| Message ID | 20251215180051.1476057-2-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm/trusted-firmware-m: apply local patches in the git version | expand |
Per offline discussion, dropping this one from the series (as it causes problems with the others queued). On Mon, Dec 15, 2025 at 1:00 PM Ross Burton via lists.yoctoproject.org <ross.burton=arm.com@lists.yoctoproject.org> wrote: > > This is not git master, but it's a lot newer and gives a baseline to > test from further. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > .../trusted-firmware-m-git-src.inc | 18 ++++++++++-------- > .../trusted-firmware-m-scripts-native_git.bb | 6 ++++++ > 2 files changed, 16 insertions(+), 8 deletions(-) > create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_git.bb > > diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc > index bf3a07d218..c3adc2e7d8 100644 > --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc > +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc > @@ -30,25 +30,27 @@ SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;dests > ${SRC_URI_TRUSTED_FIRMWARE_M_T_COSE};branch=${SRCBRANCH_t-cose};name=t-cose;destsuffix=t_cose \ > " > > +PV = "2.2.2~rc1" > + > # The required dependencies are documented in tf-m/config/config_base.cmake > # latest (25 April 2025) > -SRCBRANCH_tfm ?= "main" > -SRCREV_tfm = "1e77550712f35730e8807fd1091fdac243d1b15a" > +SRCBRANCH_tfm ?= "release/2.2.x" > +SRCREV_tfm = "4706d567a2e5c2d88067370c5347ae5bbe59bcc6" > # latest (7 April 2025) > SRCBRANCH_tfm-extras ?= "main" > -SRCREV_tfm-extras = "8679c4c26091d19807eb68a1bd4b75fb2b6685bc" > -# latest (30 April 2025) > +SRCREV_tfm-extras = "3e6ac492b913c4c681e1dbc1f90c38cd765170ab" > +# From lib/ext/tf-m-tests/version.txt > SRCBRANCH_tfm-tests ?= "main" > -SRCREV_tfm-tests = "96c110a7a70bdb28bdf0e56dcf791c37fedb20ad" > +SRCREV_tfm-tests = "e21dbfbb0c3b5e9758733793d834c55a2f280f25" > # 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) > +# mbedtls-3.6.5, value from MBEDCRYPTO_VERSION(-ish) > SRCBRANCH_mbedtls ?= "mbedtls-3.6" > -SRCREV_mbedtls = "8cf5666a174237998a7965e284d7ba8c1655d16d" > +SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df" > # mcuboot v2.2.0-rc1+ (intermediate SHA), value from MCUBOOT_VERSION > SRCBRANCH_mcuboot ?= "main" > -SRCREV_mcuboot = "6071ceb1d0d955b6ff4745499a0ff3ac7d79f24b" > +SRCREV_mcuboot = "2d61c318933819a0f4954fb2a5a957a62c6128ce" > # QCBOR v1.2, value from QCBOR_VERSION in lib/ext/qcbor/CMakeLists.txt > SRCBRANCH_qcbor ?= "master" > SRCREV_qcbor = "92d3f89030baff4af7be8396c563e6c8ef263622" > diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_git.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_git.bb > new file mode 100644 > index 0000000000..752a56f989 > --- /dev/null > +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_git.bb > @@ -0,0 +1,6 @@ > +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc > +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native.inc > + > +# Not a release recipe, try our hardest to not pull this in implicitly > +DEFAULT_PREFERENCE = "-1" > +UPSTREAM_CHECK_COMMITS = "1" > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#6799): https://lists.yoctoproject.org/g/meta-arm/message/6799 > Mute This Topic: https://lists.yoctoproject.org/mt/116796748/3616920 > Group Owner: meta-arm+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [jdmason@kudzu.us] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc index bf3a07d218..c3adc2e7d8 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc @@ -30,25 +30,27 @@ SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;dests ${SRC_URI_TRUSTED_FIRMWARE_M_T_COSE};branch=${SRCBRANCH_t-cose};name=t-cose;destsuffix=t_cose \ " +PV = "2.2.2~rc1" + # The required dependencies are documented in tf-m/config/config_base.cmake # latest (25 April 2025) -SRCBRANCH_tfm ?= "main" -SRCREV_tfm = "1e77550712f35730e8807fd1091fdac243d1b15a" +SRCBRANCH_tfm ?= "release/2.2.x" +SRCREV_tfm = "4706d567a2e5c2d88067370c5347ae5bbe59bcc6" # latest (7 April 2025) SRCBRANCH_tfm-extras ?= "main" -SRCREV_tfm-extras = "8679c4c26091d19807eb68a1bd4b75fb2b6685bc" -# latest (30 April 2025) +SRCREV_tfm-extras = "3e6ac492b913c4c681e1dbc1f90c38cd765170ab" +# From lib/ext/tf-m-tests/version.txt SRCBRANCH_tfm-tests ?= "main" -SRCREV_tfm-tests = "96c110a7a70bdb28bdf0e56dcf791c37fedb20ad" +SRCREV_tfm-tests = "e21dbfbb0c3b5e9758733793d834c55a2f280f25" # 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) +# mbedtls-3.6.5, value from MBEDCRYPTO_VERSION(-ish) SRCBRANCH_mbedtls ?= "mbedtls-3.6" -SRCREV_mbedtls = "8cf5666a174237998a7965e284d7ba8c1655d16d" +SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df" # mcuboot v2.2.0-rc1+ (intermediate SHA), value from MCUBOOT_VERSION SRCBRANCH_mcuboot ?= "main" -SRCREV_mcuboot = "6071ceb1d0d955b6ff4745499a0ff3ac7d79f24b" +SRCREV_mcuboot = "2d61c318933819a0f4954fb2a5a957a62c6128ce" # QCBOR v1.2, value from QCBOR_VERSION in lib/ext/qcbor/CMakeLists.txt SRCBRANCH_qcbor ?= "master" SRCREV_qcbor = "92d3f89030baff4af7be8396c563e6c8ef263622" diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_git.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_git.bb new file mode 100644 index 0000000000..752a56f989 --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_git.bb @@ -0,0 +1,6 @@ +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-git-src.inc +require recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native.inc + +# Not a release recipe, try our hardest to not pull this in implicitly +DEFAULT_PREFERENCE = "-1" +UPSTREAM_CHECK_COMMITS = "1"
This is not git master, but it's a lot newer and gives a baseline to test from further. Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../trusted-firmware-m-git-src.inc | 18 ++++++++++-------- .../trusted-firmware-m-scripts-native_git.bb | 6 ++++++ 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m-scripts-native_git.bb