From patchwork Mon Apr 6 15:16:19 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 85337 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 ED2E4F46C53 for ; Mon, 6 Apr 2026 15:16: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.57327.1775488581464258873 for ; Mon, 06 Apr 2026 08:16: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=o/7nr9EL; 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 103E11BA8 for ; Mon, 6 Apr 2026 08:16: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 AF5A03F632 for ; Mon, 6 Apr 2026 08:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1775488580; bh=giSzDvSjEAiExslLfvXhhe/DlW2igXZUeIRtJI/8ig4=; h=From:To:Subject:Date:From; b=o/7nr9ELmnqwtargAuJM1yJ73C0dnzylsunZ5JgpTQ8A4KqAPyHBAaRA14FZNp5+A BFeyTOQVynUlxdJTJGrA1hYWM0ufg60JEczVtsZBdSd+dSxGlqsa7sOxeLAZJeLl2/ HHVHhHdaxLcFW+8Qtdp9E1ZdhptUKOOe1x4h8HN4= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/2] arm-bsp/sbsa-ref: workaround CPU topology warning Date: Mon, 6 Apr 2026 11:16:19 -0400 Message-ID: <20260406151620.99679-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 ; Mon, 06 Apr 2026 15:16:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7004 To workaround the CPU topology issue with edk2-firmware, we can specify the number of processors being used, which seems to setup the CPU topology mask correctly (and thus no errors). With this addressed, we can use the latest edk2 firmware, which allows us to use the latest TF-A version. Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/sbsa-ref.conf | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/meta-arm-bsp/conf/machine/sbsa-ref.conf b/meta-arm-bsp/conf/machine/sbsa-ref.conf index d05e44677e0d..1f86cdb6e0e7 100644 --- a/meta-arm-bsp/conf/machine/sbsa-ref.conf +++ b/meta-arm-bsp/conf/machine/sbsa-ref.conf @@ -25,19 +25,12 @@ EFI_PROVIDER ?= "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd-boo SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;hvc0" -# FIXME - when compiling edk2, we're seeing an error of fip.bin being larger than the region size. -# Pin the version back until this can be resolved -PREFERRED_VERSION_trusted-firmware-a ?= "2.12.%" - EXTRA_IMAGEDEPENDS += "edk2-firmware" -# FIXME - Currently seeing a kernel warning for the CPU topology when bumping -# the version past this. The issue is being tracked in -# https://github.com/tianocore/edk2-platforms/issues/752 -PREFERRED_VERSION_edk2-firmware ?= "202408%" QB_SYSTEM_NAME = "qemu-system-aarch64" QB_MACHINE = "-machine sbsa-ref" QB_CPU = "-cpu neoverse-n2" +QB_SMP = "-smp 4" QB_MEM = "-m 1024" QB_DEFAULT_FSTYPE = "wic.qcow2" QB_NETWORK_DEVICE = "-device e1000e,netdev=net0,mac=@MAC@" From patchwork Mon Apr 6 15:16:20 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 85338 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 E23B4F46C51 for ; Mon, 6 Apr 2026 15:16: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.57328.1775488581594628833 for ; Mon, 06 Apr 2026 08:16:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@arm.com header.s=foss header.b=Yofx2pIi; 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 5B8972972 for ; Mon, 6 Apr 2026 08:16: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 0C9483F632 for ; Mon, 6 Apr 2026 08:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1775488581; bh=sjPQhvBJf8MiA3eCNS1BvED6KySMai+T8CProEWTMN8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Yofx2pIia1QfxpD1rVny3ubqXFwr43yglhpqQRcGKB3hmiz75Oly04WSvZsRVd7tf 93bmV+VHNvMNdkQb8iNF/lwGjmL5KtnSHLF/zGrNhdrU+kFBD1Q/LrtpgX9orOE0Ja f/aUwwBmDcPAuKB+Wdh6alg6o9xJCwJEutOvirRI= From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/2] arm-bsp/edk2-firmware: remove 202408 Date: Mon, 6 Apr 2026 11:16:20 -0400 Message-ID: <20260406151620.99679-2-jon.mason@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260406151620.99679-1-jon.mason@arm.com> References: <20260406151620.99679-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 ; Mon, 06 Apr 2026 15:16:28 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7003 Nothing in meta-arm-bsp is using this version anymore. Drop it and the related patches. Signed-off-by: Jon Mason --- .../recipes-bsp/uefi/edk2-firmware_202408.bb | 12 ----- .../0001-BaseTools-Pccts-set-C-standard.patch | 47 ------------------- .../0001-Platform-StMmRpmb-Fix-build.patch | 38 --------------- 3 files changed, 97 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch delete mode 100644 meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-StMmRpmb-Fix-build.patch diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb deleted file mode 100644 index 6b0f1961be4c..000000000000 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202408.bb +++ /dev/null @@ -1,12 +0,0 @@ -require recipes-bsp/uefi/edk2-firmware.inc - -SRCREV_edk2 ?= "b158dad150bf02879668f72ce306445250838201" -SRCREV_edk2-platforms ?= "a3c898956a4d48dc5980336fa6ce6eeb23c4f72b" - -SRC_URI += "file://0001-Platform-StMmRpmb-Fix-build.patch;patchdir=edk2-platforms \ - file://0001-BaseTools-Pccts-set-C-standard.patch" - -# FIXME: -# ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c:146:37: -# error: variable 'ContainedElements' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer] -TOOLCHAIN:aarch64 = "gcc" diff --git a/meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch b/meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch deleted file mode 100644 index 913bd4a94502..000000000000 --- a/meta-arm-bsp/recipes-bsp/uefi/files/0001-BaseTools-Pccts-set-C-standard.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e063f8b8a53861043b9872cc35b08a3dc03b0942 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 20 Jan 2025 09:40:31 +0100 -Subject: [PATCH] BaseTools/Pccts: set C standard - -The prehistoric code base doesn't build with ISO C23. Set the C -standard to C11 (for both clang and gcc) so it continues to build with -gcc 15 (which uses C23 by default). - -Signed-off-by: Gerd Hoffmann - -Upstream-Status: Backport [e063f8b8a53861043b9872cc35b08a3dc03b0942] -Signed-off-by: Ross Burton ---- - BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile | 2 +- - BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile -index 746d58b5e2..b47c8a37af 100644 ---- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile -+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/makefile -@@ -169,7 +169,7 @@ ANTLR=${BIN_DIR}/antlr - DLG=${BIN_DIR}/dlg - OBJ_EXT=o - OUT_OBJ = -o --CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN $(COTHER) -DZZLEXBUFSIZE=65536 -std=gnu11 - CPPFLAGS= - # - # SGI Users, use this CFLAGS -diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile -index e45ac98e04..d72bee3d70 100644 ---- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile -+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/makefile -@@ -123,7 +123,7 @@ endif - COPT=-O - ANTLR=${BIN_DIR}/antlr - DLG=${BIN_DIR}/dlg --CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -+CFLAGS= $(COPT) -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=65536 -std=gnu11 - CPPFLAGS= - OBJ_EXT=o - OUT_OBJ = -o --- -2.43.0 - diff --git a/meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-StMmRpmb-Fix-build.patch b/meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-StMmRpmb-Fix-build.patch deleted file mode 100644 index 234ccf343c63..000000000000 --- a/meta-arm-bsp/recipes-bsp/uefi/files/0001-Platform-StMmRpmb-Fix-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ee185eda7b7ec9a0c82827fea197fbb73d971f93 Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel -Date: Thu, 29 Aug 2024 21:21:50 +0200 -Subject: [PATCH] Platform/StMmRpmb: Fix build - -Add some missing library class resolutions relating to changes in the -core upstream EDK2 repo. - -Signed-off-by: Ard Biesheuvel -Reviewed-by: Ilias Apalodimas ---- - .../PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc | 3 +++ - 1 file changed, 3 insertions(+) - -Upstream-Status: Backport - -diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc -index 653029c52f..54c7a63b41 100644 ---- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc -+++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc -@@ -41,11 +41,14 @@ - ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf - FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf - HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf -+ HobPrintLib|MdeModulePkg/Library/HobPrintLib/HobPrintLib.inf -+ ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf - NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf - MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf - MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf -+ PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf - PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf --- -2.43.0 -