From patchwork Fri Aug 22 13:18:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 69047 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 A2177CA0FE9 for ; Fri, 22 Aug 2025 13:18:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9939.1755868695238445380 for ; Fri, 22 Aug 2025 06:18:15 -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 895191A32; Fri, 22 Aug 2025 06:18:06 -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 929933F63F; Fri, 22 Aug 2025 06:18:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Cc: Norbert Kocsis Subject: [PATCH 1/6] arm/trusted-services: Fix trusted-service license file paths Date: Fri, 22 Aug 2025 09:18:08 -0400 Message-Id: <20250822131813.93724-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:18:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6674 From: Norbert Kocsis Use UNPACKDIR instead of relative paths. Signed-off-by: Norbert Kocsis Signed-off-by: Jon Mason --- .../trusted-services/trusted-services-src.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc index e9235cf721d7..50e111172539 100644 --- a/meta-arm/recipes-security/trusted-services/trusted-services-src.inc +++ b/meta-arm/recipes-security/trusted-services/trusted-services-src.inc @@ -24,32 +24,32 @@ UPSTREAM_CHECK_COMMITS = "1" # DTC, tag "v1.6.1" SRC_URI += "git://github.com/dgibson/dtc;name=dtc;protocol=https;branch=main;destsuffix=dtc" SRCREV_dtc = "b6910bec11614980a21e46fbccc35934b671bd81" -LIC_FILES_CHKSUM += "file://../dtc/README.license;md5=a1eb22e37f09df5b5511b8a278992d0e" +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/dtc/README.license;md5=a1eb22e37f09df5b5511b8a278992d0e" # MbedTLS, tag "v3.6.0" SRC_URI += "gitsm://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;branch=master;destsuffix=mbedtls" SRCREV_mbedtls = "2ca6c285a0dd3f33982dd57299012dacab1ff206" -LIC_FILES_CHKSUM += "file://../mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/mbedtls/LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" # Nanopb, tag "nanopb-0.4.8" plus some further fixes SRC_URI += "git://github.com/nanopb/nanopb.git;name=nanopb;protocol=https;branch=master;destsuffix=nanopb" SRCREV_nanopb = "6cfe48d6f1593f8fa5c0f90437f5e6522587745e" -LIC_FILES_CHKSUM += "file://../nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/nanopb/LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f" # qcbor, tag "v1.0.0" SRC_URI += "git://github.com/laurencelundblade/QCBOR.git;name=qcbor;protocol=https;branch=master;destsuffix=qcbor" SRCREV_qcbor = "56b17bf9f74096774944bcac0829adcd887d391e" -LIC_FILES_CHKSUM += "file://../qcbor/README.md;md5=e8ff2e88a722cdc55eddd0bb9aeca002" +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/qcbor/README.md;md5=e8ff2e88a722cdc55eddd0bb9aeca002" # T_Cose SRC_URI += "git://github.com/laurencelundblade/t_cose.git;name=tcose;protocol=https;branch=master;destsuffix=tcose" SRCREV_tcose = "fc3a4b2c7196ff582e8242de8bd4a1bc4eec577f" -LIC_FILES_CHKSUM += "file://../tcose/LICENSE;md5=b2ebdbfb82602b97aa628f64cf4b65ad" +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/tcose/LICENSE;md5=b2ebdbfb82602b97aa628f64cf4b65ad" # CppUTest, tag "v3.8" SRC_URI += "git://github.com/cpputest/cpputest.git;name=cpputest;protocol=https;branch=master;destsuffix=cpputest" SRCREV_cpputest = "e25097614e1c4856036366877a02346c4b36bb5b" -LIC_FILES_CHKSUM += "file://../cpputest/COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177" +LIC_FILES_CHKSUM += "file://${UNPACKDIR}/cpputest/COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177" SRCREV_FORMAT = "trusted-services_dtc_mbedtls_nanopb_qcbor_tcose_cpputest" From patchwork Fri Aug 22 13:18: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: 69044 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 80DB6CA0EED for ; Fri, 22 Aug 2025 13:18:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9940.1755868695398387920 for ; Fri, 22 Aug 2025 06:18:15 -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 C1F9027DC for ; Fri, 22 Aug 2025 06:18:06 -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 DB6CC3F63F for ; Fri, 22 Aug 2025 06:18:14 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/6] arm/gn: disable uninitialized variable warning Date: Fri, 22 Aug 2025 09:18:09 -0400 Message-Id: <20250822131813.93724-2-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250822131813.93724-1-jon.mason@arm.com> References: <20250822131813.93724-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:18:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6673 An uninitialized variable warning is occurring when compiling gn. However, since Wall is being used in gn, this is being logged as an error. Pass the no-error flag for this case to workaround this issue. Signed-off-by: Jon Mason --- meta-arm/recipes-devtools/gn/gn_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-arm/recipes-devtools/gn/gn_git.bb b/meta-arm/recipes-devtools/gn/gn_git.bb index d4294bd36aa1..8573cd2ffbd9 100644 --- a/meta-arm/recipes-devtools/gn/gn_git.bb +++ b/meta-arm/recipes-devtools/gn/gn_git.bb @@ -43,3 +43,4 @@ do_install() { BBCLASSEXTEND = "native" COMPATIBLE_HOST = "^(?!riscv32).*" +CFLAGS += "-Wno-error=maybe-uninitialized" From patchwork Fri Aug 22 13:18: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: 69049 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 A21B6CA0FEC for ; Fri, 22 Aug 2025 13:18:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9914.1755868695791807355 for ; Fri, 22 Aug 2025 06:18:15 -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 0E3C427DD for ; Fri, 22 Aug 2025 06:18:07 -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 243243F63F for ; Fri, 22 Aug 2025 06:18:15 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 3/6] arm/gn: update to the latest SHA Date: Fri, 22 Aug 2025 09:18:10 -0400 Message-Id: <20250822131813.93724-3-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250822131813.93724-1-jon.mason@arm.com> References: <20250822131813.93724-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:18:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6675 Update gn to the latest SHA (commit from 08 Aug 2025). There are 66 commits between the previous SHA and the new one. Signed-off-by: Jon Mason --- meta-arm/recipes-devtools/gn/gn_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-devtools/gn/gn_git.bb b/meta-arm/recipes-devtools/gn/gn_git.bb index 8573cd2ffbd9..abc81a9549fd 100644 --- a/meta-arm/recipes-devtools/gn/gn_git.bb +++ b/meta-arm/recipes-devtools/gn/gn_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d" UPSTREAM_CHECK_COMMITS = "1" SRC_URI = "git://gn.googlesource.com/gn;protocol=https;branch=main" -SRCREV = "ab638bd7cbb9ac8468bf2fbe60c74ed4706a14a7" +SRCREV = "4ce861fc06ec87ff74eb6a17ebbd55e4755ebdeb" PV = "0+git" B = "${WORKDIR}/build" From patchwork Fri Aug 22 13:18: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: 69045 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 83AE1CA0FE8 for ; Fri, 22 Aug 2025 13:18:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9942.1755868696093969190 for ; Fri, 22 Aug 2025 06:18:16 -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 409E02880 for ; Fri, 22 Aug 2025 06:18:07 -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 6282F3F63F for ; Fri, 22 Aug 2025 06:18:15 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 4/6] arm/arch-armv9*: Fix PACKAGE_EXTRA_ARCHS reference Date: Fri, 22 Aug 2025 09:18:11 -0400 Message-Id: <20250822131813.93724-4-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250822131813.93724-1-jon.mason@arm.com> References: <20250822131813.93724-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:18:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6677 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:18:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 69048 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 825DFCA0EEB for ; Fri, 22 Aug 2025 13:18:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9943.1755868696101012229 for ; Fri, 22 Aug 2025 06:18:16 -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 89EA327DC for ; Fri, 22 Aug 2025 06:18:07 -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 97A6D3F63F for ; Fri, 22 Aug 2025 06:18:15 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 5/6] arm-bsp/fvp-base: remove console workaround Date: Fri, 22 Aug 2025 09:18:12 -0400 Message-Id: <20250822131813.93724-5-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250822131813.93724-1-jon.mason@arm.com> References: <20250822131813.93724-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:18:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6676 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:18:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 69046 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 924C5CA0EFF for ; Fri, 22 Aug 2025 13:18:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.9915.1755868696422461690 for ; Fri, 22 Aug 2025 06:18:16 -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 B657727DD for ; Fri, 22 Aug 2025 06:18:07 -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 D55B13F63F for ; Fri, 22 Aug 2025 06:18:15 -0700 (PDT) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 6/6] arm/optee-os: remove CFG_CORE_BTI from EXTRA_OEMAKE Date: Fri, 22 Aug 2025 09:18:13 -0400 Message-Id: <20250822131813.93724-6-jon.mason@arm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250822131813.93724-1-jon.mason@arm.com> References: <20250822131813.93724-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:18:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/6678 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"