Date   

Re: [dunfell][PATCH v3] conf: machine: wic: Fix HS image boot partition

Ryan Eatmon
 

On 6/9/2022 9:59, Andrew Davis wrote:
From: Manorit Chawdhry <m-chawdhry@...>
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@...>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@...>
---
Changes from v2:
- Added UBOOT_SYMLINK to fix missing u-boot.img image
conf/machine/am64xx-hs-evm.conf | 3 +--
conf/machine/am65xx-hs-evm.conf | 3 +--
conf/machine/include/k3.inc | 5 +++--
conf/machine/j7-hs-evm.conf | 3 +--
conf/machine/j7200-hs-evm.conf | 3 +--
5 files changed, 7 insertions(+), 10 deletions(-)

I am getting build errors for several of the HS platforms related to this change. The meta-arago/meta-arago-distro/recipces-core/images/tisdk-core-bundle.bb recipe is failing because the u-boot-<MACHINE>.img file is not in the deploy/images directory.

When I drop the patch all of the builds work correctly.



diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
index 44e81463..ebbe2e62 100644
--- a/conf/machine/am64xx-hs-evm.conf
+++ b/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/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
index e4eebb6a..de92cacb 100644
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/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/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index e0970698..f85e6b98 100644
--- a/conf/machine/include/k3.inc
+++ b/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"
@@ -40,8 +41,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}"
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
index f2e3ccf5..ece0d85e 100644
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-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"
diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
index a5bd637e..8821ffac 100644
--- a/conf/machine/j7200-hs-evm.conf
+++ b/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}"
--
Ryan Eatmon reatmon@...
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS


[dunfell][PATCH v5 2/2] optee: Upgrade to upstream 3.17.0

Andrew Davis
 

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@...>
---

Changes from v4:
- Bumped optee-os commit to latest for upstream bug fix

Changes from v3:
- Added note about SYSFW version req
- Updated optee-os SRCREV to newer commit

Changes from v2:
- Switch OPTEEMACHINE
- Update optee-examples

conf/machine/include/am62xx.inc | 2 +-
conf/machine/include/am64xx.inc | 2 +-
.../optee/optee-client_%.bbappend | 2 ++
.../optee/optee-examples_%.bbappend | 2 ++
...ow-setting-sysroot-for-libgcc-lookup.patch | 34 -------------------
...0007-allow-setting-sysroot-for-clang.patch | 29 ----------------
recipes-security/optee/optee-os_%.bbappend | 14 +++-----
recipes-security/optee/optee-test_%.bbappend | 5 +++
8 files changed, 15 insertions(+), 75 deletions(-)
create mode 100644 recipes-security/optee/optee-client_%.bbappend
create mode 100644 recipes-security/optee/optee-examples_%.bbappend
delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch
create mode 100644 recipes-security/optee/optee-test_%.bbappend

diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc
index 7c902724..0231235f 100644
--- a/conf/machine/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -12,5 +12,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-am62x"
OPTEEOUTPUTMACHINE = "k3"
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
index bc5b085c..3d84bd70 100644
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -17,7 +17,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"
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"
OPTEEOUTPUTMACHINE = "k3"

