Remove duplicated definition of EFI_SMM_COMMUNICATE_HEADER in PI and Framework SMM.

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index c2184e451d0168afb2ef52b0c60d4777c3cc777e..d734175e6e35ce70c676b284ea6b4147a68015d4 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -106,13 +106,14 @@ INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 INF  IntelFrameworkModulePkg/Universal/DataHubDxe/DataHubDxe.inf\r
-INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
+INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
+INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
 INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
-INF  UefiCpuPkg/CpuIoDxe/CpuIo.inf\r
+INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
 INF  PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
-INF  IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
 INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
 INF  MdeModulePkg/Universal/Metronome/Metronome.inf\r
 INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
@@ -148,7 +149,7 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
 \r
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
-INF  RuleOverride = ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
+INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
 \r
 FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F {\r
     SECTION PE32 = FatBinPkg/EnhancedFatDxe/X64/Fat.efi\r
@@ -205,9 +206,9 @@ INF  OvmfPkg/Sec/SecMain.inf
 #  PEI Phase modules\r
 #\r
 INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
-INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
-INF  OvmfPkg/PlatformPei/PlatformPei.inf\r
+INF  RuleOverride=NORELOC MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
+INF  RuleOverride=NORELOC IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
+INF  RuleOverride=NORELOC OvmfPkg/PlatformPei/PlatformPei.inf\r
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
 \r
 #\r
@@ -237,7 +238,7 @@ FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32           |.efi\r
+    PE32     PE32   Align=32    |.efi\r
     UI       STRING ="$(MODULE_NAME)" Optional\r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
@@ -249,10 +250,18 @@ FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 {
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
 \r
+[Rule.Common.PEIM.NORELOC]\r
+  FILE PEIM = $(NAMED_GUID) RELOCS_STRIPPED  {\r
+     PEI_DEPEX PEI_DEPEX Optional        |.depex\r
+     TE        TE                        |.efi\r
+     UI        STRING="$(MODULE_NAME)" Optional\r
+     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r
+\r
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
      PEI_DEPEX PEI_DEPEX Optional        |.depex\r
-     PE32      PE32                      |.efi\r
+     PE32      PE32   Align=32           |.efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
@@ -307,8 +316,8 @@ FILE RAW = 1BA0062E-C779-4582-8566-336AE8F78F09 {
 \r
 [Rule.Common.USER_DEFINED.ACPITABLE]\r
   FILE FREEFORM = $(NAMED_GUID) {\r
-    RAW ACPI |.acpi\r
-    RAW ASL  |.aml\r
+    RAW ACPI               |.acpi\r
+    RAW ASL                |.aml\r
   }\r
 \r
 [Rule.Common.SEC.RESET_VECTOR]\r