CI: use Musca S1 for LTS testing
PATCH 1/3 CI: use Musca S1 for LTS testing
In TF-M 2.3.0, Musca S1 was removed, but B1 is still present. In an effort to keep coverage, swapping S1 and B1.
--- ci/musca-b1.yml | 5 ----- ci/musca-s1.yml | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-)
ci/musca-b1.yml +0 -5
@@ -6,11 +6,6 @@ header: - ci/base.yml - ci/meta-openembedded.yml -local_conf_header: - version_for_ci: | - # For better CI coverage, use the LTS version of tf-m - PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%" - machine: musca-b1 target:
ci/musca-s1.yml +5 -0
@@ -6,6 +6,11 @@ header: - ci/base.yml - ci/meta-openembedded.yml +local_conf_header: + version_for_ci: | + # For better CI coverage, use the LTS version of tf-m + PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%" + machine: musca-s1 target:
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH 2/3 arm/trusted-firmware-m: Add 2.3.0 Support
Add recipes for newest version of tf-m. Of note, mbedtls has been removed in favor of the TF-PSA-Crypto library. This is having a cascade into the other recipes, with a removal from the core inc file and add of the individual lines to the specific versions.
TF-PSA-Crypto is Apache 2.0 licensed. So, no need to change the recipe license field.
--- ci/lts-revisions.yml | 1 + .../conf/machine/include/corstone1000.inc | 1 + .../trusted-firmware-m-2.1.4-src.inc | 2 + .../trusted-firmware-m-2.2.2-src.inc | 2 + .../trusted-firmware-m-2.3.0-src.inc | 87 +++++++++++++++++++ ...trusted-firmware-m-scripts-native_2.3.0.bb | 9 ++ .../trusted-firmware-m/trusted-firmware-m.inc | 1 - .../trusted-firmware-m_2.3.0.bb | 9 ++ 8 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.3.0-src.inc create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.3.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.3.0.bb
ci/lts-revisions.yml +1 -0
@@ -8,3 +8,4 @@ local_conf_header: PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" PREFERRED_VERSION_tf-a-tests ?= "2.10.%" PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%" + PREFERRED_VERSION_trusted-firmware-m-scripts-native ?= "2.1.%"
meta-arm-bsp/conf/machine/include/corstone1000.inc +1 -0
@@ -6,6 +6,7 @@ MACHINEOVERRIDES =. "corstone1000:" # TF-M PREFERRED_VERSION_trusted-firmware-m ?= "2.2.%" +PREFERRED_VERSION_trusted-firmware-m-scripts-native ?= "2.2.%" # TF-A TFA_PLATFORM = "corstone1000"
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.4-src.inc +2 -0
@@ -54,6 +54,8 @@ SRCREV_tfm-psa-adac = "5f5490cebe66ae997f316f83c3fbf1f97deef625" SRCREV_FORMAT = "tfm_tfm-extras_tfm-tests_cmsis_mbedtls_mcuboot_qcbor_tfm-psa-adac_t-cose" +EXTRA_OECMAKE += "-DMBEDCRYPTO_PATH=${S}/external/mbedtls" + S = "${UNPACKDIR}/tfm" # Apply patches
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.2.2-src.inc +2 -0
@@ -63,6 +63,8 @@ SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;dests SRCREV_FORMAT = "tfm_tfm-extras_tfm-tests_cmsis_mbedtls_mcuboot_qcbor_tfm-psa-adac_t-cose" +EXTRA_OECMAKE += "-DMBEDCRYPTO_PATH=${S}/external/mbedtls" + S = "${UNPACKDIR}/tfm" # Apply patches
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.3.0-src.inc new file +87 -0
87 lines not on this page · raw message
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.3.0.bb new file +9 -0
@@ -0,0 +1,9 @@ +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc + +inherit native python_setuptools_build_meta + +RDEPENDS:${PN} = "\ + python3-pyelftools-native \ + python3-rich-native \ + clang-native \ +"
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc +0 -1
@@ -72,7 +72,6 @@ EXTRA_OECMAKE += "${@bb.utils.contains('TFM_DEBUG', '1', '-DCMAKE_BUILD_TYPE=Deb EXTRA_OECMAKE += "\ -DCMSIS_PATH=${S}/external/cmsis \ - -DMBEDCRYPTO_PATH=${S}/external/mbedtls \ -DMCUBOOT_PATH=${S}/external/mcuboot \ -DQCBOR_PATH=${S}/external/qcbor \ -DT_COSE_PATH=${S}/external/t_cose \
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.3.0.bb new file +9 -0
@@ -0,0 +1,9 @@ +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc +require recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc + +DEPENDS += "trusted-firmware-m-scripts-native" + +# FIXME - arm-none-eabi/bin/ld: error: unsupported option: -z relro +# Working around the issue by removing the loader flags, which aren't relevant for us here +# Long term fix, create a baremetal firmware bbclass that doesn't add this stuff +SECURITY_LDFLAGS = ""
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH 3/3 arm/trusted-firmware-m: remove 2.1.4
In reply to Jon MasonRemove the older LTS, since there is a policy of the most recent release and the previous LTS.
--- ci/lts-revisions.yml | 4 +- ci/musca-s1.yml | 2 +- .../trusted-firmware-m-2.1.4-src.inc | 70 ------------------- ...trusted-firmware-m-scripts-native_2.1.4.bb | 2 - .../trusted-firmware-m_2.1.4.bb | 7 -- 5 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.4-src.inc delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.1.4.bb delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.1.4.bb
ci/lts-revisions.yml +2 -2
@@ -7,5 +7,5 @@ local_conf_header: latest_revisions: | PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" PREFERRED_VERSION_tf-a-tests ?= "2.10.%" - PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%" - PREFERRED_VERSION_trusted-firmware-m-scripts-native ?= "2.1.%" + PREFERRED_VERSION_trusted-firmware-m ?= "2.2.%" + PREFERRED_VERSION_trusted-firmware-m-scripts-native ?= "2.2.%"
ci/musca-s1.yml +1 -1
@@ -9,7 +9,7 @@ header: local_conf_header: version_for_ci: | # For better CI coverage, use the LTS version of tf-m - PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%" + PREFERRED_VERSION_trusted-firmware-m ?= "2.2.%" machine: musca-s1
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-2.1.4-src.inc deleted +0 -70
70 lines not on this page · raw message
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_2.1.4.bb deleted +0 -2
@@ -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
meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_2.1.4.bb deleted +0 -7
@@ -1,7 +0,0 @@ -require recipes-bsp/trusted-firmware-m/trusted-firmware-m-${PV}-src.inc -require recipes-bsp/trusted-firmware-m/trusted-firmware-m.inc - -# FIXME - arm-none-eabi/bin/ld: error: unsupported option: -z relro -# Working around the issue by removing the loader flags, which aren't relevant for us here -# Long term fix, create a baremetal firmware bbclass that doesn't add this stuff -SECURITY_LDFLAGS = ""
Signature · 1 line
2.50.1 (Apple Git-155)
Jon Mason
AppliedQuoted 4 lines · Jon Mason
In TF-M 2.3.0, Musca S1 was removed, but B1 is still present. In an effort to keep coverage, swapping S1 and B1.
Applied, thanks!
[1/3] CI: use Musca S1 for LTS testing
commit: 22de042eaf68868331741bc33b9c00e73b865d19
[2/3] arm/trusted-firmware-m: Add 2.3.0 Support
commit: c5df984862e5678266b087c62ff7ea878b1779c3
[3/3] arm/trusted-firmware-m: remove 2.1.4
commit: d718d02774c9b29f7bb925ab7255f26eab04301aBest regards,
Signature · 1 line
Jon Mason <[email protected]>