summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2012-12-06 13:33:16 +0000
committerKim Phillips <kim.phillips@freescale.com>2012-12-19 17:45:36 -0600
commit74752baa738ee9dafe69d726910e26da56f6f722 (patch)
tree4c50cbe789d890c198100585a0f82956df182f52 /Makefile
parentebbf0d20aa85f623c49b7ed3349ebfea450c152d (diff)
downloadu-boot-imx-74752baa738ee9dafe69d726910e26da56f6f722.zip
u-boot-imx-74752baa738ee9dafe69d726910e26da56f6f722.tar.gz
u-boot-imx-74752baa738ee9dafe69d726910e26da56f6f722.tar.bz2
spl: Change PAD_TO to CONFIG_SPL_PAD_TO
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9d43499..7e16da9 100644
--- a/Makefile
+++ b/Makefile
@@ -485,8 +485,12 @@ $(obj)u-boot.sha1: $(obj)u-boot.bin
$(obj)u-boot.dis: $(obj)u-boot
$(OBJDUMP) -d $< > $@
+
+
$(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 > $@
rm $(obj)spl/u-boot-spl-pad.bin