From 27b5abda3857f36014b5b0582dff5736296bedbd Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 15 Nov 2026 11:51:46 +0000 Subject: [PATCH 1/1] WIP Signed-off-by: Leah Rowe --- config/data/edk2_fs_drivers/build.list | 1 + config/data/edk2_fs_drivers/mkhelper.cfg | 4 + config/dependencies/arch | 1 + config/dependencies/debian | 1 + config/dependencies/fedora43 | 1 + config/dependencies/ubuntu2404 | 1 + config/dependencies/void | 1 + config/module/coreboot/chromebook/nuke.list | 1 + config/module/coreboot/default/nuke.list | 1 + .../module/edk2_fs_drivers/default/nuke.list | 2 + .../patches/0002-i-made-it-purple.patch | 201 ++ ...ersion-number-on-FrontPage-libreboot.patch | 35 + ...Pkg-Add-PXE-ICMP-fragment-copy-tests.patch | 289 +++ ...xeBcDxe-Fix-ICMP-buffer-overflow-in-.patch | 126 ++ ...xeBcDxe-Clear-ICMP-error-buffer-befo.patch | 37 + ...mcPciHcDxe-Don-t-force-EmbeddedSlot-.patch | 44 + ...0010-Add-support-for-legacy-payloads.patch | 185 ++ ...adPkg-Add-network-and-PXE-boot-suppo.patch | 235 ++ .../module/edk2_fs_drivers/default/target.cfg | 9 + .../default/edk2_efifspkg/module.cfg | 5 + .../default/edk2_efifspkg_gnuefi/module.cfg | 5 + .../default/edk2_efifspkg_grub/module.cfg | 5 + ...GRUB-filesystem-drivers-for-EfiFsPkg.patch | 1935 +++++++++++++++++ .../default/edk2_module_LvglPkg/module.cfg | 5 + .../default/edk2_module_TPM/module.cfg | 5 + .../default/edk2_module_boringssl/module.cfg | 5 + .../default/edk2_module_brotli/module.cfg | 5 + .../edk2_module_cloudflare-quiche/module.cfg | 5 + .../edk2_module_cmocka_edk2/module.cfg | 5 + .../edk2_module_cmocka_libspdm/module.cfg | 5 + .../default/edk2_module_corpora/module.cfg | 5 + .../module.cfg | 5 + .../module.cfg | 5 + .../edk2_module_googletest_edk2/module.cfg | 5 + .../module.cfg | 5 + .../edk2_module_gost-engine/module.cfg | 5 + .../default/edk2_module_jansson/module.cfg | 5 + .../default/edk2_module_krb5/module.cfg | 5 + .../default/edk2_module_libfdt/module.cfg | 5 + .../default/edk2_module_libprov/module.cfg | 5 + .../default/edk2_module_libspdm/module.cfg | 5 + .../edk2_fs_drivers/default/edk2_module_list | 40 + .../default/edk2_module_lvgl/module.cfg | 5 + .../edk2_module_mbedtls_edk2/module.cfg | 5 + .../edk2_module_mbedtls_libspdm/module.cfg | 5 + .../default/edk2_module_mipisyst/module.cfg | 5 + .../default/edk2_module_oniguruma/module.cfg | 5 + .../edk2_module_openssl_edk2/module.cfg | 5 + .../edk2_module_openssl_libspdm/module.cfg | 5 + .../edk2_module_oqs-provider/module.cfg | 5 + .../module.cfg | 5 + .../module.cfg | 5 + .../default/edk2_module_pugixml/module.cfg | 5 + .../edk2_module_pyca-cryptography/module.cfg | 5 + .../module.cfg | 5 + .../module.cfg | 5 + .../default/edk2_module_subhook/module.cfg | 5 + .../module.cfg | 5 + .../module.cfg | 5 + .../module.cfg | 5 + .../module.cfg | 5 + .../default/edk2_module_wolfssl/module.cfg | 5 + .../default/edk2_module_wycheproof/module.cfg | 5 + .../default/edk2_ntfs_3g/module.cfg | 5 + .../default/edk2_ntfs_3g_gnuefi/module.cfg | 5 + .../edk2_fs_drivers/default/module.list | 58 + include/fw/edk2_fs.sh | 172 ++ mk | 6 +- 68 files changed, 3605 insertions(+), 1 deletion(-) create mode 100644 config/data/edk2_fs_drivers/build.list create mode 100644 config/data/edk2_fs_drivers/mkhelper.cfg create mode 100644 config/module/edk2_fs_drivers/default/nuke.list create mode 100644 config/module/edk2_fs_drivers/default/patches/0002-i-made-it-purple.patch create mode 100644 config/module/edk2_fs_drivers/default/patches/0005-version-number-on-FrontPage-libreboot.patch create mode 100644 config/module/edk2_fs_drivers/default/patches/0006-NetworkPkg-Add-PXE-ICMP-fragment-copy-tests.patch create mode 100644 config/module/edk2_fs_drivers/default/patches/0007-NetworkPkg-UefiPxeBcDxe-Fix-ICMP-buffer-overflow-in-.patch create mode 100644 config/module/edk2_fs_drivers/default/patches/0008-NetworkPkg-UefiPxeBcDxe-Clear-ICMP-error-buffer-befo.patch create mode 100644 config/module/edk2_fs_drivers/default/patches/0009-MdeModulePkg-SdMmcPciHcDxe-Don-t-force-EmbeddedSlot-.patch create mode 100644 config/module/edk2_fs_drivers/default/patches/0010-Add-support-for-legacy-payloads.patch create mode 100644 config/module/edk2_fs_drivers/default/patches/0011-Revert-UefiPayloadPkg-Add-network-and-PXE-boot-suppo.patch create mode 100644 config/module/edk2_fs_drivers/default/target.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_efifspkg/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_efifspkg_gnuefi/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_efifspkg_grub/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_efifspkg_grub/patches/0001-Modify-GRUB-filesystem-drivers-for-EfiFsPkg.patch create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_LvglPkg/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_TPM/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_boringssl/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_brotli/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_cloudflare-quiche/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_cmocka_edk2/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_cmocka_libspdm/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_corpora/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_framework_mbedtls_edk2/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_framework_mbedtls_libspdm/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_googletest_edk2/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_googletest_mipisyst/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_gost-engine/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_jansson/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_krb5/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_libfdt/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_libprov/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_libspdm/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_list create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_lvgl/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_mbedtls_edk2/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_mbedtls_libspdm/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_mipisyst/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_oniguruma/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_openssl_edk2/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_openssl_libspdm/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_oqs-provider/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_pkcs11-provider_openssl_edk2/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_pkcs11-provider_openssl_libspdm/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_pugixml/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_pyca-cryptography/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_python-ecdsa_openssl/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_python-ecdsa_openssl_pkcs11-provider/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_subhook/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_tlsfuzzer_openssl_edk2/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_tlsfuzzer_openssl_pkcs11-provider/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_tlslite-ng_openssl_edk2/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_tlslite-ng_openssl_pkcs11-provider/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_wolfssl/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_module_wycheproof/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_ntfs_3g/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/edk2_ntfs_3g_gnuefi/module.cfg create mode 100644 config/submodule/edk2_fs_drivers/default/module.list create mode 100644 include/fw/edk2_fs.sh diff --git a/config/data/edk2_fs_drivers/build.list b/config/data/edk2_fs_drivers/build.list new file mode 100644 index 000000000..597445e09 --- /dev/null +++ b/config/data/edk2_fs_drivers/build.list @@ -0,0 +1 @@ +xbuild diff --git a/config/data/edk2_fs_drivers/mkhelper.cfg b/config/data/edk2_fs_drivers/mkhelper.cfg new file mode 100644 index 000000000..95ed5c669 --- /dev/null +++ b/config/data/edk2_fs_drivers/mkhelper.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +mkhelper="build_edk2_fs_drivers" +cpbin="y" diff --git a/config/dependencies/arch b/config/dependencies/arch index 0d6efa7b4..8e4722e51 100644 --- a/config/dependencies/arch +++ b/config/dependencies/arch @@ -9,6 +9,7 @@ help2man innoextract libftdi libgpiod libjaylink libpciaccess libusb nasm \ ncurses openssl 7zip less libx86 \ pandoc parted pciutils perl perl-libwww python python-setuptools rsync \ sharutils subversion swig texinfo ttf-dejavu unarchiver unzip wget xz zlib-ng-compat mtools imagemagick \ +lib32-glibc lib32-gcc-libs multilib-devel \ " aur_notice="bdf-unifont pcf-unifont psf-unifont mipsel-linux-gnu-binutils mipsel-linux-gnu-gcc" diff --git a/config/dependencies/debian b/config/dependencies/debian index b2a85ad69..9b1a51384 100644 --- a/config/dependencies/debian +++ b/config/dependencies/debian @@ -15,4 +15,5 @@ perl pkg-config python3 python3-distutils-extra python3-pkg-resources python3-py python3-pyelftools python3-setuptools python-is-python3 sharutils swig unar \ unifont unifont-bin unzip uuid-dev wget xfonts-unifont zlib1g-dev \ g++-mipsel-linux-gnu make genisoimage mtools libx86-1 libx86-dev libstdc++-arm-none-eabi-newlib autoconf-archive imagemagick \ +gcc-multilib g++-multilib libc6-dev-i386 \ " diff --git a/config/dependencies/fedora43 b/config/dependencies/fedora43 index deba7fdb9..c1b5bd905 100644 --- a/config/dependencies/fedora43 +++ b/config/dependencies/fedora43 @@ -13,4 +13,5 @@ python-unversioned-command python3 python3-setuptools rsync sharutils \ subversion systemd-devel texinfo unifont unifont-fonts uuid-devel \ unifont-ttf-fonts unzip wget xz zlib-ng-compat swig python3-devel \ libuuid-devel gnutls-devel tar unar libtool imagemagick \ +glibc-devel.i686 libstdc++-devel.i686 \ " diff --git a/config/dependencies/ubuntu2404 b/config/dependencies/ubuntu2404 index 6837be8f2..140cf5c3b 100755 --- a/config/dependencies/ubuntu2404 +++ b/config/dependencies/ubuntu2404 @@ -14,4 +14,5 @@ pciutils perl pkg-config python3 python3-pkg-resources python3-pycryptodome \ python3-pyelftools python3-setuptools python-is-python3 sharutils swig \ fonts-unifont unar unifont unzip uuid-dev wget zlib1g-dev \ g++-mipsel-linux-gnu make genisoimage mtools imagemagick \ +gcc-multilib g++-multilib libc6-dev-i386 \ " diff --git a/config/dependencies/void b/config/dependencies/void index 6f010f063..8a7d48f21 100644 --- a/config/dependencies/void +++ b/config/dependencies/void @@ -9,4 +9,5 @@ gnutls-devel help2man innoextract libftdi1 libpciaccess libusb libuuid-devel \ nasm ncurses ncurses-devel openssl openssl-devel 7zip parted pciutils perl \ perl-LWP python python3 python3-devel python3-setuptools rsync sharutils \ subversion swig texinfo unar unzip wget xz zlib-ng ImageMagick \ +glibc-devel-32bit libgcc-32bit libstdc++-devel-32bit \ " diff --git a/config/module/coreboot/chromebook/nuke.list b/config/module/coreboot/chromebook/nuke.list index 3ea63709d..30b585ea9 100644 --- a/config/module/coreboot/chromebook/nuke.list +++ b/config/module/coreboot/chromebook/nuke.list @@ -4,3 +4,4 @@ 3rdparty/amd_blobs 3rdparty/intel-microcode payloads/external/edk2/edk2_src/UefiPayloadPkg/NetworkDrivers +payloads/external/edk2/edk2_src/FSDrivers diff --git a/config/module/coreboot/default/nuke.list b/config/module/coreboot/default/nuke.list index 6db2850af..fc399a819 100644 --- a/config/module/coreboot/default/nuke.list +++ b/config/module/coreboot/default/nuke.list @@ -1,2 +1,3 @@ 3rdparty/vboot/tests payloads/external/edk2/edk2_src/UefiPayloadPkg/NetworkDrivers +payloads/external/edk2/edk2_src/FSDrivers diff --git a/config/module/edk2_fs_drivers/default/nuke.list b/config/module/edk2_fs_drivers/default/nuke.list new file mode 100644 index 000000000..81c0bca9d --- /dev/null +++ b/config/module/edk2_fs_drivers/default/nuke.list @@ -0,0 +1,2 @@ +UefiPayloadPkg/NetworkDrivers +FSDrivers diff --git a/config/module/edk2_fs_drivers/default/patches/0002-i-made-it-purple.patch b/config/module/edk2_fs_drivers/default/patches/0002-i-made-it-purple.patch new file mode 100644 index 000000000..2b800854b --- /dev/null +++ b/config/module/edk2_fs_drivers/default/patches/0002-i-made-it-purple.patch @@ -0,0 +1,201 @@ +From 5cf330f95997865077439f2024ff11d013ca7d60 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Wed, 7 Oct 2026 17:48:56 +0100 +Subject: [PATCH 2/9] i made it purple + +Signed-off-by: Leah Rowe +--- + ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 2 +- + EmulatorPkg/Library/PlatformBmLib/PlatformBm.c | 7 +++++-- + .../Console/GraphicsConsoleDxe/GraphicsConsole.c | 2 +- + .../Console/GraphicsOutputDxe/GraphicsOutput.c | 6 +++--- + MdeModulePkg/Universal/HiiDatabaseDxe/Font.c | 2 +- + OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 2 +- + .../Library/PlatformBootManagerLibBhyve/BdsPlatform.c | 2 +- + .../Library/PlatformBootManagerLibLight/PlatformBm.c | 2 +- + .../Library/PlatformBootManagerLib/PlatformBm.c | 2 +- + UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c | 6 +++--- + .../PlatformBootManagerLib/PlatformBootManager.c | 10 ++++++++-- + 11 files changed, 26 insertions(+), 17 deletions(-) + +diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +index ea093bb725..b2201141a3 100644 +--- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c ++++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c +@@ -1083,7 +1083,7 @@ PlatformBootManagerWaitCallback ( + + Timeout = PcdGet16 (PcdPlatformBootTimeOut); + +- Black.Raw = 0x00000000; ++ Black.Raw = 0x00280b22; + White.Raw = 0x00FFFFFF; + + Status = BootLogoUpdateProgress ( +diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.c b/EmulatorPkg/Library/PlatformBmLib/PlatformBm.c +index 774075d55a..cfd5bcfe40 100644 +--- a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.c ++++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBm.c +@@ -301,7 +301,10 @@ PlatformBdsRegisterStaticBootOptions ( + EFI_BOOT_MANAGER_LOAD_OPTION BootOption; + UINTN OptionNumber; + +- Black.Blue = Black.Green = Black.Red = Black.Reserved = 0; ++ Black.Blue = 0x22; ++ Black.Green = 0xb; ++ Black.Red = 0x28; ++ Black.Reserved = 0; + White.Blue = White.Green = White.Red = White.Reserved = 0xFF; + + // +@@ -426,7 +429,7 @@ PlatformBootManagerWaitCallback ( + + Timeout = PcdGet16 (PcdPlatformBootTimeOut); + +- Black.Raw = 0x00000000; ++ Black.Raw = 0x00280b22; + White.Raw = 0x00FFFFFF; + + BootLogoUpdateProgress ( +diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c +index 170dc7d002..3af2779384 100644 +--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c ++++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c +@@ -66,7 +66,7 @@ EFI_GRAPHICS_OUTPUT_BLT_PIXEL mGraphicsEfiColors[16] = { + // + // B G R reserved + // +- { 0x00, 0x00, 0x00, 0x00 }, // BLACK ++ { 0x22, 0x0b, 0x28, 0x00 }, // BLACK + { 0x98, 0x00, 0x00, 0x00 }, // LIGHTBLUE + { 0x00, 0x98, 0x00, 0x00 }, // LIGHGREEN + { 0x98, 0x98, 0x00, 0x00 }, // LIGHCYAN +diff --git a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c b/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c +index 2259d6d4ea..71bc8a9ade 100644 +--- a/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c ++++ b/MdeModulePkg/Universal/Console/GraphicsOutputDxe/GraphicsOutput.c +@@ -88,9 +88,9 @@ GraphicsOutputSetMode ( + + Private = GRAPHICS_OUTPUT_PRIVATE_FROM_THIS (This); + +- Black.Blue = 0; +- Black.Green = 0; +- Black.Red = 0; ++ Black.Blue = 0x22; ++ Black.Green = 0xb; ++ Black.Red = 0x28; + Black.Reserved = 0; + + Status = FrameBufferBlt ( +diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c +index 8a0b12f72f..fd1a883f48 100644 +--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c ++++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c +@@ -13,7 +13,7 @@ EFI_GRAPHICS_OUTPUT_BLT_PIXEL mHiiEfiColors[16] = { + // + // B G R + // +- { 0x00, 0x00, 0x00, 0x00 }, // BLACK ++ { 0x22, 0x0b, 0x28, 0x00 }, // BLACK + { 0x98, 0x00, 0x00, 0x00 }, // BLUE + { 0x00, 0x98, 0x00, 0x00 }, // GREEN + { 0x98, 0x98, 0x00, 0x00 }, // CYAN +diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +index 3edb92fabc..1a111342d8 100644 +--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c ++++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +@@ -1844,7 +1844,7 @@ PlatformBootManagerWaitCallback ( + return; + } + +- Black.Raw = 0x00000000; ++ Black.Raw = 0x00280b22; + White.Raw = 0x00FFFFFF; + + BootLogoUpdateProgress ( +diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c +index 4489eaae0b..a6c92310d7 100644 +--- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c ++++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c +@@ -1712,7 +1712,7 @@ PlatformBootManagerWaitCallback ( + + Timeout = PcdGet16 (PcdPlatformBootTimeOut); + +- Black.Raw = 0x00000000; ++ Black.Raw = 0x00280b22; + White.Raw = 0x00FFFFFF; + + BootLogoUpdateProgress ( +diff --git a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c +index 2c24c65489..1a81b58eab 100644 +--- a/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c ++++ b/OvmfPkg/Library/PlatformBootManagerLibLight/PlatformBm.c +@@ -1082,7 +1082,7 @@ PlatformBootManagerWaitCallback ( + return; + } + +- Black.Raw = 0x00000000; ++ Black.Raw = 0x00280b22; + White.Raw = 0x00FFFFFF; + + BootLogoUpdateProgress ( +diff --git a/OvmfPkg/RiscVVirt/Library/PlatformBootManagerLib/PlatformBm.c b/OvmfPkg/RiscVVirt/Library/PlatformBootManagerLib/PlatformBm.c +index 44fd21f74f..e5fbd3ba4c 100644 +--- a/OvmfPkg/RiscVVirt/Library/PlatformBootManagerLib/PlatformBm.c ++++ b/OvmfPkg/RiscVVirt/Library/PlatformBootManagerLib/PlatformBm.c +@@ -1003,7 +1003,7 @@ PlatformBootManagerWaitCallback ( + return; + } + +- Black.Raw = 0x00000000; ++ Black.Raw = 0x00280b22; + White.Raw = 0x00FFFFFF; + + BootLogoUpdateProgress ( +diff --git a/UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c b/UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c +index 74c1ce12cf..a44d6c9c87 100644 +--- a/UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c ++++ b/UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutput.c +@@ -88,9 +88,9 @@ GraphicsOutputSetMode ( + + Private = GRAPHICS_OUTPUT_PRIVATE_FROM_THIS (This); + +- Black.Blue = 0; +- Black.Green = 0; +- Black.Red = 0; ++ Black.Blue = 0x22; ++ Black.Green = 0xb; ++ Black.Red = 0x28; + Black.Reserved = 0; + + Status = FrameBufferBlt ( +diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +index 912058bf7e..c05b574c83 100644 +--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c ++++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +@@ -279,7 +279,10 @@ BootManagerEntryNotifyCallback ( + // + static UINTN UpdateProgressMessage = 1; + +- Black.Blue = Black.Green = Black.Red = Black.Reserved = 0; ++ Black.Blue = 0x22; ++ Black.Green = 0xb; ++ Black.Red = 0x28; ++ Black.Reserved = 0; + White.Blue = White.Green = White.Red = White.Reserved = 0xFF; + + if (UpdateProgressMessage) { +@@ -470,7 +473,10 @@ PlatformBootManagerAfterConsole ( + EFI_GRAPHICS_OUTPUT_BLT_PIXEL White; + EFI_STATUS Status; + +- Black.Blue = Black.Green = Black.Red = Black.Reserved = 0; ++ Black.Blue = 0x22; ++ Black.Green = 0xb; ++ Black.Red = 0x28; ++ Black.Reserved = 0; + White.Blue = White.Green = White.Red = White.Reserved = 0xFF; + + // +-- +2.47.3 + diff --git a/config/module/edk2_fs_drivers/default/patches/0005-version-number-on-FrontPage-libreboot.patch b/config/module/edk2_fs_drivers/default/patches/0005-version-number-on-FrontPage-libreboot.patch new file mode 100644 index 000000000..ee826e75c --- /dev/null +++ b/config/module/edk2_fs_drivers/default/patches/0005-version-number-on-FrontPage-libreboot.patch @@ -0,0 +1,35 @@ +From 326101531a60003e1e5a65b1d40f18cb453f67a2 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Fri, 9 Oct 2026 16:41:34 +0100 +Subject: [PATCH 5/9] version number on FrontPage (libreboot) + +Signed-off-by: Leah Rowe +--- + MdeModulePkg/Application/UiApp/FrontPage.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/MdeModulePkg/Application/UiApp/FrontPage.c +index 8765020180..b59206b79f 100644 +--- a/MdeModulePkg/Application/UiApp/FrontPage.c ++++ b/MdeModulePkg/Application/UiApp/FrontPage.c +@@ -830,14 +830,11 @@ UpdateFrontPageBannerStrings ( + GetOptionalStringByIndex ((CHAR8 *)((UINT8 *)Type0Record + Type0Record->Hdr.Length), VersionIdx, &FwVersion); + GetOptionalStringByIndex ((CHAR8 *)((UINT8 *)Type0Record + Type0Record->Hdr.Length), DateIdx, &FwDate); + +- // Allocate buffer: " FW: " (5) + version + " " (1) + date + null +- BufferSize = (5 + StrLen (FwVersion) + 1 + StrLen (FwDate) + 1) * sizeof (CHAR16); ++ // Allocate buffer: " Libreboot 26.11 Rubber Duck - https://libreboot.org/" + null ++ BufferSize = 54 * sizeof (CHAR16); + TmpBuffer = AllocateZeroPool (BufferSize); + +- StrCatS (TmpBuffer, BufferSize / sizeof (CHAR16), L" FW: "); +- StrCatS (TmpBuffer, BufferSize / sizeof (CHAR16), FwVersion); +- StrCatS (TmpBuffer, BufferSize / sizeof (CHAR16), L" "); +- StrCatS (TmpBuffer, BufferSize / sizeof (CHAR16), FwDate); ++ StrCatS (TmpBuffer, BufferSize / sizeof (CHAR16), L" Libreboot 26.11 Rubber Duck - https://libreboot.org/"); + + HiiSetString (gFrontPagePrivate.HiiHandle, STRING_TOKEN (STR_FRONT_PAGE_BIOS_VERSION), TmpBuffer, NULL); + +-- +2.47.3 + diff --git a/config/module/edk2_fs_drivers/default/patches/0006-NetworkPkg-Add-PXE-ICMP-fragment-copy-tests.patch b/config/module/edk2_fs_drivers/default/patches/0006-NetworkPkg-Add-PXE-ICMP-fragment-copy-tests.patch new file mode 100644 index 000000000..ad72e9c36 --- /dev/null +++ b/config/module/edk2_fs_drivers/default/patches/0006-NetworkPkg-Add-PXE-ICMP-fragment-copy-tests.patch @@ -0,0 +1,289 @@ +From fc6c8d07d1fec40c1eda20889768b8032b793abb Mon Sep 17 00:00:00 2001 +From: Michael D Kinney +Date: Wed, 7 Oct 2026 11:30:58 -0700 +Subject: [PATCH 6/9] NetworkPkg: Add PXE ICMP fragment-copy tests + +Test IPv4/IPv6 fragment packing, truncation, and TFTP-buffer integrity. + +Signed-off-by: Michael D Kinney +--- + .../GoogleTest/PxeBcSupportGoogleTest.cpp | 254 ++++++++++++++++++ + .../GoogleTest/UefiPxeBcDxeGoogleTest.inf | 1 + + 2 files changed, 255 insertions(+) + create mode 100644 NetworkPkg/UefiPxeBcDxe/GoogleTest/PxeBcSupportGoogleTest.cpp + +diff --git a/NetworkPkg/UefiPxeBcDxe/GoogleTest/PxeBcSupportGoogleTest.cpp b/NetworkPkg/UefiPxeBcDxe/GoogleTest/PxeBcSupportGoogleTest.cpp +new file mode 100644 +index 0000000000..52b4d2d03e +--- /dev/null ++++ b/NetworkPkg/UefiPxeBcDxe/GoogleTest/PxeBcSupportGoogleTest.cpp +@@ -0,0 +1,254 @@ ++/** @file ++ Host-based tests for PxeBcSupport.c. ++ ++ Copyright (c) 2026, Intel Corporation. All rights reserved.
++ SPDX-License-Identifier: BSD-2-Clause-Patent ++**/ ++ ++#include ++#include ++ ++extern "C" { ++ #include ++ #include ++ #include ++ #include "../PxeBcImpl.h" ++} ++ ++extern "C" { ++ VOID ++ EFIAPI ++ PxeBcIcmpErrorDpcHandle ( ++ IN VOID *Context ++ ); ++ ++ VOID ++ EFIAPI ++ PxeBcIcmp6ErrorDpcHandle ( ++ IN VOID *Context ++ ); ++} ++ ++#define ICMP_TEST_FRAGMENT_COUNT 3 ++#define ICMP_TEST_FRAGMENT_LENGTH 200 ++ ++static EFI_STATUS ++EFIAPI ++MockSignalEvent ( ++ IN EFI_EVENT Event ++ ) ++{ ++ return EFI_SUCCESS; ++} ++ ++static EFI_STATUS ++EFIAPI ++MockIp4Receive ( ++ IN EFI_IP4_PROTOCOL *This, ++ IN EFI_IP4_COMPLETION_TOKEN *Token ++ ) ++{ ++ return EFI_SUCCESS; ++} ++ ++static EFI_STATUS ++EFIAPI ++MockIp6Receive ( ++ IN EFI_IP6_PROTOCOL *This, ++ IN EFI_IP6_COMPLETION_TOKEN *Token ++ ) ++{ ++ return EFI_SUCCESS; ++} ++ ++static VOID ++InitializeIcmpFragments ( ++ OUT UINT8 FragmentBuffers[ICMP_TEST_FRAGMENT_COUNT][ICMP_TEST_FRAGMENT_LENGTH], ++ IN UINT8 ErrorType ++ ) ++{ ++ UINTN Index; ++ ++ for (Index = 0; Index < ICMP_TEST_FRAGMENT_COUNT; Index++) { ++ SetMem (FragmentBuffers[Index], ICMP_TEST_FRAGMENT_LENGTH, (UINT8)(0x10 + Index)); ++ } ++ ++ FragmentBuffers[0][0] = ErrorType; ++} ++ ++static VOID ++ExpectMemoryMatches ( ++ IN CONST CHAR8 *BufferDescription, ++ IN CONST VOID *ActualBuffer, ++ IN CONST VOID *ExpectedBuffer, ++ IN UINTN BufferLength ++ ) ++{ ++ CONST UINT8 *ActualBytes; ++ CONST UINT8 *ExpectedBytes; ++ UINTN Index; ++ ++ ActualBytes = (CONST UINT8 *)ActualBuffer; ++ ExpectedBytes = (CONST UINT8 *)ExpectedBuffer; ++ for (Index = 0; Index < BufferLength; Index++) { ++ if (ActualBytes[Index] != ExpectedBytes[Index]) { ++ EXPECT_EQ ((UINT32)ActualBytes[Index], (UINT32)ExpectedBytes[Index]) ++ << BufferDescription << " mismatch at byte offset " << Index; ++ return; ++ } ++ } ++} ++ ++static VOID ++ExpectIcmpErrorAndTftpErrorUnchanged ( ++ IN EFI_PXE_BASE_CODE_MODE *Mode, ++ IN UINT8 FragmentBuffers[ICMP_TEST_FRAGMENT_COUNT][ICMP_TEST_FRAGMENT_LENGTH], ++ IN EFI_PXE_BASE_CODE_TFTP_ERROR *TftpErrorBefore ++ ) ++{ ++ UINT8 Expected[sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)]; ++ ++ CopyMem ( ++ Expected, ++ FragmentBuffers[0], ++ ICMP_TEST_FRAGMENT_LENGTH ++ ); ++ CopyMem ( ++ Expected + ICMP_TEST_FRAGMENT_LENGTH, ++ FragmentBuffers[1], ++ ICMP_TEST_FRAGMENT_LENGTH ++ ); ++ CopyMem ( ++ Expected + (2 * ICMP_TEST_FRAGMENT_LENGTH), ++ FragmentBuffers[2], ++ sizeof (Expected) - (2 * ICMP_TEST_FRAGMENT_LENGTH) ++ ); ++ ++ ExpectMemoryMatches ( ++ "Gaps detected in packed ICMP error output buffer", ++ &Mode->IcmpError, ++ Expected, ++ sizeof (Expected) ++ ); ++ ExpectMemoryMatches ( ++ "Buffer overflow detected: adjacent TFTP error buffer was modified", ++ &Mode->TftpError, ++ TftpErrorBefore, ++ sizeof (*TftpErrorBefore) ++ ); ++} ++ ++class PxeBcIcmpErrorCopyTest : public ::testing::Test { ++protected: ++ EFI_SIGNAL_EVENT OriginalSignalEvent; ++ ++ void ++ SetUp ( ++ ) override ++ { ++ OriginalSignalEvent = gBS->SignalEvent; ++ gBS->SignalEvent = MockSignalEvent; ++ } ++ ++ void ++ TearDown ( ++ ) override ++ { ++ gBS->SignalEvent = OriginalSignalEvent; ++ } ++}; ++ ++TEST_F (PxeBcIcmpErrorCopyTest, Ipv4FragmentsAreTruncatedAtBufferEnd) { ++ PXEBC_PRIVATE_DATA Private = { 0 }; ++ EFI_IP4_PROTOCOL Ip4 = { 0 }; ++ EFI_IP4_HEADER Header = { 0 }; ++ UINT8 FragmentBuffers[ICMP_TEST_FRAGMENT_COUNT][ICMP_TEST_FRAGMENT_LENGTH]; ++ EFI_IP4_RECEIVE_DATA *RxData; ++ EFI_IP4_COMPLETION_TOKEN *Token; ++ EFI_PXE_BASE_CODE_TFTP_ERROR TftpErrorBefore; ++ UINTN RxDataSize; ++ UINTN Index; ++ ++ InitializeIcmpFragments (FragmentBuffers, ICMP_DEST_UNREACHABLE); ++ ++ RxDataSize = sizeof (EFI_IP4_RECEIVE_DATA) + ++ (sizeof (EFI_IP4_FRAGMENT_DATA) * (ICMP_TEST_FRAGMENT_COUNT - 1)); ++ RxData = (EFI_IP4_RECEIVE_DATA *)AllocateZeroPool (RxDataSize); ++ ASSERT_NE (RxData, nullptr); ++ ++ RxData->Header = &Header; ++ RxData->FragmentCount = ICMP_TEST_FRAGMENT_COUNT; ++ Header.Protocol = EFI_IP_PROTO_ICMP; ++ for (Index = 0; Index < ICMP_TEST_FRAGMENT_COUNT; Index++) { ++ RxData->FragmentTable[Index].FragmentBuffer = FragmentBuffers[Index]; ++ RxData->FragmentTable[Index].FragmentLength = ICMP_TEST_FRAGMENT_LENGTH; ++ } ++ ++ Private.Mode.UsingIpv6 = FALSE; ++ Private.Ip4 = &Ip4; ++ Ip4.Receive = MockIp4Receive; ++ Token = &Private.IcmpToken; ++ Token->Status = EFI_ICMP_ERROR; ++ Token->Packet.RxData = RxData; ++ ++ SetMem (&Private.Mode.TftpError, sizeof (Private.Mode.TftpError), 0xA5); ++ CopyMem ( ++ &TftpErrorBefore, ++ &Private.Mode.TftpError, ++ sizeof (TftpErrorBefore) ++ ); ++ ++ PxeBcIcmpErrorDpcHandle (&Private); ++ ++ ExpectIcmpErrorAndTftpErrorUnchanged (&Private.Mode, FragmentBuffers, &TftpErrorBefore); ++ FreePool (RxData); ++} ++ ++TEST_F (PxeBcIcmpErrorCopyTest, Ipv6FragmentsAreTruncatedAtBufferEnd) { ++ PXEBC_PRIVATE_DATA Private = { 0 }; ++ EFI_IP6_PROTOCOL Ip6 = { 0 }; ++ EFI_IP6_HEADER Header = { 0 }; ++ UINT8 FragmentBuffers[ICMP_TEST_FRAGMENT_COUNT][ICMP_TEST_FRAGMENT_LENGTH]; ++ EFI_IP6_RECEIVE_DATA *RxData; ++ EFI_IP6_COMPLETION_TOKEN *Token; ++ EFI_PXE_BASE_CODE_TFTP_ERROR TftpErrorBefore; ++ UINTN RxDataSize; ++ UINTN Index; ++ ++ InitializeIcmpFragments (FragmentBuffers, ICMP_V6_DEST_UNREACHABLE); ++ ++ RxDataSize = sizeof (EFI_IP6_RECEIVE_DATA) + ++ (sizeof (EFI_IP6_FRAGMENT_DATA) * (ICMP_TEST_FRAGMENT_COUNT - 1)); ++ RxData = (EFI_IP6_RECEIVE_DATA *)AllocateZeroPool (RxDataSize); ++ ASSERT_NE (RxData, nullptr); ++ ++ RxData->Header = &Header; ++ RxData->FragmentCount = ICMP_TEST_FRAGMENT_COUNT; ++ Header.NextHeader = IP6_ICMP; ++ Header.SourceAddress.Addr[0] = 0x20; ++ Header.SourceAddress.Addr[1] = 0x01; ++ Header.SourceAddress.Addr[15] = 0x01; ++ for (Index = 0; Index < ICMP_TEST_FRAGMENT_COUNT; Index++) { ++ RxData->FragmentTable[Index].FragmentBuffer = FragmentBuffers[Index]; ++ RxData->FragmentTable[Index].FragmentLength = ICMP_TEST_FRAGMENT_LENGTH; ++ } ++ ++ Private.Mode.UsingIpv6 = TRUE; ++ Private.Ip6 = &Ip6; ++ Ip6.Receive = MockIp6Receive; ++ Token = &Private.Icmp6Token; ++ Token->Status = EFI_ICMP_ERROR; ++ Token->Packet.RxData = RxData; ++ ++ SetMem (&Private.Mode.TftpError, sizeof (Private.Mode.TftpError), 0xA5); ++ CopyMem ( ++ &TftpErrorBefore, ++ &Private.Mode.TftpError, ++ sizeof (TftpErrorBefore) ++ ); ++ ++ PxeBcIcmp6ErrorDpcHandle (&Private); ++ ++ ExpectIcmpErrorAndTftpErrorUnchanged (&Private.Mode, FragmentBuffers, &TftpErrorBefore); ++ FreePool (RxData); ++} +diff --git a/NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf b/NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf +index 8b092d9291..d6ce0dba61 100644 +--- a/NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf ++++ b/NetworkPkg/UefiPxeBcDxe/GoogleTest/UefiPxeBcDxeGoogleTest.inf +@@ -20,6 +20,7 @@ VERSION_STRING = 1.0 + [Sources] + UefiPxeBcDxeGoogleTest.cpp + PxeBcDhcp6GoogleTest.cpp ++ PxeBcSupportGoogleTest.cpp + PxeBcDhcp6GoogleTest.h + ../PxeBcDhcp6.c + ../PxeBcSupport.c +-- +2.47.3 + diff --git a/config/module/edk2_fs_drivers/default/patches/0007-NetworkPkg-UefiPxeBcDxe-Fix-ICMP-buffer-overflow-in-.patch b/config/module/edk2_fs_drivers/default/patches/0007-NetworkPkg-UefiPxeBcDxe-Fix-ICMP-buffer-overflow-in-.patch new file mode 100644 index 000000000..3f5bbc523 --- /dev/null +++ b/config/module/edk2_fs_drivers/default/patches/0007-NetworkPkg-UefiPxeBcDxe-Fix-ICMP-buffer-overflow-in-.patch @@ -0,0 +1,126 @@ +From 73e8fe74924447b7362b1ce5092370c6987ace55 Mon Sep 17 00:00:00 2001 +From: santhoshkumarv +Date: Mon, 28 Sep 2026 06:06:24 -0700 +Subject: [PATCH 7/9] NetworkPkg/UefiPxeBcDxe: Fix ICMP buffer overflow in + IPv4/IPv6 handlers (CVE-2026-97631) + +Root Cause: +Incorrect buffer copy logic in ICMP error handling allowed large packets +to write beyond the allocated buffer. This could overwrite adjacent memory +with attacker-controlled data, causing memory corruption. + +Resolution: +Added proper boundary checks and corrected buffer offset calculations +in IPv4 and IPv6 ICMP error handlers. Over sized ICMP error packets are now +safely truncated when the buffer is full, preventing memory corruption. + +Signed-off-by: santhoshkumarV +--- + NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c | 68 ++++++++++---------------- + 1 file changed, 26 insertions(+), 42 deletions(-) + +diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c +index 887ea3e7d7..9e97ba4904 100644 +--- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c ++++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c +@@ -252,6 +252,7 @@ PxeBcIcmpErrorDpcHandle ( + UINTN Index; + UINT32 CopiedLen; + UINT8 *IcmpError; ++ UINT32 FragmentLen; + + Private = (PXEBC_PRIVATE_DATA *)Context; + Mode = &Private->Mode; +@@ -317,28 +318,19 @@ PxeBcIcmpErrorDpcHandle ( + } + + // +- // Copy the right ICMP error message into mode data. ++ // Copy ICMP error fragments into Mode->IcmpError in order. The maximum ++ // buffer size is sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR); truncate any excess. + // +- CopiedLen = 0; +- IcmpError = (UINT8 *)&Mode->IcmpError; +- +- for (Index = 0; Index < RxData->FragmentCount; Index++) { +- CopiedLen += RxData->FragmentTable[Index].FragmentLength; +- if (CopiedLen <= sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)) { +- CopyMem ( +- IcmpError, +- RxData->FragmentTable[Index].FragmentBuffer, +- RxData->FragmentTable[Index].FragmentLength +- ); +- } else { +- CopyMem ( +- IcmpError, +- RxData->FragmentTable[Index].FragmentBuffer, +- CopiedLen - sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR) +- ); +- } +- +- IcmpError += CopiedLen; ++ for (Index = 0, IcmpError = (UINT8 *)&Mode->IcmpError, CopiedLen = 0; ++ (Index < RxData->FragmentCount) && ++ (CopiedLen < sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)); ++ Index++, IcmpError += FragmentLen, CopiedLen += FragmentLen) ++ { ++ FragmentLen = MIN ( ++ RxData->FragmentTable[Index].FragmentLength, ++ (UINT32)(sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR) - CopiedLen) ++ ); ++ CopyMem (IcmpError, RxData->FragmentTable[Index].FragmentBuffer, FragmentLen); + } + + ON_RECYCLE: +@@ -387,6 +379,7 @@ PxeBcIcmp6ErrorDpcHandle ( + UINT8 Type; + UINT32 CopiedLen; + UINT8 *Icmp6Error; ++ UINT32 FragmentLen; + + Private = (PXEBC_PRIVATE_DATA *)Context; + Mode = &Private->Mode; +@@ -449,28 +442,19 @@ PxeBcIcmp6ErrorDpcHandle ( + } + + // +- // Copy the right ICMP6 error message into mode data. ++ // Copy ICMP error fragments into Mode->IcmpError in order. The maximum ++ // buffer size is sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR); truncate any excess. + // +- CopiedLen = 0; +- Icmp6Error = (UINT8 *)&Mode->IcmpError; +- +- for (Index = 0; Index < RxData->FragmentCount; Index++) { +- CopiedLen += RxData->FragmentTable[Index].FragmentLength; +- if (CopiedLen <= sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)) { +- CopyMem ( +- Icmp6Error, +- RxData->FragmentTable[Index].FragmentBuffer, +- RxData->FragmentTable[Index].FragmentLength +- ); +- } else { +- CopyMem ( +- Icmp6Error, +- RxData->FragmentTable[Index].FragmentBuffer, +- CopiedLen - sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR) +- ); +- } +- +- Icmp6Error += CopiedLen; ++ for (Index = 0, Icmp6Error = (UINT8 *)&Mode->IcmpError, CopiedLen = 0; ++ (Index < RxData->FragmentCount) && ++ (CopiedLen < sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)); ++ Index++, Icmp6Error += FragmentLen, CopiedLen += FragmentLen) ++ { ++ FragmentLen = MIN ( ++ RxData->FragmentTable[Index].FragmentLength, ++ (UINT32)(sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR) - CopiedLen) ++ ); ++ CopyMem (Icmp6Error, RxData->FragmentTable[Index].FragmentBuffer, FragmentLen); + } + + ON_RECYCLE: +-- +2.47.3 + diff --git a/config/module/edk2_fs_drivers/default/patches/0008-NetworkPkg-UefiPxeBcDxe-Clear-ICMP-error-buffer-befo.patch b/config/module/edk2_fs_drivers/default/patches/0008-NetworkPkg-UefiPxeBcDxe-Clear-ICMP-error-buffer-befo.patch new file mode 100644 index 000000000..e678e73c4 --- /dev/null +++ b/config/module/edk2_fs_drivers/default/patches/0008-NetworkPkg-UefiPxeBcDxe-Clear-ICMP-error-buffer-befo.patch @@ -0,0 +1,37 @@ +From fb6bbb1e29d4f0b3905282fbc3ba5ce7afc09d17 Mon Sep 17 00:00:00 2001 +From: Michael D Kinney +Date: Wed, 14 Oct 2026 12:34:35 -0700 +Subject: [PATCH 8/9] NetworkPkg/UefiPxeBcDxe: Clear ICMP error buffer before + copying + +Zero the ICMP error buffer before copying fragments so short packets do not +leave stale bytes from a previous error. + +Signed-off-by: Michael D Kinney +--- + NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c +index 9e97ba4904..7795e4f187 100644 +--- a/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c ++++ b/NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c +@@ -321,6 +321,7 @@ PxeBcIcmpErrorDpcHandle ( + // Copy ICMP error fragments into Mode->IcmpError in order. The maximum + // buffer size is sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR); truncate any excess. + // ++ ZeroMem (&Mode->IcmpError, sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)); + for (Index = 0, IcmpError = (UINT8 *)&Mode->IcmpError, CopiedLen = 0; + (Index < RxData->FragmentCount) && + (CopiedLen < sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)); +@@ -445,6 +446,7 @@ PxeBcIcmp6ErrorDpcHandle ( + // Copy ICMP error fragments into Mode->IcmpError in order. The maximum + // buffer size is sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR); truncate any excess. + // ++ ZeroMem (&Mode->IcmpError, sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)); + for (Index = 0, Icmp6Error = (UINT8 *)&Mode->IcmpError, CopiedLen = 0; + (Index < RxData->FragmentCount) && + (CopiedLen < sizeof (EFI_PXE_BASE_CODE_ICMP_ERROR)); +-- +2.47.3 + diff --git a/config/module/edk2_fs_drivers/default/patches/0009-MdeModulePkg-SdMmcPciHcDxe-Don-t-force-EmbeddedSlot-.patch b/config/module/edk2_fs_drivers/default/patches/0009-MdeModulePkg-SdMmcPciHcDxe-Don-t-force-EmbeddedSlot-.patch new file mode 100644 index 000000000..4785a7638 --- /dev/null +++ b/config/module/edk2_fs_drivers/default/patches/0009-MdeModulePkg-SdMmcPciHcDxe-Don-t-force-EmbeddedSlot-.patch @@ -0,0 +1,44 @@ +From 91db0edd134b67f55499d683eeed07dce89fcdf3 Mon Sep 17 00:00:00 2001 +From: Matt DeVillier +Date: Sun, 27 Sep 2026 13:24:02 -0500 +Subject: [PATCH 9/9] MdeModulePkg/SdMmcPciHcDxe: Don't force EmbeddedSlot for + Bayhub + +Forcing EmbeddedSlot for every supported Bayhub/O2 Micro device ID +breaks removable SD card readers using the same parts: the initial +card detect is skipped, so empty slots are probed and fail, and the +hot-plug poll ignores the slot, so cards inserted later are never +detected. + +Honor the slot type reported in the capability register, as before. +Soldered-down eMMC on a slot reporting removable is still probed as +long as card detect reports media present. + +Signed-off-by: Matt DeVillier +--- + MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c +index 17d04a4a00..d3a178c2ed 100644 +--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c ++++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c +@@ -731,15 +731,6 @@ SdMmcPciHcDriverBindingStart ( + continue; + } + +- // +- // Bayhub/O2 Micro eMMC controllers may report a removable slot type in the +- // SDHCI capability register even when the attached device is soldered-down +- // eMMC. Treat Bayhub as EmbeddedSlot so we don't skip eMMC probing. +- // +- if (BhtHostPciSupport (PciIo)) { +- Private->Capability[Slot].SlotType = EmbeddedSlot; +- } +- + Private->Slot[Slot].SlotType = Private->Capability[Slot].SlotType; + if ((Private->Slot[Slot].SlotType != RemovableSlot) && (Private->Slot[Slot].SlotType != EmbeddedSlot)) { + DEBUG ((DEBUG_INFO, "SdMmcPciHcDxe doesn't support the slot type [%d]!!!\n", Private->Slot[Slot].SlotType)); +-- +2.47.3 + diff --git a/config/module/edk2_fs_drivers/default/patches/0010-Add-support-for-legacy-payloads.patch b/config/module/edk2_fs_drivers/default/patches/0010-Add-support-for-legacy-payloads.patch new file mode 100644 index 000000000..5bc80a987 --- /dev/null +++ b/config/module/edk2_fs_drivers/default/patches/0010-Add-support-for-legacy-payloads.patch @@ -0,0 +1,185 @@ +From c33c636099f024b25010560e47dd8b064b6630ab Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Wed, 11 Nov 2026 13:04:50 +0000 +Subject: [PATCH 1/1] Add support for legacy payloads + +These have to be inserted into UefiPayloadPkg/ thus: +grub.efi +mt86plus.efi +rebios.efi + +Then you can pass any of these build options: +-D PAYLOAD_MT86=TRUE +-D PAYLOAD_GRUB=TRUE +-D PAYLOAD_CSM=TRUE + +This is only for UefiPayloadPkg. The GRUB and CSM +payloads mimick the behaviour of coreboot payloads +GRUB and SeaBIOS, for legacy applications. + +UefiPayloadPkg.fdf size limits modified so that +GRUB can fit. It might be OK to extend it even +further than in this patch, to enable addition +of a linux UKI, but that'll be for another day. + +Signed-off-by: Leah Rowe +--- + .../PlatformBootManager.c | 33 +++++++++++++++++++ + .../PlatformBootManagerLib.inf | 6 ++++ + UefiPayloadPkg/UefiPayloadPkg.dec | 12 +++++++ + UefiPayloadPkg/UefiPayloadPkg.dsc | 6 ++++ + UefiPayloadPkg/UefiPayloadPkg.fdf | 30 +++++++++++++---- + 5 files changed, 81 insertions(+), 6 deletions(-) + +diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +index a2539ee5c5..1cd6e59a15 100644 +--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c ++++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c +@@ -544,6 +544,39 @@ PlatformBootManagerAfterConsole ( + ); + } + ++ // ++ // Register MemTest86+ if the binary is present in the firmware volume. ++ // ++ if ((PcdGetPtr (PcdMT86File) != NULL) && (PcdGetPtr (PcdMT86OptionName) != NULL)) { ++ PlatformRegisterFvBootOption ( ++ (EFI_GUID *)PcdGetPtr (PcdMT86File), ++ (CHAR16 *)PcdGetPtr (PcdMT86OptionName), ++ LOAD_OPTION_ACTIVE ++ ); ++ } ++ ++ // ++ // Register GRUB if the binary is present in the firmware volume. ++ // ++ if ((PcdGetPtr (PcdGRUBFile) != NULL) && (PcdGetPtr (PcdGRUBOptionName) != NULL)) { ++ PlatformRegisterFvBootOption ( ++ (EFI_GUID *)PcdGetPtr (PcdGRUBFile), ++ (CHAR16 *)PcdGetPtr (PcdGRUBOptionName), ++ LOAD_OPTION_ACTIVE ++ ); ++ } ++ ++ // ++ // Register ReBIOS if the binary is present in the firmware volume. ++ // ++ if ((PcdGetPtr (PcdCSMFile) != NULL) && (PcdGetPtr (PcdCSMOptionName) != NULL)) { ++ PlatformRegisterFvBootOption ( ++ (EFI_GUID *)PcdGetPtr (PcdCSMFile), ++ (CHAR16 *)PcdGetPtr (PcdCSMOptionName), ++ LOAD_OPTION_ACTIVE ++ ); ++ } ++ + if (FixedPcdGetBool (PcdBootManagerEscape)) { + if (FixedPcdGetBool (PcdSerialTerminalPrintEnabled)) { + Print ( +diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +index d1a15df444..2e7bd29715 100644 +--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf ++++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +@@ -86,3 +86,9 @@ + gUefiPayloadPkgTokenSpaceGuid.PcdSerialTerminalPrintEnabled + gUefiPayloadPkgTokenSpaceGuid.PcdiPXEFile + gUefiPayloadPkgTokenSpaceGuid.PcdiPXEOptionName ++ gUefiPayloadPkgTokenSpaceGuid.PcdMT86File ++ gUefiPayloadPkgTokenSpaceGuid.PcdMT86OptionName ++ gUefiPayloadPkgTokenSpaceGuid.PcdGRUBFile ++ gUefiPayloadPkgTokenSpaceGuid.PcdGRUBOptionName ++ gUefiPayloadPkgTokenSpaceGuid.PcdCSMFile ++ gUefiPayloadPkgTokenSpaceGuid.PcdCSMOptionName +diff --git a/UefiPayloadPkg/UefiPayloadPkg.dec b/UefiPayloadPkg/UefiPayloadPkg.dec +index 7f9b4391e5..8a8978bcff 100644 +--- a/UefiPayloadPkg/UefiPayloadPkg.dec ++++ b/UefiPayloadPkg/UefiPayloadPkg.dec +@@ -116,6 +116,18 @@ gUefiPayloadPkgTokenSpaceGuid.PcdBootloaderParameter|0|UINT64|0x10000004 + gUefiPayloadPkgTokenSpaceGuid.PcdiPXEFile|{ 0xC7, 0x53, 0x86, 0xB6, 0xA1, 0xEE, 0x35, 0x44, 0xA1, 0x99, 0xA4, 0x4F, 0x59, 0xE4, 0x47, 0x6C }|VOID*|0x10000032 + gUefiPayloadPkgTokenSpaceGuid.PcdiPXEOptionName|L"iPXE Network Boot"|VOID*|0x10000033 + ++## FFS filename to find MemTest86+ ++gUefiPayloadPkgTokenSpaceGuid.PcdMT86File|{ 0x11, 0x29, 0xCE, 0x03, 0xA1, 0x04, 0xEA, 0x49, 0x90, 0x57, 0x67, 0x59, 0xEA, 0xF1, 0xBA, 0xDE }|VOID*|0x10000037 ++gUefiPayloadPkgTokenSpaceGuid.PcdMT86OptionName|L"MemTest86+ EFI Payload"|VOID*|0x10000038 ++ ++## FFS filename to find GRUB ++gUefiPayloadPkgTokenSpaceGuid.PcdGRUBFile|{ 0x33, 0x2F, 0x7B, 0x11, 0x55, 0x0E, 0x01, 0x4C, 0x90, 0xAA, 0x54, 0x9F, 0x5C, 0x44, 0xD3, 0x2E }|VOID*|0x10000039 ++gUefiPayloadPkgTokenSpaceGuid.PcdGRUBOptionName|L"GRUB EFI Payload"|VOID*|0x10000040 ++ ++## FFS filename to find SeaBIOS CSM ++gUefiPayloadPkgTokenSpaceGuid.PcdCSMFile|{ 0x8F, 0x74, 0x83, 0x2D, 0x73, 0x22, 0xB5, 0x43, 0xB3, 0x98, 0xB2, 0x37, 0x8A, 0x54, 0x0E, 0x1D }|VOID*|0x10000034 ++gUefiPayloadPkgTokenSpaceGuid.PcdCSMOptionName|L"SeaBIOS CSM Payload"|VOID*|0x10000035 ++ + ## Used to help reduce fragmentation in the EFI memory map + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x19|UINT32|0x10000012 + gUefiPayloadPkgTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x04|UINT32|0x10000013 +diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc +index ef0c49c95f..5a48917a9b 100644 +--- a/UefiPayloadPkg/UefiPayloadPkg.dsc ++++ b/UefiPayloadPkg/UefiPayloadPkg.dsc +@@ -207,6 +207,12 @@ + DEFINE NETWORK_SNP_ENABLE = FALSE + DEFINE NETWORK_IPXE = FALSE + ++ # Legacy payloads ++ # ++ DEFINE PAYLOAD_MT86 = FALSE ++ DEFINE PAYLOAD_GRUB = FALSE ++ DEFINE PAYLOAD_CSM = FALSE ++ + !if $(NETWORK_PXE_BOOT) == TRUE + DEFINE NETWORK_ENABLE = TRUE + DEFINE NETWORK_DRIVER_ENABLE = TRUE +diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf +index 3577a4df13..2f01fb5360 100644 +--- a/UefiPayloadPkg/UefiPayloadPkg.fdf ++++ b/UefiPayloadPkg/UefiPayloadPkg.fdf +@@ -14,15 +14,15 @@ DEFINE FD_BASE = 0x00800000 + DEFINE FD_BLOCK_SIZE = 0x00001000 + + !if $(TARGET) == "NOOPT" +-DEFINE FD_SIZE = 0x00850000 +-DEFINE NUM_BLOCKS = 0x850 ++DEFINE FD_SIZE = 0x2000000 ++DEFINE NUM_BLOCKS = 0x2000 + !else + !if $(TARGET) == DEBUG +-DEFINE FD_SIZE = 0x0B00000 +-DEFINE NUM_BLOCKS = 0xB00 ++DEFINE FD_SIZE = 0x2000000 ++DEFINE NUM_BLOCKS = 0x2000 + !else +-DEFINE FD_SIZE = 0x0A00000 +-DEFINE NUM_BLOCKS = 0xA00 ++DEFINE FD_SIZE = 0x2000000 ++DEFINE NUM_BLOCKS = 0x2000 + !endif + !endif + +@@ -498,6 +498,24 @@ INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf + # + INF SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf + !endif ++# ++# Legacy compatibility payloads ++# ++!if $(PAYLOAD_MT86) == TRUE ++ FILE FREEFORM = 03CE2911-04A1-49EA-9057-6759EAF1BADE { ++ SECTION PE32 = UefiPayloadPkg/mt86plus.efi ++ } ++!endif ++!if $(PAYLOAD_GRUB) == TRUE ++ FILE FREEFORM = 117B2F33-0E55-4C01-90AA-549F5C44D32E { ++ SECTION PE32 = UefiPayloadPkg/grub.efi ++ } ++!endif ++!if $(PAYLOAD_CSM) == TRUE ++ FILE FREEFORM = 2D83748F-2273-43B5-B398-B2378A540E1D { ++ SECTION PE32 = UefiPayloadPkg/rebios.efi ++ } ++!endif + !endif + + # +-- +2.47.3 + diff --git a/config/module/edk2_fs_drivers/default/patches/0011-Revert-UefiPayloadPkg-Add-network-and-PXE-boot-suppo.patch b/config/module/edk2_fs_drivers/default/patches/0011-Revert-UefiPayloadPkg-Add-network-and-PXE-boot-suppo.patch new file mode 100644 index 000000000..3ee061679 --- /dev/null +++ b/config/module/edk2_fs_drivers/default/patches/0011-Revert-UefiPayloadPkg-Add-network-and-PXE-boot-suppo.patch @@ -0,0 +1,235 @@ +From 2c48788ce9466f37c3c04c8047d3fc2755e4b4f6 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Sat, 14 Nov 2026 09:16:10 +0000 +Subject: [PATCH 1/1] Revert "UefiPayloadPkg: Add network and PXE boot support" + +This reverts commit 0ec988f2d4b8bf7beb1fa7a40f1615914ac453b2. + +Not to be confused: iPXE still available. This patch removes +the not-needed proprietary one. We only use iPXE, which is +a Free Software project. Es lebe die Softwarefreiheit! + +Both of my projects can have this patch. It fits into the policy +of both projects: one about reduction, and one about elimination. + +How you interpret this patch depends on your particular point of +view, but I think we can all agree that networking blobs in our +firmware is always a bad thing, no? + +Note that the diff I'm reverting did add these files: + +$ ls UefiPayloadPkg/NetworkDrivers/ -1 +AX88179X_178A_772D_UEFI_v3.2.0_X64_signed.efi +AX88772C_772B_772A_UEFI_V2.8.0_X64.efi +RtkUndiDxe.efi +RtkUsbUndiDxe.efi + +These files are *not* removed in this patch, because removing +them in a patch will result in those files being included in +the diff. Instead, I will remove these using nuke.list in both +lbmk and rbmk. + +Like I said: long live the Softwarefreiheit, and all that jazz. + +Signed-off-by: Leah Rowe +--- + UefiPayloadPkg/UefiPayloadPkg.dsc | 68 +------------------------------ + UefiPayloadPkg/UefiPayloadPkg.fdf | 40 ------------------ + 2 files changed, 2 insertions(+), 106 deletions(-) + +diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc +index 5a48917a9b..cb05e983c9 100644 +--- a/UefiPayloadPkg/UefiPayloadPkg.dsc ++++ b/UefiPayloadPkg/UefiPayloadPkg.dsc +@@ -193,18 +193,6 @@ + + # Network definition + # +- DEFINE NETWORK_ISCSI_ENABLE = FALSE +- DEFINE NETWORK_TLS_ENABLE = FALSE +- DEFINE NETWORK_IP6_ENABLE = FALSE +- DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE +- DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE +- DEFINE NETWORK_PXE_BOOT = FALSE +- DEFINE NETWORK_ENABLE = FALSE +- DEFINE NETWORK_RTEK_PCI = FALSE +- DEFINE NETWORK_RTEK_USB = FALSE +- DEFINE NETWORK_ASIX_USB3 = FALSE +- DEFINE NETWORK_ASIX_USB2 = FALSE +- DEFINE NETWORK_SNP_ENABLE = FALSE + DEFINE NETWORK_IPXE = FALSE + + # Legacy payloads +@@ -213,24 +201,11 @@ + DEFINE PAYLOAD_GRUB = FALSE + DEFINE PAYLOAD_CSM = FALSE + +-!if $(NETWORK_PXE_BOOT) == TRUE +- DEFINE NETWORK_ENABLE = TRUE +- DEFINE NETWORK_DRIVER_ENABLE = TRUE +- DEFINE NETWORK_IP4_ENABLE = TRUE +- DEFINE NETWORK_RTEK_PCI = TRUE +- DEFINE NETWORK_RTEK_USB = TRUE +- DEFINE NETWORK_ASIX_USB3 = TRUE +- DEFINE NETWORK_ASIX_USB2 = TRUE +- DEFINE NETWORK_SNP_ENABLE = TRUE +-!endif +- + !if $(NETWORK_IPXE) == TRUE + DEFINE NETWORK_ENABLE = TRUE + DEFINE NETWORK_DRIVER_ENABLE = TRUE + !endif + +-!include NetworkPkg/NetworkDefines.dsc.inc +- + # Security options: + # + DEFINE TPM_ENABLE = TRUE +@@ -480,14 +455,6 @@ + !if $(VARIABLE_SUPPORT) == "SMMSTORE" || ($(CAPSULE_SUPPORT) && $(BOOTLOADER) == "COREBOOT") + SmmStoreLib|UefiPayloadPkg/Library/SmmStoreLib/SmmStoreLib.inf + !endif +- +- ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf +- +-!include NetworkPkg/NetworkLibs.dsc.inc +-!if $(NETWORK_TLS_ENABLE) == TRUE +- TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf +-!endif +- + VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf + VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf + VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf +@@ -929,14 +896,9 @@ + gUefiPayloadPkgTokenSpaceGuid.PcdUseUniversalPayloadSerialPort|FALSE + + [PcdsPatchableInModule.IA32, PcdsPatchableInModule.X64] +- +- # +- # Network Pcds +- # + !if $(NETWORK_DRIVER_ENABLE) == TRUE +- !include NetworkPkg/NetworkFixedPcds.dsc.inc ++ gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE + !endif +- + gUefiPayloadPkgTokenSpaceGuid.SizeOfIoSpace|16 + gUefiPayloadPkgTokenSpaceGuid.PcdFDTPageSize|8 + # +@@ -1070,8 +1032,6 @@ + gEfiSecurityPkgTokenSpaceGuid.PcdTcg2HashAlgorithmBitmap|0x1F + gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence|TRUE + +-!include NetworkPkg/NetworkDynamicPcds.dsc.inc +- + [PcdsDynamicHii] + !if $(TPM2_ENABLE) == TRUE + gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS +@@ -1207,19 +1167,6 @@ + } + !endif + +-!if $(NETWORK_DRIVER_ENABLE) == TRUE +- # +- # Rng Protocol producer +- # +- SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf +- +- # +- # Hash2 Protocol producer +- # +- SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf +-!endif +- +- + !if $(SECURE_BOOT_ENABLE) == TRUE + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf + UefiPayloadPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf +@@ -1493,18 +1440,6 @@ + !endif + !endif + +- # +- # Network Support +- # +-!include NetworkPkg/NetworkComponents.dsc.inc +- +-!if $(NETWORK_TLS_ENABLE) == TRUE +- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf { +- +- NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf +- } +-!endif +- + !if $(TPM_ENABLE) == TRUE + SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { + +@@ -1613,6 +1548,7 @@ + DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf ++ !include NetworkPkg/NetworkLibs.dsc.inc + + [Components.X64, Components.AARCH64] + ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { +diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf +index 2f01fb5360..32fdc5c903 100644 +--- a/UefiPayloadPkg/UefiPayloadPkg.fdf ++++ b/UefiPayloadPkg/UefiPayloadPkg.fdf +@@ -488,15 +488,6 @@ INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf + SECTION PE32 = UefiPayloadPkg/NetworkDrivers/ipxe.efi + } + !endif +- # +- # Rng Protocol producer +- # +- INF SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf +- +- # +- # Hash2 Protocol producer +- # +- INF SecurityPkg/Hash2DxeCrypto/Hash2DxeCrypto.inf + !endif + # + # Legacy compatibility payloads +@@ -518,37 +509,6 @@ INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf + !endif + !endif + +-# +-# Network modules (only available on X64) +-# Available at https://www.realtek.com and https://asix.com.tw +-# +-!if $(NETWORK_ENABLE) +-!if $(ARCH) == IA32 +- # FIXME +-!else +-!if $(NETWORK_RTEK_PCI) +- FILE DRIVER = D30D5496-6DF9-462D-9B97-0B93F659D1A0 { +- SECTION PE32 = UefiPayloadPkg/NetworkDrivers/RtkUndiDxe.efi +- } +-!endif +-!if $(NETWORK_RTEK_USB) +- FILE DRIVER = 95BA3BCA-F086-4FDA-BBAC-44F5AEE5176B { +- SECTION PE32 = UefiPayloadPkg/NetworkDrivers/RtkUsbUndiDxe.efi +- } +-!endif +-!if $(NETWORK_ASIX_USB3) +- FILE DRIVER = 27E5D3B6-7839-47C2-8618-5D2190729BC7 { +- SECTION PE32 = UefiPayloadPkg/NetworkDrivers/AX88179X_178A_772D_UEFI_v3.2.0_X64_signed.efi +- } +-!endif +-!if $(NETWORK_ASIX_USB2) +- FILE DRIVER = B15239D6-6A01-4808-A0F7-B7F20F073555 { +- SECTION PE32 = UefiPayloadPkg/NetworkDrivers/AX88772C_772B_772A_UEFI_V2.8.0_X64.efi +- } +-!endif +-!endif +-!endif +- + # + # Shell + # +-- +2.47.3 + diff --git a/config/module/edk2_fs_drivers/default/target.cfg b/config/module/edk2_fs_drivers/default/target.cfg new file mode 100644 index 000000000..328cdf755 --- /dev/null +++ b/config/module/edk2_fs_drivers/default/target.cfg @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +url="https://github.com/MrChromebox/edk2.git" +bkup_url="https://codeberg.org/libreboot/edk2.git" +rev="afe0e87d25d5ac57191aa7c5211c83d1c13d198f" + +tree="default" + +noconfig="y" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_efifspkg/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_efifspkg/module.cfg new file mode 100644 index 000000000..98308eac3 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_efifspkg/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/pbatard/EfiFs.git" +subgit_bkup="https://gitea.treehouse.systems/libreboot/EfiFs.git" +subhash="e64895a7ef3ea326ecd39eddd20973e1c8744e1d" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_gnuefi/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_gnuefi/module.cfg new file mode 100644 index 000000000..a55de9bc6 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_gnuefi/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/ncroxon/gnu-efi.git" +subgit_bkup="https://gitea.treehouse.systems/libreboot/gnu-efi" +subhash="aeee48d838d40e8ef787748d5dc066ea2fb99dbe" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_grub/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_grub/module.cfg new file mode 100644 index 000000000..b62de5127 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_grub/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://gitlab.freedesktop.org/gnu-grub/grub.git" +subgit_bkup="https://gitea.treehouse.systems/libreboot/grub.git" +subhash="f10ad08fa2a02dce95774c1b5caee38254b30531" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_grub/patches/0001-Modify-GRUB-filesystem-drivers-for-EfiFsPkg.patch b/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_grub/patches/0001-Modify-GRUB-filesystem-drivers-for-EfiFsPkg.patch new file mode 100644 index 000000000..9de3a2242 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_efifspkg_grub/patches/0001-Modify-GRUB-filesystem-drivers-for-EfiFsPkg.patch @@ -0,0 +1,1935 @@ +From f23717f922d14fc30c8ed1b18fd69d71d61ebbf2 Mon Sep 17 00:00:00 2001 +From: Pete Batard +Date: Mon, 5 Oct 2026 20:00:59 +0100 +Subject: [PATCH 1/1] Modify GRUB filesystem drivers for EfiFsPkg + +MERGE NOTE (Leah Rowe): author and date set, as per +the latest commit to this file in EfiFsPkg: + +commit 55775b1dd25786722cb22395517a56218f21be72 +Author: Pete Batard +Date: Mon Oct 5 20:00:59 2026 +0100 + + Fix ZFS struct alignment on 32-bit + + * No, GRUB, you don't actually want to force-align to 64-bit on 32-bit. + +I pre-patch GRUB, so that this modification will integrate +nicely into my build system. (automated building of drivers) + +Otherwise, I would have to implement manual patching logic +in lbmk/rbmk for Libreboot and RBoot respectively. With this +instead, I can easily then build it inside my edk2 clone. + +The commit date/author should be changed as and when the +git history on that file does, in EfiFsPkg.git. Since +Pete Batard is the primary author of this patch, I put +this excellent person as the author in git-format-patch. + +Please make sure to update the commit date/author accordingly, +and change the above paste showing the commit from EfiFsPkg, +when updating this file. I automate the building of EFI file +system drivers for EDK2, instead of using MrChromebox pre-built +drivers. This patch is part of that. See: module edk2_fs_drivers +in lbmk and rbmk Git repositories, for example: + +config/module/edk2_fs_drivers +config/submodule/edk2_fs_drivers + +Check include/fw/edk2_fs.sh in lbmk and rbmk, for the build logic. +It matches logic for EfiFsPkg and ntfs-3g-efi builds. This is +then placed inside MrChromebox EDK2, for Libreboot and RBoot +firmware images that use the EDK2 UEFI payload. + +For clarity: Pete shown as author of this patch, but Pete did +not submit this patch in this form, to my project. I, Leah Rowe, +merged this patch, but I am not its author. + +Yes, thank you: Pete Batard, thank you for your wonderful +projects. We need more people like you in the world. +--- + grub-core/fs/affs.c | 2 + + grub-core/fs/bfs.c | 14 +++--- + grub-core/fs/btrfs.c | 72 ++++++++++++++++++---------- + grub-core/fs/cbfs.c | 2 +- + grub-core/fs/cpio_common.c | 2 +- + grub-core/fs/erofs.c | 6 +++ + grub-core/fs/f2fs.c | 2 + + grub-core/fs/fat.c | 8 +++- + grub-core/fs/hfs.c | 6 +++ + grub-core/fs/hfsplus.c | 2 + + grub-core/fs/hfspluscomp.c | 4 ++ + grub-core/fs/iso9660.c | 38 ++++++++++----- + grub-core/fs/jfs.c | 3 +- + grub-core/fs/nilfs2.c | 4 +- + grub-core/fs/ntfs.c | 2 + + grub-core/fs/proc.c | 2 +- + grub-core/fs/reiserfs.c | 16 ++++++- + grub-core/fs/sfs.c | 5 +- + grub-core/fs/squash4.c | 10 ++-- + grub-core/fs/tar.c | 7 ++- + grub-core/fs/udf.c | 2 + + grub-core/fs/ufs.c | 2 + + grub-core/fs/xfs.c | 2 + + grub-core/fs/zfs/zfs.c | 14 ++++-- + grub-core/fs/zfs/zfs_lz4.c | 2 + + grub-core/kern/misc.c | 12 ++--- + grub-core/lib/posix_wrap/limits.h | 12 +++++ + grub-core/lib/xzembed/xz_dec_lzma2.c | 2 + + grub-core/lib/xzembed/xz_stream.h | 2 +- + grub-core/lib/zstd/bitstream.h | 2 +- + grub-core/lib/zstd/fse_decompress.c | 3 +- + grub-core/lib/zstd/huf_decompress.c | 2 +- + grub-core/lib/zstd/mem.h | 14 +++++- + grub-core/lib/zstd/xxhash.c | 7 ++- + grub-core/lib/zstd/zstd_common.c | 3 +- + grub-core/lib/zstd/zstd_decompress.c | 1 - + grub-core/lib/zstd/zstd_internal.h | 14 +++++- + include/grub/arm64/types.h | 4 ++ + include/grub/btrfs.h | 3 +- + include/grub/exfat.h | 2 + + include/grub/fat.h | 2 + + include/grub/hfs.h | 2 + + include/grub/hfsplus.h | 6 +++ + include/grub/misc.h | 5 ++ + include/grub/ntfs.h | 2 + + include/grub/safemath.h | 44 +++++++++++++++++ + include/grub/term.h | 4 +- + include/grub/types.h | 44 +++++++++++------ + include/grub/unicode.h | 2 + + include/grub/x86_64/types.h | 2 +- + include/grub/zfs/zap_leaf.h | 2 + + include/grub/zfs/zio.h | 2 + + 52 files changed, 328 insertions(+), 101 deletions(-) + +diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c +index 520a001c7..23268812c 100644 +--- a/grub-core/fs/affs.c ++++ b/grub-core/fs/affs.c +@@ -31,6 +31,7 @@ + GRUB_MOD_LICENSE ("GPLv3+"); + + /* The affs bootblock. */ ++PRAGMA_BEGIN_PACKED + struct grub_affs_bblock + { + grub_uint8_t type[3]; +@@ -78,6 +79,7 @@ struct grub_affs_file + grub_uint32_t extension; + grub_uint32_t type; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* The location of `struct grub_affs_file' relative to the end of a + file header block. */ +diff --git a/grub-core/fs/bfs.c b/grub-core/fs/bfs.c +index 78aeb051f..dda47febe 100644 +--- a/grub-core/fs/bfs.c ++++ b/grub-core/fs/bfs.c +@@ -70,6 +70,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + #define DOUBLE_INDIRECT_SHIFT 2 + + #define LOG_EXTENT_SIZE 3 ++PRAGMA_BEGIN_PACKED + struct grub_bfs_extent + { + grub_uint32_t ag; +@@ -168,6 +169,7 @@ struct grub_bfs_btree_node + grub_uint16_t total_key_len; + #endif + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_bfs_data + { +@@ -830,13 +832,11 @@ mount (grub_disk_t disk, struct grub_bfs_superblock *sb) + grub_err_t err; + err = grub_disk_read (disk, SUPERBLOCK, 0, sizeof (*sb), sb); + if (err == GRUB_ERR_OUT_OF_RANGE) +- return grub_error (GRUB_ERR_BAD_FS, + #ifdef MODE_AFS +- "not an AFS filesystem" ++ return grub_error (GRUB_ERR_BAD_FS, "not an AFS filesystem"); + #else +- "not a BFS filesystem" ++ return grub_error (GRUB_ERR_BAD_FS, "not a BFS filesystem"); + #endif +- ); + if (err) + return err; + if (sb->magic1 != grub_cpu_to_bfs32_compile_time (SUPER_BLOCK_MAGIC1) +@@ -846,13 +846,11 @@ mount (grub_disk_t disk, struct grub_bfs_superblock *sb) + || (grub_bfs_to_cpu32 (sb->bsize) + != (1U << grub_bfs_to_cpu32 (sb->log2_bsize))) + || grub_bfs_to_cpu32 (sb->log2_bsize) < GRUB_DISK_SECTOR_BITS) +- return grub_error (GRUB_ERR_BAD_FS, + #ifdef MODE_AFS +- "not an AFS filesystem" ++ return grub_error (GRUB_ERR_BAD_FS, "not an AFS filesystem"); + #else +- "not a BFS filesystem" ++ return grub_error (GRUB_ERR_BAD_FS, "not a BFS filesystem"); + #endif +- ); + return GRUB_ERR_NONE; + } + +diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c +index 1cd842ec0..cdd44ff31 100644 +--- a/grub-core/fs/btrfs.c ++++ b/grub-core/fs/btrfs.c +@@ -41,9 +41,11 @@ + #include + #include + #include ++#ifndef NO_GRUB_COMMANDS + #include + #include + #include ++#endif + + GRUB_MOD_LICENSE ("GPLv3+"); + +@@ -66,6 +68,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + typedef grub_uint8_t grub_btrfs_checksum_t[0x20]; + typedef grub_uint16_t grub_btrfs_uuid_t[8]; + ++PRAGMA_BEGIN_PACKED + struct grub_btrfs_device + { + grub_uint64_t device_id; +@@ -102,6 +105,7 @@ struct btrfs_header + grub_uint32_t nitems; + grub_uint8_t level; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_btrfs_device_desc + { +@@ -116,8 +120,8 @@ struct grub_btrfs_data + grub_uint64_t inode; + + struct grub_btrfs_device_desc *devices_attached; +- unsigned n_devices_attached; +- unsigned n_devices_allocated; ++ grub_size_t n_devices_attached; ++ grub_size_t n_devices_allocated; + + /* Cached extent data. */ + grub_uint64_t extstart; +@@ -128,6 +132,7 @@ struct grub_btrfs_data + struct grub_btrfs_extent_data *extent; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_btrfs_chunk_item + { + grub_uint64_t size; +@@ -180,22 +185,24 @@ struct grub_btrfs_dir_item + #define GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY 2 + #define GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK 7 + grub_uint8_t type; +- char name[0]; ++ char name[1]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_btrfs_leaf_descriptor + { +- unsigned depth; +- unsigned allocated; ++ grub_size_t depth; ++ grub_size_t allocated; + struct + { + grub_disk_addr_t addr; +- unsigned iter; +- unsigned maxiter; ++ grub_size_t iter; ++ grub_size_t maxiter; + int leaf; + } *data; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_btrfs_root_ref + { + grub_uint64_t dirid; +@@ -238,6 +245,7 @@ struct grub_btrfs_extent_data + }; + }; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #define GRUB_BTRFS_EXTENT_INLINE 0 + #define GRUB_BTRFS_EXTENT_REGULAR 1 +@@ -721,7 +729,7 @@ struct raid56_buffer { + int data_is_valid; + }; + +-static void ++static grub_err_t + rebuild_raid5 (char *dest, struct raid56_buffer *buffers, + grub_uint64_t nstripes, grub_uint64_t csize) + { +@@ -733,7 +741,7 @@ rebuild_raid5 (char *dest, struct raid56_buffer *buffers, + if (i == nstripes) + { + grub_dprintf ("btrfs", "called rebuild_raid5(), but all disks are OK\n"); +- return; ++ return GRUB_ERR_NONE; + } + + grub_dprintf ("btrfs", "rebuilding RAID 5 stripe #%" PRIuGRUB_UINT64_T "\n", i); +@@ -749,8 +757,10 @@ rebuild_raid5 (char *dest, struct raid56_buffer *buffers, + } else + grub_crypto_xor (dest, dest, buffers[i].buf, csize); + } ++ return GRUB_ERR_NONE; + } + ++#ifndef NO_RAID6_RECOVERY + static grub_err_t + raid6_recover_read_buffer (void *data, int disk_nr, + grub_uint64_t addr __attribute__ ((unused)), +@@ -765,15 +775,20 @@ raid6_recover_read_buffer (void *data, int disk_nr, + + return grub_errno = GRUB_ERR_NONE; + } ++#endif + +-static void ++static grub_err_t + rebuild_raid6 (struct raid56_buffer *buffers, grub_uint64_t nstripes, + grub_uint64_t csize, grub_uint64_t parities_pos, void *dest, + grub_uint64_t stripen) + + { +- grub_raid6_recover_gen (buffers, nstripes, stripen, parities_pos, +- dest, 0, csize, 0, raid6_recover_read_buffer); ++#ifdef NO_RAID6_RECOVERY ++ return GRUB_ERR_NOT_IMPLEMENTED_YET; ++#else ++ return grub_raid6_recover_gen (buffers, nstripes, stripen, parities_pos, ++ dest, 0, csize, 0, raid6_recover_read_buffer); ++#endif + } + + static grub_err_t +@@ -867,11 +882,10 @@ raid56_read_retry (struct grub_btrfs_data *data, + + /* We have enough disks. So, rebuild the data. */ + if (chunk_type & GRUB_BTRFS_CHUNK_TYPE_RAID5) +- rebuild_raid5 (buf, buffers, nstripes, csize); ++ ret = rebuild_raid5 (buf, buffers, nstripes, csize); + else +- rebuild_raid6 (buffers, nstripes, csize, parities_pos, buf, stripen); ++ ret = rebuild_raid6 (buffers, nstripes, csize, parities_pos, buf, stripen); + +- ret = GRUB_ERR_NONE; + cleanup: + if (buffers) + for (i = 0; i < nstripes; i++) +@@ -989,8 +1003,8 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr, + "couldn't find the chunk descriptor"); + } + +- nstripes = grub_le_to_cpu16 (chunk->nstripes) ? : 1; +- chunk_stripe_length = grub_le_to_cpu64 (chunk->stripe_length) ? : 512; ++ nstripes = grub_le_to_cpu16 (chunk->nstripes) ? grub_le_to_cpu16(chunk->nstripes) : 1; ++ chunk_stripe_length = grub_le_to_cpu64 (chunk->stripe_length) ? grub_le_to_cpu64(chunk->stripe_length) : 512; + grub_dprintf ("btrfs", "chunk 0x%" PRIxGRUB_UINT64_T + "+0x%" PRIxGRUB_UINT64_T + " (%d stripes (%d substripes) of %" +@@ -1076,13 +1090,13 @@ grub_btrfs_read_logical (struct grub_btrfs_data *data, grub_disk_addr_t addr, + grub_uint64_t middle, high; + grub_uint64_t low; + grub_uint16_t nsubstripes; +- nsubstripes = grub_le_to_cpu16 (chunk->nsubstripes) ? : 1; ++ nsubstripes = grub_le_to_cpu16 (chunk->nsubstripes) ? grub_le_to_cpu16(chunk->nsubstripes) : 1; + middle = grub_divmod64 (off, + chunk_stripe_length, + &low); + + high = grub_divmod64 (middle, +- nstripes / nsubstripes ? : 1, ++ nstripes / nsubstripes ? nstripes / nsubstripes : 1, + &stripen); + stripen *= nsubstripes; + redundancy = nsubstripes; +@@ -1359,7 +1373,7 @@ static void *grub_zstd_malloc (void *state __attribute__((unused)), size_t size) + + static void grub_zstd_free (void *state __attribute__((unused)), void *address) + { +- return grub_free (address); ++ grub_free (address); + } + + static ZSTD_customMem grub_zstd_allocator (void) +@@ -2331,8 +2345,10 @@ grub_btrfs_dir (grub_device_t device, const char *path, + c = cdirel->name[grub_le_to_cpu16 (cdirel->n)]; + cdirel->name[grub_le_to_cpu16 (cdirel->n)] = 0; + info.dir = (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY); +- if (hook (cdirel->name, &info, hook_data)) ++ if (hook (cdirel->name, &info, hook_data)) { ++ r = 0; + goto out; ++ } + cdirel->name[grub_le_to_cpu16 (cdirel->n)] = c; + } + r = next (data, &desc, &elemaddr, &elemsize, &key_out); +@@ -2558,6 +2574,7 @@ grub_btrfs_embed (grub_device_t device __attribute__ ((unused)), + } + #endif + ++#ifndef NO_GRUB_COMMANDS + static grub_err_t + grub_cmd_btrfs_info (grub_command_t cmd __attribute__ ((unused)), int argc, + char **argv) +@@ -2793,12 +2810,12 @@ grub_cmd_btrfs_list_subvols (struct grub_extcmd_context *ctxt, + char *old = output; + if (num_only) + output = grub_xasprintf("%s%"PRIuGRUB_UINT64_T"\n", +- old ?: "", grub_le_to_cpu64 (key_out.offset)); ++ old ? old : "", grub_le_to_cpu64 (key_out.offset)); + else if (path_only) +- output = grub_xasprintf("%s%s\n", old ?: "", p); ++ output = grub_xasprintf("%s%s\n", old ? old : "", p); + else + output = grub_xasprintf("%sID %"PRIuGRUB_UINT64_T" path %s\n", +- old ?: "", grub_le_to_cpu64 (key_out.offset), p); ++ old ? old : "", grub_le_to_cpu64 (key_out.offset), p); + if (old) + grub_free(old); + } +@@ -3101,6 +3118,7 @@ grub_cmd_btrfs_get_default_subvol (struct grub_extcmd_context *ctxt, + + return GRUB_ERR_NONE; + } ++#endif + + static struct grub_fs grub_btrfs_fs = { + .name = "btrfs", +@@ -3117,14 +3135,17 @@ static struct grub_fs grub_btrfs_fs = { + #endif + }; + ++#ifndef NO_GRUB_COMMANDS + static grub_command_t cmd_info; + static grub_extcmd_t cmd_list_subvols; + static grub_extcmd_t cmd_get_default_subvol; ++#endif + + GRUB_MOD_INIT (btrfs) + { + grub_btrfs_fs.mod = mod; + grub_fs_register (&grub_btrfs_fs); ++#ifndef NO_GRUB_COMMANDS + cmd_info = grub_register_command ("btrfs-info", + grub_cmd_btrfs_info, + "DEVICE", +@@ -3139,12 +3160,15 @@ GRUB_MOD_INIT (btrfs) + "[-p|-n] [-o var] DEVICE", + "Print default BtrFS subvolume on " + "DEVICE.", opt_default_subvol); ++#endif + } + + GRUB_MOD_FINI (btrfs) + { + grub_fs_unregister (&grub_btrfs_fs); ++#ifndef NO_GRUB_COMMANDS + grub_unregister_command (cmd_info); + grub_unregister_extcmd (cmd_list_subvols); + grub_unregister_extcmd (cmd_get_default_subvol); ++#endif + } +diff --git a/grub-core/fs/cbfs.c b/grub-core/fs/cbfs.c +index b62c8777c..b31971a98 100644 +--- a/grub-core/fs/cbfs.c ++++ b/grub-core/fs/cbfs.c +@@ -45,7 +45,7 @@ struct grub_archelp_data + static grub_err_t + grub_cbfs_find_file (struct grub_archelp_data *data, char **name, + grub_int32_t *mtime, +- grub_uint32_t *mode) ++ grub_archelp_mode_t *mode) + { + grub_size_t offset; + for (;; +diff --git a/grub-core/fs/cpio_common.c b/grub-core/fs/cpio_common.c +index 45ac119a8..ceb5c9175 100644 +--- a/grub-core/fs/cpio_common.c ++++ b/grub-core/fs/cpio_common.c +@@ -44,7 +44,7 @@ struct grub_archelp_data + + static grub_err_t + grub_cpio_find_file (struct grub_archelp_data *data, char **name, +- grub_int32_t *mtime, grub_uint32_t *mode) ++ grub_int32_t *mtime, grub_archelp_mode_t *mode) + { + struct head hd; + grub_size_t namesize; +diff --git a/grub-core/fs/erofs.c b/grub-core/fs/erofs.c +index 11cd4e110..ba95796fa 100644 +--- a/grub-core/fs/erofs.c ++++ b/grub-core/fs/erofs.c +@@ -37,6 +37,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + #define EROFS_FEATURE_INCOMPAT_CHUNKED_FILE 0x00000004 + #define EROFS_ALL_FEATURE_INCOMPAT EROFS_FEATURE_INCOMPAT_CHUNKED_FILE + ++PRAGMA_BEGIN_PACKED + struct grub_erofs_super + { + grub_uint32_t magic; +@@ -71,6 +72,7 @@ struct grub_erofs_super + grub_uint64_t packed_nid; + grub_uint8_t reserved2[24]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #define EROFS_INODE_LAYOUT_COMPACT 0 + #define EROFS_INODE_LAYOUT_EXTENDED 1 +@@ -87,11 +89,13 @@ struct grub_erofs_super + #define EROFS_I_VERSION_BIT 0 + #define EROFS_I_DATALAYOUT_BIT 1 + ++PRAGMA_BEGIN_PACKED + struct grub_erofs_inode_chunk_info + { + grub_uint16_t format; + grub_uint16_t reserved; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #define EROFS_CHUNK_FORMAT_BLKBITS_MASK 0x001F + #define EROFS_CHUNK_FORMAT_INDEXES 0x0020 +@@ -122,6 +126,7 @@ union grub_erofs_inode_i_u + struct grub_erofs_inode_chunk_info c; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_erofs_inode_compact + { + grub_uint16_t i_format; +@@ -183,6 +188,7 @@ struct grub_erofs_dirent + grub_uint8_t file_type; + grub_uint8_t reserved; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_erofs_map_blocks + { +diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c +index 3963ffcf3..5c5f12757 100644 +--- a/grub-core/fs/f2fs.c ++++ b/grub-core/fs/f2fs.c +@@ -142,6 +142,7 @@ enum FILE_TYPE + F2FS_FT_SYMLINK = 7 + }; + ++PRAGMA_BEGIN_PACKED + struct grub_f2fs_superblock + { + grub_uint32_t magic; +@@ -292,6 +293,7 @@ struct grub_f2fs_node + }; + grub_uint8_t dummy[40]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_fshelp_node + { +diff --git a/grub-core/fs/fat.c b/grub-core/fs/fat.c +index f867b159b..e4968f6e3 100644 +--- a/grub-core/fs/fat.c ++++ b/grub-core/fs/fat.c +@@ -76,6 +76,7 @@ enum + { + FLAG_CONTIGUOUS = 2 + }; ++PRAGMA_BEGIN_PACKED + struct grub_fat_dir_entry + { + grub_uint8_t entry_type; +@@ -116,6 +117,7 @@ struct grub_fat_dir_entry + } GRUB_PACKED volume_label; + } GRUB_PACKED type_specific; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_fat_dir_node + { +@@ -130,6 +132,7 @@ struct grub_fat_dir_node + typedef struct grub_fat_dir_node grub_fat_dir_node_t; + + #else ++PRAGMA_BEGIN_PACKED + struct grub_fat_dir_entry + { + grub_uint8_t name[11]; +@@ -157,6 +160,7 @@ struct grub_fat_long_name_entry + grub_uint16_t first_cluster; + grub_uint16_t name3[2]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + typedef struct grub_fat_dir_entry grub_fat_dir_node_t; + +@@ -735,7 +739,7 @@ grub_fat_iterate_dir_next (grub_fshelp_node_t node, + grub_dprintf ("exfat", "unknown primary type 0x%02x\n", + dir->entry_type); + } +- return grub_errno ? : GRUB_ERR_EOF; ++ return grub_errno ? grub_errno : GRUB_ERR_EOF; + } + + /* +@@ -891,7 +895,7 @@ grub_fat_iterate_dir_next (grub_fshelp_node_t node, + return GRUB_ERR_NONE; + } + +- return grub_errno ? : GRUB_ERR_EOF; ++ return grub_errno ? grub_errno : GRUB_ERR_EOF; + } + + /* +diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c +index ce7581dd5..23d247982 100644 +--- a/grub-core/fs/hfs.c ++++ b/grub-core/fs/hfs.c +@@ -59,6 +59,7 @@ enum grub_hfs_cnid_type + }; + + /* A node descriptor. This is the header of every node. */ ++PRAGMA_BEGIN_PACKED + struct grub_hfs_node + { + grub_uint32_t next; +@@ -84,6 +85,7 @@ struct grub_hfs_treeheader + grub_uint32_t free_nodes; + grub_uint8_t unused[76]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* The state of a mounted HFS filesystem. */ + struct grub_hfs_data +@@ -104,6 +106,7 @@ struct grub_hfs_data + + /* The key as used on disk in a catalog tree. This is used to lookup + file/directory nodes by parent directory ID and filename. */ ++PRAGMA_BEGIN_PACKED + struct grub_hfs_catalog_key + { + grub_uint8_t unused; +@@ -157,6 +160,7 @@ struct grub_hfs_filerec + in the extent overflow file. */ + grub_hfs_datarecord_t extents; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* A record descriptor, both key and data, used to pass to call back + functions. */ +@@ -721,11 +725,13 @@ grub_hfs_iterate_records (struct grub_hfs_data *data, int type, int idx, + for (i = 0; i < reccnt; i++) + { + int pos = (nodesize >> 1) - 1 - i; ++ PRAGMA_BEGIN_PACKED + struct pointer + { + grub_uint8_t keylen; + grub_uint8_t key; + } GRUB_PACKED *pnt; ++ PRAGMA_END_PACKED + grub_uint16_t off = grub_be_to_cpu16 (node->offsets[pos]); + if (off > nodesize - sizeof(*pnt)) + continue; +diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c +index 95ba35563..a09d634db 100644 +--- a/grub-core/fs/hfsplus.c ++++ b/grub-core/fs/hfsplus.c +@@ -45,6 +45,7 @@ enum grub_hfsplus_btnode_type + }; + + /* The header of a HFS+ B+ Tree. */ ++PRAGMA_BEGIN_PACKED + struct grub_hfsplus_btheader + { + grub_uint16_t depth; +@@ -77,6 +78,7 @@ struct grub_hfsplus_catfile + struct grub_hfsplus_forkdata data; + struct grub_hfsplus_forkdata resource; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* Filetype information as used in inodes. */ + #define GRUB_HFSPLUS_FILEMODE_MASK 0170000 +diff --git a/grub-core/fs/hfspluscomp.c b/grub-core/fs/hfspluscomp.c +index abc64cd13..c8c4cd8d7 100644 +--- a/grub-core/fs/hfspluscomp.c ++++ b/grub-core/fs/hfspluscomp.c +@@ -28,6 +28,7 @@ + GRUB_MOD_LICENSE ("GPLv3+"); + + /* big-endian. */ ++PRAGMA_BEGIN_PACKED + struct grub_hfsplus_compress_header1 + { + grub_uint32_t header_size; +@@ -48,6 +49,7 @@ struct grub_hfsplus_compress_header3 + { + grub_uint32_t num_chunks; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* little-endian. */ + struct grub_hfsplus_compress_block_descriptor +@@ -56,6 +58,7 @@ struct grub_hfsplus_compress_block_descriptor + grub_uint32_t size; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_hfsplus_compress_end_descriptor + { + grub_uint8_t always_the_same[50]; +@@ -76,6 +79,7 @@ struct grub_hfsplus_compress_attr + grub_uint32_t uncompressed_inline_size; + grub_uint32_t always_0; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + enum + { +diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c +index c73cb9ce0..82eeb2a9f 100644 +--- a/grub-core/fs/iso9660.c ++++ b/grub-core/fs/iso9660.c +@@ -53,6 +53,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + #define GRUB_ISO9660_MAX_CE_HOPS 100000 + + /* The head of a volume descriptor. */ ++PRAGMA_BEGIN_PACKED + struct grub_iso9660_voldesc + { + grub_uint8_t type; +@@ -133,8 +134,18 @@ struct grub_iso9660_susp_entry + { + grub_uint8_t sig[2]; + grub_uint8_t len; +- grub_uint8_t version; +- grub_uint8_t data[0]; ++/*! MSVC compilers cannot handle a zero sized array in the middle ++ of a struct, and grub_iso9660_susp_entry is reused within ++ grub_iso9660_susp_ce. Therefore, instead of defining: ++ grub_uint8_t version; ++ grub_uint8_t data[]; ++ we leverage the fact that these attributes are the same size ++ and use an union. The only gotcha is that the actual ++ payload of u.data[] starts at 1, not 0. */ ++ union { ++ grub_uint8_t version; ++ grub_uint8_t data[1]; ++ } u; + } GRUB_PACKED; + + /* The CE entry. This is used to describe the next block where data +@@ -149,6 +160,7 @@ struct grub_iso9660_susp_ce + grub_uint32_t len; + grub_uint32_t len_be; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_iso9660_data + { +@@ -473,7 +485,7 @@ set_rockridge (struct grub_iso9660_data *data) + * The 2nd data byte stored how many bytes are skipped every time + * to get to the SUA (System Usage Area). + */ +- data->susp_skip = entry->data[2]; ++ data->susp_skip = entry->u.data[1 + 2]; + entry = (struct grub_iso9660_susp_entry *) ((char *) entry + entry->len); + + /* Iterate over the entries in the SUA area to detect +@@ -627,14 +639,14 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, + /* The flags are stored at the data position 0, here the + filename type is stored. */ + /* FIXME: Fix this slightly improper cast. */ +- if (entry->data[0] & GRUB_ISO9660_RR_DOT) ++ if (entry->u.data[1 + 0] & GRUB_ISO9660_RR_DOT) + { + if (ctx->filename_alloc) + grub_free (ctx->filename); + ctx->filename_alloc = 0; + ctx->filename = (char *) "."; + } +- else if (entry->data[0] & GRUB_ISO9660_RR_DOTDOT) ++ else if (entry->u.data[1 + 0] & GRUB_ISO9660_RR_DOTDOT) + { + if (ctx->filename_alloc) + grub_free (ctx->filename); +@@ -670,7 +682,7 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, + return grub_errno; + } + ctx->filename_alloc = 1; +- grub_memcpy (ctx->filename + off, (char *) &entry->data[1], csize); ++ grub_memcpy (ctx->filename + off, (char *) &entry->u.data[1 + 1], csize); + ctx->filename[off + csize] = '\0'; + } + } +@@ -679,7 +691,7 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, + { + /* At position 0 of the PX record the st_mode information is + stored (little-endian). */ +- grub_uint32_t mode = ((entry->data[0] + (entry->data[1] << 8)) ++ grub_uint32_t mode = ((entry->u.data[1 + 0] + (entry->u.data[1 + 1] << 8)) + & GRUB_ISO9660_FSTYPE_MASK); + + switch (mode) +@@ -713,12 +725,12 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, + * "Component Flags"; entry->data[pos + 1] is the length + * of the component. + */ +- csize = entry->data[pos + 1] + 2; ++ csize = entry->u.data[1 + pos + 1] + 2; + if (GRUB_ISO9660_SUSP_HEADER_SZ + 1 + csize > entry->len) + break; + + /* The current position is the `Component Flag'. */ +- switch (entry->data[pos] & 30) ++ switch (entry->u.data[1 + pos] & 30) + { + case 0: + { +@@ -732,9 +744,9 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, + return grub_errno; + } + +- add_part (ctx, (char *) &entry->data[pos + 2], +- entry->data[pos + 1]); +- ctx->was_continue = (entry->data[pos] & 1); ++ add_part (ctx, (char *) &entry->u.data[1 + pos + 2], ++ entry->u.data[1 + pos + 1]); ++ ctx->was_continue = (entry->u.data[1 + pos] & 1); + break; + } + +@@ -757,7 +769,7 @@ susp_iterate_dir (struct grub_iso9660_susp_entry *entry, + + /* In pos + 1 the length of the `Component Record' is + stored. */ +- pos += entry->data[pos + 1] + 2; ++ pos += entry->u.data[1 + pos + 1] + 2; + } + + /* Check if `grub_realloc' failed. */ +diff --git a/grub-core/fs/jfs.c b/grub-core/fs/jfs.c +index 03be9ef4c..b4184832b 100644 +--- a/grub-core/fs/jfs.c ++++ b/grub-core/fs/jfs.c +@@ -69,6 +69,7 @@ struct grub_jfs_sblock + char volname2[16]; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_jfs_extent + { + /* The length of the extent in filesystem blocks. */ +@@ -260,7 +261,7 @@ struct grub_jfs_diropen + char name[256 * GRUB_MAX_UTF8_PER_UTF16 + 1]; + grub_uint32_t ino; + } GRUB_PACKED; +- ++PRAGMA_END_PACKED + + static grub_dl_t my_mod; + +diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c +index 24c0455da..b69d6d9c7 100644 +--- a/grub-core/fs/nilfs2.c ++++ b/grub-core/fs/nilfs2.c +@@ -133,6 +133,7 @@ struct grub_nilfs2_super_block + grub_uint32_t s_reserved[192]; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_nilfs2_dir_entry + { + grub_uint64_t inode; +@@ -145,6 +146,7 @@ struct grub_nilfs2_dir_entry + char pad; + #endif + } GRUB_PACKED; ++PRAGMA_END_PACKED + + enum + { +@@ -754,7 +756,7 @@ static grub_err_t + grub_nilfs2_load_sb (struct grub_nilfs2_data *data) + { + grub_disk_t disk = data->disk; +- struct grub_nilfs2_super_block sb2; ++ struct grub_nilfs2_super_block sb2 = { 0 }; + grub_uint64_t partition_size; + int valid[2]; + int swp = 0; +diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c +index 054a00339..e528a2d26 100644 +--- a/grub-core/fs/ntfs.c ++++ b/grub-core/fs/ntfs.c +@@ -989,6 +989,7 @@ list_file (struct grub_ntfs_file *diro, grub_uint8_t *pos, grub_uint8_t *end_pos + return 0; + } + ++PRAGMA_BEGIN_PACKED + struct symlink_descriptor + { + grub_uint32_t type; +@@ -998,6 +999,7 @@ struct symlink_descriptor + grub_uint16_t off2; + grub_uint16_t len2; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + static char * + grub_ntfs_read_symlink (grub_fshelp_node_t node) +diff --git a/grub-core/fs/proc.c b/grub-core/fs/proc.c +index bcde43349..db2d00c77 100644 +--- a/grub-core/fs/proc.c ++++ b/grub-core/fs/proc.c +@@ -90,7 +90,7 @@ grub_procfs_rewind (struct grub_archelp_data *data) + static grub_err_t + grub_procfs_find_file (struct grub_archelp_data *data, char **name, + grub_int32_t *mtime, +- grub_uint32_t *mode) ++ grub_archelp_mode_t *mode) + { + data->entry = data->next_entry; + if (!data->entry) +diff --git a/grub-core/fs/reiserfs.c b/grub-core/fs/reiserfs.c +index 5d3c85950..9abfc1ea7 100644 +--- a/grub-core/fs/reiserfs.c ++++ b/grub-core/fs/reiserfs.c +@@ -43,15 +43,27 @@ + + GRUB_MOD_LICENSE ("GPLv3+"); + ++#ifndef _MSC_VER ++#ifndef MIN + #define MIN(a, b) \ + ({ typeof (a) _a = (a); \ + typeof (b) _b = (b); \ + _a < _b ? _a : _b; }) +- ++#endif ++#ifndef MAX + #define MAX(a, b) \ + ({ typeof (a) _a = (a); \ + typeof (b) _b = (b); \ + _a > _b ? _a : _b; }) ++#endif ++#else ++#ifndef MIN ++#define MIN(a, b) ((a)<(b)?(a):(b)) ++#endif ++#ifndef MAX ++#define MAX(a, b) ((a)>(b)?(a):(b)) ++#endif ++#endif + + #define REISERFS_SUPER_BLOCK_OFFSET 0x10000 + #define REISERFS_MAGIC_LEN 12 +@@ -83,6 +95,7 @@ enum grub_reiserfs_item_type + GRUB_REISERFS_UNKNOWN + }; + ++PRAGMA_BEGIN_PACKED + struct grub_reiserfs_superblock + { + grub_uint32_t block_count; +@@ -218,6 +231,7 @@ struct grub_reiserfs_directory_header + grub_uint16_t location; + grub_uint16_t state; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_fshelp_node + { +diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c +index bad4ae8d1..ce977c094 100644 +--- a/grub-core/fs/sfs.c ++++ b/grub-core/fs/sfs.c +@@ -32,6 +32,7 @@ + GRUB_MOD_LICENSE ("GPLv3+"); + + /* The common header for a block. */ ++PRAGMA_BEGIN_PACKED + struct grub_sfs_bheader + { + grub_uint8_t magic[4]; +@@ -123,8 +124,10 @@ struct grub_sfs_btree + supported. */ + struct grub_sfs_btree_node node[1]; + } GRUB_PACKED; ++PRAGMA_END_PACKED ++ ++ + +- + + struct cache_entry + { +diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c +index cf2bca822..1daa571b9 100644 +--- a/grub-core/fs/squash4.c ++++ b/grub-core/fs/squash4.c +@@ -51,6 +51,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + unk2 containts one uint64_t + */ + ++PRAGMA_BEGIN_PACKED + struct grub_squash_super + { + grub_uint32_t magic; +@@ -89,7 +90,7 @@ struct grub_squash_inode + grub_uint32_t fragment; + grub_uint32_t offset; + grub_uint32_t size; +- grub_uint32_t block_size[0]; ++ grub_uint32_t block_size[1]; + } GRUB_PACKED file; + struct { + grub_uint64_t chunk; +@@ -98,7 +99,7 @@ struct grub_squash_inode + grub_uint32_t fragment; + grub_uint32_t offset; + grub_uint32_t dummy3; +- grub_uint32_t block_size[0]; ++ grub_uint32_t block_size[1]; + } GRUB_PACKED long_file; + struct { + grub_uint32_t chunk; +@@ -117,10 +118,11 @@ struct grub_squash_inode + struct { + grub_uint32_t dummy; + grub_uint32_t namelen; +- char name[0]; ++ char name[1]; + } GRUB_PACKED symlink; + } GRUB_PACKED; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_squash_cache_inode + { +@@ -131,6 +133,7 @@ struct grub_squash_cache_inode + grub_disk_addr_t *cumulated_block_sizes; + }; + ++PRAGMA_BEGIN_PACKED + /* Chunk-based. */ + struct grub_squash_dirent_header + { +@@ -166,6 +169,7 @@ struct grub_squash_frag_desc + grub_uint32_t size; + grub_uint32_t dummy; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + enum + { +diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c +index 1eaa5349f..2a53d3609 100644 +--- a/grub-core/fs/tar.c ++++ b/grub-core/fs/tar.c +@@ -73,7 +73,7 @@ struct grub_archelp_data + static grub_err_t + grub_cpio_find_file (struct grub_archelp_data *data, char **name, + grub_int32_t *mtime, +- grub_uint32_t *mode) ++ grub_archelp_mode_t *mode) + { + struct head hd; + int reread = 0, have_longname = 0, have_longlink = 0; +@@ -189,9 +189,12 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name, + } + if (mode) + { +- if (grub_cast (read_number (hd.mode, sizeof (hd.mode)), mode)) ++ grub_uint32_t modeval; ++ if (grub_cast (read_number (hd.mode, sizeof (hd.mode)), &modeval)) + return grub_error (GRUB_ERR_BAD_FS, N_("mode overflow")); + ++ *mode = modeval; ++ + switch (hd.typeflag) + { + /* Hardlink. */ +diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c +index 3d5ee5af5..8413eb907 100644 +--- a/grub-core/fs/udf.c ++++ b/grub-core/fs/udf.c +@@ -119,6 +119,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + ((char *) (_ptr) >= end_ptr || \ + ((grub_ssize_t) (end_ptr - (char *) (_ptr)) < (grub_ssize_t) sizeof (_struct))) + ++PRAGMA_BEGIN_PACKED + struct grub_udf_lb_addr + { + grub_uint32_t block_num; +@@ -376,6 +377,7 @@ struct grub_udf_aed + grub_uint32_t prev_ae; + grub_uint32_t ae_len; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_udf_data + { +diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c +index 8b5adbd48..75f15ca8c 100644 +--- a/grub-core/fs/ufs.c ++++ b/grub-core/fs/ufs.c +@@ -153,6 +153,7 @@ struct grub_ufs_sblock + grub_uint32_t magic; + }; + ++PRAGMA_BEGIN_PACKED + #ifdef MODE_UFS2 + /* UFS inode. */ + struct grub_ufs_inode +@@ -236,6 +237,7 @@ struct grub_ufs_dirent + }; + }; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* Information about a "mounted" ufs filesystem. */ + struct grub_ufs_data +diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c +index d95fa4a66..7764905d5 100644 +--- a/grub-core/fs/xfs.c ++++ b/grub-core/fs/xfs.c +@@ -122,6 +122,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); + XFS_SB_FEAT_INCOMPAT_PARENT | \ + XFS_SB_FEAT_INCOMPAT_METADIR) + ++PRAGMA_BEGIN_PACKED + struct grub_xfs_sblock + { + grub_uint8_t magic[4]; +@@ -254,6 +255,7 @@ struct grub_xfs_dirblock_tail + grub_uint32_t leaf_count; + grub_uint32_t leaf_stale; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_fshelp_node + { +diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c +index 5d0c50b69..7f70b97ed 100644 +--- a/grub-core/fs/zfs/zfs.c ++++ b/grub-core/fs/zfs/zfs.c +@@ -63,6 +63,12 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + #define ZPOOL_PROP_BOOTFS "bootfs" + ++#if defined(_M_IX86) || defined(__i386__) || defined (_M_ARM) || defined(__arm__) ++#define zfs_properly_aligned_t grub_uint32_t ++#else ++#define zfs_properly_aligned_t grub_uint64_t ++#endif ++ + /* + * For nvlist manipulation. (from nvpair.h) + */ +@@ -148,7 +154,7 @@ ZAP_LEAF_CHUNK (zap_leaf_phys_t *l, int bs, int idx) + { + grub_properly_aligned_t *l_entries; + +- l_entries = (grub_properly_aligned_t *) ALIGN_UP((grub_addr_t)l->l_hash, sizeof (grub_properly_aligned_t)); ++ l_entries = (grub_properly_aligned_t *) ALIGN_UP((grub_addr_t)l->l_hash, sizeof (zfs_properly_aligned_t)); + return &((zap_leaf_chunk_t *) (l_entries + + (ZAP_LEAF_HASH_NUMENTRIES(bs) * 2) + / sizeof (grub_properly_aligned_t)))[idx]; +@@ -254,8 +260,8 @@ struct grub_zfs_data + struct subvolume subvol; + + struct grub_zfs_device_desc *devices_attached; +- unsigned n_devices_attached; +- unsigned n_devices_allocated; ++ grub_size_t n_devices_attached; ++ grub_size_t n_devices_allocated; + struct grub_zfs_device_desc *device_original; + + uberblock_t current_uberblock; +@@ -2808,7 +2814,9 @@ dnode_get (dnode_end_t * mdn, grub_uint64_t objnum, grub_uint8_t type, + return GRUB_ERR_NONE; + } + ++#ifdef __GNUC__ + #pragma GCC diagnostic ignored "-Wstrict-aliasing" ++#endif + + /* + * Get the file dnode for a given file name where mdn is the meta dnode +diff --git a/grub-core/fs/zfs/zfs_lz4.c b/grub-core/fs/zfs/zfs_lz4.c +index 5453822d0..873445803 100644 +--- a/grub-core/fs/zfs/zfs_lz4.c ++++ b/grub-core/fs/zfs/zfs_lz4.c +@@ -74,6 +74,7 @@ static int LZ4_uncompress_unknownOutputSize(const char *source, char *dest, + #define S32 grub_int32_t + #define U64 grub_uint64_t + ++PRAGMA_BEGIN_PACKED + typedef struct _U16_S { + U16 v; + } GRUB_PACKED U16_S; +@@ -83,6 +84,7 @@ typedef struct _U32_S { + typedef struct _U64_S { + U64 v; + } GRUB_PACKED U64_S; ++PRAGMA_END_PACKED + + #define A64(x) (((U64_S *)(x))->v) + #define A32(x) (((U32_S *)(x))->v) +diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c +index 2395dc15d..4813e38a9 100644 +--- a/grub-core/kern/misc.c ++++ b/grub-core/kern/misc.c +@@ -38,7 +38,7 @@ union printf_arg + INT, LONG, LONGLONG, + UNSIGNED_INT = 3, UNSIGNED_LONG, UNSIGNED_LONGLONG, + STRING, +- GUID ++ UUID + } type; + long long ll; + }; +@@ -247,7 +247,7 @@ grub_puts_ (const char *s) + return grub_puts (_(s)); + } + +-#if defined (__APPLE__) && ! defined (GRUB_UTIL) ++#if ( defined (__APPLE__) || defined (_MSC_VER) ) && ! defined (GRUB_UTIL) + int + grub_err_printf (const char *fmt, ...) + { +@@ -262,7 +262,7 @@ grub_err_printf (const char *fmt, ...) + } + #endif + +-#if ! defined (__APPLE__) && ! defined (GRUB_UTIL) ++#if ! defined (__APPLE__) && ! defined (_MSC_VER) && ! defined (GRUB_UTIL) + int grub_err_printf (const char *fmt, ...) + __attribute__ ((alias("grub_printf"))); + #endif +@@ -1067,7 +1067,7 @@ parse_printf_arg_fmt (const char *fmt0, struct printf_args *args, + else + args->ptr[curn].type = UNSIGNED_INT; + if (*(fmt) == 'G') { +- args->ptr[curn].type = GUID; ++ args->ptr[curn].type = UUID; + ++fmt; + } + break; +@@ -1111,7 +1111,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args, va_list args_in) + args->ptr[n].ll = va_arg (args_in, long long); + break; + case STRING: +- case GUID: ++ case UUID: + if (sizeof (void *) == sizeof (long long)) + args->ptr[n].ll = va_arg (args_in, long long); + else +@@ -1320,7 +1320,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt0, + { + grub_size_t len = 0; + grub_size_t fill; +- const char *p = ((char *) (grub_addr_t) curarg) ? : "(null)"; ++ const char *p = (curarg != 0) ? ((char *) (grub_addr_t) curarg) : "(null)"; + grub_size_t i; + + while (len < format2 && p[len]) +diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h +index 4be7b4080..9f89a0f9d 100644 +--- a/grub-core/lib/posix_wrap/limits.h ++++ b/grub-core/lib/posix_wrap/limits.h +@@ -23,8 +23,12 @@ + + #define UCHAR_MAX GRUB_UCHAR_MAX + #define USHRT_MAX GRUB_USHRT_MAX ++#ifndef UINT_MAX + #define UINT_MAX GRUB_UINT_MAX ++#endif ++#ifndef ULONG_MAX + #define ULONG_MAX GRUB_ULONG_MAX ++#endif + + /* gnulib also defines this type */ + #ifndef SIZE_MAX +@@ -35,10 +39,18 @@ + #define SCHAR_MAX GRUB_SCHAR_MAX + #define SHRT_MIN GRUB_SHRT_MIN + #define SHRT_MAX GRUB_SHRT_MAX ++#ifndef INT_MIN + #define INT_MIN GRUB_INT_MIN ++#endif ++#ifndef INT_MAX + #define INT_MAX GRUB_INT_MAX ++#endif ++#ifndef LONG_MIN + #define LONG_MIN GRUB_LONG_MIN ++#endif ++#ifndef LONG_MAX + #define LONG_MAX GRUB_LONG_MAX ++#endif + + #define CHAR_BIT 8 + #define WORD_BIT 32 +diff --git a/grub-core/lib/xzembed/xz_dec_lzma2.c b/grub-core/lib/xzembed/xz_dec_lzma2.c +index af7b77079..d39f8afc0 100644 +--- a/grub-core/lib/xzembed/xz_dec_lzma2.c ++++ b/grub-core/lib/xzembed/xz_dec_lzma2.c +@@ -24,7 +24,9 @@ + #include "xz_private.h" + #include "xz_lzma2.h" + ++#ifdef __GNUC__ + #pragma GCC diagnostic warning "-Wattributes" ++#endif + + /* + * Range decoder initialization eats the first five bytes of each LZMA chunk. +diff --git a/grub-core/lib/xzembed/xz_stream.h b/grub-core/lib/xzembed/xz_stream.h +index f58397a15..2a64d1c8d 100644 +--- a/grub-core/lib/xzembed/xz_stream.h ++++ b/grub-core/lib/xzembed/xz_stream.h +@@ -32,7 +32,7 @@ + + #define STREAM_HEADER_SIZE 12 + +-#define HEADER_MAGIC "\3757zXZ\0" ++#define HEADER_MAGIC "\xFD" "7zXZ\0" + #define HEADER_MAGIC_SIZE 6 + + #define FOOTER_MAGIC "YZ" +diff --git a/grub-core/lib/zstd/bitstream.h b/grub-core/lib/zstd/bitstream.h +index 2f91460c5..d95b7ed82 100644 +--- a/grub-core/lib/zstd/bitstream.h ++++ b/grub-core/lib/zstd/bitstream.h +@@ -161,7 +161,7 @@ MEM_STATIC unsigned BIT_highbit32 (U32 val) + unsigned long r=0; + _BitScanReverse ( &r, val ); + return (unsigned) r; +-# elif defined(__GNUC__) && (__GNUC__ >= 3) /* Use GCC Intrinsic */ ++# elif defined(__GNUC__) && (__GNUC__ >= 3) && !defined(__riscv) /* Use GCC Intrinsic */ + return 31 - __builtin_clz (val); + # else /* Software version */ + static const unsigned DeBruijnClz[32] = { 0, 9, 1, 10, 13, 21, 2, 29, +diff --git a/grub-core/lib/zstd/fse_decompress.c b/grub-core/lib/zstd/fse_decompress.c +index 2227b84bc..a08c8fbb2 100644 +--- a/grub-core/lib/zstd/fse_decompress.c ++++ b/grub-core/lib/zstd/fse_decompress.c +@@ -36,8 +36,7 @@ + /* ************************************************************** + * Includes + ****************************************************************/ +-#include /* malloc, free, qsort */ +-#include /* memcpy, memset */ ++#include "mem.h" + #include "bitstream.h" + #include "compiler.h" + #define FSE_STATIC_LINKING_ONLY +diff --git a/grub-core/lib/zstd/huf_decompress.c b/grub-core/lib/zstd/huf_decompress.c +index 83ecaff01..856866322 100644 +--- a/grub-core/lib/zstd/huf_decompress.c ++++ b/grub-core/lib/zstd/huf_decompress.c +@@ -35,7 +35,7 @@ + /* ************************************************************** + * Dependencies + ****************************************************************/ +-#include /* memcpy, memset */ ++#include "mem.h" + #include "compiler.h" + #include "bitstream.h" /* BIT_* */ + #include "fse.h" /* to compress headers */ +diff --git a/grub-core/lib/zstd/mem.h b/grub-core/lib/zstd/mem.h +index 2051bcad1..032ba040d 100644 +--- a/grub-core/lib/zstd/mem.h ++++ b/grub-core/lib/zstd/mem.h +@@ -21,6 +21,16 @@ extern "C" { + #include /* size_t, ptrdiff_t */ + #include /* memcpy */ + ++#ifdef GRUB ++#include ++#include ++#define memset grub_memset ++#define memcpy grub_memcpy ++#define memmove grub_memmove ++#define malloc grub_malloc ++#define calloc grub_calloc ++#define free grub_free ++#endif + + /*-**************************************** + * Compiler specifics +@@ -196,7 +206,7 @@ MEM_STATIC void MEM_write64(void* memPtr, U64 value) + + MEM_STATIC U32 MEM_swap32(U32 in) + { +-#if defined(_MSC_VER) /* Visual Studio */ ++#if defined(_MSC_VER) && !defined(GRUB) /* Visual Studio */ + return _byteswap_ulong(in); + #elif defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403) + return __builtin_bswap32(in); +@@ -210,7 +220,7 @@ MEM_STATIC U32 MEM_swap32(U32 in) + + MEM_STATIC U64 MEM_swap64(U64 in) + { +-#if defined(_MSC_VER) /* Visual Studio */ ++#if defined(_MSC_VER) && !defined(GRUB) /* Visual Studio */ + return _byteswap_uint64(in); + #elif defined (__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 403) + return __builtin_bswap64(in); +diff --git a/grub-core/lib/zstd/xxhash.c b/grub-core/lib/zstd/xxhash.c +index 532b81619..01f4c800a 100644 +--- a/grub-core/lib/zstd/xxhash.c ++++ b/grub-core/lib/zstd/xxhash.c +@@ -97,8 +97,7 @@ + ***************************************/ + /* Modify the local functions below should you wish to use some other memory routines */ + /* for malloc(), free() */ +-#include +-#include /* size_t */ ++#include "mem.h" + static void* XXH_malloc(size_t s) { return malloc(s); } + static void XXH_free (void* p) { free(p); } + /* for memcpy() */ +@@ -202,7 +201,7 @@ static U64 XXH_read64(const void* memPtr) + #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) + + /* Note : although _rotl exists for minGW (GCC under windows), performance seems poor */ +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) && !defined(GRUB) + # define XXH_rotl32(x,r) _rotl(x,r) + # define XXH_rotl64(x,r) _rotl64(x,r) + #else +@@ -210,7 +209,7 @@ static U64 XXH_read64(const void* memPtr) + # define XXH_rotl64(x,r) ((x << r) | (x >> (64 - r))) + #endif + +-#if defined(_MSC_VER) /* Visual Studio */ ++#if defined(_MSC_VER) && !defined(GRUB) /* Visual Studio */ + # define XXH_swap32 _byteswap_ulong + # define XXH_swap64 _byteswap_uint64 + #elif GCC_VERSION >= 403 +diff --git a/grub-core/lib/zstd/zstd_common.c b/grub-core/lib/zstd/zstd_common.c +index 6f05d240e..568cebd79 100644 +--- a/grub-core/lib/zstd/zstd_common.c ++++ b/grub-core/lib/zstd/zstd_common.c +@@ -13,8 +13,7 @@ + /*-************************************* + * Dependencies + ***************************************/ +-#include /* malloc, calloc, free */ +-#include /* memset */ ++#include "mem.h" + #include "error_private.h" + #include "zstd_internal.h" + +diff --git a/grub-core/lib/zstd/zstd_decompress.c b/grub-core/lib/zstd/zstd_decompress.c +index e4b5670c2..b3397f411 100644 +--- a/grub-core/lib/zstd/zstd_decompress.c ++++ b/grub-core/lib/zstd/zstd_decompress.c +@@ -55,7 +55,6 @@ + /*-******************************************************* + * Dependencies + *********************************************************/ +-#include /* memcpy, memmove, memset */ + #include "compiler.h" /* prefetch */ + #include "cpu.h" /* bmi2 */ + #include "mem.h" /* low level memory routines */ +diff --git a/grub-core/lib/zstd/zstd_internal.h b/grub-core/lib/zstd/zstd_internal.h +index e75adfa61..05b222069 100644 +--- a/grub-core/lib/zstd/zstd_internal.h ++++ b/grub-core/lib/zstd/zstd_internal.h +@@ -67,12 +67,24 @@ static const U32 repStartValue[ZSTD_REP_NUM] = { 1, 4, 8 }; + #define MB *(1 <<20) + #define GB *(1U<<30) + ++#ifndef BIT7 + #define BIT7 128 ++#endif ++#ifndef BIT6 + #define BIT6 64 ++#endif ++#ifndef BIT5 + #define BIT5 32 ++#endif ++#ifndef BIT4 + #define BIT4 16 ++#endif ++#ifndef BIT1 + #define BIT1 2 ++#endif ++#ifndef BIT0 + #define BIT0 1 ++#endif + + #define ZSTD_WINDOWLOG_ABSOLUTEMIN 10 + #define ZSTD_WINDOWLOG_DEFAULTMAX 27 /* Default maximum allowed window log */ +@@ -215,7 +227,7 @@ MEM_STATIC U32 ZSTD_highbit32(U32 val) /* compress, dictBuilder, decodeCorpus + unsigned long r=0; + _BitScanReverse(&r, val); + return (unsigned)r; +-# elif defined(__GNUC__) && (__GNUC__ >= 3) /* GCC Intrinsic */ ++# elif defined(__GNUC__) && (__GNUC__ >= 3) && !defined(__riscv) /* GCC Intrinsic */ + return 31 - __builtin_clz(val); + # else /* Software version */ + static const U32 DeBruijnClz[32] = { 0, 9, 1, 10, 13, 21, 2, 29, 11, 14, 16, 18, 22, 25, 3, 30, 8, 12, 20, 28, 15, 17, 24, 7, 19, 27, 23, 6, 26, 5, 4, 31 }; +diff --git a/include/grub/arm64/types.h b/include/grub/arm64/types.h +index d132c5eab..54b5e6398 100644 +--- a/include/grub/arm64/types.h ++++ b/include/grub/arm64/types.h +@@ -23,7 +23,11 @@ + #define GRUB_TARGET_SIZEOF_VOID_P 8 + + /* The size of long. */ ++#if defined(_MSC_VER) ++#define GRUB_TARGET_SIZEOF_LONG 4 ++#else + #define GRUB_TARGET_SIZEOF_LONG 8 ++#endif + + /* currently only support little-endian. */ + #undef GRUB_TARGET_WORDS_BIGENDIAN +diff --git a/include/grub/btrfs.h b/include/grub/btrfs.h +index 19de49311..8d95114b4 100644 +--- a/include/grub/btrfs.h ++++ b/include/grub/btrfs.h +@@ -41,6 +41,7 @@ enum + + #define GRUB_BTRFS_ROOT_SUBVOL_RDONLY (1ULL << 0) + ++PRAGMA_BEGIN_PACKED + struct grub_btrfs_root_item + { + grub_uint8_t dummy[0xb0]; +@@ -56,7 +57,6 @@ struct grub_btrfs_key + grub_uint64_t offset; + } GRUB_PACKED; + +- + struct grub_btrfs_root_backref + { + grub_uint64_t inode_id; +@@ -71,5 +71,6 @@ struct grub_btrfs_inode_ref + grub_uint16_t n; + char name[0]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #endif +diff --git a/include/grub/exfat.h b/include/grub/exfat.h +index 2b8009cee..b7654d0aa 100644 +--- a/include/grub/exfat.h ++++ b/include/grub/exfat.h +@@ -21,6 +21,7 @@ + + #include + ++PRAGMA_BEGIN_PACKED + struct grub_exfat_bpb + { + grub_uint8_t jmp_boot[3]; +@@ -42,6 +43,7 @@ struct grub_exfat_bpb + grub_uint8_t num_ph_drive; + grub_uint8_t reserved[8]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #ifdef GRUB_UTIL + #include +diff --git a/include/grub/fat.h b/include/grub/fat.h +index 8d7e4a1e5..bf4441479 100644 +--- a/include/grub/fat.h ++++ b/include/grub/fat.h +@@ -21,6 +21,7 @@ + + #include + ++PRAGMA_BEGIN_PACKED + struct grub_fat_bpb + { + grub_uint8_t jmp_boot[3]; +@@ -66,6 +67,7 @@ struct grub_fat_bpb + } GRUB_PACKED fat32; + } GRUB_PACKED version_specific; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #ifdef GRUB_UTIL + #include +diff --git a/include/grub/hfs.h b/include/grub/hfs.h +index e27993c42..7a1008778 100644 +--- a/include/grub/hfs.h ++++ b/include/grub/hfs.h +@@ -24,6 +24,7 @@ + #define GRUB_HFS_MAGIC 0x4244 + + /* A single extent. A file consists of one or more extents. */ ++PRAGMA_BEGIN_PACKED + struct grub_hfs_extent + { + /* The first physical block. */ +@@ -68,5 +69,6 @@ struct grub_hfs_sblock + grub_uint32_t catalog_size; + grub_hfs_datarecord_t catalog_recs; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + #endif /* ! GRUB_HFS_HEADER */ +diff --git a/include/grub/hfsplus.h b/include/grub/hfsplus.h +index 2d8336aff..8627dc47e 100644 +--- a/include/grub/hfsplus.h ++++ b/include/grub/hfsplus.h +@@ -24,6 +24,7 @@ + #define GRUB_HFSPLUS_SBLOCK 2 + + /* A HFS+ extent. */ ++PRAGMA_BEGIN_PACKED + struct grub_hfsplus_extent + { + /* The first block of a file on disk. */ +@@ -68,6 +69,7 @@ struct grub_hfsplus_volheader + struct grub_hfsplus_forkdata attr_file; + struct grub_hfsplus_forkdata startup_file; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_hfsplus_compress_index + { +@@ -140,6 +142,7 @@ struct grub_hfsplus_extkey_internal + grub_uint8_t type; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_hfsplus_attrkey + { + grub_uint16_t keylen; +@@ -149,6 +152,7 @@ struct grub_hfsplus_attrkey + grub_uint16_t namelen; + grub_uint16_t name[0]; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_hfsplus_attrkey_internal + { +@@ -168,6 +172,7 @@ struct grub_hfsplus_key_internal + }; + + /* The on disk layout of a catalog key. */ ++PRAGMA_BEGIN_PACKED + struct grub_hfsplus_catkey + { + grub_uint16_t keylen; +@@ -206,6 +211,7 @@ struct grub_hfsplus_btnode + grub_uint16_t count; + grub_uint16_t unused; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* Return the offset of the record with the index INDEX, in the node + NODE which is part of the B+ tree BTREE. */ +diff --git a/include/grub/misc.h b/include/grub/misc.h +index 078e8e544..7fe613df0 100644 +--- a/include/grub/misc.h ++++ b/include/grub/misc.h +@@ -32,7 +32,9 @@ + #define ALIGN_UP_OVERHEAD(addr, align) ((-(addr)) & ((typeof (addr)) (align) - 1)) + #define ALIGN_DOWN(addr, align) \ + ((addr) & ~((typeof (addr)) (align) - 1)) ++#ifndef ARRAY_SIZE + #define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0])) ++#endif + #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; } + + #define grub_dprintf(condition, ...) grub_real_dprintf(GRUB_FILE, __FUNCTION__, __LINE__, condition, __VA_ARGS__) +@@ -333,6 +335,9 @@ grub_uuidcasecmp (const char *uuid1, const char *uuid2, grub_size_t n) + * ... or ... + * l = grub_strtoul(s, (const char ** const)&end, 10); + */ ++#ifdef _MSC_VER ++#define restrict ++#endif + unsigned long EXPORT_FUNC(grub_strtoul) (const char * restrict str, const char ** const restrict end, int base); + unsigned long long EXPORT_FUNC(grub_strtoull) (const char * restrict str, const char ** const restrict end, int base); + +diff --git a/include/grub/ntfs.h b/include/grub/ntfs.h +index 77b182acf..5a40bf934 100644 +--- a/include/grub/ntfs.h ++++ b/include/grub/ntfs.h +@@ -125,6 +125,7 @@ enum + GRUB_NTFS_RF_BLNK = 1 + }; + ++PRAGMA_BEGIN_PACKED + struct grub_ntfs_bpb + { + grub_uint8_t jmp_boot[3]; +@@ -150,6 +151,7 @@ struct grub_ntfs_bpb + grub_uint64_t num_serial; + grub_uint32_t checksum; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + struct grub_ntfs_attr + { +diff --git a/include/grub/safemath.h b/include/grub/safemath.h +index e032f63a0..26704ae9a 100644 +--- a/include/grub/safemath.h ++++ b/include/grub/safemath.h +@@ -47,6 +47,50 @@ + __failed; \ + }) + ++#elif defined(_MSC_VER) ++ ++#define ENABLE_INTSAFE_SIGNED_FUNCTIONS ++#include ++#include ++#include ++ ++#define grub_add(a, b, res) \ ++FAILED(_Generic(*(res), \ ++INT: IntAdd, \ ++UINT: UIntAdd, \ ++USHORT: UShortAdd, \ ++ULONGLONG: ULongLongAdd \ ++)((a), (b), (res))) ++ ++#define grub_sub(a, b, res) \ ++FAILED(_Generic(*(res), \ ++INT: IntSub, \ ++UINT: UIntSub, \ ++USHORT: UShortSub, \ ++ULONGLONG: ULongLongSub \ ++)((a), (b), (res))) ++ ++#define grub_mul(a, b, res) \ ++FAILED(_Generic(*(res), \ ++INT: IntMult, \ ++UINT: UIntMult, \ ++USHORT: UShortMult, \ ++ULONGLONG: ULongLongMult \ ++)((a), (b), (res))) ++ ++#define grub_cast(a, res) grub_add ((a), 0, (res)) ++ ++// Only used by EROFS for now... ++static __inline bool ALIGN_UP_OVF(uintptr_t v, uintptr_t align, uintptr_t* res) ++{ ++ uintptr_t __a = ((uintptr_t)(align) - 1); ++ ++ if (grub_add (v, __a, res)) ++ return false; ++ *(res) &= ~__a; ++ return true; ++} ++ + #else + #error gcc 5.1 or newer or clang 8.0 or newer is required + #endif +diff --git a/include/grub/term.h b/include/grub/term.h +index 7f1a14c84..6daa584a1 100644 +--- a/include/grub/term.h ++++ b/include/grub/term.h +@@ -339,12 +339,12 @@ void grub_term_restore_pos (struct grub_term_coordinate *pos); + + static inline unsigned grub_term_width (struct grub_term_output *term) + { +- return term->getwh(term).x ? : 80; ++ return term->getwh(term).x ? term->getwh(term).x : 80; + } + + static inline unsigned grub_term_height (struct grub_term_output *term) + { +- return term->getwh(term).y ? : 24; ++ return term->getwh(term).y ? term->getwh(term).y : 24; + } + + static inline struct grub_term_coordinate +diff --git a/include/grub/types.h b/include/grub/types.h +index b3ba762fc..7cbe6e155 100644 +--- a/include/grub/types.h ++++ b/include/grub/types.h +@@ -27,10 +27,20 @@ + + #ifdef __MINGW32__ + #define GRUB_PACKED __attribute__ ((packed,gcc_struct)) ++#elif defined(_MSC_VER) ++#define GRUB_PACKED + #else + #define GRUB_PACKED __attribute__ ((packed)) + #endif + ++#ifdef _MSC_VER ++#define PRAGMA_BEGIN_PACKED __pragma(pack(push, 1)) ++#define PRAGMA_END_PACKED __pragma(pack(pop)) ++#else ++#define PRAGMA_BEGIN_PACKED ++#define PRAGMA_END_PACKED ++#endif ++ + #ifdef GRUB_BUILD + # define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P + # define GRUB_CPU_SIZEOF_LONG BUILD_SIZEOF_LONG +@@ -104,7 +114,7 @@ typedef unsigned short grub_uint16_t; + typedef unsigned grub_uint32_t; + # define PRIxGRUB_UINT32_T "x" + # define PRIuGRUB_UINT32_T "u" +-#if GRUB_CPU_SIZEOF_LONG == 8 ++#if GRUB_CPU_SIZEOF_LONG == 8 && !defined(_MSC_VER) + typedef unsigned long grub_uint64_t; + # define PRIxGRUB_UINT64_T "lx" + # define PRIuGRUB_UINT64_T "lu" +@@ -199,19 +209,17 @@ static inline grub_uint16_t grub_swap_bytes16(grub_uint16_t _x) + #define grub_swap_bytes16_compile_time(x) ((grub_uint16_t)((((x) & 0xff) << 8) | (((x) & 0xff00) >> 8))) + #define grub_swap_bytes32_compile_time(x) ((grub_uint32_t)((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) | (((x) & 0xff0000) >> 8) | (((x) & 0xff000000UL) >> 24))) + #define grub_swap_bytes64_compile_time(x) \ +-({ \ +- grub_uint64_t _x = (x); \ +- (grub_uint64_t) ((_x << 56) \ +- | ((_x & (grub_uint64_t) 0xFF00ULL) << 40) \ +- | ((_x & (grub_uint64_t) 0xFF0000ULL) << 24) \ +- | ((_x & (grub_uint64_t) 0xFF000000ULL) << 8) \ +- | ((_x & (grub_uint64_t) 0xFF00000000ULL) >> 8) \ +- | ((_x & (grub_uint64_t) 0xFF0000000000ULL) >> 24) \ +- | ((_x & (grub_uint64_t) 0xFF000000000000ULL) >> 40) \ +- | (_x >> 56)); \ +-}) +- +-#if (defined(__GNUC__) && (__GNUC__ > 3) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 3)) || defined(__clang__) ++((grub_uint64_t) ((((grub_uint64_t)x) << 56) \ ++ | ((((grub_uint64_t)x) & (grub_uint64_t) 0xFF00ULL) << 40) \ ++ | ((((grub_uint64_t)x) & (grub_uint64_t) 0xFF0000ULL) << 24) \ ++ | ((((grub_uint64_t)x) & (grub_uint64_t) 0xFF000000ULL) << 8) \ ++ | ((((grub_uint64_t)x) & (grub_uint64_t) 0xFF00000000ULL) >> 8) \ ++ | ((((grub_uint64_t)x) & (grub_uint64_t) 0xFF0000000000ULL) >> 24) \ ++ | ((((grub_uint64_t)x) & (grub_uint64_t) 0xFF000000000000ULL) >> 40) \ ++ | (((grub_uint64_t)x) >> 56)) \ ++) ++ ++#if ((defined(__GNUC__) && (__GNUC__ > 3) && (__GNUC__ > 4 || __GNUC_MINOR__ >= 3)) || defined(__clang__)) && (!defined (__riscv)) + static inline grub_uint32_t grub_swap_bytes32(grub_uint32_t x) + { + return __builtin_bswap32(x); +@@ -286,18 +294,24 @@ static inline grub_uint64_t grub_swap_bytes64(grub_uint64_t _x) + + #endif /* ! WORDS_BIGENDIAN */ + ++PRAGMA_BEGIN_PACKED + struct grub_unaligned_uint16 + { + grub_uint16_t val; + } GRUB_PACKED; ++PRAGMA_END_PACKED ++PRAGMA_BEGIN_PACKED + struct grub_unaligned_uint32 + { + grub_uint32_t val; + } GRUB_PACKED; ++PRAGMA_END_PACKED ++PRAGMA_BEGIN_PACKED + struct grub_unaligned_uint64 + { + grub_uint64_t val; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + typedef struct grub_unaligned_uint16 grub_unaligned_uint16_t; + typedef struct grub_unaligned_uint32 grub_unaligned_uint32_t; +@@ -338,10 +352,12 @@ static inline grub_uint64_t grub_get_unaligned64 (const void *ptr) + + static inline void grub_set_unaligned64 (void *ptr, grub_uint64_t val) + { ++ PRAGMA_BEGIN_PACKED + struct grub_unaligned_uint64_t + { + grub_uint64_t d; + } GRUB_PACKED; ++ PRAGMA_END_PACKED + struct grub_unaligned_uint64_t *dd = (struct grub_unaligned_uint64_t *) ptr; + dd->d = val; + } +diff --git a/include/grub/unicode.h b/include/grub/unicode.h +index 9360b0b97..37bf6158f 100644 +--- a/include/grub/unicode.h ++++ b/include/grub/unicode.h +@@ -29,6 +29,7 @@ struct grub_unicode_bidi_pair + grub_uint32_t replace; + }; + ++PRAGMA_BEGIN_PACKED + struct grub_unicode_compact_range + { + unsigned start:21; +@@ -38,6 +39,7 @@ struct grub_unicode_compact_range + unsigned bidi_mirror:1; + unsigned join_type:3; + } GRUB_PACKED; ++PRAGMA_END_PACKED + + /* Old-style Arabic shaping. Used for "visual UTF-8" and + in grub-mkfont to find variant glyphs in absence of GPOS tables. */ +diff --git a/include/grub/x86_64/types.h b/include/grub/x86_64/types.h +index 0bbdc6d01..eefa80847 100644 +--- a/include/grub/x86_64/types.h ++++ b/include/grub/x86_64/types.h +@@ -27,7 +27,7 @@ + #endif + + /* The size of long. */ +-#if defined(__MINGW32__) || defined(__ILP32__) ++#if defined(__MINGW32__) || defined(__ILP32__) || defined(_MSC_VER) + #define GRUB_TARGET_SIZEOF_LONG 4 + #else + #define GRUB_TARGET_SIZEOF_LONG 8 +diff --git a/include/grub/zfs/zap_leaf.h b/include/grub/zfs/zap_leaf.h +index 11447c166..0479d383f 100644 +--- a/include/grub/zfs/zap_leaf.h ++++ b/include/grub/zfs/zap_leaf.h +@@ -86,11 +86,13 @@ typedef union zap_leaf_chunk { + } l_entry; + struct zap_leaf_array { + grub_uint8_t la_type; /* always ZAP_CHUNK_ARRAY */ ++ PRAGMA_BEGIN_PACKED + union + { + grub_uint8_t la_array[ZAP_LEAF_ARRAY_BYTES]; + grub_uint64_t la_array64; + } GRUB_PACKED; ++ PRAGMA_END_PACKED + grub_uint16_t la_next; /* next blk or CHAIN_END */ + } l_array; + struct zap_leaf_free { +diff --git a/include/grub/zfs/zio.h b/include/grub/zfs/zio.h +index 997b0c4d4..88dcce269 100644 +--- a/include/grub/zfs/zio.h ++++ b/include/grub/zfs/zio.h +@@ -27,10 +27,12 @@ + + #define ZEC_MAGIC 0x210da7ab10c7a11ULL /* zio data bloc tail */ + ++PRAGMA_BEGIN_PACKED + typedef struct zio_eck { + grub_uint64_t zec_magic; /* for validation, endianness */ + zio_cksum_t zec_cksum; /* 256-bit checksum */ + } GRUB_PACKED zio_eck_t; ++PRAGMA_END_PACKED + + /* + * Gang block headers are self-checksumming and contain an array +-- +2.47.3 + diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_LvglPkg/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_LvglPkg/module.cfg new file mode 100644 index 000000000..8a0573ffb --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_LvglPkg/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/MrChromebox/LvglPkg.git" +subgit_bkup="https://codeberg.org/libreboot/LvglPkg.git" +subhash="659b502401d9439443dc636acb10ca711afe8bc5" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_TPM/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_TPM/module.cfg new file mode 100644 index 000000000..4630a8582 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_TPM/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/TrustedComputingGroup/TPM.git" +subgit_bkup="https://codeberg.org/libreboot/TPM.git" +subhash="bc29a21d44b01396223c152a4834e52318591770" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_boringssl/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_boringssl/module.cfg new file mode 100644 index 000000000..c01b1f1db --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_boringssl/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/google/boringssl.git" +subgit_bkup="https://git.disroot.org/libreboot/boringssl.git" +subhash="f1c75347daa2ea81a941e953f2263e0a4d970c8d" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_brotli/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_brotli/module.cfg new file mode 100644 index 000000000..b16c0ad54 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_brotli/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/google/brotli.git" +subgit_bkup="https://codeberg.org/libreboot/brotli.git" +subhash="e230f474b87134e8c6c85b630084c612057f253e" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_cloudflare-quiche/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_cloudflare-quiche/module.cfg new file mode 100644 index 000000000..d43e6d8c7 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_cloudflare-quiche/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/cloudflare/quiche.git" +subgit_bkup="https://git.disroot.org/libreboot/quiche.git" +subhash="7ab6a55cfe471267d61e4d28ba43d41defcd87e0" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_cmocka_edk2/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_cmocka_edk2/module.cfg new file mode 100644 index 000000000..7edc3c95e --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_cmocka_edk2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/tianocore/edk2-cmocka.git" +subgit_bkup="https://codeberg.org/libreboot/edk2-cmocka.git" +subhash="1cc9cde3448cdd2e000886a26acf1caac2db7cf1" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_cmocka_libspdm/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_cmocka_libspdm/module.cfg new file mode 100644 index 000000000..2154e95a7 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_cmocka_libspdm/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://gitlab.com/cmocka/cmocka.git" +subgit_bkup="https://codeberg.org/libreboot/cmocka.git" +subhash="a01cc69ee9536f90e57c61a198f2d1944d3d4313" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_corpora/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_corpora/module.cfg new file mode 100644 index 000000000..073beac43 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_corpora/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/openssl/fuzz-corpora.git" +subgit_bkup="https://git.disroot.org/libreboot/fuzz-corpora.git" +subhash="ce771805c094d098c25a218bc8e9f7344eccbc5a" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_framework_mbedtls_edk2/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_framework_mbedtls_edk2/module.cfg new file mode 100644 index 000000000..5cbb0ef70 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_framework_mbedtls_edk2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/Mbed-TLS/mbedtls-framework.git" +subgit_bkup="https://codeberg.org/libreboot/mbedtls-framework.git" +subhash="dff9da04438d712f7647fd995bc90fadd0c0e2ce" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_framework_mbedtls_libspdm/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_framework_mbedtls_libspdm/module.cfg new file mode 100644 index 000000000..6aad2e602 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_framework_mbedtls_libspdm/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/Mbed-TLS/mbedtls-framework.git" +subgit_bkup="https://codeberg.org/libreboot/mbedtls-framework.git" +subhash="94599c0e3b5036e086446a51a3f79640f70f22f6" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_googletest_edk2/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_googletest_edk2/module.cfg new file mode 100644 index 000000000..cd09f5e8f --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_googletest_edk2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/google/googletest.git" +subgit_bkup="https://codeberg.org/libreboot/googletest.git" +subhash="86add13493e5c881d7e4ba77fb91c1f57752b3a4" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_googletest_mipisyst/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_googletest_mipisyst/module.cfg new file mode 100644 index 000000000..cc7b2ddcc --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_googletest_mipisyst/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/google/googletest.git" +subgit_bkup="https://codeberg.org/libreboot/googletest.git" +subhash="a6f06bf2fd3b832822cd4e9e554b7d47f32ec084" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_gost-engine/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_gost-engine/module.cfg new file mode 100644 index 000000000..13c965753 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_gost-engine/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/gost-engine/engine.git" +subgit_bkup="https://git.disroot.org/libreboot/engine.git" +subhash="74b1f4fddbc2d6de969815b1992ddc1ae7c643fe" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_jansson/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_jansson/module.cfg new file mode 100644 index 000000000..91ed32d09 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_jansson/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/akheron/jansson.git" +subgit_bkup="https://codeberg.org/libreboot/jansson.git" +subhash="e9ebfa7e77a6bee77df44e096b100e7131044059" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_krb5/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_krb5/module.cfg new file mode 100644 index 000000000..8458c27d2 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_krb5/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/krb5/krb5.git" +subgit_bkup="https://git.disroot.org/libreboot/krb5.git" +subhash="784c38f50e70a739400cdd3f2620bac2e2788e6c" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_libfdt/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_libfdt/module.cfg new file mode 100644 index 000000000..10a170946 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_libfdt/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/devicetree-org/pylibfdt.git" +subgit_bkup="https://codeberg.org/libreboot/pylibfdt.git" +subhash="cfff805481bdea27f900c32698171286542b8d3c" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_libprov/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_libprov/module.cfg new file mode 100644 index 000000000..2260cd69d --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_libprov/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/provider-corner/libprov.git" +subgit_bkup="https://git.disroot.org/libreboot/libprov.git" +subhash="0b445c73ae1e87577430c6884cdeeca1afa36dbd" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_libspdm/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_libspdm/module.cfg new file mode 100644 index 000000000..a17503887 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_libspdm/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/DMTF/libspdm.git" +subgit_bkup="https://codeberg.org/libreboot/libspdm.git" +subhash="f55cf6d48ec69b4ac60a63903e9c6a2cb0fd155d" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_list b/config/submodule/edk2_fs_drivers/default/edk2_module_list new file mode 100644 index 000000000..f2acc3397 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_list @@ -0,0 +1,40 @@ +boringssl +brotli +cloudflare-quiche +cmocka_edk2 +cmocka_libspdm +corpora +framework_mbedtls_edk2 +framework_mbedtls_libspdm +googletest_edk2 +googletest_mipisyst +gost-engine +jansson +krb5 +libfdt +libprov +libspdm +list +lvgl +LvglPkg +mbedtls_edk2 +mbedtls_libspdm +mipisyst +oniguruma +openssl_edk2 +openssl_libspdm +oqs-provider +pkcs11-provider_openssl_edk2 +pkcs11-provider_openssl_libspdm +pugixml +pyca-cryptography +python-ecdsa_openssl +python-ecdsa_openssl_pkcs11-provider +subhook +tlsfuzzer_openssl_edk2 +tlsfuzzer_openssl_pkcs11-provider +tlslite-ng_openssl_edk2 +tlslite-ng_openssl_pkcs11-provider +TPM +wolfssl +wycheproof diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_lvgl/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_lvgl/module.cfg new file mode 100644 index 000000000..fc7d40c85 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_lvgl/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/lvgl/lvgl.git" +subgit_bkup="https://git.disroot.org/libreboot/lvgl.git" +subhash="85aa60d18b3d5e5588d7b247abf90198f07c8a63" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_mbedtls_edk2/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_mbedtls_edk2/module.cfg new file mode 100644 index 000000000..25df8b3b1 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_mbedtls_edk2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/ARMmbed/mbedtls.git" +subgit_bkup="https://codeberg.org/libreboot/mbedtls.git" +subhash="0bebf8b8c7f07abe3571ded48a11aa907a1ffb20" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_mbedtls_libspdm/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_mbedtls_libspdm/module.cfg new file mode 100644 index 000000000..162dc7a3d --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_mbedtls_libspdm/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/Mbed-TLS/mbedtls" +subgit_bkup="https://codeberg.org/libreboot/mbedtls.git" +subhash="107ea89daaefb9867ea9121002fbbdf926780e98" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_mipisyst/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_mipisyst/module.cfg new file mode 100644 index 000000000..c62c7b4a0 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_mipisyst/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/MIPI-Alliance/public-mipi-sys-t.git" +subgit_bkup="https://codeberg.org/libreboot/public-mipi-sys-t.git" +subhash="370b5944c046bab043dd8b133727b2135af7747a" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_oniguruma/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_oniguruma/module.cfg new file mode 100644 index 000000000..9199a21a4 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_oniguruma/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/kkos/oniguruma.git" +subgit_bkup="https://codeberg.org/libreboot/oniguruma.git" +subhash="4ef89209a239c1aea328cf13c05a2807e5c146d1" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_openssl_edk2/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_openssl_edk2/module.cfg new file mode 100644 index 000000000..4765366a7 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_openssl_edk2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/openssl/openssl.git" +subgit_bkup="https://codeberg.org/libreboot/openssl.git" +subhash="8cf17aaeb4599f8af87fefd810b5b5fee90fe69e" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_openssl_libspdm/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_openssl_libspdm/module.cfg new file mode 100644 index 000000000..795983cb0 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_openssl_libspdm/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/openssl/openssl.git" +subgit_bkup="https://codeberg.org/libreboot/openssl.git" +subhash="aea7aaf2abb04789f5868cbabec406ea43aa84bf" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_oqs-provider/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_oqs-provider/module.cfg new file mode 100644 index 000000000..0fc0701e8 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_oqs-provider/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/open-quantum-safe/oqs-provider.git" +subgit_bkup="https://git.disroot.org/libreboot/oqs-provider.git" +subhash="7bc597c04b534ddea9b6654481deb31ded8e1bbc" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_pkcs11-provider_openssl_edk2/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_pkcs11-provider_openssl_edk2/module.cfg new file mode 100644 index 000000000..a88435111 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_pkcs11-provider_openssl_edk2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/latchset/pkcs11-provider.git" +subgit_bkup="https://codeberg.org/libreboot/pkcs11-provider.git" +subhash="663dea335c80bec7fd96d544ff875af08d6461a9" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_pkcs11-provider_openssl_libspdm/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_pkcs11-provider_openssl_libspdm/module.cfg new file mode 100644 index 000000000..d1140aeef --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_pkcs11-provider_openssl_libspdm/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/latchset/pkcs11-provider.git" +subgit_bkup="https://codeberg.org/libreboot/pkcs11-provider.git" +subhash="898b1079d95453dc5d0f378dd15a75b99252caf3" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_pugixml/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_pugixml/module.cfg new file mode 100644 index 000000000..9efd571d8 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_pugixml/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/zeux/pugixml.git" +subgit_bkup="https://git.disroot.org/libreboot/pugixml.git" +subhash="c53fdab93af76106b963216d85897614b996f8b6" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_pyca-cryptography/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_pyca-cryptography/module.cfg new file mode 100644 index 000000000..90352ab0f --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_pyca-cryptography/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/pyca/cryptography.git" +subgit_bkup="https://git.disroot.org/libreboot/cryptography.git" +subhash="7e33b0e7739d633c77b8c478620167f693ed13f4" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_python-ecdsa_openssl/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_python-ecdsa_openssl/module.cfg new file mode 100644 index 000000000..6b9e227aa --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_python-ecdsa_openssl/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/tlsfuzzer/python-ecdsa.git" +subgit_bkup="https://codeberg.org/libreboot/python-ecdsa.git" +subhash="4096fa01715929e08b97e73f3173aee9d57f2a3f" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_python-ecdsa_openssl_pkcs11-provider/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_python-ecdsa_openssl_pkcs11-provider/module.cfg new file mode 100644 index 000000000..e6f714db8 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_python-ecdsa_openssl_pkcs11-provider/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/tlsfuzzer/python-ecdsa.git" +subgit_bkup="https://codeberg.org/libreboot/python-ecdsa.git" +subhash="ea9666903c109a8e88a37eb1c60d4e98f01f0299" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_subhook/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_subhook/module.cfg new file mode 100644 index 000000000..687b48140 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_subhook/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/tianocore/edk2-subhook.git" +subgit_bkup="https://codeberg.org/libreboot/edk2-subhook.git" +subhash="83d4e1ebef3588fae48b69a7352cc21801cb70bc" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_tlsfuzzer_openssl_edk2/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_tlsfuzzer_openssl_edk2/module.cfg new file mode 100644 index 000000000..df7245b4b --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_tlsfuzzer_openssl_edk2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/tlsfuzzer/tlsfuzzer.git" +subgit_bkup="https://git.disroot.org/libreboot/tlsfuzzer.git" +subhash="61f45d9701294fd87ef92d2a7e3dfb076653a562" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_tlsfuzzer_openssl_pkcs11-provider/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_tlsfuzzer_openssl_pkcs11-provider/module.cfg new file mode 100644 index 000000000..91a5a7ee7 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_tlsfuzzer_openssl_pkcs11-provider/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/tlsfuzzer/tlsfuzzer.git" +subgit_bkup="https://git.disroot.org/libreboot/tlsfuzzer.git" +subhash="32fcb0d8e78fd9ffc4568d11ba5916936a46af8c" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_tlslite-ng_openssl_edk2/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_tlslite-ng_openssl_edk2/module.cfg new file mode 100644 index 000000000..78056126c --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_tlslite-ng_openssl_edk2/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/tlsfuzzer/tlslite-ng.git" +subgit_bkup="https://git.disroot.org/libreboot/tlslite-ng.git" +subhash="77ef321dde1a9e6bcf94d73c80f8789a770d8031" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_tlslite-ng_openssl_pkcs11-provider/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_tlslite-ng_openssl_pkcs11-provider/module.cfg new file mode 100644 index 000000000..b29065f76 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_tlslite-ng_openssl_pkcs11-provider/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/tlsfuzzer/tlslite-ng.git" +subgit_bkup="https://git.disroot.org/libreboot/tlslite-ng.git" +subhash="4e16574d7c52f17c81c3f5e0aa547776a67fdf8e" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_wolfssl/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_wolfssl/module.cfg new file mode 100644 index 000000000..1999fff7c --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_wolfssl/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/wolfSSL/wolfssl.git" +subgit_bkup="https://git.disroot.org/libreboot/wolfssl.git" +subhash="9c87f979a7f1d3a6d786b260653d566c1d31a1c4" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_module_wycheproof/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_module_wycheproof/module.cfg new file mode 100644 index 000000000..0db943290 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_module_wycheproof/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/google/wycheproof" +subgit_bkup="https://git.disroot.org/libreboot/wycheproof.git" +subhash="2196000605e45d91097147c9c71f26b72af58003" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_ntfs_3g/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_ntfs_3g/module.cfg new file mode 100644 index 000000000..af71a2cf3 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_ntfs_3g/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/pbatard/ntfs-3g.git" +subgit_bkup="https://gitea.treehouse.systems/libreboot/ntfs-3g.git" +subhash="68c1da7ec35cfa3289bfbe3999fb31474494abce" diff --git a/config/submodule/edk2_fs_drivers/default/edk2_ntfs_3g_gnuefi/module.cfg b/config/submodule/edk2_fs_drivers/default/edk2_ntfs_3g_gnuefi/module.cfg new file mode 100644 index 000000000..af994e926 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/edk2_ntfs_3g_gnuefi/module.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +subgit="https://github.com/ncroxon/gnu-efi.git" +subgit_bkup="https://gitea.treehouse.systems/libreboot/gnu-efi.git" +subhash="f56c54402de23349bd658dc91eb508d7732a9970" diff --git a/config/submodule/edk2_fs_drivers/default/module.list b/config/submodule/edk2_fs_drivers/default/module.list new file mode 100644 index 000000000..beed6fd35 --- /dev/null +++ b/config/submodule/edk2_fs_drivers/default/module.list @@ -0,0 +1,58 @@ +BaseTools/Source/C/BrotliCompress/brotli:edk2_module_brotli +CryptoPkg/Library/MbedTlsLib/mbedtls:edk2_module_mbedtls_edk2 +CryptoPkg/Library/MbedTlsLib/mbedtls/framework:edk2_module_framework_mbedtls_edk2 +CryptoPkg/Library/OpensslLib/openssl:edk2_module_openssl_edk2 +CryptoPkg/Library/OpensslLib/openssl/cloudflare-quiche:edk2_module_cloudflare-quiche +CryptoPkg/Library/OpensslLib/openssl/cloudflare-quiche/quiche/deps/boringssl:edk2_module_boringssl +CryptoPkg/Library/OpensslLib/openssl/fuzz/corpora:edk2_module_corpora +CryptoPkg/Library/OpensslLib/openssl/gost-engine:edk2_module_gost-engine +CryptoPkg/Library/OpensslLib/openssl/gost-engine/libprov:edk2_module_libprov +CryptoPkg/Library/OpensslLib/openssl/krb5:edk2_module_krb5 +CryptoPkg/Library/OpensslLib/openssl/oqs-provider:edk2_module_oqs-provider +CryptoPkg/Library/OpensslLib/openssl/pkcs11-provider:edk2_module_pkcs11-provider_openssl_edk2 +CryptoPkg/Library/OpensslLib/openssl/pkcs11-provider/python-ecdsa:edk2_module_python-ecdsa_openssl_pkcs11-provider +CryptoPkg/Library/OpensslLib/openssl/pkcs11-provider/tlsfuzzer:edk2_module_tlsfuzzer_openssl_pkcs11-provider +CryptoPkg/Library/OpensslLib/openssl/pkcs11-provider/tlslite-ng:edk2_module_tlslite-ng_openssl_pkcs11-provider +CryptoPkg/Library/OpensslLib/openssl/pyca-cryptography:edk2_module_pyca-cryptography +CryptoPkg/Library/OpensslLib/openssl/python-ecdsa:edk2_module_python-ecdsa_openssl +CryptoPkg/Library/OpensslLib/openssl/tlsfuzzer:edk2_module_tlsfuzzer_openssl_edk2 +CryptoPkg/Library/OpensslLib/openssl/tlslite-ng:edk2_module_tlslite-ng_openssl_edk2 +CryptoPkg/Library/OpensslLib/openssl/wycheproof:edk2_module_wycheproof +EfiFsPkg:edk2_efifspkg +EfiFsPkg/grub:edk2_efifspkg_grub +EfiFsPkg/gnu-efi:edk2_efifspkg_gnuefi +MdeModulePkg/Library/BrotliCustomDecompressLib/brotli:edk2_module_brotli +MdeModulePkg/Universal/RegularExpressionDxe/oniguruma:edk2_module_oniguruma +MdePkg/Library/BaseFdtLib/libfdt:edk2_module_libfdt +MdePkg/Library/MipiSysTLib/mipisyst:edk2_module_mipisyst +MdePkg/Library/MipiSysTLib/mipisyst/external/googletest:edk2_module_googletest_mipisyst +MdePkg/Library/MipiSysTLib/mipisyst/external/pugixml:edk2_module_pugixml +RedfishPkg/Library/JsonLib/jansson:edk2_module_jansson +SecurityPkg/DeviceSecurity/SpdmLib/libspdm:edk2_module_libspdm +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/mbedtlslib/mbedtls:edk2_module_mbedtls_libspdm +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/mbedtlslib/mbedtls/framework:edk2_module_framework_mbedtls_libspdm +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl:edk2_module_openssl_libspdm +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/cloudflare-quiche:edk2_module_cloudflare-quiche +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/cloudflare-quiche/quiche/deps/boringssl:edk2_module_boringssl +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/fuzz/corpora:edk2_module_corpora +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/gost-engine:edk2_module_gost-engine +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/gost-engine/libprov:edk2_module_libprov +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/krb5:edk2_module_krb5 +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/oqs-provider:edk2_module_oqs-provider +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/pkcs11-provider:edk2_module_pkcs11-provider_openssl_libspdm +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/pkcs11-provider/python-ecdsa:edk2_module_python-ecdsa_openssl_pkcs11-provider +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/pkcs11-provider/tlsfuzzer:edk2_module_tlsfuzzer_openssl_pkcs11-provider +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/pkcs11-provider/tlslite-ng:edk2_module_tlslite-ng_openssl_pkcs11-provider +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/pyca-cryptography:edk2_module_pyca-cryptography +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/python-ecdsa:edk2_module_python-ecdsa_openssl +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/tlsfuzzer:edk2_module_tlsfuzzer_openssl_edk2 +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/tlslite-ng:edk2_module_tlslite-ng_openssl_edk2 +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/os_stub/openssllib/openssl/wycheproof:edk2_module_wycheproof +SecurityPkg/DeviceSecurity/SpdmLib/libspdm/unit_test/cmockalib/cmocka:edk2_module_cmocka_libspdm +TcgTpmPkg/Library/TpmLib/TPM:edk2_module_TPM +TcgTpmPkg/Library/TpmLib/TPM/external/wolfssl:edk2_module_wolfssl +UnitTestFrameworkPkg/Library/CmockaLib/cmocka:edk2_module_cmocka_edk2 +UnitTestFrameworkPkg/Library/GoogleTestLib/googletest:edk2_module_googletest_edk2 +UnitTestFrameworkPkg/Library/SubhookLib/subhook:edk2_module_subhook +ntfs-3g:edk2_ntfs_3g +ntfs-3g/gnu-efi:edk2_ntfs_3g_gnuefi diff --git a/include/fw/edk2_fs.sh b/include/fw/edk2_fs.sh new file mode 100644 index 000000000..e9ab9f1e5 --- /dev/null +++ b/include/fw/edk2_fs.sh @@ -0,0 +1,172 @@ +# SPDX-License-Identifier: GPL-3.0-or-later + +# Copyright (c) 2026 Leah Rowe + +# Build filesystem drivers for EDK2, from source. + +# We do not use MrChromebox EDK2's bundled filesystem drivers. +# We build our own, to have complete control over the source code. +# MrChromebox bundles them pre-compiled, with source code revisions +# specified, but we still can't know reliably which EDK2 tree was +# used or how exactly they were compiled. These drivers are built +# using Pete Batard's modifications of GRUB and ntfs-3g drivers. + +# MrChromebox also uses these sources. The build logic in this +# file is an analog of what MrChromebox likely did for his builds. + +# Check files in: +# config/module/edk2_fs_drivers +# config/submodule/edk2_fs_drivers +# config/data/edk2_fs_drivers + +# We replace FS driver builds in MrChromeBox EDK2, at: +# FSDrivers/ +# See: modifications to coreboot edk2 Makefiles + +# An mkhelper runs build_edk2_fs_drivers and we place Pete's +# code into EDK2 as submodules. We then use the builds in EDK2, +# replacing MrChromebox's own builds inside his EDK2 payload. +# This allows us to add whatever drivers we want in builds. + +# Please note: expected to build on an x86_64 host (gcc-linux). +# Multilib toolchain required for IA32 driver builds. + +# mkhelper for: config/module/edk2_fs_drivers +build_edk2_fs_drivers() +{ +( + # EDK2 edk2setup.sh needs GNU BASH + bash_path="" + + x_ command -v bash > "$xbtmp/bash" || \ + err "Can't get bash path" get_bash_path "$@"; : + read -r bash_path < "$xbtmp/bash" || \ + err "Can't read bash path" build_edk2_fs_drivers "$@" + + x_ chkvar "$xbmkpwd" xbmkpwd + x_ make -C "$xbmkpwd/$srcdir/BaseTools" + + export EDK2_PATH="$xbmkpwd/$srcdir" + export EDK_TOOLS_PATH="$xbmkpwd/$srcdir/BaseTools" + export CONF_PATH="$xbmkpwd/$srcdir/Conf" + export PYTHON_COMMAND="$python" + + x_ build_edk2_fs_drivers_efifspkg "$bash_path" + x_ build_edk2_fs_drivers_ntfs_3g "$bash_path" + + x_ copy_edk2_fs_drivers + +) || \ + err "Could not build FS drivers" build_edk2_fs_drivers "$@"; : +} + +# Build Pete Batard's modified EfiFsPkg for EFI +# +build_edk2_fs_drivers_efifspkg() +{ +( + export SHELL="$1" + + x_ chkvar "$xbmkpwd" xbmkpwd + x_ cd "$xbmkpwd/$srcdir" + + export WORKSPACE="$xbmkpwd/$srcdir" + export PACKAGES_PATH="$WORKSPACE:$EDK2_PATH" + + x_ rm -Rf "Build" + + source "edksetup.sh" --reconfig || \ + err "edksetup.sh" build_edk2_fs_drivers_efifspkg "$@"; : + + for earch in "IA32" "X64"; do + + x_ "./EfiFsPkg/set_grub_cpu.sh" $earch + + x_ build -a $earch -b RELEASE -t GCC -p EfiFsPkg/EfiFsPkg.dsc \ + clean + + x_ build -a $earch -b RELEASE -t GCC -p EfiFsPkg/EfiFsPkg.dsc + done +) || \ + err "Could not build EfiFsPkg" build_edk2_fs_drivers_efifspkg "$@"; : +} + +# Build Pete Batard's modified ntfs-3g for EFI +# +build_edk2_fs_drivers_ntfs_3g() +{ +( + x_ chkvar "$xbmkpwd" xbmkpwd + + export SHELL="$1" + + export WORKSPACE="$xbmkpwd/$srcdir/ntfs-3g" + x_ cd "$WORKSPACE" + + x_ rm -Rf "Build" + + export EDK2_PATH="$xbmkpwd/$srcdir" + export PACKAGES_PATH="$WORKSPACE:$EDK2_PATH" + + source "$EDK2_PATH/edksetup.sh" --reconfig || \ + err "edksetup.sh" build_edk2_fs_drivers_ntfs_3g "$@"; : + + for earch in "IA32" "X64"; do + x_ build -a $earch -b RELEASE -t GCC -p uefi-driver.dsc clean + x_ build -a $earch -b RELEASE -t GCC -p uefi-driver.dsc + done +) || \ + err "Could not build ntfs-3g" build_edk2_fs_drivers_ntfs_3g "$@"; : +} + +# Move and rename builds for xbmk build.list +copy_edk2_fs_drivers() +{ + x_ chkvar "$xbmkpwd" xbmkpwd + x_ cd "$xbmkpwd/$srcdir" + + x_ remkdir "xbuild" + x_ remkdir "xbuild/EfiFsPkg" "xbuild/ntfs-3g" + + for xcopy in "IA32" "X64"; do + esuffix="ia32" + [ "$xcopy" = "X64" ] && \ + esuffix="x64" + + x_ copy_edk2_fs_driver_project \ + "Build/EfiFs/RELEASE_GCC/$xcopy" "xbuild/EfiFsPkg" + + x_ copy_edk2_fs_driver_project \ + "ntfs-3g/Build/RELEASE_GCC/$xcopy" "xbuild/ntfs-3g" + + done +} + +copy_edk2_fs_driver_project() +{ + ebuilddir="$1" + etargetdir="$2" + + x_ chkvar "$ebuilddir" ebuilddir + x_ chkvar "$etargetdir" etargetdir + + for xbuild in "$ebuilddir/"*.efi; do + [ -f "$xbuild" ] || continue; : + + tbuild="${xbuild%.efi}_$esuffix.efi" + tbuild="$etargetdir/${tbuild##*/}" + + x_ cp "$xbuild" "$tbuild" + done +} + + + + + + + + + + + diff --git a/mk b/mk index 6a6e806dd..4584ee97c 100755 --- a/mk +++ b/mk @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # SPDX-License-Identifier: GPL-3.0-or-later @@ -7,6 +7,9 @@ # Copyright (c) 2022-2023 Alper Nebi Yasak # Copyright (c) 2022 Ferass El Hafidi +# shebang set back to bash (previously sh) because edksetup.sh needs it. +# in practise, most of the build system still mostly only uses POSIX features. + set -u -e export LC_ALL="C.UTF-8" @@ -77,6 +80,7 @@ x_ xbmk_init "$@" . "include/fw/mrc.sh" . "include/fw/inject.sh" . "include/fw/rom.sh" +. "include/fw/edk2_fs.sh" . "include/mk/release.sh" -- 2.47.3