diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
commit | 904298deb07d532a76de153a42c6f678d2e4c740 (patch) | |
tree | 613d135d183962bf4dee1f5aef9449fbaceb0acd /scripts/Makefile | |
parent | ebf9022f2eee564fc4b0e4b37a8267319923d808 (diff) | |
parent | fe4ecd1dbfc44d0fe420e8b28a984738d74f3b69 (diff) | |
download | barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.gz barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.xz |
Merge branch 'for-next/socfpga'
Conflicts:
scripts/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 71d30be20a..2c43f6682b 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -15,6 +15,7 @@ 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 +hostprogs-$(CONFIG_ARCH_SOCFPGA) += socfpga_mkimage subdir-y += mod subdir-$(CONFIG_OMAP4_USBBOOT) += omap4_usbboot |