* [meta-ti][dunfell][PATCH v4 1/2] trusted-firmware-a: Update to latest upstream master @ 2022-06-14 21:55 Andrew Davis 2022-06-14 21:55 ` [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 Andrew Davis 0 siblings, 1 reply; 12+ messages in thread From: Andrew Davis @ 2022-06-14 21:55 UTC (permalink / raw) To: Denys Dmytriyenko, Ryan Eatmon, meta-arago; +Cc: Andrew Davis For TF-A we work against upstream first, our fork has only been used in the rare cases we need to ship a feature before we can get it upstream. This is not currently the case so lets switch to upstream repo until there is a need for our fork. Signed-off-by: Andrew Davis <afd@ti.com> --- recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 68bfa899..207f3dac 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,8 +1,6 @@ PV_k3 = "2.6" LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" -BRANCH_k3 = "ti-atf" -SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa" -SRCREV_tfa_k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce" +SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934" COMPATIBLE_MACHINE_k3 = "k3" TFA_BUILD_TARGET_k3 = "all" TFA_INSTALL_TARGET_k3 = "bl31" -- 2.36.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-14 21:55 [meta-ti][dunfell][PATCH v4 1/2] trusted-firmware-a: Update to latest upstream master Andrew Davis @ 2022-06-14 21:55 ` Andrew Davis 2022-06-14 23:14 ` [meta-arago] " Denys Dmytriyenko 2022-06-15 21:32 ` Andrew Davis 0 siblings, 2 replies; 12+ messages in thread From: Andrew Davis @ 2022-06-14 21:55 UTC (permalink / raw) To: Denys Dmytriyenko, Ryan Eatmon, meta-arago; +Cc: Andrew Davis Update to the latest upstream master which is 3.17. We do this to add HUK and AM64x/AM62x support. With this we need to also switch OPTEEMACHINE for AM64x/AM62x. To build against the latest OP-TEE the support recipes need updated also. Move these here into meta-ti so that builds will still work when not using meta-arago-distro. The fix patches do not look to be needed anymore. While here switch to git checkout with https. NOTE: The latest OP-TEE requires SYSFW 8.04+ Signed-off-by: Andrew Davis <afd@ti.com> --- Changes from v3: - Added note about SYSFW version req - Updated optee-os SRCREV to newer commit Changes from v2: - Switch OPTEEMACHINE - Update optee-examples conf/machine/include/am62xx.inc | 2 +- conf/machine/include/am64xx.inc | 2 +- .../optee/optee-client_%.bbappend | 2 ++ .../optee/optee-examples_%.bbappend | 2 ++ ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- recipes-security/optee/optee-os_%.bbappend | 14 +++----- recipes-security/optee/optee-test_%.bbappend | 5 +++ 8 files changed, 15 insertions(+), 75 deletions(-) create mode 100644 recipes-security/optee/optee-client_%.bbappend create mode 100644 recipes-security/optee/optee-examples_%.bbappend delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch create mode 100644 recipes-security/optee/optee-test_%.bbappend diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc index ff857b97..0364edd1 100644 --- a/conf/machine/include/am62xx.inc +++ b/conf/machine/include/am62xx.inc @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" TFA_BOARD = "lite" -OPTEEMACHINE = "k3-am65x" +OPTEEMACHINE = "k3-am62x" OPTEEOUTPUTMACHINE = "k3" diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 7646c70a..60ffacd5 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" TFA_BOARD = "lite" -OPTEEMACHINE = "k3-am65x" +OPTEEMACHINE = "k3-am64x" OPTEEOUTPUTMACHINE = "k3" # Set the list of device targets for ti-pdk class recipes diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend new file mode 100644 index 00000000..5675570a --- /dev/null +++ b/recipes-security/optee/optee-client_%.bbappend @@ -0,0 +1,2 @@ +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend new file mode 100644 index 00000000..19e32d9d --- /dev/null +++ b/recipes-security/optee/optee-examples_%.bbappend @@ -0,0 +1,2 @@ +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted file mode 100644 index 17005396..00000000 --- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@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 diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted file mode 100644 index 5c0d0a56..00000000 --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 -From: Brett Warren <brett.warren@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 diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 4e01ea74..75bd28ea 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend @@ -1,14 +1,8 @@ -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" -PV_ti-soc = "3.12.0+git${SRCPV}" - -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" - -SRC_URI_ti-soc = " \ - git://github.com/OP-TEE/optee_os.git \ - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ - file://0007-allow-setting-sysroot-for-clang.patch \ -" +DEPENDS_append_ti-soc = " python3-cryptography-native" EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend new file mode 100644 index 00000000..d81ae521 --- /dev/null +++ b/recipes-security/optee/optee-test_%.bbappend @@ -0,0 +1,5 @@ +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" + +DEPENDS_append_ti-soc = " python3-cryptography-native" -- 2.36.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [meta-arago] [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-14 21:55 ` [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 Andrew Davis @ 2022-06-14 23:14 ` Denys Dmytriyenko 2022-06-15 3:48 ` Andrew Davis 2022-06-15 21:32 ` Andrew Davis 1 sibling, 1 reply; 12+ messages in thread From: Denys Dmytriyenko @ 2022-06-14 23:14 UTC (permalink / raw) To: afd; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-arago Wrong list? On Tue, Jun 14, 2022 at 04:55:15PM -0500, Andrew Davis via lists.yoctoproject.org wrote: > 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> > --- > > Changes from v3: > - Added note about SYSFW version req > - Updated optee-os SRCREV to newer commit > > Changes from v2: > - Switch OPTEEMACHINE > - Update optee-examples > > conf/machine/include/am62xx.inc | 2 +- > conf/machine/include/am64xx.inc | 2 +- > .../optee/optee-client_%.bbappend | 2 ++ > .../optee/optee-examples_%.bbappend | 2 ++ > ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- > ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- > recipes-security/optee/optee-os_%.bbappend | 14 +++----- > recipes-security/optee/optee-test_%.bbappend | 5 +++ > 8 files changed, 15 insertions(+), 75 deletions(-) > create mode 100644 recipes-security/optee/optee-client_%.bbappend > create mode 100644 recipes-security/optee/optee-examples_%.bbappend > delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch > delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch > create mode 100644 recipes-security/optee/optee-test_%.bbappend > > diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc > index ff857b97..0364edd1 100644 > --- a/conf/machine/include/am62xx.inc > +++ b/conf/machine/include/am62xx.inc > @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > > TFA_BOARD = "lite" > -OPTEEMACHINE = "k3-am65x" > +OPTEEMACHINE = "k3-am62x" > OPTEEOUTPUTMACHINE = "k3" > diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc > index 7646c70a..60ffacd5 100644 > --- a/conf/machine/include/am64xx.inc > +++ b/conf/machine/include/am64xx.inc > @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > > TFA_BOARD = "lite" > -OPTEEMACHINE = "k3-am65x" > +OPTEEMACHINE = "k3-am64x" > OPTEEOUTPUTMACHINE = "k3" > > # Set the list of device targets for ti-pdk class recipes > diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend > new file mode 100644 > index 00000000..5675570a > --- /dev/null > +++ b/recipes-security/optee/optee-client_%.bbappend > @@ -0,0 +1,2 @@ > +PV_ti-soc = "3.17.0+git${SRCPV}" > +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" > diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend > new file mode 100644 > index 00000000..19e32d9d > --- /dev/null > +++ b/recipes-security/optee/optee-examples_%.bbappend > @@ -0,0 +1,2 @@ > +PV_ti-soc = "3.17.0+git${SRCPV}" > +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" > diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch > deleted file mode 100644 > index 17005396..00000000 > --- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 > -From: Ross Burton <ross.burton@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 > diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch > deleted file mode 100644 > index 5c0d0a56..00000000 > --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 > -From: Brett Warren <brett.warren@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 > diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend > index 4e01ea74..75bd28ea 100644 > --- a/recipes-security/optee/optee-os_%.bbappend > +++ b/recipes-security/optee/optee-os_%.bbappend > @@ -1,14 +1,8 @@ > -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" > +PV_ti-soc = "3.17.0+git${SRCPV}" > +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" > +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" > > -PV_ti-soc = "3.12.0+git${SRCPV}" > - > -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" > - > -SRC_URI_ti-soc = " \ > - git://github.com/OP-TEE/optee_os.git \ > - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ > - file://0007-allow-setting-sysroot-for-clang.patch \ > -" > +DEPENDS_append_ti-soc = " python3-cryptography-native" > > EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" > > diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend > new file mode 100644 > index 00000000..d81ae521 > --- /dev/null > +++ b/recipes-security/optee/optee-test_%.bbappend > @@ -0,0 +1,5 @@ > +PV_ti-soc = "3.17.0+git${SRCPV}" > +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" > +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" > + > +DEPENDS_append_ti-soc = " python3-cryptography-native" > -- > 2.36.1 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-arago] [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-14 23:14 ` [meta-arago] " Denys Dmytriyenko @ 2022-06-15 3:48 ` Andrew Davis 2022-06-15 14:33 ` Ryan Eatmon 0 siblings, 1 reply; 12+ messages in thread From: Andrew Davis @ 2022-06-15 3:48 UTC (permalink / raw) To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Ryan Eatmon, meta-arago On 6/14/22 6:14 PM, Denys Dmytriyenko wrote: > Wrong list? > Oops, looks like it, re-sending over to meta-ti.. > > On Tue, Jun 14, 2022 at 04:55:15PM -0500, Andrew Davis via lists.yoctoproject.org wrote: >> 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> >> --- >> >> Changes from v3: >> - Added note about SYSFW version req >> - Updated optee-os SRCREV to newer commit >> >> Changes from v2: >> - Switch OPTEEMACHINE >> - Update optee-examples >> >> conf/machine/include/am62xx.inc | 2 +- >> conf/machine/include/am64xx.inc | 2 +- >> .../optee/optee-client_%.bbappend | 2 ++ >> .../optee/optee-examples_%.bbappend | 2 ++ >> ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- >> ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- >> recipes-security/optee/optee-os_%.bbappend | 14 +++----- >> recipes-security/optee/optee-test_%.bbappend | 5 +++ >> 8 files changed, 15 insertions(+), 75 deletions(-) >> create mode 100644 recipes-security/optee/optee-client_%.bbappend >> create mode 100644 recipes-security/optee/optee-examples_%.bbappend >> delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >> delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >> create mode 100644 recipes-security/optee/optee-test_%.bbappend >> >> diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc >> index ff857b97..0364edd1 100644 >> --- a/conf/machine/include/am62xx.inc >> +++ b/conf/machine/include/am62xx.inc >> @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> >> TFA_BOARD = "lite" >> -OPTEEMACHINE = "k3-am65x" >> +OPTEEMACHINE = "k3-am62x" >> OPTEEOUTPUTMACHINE = "k3" >> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc >> index 7646c70a..60ffacd5 100644 >> --- a/conf/machine/include/am64xx.inc >> +++ b/conf/machine/include/am64xx.inc >> @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> >> TFA_BOARD = "lite" >> -OPTEEMACHINE = "k3-am65x" >> +OPTEEMACHINE = "k3-am64x" >> OPTEEOUTPUTMACHINE = "k3" >> >> # Set the list of device targets for ti-pdk class recipes >> diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend >> new file mode 100644 >> index 00000000..5675570a >> --- /dev/null >> +++ b/recipes-security/optee/optee-client_%.bbappend >> @@ -0,0 +1,2 @@ >> +PV_ti-soc = "3.17.0+git${SRCPV}" >> +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >> diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend >> new file mode 100644 >> index 00000000..19e32d9d >> --- /dev/null >> +++ b/recipes-security/optee/optee-examples_%.bbappend >> @@ -0,0 +1,2 @@ >> +PV_ti-soc = "3.17.0+git${SRCPV}" >> +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" >> diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >> deleted file mode 100644 >> index 17005396..00000000 >> --- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >> +++ /dev/null >> @@ -1,34 +0,0 @@ >> -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 >> -From: Ross Burton <ross.burton@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 >> diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >> deleted file mode 100644 >> index 5c0d0a56..00000000 >> --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >> +++ /dev/null >> @@ -1,29 +0,0 @@ >> -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 >> -From: Brett Warren <brett.warren@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 >> diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend >> index 4e01ea74..75bd28ea 100644 >> --- a/recipes-security/optee/optee-os_%.bbappend >> +++ b/recipes-security/optee/optee-os_%.bbappend >> @@ -1,14 +1,8 @@ >> -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" >> +PV_ti-soc = "3.17.0+git${SRCPV}" >> +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" >> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" >> >> -PV_ti-soc = "3.12.0+git${SRCPV}" >> - >> -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" >> - >> -SRC_URI_ti-soc = " \ >> - git://github.com/OP-TEE/optee_os.git \ >> - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ >> - file://0007-allow-setting-sysroot-for-clang.patch \ >> -" >> +DEPENDS_append_ti-soc = " python3-cryptography-native" >> >> EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" >> >> diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend >> new file mode 100644 >> index 00000000..d81ae521 >> --- /dev/null >> +++ b/recipes-security/optee/optee-test_%.bbappend >> @@ -0,0 +1,5 @@ >> +PV_ti-soc = "3.17.0+git${SRCPV}" >> +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" >> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" >> + >> +DEPENDS_append_ti-soc = " python3-cryptography-native" >> -- >> 2.36.1 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-arago] [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-15 3:48 ` Andrew Davis @ 2022-06-15 14:33 ` Ryan Eatmon 2022-06-15 15:13 ` Andrew Davis 0 siblings, 1 reply; 12+ messages in thread From: Ryan Eatmon @ 2022-06-15 14:33 UTC (permalink / raw) To: Andrew Davis, Denys Dmytriyenko; +Cc: Denys Dmytriyenko, meta-arago We still do need a patch for meta-arago to remove the optee stuff that you are moving to meta-ti... On 6/14/2022 22:48, Andrew Davis wrote: > On 6/14/22 6:14 PM, Denys Dmytriyenko wrote: >> Wrong list? >> > > Oops, looks like it, re-sending over to meta-ti.. > >> >> On Tue, Jun 14, 2022 at 04:55:15PM -0500, Andrew Davis via >> lists.yoctoproject.org wrote: >>> 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> >>> --- >>> >>> Changes from v3: >>> - Added note about SYSFW version req >>> - Updated optee-os SRCREV to newer commit >>> >>> Changes from v2: >>> - Switch OPTEEMACHINE >>> - Update optee-examples >>> >>> conf/machine/include/am62xx.inc | 2 +- >>> conf/machine/include/am64xx.inc | 2 +- >>> .../optee/optee-client_%.bbappend | 2 ++ >>> .../optee/optee-examples_%.bbappend | 2 ++ >>> ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- >>> ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- >>> recipes-security/optee/optee-os_%.bbappend | 14 +++----- >>> recipes-security/optee/optee-test_%.bbappend | 5 +++ >>> 8 files changed, 15 insertions(+), 75 deletions(-) >>> create mode 100644 recipes-security/optee/optee-client_%.bbappend >>> create mode 100644 recipes-security/optee/optee-examples_%.bbappend >>> delete mode 100644 >>> recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>> >>> delete mode 100644 >>> recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>> >>> create mode 100644 recipes-security/optee/optee-test_%.bbappend >>> >>> diff --git a/conf/machine/include/am62xx.inc >>> b/conf/machine/include/am62xx.inc >>> index ff857b97..0364edd1 100644 >>> --- a/conf/machine/include/am62xx.inc >>> +++ b/conf/machine/include/am62xx.inc >>> @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = >>> "mc::k3r5:ti-sci-fw:do_deploy" >>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>> TFA_BOARD = "lite" >>> -OPTEEMACHINE = "k3-am65x" >>> +OPTEEMACHINE = "k3-am62x" >>> OPTEEOUTPUTMACHINE = "k3" >>> diff --git a/conf/machine/include/am64xx.inc >>> b/conf/machine/include/am64xx.inc >>> index 7646c70a..60ffacd5 100644 >>> --- a/conf/machine/include/am64xx.inc >>> +++ b/conf/machine/include/am64xx.inc >>> @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = >>> "mc::k3r5:ti-sci-fw:do_deploy" >>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>> TFA_BOARD = "lite" >>> -OPTEEMACHINE = "k3-am65x" >>> +OPTEEMACHINE = "k3-am64x" >>> OPTEEOUTPUTMACHINE = "k3" >>> # Set the list of device targets for ti-pdk class recipes >>> diff --git a/recipes-security/optee/optee-client_%.bbappend >>> b/recipes-security/optee/optee-client_%.bbappend >>> new file mode 100644 >>> index 00000000..5675570a >>> --- /dev/null >>> +++ b/recipes-security/optee/optee-client_%.bbappend >>> @@ -0,0 +1,2 @@ >>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>> +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >>> diff --git a/recipes-security/optee/optee-examples_%.bbappend >>> b/recipes-security/optee/optee-examples_%.bbappend >>> new file mode 100644 >>> index 00000000..19e32d9d >>> --- /dev/null >>> +++ b/recipes-security/optee/optee-examples_%.bbappend >>> @@ -0,0 +1,2 @@ >>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>> +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" >>> diff --git >>> a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>> b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>> >>> deleted file mode 100644 >>> index 17005396..00000000 >>> --- >>> a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>> >>> +++ /dev/null >>> @@ -1,34 +0,0 @@ >>> -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 >>> -From: Ross Burton <ross.burton@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 >>> diff --git >>> a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>> b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>> >>> deleted file mode 100644 >>> index 5c0d0a56..00000000 >>> --- >>> a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>> >>> +++ /dev/null >>> @@ -1,29 +0,0 @@ >>> -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 >>> -From: Brett Warren <brett.warren@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 >>> diff --git a/recipes-security/optee/optee-os_%.bbappend >>> b/recipes-security/optee/optee-os_%.bbappend >>> index 4e01ea74..75bd28ea 100644 >>> --- a/recipes-security/optee/optee-os_%.bbappend >>> +++ b/recipes-security/optee/optee-os_%.bbappend >>> @@ -1,14 +1,8 @@ >>> -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" >>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>> +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" >>> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" >>> -PV_ti-soc = "3.12.0+git${SRCPV}" >>> - >>> -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" >>> - >>> -SRC_URI_ti-soc = " \ >>> - git://github.com/OP-TEE/optee_os.git \ >>> - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ >>> - file://0007-allow-setting-sysroot-for-clang.patch \ >>> -" >>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >>> EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ >>> d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" >>> diff --git a/recipes-security/optee/optee-test_%.bbappend >>> b/recipes-security/optee/optee-test_%.bbappend >>> new file mode 100644 >>> index 00000000..d81ae521 >>> --- /dev/null >>> +++ b/recipes-security/optee/optee-test_%.bbappend >>> @@ -0,0 +1,5 @@ >>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>> +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" >>> +SRC_URI_ti-soc = >>> "git://github.com/OP-TEE/optee_test.git;protocol=https" >>> + >>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >>> -- >>> 2.36.1 -- Ryan Eatmon reatmon@ti.com ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-arago] [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-15 14:33 ` Ryan Eatmon @ 2022-06-15 15:13 ` Andrew Davis 0 siblings, 0 replies; 12+ messages in thread From: Andrew Davis @ 2022-06-15 15:13 UTC (permalink / raw) To: Ryan Eatmon, Denys Dmytriyenko; +Cc: Denys Dmytriyenko, meta-arago On 6/15/22 9:33 AM, Ryan Eatmon wrote: > > 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 > > On 6/14/2022 22:48, Andrew Davis wrote: >> On 6/14/22 6:14 PM, Denys Dmytriyenko wrote: >>> Wrong list? >>> >> >> Oops, looks like it, re-sending over to meta-ti.. >> >>> >>> On Tue, Jun 14, 2022 at 04:55:15PM -0500, Andrew Davis via lists.yoctoproject.org wrote: >>>> 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> >>>> --- >>>> >>>> Changes from v3: >>>> - Added note about SYSFW version req >>>> - Updated optee-os SRCREV to newer commit >>>> >>>> Changes from v2: >>>> - Switch OPTEEMACHINE >>>> - Update optee-examples >>>> >>>> conf/machine/include/am62xx.inc | 2 +- >>>> conf/machine/include/am64xx.inc | 2 +- >>>> .../optee/optee-client_%.bbappend | 2 ++ >>>> .../optee/optee-examples_%.bbappend | 2 ++ >>>> ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- >>>> ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- >>>> recipes-security/optee/optee-os_%.bbappend | 14 +++----- >>>> recipes-security/optee/optee-test_%.bbappend | 5 +++ >>>> 8 files changed, 15 insertions(+), 75 deletions(-) >>>> create mode 100644 recipes-security/optee/optee-client_%.bbappend >>>> create mode 100644 recipes-security/optee/optee-examples_%.bbappend >>>> delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>> delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>> create mode 100644 recipes-security/optee/optee-test_%.bbappend >>>> >>>> diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc >>>> index ff857b97..0364edd1 100644 >>>> --- a/conf/machine/include/am62xx.inc >>>> +++ b/conf/machine/include/am62xx.inc >>>> @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>> TFA_BOARD = "lite" >>>> -OPTEEMACHINE = "k3-am65x" >>>> +OPTEEMACHINE = "k3-am62x" >>>> OPTEEOUTPUTMACHINE = "k3" >>>> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc >>>> index 7646c70a..60ffacd5 100644 >>>> --- a/conf/machine/include/am64xx.inc >>>> +++ b/conf/machine/include/am64xx.inc >>>> @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>> TFA_BOARD = "lite" >>>> -OPTEEMACHINE = "k3-am65x" >>>> +OPTEEMACHINE = "k3-am64x" >>>> OPTEEOUTPUTMACHINE = "k3" >>>> # Set the list of device targets for ti-pdk class recipes >>>> diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend >>>> new file mode 100644 >>>> index 00000000..5675570a >>>> --- /dev/null >>>> +++ b/recipes-security/optee/optee-client_%.bbappend >>>> @@ -0,0 +1,2 @@ >>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>> +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >>>> diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend >>>> new file mode 100644 >>>> index 00000000..19e32d9d >>>> --- /dev/null >>>> +++ b/recipes-security/optee/optee-examples_%.bbappend >>>> @@ -0,0 +1,2 @@ >>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>> +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" >>>> diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>> deleted file mode 100644 >>>> index 17005396..00000000 >>>> --- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>> +++ /dev/null >>>> @@ -1,34 +0,0 @@ >>>> -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 >>>> -From: Ross Burton <ross.burton@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 >>>> diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>> deleted file mode 100644 >>>> index 5c0d0a56..00000000 >>>> --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>> +++ /dev/null >>>> @@ -1,29 +0,0 @@ >>>> -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 >>>> -From: Brett Warren <brett.warren@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 >>>> diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend >>>> index 4e01ea74..75bd28ea 100644 >>>> --- a/recipes-security/optee/optee-os_%.bbappend >>>> +++ b/recipes-security/optee/optee-os_%.bbappend >>>> @@ -1,14 +1,8 @@ >>>> -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" >>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>> +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" >>>> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" >>>> -PV_ti-soc = "3.12.0+git${SRCPV}" >>>> - >>>> -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" >>>> - >>>> -SRC_URI_ti-soc = " \ >>>> - git://github.com/OP-TEE/optee_os.git \ >>>> - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ >>>> - file://0007-allow-setting-sysroot-for-clang.patch \ >>>> -" >>>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >>>> EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" >>>> diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend >>>> new file mode 100644 >>>> index 00000000..d81ae521 >>>> --- /dev/null >>>> +++ b/recipes-security/optee/optee-test_%.bbappend >>>> @@ -0,0 +1,5 @@ >>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>> +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" >>>> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" >>>> + >>>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >>>> -- >>>> 2.36.1 > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-14 21:55 ` [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 Andrew Davis 2022-06-14 23:14 ` [meta-arago] " Denys Dmytriyenko @ 2022-06-15 21:32 ` Andrew Davis 2022-06-15 22:40 ` Ryan Eatmon 1 sibling, 1 reply; 12+ messages in thread From: Andrew Davis @ 2022-06-15 21:32 UTC (permalink / raw) To: Denys Dmytriyenko, Ryan Eatmon, meta-arago 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 On 6/14/22 4:55 PM, Andrew Davis wrote: > 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> > --- > > Changes from v3: > - Added note about SYSFW version req > - Updated optee-os SRCREV to newer commit > > Changes from v2: > - Switch OPTEEMACHINE > - Update optee-examples > > conf/machine/include/am62xx.inc | 2 +- > conf/machine/include/am64xx.inc | 2 +- > .../optee/optee-client_%.bbappend | 2 ++ > .../optee/optee-examples_%.bbappend | 2 ++ > ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- > ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- > recipes-security/optee/optee-os_%.bbappend | 14 +++----- > recipes-security/optee/optee-test_%.bbappend | 5 +++ > 8 files changed, 15 insertions(+), 75 deletions(-) > create mode 100644 recipes-security/optee/optee-client_%.bbappend > create mode 100644 recipes-security/optee/optee-examples_%.bbappend > delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch > delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch > create mode 100644 recipes-security/optee/optee-test_%.bbappend > > diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc > index ff857b97..0364edd1 100644 > --- a/conf/machine/include/am62xx.inc > +++ b/conf/machine/include/am62xx.inc > @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > > TFA_BOARD = "lite" > -OPTEEMACHINE = "k3-am65x" > +OPTEEMACHINE = "k3-am62x" > OPTEEOUTPUTMACHINE = "k3" > diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc > index 7646c70a..60ffacd5 100644 > --- a/conf/machine/include/am64xx.inc > +++ b/conf/machine/include/am64xx.inc > @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" > > TFA_BOARD = "lite" > -OPTEEMACHINE = "k3-am65x" > +OPTEEMACHINE = "k3-am64x" > OPTEEOUTPUTMACHINE = "k3" > > # Set the list of device targets for ti-pdk class recipes > diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend > new file mode 100644 > index 00000000..5675570a > --- /dev/null > +++ b/recipes-security/optee/optee-client_%.bbappend > @@ -0,0 +1,2 @@ > +PV_ti-soc = "3.17.0+git${SRCPV}" > +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" > diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend > new file mode 100644 > index 00000000..19e32d9d > --- /dev/null > +++ b/recipes-security/optee/optee-examples_%.bbappend > @@ -0,0 +1,2 @@ > +PV_ti-soc = "3.17.0+git${SRCPV}" > +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" > diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch > deleted file mode 100644 > index 17005396..00000000 > --- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch > +++ /dev/null > @@ -1,34 +0,0 @@ > -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 > -From: Ross Burton <ross.burton@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 > diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch > deleted file mode 100644 > index 5c0d0a56..00000000 > --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 > -From: Brett Warren <brett.warren@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 > diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend > index 4e01ea74..75bd28ea 100644 > --- a/recipes-security/optee/optee-os_%.bbappend > +++ b/recipes-security/optee/optee-os_%.bbappend > @@ -1,14 +1,8 @@ > -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" > +PV_ti-soc = "3.17.0+git${SRCPV}" > +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" > +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" > > -PV_ti-soc = "3.12.0+git${SRCPV}" > - > -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" > - > -SRC_URI_ti-soc = " \ > - git://github.com/OP-TEE/optee_os.git \ > - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ > - file://0007-allow-setting-sysroot-for-clang.patch \ > -" > +DEPENDS_append_ti-soc = " python3-cryptography-native" > > EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" > > diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend > new file mode 100644 > index 00000000..d81ae521 > --- /dev/null > +++ b/recipes-security/optee/optee-test_%.bbappend > @@ -0,0 +1,5 @@ > +PV_ti-soc = "3.17.0+git${SRCPV}" > +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" > +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" > + > +DEPENDS_append_ti-soc = " python3-cryptography-native" ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-15 21:32 ` Andrew Davis @ 2022-06-15 22:40 ` Ryan Eatmon 2022-06-16 16:32 ` Andrew Davis 0 siblings, 1 reply; 12+ messages in thread From: Ryan Eatmon @ 2022-06-15 22:40 UTC (permalink / raw) To: Andrew Davis, Denys Dmytriyenko, meta-arago My initial test builds showed a number of errors so I already backed it out. On 6/15/2022 16:32, Andrew Davis wrote: > 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 > > On 6/14/22 4:55 PM, Andrew Davis wrote: >> 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> >> --- >> >> Changes from v3: >> - Added note about SYSFW version req >> - Updated optee-os SRCREV to newer commit >> >> Changes from v2: >> - Switch OPTEEMACHINE >> - Update optee-examples >> >> conf/machine/include/am62xx.inc | 2 +- >> conf/machine/include/am64xx.inc | 2 +- >> .../optee/optee-client_%.bbappend | 2 ++ >> .../optee/optee-examples_%.bbappend | 2 ++ >> ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- >> ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- >> recipes-security/optee/optee-os_%.bbappend | 14 +++----- >> recipes-security/optee/optee-test_%.bbappend | 5 +++ >> 8 files changed, 15 insertions(+), 75 deletions(-) >> create mode 100644 recipes-security/optee/optee-client_%.bbappend >> create mode 100644 recipes-security/optee/optee-examples_%.bbappend >> delete mode 100644 >> recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >> >> delete mode 100644 >> recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >> >> create mode 100644 recipes-security/optee/optee-test_%.bbappend >> >> diff --git a/conf/machine/include/am62xx.inc >> b/conf/machine/include/am62xx.inc >> index ff857b97..0364edd1 100644 >> --- a/conf/machine/include/am62xx.inc >> +++ b/conf/machine/include/am62xx.inc >> @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = >> "mc::k3r5:ti-sci-fw:do_deploy" >> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> TFA_BOARD = "lite" >> -OPTEEMACHINE = "k3-am65x" >> +OPTEEMACHINE = "k3-am62x" >> OPTEEOUTPUTMACHINE = "k3" >> diff --git a/conf/machine/include/am64xx.inc >> b/conf/machine/include/am64xx.inc >> index 7646c70a..60ffacd5 100644 >> --- a/conf/machine/include/am64xx.inc >> +++ b/conf/machine/include/am64xx.inc >> @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = >> "mc::k3r5:ti-sci-fw:do_deploy" >> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >> TFA_BOARD = "lite" >> -OPTEEMACHINE = "k3-am65x" >> +OPTEEMACHINE = "k3-am64x" >> OPTEEOUTPUTMACHINE = "k3" >> # Set the list of device targets for ti-pdk class recipes >> diff --git a/recipes-security/optee/optee-client_%.bbappend >> b/recipes-security/optee/optee-client_%.bbappend >> new file mode 100644 >> index 00000000..5675570a >> --- /dev/null >> +++ b/recipes-security/optee/optee-client_%.bbappend >> @@ -0,0 +1,2 @@ >> +PV_ti-soc = "3.17.0+git${SRCPV}" >> +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >> diff --git a/recipes-security/optee/optee-examples_%.bbappend >> b/recipes-security/optee/optee-examples_%.bbappend >> new file mode 100644 >> index 00000000..19e32d9d >> --- /dev/null >> +++ b/recipes-security/optee/optee-examples_%.bbappend >> @@ -0,0 +1,2 @@ >> +PV_ti-soc = "3.17.0+git${SRCPV}" >> +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" >> diff --git >> a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >> b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >> >> deleted file mode 100644 >> index 17005396..00000000 >> --- >> a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >> >> +++ /dev/null >> @@ -1,34 +0,0 @@ >> -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 >> -From: Ross Burton <ross.burton@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 >> diff --git >> a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >> b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >> >> deleted file mode 100644 >> index 5c0d0a56..00000000 >> --- >> a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >> >> +++ /dev/null >> @@ -1,29 +0,0 @@ >> -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 >> -From: Brett Warren <brett.warren@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 >> diff --git a/recipes-security/optee/optee-os_%.bbappend >> b/recipes-security/optee/optee-os_%.bbappend >> index 4e01ea74..75bd28ea 100644 >> --- a/recipes-security/optee/optee-os_%.bbappend >> +++ b/recipes-security/optee/optee-os_%.bbappend >> @@ -1,14 +1,8 @@ >> -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" >> +PV_ti-soc = "3.17.0+git${SRCPV}" >> +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" >> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" >> -PV_ti-soc = "3.12.0+git${SRCPV}" >> - >> -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" >> - >> -SRC_URI_ti-soc = " \ >> - git://github.com/OP-TEE/optee_os.git \ >> - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ >> - file://0007-allow-setting-sysroot-for-clang.patch \ >> -" >> +DEPENDS_append_ti-soc = " python3-cryptography-native" >> EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ >> d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" >> diff --git a/recipes-security/optee/optee-test_%.bbappend >> b/recipes-security/optee/optee-test_%.bbappend >> new file mode 100644 >> index 00000000..d81ae521 >> --- /dev/null >> +++ b/recipes-security/optee/optee-test_%.bbappend >> @@ -0,0 +1,5 @@ >> +PV_ti-soc = "3.17.0+git${SRCPV}" >> +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" >> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" >> + >> +DEPENDS_append_ti-soc = " python3-cryptography-native" -- Ryan Eatmon reatmon@ti.com ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-15 22:40 ` Ryan Eatmon @ 2022-06-16 16:32 ` Andrew Davis 2022-06-16 18:39 ` Ryan Eatmon 0 siblings, 1 reply; 12+ messages in thread From: Andrew Davis @ 2022-06-16 16:32 UTC (permalink / raw) To: Ryan Eatmon, Denys Dmytriyenko, meta-arago Build errors or test errors? I'm ready to push v5 but don't see any build errors with v4. Andrew On 6/15/22 5:40 PM, Ryan Eatmon wrote: > > My initial test builds showed a number of errors so I already backed it out. > > > On 6/15/2022 16:32, Andrew Davis wrote: >> 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 >> >> On 6/14/22 4:55 PM, Andrew Davis wrote: >>> 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> >>> --- >>> >>> Changes from v3: >>> - Added note about SYSFW version req >>> - Updated optee-os SRCREV to newer commit >>> >>> Changes from v2: >>> - Switch OPTEEMACHINE >>> - Update optee-examples >>> >>> conf/machine/include/am62xx.inc | 2 +- >>> conf/machine/include/am64xx.inc | 2 +- >>> .../optee/optee-client_%.bbappend | 2 ++ >>> .../optee/optee-examples_%.bbappend | 2 ++ >>> ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- >>> ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- >>> recipes-security/optee/optee-os_%.bbappend | 14 +++----- >>> recipes-security/optee/optee-test_%.bbappend | 5 +++ >>> 8 files changed, 15 insertions(+), 75 deletions(-) >>> create mode 100644 recipes-security/optee/optee-client_%.bbappend >>> create mode 100644 recipes-security/optee/optee-examples_%.bbappend >>> delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>> delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>> create mode 100644 recipes-security/optee/optee-test_%.bbappend >>> >>> diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc >>> index ff857b97..0364edd1 100644 >>> --- a/conf/machine/include/am62xx.inc >>> +++ b/conf/machine/include/am62xx.inc >>> @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>> TFA_BOARD = "lite" >>> -OPTEEMACHINE = "k3-am65x" >>> +OPTEEMACHINE = "k3-am62x" >>> OPTEEOUTPUTMACHINE = "k3" >>> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc >>> index 7646c70a..60ffacd5 100644 >>> --- a/conf/machine/include/am64xx.inc >>> +++ b/conf/machine/include/am64xx.inc >>> @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>> TFA_BOARD = "lite" >>> -OPTEEMACHINE = "k3-am65x" >>> +OPTEEMACHINE = "k3-am64x" >>> OPTEEOUTPUTMACHINE = "k3" >>> # Set the list of device targets for ti-pdk class recipes >>> diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend >>> new file mode 100644 >>> index 00000000..5675570a >>> --- /dev/null >>> +++ b/recipes-security/optee/optee-client_%.bbappend >>> @@ -0,0 +1,2 @@ >>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>> +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >>> diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend >>> new file mode 100644 >>> index 00000000..19e32d9d >>> --- /dev/null >>> +++ b/recipes-security/optee/optee-examples_%.bbappend >>> @@ -0,0 +1,2 @@ >>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>> +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" >>> diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>> deleted file mode 100644 >>> index 17005396..00000000 >>> --- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>> +++ /dev/null >>> @@ -1,34 +0,0 @@ >>> -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 >>> -From: Ross Burton <ross.burton@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 >>> diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>> deleted file mode 100644 >>> index 5c0d0a56..00000000 >>> --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>> +++ /dev/null >>> @@ -1,29 +0,0 @@ >>> -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 >>> -From: Brett Warren <brett.warren@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 >>> diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend >>> index 4e01ea74..75bd28ea 100644 >>> --- a/recipes-security/optee/optee-os_%.bbappend >>> +++ b/recipes-security/optee/optee-os_%.bbappend >>> @@ -1,14 +1,8 @@ >>> -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" >>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>> +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" >>> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" >>> -PV_ti-soc = "3.12.0+git${SRCPV}" >>> - >>> -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" >>> - >>> -SRC_URI_ti-soc = " \ >>> - git://github.com/OP-TEE/optee_os.git \ >>> - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ >>> - file://0007-allow-setting-sysroot-for-clang.patch \ >>> -" >>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >>> EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" >>> diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend >>> new file mode 100644 >>> index 00000000..d81ae521 >>> --- /dev/null >>> +++ b/recipes-security/optee/optee-test_%.bbappend >>> @@ -0,0 +1,5 @@ >>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>> +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" >>> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" >>> + >>> +DEPENDS_append_ti-soc = " python3-cryptography-native" > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-16 16:32 ` Andrew Davis @ 2022-06-16 18:39 ` Ryan Eatmon 2022-06-16 19:30 ` Andrew Davis 0 siblings, 1 reply; 12+ messages in thread From: Ryan Eatmon @ 2022-06-16 18:39 UTC (permalink / raw) To: Andrew Davis, Denys Dmytriyenko, meta-arago 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. On 6/16/2022 11:32, Andrew Davis wrote: > Build errors or test errors? I'm ready to push v5 but > don't see any build errors with v4. > > Andrew > > On 6/15/22 5:40 PM, Ryan Eatmon wrote: >> >> My initial test builds showed a number of errors so I already backed >> it out. >> >> >> On 6/15/2022 16:32, Andrew Davis wrote: >>> 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 >>> >>> On 6/14/22 4:55 PM, Andrew Davis wrote: >>>> 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> >>>> --- >>>> >>>> Changes from v3: >>>> - Added note about SYSFW version req >>>> - Updated optee-os SRCREV to newer commit >>>> >>>> Changes from v2: >>>> - Switch OPTEEMACHINE >>>> - Update optee-examples >>>> >>>> conf/machine/include/am62xx.inc | 2 +- >>>> conf/machine/include/am64xx.inc | 2 +- >>>> .../optee/optee-client_%.bbappend | 2 ++ >>>> .../optee/optee-examples_%.bbappend | 2 ++ >>>> ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 >>>> ------------------- >>>> ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- >>>> recipes-security/optee/optee-os_%.bbappend | 14 +++----- >>>> recipes-security/optee/optee-test_%.bbappend | 5 +++ >>>> 8 files changed, 15 insertions(+), 75 deletions(-) >>>> create mode 100644 recipes-security/optee/optee-client_%.bbappend >>>> create mode 100644 recipes-security/optee/optee-examples_%.bbappend >>>> delete mode 100644 >>>> recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>> >>>> delete mode 100644 >>>> recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>> >>>> create mode 100644 recipes-security/optee/optee-test_%.bbappend >>>> >>>> diff --git a/conf/machine/include/am62xx.inc >>>> b/conf/machine/include/am62xx.inc >>>> index ff857b97..0364edd1 100644 >>>> --- a/conf/machine/include/am62xx.inc >>>> +++ b/conf/machine/include/am62xx.inc >>>> @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = >>>> "mc::k3r5:ti-sci-fw:do_deploy" >>>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>> TFA_BOARD = "lite" >>>> -OPTEEMACHINE = "k3-am65x" >>>> +OPTEEMACHINE = "k3-am62x" >>>> OPTEEOUTPUTMACHINE = "k3" >>>> diff --git a/conf/machine/include/am64xx.inc >>>> b/conf/machine/include/am64xx.inc >>>> index 7646c70a..60ffacd5 100644 >>>> --- a/conf/machine/include/am64xx.inc >>>> +++ b/conf/machine/include/am64xx.inc >>>> @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = >>>> "mc::k3r5:ti-sci-fw:do_deploy" >>>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>> TFA_BOARD = "lite" >>>> -OPTEEMACHINE = "k3-am65x" >>>> +OPTEEMACHINE = "k3-am64x" >>>> OPTEEOUTPUTMACHINE = "k3" >>>> # Set the list of device targets for ti-pdk class recipes >>>> diff --git a/recipes-security/optee/optee-client_%.bbappend >>>> b/recipes-security/optee/optee-client_%.bbappend >>>> new file mode 100644 >>>> index 00000000..5675570a >>>> --- /dev/null >>>> +++ b/recipes-security/optee/optee-client_%.bbappend >>>> @@ -0,0 +1,2 @@ >>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>> +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >>>> diff --git a/recipes-security/optee/optee-examples_%.bbappend >>>> b/recipes-security/optee/optee-examples_%.bbappend >>>> new file mode 100644 >>>> index 00000000..19e32d9d >>>> --- /dev/null >>>> +++ b/recipes-security/optee/optee-examples_%.bbappend >>>> @@ -0,0 +1,2 @@ >>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>> +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" >>>> diff --git >>>> a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>> b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>> >>>> deleted file mode 100644 >>>> index 17005396..00000000 >>>> --- >>>> a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>> >>>> +++ /dev/null >>>> @@ -1,34 +0,0 @@ >>>> -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 >>>> -From: Ross Burton <ross.burton@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 >>>> diff --git >>>> a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>> b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>> >>>> deleted file mode 100644 >>>> index 5c0d0a56..00000000 >>>> --- >>>> a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>> >>>> +++ /dev/null >>>> @@ -1,29 +0,0 @@ >>>> -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 >>>> -From: Brett Warren <brett.warren@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 >>>> diff --git a/recipes-security/optee/optee-os_%.bbappend >>>> b/recipes-security/optee/optee-os_%.bbappend >>>> index 4e01ea74..75bd28ea 100644 >>>> --- a/recipes-security/optee/optee-os_%.bbappend >>>> +++ b/recipes-security/optee/optee-os_%.bbappend >>>> @@ -1,14 +1,8 @@ >>>> -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" >>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>> +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" >>>> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" >>>> -PV_ti-soc = "3.12.0+git${SRCPV}" >>>> - >>>> -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" >>>> - >>>> -SRC_URI_ti-soc = " \ >>>> - git://github.com/OP-TEE/optee_os.git \ >>>> - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ >>>> - file://0007-allow-setting-sysroot-for-clang.patch \ >>>> -" >>>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >>>> EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ >>>> d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" >>>> diff --git a/recipes-security/optee/optee-test_%.bbappend >>>> b/recipes-security/optee/optee-test_%.bbappend >>>> new file mode 100644 >>>> index 00000000..d81ae521 >>>> --- /dev/null >>>> +++ b/recipes-security/optee/optee-test_%.bbappend >>>> @@ -0,0 +1,5 @@ >>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>> +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" >>>> +SRC_URI_ti-soc = >>>> "git://github.com/OP-TEE/optee_test.git;protocol=https" >>>> + >>>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >> -- Ryan Eatmon reatmon@ti.com ----------------------------------------- Texas Instruments, Inc. - LCPD - MGTS ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-16 18:39 ` Ryan Eatmon @ 2022-06-16 19:30 ` Andrew Davis 0 siblings, 0 replies; 12+ messages in thread From: Andrew Davis @ 2022-06-16 19:30 UTC (permalink / raw) To: Ryan Eatmon, Denys Dmytriyenko, meta-arago Testing looks good now, v5 sent. Andrew On 6/16/22 1:39 PM, Ryan Eatmon wrote: > > 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. > > > On 6/16/2022 11:32, Andrew Davis wrote: >> Build errors or test errors? I'm ready to push v5 but >> don't see any build errors with v4. >> >> Andrew >> >> On 6/15/22 5:40 PM, Ryan Eatmon wrote: >>> >>> My initial test builds showed a number of errors so I already backed it out. >>> >>> >>> On 6/15/2022 16:32, Andrew Davis wrote: >>>> 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 >>>> >>>> On 6/14/22 4:55 PM, Andrew Davis wrote: >>>>> 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> >>>>> --- >>>>> >>>>> Changes from v3: >>>>> - Added note about SYSFW version req >>>>> - Updated optee-os SRCREV to newer commit >>>>> >>>>> Changes from v2: >>>>> - Switch OPTEEMACHINE >>>>> - Update optee-examples >>>>> >>>>> conf/machine/include/am62xx.inc | 2 +- >>>>> conf/machine/include/am64xx.inc | 2 +- >>>>> .../optee/optee-client_%.bbappend | 2 ++ >>>>> .../optee/optee-examples_%.bbappend | 2 ++ >>>>> ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- >>>>> ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- >>>>> recipes-security/optee/optee-os_%.bbappend | 14 +++----- >>>>> recipes-security/optee/optee-test_%.bbappend | 5 +++ >>>>> 8 files changed, 15 insertions(+), 75 deletions(-) >>>>> create mode 100644 recipes-security/optee/optee-client_%.bbappend >>>>> create mode 100644 recipes-security/optee/optee-examples_%.bbappend >>>>> delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>>> delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>>> create mode 100644 recipes-security/optee/optee-test_%.bbappend >>>>> >>>>> diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc >>>>> index ff857b97..0364edd1 100644 >>>>> --- a/conf/machine/include/am62xx.inc >>>>> +++ b/conf/machine/include/am62xx.inc >>>>> @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>>> TFA_BOARD = "lite" >>>>> -OPTEEMACHINE = "k3-am65x" >>>>> +OPTEEMACHINE = "k3-am62x" >>>>> OPTEEOUTPUTMACHINE = "k3" >>>>> diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc >>>>> index 7646c70a..60ffacd5 100644 >>>>> --- a/conf/machine/include/am64xx.inc >>>>> +++ b/conf/machine/include/am64xx.inc >>>>> @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>>> do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" >>>>> TFA_BOARD = "lite" >>>>> -OPTEEMACHINE = "k3-am65x" >>>>> +OPTEEMACHINE = "k3-am64x" >>>>> OPTEEOUTPUTMACHINE = "k3" >>>>> # Set the list of device targets for ti-pdk class recipes >>>>> diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend >>>>> new file mode 100644 >>>>> index 00000000..5675570a >>>>> --- /dev/null >>>>> +++ b/recipes-security/optee/optee-client_%.bbappend >>>>> @@ -0,0 +1,2 @@ >>>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>>> +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" >>>>> diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend >>>>> new file mode 100644 >>>>> index 00000000..19e32d9d >>>>> --- /dev/null >>>>> +++ b/recipes-security/optee/optee-examples_%.bbappend >>>>> @@ -0,0 +1,2 @@ >>>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>>> +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" >>>>> diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>>> deleted file mode 100644 >>>>> index 17005396..00000000 >>>>> --- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch >>>>> +++ /dev/null >>>>> @@ -1,34 +0,0 @@ >>>>> -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 >>>>> -From: Ross Burton <ross.burton@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 >>>>> diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>>> deleted file mode 100644 >>>>> index 5c0d0a56..00000000 >>>>> --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch >>>>> +++ /dev/null >>>>> @@ -1,29 +0,0 @@ >>>>> -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 >>>>> -From: Brett Warren <brett.warren@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 >>>>> diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend >>>>> index 4e01ea74..75bd28ea 100644 >>>>> --- a/recipes-security/optee/optee-os_%.bbappend >>>>> +++ b/recipes-security/optee/optee-os_%.bbappend >>>>> @@ -1,14 +1,8 @@ >>>>> -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" >>>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>>> +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" >>>>> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" >>>>> -PV_ti-soc = "3.12.0+git${SRCPV}" >>>>> - >>>>> -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" >>>>> - >>>>> -SRC_URI_ti-soc = " \ >>>>> - git://github.com/OP-TEE/optee_os.git \ >>>>> - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ >>>>> - file://0007-allow-setting-sysroot-for-clang.patch \ >>>>> -" >>>>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >>>>> EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" >>>>> diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend >>>>> new file mode 100644 >>>>> index 00000000..d81ae521 >>>>> --- /dev/null >>>>> +++ b/recipes-security/optee/optee-test_%.bbappend >>>>> @@ -0,0 +1,5 @@ >>>>> +PV_ti-soc = "3.17.0+git${SRCPV}" >>>>> +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" >>>>> +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" >>>>> + >>>>> +DEPENDS_append_ti-soc = " python3-cryptography-native" >>> > ^ permalink raw reply [flat|nested] 12+ messages in thread
* [meta-ti][dunfell][PATCH v4 1/2] trusted-firmware-a: Update to latest upstream master @ 2022-06-15 3:47 Andrew Davis 2022-06-15 3:47 ` [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 Andrew Davis 0 siblings, 1 reply; 12+ messages in thread From: Andrew Davis @ 2022-06-15 3:47 UTC (permalink / raw) To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis For TF-A we work against upstream first, our fork has only been used in the rare cases we need to ship a feature before we can get it upstream. This is not currently the case so lets switch to upstream repo until there is a need for our fork. Signed-off-by: Andrew Davis <afd@ti.com> --- recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 68bfa899..207f3dac 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,8 +1,6 @@ PV_k3 = "2.6" LIC_FILES_CHKSUM_k3 = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" -BRANCH_k3 = "ti-atf" -SRC_URI_k3 = "git://git.ti.com/atf/arm-trusted-firmware.git;branch=${BRANCH};name=tfa" -SRCREV_tfa_k3 = "6541aa24f834daa80da701e0054dfe3a16cda0ce" +SRCREV_tfa_k3 = "453abc80b2eacbf2816c838e47e40f063227d934" COMPATIBLE_MACHINE_k3 = "k3" TFA_BUILD_TARGET_k3 = "all" TFA_INSTALL_TARGET_k3 = "bl31" -- 2.36.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 2022-06-15 3:47 [meta-ti][dunfell][PATCH v4 1/2] trusted-firmware-a: Update to latest upstream master Andrew Davis @ 2022-06-15 3:47 ` Andrew Davis 0 siblings, 0 replies; 12+ messages in thread From: Andrew Davis @ 2022-06-15 3:47 UTC (permalink / raw) To: Denys Dmytriyenko, Ryan Eatmon, meta-ti; +Cc: Andrew Davis Update to the latest upstream master which is 3.17. We do this to add HUK and AM64x/AM62x support. With this we need to also switch OPTEEMACHINE for AM64x/AM62x. To build against the latest OP-TEE the support recipes need updated also. Move these here into meta-ti so that builds will still work when not using meta-arago-distro. The fix patches do not look to be needed anymore. While here switch to git checkout with https. NOTE: The latest OP-TEE requires SYSFW 8.04+ Signed-off-by: Andrew Davis <afd@ti.com> --- Changes from v3: - Added note about SYSFW version req - Updated optee-os SRCREV to newer commit Changes from v2: - Switch OPTEEMACHINE - Update optee-examples conf/machine/include/am62xx.inc | 2 +- conf/machine/include/am64xx.inc | 2 +- .../optee/optee-client_%.bbappend | 2 ++ .../optee/optee-examples_%.bbappend | 2 ++ ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 ------------------- ...0007-allow-setting-sysroot-for-clang.patch | 29 ---------------- recipes-security/optee/optee-os_%.bbappend | 14 +++----- recipes-security/optee/optee-test_%.bbappend | 5 +++ 8 files changed, 15 insertions(+), 75 deletions(-) create mode 100644 recipes-security/optee/optee-client_%.bbappend create mode 100644 recipes-security/optee/optee-examples_%.bbappend delete mode 100644 recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch delete mode 100644 recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch create mode 100644 recipes-security/optee/optee-test_%.bbappend diff --git a/conf/machine/include/am62xx.inc b/conf/machine/include/am62xx.inc index ff857b97..0364edd1 100644 --- a/conf/machine/include/am62xx.inc +++ b/conf/machine/include/am62xx.inc @@ -15,5 +15,5 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" TFA_BOARD = "lite" -OPTEEMACHINE = "k3-am65x" +OPTEEMACHINE = "k3-am62x" OPTEEOUTPUTMACHINE = "k3" diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 7646c70a..60ffacd5 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -20,7 +20,7 @@ do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" TFA_BOARD = "lite" -OPTEEMACHINE = "k3-am65x" +OPTEEMACHINE = "k3-am64x" OPTEEOUTPUTMACHINE = "k3" # Set the list of device targets for ti-pdk class recipes diff --git a/recipes-security/optee/optee-client_%.bbappend b/recipes-security/optee/optee-client_%.bbappend new file mode 100644 index 00000000..5675570a --- /dev/null +++ b/recipes-security/optee/optee-client_%.bbappend @@ -0,0 +1,2 @@ +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "a5c30b1277466a9bf85b62f45a6b00e79774e29c" diff --git a/recipes-security/optee/optee-examples_%.bbappend b/recipes-security/optee/optee-examples_%.bbappend new file mode 100644 index 00000000..19e32d9d --- /dev/null +++ b/recipes-security/optee/optee-examples_%.bbappend @@ -0,0 +1,2 @@ +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "65fc74309e12189ad5b6ce3ffec37c8011088a5a" diff --git a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch b/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch deleted file mode 100644 index 17005396..00000000 --- a/recipes-security/optee/optee-os/0006-allow-setting-sysroot-for-libgcc-lookup.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0bab935695ebcf0c533b49896ab18ff33d4a47d1 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@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 diff --git a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch b/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch deleted file mode 100644 index 5c0d0a56..00000000 --- a/recipes-security/optee/optee-os/0007-allow-setting-sysroot-for-clang.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3167f2c0dba4db59d61b60a8fe66f969d20aafa9 Mon Sep 17 00:00:00 2001 -From: Brett Warren <brett.warren@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 diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend index 4e01ea74..75bd28ea 100644 --- a/recipes-security/optee/optee-os_%.bbappend +++ b/recipes-security/optee/optee-os_%.bbappend @@ -1,14 +1,8 @@ -FILESEXTRAPATHS_prepend_ti-soc := "${THISDIR}/${PN}:" +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "bf9dfcc22a3c26edaba666d63cfaec0c3d1c5655" +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_os.git;protocol=https" -PV_ti-soc = "3.12.0+git${SRCPV}" - -SRCREV_ti-soc = "3d47a131bca1d9ed511bfd516aa5e70269e12c1d" - -SRC_URI_ti-soc = " \ - git://github.com/OP-TEE/optee_os.git \ - file://0006-allow-setting-sysroot-for-libgcc-lookup.patch \ - file://0007-allow-setting-sysroot-for-clang.patch \ -" +DEPENDS_append_ti-soc = " python3-cryptography-native" EXTRA_OEMAKE_append_k3 = "${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" diff --git a/recipes-security/optee/optee-test_%.bbappend b/recipes-security/optee/optee-test_%.bbappend new file mode 100644 index 00000000..d81ae521 --- /dev/null +++ b/recipes-security/optee/optee-test_%.bbappend @@ -0,0 +1,5 @@ +PV_ti-soc = "3.17.0+git${SRCPV}" +SRCREV_ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" +SRC_URI_ti-soc = "git://github.com/OP-TEE/optee_test.git;protocol=https" + +DEPENDS_append_ti-soc = " python3-cryptography-native" -- 2.36.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-06-16 19:30 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-06-14 21:55 [meta-ti][dunfell][PATCH v4 1/2] trusted-firmware-a: Update to latest upstream master Andrew Davis 2022-06-14 21:55 ` [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 Andrew Davis 2022-06-14 23:14 ` [meta-arago] " Denys Dmytriyenko 2022-06-15 3:48 ` Andrew Davis 2022-06-15 14:33 ` Ryan Eatmon 2022-06-15 15:13 ` Andrew Davis 2022-06-15 21:32 ` Andrew Davis 2022-06-15 22:40 ` Ryan Eatmon 2022-06-16 16:32 ` Andrew Davis 2022-06-16 18:39 ` Ryan Eatmon 2022-06-16 19:30 ` Andrew Davis 2022-06-15 3:47 [meta-ti][dunfell][PATCH v4 1/2] trusted-firmware-a: Update to latest upstream master Andrew Davis 2022-06-15 3:47 ` [meta-ti][dunfell][PATCH v4 2/2] optee: Upgrade to upstream 3.17.0 Andrew Davis
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.