[PATCH 1/3] arm/trusted-firmware-a: update 2.10 lts
Jon Mason <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arm |
|---|---|
| Message-ID | <[email protected]> |
Update the TF-A 2.10 LTS recipes to the latest versions, which are 2.10.17 and 2.10.15 for the tests. Signed-off-by: Jon Mason <[email protected]> --- ...ool-native_2.10.9.bb => fiptool-native_2.10.17.bb} | 4 ++-- .../{tf-a-tests_2.10.3.bb => tf-a-tests_2.10.15.bb} | 6 +++--- ...are-a_2.10.12.bb => trusted-firmware-a_2.10.17.bb} | 11 ++++++----- 3 files changed, 11 insertions(+), 10 deletions(-) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.10.9.bb => fiptool-native_2.10.17.bb} (92%) rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.10.3.bb => tf-a-tests_2.10.15.bb} (89%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.10.12.bb => trusted-firmware-a_2.10.17.bb} (70%) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb similarity index 92% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb index a6ebea976d1c..1534b7e5f562 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb @@ -9,8 +9,8 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmwa SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -# Use fiptool from TF-A v2.10.9 -SRCREV = "7e63213601425c7a6d83e47dc936b264deb9df2b" +# Use fiptool from TF-A v2.10.17 +SRCREV = "4b1f6671b0cbddad7577fea5fcd7027f5533dc71" SRCBRANCH = "lts-v2.10" DEPENDS += "openssl-native" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb similarity index 89% rename from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb index 39fddd9b7fd6..5b2899600bfb 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb @@ -8,9 +8,9 @@ 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};nobranch=1" -SRCBRANCH = "master" -SRCREV = "8917cf8b5eeb409b63256076d0dc35c60930ce18" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}" +SRCBRANCH = "lts-v2.10" +SRCREV = "42c6a147d6f8957ff0b6e9eec4591b0927b8769f" EXTRA_OEMAKE += "USE_NVM=0" EXTRA_OEMAKE += "SHELL_COLOR=1" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.12.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.17.bb similarity index 70% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.12.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.17.bb index 5454e84cc8aa..e7dd90a5fec5 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.12.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.17.bb @@ -1,15 +1,16 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A v2.10.12 -SRCREV_tfa = "408ba4ddfe9a8d55e3e2488bea89c39adef07981" +# TF-A v2.10.17 +SRCREV_tfa = "4b1f6671b0cbddad7577fea5fcd7027f5533dc71" SRCBRANCH = "lts-v2.10" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls -# mbedtls-3.6.2 -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-3.6" -SRCREV_mbedtls = "107ea89daaefb9867ea9121002fbbdf926780e98" +# mbedtls-3.6.3 +SRCBRANCH_MBEDTLS = "mbedtls-3.6" +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=${SRCBRANCH_MBEDTLS}" +SRCREV_mbedtls = "22098d41c6620ce07cf8a0134d37302355e1e5ef" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" -- 2.39.5 (Apple Git-154)