From: Marco Felsch <m.felsch@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH] firmware: fix missing firmware handling for external firmware
Date: Wed, 10 Jan 2024 15:59:08 +0100 [thread overview]
Message-ID: <20240110145908.3965855-1-m.felsch@pengutronix.de> (raw)
Currently we depend on the external firmware file since we need it for
the sha256sum. But this dependency break the 'optional missing firmware'
feature.
Fix this by dropping the firmware file prerequisite and instead evaluate
the FWNAME_EXISTS variable. If the firmware file does not exist a dummy
file is created and the build continues till the linking process (like
we do for the other firmware).
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
firmware/Makefile | 6 +++---
images/Makefile | 2 +-
scripts/Makefile.lib | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/firmware/Makefile b/firmware/Makefile
index 51d98d54bf14..a07b31caec73 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -41,7 +41,7 @@ fwobjdir := $(objtree)/firmware
pbl-y := $(addsuffix .gen.o, $(pbl-firmware-y))
obj-pbl-y := $(addsuffix .gen.o, $(firmware-y))
-FWNAME = $(patsubst $(obj)/%.extgen.S,%,$(patsubst $(obj)/%.gen.S,%,$@))
+FWNAME = $(patsubst $(obj)/%.sum,%,$(patsubst $(obj)/%.extgen.S,%,$(patsubst $(obj)/%.gen.S,%,$@)))
FWSTR = $(subst /,_,$(subst .,_,$(subst -,_,$(FWNAME))))
FWNAME_EXISTS = $(if $(wildcard $(fwdir)/$(FWNAME)),1,0)
@@ -91,8 +91,8 @@ $(obj)/%.extgen.S: $(obj)/%.sha.bin FORCE
$(obj)/%.sha.bin: $(obj)/%.sum FORCE
$(call if_changed,sha256bin)
-$(obj)/%.sum: $(obj)/% FORCE
- $(call if_changed,sha256sum)
+$(obj)/%.sum: FORCE
+ $(if $(findstring 1,$(FWNAME_EXISTS)), $(call if_changed,sha256sum,$(obj)/$*), @touch $@)
clean-files += *.sha.bin *.sum
diff --git a/images/Makefile b/images/Makefile
index 7b4e01953185..c0105609eec2 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -132,7 +132,7 @@ $(obj)/barebox.sha.bin: $(obj)/barebox.sum FORCE
$(call if_changed,sha256bin)
$(obj)/barebox.sum: $(obj)/barebox.z FORCE
- $(call if_changed,sha256sum)
+ $(call if_changed,sha256sum,$<)
# barebox.z - compressed barebox binary
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 0b236babb275..f205e08afc13 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -301,7 +301,7 @@ quiet_cmd_sha256bin ?= SHA-BIN $@
while read -r byte; do printf '\%o' $$byte; done)" > $@
quiet_cmd_sha256sum ?= SHA $@
- cmd_sha256sum ?= sha256sum $< > $@
+ cmd_sha256sum ?= sha256sum $2 > $@
# Decompressor for barebox proper binary when using PBL
# ---------------------------------------------------------------------------
--
2.39.2
next reply other threads:[~2024-01-10 15:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 14:59 Marco Felsch [this message]
2024-01-16 14:44 ` Sascha Hauer
2024-01-17 9:50 ` Sascha Hauer
2024-01-17 9:58 ` Marco Felsch
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=20240110145908.3965855-1-m.felsch@pengutronix.de \
--to=m.felsch@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