pkg/uefi : Update amd64 EDK2 to 202408

pkg/pillar/Dockerfile

@@ -10,7 +10,7 @@ ARG BUILD_PKGS_BASE="git gcc linux-headers libc-dev make linux-pam-dev m4 findut
 # we use the same image in several places
 ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f
 
-FROM lfedge/eve-uefi:d821658883d6748d8bbf0d6640c62288e3ce8c6f as uefi-build
+FROM lfedge/eve-uefi:1f971167cc8866c306ffc7f4157665a1a2e6d95d as uefi-build
 FROM lfedge/eve-dom0-ztools:09f378d92d6c8ada04fb8e9cf5d45fc8fdf934f9 as zfs
 RUN mkdir /out
 # copy zfs-related files from dom0-ztools using prepared list of files

pkg/uefi/Dockerfile

@@ -29,8 +29,8 @@ COPY rpi /rpi
 
 FROM build AS build-amd64-versions
 
-ENV EDK_VERSION edk2-stable202005
-ENV EDK_COMMIT ca407c7246bf405da6d9b1b9d93e5e7f17b4b1f9
+ENV EDK_VERSION edk2-stable202408
+ENV EDK_COMMIT b158dad150bf02879668f72ce306445250838201
 
 FROM build-${TARGETARCH}-versions AS build-edk2
 
@@ -67,9 +67,6 @@ RUN rm -rf /out && mkdir /out && cp /edk2/OVMF*.fd /out
 
 # some architecture specific cases. There probably is a cleaner dockerfile-native way to do this.
 RUN case $(uname -m) in \
-    x86_64) \
-        cp /edk2/*.rom /out/ \
-        ;; \
     aarch64) \
         cp -r /rpi /out/ \
         ;; \

pkg/uefi/build.sh

@@ -3,12 +3,18 @@
 TARGET=RELEASE
 
 make -C BaseTools
+OVMF_COMMON_FLAGS="-DNETWORK_TLS_ENABLE"
+OVMF_COMMON_FLAGS+=" -DSECURE_BOOT_ENABLE=TRUE"
+OVMF_COMMON_FLAGS+=" -DTPM2_CONFIG_ENABLE=TRUE"
+OVMF_COMMON_FLAGS+=" -DTPM2_ENABLE=TRUE"
+OVMF_COMMON_FLAGS+=" -DFD_SIZE_4MB"
 
 # shellcheck disable=SC1091
 . edksetup.sh
 
 set -e
 
+# shellcheck disable=SC2086
 case $(uname -m) in
     riscv64) make -C /opensbi -j "$(nproc)" PLATFORM=generic
              cp /opensbi/build/platform/generic/firmware/fw_payload.elf OVMF_CODE.fd
@@ -23,11 +29,9 @@ case $(uname -m) in
              build -b ${TARGET} -t GCC5 -a AARCH64  -p ArmVirtPkg/ArmVirtXen.dsc
              cp Build/ArmVirtXen-AARCH64/${TARGET}_*/FV/XEN_EFI.fd OVMF_PVH.fd
              ;;
-     x86_64) build -b ${TARGET} -t GCC5 -a X64 -p OvmfPkg/OvmfPkgX64.dsc -D TPM_ENABLE=TRUE -D TPM_CONFIG_ENABLE=TRUE
+     x86_64) build -b ${TARGET} -t GCC5 -a X64 -p OvmfPkg/OvmfPkgX64.dsc ${OVMF_COMMON_FLAGS}
              cp Build/OvmfX64/${TARGET}_*/FV/OVMF*.fd .
              build -b ${TARGET} -t GCC5 -a X64 -p OvmfPkg/OvmfXen.dsc
-             BaseTools/Source/C/bin/EfiRom -f 0x1F96 -i 0x0778 -e Build/OvmfX64/${TARGET}_*/X64/IgdAssignmentDxe.efi
-             cp Build/OvmfX64/${TARGET}_*/X64/IgdAssignmentDxe.rom IgdAssignmentDxe.rom
              cp Build/OvmfXen/${TARGET}_*/FV/OVMF.fd OVMF_PVH.fd
              ;;
           *) echo "Unsupported architecture $(uname). Bailing."