From patchwork Thu Dec 6 09:29:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot,resend,1/2] u-boot/spl: Add u-boot-spl.img to u-boot targets Date: Wed, 05 Dec 2012 23:29:36 -0000 From: Vipin Kumar X-Patchwork-Id: 204192 Message-Id: <0914ca07f3fa7549188e349e7a0a32c3d6521321.1354786138.git.vipin.kumar@st.com> To: , , , Cc: spear-devel@list.st.com Signed-off-by: Vipin Kumar --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 8a04727..7f416f4 100644 --- a/Makefile +++ b/Makefile @@ -499,6 +499,13 @@ $(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin elftosb -zdf $(ELFTOSB_TARGET-y) -c $(TOPDIR)/$(CPUDIR)/$(SOC)/u-boot-$(ELFTOSB_TARGET-y).bd \ -o $(obj)u-boot.sb +$(obj)spl/u-boot-spl.img: $(obj)spl/u-boot-spl.bin + $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \ + -a $(CONFIG_SPL_TEXT_BASE) -e $(CONFIG_SPL_TEXT_BASE) \ + -n $(shell sed -n -e 's/.*U_BOOT_SPL_VERSION//p' $(VERSION_FILE) | \ + sed -e 's/"[ ]*$$/ for $(BOARD) board"/') \ + -d $(obj)spl/u-boot-spl.bin $(obj)spl/u-boot-spl.img + # On x600 (SPEAr600) U-Boot is appended to U-Boot SPL. # Both images are created using mkimage (crc etc), so that the ROM # bootloader can check its integrity. Padding needs to be done to the @@ -707,6 +714,9 @@ $(VERSION_FILE): "$(U_BOOT_VERSION)" "$${localvers}" ; \ printf '#define U_BOOT_VERSION "U-Boot %s%s"\n' \ "$(U_BOOT_VERSION)" "$${localvers}" ; \ + printf '#define U_BOOT_SPL_VERSION "%s %s%s"\n' \ + $(if $(CONFIG_SPL_IMAGENAME),$(CONFIG_SPL_IMAGENAME),"U-Boot SPL") \ + "$(U_BOOT_VERSION)" "$${localvers}" ; \ ) > $@.tmp @( printf '#define CC_VERSION_STRING "%s"\n' \ '$(shell $(CC) --version | head -n 1)' )>> $@.tmp