@samitouri / QOSamiQemu / commits / 1f03378bb4

edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars

Upstream edk2 has dropped support for 32-bit architectures. Remove the build config for these builds. Update aarch64 config and test cases, aarch64 used to share the 'vars' image with arm. Drop references to the 32-bit builds in a number of places. Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-ID: <20260824164751.1700783-5-kraxel@redhat.com>

Gerd Hoffmann committed Aug 24, 2026 at 18:47 UTC 1f03378bb49f0654598bdf6dced05f2502594c2d
9 files changed +23 -166
pc-bios/descriptors/50-edk2-i386-secure.json deleted
-34
@@ -1,34 +0,0 @@
1 -{
2 - "description": "UEFI firmware for i386, with Secure Boot and SMM",
3 - "interface-types": [
4 - "uefi"
5 - ],
6 - "mapping": {
7 - "device": "flash",
8 - "executable": {
9 - "filename": "@DATADIR@/edk2-i386-secure-code.fd",
10 - "format": "raw"
11 - },
12 - "nvram-template": {
13 - "filename": "@DATADIR@/edk2-i386-vars.fd",
14 - "format": "raw"
15 - }
16 - },
17 - "targets": [
18 - {
19 - "architecture": "i386",
20 - "machines": [
21 - "pc-q35-*"
22 - ]
23 - }
24 - ],
25 - "features": [
26 - "acpi-s3",
27 - "requires-smm",
28 - "secure-boot",
29 - "verbose-dynamic"
30 - ],
31 - "tags": [
32 -
33 - ]
34 -}
pc-bios/descriptors/60-edk2-aarch64.json
+1 -1
@@ -10,7 +10,7 @@
10 "format": "raw"
11 },
12 "nvram-template": {
13 - "filename": "@DATADIR@/edk2-arm-vars.fd",
13 + "filename": "@DATADIR@/edk2-aarch64-vars.fd",
14 "format": "raw"
15 }
16 },
pc-bios/descriptors/60-edk2-arm.json deleted
-31
@@ -1,31 +0,0 @@
1 -{
2 - "description": "UEFI firmware for arm",
3 - "interface-types": [
4 - "uefi"
5 - ],
6 - "mapping": {
7 - "device": "flash",
8 - "executable": {
9 - "filename": "@DATADIR@/edk2-arm-code.fd",
10 - "format": "raw"
11 - },
12 - "nvram-template": {
13 - "filename": "@DATADIR@/edk2-arm-vars.fd",
14 - "format": "raw"
15 - }
16 - },
17 - "targets": [
18 - {
19 - "architecture": "arm",
20 - "machines": [
21 - "virt-*"
22 - ]
23 - }
24 - ],
25 - "features": [
26 - "verbose-static"
27 - ],
28 - "tags": [
29 -
30 - ]
31 -}
pc-bios/descriptors/60-edk2-i386.json deleted
-33
@@ -1,33 +0,0 @@
1 -{
2 - "description": "UEFI firmware for i386",
3 - "interface-types": [
4 - "uefi"
5 - ],
6 - "mapping": {
7 - "device": "flash",
8 - "executable": {
9 - "filename": "@DATADIR@/edk2-i386-code.fd",
10 - "format": "raw"
11 - },
12 - "nvram-template": {
13 - "filename": "@DATADIR@/edk2-i386-vars.fd",
14 - "format": "raw"
15 - }
16 - },
17 - "targets": [
18 - {
19 - "architecture": "i386",
20 - "machines": [
21 - "pc-i440fx-*",
22 - "pc-q35-*"
23 - ]
24 - }
25 - ],
26 - "features": [
27 - "acpi-s3",
28 - "verbose-dynamic"
29 - ],
30 - "tags": [
31 -
32 - ]
33 -}
pc-bios/descriptors/meson.build
-3
@@ -1,10 +1,7 @@
1 if unpack_edk2_blobs and get_option('install_blobs')
2 foreach f: [
3 - '50-edk2-i386-secure.json',
3 '50-edk2-x86_64-secure.json',
4 '60-edk2-aarch64.json',
6 - '60-edk2-arm.json',
7 - '60-edk2-i386.json',
5 '60-edk2-x86_64.json',
6 '60-edk2-loongarch64.json',
7 '60-edk2-riscv64.json'
pc-bios/meson.build
+1 -5
@@ -2,13 +2,9 @@ roms = []
2 if unpack_edk2_blobs
3 fds = [
4 'edk2-aarch64-code.fd',
5 - 'edk2-arm-code.fd',
6 - 'edk2-arm-vars.fd',
5 + 'edk2-aarch64-vars.fd',
6 'edk2-riscv-code.fd',
7 'edk2-riscv-vars.fd',
9 - 'edk2-i386-code.fd',
10 - 'edk2-i386-secure-code.fd',
11 - 'edk2-i386-vars.fd',
8 'edk2-x86_64-code.fd',
9 'edk2-x86_64-secure-code.fd',
10 'edk2-loongarch64-code.fd',
roms/edk2-build.config
+3 -41
@@ -33,29 +33,6 @@ PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
33 # shim.efi has broken MemAttr code
34 PcdUninstallMemAttrProtocol = TRUE
35
36 -####################################################################################
37 -# i386
38 -
39 -[build.ovmf.i386]
40 -desc = ovmf build (32-bit)
41 -conf = OvmfPkg/OvmfPkgIa32.dsc
42 -arch = IA32
43 -opts = common
44 -plat = OvmfIa32
45 -dest = ../pc-bios
46 -cpy1 = FV/OVMF_CODE.fd edk2-i386-code.fd
47 -cpy2 = FV/OVMF_VARS.fd edk2-i386-vars.fd
48 -
49 -[build.ovmf.i386.secure]
50 -desc = ovmf build (32-bit, secure boot)
51 -conf = OvmfPkg/OvmfPkgIa32.dsc
52 -arch = IA32
53 -opts = common
54 - ovmf.sb.smm
55 -plat = OvmfIa32
56 -dest = ../pc-bios
57 -cpy1 = FV/OVMF_CODE.fd edk2-i386-secure-code.fd
58 -
36 ####################################################################################
37 # x86_64
38
@@ -87,23 +64,6 @@ plat = MicrovmX64
64 dest = ../pc-bios
65 cpy1 = FV/MICROVM.fd edk2-x86_64-microvm.fd
66
90 -####################################################################################
91 -# arm
92 -
93 -[build.armvirt.arm]
94 -desc = ArmVirt build, 32-bit (arm v7)
95 -conf = ArmVirtPkg/ArmVirtQemu.dsc
96 -arch = ARM
97 -opts = common
98 - armvirt.silent
99 -pcds = nx.broken.shim.grub
100 -plat = ArmVirtQemu-ARM
101 -dest = ../pc-bios
102 -cpy1 = FV/QEMU_EFI.fd edk2-arm-code.fd
103 -cpy2 = FV/QEMU_VARS.fd edk2-arm-vars.fd
104 -pad1 = edk2-arm-code.fd 64m
105 -pad2 = edk2-arm-vars.fd 64m
106 -
67 ####################################################################################
68 # aarch64
69
@@ -114,10 +74,12 @@ arch = AARCH64
74 opts = common
75 armvirt.silent
76 pcds = nx.broken.shim.grub
117 -plat = ArmVirtQemu-AARCH64
77 +plat = ArmVirtQemu-AArch64
78 dest = ../pc-bios
79 cpy1 = FV/QEMU_EFI.fd edk2-aarch64-code.fd
80 +cpy2 = FV/QEMU_VARS.fd edk2-aarch64-vars.fd
81 pad1 = edk2-aarch64-code.fd 64m
82 +pad2 = edk2-aarch64-vars.fd 64m
83
84 ####################################################################################
85 # riscv64
tests/functional/aarch64/test_virt_vbsa.py
+1 -1
@@ -35,7 +35,7 @@ class Aarch64VirtMachine(QemuSystemTest):
35 Setup QEMU firmware blobs for boot.
36 """
37 code_path = self.build_file('pc-bios', 'edk2-aarch64-code.fd')
38 - vars_source = self.build_file('pc-bios', 'edk2-arm-vars.fd')
38 + vars_source = self.build_file('pc-bios', 'edk2-aarch64-vars.fd')
39 vars_path = self.scratch_file('vars.fd')
40 shutil.copy(vars_source, vars_path)
41
tests/qtest/bios-tables-test.c
+17 -17
@@ -1640,7 +1640,7 @@ static void test_acpi_aarch64_virt_tcg_memhp(void)
1640 .arch = "aarch64",
1641 .tcg_only = true,
1642 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
1643 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
1643 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
1644 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
1645 .ram_start = 0x40000000ULL,
1646 .scan_len = 256ULL * MiB,
@@ -1671,7 +1671,7 @@ static void test_acpi_aarch64_virt_acpi_pci_hotplug(void)
1671 .arch = "aarch64",
1672 .tcg_only = true,
1673 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
1674 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
1674 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
1675 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
1676 .ram_start = 0x40000000ULL,
1677 .scan_len = 256ULL * MiB,
@@ -1695,7 +1695,7 @@ static void test_acpi_aarch64_virt_pcie_root_port_hpoff(void)
1695 .arch = "aarch64",
1696 .tcg_only = true,
1697 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
1698 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
1698 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
1699 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
1700 .ram_start = 0x40000000ULL,
1701 .scan_len = 256ULL * MiB,
@@ -1809,7 +1809,7 @@ static void test_acpi_aarch64_virt_tcg_numamem(void)
1809 .arch = "aarch64",
1810 .tcg_only = true,
1811 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
1812 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
1812 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
1813 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
1814 .ram_start = 0x40000000ULL,
1815 .scan_len = 128ULL * MiB,
@@ -1832,7 +1832,7 @@ static void test_acpi_aarch64_virt_tcg_pxb(void)
1832 .arch = "aarch64",
1833 .tcg_only = true,
1834 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
1835 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
1835 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
1836 .ram_start = 0x40000000ULL,
1837 .scan_len = 128ULL * MiB,
1838 };
@@ -1865,7 +1865,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_spcr(void)
1865 .arch = "aarch64",
1866 .tcg_only = true,
1867 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
1868 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
1868 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
1869 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
1870 .ram_start = 0x40000000ULL,
1871 .scan_len = 128ULL * 1024 * 1024,
@@ -1945,7 +1945,7 @@ static void test_acpi_aarch64_virt_tcg_acpi_hmat(void)
1945 .arch = "aarch64",
1946 .tcg_only = true,
1947 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
1948 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
1948 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
1949 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
1950 .ram_start = 0x40000000ULL,
1951 .scan_len = 128ULL * MiB,
@@ -2221,7 +2221,7 @@ static void test_acpi_aarch64_virt_tcg(void)
2221 .arch = "aarch64",
2222 .tcg_only = true,
2223 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2224 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2224 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2225 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
2226 .ram_start = 0x40000000ULL,
2227 .scan_len = 128ULL * MiB,
@@ -2242,7 +2242,7 @@ static void test_acpi_aarch64_virt_tcg_topology(void)
2242 .variant = ".topology",
2243 .tcg_only = true,
2244 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2245 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2245 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2246 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
2247 .ram_start = 0x40000000ULL,
2248 .scan_len = 128ULL * MiB,
@@ -2265,7 +2265,7 @@ static void test_acpi_aarch64_virt_tcg_its_off(void)
2265 .variant = ".its_off",
2266 .tcg_only = true,
2267 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2268 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2268 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2269 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
2270 .ram_start = 0x40000000ULL,
2271 .scan_len = 128ULL * 1024 * 1024,
@@ -2284,7 +2284,7 @@ static void test_acpi_aarch64_virt_tcg_msi_gicv2m(void)
2284 .variant = ".msi_gicv2m",
2285 .tcg_only = true,
2286 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2287 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2287 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2288 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
2289 .ram_start = 0x40000000ULL,
2290 .scan_len = 128ULL * 1024 * 1024,
@@ -2303,7 +2303,7 @@ static void test_acpi_aarch64_virt_tcg_wdat(void)
2303 .variant = ".wdat",
2304 .tcg_only = true,
2305 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2306 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2306 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2307 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
2308 .ram_start = 0x40000000ULL,
2309 .scan_len = 128ULL * MiB,
@@ -2322,7 +2322,7 @@ static void test_acpi_aarch64_virt_tcg_gtdt_wd(void)
2322 .variant = ".gwdt",
2323 .tcg_only = true,
2324 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2325 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2325 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2326 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
2327 .ram_start = 0x40000000ULL,
2328 .scan_len = 128ULL * MiB,
@@ -2407,7 +2407,7 @@ static void test_acpi_aarch64_virt_viot(void)
2407 .variant = ".viot",
2408 .tcg_only = true,
2409 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2410 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2410 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2411 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
2412 .ram_start = 0x40000000ULL,
2413 .scan_len = 128ULL * MiB,
@@ -2425,7 +2425,7 @@ static void test_acpi_aarch64_virt_smmuv3_legacy(void)
2425 .arch = "aarch64",
2426 .tcg_only = true,
2427 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2428 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2428 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2429 .ram_start = 0x40000000ULL,
2430 .scan_len = 128ULL * MiB,
2431 };
@@ -2464,7 +2464,7 @@ static void test_acpi_aarch64_virt_smmuv3_dev(void)
2464 .arch = "aarch64",
2465 .tcg_only = true,
2466 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2467 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2467 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2468 .ram_start = 0x40000000ULL,
2469 .scan_len = 128ULL * MiB,
2470 };
@@ -2683,7 +2683,7 @@ static void test_acpi_aarch64_virt_oem_fields(void)
2683 .arch = "aarch64",
2684 .tcg_only = true,
2685 .uefi_fl1 = "pc-bios/edk2-aarch64-code.fd",
2686 - .uefi_fl2 = "pc-bios/edk2-arm-vars.fd",
2686 + .uefi_fl2 = "pc-bios/edk2-aarch64-vars.fd",
2687 .cd = "tests/data/uefi-boot-images/bios-tables-test.aarch64.iso.qcow2",
2688 .ram_start = 0x40000000ULL,
2689 .scan_len = 128ULL * MiB,