mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-07 19:32:58 +00:00
Code Issues Projects Releases Wiki Activity

optee: Upgrade to upstream 3.17.0

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

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

The fix patches do not look to be needed anymore.

While here switch to git checkout with https.

NOTE: The latest OP-TEE requires SYSFW 8.04+

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Andrew Davis
2022-06-16 11:42:14 -05:00
committed by Ryan Eatmon
parent 26998f4307
commit f8182afdcf
8 changed files with 15 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/machine/include/am62xx.inc
+1 -1
View File
@@ -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
View File
@@ -21,7 +21,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
+2
View File
@@ -0,0 +1,2 @@
PV_ti-soc = "3.17.0+git${SRCPV}"
SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-examples_%.bbappend
+2
View File
@@ -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
-34
View File
@@ -1,34 +0,0 @@
From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
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@arm.com>
---
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
-29
View File
@@ -1,29 +0,0 @@
From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001
From: Brett Warren <brett.warren@arm.com>
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@arm.com>
---
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
View File
@@ -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 ''}"
recipes-security/optee/optee-test_%.bbappend
+5
View File
@@ -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"