diff options
| author | Tom Rini <trini@ti.com> | 2014-01-13 13:50:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-01-13 13:50:25 -0500 |
| commit | 0effc5e5678e569296f661c8f66b182e8788f30d (patch) | |
| tree | d661fb1e4a240b884a1f5eeb0ae8e3337481c7b3 | |
| parent | 10fcda8e25cb9477b47a62edb716f81c9d5e1f0e (diff) | |
| parent | 4efd69250f6118ebd783867b3809001a1886ce9e (diff) | |
| download | u-boot-imx-0effc5e5678e569296f661c8f66b182e8788f30d.zip u-boot-imx-0effc5e5678e569296f661c8f66b182e8788f30d.tar.gz u-boot-imx-0effc5e5678e569296f661c8f66b182e8788f30d.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
| -rw-r--r-- | arch/arm/cpu/pxa/config.mk | 13 | ||||
| -rw-r--r-- | board/vpac270/u-boot-spl.lds | 1 | ||||
| -rw-r--r-- | include/configs/vpac270.h | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/cpu/pxa/config.mk b/arch/arm/cpu/pxa/config.mk index d8d263d..f2befbe 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 diff --git a/board/vpac270/u-boot-spl.lds b/board/vpac270/u-boot-spl.lds index 02d107c..b6fdde4 100644 --- a/board/vpac270/u-boot-spl.lds +++ b/board/vpac270/u-boot-spl.lds @@ -20,6 +20,7 @@ SECTIONS .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*) } diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h index 71a89b6..c6d4763 100644 --- a/include/configs/vpac270.h +++ b/include/configs/vpac270.h @@ -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 |