From patchwork Fri Aug 22 13:20:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 69050 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 B442CCA0EEB for ; Fri, 22 Aug 2025 13:20:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9998.1755868812305679507 for ; Fri, 22 Aug 2025 06:20:12 -0700 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 AE8741A32 for ; Fri, 22 Aug 2025 06:20:03 -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 CC3EB3F63F for ; Fri, 22 Aug 2025 06:20:11 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/3] arm/arch-armv9*: Fix PACKAGE_EXTRA_ARCHS reference Date: Fri, 22 Aug 2025 09:20:09 -0400 Message-Id: <20250822132011.93796-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, 22 Aug 2025 13:20:14 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6680 PACKAGE_EXTRA_ARCHS references armv8 instead of armv9 Signed-off-by: Jon Mason --- meta-arm/conf/machine/include/arm/arch-armv9-1a.inc | 2 +- meta-arm/conf/machine/include/arm/arch-armv9-2a.inc | 2 +- meta-arm/conf/machine/include/arm/arch-armv9-3a.inc | 2 +- meta-arm/conf/machine/include/arm/arch-armv9-4a.inc | 2 +- meta-arm/conf/machine/include/arm/arch-armv9-5a.inc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-arm/conf/machine/include/arm/arch-armv9-1a.inc b/meta-arm/conf/machine/include/arm/arch-armv9-1a.inc index c42b5c00a9e4..f9e6dce77c82 100644 --- a/meta-arm/conf/machine/include/arm/arch-armv9-1a.inc +++ b/meta-arm/conf/machine/include/arm/arch-armv9-1a.inc @@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-1a" ARMPKGARCH:tune-armv9-1a ?= "armv9-1a" TUNE_FEATURES:tune-armv9-1a = "aarch64 armv9-1a" -PACKAGE_EXTRA_ARCHS:tune-armv9-1a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-1a" +PACKAGE_EXTRA_ARCHS:tune-armv9-1a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-1a" BASE_LIB:tune-armv9-1a = "lib64" diff --git a/meta-arm/conf/machine/include/arm/arch-armv9-2a.inc b/meta-arm/conf/machine/include/arm/arch-armv9-2a.inc index 211dac527f85..4b5cf3ed156a 100644 --- a/meta-arm/conf/machine/include/arm/arch-armv9-2a.inc +++ b/meta-arm/conf/machine/include/arm/arch-armv9-2a.inc @@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-2a" ARMPKGARCH:tune-armv9-2a ?= "armv9-2a" TUNE_FEATURES:tune-armv9-2a = "aarch64 armv9-2a" -PACKAGE_EXTRA_ARCHS:tune-armv9-2a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-2a" +PACKAGE_EXTRA_ARCHS:tune-armv9-2a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-2a" BASE_LIB:tune-armv9-2a = "lib64" diff --git a/meta-arm/conf/machine/include/arm/arch-armv9-3a.inc b/meta-arm/conf/machine/include/arm/arch-armv9-3a.inc index bdd8bb95388a..c345f1532c48 100644 --- a/meta-arm/conf/machine/include/arm/arch-armv9-3a.inc +++ b/meta-arm/conf/machine/include/arm/arch-armv9-3a.inc @@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-3a" ARMPKGARCH:tune-armv9-3a ?= "armv9-3a" TUNE_FEATURES:tune-armv9-3a = "aarch64 armv9-3a" -PACKAGE_EXTRA_ARCHS:tune-armv9-3a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-3a" +PACKAGE_EXTRA_ARCHS:tune-armv9-3a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-3a" BASE_LIB:tune-armv9-3a = "lib64" diff --git a/meta-arm/conf/machine/include/arm/arch-armv9-4a.inc b/meta-arm/conf/machine/include/arm/arch-armv9-4a.inc index 88c907c85d14..04668dd6f033 100644 --- a/meta-arm/conf/machine/include/arm/arch-armv9-4a.inc +++ b/meta-arm/conf/machine/include/arm/arch-armv9-4a.inc @@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-4a" ARMPKGARCH:tune-armv9-4a ?= "armv9-4a" TUNE_FEATURES:tune-armv9-4a = "aarch64 armv9-4a" -PACKAGE_EXTRA_ARCHS:tune-armv9-4a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-4a" +PACKAGE_EXTRA_ARCHS:tune-armv9-4a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-4a" BASE_LIB:tune-armv9-4a = "lib64" diff --git a/meta-arm/conf/machine/include/arm/arch-armv9-5a.inc b/meta-arm/conf/machine/include/arm/arch-armv9-5a.inc index 7202418b5dce..848afada890d 100644 --- a/meta-arm/conf/machine/include/arm/arch-armv9-5a.inc +++ b/meta-arm/conf/machine/include/arm/arch-armv9-5a.inc @@ -9,5 +9,5 @@ require conf/machine/include/arm/arch-armv9a.inc AVAILTUNES += "armv9-5a" ARMPKGARCH:tune-armv9-5a ?= "armv9-5a" TUNE_FEATURES:tune-armv9-5a = "aarch64 armv9-5a" -PACKAGE_EXTRA_ARCHS:tune-armv9-5a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv9-5a" +PACKAGE_EXTRA_ARCHS:tune-armv9-5a = "${PACKAGE_EXTRA_ARCHS:tune-armv9a} armv9-5a" BASE_LIB:tune-armv9-5a = "lib64" From patchwork Fri Aug 22 13:20:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 69051 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 C36CCCA0EFF for ; Fri, 22 Aug 2025 13:20:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9963.1755868812519764368 for ; Fri, 22 Aug 2025 06:20:12 -0700 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 E7E3627DC for ; Fri, 22 Aug 2025 06:20:03 -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 0D0173F63F for ; Fri, 22 Aug 2025 06:20:12 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/3] arm-bsp/fvp-base: remove console workaround Date: Fri, 22 Aug 2025 09:20:10 -0400 Message-Id: <20250822132011.93796-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250822132011.93796-1-jon.mason@arm.com> References: <20250822132011.93796-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, 22 Aug 2025 13:20:14 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6681 Remove the KERNEL_CONSOLE workaround, as that has now been upstreamed should should no longer be needed. Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/fvp-base.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-arm-bsp/conf/machine/fvp-base.conf b/meta-arm-bsp/conf/machine/fvp-base.conf index 8761eb77d12a..2dd2dacb7775 100644 --- a/meta-arm-bsp/conf/machine/fvp-base.conf +++ b/meta-arm-bsp/conf/machine/fvp-base.conf @@ -17,8 +17,6 @@ IMAGE_FSTYPES += "wic" WKS_FILE ?= "efi-disk.wks.in" 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_PROVIDER_virtual/kernel ?= "linux-yocto" KERNEL_DTB_NAME = "fvp-base-revc.dtb" From patchwork Fri Aug 22 13:20:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 69052 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 BB69CCA0FE8 for ; Fri, 22 Aug 2025 13:20:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9965.1755868812863303828 for ; Fri, 22 Aug 2025 06:20:12 -0700 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 34BBB27DD for ; Fri, 22 Aug 2025 06:20:04 -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 4A6553F63F for ; Fri, 22 Aug 2025 06:20:12 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/3] arm/optee-os: remove CFG_CORE_BTI from EXTRA_OEMAKE Date: Fri, 22 Aug 2025 09:20:11 -0400 Message-Id: <20250822132011.93796-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250822132011.93796-1-jon.mason@arm.com> References: <20250822132011.93796-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, 22 Aug 2025 13:20:14 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6682 commit a3a2c49b2149606f314b2ee0aeba7d6becd12545 corrected a typo that was preventing arm-branch-protection flags from being enabled. However, since making this change, fvp-base with trusted services enabled no longer boots. However, the flag that seems to be the problem on fvp base is CFG_TA_BTI. Since this is the only use case for arm-branch-protection machine feature, remove it from the common file until this issue can be properly sorted. Signed-off-by: Jon Mason --- 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 68bb1226b232..3065f71f6ec1 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 -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)}" +EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'arm-branch-protection', ' CFG_TA_BTI=1 CFG_CORE_PAUTH=y CFG_TA_PAUTH=y', '', d)}" LDFLAGS[unexport] = "1" CPPFLAGS[unexport] = "1"