INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
\r
INF OvmfPkg/SioBusDxe/SioBusDxe.inf\r
-!ifndef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == FALSE\r
INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
!endif\r
INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
\r
!ifdef $(CSM_ENABLE)\r
-INF IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf\r
-INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
+INF OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf\r
+INF OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf\r
+!else\r
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
!endif\r
\r
-INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf\r
INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
INF OvmfPkg/PlatformDxe/Platform.inf\r
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
!endif\r
\r
+#\r
+# TPM2 support\r
+#\r
!if $(TPM2_ENABLE) == TRUE\r
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
!if $(TPM2_CONFIG_ENABLE) == TRUE\r