From 3681201897f164408194e4cc823e1e3650607dab Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Thu, 4 Jun 2026 14:59:56 -0400
Subject: [PATCH] arm/optee: update to 4.10.0

Update the recipes to 4.10.0 and update the git recipes to 4.10.0
Since corstone1000 is still using 4.9.0, move that to meta-arm-bsp

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../optee/optee-client_4.9.0.bb               |  0
 .../optee/optee-examples_4.9.0.bb             |  0
 .../optee/optee-os-tadevkit_4.9.0.bb          |  0
 .../recipes-security/optee/optee-os_4.9.0.bb  |  0
 .../optee/optee-test_4.9.0.bb                 |  0
 .../optee/optee-client_4.10.0.bb              |  4 +++
 .../optee/optee-client_git.bb                 |  2 +-
 .../optee/optee-examples_4.10.0.bb            |  4 +++
 .../optee/optee-examples_git.bb               |  4 +--
 .../optee/optee-os-tadevkit_4.10.0.bb         | 30 +++++++++++++++++++
 .../recipes-security/optee/optee-os_4.10.0.bb |  6 ++++
 .../recipes-security/optee/optee-os_git.bb    |  4 +--
 .../optee/optee-test_4.10.0.bb                | 17 +++++++++++
 .../recipes-security/optee/optee-test_git.bb  |  4 +--
 14 files changed, 68 insertions(+), 7 deletions(-)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-client_4.9.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-examples_4.9.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-tadevkit_4.9.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os_4.9.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-test_4.9.0.bb (100%)
 create mode 100644 meta-arm/recipes-security/optee/optee-client_4.10.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-examples_4.10.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-os_4.10.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-test_4.10.0.bb

diff --git a/meta-arm/recipes-security/optee/optee-client_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-client_4.9.0.bb
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-client_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-client_4.9.0.bb
diff --git a/meta-arm/recipes-security/optee/optee-examples_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-examples_4.9.0.bb
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-examples_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-examples_4.9.0.bb
diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.9.0.bb
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.9.0.bb
diff --git a/meta-arm/recipes-security/optee/optee-os_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-os_4.9.0.bb
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-os_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-os_4.9.0.bb
diff --git a/meta-arm/recipes-security/optee/optee-test_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-test_4.9.0.bb
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-test_4.9.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-test_4.9.0.bb
diff --git a/meta-arm/recipes-security/optee/optee-client_4.10.0.bb b/meta-arm/recipes-security/optee/optee-client_4.10.0.bb
new file mode 100644
index 00000000..8897529e
--- /dev/null
+++ b/meta-arm/recipes-security/optee/optee-client_4.10.0.bb
@@ -0,0 +1,4 @@
+require recipes-security/optee/optee-client.inc
+
+# 4.9.0 and 4.10.0 share the same tag
+SRCREV = "9f5e90918093c1d1cd264d8149081b64ab7ba672"
diff --git a/meta-arm/recipes-security/optee/optee-client_git.bb b/meta-arm/recipes-security/optee/optee-client_git.bb
index 24e2d194..884f3b59 100644
--- a/meta-arm/recipes-security/optee/optee-client_git.bb
+++ b/meta-arm/recipes-security/optee/optee-client_git.bb
@@ -1,6 +1,6 @@
 require recipes-security/optee/optee-client.inc
 
-# v4.9.0
+# v4.10.0
 SRCREV = "9f5e90918093c1d1cd264d8149081b64ab7ba672"
 PV .= "+git"
 UPSTREAM_CHECK_COMMITS = "1"
diff --git a/meta-arm/recipes-security/optee/optee-examples_4.10.0.bb b/meta-arm/recipes-security/optee/optee-examples_4.10.0.bb
new file mode 100644
index 00000000..15fddb79
--- /dev/null
+++ b/meta-arm/recipes-security/optee/optee-examples_4.10.0.bb
@@ -0,0 +1,4 @@
+require recipes-security/optee/optee-examples.inc
+
+# v4.10.0
+SRCREV = "934c7edb74a26e90f68024cf441073528444177f"
diff --git a/meta-arm/recipes-security/optee/optee-examples_git.bb b/meta-arm/recipes-security/optee/optee-examples_git.bb
index 4fda635b..d8d6d043 100644
--- a/meta-arm/recipes-security/optee/optee-examples_git.bb
+++ b/meta-arm/recipes-security/optee/optee-examples_git.bb
@@ -1,7 +1,7 @@
 require recipes-security/optee/optee-examples.inc
 
