OvmfPkg: Enable 2 different CpuMpPei and CpuDxe drivers

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 6e72cdf3453e2484bd4ed010d8dc021496160030..aa9a83032d9bd8ca0965a43a02219c803327ecb1 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -185,6 +185,7 @@ INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
 INF  OvmfPkg/SmmAccess/SmmAccessPei.inf\r
 !endif\r
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 INF  OvmfPkg/SmmAccess/SmmAccessPei.inf\r
 !endif\r
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r

+INF  FILE_GUID = $(UP_CPU_PEI_GUID) UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r

 \r
 !include OvmfPkg/OvmfTpmPei.fdf.inc\r
 \r
 \r
 !include OvmfPkg/OvmfTpmPei.fdf.inc\r
 \r


@@ -239,7 +240,10 @@ INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
 INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
 INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r

+\r

 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r

+INF  FILE_GUID = $(UP_CPU_DXE_GUID) UefiCpuPkg/CpuDxe/CpuDxe.inf\r
+\r

 !ifdef $(CSM_ENABLE)\r
   INF  OvmfPkg/8259InterruptControllerDxe/8259.inf\r
   INF  OvmfPkg/8254TimerDxe/8254Timer.inf\r
 !ifdef $(CSM_ENABLE)\r
   INF  OvmfPkg/8259InterruptControllerDxe/8259.inf\r
   INF  OvmfPkg/8254TimerDxe/8254Timer.inf\r