[master/kirkstone][PATCH 00/65] Latest 2022.09 sync-up with Dunfell #1

[master/kirkstone][PATCH 00/65] Latest 2022.09 sync-up with Dunfell #1

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Sync up with latest Dunfell changes.
This is still incomplete - there's a second part coming, but needs more work.

Andrew Davis (10):
  conf: machine: am64xx: Add missing dtbo
  trusted-firmware-a: Update to latest upstream master
  optee: Upgrade to upstream 3.17.0
  optee-os: Use software RNG on AM62x and J721s2
  linux-ti-staging: Unblock SA2UL for AM64x and J7200 HS devices
  conf: machine: Make multi-certificate image the default
  u-boot-ti: Do not prepend output files with DEPLOYDIR
  optee-os: Allow build to continue without TI_SECURE_DEV_PKG set
  trusted-firmware-a: Allow build to continue without TI_SECURE_DEV_PKG
    set
  prueth-fw: Deploy for AM64xx based on SoC not EVM

Aparna M (1):
  ti-tros-firmware: Add DM firmware binary to deploy directory for
    am62xx-evm

Bryan Brattlof (2):
  k3conf: update SRCREV to add J721S2 support
  k3conf: update SRCREV to add j721S2 fixes

Darren Etheridge (1):
  ti-graphics: update for 4K/64K page size GPU drivers

Denys Dmytriyenko (2):
  cnm-wave-fw: mark also compatible with j721s2 HS
  j721e-hs-evm-k3r5: do not create generic sysfw.itb symlink

Drew Fustini (3):
  conf: dra7xx-evm: avoid missing dtb files for linux-ti-mainline
  conf: am57xx-evm: avoid missing dtb files for linux-ti-mainline
  conf: am43: avoid missing dtb files for linux-ti-mainline

Jayesh Choudhary (3):
  conf: machine: Add j721s2 hs platform
  ti-rtos-firmware: Add j721s2 hs support
  j721s2-hs: changes to support new hs platform

Jonathan Humphreys (1):
  j7200-hs-evm-k3r5: Move J7200 HS evm support to PG2.0

LCPD Automation Script (4):
  u-boot-ti-staging: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17
  linux-ti-staging-rt: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17
  linux-ti-staging: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17
  u-boot-ti-staging: CI/CD Auto-Merger: cicd.2022.07.30.15:19:12

Manorit Chawdhry (1):
  conf: machine: wic: Fix HS image boot partition

Praneeth Bajjuri (1):
  conf: machine: am62xx: add new dtb for low-power

Ryan Eatmon (36):
  conf: machine: am62xx Fix overlay extension
  u-boot-ti-staging: Bump to 08.03.00.004 release
  linux-ti-staging: Bump to 08.03.00.004 release
  linux-ti-staging-rt: Bump to 08.03.00.004 release
  ti-linux-fw: Bump to 08.03.00.004 release
  u-boot-ti-staging: Bump to 08.03.00.005 release
  linux-ti-staging: Bump to 08.03.00.005 release
  linux-ti-staging-rt: Bump to 08.03.00.005 release
  ti-linux-fw: Bump to 08.03.00.005 release
  u-boot: Bump to verison that supports j721s2-hs-evm
  u-boot-ti-staging: Bump to 08.04.00.001 release
  linux-ti-staging: Bump to 08.04.00.001 release
  linux-ti-staging-rt: Bump to 08.04.00.001 release
  ti-linux-fw: Bump to 08.04.00.001 release
  u-boot-ti-staging: Bump to 08.04.00.002 release
  linux-ti-staging: Bump to 08.04.00.002 release
  linux-ti-staging-rt: Bump to 08.04.00.002 release
  ti-linux-fw: Bump to 08.04.00.002 release
  conf: machine: wic: Fix j721s2-hs-evm image boot partition
  u-boot-ti-staging: Bump to 08.04.00.003 release
  linux-ti-staging: Bump to 08.04.00.003 release
  linux-ti-staging-rt: Bump to 08.04.00.003 release
  conf: machine: j721s2: add new dtb for GESI
  u-boot-ti-staging: Bump to 08.04.00.004 release
  linux-ti-staging: Bump to 08.04.00.004 release
  linux-ti-staging-rt: Bump to 08.04.00.004 release
  ti-img-encode-decode: Lock test app to j7-evm
  kernel u-boot: Fix formulation of LOCALVERSION
  u-boot-ti-staging: Bump to 08.04.00.005 release
  linux-ti-staging: Bump to 08.04.00.005 release
  linux-ti-staging-rt: Bump to 08.04.00.005 release
  cadence-mhdp-fw: Lock firmware to j721e
  ti-linux-fw: Create K3_IMAGE_GEN_BRANCH variable
  linux-ti-staging: Bump to 08.04.01.001 release
  linux-ti-staging-rt: Bump to 08.04.01.001 release
  ti-linux-fw: Bump to 08.04.01.001 release

 meta-ti-bsp/conf/machine/am57xx-evm.conf      |  6 +-
 meta-ti-bsp/conf/machine/am62xx-evm.conf      |  4 +-
 meta-ti-bsp/conf/machine/am64xx-hs-evm.conf   |  3 +-
 meta-ti-bsp/conf/machine/am65xx-hs-evm.conf   |  3 +-
 meta-ti-bsp/conf/machine/dra7xx-evm.conf      |  2 +-
 meta-ti-bsp/conf/machine/include/am62xx.inc   |  5 +-
 meta-ti-bsp/conf/machine/include/am64xx.inc   |  6 +-
 meta-ti-bsp/conf/machine/include/am65xx.inc   |  5 +-
 meta-ti-bsp/conf/machine/include/k3.inc       |  6 +-
 meta-ti-bsp/conf/machine/include/ti43x.inc    |  6 +-
 meta-ti-bsp/conf/machine/j7200-evm.conf       |  3 -
 .../conf/machine/j7200-hs-evm-k3r5.conf       |  2 +-
 meta-ti-bsp/conf/machine/j7200-hs-evm.conf    |  3 +-
 meta-ti-bsp/conf/machine/j721e-evm.conf       |  3 +
 .../conf/machine/j721e-hs-evm-k3r5.conf       |  1 +
 meta-ti-bsp/conf/machine/j721e-hs-evm.conf    |  4 +-
 meta-ti-bsp/conf/machine/j721s2-evm.conf      |  4 +-
 .../conf/machine/j721s2-hs-evm-k3r5.conf      | 13 +++++
 .../{j7200-hs-evm.conf => j721s2-hs-evm.conf} | 11 ++--
 .../cadence-mhdp-fw/cadence-mhdp-fw_git.bb    |  2 +-
 .../cnm-wave-fw/cnm-wave-fw_git.bb            |  4 +-
 .../ti-img-rogue-driver_1.15.6133109.bb       |  6 +-
 .../prueth-fw/prueth-fw-am65x-sr2_git.bb      |  2 +-
 .../viddec-test-app_1.0.0.bb                  |  2 +-
 .../videnc-test-app_1.0.0.bb                  |  2 +-
 .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc   |  8 ++-
 .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb    | 18 ++++++
 .../trusted-firmware-a_%.bbappend             | 44 +++++++-------
 .../u-boot/u-boot-ti-staging_2021.01.bb       |  4 +-
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc  | 44 ++++++++------
 .../recipes-devtools/k3conf/k3conf_git.bb     |  2 +-
 .../ti-img-rogue-umlibs_1.15.6133109.bb       |  6 +-
 .../recipes-kernel/linux/kernel-rdepends.inc  |  6 +-
 .../linux/linux-ti-staging-rt_5.10.bb         |  4 +-
 .../linux/linux-ti-staging_5.10.bb            | 10 +---
 .../recipes-kernel/linux/setup-defconfig.inc  |  2 +-
 .../optee/optee-client_%.bbappend             |  2 +
 .../optee/optee-examples_%.bbappend           |  2 +
 .../optee/optee-os-tadevkit_%.bbappend        |  2 +
 .../optee/optee-os_%.bbappend                 | 19 +++++-
 .../optee/optee-test_%.bbappend               |  3 +
 .../ti-rtos-bin/ti-rtos-firmware.bb           | 58 +++++++++++++++++++
 42 files changed, 226 insertions(+), 116 deletions(-)
 create mode 100644 meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
 copy meta-ti-bsp/conf/machine/{j7200-hs-evm.conf => j721s2-hs-evm.conf} (63%)
 create mode 100644 meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend
 create mode 100644 meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
 create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
 create mode 100644 meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend

-- 
2.25.1

[master/kirkstone][PATCH 01/65] ti-graphics: update for 4K/64K page size GPU drivers

[Denys Dmytriyenko]

From: Darren Etheridge <detheridge@ti.com>

Pull in the GPU KM/UMLIBS that enable the unified 4K/64K page
firmware support in the IMG Rogue drivers.

Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb     | 6 +++---
 .../libgles/ti-img-rogue-umlibs_1.15.6133109.bb             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
index 2f4a7354..109a13d0 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_1.15.6133109.bb
@@ -7,7 +7,7 @@ inherit module features_check
 
 REQUIRED_MACHINE_FEATURES = "gpu"
 
-MACHINE_KERNEL_PR:append = "a"
+MACHINE_KERNEL_PR:append = "b"
 PR = "${MACHINE_KERNEL_PR}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -17,7 +17,7 @@ DEPENDS = "virtual/kernel"
 
 PROVIDES = "virtual/gpudriver"
 
-BRANCH = "linuxws/dunfell/k5.10/${PV}"
+BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize"
 
 SRC_URI = " \
     git://git.ti.com/graphics/ti-img-rogue-driver.git;branch=${BRANCH} \
@@ -27,7 +27,7 @@ SRC_URI = " \
 
 S = "${WORKDIR}/git"
 
