From patchwork Tue Aug 5 17:18:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 68105 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 4D605C87FDA for ; Tue, 5 Aug 2025 17:19:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.5102.1754414348847354631 for ; Tue, 05 Aug 2025 10:19:08 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 D5C3E150C for ; Tue, 5 Aug 2025 10:18:59 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 82A3B3F673 for ; Tue, 5 Aug 2025 10:19:07 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/6] arm/hafnium: mark compatible with just qemuarm64-secureboot Date: Tue, 5 Aug 2025 18:18:58 +0100 Message-ID: <20250805171903.277422-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 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 ; Tue, 05 Aug 2025 17:19:16 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6656 Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb index 42a02259b2..6987d520cf 100644 --- a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb +++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb @@ -20,14 +20,14 @@ SRCREV = "2cf2ca7c4b81ab18e9cd363d9a5c8288e2a94fda" B = "${WORKDIR}/build" COMPATIBLE_MACHINE ?= "invalid" -COMPATIBLE_MACHINE:qemuarm64 = "qemuarm64" +COMPATIBLE_MACHINE:qemuarm64-secureboot = "qemuarm64" # Default build 'reference' HAFNIUM_PROJECT ?= "reference" # Platform must be set for each machine HAFNIUM_PLATFORM ?= "invalid" -HAFNIUM_PLATFORM:qemuarm64 = "secure_qemu_aarch64" +HAFNIUM_PLATFORM:qemuarm64-secureboot = "secure_qemu_aarch64" # do_deploy will install everything listed in this variable. It is set by # default to hafnium From patchwork Tue Aug 5 17:18:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 68102 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 4BF0AC87FCB for ; Tue, 5 Aug 2025 17:19:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4931.1754414349082950983 for ; Tue, 05 Aug 2025 10:19:09 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 888BE2BC2 for ; Tue, 5 Aug 2025 10:19:00 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 333133F673 for ; Tue, 5 Aug 2025 10:19:08 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/6] arm/hafnium: depend on lld-native Date: Tue, 5 Aug 2025 18:18:59 +0100 Message-ID: <20250805171903.277422-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250805171903.277422-1-ross.burton@arm.com> References: <20250805171903.277422-1-ross.burton@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 ; Tue, 05 Aug 2025 17:19:16 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6657 The build explicitly uses lld, so now that it has been split out of the clang recipe we need to also depend on that. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb index 6987d520cf..c67bca57e9 100644 --- a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb +++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Hafnium" DESCRIPTION = "A reference Secure Partition Manager (SPM) for systems that implement the Armv8.4-A Secure-EL2 extension" -DEPENDS = "gn-native ninja-native bison-native bc-native dtc-native openssl-native clang-native" +DEPENDS = "gn-native ninja-native bison-native bc-native dtc-native openssl-native clang-native lld-native" LICENSE = "BSD-3-Clause & GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=782b40c14bad5294672c500501edc103" From patchwork Tue Aug 5 17:19:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 68101 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 48AEBC87FD1 for ; Tue, 5 Aug 2025 17:19:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4934.1754414349695046681 for ; Tue, 05 Aug 2025 10:19:09 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 37CD9150C for ; Tue, 5 Aug 2025 10:19:01 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 D81DB3F673 for ; Tue, 5 Aug 2025 10:19:08 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/6] arm/hafnium: clean up inherits Date: Tue, 5 Aug 2025 18:19:00 +0100 Message-ID: <20250805171903.277422-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250805171903.277422-1-ross.burton@arm.com> References: <20250805171903.277422-1-ross.burton@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 ; Tue, 05 Aug 2025 17:19:16 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6658 This doesn't use pkgconfig, or python3native, or need to inherit clang. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb index c67bca57e9..602f36b33d 100644 --- a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb +++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb @@ -7,10 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=782b40c14bad5294672c500501edc103" PACKAGE_ARCH = "${MACHINE_ARCH}" -CLANGNATIVE = "" -CLANGNATIVE:runtime-llvm = "clang-native" - -inherit deploy python3native pkgconfig ${CLANGNATIVE} +inherit deploy SRC_URI = "gitsm://git.trustedfirmware.org/hafnium/hafnium.git;protocol=https;branch=master \ file://0001-arm-hafnium-fix-kernel-tool-linking.patch \ From patchwork Tue Aug 5 17:19:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 68103 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 58F0FCA0EC0 for ; Tue, 5 Aug 2025 17:19:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.5103.1754414350388877243 for ; Tue, 05 Aug 2025 10:19:10 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 DB485150C for ; Tue, 5 Aug 2025 10:19:01 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 8916E3F673 for ; Tue, 5 Aug 2025 10:19:09 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/6] arm/hafnium: don't exclude from world builds Date: Tue, 5 Aug 2025 18:19:01 +0100 Message-ID: <20250805171903.277422-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250805171903.277422-1-ross.burton@arm.com> References: <20250805171903.277422-1-ross.burton@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 ; Tue, 05 Aug 2025 17:19:16 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6659 Clang is large but this recipe builds on all hosts now, so we don't need to exclude it. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb index 602f36b33d..64247e5a28 100644 --- a/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb +++ b/meta-arm/recipes-bsp/hafnium/hafnium_2.12.0.bb @@ -66,5 +66,3 @@ do_deploy() { cp -rf ${D}/firmware/* ${DEPLOYDIR}/ } addtask deploy after do_install - -EXCLUDE_FROM_WORLD = "1" From patchwork Tue Aug 5 17:19:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 68104 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 6347CCA0EC1 for ; Tue, 5 Aug 2025 17:19:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4935.1754414351018231683 for ; Tue, 05 Aug 2025 10:19:11 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 84B68150C for ; Tue, 5 Aug 2025 10:19:02 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 3A00A3F673 for ; Tue, 5 Aug 2025 10:19:10 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 5/6] arm/optee: the build uses lld if using clang Date: Tue, 5 Aug 2025 18:19:02 +0100 Message-ID: <20250805171903.277422-5-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250805171903.277422-1-ross.burton@arm.com> References: <20250805171903.277422-1-ross.burton@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 ; Tue, 05 Aug 2025 17:19:16 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6660 The OP-TEE suite of packages use lld if the compiler is clang, so now that the lld recipe has been split out of the clang recipe we need to depend on both. Signed-off-by: Ross Burton --- meta-arm/recipes-security/optee/optee-os-tadevkit_4.6.0.bb | 1 + meta-arm/recipes-security/optee/optee-os.inc | 2 +- meta-arm/recipes-security/optee/optee-test.inc | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.6.0.bb b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.6.0.bb index 961d525179..cca9f62abc 100644 --- a/meta-arm/recipes-security/optee/optee-os-tadevkit_4.6.0.bb +++ b/meta-arm/recipes-security/optee/optee-os-tadevkit_4.6.0.bb @@ -5,6 +5,7 @@ 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 diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index cf50dabed3..973a421666 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -12,7 +12,7 @@ CVE_PRODUCT = "linaro:op-tee op-tee:op-tee_os" DEPENDS = "python3-pyelftools-native python3-cryptography-native" -DEPENDS:append:toolchain-clang = " compiler-rt" +DEPENDS:append:toolchain-clang = " lld-native compiler-rt" SRC_URI = "git://github.com/OP-TEE/optee_os.git;branch=master;protocol=https" diff --git a/meta-arm/recipes-security/optee/optee-test.inc b/meta-arm/recipes-security/optee/optee-test.inc index 6f81f0de6d..397515f9c4 100644 --- a/meta-arm/recipes-security/optee/optee-test.inc +++ b/meta-arm/recipes-security/optee/optee-test.inc @@ -9,6 +9,7 @@ inherit deploy require optee.inc DEPENDS = "optee-client optee-os-tadevkit python3-cryptography-native openssl" +DEPENDS:append:toolchain-clang = " lld-native" SRC_URI = "git://github.com/OP-TEE/optee_test.git;branch=master;protocol=https \ file://run-ptest \ From patchwork Tue Aug 5 17:19:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 68106 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 637B6CA0EC2 for ; Tue, 5 Aug 2025 17:19:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.4936.1754414351666591173 for ; Tue, 05 Aug 2025 10:19:11 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 34278150C for ; Tue, 5 Aug 2025 10:19:03 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.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 D5F5F3F673 for ; Tue, 5 Aug 2025 10:19:10 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 6/6] arm/optee-so: fix typo in EXTRA_OEMAKE Date: Tue, 5 Aug 2025 18:19:03 +0100 Message-ID: <20250805171903.277422-6-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250805171903.277422-1-ross.burton@arm.com> References: <20250805171903.277422-1-ross.burton@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 ; Tue, 05 Aug 2025 17:19:16 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6661 This recipe was using EXTREA_OEMAKE to enable BTI, fix the typo. Signed-off-by: Ross Burton --- meta-arm/recipes-security/optee/optee-os.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index 973a421666..68bb1226b2 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -31,7 +31,7 @@ EXTRA_OEMAKE += " HOST_PREFIX=${HOST_PREFIX}" EXTRA_OEMAKE += " CROSS_COMPILE64=${HOST_PREFIX}" # Enable BTI in optee -EXTREA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_CORE_BTI=1 CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}" +EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_CORE_BTI=1 CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}" LDFLAGS[unexport] = "1" CPPFLAGS[unexport] = "1"