* Patch by Stefan Roese, 03 May 2005:

[oweals/u-boot.git] / cpu / arm720t / start.S

diff --git a/cpu/arm720t/start.S b/cpu/arm720t/start.S
index bde936a7517201b8d4b4313120609d4e75d90bc0..3695465e70959be4837261131413e23fa6f2db17 100644 (file)
--- a/cpu/arm720t/start.S
+++ b/cpu/arm720t/start.S
@@ -119,10 +119,11 @@ reset:
         * we do sys-critical inits only at reboot,
         * not when booting from ram!
         */
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
        bl      cpu_init_crit
 #endif
 
+#ifndef CONFIG_SKIP_RELOCATE_UBOOT
 relocate:                              /* relocate U-Boot to RAM           */
        adr     r0, _start              /* r0 <- current position of code   */
        ldr     r1, _TEXT_BASE          /* test if we run from flash or RAM */
@@ -150,6 +151,8 @@ copy_loop:
        cmp     r0, r2                  /* until source end addreee [r2]    */
        ble     copy_loop
 
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
+
        /* Set up the stack                                                 */
 stack_setup:
        ldr     r0, _TEXT_BASE          /* upper 128 KiB: relocated uboot   */
@@ -316,10 +319,10 @@ cpu_init_crit:
        /*
         * before relocating, we have to setup RAM timing
         * because memory timing is board-dependent, you will
-        * find a memsetup.S in your board directory.
+        * find a lowlevel_init.S in your board directory.
         */
        mov     ip, lr
-       bl      memsetup
+       bl      lowlevel_init
        mov     lr, ip
 
        mov     pc, lr