OvmfPkg: include UefiCpuPkg/CpuMpPei

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 39fbdb5cae8e2fa2a013067b1fb4ddd515473867..630c2959ffbc1b888510bbd6137a877ad6e3d645 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -67,10 +67,10 @@ FV = SECFV
 \r
 [FD.MEMFD]\r
 BaseAddress   = $(MEMFD_BASE_ADDRESS)\r
-Size          = 0xA00000\r
+Size          = 0xB00000\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
-NumBlocks     = 0xA0\r
+NumBlocks     = 0xB0\r
 \r
 0x000000|0x006000\r
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize\r
@@ -84,20 +84,18 @@ gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSp
 0x010000|0x008000\r
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\r
 \r
-0x018000|0x008000\r
-gUefiOvmfPkgTokenSpaceGuid.PcdS3AcpiReservedMemoryBase|gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize\r
-\r
 0x020000|0x0E0000\r
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize\r
 FV = PEIFV\r
 \r
-0x100000|0x900000\r
+0x100000|0xA00000\r
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize\r
 FV = DXEFV\r
 \r
 ################################################################################\r
 \r
 [FV.SECFV]\r
+FvNameGuid         = 763BED0D-DE9F-48F5-81F1-3E90E1B1A015\r
 BlockSize          = 0x1000\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -128,6 +126,7 @@ INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf
 \r
 ################################################################################\r
 [FV.PEIFV]\r
+FvNameGuid         = 6938079B-B503-4E3D-9D24-B28337A25806\r
 BlockSize          = 0x10000\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -162,10 +161,12 @@ INF  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
 !if $(SMM_REQUIRE) == TRUE\r
 INF  OvmfPkg/SmmAccess/SmmAccessPei.inf\r
 !endif\r
+INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
 ################################################################################\r
 \r
 [FV.DXEFV]\r
+FvNameGuid         = 7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1\r
 BlockSize          = 0x10000\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -207,6 +208,8 @@ INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
 INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
+INF  OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
+INF  OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
 INF  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
 INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
 INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
@@ -234,12 +237,9 @@ INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
 INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
 INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
 INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-!if $(USE_OLD_BDS) == TRUE\r
-INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
-!else\r
+INF  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
 INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
 INF  MdeModulePkg/Application/UiApp/UiApp.inf\r
-!endif\r
 INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
 INF  MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
@@ -381,6 +381,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 ################################################################################\r
 \r
 [FV.FVMAIN_COMPACT]\r
+FvNameGuid         = 48DB5E17-707C-472D-91CD-1613E7EF51B0\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -449,6 +450,8 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+    RAW ACPI  Optional               |.acpi\r
+    RAW ASL   Optional               |.aml\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r