Merge branch 'master' of git://git.denx.de/u-boot-arm

Tom Rini
2 parents 10fcda8e25 4efd69250f
Showing 3 changed files Side-by-side Diff
arch/arm/cpu/pxa/config.mk
board/vpac270/u-boot-spl.lds
include/configs/vpac270.h
@@ -14,4 +14,17 @@
 # ========================================================================
 PF_RELFLAGS_SLB_AT := $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
 PLATFORM_RELFLAGS += $(PF_RELFLAGS_SLB_AT)
+
+#
+# !WARNING!
+# The PXA's OneNAND SPL uses .text.0 and .text.1 segments to allow booting from
+# really small OneNAND memories where the mmap'd window is only 1KiB big. The
+# .text.0 contains only the bare minimum needed to load the real SPL into SRAM.
+# Add .text.0 and .text.1 into OBJFLAGS, so when the SPL is being objcopy'd,
+# they are not discarded.
+#
+
+#ifdef CONFIG_SPL_BUILD
+OBJCFLAGS += -j .text.0 -j .text.1
+#endif
@@ -20,6 +20,7 @@
 	.text.0	:
 	{
 		arch/arm/cpu/pxa/start.o		(.text*)
+		arch/arm/lib/built-in.o			(.text*)
 		board/vpac270/built-in.o		(.text*)
 		drivers/mtd/onenand/built-in.o		(.text*)
 	}
@@ -286,7 +286,7 @@
 /*
  * Memory settings
  */
-#define	CONFIG_SYS_MSC0_VAL	0x3ffc95fa
+#define	CONFIG_SYS_MSC0_VAL	0x3ffc95f9
 #define	CONFIG_SYS_MSC1_VAL	0x02ccf974
 #define	CONFIG_SYS_MSC2_VAL	0x00000000
 #ifdef	CONFIG_RAM_256M
...	...	@@ -14,4 +14,17 @@
14	14	# ========================================================================
15	15	PF_RELFLAGS_SLB_AT := $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
16	16	PLATFORM_RELFLAGS += $(PF_RELFLAGS_SLB_AT)
	17	+
	18	+#
	19	+# !WARNING!
	20	+# The PXA's OneNAND SPL uses .text.0 and .text.1 segments to allow booting from
	21	+# really small OneNAND memories where the mmap'd window is only 1KiB big. The
	22	+# .text.0 contains only the bare minimum needed to load the real SPL into SRAM.
	23	+# Add .text.0 and .text.1 into OBJFLAGS, so when the SPL is being objcopy'd,
	24	+# they are not discarded.
	25	+#
	26	+
	27	+#ifdef CONFIG_SPL_BUILD
	28	+OBJCFLAGS += -j .text.0 -j .text.1
	29	+#endif
...	...	@@ -20,6 +20,7 @@
20	20	.text.0 :
21	21	{
22	22	arch/arm/cpu/pxa/start.o (.text*)
	23	+ arch/arm/lib/built-in.o (.text*)
23	24	board/vpac270/built-in.o (.text*)
24	25	drivers/mtd/onenand/built-in.o (.text*)
25	26	}
...	...	@@ -286,7 +286,7 @@
286	286	/*
287	287	* Memory settings
288	288	*/
289		-#define CONFIG_SYS_MSC0_VAL 0x3ffc95fa
	289	+#define CONFIG_SYS_MSC0_VAL 0x3ffc95f9
290	290	#define CONFIG_SYS_MSC1_VAL 0x02ccf974
291	291	#define CONFIG_SYS_MSC2_VAL 0x00000000
292	292	#ifdef CONFIG_RAM_256M