Pull request:[ARM]
Wolfgang
Please pull from the merge branch at git://denx.de/git/u-boot-arm.git master
---
The following changes since commit 45da195cf675d0b4054aeeabf7b9c0daf798841d:
Wolfgang Denk (1):
Merge branch 'master' of
git+ssh://10.10.0.7/home/wd/git/u-boot/master
are available in the git repository at:
git://www.denx.de/git/u-boot-arm.git master
Andreas Engel (1):
ARM: cleanup duplicated exception handlingcode
Haavard Skinnemoen (1):
Move AT91RM9200DK board support under board/atmel
Peter Pearse (6):
Update board NetStar
Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdev
Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdev
Merge branch '080131_artila' of git://linux-arm.org/u-boot-armdev
Merge branch '080202_at91rm9200dk' of
git://linux-arm.org/u-boot-armdev
Merge branch '080208_dupint' of git://linux-arm.org/u-boot-armdevStelian Pop (9):
Fix arm926ejs compile when SKIP_LOWLEVEL_INIT is on Improve DataFlash CS definition.
AT91CAP9 support : build integration
AT91CAP9 support : include/ files
AT91CAP9 support : cpu/ files
AT91CAP9 support : board/ files
AT91CAP9 support : MACB changes
AT91CAP9 support : move board files to Atmel vendor directory. AT91CAP9 support
Timo Tuunainen (1):
Support for Artila M-501 starter kit
CREDITS | 20 +
MAKEALL | 2 +
Makefile | 18 +-
board/{at91rm9200dk => atmel/at91cap9adk}/Makefile | 8 +-
board/atmel/at91cap9adk/at91cap9adk.c | 283 +++++++++++
board/atmel/at91cap9adk/config.mk | 1 +
board/atmel/at91cap9adk/led.c | 80 +++
board/atmel/at91cap9adk/nand.c | 71 +++
.../{at91rm9200dk => atmel/at91cap9adk}/u-boot.lds | 10 +-
board/{ => atmel}/at91rm9200dk/Makefile | 0
board/{ => atmel}/at91rm9200dk/at91rm9200dk.c | 0
board/{ => atmel}/at91rm9200dk/config.mk | 0
board/{ => atmel}/at91rm9200dk/flash.c | 0
board/{ => atmel}/at91rm9200dk/led.c | 0
board/{ => atmel}/at91rm9200dk/mux.c | 0
board/{ => atmel}/at91rm9200dk/u-boot.lds | 0
board/{at91rm9200dk => m501sk}/Makefile | 22 +-
board/{at91rm9200dk => m501sk}/config.mk | 0
board/m501sk/eeprom.c | 102 ++++
board/m501sk/m501sk.c | 194 ++++++++
board/m501sk/m501sk.h | 167 +++++++
board/m501sk/memsetup.S | 200 ++++++++
board/{at91rm9200dk => m501sk}/u-boot.lds | 8 +-
board/netstar/nand.c | 13 +-
common/env_dataflash.c | 17 +-
cpu/arm1136/interrupts.c | 134 -----
cpu/arm720t/interrupts.c | 132 +-----
cpu/arm920t/interrupts.c | 135 +-----
cpu/arm925t/interrupts.c | 135 -----
.../arm926ejs/at91cap9}/Makefile | 24 +-
cpu/arm926ejs/at91cap9/config.mk | 2 +
.../u-boot.lds => cpu/arm926ejs/at91cap9/ether.c | 46 +--
.../arm926ejs/at91cap9/lowlevel_init.S | 50 +--
cpu/arm926ejs/at91cap9/spi.c | 119 +++++
cpu/arm926ejs/at91cap9/timer.c | 149 ++++++
.../u-boot.lds => cpu/arm926ejs/at91cap9/usb.c | 57 +--
cpu/arm926ejs/interrupts.c | 136 +-----
cpu/arm926ejs/start.S | 8 +-
cpu/arm946es/interrupts.c | 134 -----
cpu/arm_intcm/Makefile | 2 +-
cpu/ixp/interrupts.c | 132 +-----
cpu/lh7a40x/interrupts.c | 135 -----
cpu/pxa/interrupts.c | 117 -----
cpu/s3c44b0/interrupts.c | 104 ----
cpu/sa1100/interrupts.c | 137 -----
drivers/mtd/dataflash.c | 36 +-
drivers/net/macb.c | 8 +
drivers/net/macb.h | 6 +
include/asm-arm/arch-at91cap9/AT91CAP9.h | 518
++++++++++++++++++++
.../asm-arm/arch-at91cap9/clk.h | 50 +--
include/asm-arm/arch-at91cap9/hardware.h | 38 ++
.../asm-arm/arch-at91cap9/memory-map.h | 47 +--
include/asm-arm/dma-mapping.h | 50 ++
include/configs/at91cap9adk.h | 212 ++++++++
include/configs/m501sk.h | 197 ++++++++
include/configs/netstar.h | 86 ++--
lib_arm/Makefile | 2 +-
lib_arm/armlinux.c | 3 +-
{cpu/arm_intcm => lib_arm}/interrupts.c | 34 +-
net/eth.c | 4 +
60 files changed, 2645 insertions(+), 1750 deletions(-)
copy board/{at91rm9200dk => atmel/at91cap9adk}/Makefile (87%)
mode change 100755 => 100644
create mode 100644 board/atmel/at91cap9adk/at91cap9adk.c
create mode 100644 board/atmel/at91cap9adk/config.mk
create mode 100644 board/atmel/at91cap9adk/led.c
create mode 100644 board/atmel/at91cap9adk/nand.c
copy board/{at91rm9200dk => atmel/at91cap9adk}/u-boot.lds (86%)
copy board/{ => atmel}/at91rm9200dk/Makefile (100%)
rename board/{ => atmel}/at91rm9200dk/at91rm9200dk.c (100%)
copy board/{ => atmel}/at91rm9200dk/config.mk (100%)
rename board/{ => atmel}/at91rm9200dk/flash.c (100%)
rename board/{ => atmel}/at91rm9200dk/led.c (100%)
rename board/{ => atmel}/at91rm9200dk/mux.c (100%)
copy board/{ => atmel}/at91rm9200dk/u-boot.lds (100%)
copy board/{at91rm9200dk => m501sk}/Makefile (73%)
mode change 100755 => 100644
rename board/{at91rm9200dk => m501sk}/config.mk (100%)
create mode 100644 board/m501sk/eeprom.c
create mode 100644 board/m501sk/m501sk.c
create mode 100644 board/m501sk/m501sk.h
create mode 100644 board/m501sk/memsetup.S
copy board/{at91rm9200dk => m501sk}/u-boot.lds (90%)
rename {board/at91rm9200dk => cpu/arm926ejs/at91cap9}/Makefile (69%)
mode change 100755 => 100644
create mode 100644 cpu/arm926ejs/at91cap9/config.mk
copy board/at91rm9200dk/u-boot.lds => cpu/arm926ejs/at91cap9/ether.c (51%)
copy board/at91rm9200dk/u-boot.lds =>
cpu/arm926ejs/at91cap9/lowlevel_init.S (51%)
create mode 100644 cpu/arm926ejs/at91cap9/spi.c
create mode 100644 cpu/arm926ejs/at91cap9/timer.c
copy board/at91rm9200dk/u-boot.lds => cpu/arm926ejs/at91cap9/usb.c (50%)
create mode 100644 include/asm-arm/arch-at91cap9/AT91CAP9.h
copy board/at91rm9200dk/u-boot.lds => include/asm-arm/arch-at91cap9/clk.h
(51%)
create mode 100644 include/asm-arm/arch-at91cap9/hardware.h
rename board/at91rm9200dk/u-boot.lds =>
include/asm-arm/arch-at91cap9/memory-map.h (51%)
create mode 100644 include/asm-arm/dma-mapping.h
create mode 100644 include/configs/at91cap9adk.h
create mode 100644 include/configs/m501sk.h
rename {cpu/arm_intcm => lib_arm}/interrupts.c (77%)---
Regards
Peter
Quoted 40 lines · In message <[email protected]> you wrote:
Wolfgang
Please pull from the merge branch at
git://denx.de/git/u-boot-arm.gitmaster---
The following changes since commit45da195cf675d0b4054aeeabf7b9c0daf798841d:
Wolfgang Denk (1):
Merge branch 'master' of
git+ssh://10.10.0.7/home/wd/git/u-boot/masterare available in the git repository at:
git://www.denx.de/git/u-boot-arm.gitmasterAndreas Engel (1):
ARM: cleanup duplicated exception handlingcodeHaavard Skinnemoen (1):
Move AT91RM9200DK board support under board/atmelPeter Pearse (6):
Update board NetStar Merge branch '070524_netstar' of git://linux-arm.org/u-boot-armdev Merge branch '080116_at91cap9' of git://linux-arm.org/u-boot-armdev Merge branch '080131_artila' of git://linux-arm.org/u-boot-armdev Merge branch '080202_at91rm9200dk' of git://linux-arm.org/u-boot-armdev Merge branch '080208_dupint' of git://linux-arm.org/u-boot-armdevStelian Pop (9):
Fix arm926ejs compile whenSKIP_LOWLEVEL_INITis on Improve DataFlash CS definition.
AT91CAP9 support : build integration
AT91CAP9 support :include/files
AT91CAP9 support : cpu/ files
AT91CAP9 support : board/ files
AT91CAP9 support : MACB changes
AT91CAP9 support : move board files to Atmel vendor directory. AT91CAP9 support
Quoted 2 lines
Timo Tuunainen (1):
Support for Artila M-501 starter kit
Done, thanks lot!
Best regards,
Wolfgang Denk
Signature · 9 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 [War] is instinctive. But the instinct can be fought. We're human beings with the blood of a million savage years on our hands! But we can stop it. We can admit that we're killers ... but we're not going to kill today. That's all it takes! Knowing that we're not going to kill today! -- Kirk, "A Taste of Armageddon", stardate 3193.0