diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:11:48 +0200 |
| commit | bee8dddbfcb07de469105a660e426fa132f96b6a (patch) | |
| tree | 11568bb2d8fa6cbbdc1b468093b5202eb5bcddeb /scripts/Makefile | |
| parent | d8b30e6c3823bfe50c3e060aab39b0fab2de933f (diff) | |
| parent | 93ca711e64d7a4d79aee15b4ce415688f5415fda (diff) | |
| download | barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.gz barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.xz | |
Merge branch 'for-next/omap'
Conflicts:
Makefile
Diffstat (limited to 'scripts/Makefile')
| -rw-r--r-- | scripts/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index 7ca5e2973d..55ccdac539 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -9,7 +9,7 @@ hostprogs-y += bin2c hostprogs-y += mkimage hostprogs-y += bareboxenv hostprogs-$(CONFIG_ARCH_NETX) += gen_netx_image -hostprogs-$(CONFIG_ARCH_OMAP) += omap_signGP +hostprogs-$(CONFIG_ARCH_OMAP) += omap_signGP mk-am35xx-spi-image hostprogs-$(CONFIG_ARCH_S5PCxx) += s5p_cksum hostprogs-$(CONFIG_ARCH_DAVINCI) += mkublheader |