configs/config.novacustom_*: enable capsule updates

.github/workflows/build.yml

@@ -69,12 +69,20 @@ jobs:
           cp configs/config.${{ matrix.vendor }}_${{ matrix.model }} .config
           make olddefconfig
           make
+      - name: Copy default testing keys for capsules
+        run: |
+          mkdir keys
+          cp payloads/external/edk2/workspace/Dasharo/BaseTools/Source/Python/Pkcs7Sign/Test* keys/
+      - name: Generate capsule
+        run: |
+          ./capsule.sh make -t keys/TestRoot.pub.pem -o keys/TestSub.pub.pem -s keys/TestCert.pem -b
       - name: Save artifacts
         uses: actions/upload-artifact@v4
         with:
           name: "dasharo-${{ matrix.vendor }}-${{ matrix.model }}"
           path: |
             build/coreboot.rom
+            *.cap
           retention-days: 30
   build_optiplex:
     runs-on: ubuntu-22.04

capsule.sh

@@ -39,6 +39,7 @@ function print_usage() {
     echo '          -t root-certificate-file'
     echo '          -o subroot-certificate-file'
     echo '          -s signing-certificate-file'
+    echo '          -b (the flag adds battery check DXE into the capsule)'
 }
 
 function help_subcommand() {
@@ -201,12 +202,13 @@ function make_subcommand() {
     #  * t - trusted
     #  * o - other
     #  * s - signer
-    local root_cert sub_cert sign_cert
-    while getopts "t:o:s:" OPTION; do
+    local root_cert sub_cert sign_cert include_battery_check
+    while getopts "t:o:s:b" OPTION; do
         case $OPTION in
             t) root_cert="$OPTARG" ;;
             o) sub_cert="$OPTARG" ;;
             s) sign_cert="$OPTARG" ;;
+            b) include_battery_check=1 ;;
             *) exit 1 ;;
         esac
     done
