Skip to contentSkip to conversation

arm/opencsd: update to v1.5.1

PATCH Applied Jon Mason 2 participants 4 messages Jan 26, 2024 – Jan 27, 2024

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/3 arm/opencsd: update to v1.5.1

---
 .../opencsd/{opencsd_1.4.2.bb => opencsd_1.5.1.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-arm/recipes-devtools/opencsd/{opencsd_1.4.2.bb => opencsd_1.5.1.bb} (95%)
meta-arm/recipes-devtools/opencsd/opencsd_1.5.1.bb renamed from meta-arm/recipes-devtools/opencsd/opencsd_1.4.2.bb +1 -1
similarity index 95%
rename from meta-arm/recipes-devtools/opencsd/opencsd_1.4.2.bb
rename to meta-arm/recipes-devtools/opencsd/opencsd_1.5.1.bb
index 4bfed2780860..5f838557db9f 100644
@@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5"
 
 SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https;branch=master"
-SRCREV = "37ace5c3e1a9f87d0541b3d3cbbbf39267258dbc"
+SRCREV = "c16418833b5d7cbcbcb4e2a2d917ad0147efb2be"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.39.3 (Apple Git-145)
author
#1 lore raw

PATCH 2/3 arm/optee: update to 4.1

Add 4.1.0 recipes and move 4.0.0 to meta-arm-bsp for n1sdp

---
 .../conf/machine/include/corstone1000.inc     |  3 +-
 meta-arm-bsp/conf/machine/n1sdp.conf          |  3 ++
 .../optee/optee-client_4.0.0.bb               |  0
 .../optee/optee-examples_4.0.0.bb             |  0
 ...bappend => optee-os-tadevkit_4.%.bbappend} |  0
 .../optee/optee-os-tadevkit_4.0.0.bb          |  0
 .../0003-optee-enable-clang-support.patch     | 30 ++++++++++++++++
 ...s_4.0.0.bbappend => optee-os_4.%.bbappend} |  0
 .../recipes-security/optee/optee-os_4.0.0.bb  |  0
 ...4.0.0.bbappend => optee-test_4.%.bbappend} |  0
 .../optee/optee-test_4.0.0.bb                 |  0
 .../optee/optee-client_4.1.0.bb               |  7 ++++
 .../optee/optee-examples_4.1.0.bb             |  3 ++
 .../optee/optee-os-tadevkit_4.1.0.bb          | 29 ++++++++++++++++
 .../recipes-security/optee/optee-os_4.1.0.bb  | 10 ++++++
 ...stats-remove-unneeded-stat.h-include.patch | 34 +++++++++++++++++++
 .../optee/optee-test_4.1.0.bb                 | 12 +++++++
 17 files changed, 129 insertions(+), 2 deletions(-)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-client_4.0.0.bb (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-examples_4.0.0.bb (100%)
 rename meta-arm-bsp/recipes-security/optee/{optee-os-tadevkit_4.0.0.bbappend => optee-os-tadevkit_4.%.bbappend} (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-tadevkit_4.0.0.bb (100%)
 create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch
 rename meta-arm-bsp/recipes-security/optee/{optee-os_4.0.0.bbappend => optee-os_4.%.bbappend} (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os_4.0.0.bb (100%)
 rename meta-arm-bsp/recipes-security/optee/{optee-test_4.0.0.bbappend => optee-test_4.%.bbappend} (100%)
 rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-test_4.0.0.bb (100%)
 create mode 100644 meta-arm/recipes-security/optee/optee-client_4.1.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-examples_4.1.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_4.1.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-os_4.1.0.bb
 create mode 100644 meta-arm/recipes-security/optee/optee-test/0001-xtest-stats-remove-unneeded-stat.h-include.patch
 create mode 100644 meta-arm/recipes-security/optee/optee-test_4.1.0.bb
meta-arm-bsp/conf/machine/include/corstone1000.inc +1 -2
index d03c23c09c7c..06b630a55cc9 100644
@@ -37,8 +37,7 @@ UBOOT_ARCH = "arm"
 UBOOT_EXTLINUX = "0"
 
 #optee
-PREFERRED_VERSION_optee-os ?= "4.0.%"
-PREFERRED_VERSION_optee-client ?= "3.22%"
+PREFERRED_VERSION_optee-os ?= "4.1.%"
 EXTRA_IMAGEDEPENDS += "optee-os"
 OPTEE_ARCH = "arm64"
 OPTEE_BINARY = "tee-pager_v2.bin"
meta-arm-bsp/conf/machine/n1sdp.conf +3 -0
index 79604cee9989..7e39e2f4ee53 100644
@@ -38,6 +38,9 @@ PREFERRED_VERSION_edk2-firmware ?= "202305"
 
 #optee
 PREFERRED_VERSION_optee-os ?= "4.0.%"
+PREFERRED_VERSION_optee-os-tadevkit ?= "4.0.%"
+PREFERRED_VERSION_optee-test ?= "4.0.%"
+PREFERRED_VERSION_optee-client ?= "4.0.%"
 
 #grub-efi
 EFI_PROVIDER ?= "grub-efi"
meta-arm-bsp/recipes-security/optee/optee-client_4.0.0.bb renamed from meta-arm/recipes-security/optee/optee-client_4.0.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-client_4.0.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-client_4.0.0.bb
meta-arm-bsp/recipes-security/optee/optee-examples_4.0.0.bb renamed from meta-arm/recipes-security/optee/optee-examples_4.0.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-examples_4.0.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-examples_4.0.0.bb
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.%.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.%.bbappend
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bb renamed from meta-arm/recipes-security/optee/optee-os-tadevkit_4.0.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-os-tadevkit_4.0.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bb
meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch new file +30 -0
new file mode 100644
index 000000000000..3c13ce3f028c
@@ -0,0 +1,30 @@
+From 59d4c190eae11c93b26cca5a7b005a17dadc8248 Mon Sep 17 00:00:00 2001
+From: Brett Warren <[email protected]>
+Date: Wed, 23 Sep 2020 09:27:34 +0100
+Subject: [PATCH] optee: enable clang support
+
+When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
+to provide a sysroot wasn't included, which results in not locating
+compiler-rt. This is mitigated by including the variable as ammended.
+
+Upstream-Status: Pending
+ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
+Signed-off-by: Brett Warren <[email protected]>
+
+---
+ mk/clang.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mk/clang.mk b/mk/clang.mk
+index a045beee8..1ebe2f702 100644
+--- a/mk/clang.mk
++++ b/mk/clang.mk
+@@ -30,7 +30,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
meta-arm-bsp/recipes-security/optee/optee-os_4.%.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-os_4.%.bbappend
meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bb renamed from meta-arm/recipes-security/optee/optee-os_4.0.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-os_4.0.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bb
meta-arm-bsp/recipes-security/optee/optee-test_4.%.bbappend renamed from meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bbappend +0 -0
similarity index 100%
rename from meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bbappend
rename to meta-arm-bsp/recipes-security/optee/optee-test_4.%.bbappend
meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bb renamed from meta-arm/recipes-security/optee/optee-test_4.0.0.bb +0 -0
similarity index 100%
rename from meta-arm/recipes-security/optee/optee-test_4.0.0.bb
rename to meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bb
meta-arm/recipes-security/optee/optee-client_4.1.0.bb new file +7 -0
new file mode 100644
index 000000000000..2f9567658262
@@ -0,0 +1,7 @@
+require recipes-security/optee/optee-client.inc
+
+SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2"
+
+inherit pkgconfig
+DEPENDS += "util-linux"
+EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
meta-arm/recipes-security/optee/optee-examples_4.1.0.bb new file +3 -0
new file mode 100644
index 000000000000..f082a25d05c7
@@ -0,0 +1,3 @@
+require recipes-security/optee/optee-examples.inc
+
+SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
meta-arm/recipes-security/optee/optee-os-tadevkit_4.1.0.bb new file +29 -0
new file mode 100644
index 000000000000..961d52517929
@@ -0,0 +1,29 @@
+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"
+
+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)}"
meta-arm/recipes-security/optee/optee-os_4.1.0.bb new file +10 -0
new file mode 100644
index 000000000000..bfb61eb28b6e
@@ -0,0 +1,10 @@
+require recipes-security/optee/optee-os.inc
+
+DEPENDS += "dtc-native"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRCREV = "18b424c23aa5a798dfe2e4d20b4bde3919dc4e99"
+SRC_URI += " \
+    file://0003-optee-enable-clang-support.patch \
+   "
meta-arm/recipes-security/optee/optee-test/0001-xtest-stats-remove-unneeded-stat.h-include.patch new file +34 -0
new file mode 100644
index 000000000000..581c6db3cc82
@@ -0,0 +1,34 @@
+From 236ebb968a298fa5d461e734559ad8a13b667eb6 Mon Sep 17 00:00:00 2001
+From: Jon Mason <[email protected]>
+Date: Wed, 24 Jan 2024 11:35:50 -0500
+Subject: [PATCH] xtest: stats: remove unneeded stat.h include
+
+Hack to work around musl compile error:
+
+| In file included from optee-test/4.1.0/recipe-sysroot/usr/include/sys/stat.h:23,
+|                  from optee-test/4.1.0/git/host/xtest/stats.c:17:
+| optee-test/4.1.0/recipe-sysroot/usr/include/bits/stat.h:17:26: error: expected identifier or '(' before '[' token
+|    17 |         unsigned __unused[2];
+|       |                          ^
+
+stat.h is not needed, since it is not being used in this file.  So
+removing it.
+
+Upstream-Status: Inappropriate [https://github.com/OP-TEE/optee_test/issues/722]
+Signed-off-by: Jon Mason <[email protected]>
+---
+ host/xtest/stats.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/host/xtest/stats.c b/host/xtest/stats.c
+index fb16d55586da..05aa3adac611 100644
+--- a/host/xtest/stats.c
++++ b/host/xtest/stats.c
+@@ -14,7 +14,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <tee_client_api.h>
+ #include <unistd.h>
meta-arm/recipes-security/optee/optee-test_4.1.0.bb new file +12 -0
new file mode 100644
index 000000000000..1b124550b9d2
@@ -0,0 +1,12 @@
+require recipes-security/optee/optee-test.inc
+
+SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2"
+SRC_URI += "file://0001-xtest-stats-remove-unneeded-stat.h-include.patch"
+
+# 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)}"
Signature · 1 line
2.39.3 (Apple Git-145)
author
#2 lore raw

PATCH 3/3 arm-bsp/optee: remove unused v3.22.0 recipes

In reply to Jon Mason
---
 .../optee/optee-client_3.22.0.bb              |   7 -
 .../optee/optee-examples_3.22.0.bb            |   3 -
 ...ow-setting-sysroot-for-libgcc-lookup.patch |  34 ---
 ...-Define-section-attributes-for-clang.patch | 240 ------------------
 .../0003-optee-enable-clang-support.patch     |  29 ---
 ...4-core-link-add-no-warn-rwx-segments.patch |  62 -----
 .../optee/optee-os-tadevkit_3.22.0.bb         |  29 ---
 .../optee/optee-os-tadevkit_3.22.0.bbappend   |   6 -
 .../recipes-security/optee/optee-os_3.22.0.bb |  13 -
 .../optee/optee-os_3.22.0.bbappend            |   9 -
 .../optee/optee-test_3.22.0.bb                |  14 -
 .../optee/optee-test_3.22.0.bbappend          |   6 -
 12 files changed, 452 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client_3.22.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-examples_3.22.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.22.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.22.0/0002-core-Define-section-attributes-for-clang.patch
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.22.0/0003-optee-enable-clang-support.patch
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.22.0/0004-core-link-add-no-warn-rwx-segments.patch
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.22.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.22.0.bbappend
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_3.22.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_3.22.0.bbappend
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test_3.22.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test_3.22.0.bbappend
meta-arm-bsp/recipes-security/optee/optee-client_3.22.0.bb deleted +0 -7
deleted file mode 100644
index 904c25650941..000000000000
@@ -1,7 +0,0 @@
-require recipes-security/optee/optee-client.inc
-
-SRCREV = "8533e0e6329840ee96cf81b6453f257204227e6c"
-
-inherit pkgconfig
-DEPENDS += "util-linux"
-EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
meta-arm-bsp/recipes-security/optee/optee-examples_3.22.0.bb deleted +0 -3
deleted file mode 100644
index f082a25d05c7..000000000000
@@ -1,3 +0,0 @@
-require recipes-security/optee/optee-examples.inc
-
-SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
meta-arm-bsp/recipes-security/optee/optee-os-3.22.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
deleted file mode 100644
index 392e8d82bdb2..000000000000
@@ -1,34 +0,0 @@
-From 02ea8e616ac615efe3507d627dfba9820d3357f6 Mon Sep 17 00:00:00 2001
-From: Ross Burton <[email protected]>
-Date: Tue, 26 May 2020 14:38:02 -0500
-Subject: [PATCH] allow setting sysroot for libgcc lookup
-
-Explicitly pass the new variable LIBGCC_LOCATE_CFLAGS variable when searching
-for the compiler libraries as there's no easy way to reliably pass --sysroot
-otherwise.
-
-Upstream-Status: Pending [https://github.com/OP-TEE/optee_os/issues/4188]
-Signed-off-by: Ross Burton <[email protected]>
----
- mk/gcc.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mk/gcc.mk b/mk/gcc.mk
-index adc77a24f25e..81bfa78ad8d7 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
meta-arm-bsp/recipes-security/optee/optee-os-3.22.0/0002-core-Define-section-attributes-for-clang.patch deleted +0 -240

240 lines not on this page · raw message

meta-arm-bsp/recipes-security/optee/optee-os-3.22.0/0003-optee-enable-clang-support.patch deleted +0 -29
deleted file mode 100644
index b4ea8ed35639..000000000000
@@ -1,29 +0,0 @@
-From 9c55b7a4e39617c2abbf4e0e39fd8041c7b2b9b6 Mon Sep 17 00:00:00 2001
-From: Brett Warren <[email protected]>
-Date: Wed, 23 Sep 2020 09:27:34 +0100
-Subject: [PATCH] optee: enable clang support
-
-When compiling with clang, the LIBGCC_LOCATE_CFLAG variable used
-to provide a sysroot wasn't included, which results in not locating
-compiler-rt. This is mitigated by including the variable as ammended.
-
-Upstream-Status: Pending
-ChangeId: 8ba69a4b2eb8ebaa047cb266c9aa6c2c3da45701
-Signed-off-by: Brett Warren <[email protected]>
----
- mk/clang.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mk/clang.mk b/mk/clang.mk
-index a045beee8482..1ebe2f702dcd 100644
---- a/mk/clang.mk
-+++ b/mk/clang.mk
-@@ -30,7 +30,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
meta-arm-bsp/recipes-security/optee/optee-os-3.22.0/0004-core-link-add-no-warn-rwx-segments.patch deleted +0 -62

62 lines not on this page · raw message

meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.22.0.bb deleted +0 -29
deleted file mode 100644
index 44496164b690..000000000000
@@ -1,29 +0,0 @@
-require optee-os_3.22.0.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"
-
-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)}"
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.22.0.bbappend deleted +0 -6
deleted file mode 100644
index e09c4a5ea7fa..000000000000
@@ -1,6 +0,0 @@
-# Machine specific configurations
-
-MACHINE_OPTEE_OS_TADEVKIT_REQUIRE ?= ""
-MACHINE_OPTEE_OS_TADEVKIT_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
-
-require ${MACHINE_OPTEE_OS_TADEVKIT_REQUIRE}
meta-arm-bsp/recipes-security/optee/optee-os_3.22.0.bb deleted +0 -13
deleted file mode 100644
index e12201920e31..000000000000
@@ -1,13 +0,0 @@
-require recipes-security/optee/optee-os.inc
-
-DEPENDS += "dtc-native"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${P}:"
-
-SRCREV = "001ace6655dd6bb9cbe31aa31b4ba69746e1a1d9"
-SRC_URI += " \
-    file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \
-    file://0002-core-Define-section-attributes-for-clang.patch \
-    file://0003-optee-enable-clang-support.patch \
-    file://0004-core-link-add-no-warn-rwx-segments.patch \
-   "
meta-arm-bsp/recipes-security/optee/optee-os_3.22.0.bbappend deleted +0 -9
deleted file mode 100644
index ee4ca17f53cb..000000000000
@@ -1,9 +0,0 @@
-# Include Trusted Services Secure Partitions
-require recipes-security/optee/optee-os-ts.inc
-
-# Machine specific configurations
-MACHINE_OPTEE_OS_REQUIRE ?= ""
-MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc"
-MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc"
-
-require ${MACHINE_OPTEE_OS_REQUIRE}
meta-arm-bsp/recipes-security/optee/optee-test_3.22.0.bb deleted +0 -14
deleted file mode 100644
index eddf04d86cbf..000000000000
@@ -1,14 +0,0 @@
-require recipes-security/optee/optee-test.inc
-
-SRC_URI += " \
-    file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch \
-   "
-SRCREV = "a286b57f1721af215ace318d5807e63f40186df6"
-
-# 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)}"
meta-arm-bsp/recipes-security/optee/optee-test_3.22.0.bbappend deleted +0 -6
deleted file mode 100644
index 05e2abca63f1..000000000000
@@ -1,6 +0,0 @@
-# Machine specific configurations
-
-MACHINE_OPTEE_TEST_REQUIRE ?= ""
-MACHINE_OPTEE_TEST_REQUIRE:n1sdp = "optee-os-generic-n1sdp.inc"
-
-require ${MACHINE_OPTEE_TEST_REQUIRE}
Signature · 1 line
2.39.3 (Apple Git-145)
Applied
#3 lore raw
In reply to Jon Mason
Quoted 1 line · Jon Mason

Applied, thanks!

[1/3] arm/opencsd: update to v1.5.1

      commit: b422688735de8a1705323fa19a5fd08d1f6a28de
[2/3] arm/optee: update to 4.1
      commit: 5a78c75f3544afb670927cc004097db36a8ce162
[3/3] arm-bsp/optee: remove unused v3.22.0 recipes
      commit: d1f05978224605e592a0003a057e69efdd58a3da

Best regards,

Signature · 1 line
Jon Mason <[email protected]>