diff options
| author | Jens Scharsig <esw@bus-elektronik.de> | 2008-11-18 10:48:46 +0100 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2008-11-24 22:10:04 +0100 |
| commit | 8052352f20b33bef8f9872fc983eac73d4693c38 (patch) | |
| tree | 85a622d58f40b25e7202dd4faedcb98e605646d2 /cpu | |
| parent | 3e0cda071a67cb5709e3fa4faf6b31a731859acc (diff) | |
| download | blackbird-obmc-uboot-8052352f20b33bef8f9872fc983eac73d4693c38.tar.gz blackbird-obmc-uboot-8052352f20b33bef8f9872fc983eac73d4693c38.zip | |
at91rm9200: fix broken boot from nor flash
This patch fix the broken boot from NOR Flash on AT91RM9200 boards, if
CONFIG_AT91RM9200 is defined and nor preloader is used.
Signed-off-by: Jens Scharsig <esw@bus-elektronik.de>
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/arm920t/start.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S index 17977c26b1..f99d129f85 100644 --- a/cpu/arm920t/start.S +++ b/cpu/arm920t/start.S @@ -24,7 +24,6 @@ * MA 02111-1307 USA */ - #include <config.h> #include <version.h> #include <status_led.h> @@ -178,8 +177,6 @@ copyex: bl cpu_init_crit #endif -#ifndef CONFIG_AT91RM9200 - #ifndef CONFIG_SKIP_RELOCATE_UBOOT relocate: /* relocate U-Boot to RAM */ adr r0, _start /* r0 <- current position of code */ @@ -198,7 +195,7 @@ copy_loop: cmp r0, r2 /* until source end addreee [r2] */ ble copy_loop #endif /* CONFIG_SKIP_RELOCATE_UBOOT */ -#endif + /* Set up the stack */ stack_setup: ldr r0, _TEXT_BASE /* upper 128 KiB: relocated uboot */ |
