arm-bsp: remove unused recipes
PATCH 1/2 arm-bsp: remove unused recipes
These recipes users went away but didn't clean up after themselves. Doing so now.
--- .../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
meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.9.0.bb deleted +0 -54
@@ -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
meta-arm-bsp/recipes-security/optee/optee-client_4.0.0.bb deleted +0 -7
@@ -1,7 +0,0 @@ -require recipes-security/optee/optee-client.inc - -SRCREV = "acb0885c117e73cb6c5c9b1dd9054cb3f93507ee" - -inherit pkgconfig -DEPENDS += "util-linux" -EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_3.20.0.bb deleted +0 -24
@@ -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"
meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.0.0.bb deleted +0 -29
@@ -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)}"
meta-arm-bsp/recipes-security/optee/optee-os_4.0.0.bb deleted +0 -10
@@ -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 \ - "
meta-arm-bsp/recipes-security/optee/optee-test_4.0.0.bb deleted +0 -11
@@ -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)}"
Signature · 1 line
2.39.3 (Apple Git-146)
PATCH 2/2 arm-bsp: Remove tc1
Remove tc1 and related recipes that are unique to it (and generally unused ones).
--- .gitlab-ci.yml | 8 - ci/fvps.yml | 1 - ci/tc1.yml | 11 - meta-arm-bsp/conf/machine/include/tc.inc | 36 - meta-arm-bsp/conf/machine/tc1.conf | 31 - meta-arm-bsp/documentation/tc1.md | 32 - .../recipes-bsp/hafnium/hafnium-tc.inc | 8 - .../scp-firmware/scp-firmware-tc.inc | 6 - .../trusted-firmware-a-tc.inc | 134 ---- .../trusted-firmware-a_2.8.6.bb | 19 - meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc.inc | 5 - .../tc/0001-WIP-Enable-managed-exit.patch | 120 ---- ...talcompute-fix-TZDRAM-start-and-size.patch | 34 - ...xtest-Limit-tests-to-a-single-thread.patch | 55 -- .../optee/optee-client_3.20.0.bb | 7 - ...ow-setting-sysroot-for-libgcc-lookup.patch | 34 - .../0002-optee-enable-clang-support.patch | 29 - ...3-core-link-add-no-warn-rwx-segments.patch | 62 -- ...-Define-section-attributes-for-clang.patch | 240 ------- ...-core-arm-S-EL1-SPMC-boot-ABI-update.patch | 89 --- ...-core-ffa-add-TOS_FW_CONFIG-handling.patch | 247 ------- ...re-spmc-handle-non-secure-interrupts.patch | 275 -------- ...ure-SP-s-NS-interrupt-action-based-o.patch | 148 ---- .../optee-os-3.20.0/CVE-2023-41325.patch | 634 ------------------ .../recipes-security/optee/optee-os-tc.inc | 33 - .../0003-optee-enable-clang-support.patch | 30 - .../recipes-security/optee/optee-os_3.20.0.bb | 18 - .../optee/optee-os_3.20.0.bbappend | 6 - .../recipes-security/optee/optee-test-tc.inc | 8 - ..._1000-remove-unneeded-stat.h-include.patch | 34 - ..._ffa_user-driver-compatibility-check.patch | 160 ----- ...pdate-arm_ffa_user-driver-dependency.patch | 36 - .../optee/optee-test_3.20.0.bb | 8 - .../optee/optee-test_3.20.0.bbappend | 6 - meta-arm/recipes-devtools/fvp/fvp-tc1.bb | 11 - 35 files changed, 2615 deletions(-) delete mode 100644 ci/tc1.yml delete mode 100644 meta-arm-bsp/conf/machine/include/tc.inc delete mode 100644 meta-arm-bsp/conf/machine/tc1.conf delete mode 100644 meta-arm-bsp/documentation/tc1.md delete mode 100644 meta-arm-bsp/recipes-bsp/hafnium/hafnium-tc.inc delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc.inc delete mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-WIP-Enable-managed-exit.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0002-plat-totalcompute-fix-TZDRAM-start-and-size.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-test/tc/0001-xtest-Limit-tests-to-a-single-thread.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-client_3.20.0.bb delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0002-optee-enable-clang-support.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0003-core-link-add-no-warn-rwx-segments.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0004-core-Define-section-attributes-for-clang.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0007-core-spmc-handle-non-secure-interrupts.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/CVE-2023-41325.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os-tc.inc delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bb delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test-tc.inc delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test/0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test/0002-ffa_spmc-Add-arm_ffa_user-driver-compatibility-check.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test/0003-Update-arm_ffa_user-driver-dependency.patch delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test_3.20.0.bb delete mode 100644 meta-arm-bsp/recipes-security/optee/optee-test_3.20.0.bbappend delete mode 100644 meta-arm/recipes-devtools/fvp/fvp-tc1.bb
.gitlab-ci.yml +0 -8
@@ -260,14 +260,6 @@ qemuarmv5: sgi575: extends: .build -tc1: - extends: .build - parallel: - matrix: - - TESTING: testimage - tags: - - x86_64 - toolchains: extends: .build
ci/fvps.yml +0 -1
@@ -22,4 +22,3 @@ target: - nativesdk-fvp-corstone1000 - nativesdk-fvp-n1-edge - nativesdk-fvp-sgi575 - - nativesdk-fvp-tc1
ci/tc1.yml deleted +0 -11
@@ -1,11 +0,0 @@ -header: - version: 14 - includes: - - ci/base.yml - - ci/fvp.yml - - ci/meta-openembedded.yml - -machine: tc1 - -target: - - core-image-minimal
meta-arm-bsp/conf/machine/include/tc.inc deleted +0 -36
@@ -1,36 +0,0 @@ -TUNE_FEATURES = "aarch64" - -require conf/machine/include/arm/arch-armv8a.inc - -MACHINEOVERRIDES =. "tc:" - -# Das U-boot -UBOOT_MACHINE ?= "total_compute_defconfig" -UBOOT_RD_LOADADDRESS = "0x88000000" -UBOOT_RD_ENTRYPOINT = "0x88000000" -UBOOT_LOADADDRESS = "0x80080000" -UBOOT_ENTRYPOINT = "0x80080000" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" - -# OP-TEE -PREFERRED_VERSION_optee-os ?= "3.20%" -PREFERRED_VERSION_optee-client ?= "3.20%" -PREFERRED_VERSION_optee-test ?= "3.20%" - -# Cannot use the default zImage on arm64 -KERNEL_IMAGETYPE = "Image" -KERNEL_IMAGETYPES += "fitImage" -KERNEL_CLASSES = " kernel-fitimage " - -IMAGE_FSTYPES += "cpio.gz" -INITRAMFS_IMAGE ?= "core-image-minimal" -IMAGE_NAME_SUFFIX = "" - -SERIAL_CONSOLES = "115200;ttyAMA0" - -EXTRA_IMAGEDEPENDS += "trusted-firmware-a optee-os" -PREFERRED_VERSION_trusted-firmware-a ?= "2.8.%" -# FIXME - there is signed image dependency/race with testimage. -# This should be fixed in oe-core -TESTIMAGEDEPENDS:append = " virtual/kernel:do_deploy"
meta-arm-bsp/conf/machine/tc1.conf deleted +0 -31
@@ -1,31 +0,0 @@ -# Configuration for TC1 - -#@TYPE: Machine -#@NAME: TC1 -#@DESCRIPTION: Machine configuration for TC1 - -require conf/machine/include/tc.inc - -TEST_TARGET = "OEFVPTarget" -TEST_SUITES = "fvp_boot" - -# FVP Config -FVP_PROVIDER ?= "fvp-tc1-native" -FVP_EXE ?= "FVP_TC1" - -# FVP Parameters -FVP_CONFIG[css.scp.ROMloader.fname] ?= "scp_romfw.bin" -FVP_CONFIG[css.trustedBootROMloader.fname] ?= "bl1-tc.bin" -FVP_CONFIG[board.flashloader0.fname] ?= "fip_gpt-tc.bin" - -#FVP_CONFIG[board.hostbridge.userNetworking] ?= "true" -#FVP_CONFIG[board.hostbridge.userNetPorts] ?= "2222=22" -#smsc ethernet takes a very long time to come up. disable now to prevent testimage timeout -#FVP_CONFIG[board.smsc_91c111.enabled] ?= "1" - -FVP_CONSOLE = "terminal_s1" -FVP_TERMINALS[soc.terminal_s0] ?= "Secure Console" -FVP_TERMINALS[soc.terminal_s1] ?= "Console" - -# Boot image -FVP_DATA ?= "board.dram=fitImage-core-image-minimal-tc1-tc1@0x20000000"
meta-arm-bsp/documentation/tc1.md deleted +0 -32
@@ -1,32 +0,0 @@ -# TC1 Platform Support in meta-arm-bsp - -## Overview -The Total Compute platform provides an envelope for all of Arm's latest IP and -software solutions, optimised to work together. Further information can be -found on the Total Compute community page: -https://community.arm.com/developer/tools-software/oss-platforms/w/docs/606/total-compute - -The user guide for TC1 platform with detailed instructions for -syncing and building the source code and running on TC1 Fixed Virtual Platform -for poky and android distributions is available at: -https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms.git/tree/docs/tc1/user-guide.rst - -## Building -In the local.conf file, MACHINE should be set as follows: -MACHINE = "tc1" - -To build the required binaries for tc1, run the commmand: -```bash$ bitbake tc-artifacts-image``` - -Trusted-firmware-a is the final component to be built with the rest of the -components dependent of it, therefore building tc-artifacts-image which depends -on trusted-firmware-a will build all the required binaries. - -## Running -To run the produced binaries in a TC1 Fixed Virtual Platform please get -the run scripts at: -https://git.linaro.org/landing-teams/working/arm/model-scripts.git/ - -and follow the instructions in the user-guide.rst available in: -https://git.linaro.org/landing-teams/working/arm/arm-reference-platforms.git/tree/docs/tc1/user-guide.rst -
meta-arm-bsp/recipes-bsp/hafnium/hafnium-tc.inc deleted +0 -8
@@ -1,8 +0,0 @@ -# TC specific configuration - -COMPATIBLE_MACHINE = "(tc?)" -HAFNIUM_PLATFORM = "secure_tc" - -do_compile() { - PATH="${S}/prebuilts/linux-x64/clang/bin:$PATH" oe_runmake -C ${S} -}
meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-tc.inc deleted +0 -6
@@ -1,6 +0,0 @@ -# TC specific SCP configuration - -COMPATIBLE_MACHINE = "(tc1)" -SCP_PRODUCT_GROUP = "totalcompute" - -FW_TARGETS = "scp"
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc.inc deleted +0 -134
134 lines not on this page · raw message
meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.8.6.bb deleted +0 -19
@@ -1,19 +0,0 @@ -require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc - -# TF-A v2.8.6 -SRCREV_tfa = "ff0bd5f9bb2ba2f31fb9cec96df917747af9e92d" -SRCBRANCH = "lts-v2.8" - -SRC_URI += "file://rwx-segments.patch" - -LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" - -# mbed TLS v2.28.2 -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.28" -SRCREV_mbedtls = "89f040a5c938985c5f30728baed21e49d0846a53" - -LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" - -do_compile:prepend() { - sed -i '/^LDLIBS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile -}
meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc.inc deleted +0 -5
@@ -1,5 +0,0 @@ -# TC0 and TC1 specific U-boot support - -SRC_URI:append = " \ - file://bootargs.cfg \ - "
meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0001-WIP-Enable-managed-exit.patch deleted +0 -120
120 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/files/optee-os/tc/0002-plat-totalcompute-fix-TZDRAM-start-and-size.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 5ddda749c60dce834bcd79e8b8d904858319adc0 Mon Sep 17 00:00:00 2001 -From: Rupinderjit Singh <[email protected]> -Date: Tue, 7 Feb 2023 09:45:02 +0000 -Subject: [PATCH] plat-totalcompute: update TZDRAM_SIZE - -For CFG_CORE_SEL2_SPMC, manifest size is increased from 0x1000 to -0x4000 for boot protocol support. - -Signed-off-by: Rupinderjit Singh <[email protected]> -Acked-by: Jens Wiklander <[email protected]> - -Upstream-Status: Backport -Signed-off-by: Jon Mason <[email protected]> - ---- - core/arch/arm/plat-totalcompute/conf.mk | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/core/arch/arm/plat-totalcompute/conf.mk b/core/arch/arm/plat-totalcompute/conf.mk -index b39ac0f0667f..2f6c0ee1460a 100644 ---- a/core/arch/arm/plat-totalcompute/conf.mk -+++ b/core/arch/arm/plat-totalcompute/conf.mk -@@ -32,8 +32,9 @@ ifeq ($(CFG_CORE_SEL1_SPMC),y) - CFG_TZDRAM_START ?= 0xfd000000 - CFG_TZDRAM_SIZE ?= 0x02000000 - else ifeq ($(CFG_CORE_SEL2_SPMC),y) --CFG_TZDRAM_START ?= 0xfd281000 --CFG_TZDRAM_SIZE ?= 0x01d7f000 -+CFG_TZDRAM_START ?= 0xfd284000 -+# TZDRAM size 0x1980000 - 0x4000 manifest size -+CFG_TZDRAM_SIZE ?= 0x0197c000 - else - CFG_TZDRAM_START ?= 0xff000000 - CFG_TZDRAM_SIZE ?= 0x01000000
meta-arm-bsp/recipes-security/optee/files/optee-test/tc/0001-xtest-Limit-tests-to-a-single-thread.patch deleted +0 -55
55 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-client_3.20.0.bb deleted +0 -7
@@ -1,7 +0,0 @@ -require recipes-security/optee/optee-client.inc - -SRCREV = "dd2d39b49975d2ada7870fe2b7f5a84d0d3860dc" - -inherit pkgconfig -DEPENDS += "util-linux" -EXTRA_OEMAKE += "PKG_CONFIG=pkg-config"
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0001-allow-setting-sysroot-for-libgcc-lookup.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 843eb2ef918d5ae3d09de088110cb026ca25306b 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.20.0/0002-optee-enable-clang-support.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 0ca5ef7c8256dbd9690a01a82397bc16a123e179 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.20.0/0003-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-3.20.0/0004-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.20.0/0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch deleted +0 -89
89 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0006-core-ffa-add-TOS_FW_CONFIG-handling.patch deleted +0 -247
247 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0007-core-spmc-handle-non-secure-interrupts.patch deleted +0 -275
275 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch deleted +0 -148
148 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-os-3.20.0/CVE-2023-41325.patch deleted +0 -634
634 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-os-tc.inc deleted +0 -33
@@ -1,33 +0,0 @@ -# TC0 specific configuration - -# Total Compute (tc) specific configuration for optee-os and optee-os-tadevkit - -FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/tc:" -SRC_URI:append:tc = " file://sp_layout.json \ - file://0001-WIP-Enable-managed-exit.patch \ - file://0002-plat-totalcompute-fix-TZDRAM-start-and-size.patch \ - " - -COMPATIBLE_MACHINE = "(tc?)" - -OPTEEMACHINE:tc1 = "totalcompute-tc1" - -# Enable optee memory layout and boot logs -EXTRA_OEMAKE += " CFG_TEE_CORE_LOG_LEVEL=3" - -# default disable latency benchmarks (over all OP-TEE layers) -EXTRA_OEMAKE += " CFG_TEE_BENCHMARK=n" - -# Enable stats -EXTRA_OEMAKE += " CFG_WITH_STATS=y" - -EXTRA_OEMAKE += " CFG_CORE_SEL2_SPMC=y" - -# Copy optee manifest file -do_install:append() { - install -d ${D}${nonarch_base_libdir}/firmware/ - install -m 644 ${WORKDIR}/sp_layout.json ${D}${nonarch_base_libdir}/firmware/ - install -m 644 \ - ${S}/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts \ - ${D}${nonarch_base_libdir}/firmware/ -}
meta-arm-bsp/recipes-security/optee/optee-os/0003-optee-enable-clang-support.patch deleted +0 -30
@@ -1,30 +0,0 @@ -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_3.20.0.bb deleted +0 -18
@@ -1,18 +0,0 @@ -require recipes-security/optee/optee-os.inc - -DEPENDS += "dtc-native" - -FILESEXTRAPATHS:prepend := "${THISDIR}/${P}:" - -SRCREV = "8e74d47616a20eaa23ca692f4bbbf917a236ed94" -SRC_URI += " \ - file://0001-allow-setting-sysroot-for-libgcc-lookup.patch \ - file://0002-optee-enable-clang-support.patch \ - file://0003-core-link-add-no-warn-rwx-segments.patch \ - file://0004-core-Define-section-attributes-for-clang.patch \ - file://0005-core-arm-S-EL1-SPMC-boot-ABI-update.patch \ - file://0006-core-ffa-add-TOS_FW_CONFIG-handling.patch \ - file://0007-core-spmc-handle-non-secure-interrupts.patch \ - file://0008-core-spmc-configure-SP-s-NS-interrupt-action-based-o.patch \ - file://CVE-2023-41325.patch \ - "
meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend deleted +0 -6
@@ -1,6 +0,0 @@ -# Machine specific configurations - -MACHINE_OPTEE_OS_REQUIRE ?= "" -MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc" - -require ${MACHINE_OPTEE_OS_REQUIRE}
meta-arm-bsp/recipes-security/optee/optee-test-tc.inc deleted +0 -8
@@ -1,8 +0,0 @@ -# TC specific configuration - -FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-test/tc:" -SRC_URI:append:tc = " \ - file://0001-xtest-Limit-tests-to-a-single-thread.patch \ - " - -COMPATIBLE_MACHINE = "(tc?)"
meta-arm-bsp/recipes-security/optee/optee-test/0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 53642dc98630b9c725977ab935c5bdd9c401e1aa Mon Sep 17 00:00:00 2001 -From: Jon Mason <[email protected]> -Date: Sat, 15 Jul 2023 15:08:43 -0400 -Subject: [PATCH] xtest: regression_1000: remove unneeded stat.h include - -Hack to work around musl compile error: - In file included from optee-test/3.17.0-r0/recipe-sysroot/usr/include/sys/stat.h:23, - from optee-test/3.17.0-r0/git/host/xtest/regression_1000.c:25: - optee-test/3.17.0-r0/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: Backport -Signed-off-by: Jon Mason <[email protected]> -Reviewed-by: Jerome Forissier <[email protected]> -Acked-by: Jens Wiklander <[email protected]> ---- - host/xtest/regression_1000.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/host/xtest/regression_1000.c b/host/xtest/regression_1000.c -index de32c4184fd8..25b4721cdc45 100644 ---- a/host/xtest/regression_1000.c -+++ b/host/xtest/regression_1000.c -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <sys/stat.h> - #include <sys/types.h> - #include <ta_arm_bti.h> - #include <ta_concurrent.h>
meta-arm-bsp/recipes-security/optee/optee-test/0002-ffa_spmc-Add-arm_ffa_user-driver-compatibility-check.patch deleted +0 -160
160 lines not on this page · raw message
meta-arm-bsp/recipes-security/optee/optee-test/0003-Update-arm_ffa_user-driver-dependency.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From 3de910a19f01a2a9e1c9a6bd6feee1aef547f676 Mon Sep 17 00:00:00 2001 -From: Gabor Toth <[email protected]> -Date: Fri, 3 Mar 2023 12:23:45 +0100 -Subject: [PATCH] Update arm_ffa_user driver dependency - -Updating arm-ffa-user to v5.0.1 to get the following changes: - - move to 64 bit direct messages - - add Linux Kernel v6.1 compatibility -The motivation is to update x-test to depend on the same driver -version as TS uefi-test and thus to enable running these in a single -configuration. -Note: arm_ffa_user.h was copied from: - - URL:https://git.gitlab.arm.com/linux-arm/linux-trusted-services.git - - SHA:18e3be71f65a405dfb5d97603ae71b3c11759861 - -Upstream-Status: Backport - -Signed-off-by: Gabor Toth <[email protected]> -Acked-by: Jens Wiklander <[email protected]> ---- - host/xtest/include/uapi/linux/arm_ffa_user.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/host/xtest/include/uapi/linux/arm_ffa_user.h b/host/xtest/include/uapi/linux/arm_ffa_user.h -index 9ef0be3e1664..0acde4fb2020 100644 ---- a/host/xtest/include/uapi/linux/arm_ffa_user.h -+++ b/host/xtest/include/uapi/linux/arm_ffa_user.h -@@ -33,7 +33,7 @@ struct ffa_ioctl_ep_desc { - * @dst_id: [in] 16-bit ID of destination endpoint. - */ - struct ffa_ioctl_msg_args { -- __u32 args[5]; -+ __u64 args[5]; - __u16 dst_id; - }; - #define FFA_IOC_MSG_SEND _IOWR(FFA_IOC_MAGIC, FFA_IOC_BASE + 1, \
meta-arm-bsp/recipes-security/optee/optee-test_3.20.0.bb deleted +0 -8
@@ -1,8 +0,0 @@ -require recipes-security/optee/optee-test.inc - -SRC_URI += " \ - file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch \ - file://0002-ffa_spmc-Add-arm_ffa_user-driver-compatibility-check.patch \ - file://0003-Update-arm_ffa_user-driver-dependency.patch \ - " -SRCREV = "5db8ab4c733d5b2f4afac3e9aef0a26634c4b444"
meta-arm-bsp/recipes-security/optee/optee-test_3.20.0.bbappend deleted +0 -6
@@ -1,6 +0,0 @@ -# Machine specific configurations - -MACHINE_OPTEE_TEST_REQUIRE ?= "" -MACHINE_OPTEE_TEST_REQUIRE:tc = "optee-test-tc.inc" - -require ${MACHINE_OPTEE_TEST_REQUIRE}
meta-arm/recipes-devtools/fvp/fvp-tc1.bb deleted +0 -11
@@ -1,11 +0,0 @@ -require fvp-ecosystem.inc - -MODEL = "TC1" -MODEL_CODE = "FVP_TC1" -PV = "11.18.28_Linux64" - -SRC_URI = "https://developer.arm.com/-/media/Arm%20Developer%20Community/Downloads/OSS/FVP/TotalCompute/Total%20Compute%20Update%202022/${MODEL_CODE}_${PV_URL}.tgz;subdir=${BP}" -SRC_URI[sha256sum] = "3a2b32ecf34dc9581482d6fc682a9378ba6ed151ea9b68914b4ebad39fb5cacf" - -LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=a50d186fffa51ed55599183aad911298 \ - file://license_terms/third_party_licenses/third_party_licenses.txt;md5=34a1ba318d745f05e6197def68ea5411"
Signature · 1 line
2.39.3 (Apple Git-146)
Jon Mason
AppliedQuoted 4 lines · Jon Mason
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: 0af53c6453482a15395b86a107805c72da114c1cBest regards,
Signature · 1 line
Jon Mason <[email protected]>