# Set the list of device targets for ti-pdk class recipes
diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend
new file mode 100644
index 00000000..5675570a
--- /dev/null
+++ b/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/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend
new file mode 100644
index 00000000..19e32d9d
--- /dev/null
+++ b/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/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
deleted file mode 100644
index 17005396..00000000
--- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@...>
-Date: Tue, 26 May 2020 14:38:02 -0500
-Subject: [PATCH] allow setting sysroot for libgcc lookup
-
-Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching
-for the compiler libraries as there's no easy way to reliably pass --sysroot
-otherwise.
-
-Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188]
-Signed-off-by: Ross Burton <ross.burton@...>
----
- mk/gcc.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mk/gcc.mk b/mk/gcc.mk
-index adc77a24..81bfa78a 100644
---- a/mk/gcc.mk
-+++ b/mk/gcc.mk
-@@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \
- -print-file-name=include 2> /dev/null)
-
- # Get location of libgcc from gcc
--libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
-+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
- -print-libgcc-file-name 2> /dev/null)
--libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
-+libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
- -print-file-name=libstdc++.a 2> /dev/null)
--libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
-+libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
- -print-file-name=libgcc_eh.a 2> /dev/null)
-
- # Define these to something to discover accidental use
diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch
deleted file mode 100644
index 5c0d0a56..00000000
--- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <brett.warren@...>
-Date: Wed, 23 Sep 2020 09:27:34 +0100
-Subject: [PATCH] optee: enable clang support
-
-When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
-to provide a sysroot wasn't included, which results in not locating
-compiler-rt. This is mitigated by including the variable as ammended.
-
-Upstream-Status: Pending
-ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
-Signed-off-by: Brett Warren <brett.warren@...>
----
- mk/clang.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/clang.mk b/mk/clang.mk
-index 0f48c836..47465523 100644
---- a/mk/clang.mk
-+++ b/mk/clang.mk
-@@ -27,7 +27,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
-
- # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
- # libgcc for clang
--libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
-+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
- -rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
-
- # Core ASLR relies on the executable being ready to run from its preferred load
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
index 4e01ea74..7ff8377b 100644
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -1,14 +1,8 @@
-FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:"
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "15a746d28d10df3d79d72bc9fe4a5a654b88bcca"
+SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https"

-PV_ti-soc = "3.12.0+git${SRCPV}"
-
-SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d"
-
-SRC_URI_ti-soc = " \
- git://github.com/OP-TEE/optee_os.git \
- file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
- file://0007-allow-setting-sysroot-for-clang.patch \
-"
+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 ''}"

diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend
new file mode 100644
index 00000000..d81ae521
--- /dev/null
+++ b/recipes-security/optee/optee-test_%.bbappend
@@ -0,0 +1,5 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25"
+SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https"
+
+DEPENDS_append_ti-soc = " python3-cryptography-native"
--
2.36.1


[dunfell][PATCH v5 1/2] trusted-firmware-a: Update to latest upstream master

Andrew Davis
 

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@...>
Reviewed-by: Praneeth Bajjuri <praneeth@...>
---

Changes from v4:
- Added Praneeth's Reviewed-by

recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 68bfa899..207f3dac 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/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"
+SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934"
COMPATIBLE_MACHINE_k3 = "k3"
TFA_BUILD_TARGET_k3 = "all"
TFA_INSTALL_TARGET_k3 = "bl31"
--
2.36.1


[dunfell][PATCH 1/4] u-boot-ti-staging: Bump to 08.04.00.001 release

Ryan Eatmon
 

Updated the u-boot version for 08.04.00.001

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

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 55ea6b8a..0386bff4 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/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.17.1


[dunfell][PATCH 4/4] ti-linux-fw: Bump to 08.04.00.001 release

Ryan Eatmon
 

Updated the ti-linux-fw version for 08.04.00.001

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

diff --git a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 52766ac0..ffbb1bba 100644
--- a/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/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.17.1


[dunfell][PATCH 0/4] Update to 08.04.00.001

Ryan Eatmon
 

Update u-boot, linux, linux rt and ti-linux-fw to 08.04.00.001 tag

Ryan Eatmon (4):
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

recipes-bsp/ti-linux-fw/ti-linux-fw.inc | 4 ++--
recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb | 4 ++--
recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 4 ++--
recipes-kernel/linux/linux-ti-staging_5.10.bb | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)

--
2.17.1


[dunfell][PATCH 2/4] linux-ti-staging: Bump to 08.04.00.001 release

Ryan Eatmon
 

Updated the linux version for 08.04.00.001

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

diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb
index ef0b77d5..c440835d 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/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.17.1


[dunfell][PATCH 3/4] linux-ti-staging-rt: Bump to 08.04.00.001 release

Ryan Eatmon
 

Updated the linux rt version for 08.04.00.001

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

diff --git a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index c19f9054..1f711c36 100644
--- a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/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.17.1