-SRCREV = "ee0674adccac16f5b2f7cb8d5d05948706080cb5"
+SRCREV = "6d3d62a15ceb85b719c35f34c6c9e35f556b406b"
 
 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
diff --git a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
index 115344b1..1fb04dab 100644
--- a/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
+++ b/meta-ti-bsp/recipes-graphics/libgles/ti-img-rogue-umlibs_1.15.6133109.bb
@@ -10,12 +10,12 @@ REQUIRED_MACHINE_FEATURES = "gpu"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "j721e|j721s2|am62xx"
 
-PR = "r1"
+PR = "r2"
 
-BRANCH = "linuxws/dunfell/k5.10/${PV}"
+BRANCH = "linuxws/dunfell/k5.10/${PV}_unified_fw_pagesize"
 
 SRC_URI = "git://git.ti.com/graphics/ti-img-rogue-umlibs.git;branch=${BRANCH}"
-SRCREV = "47c3ffc44f2881397d45c8a2b5dfa7d6c58b79fb"
+SRCREV = "fba0c770b712640ab3761dbe8369d43f89f616ed"
 
 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
-- 
2.25.1

[master/kirkstone][PATCH 02/65] ti-tros-firmware: Add DM firmware binary to deploy directory for am62xx-evm

[Denys Dmytriyenko]

From: Aparna M <a-m1@ti.com>

The DM firmware binary is required for building uboot binaries for
am62xx-evm  using toplevel makefile in SDK. Add this file to deploy
directory so it can be included in prebuilt-images directory of SDK
for am62xx-evm.

Signed-off-by: Aparna M <a-m1@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 93429570..317ff4c4 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -167,6 +167,16 @@ do_install:am62xx() {
     install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR}
 }
 
+
+do_deploy() {
+    install -d ${DEPLOYDIR}
+}
+
+do_deploy:am62xx() {
+    install -d ${DEPLOYDIR}
+    install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${DEPLOYDIR}
+}
+
 # Set up names for the firmwares
 ALTERNATIVE:${PN}:am65xx = "\
                     am65x-mcu-r5f0_0-fw \
@@ -355,3 +365,5 @@ INSANE_SKIP:${PN} += "arch"
 # we don't want to configure and build the source code
 do_compile[noexec] = "1"
 do_configure[noexec] = "1"
+
+addtask deploy after do_install
-- 
2.25.1

[master/kirkstone][PATCH 03/65] conf: machine: am62xx Fix overlay extension

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

The file extension for the overlay needs to be .dtbo.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/am62xx-evm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index 33b3294e..6f097e77 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -6,7 +6,7 @@ require conf/machine/include/am62xx.inc
 
 KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
-    ti/k3-am625-sk-csi2-ov5640.dtb \
+    ti/k3-am625-sk-csi2-ov5640.dtbo \
 "
 
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
-- 
2.25.1

[master/kirkstone][PATCH 04/65] u-boot-ti-staging: Bump to 08.03.00.004 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the u-boot version for 08.03.00.004

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index e3214c37..b189de8b 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r25"
+PR = "r26"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "70c33dd821811a05c595f29ecac5abae23534768"
+SRCREV = "2de57d278b74747234313b51f8daac9928a5df6c"
-- 
2.25.1

[master/kirkstone][PATCH 05/65] linux-ti-staging: Bump to 08.03.00.004 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.03.00.004

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index a0581cb4..875ecb48 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "9cff62efaca103acf18b8478362ec56e11d7f526"
+SRCREV = "478daea6c94e2c885fa2cf049bc11fb285c5323b"
 PV = "5.10.109+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.25.1

[master/kirkstone][PATCH 06/65] linux-ti-staging-rt: Bump to 08.03.00.004 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.03.00.004

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 61327720..7aedb81d 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "44a4e68ecf519fd2e35417371fbac546c416d2d9"
+SRCREV = "f57afba2afc20fecd853518af1c24221fa3b5c76"
 PV = "5.10.109+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 07/65] ti-linux-fw: Bump to 08.03.00.004 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the ti-linux-fw version for 08.03.00.004

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 47e76347..3bfddf05 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -20,7 +20,7 @@ IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.00"
 TIFS_LPM_STUB_FW_VERSION = "08.03.02"
 
-TI_LINUX_FW_SRCREV ?= "917625c2721eef8677df9e47d919005b0d4f93aa"
+TI_LINUX_FW_SRCREV ?= "5aa15e59927a5c4acc4dd61d213ab6cef7c0209f"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
-- 
2.25.1

[master/kirkstone][PATCH 08/65] conf: machine: am62xx: add new dtb for low-power

[Denys Dmytriyenko]

From: Praneeth Bajjuri <praneeth@ti.com>

The following commits in ti-linux-5.10.y kernel has introduced new dtbs.
a minimal skeleton and a lpm (low-power-mode) demo dtb.

commit c161df7b1ea0 ("arm64: dts: ti: Introduce k3-am625-sk-lpmdemo")
commit 61df7fcf9307 ("arm64: dts: ti: introduce minimal dt for am625")

This patch on am62xx conf is to include the new dtbs.

Reported-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/am62xx-evm.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index 6f097e77..73859d5f 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -6,6 +6,8 @@ require conf/machine/include/am62xx.inc
 
 KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
+    ti/k3-am625-skeleton.dtb \
+    ti/k3-am625-sk-lpmdemo.dtb \
     ti/k3-am625-sk-csi2-ov5640.dtbo \
 "
 
-- 
2.25.1

[master/kirkstone][PATCH 09/65] u-boot-ti-staging: Bump to 08.03.00.005 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the u-boot version for 08.03.00.005

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index b189de8b..b2982b04 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r26"
+PR = "r27"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "2de57d278b74747234313b51f8daac9928a5df6c"
+SRCREV = "74fc69c8897f67628ee9517744c720a3dc201f53"
-- 
2.25.1

[master/kirkstone][PATCH 10/65] linux-ti-staging: Bump to 08.03.00.005 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.03.00.005

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 875ecb48..86ba2145 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "478daea6c94e2c885fa2cf049bc11fb285c5323b"
+SRCREV = "9e58028f945f077b3e0d7423c6af8938ec46a80a"
 PV = "5.10.109+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.25.1

[master/kirkstone][PATCH 11/65] linux-ti-staging-rt: Bump to 08.03.00.005 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.03.00.005

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 7aedb81d..40cefb02 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "f57afba2afc20fecd853518af1c24221fa3b5c76"
+SRCREV = "d9ee8a25c2eea0d2aff22f36ced2513538fbd1a2"
 PV = "5.10.109+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 12/65] ti-linux-fw: Bump to 08.03.00.005 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the ti-linux-fw version for 08.03.00.005

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 3bfddf05..52766ac0 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -25,7 +25,7 @@ SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
 
-K3_IMAGE_GEN_SRCREV ?= "62872c7e285fa9b9af76a258a24d603f851769c3"
+K3_IMAGE_GEN_SRCREV ?= "79492803a70ba1918116ac28e18c74670cdda2b9"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"
 
-- 
2.25.1

[master/kirkstone][PATCH 13/65] conf: machine: am64xx: Add missing dtbo

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

Add missing k3-am642-evm-icssg1-dualemac-mii.dtbo.

Reported-by: Judith Mendez <jm@ti.com>
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/include/am64xx.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index afb96a22..c5820986 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -10,6 +10,7 @@ KERNEL_DEVICETREE = " \
     ti/k3-am642-evm.dtb \
     ti/k3-am642-sk.dtb \
     ti/k3-am642-evm-icssg1-dualemac.dtbo \
+    ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
     ti/k3-am642-evm-nand.dtbo \
 "
 
-- 
2.25.1

[master/kirkstone][PATCH 14/65] conf: machine: Add j721s2 hs platform

[Denys Dmytriyenko]

From: Jayesh Choudhary <j-choudhary@ti.com>

Machine conf for J721S2 HS platform.
Used j7200 hs as reference.

Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../conf/machine/j721s2-hs-evm-k3r5.conf      | 13 +++++++++++
 meta-ti-bsp/conf/machine/j721s2-hs-evm.conf   | 22 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
 create mode 100644 meta-ti-bsp/conf/machine/j721s2-hs-evm.conf

diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
new file mode 100644
index 00000000..ac4df86e
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm-k3r5.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: J721S2 HS EVM (R5F)
+#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM (R5F core)
+
+require conf/machine/include/k3r5.inc
+
+SYSFW_SOC = "j721s2"
+SYSFW_CONFIG = "evm"
+SYSFW_SUFFIX = "hs"
+
+UBOOT_MACHINE = "j721s2_hs_evm_r5_defconfig"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
new file mode 100644
index 00000000..43fb2ebc
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: J721S2 HS EVM
+#@DESCRIPTION: Machine configuration for the TI J721S2 HS EVM
+
+require conf/machine/j721s2-evm.conf
+
+UBOOT_MACHINE = "j721s2_hs_evm_a72_defconfig"
+
+UBOOT_ENTRYPOINT =       "0x80080000"
+UBOOT_LOADADDRESS =      "0x80080000"
+UBOOT_RD_LOADADDRESS =   "0x84000000"
+UBOOT_RD_ENTRYPOINT =    "0x84000000"
+UBOOT_DTB_LOADADDRESS =  "0x83000000"
+UBOOT_DTBO_LOADADDRESS = "0x83080000"
+UBOOT_DTBO_OFFSET =      "0x00010000"
+
+SPL_BINARY = "tispl.bin_HS"
+SPL_BINARYNAME = "tispl.bin"
+UBOOT_BINARY = "u-boot.img_HS"
+IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+
+TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
-- 
2.25.1

[master/kirkstone][PATCH 15/65] ti-rtos-firmware: Add j721s2 hs support

[Denys Dmytriyenko]

From: Jayesh Choudhary <j-choudhary@ti.com>

