In preparation for generating FIT images without an input ITS (what mkimage calls automatic mode), let's rename the existing .fit extension to .itb, so .fit is usable for images that have no its. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- images/.gitignore | 1 + images/Makefile | 8 ++++---- images/Makefile.k3 | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/images/.gitignore b/images/.gitignore index 6f8067554671..ec31293766e4 100644 --- a/images/.gitignore +++ b/images/.gitignore @@ -37,5 +37,6 @@ barebox.sum *.swapped *.rkimg *.imx9img +*.itb *.fit *.missing-firmware diff --git a/images/Makefile b/images/Makefile index a74aa6023e73..e0e3e5c537cc 100644 --- a/images/Makefile +++ b/images/Makefile @@ -114,14 +114,14 @@ $(obj)/%.pblb: $(obj)/%.pbl FORCE $(obj)/%.s: $(obj)/% FORCE $(call if_changed,disasm) -quiet_cmd_fit = FIT $@ -cmd_fit = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) \ +quiet_cmd_itb = FIT.ITS $@ +cmd_itb = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) \ -D'$(subst -,_,$(*F))_dts=1' $(foreach f,$< $(2),-include '$(f)') /dev/null ; \ mkimage -f $(dtc-tmp) $@ -E \ cat $(depfile).pre $(depfile).dtc > $(depfile) -$(obj)/%.fit: $(obj)/%.its FORCE - $(call if_changed,fit) +$(obj)/%.itb: $(obj)/%.its FORCE + $(call if_changed,itb) $(obj)/piggy.o: $(obj)/barebox.z FORCE diff --git a/images/Makefile.k3 b/images/Makefile.k3 index f7acd7801431..7988defe79b8 100644 --- a/images/Makefile.k3 +++ b/images/Makefile.k3 @@ -7,7 +7,7 @@ pblb-$(CONFIG_MACH_BEAGLEPLAY) += start_beagleplay FILE_barebox-beagleplay.img = start_beagleplay.pblb image-$(CONFIG_MACH_BEAGLEPLAY) += barebox-beagleplay.img -$(obj)/k3-am625-beagleplay.fit: $(obj)/barebox-beagleplay.img -FILE_barebox-beagleplay-fit.img = k3-am625-beagleplay.fit +$(obj)/k3-am625-beagleplay.itb: $(obj)/barebox-beagleplay.img +FILE_barebox-beagleplay-fit.img = k3-am625-beagleplay.itb image-$(CONFIG_MACH_BEAGLEPLAY) += barebox-beagleplay-fit.img -- 2.39.5