-# v4.8.0
-SRCREV = "3ef17eb1f309def91113637f95f67613b1d89119"
+# v4.10.0
+SRCREV = "934c7edb74a26e90f68024cf441073528444177f"
 PV .= "+git"
 UPSTREAM_CHECK_COMMITS = "1"
 
diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb
new file mode 100644
index 00000000..cca9f62a
--- /dev/null
+++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb
@@ -0,0 +1,30 @@
+require recipes-security/optee/optee-os_${PV}.bb
+
+SUMMARY = "OP-TEE Trusted OS TA devkit"
+DESCRIPTION = "OP-TEE TA devkit for build TAs"
+HOMEPAGE = "https://www.op-tee.org/"
+
+DEPENDS += "python3-pycryptodome-native"
+DEPENDS:append:toolchain-clang = " lld-native"
+
+do_install() {
+    #install TA devkit
+    install -d ${D}${includedir}/optee/export-user_ta/
+    for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do
+        cp -aR $f ${D}${includedir}/optee/export-user_ta/
+    done
+}
+
+do_deploy() {
+	echo "Do not inherit do_deploy from optee-os."
+}
+
+FILES:${PN} = "${includedir}/optee/"
+
+# Build paths are currently embedded
+INSANE_SKIP:${PN}-dev += "buildpaths"
+
+# Include extra headers needed by SPMC tests to TA DEVKIT.
+# Supported after op-tee v3.20
+EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \
+                                        ' CFG_SPMC_TESTS=y', '' , d)}"
diff --git a/meta-arm/recipes-security/optee/optee-os_4.10.0.bb b/meta-arm/recipes-security/optee/optee-os_4.10.0.bb
new file mode 100644
index 00000000..b4c6ccca
--- /dev/null
+++ b/meta-arm/recipes-security/optee/optee-os_4.10.0.bb
@@ -0,0 +1,6 @@
+require recipes-security/optee/optee-os.inc
+
+DEPENDS += "dtc-native"
+
+# 4.10.0
+SRCREV = "753afbbee1682f5d16fd30e87b31058a4fd4f4b8"
diff --git a/meta-arm/recipes-security/optee/optee-os_git.bb b/meta-arm/recipes-security/optee/optee-os_git.bb
index 03b0f1cc..f2ae0d46 100644
--- a/meta-arm/recipes-security/optee/optee-os_git.bb
+++ b/meta-arm/recipes-security/optee/optee-os_git.bb
@@ -2,8 +2,8 @@ require recipes-security/optee/optee-os.inc
 
 DEPENDS += "dtc-native"
 
-# v4.8.0
-SRCREV = "86660925433a8d4d1b19cfa5fe940081d77b34b4"
+# v4.10.0
+SRCREV = "753afbbee1682f5d16fd30e87b31058a4fd4f4b8"
 PV .= "+git"
 UPSTREAM_CHECK_COMMITS = "1"
 
diff --git a/meta-arm/recipes-security/optee/optee-test_4.10.0.bb b/meta-arm/recipes-security/optee/optee-test_4.10.0.bb
new file mode 100644
index 00000000..f392a43e
--- /dev/null
+++ b/meta-arm/recipes-security/optee/optee-test_4.10.0.bb
@@ -0,0 +1,17 @@
+require recipes-security/optee/optee-test.inc
+
+# v4.10.0
+SRCREV = "88c93e87a5c172363ee986ded036a25cafcc9d2c"
+
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \
+                    file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \
+                    file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d \
+                   "
+
+# Include ffa_spmc test group if the SPMC test is enabled.
+# Supported after op-tee v3.20
+EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \
+                                        ' CFG_SPMC_TESTS=y CFG_SECURE_PARTITION=y', '' , d)}"
+
+RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \
+                                              ' arm-ffa-user', '' , d)}"
diff --git a/meta-arm/recipes-security/optee/optee-test_git.bb b/meta-arm/recipes-security/optee/optee-test_git.bb
index 1d4ee44e..a06c76c1 100644
--- a/meta-arm/recipes-security/optee/optee-test_git.bb
+++ b/meta-arm/recipes-security/optee/optee-test_git.bb
@@ -1,7 +1,7 @@
 require recipes-security/optee/optee-test.inc
 
-# v4.8.0
-SRCREV = "6569cd7b13e1b37b37069e090d592adca7d3926d"
+# v4.10.0
+SRCREV = "88c93e87a5c172363ee986ded036a25cafcc9d2c"
 PV .= "+git"
 UPSTREAM_CHECK_COMMITS = "1"