Skip to contentSkip to conversation

trusted-firmware-a: Update to latest upstream master

PATCH Superseded Andrew Davis 3 participants 11 messages Jun 14, 2022 – Jun 16, 2022

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

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

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.

---
 recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +1 -3
index 68bfa899..207f3dac 100644
@@ -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"
Signature · 1 line
2.36.1
#1 lore raw

PATCH v4 2/2 optee: Upgrade to upstream 3.17.0

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+

---

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
conf/machine/include/am62xx.inc +1 -1
index ff857b97..0364edd1 100644
@@ -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"
conf/machine/include/am64xx.inc +1 -1
index 7646c70a..60ffacd5 100644
@@ -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
recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
deleted file mode 100644
index 17005396..00000000
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted +0 -29
deleted file mode 100644
index 5c0d0a56..00000000
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"
 
recipes-security/optee/optee-test_%.bbappend new file +5 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"
Signature · 1 line
2.36.1
#2 lore raw

Re: [meta-arago] [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

Wrong list?

Quoted 191 lines · Andrew Davis via lists.yoctoproject.org

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+

---

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
conf/machine/include/am62xx.inc +1 -1
index ff857b97..0364edd1 100644
@@ -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"
conf/machine/include/am64xx.inc +1 -1
index 7646c70a..60ffacd5 100644
@@ -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
recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
deleted file mode 100644
index 17005396..00000000
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted +0 -29
deleted file mode 100644
index 5c0d0a56..00000000
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"
 
recipes-security/optee/optee-test_%.bbappend new file +5 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"
Signature · 1 line
2.36.1
#3 lore raw

Re: [meta-arago] [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

Quoted 2 lines · Denys Dmytriyenko

Wrong list?

Oops, looks like it, re-sending over to meta-ti..

Quoted 193 lines · Andrew Davis via lists.yoctoproject.org
Quoted 191 lines

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+

---

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

conf/machine/include/am62xx.inc +1 -1
index ff857b97..0364edd1 100644
@@ -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"
conf/machine/include/am64xx.inc +1 -1
index 7646c70a..60ffacd5 100644
@@ -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
recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
deleted file mode 100644
index 17005396..00000000
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted +0 -29
deleted file mode 100644
index 5c0d0a56..00000000
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"
 
recipes-security/optee/optee-test_%.bbappend new file +5 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"
Signature · 1 line
2.36.1
#4 lore raw

Re: [meta-arago] [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

We still do need a patch for meta-arago to remove the optee stuff that you are moving to meta-ti...

Quoted 217 lines · Andrew Davis
Quoted 2 lines · Denys Dmytriyenko

Wrong list?

Oops, looks like it, re-sending over to meta-ti..

Quoted 211 lines · Andrew Davis via lists.yoctoproject.org
Quoted 209 lines

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+

---

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

conf/machine/include/am62xx.inc +0 -0
index ff857b97..0364edd1 100644
@@ -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"

conf/machine/include/am62xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am62x"

  OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am64xx.inc +0 -0
index 7646c70a..60ffacd5 100644
@@ -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"

conf/machine/include/am64xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"

  OPTEEOUTPUTMACHINE = "k3"
  # Set the list of device targets for ti-pdk class recipes

recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -0

deleted file mode 100644
index 17005396..00000000
---
a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch

+++ /dev/null

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -6
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -5
-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]

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -10
-Signed-off-by: Ross Burton <[email protected]>
----
- 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)

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -2
-
- # Define these to something to discover accidental use
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +0 -0

deleted file mode 100644
index 5c0d0a56..00000000
---
a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch

+++ /dev/null

recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +0 -24
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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

recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"

recipes-security/optee/optee-test_%.bbappend new file +3 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"

recipes-security/optee/optee-test_%.bbappend new file +2 -0
+
+DEPENDS_append_ti-soc = " python3-cryptography-native"
Signature · 1 line
2.36.1
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#5 lore raw

Re: [meta-arago] [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

Quoted 3 lines · Ryan Eatmon

We still do need a patch for meta-arago to remove the optee stuff that you are moving to meta-ti...

Sure, was going to send that after this goes in. It doesn't seem to hurt anything to have both, this one just overrides the meta-arago ones and nothing breaks.

Andrew

Quoted 196 lines · Andrew Davis
Quoted 193 lines · Denys Dmytriyenko
Quoted 2 lines

Wrong list?

Oops, looks like it, re-sending over to meta-ti..

Quoted 187 lines · Andrew Davis via lists.yoctoproject.org
Quoted 185 lines

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+

---

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

conf/machine/include/am62xx.inc +0 -0
index ff857b97..0364edd1 100644
@@ -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"

conf/machine/include/am62xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am62x"

  OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am64xx.inc +0 -0
index 7646c70a..60ffacd5 100644
@@ -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"

conf/machine/include/am64xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"

  OPTEEOUTPUTMACHINE = "k3"
  # Set the list of device targets for ti-pdk class recipes

recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
deleted file mode 100644
index 17005396..00000000
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted +0 -29
deleted file mode 100644
index 5c0d0a56..00000000
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"

recipes-security/optee/optee-test_%.bbappend new file +5 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"
Signature · 1 line
2.36.1
#6 lore raw

Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

In reply to Andrew Davis

Lets hold off on this patch for one more day, might be a bug in the latest OP-TEE that might impact AM64x/AM62x GP boards.. need to do one more round of sanity checks here, and change the commit we move to if we are affected.

Andrew

Quoted 189 lines · 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+

---

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

conf/machine/include/am62xx.inc +1 -1
index ff857b97..0364edd1 100644
@@ -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"
conf/machine/include/am64xx.inc +1 -1
index 7646c70a..60ffacd5 100644
@@ -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
recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
deleted file mode 100644
index 17005396..00000000
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted +0 -29
deleted file mode 100644
index 5c0d0a56..00000000
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"
 
recipes-security/optee/optee-test_%.bbappend new file +5 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"
#7 lore raw

Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

My initial test builds showed a number of errors so I already backed it out.

Quoted 214 lines · Andrew Davis

Lets hold off on this patch for one more day, might be a bug in the latest OP-TEE that might impact AM64x/AM62x GP boards.. need to do one more round of sanity checks here, and change the commit we move to if we are affected.

Andrew

Quoted 206 lines · 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+

---

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

conf/machine/include/am62xx.inc +0 -0
index ff857b97..0364edd1 100644
@@ -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"

conf/machine/include/am62xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am62x"

  OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am64xx.inc +0 -0
index 7646c70a..60ffacd5 100644
@@ -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"

conf/machine/include/am64xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"

  OPTEEOUTPUTMACHINE = "k3"
  # Set the list of device targets for ti-pdk class recipes

recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -0

deleted file mode 100644
index 17005396..00000000
---
a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch

+++ /dev/null

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -6
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -5
-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]

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -10
-Signed-off-by: Ross Burton <[email protected]>
----
- 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)

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -2
-
- # Define these to something to discover accidental use
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +0 -0

deleted file mode 100644
index 5c0d0a56..00000000
---
a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch

+++ /dev/null

recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +0 -24
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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

recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"

recipes-security/optee/optee-test_%.bbappend new file +5 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#8 lore raw

Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

Build errors or test errors? I'm ready to push v5 but don't see any build errors with v4.

Andrew

Quoted 197 lines · Ryan Eatmon

My initial test builds showed a number of errors so I already backed it out.

Quoted 191 lines · Andrew Davis

Lets hold off on this patch for one more day, might be a bug in the latest OP-TEE that might impact AM64x/AM62x GP boards.. need to do one more round of sanity checks here, and change the commit we move to if we are affected.

Andrew

Quoted 183 lines · 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+

---

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

conf/machine/include/am62xx.inc +0 -0
index ff857b97..0364edd1 100644
@@ -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"

conf/machine/include/am62xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am62x"

  OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am64xx.inc +0 -0
index 7646c70a..60ffacd5 100644
@@ -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"

conf/machine/include/am64xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"

  OPTEEOUTPUTMACHINE = "k3"
  # Set the list of device targets for ti-pdk class recipes

recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
deleted file mode 100644
index 17005396..00000000
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted +0 -29
deleted file mode 100644
index 5c0d0a56..00000000
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"

