summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-05-24 08:20:43 -0400
committerTom Rini <trini@konsulko.com>2016-05-24 08:20:43 -0400
commitec8fb48ce98987065493b27422200897cf0909f8 (patch)
treee56d70ee24a04ee26fe75ac2af46c22705da61ed /scripts
parentc98dc5a13399414fb651a80d05fa682236c4444e (diff)
parentad5b5801264e573bfbf17a20b04c546985c5bfc1 (diff)
downloadu-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.zip
u-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.tar.gz
u-boot-imx-ec8fb48ce98987065493b27422200897cf0909f8.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.spl7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index ec8d8f1..6d2017d 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -129,7 +129,12 @@ endif
boot.bin: $(obj)/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
else
+ifdef CONFIG_ARCH_ZYNQ
MKIMAGEFLAGS_boot.bin = -T zynqimage
+endif
+ifdef CONFIG_ARCH_ZYNQMP
+MKIMAGEFLAGS_boot.bin = -T zynqmpimage
+endif
spl/boot.bin: $(obj)/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
@@ -157,6 +162,8 @@ ifdef CONFIG_ARCH_ZYNQ
ALL-y += $(obj)/boot.bin
endif
+ALL-(CONFIG_ARCH_ZYNQMP) += $(obj)/boot.bin
+
all: $(ALL-y)
quiet_cmd_cat = CAT $@