[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: Fix OptionROM scanning
2023-12-28 14:38:35 -07:00 · 2023-12-28 14:38:29 -07:00
2 changed files with 7 additions and 5 deletions
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
@@ -2551,10 +2551,12 @@ PciEnumeratorLight (
      //
      RemoveRejectedPciDevices (RootBridgeDev->Handle, RootBridgeDev);

-      //
-      // Process option rom light
-      //
-      ProcessOptionRomLight (RootBridgeDev);
+      if (!PcdGetBool (PcdPciDisableBusEnumeration)) {
+        //
+        // Process option rom light
+        //
+        ProcessOptionRomLight (RootBridgeDev);
+      }

      //
      // Determine attributes for all devices under this root bridge
--- a/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c
+++ b/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