Merge commit 'u-boot/master' into for-1.3.1

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

diff --git a/cpu/lh7a40x/start.S b/cpu/lh7a40x/start.S
index 5dca77363f9a84a148a4e51947d8513dbc98cb32..fb748cffc63be59f34a57985fb46bda8d27b5718 100644 (file)
--- a/cpu/lh7a40x/start.S
+++ b/cpu/lh7a40x/start.S
@@ -145,10 +145,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 */
@@ -166,6 +167,7 @@ copy_loop:
        cmp     r0, r2                  /* until source end addreee [r2]    */
        blt     copy_loop               /* a 'ble' here actually copies     */
                                        /*   four bytes of bss              */
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
 
        /* Set up the stack                                                 */
 stack_setup: