!endif\r
INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
\r
-!if $(TPM_ENABLE) == TRUE\r
-INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf\r
-INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
-INF SecurityPkg/Tcg/TcgPei/TcgPei.inf\r
-INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
-INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf\r
-!endif\r
+!include OvmfPkg/OvmfTpmPei.fdf.inc\r
\r
################################################################################\r
\r
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
-INF OvmfPkg/8259InterruptControllerDxe/8259.inf\r
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
-INF OvmfPkg/8254TimerDxe/8254Timer.inf\r
+!ifdef $(CSM_ENABLE)\r
+ INF OvmfPkg/8259InterruptControllerDxe/8259.inf\r
+ INF OvmfPkg/8254TimerDxe/8254Timer.inf\r
+!else\r
+ INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf\r
+!endif\r
INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
#\r
# TPM support\r
#\r
-!if $(TPM_ENABLE) == TRUE\r
-INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
-INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
-INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf\r
-!if $(TPM_CONFIG_ENABLE) == TRUE\r
-INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
-!endif\r
-!endif\r
+!include OvmfPkg/OvmfTpmDxe.fdf.inc\r
\r
################################################################################\r
\r