[PATCH 1/2] kbuild: allow overriding mkimage
Ahmad Fatoum
a.fatoum at pengutronix.de
Thu Jan 16 06:09:23 PST 2025
mkimage is not built as part of barebox and the barebox build for the
BeaglePlay assumes it's in PATH. To make integration in build systems
easier, let's allow specifying the location of the mkimage binary via
the MKIMAGE variable.
Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
Makefile | 3 ++-
images/Makefile | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 3de35d3a34cc..3487aba201b9 100644
--- a/Makefile
+++ b/Makefile
@@ -438,6 +438,7 @@ KALLSYMS = scripts/kallsyms
PERL = perl
PYTHON3 = python3
CHECK = sparse
+MKIMAGE = mkimage
BASH = bash
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
@@ -500,7 +501,7 @@ LDFLAGS_elf += $(LDFLAGS_common) --nmagic -s
export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC
export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL PYTHON3 UTS_MACHINE
export LEX YACC
-export HOSTCXX CHECK CHECKFLAGS
+export HOSTCXX CHECK CHECKFLAGS MKIMAGE
export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
export KBUILD_USERCFLAGS KBUILD_USERLDFLAGS
diff --git a/images/Makefile b/images/Makefile
index 4e5cb693e40a..6daaee8b7c7e 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -117,7 +117,7 @@ $(obj)/%.s: $(obj)/% FORCE
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 \
+ $(MKIMAGE) -f $(dtc-tmp) $@ -E \
cat $(depfile).pre $(depfile).dtc > $(depfile)
$(obj)/%.itb: $(obj)/%.its FORCE
--
2.39.5
More information about the barebox
mailing list