From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH] barebox: inject firmware before prepare for i.MX8M on 2023.06.0
Date: Fri, 30 Jun 2023 10:46:38 +0200 [thread overview]
Message-ID: <20230630084638.1289086-1-p.zabel@pengutronix.de> (raw)
Since Barebox 2023.06.0, specifically commit 624962fb45c6 ("ARM: i.MX:
make boards selectable only when firmware files are present"), some
i.MX8M boards will be dropped from the configuration, if required DDR
training and TF-A firmware files are not already present in the source
tree.
To fix this, inject them before calling prepare.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/barebox.make | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/rules/barebox.make b/rules/barebox.make
index 6383e1c72f52..c0d9c5744e4a 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -80,6 +80,9 @@ endif
$(STATEDIR)/barebox.prepare:
@$(call targetinfo)
+ifdef PTXCONF_BAREBOX_FIRMWARE
+ @$(call world/inject, BAREBOX)
+endif
@$(call world/prepare, BAREBOX)
ifdef PTXCONF_BAREBOX_EXTRA_ENV
@@ -95,11 +98,6 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV
fi;)
@rm -rf $(BAREBOX_BUILD_DIR)/defaultenv/barebox_default_env
endif
-
-ifdef PTXCONF_BAREBOX_FIRMWARE
- @$(call world/inject, BAREBOX)
-endif
-
@$(call touch)
# ----------------------------------------------------------------------------
--
2.39.2
next reply other threads:[~2023-06-30 8:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 8:46 Philipp Zabel [this message]
2023-07-08 7:02 ` [ptxdist] [APPLIED] " Michael Olbrich
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=20230630084638.1289086-1-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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