GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-20 13:41:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Rini 2014-01-13 13:50:25 -05:00
commit 0effc5e567
3 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
arch/arm/cpu/pxa/config.mk
View file

@ -14,3 +14,16 @@ PLATFORM_CPPFLAGS += -mcpu=xscale
# ======================================================================== # ========================================================================
PF_RELFLAGS_SLB_AT := $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) PF_RELFLAGS_SLB_AT := $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
PLATFORM_RELFLAGS += $(PF_RELFLAGS_SLB_AT) 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

1
board/vpac270/u-boot-spl.lds
View file

@ -20,6 +20,7 @@ SECTIONS
.text.0 : .text.0 :
{ {
arch/arm/cpu/pxa/start.o (.text*) arch/arm/cpu/pxa/start.o (.text*)
arch/arm/lib/built-in.o (.text*)
board/vpac270/built-in.o (.text*) board/vpac270/built-in.o (.text*)
drivers/mtd/onenand/built-in.o (.text*) drivers/mtd/onenand/built-in.o (.text*)
} }

2
include/configs/vpac270.h
View file

@ -286,7 +286,7 @@
/* /*
* Memory settings * Memory settings
*/ */
#define CONFIG_SYS_MSC0_VAL 0x3ffc95fa #define CONFIG_SYS_MSC0_VAL 0x3ffc95f9
#define CONFIG_SYS_MSC1_VAL 0x02ccf974 #define CONFIG_SYS_MSC1_VAL 0x02ccf974
#define CONFIG_SYS_MSC2_VAL 0x00000000 #define CONFIG_SYS_MSC2_VAL 0x00000000
#ifdef CONFIG_RAM_256M #ifdef CONFIG_RAM_256M