diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-19 11:25:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-19 11:25:36 -0500 |
| commit | aa7077fcee6cf00cde59bb9709ebd6205720f8bf (patch) | |
| tree | 067a13ac5342287fbbc1429425b2e87f9f28106b /scripts/Makefile.spl | |
| parent | 4c60850792e003bcafd16c324237a19307763829 (diff) | |
| parent | bdaeb8f23c6d5d11829072baaf0c0fe37c09f26a (diff) | |
| download | u-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.zip u-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.tar.gz u-boot-imx-aa7077fcee6cf00cde59bb9709ebd6205720f8bf.tar.bz2 | |
Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'scripts/Makefile.spl')
| -rw-r--r-- | scripts/Makefile.spl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 8f690eb..96f414a 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -117,6 +117,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) @@ -127,6 +128,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 @@ -150,6 +157,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 $@ |