[PATCH 2/2] arm/trusted-firmware-m: remove 2.2.0
Ross Burton <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arm |
|---|---|
| Message-ID | <[email protected]> |
We have 2.2.1, so there's no need for 2.2.0. This removal was accidentally omitted from the 2.2.1 upgrade. Signed-off-by: Ross Burton <[email protected]> --- .../trusted-firmware-m-2.2.0-src.inc | 78 ------------------- ...trusted-firmware-m-scripts-native_2.2.0.bb | 2 - .../trusted-firmware-m_2.2.0.bb | 2 - 3 files changed, 82 deletions(-) delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.0-src.inc delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.2.0.bb delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.2.0.bb diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.0-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.0-src.inc deleted file mode 100644 index 4162cc9c56..0000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.0-src.inc +++ /dev/null @@ -1,78 +0,0 @@ -# Common src definitions for trusted-firmware-m and trusted-firmware-m-scripts - -LICENSE = "BSD-2-Clause & BSD-3-Clause & Apache-2.0" - -EXTRA_OECMAKE += "-DT_COSE_PATH=${S}/../t_cose" - -LIC_FILES_CHKSUM = "file://license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \ - file://../tf-m-tests/license.rst;md5=4481bae2221b0cfca76a69fb3411f390 \ - file://../mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d \ - file://../mcuboot/LICENSE;md5=b6ee33f1d12a5e6ee3de1e82fb51eeb8 \ - file://../tfm-psa-adac/license.rst;md5=07f368487da347f3c7bd0fc3085f3afa \ - file://../t_cose/LICENSE;md5=b2ebdbfb82602b97aa628f64cf4b65ad \ - " - -SRC_URI_TRUSTED_FIRMWARE_M ?= "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https" -SRC_URI_TRUSTED_FIRMWARE_M_EXTRAS ?= "git://git.trustedfirmware.org/TF-M/tf-m-extras.git;protocol=https" -SRC_URI_TRUSTED_FIRMWARE_M_TESTS ?= "git://git.trustedfirmware.org/TF-M/tf-m-tests.git;protocol=https" -SRC_URI_TRUSTED_FIRMWARE_M_CMSIS ?= "git://github.com/ARM-software/CMSIS_6.git;protocol=https" -SRC_URI_TRUSTED_FIRMWARE_M_MBEDTLS ?= "gitsm://github.com/ARMmbed/mbedtls.git;protocol=https" -SRC_URI_TRUSTED_FIRMWARE_M_MCUBOOT ?= "git://github.com/mcu-tools/mcuboot.git;protocol=https" -SRC_URI_TRUSTED_FIRMWARE_M_QCBOR ?= "git://github.com/laurencelundblade/QCBOR.git;protocol=https" -SRC_URI_TRUSTED_FIRMWARE_M_PSA_ADAC ?= "git://git.trustedfirmware.org/shared/psa-adac.git;protocol=https" -SRC_URI_TRUSTED_FIRMWARE_M_T_COSE ?= "git://github.com/laurencelundblade/t_cose.git;protocol=https" -SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;destsuffix=tfm \ - ${SRC_URI_TRUSTED_FIRMWARE_M_EXTRAS};branch=${SRCBRANCH_tfm-extras};name=tfm-extras;destsuffix=tfm-extras \ - ${SRC_URI_TRUSTED_FIRMWARE_M_TESTS};branch=${SRCBRANCH_tfm-tests};name=tfm-tests;destsuffix=tf-m-tests \ - ${SRC_URI_TRUSTED_FIRMWARE_M_CMSIS};branch=${SRCBRANCH_cmsis};name=cmsis;destsuffix=cmsis \ - ${SRC_URI_TRUSTED_FIRMWARE_M_MBEDTLS};branch=${SRCBRANCH_mbedtls};name=mbedtls;destsuffix=mbedtls \ - ${SRC_URI_TRUSTED_FIRMWARE_M_MCUBOOT};branch=${SRCBRANCH_mcuboot};name=mcuboot;destsuffix=mcuboot \ - ${SRC_URI_TRUSTED_FIRMWARE_M_QCBOR};branch=${SRCBRANCH_qcbor};name=qcbor;destsuffix=qcbor \ - ${SRC_URI_TRUSTED_FIRMWARE_M_PSA_ADAC};branch=${SRCBRANCH_tfm-psa-adac};name=tfm-psa-adac;destsuffix=tfm-psa-adac \ - ${SRC_URI_TRUSTED_FIRMWARE_M_T_COSE};branch=${SRCBRANCH_t-cose};name=t-cose;destsuffix=t_cose \ - " - -# The required dependencies are documented in tf-m/config/config_base.cmake -# TF-Mv2.2.0 -SRCBRANCH_tfm ?= "release/2.2.x" -SRCREV_tfm = "dd2b7de197742beeebd12197c14d9d3cb1b9ec68" -# TF-Mv2.2.0 -SRCBRANCH_tfm-extras ?= "release/2.2.x" -SRCREV_tfm-extras = "88a4bd39284bb497dd8b362f20cd2b7f704ac390" -# TF-Mv2.2.0 -SRCBRANCH_tfm-tests ?= "release/2.2.x" -SRCREV_tfm-tests = "e0a433c67c37138cd9dce23657ae82c5cbdcf51f" -# CMSIS v6.1.0, CMSIS_TAG from lib/ext/cmsis/CMakeLists.txt -SRCBRANCH_cmsis ?= "main" -SRCREV_cmsis = "b0bbb0423b278ca632cfe1474eb227961d835fd2" -# mbedtls-3.6.3 (+2 commits), value from MBEDCRYPTO_VERSION(-ish) -SRCBRANCH_mbedtls ?= "mbedtls-3.6" -SRCREV_mbedtls = "8cf5666a174237998a7965e284d7ba8c1655d16d" -# mcuboot v2.2.0-rc1+ (intermediate SHA), value from MCUBOOT_VERSION -SRCBRANCH_mcuboot ?= "main" -SRCREV_mcuboot = "6071ceb1d0d955b6ff4745499a0ff3ac7d79f24b" -# QCBOR v1.2, value from QCBOR_VERSION in lib/ext/qcbor/CMakeLists.txt -SRCBRANCH_qcbor ?= "master" -SRCREV_qcbor = "92d3f89030baff4af7be8396c563e6c8ef263622" -# PSA-ADAC (intermediate SHA), value from PLATFORM_PSA_ADAC_VERSION -SRCBRANCH_tfm-psa-adac = "master" -SRCREV_tfm-psa-adac = "819a254af6fb5eefdcef194ec85d2c7627451351" -# T_COSE v2.0-alpha-2, from lib/ext/t_cose/CMakeLists.txt -SRCBRANCH_t-cose = "dev" -SRCREV_t-cose = "3076010eeb6383f0827bd992c75b68af9311cf1d" - -SRCREV_FORMAT = "tfm" - -S = "${UNPACKDIR}/tfm" - -# Apply patches -inherit apply_local_src_patches -LOCAL_SRC_PATCHES_INPUT_DIR = "N/A" - -do_apply_local_src_patches() { - apply_local_src_patches ${S}/lib/ext/qcbor ${UNPACKDIR}/qcbor - apply_local_src_patches ${S}/lib/ext/mbedcrypto ${UNPACKDIR}/mbedtls - apply_local_src_patches ${S}/lib/ext/mcuboot ${UNPACKDIR}/mcuboot - apply_local_src_patches ${S}/lib/ext/tf-m-tests ${UNPACKDIR}/tf-m-tests - apply_local_src_patches ${S}/lib/ext/t_cose ${UNPACKDIR}/t_cose -} diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.2.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.2.0.bb deleted file mode 100644 index d50d886f60..0000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.2.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc -require recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native.inc diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.2.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.2.0.bb deleted file mode 100644 index 3464f49dd9..0000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.2.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc -require recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc -- 2.43.0