summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-01-13 13:50:25 -0500
committerTom Rini <trini@ti.com>2014-01-13 13:50:25 -0500
commit0effc5e5678e569296f661c8f66b182e8788f30d (patch)
treed661fb1e4a240b884a1f5eeb0ae8e3337481c7b3 /arch
parent10fcda8e25cb9477b47a62edb716f81c9d5e1f0e (diff)
parent4efd69250f6118ebd783867b3809001a1886ce9e (diff)
downloadtalos-obmc-uboot-0effc5e5678e569296f661c8f66b182e8788f30d.tar.gz
talos-obmc-uboot-0effc5e5678e569296f661c8f66b182e8788f30d.zip
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/pxa/config.mk13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/cpu/pxa/config.mk b/arch/arm/cpu/pxa/config.mk
index d8d263d404..f2befbe515 100644
--- a/arch/arm/cpu/pxa/config.mk
+++ b/arch/arm/cpu/pxa/config.mk
@@ -14,3 +14,16 @@ PLATFORM_CPPFLAGS += -mcpu=xscale
# ========================================================================
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
OpenPOWER on IntegriCloud