X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Fs3c44b0%2Fstart.S;h=1d88c1c030aab66a5cb2a0e60d71eae44f34e7a3;hb=845842c1e4c465c895cdfcd013e162320d127048;hp=b4b7c3f62cec4ba761989c5abd67fa87fe1e752c;hpb=42dfe7a1844cbad7114038aaf03828acb7a84414;p=oweals%2Fu-boot.git

diff --git a/cpu/s3c44b0/start.S b/cpu/s3c44b0/start.S
index b4b7c3f62c..1d88c1c030 100644
--- a/cpu/s3c44b0/start.S
+++ b/cpu/s3c44b0/start.S
@@ -112,16 +112,17 @@ 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
 	 * because memory timing is board-dependend, you will
-	 * find a memsetup.S in your board directory.
+	 * find a lowlevel_init.S in your board directory.
 	 */
-	bl	memsetup
+	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:
@@ -186,7 +188,7 @@ _start_armboot:	.word start_armboot
 #define WTCON (0x01c00000+0x130000)
 cpu_init_crit:
 	/* disable watch dog */
-	ldr 	r0, =WTCON
+	ldr	r0, =WTCON
 	ldr	r1, =0x0
 	str	r1, [r0]
 
@@ -209,7 +211,7 @@ cpu_init_crit:
 	ldr	r1, =PLLCON
 
 #if CONFIG_S3C44B0_CLOCK_SPEED==66
-	ldr	r0, =0x34031 	/* 66MHz (Quartz=11MHz) */
+	ldr	r0, =0x34031	/* 66MHz (Quartz=11MHz) */
 #elif CONFIG_S3C44B0_CLOCK_SPEED==75
 	ldr	r0, =0x610c1 /*B2: Xtal=20mhz Fclk=75MHz  */
 #else