Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

spl: Change PAD_TO to CONFIG_SPL_PAD_TO

Browse source 
This was already used by some SPL targets, and allows the pad amount to
be specified by board config headers rather than only in makefile
fragments.

Also supply a pad-to of zero if the variable is undefined.  It works
without this, but this avoids relying on undocumented behavior.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
This commit is contained in:
Scott Wood 2012-12-06 13:33:16 +00:00 committed by Kim Phillips
parent ebbf0d20aa
commit 74752baa73
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -485,8 +485,12 @@ $(obj)u-boot.sha1: $(obj)u-boot.bin
$(obj)u-boot.dis: $(obj)u-boot $(obj)u-boot.dis: $(obj)u-boot
$(OBJDUMP) -d $< > $@ $(OBJDUMP) -d $< > $@
$(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(obj)u-boot-with-spl.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin
$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(or $(CONFIG_SPL_PAD_TO),0) \
-O binary $(obj)spl/u-boot-spl \
$(obj)spl/u-boot-spl-pad.bin
cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@ cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
rm $(obj)spl/u-boot-spl-pad.bin rm $(obj)spl/u-boot-spl-pad.bin

4
README
View file

@ -2836,6 +2836,10 @@ FIT uImage format:
CONFIG_SPL_LIBGENERIC_SUPPORT CONFIG_SPL_LIBGENERIC_SUPPORT
Support for lib/libgeneric.o in SPL binary Support for lib/libgeneric.o in SPL binary
CONFIG_SPL_PAD_TO
Linker address to which the SPL should be padded before
appending the SPL payload.
CONFIG_SPL_TARGET CONFIG_SPL_TARGET
Final target image containing SPL and payload. Some SPLs Final target image containing SPL and payload. Some SPLs
use an arch-specific makefile fragment instead, for use an arch-specific makefile fragment instead, for

2
board/ait/cam_enc_4xx/config.mk
View file

@ -8,7 +8,7 @@
# #
#Provide at least 16MB spacing between us and the Linux Kernel image #Provide at least 16MB spacing between us and the Linux Kernel image
PAD_TO := 12320 CONFIG_SPL_PAD_TO := 12320
UBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/ublimage.cfg UBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/ublimage.cfg
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
ALL-y += $(obj)u-boot.ubl ALL-y += $(obj)u-boot.ubl