edk2: update to edk2-stable202511
cover edk2: update to edk2-stable202511
Update edk2 firmware images to latest upstream release.
Noteworthy edk2 upstream change is that 32-bit architectures (ia32 and arm) are not supported any more, so the qemu builds of these are removed too.
Gerd Hoffmann (8):
tests/acpi: enable updates
edk2: update build script
edk2: update submodule to edk2-stable202511
edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars
edk2: drop 32-bit binaries (ia32 and arm)
edk2: update binaries to edk2-stable202511
tests/acpi: update expected data files
tests/acpi: disable updates
roms/edk2-build.py | 21 +++++++--
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/edk2-aarch64-code.fd.bz2 | Bin 1565763 -> 1662423 bytes
...m-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} | Bin
pc-bios/edk2-arm-code.fd.bz2 | Bin 1570311 -> 0 bytes
pc-bios/edk2-i386-code.fd.bz2 | Bin 1780004 -> 0 bytes
pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 1858666 -> 0 bytes
pc-bios/edk2-i386-vars.fd.bz2 | Bin 190 -> 0 bytes
pc-bios/edk2-loongarch64-code.fd.bz2 | Bin 1148383 -> 1178146 bytes
pc-bios/edk2-riscv-code.fd.bz2 | Bin 1296526 -> 1252448 bytes
pc-bios/edk2-x86_64-code.fd.bz2 | Bin 1907255 -> 2138026 bytes
pc-bios/edk2-x86_64-microvm.fd.bz2 | Bin 1787244 -> 1996414 bytes
pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 1962992 -> 2293816 bytes
pc-bios/meson.build | 6 +--
roms/edk2 | 2 +-
roms/edk2-build.config | 44 ++----------------
roms/edk2-version | 4 +-
tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes
tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes
24 files changed, 39 insertions(+), 169 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
rename pc-bios/{edk2-arm-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} (100%)
delete mode 100644 pc-bios/edk2-arm-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-secure-code.fd.bz2
delete mode 100644 pc-bios/edk2-i386-vars.fd.bz2Signature · 1 line
2.52.0
PATCH 1/8 tests/acpi: enable updates
--- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 1 file changed, 2 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +2 -0
@@ -1 +1,3 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/aarch64/virt/HEST" , +"tests/data/acpi/aarch64/virt/SSDT.memhp",
Signature · 1 line
2.52.0
PATCH 2/8 edk2: update build script
In reply to Gerd Hoffmannsync with https://gitlab.com/kraxel/edk2-build-config/
--- roms/edk2-build.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
roms/edk2-build.py +17 -4
@@ -51,7 +51,17 @@ def get_toolchain(cfg, build): return cfg[build]['tool'] if cfg.has_option('global', 'tool'): return cfg['global']['tool'] - return 'GCC5' + return 'GCC' + +def get_hostarch(): + mach = os.uname().machine + if mach == 'x86_64': + return 'X64' + if mach == 'aarch64': + return 'AARCH64' + if mach == 'riscv64': + return 'RISCV64' + return 'UNKNOWN' def get_version(cfg, silent = False): coredir = get_coredir(cfg)
@@ -137,7 +147,7 @@ def build_run(cmdline, name, section, silent = False, nologs = False): print(f'### exit code: {result.returncode}') else: secs = int(time.time() - start) - print(f'### OK ({int(secs/60)}:{secs%60:02d})') + print(f'### OK ({int(secs)}sec)') else: print(cmdline, flush = True) result = subprocess.run(cmdline, check = False)
@@ -191,7 +201,10 @@ def build_one(cfg, build, jobs = None, silent = False, nologs = False): if jobs: cmdline += [ '-n', jobs ] for arch in b['arch'].split(): - cmdline += [ '-a', arch ] + if arch == 'HOST': + cmdline += [ '-a', get_hostarch() ] + else: + cmdline += [ '-a', arch ] if 'opts' in b: for name in b['opts'].split(): section = 'opts.' + name
@@ -235,7 +248,7 @@ def build_one(cfg, build, jobs = None, silent = False, nologs = False): def build_basetools(silent = False, nologs = False): build_message('building: BaseTools', silent = silent) - basedir = os.environ['EDK_TOOLS_PATH'] + basedir = os.environ['EDK_TOOLS_PATH'] + '/Source/C' cmdline = [ 'make', '-C', basedir ] build_run(cmdline, 'BaseTools', 'build.basetools', silent, nologs)
Signature · 1 line
2.52.0
PATCH 3/8 edk2: update submodule to edk2-stable202511
In reply to Gerd Hoffmann--- roms/edk2 | 2 +- roms/edk2-version | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
roms/edk2 +1 -1
@@ -1 +1 @@ -Subproject commit 4dfdca63a93497203f197ec98ba20e2327e4afe4 +Subproject commit 46548b1adac82211d8d11da12dd914f41e7aa775
roms/edk2-version +2 -2
@@ -1,2 +1,2 @@ -EDK2_STABLE = edk2-stable202408 -EDK2_DATE = 08/13/2024 +EDK2_STABLE = edk2-stable202511 +EDK2_DATE = 11/19/2025
Signature · 1 line
2.52.0
PATCH 4/8 edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars
In reply to Gerd HoffmannUpstream 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.
--- 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
tests/qtest/bios-tables-test.c +14 -14
@@ -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,
pc-bios/descriptors/50-edk2-i386-secure.json deleted +0 -34
@@ -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": [ - - ] -}
pc-bios/descriptors/60-edk2-aarch64.json +1 -1
@@ -10,7 +10,7 @@ "format": "raw" }, "nvram-template": { - "filename": "@DATADIR@/edk2-arm-vars.fd", + "filename": "@DATADIR@/edk2-aarch64-vars.fd", "format": "raw" } },
pc-bios/descriptors/60-edk2-arm.json deleted +0 -31
@@ -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": [ - - ] -}
pc-bios/descriptors/60-edk2-i386.json deleted +0 -33
@@ -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": [ - - ] -}
pc-bios/descriptors/meson.build +0 -3
@@ -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'
pc-bios/meson.build +1 -5
@@ -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',
roms/edk2-build.config +3 -41
65 lines not on this page · raw message
Signature · 1 line
2.52.0
Re: [PATCH 4/8] edk2: drop 32-bit build config (ia32 and arm), update aarch64 vars
Quoted 17 lines · Gerd Hoffmann
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 <[email protected]>--- 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(-)
Quoted 3 lines
delete mode 100644
pc-bios/descriptors/50-edk2-i386-secure.jsondelete mode 100644pc-bios/descriptors/60-edk2-arm.jsondelete mode 100644pc-bios/descriptors/60-edk2-i386.json
PATCH 7/8 tests/acpi: update expected data files
In reply to Gerd HoffmannNew firmware builds change the memory layout a bit, so some addresses in the acpi tables need an update.
--- tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes 2 files changed, 0 insertions(+), 0 deletions(-)
tests/data/acpi/aarch64/virt/HEST binary +0 -0
tests/data/acpi/aarch64/virt/SSDT.memhp binary +0 -0
Signature · 1 line
2.52.0
Re: [PATCH 7/8] tests/acpi: update expected data files
Quoted 2 lines · Gerd Hoffmann
New firmware builds change the memory layout a bit, so some addresses in the acpi tables need an update.
Please, show the diff of the disassembled tables in the commit log.
Otherwise the change is impossible to review or rebase.
Quoted 28 lines
Signed-off-by Gerd Hoffmann <[email protected]>--- tests/data/acpi/aarch64/virt/HEST | Bin 224 -> 224 bytes tests/data/acpi/aarch64/virt/SSDT.memhp | Bin 1817 -> 1817 bytes 2 files changed, 0 insertions(+), 0 deletions(-)tests/data/acpi/aarch64/virt/HEST binary +0
-0tests/data/acpi/aarch64/virt/SSDT.memhp binary +0
-0Signature · 2 lines
-- 2.52.0
PATCH 8/8 tests/acpi: disable updates
In reply to Gerd Hoffmann--- tests/qtest/bios-tables-test-allowed-diff.h | 2 -- 1 file changed, 2 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -2
@@ -1,3 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/aarch64/virt/HEST" , -"tests/data/acpi/aarch64/virt/SSDT.memhp",
Signature · 1 line
2.52.0
Quoted 5 lines · Gerd Hoffmann
Update edk2 firmware images to latest upstream release.
Noteworthy edk2 upstream change is that 32-bit architectures (ia32 and arm) are not supported any more, so the qemu builds of these are removed too.
Thanks for doing this work.
Quoted 7 lines
roms/edk2-build.py | 21 +++++++-- 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 --
Quoted 8 lines
pc-bios/edk2-aarch64-code.fd.bz2 | Bin 1565763 -> 1662423 bytes ...m-vars.fd.bz2 => edk2-aarch64-vars.fd.bz2} | Bin pc-bios/edk2-arm-code.fd.bz2 | Bin 1570311 -> 0 bytes pc-bios/edk2-i386-code.fd.bz2 | Bin 1780004 -> 0 bytes pc-bios/edk2-i386-secure-code.fd.bz2 | Bin 1858666 -> 0 bytes pc-bios/edk2-i386-vars.fd.bz2 | Bin 190 -> 0 bytes pc-bios/edk2-loongarch64-code.fd.bz2 | Bin 1148383 -> 1178146 bytes pc-bios/edk2-riscv-code.fd.bz2 | Bin 1296526 -> 1252448 bytes
Since here, could we rename this one as edk2-riscv64-code.fd.bz2 for coherency and clarity?
Quoted 3 lines
pc-bios/edk2-x86_64-code.fd.bz2 | Bin 1907255 -> 2138026 bytes pc-bios/edk2-x86_64-microvm.fd.bz2 | Bin 1787244 -> 1996414 bytes pc-bios/edk2-x86_64-secure-code.fd.bz2 | Bin 1962992 -> 2293816 bytes