Re: [dunfell][PATCH v3] conf: machine: wic: Fix HS image boot partition

Ryan Eatmon
 

On 6/15/2022 13:58, Andrew Davis wrote:
On 6/15/22 1:55 PM, Ryan Eatmon wrote:


On 6/15/2022 10:57, Jayesh Choudhary wrote:


On 15/06/22 20:41, Andrew Davis wrote:
On 6/15/22 9:52 AM, Ryan Eatmon wrote:


On 6/14/2022 3:20, Manorit Chawdhry wrote:
On 09:59-20220609, Andrew Davis wrote:
From: Manorit Chawdhry <m-chawdhry@...>

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@...>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@...>
---

Changes from v2:
  - Added UBOOT_SYMLINK to fix missing u-boot.img image
LGTM.

Acked-by: Manorit Chawdhry <m-chawdhry@...>

I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?


We can make a delta patch to fixup j721s2 after this goes in.

Andrew,

There was a second patch in V1, but it is missing in V2 and V3.  Did you mean to drop it?  Or is that coming later?  I just want to make sure I don't miss something you meant to have patched.

'conf: machine: Make multi-certificate image the default'?
I just dropped it for now, it is un-related to the first patch.
It is still valid and if you would like you can take the v1
of that patch, it would save me from having to send it
again as a standalone..
Andrew

Thank you.


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


Re: [dunfell][PATCH v3] conf: machine: wic: Fix HS image boot partition

Andrew Davis
 

On 6/15/22 1:55 PM, Ryan Eatmon wrote:
On 6/15/2022 10:57, Jayesh Choudhary wrote:


On 15/06/22 20:41, Andrew Davis wrote:
On 6/15/22 9:52 AM, Ryan Eatmon wrote:


On 6/14/2022 3:20, Manorit Chawdhry wrote:
On 09:59-20220609, Andrew Davis wrote:
From: Manorit Chawdhry <m-chawdhry@...>

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@...>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@...>
---

Changes from v2:
  - Added UBOOT_SYMLINK to fix missing u-boot.img image
LGTM.

Acked-by: Manorit Chawdhry <m-chawdhry@...>

I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?


We can make a delta patch to fixup j721s2 after this goes in.
Andrew,
There was a second patch in V1, but it is missing in V2 and V3.  Did you mean to drop it?  Or is that coming later?  I just want to make sure I don't miss something you meant to have patched.
'conf: machine: Make multi-certificate image the default'?

I just dropped it for now, it is un-related to the first patch.
It is still valid and if you would like you can take the v1
of that patch, it would save me from having to send it
again as a standalone..

Andrew


Re: [dunfell][PATCH v3] conf: machine: wic: Fix HS image boot partition

Ryan Eatmon
 

On 6/15/2022 10:57, Jayesh Choudhary wrote:
On 15/06/22 20:41, Andrew Davis wrote:
On 6/15/22 9:52 AM, Ryan Eatmon wrote:


On 6/14/2022 3:20, Manorit Chawdhry wrote:
On 09:59-20220609, Andrew Davis wrote:
From: Manorit Chawdhry <m-chawdhry@...>

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@...>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@...>
---

Changes from v2:
  - Added UBOOT_SYMLINK to fix missing u-boot.img image
LGTM.

Acked-by: Manorit Chawdhry <m-chawdhry@...>

I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?


We can make a delta patch to fixup j721s2 after this goes in.

Andrew,

There was a second patch in V1, but it is missing in V2 and V3. Did you mean to drop it? Or is that coming later? I just want to make sure I don't miss something you meant to have patched.


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


Re: [dunfell][PATCH v3] conf: machine: wic: Fix HS image boot partition

Jayesh Choudhary
 

On 15/06/22 20:41, Andrew Davis wrote:
On 6/15/22 9:52 AM, Ryan Eatmon wrote:


On 6/14/2022 3:20, Manorit Chawdhry wrote:
On 09:59-20220609, Andrew Davis wrote:
From: Manorit Chawdhry <m-chawdhry@...>

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@...>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@...>
---

Changes from v2:
  - Added UBOOT_SYMLINK to fix missing u-boot.img image
LGTM.

Acked-by: Manorit Chawdhry <m-chawdhry@...>

I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?

We can make a delta patch to fixup j721s2 after this goes in.
Jayesh,
Can you take that action, see what we did here for each platform and
do the same for j721s2-hs and submit a patch.
Andrew

Okay sure!! I will post the delta patch.

-Jayesh


Re: [dunfell][PATCH v3] conf: machine: wic: Fix HS image boot partition

Andrew Davis
 

On 6/15/22 9:52 AM, Ryan Eatmon wrote:
On 6/14/2022 3:20, Manorit Chawdhry wrote:
On 09:59-20220609, Andrew Davis wrote:
From: Manorit Chawdhry <m-chawdhry@...>

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@...>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@...>
---

Changes from v2:
  - Added UBOOT_SYMLINK to fix missing u-boot.img image
LGTM.

Acked-by: Manorit Chawdhry <m-chawdhry@...>
I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?

We can make a delta patch to fixup j721s2 after this goes in.

Jayesh,

Can you take that action, see what we did here for each platform and
do the same for j721s2-hs and submit a patch.

Andrew




  conf/machine/am64xx-hs-evm.conf | 3 +--
  conf/machine/am65xx-hs-evm.conf | 3 +--
  conf/machine/include/k3.inc     | 5 +++--
  conf/machine/j7-hs-evm.conf     | 3 +--
  conf/machine/j7200-hs-evm.conf  | 3 +--
  5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
index 44e81463..ebbe2e62 100644
--- a/conf/machine/am64xx-hs-evm.conf
+++ b/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/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
index e4eebb6a..de92cacb 100644
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/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/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index e0970698..f85e6b98 100644
--- a/conf/machine/include/k3.inc
+++ b/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"
@@ -40,8 +41,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}"
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
index f2e3ccf5..ece0d85e 100644
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-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"
diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
index a5bd637e..8821ffac 100644
--- a/conf/machine/j7200-hs-evm.conf
+++ b/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}"
--
2.36.1


Re: [dunfell][PATCH v3] conf: machine: wic: Fix HS image boot partition

Ryan Eatmon
 

On 6/14/2022 3:20, Manorit Chawdhry wrote:
On 09:59-20220609, Andrew Davis wrote:
From: Manorit Chawdhry <m-chawdhry@...>

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@...>
[afd: Extended fix to all HS platforms]
Signed-off-by: Andrew Davis <afd@...>
---

Changes from v2:
- Added UBOOT_SYMLINK to fix missing u-boot.img image
LGTM.
Acked-by: Manorit Chawdhry <m-chawdhry@...>

I hate to ask this, but I just merged in the patches to add j721s2-hs-evm support... do you want to make a V4 and make the same changes in that file? or do you want to submit another patch to clean that up?




conf/machine/am64xx-hs-evm.conf | 3 +--
conf/machine/am65xx-hs-evm.conf | 3 +--
conf/machine/include/k3.inc | 5 +++--
conf/machine/j7-hs-evm.conf | 3 +--
conf/machine/j7200-hs-evm.conf | 3 +--
5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
index 44e81463..ebbe2e62 100644
--- a/conf/machine/am64xx-hs-evm.conf
+++ b/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/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
index e4eebb6a..de92cacb 100644
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/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/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
index e0970698..f85e6b98 100644
--- a/conf/machine/include/k3.inc
+++ b/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"
@@ -40,8 +41,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}"
diff --git a/conf/machine/j7-hs-evm.conf b/conf/machine/j7-hs-evm.conf
index f2e3ccf5..ece0d85e 100644
--- a/conf/machine/j7-hs-evm.conf
+++ b/conf/machine/j7-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"
diff --git a/conf/machine/j7200-hs-evm.conf b/conf/machine/j7200-hs-evm.conf
index a5bd637e..8821ffac 100644
--- a/conf/machine/j7200-hs-evm.conf
+++ b/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}"
--
2.36.1
--
Ryan Eatmon reatmon@...
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS


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

Ryan Eatmon
 

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

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index b2982b04..55ea6b8a 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/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.17.1


Re: [dunfell][PATCH v4 1/2] trusted-firmware-a: Update to latest upstream master

praneeth
 

On 6/15/2022 9:17 AM, Andrew Davis via lists.yoctoproject.org wrote:
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@...>
Reviewed-by: Praneeth Bajjuri <praneeth@...>


---
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 68bfa899..207f3dac 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/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"
+SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934"
COMPATIBLE_MACHINE_k3 = "k3"
TFA_BUILD_TARGET_k3 = "all"
TFA_INSTALL_TARGET_k3 = "bl31"


[dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

Andrew Davis
 

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@...>
---

Changes from v3:
- Added note about SYSFW version req
- Updated optee-os SRCREV to newer commit

Changes from v2:
- Switch OPTEEMACHINE
- Update optee-examples

conf/machine/include/am62xx.inc | 2 +-
conf/machine/include/am64xx.inc | 2 +-
.../optee/optee-client_%.bbappend | 2 ++
.../optee/optee-examples_%.bbappend | 2 ++
...ow-setting-sysroot-for-libgcc-lookup.patch | 34 -------------------
...0007-allow-setting-sysroot-for-clang.patch | 29 ----------------
recipes-security/optee/optee-os_%.bbappend | 14 +++-----
recipes-security/optee/optee-test_%.bbappend | 5 +++
8 files changed, 15 insertions(+), 75 deletions(-)
create mode 100644 recipes-security/optee/optee-client_%.bbappend
create mode 100644 recipes-security/optee/optee-examples_%.bbappend
delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch
create mode 100644 recipes-security/optee/optee-test_%.bbappend

diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc
index ff857b97..0364edd1 100644
--- a/conf/machine/include/am62xx.inc
+++ b/conf/machine/include/am62xx.inc
@@ -15,5 +15,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-am62x"
OPTEEOUTPUTMACHINE = "k3"
diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc
index 7646c70a..60ffacd5 100644
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -20,7 +20,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"
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"
OPTEEOUTPUTMACHINE = "k3"

# Set the list of device targets for ti-pdk class recipes
diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend
new file mode 100644
index 00000000..5675570a
--- /dev/null
+++ b/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/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend
new file mode 100644
index 00000000..19e32d9d
--- /dev/null
+++ b/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/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
deleted file mode 100644
index 17005396..00000000
--- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@...>
-Date: Tue, 26 May 2020 14:38:02 -0500
-Subject: [PATCH] allow setting sysroot for libgcc lookup
-
-Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching
-for the compiler libraries as there's no easy way to reliably pass --sysroot
-otherwise.
-
-Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188]
-Signed-off-by: Ross Burton <ross.burton@...>
----
- mk/gcc.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mk/gcc.mk b/mk/gcc.mk
-index adc77a24..81bfa78a 100644
---- a/mk/gcc.mk
-+++ b/mk/gcc.mk
-@@ -13,11 +13,11 @@ nostdinc$(sm) := -nostdinc -isystem $(shell $(CC$(sm)) \
- -print-file-name=include 2> /dev/null)
-
- # Get location of libgcc from gcc
--libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
-+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
- -print-libgcc-file-name 2> /dev/null)
--libstdc++$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
-+libstdc++$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
- -print-file-name=libstdc++.a 2> /dev/null)
--libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
-+libgcc_eh$(sm) := $(shell $(CXX$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CXXFLAGS$(arch-bits-$(sm))) $(comp-cxxflags$(sm)) \
- -print-file-name=libgcc_eh.a 2> /dev/null)
-
- # Define these to something to discover accidental use
diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch
deleted file mode 100644
index 5c0d0a56..00000000
--- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <brett.warren@...>
-Date: Wed, 23 Sep 2020 09:27:34 +0100
-Subject: [PATCH] optee: enable clang support
-
-When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
-to provide a sysroot wasn't included, which results in not locating
-compiler-rt. This is mitigated by including the variable as ammended.
-
-Upstream-Status: Pending
-ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
-Signed-off-by: Brett Warren <brett.warren@...>
----
- mk/clang.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/clang.mk b/mk/clang.mk
-index 0f48c836..47465523 100644
---- a/mk/clang.mk
-+++ b/mk/clang.mk
-@@ -27,7 +27,7 @@ comp-cflags-warns-clang := -Wno-language-extension-token \
-
- # Note, use the compiler runtime library (libclang_rt.builtins.*.a) instead of
- # libgcc for clang
--libgcc$(sm) := $(shell $(CC$(sm)) $(CFLAGS$(arch-bits-$(sm))) \
-+libgcc$(sm) := $(shell $(CC$(sm)) $(LIBGCC_LOCATE_CFLAGS) $(CFLAGS$(arch-bits-$(sm))) \
- -rtlib=compiler-rt -print-libgcc-file-name 2> /dev/null)
-
- # Core ASLR relies on the executable being ready to run from its preferred load
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend
index 4e01ea74..75bd28ea 100644
--- a/recipes-security/optee/optee-os_%.bbappend
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -1,14 +1,8 @@
-FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:"
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655"
+SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https"

-PV_ti-soc = "3.12.0+git${SRCPV}"
-
-SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d"
-
-SRC_URI_ti-soc = " \
- git://github.com/OP-TEE/optee_os.git \
- file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \
- file://0007-allow-setting-sysroot-for-clang.patch \
-"
+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 ''}"

diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend
new file mode 100644
index 00000000..d81ae521
--- /dev/null
+++ b/recipes-security/optee/optee-test_%.bbappend
@@ -0,0 +1,5 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25"
+SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https"
+
+DEPENDS_append_ti-soc = " python3-cryptography-native"
--
2.36.1


[dunfell][PATCH v4 1/2] trusted-firmware-a: Update to latest upstream master

Andrew Davis
 

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@...>
---
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 68bfa899..207f3dac 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/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"
+SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934"
COMPATIBLE_MACHINE_k3 = "k3"
TFA_BUILD_TARGET_k3 = "all"
TFA_INSTALL_TARGET_k3 = "bl31"
--
2.36.1


Re: [dunfell PATCH] k3conf: Update SRCREV to add J721S2 support

praneeth
 

On 6/14/2022 11:53 PM, Bryan Brattlof wrote:
update the SHA of k3conf to pickup j721s2 support
how about master branch?


Signed-off-by: Bryan Brattlof <bb@...>
Reviewed-by: Praneeth Bajjuri <praneeth@...>


---
recipes-devtools/k3conf/k3conf_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-devtools/k3conf/k3conf_git.bb b/recipes-devtools/k3conf/k3conf_git.bb
index 3f542da4aa96e..af48337f5cb4d 100644
--- a/recipes-devtools/k3conf/k3conf_git.bb
+++ b/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}"


[dunfell/master PATCH] linux-ti-staging: Update 5.10 kernel to 5.10.120

praneeth
 

Update linux 5.10 to 5.10.120 stable

Signed-off-by: Praneeth Bajjuri <praneeth@...>
---
recipes-kernel/linux/linux-ti-staging-rt_5.10.bb | 4 ++--
recipes-kernel/linux/linux-ti-staging_5.10.bb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb b/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
index c19f9054..31e7fcb1 100644
--- a/recipes-kernel/linux/linux-ti-staging-rt_5.10.bb
+++ b/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 = "6a6c6021dd80bb218c1d39fd9a79cb5db6f667e1"
+PV = "5.10.120+git${SRCPV}"
diff --git a/recipes-kernel/linux/linux-ti-staging_5.10.bb b/recipes-kernel/linux/linux-ti-staging_5.10.bb
index ef0b77d5..f4157134 100644
--- a/recipes-kernel/linux/linux-ti-staging_5.10.bb
+++ b/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 = "7d8201c5206f591356ecfd4ffea97f33ea0208aa"
+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.17.1

41 - 60 of 14873