Patchwork [U-Boot,v3,3/4] SMDK6400: Fix build error for nand_spl support

login
register
mail settings
Submitter seedshope
Date Jan. 13, 2011, 1:36 p.m.
Message ID <1294925784-5042-4-git-send-email-bocui107@gmail.com>
Download mbox | patch
Permalink /patch/78755/
State Rejected
Headers show

Comments

seedshope - Jan. 13, 2011, 1:36 p.m.
Add some relocation symbols to u-boot.lds and disable LED functions
in start.s to support nand_spl.

Signed-off-by: seedshope <bocui107@gmail.com>

Patch

diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S
index 237dcfe..ae3706a 100644
--- a/arch/arm/cpu/arm1176/start.S
+++ b/arch/arm/cpu/arm1176/start.S
@@ -354,9 +354,11 @@  clbss_l:str	r2, [r0]		/* clear loop...		    */
 	cmp	r0, r1
 	bne	clbss_l
 
+#ifndef CONFIG_NAND_SPL
 	bl coloured_LED_init
 	bl red_LED_on
 #endif
+#endif
 
 /*
  * We are done. Do not return, instead branch to second part of board
diff --git a/nand_spl/board/samsung/smdk6400/u-boot.lds b/nand_spl/board/samsung/smdk6400/u-boot.lds
index 3ac6aa1..30b1573 100644
--- a/nand_spl/board/samsung/smdk6400/u-boot.lds
+++ b/nand_spl/board/samsung/smdk6400/u-boot.lds
@@ -55,7 +55,22 @@  SECTIONS
 	__u_boot_cmd_end = .;
 
 	. = ALIGN(4);
+
+	.rel.dyn : {
+	__rel_dyn_start = .;
+	*(.rel*)
+	__rel_dyn_end = .;
+	}
+
+	.dynsym : {
+	__dynsym_start = .;
+	*(.dynsym)
+	}
+
+	.bss __rel_dyn_start (OVERLAY) : {
 	__bss_start = .;
-	.bss : { *(.bss) . = ALIGN(4); }
+	*(.bss)
+	. = ALIGN(4);
 	_end = .;
+	}
 }