Sign the DM firmware for j721s2 similar to j7200 hs.
Duplicate all j721s2 entries for j721s2-hs as we cannot use same
keyword for match between j721s2-evm and j721s2-hs-evm.

Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../ti-rtos-bin/ti-rtos-firmware.bb           | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
index 317ff4c4..072a7c3c 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
@@ -17,6 +17,7 @@ PLAT_SFX:j7 = "j721e"
 PLAT_SFX:j7200-evm = "j7200"
 PLAT_SFX:j7200-hs-evm = "j7200"
 PLAT_SFX:j721s2-evm = "j721s2"
+PLAT_SFX:j721s2-hs-evm = "j721s2"
 PLAT_SFX:am65xx = "am65xx"
 PLAT_SFX:am64xx = "am64xx"
 PLAT_SFX:am62xx = "am62xx"
@@ -65,6 +66,15 @@ do_install:prepend:j7200-hs-evm() {
         )
 }
 
+# J7 HS support
+do_install:prepend:j721s2-hs-evm() {
+        export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+        ( cd ${RTOS_DM_FW_DIR}; \
+                mv ${DM_FIRMWARE} ${DM_FIRMWARE}.unsigned; \
+                ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${DM_FIRMWARE}.unsigned ${DM_FIRMWARE}; \
+        )
+}
+
 # Update the am64xx ipc binaries to be consistent with other platforms
 do_install:prepend:am64xx() {
         ( cd ${RTOS_IPC_FW_DIR}; \
@@ -145,6 +155,22 @@ do_install:j721s2-evm() {
     # install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR}
 }
 
+do_install:j721s2-hs-evm() {
+    install -d ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu2_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu3_1_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_1_release_strip.xe71 ${LEGACY_IPC_FW_DIR}
+    install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_c7x_2_release_strip.xe71 ${LEGACY_IPC_FW_DIR}
+    # DM Firmware
+    install -m 0644 ${RTOS_DM_FW_DIR}/ipc_echo_testb_mcu1_0_release_strip.xer5f ${LEGACY_DM_FW_DIR}
+    # ETH firmware
+    # install -d ${LEGACY_ETH_FW_DIR}
+    # install -m 0644 ${RTOS_ETH_FW_DIR}/app_remoteswitchcfg_server_strip.xer5f ${LEGACY_ETH_FW_DIR}
+}
+
 do_install:am65xx() {
     install -d ${LEGACY_IPC_FW_DIR}
     install -m 0644 ${RTOS_IPC_FW_DIR}/ipc_echo_test_mcu1_0_release_strip.xer5f ${LEGACY_IPC_FW_DIR}
@@ -232,6 +258,17 @@ ALTERNATIVE_${PN}:j721s2-evm = "\
                     j721s2-c71_1-fw \
                     "
 
+ALTERNATIVE:${PN}:j721s2-hs-evm = "\
+                    j721s2-mcu-r5f0_0-fw \
+                    j721s2-mcu-r5f0_1-fw \
+                    j721s2-main-r5f0_0-fw \
+                    j721s2-main-r5f0_1-fw \
+                    j721s2-main-r5f1_0-fw \
+                    j721s2-main-r5f1_1-fw \
+                    j721s2-c71_0-fw \
+                    j721s2-c71_1-fw \
+                    "
+
 # Set up link names for the firmwares
 
 TARGET_MCU_R5FSS0_0:am65xx = "am65x-mcu-r5f0_0-fw"
@@ -275,6 +312,15 @@ TARGET_MAIN_R5FSS1_1:j721s2-evm = "j721s2-main-r5f1_1-fw"
 TARGET_C7X_0:j721s2-evm = "j721s2-c71_0-fw"
 TARGET_C7X_1:j721s2-evm = "j721s2-c71_1-fw"
 
+TARGET_MCU_R5FSS0_0:j721s2-hs-evm = "j721s2-mcu-r5f0_0-fw"
+TARGET_MCU_R5FSS0_1:j721s2-hs-evm = "j721s2-mcu-r5f0_1-fw"
+TARGET_MAIN_R5FSS0_0:j721s2-hs-evm = "j721s2-main-r5f0_0-fw"
+TARGET_MAIN_R5FSS0_1:j721s2-hs-evm = "j721s2-main-r5f0_1-fw"
+TARGET_MAIN_R5FSS1_0:j721s2-hs-evm = "j721s2-main-r5f1_0-fw"
+TARGET_MAIN_R5FSS1_1:j721s2-hs-evm = "j721s2-main-r5f1_1-fw"
+TARGET_C7X_0:j721s2-hs-evm = "j721s2-c71_0-fw"
+TARGET_C7X_1:j721s2-hs-evm = "j721s2-c71_1-fw"
+
 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_0}"
 ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/${TARGET_MCU_R5FSS0_1}"
 
-- 
2.25.1

[master/kirkstone][PATCH 16/65] j721s2-hs: changes to support new hs platform

[Denys Dmytriyenko]

From: Jayesh Choudhary <j-choudhary@ti.com>

Changes to support new j721s2-hs platform in:
1) ti-sci-fw_git: Update firmware prefix for j721s2-hs
2) atf: sign the image
3) u-boot: Add u-boot-spl image for combined boot image
4) optee: sign the image

Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb     | 18 ++++++++++++++++++
 .../trusted-firmware-a_%.bbappend              |  8 ++++++++
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc   |  6 ++++++
 .../recipes-security/optee/optee-os_%.bbappend |  4 ++++
 4 files changed, 36 insertions(+)

diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 530b25b8..6a381447 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -4,6 +4,7 @@ DEPENDS = "openssl-native u-boot-mkimage-native dtc-native"
 DEPENDS:append:j7200-evm-k3r5 = " virtual/bootloader"
 DEPENDS:append:j7200-hs-evm-k3r5 = " virtual/bootloader"
 DEPENDS:append:j721s2-evm-k3r5 = " virtual/bootloader"
+DEPENDS:append:j721s2-hs-evm-k3r5 = " virtual/bootloader"
 DEPENDS:append:am64xx-evm-k3r5 = " virtual/bootloader"
 DEPENDS:append:am64xx-hs-evm-k3r5 = " virtual/bootloader"
 DEPENDS:append:am62xx-evm-k3r5 = " virtual/bootloader"
@@ -30,6 +31,7 @@ SYSFW_PREFIX:j721e-hs-evm-k3r5-sr1-1 = "ti-fs-firmware"
 SYSFW_PREFIX:j7200-evm-k3r5 = "ti-fs-firmware"
 SYSFW_PREFIX:j7200-hs-evm-k3r5 = "ti-fs-firmware"
 SYSFW_PREFIX:j721s2-evm-k3r5 = "ti-fs-firmware"
+SYSFW_PREFIX:j721s2-hs-evm-k3r5 = "ti-fs-firmware"
 SYSFW_PREFIX:am62xx-evm-k3r5 = "ti-fs-firmware"
 
 SYSFW_SUFFIX ?= "unknown"
@@ -63,6 +65,7 @@ EXTRA_OEMAKE:append = "${@['',' ${EXTRA_OEMAKE_HS}']['${SYSFW_SUFFIX}' == 'hs']}
 EXTRA_OEMAKE:append:j7200-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE:append:j7200-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE:append:j721s2-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
+EXTRA_OEMAKE:append:j721s2-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE:append:am64xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE:append:am64xx-hs-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
 EXTRA_OEMAKE:append:am62xx-evm-k3r5 = " SBL="${STAGING_DIR_HOST}/boot/u-boot-spl.bin""
@@ -143,6 +146,21 @@ do_deploy:j721s2-evm-k3r5() {
 	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
 }
 
+do_install:j721s2-hs-evm-k3r5() {
+	install -d ${D}/boot
+	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
+	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_SYMLINK}
+	ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+}
+
+do_deploy:j721s2-hs-evm-k3r5() {
+	install -d ${DEPLOYDIR}
+	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
+	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_SYMLINK}
+	ln -sf ${UBOOT_IMAGE} ${DEPLOYDIR}/${UBOOT_BINARY}
+	install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
+}
+
 do_install:am64xx-evm-k3r5() {
 	install -d ${D}/boot
 	install -m 644 ${WORKDIR}/imggen/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 45d56451..6254d09e 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -42,3 +42,11 @@ do_compile:append:j7200-hs-evm() {
 		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
 	)
 }
+
+do_compile:append:j721s2-hs-evm() {
+	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
+	( cd ${B}/${BUILD_DIR}/release/; \
+		mv bl31.bin bl31.bin.unsigned; \
+		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
+	)
+}
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index dddf6284..f470c95e 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -59,6 +59,7 @@ SPL_UART_BINARY:lego-ev3 = ""
 SPL_UART_BINARY:j7200-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY:j7200-hs-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY:j721s2-evm-k3r5 = "u-boot-spl.bin"
+SPL_UART_BINARY:j721s2-hs-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY:am64xx-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY:am64xx-hs-evm-k3r5 = "u-boot-spl.bin"
 SPL_UART_BINARY:am62xx-evm-k3r5 = "u-boot-spl.bin"
@@ -277,6 +278,11 @@ do_deploy:append:j721s2-evm-k3r5 () {
 	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
 }
 
+do_deploy:append:j721s2-hs-evm-k3r5 () {
+	mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
+	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
+}
+
 do_deploy:append:am64xx-evm-k3r5 () {
 	mv ${DEPLOYDIR}/tiboot3.bin ${DEPLOYDIR}/tiboot3-r5spl.bin || true
 	mv ${DEPLOYDIR}/u-boot-spl.bin ${DEPLOYDIR}/u-boot-spl-r5spl.bin || true
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
index 6097580f..d55bbc90 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
@@ -63,6 +63,10 @@ do_compile:append:j7200-hs-evm() {
     optee_sign_k3hs
 }
 
+do_compile:append:j721s2-hs-evm() {
+    optee_sign_k3hs
+}
+
 do_install:append:ti-soc() {
     install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true
     install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true
-- 
2.25.1

[master/kirkstone][PATCH 17/65] cnm-wave-fw: mark also compatible with j721s2 HS

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb | 4 ++--
 meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
index 50058b97..12d21335 100644
--- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -13,7 +13,7 @@ PR = "${INC_PR}.1"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "j721s2-evm"
+COMPATIBLE_MACHINE = "j721s2"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -21,7 +21,7 @@ S = "${WORKDIR}/git"
 TARGET_WAVE521C = "wave521c_codec_fw.bin"
 
 SOURCE_WAVE521C = "wave521c_codec_fw.bin"
-SOURCE_WAVE521C:j721s2-evm = "wave521c_j721s2_codec_fw.bin"
+SOURCE_WAVE521C:j721s2 = "wave521c_j721s2_codec_fw.bin"
 
 ALTERNATIVE_LINK_NAME[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/${TARGET_WAVE521C}"
 ALTERNATIVE_TARGET[wave521c_codec_fw.bin] = "${nonarch_base_libdir}/firmware/cnm/${TARGET_WAVE521C}"
diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
index bb2c1a00..8acf614d 100644
--- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
@@ -27,7 +27,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " cadence-mhdp-fw"
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw"
 
 # Add run-time dependency for Chips&Media Wave521 firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2-evm = " cnm-wave-fw"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw"
 
 # Add run-time dependency for TIFS Low Power Module stub
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62xx-evm = " tifs-lpm-stub"
-- 
2.25.1

[master/kirkstone][PATCH 18/65] u-boot: Bump to verison that supports j721s2-hs-evm

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index b2982b04..55ea6b8a 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -6,4 +6,4 @@ PR = "r27"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "74fc69c8897f67628ee9517744c720a3dc201f53"
+SRCREV = "d588b4b55d2240c13c3cce507683853fd6d6ac00"
-- 
2.25.1

[master/kirkstone][PATCH 19/65] u-boot-ti-staging: Bump to 08.04.00.001 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the u-boot version for 08.04.00.001

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 55ea6b8a..0386bff4 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r27"
+PR = "r28"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "d588b4b55d2240c13c3cce507683853fd6d6ac00"
+SRCREV = "f4d82db64258c50b6e44411ffdf0b87770bc1aff"
-- 
2.25.1

[master/kirkstone][PATCH 20/65] linux-ti-staging: Bump to 08.04.00.001 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.04.00.001

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 86ba2145..bc024cf6 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,8 +25,8 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "9e58028f945f077b3e0d7423c6af8938ec46a80a"
-PV = "5.10.109+git${SRCPV}"
+SRCREV = "d5f4ca50bbb42d7872dfa7286c7a0f9f5699e94b"
+PV = "5.10.120+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
 MACHINE_KERNEL_PR:append = "b"
-- 
2.25.1

[master/kirkstone][PATCH 21/65] linux-ti-staging-rt: Bump to 08.04.00.001 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.04.00.001

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 40cefb02..39089308 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "d9ee8a25c2eea0d2aff22f36ced2513538fbd1a2"
-PV = "5.10.109+git${SRCPV}"
+SRCREV = "bd4b7ce35aa987b5b6f80fc2efd2be9a4e707b84"
+PV = "5.10.120+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 22/65] ti-linux-fw: Bump to 08.04.00.001 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the ti-linux-fw version for 08.04.00.001

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 52766ac0..ffbb1bba 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -20,12 +20,12 @@ IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.00"
 TIFS_LPM_STUB_FW_VERSION = "08.03.02"
 
-TI_LINUX_FW_SRCREV ?= "5aa15e59927a5c4acc4dd61d213ab6cef7c0209f"
+TI_LINUX_FW_SRCREV ?= "224f82474e4029dd2e550600ba7e59f687ff7131"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
 
-K3_IMAGE_GEN_SRCREV ?= "79492803a70ba1918116ac28e18c74670cdda2b9"
+K3_IMAGE_GEN_SRCREV ?= "c43068a114a86daad9241724ef8e3afda45be9be"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"
 
-- 
2.25.1

[master/kirkstone][PATCH 23/65] trusted-firmware-a: Update to latest upstream master

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

For TF-A we work against upstream first, our fork has only been
used in the rare cases we need to ship a feature before we can
get it upstream. This is not currently the case so lets switch
to upstream repo until there is a need for our fork.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../trusted-firmware-a/trusted-firmware-a_%.bbappend      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 6254d09e..41241a57 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -1,8 +1,6 @@
-PV:k3 = "2.6"
-LIC_FILES_CHKSUM:k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
-BRANCH:k3 = "ti-atf"
-SRC_URI:k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa"
-SRCREV_tfa:k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce"
+PV:k3 = "2.6+2.7-rc0"
+SRCREV_tfa:k3 = "453abc80b2eacbf2816c838e47e40f063227d934"
+SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master"
 COMPATIBLE_MACHINE:k3 = "k3"
 TFA_BUILD_TARGET:k3 = "all"
 TFA_INSTALL_TARGET:k3 = "bl31"
-- 
2.25.1

[master/kirkstone][PATCH 24/65] optee: Upgrade to upstream 3.17.0

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

Update to the latest upstream master which is 3.17.
We do this to add HUK and AM64x/AM62x support.
With this we need to also switch OPTEEMACHINE for AM64x/AM62x.

To build against the latest OP-TEE the support recipes need updated also.
Move these here into meta-ti so that builds will still work when not using
meta-arago-distro.

The fix patches do not look to be needed anymore.

While here switch to git checkout with https.

NOTE: The latest OP-TEE requires SYSFW 8.04+

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/include/am62xx.inc                  | 2 +-
 meta-ti-bsp/conf/machine/include/am64xx.inc                  | 2 +-
 meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend   | 2 ++
 meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend | 2 ++
 .../recipes-security/optee/optee-os-tadevkit_%.bbappend      | 2 ++
 meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend       | 5 +++++
 meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend     | 3 +++
 7 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend
 create mode 100644 meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
 create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
 create mode 100644 meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend

diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index fff1312f..80df1844 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -21,5 +21,5 @@ do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am62x"
 OPTEEOUTPUTMACHINE = "k3"
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index c5820986..87791ef7 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -21,5 +21,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
 TFA_BOARD = "lite"
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"
 OPTEEOUTPUTMACHINE = "k3"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend
new file mode 100644
index 00000000..109d451c
--- /dev/null
+++ b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend
@@ -0,0 +1,2 @@
+PV:ti-soc = "3.17.0+git${SRCPV}"
+SRCREV:ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
new file mode 100644
index 00000000..98b5bea4
--- /dev/null
+++ b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend
@@ -0,0 +1,2 @@
+PV:ti-soc = "3.17.0+git${SRCPV}"
+SRCREV:ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
new file mode 100644
index 00000000..4300c1a9
--- /dev/null
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend
@@ -0,0 +1,2 @@
+PV:ti-soc = "3.17.0+git${SRCPV}"
+SRCREV:ti-soc = "15a746d28d10df3d79d72bc9fe4a5a654b88bcca"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
index d55bbc90..60e8c391 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
@@ -1,3 +1,8 @@
+PV:ti-soc = "3.17.0+git${SRCPV}"
+SRCREV:ti-soc = "15a746d28d10df3d79d72bc9fe4a5a654b88bcca"
+
+DEPENDS:append:ti-soc = " python3-cryptography-native"
+
 EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
 
 do_compile:prepend:ti-soc() {
diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend
new file mode 100644
index 00000000..4fbaa4c4
--- /dev/null
+++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend
@@ -0,0 +1,3 @@
+PV:ti-soc = "3.17.0+git${SRCPV}"
+SRCREV:ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25"
+SRC_URI:ti-soc = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https"
-- 
2.25.1

[master/kirkstone][PATCH 25/65] k3conf: update SRCREV to add J721S2 support

[Denys Dmytriyenko]

From: Bryan Brattlof <bb@ti.com>

update the SHA of k3conf to pickup j721s2 support

Signed-off-by: Bryan Brattlof <bb@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
index 3f542da4..af48337f 100644
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -8,7 +8,7 @@ PV = "0.2+git${SRCPV}"
 COMPATIBLE_MACHINE = "k3"
 
 BRANCH ?= "master"
-SRCREV = "966a5695b73bc53039ca60d196b77de0640088d4"
+SRCREV = "4ca1c3d330bc1de779909e733483b09a1fc4fe44"
 
 SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}"
 
-- 
2.25.1

[master/kirkstone][PATCH 26/65] conf: machine: wic: Fix HS image boot partition

[Denys Dmytriyenko]

From: Manorit Chawdhry <m-chawdhry@ti.com>

IMAGE_BOOT_FILES was being overwritten in the HS recipes leading to
incomplete binaries in /boot and the naming of the binaries were not
correct.

Fixes /boot partition for HS devices.

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@ti.com>
Acked-by: Manorit Chawdhry <m-chawdhry@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/am64xx-hs-evm.conf | 3 +--
 meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | 3 +--
 meta-ti-bsp/conf/machine/include/k3.inc     | 5 +++--
 meta-ti-bsp/conf/machine/j7200-hs-evm.conf  | 3 +--
 meta-ti-bsp/conf/machine/j721e-hs-evm.conf  | 3 +--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf
index 44e81463..ebbe2e62 100644
--- a/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am64xx-hs-evm.conf
@@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"
 
 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
index e4eebb6a..de92cacb 100644
--- a/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm.conf
@@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"
 
 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 911b59bd..5b5fb1b6 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -22,6 +22,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
 SPL_BINARY = "tispl.bin"
+SPL_BINARYNAME = "tispl.bin"
 UBOOT_SUFFIX = "img"
 
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
@@ -38,8 +39,8 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 
-IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
-IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
+IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
+IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
 
 IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
 IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
index a5bd637e..8821ffac 100644
--- a/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-hs-evm.conf
@@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"
 
 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
index 433863dd..56eaa64e 100644
--- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
@@ -15,9 +15,8 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"
 
 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"
 
 BBMULTICONFIG += "k3r5-sr1-1"
 
-- 
2.25.1

[master/kirkstone][PATCH 27/65] u-boot-ti-staging: Bump to 08.04.00.002 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the u-boot version for 08.04.00.002

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 0386bff4..9eff7c8f 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r28"
+PR = "r29"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "f4d82db64258c50b6e44411ffdf0b87770bc1aff"
+SRCREV = "8de449466158ba4c57a72ab20da7332464c0cb44"
-- 
2.25.1

[master/kirkstone][PATCH 28/65] linux-ti-staging: Bump to 08.04.00.002 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.04.00.002

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index bc024cf6..3cae4d14 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "d5f4ca50bbb42d7872dfa7286c7a0f9f5699e94b"
+SRCREV = "ab2d96e4f21159a7df2e87a6fb2a29bd9535506b"
 PV = "5.10.120+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.25.1

[master/kirkstone][PATCH 29/65] linux-ti-staging-rt: Bump to 08.04.00.002 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.04.00.002

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 39089308..81ab819f 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "bd4b7ce35aa987b5b6f80fc2efd2be9a4e707b84"
+SRCREV = "c0344a7bf119b7169765e13bef377735fa39cef9"
 PV = "5.10.120+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 30/65] ti-linux-fw: Bump to 08.04.00.002 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the ti-linux-fw version for 08.04.00.002

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index ffbb1bba..d1a1f3a5 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -20,12 +20,12 @@ IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.00"
 TIFS_LPM_STUB_FW_VERSION = "08.03.02"
 
-TI_LINUX_FW_SRCREV ?= "224f82474e4029dd2e550600ba7e59f687ff7131"
+TI_LINUX_FW_SRCREV ?= "2d9a1002663a20673d942826c558ba4b472ffe9a"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
 
-K3_IMAGE_GEN_SRCREV ?= "c43068a114a86daad9241724ef8e3afda45be9be"
+K3_IMAGE_GEN_SRCREV ?= "f67a3696bb8d9efd052f40b6c67b742d63f6545c"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"
 
-- 
2.25.1

[master/kirkstone][PATCH 31/65] conf: machine: wic: Fix j721s2-hs-evm image boot partition

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

This patch is to align with a recent change to how the HS platforms
are setup in the /boot partition.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/j721s2-hs-evm.conf | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
index 43fb2ebc..7ffad45a 100644
--- a/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-hs-evm.conf
@@ -15,8 +15,7 @@ UBOOT_DTBO_LOADADDRESS = "0x83080000"
 UBOOT_DTBO_OFFSET =      "0x00010000"
 
 SPL_BINARY = "tispl.bin_HS"
-SPL_BINARYNAME = "tispl.bin"
 UBOOT_BINARY = "u-boot.img_HS"
-IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
+UBOOT_SYMLINK = "u-boot.img"
 
 TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
-- 
2.25.1

[master/kirkstone][PATCH 32/65] u-boot-ti-staging: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17

[Denys Dmytriyenko]

From: LCPD Automation Script <lcpdbld@list.ti.com>

Updated the value(s) for:
  SRCREV

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 9eff7c8f..023af05f 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -6,4 +6,4 @@ PR = "r29"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "8de449466158ba4c57a72ab20da7332464c0cb44"
+SRCREV = "4c186846fa8c8b432dfb8fa19b31b121c0e7c06e"
-- 
2.25.1

[master/kirkstone][PATCH 33/65] linux-ti-staging-rt: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17

[Denys Dmytriyenko]

From: LCPD Automation Script <lcpdbld@list.ti.com>

Updated the value(s) for:
  SRCREV

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 81ab819f..402b132c 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "c0344a7bf119b7169765e13bef377735fa39cef9"
+SRCREV = "7e2ed4859e948ee827abe3c8b59dfa4e046e51ce"
 PV = "5.10.120+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 34/65] linux-ti-staging: CI/CD Auto-Merger: cicd.2022.06.28.12:11:17

[Denys Dmytriyenko]

From: LCPD Automation Script <lcpdbld@list.ti.com>

Updated the value(s) for:
  SRCREV

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 3cae4d14..83d18e7a 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "ab2d96e4f21159a7df2e87a6fb2a29bd9535506b"
+SRCREV = "016e97907aa4a3194540d461baf33c2d7439db75"
 PV = "5.10.120+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.25.1

[master/kirkstone][PATCH 35/65] u-boot-ti-staging: Bump to 08.04.00.003 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the u-boot version for 08.04.00.003

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 023af05f..91ae0319 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r29"
+PR = "r30"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "4c186846fa8c8b432dfb8fa19b31b121c0e7c06e"
+SRCREV = "5de948718fab9c024b56268860a06fab9c7d514c"
-- 
2.25.1

[master/kirkstone][PATCH 36/65] linux-ti-staging: Bump to 08.04.00.003 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.04.00.003

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 83d18e7a..333c9a27 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "016e97907aa4a3194540d461baf33c2d7439db75"
+SRCREV = "a293790a7822997b0ff63bdd95f580ac6e2d85e2"
 PV = "5.10.120+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.25.1

[master/kirkstone][PATCH 37/65] linux-ti-staging-rt: Bump to 08.04.00.003 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.04.00.003

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 402b132c..b9e556c0 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "7e2ed4859e948ee827abe3c8b59dfa4e046e51ce"
+SRCREV = "70d8aea23ac37d6a72bfd18fd8661ca6f1136c0a"
 PV = "5.10.120+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 38/65] optee-os: Use software RNG on AM62x and J721s2

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

The TRNG driver is not currently functional for these two platforms.
Disable the TRNG driver until fixed.

Reported-by: Vignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
index 60e8c391..5d50a04f 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
@@ -5,6 +5,9 @@ DEPENDS:append:ti-soc = " python3-cryptography-native"
 
 EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
 
+EXTRA_OEMAKE:append:am62xx = " CFG_WITH_SOFTWARE_PRNG=y"
+EXTRA_OEMAKE:append:j721s2 = " CFG_WITH_SOFTWARE_PRNG=y"
+
 do_compile:prepend:ti-soc() {
     export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
 }
-- 
2.25.1

[master/kirkstone][PATCH 39/65] linux-ti-staging: Unblock SA2UL for AM64x and J7200 HS devices

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

The SA2UL driver now works on HS devices, unblock this.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 333c9a27..af848175 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -45,9 +45,3 @@ module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg
 module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
 KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
 KERNEL_MODULE_AUTOLOAD:append:j7 = " rpmsg_kdrv_switch"
-
-# Disable SA2UL for AM64x HS and J7200 HS
-module_conf_sa2ul:am64xx-hs-evm = "blacklist sa2ul"
-KERNEL_MODULE_PROBECONF:append:am64xx-hs-evm = " sa2ul"
-module_conf_sa2ul:j7200-hs-evm = "blacklist sa2ul"
-KERNEL_MODULE_PROBECONF:append:j7200-hs-evm = " sa2ul"
-- 
2.25.1

[master/kirkstone][PATCH 40/65] conf: machine: j721s2: add new dtb for GESI

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

The following commits in ti-linux-5.10.y kernel has introduced a new dtb.

commit: 9b05b2a89ff ("arm64: dts: ti: Add overlay for GESI to enable main CPSW2G in J721S2")

This patch on j721s2 conf is to include the new dtb.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/j721s2-evm.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index a2c15f74..bbe011c0 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -11,6 +11,7 @@ OPTEE_K3_USART = "0x8"
 
 KERNEL_DEVICETREE = " \
     ti/k3-j721s2-common-proc-board.dtb \
+    ti/k3-j721s2-gesi-exp-board.dtbo \
 "
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
-- 
2.25.1

[master/kirkstone][PATCH 41/65] u-boot-ti-staging: Bump to 08.04.00.004 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the u-boot version for 08.04.00.004

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 91ae0319..a1d2f14c 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r30"
+PR = "r31"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "5de948718fab9c024b56268860a06fab9c7d514c"
+SRCREV = "24bb75ba60e716a606bb90150348bfe3a21a5120"
-- 
2.25.1

[master/kirkstone][PATCH 42/65] linux-ti-staging: Bump to 08.04.00.004 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.04.00.004

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index af848175..9a80870e 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "a293790a7822997b0ff63bdd95f580ac6e2d85e2"
+SRCREV = "b56b1fd4a1c0e331114d15f7030bc8397a7e7b9b"
 PV = "5.10.120+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.25.1

[master/kirkstone][PATCH 43/65] linux-ti-staging-rt: Bump to 08.04.00.004 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.04.00.004

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index b9e556c0..016a81fe 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "70d8aea23ac37d6a72bfd18fd8661ca6f1136c0a"
+SRCREV = "1872082f52dc08d10c9db367dd3530fb9b4e5a9c"
 PV = "5.10.120+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 44/65] conf: dra7xx-evm: avoid missing dtb files for linux-ti-mainline

[Denys Dmytriyenko]

From: Drew Fustini <dfustini@baylibre.com>

Avoid the inclusion of device tree files that do not exist upstream
when virtual/kernel is linux-ti-mainline for the dra7xx-evm MACHINE.

Signed-off-by: Drew Fustini <dfustini@baylibre.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/dra7xx-evm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/conf/machine/dra7xx-evm.conf b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
index 5fa1dfa5..813e0e06 100644
--- a/meta-ti-bsp/conf/machine/dra7xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/dra7xx-evm.conf
@@ -12,7 +12,7 @@ KERNEL_DEVICETREE = " \
     dra7-evm.dtb \
     ti/dra7x-evm-osd-lcd-common.dtbo \
     dra71-evm.dtb \
-    dra71-evm-nand.dtb \
+    ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'dra71-evm-nand.dtb', d)} \
     ti/dra71-evm-lcd-auo-g101evn01.0.dtbo \
     dra72-evm.dtb \
     dra72-evm-revc.dtb \
-- 
2.25.1

[master/kirkstone][PATCH 45/65] conf: am57xx-evm: avoid missing dtb files for linux-ti-mainline

[Denys Dmytriyenko]

From: Drew Fustini <dfustini@baylibre.com>

Avoid the inclusion of device tree files that do not exist upstream
when virtual/kernel is linux-ti-mainline for the am57xx-evm MACHINE.

Signed-off-by: Drew Fustini <dfustini@baylibre.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/am57xx-evm.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf b/meta-ti-bsp/conf/machine/am57xx-evm.conf
index 825bc31d..ca635f43 100644
--- a/meta-ti-bsp/conf/machine/am57xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf
@@ -13,9 +13,9 @@ KERNEL_DEVICETREE = " \
     am57xx-beagle-x15-revb1.dtb \
     am57xx-beagle-x15-revc.dtb \
     am5729-beagleboneai.dtb \
-    am57xx-evm.dtb \
+    ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am57xx-evm.dtb', d)} \
     ti/am57xx-evm-common.dtbo \
-    am57xx-evm-reva3.dtb \
+    ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am57xx-evm-reva3.dtb', d)} \
     ti/am57xx-evm-reva3.dtbo \
     am571x-idk.dtb \
     ti/am571x-idk-touchscreen.dtbo \
@@ -25,7 +25,7 @@ KERNEL_DEVICETREE = " \
     ti/am572x-idk-touchscreen.dtbo \
     ti/lcd-osd101t2587.dtbo \
     ti/lcd-osd101t2045.dtbo \
-    ti/ov10635.dtbo \
+    ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'ti/ov10635.dtbo', d)} \
 "
 
 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"
-- 
2.25.1

[master/kirkstone][PATCH 46/65] conf: am43: avoid missing dtb files for linux-ti-mainline

[Denys Dmytriyenko]

From: Drew Fustini <dfustini@baylibre.com>

Avoid the inclusion of device tree files that do not exist upstream
when virtual/kernel is linux-ti-mainline for the am43xx machines.

Signed-off-by: Drew Fustini <dfustini@baylibre.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/include/ti43x.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 0da5f761..5509a54d 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -20,9 +20,11 @@ PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km"
 KERNEL_IMAGETYPE = "zImage"
 
 KERNEL_DEVICETREE = " \
-    am437x-gp-evm.dtb am437x-gp-evm-hdmi.dtb \
+    am437x-gp-evm.dtb \
+    ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am437x-gp-evm-hdmi.dtb', d)} \
     am437x-sk-evm.dtb am437x-idk-evm.dtb \
-    am43x-epos-evm.dtb am43x-epos-evm-hdmi.dtb \
+    am43x-epos-evm.dtb \
+    ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am43x-epos-evm-hdmi.dtb', d)} \
 "
 
 KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}"
-- 
2.25.1

[master/kirkstone][PATCH 47/65] ti-img-encode-decode: Lock test app to j7-evm

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

The test app is not compatible with later versions of j7, so
add COMPATIBLE_MACHINE to lock these recipes down to just
j721e.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb   | 2 +-
 .../recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
index 718fdbe1..ffc3f56e 100644
--- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "libdrm ffmpeg"
 
 inherit autotools pkgconfig
 
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j721e"
 
 PR = "r1"
 SRCREV = "94a80c8c090dbfdc7fafd4e5bb78c2091e715af2"
diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
index 4dc81c54..125a9250 100644
--- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "libdrm"
 
 inherit autotools pkgconfig
 
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j721e"
 
 PR = "r0"
 SRCREV = "a5e7d820bea1be24f25a8369d4d4521c784f869a"
-- 
2.25.1

[master/kirkstone][PATCH 48/65] j721e-hs-evm-k3r5: do not create generic sysfw.itb symlink

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Commit bdceaa05aca9d3685ebfefbe7b7b60e2fd33789f added SR1.1 support for
J721e HS with the idea that the default sysfw.itb will point to SR1.1.
For that to work, the config for SR1 has to explicitly disable creating
such symlink.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
index 80f3b969..9c285bae 100644
--- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
@@ -7,6 +7,7 @@ require conf/machine/include/k3r5.inc
 SYSFW_SOC = "j721e"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
+SYSFW_SYMLINK = ""
 
 UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"
 
-- 
2.25.1

[master/kirkstone][PATCH 49/65] k3conf: update SRCREV to add j721S2 fixes

[Denys Dmytriyenko]

From: Bryan Brattlof <bb@ti.com>

update the SHA for k3conf to pickup the j721s2 fixes

Signed-off-by: Bryan Brattlof <bb@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
index af48337f..567e8d55 100644
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -8,7 +8,7 @@ PV = "0.2+git${SRCPV}"
 COMPATIBLE_MACHINE = "k3"
 
 BRANCH ?= "master"
-SRCREV = "4ca1c3d330bc1de779909e733483b09a1fc4fe44"
+SRCREV = "48cb8e8d7dc962229a9f318cd512b4ddeec5cdc5"
 
 SRC_URI = "git://git.ti.com/k3conf/k3conf.git;protocol=git;branch=${BRANCH}"
 
-- 
2.25.1

[master/kirkstone][PATCH 50/65] j7200-hs-evm-k3r5: Move J7200 HS evm support to PG2.0

[Denys Dmytriyenko]

From: Jonathan Humphreys <j-humphreys@ti.com>

With J7200 PG1.0 being deprecated, use PG2.0 sysfw when building images for j7200-hs-evm.
Also update k3-image-gen version to support this change.

Signed-off-by: Jonathan Humphreys <j-humphreys@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf     | 2 +-
 meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
index 488f19ec..3f134877 100644
--- a/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j7200-hs-evm-k3r5.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/k3r5.inc
 
-SYSFW_SOC = "j7200"
+SYSFW_SOC = "j7200_sr2"
 SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
 
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index d1a1f3a5..8aaf1559 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -25,7 +25,7 @@ SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
 
-K3_IMAGE_GEN_SRCREV ?= "f67a3696bb8d9efd052f40b6c67b742d63f6545c"
+K3_IMAGE_GEN_SRCREV ?= "85a70059fc24242ea03653a5014b98100e4da2d6"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"
 
-- 
2.25.1

[master/kirkstone][PATCH 51/65] kernel u-boot: Fix formulation of LOCALVERSION

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

devtool does not work with the current formulation of
the LOCALVERSION variables.  We need to use SRCPV to
avoid AUTOREV on bleeding builds, but there will be no
+ in the string, so we cannot split on that.  Just
use SRCPV directly.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc         | 2 +-
 meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index f470c95e..7a22161d 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -1,6 +1,6 @@
 # UBOOT_LOCALVERSION can be set to add a tag to the end of the
 # U-boot version string.  such as the commit id
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
+UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"
 
 UBOOT_SUFFIX ?= "img"
 SPL_BINARY ?= "MLO"
diff --git a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
index 1e97acc0..df7d9ac8 100644
--- a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
@@ -1,6 +1,6 @@
 # KERNEL_LOCALVERSION can be set to add a tag to the end of the
 # kernel version string.  such as the commit id
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
+KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).replace('AUTOINC+','')[:10]}"
 
 # Check the defconfig file and see if it points to an in kernel
 # defconfig that should be used, or if it is a complete config file
-- 
2.25.1

[master/kirkstone][PATCH 52/65] u-boot-ti-staging: Bump to 08.04.00.005 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the u-boot version for 08.04.00.005

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index a1d2f14c..f90519f9 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r31"
+PR = "r32"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "24bb75ba60e716a606bb90150348bfe3a21a5120"
+SRCREV = "a169f4261024397dd3ddb944decc1601a623df2a"
-- 
2.25.1

[master/kirkstone][PATCH 53/65] linux-ti-staging: Bump to 08.04.00.005 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.04.00.005

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 9a80870e..6d66b591 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "b56b1fd4a1c0e331114d15f7030bc8397a7e7b9b"
+SRCREV = "95b90aa828165df6c45d6bb0e1cce905e83a66a7"
 PV = "5.10.120+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.25.1

[master/kirkstone][PATCH 54/65] linux-ti-staging-rt: Bump to 08.04.00.005 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.04.00.005

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 016a81fe..06d5dd67 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "1872082f52dc08d10c9db367dd3530fb9b4e5a9c"
+SRCREV = "adb96c641cb03198db729962eb348ca1a16978e2"
 PV = "5.10.120+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 55/65] cadence-mhdp-fw: Lock firmware to j721e

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

This firmware is only applicable to the j721e platform and not
all j7 devices.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb | 2 +-
 meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
index f6797e2b..2f694202 100644
--- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -10,7 +10,7 @@ PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "j7"
+COMPATIBLE_MACHINE = "j721e"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
index 8acf614d..c6619b1d 100644
--- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
@@ -21,7 +21,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx-evm = " prueth-fw-am65x-sr2 p
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am64xx-evm = " prueth-fw-am65x-sr2"
 
 # Add run-time dependency for Cadence MHDP firmware to the rootfs
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " cadence-mhdp-fw"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " cadence-mhdp-fw"
 
 # Add run-time dependency for Video Decoding firmware to the rootfs
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7 = " vxd-dec-fw"
-- 
2.25.1

[master/kirkstone][PATCH 56/65] ti-linux-fw: Create K3_IMAGE_GEN_BRANCH variable

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

For the upcoming CICD flow we need to control the branch for
all of the needed packages.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 8aaf1559..0d947b49 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -29,9 +29,11 @@ K3_IMAGE_GEN_SRCREV ?= "85a70059fc24242ea03653a5014b98100e4da2d6"
 SRCREV_imggen = "${K3_IMAGE_GEN_SRCREV}"
 SRCREV_FORMAT = "imggen"
 
