From patchwork Thu Jun 18 12:59:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 90430 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 576B9CD98F2 for ; Thu, 18 Jun 2026 12:59:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.18806.1781787560816973533 for ; Thu, 18 Jun 2026 05:59:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=a95N1k3l; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6EAE12936 for ; Thu, 18 Jun 2026 05:59:15 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EF82E3F915 for ; Thu, 18 Jun 2026 05:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781787560; bh=8kBwbuL+Y7/crI7Hs67bEtK82cUp9X+4IuBVZ0+DOb4=; h=From:To:Subject:Date:From; b=a95N1k3lv9EhL47FbhEamElQtOnc4GAfKKC/Ro2qalPovF5vHjzo5p20K8WZL8ahJ Hva+pv3TB6vSgsSJkAKEaBaoisJwe/ClTC5QOvEakMQolISC1HpE7KibSMa73TaRFb BCLkJPt2cQ5ufGW7nIDf0fwswwxVU+Ma8851XyFs= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/7] arm/trusted-firmware-a: Add support for v2.15.0 Date: Thu, 18 Jun 2026 08:59:12 -0400 Message-ID: <20260618125918.62619-1-jon.mason@arm.com> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Jun 2026 12:59:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7085 Add support for the newest release of TF-A. mbedtls was made a git submodule. Given that this is no longer needed for the generic inc file, I've moved the relevant parts to the LTS recipe and others using the older way of building. Also, seeing some weird behavior with CPUs not coming on line in sbsa-ref and qemuarm-secureboot. So, pinning those back to the LTS until they can be sorted out. Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/sbsa-ref.conf | 2 + .../trusted-firmware-a-corstone1000.inc | 1 + .../trusted-firmware-a-fvp-base.inc | 3 - .../trusted-firmware-a-juno.inc | 1 - .../trusted-firmware-a-rdn2.inc | 26 +++++++++ .../trusted-firmware-a-rdv2.inc | 26 +++++++++ meta-arm/conf/machine/qemuarm-secureboot.conf | 2 + .../trusted-firmware-a/cot-dt2c_0.1.0.bb | 6 +- .../fiptool-native_2.15.0.bb | 33 +++++++++++ .../trusted-firmware-a/tf-a-tests_2.15.0.bb | 56 +++++++++++++++++++ .../trusted-firmware-a/trusted-firmware-a.inc | 19 ------- .../trusted-firmware-a_2.10.30.bb | 2 + .../trusted-firmware-a_2.12.10.bb | 2 + .../trusted-firmware-a_2.14.1.bb | 20 +++++++ .../trusted-firmware-a_2.15.0.bb | 8 +++ 15 files changed, 181 insertions(+), 26 deletions(-) create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.15.0.bb create mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.15.0.bb diff --git a/meta-arm-bsp/conf/machine/sbsa-ref.conf b/meta-arm-bsp/conf/machine/sbsa-ref.conf index 1f86cdb6e0e7..82d55c9b3d7a 100644 --- a/meta-arm-bsp/conf/machine/sbsa-ref.conf +++ b/meta-arm-bsp/conf/machine/sbsa-ref.conf @@ -26,6 +26,8 @@ EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boo SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" EXTRA_IMAGEDEPENDS += "edk2-firmware" +#FIXME - in 2.15.0, new logic for pen hold the SMP cores was added, which breaks this platform. Hold this back until it can be resolved. +PREFERRED_VERSION_trusted-firmware-a ?= "2.14.%" QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine sbsa-ref" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc index 4979f29477f3..86522d1b88ef 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc @@ -11,6 +11,7 @@ SRC_URI:append = " \ TFA_DEBUG = "1" TFA_UBOOT ?= "1" +#FIXME - this can be removed after moving to 2.15.0 TFA_MBEDTLS = "1" TFA_BUILD_TARGET = "bl2 bl31 fip" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc index c87cbb726ec8..8b06eace2012 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc @@ -55,9 +55,6 @@ TFA_PLATFORM = "fvp" # Disable debug build if measured boot is enabled. TFA_DEBUG := "${@bb.utils.contains('MACHINE_FEATURES', 'ts-attestation', '0',\ d.getVar('TFA_DEBUG'), d)}" -# Add mbedtls if measured boot is enabled -TFA_MBEDTLS := "${@bb.utils.contains('MACHINE_FEATURES', 'ts-attestation',\ - '1', d.getVar('TFA_MBEDTLS'), d)}" TFA_UBOOT ?= "1" TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc index a3a35ab4e501..c69e2ec3662e 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-juno.inc @@ -3,7 +3,6 @@ COMPATIBLE_MACHINE = "juno" TFA_PLATFORM = "juno" TFA_DEBUG = "1" -TFA_MBEDTLS = "1" TFA_UBOOT ?= "1" TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn2.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn2.inc index 0c09818c9024..d761a7ae639d 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn2.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdn2.inc @@ -27,3 +27,29 @@ SRCREV_tfa = "a4b376b128bb5b91771002f7808566f53c8d9f3a" SRC_URI:remove = "file://0001-feat-build-add-HOSTLDFLAGS-to-pass-flags-to-host-lin.patch" LIC_FILES_CHKSUM:remove = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" + +# sub-directory in which mbedtls will be downloaded +# Only needed for legacy versions, as v2.15.0 added this as a git submodule +TFA_MBEDTLS_DIR ?= "mbedtls" +# This should be set to MBEDTLS download URL if MBEDTLS is needed +SRC_URI_MBEDTLS ??= "" +# This should be set to MBEDTLS LIC FILES checksum +LIC_FILES_CHKSUM_MBEDTLS ??= "" +# add MBEDTLS to our sources if activated +SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}" +# Update license variables +LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}" +LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}" +# add mbed TLS to version +SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}" + +# Handle MBEDTLS +EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}" + +# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls +# mbedtls-3.6.5 +SRCBRANCH_MBEDTLS = "mbedtls-3.6" +SRC_URI_MBEDTLS = "gitsm://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}" +SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df" + +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv2.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv2.inc index 796011576e1d..8010c523e144 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv2.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-rdv2.inc @@ -27,3 +27,29 @@ SRCREV_tfa = "a4b376b128bb5b91771002f7808566f53c8d9f3a" SRC_URI:remove = "file://0001-feat-build-add-HOSTLDFLAGS-to-pass-flags-to-host-lin.patch" LIC_FILES_CHKSUM:remove = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" + +# sub-directory in which mbedtls will be downloaded +# Only needed for legacy versions, as v2.15.0 added this as a git submodule +TFA_MBEDTLS_DIR ?= "mbedtls" +# This should be set to MBEDTLS download URL if MBEDTLS is needed +SRC_URI_MBEDTLS ??= "" +# This should be set to MBEDTLS LIC FILES checksum +LIC_FILES_CHKSUM_MBEDTLS ??= "" +# add MBEDTLS to our sources if activated +SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}" +# Update license variables +LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}" +LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}" +# add mbed TLS to version +SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}" + +# Handle MBEDTLS +EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}" + +# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls +# mbedtls-3.6.5 +SRCBRANCH_MBEDTLS = "mbedtls-3.6" +SRC_URI_MBEDTLS = "gitsm://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}" +SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df" + +LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" diff --git a/meta-arm/conf/machine/qemuarm-secureboot.conf b/meta-arm/conf/machine/qemuarm-secureboot.conf index f08b84fe5e76..2787472bfdbf 100644 --- a/meta-arm/conf/machine/qemuarm-secureboot.conf +++ b/meta-arm/conf/machine/qemuarm-secureboot.conf @@ -18,6 +18,8 @@ IMAGE_FSTYPES += "wic wic.qcow2" WKS_FILE ?= "qemuarm.wks" WKS_FILE_DEPENDS = "trusted-firmware-a" +#FIXME - in 2.15.0, new logic for pen hold the SMP cores was added, which breaks this platform. Hold this back until it can be resolved. +PREFERRED_VERSION_trusted-firmware-a ?= "2.14.%" IMAGE_BOOT_FILES = "${KERNEL_IMAGETYPE}" MACHINE_FEATURES += "optee-ftpm" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb index 2cffb46c417d..a4e72b0052f7 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb @@ -6,9 +6,9 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-fir SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" -# Use cot-dt2c from TF-A v2.14.1 -SRCREV = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569" -SRCBRANCH = "lts-v2.14" +# Use cot-dt2c from TF-A v2.15.0 +SRCREV = "da738d5eae93af342fdc4995dd3c05acb4c9d757" +SRCBRANCH = "master" inherit python_poetry_core diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb new file mode 100644 index 000000000000..11e54fbf06e6 --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.15.0.bb @@ -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://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" +LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" + +# Use fiptool from TF-A v2.15.0 +SRCREV = "da738d5eae93af342fdc4995dd3c05acb4c9d757" +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 +} diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.15.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.15.0.bb new file mode 100644 index 000000000000..8bd5dd564334 --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.15.0.bb @@ -0,0 +1,56 @@ +DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)" +LICENSE = "BSD-3-Clause & NCSA" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a" + +inherit deploy + +COMPATIBLE_MACHINE ?= "invalid" + +SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://review.trustedfirmware.org/TF-A/tf-a-tests;protocol=https" +SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}" +SRCBRANCH = "master" +SRCREV = "bd08278493028d3c33936f61f406169a7f0deb9f" + +SRC_URI += "file://0001-Fix-GCC-errors-in-test_psci_stat.c.patch" + +EXTRA_OEMAKE += "USE_NVM=0" +EXTRA_OEMAKE += "SHELL_COLOR=1" +EXTRA_OEMAKE += "DEBUG=1" + +# Modify mode based on debug or release mode +TFTF_MODE ?= "debug" + +# Platform must be set for each machine +TFA_PLATFORM ?= "invalid" + +EXTRA_OEMAKE += "ARCH=aarch64" +EXTRA_OEMAKE += "LOG_LEVEL=50" + +B = "${WORKDIR}/build" + +# Add platform parameter +EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}" + +# Requires CROSS_COMPILE set by hand as there is no configure script +export CROSS_COMPILE = "${TARGET_PREFIX}" + +LDFLAGS[unexport] = "1" +do_compile() { + oe_runmake -C ${S} tftf +} + +do_compile[cleandirs] = "${B}" + +FILES:${PN} = "/firmware/tftf.bin" +SYSROOT_DIRS += "/firmware" + +do_install() { + install -d -m 755 ${D}/firmware + install -m 0644 ${B}/${TFA_PLATFORM}/${TFTF_MODE}/tftf.bin ${D}/firmware/tftf.bin +} + +do_deploy() { + cp -rf ${D}/firmware/* ${DEPLOYDIR}/ +} +addtask deploy after do_install diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc index 62204042cbab..c8717c3f6e28 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc @@ -43,22 +43,6 @@ TFA_LTO ?= "" B = "${WORKDIR}/build" -# mbed TLS support (set TFA_MBEDTLS to 1 to activate) -TFA_MBEDTLS ?= "0" -# sub-directory in which mbedtls will be downloaded -TFA_MBEDTLS_DIR ?= "mbedtls" -# This should be set to MBEDTLS download URL if MBEDTLS is needed -SRC_URI_MBEDTLS ??= "" -# This should be set to MBEDTLS LIC FILES checksum -LIC_FILES_CHKSUM_MBEDTLS ??= "" -# add MBEDTLS to our sources if activated -SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}" -# Update license variables -LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}" -LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}" -# add mbed TLS to version -SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}" - # U-boot support (set TFA_UBOOT to 1 to activate) # When U-Boot support is activated BL33 is activated with u-boot.bin file TFA_UBOOT ??= "0" @@ -131,9 +115,6 @@ EXTRA_OEMAKE += "${@'SPMD_SPM_AT_SEL2=${TFA_SPMD_SPM_AT_SEL2}' if d.getVar('TFA_ # Handle TFA_DEBUG parameter EXTRA_OEMAKE += "${@bb.utils.contains('TFA_DEBUG', '1', 'DEBUG=${TFA_DEBUG}', '', d)}" -# Handle MBEDTLS -EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}" - # Uboot support DEPENDS += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot', '', d)}" do_compile[depends] += " ${@bb.utils.contains('TFA_UBOOT', '1', 'u-boot:do_deploy', '', d)}" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb index fd19ac911089..72dd4b09cc7c 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM += "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dd SRCBRANCH_MBEDTLS = "mbedtls-3.6" SRC_URI_MBEDTLS = "git://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}" SRCREV_mbedtls = "c765c831e5c2a0971410692f92f7a81d6ec65ec2" +# The default value changed in v2.15.0 and later. Given this is a legacy version, change it here to keep future versions simplier +TFA_MBEDTLS_DIR = "mbedtls" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb index 20fc5a7d70bc..737a90a70e15 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb @@ -11,6 +11,8 @@ LIC_FILES_CHKSUM += "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee SRCBRANCH_MBEDTLS = "mbedtls-3.6" SRC_URI_MBEDTLS = "git://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}" SRCREV_mbedtls = "22098d41c6620ce07cf8a0134d37302355e1e5ef" +# The default value changed in v2.15.0 and later. Given this is a legacy version, change it here to keep future versions simplier +TFA_MBEDTLS_DIR = "mbedtls" LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb index 2f69d054a3f8..de29941b2c8d 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb @@ -7,6 +7,26 @@ SRCBRANCH = "lts-v2.14" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" +# mbed TLS support (set TFA_MBEDTLS to 1 to activate) +TFA_MBEDTLS ?= "0" +# sub-directory in which mbedtls will be downloaded +# Only needed for legacy versions, as v2.15.0 added this as a git submodule +TFA_MBEDTLS_DIR ?= "mbedtls" +# This should be set to MBEDTLS download URL if MBEDTLS is needed +SRC_URI_MBEDTLS ??= "" +# This should be set to MBEDTLS LIC FILES checksum +LIC_FILES_CHKSUM_MBEDTLS ??= "" +# add MBEDTLS to our sources if activated +SRC_URI:append = " ${@bb.utils.contains('TFA_MBEDTLS', '1', '${SRC_URI_MBEDTLS}', '', d)}" +# Update license variables +LICENSE:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' & Apache-2.0', '', d)}" +LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}" +# add mbed TLS to version +SRCREV_FORMAT:append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}" + +# Handle MBEDTLS +EXTRA_OEMAKE += "${@bb.utils.contains('TFA_MBEDTLS', '1', 'MBEDTLS_DIR=${TFA_MBEDTLS_DIR}', '', d)}" + # in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls # mbedtls-3.6.5 SRCBRANCH_MBEDTLS = "mbedtls-3.6" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.15.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.15.0.bb new file mode 100644 index 000000000000..f780ab59bf5c --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.15.0.bb @@ -0,0 +1,8 @@ +require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc + +# TF-A v2.15.0 +SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" +SRCREV = "da738d5eae93af342fdc4995dd3c05acb4c9d757" +SRCBRANCH = "master" + +LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" From patchwork Thu Jun 18 12:59:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 90426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2B41CD98ED for ; Thu, 18 Jun 2026 12:59:28 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.18998.1781787560974709004 for ; Thu, 18 Jun 2026 05:59:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=K+NoWDHf; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C12A8293B for ; Thu, 18 Jun 2026 05:59:15 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3EEAA3F915 for ; Thu, 18 Jun 2026 05:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781787560; bh=JfbXQg7FBtvk9yWZ1DHQD3tEqjZ8MXylw0FemLh6SE0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=K+NoWDHf1vKzf7pjtJ6N+Q4JfxBp+UG5rCRn/6IX9TlG/yXhwDksKvYKqHI/Gs4Yp FuRRdnE0MIizcxzLRz2paXPFOBVuMo7Ma6iX/dIz9D6DLNUZ+GqnLcIpH6zJfV0cmj hUQM/1N+sQQ5G+1Vk5XUQl3P6JrxbcYabvbsjAds= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/7] arm/trusted-firmware-a: remove older LTS versions Date: Thu, 18 Jun 2026 08:59:13 -0400 Message-ID: <20260618125918.62619-2-jon.mason@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260618125918.62619-1-jon.mason@arm.com> References: <20260618125918.62619-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Jun 2026 12:59:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7086 The policy in meta-arm is to only have the latest version and the latest LTS version. Remove all of the older LTS versions to comply with this policy. Signed-off-by: Jon Mason --- ci/lts-revisions.yml | 4 +- ...-make-PCIe-tests-default-for-testing.patch | 531 ------------------ ...-handle-secure-SGI-at-EL1-for-OP-TEE.patch | 33 -- ...ot.c-ignore-TPM-error-and-continue-w.patch | 33 -- .../fiptool-native_2.10.30.bb | 33 -- .../fiptool-native_2.12.10.bb | 33 -- .../trusted-firmware-a/tf-a-tests_2.10.24.bb | 54 -- .../trusted-firmware-a/tf-a-tests_2.12.3.bb | 56 -- .../trusted-firmware-a_2.10.30.bb | 23 - .../trusted-firmware-a_2.12.10.bb | 22 - 10 files changed, 2 insertions(+), 820 deletions(-) delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb diff --git a/ci/lts-revisions.yml b/ci/lts-revisions.yml index 2cb7a6bc3411..0cd6ac074d9c 100644 --- a/ci/lts-revisions.yml +++ b/ci/lts-revisions.yml @@ -5,6 +5,6 @@ header: local_conf_header: latest_revisions: | - PREFERRED_VERSION_trusted-firmware-a ?= "2.10.%" - PREFERRED_VERSION_tf-a-tests ?= "2.10.%" + PREFERRED_VERSION_trusted-firmware-a ?= "2.14.%" + PREFERRED_VERSION_tf-a-tests ?= "2.14.%" PREFERRED_VERSION_trusted-firmware-m ?= "2.1.%" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch deleted file mode 100644 index f8f998a6a012..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-realm-make-PCIe-tests-default-for-testing.patch +++ /dev/null @@ -1,531 +0,0 @@ -From f5c206b8d9019d8112e55ac8da1936c79c7d2ce7 Mon Sep 17 00:00:00 2001 -From: Soby Mathew -Date: Fri, 15 Nov 2024 17:11:24 +0000 -Subject: [PATCH] fix(realm): make PCIe tests default for testing - -This patch moves the PCIe DOE test to the default realm world -testsuite. - -Also fixes some build issues and hardens the PCIe functions. - -Note that FVP_Base_RevC model needs to have the following -options enabled for the PCIe tests to work : - - -C pci.pcie_rc.ahci0.endpoint.doe_supported=1 - -C pci.pcie_rc.ahci0.endpoint.ide_supported=1 - -Change-Id: Icfd6b68799b0bacb44299c6a3cf99a3c425f833d -Signed-off-by: Soby Mathew -Upstream-Status: Backport [2c2810f79e57e78d77899084b5439cbdd1aaa464] ---- - docs/porting/optional-mods.rst | 12 ++++++ - include/lib/pcie/pcie.h | 9 ++-- - include/plat/common/platform.h | 10 ++++- - lib/pcie/pcie.c | 41 ++++++++++++++----- - plat/arm/fvp/fvp_pcie.c | 4 +- - plat/arm/fvp/include/platform_pcie.h | 2 - - plat/arm/fvp/plat_setup.c | 2 - - plat/arm/fvp/platform.mk | 9 ++-- - plat/common/plat_common.c | 8 +++- - tftf/tests/doe_tests/doe_helpers.c | 11 +++-- - tftf/tests/doe_tests/doe_helpers.h | 2 + - tftf/tests/doe_tests/test_doe.c | 9 +++- - .../realm_payload/host_realm_simd_common.h | 2 +- - tftf/tests/tests-pcie-doe.mk | 22 ---------- - tftf/tests/tests-pcie-doe.xml | 14 ------- - tftf/tests/tests-realm-payload.mk | 14 ++++++- - tftf/tests/tests-realm-payload.xml | 7 +++- - 17 files changed, 105 insertions(+), 73 deletions(-) - delete mode 100644 tftf/tests/tests-pcie-doe.mk - delete mode 100644 tftf/tests/tests-pcie-doe.xml - -diff --git a/docs/porting/optional-mods.rst b/docs/porting/optional-mods.rst -index a88d682..7fc3813 100644 ---- a/docs/porting/optional-mods.rst -+++ b/docs/porting/optional-mods.rst -@@ -50,6 +50,18 @@ The default implementation uses the ARM watchdog peripheral (`SP805`_) to - generate a watchdog timeout interrupt. This interrupt remains deliberately - unserviced, which eventually asserts the reset signal. - -+Function : plat_pcie_get_info_table() -+---------------------------- -+ -+:: -+ -+ Argument : void -+ Return : struct pcie_info_table * -+ -+This function returns the pointer to `pcie_info_table` structure -+correponding to the platform. This needs to be implemented -+only if the platform want to run PCIe related tests. -+ - -------------- - - *Copyright (c) 2019, Arm Limited. All rights reserved.* -diff --git a/include/lib/pcie/pcie.h b/include/lib/pcie/pcie.h -index aa3911f..3ce6986 100644 ---- a/include/lib/pcie/pcie.h -+++ b/include/lib/pcie/pcie.h -@@ -11,6 +11,9 @@ - #include - #include - -+/* platforms need to ensure that number of entries is less that this value */ -+#define MAX_PCIE_INFO_ENTRIES 5 -+ - typedef struct { - unsigned long ecam_base; /* ECAM base address */ - unsigned int segment_num; /* Segment number of this ECAM */ -@@ -18,10 +21,10 @@ typedef struct { - unsigned int end_bus_num; /* Last bus number */ - } pcie_info_block_t; - --typedef struct { -+struct pcie_info_table{ - unsigned int num_entries; /* Number of entries */ -- pcie_info_block_t block[]; --} pcie_info_table_t; -+ pcie_info_block_t block[MAX_PCIE_INFO_ENTRIES]; -+}; - - typedef struct { - uint32_t bdf; -diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h -index c8b785c..1a51823 100644 ---- a/include/plat/common/platform.h -+++ b/include/plat/common/platform.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2018-2019, Arm Limited. All rights reserved. -+ * Copyright (c) 2018-2024, Arm Limited. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -@@ -193,4 +193,12 @@ static inline uint32_t get_current_core_id(void) - return platform_get_core_pos(read_mpidr_el1() & MPID_MASK); - } - -+/* Forward declaration */ -+struct pcie_info_table; -+ -+/* -+ * Retrieve platform PCIe information. -+ */ -+const struct pcie_info_table *plat_pcie_get_info_table(void); -+ - #endif /* __PLATFORM_H__ */ -diff --git a/lib/pcie/pcie.c b/lib/pcie/pcie.c -index c3906d5..5f8c97f 100644 ---- a/lib/pcie/pcie.c -+++ b/lib/pcie/pcie.c -@@ -11,13 +11,12 @@ - #include - #include - #include -+#include - #include - --#include -- - #define PCIE_DEBUG VERBOSE - --const pcie_info_table_t *g_pcie_info_table; -+const struct pcie_info_table *g_pcie_info_table; - pcie_device_bdf_table_t *g_pcie_bdf_table; - - pcie_device_bdf_table_t pcie_bdf_table[PCIE_DEVICE_BDF_TABLE_SZ]; -@@ -256,6 +255,8 @@ uint32_t pcie_get_rootport(uint32_t bdf, uint32_t *rp_bdf) - return 1; - } - -+ assert(g_pcie_bdf_table != NULL); -+ - while (index < g_pcie_bdf_table->num_entries) { - *rp_bdf = g_pcie_bdf_table->device[index++].bdf; - -@@ -294,6 +295,8 @@ static uint32_t pcie_populate_device_rootport(void) - uint32_t bdf, rp_bdf; - pcie_device_bdf_table_t *bdf_tbl_ptr = g_pcie_bdf_table; - -+ assert(bdf_tbl_ptr != NULL); -+ - for (unsigned int tbl_index = 0; tbl_index < bdf_tbl_ptr->num_entries; - tbl_index++) { - bdf = bdf_tbl_ptr->device[tbl_index].bdf; -@@ -317,6 +320,8 @@ static uint32_t pcie_populate_device_rootport(void) - */ - pcie_device_bdf_table_t *pcie_get_bdf_table(void) - { -+ assert(g_pcie_bdf_table != NULL); -+ - return g_pcie_bdf_table; - } - -@@ -336,6 +341,8 @@ void pcie_create_device_bdf_table(void) - assert(g_pcie_bdf_table != NULL); - - g_pcie_bdf_table->num_entries = 0; -+ -+ assert(g_pcie_info_table != NULL); - assert(g_pcie_info_table->num_entries != 0); - - for (ecam_index = 0; ecam_index < g_pcie_info_table->num_entries; ecam_index++) { -@@ -420,6 +427,8 @@ uintptr_t pcie_get_ecam_base(uint32_t bdf) - uint32_t reg_value; - uintptr_t ecam_base = 0; - -+ assert(g_pcie_info_table != NULL); -+ - while (ecam_index < g_pcie_info_table->num_entries) { - /* Derive ECAM specific information */ - const pcie_info_block_t *block = &g_pcie_info_table->block[ecam_index]; -@@ -462,13 +471,15 @@ void pcie_print_device_info(void) - uint32_t ecam_index = 0; - uint32_t ecam_base, ecam_start_bus, ecam_end_bus; - pcie_device_bdf_table_t *bdf_tbl_ptr = g_pcie_bdf_table; -- uint32_t num_rciep = 0, num_rcec = 0; -- uint32_t num_iep = 0, num_irp = 0; -- uint32_t num_ep = 0, num_rp = 0; -- uint32_t num_dp = 0, num_up = 0; -- uint32_t num_pcie_pci = 0, num_pci_pcie = 0; -+ uint32_t num_rciep __unused = 0, num_rcec __unused = 0; -+ uint32_t num_iep __unused = 0, num_irp __unused = 0; -+ uint32_t num_ep __unused = 0, num_rp __unused = 0; -+ uint32_t num_dp __unused = 0, num_up __unused = 0; -+ uint32_t num_pcie_pci __unused = 0, num_pci_pcie __unused = 0; - uint32_t bdf_counter; - -+ assert(bdf_tbl_ptr != NULL); -+ - if (bdf_tbl_ptr->num_entries == 0) { - INFO("BDF Table: No RCiEP or iEP found\n"); - return; -@@ -525,6 +536,8 @@ void pcie_print_device_info(void) - INFO("Number of PCI/PCIe Bridge: %u\n", num_pci_pcie); - INFO("Number of PCIe/PCI Bridge: %u\n", num_pcie_pci); - -+ assert(g_pcie_info_table != NULL); -+ - while (ecam_index < g_pcie_info_table->num_entries) { - - /* Derive ECAM specific information */ -@@ -540,7 +553,7 @@ void pcie_print_device_info(void) - - while (tbl_index < bdf_tbl_ptr->num_entries) { - uint32_t seg_num, bus_num, dev_num, func_num; -- uint32_t device_id, vendor_id, reg_value; -+ uint32_t device_id __unused, vendor_id __unused, reg_value; - uint32_t bdf, dev_ecam_base; - - bdf = bdf_tbl_ptr->device[tbl_index++].bdf; -@@ -588,12 +601,18 @@ void pcie_create_info_table(void) - INFO("Creating PCIe info table\n"); - - g_pcie_info_table = plat_pcie_get_info_table(); -+ if (g_pcie_info_table == NULL) { -+ ERROR("PCIe info not returned by platform\n"); -+ panic(); -+ } -+ - g_pcie_bdf_table = pcie_bdf_table; - - num_ecam = g_pcie_info_table->num_entries; - INFO("Number of ECAM regions : %u\n", num_ecam); -- if (num_ecam == 0) { -- return; -+ if ((num_ecam == 0) || (num_ecam > MAX_PCIE_INFO_ENTRIES)) { -+ ERROR("PCIe info entries invalid\n"); -+ panic(); - } - pcie_create_device_bdf_table(); - pcie_print_device_info(); -diff --git a/plat/arm/fvp/fvp_pcie.c b/plat/arm/fvp/fvp_pcie.c -index 0569832..c43e42d 100644 ---- a/plat/arm/fvp/fvp_pcie.c -+++ b/plat/arm/fvp/fvp_pcie.c -@@ -11,7 +11,7 @@ - - CASSERT(PLATFORM_NUM_ECAM != 0, PLATFORM_NUM_ECAM_is_zero); - --const pcie_info_table_t fvp_pcie_cfg = { -+const struct pcie_info_table fvp_pcie_cfg = { - .num_entries = PLATFORM_NUM_ECAM, - .block[0] = { - PLATFORM_PCIE_ECAM_BASE_ADDR_0, -@@ -21,7 +21,7 @@ const pcie_info_table_t fvp_pcie_cfg = { - } - }; - --const pcie_info_table_t *plat_pcie_get_info_table(void) -+const struct pcie_info_table *plat_pcie_get_info_table(void) - { - return &fvp_pcie_cfg; - } -diff --git a/plat/arm/fvp/include/platform_pcie.h b/plat/arm/fvp/include/platform_pcie.h -index c76c7d9..4b3a0e9 100644 ---- a/plat/arm/fvp/include/platform_pcie.h -+++ b/plat/arm/fvp/include/platform_pcie.h -@@ -19,6 +19,4 @@ - #define PLATFORM_PCIE_START_BUS_NUM_0 0x0 - #define PLATFORM_PCIE_END_BUS_NUM_0 0xFF - --const pcie_info_table_t *plat_pcie_get_info_table(void); -- - #endif /* PLATFORM_PCIE_H */ -diff --git a/plat/arm/fvp/plat_setup.c b/plat/arm/fvp/plat_setup.c -index e6e4244..69cb0a1 100644 ---- a/plat/arm/fvp/plat_setup.c -+++ b/plat/arm/fvp/plat_setup.c -@@ -35,9 +35,7 @@ static const mmap_region_t mmap[] = { - #if USE_NVM - MAP_REGION_FLAT(FLASH_BASE, FLASH_SIZE, MT_DEVICE | MT_RW | MT_NS), - #endif --#if USE_PCIE - MAP_REGION_FLAT(PCIE_CONFIG_BASE, PCIE_CONFIG_SIZE, MT_DEVICE | MT_RW | MT_NS), --#endif - MAP_REGION_FLAT(DRAM_BASE, TFTF_BASE - DRAM_BASE, MT_MEMORY | MT_RW | MT_NS), - {0} - }; -diff --git a/plat/arm/fvp/platform.mk b/plat/arm/fvp/platform.mk -index 7a2850f..ee30721 100644 ---- a/plat/arm/fvp/platform.mk -+++ b/plat/arm/fvp/platform.mk -@@ -90,12 +90,8 @@ $(eval $(call add_define,NS_BL2U_DEFINES,PA_SIZE)) - $(eval $(call add_define,TFTF_DEFINES,PA_SIZE)) - $(eval $(call add_define,REALM_DEFINES,PA_SIZE)) - --ifeq ($(TESTS),pcie-doe) --USE_PCIE=1 --$(eval $(call add_define,TFTF_DEFINES,USE_PCIE)) --endif -- --PLAT_INCLUDES += -Iplat/arm/fvp/include/ -+PLAT_INCLUDES += -Iplat/arm/fvp/include/ \ -+ -Iinclude/lib/pcie/ - - PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \ - drivers/arm/gic/gic_v2.c \ -@@ -104,6 +100,7 @@ PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \ - drivers/arm/timer/private_timer.c \ - drivers/arm/timer/system_timer.c \ - plat/arm/fvp/${ARCH}/plat_helpers.S \ -+ plat/arm/fvp/fvp_pcie.c \ - plat/arm/fvp/fvp_pwr_state.c \ - plat/arm/fvp/fvp_topology.c \ - plat/arm/fvp/fvp_mem_prot.c \ -diff --git a/plat/common/plat_common.c b/plat/common/plat_common.c -index c43ae12..a4195c3 100644 ---- a/plat/common/plat_common.c -+++ b/plat/common/plat_common.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2018-2020, Arm Limited. All rights reserved. -+ * Copyright (c) 2018-2024, Arm Limited. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -@@ -24,6 +24,7 @@ - #pragma weak tftf_plat_enable_mmu - #pragma weak tftf_plat_reset - #pragma weak plat_get_prot_regions -+#pragma weak plat_pcie_get_info_table - - #if IMAGE_TFTF - -@@ -148,3 +149,8 @@ const mem_region_t *plat_get_prot_regions(int *nelem) - *nelem = 0; - return NULL; - } -+ -+const struct pcie_info_table *plat_pcie_get_info_table(void) -+{ -+ return NULL; -+} -diff --git a/tftf/tests/doe_tests/doe_helpers.c b/tftf/tests/doe_tests/doe_helpers.c -index 28b6a86..911fbd0 100644 ---- a/tftf/tests/doe_tests/doe_helpers.c -+++ b/tftf/tests/doe_tests/doe_helpers.c -@@ -13,12 +13,15 @@ - #include - #include - --#include -- - void pcie_init(void) - { -+ static bool is_init; -+ - /* Create PCIe table and enumeration */ -- pcie_create_info_table(); -+ if (!is_init) { -+ pcie_create_info_table(); -+ is_init = true; -+ } - } - - /* -@@ -113,7 +116,7 @@ int get_spdm_version(uint32_t bdf, uint32_t doe_cap_base) - sizeof(ver_resp->version_number_entry_count)); - - while (entry_count-- != 0) { -- spdm_version_number_t ver = *ver_ptr++; -+ spdm_version_number_t ver __unused = *ver_ptr++; - - INFO("SPDM v%llu.%llu.%llu.%llu\n", - EXTRACT(SPDM_VER_MAJOR, ver), -diff --git a/tftf/tests/doe_tests/doe_helpers.h b/tftf/tests/doe_tests/doe_helpers.h -index 08137e3..d0fc5c8 100644 ---- a/tftf/tests/doe_tests/doe_helpers.h -+++ b/tftf/tests/doe_tests/doe_helpers.h -@@ -8,6 +8,8 @@ - #ifndef DOE_HELPERS_H - #define DOE_HELPERS_H - -+#include -+ - void pcie_init(void); - int find_doe_device(uint32_t *bdf_ptr, uint32_t *cap_base_ptr); - int doe_discovery(uint32_t bdf, uint32_t doe_cap_base); -diff --git a/tftf/tests/doe_tests/test_doe.c b/tftf/tests/doe_tests/test_doe.c -index 6eb5079..cc852fa 100644 ---- a/tftf/tests/doe_tests/test_doe.c -+++ b/tftf/tests/doe_tests/test_doe.c -@@ -10,6 +10,13 @@ - - #define SKIP_TEST_IF_DOE_NOT_SUPPORTED() \ - do { \ -+ /* Test PCIe DOE only for RME */ \ -+ if (!get_armv9_2_feat_rme_support()) { \ -+ tftf_testcase_printf("FEAT_RME not supported\n"); \ -+ return TEST_RESULT_SKIPPED; \ -+ } \ -+ \ -+ pcie_init(); \ - if (find_doe_device(&bdf, &doe_cap_base) != 0) { \ - tftf_testcase_printf("PCIe DOE not supported\n"); \ - return TEST_RESULT_SKIPPED; \ -@@ -21,8 +28,6 @@ test_result_t doe_discovery_test(void) - uint32_t bdf, doe_cap_base; - int ret; - -- pcie_init(); -- - SKIP_TEST_IF_DOE_NOT_SUPPORTED(); - - ret = doe_discovery(bdf, doe_cap_base); -diff --git a/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h b/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h -index 377c85b..6ab45c3 100644 ---- a/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h -+++ b/tftf/tests/runtime_services/realm_payload/host_realm_simd_common.h -@@ -4,7 +4,7 @@ - */ - - #ifndef HOST_REALM_COMMON_H --#define HOST_REALM_COMMON_h -+#define HOST_REALM_COMMON_H - - #define NS_NORMAL_SVE 0x1U - #define NS_STREAMING_SVE 0x2U -diff --git a/tftf/tests/tests-pcie-doe.mk b/tftf/tests/tests-pcie-doe.mk -deleted file mode 100644 -index 14bc9cf..0000000 ---- a/tftf/tests/tests-pcie-doe.mk -+++ /dev/null -@@ -1,22 +0,0 @@ --# --# Copyright (c) 2024, Arm Limited. All rights reserved. --# --# SPDX-License-Identifier: BSD-3-Clause --# -- --TESTS_SOURCES += \ -- $(addprefix plat/arm/fvp/, \ -- fvp_pcie.c \ -- ) -- --TESTS_SOURCES += \ -- $(addprefix tftf/tests/doe_tests/, \ -- doe_helpers.c \ -- test_doe.c \ -- ) -- --TESTS_SOURCES += \ -- $(addprefix lib/pcie/, \ -- pcie.c \ -- pcie_doe.c \ -- ) -diff --git a/tftf/tests/tests-pcie-doe.xml b/tftf/tests/tests-pcie-doe.xml -deleted file mode 100644 -index ed8b7cb..0000000 ---- a/tftf/tests/tests-pcie-doe.xml -+++ /dev/null -@@ -1,14 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -diff --git a/tftf/tests/tests-realm-payload.mk b/tftf/tests/tests-realm-payload.mk -index ae4b20a..4da8e3e 100644 ---- a/tftf/tests/tests-realm-payload.mk -+++ b/tftf/tests/tests-realm-payload.mk -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2021-2023, Arm Limited. All rights reserved. -+# Copyright (c) 2021-2024, Arm Limited. All rights reserved. - # - # SPDX-License-Identifier: BSD-3-Clause - # -@@ -44,4 +44,16 @@ TESTS_SOURCES += \ - $(addprefix lib/extensions/fpu/, \ - fpu.c \ - ) -+ -+TESTS_SOURCES += \ -+ $(addprefix tftf/tests/doe_tests/, \ -+ doe_helpers.c \ -+ test_doe.c \ -+ ) -+ -+TESTS_SOURCES += \ -+ $(addprefix lib/pcie/, \ -+ pcie.c \ -+ pcie_doe.c \ -+ ) - endif -diff --git a/tftf/tests/tests-realm-payload.xml b/tftf/tests/tests-realm-payload.xml -index 3c0dda4..d99a6b9 100644 ---- a/tftf/tests/tests-realm-payload.xml -+++ b/tftf/tests/tests-realm-payload.xml -@@ -1,7 +1,7 @@ - - - -@@ -126,5 +126,10 @@ - function="host_test_non_lpa2_realm_on_lpa2plat" /> - -+ -+ -+ - - --- -2.34.1 - diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch deleted file mode 100644 index 3dcc2de81c2f..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f5b2fa90e0c0324f31e72429e7a7382f49a25912 Mon Sep 17 00:00:00 2001 -From: Shen Jiamin -Date: Wed, 24 Jul 2024 18:58:55 +0800 -Subject: [PATCH] fix(zynqmp): handle secure SGI at EL1 for OP-TEE - -OP-TEE requires SGIs to be handled at S-EL1. The -Makefile was not properly setting the flag -GICV2_G0_FOR_EL3 to 0 when the SPD is OP-TEE. - -Change-Id: I256afa37ddf4ad4a154c43d51807de670c3689bb -Signed-off-by: Shen Jiamin ---- - plat/xilinx/zynqmp/platform.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Upstream-Status: Backport - -diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk -index c340009d0..22eceb621 100644 ---- a/plat/xilinx/zynqmp/platform.mk -+++ b/plat/xilinx/zynqmp/platform.mk -@@ -21,7 +21,7 @@ ENABLE_LTO := 1 - EL3_EXCEPTION_HANDLING := $(SDEI_SUPPORT) - - # pncd SPD requires secure SGI to be handled at EL1 --ifeq (${SPD}, $(filter ${SPD},pncd tspd)) -+ifeq (${SPD}, $(filter ${SPD},pncd tspd opteed)) - ifeq (${ZYNQMP_WDT_RESTART},1) - $(error "Error: ZYNQMP_WDT_RESTART and SPD=pncd are incompatible") - endif --- -2.34.1 - diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch deleted file mode 100644 index 733fa370b944..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-qemu_measured_boot.c-ignore-TPM-error-and-continue-w.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b91c651e6d596cfe27448b19c8fb2f1168493827 Mon Sep 17 00:00:00 2001 -From: Mikko Rapeli -Date: Mon, 15 Jan 2024 09:26:56 +0000 -Subject: [PATCH] qemu_measured_boot.c: ignore TPM error and continue with boot - -If firmware is configured with TPM support but it's missing -on HW, e.g. swtpm not started and/or configured with qemu, -then continue booting. Missing TPM is not a fatal error. -Enables testing boot without TPM device to see that -missing TPM is detected further up the SW stack and correct -fallback actions are taken. - -Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/36514] - -Signed-off-by: Mikko Rapeli ---- - plat/qemu/qemu/qemu_measured_boot.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/plat/qemu/qemu/qemu_measured_boot.c b/plat/qemu/qemu/qemu_measured_boot.c -index 76a4da17e6a9..ec7f44d3720d 100644 ---- a/plat/qemu/qemu/qemu_measured_boot.c -+++ b/plat/qemu/qemu/qemu_measured_boot.c -@@ -80,7 +80,8 @@ void bl2_plat_mboot_finish(void) - * Note: In QEMU platform, OP-TEE uses nt_fw_config to get the - * secure Event Log buffer address. - */ -- panic(); -+ ERROR("Ignoring TPM errors, continuing without\n"); -+ return; - } - - /* Copy Event Log to Non-secure memory */ diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb deleted file mode 100644 index deab9ad059bc..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.30.bb +++ /dev/null @@ -1,33 +0,0 @@ -# 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://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" -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.30 -SRCREV = "d57b81079003e1647ed4181057c5784c7e3b1c3e" -SRCBRANCH = "lts-v2.10" - -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 -} diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb deleted file mode 100644 index 985fd4c2ca6c..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.10.bb +++ /dev/null @@ -1,33 +0,0 @@ -# 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://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" -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.10 -SRCREV = "9487b105dcf18d057c6aeb405f9eaa1079c8fe6e" -SRCBRANCH = "lts-v2.12" - -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 -} diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb deleted file mode 100644 index b2691122cc09..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.24.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)" -LICENSE = "BSD-3-Clause & NCSA" - -LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a" - -inherit deploy - -COMPATIBLE_MACHINE ?= "invalid" - -SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://review.trustedfirmware.org/TF-A/tf-a-tests;protocol=https" -SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}" -SRCBRANCH = "lts-v2.10" -SRCREV = "ad8e3c9506abc6fd093c9753c8e201ddc2daa270" - -EXTRA_OEMAKE += "USE_NVM=0" -EXTRA_OEMAKE += "SHELL_COLOR=1" -EXTRA_OEMAKE += "DEBUG=1" - -# Modify mode based on debug or release mode -TFTF_MODE ?= "debug" - -# Platform must be set for each machine -TFA_PLATFORM ?= "invalid" - -EXTRA_OEMAKE += "ARCH=aarch64" -EXTRA_OEMAKE += "LOG_LEVEL=50" - -B = "${WORKDIR}/build" - -# Add platform parameter -EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}" - -# Requires CROSS_COMPILE set by hand as there is no configure script -export CROSS_COMPILE = "${TARGET_PREFIX}" - -LDFLAGS[unexport] = "1" -do_compile() { - oe_runmake -C ${S} tftf -} - -do_compile[cleandirs] = "${B}" - -FILES:${PN} = "/firmware/tftf.bin" -SYSROOT_DIRS += "/firmware" - -do_install() { - install -d -m 755 ${D}/firmware - install -m 0644 ${B}/${TFA_PLATFORM}/${TFTF_MODE}/tftf.bin ${D}/firmware/tftf.bin -} - -do_deploy() { - cp -rf ${D}/firmware/* ${DEPLOYDIR}/ -} -addtask deploy after do_install diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb deleted file mode 100644 index ecd02f67cd44..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb +++ /dev/null @@ -1,56 +0,0 @@ -DESCRIPTION = "Trusted Firmware-A tests(aka TFTF)" -LICENSE = "BSD-3-Clause & NCSA" - -LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6175cc0aa2e63b6d21a32aa0ee7d1b4a" - -inherit deploy - -COMPATIBLE_MACHINE ?= "invalid" - -SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://review.trustedfirmware.org/TF-A/tf-a-tests;protocol=https" -SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ - file://0001-fix-realm-make-PCIe-tests-default-for-testing.patch \ - " -SRCBRANCH = "lts-v2.12" -SRCREV = "3650d9cdfaa8eda20eba4b0c366c7c213a356557" - -EXTRA_OEMAKE += "USE_NVM=0" -EXTRA_OEMAKE += "SHELL_COLOR=1" -EXTRA_OEMAKE += "DEBUG=1" - -# Modify mode based on debug or release mode -TFTF_MODE ?= "debug" - -# Platform must be set for each machine -TFA_PLATFORM ?= "invalid" - -EXTRA_OEMAKE += "ARCH=aarch64" -EXTRA_OEMAKE += "LOG_LEVEL=50" - -B = "${WORKDIR}/build" - -# Add platform parameter -EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}" - -# Requires CROSS_COMPILE set by hand as there is no configure script -export CROSS_COMPILE = "${TARGET_PREFIX}" - -LDFLAGS[unexport] = "1" -do_compile() { - oe_runmake -C ${S} tftf -} - -do_compile[cleandirs] = "${B}" - -FILES:${PN} = "/firmware/tftf.bin" -SYSROOT_DIRS += "/firmware" - -do_install() { - install -d -m 755 ${D}/firmware - install -m 0644 ${B}/${TFA_PLATFORM}/${TFTF_MODE}/tftf.bin ${D}/firmware/tftf.bin -} - -do_deploy() { - cp -rf ${D}/firmware/* ${DEPLOYDIR}/ -} -addtask deploy after do_install diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb deleted file mode 100644 index 72dd4b09cc7c..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.30.bb +++ /dev/null @@ -1,23 +0,0 @@ -require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc - -# TF-A v2.10.30 -SRCREV_tfa = "d57b81079003e1647ed4181057c5784c7e3b1c3e" -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.4 -SRCBRANCH_MBEDTLS = "mbedtls-3.6" -SRC_URI_MBEDTLS = "git://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}" -SRCREV_mbedtls = "c765c831e5c2a0971410692f92f7a81d6ec65ec2" -# The default value changed in v2.15.0 and later. Given this is a legacy version, change it here to keep future versions simplier -TFA_MBEDTLS_DIR = "mbedtls" - -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 \ - file://0001-fix-zynqmp-handle-secure-SGI-at-EL1-for-OP-TEE.patch \ -" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb deleted file mode 100644 index 737a90a70e15..000000000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.10.bb +++ /dev/null @@ -1,22 +0,0 @@ -require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc - -# TF-A v2.12.10 -SRCREV_tfa = "9487b105dcf18d057c6aeb405f9eaa1079c8fe6e" -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.3 -SRCBRANCH_MBEDTLS = "mbedtls-3.6" -SRC_URI_MBEDTLS = "git://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}" -SRCREV_mbedtls = "22098d41c6620ce07cf8a0134d37302355e1e5ef" -# The default value changed in v2.15.0 and later. Given this is a legacy version, change it here to keep future versions simplier -TFA_MBEDTLS_DIR = "mbedtls" - -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 \ -" From patchwork Thu Jun 18 12:59:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 90428 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28D36CD98F9 for ; Thu, 18 Jun 2026 12:59:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.18807.1781787561421563651 for ; Thu, 18 Jun 2026 05:59:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=Hg5gbz4E; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4CAF82BC3 for ; Thu, 18 Jun 2026 05:59:16 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BC4BF3F915 for ; Thu, 18 Jun 2026 05:59:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781787560; bh=u9scEH31mrQxnIgEnfdUzCT4BFko5GfcgXIKvV2YQVw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Hg5gbz4EtJXvcoqNzK/jJDVpEP6TEsia4ZDODq6Q3yLm2zVXkLY8252SplDXULARS cQO1ioySSnHSk1pdyfcN3p4D61UdB5h2QVNG03fWoq0VsPnQQZ3obufq0sbAU5ZMoa MXtOV40cEDj5RmI4oEQxCpKMLU/LhDAEU6HPyJow= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/7] arm/trusted-firmware-a: Update LTS to 2.14.2 Date: Thu, 18 Jun 2026 08:59:14 -0400 Message-ID: <20260618125918.62619-3-jon.mason@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260618125918.62619-1-jon.mason@arm.com> References: <20260618125918.62619-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Jun 2026 12:59:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7087 Signed-off-by: Jon Mason --- .../{fiptool-native_2.14.1.bb => fiptool-native_2.14.2.bb} | 4 ++-- ...sted-firmware-a_2.14.1.bb => trusted-firmware-a_2.14.2.bb} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta-arm/recipes-bsp/trusted-firmware-a/{fiptool-native_2.14.1.bb => fiptool-native_2.14.2.bb} (92%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.14.1.bb => trusted-firmware-a_2.14.2.bb} (96%) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.2.bb similarity index 92% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.1.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.2.bb index d70304aa1299..b6d302d47354 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.1.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.14.2.bb @@ -9,8 +9,8 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-fir SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" -# Use fiptool from TF-A v2.14.1 -SRCREV = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569" +# Use fiptool from TF-A v2.14.2 +SRCREV = "aa1793fff49a1b5a6a877c278a0df0a188e2b1f2" SRCBRANCH = "lts-v2.14" DEPENDS += "openssl-native" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.2.bb similarity index 96% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.2.bb index de29941b2c8d..3d0b80188e9b 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.1.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.14.2.bb @@ -1,8 +1,8 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A v2.14.1 +# TF-A v2.14.2 SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" -SRCREV_tfa = "e82c7ced9e76aea35b176e608d67dfe5ebe1c569" +SRCREV_tfa = "aa1793fff49a1b5a6a877c278a0df0a188e2b1f2" SRCBRANCH = "lts-v2.14" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" From patchwork Thu Jun 18 12:59:15 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 90427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43869CD98FA for ; Thu, 18 Jun 2026 12:59:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.18999.1781787561741591774 for ; Thu, 18 Jun 2026 05:59:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=vGndmG2P; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 99877293B for ; Thu, 18 Jun 2026 05:59:16 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1BED93F915 for ; Thu, 18 Jun 2026 05:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781787561; bh=qV0BSyA7f1A/XAzwVttTxH6pl+VS2AdiiXzd8v1ESLQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=vGndmG2PTM1/uCUq7IRDJ56aqpnJDA2O8E3NhbuAsW3G+10YJNTFAHtsGx5gdG1kg vQ4rPraROQGxP6WpZx4vy80sRuf1K5sRtrRg0WUG62HKrfJuYy5Gj/XHBEN9OrWBLa u2DFE58D8NwkqLS289SQz2p/2mHX1uN5VaOphgKg= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/7] arm/trusted-firmware-a: Update git recipe to the latest commit Date: Thu, 18 Jun 2026 08:59:15 -0400 Message-ID: <20260618125918.62619-4-jon.mason@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260618125918.62619-1-jon.mason@arm.com> References: <20260618125918.62619-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Jun 2026 12:59:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7088 Signed-off-by: Jon Mason --- .../trusted-firmware-a/trusted-firmware-a_git.bb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb index 6d7f7c3e428a..517ca34aa418 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb @@ -1,17 +1,12 @@ require recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc -# TF-A master, tag: v2.14 -SRCREV_tfa = "1d5aa939bc8d3d892e2ed9945fa50e36a1a924cc" -SRCBRANCH = "master" +# TF-A integration branch, current commit +SRC_URI_TRUSTED_FIRMWARE_A = "gitsm://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" +SRCREV_tfa = "abead3308de3eb2d89a5ce3fe264ea829f87648c" +SRCBRANCH = "integration" LIC_FILES_CHKSUM += "file://docs/license.rst;md5=6ed7bace7b0bc63021c6eba7b524039e" -# in TF-A src, docs/getting_started/prerequisites.rst lists the expected version mbedtls -# mbedtls-3.6.5 -SRCBRANCH_MBEDTLS = "mbedtls-3.6" -SRC_URI_MBEDTLS = "gitsm://github.com/Mbed-TLS/mbedtls;name=mbedtls;protocol=https;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/mbedtls;branch=${SRCBRANCH_MBEDTLS}" -SRCREV_mbedtls = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df" - LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" # Not a release recipe, try our hardest to not pull this in implicitly From patchwork Thu Jun 18 12:59:16 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 90431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E0CDCD98FB for ; Thu, 18 Jun 2026 12:59:29 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.18999.1781787561741591774 for ; Thu, 18 Jun 2026 05:59:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@arm.com header.s=foss header.b=i+BPQ3nq; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 14EF22936 for ; Thu, 18 Jun 2026 05:59:17 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9B0EE3F915 for ; Thu, 18 Jun 2026 05:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781787561; bh=Xiv7QUQGUorOlYL2XBWpgd2tJztHtV8gzW4/CS6hicg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=i+BPQ3nqd0SXVETqcb7kD8tYjDhQyEQp1w9b+VnDjPsM8go6vPDt4A4ESw8L081ec RQz6riiR0gvqPHSuw8GlnOlv6/yDmlTnm7VmWFm0OjEx7YJCN7g6IlHfKNapnv5Cyq 6HjEfcFFeH/ffpsF0brSrNzaPmnbxhfceK+84uiI= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 5/7] arm/uefi: update edk2-firmware to 202605 Date: Thu, 18 Jun 2026 08:59:16 -0400 Message-ID: <20260618125918.62619-5-jon.mason@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260618125918.62619-1-jon.mason@arm.com> References: <20260618125918.62619-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Jun 2026 12:59:29 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7089 Update edk2-firmware to the latest release. Of note, GCC5 make variable has been removed. Use the GCC make variable instead. Also, these changes caused the need to modify the sbsa-acs patches. Signed-off-by: Jon Mason --- ...602.bb => edk2-basetools-native_202605.bb} | 2 +- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 6 +-- .../recipes-bsp/uefi/edk2-firmware_202602.bb | 6 --- .../recipes-bsp/uefi/edk2-firmware_202605.bb | 4 ++ ...-C-VfrCompile-Fix-parallel-make-fail.patch | 46 ------------------- ...02-Enforce-using-good-old-BFD-linker.patch | 22 ++++----- meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb | 2 +- 7 files changed, 20 insertions(+), 68 deletions(-) rename meta-arm/recipes-bsp/uefi/{edk2-basetools-native_202602.bb => edk2-basetools-native_202605.bb} (97%) delete mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb create mode 100644 meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb delete mode 100644 meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch diff --git a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202602.bb b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb similarity index 97% rename from meta-arm/recipes-bsp/uefi/edk2-basetools-native_202602.bb rename to meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb index 28bd0dbade71..e10b85cbcb84 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202602.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-basetools-native_202605.bb @@ -17,7 +17,7 @@ SRC_URI = " \ " LIC_FILES_CHKSUM = "file://License.txt;md5=2b415520383f7964e96700ae12b4570a" -SRCREV = "b7a715f7c03c45c6b4575bf88596bfd79658b8ce" +SRCREV = "b03a21a63e3bd001f52c527e5a57feddb53a690b" SRCREV_brotli = "e230f474b87134e8c6c85b630084c612057f253e" SRCREV_FORMAT = "default_brotli" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index 8b6f153a836c..e12a490fa018 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -74,9 +74,9 @@ export CONF_PATH = "${S}/Conf" export BTOOLS_PATH = "${EDK_TOOLS_PATH}/BinWrappers/PosixLike" -EDK_COMPILER ?= "GCC5" -export GCC5_AARCH64_PREFIX = "${TARGET_PREFIX}" -export GCC5_ARM_PREFIX = "${TARGET_PREFIX}" +EDK_COMPILER ?= "GCC" +export GCC_AARCH64_PREFIX = "${TARGET_PREFIX}" +export GCC_ARM_PREFIX = "${TARGET_PREFIX}" EDK_COMPILER:toolchain-clang = "CLANGDWARF" export CLANG38_AARCH64_PREFIX = "${TARGET_PREFIX}" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb deleted file mode 100644 index de739f37b12b..000000000000 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202602.bb +++ /dev/null @@ -1,6 +0,0 @@ -require recipes-bsp/uefi/edk2-firmware.inc - -SRCREV_edk2 ?= "b7a715f7c03c45c6b4575bf88596bfd79658b8ce" -SRCREV_edk2-platforms ?= "75024f5aa54cf4d975d024768604b28c754db338" - -SRC_URI += "file://0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb new file mode 100644 index 000000000000..8f1afe133a4e --- /dev/null +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202605.bb @@ -0,0 +1,4 @@ +require recipes-bsp/uefi/edk2-firmware.inc + +SRCREV_edk2 ?= "b03a21a63e3bd001f52c527e5a57feddb53a690b" +SRCREV_edk2-platforms ?= "04470160f67192c53ec9192e0e8460d183fe49ec" diff --git a/meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch b/meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch deleted file mode 100644 index 7e7353fbb73c..000000000000 --- a/meta-arm/recipes-bsp/uefi/files/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5f8c99d9a7fe88301b01a7015375a827eecc7985 Mon Sep 17 00:00:00 2001 -From: Michael D Kinney -Date: Thu, 26 Feb 2026 11:48:11 -0500 -Subject: [PATCH] BaseTools/Source/C/VfrCompile: Fix parallel make failures - -Update makefile rules to run antlr and dlg to completion -before compiling any of the generated cpp files. - -Without this change, parallel make may start compiling some -of the cpp files before both antlr and dlg have finished -which produces syntax errors from compilation with partially -generated files. - -Also use &: so the targets are treated as a group and the -rule is only executed once for the entire group. Without -this change, parallel make may run the rule actions more -than once and modify the output while it is being used by -another rule. - -Signed-off-by: Michael D Kinney - -Upstream-Status: Backport [2f75effb93999adadeead511dd76f86833649b45] -Signed-off-by: Jon Mason ---- - BaseTools/Source/C/VfrCompile/GNUmakefile | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile -index b469bd3f303f..4f10b1d9338b 100644 ---- a/BaseTools/Source/C/VfrCompile/GNUmakefile -+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile -@@ -54,10 +54,11 @@ VfrCompiler.o: ../Include/Common/BuildVersion.h - - include $(MAKEROOT)/Makefiles/footer.makefile - --VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: Pccts/antlr/antlr VfrSyntax.g -- Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g -+ANTLR_GEN = VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h -+DLG_GEN = VfrLexer.cpp VfrLexer.h - --VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg -+$(ANTLR_GEN) $(DLG_GEN) &: Pccts/antlr/antlr Pccts/dlg/dlg VfrSyntax.g -+ Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g - Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg - - Pccts/antlr/antlr: diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch index 42523d0e9a1c..7c02100d7218 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs/0002-Enforce-using-good-old-BFD-linker.patch @@ -1,4 +1,4 @@ -From af134611c744322e1d159794c426fbdd02e151cc Mon Sep 17 00:00:00 2001 +From 8509abdab8ad75d59d6bc2478bba78b50c59ad82 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 7 Apr 2021 00:16:07 -0400 Subject: [PATCH] Enforce using good old BFD linker @@ -25,15 +25,15 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 90a389bdff07..93f7b5cde437 100755 +index eca4cb82d059..ec4e30f3df84 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -839,7 +839,7 @@ DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mabi=lp64d -fno-asyn - DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global - DEFINE GCC_AARCH64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only - DEFINE GCC_RISCV64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only --DEFINE GCC_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds -+DEFINE GCC_DLINK2_FLAGS_COMMON = -fuse-ld=bfd -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds - DEFINE GCC_LOONGARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map - DEFINE GCC_AARCH64_DLINK_FLAGS = -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map -z common-page-size=0x20 - DEFINE GCC_LOONGARCH64_DLINK_FLAGS = DEF(GCC_LOONGARCH64_DLINK_COMMON) -z common-page-size=0x20 +@@ -931,7 +931,7 @@ DEFINE GCC_LOONGARCH64_CC_FLAGS = DEF(GCC_ALL_CC_COMMON) -mabi=lp64d -fno + DEFINE GCC_AARCH64_CC_COMMON = DEF(GCC_ALL_CC_COMMON) -mlittle-endian -fno-short-enums -fverbose-asm -funsigned-char -ffunction-sections -fdata-sections -Wno-address -fno-asynchronous-unwind-tables -fno-unwind-tables -fno-pic -fno-pie -ffixed-x18 -mstack-protector-guard=global + DEFINE GCC_AARCH64_CC_XIPCOMMON = -mstrict-align -mgeneral-regs-only + DEFINE GCC_RISCV64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only +-DEFINE GCC_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds ++DEFINE GCC_DLINK2_FLAGS_COMMON = -fuse-ld=bfd -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds + DEFINE GCC_AARCH64_DLINK_COMMON = -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map + DEFINE GCC_LOONGARCH64_DLINK_COMMON = -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map -z common-page-size=0x20 + DEFINE GCC_AARCH64_ASLDLINK_COMMON = DEF(GCC_AARCH64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u $(IMAGE_ENTRY_POINT) -Wl,--defsym=PECOFF_HEADER_SIZE=0 DEF(GCC_DLINK2_FLAGS_COMMON) -z common-page-size=0x20 diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb index bc8187ebeb10..6d4422f99a99 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_7.2.2.bb @@ -1,4 +1,4 @@ -require recipes-bsp/uefi/edk2-firmware_202602.bb +require recipes-bsp/uefi/edk2-firmware_202605.bb PROVIDES:remove = "virtual/bootloader" LICENSE += "& Apache-2.0" From patchwork Thu Jun 18 12:59:17 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 90429 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBDB0CD98F7 for ; Thu, 18 Jun 2026 12:59:28 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.18999.1781787561741591774 for ; Thu, 18 Jun 2026 05:59:22 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=gPSABzGT; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 893D6293B for ; Thu, 18 Jun 2026 05:59:17 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 11A423F915 for ; Thu, 18 Jun 2026 05:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781787562; bh=Rus51KJ0MYnVzGV2BC9VVunfmRVkFrUd9H971ZqJl58=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gPSABzGT8RrMoM9BKRQOwVQgRy7oOmvFOdYCTz77jawpDDnr4LupIXBfSI+cWZf4L sFWmKhSGvf0vDIxaE++cTJSubFwcIMJ5W0Ve9r3M8AsmNNQ56JYHLJgli359B3tgNN NWr4lC6Bs8/REvkj3zRrmhd5zdBa1uB590AtiAWo= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 6/7] arm/opencsd: upgrade to v1.8.2 Date: Thu, 18 Jun 2026 08:59:17 -0400 Message-ID: <20260618125918.62619-6-jon.mason@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260618125918.62619-1-jon.mason@arm.com> References: <20260618125918.62619-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Jun 2026 12:59:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7090 Signed-off-by: Jon Mason --- .../opencsd/{opencsd_1.7.1.bb => opencsd_1.8.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-arm/recipes-devtools/opencsd/{opencsd_1.7.1.bb => opencsd_1.8.2.bb} (95%) diff --git a/meta-arm/recipes-devtools/opencsd/opencsd_1.7.1.bb b/meta-arm/recipes-devtools/opencsd/opencsd_1.8.2.bb similarity index 95% rename from meta-arm/recipes-devtools/opencsd/opencsd_1.7.1.bb rename to meta-arm/recipes-devtools/opencsd/opencsd_1.8.2.bb index f8429dbbadc9..0a0c7cd62ebf 100644 --- a/meta-arm/recipes-devtools/opencsd/opencsd_1.7.1.bb +++ b/meta-arm/recipes-devtools/opencsd/opencsd_1.8.2.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=ad8cb685eb324d2fa2530b985a43f3e5" SRC_URI = "git://github.com/Linaro/OpenCSD;protocol=https;branch=master" -SRCREV = "83e4575459305c054ce43f7d5eb5e468e304645c" +SRCREV = "9b462f77a4e1c6ab363fafe8f1f5d7374f5782b5" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" From patchwork Thu Jun 18 12:59:18 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 90425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA09FCD98F3 for ; Thu, 18 Jun 2026 12:59:28 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.19001.1781787563199463868 for ; Thu, 18 Jun 2026 05:59:23 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=pxcWnwkU; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 27D082936 for ; Thu, 18 Jun 2026 05:59:18 -0700 (PDT) Received: from H24V3P4C17.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 576DF3F915 for ; Thu, 18 Jun 2026 05:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1781787562; bh=+583qO433SsCrIYLN9H2wZltokqrJ+vED87BMrKEY0w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=pxcWnwkUVHVnS3xEF+KMmFFG6AmDxEJ8z4jiccYu/28Qu9gTBbvs4FijBU33QUMD8 BjHh7QCIofrHslZc3GZYdvL4Qem8vQYurdE7glZWNdJ1V/2resAg2Y0TZ6Yo8G+uBx nioNbr8nmpN0V9Emp/wsUL1VrEfbNxp70vkaamjk= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 7/7] arm/optee: update to 4.10.0 Date: Thu, 18 Jun 2026 08:59:18 -0400 Message-ID: <20260618125918.62619-7-jon.mason@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260618125918.62619-1-jon.mason@arm.com> References: <20260618125918.62619-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 18 Jun 2026 12:59:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7091 Update the recipes to 4.10.0 and update the git recipes to 4.10.0 Since corstone1000 is still using 4.9.0, move that to meta-arm-bsp Signed-off-by: Jon Mason --- .../optee/optee-client_4.9.0.bb | 0 .../optee/optee-examples_4.9.0.bb | 0 .../optee/optee-os-tadevkit_4.9.0.bb | 0 .../recipes-security/optee/optee-os_4.9.0.bb | 0 .../optee/optee-test_4.9.0.bb | 0 .../optee/optee-client_4.10.0.bb | 4 +++ .../optee/optee-client_git.bb | 2 +- .../optee/optee-examples_4.10.0.bb | 4 +++ .../optee/optee-examples_git.bb | 4 +-- .../optee/optee-os-tadevkit_4.10.0.bb | 30 +++++++++++++++++++ .../recipes-security/optee/optee-os_4.10.0.bb | 6 ++++ .../recipes-security/optee/optee-os_git.bb | 4 +-- .../optee/optee-test_4.10.0.bb | 17 +++++++++++ .../recipes-security/optee/optee-test_git.bb | 4 +-- 14 files changed, 68 insertions(+), 7 deletions(-) rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-client_4.9.0.bb (100%) rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-examples_4.9.0.bb (100%) rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os-tadevkit_4.9.0.bb (100%) rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-os_4.9.0.bb (100%) rename {meta-arm => meta-arm-bsp}/recipes-security/optee/optee-test_4.9.0.bb (100%) create mode 100644 meta-arm/recipes-security/optee/optee-client_4.10.0.bb create mode 100644 meta-arm/recipes-security/optee/optee-examples_4.10.0.bb create mode 100644 meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb create mode 100644 meta-arm/recipes-security/optee/optee-os_4.10.0.bb create mode 100644 meta-arm/recipes-security/optee/optee-test_4.10.0.bb diff --git a/meta-arm/recipes-security/optee/optee-client_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-client_4.9.0.bb similarity index 100% rename from meta-arm/recipes-security/optee/optee-client_4.9.0.bb rename to meta-arm-bsp/recipes-security/optee/optee-client_4.9.0.bb diff --git a/meta-arm/recipes-security/optee/optee-examples_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-examples_4.9.0.bb similarity index 100% rename from meta-arm/recipes-security/optee/optee-examples_4.9.0.bb rename to meta-arm-bsp/recipes-security/optee/optee-examples_4.9.0.bb diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.9.0.bb similarity index 100% rename from meta-arm/recipes-security/optee/optee-os-tadevkit_4.9.0.bb rename to meta-arm-bsp/recipes-security/optee/optee-os-tadevkit_4.9.0.bb diff --git a/meta-arm/recipes-security/optee/optee-os_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-os_4.9.0.bb similarity index 100% rename from meta-arm/recipes-security/optee/optee-os_4.9.0.bb rename to meta-arm-bsp/recipes-security/optee/optee-os_4.9.0.bb diff --git a/meta-arm/recipes-security/optee/optee-test_4.9.0.bb b/meta-arm-bsp/recipes-security/optee/optee-test_4.9.0.bb similarity index 100% rename from meta-arm/recipes-security/optee/optee-test_4.9.0.bb rename to meta-arm-bsp/recipes-security/optee/optee-test_4.9.0.bb diff --git a/meta-arm/recipes-security/optee/optee-client_4.10.0.bb b/meta-arm/recipes-security/optee/optee-client_4.10.0.bb new file mode 100644 index 000000000000..8897529ed004 --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-client_4.10.0.bb @@ -0,0 +1,4 @@ +require recipes-security/optee/optee-client.inc + +# 4.9.0 and 4.10.0 share the same tag +SRCREV = "9f5e90918093c1d1cd264d8149081b64ab7ba672" diff --git a/meta-arm/recipes-security/optee/optee-client_git.bb b/meta-arm/recipes-security/optee/optee-client_git.bb index 24e2d1941299..884f3b5934c5 100644 --- a/meta-arm/recipes-security/optee/optee-client_git.bb +++ b/meta-arm/recipes-security/optee/optee-client_git.bb @@ -1,6 +1,6 @@ require recipes-security/optee/optee-client.inc -# v4.9.0 +# v4.10.0 SRCREV = "9f5e90918093c1d1cd264d8149081b64ab7ba672" PV .= "+git" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-arm/recipes-security/optee/optee-examples_4.10.0.bb b/meta-arm/recipes-security/optee/optee-examples_4.10.0.bb new file mode 100644 index 000000000000..15fddb79206d --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-examples_4.10.0.bb @@ -0,0 +1,4 @@ +require recipes-security/optee/optee-examples.inc + +# v4.10.0 +SRCREV = "934c7edb74a26e90f68024cf441073528444177f" diff --git a/meta-arm/recipes-security/optee/optee-examples_git.bb b/meta-arm/recipes-security/optee/optee-examples_git.bb index 4fda635b72eb..d8d6d04308f1 100644 --- a/meta-arm/recipes-security/optee/optee-examples_git.bb +++ b/meta-arm/recipes-security/optee/optee-examples_git.bb @@ -1,7 +1,7 @@ require recipes-security/optee/optee-examples.inc -# v4.8.0 -SRCREV = "3ef17eb1f309def91113637f95f67613b1d89119" +# v4.10.0 +SRCREV = "934c7edb74a26e90f68024cf441073528444177f" PV .= "+git" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb new file mode 100644 index 000000000000..cca9f62abccf --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.10.0.bb @@ -0,0 +1,30 @@ +require recipes-security/optee/optee-os_${PV}.bb + +SUMMARY = "OP-TEE Trusted OS TA devkit" +DESCRIPTION = "OP-TEE TA devkit for build TAs" +HOMEPAGE = "https://www.op-tee.org/" + +DEPENDS += "python3-pycryptodome-native" +DEPENDS:append:toolchain-clang = " lld-native" + +do_install() { + #install TA devkit + install -d ${D}${includedir}/optee/export-user_ta/ + for f in ${B}/export-ta_${OPTEE_ARCH}/* ; do + cp -aR $f ${D}${includedir}/optee/export-user_ta/ + done +} + +do_deploy() { + echo "Do not inherit do_deploy from optee-os." +} + +FILES:${PN} = "${includedir}/optee/" + +# Build paths are currently embedded +INSANE_SKIP:${PN}-dev += "buildpaths" + +# Include extra headers needed by SPMC tests to TA DEVKIT. +# Supported after op-tee v3.20 +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \ + ' CFG_SPMC_TESTS=y', '' , d)}" diff --git a/meta-arm/recipes-security/optee/optee-os_4.10.0.bb b/meta-arm/recipes-security/optee/optee-os_4.10.0.bb new file mode 100644 index 000000000000..b4c6cccaa210 --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-os_4.10.0.bb @@ -0,0 +1,6 @@ +require recipes-security/optee/optee-os.inc + +DEPENDS += "dtc-native" + +# 4.10.0 +SRCREV = "753afbbee1682f5d16fd30e87b31058a4fd4f4b8" diff --git a/meta-arm/recipes-security/optee/optee-os_git.bb b/meta-arm/recipes-security/optee/optee-os_git.bb index 03b0f1cc74fd..f2ae0d46d4dd 100644 --- a/meta-arm/recipes-security/optee/optee-os_git.bb +++ b/meta-arm/recipes-security/optee/optee-os_git.bb @@ -2,8 +2,8 @@ require recipes-security/optee/optee-os.inc DEPENDS += "dtc-native" -# v4.8.0 -SRCREV = "86660925433a8d4d1b19cfa5fe940081d77b34b4" +# v4.10.0 +SRCREV = "753afbbee1682f5d16fd30e87b31058a4fd4f4b8" PV .= "+git" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-arm/recipes-security/optee/optee-test_4.10.0.bb b/meta-arm/recipes-security/optee/optee-test_4.10.0.bb new file mode 100644 index 000000000000..f392a43e475c --- /dev/null +++ b/meta-arm/recipes-security/optee/optee-test_4.10.0.bb @@ -0,0 +1,17 @@ +require recipes-security/optee/optee-test.inc + +# v4.10.0 +SRCREV = "88c93e87a5c172363ee986ded036a25cafcc9d2c" + +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a8fa504109e4cd7ea575bc49ea4be560 \ + file://LICENSE-BSD;md5=dca16d6efa93b55d0fd662ae5cd6feeb \ + file://LICENSE-GPL;md5=10e86b5d2a6cb0e2b9dcfdd26a9ac58d \ + " + +# Include ffa_spmc test group if the SPMC test is enabled. +# Supported after op-tee v3.20 +EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \ + ' CFG_SPMC_TESTS=y CFG_SECURE_PARTITION=y', '' , d)}" + +RDEPENDS:${PN} += "${@bb.utils.contains('MACHINE_FEATURES', 'optee-spmc-test', \ + ' arm-ffa-user', '' , d)}" diff --git a/meta-arm/recipes-security/optee/optee-test_git.bb b/meta-arm/recipes-security/optee/optee-test_git.bb index 1d4ee44ea77d..a06c76c159e1 100644 --- a/meta-arm/recipes-security/optee/optee-test_git.bb +++ b/meta-arm/recipes-security/optee/optee-test_git.bb @@ -1,7 +1,7 @@ require recipes-security/optee/optee-test.inc -# v4.8.0 -SRCREV = "6569cd7b13e1b37b37069e090d592adca7d3926d" +# v4.10.0 +SRCREV = "88c93e87a5c172363ee986ded036a25cafcc9d2c" PV .= "+git" UPSTREAM_CHECK_COMMITS = "1"