diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:37:01 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:04 +0200 |
commit | 89fd7e44dbe754366354cee37395f7fc11cce50e (patch) | |
tree | 4eb451caf7f2f789ae9e381b48b012d61c6407c5 /scripts/Makefile | |
parent | 064fdcec9f72fa6616dc4d3bcf340705f27e5fe1 (diff) | |
parent | 7286acab6715691c1262b320e9d22a480804ba49 (diff) | |
download | barebox-89fd7e44dbe754366354cee37395f7fc11cce50e.tar.gz barebox-89fd7e44dbe754366354cee37395f7fc11cce50e.tar.xz |
Merge branch 'for-next/marvell'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'scripts/Makefile')
-rw-r--r-- | scripts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index a542ea6022..307dc3d1a4 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -8,6 +8,7 @@ hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-y += bin2c hostprogs-y += mkimage hostprogs-y += bareboxenv +hostprogs-$(CONFIG_ARCH_MVEBU) += kwbimage kwboot hostprogs-$(CONFIG_ARCH_NETX) += gen_netx_image hostprogs-$(CONFIG_ARCH_OMAP) += omap_signGP mk-am35xx-spi-image hostprogs-$(CONFIG_ARCH_S5PCxx) += s5p_cksum |