summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-07-01 10:14:40 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-07-01 10:14:40 +0200
commit939c2173a3787daa36be6f5f67c72561f7665f65 (patch)
tree0de80442bce4c39234866a7adf6c3f24bd8e2560 /Makefile
parentae0589c5efd09e0b2f00edf4970442ad3b096179 (diff)
parent08c0e206b3614eeecc1c3cee63665077360212e5 (diff)
downloadbarebox-939c2173a3787daa36be6f5f67c72561f7665f65.tar.gz
barebox-939c2173a3787daa36be6f5f67c72561f7665f65.tar.xz
Merge branch 'for-next/multi-image'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 8c1becbc0c..9afe3058f3 100644
--- a/Makefile
+++ b/Makefile
@@ -481,7 +481,16 @@ export KBUILD_BINARY ?= barebox.bin
barebox-flash-image: $(KBUILD_IMAGE) FORCE
$(call if_changed,ln)
+images: barebox.bin FORCE
+ $(Q)$(MAKE) $(build)=images $@
+images/%.s: barebox.bin FORCE
+ $(Q)$(MAKE) $(build)=images $@
+
+ifdef CONFIG_PBL_MULTI_IMAGES
+all: $(KBUILD_DTBS) barebox.bin images
+else
all: barebox-flash-image $(KBUILD_DTBS)
+endif
common-$(CONFIG_PBL_IMAGE) += pbl/
@@ -987,6 +996,7 @@ clean-dirs := $(addprefix _clean_,$(srctree) $(barebox-alldirs))
PHONY += $(clean-dirs) clean archclean
$(clean-dirs):
+ $(Q)$(MAKE) $(clean)=images
$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)
clean: archclean $(clean-dirs)