OvmfPkg: include UefiCpuPkg/CpuMpPei

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 30b0c2ba3fc82c5717cb2d499419954d8249287d..630c2959ffbc1b888510bbd6137a877ad6e3d645 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -84,9 +84,6 @@ 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
@@ -98,6 +95,7 @@ FV = DXEFV
 ################################################################################\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
@@ -208,6 +209,7 @@ INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
 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
@@ -379,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