summaryrefslogtreecommitdiffstats
path: root/scripts/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-04-04 23:23:19 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-04-04 23:23:19 +0200
commit0a637bcc3c66c647f52970ddd1dbae2d749dc969 (patch)
tree55ccc56a785cac9a3b990130f70316869ee77b47 /scripts/Makefile
parentdd9f6d08a2736bf8ddc0004779c563a4c3a77cef (diff)
parentc6ef15b3879607a9e31964fc8942f95c253122f9 (diff)
downloadbarebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.gz
barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.xz
Merge branch 'for-next/zynq'
Conflicts: arch/arm/Makefile
Diffstat (limited to 'scripts/Makefile')
-rw-r--r--scripts/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile b/scripts/Makefile
index e3e55aa6c7..f062fc011b 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -12,6 +12,7 @@ hostprogs-$(CONFIG_ARCH_NETX) += gen_netx_image
hostprogs-$(CONFIG_ARCH_OMAP) += omap_signGP mk-am35xx-spi-image
hostprogs-$(CONFIG_ARCH_S5PCxx) += s5p_cksum
hostprogs-$(CONFIG_ARCH_DAVINCI) += mkublheader
+hostprogs-$(CONFIG_ARCH_ZYNQ) += zynq_mkimage
HOSTLOADLIBES_omap4_usbboot = -lpthread
omap4_usbboot-objs := usb_linux.o omap4_usbboot.o