arm/trusted-firmware-a: update 2.10 lts
PATCH 1/3 arm/trusted-firmware-a: update 2.10 lts
Update the TF-A 2.10 LTS recipes to the latest versions, which are 2.10.17 and 2.10.15 for the tests.
---
...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%)meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb +2 -2
@@ -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"
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb +3 -3
@@ -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"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.17.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.12.bb +6 -5
@@ -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"
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH 2/3 arm/trusted-firmware-a: update 2.12 lts
Update the TF-A 2.12 LTS recipes to the latest versions, which are 2.12.3.
---
...{fiptool-native_2.12.1.bb => fiptool-native_2.12.3.bb} | 4 ++--
.../{tf-a-tests_2.12.0.bb => tf-a-tests_2.12.3.bb} | 7 +++----
...-firmware-a_2.12.1.bb => trusted-firmware-a_2.12.3.bb} | 8 ++++----
3 files changed, 9 insertions(+), 10 deletions(-)
rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.12.1.bb => fiptool-native_2.12.3.bb} (92%)
rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.12.0.bb => tf-a-tests_2.12.3.bb} (93%)
rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.12.1.bb => trusted-firmware-a_2.12.3.bb} (81%)meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.1.bb +2 -2
@@ -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=83b7626b8c7a37263c6a58af8d19bee1" -# Use fiptool from TF-A v2.12.1 -SRCREV = "8cf9edba5cc3ec11ed5463f206aa5819f7fdbade" +# Use fiptool from TF-A v2.12.3 +SRCREV = "799fa03173b6c5ab85f70e583dd7d12719592436" SRCBRANCH = "lts-v2.12" DEPENDS += "openssl-native"
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb +3 -4
@@ -8,10 +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};branch=${SRCBRANCH} \ - " -SRCBRANCH = "master" -SRCREV = "6a113621a9efdc143e9270b1789046cd7d9cdfb1" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}" +SRCBRANCH = "lts-v2.12" +SRCREV = "3650d9cdfaa8eda20eba4b0c366c7c213a356557" EXTRA_OEMAKE += "USE_NVM=0" EXTRA_OEMAKE += "SHELL_COLOR=1"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.3.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.1.bb +4 -4
@@ -1,16 +1,16 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A v2.12.1 -SRCREV_tfa = "8cf9edba5cc3ec11ed5463f206aa5819f7fdbade" +# TF-A v2.12.3 +SRCREV_tfa = "799fa03173b6c5ab85f70e583dd7d12719592436" SRCBRANCH = "lts-v2.12" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1" # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls -# mbedtls-3.6.2 +# 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 = "107ea89daaefb9867ea9121002fbbdf926780e98" +SRCREV_mbedtls = "22098d41c6620ce07cf8a0134d37302355e1e5ef" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d"
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH 3/3 arm/trusted-firmware-a: add 2.13.0 support
In reply to Jon MasonAdd recipe for the latest version of TF-A, which needs a newer version of mbedtls as well. The license checksum updated due to hob code being imported from edk2, which is BSD 2 Clause, which is already in the license field for the recipe.
Updating the git recipe to use the latest version, and keeping LTS versions.
sgi575 was removed from 2.13.0. So, pointing that to 2.12
--- meta-arm-bsp/conf/machine/sgi575.conf | 3 + .../fiptool-native_2.13.0.bb | 33 +++++++++++ .../trusted-firmware-a/tf-a-tests_2.13.0.bb | 55 +++++++++++++++++++ .../trusted-firmware-a_2.13.0.bb | 15 +++++ .../trusted-firmware-a_git.bb | 16 ++---- 5 files changed, 112 insertions(+), 10 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.13.0.bb
meta-arm-bsp/conf/machine/sgi575.conf +3 -0
@@ -9,6 +9,9 @@ require conf/machine/include/arm/armv8-2a/tune-cortexa75.inc EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" EXTRA_IMAGEDEPENDS += "trusted-firmware-a" +# 2.13.0 removes support for sgi575 +PREFERRED_VERSION_trusted-firmware-a ?= "2.12.%" + KERNEL_IMAGETYPE ?= "Image" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" SERIAL_CONSOLES = "115200;ttyAMA0"
meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb new file +33 -0
@@ -0,0 +1,33 @@ +# Firmware Image Package (FIP) +# It is a packaging format used by TF-A to package the +# firmware images in a single binary. + +DESCRIPTION = "fiptool - Trusted Firmware tool for packaging" +LICENSE = "BSD-3-Clause" + +SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" + +# Use fiptool from TF-A v2.13.0 +SRCREV = "c17351450c8a513ca3f30f936e26a71db693a145" +SRCBRANCH = "master" + +DEPENDS += "openssl-native" + +inherit native + +EXTRA_OEMAKE = "V=1 HOSTCC='${BUILD_CC}' OPENSSL_DIR=${STAGING_DIR_NATIVE}/${prefix_native}" + +do_compile () { + # This is still needed to have the native fiptool executing properly by + # setting the RPATH + sed -i '/^LDOPTS/ s,$, \$\{BUILD_LDFLAGS},' ${S}/tools/fiptool/Makefile + sed -i '/^INCLUDE_PATHS/ s,$, \$\{BUILD_CFLAGS},' ${S}/tools/fiptool/Makefile + + oe_runmake fiptool +} + +do_install () { + install -D -p -m 0755 tools/fiptool/fiptool ${D}${bindir}/fiptool +}
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb new file +55 -0
55 lines not on this page · raw message
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.13.0.bb new file +15 -0
@@ -0,0 +1,15 @@ +require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc + +# TF-A v2.13.0 +SRCREV_tfa = "c17351450c8a513ca3f30f936e26a71db693a145" +SRCBRANCH = "master" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" + +# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls +# 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"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +6 -10
@@ -1,23 +1,19 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc # TF-A master -SRCREV_tfa = "0035ab76e580b59f88ad5a6be76b7f2bebbac654" +SRCREV_tfa = "c17351450c8a513ca3f30f936e26a71db693a145" SRCBRANCH = "master" -LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1" +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" # 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" -# continue to boot also without TPM -SRC_URI += "\ - file://0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch \ -" - # Not a release recipe, try our hardest to not pull this in implicitly DEFAULT_PREFERENCE = "-1" UPSTREAM_CHECK_COMMITS = "1"
Signature · 1 line
2.39.5 (Apple Git-154)
Jon Mason
AppliedQuoted 4 lines · Jon Mason
Update the TF-A 2.10 LTS recipes to the latest versions, which are 2.10.17 and 2.10.15 for the tests.
Applied, thanks!
[1/3] arm/trusted-firmware-a: update 2.10 lts
commit: 1250d00074fd085ec97e66a281a535c0c758e8ee
[2/3] arm/trusted-firmware-a: update 2.12 lts
commit: b4ece023fb4e98262cee291983525539111bcef4
[3/3] arm/trusted-firmware-a: add 2.13.0 support
commit: 8a11dd3a1651a6b3ad36520aa94ab1045fc8aed3Best regards,
Signature · 1 line
Jon Mason <[email protected]>