recipes-security/optee/optee-test_%.bbappend new file +5 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"
#9 lore raw

Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

I was seeing build errors, but they turned out not to be related to your change. It was something else (I just found out). I'm ok to merge your changes back in when your testing is good.

Quoted 228 lines · Andrew Davis

Build errors or test errors? I'm ready to push v5 but don't see any build errors with v4.

Andrew

Quoted 222 lines · Ryan Eatmon

My initial test builds showed a number of errors so I already backed it out.

Quoted 216 lines · Andrew Davis

Lets hold off on this patch for one more day, might be a bug in the latest OP-TEE that might impact AM64x/AM62x GP boards.. need to do one more round of sanity checks here, and change the commit we move to if we are affected.

Andrew

Quoted 208 lines · 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+

---

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

conf/machine/include/am62xx.inc +0 -0
index ff857b97..0364edd1 100644
@@ -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"

conf/machine/include/am62xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am62x"

  OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am64xx.inc +0 -0
index 7646c70a..60ffacd5 100644
@@ -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"

conf/machine/include/am64xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"

  OPTEEOUTPUTMACHINE = "k3"
  # Set the list of device targets for ti-pdk class recipes

recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -0

deleted file mode 100644
index 17005396..00000000
---
a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch

+++ /dev/null

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -6
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -5
-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]

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -10
-Signed-off-by: Ross Burton <[email protected]>
----
- 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)

recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +0 -2
-
- # Define these to something to discover accidental use
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +0 -0

deleted file mode 100644
index 5c0d0a56..00000000
---
a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch

+++ /dev/null

recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +0 -24
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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

recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"

recipes-security/optee/optee-test_%.bbappend new file +3 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"

recipes-security/optee/optee-test_%.bbappend new file +2 -0
+
+DEPENDS_append_ti-soc = " python3-cryptography-native"
Signature · 3 lines
Ryan Eatmon                [email protected]
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
#10 lore raw

Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0

Testing looks good now, v5 sent.

Andrew

Quoted 209 lines · Ryan Eatmon

I was seeing build errors, but they turned out not to be related to your change.  It was something else (I just found out).  I'm ok to merge your changes back in when your testing is good.

Quoted 203 lines · Andrew Davis

Build errors or test errors? I'm ready to push v5 but don't see any build errors with v4.

Andrew

Quoted 197 lines · Ryan Eatmon

My initial test builds showed a number of errors so I already backed it out.

Quoted 191 lines · Andrew Davis

Lets hold off on this patch for one more day, might be a bug in the latest OP-TEE that might impact AM64x/AM62x GP boards.. need to do one more round of sanity checks here, and change the commit we move to if we are affected.

Andrew

Quoted 183 lines · 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+

---

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

conf/machine/include/am62xx.inc +0 -0
index ff857b97..0364edd1 100644
@@ -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"

conf/machine/include/am62xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am62x"

  OPTEEOUTPUTMACHINE = "k3"

conf/machine/include/am64xx.inc +0 -0
index 7646c70a..60ffacd5 100644
@@ -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"

conf/machine/include/am64xx.inc +1 -1
-OPTEEMACHINE = "k3-am65x"
+OPTEEMACHINE = "k3-am64x"

  OPTEEOUTPUTMACHINE = "k3"
  # Set the list of device targets for ti-pdk class recipes

recipes-security/optee/optee-client_%.bbappend new file +2 -0
new file mode 100644
index 00000000..5675570a
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend new file +2 -0
new file mode 100644
index 00000000..19e32d9d
@@ -0,0 +1,2 @@
+PV_ti-soc = "3.17.0+git${SRCPV}"
+SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
deleted file mode 100644
index 17005396..00000000
@@ -1,34 +0,0 @@
-From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted +0 -29
deleted file mode 100644
index 5c0d0a56..00000000
@@ -1,29 +0,0 @@
-From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-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 <[email protected]>
----
- 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
recipes-security/optee/optee-os_%.bbappend +4 -10
index 4e01ea74..75bd28ea 100644
@@ -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 ''}"

recipes-security/optee/optee-test_%.bbappend new file +5 -0
new file mode 100644
index 00000000..d81ae521
@@ -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"