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>

diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index 17977c26b1ef3011c41bf45607cd7774d71bafe5..f99d129f85e8121b2573fa3a150464d5da1ed72f 100644 (file)
--- 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   */

diff --git a/include/configs/at91rm9200dk.h b/include/configs/at91rm9200dk.h
index 633a053000117a0b3fd980ed984d85c70a6f3ec3..5c239d7bf74a6e28308b8978ecd198860b81a893 100644 (file)
--- a/include/configs/at91rm9200dk.h
+++ b/include/configs/at91rm9200dk.h
@@ -72,6 +72,8 @@
 #define SDRC_MR_VAL2   0x00000003 /* Load Mode Register */
 #define SDRC_MR_VAL3   0x00000000 /* Normal Mode */
 #define SDRC_TR_VAL    0x000002E0 /* Write refresh rate */
+#else
+#define CONFIG_SKIP_RELOCATE_UBOOT
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 /*
  * Size of malloc() pool

diff --git a/include/configs/cmc_pu2.h b/include/configs/cmc_pu2.h
index 527921e8fce2190d5ecd530ce0ea8559389f4259..cdd308d8b91bd7abeccde673e73bd311e6238dd7 100644 (file)
--- a/include/configs/cmc_pu2.h
+++ b/include/configs/cmc_pu2.h
@@ -71,6 +71,8 @@
 #define SDRC_MR_VAL2   0x00000003 /* Load Mode Register */
 #define SDRC_MR_VAL3   0x00000000 /* Normal Mode */
 #define SDRC_TR_VAL    0x000002E0 /* Write refresh rate */
+#else
+#define CONFIG_SKIP_RELOCATE_UBOOT
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 
 /*

diff --git a/include/configs/csb637.h b/include/configs/csb637.h
index 38fd25cb66825d5003ee44621cec7c12b8a34ba1..682db447dd81cd5939b6126df659c8f5b4e8eec9 100644 (file)
--- a/include/configs/csb637.h
+++ b/include/configs/csb637.h
@@ -72,6 +72,8 @@
 #define SDRC_MR_VAL2   0x00000003 /* Load Mode Register */
 #define SDRC_MR_VAL3   0x00000000 /* Normal Mode */
 #define SDRC_TR_VAL    0x000002E0 /* Write refresh rate */
+#else
+#define CONFIG_SKIP_RELOCATE_UBOOT
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 /*
  * Size of malloc() pool

diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 55cda329ee9e9495cfe024100408133cc8062c80..1ce8c6974adf1f648c33fc1d60fb707a0bf00055 100644 (file)
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -51,6 +51,8 @@
 #define CONFIG_INITRD_TAG      1
 
 #define        CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_RELOCATE_UBOOT     /* undef this for direct boot from */
+                                                                       /* NOR flash without preloader */
 
 #define        CONFIG_SYS_LONGHELP
 

diff --git a/include/configs/mp2usb.h b/include/configs/mp2usb.h
index 2ffeae608b388a3c985931570ce823ec859f8196..cbbdb0c77edc53142a373b350201ba168fa65925 100644 (file)
--- a/include/configs/mp2usb.h
+++ b/include/configs/mp2usb.h
@@ -76,6 +76,8 @@
 #define SDRC_MR_VAL2   0x00000003 /* Load Mode Register */
 #define SDRC_MR_VAL3   0x00000000 /* Normal Mode */
 #define SDRC_TR_VAL    0x000002E0 /* Write refresh rate */
+#else
+#define CONFIG_SKIP_RELOCATE_UBOOT
 #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
 
 /*