[HACK] Load OptionROMs immediately

This will make sure the ConsoleInit is able to connect the driver installed
by the VGA Option ROMs.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>

MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c

@@ -2551,10 +2551,12 @@ PciEnumeratorLight (
       //
       RemoveRejectedPciDevices (RootBridgeDev->Handle, RootBridgeDev);
 
+      if (!PcdGetBool (PcdPciDisableBusEnumeration)) {
         //
         // Process option rom light
         //
         ProcessOptionRomLight (RootBridgeDev);
+      }
 
       //
       // Determine attributes for all devices under this root bridge

MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c

@@ -285,7 +285,7 @@ UsbHcBulkTransfer (
   IN  UINT8                               DevSpeed,
   IN  UINTN                               MaxPacket,
   IN  UINT8                               BufferNum,
-  IN  OUT VOID                            *Data[],
+  IN  OUT VOID                            *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
   IN  OUT UINTN                           *DataLength,
   IN  OUT UINT8                           *DataToggle,
   IN  UINTN                               TimeOut,

MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h

@@ -149,7 +149,7 @@ UsbHcBulkTransfer (
   IN  UINT8                               DevSpeed,
   IN  UINTN                               MaxPacket,
   IN  UINT8                               BufferNum,
-  IN  OUT VOID                            *Data[],
+  IN  OUT VOID                            *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
   IN  OUT UINTN                           *DataLength,
   IN  OUT UINT8                           *DataToggle,
   IN  UINTN                               TimeOut,

MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c

@@ -25,7 +25,7 @@ typedef struct {
 } DEFERRED_3RD_PARTY_IMAGE_TABLE;
 
 BOOLEAN                          mImageLoadedAfterEndOfDxe   = FALSE;
-BOOLEAN                          mEndOfDxe                   = FALSE;
+BOOLEAN                          mEndOfDxe                   = TRUE;
 DEFERRED_3RD_PARTY_IMAGE_TABLE   mDeferred3rdPartyImage = {
   0,       // Deferred image count
   NULL     // The deferred image info

UefiPayloadPkg/UefiPayloadPkg.dsc

@@ -706,12 +706,6 @@
   }
 !endif
 
-  #
-  # Firmware update
-  #
-  MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
-  MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
-
   #------------------------------
   #  Build the shell
   #------------------------------

UefiPayloadPkg/UefiPayloadPkg.fdf

@@ -278,12 +278,6 @@ INF SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf
   }
 !endif
 
-#
-# Firmware update
-#
-INF MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
-INF MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf
-
 #
 # Shell
 #