diff mbox series

[1/2] arm-bsp/sbsa-ref: workaround CPU topology warning

Message ID 20260406151620.99679-1-jon.mason@arm.com
State New
Headers show
Series [1/2] arm-bsp/sbsa-ref: workaround CPU topology warning | expand

Commit Message

Jon Mason April 6, 2026, 3:16 p.m. UTC
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 <jon.mason@arm.com>
---
 meta-arm-bsp/conf/machine/sbsa-ref.conf | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
diff mbox series

Patch

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@"