diff mbox series

[1/2] arm-bsp: remove unused recipes

Message ID 20240411125913.64905-1-jon.mason@arm.com
State New
Headers show
Series [1/2] arm-bsp: remove unused recipes | expand

Commit Message

Jon Mason April 11, 2024, 12:59 p.m. UTC
These recipes users went away but didn't clean up after themselves.
Doing so now.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .../trusted-firmware-a/tf-a-tests_2.9.0.bb    | 54 -------------------
 .../optee/optee-client_4.0.0.bb               |  7 ---
 .../optee/optee-os-tadevkit_3.20.0.bb         | 24 ---------
 .../optee/optee-os-tadevkit_4.0.0.bb          | 29 ----------
 .../recipes-security/optee/optee-os_4.0.0.bb  | 10 ----
 .../optee/optee-test_4.0.0.bb                 | 11 ----
 6 files changed, 135 deletions(-)
 delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client_4.0.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bb
 delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bb

Comments

Jon Mason April 11, 2024, 6:39 p.m. UTC | #1
On Thu, 11 Apr 2024 08:59:12 -0400, Jon Mason wrote:
> These recipes users went away but didn't clean up after themselves.
> Doing so now.
> 
> 

Applied, thanks!

[1/2] arm-bsp: remove unused recipes
      commit: 2021b81dc5fce00667f2a2774b02abab5bf352e0
[2/2] arm-bsp: Remove tc1
      commit: 0af53c6453482a15395b86a107805c72da114c1c

Best regards,
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb
deleted file mode 100644
index 72a3e7911ba5..000000000000
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb
+++ /dev/null
@@ -1,54 +0,0 @@ 
-DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)"
-LICENSE = "BSD-3-Clause & NCSA"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a"
-
-inherit deploy
-
-COMPATIBLE_MACHINE ?= "invalid"
-
-SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https"
-SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \
-          "
-SRCBRANCH = "master"
-SRCREV = "df6783437cdc98dabf4f49568312b86460f72efa"
-
-DEPENDS += "optee-os"
-
-EXTRA_OEMAKE += "USE_NVM=0"
-EXTRA_OEMAKE += "SHELL_COLOR=1"
-EXTRA_OEMAKE += "DEBUG=1"
-
-# Platform must be set for each machine
-TFA_PLATFORM ?= "invalid"
-
-EXTRA_OEMAKE += "ARCH=aarch64"
-EXTRA_OEMAKE += "LOG_LEVEL=50"
-
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-# Add platform parameter
-EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}"
-
-# Requires CROSS_COMPILE set by hand as there is no configure script
-export CROSS_COMPILE="${TARGET_PREFIX}"
-
-do_compile() {
-    oe_runmake -C ${S} tftf
-}
-
-do_compile[cleandirs] = "${B}"
-
-FILES:${PN} = "/firmware/tftf.bin"
-SYSROOT_DIRS += "/firmware"
-
-do_install() {
-    install -d -m 755 ${D}/firmware
-    install -m 0644 ${B}/${TFA_PLATFORM}/debug/tftf.bin ${D}/firmware/tftf.bin
-}
-
-do_deploy() {
-    cp -rf ${D}/firmware/* ${DEPLOYDIR}/
-}
-addtask deploy after do_install
diff --git a/meta-arm-bsp/recipes-security/optee/optee-client_4.0.0.bb b/meta-arm-bsp/recipes-security/optee/optee-client_4.0.0.bb
deleted file mode 100644
index dc9577c211f0..000000000000
--- a/meta-arm-bsp/recipes-security/optee/optee-client_4.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@ 
-require recipes-security/optee/optee-client.inc
-
-SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee"
-
-inherit pkgconfig
-DEPENDS += "util-linux"
-EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bb b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bb
deleted file mode 100644
index 202caa546e95..000000000000
--- a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@ 
-require optee-os_3.20.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"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bb b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bb
deleted file mode 100644
index 9fe2697e60da..000000000000
--- a/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bb
+++ /dev/null
@@ -1,29 +0,0 @@ 
-require optee-os_4.0.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)}"
diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bb b/meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bb
deleted file mode 100644
index cb326042a571..000000000000
--- a/meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@ 
-require recipes-security/optee/optee-os.inc
-
-DEPENDS += "dtc-native"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRCREV = "2a5b1d1232f582056184367fb58a425ac7478ec6"
-SRC_URI += " \
-    file://0003-optee-enable-clang-support.patch \
-   "
diff --git a/meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bb b/meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bb
deleted file mode 100644
index ecd949f4318c..000000000000
--- a/meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@ 
-require recipes-security/optee/optee-test.inc
-
-SRCREV = "1c3d6be5eaa6174e3dbabf60928d15628e39b994"
-
-# 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)}"