mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/2] kbuild: allow overriding mkimage
Date: Thu, 16 Jan 2025 15:09:23 +0100	[thread overview]
Message-ID: <20250116140924.298889-1-a.fatoum@pengutronix.de> (raw)

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@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




             reply	other threads:[~2025-01-16 14:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-16 14:09 Ahmad Fatoum [this message]
2025-01-16 14:09 ` [PATCH 2/2] kbuild: allow overriding compression tools Ahmad Fatoum
2025-01-21  8:20   ` Sascha Hauer
2025-01-21  8:52     ` Ahmad Fatoum
2025-01-21  9:38   ` Sascha Hauer
2025-01-21  9:39     ` Ahmad Fatoum
2025-01-21  8:59 ` [PATCH 1/2] kbuild: allow overriding mkimage Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250116140924.298889-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox