summaryrefslogtreecommitdiffstats
path: root/cpu/arm1136
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/arm1136
parent986ef4340e73c6912a26e0c165c9966ab98618d4 (diff)
downloadu-boot-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.gz
u-boot-8aa1a2d115420b1eb126f69f3547b54d275c3228.tar.xz
u-boot-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/arm1136')
-rw-r--r--cpu/arm1136/start.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/cpu/arm1136/start.S b/cpu/arm1136/start.S
index 27fcc89cc9..c3bf6e37e1 100644
--- a/cpu/arm1136/start.S
+++ b/cpu/arm1136/start.S
@@ -129,8 +129,11 @@ next:
bl cpy_clk_code /* put dpll adjust code behind vectors */
#endif
/* the mask ROM code should have PLL and others stable */
+#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 */
@@ -147,6 +150,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: