From 1899bc04e438d10c61ac539e14a7f11a8f54c41e Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Tue, 13 Sep 2022 03:55:00 +0000 Subject: optee: Upgrade to upstream 3.17.0 Update to the latest upstream master which is 3.17. We do this to add HUK and AM64x/AM62x support. With this we need to also switch OPTEEMACHINE for AM64x/AM62x. To build against the latest OP-TEE the support recipes need updated also. Move these here into meta-ti so that builds will still work when not using meta-arago-distro. The fix patches do not look to be needed anymore. While here switch to git checkout with https. NOTE: The latest OP-TEE requires SYSFW 8.04+ Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend | 2 ++ meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend | 2 ++ meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend | 2 ++ meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend | 5 +++++ meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend | 3 +++ 5 files changed, 14 insertions(+) create mode 100644 meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend create mode 100644 meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend create mode 100644 meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend create mode 100644 meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend (limited to 'meta-ti-bsp/recipes-security') diff --git a/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-client_%.bbappend new file mode 100644 index 00000000..109d451c --- /dev/null +++ b/meta-ti-bsp/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/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-examples_%.bbappend new file mode 100644 index 00000000..98b5bea4 --- /dev/null +++ b/meta-ti-bsp/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/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend new file mode 100644 index 00000000..4300c1a9 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-os-tadevkit_%.bbappend @@ -0,0 +1,2 @@ +PV:ti-soc = "3.17.0+git${SRCPV}" +SRCREV:ti-soc = "15a746d28d10df3d79d72bc9fe4a5a654b88bcca" diff --git a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend index d55bbc90..60e8c391 100644 --- a/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend +++ b/meta-ti-bsp/recipes-security/optee/optee-os_%.bbappend @@ -1,3 +1,8 @@ +PV:ti-soc = "3.17.0+git${SRCPV}" +SRCREV:ti-soc = "15a746d28d10df3d79d72bc9fe4a5a654b88bcca" + +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 ''}" do_compile:prepend:ti-soc() { diff --git a/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend new file mode 100644 index 00000000..4fbaa4c4 --- /dev/null +++ b/meta-ti-bsp/recipes-security/optee/optee-test_%.bbappend @@ -0,0 +1,3 @@ +PV:ti-soc = "3.17.0+git${SRCPV}" +SRCREV:ti-soc = "8a698baf9e8e010e4d8d52e6aded42dfc31e5b25" +SRC_URI:ti-soc = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https" -- cgit v1.2.3-54-g00ecf