From: Stefan Roese <sr@denx.de>
Date: Fri, 24 Aug 2012 15:36:53 +0000 (+0200)
Subject: Makefile: Add target for combined spl/u-boot.bin & u-boot.img
X-Git-Tag: v2013.01-rc2~92
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fb3d2b8a3fc26ffb0127fd0fed90ff5f074e67d7;p=oweals%2Fu-boot.git

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>
---

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 \