From c672b9499ec8d125495831d693650c304a64cd86 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 8 Apr 2026 21:17:49 +0200 Subject: [PATCH] boot/edk2: bump to version edk2-stable202602 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For release notes since edk2-stable202511, see: https://github.com/tianocore/edk2/releases/tag/edk2-stable202602 This commit also updates the edk2-platforms packages with the last commit merged at the edk2 release date (2026-02-13), which corresponds to commit [1]. The edk2-non-osi package is not updated because it did not received any commit since the last edk2 bump. The commit removes the package patch 0001 which is included in this new version. It also adds a new patch to fix parallel build failures with a large number (>16) of processors. See: https://github.com/tianocore/edk2/pull/12199 This commit has been runtime tested with tests using EDK2 package, with commands: support/testing/run-tests \ -d dl -o output_folder \ tests.boot.test_edk2 \ tests.boot.test_grub.TestGrubAArch64EFI \ tests.boot.test_grub.TestGrubRiscV64EFI \ tests.boot.test_grub.TestGrubX8664EFI \ tests.package.test_fwts It has also been runtime tested (by booting in qemu) with defconfigs using EDK2 package: qemu_aarch64_sbsa_defconfig qemu_loongarch64_virt_efi_defconfig qemu_riscv64_virt_efi_defconfig qemu_x86_64_efi_defconfig [1] https://github.com/tianocore/edk2-platforms/commit/23625e812490e6cf66ab9e74972c6a5129bf3e2a Cc: Dick Olsson Cc: Romain Naour Cc: Vincent Stehlé Tested-by: Julien Olivain Tested-by: Vincent Stehlé Signed-off-by: Julien Olivain --- ...aseTools-EfiRom-fix-compiler-warning.patch | 46 ------------------ ...-C-VfrCompile-Fix-parallel-make-fail.patch | 48 +++++++++++++++++++ boot/edk2/edk2.hash | 2 +- boot/edk2/edk2.mk | 2 +- package/edk2-platforms/edk2-platforms.hash | 2 +- package/edk2-platforms/edk2-platforms.mk | 2 +- 6 files changed, 52 insertions(+), 50 deletions(-) delete mode 100644 boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch create mode 100644 boot/edk2/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch diff --git a/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch b/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch deleted file mode 100644 index c1e688cfe0..0000000000 --- a/boot/edk2/0001-BaseTools-EfiRom-fix-compiler-warning.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9af06ef3cbb052b142f9660c2c01e7aeb401300c Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 8 Dec 2025 10:28:50 +0100 -Subject: [PATCH] BaseTools/EfiRom: fix compiler warning -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -New warning after updating gcc: - -EfiRom.c: In function ‘main’: -EfiRom.c:78:17: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] - -The assigned value is not used, so fix the warning by just removing it. - -Signed-off-by: Gerd Hoffmann -Upstream: https://github.com/tianocore/edk2/commit/9af06ef3cbb052b142f9660c2c01e7aeb401300c -Signed-off-by: Vincent Stehlé ---- - BaseTools/Source/C/EfiRom/EfiRom.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/BaseTools/Source/C/EfiRom/EfiRom.c b/BaseTools/Source/C/EfiRom/EfiRom.c -index fa7bf0e62e..6e903b3504 100644 ---- a/BaseTools/Source/C/EfiRom/EfiRom.c -+++ b/BaseTools/Source/C/EfiRom/EfiRom.c -@@ -44,7 +44,6 @@ Returns: - FILE_LIST *FList; - UINT32 TotalSize; - UINT32 Size; -- CHAR8 *Ptr0; - - SetUtilityName(UTILITY_NAME); - -@@ -75,7 +74,7 @@ Returns: - // - if (mOptions.DumpOption == 1) { - if (mOptions.FileList != NULL) { -- if ((Ptr0 = strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) { -+ if (strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION) != NULL) { - DumpImage (mOptions.FileList); - goto BailOut; - } else { --- -2.53.0 - diff --git a/boot/edk2/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch b/boot/edk2/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch new file mode 100644 index 0000000000..020d3d7467 --- /dev/null +++ b/boot/edk2/0001-BaseTools-Source-C-VfrCompile-Fix-parallel-make-fail.patch @@ -0,0 +1,48 @@ +From 3d3af4812d29c5527e5a701d2cb7aff671fdc182 Mon Sep 17 00:00:00 2001 +From: Michael D Kinney +Date: Tue, 24 Feb 2026 21:50:20 -0800 +Subject: [PATCH] BaseTools/Source/C/VfrCompile: Fix parallel make failures + +Update makefile rules to run antlr and dlg to completion +before compiling any of the generated cpp files. + +Without this change, parallel make may start compiling some +of the cpp files before both antlr and dlg have finished +which produces syntax errors from compilation with partially +generated files. + +Also use &: so the targets are treated as a group and the +rule is only executed once for the entire group. Without +this change, parallel make may run the rule actions more +than once and modify the output while it is being used by +another rule. + +Upstream: https://github.com/tianocore/edk2/commit/9fc0aca51e83afda703963ea177feeb78a125cbc +Signed-off-by: Michael D Kinney +Signed-off-by: Julien Olivain +--- + BaseTools/Source/C/VfrCompile/GNUmakefile | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile +index b469bd3f30..4f10b1d933 100644 +--- a/BaseTools/Source/C/VfrCompile/GNUmakefile ++++ b/BaseTools/Source/C/VfrCompile/GNUmakefile +@@ -54,10 +54,11 @@ VfrCompiler.o: ../Include/Common/BuildVersion.h + + include $(MAKEROOT)/Makefiles/footer.makefile + +-VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h: Pccts/antlr/antlr VfrSyntax.g +- Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g ++ANTLR_GEN = VfrSyntax.cpp EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h ++DLG_GEN = VfrLexer.cpp VfrLexer.h + +-VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg ++$(ANTLR_GEN) $(DLG_GEN) &: Pccts/antlr/antlr Pccts/dlg/dlg VfrSyntax.g ++ Pccts/antlr/antlr -CC -e3 -ck 3 -k 2 -fl VfrParser.dlg -ft VfrTokens.h -o . VfrSyntax.g + Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg + + Pccts/antlr/antlr: +-- +2.53.0 + diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash index 8aa19bf545..ab9bbcf7ef 100644 --- a/boot/edk2/edk2.hash +++ b/boot/edk2/edk2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a8378e83060d621806b4237f6b2b9ead89d51f888d41e46e78d42b76d6594329 edk2-edk2-stable202511-git4.tar.gz +sha256 a44b47f2d233213cdb848206bda8d475b264ed1a2cf097ae9cd82581e4aa2090 edk2-edk2-stable202602-git4.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk index dba4aed513..11d9b90e7f 100644 --- a/boot/edk2/edk2.mk +++ b/boot/edk2/edk2.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDK2_VERSION = edk2-stable202511 +EDK2_VERSION = edk2-stable202602 EDK2_SITE = https://github.com/tianocore/edk2 EDK2_SITE_METHOD = git EDK2_LICENSE = BSD-2-Clause-Patent diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash index b3fa5d8424..31b84cf05a 100644 --- a/package/edk2-platforms/edk2-platforms.hash +++ b/package/edk2-platforms/edk2-platforms.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 96bb0d16d76285190663e15367d0c022a3a47230e5361d80b8549f546ad93fbe edk2-platforms-1e64c1109ae2ac0185351e8d0c19732970d4fecf.tar.gz +sha256 f06674ea8cebd2547acbff0245226bf97159d52df930b6161c4169ef0fa41215 edk2-platforms-23625e812490e6cf66ab9e74972c6a5129bf3e2a.tar.gz sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk index 7c46d9ed9f..cad3ccc5d2 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 = 1e64c1109ae2ac0185351e8d0c19732970d4fecf +EDK2_PLATFORMS_VERSION = 23625e812490e6cf66ab9e74972c6a5129bf3e2a EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION)) EDK2_PLATFORMS_LICENSE = BSD-2-Clause-Patent EDK2_PLATFORMS_LICENSE_FILES = License.txt