Skip to content
Snippets Groups Projects
Commit 08598d6e authored by Nathan Rossi's avatar Nathan Rossi Committed by Michal Simek
Browse files

ARM: zynq: Add target for building bootable SPL image for Zynq


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: default avatarNathan Rossi <nathan@nathanrossi.com>
Signed-off-by: default avatarMichal 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: default avatarTom Rini <trini@konsulko.com>
parent 66eef1e7
Branches
Tags
No related merge requests found
...@@ -1335,6 +1335,9 @@ spl/sunxi-spl.bin: spl/u-boot-spl ...@@ -1335,6 +1335,9 @@ spl/sunxi-spl.bin: spl/u-boot-spl
spl/u-boot-spl-dtb.sfp: 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 tpl/u-boot-tpl.bin: tools prepare
$(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all $(Q)$(MAKE) obj=tpl -f $(srctree)/scripts/Makefile.spl all
......
...@@ -117,6 +117,7 @@ MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE) ...@@ -117,6 +117,7 @@ MKIMAGEFLAGS_MLO.byteswap = -T omapimage -n byteswap -a $(CONFIG_SPL_TEXT_BASE)
MLO MLO.byteswap: $(obj)/u-boot-spl.bin MLO MLO.byteswap: $(obj)/u-boot-spl.bin
$(call if_changed,mkimage) $(call if_changed,mkimage)
ifeq ($(CONFIG_SYS_SOC),"at91")
MKIMAGEFLAGS_boot.bin = -T atmelimage MKIMAGEFLAGS_boot.bin = -T atmelimage
ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y) ifeq ($(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER),y)
...@@ -127,6 +128,12 @@ endif ...@@ -127,6 +128,12 @@ endif
boot.bin: $(obj)/u-boot-spl.bin boot.bin: $(obj)/u-boot-spl.bin
$(call if_changed,mkimage) $(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 ALL-y += $(obj)/$(SPL_BIN).bin $(obj)/$(SPL_BIN).cfg
...@@ -150,6 +157,10 @@ ifeq ($(CONFIG_SYS_SOC),"at91") ...@@ -150,6 +157,10 @@ ifeq ($(CONFIG_SYS_SOC),"at91")
ALL-y += boot.bin ALL-y += boot.bin
endif endif
ifdef CONFIG_ARCH_ZYNQ
ALL-y += $(obj)/boot.bin
endif
all: $(ALL-y) all: $(ALL-y)
quiet_cmd_cat = CAT $@ quiet_cmd_cat = CAT $@
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment