[master][PATCH 00/10] sync up with Dunfell 08.03.00.003

[master][PATCH 00/10] sync up with Dunfell 08.03.00.003

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Sync up with Dunfell up to 08.03.00.003 release.
Plus couple minor fixes.

Denys Dmytriyenko (2):
  libdce: upgrade to 3.00.15.00 and specify branch
  dsptop: fix host contamination warning

Nishanth Menon (3):
  u-boot-ti: Use SRCPV instead of SRCREV for U_BOOT_LOCAL_VERSION
  recipes-kernel: setup-defconfig: Use SRCPV to update
    KERNEL_LOCALVERSION
  conf/machine: am62xx: Update build flag for low power mode

Praneeth Bajjuri (1):
  trusted-firmware-a: upgrade to v2.6+

Ryan Eatmon (4):
  recipes-bsp: tifs-lpm-stub: Introduce new recipe
  u-boot-ti-staging: Bump to 08.03.00.003 release
  linux-ti-staging: Bump to 08.03.00.003 release
  linux-ti-staging-rt: Bump to 08.03.00.003 release

 meta-ti-bsp/conf/machine/include/am62xx.inc   |  2 ++
 .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc   |  1 +
 .../tifs-lpm-stub/tifs-lpm-stub_git.bb        | 23 +++++++++++++++++++
 .../trusted-firmware-a_%.bbappend             |  5 ++--
 .../u-boot/u-boot-ti-staging_2021.01.bb       |  4 ++--
 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc  |  2 +-
 .../recipes-kernel/linux/kernel-rdepends.inc  |  4 ++++
 .../linux/linux-ti-staging-rt_5.10.bb         |  2 +-
 .../linux/linux-ti-staging_5.10.bb            |  2 +-
 .../recipes-kernel/linux/setup-defconfig.inc  | 10 +-------
 .../recipes-bsp/dsptop/dsptop_git.bb          |  1 +
 ...dce_3.00.14.00.bb => libdce_3.00.15.00.bb} |  6 ++---
 12 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb
 rename meta-ti-extras/recipes-multimedia/libdce/{libdce_3.00.14.00.bb => libdce_3.00.15.00.bb} (75%)

-- 
2.25.1

[master][PATCH 01/10] u-boot-ti: Use SRCPV instead of SRCREV for U_BOOT_LOCAL_VERSION

[Denys Dmytriyenko]

From: Nishanth Menon <nm@ti.com>

SRCREV works with fixed commits, but when we use AUTOREV for a
downstream distro bbappend, we will end up getting a bad local
revision.

Lets use SRCPV instead, which bitbake already deals with sensibly.

[1] https://www.yoctoproject.org/docs/2.5.1/dev-manual/dev-manual.html#automatically-incrementing-a-binary-package-revision-number

Fixes: 39fa0c1d3d02 ("u-boot-ti: Use SRCREV to get short commit ID")
Suggested-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Nishanth Menon <nm@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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5ddcaff7..dddf6284 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("SRCREV", False).__str__()[:10]}"
+UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
 
 UBOOT_SUFFIX ?= "img"
 SPL_BINARY ?= "MLO"
-- 
2.25.1

[master][PATCH 02/10] recipes-kernel: setup-defconfig: Use SRCPV to update KERNEL_LOCALVERSION

[Denys Dmytriyenko]

From: Nishanth Menon <nm@ti.com>

Due to recent security update[1] in git, a subprocess will be unable
to run git rev-parse to fetch revision.

So instead, use the SRCPV to parse the short commit ID and set the
KERNEL_LOCALVERSION variable.

[1] https://github.blog/2022-04-12-git-security-vulnerability-announced/

Inspired-by: Devarsh Thakkar <devarsht@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
index 850a1dd8..1e97acc0 100644
--- a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
@@ -1,14 +1,6 @@
 # KERNEL_LOCALVERSION can be set to add a tag to the end of the
 # kernel version string.  such as the commit id
