summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2012-08-24 17:36:53 +0200
committerStefan Roese <sr@denx.de>2012-12-05 17:31:30 +0100
commitfb3d2b8a3fc26ffb0127fd0fed90ff5f074e67d7 (patch)
tree66f214c9cd4abc446aa7bd1e23c0b46700a47964 /Makefile
parentb40bda6bd8b311d828a11dfa12df324cd51c3a55 (diff)
downloadu-boot-fb3d2b8a3fc26ffb0127fd0fed90ff5f074e67d7.tar.gz
u-boot-fb3d2b8a3fc26ffb0127fd0fed90ff5f074e67d7.tar.xz
u-boot-fb3d2b8a3fc26ffb0127fd0fed90ff5f074e67d7.zip
Makefile: Add target for combined spl/u-boot.bin & u-boot.img
This new make target "u-boot-img.bin" consists of the U-Boot SPL image with the real, full-blown U-Boot image directly attached to it. The full-blown U-Boot image has the mkimage header included, with its load-address and entry-point. This will be used by the upcoming a3m071 MPC5200 board port. Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index bf9a9378da..2132ebf10f 100644
--- a/Makefile
+++ b/Makefile
@@ -544,6 +544,9 @@ $(obj)u-boot-$(nodtb)-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin $(dtb
rm $(obj)spl/u-boot-spl-pad.bin
endif
+$(obj)u-boot-img.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img
+ cat $(obj)spl/u-boot-spl.bin $(obj)u-boot.img > $@
+
ifeq ($(CONFIG_SANDBOX),y)
GEN_UBOOT = \
cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \