The Zynq board in tree is converted to multi-image, thus doesn't need image generation in arch/arm/Makefile anymore. Drop it. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- Makefile | 2 +- arch/arm/Makefile | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile b/Makefile index aff89bb939..bcc94cd13a 100644 --- a/Makefile +++ b/Makefile @@ -1145,7 +1145,7 @@ CLEAN_FILES += barebox System.map stickypage.bin include/generated/barebox_defau .tmp_version .tmp_barebox* barebox.bin barebox.map \ .tmp_kallsyms* barebox.ldr compile_commands.json \ barebox-flash-image \ - barebox.srec barebox.s5p barebox.ubl barebox.zynq \ + barebox.srec barebox.s5p barebox.ubl \ barebox.uimage barebox.spi barebox.kwb barebox.kwbuart \ barebox.efi barebox.canon-a1100.bin diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 861b726496..3738b4d15a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -187,16 +187,6 @@ ifeq ($(CONFIG_OMAP_BUILD_SPI),y) KBUILD_IMAGE := MLO.spi endif -quiet_cmd_zynq_image = ZYNQ-IMG $@ - cmd_zynq_image = scripts/zynq_mkimage $< $@ - -barebox.zynq: $(KBUILD_BINARY) FORCE - $(call if_changed,zynq_image) - -ifeq ($(machine-y),zynq) -KBUILD_IMAGE := barebox.zynq -endif - quiet_cmd_canon_a1100_image = DD $@ cmd_canon_a1100_image = scripts/canon-a1100-image $< $@ || \ echo "WARNING: Couldn't create Canon A1100 image due to previous errors." -- 2.30.2