summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-08-07 06:14:18 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-08-07 06:14:18 +0200
commit3522192d6da091dfae912a28ed9377913b596299 (patch)
treeb41cc7b040294ba4a207cebffe5432453b044fb9 /Makefile
parent8762b3046e0724e9318944cf03cff523f4d3bb7a (diff)
parent2dcccf4f7965630c2ae1213efe47b18ada3604eb (diff)
downloadbarebox-3522192d6da091dfae912a28ed9377913b596299.tar.gz
barebox-3522192d6da091dfae912a28ed9377913b596299.tar.xz
Merge branch 'for-next/canon'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0791c3889f..b75e46b1ec 100644
--- a/Makefile
+++ b/Makefile
@@ -997,7 +997,8 @@ CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \
.tmp_kallsyms* common/barebox_default_env* barebox.ldr \
scripts/bareboxenv-target barebox-flash-image \
Doxyfile.version barebox.srec barebox.s5p barebox.ubl \
- barebox.uimage barebox.spi barebox.kwb barebox.kwbuart
+ barebox.uimage barebox.spi barebox.kwb barebox.kwbuart \
+ barebox.canon-a1100.bin
# Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config include2 usr/include