[dunfell/master PATCH 0/2] Fixes and Upgrades on TIFS/DM

[dunfell/master PATCH 0/2] Fixes and Upgrades on TIFS/DM

[praneeth]

From: Praneeth Bajjuri <praneeth@ti.com>

This series is to
* upgrade K3-image-gen and ti-linux-firmware to pick latest sysfw
  release v2022.01 which introduces j721s2 platform.
* Revert temp fix carried in meta-ti for HS combined boot flow since
  the patch is now part of k3-image-gen repo.

Praneeth Bajjuri (2):
  ti-linux-fw: Bump up TIFS and DM to v2022.01
  Revert "ti-sci-fw: Fix for k3-image-gen issue for combined boot
    images"

 recipes-bsp/ti-linux-fw/ti-linux-fw.inc       |  8 +--
 ...gning-of-binaries-for-combined-boot-.patch | 64 -------------------
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb        |  5 --
 3 files changed, 4 insertions(+), 73 deletions(-)
 delete mode 100644 recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch

-- 
2.17.1

[dunfell/master PATCH 1/2] ti-linux-fw: Bump up TIFS and DM to v2022.01

[praneeth]

From: Praneeth Bajjuri <praneeth@ti.com>

Update ti-linux-firmware and k3-image-gen to
pick latest TIFS and DM v2022.01

This version also adds support to j721s2

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
---
 recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index f1607686..d3819ab9 100644
--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -3,8 +3,8 @@ SUMMARY = "TI SCI firmware (SYSFW)"
 LICENSE = "TI-TFL"
 LIC_FILES_CHKSUM = "file://LICENSE.ti;md5=b5aebf0668bdf95621259288c4a46d76"
 
-PV = "2021.09a"
-INC_PR = "r1"
+PV = "2022.01"
+INC_PR = "r2"
 
 # Firmware versions
 CORESDK_RTOS_VERSION = "08.01.00.02"
@@ -18,12 +18,12 @@ GOODIX_FW_VERSION = "1.0.0.0"
 CADENCE_MHDP_FW_VERSION = "1.2.17"
 IMG_DEC_FW_VERSION = "1.0"
 
-TI_LINUX_FW_SRCREV ?= "c96a734a059889e571dcf30c0638157c690a6e6e"
+TI_LINUX_FW_SRCREV ?= "6070de0ae4095d291e1f7679d1fe6e07253a2fc3"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
 
-K3_IMAGE_GEN_SRCREV ?= "489c767a153ff26e9230746e04dd4b1ad0809901"
+K3_IMAGE_GEN_SRCREV ?= "9abbe130d47a7fa6f8e02b740ad3ad27bc81d327"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"
 
-- 
2.17.1

[dunfell/master PATCH 2/2] Revert "ti-sci-fw: Fix for k3-image-gen issue for combined boot images"

[praneeth]

From: Praneeth Bajjuri <praneeth@ti.com>

This reverts commit d29025f7e868bea6299b55caf78e684fc647be33.

* associated fix in k3-image-gen is picked up now.
  commit 892c86501ff7 ("Makefile: Skip signing of binaries for HS combined boot")

hence its no longer needed to carry the same fix from meta-ti here.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
---
 recipes-bsp/ti-linux-fw/ti-linux-fw.inc       |  2 +-
 ...gning-of-binaries-for-combined-boot-.patch | 64 -------------------
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb        |  5 --
 3 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch

diff --git a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index d3819ab9..12ca7873 100644
--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -23,7 +23,7 @@ SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
 
-K3_IMAGE_GEN_SRCREV ?= "9abbe130d47a7fa6f8e02b740ad3ad27bc81d327"
+K3_IMAGE_GEN_SRCREV ?= "892c86501ff745dfde4d535923ce686f45700da3"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"
 
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
deleted file mode 100644
index 196f3d3f..00000000
--- a/recipes-bsp/ti-sci-fw/files/0001-Makefile-Skip-signing-of-binaries-for-combined-boot-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2efc79702a47f9cbbeecbb2f604577f1ec8c95ba Mon Sep 17 00:00:00 2001
-From: Yogesh Siraswar <yogeshs@ti.com>
-Date: Wed, 8 Dec 2021 17:50:19 -0600
-Subject: [KIG PATCH] Makefile: Skip signing of binaries for combined boot hs
- images
-
-Combined sysfw binaries used in tiboot.bin do not require signed images.
-This fixes issues with AM64x HS and J7200 HS boot images
-
-Upstream-Status: Submitted
-Signed-off-by: Yogesh Siraswar <yogeshs@ti.com>
----
- Makefile           | 8 +++++++-
- soc/am64x/Makefile | 1 +
- soc/j7200/Makefile | 1 +
- 3 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 47b3b20..ab465df 100644
---- a/Makefile
-+++ b/Makefile
-@@ -215,8 +215,14 @@ $(soc_objroot)/%.o: %.c
- 	$(CROSS_COMPILE)gcc $(CFLAGS) -c -o $@-pre-validated $<
- 	python3 ./scripts/sysfw_boardcfg_validator.py -b $@-pre-validated -i -o $@ -s $(SOC) -l $@.log
- 
--# On HS board configuration binaries must be signed
-+# On HS board configuration binaries must be signed unless it is combined boot image
- ifdef HS
-+ifndef COMBINED_BOOT_IMAGE
-+SIGN_BINARY=1
-+endif
-+endif
-+
-+ifdef SIGN_BINARY
- %.bin.unsigned: %.o
- 	$(CROSS_COMPILE)objcopy -S -O binary $< $@
- %.bin: %.bin.unsigned
-diff --git a/soc/am64x/Makefile b/soc/am64x/Makefile
-index bfbe3e5..33ebbd0 100644
---- a/soc/am64x/Makefile
-+++ b/soc/am64x/Makefile
-@@ -31,6 +31,7 @@
- #
- 
- SBL_LOADADDDR ?= 0x70000000
-+COMBINED_BOOT_IMAGE = 1
- COMBINED_SYSFW_BRDCFG_LOADADDR ?= 0x7b000
- LOADADDR  ?= 0x44000
- SCIFS = sci
-diff --git a/soc/j7200/Makefile b/soc/j7200/Makefile
-index 3b754f7..0baef51 100644
---- a/soc/j7200/Makefile
-+++ b/soc/j7200/Makefile
-@@ -31,6 +31,7 @@
- #
- 
- SBL_LOADADDDR ?= 0x41c00000
-+COMBINED_BOOT_IMAGE = 1
- COMBINED_TIFS_BRDCFG_LOADADDR ?= 0x7f000
- COMBINED_DM_BRDCFG_LOADADDR ?= 0x41c80000
- LOADADDR ?= 0x40000
--- 
-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 d70d664c..646833a7 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -49,11 +49,6 @@ 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