arm/trusted-firmware-a: update 2.10 LTS to the latest versions
PATCH 1/3 arm/trusted-firmware-a: update 2.10 LTS to the latest versions
Update TF-A LTS to 2.10.9 (which includes an mbedtls bump to 3.6.1, per docs). Also, bump the TF-A tests to the latest version.
---
...ptool-native_2.10.4.bb => fiptool-native_2.10.9.bb} | 4 ++--
.../{tf-a-tests_2.10.0.bb => tf-a-tests_2.10.3.bb} | 5 ++---
...rmware-a_2.10.4.bb => trusted-firmware-a_2.10.9.bb} | 10 +++++-----
3 files changed, 9 insertions(+), 10 deletions(-)
rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.10.4.bb => fiptool-native_2.10.9.bb} (92%)
rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.10.0.bb => tf-a-tests_2.10.3.bb} (90%)
rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.10.4.bb => trusted-firmware-a_2.10.9.bb} (74%)meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.4.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.4 -SRCREV = "569e16caad976a0684147da1ecc6333fd9b7f813" +# Use fiptool from TF-A v2.10.9 +SRCREV = "7e63213601425c7a6d83e47dc936b264deb9df2b" SRCBRANCH = "lts-v2.10" DEPENDS += "openssl-native"
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.0.bb +2 -3
@@ -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} \ - " +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};nobranch=1" SRCBRANCH = "master" -SRCREV = "42b99719d5dde58bdde07712bcb70a20d87f9067" +SRCREV = "8917cf8b5eeb409b63256076d0dc35c60930ce18" DEPENDS += "optee-os"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.9.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.4.bb +5 -5
@@ -1,15 +1,15 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A v2.10.4 -SRCREV_tfa = "569e16caad976a0684147da1ecc6333fd9b7f813" +# TF-A v2.10.9 +SRCREV_tfa = "7e63213601425c7a6d83e47dc936b264deb9df2b" 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.4.1 -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=master" -SRCREV_mbedtls = "72718dd87e087215ce9155a826ee5a66cfbe9631" +# mbedtls-3.6.1 +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-3.6" +SRCREV_mbedtls = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH 2/3 arm/trusted-firmware-a: add support for 2.12.0
From: Quentin Schulz <[email protected]>
Add support for TF-A version v2.12.0 and mbedtls 3.6.1.
GCC-compiled boot tested on RK3588 Tiger, RK3399 Puma and PX30 Ringneck.
0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch is merged in 2.12.0 so no need to have it in SRC_URI as for 2.11.0 and earlier recipes.
--- meta-arm-bsp/conf/machine/fvp-base.conf | 2 ++ meta-arm-bsp/conf/machine/sgi575.conf | 2 ++ .../trusted-firmware-a_2.12.0.bb | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb
meta-arm-bsp/conf/machine/fvp-base.conf +2 -0
@@ -20,6 +20,8 @@ SERIAL_CONSOLES = "115200;ttyAMA0" # FIXME - This is being upstreamed. Remove once that has occurred. KERNEL_CONSOLE ?= "${@','.join(d.getVar('SERIAL_CONSOLES').split(' ')[0].split(';')[::-1]) or 'ttyS0'}" +PREFERRED_VERSION_trusted-firmware-a ?= "2.11.%" + PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KERNEL_DTB_NAME = "fvp-base-revc.dtb" KERNEL_DEVICETREE = "arm/${KERNEL_DTB_NAME}"
meta-arm-bsp/conf/machine/sgi575.conf +2 -0
@@ -6,6 +6,8 @@ require conf/machine/include/arm/armv8-2a/tune-cortexa75.inc +PREFERRED_VERSION_trusted-firmware-a ?= "2.11.%" + EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware" EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb new file +19 -0
@@ -0,0 +1,19 @@ +require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc + +# TF-A v2.12.0 +SRCREV_tfa = "4ec2948fe3f65dba2f19e691e702f7de2949179c" +SRCBRANCH = "master" + +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.1 +SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-3.6" +SRCREV_mbedtls = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3" + +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 \ +"
Signature · 1 line
2.39.5 (Apple Git-154)
PATCH 3/3 arm/trusted-firmware-a: bump fip and tests to 2.12
In reply to Jon MasonBump fip and tf-a tests to use the 2.12 sources
Note: change to license is for CoT device tree python application (which is Apache licensed).
---
.../{fiptool-native_2.11.0.bb => fiptool-native_2.12.0.bb} | 6 +++---
.../{tf-a-tests_2.11.0.bb => tf-a-tests_2.12.0.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.11.0.bb => fiptool-native_2.12.0.bb} (85%)
rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.11.0.bb => tf-a-tests_2.12.0.bb} (96%)meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.0.bb +3 -3
@@ -7,10 +7,10 @@ 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=b5fbfdeb6855162dded31fadcd5d4dc5" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1" -# Use fiptool from TF-A v2.11.0 -SRCREV = "f2735ebccf5173f74c0458736ec526276106097e" +# Use fiptool from TF-A v2.12.0 +SRCREV = "4ec2948fe3f65dba2f19e691e702f7de2949179c" SRCBRANCH = "master" DEPENDS += "openssl-native"
meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb renamed from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.11.0.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tes SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ " SRCBRANCH = "master" -SRCREV = "fd053b75cde9c2aa1a5b979a2b544890510d4f52" +SRCREV = "6a113621a9efdc143e9270b1789046cd7d9cdfb1" DEPENDS += "optee-os"
Signature · 1 line
2.39.5 (Apple Git-154)
Jon Mason
AppliedQuoted 4 lines · Jon Mason
Update TF-A LTS to 2.10.9 (which includes an mbedtls bump to 3.6.1, per docs). Also, bump the TF-A tests to the latest version.
Applied, thanks!
[1/3] arm/trusted-firmware-a: update 2.10 LTS to the latest versions
commit: 772947ef0149220c6408012043b673f36ba9d6d9
[2/3] arm/trusted-firmware-a: add support for 2.12.0
commit: 104f03c34730e0750d37a75e4c139a31ac9030e9
[3/3] arm/trusted-firmware-a: bump fip and tests to 2.12
commit: 3032ed613d3c02f98b074be1dae0619be2be20a3Best regards,
Signature · 1 line
Jon Mason <[email protected]>