diff --git a/Config.in.legacy b/Config.in.legacy index a2a7b06a6d..a612203f74 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,15 @@ endif ############################################################################### +comment "Legacy options removed in 2026.05" + +config BR2_TARGET_EDK2_PLATFORM_OVMF_I386 + bool "EDK2 OVMF IA32 removed" + select BR2_LEGACY + help + EDK2 OVMF IA32 support was removed in upstream version + 202511, so it has been dropped. + comment "Legacy options removed in 2026.02" config BR2_PACKAGE_QEMU_TARGET_CRIS diff --git a/boot/edk2/Config.in b/boot/edk2/Config.in index 168fc296a2..2620c79076 100644 --- a/boot/edk2/Config.in +++ b/boot/edk2/Config.in @@ -21,20 +21,12 @@ if BR2_TARGET_EDK2 choice prompt "Platform" - default BR2_TARGET_EDK2_PLATFORM_OVMF_I386 if BR2_i386 default BR2_TARGET_EDK2_PLATFORM_OVMF_LOONGARCH64 if \ BR2_loongarch64 default BR2_TARGET_EDK2_PLATFORM_OVMF_RISCV if BR2_RISCV_64 default BR2_TARGET_EDK2_PLATFORM_OVMF_X64 if BR2_x86_64 default BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU if BR2_aarch64 -config BR2_TARGET_EDK2_PLATFORM_OVMF_I386 - bool "i386" - depends on BR2_i386 || BR2_x86_64 - help - Platform configuration for a generic i386 target. - This platform will boot from flash address 0x0. - config BR2_TARGET_EDK2_PLATFORM_OVMF_LOONGARCH64 bool "LoongArch64" depends on BR2_loongarch64 @@ -118,8 +110,7 @@ endchoice config BR2_TARGET_EDK2_OVMF_DEBUG_ON_SERIAL bool "OVMF Debug on Serial" depends on BR2_ENABLE_DEBUG - depends on BR2_TARGET_EDK2_PLATFORM_OVMF_I386 || \ - BR2_TARGET_EDK2_PLATFORM_OVMF_X64 + depends on BR2_TARGET_EDK2_PLATFORM_OVMF_X64 help When EDK2 OVMF is built with debug, messages are printed to IO port 0x402. Those messages are not shown in the normal @@ -147,7 +138,6 @@ config BR2_TARGET_EDK2_EXTRA_BUILD_OPTS config BR2_TARGET_EDK2_FD_NAME string - default "OVMF" if BR2_TARGET_EDK2_PLATFORM_OVMF_I386 default "OVMF" if BR2_TARGET_EDK2_PLATFORM_OVMF_X64 default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU default "QEMU_EFI" if BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index a7170a67cc..8aa19bf545 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 1e675a98f6bcf81fbae1141779b9e72ec28773d0e5ec77bdcc890f14502615a4 edk2-edk2-stable202508-git4.tar.gz +sha256 a8378e83060d621806b4237f6b2b9ead89d51f888d41e46e78d42b76d6594329 edk2-edk2-stable202511-git4.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index 2c089aefca..dba4aed513 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202508 +EDK2_VERSION = edk2-stable202511 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause-Patent @@ -56,14 +56,7 @@ EDK2_GIT_SUBMODULES = YES EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot EDK2_PACKAGES_PATHS = $(@D) $(EDK2_BUILD_PACKAGES) $(STAGING_DIR)/usr/share/edk2-platforms -ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_I386),y) -EDK2_ARCH = IA32 -EDK2_DEPENDENCIES += host-nasm -EDK2_PACKAGE_NAME = OvmfPkg -EDK2_PLATFORM_NAME = OvmfPkgIa32 -EDK2_BUILD_DIR = OvmfIa32 - -else ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_X64),y) +ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_X64),y) EDK2_ARCH = X64 EDK2_DEPENDENCIES += host-nasm EDK2_PACKAGE_NAME = OvmfPkg @@ -74,13 +67,13 @@ else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU),y) EDK2_ARCH = AARCH64 EDK2_PACKAGE_NAME = ArmVirtPkg EDK2_PLATFORM_NAME = ArmVirtQemu -EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-AArch64 else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_VIRT_QEMU_KERNEL),y) EDK2_ARCH = AARCH64 EDK2_PACKAGE_NAME = ArmVirtPkg EDK2_PLATFORM_NAME = ArmVirtQemuKernel -EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH) +EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-AArch64 else ifeq ($(BR2_TARGET_EDK2_PLATFORM_ARM_SGI575),y) EDK2_ARCH = AARCH64 diff --git a/package/edk2-non-osi/edk2-non-osi.hash b/package/edk2-non-osi/edk2-non-osi.hash index 27c8ee632e..b80937256a 100644 --- a/package/edk2-non-osi/edk2-non-osi.hash +++ b/package/edk2-non-osi/edk2-non-osi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a726656c45dd1e1698cc2ffd838b143197f6c574725a5c9bf42d1b01ea7f0719 edk2-non-osi-ea2040c2d4e2200557e87b9f9fbd4f8fb7a2b6e8.tar.gz +sha256 922e72db9e3930907d27ca49dc762e6cb9236d4fba8a90b0f3a321bee9efed52 edk2-non-osi-94d048981116e2e3eda52dad1a89958ee404098d.tar.gz sha256 38d73db2f9dfb32e1666d898cb9d7c1ccd78302dd9922d5fac4a9cf61fa872d9 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf diff --git a/package/edk2-non-osi/edk2-non-osi.mk b/package/edk2-non-osi/edk2-non-osi.mk index 42b45f2475..57c8fca821 100644 --- a/package/edk2-non-osi/edk2-non-osi.mk +++ b/package/edk2-non-osi/edk2-non-osi.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_NON_OSI_VERSION = ea2040c2d4e2200557e87b9f9fbd4f8fb7a2b6e8 +EDK2_NON_OSI_VERSION = 94d048981116e2e3eda52dad1a89958ee404098d EDK2_NON_OSI_SITE = $(call github,tianocore,edk2-non-osi,$(EDK2_NON_OSI_VERSION)) EDK2_NON_OSI_INSTALL_TARGET = NO EDK2_NON_OSI_INSTALL_STAGING = YES diff --git a/package/edk2-platforms/0001-Silicon-Marvell-fix-SMBIOS-type-7-structures.patch b/package/edk2-platforms/0001-Silicon-Marvell-fix-SMBIOS-type-7-structures.patch new file mode 100644 index 0000000000..9a12580a69 --- /dev/null +++ b/package/edk2-platforms/0001-Silicon-Marvell-fix-SMBIOS-type-7-structures.patch @@ -0,0 +1,80 @@ +From cb5129ba29c1851b452d54d5312bd6b3a27a1f34 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 23 Jan 2026 19:02:45 +0100 +Subject: [PATCH] Silicon/Marvell: fix SMBIOS type 7 structures +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Commit [1] updated the uses of SMBIOS type 4 and 7 structures for +Silicon/Marvell but forgot to actually use SMBIOS_CACHE_SIZE_2 +structures (introduced in commit [2]). + +Compiling this platform fails with error: + + edk2-platforms/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c:231:3: error: unsigned conversion from ‘int’ to ‘unsigned char:1’ changes value from ‘48’ to ‘0’ [-Werror=overflow] + 231 | 48, //48k installed + | ^~ + +This commit fixes this issue. + +[1] https://github.com/tianocore/edk2-platforms/commit/8390e51f56c416465a1ebb81e320a89b539cca30 +[2] https://github.com/tianocore/edk2/commit/dfac150bdfc059e486f14072c5249d4d7c200c38 + +Upstream: https://github.com/tianocore/edk2-platforms/pull/935 +Signed-off-by: Julien Olivain +--- + .../SmbiosPlatformDxe/SmbiosPlatformDxe.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c +index 16fe05a46c..d348bbb458 100644 +--- a/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c ++++ b/Silicon/Marvell/Drivers/SmbiosPlatformDxe/SmbiosPlatformDxe.c +@@ -227,8 +227,8 @@ STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1i = { + CacheTypeInstruction, //instruction cache + CacheAssociativityOther, //three way + // SMBIOS 3.1.0 fields +- 48, //48k I-cache max +- 48, //48k installed ++ {48,0},//48k I-cache max ++ {48,0},//48k installed + }; + + STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1d = { +@@ -248,8 +248,8 @@ STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l1d = { + CacheTypeData, //data cache + CacheAssociativity2Way, //two way + // SMBIOS 3.1.0 fields +- 32, //32k D-cache max +- 32, //32k installed ++ {32,0},//32k D-cache max ++ {32,0},//32k installed + }; + + STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l2 = { +@@ -269,8 +269,8 @@ STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_a72_l2 = { + CacheTypeUnified, //instruction cache + CacheAssociativity16Way, //16 way associative + // SMBIOS 3.1.0 fields +- 512, //512k D-cache max +- 512, //512k installed ++ {512,0},//512k D-cache max ++ {512,0},//512k installed + }; + + STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_l3 = { +@@ -290,8 +290,8 @@ STATIC SMBIOS_TABLE_TYPE7 mArmadaDefaultType7_l3 = { + CacheTypeUnified, //instruction cache + CacheAssociativity8Way, //8 way associative + // SMBIOS 3.1.0 fields +- 1024, //1M cache max +- 1024, //1M installed ++ {1024,0},//1M cache max ++ {1024,0},//1M installed + }; + + STATIC CONST CHAR8 *mArmadaDefaultType7Strings[] = { +-- +2.52.0 + diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index d088bcc342..b3fa5d8424 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4417db79bfb8a9bf601e94e295fec270f99eac3447a6d418ff28ea7dd374d8d6 edk2-platforms-d1b297b2aa693fc723ac883866c925e9d04260c9.tar.gz +sha256 96bb0d16d76285190663e15367d0c022a3a47230e5361d80b8549f546ad93fbe edk2-platforms-1e64c1109ae2ac0185351e8d0c19732970d4fecf.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 86b9fea960..7c46d9ed9f 100644 --- a/package/edk2-platforms/edk2-platforms.mk +++ b/package/edk2-platforms/edk2-platforms.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep in sync with latest commit as of the release date for boot/edk2 -EDK2_PLATFORMS_VERSION = d1b297b2aa693fc723ac883866c925e9d04260c9 +EDK2_PLATFORMS_VERSION = 1e64c1109ae2ac0185351e8d0c19732970d4fecf EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt