summaryrefslogtreecommitdiff
path: root/cpu/arm720t
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-04-04 12:44:11 +0000
committerwdenk <wdenk>2005-04-04 12:44:11 +0000
commit8aa1a2d115420b1eb126f69f3547b54d275c3228 (patch)
tree9167bf91193bcd6b15696a97180df29bc1524c83 /cpu/arm720t
parent986ef4340e73c6912a26e0c165c9966ab98618d4 (diff)
downloadu-boot-imx-8aa1a2d115420b1eb126f69f3547b54d275c3228.zip
u-boot-imx-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.gz
u-boot-imx-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.bz2
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/arm720t')
-rw-r--r--cpu/arm720t/start.S5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpu/arm720t/start.S b/cpu/arm720t/start.S
index 0e15965..3695465 100644
--- 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 */