[3/3] arm/arm-bsp: optee: drop version 4.7.0

diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.7.0.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.7.0.bb
deleted file mode 100644
index 9164f31b..00000000
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_4.7.0.bb
+++ /dev/null
@@ -1,94 +0,0 @@ 
-SUMMARY = "OPTEE fTPM Microsoft TA"
-DESCRIPTION = "TCG reference implementation of the TPM 2.0 Specification."
-HOMEPAGE = "https://github.com/microsoft/ms-tpm-20-ref/"
-
-COMPATIBLE_MACHINE ?= "invalid"
-COMPATIBLE_MACHINE:genericarm64 = "genericarm64"
-COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64"
-COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64"
-COMPATIBLE_MACHINE:qemuarm-secureboot = "qemuarm"
-
-inherit deploy python3native
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=5a3925ece0806073ae9ebbb08ff6f11e"
-LIC_FILES_CHKSUM += "file://optee-ta/LICENSE;md5=5a3925ece0806073ae9ebbb08ff6f11e"
-
-DEPENDS = "python3-pyelftools-native optee-os-tadevkit python3-cryptography-native"
-DEPENDS:append:toolchain-clang = " lld-native"
-
-FTPM_UUID = "bc50d971-d4c9-42c4-82cb-343fb7f37896"
-
-SRC_URI_ms-tpm   ?= "gitsm://github.com/Microsoft/ms-tpm-20-ref;protocol=https"
-SRC_URI_optee-ta ?= "gitsm://github.com/OP-TEE/optee_ftpm.git;protocol=https"
-
-SRCBRANCH_ms-tpm    = "main"
-SRCBRANCH_optee-ta  = "master"
-
-SRC_URI = "\
-    ${SRC_URI_ms-tpm};branch=${SRCBRANCH_ms-tpm};name=ms-tpm;destsuffix=ms-tpm \
-    ${SRC_URI_optee-ta};branch=${SRCBRANCH_optee-ta};name=optee-ta;destsuffix=ms-tpm/optee-ta \
-"
-
-# As per optee-ftpm TA documentation, we have to use this SHA of MS TPM reference
-SRCREV_ms-tpm   ?= "98b60a44aba79b15fcce1c0d1e46cf5918400f6a"
-
-# v4.7.0
-SRCREV_optee-ta ?= "ce33372ab772e879826361a1ca91126260bd9be1"
-
-SRCREV_FORMAT    = "ms-tpm_optee-ta"
-
-UPSTREAM_CHECK_COMMITS = "1"
-
-S = "${UNPACKDIR}/ms-tpm"
-
-OPTEE_CLIENT_EXPORT = "${STAGING_DIR_HOST}${prefix}"
-TEEC_EXPORT = "${STAGING_DIR_HOST}${prefix}"
-TA_DEV_KIT_DIR = "${STAGING_INCDIR}/optee/export-user_ta"
-
-EXTRA_OEMAKE += '\
-    COMPILER=${TOOLCHAIN} \
-    TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \
-    CROSS_COMPILE=${TARGET_PREFIX} \
-    CFG_MS_TPM_20_REF="${S}" \
-    CFLAGS="${CFLAGS} --sysroot=${STAGING_DIR_HOST}" \
-'
-
-EXTRA_OEMAKE:append:aarch64:qemuall = "\
-    CFG_ARM64_ta_arm64=y \
-"
-
-CFLAGS:append:toolchain-clang = " -Wno-unknown-warning-option"
-
-# python3-cryptography needs the legacy provider, so set OPENSSL_MODULES to the
-# right path until this is relocated automatically.
-export OPENSSL_MODULES = "${STAGING_LIBDIR_NATIVE}/ossl-modules"
-
-PARALLEL_MAKE = ""
-
-do_compile() {
-    cd ${S}/optee-ta
-    oe_runmake
-}
-
-do_install () {
-    mkdir -p ${D}/${nonarch_base_libdir}/optee_armtz
-    install -D -p -m 0644 ${S}/optee-ta/${FTPM_UUID}.ta ${D}/${nonarch_base_libdir}/optee_armtz/
-    install -D -p -m 0644 ${S}/optee-ta/${FTPM_UUID}.stripped.elf ${D}/${nonarch_base_libdir}/optee_armtz/
-}
-
-do_deploy () {
-    install -d ${DEPLOYDIR}/optee
-    install -D -p -m 0644 ${S}/optee-ta/${FTPM_UUID}.stripped.elf ${DEPLOYDIR}/optee/
-}
-
-addtask deploy before do_build after do_install
-
-FILES:${PN} += " \
-               ${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.ta \
-               ${nonarch_base_libdir}/optee_armtz/${FTPM_UUID}.stripped.elf \
-               "
-
-# Imports machine specific configs from staging to build
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-INSANE_SKIP:${PN} += "ldflags"
diff --git a/meta-arm/recipes-security/optee/optee-client/0001-tee-supplicant-update-udev-systemd-install-code.patch b/meta-arm/recipes-security/optee/optee-client/0001-tee-supplicant-update-udev-systemd-install-code.patch
deleted file mode 100644
index cd367124..00000000
--- a/meta-arm/recipes-security/optee/optee-client/0001-tee-supplicant-update-udev-systemd-install-code.patch
+++ /dev/null
@@ -1,78 +0,0 @@ 
-From 5ddaac7c0770a423eca0cb727403b2f06657ffea Mon Sep 17 00:00:00 2001
-From: Gyorgy Szing <gyorgy.szing@arm.com>
-Date: Tue, 14 Jan 2025 09:42:25 +0100
-Subject: [PATCH 1/1] tee-supplicant: update udev & systemd install code
-
-- Allow optionally using pkg-config to discover install location of
-  systemd service and udev rule files.
-- Make systemd service file generation and installation optional.
-- Make udev rule file generation and installation optional.
-
-Changes are backwards compatible and the default operation is unchanged.
-
-Upstream-Status: Submitted [https://github.com/OP-TEE/optee_client/pull/402]
-
-Signed-off-by: Gyorgy Szing <gyorgy.szing@arm.com>
----
- tee-supplicant/CMakeLists.txt | 39 +++++++++++++++++++++++++++++++----
- 1 file changed, 35 insertions(+), 4 deletions(-)
-
-diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt
-index 8df9bef..ae1f5a4 100644
---- a/tee-supplicant/CMakeLists.txt
-+++ b/tee-supplicant/CMakeLists.txt
-@@ -7,6 +7,9 @@ option(RPMB_EMU "Enable tee-supplicant to emulate RPMB" ON)
- option(CFG_TA_GPROF_SUPPORT "Enable tee-supplicant support for TAs instrumented with gprof" ON)
- option(CFG_FTRACE_SUPPORT "Enable tee-supplicant support for TAs instrumented with ftrace" ON)
- option(CFG_TEE_SUPP_PLUGINS "Enable tee-supplicant plugin support" ON)
-+option(CFG_ENABLE_SYSTEMD "Enable systemd service unit file generation." ON)
-+option(CFG_ENABLE_UDEV "Enable udev rules file generation." ON)
-+option(CFG_USE_PKGCONFIG "Use pkg-config for discovering install target directory for systemd and udev files." OFF)
- 
- set(CFG_TEE_SUPP_LOG_LEVEL "1" CACHE STRING "tee-supplicant log level")
- # FIXME: Question is, is this really needed? Should just use defaults from # GNUInstallDirs?
-@@ -117,8 +120,36 @@ endif()
- ################################################################################
- # Install targets
- ################################################################################
-+# Discover target install location of the systemd and udev files using pkg-config
-+if (CFG_USE_PKGCONFIG)
-+	# Note: pkg-config should return setting valid for the target platform and not the host.
-+	include(FindPkgConfig)
-+	if (PKG_CONFIG_FOUND)
-+		pkg_search_module(SYSTEMD systemd)
-+		if (SYSTEMD_FOUND AND CFG_ENABLE_SYSTEMD)
-+			pkg_get_variable(UNIT_DIR systemd systemd_system_unit_dir)
-+			set(SYSTEMD_UNIT_DIR "${UNIT_DIR}" CACHE PATH "Location of systemd unit files.")
-+			unset(UNIT_DIR)
-+		endif()
-+		pkg_search_module(UDEV udev)
-+		if (UDEV_FOUND)
-+			pkg_get_variable(UDEV_DIR udev udev_dir)
-+			set(UDEV_UDEV_DIR "${UDEV_DIR}" CACHE PATH "Location of udev files.")
-+			unset(UDEV_DIR)
-+		endif()
-+	endif()
-+endif()
-+
-+# Some sane defaults is discovering through pkgconfig fails or is disabled.
-+set(SYSTEMD_UNIT_DIR "${CMAKE_INSTALL_LIBDIR}/systemd/system" CACHE PATH "Location of systemd unit files.")
-+set(UDEV_UDEV_DIR "${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d" CACHE PATH "Location of udev files.")
-+
- install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
--configure_file(tee-supplicant@.service.in tee-supplicant@.service @ONLY)
--install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}/tee-supplicant@.service DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system)
--configure_file(optee-udev.rules.in optee-udev.rules @ONLY)
--install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}/optee-udev.rules DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d)
-+if (CFG_ENABLE_SYSTEMD)
-+	configure_file(tee-supplicant@.service.in tee-supplicant@.service @ONLY)
-+	install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}/tee-supplicant@.service DESTINATION ${SYSTEMD_UNIT_DIR})
-+endif()
-+if (CFG_ENABLE_UDEV)
-+	configure_file(optee-udev.rules.in optee-udev.rules @ONLY)
-+	install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}/optee-udev.rules DESTINATION ${UDEV_UDEV_DIR})
-+endif()
-\ No newline at end of file
--- 
-2.43.0
-
diff --git a/meta-arm/recipes-security/optee/optee-client_4.7.0.bb b/meta-arm/recipes-security/optee/optee-client_4.7.0.bb
deleted file mode 100644
index 2fb157df..00000000
--- a/meta-arm/recipes-security/optee/optee-client_4.7.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@ 
-require recipes-security/optee/optee-client.inc
-
-# v4.7.0
-SRCREV = "23c112a6f05cc5e39bd4aaf52ad515cad532237d"
-SRC_URI += "file://0001-tee-supplicant-update-udev-systemd-install-code.patch"
diff --git a/meta-arm/recipes-security/optee/optee-examples_4.7.0.bb b/meta-arm/recipes-security/optee/optee-examples_4.7.0.bb
deleted file mode 100644
index a926f819..00000000
--- a/meta-arm/recipes-security/optee/optee-examples_4.7.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@ 
-require recipes-security/optee/optee-examples.inc
-
-# v4.7.0
-SRCREV = "14321a0607db16099d158478b21a2b2e37b3a935"
diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.7.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.7.0.bb
deleted file mode 100644
index cca9f62a..00000000
--- a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.7.0.bb
+++ /dev/null
@@ -1,30 +0,0 @@ 
-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.7.0.bb b/meta-arm/recipes-security/optee/optee-os_4.7.0.bb
deleted file mode 100644
index 1d5d8ccc..00000000
--- a/meta-arm/recipes-security/optee/optee-os_4.7.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@ 
-require recipes-security/optee/optee-os.inc
-
-DEPENDS += "dtc-native"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-# v4.7.0
-SRCREV = "86846f4fdf14f25b50fd64a87888ca9fe85a9e2b"
diff --git a/meta-arm/recipes-security/optee/optee-test_4.7.0.bb b/meta-arm/recipes-security/optee/optee-test_4.7.0.bb
deleted file mode 100644
index f42e254a..00000000
--- a/meta-arm/recipes-security/optee/optee-test_4.7.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@ 
-require recipes-security/optee/optee-test.inc
-
-# v4.7.0
-SRCREV = "a15be9eca1b7e935917d834284726027dffc8cfb"
-
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560"
-
-# 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)}"