All mvebu boards are multi-image, so they don't need image generation in arch/arm/Makefile anymore. Drop it. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- Makefile | 2 +- arch/arm/Makefile | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Makefile b/Makefile index bcc94cd13a..d7b4cc6ce9 100644 --- a/Makefile +++ b/Makefile @@ -1146,7 +1146,7 @@ CLEAN_FILES += barebox System.map stickypage.bin include/generated/barebox_defau .tmp_kallsyms* barebox.ldr compile_commands.json \ barebox-flash-image \ barebox.srec barebox.s5p barebox.ubl \ - barebox.uimage barebox.spi barebox.kwb barebox.kwbuart \ + barebox.uimage barebox.spi \ barebox.efi barebox.canon-a1100.bin CLEAN_FILES += scripts/bareboxenv-target scripts/kernel-install-target \ diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 3738b4d15a..3867d48427 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -197,27 +197,6 @@ ifeq ($(CONFIG_MACH_CANON_A1100),y) KBUILD_IMAGE := barebox.canon-a1100.bin endif -KWBIMAGE_OPTS = \ - -c -i $(srctree)/$(BOARD)/kwbimage.cfg -d $(TEXT_BASE) -e $(TEXT_BASE) - -quiet_cmd_kwbimage = KWB $@ - cmd_kwbimage = scripts/kwbimage -p $< $(KWBIMAGE_OPTS) -o $@ || \ - echo "WARNING: Couldn't create KWB image due to previous errors." - -quiet_cmd_kwbimage_uart = KWBUART $@ - cmd_kwbimage_uart = scripts/kwbimage -m uart -p $< $(KWBIMAGE_OPTS) -o $@ || \ - echo "WARNING Couldn't create KWB image due to previous errors." - -barebox.kwb: $(KBUILD_BINARY) FORCE - $(call if_changed,kwbimage) - -barebox.kwbuart: $(KBUILD_BINARY) FORCE - $(call if_changed,kwbimage_uart) - -ifeq ($(CONFIG_ARCH_MVEBU),y) -KBUILD_IMAGE := barebox.kwb barebox.kwbuart -endif - archclean: $(MAKE) $(clean)=$(pbl) -- 2.30.2
