UefiPayloadPkg: Enable ESRT

Signed-off-by: Tim Crawford <tcrawford@system76.com>
MdeModulePkg/UsbBusDxe: fix NOOPT build error
2024-05-29 14:29:10 -06:00 · 2024-02-21 09:11:18 -07:00 · 2023-06-27 08:16:14 -06:00 · 2023-06-22 13:41:43 -06:00
6 changed files with 16 additions and 4 deletions
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -285,7 +285,7 @@ UsbHcBulkTransfer (
  IN  UINT8                               DevSpeed,
  IN  UINTN                               MaxPacket,
  IN  UINT8                               BufferNum,
-  IN  OUT VOID                            *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
+  IN  OUT VOID                            *Data[],
  IN  OUT UINTN                           *DataLength,
  IN  OUT UINT8                           *DataToggle,
  IN  UINTN                               TimeOut,
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
@@ -149,7 +149,7 @@ UsbHcBulkTransfer (
  IN  UINT8                               DevSpeed,
  IN  UINTN                               MaxPacket,
  IN  UINT8                               BufferNum,
-  IN  OUT VOID                            *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
+  IN  OUT VOID                            *Data[],
  IN  OUT UINTN                           *DataLength,
  IN  OUT UINT8                           *DataToggle,
  IN  UINTN                               TimeOut,
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigImpl.c
@@ -4324,7 +4324,7 @@ SecureBootCallback (
  UINT8                           *SecureBootEnable;
  UINT8                           *Pk;
  UINT8                           *SecureBootMode;
-  UINT8                           *SetupMode;
+  //UINT8                           *SetupMode;
  CHAR16                          PromptString[100];
  EFI_DEVICE_PATH_PROTOCOL        *File;
  UINTN                           NameLength;
@@ -4336,7 +4336,7 @@ SecureBootCallback (
  Status             = EFI_SUCCESS;
  SecureBootEnable   = NULL;
  SecureBootMode     = NULL;
-  SetupMode          = NULL;
+  //SetupMode          = NULL;
  File               = NULL;
  EnrollKeyErrorCode = None_Error;

--- a/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/crl.bin
+++ b/UefiPayloadPkg/SecureBootEnrollDefaultKeys/keys/crl.bin
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -706,6 +706,12 @@
  }
 !endif

+  #
+  # Firmware update
+  #
+  MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
+  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
+
  #------------------------------
  #  Build the shell
  #------------------------------
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -278,6 +278,12 @@ INF SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
  }
 !endif

+#
+# Firmware update
+#
+INF MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
+INF MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
+
 #
 # Shell
 #
Author	SHA1	Message	Date
Tim Crawford	2b549700ac	UefiPayloadPkg: Enable ESRT Signed-off-by: Tim Crawford <tcrawford@system76.com>	2024-05-29 14:29:10 -06:00
Gerd Hoffmann	88f5720e16	MdeModulePkg/UsbBusDxe: fix NOOPT build error gcc-11 (fedora 35): /home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c: In function ?UsbIoBulkTransfer?: /home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c:277:12: error: ?UsbHcBulkTransfer? accessing 80 bytes in a region of size 8 [-Werror=stringop-overflow=] Upstream commit `ae8272ef78` Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Hao A Wu <hao.a.wu@intel.com>	2024-02-21 09:11:18 -07:00
Tim Crawford	27585e73da	Update DBX to 2023-05-09 Ref: https://uefi.org/revocationlistfile Signed-off-by: Tim Crawford <tcrawford@system76.com>	2023-06-27 08:16:14 -06:00
Tim Crawford	42a443d5cd	SecurityPkg: Fix debug build For some reason only DEBUG builds fail because of the unused variable. Signed-off-by: Tim Crawford <tcrawford@system76.com>	2023-06-22 13:41:43 -06:00