X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Farm720t%2Fstart.S;h=3695465e70959be4837261131413e23fa6f2db17;hb=434cf850a4afd9a1311c657333ac9ded95ea3096;hp=bde936a7517201b8d4b4313120609d4e75d90bc0;hpb=a1191902cab72b9f7127365fac39a1e1d5c9abda;p=oweals%2Fu-boot.git

diff --git a/cpu/arm720t/start.S b/cpu/arm720t/start.S
index bde936a751..3695465e70 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   */
@@ -316,10 +319,10 @@ cpu_init_crit:
 	/*
 	 * before relocating, we have to setup RAM timing
 	 * because memory timing is board-dependent, you will
-	 * find a memsetup.S in your board directory.
+	 * find a lowlevel_init.S in your board directory.
 	 */
 	mov	ip, lr
-	bl	memsetup
+	bl	lowlevel_init
 	mov	lr, ip
 
 	mov	pc, lr