-def get_git_revision(p):
-    import subprocess
-
-    try:
-        return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE, universal_newlines=True).communicate()[0].rstrip()
-    except OSError:
-        return None
-
-KERNEL_LOCALVERSION = "-g${@get_git_revision('${S}').__str__()[:10]}"
+KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).split('+')[1]}"
 
 # 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][PATCH 03/10] recipes-bsp: tifs-lpm-stub: Introduce new recipe

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

This firmware stub is required by the TI foundational security
software while transitioning to low power mode.

Add a recipe for this compatible with am62xx-evm

Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-bsp/ti-linux-fw/ti-linux-fw.inc   |  1 +
 .../tifs-lpm-stub/tifs-lpm-stub_git.bb        | 23 +++++++++++++++++++
 .../recipes-kernel/linux/kernel-rdepends.inc  |  4 ++++
 3 files changed, 28 insertions(+)
 create mode 100644 meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb

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 3ebdae30..47e76347 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
@@ -18,6 +18,7 @@ GOODIX_FW_VERSION = "1.0.0.0"
 CADENCE_MHDP_FW_VERSION = "1.2.17"
 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"
 SRCREV = "${TI_LINUX_FW_SRCREV}"
diff --git a/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb b/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb
new file mode 100644
index 00000000..90af55f1
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/tifs-lpm-stub/tifs-lpm-stub_git.bb
@@ -0,0 +1,23 @@
+SUMMARY = "TI Foundational security Low Power Management Stub"
+
+require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+
+PV = "${TIFS_LPM_STUB_FW_VERSION}"
+PR = "${INC_PR}.0"
+
+CLEANBROKEN = "1"
+
+COMPATIBLE_MACHINE = "am62xx-evm"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+S = "${WORKDIR}/git"
+
+TARGET = "ti-fs-stub-firmware-am62x-gp-signed.bin"
+
+do_install() {
+	install -d ${D}${nonarch_base_libdir}/firmware/ti-sysfw/
+	install -m 0644 ${S}/ti-sysfw/${TARGET} ${D}${nonarch_base_libdir}/firmware/ti-sysfw/${TARGET}
+}
+
+FILES:${PN} = "${nonarch_base_libdir}/firmware"
diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
index 8ceae8a1..bb2c1a00 100644
--- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc
@@ -28,3 +28,7 @@ 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"
+
+# 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][PATCH 04/10] trusted-firmware-a: upgrade to v2.6+

[Denys Dmytriyenko]

From: Praneeth Bajjuri <praneeth@ti.com>

upgrade arm-trusted-firmare to master which is currently v2.6+

This upgrade picks up am62x low power mode feature.

Signed-off-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          | 4 ++--
 1 file changed, 2 insertions(+), 2 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 5a2b4510..32f913ca 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,8 @@
-PV:k3 = "2.5"
+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 = "0693f356eb2a25adf8758d98058120bed082cc73"
+SRCREV_tfa:k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce"
 COMPATIBLE_MACHINE:k3 = "k3"
 TFA_BUILD_TARGET:k3 = "all"
 TFA_INSTALL_TARGET:k3 = "bl31"
-- 
2.25.1

[master][PATCH 05/10] conf/machine: am62xx: Update build flag for low power mode

[Denys Dmytriyenko]

From: Nishanth Menon <nm@ti.com>

Update build flag for arm-trusted-firmware to include low power mode
support

K3_PM_SYSTEM_SUSPEND is added in arm-trusted-firmware now which enables
low power mode support for am62xx.

Signed-off-by: Nishanth Menon <nm@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/include/am62xx.inc                     | 2 ++
 .../trusted-firmware-a/trusted-firmware-a_%.bbappend            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index bcf435f5..fff1312f 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -19,5 +19,7 @@ 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"
