| Message ID | 20230208202918.2662658-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm/trusted-firmware-m: Do not use release branches | expand |
On Wed, 8 Feb 2023 20:29:17 +0000, Ross Burton wrote: > TF-M does not use persistent release branches and the release-* branches > have been removed from the repository, so switch the branches to master. > > Also update the tf-m-tests SRVREV to the 1.7.0 tag, not the RC2. > > 99% based on a patch by Peter Hoyes <Peter.Hoyes@arm.com>. Applied, thanks! [1/1] arm/trusted-firmware-m: Do not use release branches commit: 4ec5d8b306e84f929188e038b330c01d68dabd3b Best regards,
On Wed, 8 Feb 2023 20:29:17 +0000, Ross Burton wrote: > TF-M does not use persistent release branches and the release-* branches > have been removed from the repository, so switch the branches to master. > > Also update the tf-m-tests SRVREV to the 1.7.0 tag, not the RC2. > > 99% based on a patch by Peter Hoyes <Peter.Hoyes@arm.com>. Applied, thanks! [1/1] arm/trusted-firmware-m: Do not use release branches commit: 79b44a4d32bc19eda2b3dec5750a818959097cd6 Best regards,
diff --git a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.0.bb b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.0.bb index b4a4c41f..f4219be6 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-m/trusted-firmware-m_1.7.0.bb @@ -30,14 +30,14 @@ SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH_tfm};name=tfm;dests # The required dependencies are documented in tf-m/config/config_default.cmake # TF-Mv1.7.0 -SRCBRANCH_tfm ?= "release/1.7.x" +SRCBRANCH_tfm ?= "master" SRCREV_tfm = "b725a1346cdb9ec75b1adcdc4c84705881e8fd4e" # mbedtls-3.2.0 SRCBRANCH_mbedtls ?= "master" SRCREV_mbedtls = "869298bffeea13b205343361b7a7daf2b210e33d" -# TF-Mv1.6.0 -SRCBRANCH_tfm-tests ?= "release/1.7.x" -SRCREV_tfm-tests = "4972e8df3fcbd386a5b0c18613d8a803f4dda082" +# TF-Mv1.7.0 +SRCBRANCH_tfm-tests ?= "master" +SRCREV_tfm-tests = "4c4b58041c6c01670266690538a780b4a23d08b8" # v1.9.0 SRCBRANCH_mcuboot ?= "main" SRCREV_mcuboot = "c657cbea75f2bb1faf1fceacf972a0537a8d26dd" diff --git a/meta-arm/recipes-devtools/trusted-firmware-m-scripts/trusted-firmware-m-scripts-native_1.6.0.bb b/meta-arm/recipes-devtools/trusted-firmware-m-scripts/trusted-firmware-m-scripts-native_1.6.0.bb index 217f08a6..db35ecf7 100644 --- a/meta-arm/recipes-devtools/trusted-firmware-m-scripts/trusted-firmware-m-scripts-native_1.6.0.bb +++ b/meta-arm/recipes-devtools/trusted-firmware-m-scripts/trusted-firmware-m-scripts-native_1.6.0.bb @@ -2,7 +2,7 @@ SRC_URI_TRUSTED_FIRMWARE_M ?= "git://git.trustedfirmware.org/TF-M/trusted-firmware-m.git;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_M};branch=${SRCBRANCH}" # Use the wrapper script from TF-Mv1.6.0 -SRCBRANCH ?= "release/1.6.x" +SRCBRANCH ?= "master" SRCREV = "7387d88158701a3c51ad51c90a05326ee12847a8" LICENSE = "BSD-3-Clause"
TF-M does not use persistent release branches and the release-* branches have been removed from the repository, so switch the branches to master. Also update the tf-m-tests SRVREV to the 1.7.0 tag, not the RC2. 99% based on a patch by Peter Hoyes <Peter.Hoyes@arm.com>. Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../trusted-firmware-m/trusted-firmware-m_1.7.0.bb | 8 ++++---- .../trusted-firmware-m-scripts-native_1.6.0.bb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)