diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:24 +0100 |
| commit | e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa (patch) | |
| tree | 075fbf70c17a50190c3fb290eb6b362177f0d1e5 /scripts/Makefile | |
| parent | 18aa86831ed72380b7c2edba3c27bbf7a999da76 (diff) | |
| parent | 1e7f2bd25c28b36c7c40ed4797b2a21cc4e1502e (diff) | |
| download | barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.gz barebox-e9ea6eeaabb15258dbeefe06a421fca8c2fe9baa.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
scripts/Makefile
Diffstat (limited to 'scripts/Makefile')
| -rw-r--r-- | scripts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index 2f78c4bb64..3908c1dcb9 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -8,6 +8,7 @@ hostprogs-y += bin2c hostprogs-y += mkimage hostprogs-y += fix_size hostprogs-y += bareboxenv +hostprogs-y += bareboxcrc32 hostprogs-y += kernel-install hostprogs-$(CONFIG_KALLSYMS) += kallsyms hostprogs-$(CONFIG_ARCH_MVEBU) += kwbimage kwboot @@ -26,6 +27,7 @@ subdir-$(CONFIG_DTC) += dtc targetprogs-$(CONFIG_BAREBOXENV_TARGET) += bareboxenv-target targetprogs-$(CONFIG_KERNEL_INSTALL_TARGET) += kernel-install-target +targetprogs-$(CONFIG_BAREBOXCRC32_TARGET) += bareboxcrc32-target # Let clean descend into subdirs subdir- += basic kconfig setupmbr |