trusted-firmware-a: Update to latest upstream master
PATCH v2 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
@@ -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
PATCH v2 2/2 optee: Upgrade to upstream 3.17.0
Update to the latest upstream master which is 3.17. The extra patches do not look to be needed anymore.
While here switch to git checkout with https.
--- .../optee/optee-client_%.bbappend | 4 +++ ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- recipes-security/optee/optee-os_%.bbappend | 12 +++---- recipes-security/optee/optee-test_%.bbappend | 7 ++++ 5 files changed, 15 insertions(+), 71 deletions(-) create mode 100644 recipes-security/optee/optee-client_%.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
recipes-security/optee/optee-client_%.bbappend new file +4 -0
@@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" + +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c"
recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
@@ -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
@@ -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 -8
@@ -1,14 +1,10 @@ FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" -PV_ti-soc = "3.12.0+git${SRCPV}" +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "332dec4a4bb9935e650b9925577cef5d485af724" +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" -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 +7 -0
@@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" + +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
What is the difference between v1 and v2 of these patches?
Quoted 27 lines · Andrew Davis via lists.yoctoproject.org
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 <[email protected]>--- 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@@ -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
He sent this one as a mistake. He is going to send a V3 that moves the optee-[client|test|examples] out of meta-arago and into meta-ti so that all of the optee stuff is in one place.
Quoted 31 lines · Denys Dmytriyenko
What is the difference between v1 and v2 of these patches?
Quoted 27 lines · Andrew Davis via lists.yoctoproject.org
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 <[email protected]>--- 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@@ -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
Signature · 3 lines
Ryan Eatmon [email protected] ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS
Quoted 4 lines · Ryan Eatmon
He sent this one as a mistake. He is going to send a V3 that moves the optee-[client|test|examples] out of meta-arago and into meta-ti so that all of the optee stuff is in one place.
What is the pressing need to update optee in dunfell to the very latest?
Quoted 32 lines · Denys Dmytriyenko
Quoted 31 lines
What is the difference between v1 and v2 of these patches?
Quoted 27 lines · Andrew Davis via lists.yoctoproject.org
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 <[email protected]>--- 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@@ -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
Quoted 8 lines · Denys Dmytriyenko
Quoted 4 lines · Ryan Eatmon
He sent this one as a mistake. He is going to send a V3 that moves the optee-[client|test|examples] out of meta-arago and into meta-ti so that all of the optee stuff is in one place.
What is the pressing need to update optee in dunfell to the very latest?
It pulls in new features for our plats like HUK and AM64x/AM62x support.
Andrew
Quoted 33 lines
Quoted 33 lines · Denys Dmytriyenko
Quoted 31 lines
What is the difference between v1 and v2 of these patches?
Quoted 27 lines · Andrew Davis via lists.yoctoproject.org
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 <[email protected]>--- 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@@ -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