+K3_IMAGE_GEN_BRANCH ?= "master"
+
 SRC_URI = " \
 	git://git.ti.com/processor-firmware/ti-linux-firmware.git;protocol=git;branch=${BRANCH} \
-	git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=master;destsuffix=imggen;name=imggen \
+	git://git.ti.com/k3-image-gen/k3-image-gen.git;protocol=git;branch=${K3_IMAGE_GEN_BRANCH};destsuffix=imggen;name=imggen \
 "
 
 S = "${WORKDIR}/git"
-- 
2.25.1

[master/kirkstone][PATCH 57/65] u-boot-ti-staging: CI/CD Auto-Merger: cicd.2022.07.30.15:19:12

[Denys Dmytriyenko]

From: LCPD Automation Script <lcpdbld@list.ti.com>

Updated the value(s) for:
  SRCREV

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index f90519f9..5560d1a1 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -6,4 +6,4 @@ PR = "r32"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "a169f4261024397dd3ddb944decc1601a623df2a"
+SRCREV = "a3f87b40a1b6744261d1ac351fe2566dbf64bc66"
-- 
2.25.1

[master/kirkstone][PATCH 58/65] linux-ti-staging: Bump to 08.04.01.001 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.04.01.001

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
index 6d66b591..c23b4f18 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 BRANCH = "ti-linux-5.10.y"
 
-SRCREV = "95b90aa828165df6c45d6bb0e1cce905e83a66a7"
+SRCREV = "553874e9bc2cd24265c7b56692e1eb29d5f46b17"
 PV = "5.10.120+git${SRCPV}"
 
 # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-- 
2.25.1

[master/kirkstone][PATCH 59/65] linux-ti-staging-rt: Bump to 08.04.01.001 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.04.01.001

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index 06d5dd67..14775d15 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
@@ -6,5 +6,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-5.10:"
 
 BRANCH = "ti-rt-linux-5.10.y"
 
-SRCREV = "adb96c641cb03198db729962eb348ca1a16978e2"
+SRCREV = "614438c4da01dd40a99d7c4165f3c86f82f000a3"
 PV = "5.10.120+git${SRCPV}"
-- 
2.25.1

[master/kirkstone][PATCH 60/65] ti-linux-fw: Bump to 08.04.01.001 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the ti-linux-fw version for 08.04.01.001

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 0d947b49..6f451439 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -20,7 +20,7 @@ IMG_DEC_FW_VERSION = "1.0"
 CNM_WAVE521_FW_VERSION = "1.0.00"
 TIFS_LPM_STUB_FW_VERSION = "08.03.02"
 
-TI_LINUX_FW_SRCREV ?= "2d9a1002663a20673d942826c558ba4b472ffe9a"
+TI_LINUX_FW_SRCREV ?= "5f34a3a9bd5a9c93974ffec41da81b916f794efc"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
 
 BRANCH ?= "ti-linux-firmware"
-- 
2.25.1

[master/kirkstone][PATCH 61/65] conf: machine: Make multi-certificate image the default

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

Only the first two K3 devices do not support multi-cert boot so
lets make multi-cert the default and only add back sysfw.itb
for these two devices.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: lines be preserved?
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/conf/machine/include/am62xx.inc | 3 ---
 meta-ti-bsp/conf/machine/include/am64xx.inc | 3 ---
 meta-ti-bsp/conf/machine/include/am65xx.inc | 5 ++++-
 meta-ti-bsp/conf/machine/include/k3.inc     | 5 +----
 meta-ti-bsp/conf/machine/j7200-evm.conf     | 3 ---
 meta-ti-bsp/conf/machine/j721e-evm.conf     | 3 +++
 meta-ti-bsp/conf/machine/j721e-hs-evm.conf  | 1 -
 meta-ti-bsp/conf/machine/j721s2-evm.conf    | 3 ---
 8 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index 80df1844..a5aad994 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -12,9 +12,6 @@ PREFERRED_PROVIDER_virtual/libgles2 ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/libgbm ?= "ti-img-rogue-umlibs"
 PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
 
-# AM62 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
 do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index 87791ef7..297d6007 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -14,9 +14,6 @@ KERNEL_DEVICETREE = " \
     ti/k3-am642-evm-nand.dtbo \
 "
 
-# AM64 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
 do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index d6bd9810..80aa6d27 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -28,9 +28,12 @@ KERNEL_DEVICETREE = " \
 
 BBMULTICONFIG += "k3r5-sr2"
 
-# Use default IMAGE_BOOT_FILES_LEGACY files
+# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+IMAGE_BOOT_FILES += "sysfw.itb"
+
 # Since default sysfw.itb on AM65x is for SR2.0, add a version for SR1.0
 IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
+
 do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
 
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index 5b5fb1b6..8a32e0fe 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -39,10 +39,7 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 
-IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb"
-IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
-
-IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
+IMAGE_BOOT_FILES ?= "${SPL_BINARYNAME} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
 IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 
 EFI_PROVIDER ?= "grub-efi"
diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
index 175d30f8..303ec182 100644
--- a/meta-ti-bsp/conf/machine/j7200-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
@@ -13,8 +13,5 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j7200_evm_a72_config"
 
-# J7200 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
 do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
index fe28e6f5..d28d16d1 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -7,6 +7,9 @@ require conf/machine/include/j721e.inc
 SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
 
+# Since J721e does not support multi-cert tiboot3.bin add standalone sysfw.itb
+IMAGE_BOOT_FILES += "sysfw.itb"
+
 KERNEL_DEVICETREE = " \
     ti/k3-j721e-common-proc-board.dtb \
     ti/k3-j721e-common-proc-board-infotainment.dtbo \
diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
index 56eaa64e..a24a986b 100644
--- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
@@ -20,7 +20,6 @@ UBOOT_SYMLINK = "u-boot.img"
 
 BBMULTICONFIG += "k3r5-sr1-1"
 
-# Use default IMAGE_BOOT_FILES_LEGACY files
 # Since default sysfw.itb on J721e is for SR1.1, add a version for SR1.0
 IMAGE_BOOT_FILES += "sysfw-j721e-evm.itb"
 do_image_wic[mcdepends] += "mc::k3r5-sr1-1:ti-sci-fw:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index bbe011c0..77fc3e66 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -16,8 +16,5 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
 
-# J721S2 supports multi-certificate images, use the same
-IMAGE_BOOT_FILES = "${IMAGE_BOOT_FILES_MULTI_CERT}"
-
 do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
 do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy"
-- 
2.25.1

Re: [meta-ti] [master/kirkstone][PATCH 61/65] conf: machine: Make multi-certificate image the default

[Andrew Davis]

On 9/12/22 10:55 PM, Denys Dmytriyenko wrote:
> From: Andrew Davis <afd@ti.com>
> 
> Only the first two K3 devices do not support multi-cert boot so
> lets make multi-cert the default and only add back sysfw.itb
> for these two devices.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> Reviewed-by: lines be preserved?

By who?..

> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> ---

Re: [meta-ti] [master/kirkstone][PATCH 61/65] conf: machine: Make multi-certificate image the default

[Denys Dmytriyenko]

On Tue, Oct 04, 2022 at 02:38:11PM -0500, Andrew Davis wrote:
> On 9/12/22 10:55 PM, Denys Dmytriyenko wrote:
> >From: Andrew Davis <afd@ti.com>
> >
> >Only the first two K3 devices do not support multi-cert boot so
> >lets make multi-cert the default and only add back sysfw.itb
> >for these two devices.
> >
> >Signed-off-by: Andrew Davis <afd@ti.com>
> >Reviewed-by: lines be preserved?
> 
> By who?..

That's how the original patch got merged :)

https://git.yoctoproject.org/meta-ti/commit/?h=dunfell&id=038148a6d018c971e15a89c80192179fc04cf170

I'm guessing patchwork picked up part of our discussion.

https://patchwork.yoctoproject.org/project/ti/patch/20220801214007.25463-1-afd@ti.com/


> >Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>

-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

Re: [meta-ti] [master/kirkstone][PATCH 61/65] conf: machine: Make multi-certificate image the default

[Andrew Davis]

On 10/4/22 2:42 PM, Denys Dmytriyenko wrote:
> On Tue, Oct 04, 2022 at 02:38:11PM -0500, Andrew Davis wrote:
>> On 9/12/22 10:55 PM, Denys Dmytriyenko wrote:
>>> From: Andrew Davis <afd@ti.com>
>>>
>>> Only the first two K3 devices do not support multi-cert boot so
>>> lets make multi-cert the default and only add back sysfw.itb
>>> for these two devices.
>>>
>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>> Reviewed-by: lines be preserved?
>>
>> By who?..
> 
> That's how the original patch got merged :)
> 
> https://git.yoctoproject.org/meta-ti/commit/?h=dunfell&id=038148a6d018c971e15a89c80192179fc04cf170
> 
> I'm guessing patchwork picked up part of our discussion.
> 
> https://patchwork.yoctoproject.org/project/ti/patch/20220801214007.25463-1-afd@ti.com/
> 

Ah, yup there it is :)

Also looks like this forward port dropped the removal of some lines in
j7.inc, but at this point I'll just clean that up after, this has been
in -next long enough and should just go in already..

Andrew

> 
>>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> 

Re: [meta-ti] [master/kirkstone][PATCH 61/65] conf: machine: Make multi-certificate image the default

[Denys Dmytriyenko]

