Add a build target to generate 'boot.bin' which includes SPL. This is used by the platforms BootROM to load SPL directly.
This change also conditionally changes what the 'boot.bin' target generates depending on the SoC. Leaving the behaviour unchanged for the AT91 targets.
Signed-off-by: Nathan Rossi nathan@nathanrossi.com Signed-off-by: Michal Simek michal.simek@xilinx.com Cc: Tom Rini trini@konsulko.com Cc: Andreas Bießmann andreas.devel@googlemail.com Cc: Heiko Schocher hs@denx.de Reviewed-by: Tom Rini trini@konsulko.com --- Changes in v2: None --- Makefile | 3 +++ scripts/Makefile.spl | 11 +++++++++++ 2 files changed, 14 insertions(+)
diff --git a/Makefile b/Makefile index 61050ad..b7da462 100644 --- a/Makefile +++ b/Makefile @@ -1335,6 +1335,9 @@ spl/sunxi-spl.bin: spl/u-boot-spl spl/u-boot-spl-dtb.sfp: spl/u-boot-spl @:
+spl/boot.bin: spl/u-boot-spl + @: + tpl/u-boot-tpl.bin: tools prepare $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index dd235b9..b0d8551 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -116,6 +116,7 @@ MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE) MLO MLO.byteswap: $(obj)/u-boot-spl.bin $(call if_changed,mkimage)
+ifeq ($(CONFIG_SYS_SOC),"at91") MKIMAGEFLAGS_boot.bin = -T atmelimage
ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y) @@ -126,6 +127,12 @@ endif
boot.bin: $(obj)/u-boot-spl.bin $(call if_changed,mkimage) +else +MKIMAGEFLAGS_boot.bin = -T zynqimage + +spl/boot.bin: $(obj)/u-boot-spl-dtb.bin + $(call if_changed,mkimage) +endif
ALL-y += $(obj)/$(SPL_BIN).bin $(obj)/$(SPL_BIN).cfg
@@ -149,6 +156,10 @@ ifeq ($(CONFIG_SYS_SOC),"at91") ALL-y += boot.bin endif
+ifdef CONFIG_ARCH_ZYNQ +ALL-y += $(obj)/boot.bin +endif + all: $(ALL-y)
quiet_cmd_cat = CAT $@