From 8aa1a2d115420b1eb126f69f3547b54d275c3228 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Mon, 4 Apr 2005 12:44:11 +0000
Subject: 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

---
 cpu/arm920t/start.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'cpu/arm920t')

diff --git a/cpu/arm920t/start.S b/cpu/arm920t/start.S
index a7cabf8..afe654b 100644
--- a/cpu/arm920t/start.S
+++ b/cpu/arm920t/start.S
@@ -156,10 +156,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 */
@@ -176,6 +177,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:
-- 
cgit v1.1