From patchwork Fri Jan 10 15:26:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 55337 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 88EB6E7719D for ; Fri, 10 Jan 2025 15:26:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.21251.1736522797176952726 for ; Fri, 10 Jan 2025 07:26:37 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 000221477 for ; Fri, 10 Jan 2025 07:27:04 -0800 (PST) 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 902043F59E for ; Fri, 10 Jan 2025 07:26:36 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/3] arm/trusted-firmware-a: update 2.10 LTS to the latest versions Date: Fri, 10 Jan 2025 10:26:33 -0500 Message-Id: <20250110152635.99735-1-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Jan 2025 15:26:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6313 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. Signed-off-by: Jon Mason --- ...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%) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.4.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb similarity index 92% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.4.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb index 9072dca50a50..a6ebea976d1c 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.4.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.9.bb @@ -9,8 +9,8 @@ SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmwa SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" -# Use fiptool from TF-A v2.10.4 -SRCREV = "569e16caad976a0684147da1ecc6333fd9b7f813" +# Use fiptool from TF-A v2.10.9 +SRCREV = "7e63213601425c7a6d83e47dc936b264deb9df2b" SRCBRANCH = "lts-v2.10" DEPENDS += "openssl-native" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb similarity index 90% rename from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.0.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb index fffdf5d3653d..645e8d86a8a6 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.3.bb @@ -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" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.4.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.9.bb similarity index 74% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.4.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.9.bb index 8cdfda443cde..aab78477f484 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.4.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.9.bb @@ -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" From patchwork Fri Jan 10 15:26:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 55336 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 87DACE77188 for ; Fri, 10 Jan 2025 15:26:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.21210.1736522797324390526 for ; Fri, 10 Jan 2025 07:26:37 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 3EC921E32; Fri, 10 Jan 2025 07:27:05 -0800 (PST) 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 C60783F59E; Fri, 10 Jan 2025 07:26:36 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Quentin Schulz Subject: [PATCH 2/3] arm/trusted-firmware-a: add support for 2.12.0 Date: Fri, 10 Jan 2025 10:26:34 -0500 Message-Id: <20250110152635.99735-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250110152635.99735-1-jon.mason@arm.com> References: <20250110152635.99735-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Jan 2025 15:26:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6314 From: Quentin Schulz 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. Signed-off-by: Quentin Schulz Signed-off-by: Jon Mason --- 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 diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf index 03896a347184..b69995256008 100644 --- a/meta-arm-bsp/conf/machine/fvp-base.conf +++ b/meta-arm-bsp/conf/machine/fvp-base.conf @@ -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}" diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf index 3c2c94b6dcbf..e905c4293792 100644 --- a/meta-arm-bsp/conf/machine/sgi575.conf +++ b/meta-arm-bsp/conf/machine/sgi575.conf @@ -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" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb new file mode 100644 index 000000000000..ceaac263fc75 --- /dev/null +++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.12.0.bb @@ -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 \ +" From patchwork Fri Jan 10 15:26:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 55335 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 87DF1E7719C for ; Fri, 10 Jan 2025 15:26:40 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.21252.1736522797638017849 for ; Fri, 10 Jan 2025 07:26:37 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 7354C1F91 for ; Fri, 10 Jan 2025 07:27:05 -0800 (PST) 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 102983F59E for ; Fri, 10 Jan 2025 07:26:37 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/3] arm/trusted-firmware-a: bump fip and tests to 2.12 Date: Fri, 10 Jan 2025 10:26:35 -0500 Message-Id: <20250110152635.99735-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250110152635.99735-1-jon.mason@arm.com> References: <20250110152635.99735-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Jan 2025 15:26:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6315 Bump 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). Signed-off-by: Jon Mason --- .../{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%) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.0.bb similarity index 85% rename from meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.0.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.0.bb index 47e783a892c8..e7fbb8b499ef 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.11.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.0.bb @@ -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" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.11.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb similarity index 96% rename from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.11.0.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb index 02f03f3b00cf..c3f0c7fa4c2c 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.11.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.0.bb @@ -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"