summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:11:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:11:48 +0200
commitbee8dddbfcb07de469105a660e426fa132f96b6a (patch)
tree11568bb2d8fa6cbbdc1b468093b5202eb5bcddeb /Makefile
parentd8b30e6c3823bfe50c3e060aab39b0fab2de933f (diff)
parent93ca711e64d7a4d79aee15b4ce415688f5415fda (diff)
downloadbarebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.gz
barebox-bee8dddbfcb07de469105a660e426fa132f96b6a.tar.xz
Merge branch 'for-next/omap'
Conflicts: Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5c4bab8e94..3d60927dae 100644
--- a/Makefile
+++ b/Makefile
@@ -1032,7 +1032,7 @@ CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \
.tmp_kallsyms* barebox_default_env* barebox.ldr \
scripts/bareboxenv-target barebox-flash-image \
Doxyfile.version barebox.srec barebox.s5p barebox.ubl \
- barebox.uimage
+ barebox.uimage barebox.spi
# Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include2 usr/include