summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2012-09-19 17:45:41 -0500
committerScott Wood <scottwood@freescale.com>2012-11-26 15:41:21 -0600
commit5364add4ef90c058bea8b3eceb2a559c0a983537 (patch)
treed5f45f66c04a4cbbd687f47e48ae913c328e693a /Makefile
parent277f00f5b52c5c4c1b05703360a8e2399cc2484a (diff)
downloadu-boot-imx-5364add4ef90c058bea8b3eceb2a559c0a983537.zip
u-boot-imx-5364add4ef90c058bea8b3eceb2a559c0a983537.tar.gz
u-boot-imx-5364add4ef90c058bea8b3eceb2a559c0a983537.tar.bz2
spl: rename u-boot-pad.bin to u-boot-with-spl.bin
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 628f778..f2882a1 100644
--- a/Makefile
+++ b/Makefile
@@ -474,14 +474,14 @@ $(obj)u-boot.sha1: $(obj)u-boot.bin
$(obj)u-boot.dis: $(obj)u-boot
$(OBJDUMP) -d $< > $@
-$(obj)u-boot-pad.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
- cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $(obj)u-boot-pad.bin
+ cat $(obj)spl/u-boot-spl-pad.bin $(obj)u-boot.bin > $@
rm $(obj)spl/u-boot-spl-pad.bin
-$(obj)u-boot.ubl: $(obj)u-boot-pad.bin
+$(obj)u-boot.ubl: $(obj)u-boot-with-spl.bin
$(obj)tools/mkimage -n $(UBL_CONFIG) -T ublimage \
- -e $(CONFIG_SYS_TEXT_BASE) -d $(obj)u-boot-pad.bin $(obj)u-boot.ubl
+ -e $(CONFIG_SYS_TEXT_BASE) -d $< $(obj)u-boot.ubl
$(obj)u-boot.ais: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img
$(obj)tools/mkimage -s -n $(if $(CONFIG_AIS_CONFIG_FILE),$(CONFIG_AIS_CONFIG_FILE),"/dev/null") \