From: Sascha Hauer <s.hauer@pengutronix.de>
To: BAREBOX <barebox@lists.infradead.org>
Subject: [PATCH 2/4] ARM: k3: make some firmware files SoC specific
Date: Tue, 02 Dec 2025 16:58:26 +0100 [thread overview]
Message-ID: <20251202-k3-deps-v1-2-68404d3b2c70@pengutronix.de> (raw)
In-Reply-To: <20251202-k3-deps-v1-0-68404d3b2c70@pengutronix.de>
On AM625 SYSFWDATA and DMDATA are really SoC specific, so drop the
possibility to overwrite them per board.
On AM62L TFA, SYSFW, SYSFWDATA, INNERDATA and the signing key are really
SoC specific, so drop the possibility to overwrite them per board.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
images/Makefile.k3 | 40 +++++++++++-----------------------------
1 file changed, 11 insertions(+), 29 deletions(-)
diff --git a/images/Makefile.k3 b/images/Makefile.k3
index 27ddb5d0b68ac6411165847f1fab18c38f48dc04..e0f79f1439f1340a09c09d236b5d7470caa4ad77 100644
--- a/images/Makefile.k3
+++ b/images/Makefile.k3
@@ -42,8 +42,6 @@ INNERDATA_am625=$(FIRMWARE_DIR)/ti-linux-firmware/ti-sysfw/ti-fs-firmware-am62x-
## TI am625(sip)-SK ##
SYSFW_start_am625_sk_r5.pblb.k3_am62x_img=$(SYSFW_am625_hs_fs)
-SYSFWDATA_start_am625_sk_r5.pblb.k3_am62x_img=$(SYSFWDATA_am625)
-DMDATA_start_am625_sk_r5.pblb.k3_am62x_img=$(DMDATA_am625)
INNERDATA_start_am625_sk_r5.pblb.k3_am62x_img=$(INNERDATA_am625)
KEY_start_am625_sk_r5.pblb.k3_am62x_img=$(KEY_custmpk)
@@ -52,8 +50,6 @@ FILE_barebox-am625-sk-r5.img = start_am625_sk_r5.pblb.k3_am62x_img
image-$(CONFIG_MACH_AM625_SK) += barebox-am625-sk-r5.img
SYSFW_start_am625sip_sk_r5.pblb.k3_am62x_img=$(SYSFW_am625_hs_fs)
-SYSFWDATA_start_am625sip_sk_r5.pblb.k3_am62x_img=$(SYSFWDATA_am625)
-DMDATA_start_am625sip_sk_r5.pblb.k3_am62x_img=$(DMDATA_am625)
INNERDATA_start_am625sip_sk_r5.pblb.k3_am62x_img=$(INNERDATA_am625)
KEY_start_am625sip_sk_r5.pblb.k3_am62x_img=$(KEY_custmpk)
@@ -63,8 +59,6 @@ image-$(CONFIG_MACH_AM625_SK) += barebox-am625sip-sk-r5.img
## BeaglePlay ##
SYSFW_start_beagleplay_r5.pblb.k3_am62x_img=$(SYSFW_am625_gp)
-SYSFWDATA_start_beagleplay_r5.pblb.k3_am62x_img=$(SYSFWDATA_am625)
-DMDATA_start_beagleplay_r5.pblb.k3_am62x_img=$(DMDATA_am625)
KEY_start_beagleplay_r5.pblb.k3_am62x_img=$(KEY_degenerate)
pblb-$(CONFIG_MACH_BEAGLEPLAY) += start_beagleplay_r5
@@ -76,18 +70,10 @@ endif
SYSFWDATA_am62lx=$(objtree)/arch/arm/mach-k3/combined-sysfw-cfg-am62l.k3cfg
SYSFW_am62lx_hs_fs=$(FIRMWARE_DIR)/ti-linux-firmware/ti-sysfw/ti-fs-firmware-am62lx-hs-enc.bin
INNERDATA_am62lx=$(FIRMWARE_DIR)/ti-linux-firmware/ti-sysfw/ti-fs-firmware-am62lx-hs-cert.bin
+TFA_BL31_am62lx=$(FIRMWARE_DIR)/am62lx-bl31.bin
## TI am62lx-EVM ##
-SYSFW_start_am62lx_evm.pblb.k3_am62lx_img=$(SYSFW_am62lx_hs_fs)
-SYSFWDATA_start_am62lx_evm.pblb.k3_am62lx_img=$(SYSFWDATA_am62lx)
-TFA_start_am62lx_evm.pblb.k3_am62lx_img=$(FIRMWARE_DIR)/am62lx-bl31.bin
-INNERDATA_start_am62lx_evm.pblb.k3_am62lx_img=$(INNERDATA_am62lx)
-KEY_start_am62lx_evm.pblb.k3_am62lx_img=$(KEY_custmpk)
-
-SYSFW_start_am62lx_evm.pblb.k3_am62lx_tiboot3_img=$(SYSFW_am62lx_hs_fs)
-INNERDATA_start_am62lx_evm.pblb.k3_am62lx_tiboot3_img=$(INNERDATA_am62lx)
TFA_BL1_start_am62lx_evm.pblb.k3_am62lx_tiboot3_img=$(FIRMWARE_DIR)/am62lx-bl1.bin
-KEY_start_am62lx_evm.pblb.k3_am62lx_tiboot3_img=$(KEY_custmpk)
pblb-$(CONFIG_MACH_AM62LX_EVM) += start_am62lx_evm
FILE_barebox-am62lx-evm.img = start_am62lx_evm.pblb.k3_am62lx_img
@@ -104,37 +90,33 @@ quiet_cmd_k3_am62x_image = K3_am62x_IMG $@
$(srctree)/scripts/k3img \
$<:1:16:0:43c00000 \
$(SYSFW_$(@F)):2:0:0:00040000 \
- $(SYSFWDATA_$(@F)):18:0:0:00067000 \
+ $(SYSFWDATA_am625):18:0:0:00067000 \
$$inner \
- $(DMDATA_$(@F)):17:16:0:43c3a800 \
+ $(DMDATA_am625):17:16:0:43c3a800 \
--key "$(KEY_$(@F))" --out $@
quiet_cmd_k3_am62lx_image = K3_am62lx_IMG $@
cmd_k3_am62lx_image = \
- if [ -n "$(INNERDATA_$(@F))" ]; then \
- inner="$(INNERDATA_$(@F)):3:0:0:00000000"; \
- fi; \
- \
if [ -e "$(FIRMWARE_DIR)/am62lx-bl32.bin" ]; then \
optee=$(FIRMWARE_DIR)/am62lx-bl32.bin:17:16:0:80200000; \
fi; \
\
$(srctree)/scripts/k3img \
- $(TFA_$(@F)):1:16:0:80000000 \
- $(SYSFW_$(@F)):2:0:0:00040000 \
- $(SYSFWDATA_$(@F)):18:0:0:0006c000 \
- $$inner \
+ $(TFA_BL31_am62lx):1:16:0:80000000 \
+ $(SYSFW_am62lx_hs_fs):2:0:0:00040000 \
+ $(SYSFWDATA_am62lx):18:0:0:0006c000 \
+ $(INNERDATA_am62lx):3:0:0:00000000 \
$$optee \
$<:17:16:0:82000000 \
- --key "$(KEY_$(@F))" --out $@
+ --key "$(KEY_custmpk)" --out $@
quiet_cmd_k3_am62lx_tiboot3_image = K3_am62lx_tiboot3_IMG $@
cmd_k3_am62lx_tiboot3_image = \
$(srctree)/scripts/k3img \
$(TFA_BL1_$(@F)):1:16:160:70800000 \
- $(SYSFW_$(@F)):2:0:0:00040000 \
- $(INNERDATA_$(@F)):3:0:0:00000000 \
- --key "$(KEY_$(@F))" \
+ $(SYSFW_am62lx_hs_fs):2:0:0:00040000 \
+ $(INNERDATA_am62lx):3:0:0:00000000 \
+ --key "$(KEY_custmpk)" \
--out $@
$(obj)/%.k3_am62x_img: $(obj)/% scripts/k3img FORCE
--
2.47.3
next prev parent reply other threads:[~2025-12-02 15:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-02 15:58 [PATCH 0/4] ARM: k3: fix k3img dependencies Sascha Hauer
2025-12-02 15:58 ` [PATCH 1/4] ARM: K3: am62l: don't put sysfwdata into 1st stage image Sascha Hauer
2025-12-02 15:58 ` Sascha Hauer [this message]
2025-12-02 15:58 ` [PATCH 3/4] ARM: k3: am62l: Add dedicated config option for OP-TEE Sascha Hauer
2025-12-02 15:58 ` [PATCH 4/4] ARM: k3: am62l: fix dependencies on k3img input files Sascha Hauer
2025-12-03 11:56 ` [PATCH 0/4] ARM: k3: fix k3img dependencies 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=20251202-k3-deps-v1-2-68404d3b2c70@pengutronix.de \
--to=s.hauer@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