diff options
Diffstat (limited to 'cpu/sa1100/start.S')
| -rw-r--r-- | cpu/sa1100/start.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/sa1100/start.S b/cpu/sa1100/start.S index 08e41c7d79..431ee656e8 100644 --- a/cpu/sa1100/start.S +++ b/cpu/sa1100/start.S @@ -121,10 +121,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 */ @@ -141,6 +142,7 @@ copy_loop: stmia r1!, {r3-r10} /* copy to target address [r1] */ cmp r0, r2 /* until source end addreee [r2] */ ble copy_loop +#endif /* CONFIG_SKIP_RELOCATE_UBOOT */ /* Set up the stack */ stack_setup: |