CorebootPayloadPkg: fixed GCC49 and GCC5 hang in PeiCore

[mirror_edk2.git] / CorebootPayloadPkg / CorebootPayloadPkg.fdf

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 4102e60cc1badc3107df84768ccec03e24c117f9..d07fd30a103e8885958c98fdb9e49ffc7def8b7b 100644 (file)
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -86,7 +86,8 @@ INF IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe
 \r
 INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
-INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF MdeModulePkg/Application/UiApp/UiApp.inf\r
 INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
 INF MdeModulePkg/Universal/Metronome/Metronome.inf\r
 INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
@@ -110,14 +111,13 @@ INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 #\r
 # PCI Support\r
 #\r
-INF CorebootModulePkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf\r
-INF CorebootModulePkg/PciBusNoEnumerationDxe/PciBusNoEnumeration.inf\r
-INF CorebootModulePkg/PciSioSerialDxe/PciSioSerialDxe.inf\r
+INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
 \r
 #\r
 # ISA Support\r
 #\r
-INF CorebootModulePkg/SerialDxe/SerialDxe.inf\r
+INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
 \r
 #\r
 # Console Support\r
@@ -142,13 +142,13 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
 #\r
-# SD/eMMC Support
-#
-INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
-INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf
-INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf
-
-#
+# SD/eMMC Support\r
+#\r
+INF MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf\r
+INF MdeModulePkg/Bus/Sd/EmmcDxe/EmmcDxe.inf\r
+INF MdeModulePkg/Bus/Sd/SdDxe/SdDxe.inf\r
+\r
+#\r
 # Usb Support\r
 #\r
 INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
@@ -158,6 +158,11 @@ INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
 INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
 \r
+#\r
+# OHCI Support\r
+#\r
+INF QuarkSocPkg/QuarkSouthCluster/Usb/Ohci/Dxe/OhciDxe.inf\r
+\r
 #\r
 # Shell\r
 #\r
@@ -214,7 +219,7 @@ INF CorebootPayloadPkg/FbGop/FbGop.inf
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32   Align=32    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    PE32     PE32   Align=Auto    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional\r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
@@ -222,7 +227,7 @@ INF CorebootPayloadPkg/FbGop/FbGop.inf
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
      PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-     PE32      PE32   Align=32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+     PE32      PE32   Align=Auto           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r