From: Yogesh Siraswar <[email protected]>

This is temporary fix for combined boot images for KIG in meta-ti till
the patch is integrated.

Signed-off-by: Vignesh Raghavendra <[email protected]>
Signed-off-by: Yogesh Siraswar <[email protected]>
Signed-off-by: Praneeth Bajjuri <[email protected]>
---
v3: Addressed review comments and simplified the patch further

 ...gning-of-binaries-for-combined-boot-.patch | 38 +++++++++++++++++++
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb        |  5 +++
 2 files changed, 43 insertions(+)
 create mode 100644 
recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch

diff --git 
a/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
 
b/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
new file mode 100644
index 00000000..604c0c60
--- /dev/null
+++ 
b/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
@@ -0,0 +1,38 @@
+From 31134a5750ab645394c7ae72e8da46509d48bfb4 Mon Sep 17 00:00:00 2001
+From: Vignesh Raghavendra <[email protected]>
+Date: Thu, 9 Dec 2021 12:24:08 -0600
+Subject: [tiKIG PATCHv2] Makefile: Skip signing of binaries for HS combined
+ boot
+
+Combined sysfw binaries used in tiboot3.bin do not require signed images.
+This fixes HS boot failures on am64x and j7200.
+
+Upstream-Status: Submitted
+Signed-off-by: Vignesh Raghavendra <[email protected]>
+Signed-off-by: Yogesh Siraswar <[email protected]>
+Signed-off-by: Praneeth Bajjuri <[email protected]>
+---
+
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 47b3b20..18e9eb5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -217,10 +217,12 @@ $(soc_objroot)/%.o: %.c
+ 
+ # On HS board configuration binaries must be signed
+ ifdef HS
++ifneq (,$(COMBINED_SYSFW_BRDCFG_LOADADDR))
+ %.bin.unsigned: %.o
+       $(CROSS_COMPILE)objcopy -S -O binary $< $@
+ %.bin: %.bin.unsigned
+       $(TI_SECURE_DEV_PKG)/scripts/secure-binary-image.sh $< $@
++endif
+ else
+ %.bin: %.o
+       $(CROSS_COMPILE)objcopy -S -O binary $< $@
+-- 
+2.17.1
+
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb 
b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 6d48bf23..00756fd8 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -47,6 +47,11 @@ LD[unexport] = "1"
 
 do_configure[noexec] = "1"
 
+SRC_URI_append_j7200-hs-evm-k3r5 = "\
+       
file://0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch;patchdir=../imggen"
+SRC_URI_append_am64xx-hs-evm-k3r5 = "\
+       
file://0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch;patchdir=../imggen"
+
 EXTRA_OEMAKE = "\
     CROSS_COMPILE=${TARGET_PREFIX} SYSFW_DL_URL='' SYSFW_HS_DL_URL='' 
SYSFW_HS_INNER_CERT_DL_URL='' \
     SYSFW_PATH="${SYSFW_TISCI}" SOC=${SYSFW_SOC} CONFIG=${SYSFW_CONFIG} \
-- 
2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14275): 
https://lists.yoctoproject.org/g/meta-ti/message/14275
Mute This Topic: https://lists.yoctoproject.org/mt/87618406/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to