On Tue, Oct 04, 2022 at 02:46:24PM -0500, Andrew Davis wrote:
> On 10/4/22 2:42 PM, Denys Dmytriyenko wrote:
> >On Tue, Oct 04, 2022 at 02:38:11PM -0500, Andrew Davis wrote:
> >>On 9/12/22 10:55 PM, Denys Dmytriyenko wrote:
> >>>From: Andrew Davis <afd@ti.com>
> >>>
> >>>Only the first two K3 devices do not support multi-cert boot so
> >>>lets make multi-cert the default and only add back sysfw.itb
> >>>for these two devices.
> >>>
> >>>Signed-off-by: Andrew Davis <afd@ti.com>
> >>>Reviewed-by: lines be preserved?
> >>
> >>By who?..
> >
> >That's how the original patch got merged :)
> >
> >https://git.yoctoproject.org/meta-ti/commit/?h=dunfell&id=038148a6d018c971e15a89c80192179fc04cf170
> >
> >I'm guessing patchwork picked up part of our discussion.
> >
> >https://patchwork.yoctoproject.org/project/ti/patch/20220801214007.25463-1-afd@ti.com/
> >
> 
> Ah, yup there it is :)
> 
> Also looks like this forward port dropped the removal of some lines in
> j7.inc,

There's batch #2 with remaining dunfell commits pending.


> but at this point I'll just clean that up after, this has been
> in -next long enough and should just go in already..

Ryan?


> Andrew
> 
> >
> >>>Signed-off-by: Ryan Eatmon <reatmon@ti.com>
> >>>Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>

Re: [meta-ti] [master/kirkstone][PATCH 61/65] conf: machine: Make multi-certificate image the default

[Ryan Eatmon]

On 10/4/2022 14:49, Denys Dmytriyenko wrote:
> On Tue, Oct 04, 2022 at 02:46:24PM -0500, Andrew Davis wrote:
>> On 10/4/22 2:42 PM, Denys Dmytriyenko wrote:
>>> On Tue, Oct 04, 2022 at 02:38:11PM -0500, Andrew Davis wrote:
>>>> On 9/12/22 10:55 PM, Denys Dmytriyenko wrote:
>>>>> From: Andrew Davis <afd@ti.com>
>>>>>
>>>>> Only the first two K3 devices do not support multi-cert boot so
>>>>> lets make multi-cert the default and only add back sysfw.itb
>>>>> for these two devices.
>>>>>
>>>>> Signed-off-by: Andrew Davis <afd@ti.com>
>>>>> Reviewed-by: lines be preserved?
>>>>
>>>> By who?..
>>>
>>> That's how the original patch got merged :)
>>>
>>> https://git.yoctoproject.org/meta-ti/commit/?h=dunfell&id=038148a6d018c971e15a89c80192179fc04cf170
>>>
>>> I'm guessing patchwork picked up part of our discussion.
>>>
>>> https://patchwork.yoctoproject.org/project/ti/patch/20220801214007.25463-1-afd@ti.com/
>>>
>>
>> Ah, yup there it is :)
>>
>> Also looks like this forward port dropped the removal of some lines in
>> j7.inc,
> 
> There's batch #2 with remaining dunfell commits pending.
> 
> 
>> but at this point I'll just clean that up after, this has been
>> in -next long enough and should just go in already..
> 
> Ryan?

Going in today.


> 
>> Andrew
>>
>>>
>>>>> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
>>>>> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
>>>>>
>>>>>
>>>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>>> Links: You receive all messages sent to this group.
>>>>> View/Reply Online (#15108): https://lists.yoctoproject.org/g/meta-ti/message/15108
>>>>> Mute This Topic: https://lists.yoctoproject.org/mt/93648962/6551054
>>>>> Group Owner: meta-ti+owner@lists.yoctoproject.org
>>>>> Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [reatmon@ti.com]
>>>>> -=-=-=-=-=-=-=-=-=-=-=-
>>>>>

-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS

[master/kirkstone][PATCH 62/65] u-boot-ti: Do not prepend output files with DEPLOYDIR

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

We already cd into DEPLOYDIR so this is not needed. This now matches the
keystone version below. Also fixes build in some odd situations.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc | 36 ++++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index 7a22161d..d29c80cf 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -174,15 +174,15 @@ do_deploy:append () {
 				then
 					cd ${DEPLOYDIR}
 					if [ "x${SPL_UART_BINARY}" != "x" ]; then
-						install ${B}/${config}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}-${type}
-						rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
-						ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}-${type}
-						ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_BINARY}
-						ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}-${type}
-						ln -sf ${SPL_UART_IMAGE}-${type} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+						install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
+						rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
+						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
+						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
+						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
+						ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
 					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
-						install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}-${type}
+						install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
 						rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
 						ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
 						ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
@@ -190,7 +190,7 @@ do_deploy:append () {
 						ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
 					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
-						install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}-${type}
+						install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
 						rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
 						ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
 						ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
@@ -198,7 +198,7 @@ do_deploy:append () {
 						ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
 					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
-						install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}-${type}
+						install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
 						rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
 						ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
 						ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
@@ -206,7 +206,7 @@ do_deploy:append () {
 						ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
 					fi
 					if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
-						install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}-${type}
+						install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
 						rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
 						ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
 						ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
@@ -221,31 +221,31 @@ do_deploy:append () {
 	else
 		cd ${DEPLOYDIR}
 		if [ "x${SPL_UART_BINARY}" != "x" ]; then
-			install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE}
-			rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
-			ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY}
-			ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK}
+			install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}
+			rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
+			ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
+			ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
 		fi
 		if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
-			install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE}
+			install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}
 			rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
 			ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
 			ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
 		fi
 		if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
-			install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE}
+			install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}
 			rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
 			ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
 			ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
 		fi
 		if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
-			install ${B}/${UBOOT_HS_ISSW_BINARY} ${DEPLOYDIR}/${UBOOT_HS_ISSW_IMAGE}
+			install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}
 			rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
 			ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK}
 			ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY}
 		fi
 		if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
-			install ${B}/${UBOOT_HS_2ND_BINARY} ${DEPLOYDIR}/${UBOOT_HS_2ND_IMAGE}
+			install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}
 			rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
 			ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK}
 			ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
-- 
2.25.1

[master/kirkstone][PATCH 63/65] optee-os: Allow build to continue without TI_SECURE_DEV_PKG set

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
index 5d50a04f..e268a542 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
+++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend
@@ -41,7 +41,12 @@ optee_sign_legacyhs() {
 # Signing procedure for K3 HS devices
 optee_sign_k3hs() {
     ( cd ${B}/core/; \
-        ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \
+        if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \
+            ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee-pager_v2.bin tee-pager.bin.signed; \
+        else \
+            echo "Warning: TI_SECURE_DEV_PKG not set, OP-TEE not signed."; \
+            cp tee-pager_v2.bin tee-pager.bin.signed; \
+        fi; \
         mv tee-pager.bin.signed ${B}/bl32.bin; \
         cp tee.elf ${B}/bl32.elf; \
     )
-- 
2.25.1

[master/kirkstone][PATCH 64/65] trusted-firmware-a: Allow build to continue without TI_SECURE_DEV_PKG set

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../trusted-firmware-a_%.bbappend             | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 41241a57..14463846 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -9,42 +9,36 @@ TFA_SPD:k3 = "opteed"
 EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
 EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
 
-do_compile:append:am65xx-hs-evm() {
+# Signing procedure for K3 HS devices
+tfa_sign_k3hs() {
 	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
 	( cd ${BUILD_DIR}; \
 		mv bl31.bin bl31.bin.unsigned; \
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
+		if [ -f ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ]; then \
+			${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
+		else \
+			echo "Warning: TI_SECURE_DEV_PKG not set, TF-A not signed."; \
+			cp bl31.bin.unsigned bl31.bin; \
+		fi; \
 	)
 }
 
+do_compile:append:am65xx-hs-evm() {
+	tfa_sign_k3hs
+}
+
 do_compile:append:am64xx-hs-evm() {
-	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-	( cd ${BUILD_DIR}; \
-		mv bl31.bin bl31.bin.unsigned; \
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
-	)
+	tfa_sign_k3hs
 }
 
 do_compile:append:j721e-hs-evm() {
-	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-	( cd ${BUILD_DIR}; \
-		mv bl31.bin bl31.bin.unsigned; \
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
-	)
+	tfa_sign_k3hs
 }
 
 do_compile:append:j7200-hs-evm() {
-	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-	( cd ${BUILD_DIR}; \
-		mv bl31.bin bl31.bin.unsigned; \
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
-	)
+	tfa_sign_k3hs
 }
 
 do_compile:append:j721s2-hs-evm() {
-	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-	( cd ${B}/${BUILD_DIR}/release/; \
-		mv bl31.bin bl31.bin.unsigned; \
-		${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh bl31.bin.unsigned bl31.bin; \
-	)
+	tfa_sign_k3hs
 }
-- 
2.25.1

[master/kirkstone][PATCH 65/65] prueth-fw: Deploy for AM64xx based on SoC not EVM

[Denys Dmytriyenko]

From: Andrew Davis <afd@ti.com>

This makes sense but looks like was done wrong to match AM65xx which
needed the exact EVM specified due to this only working on SR2.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb | 2 +-
 meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
index 4eb48959..28c02698 100644
--- a/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
+++ b/meta-ti-bsp/recipes-bsp/prueth-fw/prueth-fw-am65x-sr2_git.bb
@@ -7,7 +7,7 @@ PR = "${INC_PR}.0"
 
 CLEANBROKEN = "1"
 
-COMPATIBLE_MACHINE = "am65xx-evm|am64xx-evm"
+COMPATIBLE_MACHINE = "am65xx-evm|am64xx"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
index c6619b1d..1071a278 100644
--- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
@@ -18,7 +18,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw"
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x"
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx-evm = " prueth-fw-am65x-sr2 prusw-fw-am65x-sr2"
-RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am64xx-evm = " prueth-fw-am65x-sr2"
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am64xx = " prueth-fw-am65x-sr2"
 
 # Add run-time dependency for Cadence MHDP firmware to the rootfs
 RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " cadence-mhdp-fw"
-- 
2.25.1