diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-04 19:09:15 +0100 |
commit | ce961e341258dc9f78da3c0d64231cf1afdc4e63 (patch) | |
tree | 90c65241a72f55fbd67f58c05b091f714e4c2490 /Makefile | |
parent | 91d4a4264bc2dead4e3101c5064da35c78f4c89b (diff) | |
parent | cf715885604004ccfc30bc4caa75d58a75bb02c7 (diff) | |
download | barebox-ce961e341258dc9f78da3c0d64231cf1afdc4e63.tar.gz barebox-ce961e341258dc9f78da3c0d64231cf1afdc4e63.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -488,9 +488,9 @@ images/%.s: barebox.bin FORCE $(Q)$(MAKE) $(build)=images $@ ifdef CONFIG_PBL_MULTI_IMAGES -all: $(KBUILD_DTBS) barebox.bin images +all: barebox.bin images else -all: barebox-flash-image $(KBUILD_DTBS) +all: barebox-flash-image endif common-$(CONFIG_PBL_IMAGE) += pbl/ @@ -953,7 +953,7 @@ endif # CONFIG_MODULES CLEAN_DIRS += $(MODVERDIR) CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \ .tmp_version .tmp_barebox* barebox.bin barebox.map barebox.S \ - .tmp_kallsyms* common/barebox_default_env* barebox.ldr \ + .tmp_kallsyms* barebox.ldr \ scripts/bareboxenv-target barebox-flash-image \ barebox.srec barebox.s5p barebox.ubl barebox.zynq \ barebox.uimage barebox.spi barebox.kwb barebox.kwbuart \ |