Upstream edk2 has dropped support for 32-bit architectures. Remove the
build config for these builds, update aarch64 (which used to share the
'vars' image with arm).
Drop references to the 32-bit builds in a number of places.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
tests/qtest/bios-tables-test.c | 28 ++++++-------
pc-bios/descriptors/50-edk2-i386-secure.json | 34 ---------------
pc-bios/descriptors/60-edk2-aarch64.json | 2 +-
pc-bios/descriptors/60-edk2-arm.json | 31 --------------
pc-bios/descriptors/60-edk2-i386.json | 33 ---------------
pc-bios/descriptors/meson.build | 3 --
pc-bios/meson.build | 6 +--
roms/edk2-build.config | 44 ++------------------
8 files changed, 19 insertions(+), 162 deletions(-)
delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json
delete mode 100644 pc-bios/descriptors/60-edk2-arm.json
delete mode 100644 pc-bios/descriptors/60-edk2-i386.json
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c
index 6b892ef23e1a..e65db5e7fce7 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -1619,7 +1619,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 256ULL * MiB,
@@ -1650,7 +1650,7 @@ static void test_acpi_aarch64_virt_acpi_pci_hotplug(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 256ULL * MiB,
@@ -1674,7 +1674,7 @@ static void test_acpi_aarch64_virt_pcie_root_port_hpoff(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 256ULL * MiB,
@@ -1788,7 +1788,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -1811,7 +1811,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
};
@@ -1844,7 +1844,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_spcr(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * 1024 * 1024,
@@ -1924,7 +1924,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2200,7 +2200,7 @@ static void test_acpi_aarch64_virt_tcg(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2221,7 +2221,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void)
.variant = ".topology",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2240,7 +2240,7 @@ static void test_acpi_aarch64_virt_tcg_its_off(void)
.variant = ".its_off",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * 1024 * 1024,
@@ -2326,7 +2326,7 @@ static void test_acpi_aarch64_virt_viot(void)
.variant = ".viot",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
@@ -2344,7 +2344,7 @@ static void test_acpi_aarch64_virt_smmuv3_legacy(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
};
@@ -2383,7 +2383,7 @@ static void test_acpi_aarch64_virt_smmuv3_dev(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
};
@@ -2590,7 +2590,7 @@ static void test_acpi_aarch64_virt_oem_fields(void)
.arch = "aarch64",
.tcg_only = true,
.uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
- .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
+ .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
.cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
.ram_start = 0x40000000ULL,
.scan_len = 128ULL * MiB,
diff --git a/pc-bios/descriptors/50-edk2-i386-secure.json b/pc-bios/descriptors/50-edk2-i386-secure.json
deleted file mode 100644
index d7108c1da05a..000000000000
--- a/pc-bios/descriptors/50-edk2-i386-secure.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "description": "UEFI firmware for i386, with Secure Boot and SMM",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "@DATADIR@/edk2-i386-secure-code.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "@DATADIR@/edk2-i386-vars.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "i386",
- "machines": [
- "pc-q35-*"
- ]
- }
- ],
- "features": [
- "acpi-s3",
- "requires-smm",
- "secure-boot",
- "verbose-dynamic"
- ],
- "tags": [
-
- ]
-}
diff --git a/pc-bios/descriptors/60-edk2-aarch64.json b/pc-bios/descriptors/60-edk2-aarch64.json
index 800a21bda691..94926172959c 100644
--- a/pc-bios/descriptors/60-edk2-aarch64.json
+++ b/pc-bios/descriptors/60-edk2-aarch64.json
@@ -10,7 +10,7 @@
"format": "raw"
},
"nvram-template": {
- "filename": "@DATADIR@/edk2-arm-vars.fd",
+ "filename": "@DATADIR@/edk2-aarch64-vars.fd",
"format": "raw"
}
},
diff --git a/pc-bios/descriptors/60-edk2-arm.json b/pc-bios/descriptors/60-edk2-arm.json
deleted file mode 100644
index d5f1bba6cc82..000000000000
--- a/pc-bios/descriptors/60-edk2-arm.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "description": "UEFI firmware for arm",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "@DATADIR@/edk2-arm-code.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "@DATADIR@/edk2-arm-vars.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "arm",
- "machines": [
- "virt-*"
- ]
- }
- ],
- "features": [
- "verbose-static"
- ],
- "tags": [
-
- ]
-}
diff --git a/pc-bios/descriptors/60-edk2-i386.json b/pc-bios/descriptors/60-edk2-i386.json
deleted file mode 100644
index 2f8dec74fecb..000000000000
--- a/pc-bios/descriptors/60-edk2-i386.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "description": "UEFI firmware for i386",
- "interface-types": [
- "uefi"
- ],
- "mapping": {
- "device": "flash",
- "executable": {
- "filename": "@DATADIR@/edk2-i386-code.fd",
- "format": "raw"
- },
- "nvram-template": {
- "filename": "@DATADIR@/edk2-i386-vars.fd",
- "format": "raw"
- }
- },
- "targets": [
- {
- "architecture": "i386",
- "machines": [
- "pc-i440fx-*",
- "pc-q35-*"
- ]
- }
- ],
- "features": [
- "acpi-s3",
- "verbose-dynamic"
- ],
- "tags": [
-
- ]
-}
diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.build
index cdd0be01a356..63f1c00b6406 100644
--- a/pc-bios/descriptors/meson.build
+++ b/pc-bios/descriptors/meson.build
@@ -1,10 +1,7 @@
if unpack_edk2_blobs and get_option('install_blobs')
foreach f: [
- '50-edk2-i386-secure.json',
'50-edk2-x86_64-secure.json',
'60-edk2-aarch64.json',
- '60-edk2-arm.json',
- '60-edk2-i386.json',
'60-edk2-x86_64.json',
'60-edk2-loongarch64.json',
'60-edk2-riscv64.json'
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 9260aaad78e8..7c3d56478345 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -2,13 +2,9 @@ roms = []
if unpack_edk2_blobs
fds = [
'edk2-aarch64-code.fd',
- 'edk2-arm-code.fd',
- 'edk2-arm-vars.fd',
+ 'edk2-aarch64-vars.fd',
'edk2-riscv-code.fd',
'edk2-riscv-vars.fd',
- 'edk2-i386-code.fd',
- 'edk2-i386-secure-code.fd',
- 'edk2-i386-vars.fd',
'edk2-x86_64-code.fd',
'edk2-x86_64-secure-code.fd',
'edk2-loongarch64-code.fd',
diff --git a/roms/edk2-build.config b/roms/edk2-build.config
index 9e45361fb445..fcf9da8c7681 100644
--- a/roms/edk2-build.config
+++ b/roms/edk2-build.config
@@ -33,29 +33,6 @@ PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
# shim.efi has broken MemAttr code
PcdUninstallMemAttrProtocol = TRUE
-####################################################################################
-# i386
-
-[build.ovmf.i386]
-desc = ovmf build (32-bit)
-conf = OvmfPkg/OvmfPkgIa32.dsc
-arch = IA32
-opts = common
-plat = OvmfIa32
-dest = ../pc-bios
-cpy1 = FV/OVMF_CODE.fd edk2-i386-code.fd
-cpy2 = FV/OVMF_VARS.fd edk2-i386-vars.fd
-
-[build.ovmf.i386.secure]
-desc = ovmf build (32-bit, secure boot)
-conf = OvmfPkg/OvmfPkgIa32.dsc
-arch = IA32
-opts = common
- ovmf.sb.smm
-plat = OvmfIa32
-dest = ../pc-bios
-cpy1 = FV/OVMF_CODE.fd edk2-i386-secure-code.fd
-
####################################################################################
# x86_64
@@ -87,23 +64,6 @@ plat = MicrovmX64
dest = ../pc-bios
cpy1 = FV/MICROVM.fd edk2-x86_64-microvm.fd
-####################################################################################
-# arm
-
-[build.armvirt.arm]
-desc = ArmVirt build, 32-bit (arm v7)
-conf = ArmVirtPkg/ArmVirtQemu.dsc
-arch = ARM
-opts = common
- armvirt.silent
-pcds = nx.broken.shim.grub
-plat = ArmVirtQemu-ARM
-dest = ../pc-bios
-cpy1 = FV/QEMU_EFI.fd edk2-arm-code.fd
-cpy2 = FV/QEMU_VARS.fd edk2-arm-vars.fd
-pad1 = edk2-arm-code.fd 64m
-pad2 = edk2-arm-vars.fd 64m
-
####################################################################################
# aarch64
@@ -114,10 +74,12 @@ arch = AARCH64
opts = common
armvirt.silent
pcds = nx.broken.shim.grub
-plat = ArmVirtQemu-AARCH64
+plat = ArmVirtQemu-AArch64
dest = ../pc-bios
cpy1 = FV/QEMU_EFI.fd edk2-aarch64-code.fd
+cpy2 = FV/QEMU_VARS.fd edk2-aarch64-vars.fd
pad1 = edk2-aarch64-code.fd 64m
+pad2 = edk2-aarch64-vars.fd 64m
####################################################################################
# riscv64
--
2.52.0On 26/11/25 15:21, Gerd Hoffmann wrote: > Upstream edk2 has dropped support for 32-bit architectures. Remove the > build config for these builds, update aarch64 (which used to share the > 'vars' image with arm). > > Drop references to the 32-bit builds in a number of places. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > tests/qtest/bios-tables-test.c | 28 ++++++------- > pc-bios/descriptors/50-edk2-i386-secure.json | 34 --------------- > pc-bios/descriptors/60-edk2-aarch64.json | 2 +- > pc-bios/descriptors/60-edk2-arm.json | 31 -------------- > pc-bios/descriptors/60-edk2-i386.json | 33 --------------- > pc-bios/descriptors/meson.build | 3 -- > pc-bios/meson.build | 6 +-- > roms/edk2-build.config | 44 ++------------------ > 8 files changed, 19 insertions(+), 162 deletions(-) > delete mode 100644 pc-bios/descriptors/50-edk2-i386-secure.json > delete mode 100644 pc-bios/descriptors/60-edk2-arm.json > delete mode 100644 pc-bios/descriptors/60-edk2-i386.json Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
© 2016 - 2025 Red Hat, Inc.