Skip to contentSkip to conversation

Pull request: u-boot-atmel at91

GIT PULL Reinhard Meyer 3 participants 5 messages Oct 19, 2010 – Oct 20, 2010

lore
Share & tools
lore
#0 lore raw

Hello Wolfgang,

The following changes since commit 1ba91ba23396005ef7b42381cc21f0baf78d0d60:
Joakim Tjernlund (1):
dlmalloc.c: Fix gcc alias warning

are available in the git repository at:

git://git.denx.de/u-boot-atmel.git at91

Andreas Bie?mann (3):
at91rm9200ek: convert to at91
at91rm9200: enable USB support
at91rm9200ek: enbable USB support

Reinhard Meyer (1):
AT91 clock/timer: move static data to global_data struct

 MAINTAINERS                               |    4 +
 arch/arm/cpu/arm926ejs/at91/clock.c       |   55 +++---
 arch/arm/cpu/arm926ejs/at91/timer.c       |   85 +++++-----
 arch/arm/include/asm/arch-at91/hardware.h |    1 +
 arch/arm/include/asm/global_data.h        |   14 ++
 board/atmel/at91rm9200ek/Makefile         |    5 -
 board/atmel/at91rm9200ek/at91rm9200ek.c   |   60 ++-----
 board/atmel/at91rm9200ek/config.mk        |    3 +-
 board/atmel/at91rm9200ek/led.c            |   58 +++---
 board/atmel/at91rm9200ek/misc.c           |   50 -----
 board/atmel/at91rm9200ek/mux.c            |   38 ----
 board/atmel/at91rm9200ek/partition.c      |   38 ----
 boards.cfg                                |    2 +-
 include/configs/at91rm9200ek.h            |  286 +++++++++--------------------
 14 files changed, 221 insertions(+), 478 deletions(-)
 delete mode 100644 board/atmel/at91rm9200ek/misc.c
 delete mode 100644 board/atmel/at91rm9200ek/mux.c
 delete mode 100644 board/atmel/at91rm9200ek/partition.c

Best Regards,
Reinhard

#1 lore raw

Hello,

I just noticed that:

Quoted 1 line
  board/atmel/at91rm9200ek/config.mk        |    3 +-

This file should/could be removed by moving the text base define to the board config file.

Simplest way is that you send an incremental patch and I squash it in before Wolfgang pulls. Or, if its OK for Wolfgang to fix this later, stuff can be pulled now anyway.

Best Regards,
Reinhard

#2 lore raw

Dear Reinhard Meyer,

Quoted 7 lines · In message <[email protected]> you wrote:

This file should/could be removed by moving the text base define to the board config file.

Simplest way is that you send an incremental patch and I squash it in before Wolfgang pulls. Or, if its OK for Wolfgang to fix this later, stuff can be pulled now anyway.

Feel free to try to fix it before I pull - but you don't have much time, as I'm starting my night shift now :-)

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
######## This message was made from 100% recycled electrons. ########
#3 lore raw
In reply to Reinhard Meyer

Dear Reinhard Meyer,
Am 19.10.2010 um 20:42 schrieb Reinhard Meyer:

Quoted 8 lines

Hello,

I just noticed that:

Quoted 1 line
 board/atmel/at91rm9200ek/config.mk        |    3 +-

This file should/could be removed by moving the text base define to the board config file.

Good Idea, I just thought about that before. I will remove this in a future patch, I plan to support different boot-strategies with different config parameters eg. at91rm9200ek_ram, at91rm9200ek_dataflash ...

Quoted 2 lines

Simplest way is that you send an incremental patch and I squash it in before Wolfgang pulls.

If this was not changed by Wolfgang last night I will send a patch near beginning of next week.

regards

Andreas Bie?mann

#4 lore raw
In reply to Reinhard Meyer

Dear Reinhard Meyer,

Quoted 28 lines · In message <[email protected]> you wrote:

Hello Wolfgang,

The following changes since commit 1ba91ba23396005ef7b42381cc21f0baf78d0d60:
Joakim Tjernlund (1):
dlmalloc.c: Fix gcc alias warning

are available in the git repository at:

git://git.denx.de/u-boot-atmel.git at91

Andreas Bie?mann (3):
at91rm9200ek: convert to at91
at91rm9200: enable USB support
at91rm9200ek: enbable USB support

Reinhard Meyer (1):
AT91 clock/timer: move static data to global_data struct

 MAINTAINERS                               |    4 +
 arch/arm/cpu/arm926ejs/at91/clock.c       |   55 +++---
 arch/arm/cpu/arm926ejs/at91/timer.c       |   85 +++++-----
 arch/arm/include/asm/arch-at91/hardware.h |    1 +
 arch/arm/include/asm/global_data.h        |   14 ++
 board/atmel/at91rm9200ek/Makefile         |    5 -
 board/atmel/at91rm9200ek/at91rm9200ek.c   |   60 ++-----
 board/atmel/at91rm9200ek/config.mk        |    3 +-
 board/atmel/at91rm9200ek/led.c            |   58 +++---
 board/atmel/at91rm9200ek/misc.c           |   50 -----
Quoted 8 lines
 board/atmel/at91rm9200ek/mux.c            |   38 ----
 board/atmel/at91rm9200ek/partition.c      |   38 ----
 boards.cfg                                |    2 +-
 include/configs/at91rm9200ek.h            |  286 +++++++++--------------------
 14 files changed, 221 insertions(+), 478 deletions(-)
 delete mode 100644 board/atmel/at91rm9200ek/misc.c
 delete mode 100644 board/atmel/at91rm9200ek/mux.c
 delete mode 100644 board/atmel/at91rm9200ek/partition.c

Applied to u-boot-arm, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Nobody will ever need more than 640k RAM!"       -- Bill Gates, 1981
"Windows 95 needs at least 8 MB RAM."             -- Bill Gates, 1996
"Nobody will ever need Windows 95."             -- logical conclusion