diff options
| author | wdenk <wdenk> | 2005-04-04 12:44:11 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-04-04 12:44:11 +0000 |
| commit | 8aa1a2d115420b1eb126f69f3547b54d275c3228 (patch) | |
| tree | 9167bf91193bcd6b15696a97180df29bc1524c83 /cpu/arm925t/start.S | |
| parent | 986ef4340e73c6912a26e0c165c9966ab98618d4 (diff) | |
| download | talos-obmc-uboot-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.gz talos-obmc-uboot-8aa1a2d115420b1eb126f69f3547b54d275c3228.zip | |
Patch by Steven Scholz, 4 Apr 2005:
- remove all references to CONFIG_INIT_CRITICAL for ARM based boards
- introduce two new configuration options instead:
CONFIG_SKIP_LOWLEVEL_INIT and CONFIG_SKIP_RELOCATE_UBOOT
Diffstat (limited to 'cpu/arm925t/start.S')
| -rw-r--r-- | cpu/arm925t/start.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/arm925t/start.S b/cpu/arm925t/start.S index f74064b97f..238925936e 100644 --- a/cpu/arm925t/start.S +++ b/cpu/arm925t/start.S @@ -164,10 +164,11 @@ poll1: * 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 */ @@ -184,6 +185,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: |