@@ -240,6 +242,18 @@ function make_subcommand() {
     cat > "$json_file" << EOF
 {
     "EmbeddedDrivers": [
+EOF
+
+    # Ensure the charger check driver module is first
+    if [ "$include_battery_check" = 1 ]; then
+      cat >> "$json_file" << EOF
+        {
+            "Driver": "${edk_workspace}/Build/DasharoPayloadPkgX64/${build_type}_COREBOOT/X64/CapsuleChargerCheckDxe.efi"
+        },
+EOF
+    fi
+
+    cat >> "$json_file" << EOF
         {
             "Driver": "${edk_workspace}/Build/DasharoPayloadPkgX64/${build_type}_COREBOOT/X64/CapsuleSplashDxe.efi"
         },

configs/config.dell_optiplex_9010_sff_uefi

@@ -18,7 +18,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.dell_optiplex_9010_sff_uefi_txt

@@ -21,7 +21,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.emulation_qemu_x86_q35_uefi

@@ -20,7 +20,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_BUILD_IPXE=y

configs/config.emulation_qemu_x86_q35_uefi_all_menus

@@ -15,7 +15,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_BUILD_IPXE=y

configs/config.hardkernel_odroid_h4

@@ -26,7 +26,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_EDK2_SERIAL_SUPPORT=y

configs/config.intel_minnowmax

@@ -16,7 +16,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.msi_ms7d25_ddr4

@@ -42,7 +42,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_POST_DEVICE_PCI_PCIE=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.msi_ms7d25_ddr5

@@ -39,7 +39,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.msi_ms7e06_ddr4

@@ -39,7 +39,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.msi_ms7e06_ddr5

@@ -39,7 +39,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2.git"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.novacustom_ns5x_adl

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v1.8.0-rc1"
+CONFIG_LOCALVERSION="v1.8.0-rc2"
 CONFIG_CCACHE=y
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_NOVACUSTOM=y
@@ -20,6 +20,11 @@ CONFIG_NO_GFX_INIT=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_EFI_FW_INFO=y
+CONFIG_DRIVERS_EFI_MAIN_FW_GUID="742d22fb-1043-4994-9154-7a30679de5f0"
+CONFIG_DRIVERS_EFI_MAIN_FW_VERSION=0x01080002
+CONFIG_DRIVERS_EFI_MAIN_FW_LSV=0x01080002
+CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y
 CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
 CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
@@ -30,7 +35,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.novacustom_ns5x_tgl

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v1.8.0-rc1"
+CONFIG_LOCALVERSION="v1.6.0-rc2"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_NOVACUSTOM=y
 CONFIG_FMDFILE="src/mainboard/clevo/tgl-u/vboot-rwa.fmd"
@@ -20,6 +20,11 @@ CONFIG_NO_GFX_INIT=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_EFI_FW_INFO=y
+CONFIG_DRIVERS_EFI_MAIN_FW_GUID="2c033395-4de7-4de5-b610-eafa2e0b6300"
+CONFIG_DRIVERS_EFI_MAIN_FW_VERSION=0x01060002
+CONFIG_DRIVERS_EFI_MAIN_FW_LSV=0x01060002
+CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y
 CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
 CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
@@ -30,7 +35,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.novacustom_nv4x_adl

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v1.8.0-rc1"
+CONFIG_LOCALVERSION="v1.8.0-rc2"
 CONFIG_CCACHE=y
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_NOVACUSTOM=y
@@ -20,6 +20,11 @@ CONFIG_NO_GFX_INIT=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_EFI_FW_INFO=y
+CONFIG_DRIVERS_EFI_MAIN_FW_GUID="b79b7279-79a4-47cf-ab2f-8636c541f2d0"
+CONFIG_DRIVERS_EFI_MAIN_FW_VERSION=0x01080002
+CONFIG_DRIVERS_EFI_MAIN_FW_LSV=0x01080002
+CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y
 CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
 CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
@@ -30,7 +35,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.novacustom_nv4x_tgl

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v1.6.0-rc1"
+CONFIG_LOCALVERSION="v1.6.0-rc2"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_NOVACUSTOM=y
 CONFIG_FMDFILE="src/mainboard/clevo/tgl-u/vboot-rwa.fmd"
@@ -20,6 +20,11 @@ CONFIG_NO_GFX_INIT=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_PCIEXP_HOTPLUG_IO=0x2000
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_EFI_FW_INFO=y
+CONFIG_DRIVERS_EFI_MAIN_FW_GUID="ffe49861-809c-4aa4-8d3e-2b1640b3c96c"
+CONFIG_DRIVERS_EFI_MAIN_FW_VERSION=0x01060002
+CONFIG_DRIVERS_EFI_MAIN_FW_LSV=0x01060002
+CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y
 CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
 CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_BOOTMEDIA_LOCK_CONTROLLER=y
@@ -30,7 +35,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 # CONFIG_CONSOLE_USE_ANSI_ESCAPES is not set
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.novacustom_v540tnx

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v1.0.0-rc2"
+CONFIG_LOCALVERSION="v1.0.0-rc3"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_NOVACUSTOM=y
 CONFIG_MAINBOARD_PART_NUMBER="V54x_6x_TU"
@@ -26,6 +26,11 @@ CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y
 CONFIG_SUBSYSTEM_VENDOR_ID=0x1558
 CONFIG_SUBSYSTEM_DEVICE_ID=0xa741
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_EFI_FW_INFO=y
+CONFIG_DRIVERS_EFI_MAIN_FW_GUID="ec380f40-ad1b-40e9-b5a2-99ab56be66d3"
+CONFIG_DRIVERS_EFI_MAIN_FW_VERSION=0x01000003
+CONFIG_DRIVERS_EFI_MAIN_FW_LSV=0x01000003
+CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y
 CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
 CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -39,7 +44,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"

configs/config.novacustom_v540tu

@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="v1.0.0-rc2"
+CONFIG_LOCALVERSION="v1.0.0-rc3"
 CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_NOVACUSTOM=y
 CONFIG_FMDFILE="src/mainboard/novacustom/mtl-h/vboot-rwab.fmd"
@@ -27,6 +27,11 @@ CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y
 CONFIG_PCIEXP_LANE_ERR_STAT_CLEAR=y
 CONFIG_PCIEXP_HOTPLUG_PREFETCH_MEM_BELOW_4G=y
 CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_EFI_FW_INFO=y
+CONFIG_DRIVERS_EFI_MAIN_FW_GUID="f4deb4f3-f673-48fe-a481-627357b00b6a"
+CONFIG_DRIVERS_EFI_MAIN_FW_VERSION=0x01000003
+CONFIG_DRIVERS_EFI_MAIN_FW_LSV=0x01000003
+CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y
 CONFIG_DRIVERS_GENERIC_CBFS_SERIAL=y
 CONFIG_DRIVERS_GENERIC_CBFS_UUID=y
 CONFIG_ADD_FSP_BINARIES=y
@@ -41,7 +46,7 @@ CONFIG_BOOTMEDIA_SMM_BWP=y
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_PAYLOAD_EDK2=y
 CONFIG_EDK2_REPOSITORY="https://github.com/Dasharo/edk2"
-CONFIG_EDK2_TAG_OR_REV="10b02a94ccc66da379845c5ebe12fe44a064e4f5"
+CONFIG_EDK2_TAG_OR_REV="04af20830d1108571f3ed35341ecadbcb310f48d"
 CONFIG_EDK2_USE_EDK2_PLATFORMS=y
 CONFIG_EDK2_PLATFORMS_REPOSITORY="https://github.com/Dasharo/edk2-platforms"
 CONFIG_EDK2_PLATFORMS_TAG_OR_REV="1002a59639f111a2f8178b77d1f5fde0ea8d976f"