+TFA_K3_SYSTEM_SUSPEND = "1"
+
 OPTEEMACHINE = "k3-am65x"
 OPTEEOUTPUTMACHINE = "k3"
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 32f913ca..45d56451 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,6 +9,7 @@ TFA_INSTALL_TARGET:k3 = "bl31"
 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() {
 	export TI_SECURE_DEV_PKG=${TI_SECURE_DEV_PKG}
-- 
2.25.1

[master][PATCH 06/10] u-boot-ti-staging: Bump to 08.03.00.003 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the u-boot version for 08.03.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 03c73112..e3214c37 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 = "r24"
+PR = "r25"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "edbebb6447c16241031c21b47d27bd3484f78f42"
+SRCREV = "70c33dd821811a05c595f29ecac5abae23534768"
-- 
2.25.1

[master][PATCH 07/10] linux-ti-staging: Bump to 08.03.00.003 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux version for 08.03.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 d5c2c587..a0581cb4 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 = "45b6d4fdf6550061582b89d0b794a1cc7c1dc4b2"
+SRCREV = "9cff62efaca103acf18b8478362ec56e11d7f526"
 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][PATCH 08/10] linux-ti-staging-rt: Bump to 08.03.00.003 release

[Denys Dmytriyenko]

From: Ryan Eatmon <reatmon@ti.com>

Updated the linux rt version for 08.03.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 ad2ffedc..61327720 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 = "71d8b949868162e2aaac748ce569c1faf0b4b4f3"
+SRCREV = "44a4e68ecf519fd2e35417371fbac546c416d2d9"
 PV = "5.10.109+git${SRCPV}"
-- 
2.25.1

[master][PATCH 09/10] libdce: upgrade to 3.00.15.00 and specify branch

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Fixes these warnings:

| WARNING: libdce-3.00.14.00-r1 do_fetch: URL: git://git.omapzoom.org/repo/libdce.git;protocol=git
| does not set any branch parameter. The future default branch used by tools and repositories
| is uncertain and we will therefore soon require this is set in all git urls.
| WARNING: libdce-3.00.14.00-r1 do_unpack: URL: git://git.omapzoom.org/repo/libdce.git;protocol=git
| does not set any branch parameter. The future default branch used by tools and repositories
| is uncertain and we will therefore soon require this is set in all git urls.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../libdce/{libdce_3.00.14.00.bb => libdce_3.00.15.00.bb}   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta-ti-extras/recipes-multimedia/libdce/{libdce_3.00.14.00.bb => libdce_3.00.15.00.bb} (75%)

diff --git a/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.14.00.bb b/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
similarity index 75%
rename from meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.14.00.bb
rename to meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
index a6dc1d1d..54f6ff8a 100644
--- a/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.14.00.bb
+++ b/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
@@ -6,10 +6,8 @@ inherit autotools pkgconfig
 
 DEPENDS = "libdrm ti-ipc"
 
-SRC_URI = "git://git.omapzoom.org/repo/libdce.git;protocol=git"
-SRCREV = "f72096090e3063e85ea77cae66b2d99a48d91727"
-
-PR = "r1"
+SRC_URI = "git://git.omapzoom.org/repo/libdce.git;protocol=git;branch=master"
+SRCREV = "ec14e1d5cea1ed3c3ea0e2b9cf1fd581acff93e3"
 
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "IPC_HEADERS=${STAGING_INCDIR}/ti/ipc/mm"
-- 
2.25.1

[master][PATCH 10/10] dsptop: fix host contamination warning

[Denys Dmytriyenko]

From: Denys Dmytriyenko <denys@konsulko.com>

Fixes this warning:

| WARNING: dsptop-1.4.0-r2.2 do_package_qa: QA Issue: dsptop: /usr/bin/dsptop is owned by uid 1000,
| which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
index e8853ff8..90ce8943 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
@@ -15,6 +15,7 @@ EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX} CC="${CC
 
 do_install() {
     oe_runmake install DESTDIR=${D}
+    chown -R root:root ${D}
 }
 
 COMPATIBLE_MACHINE = "dra7xx"
-- 
2.25.1