summaryrefslogtreecommitdiff
path: root/cpu/s3c44b0
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/s3c44b0
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/s3c44b0')
-rw-r--r--cpu/s3c44b0/start.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/s3c44b0/start.S b/cpu/s3c44b0/start.S
index fc7f592..7affe87 100644
--- a/cpu/s3c44b0/start.S
+++ b/cpu/s3c44b0/start.S
@@ -112,7 +112,7 @@ reset:
* not when booting from ram!
*/
-#ifdef CONFIG_INIT_CRITICAL
+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
bl cpu_init_crit
/*
* before relocating, we have to setup RAM timing
@@ -122,6 +122,7 @@ reset:
bl lowlevel_init
#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 */
@@ -151,6 +152,7 @@ vector_copy_loop:
stmia r1!, {r3-r10}
cmp r0, r2
ble vector_copy_loop
+#endif /* CONFIG_SKIP_RELOCATE_UBOOT */
/* Set up the stack */
stack_setup: