DEFINE SMM_REQUIRE = FALSE\r
DEFINE SOURCE_DEBUG_ENABLE = FALSE\r
\r
-!include OvmfPkg/OvmfTpmDefines.dsc.inc\r
+!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc\r
\r
#\r
# Network definition\r
#\r
# Device drivers\r
#\r
- DEFINE PVSCSI_ENABLE = TRUE\r
- DEFINE MPT_SCSI_ENABLE = TRUE\r
+ DEFINE PVSCSI_ENABLE = FALSE\r
+ DEFINE MPT_SCSI_ENABLE = FALSE\r
DEFINE LSI_SCSI_ENABLE = FALSE\r
\r
#\r
INTEL:*_*_*_CC_FLAGS = /D DISABLE_NEW_DEPRECATED_INTERFACES\r
GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
\r
+ #\r
+ # SECURE_BOOT_FEATURE_ENABLED\r
+ #\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+ MSFT:*_*_*_CC_FLAGS = /D SECURE_BOOT_FEATURE_ENABLED\r
+ INTEL:*_*_*_CC_FLAGS = /D SECURE_BOOT_FEATURE_ENABLED\r
+ GCC:*_*_*_CC_FLAGS = -D SECURE_BOOT_FEATURE_ENABLED\r
+!endif\r
+\r
!include NetworkPkg/NetworkBuildOptions.dsc.inc\r
\r
[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf\r
PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf\r
PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf\r
+ CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf\r
IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf\r
OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf\r
SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf\r
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf\r
SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf\r
- UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf\r
- QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf\r
+ QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf\r
QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf\r
VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf\r
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf\r
+ PeiHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/PeiHardwareInfoLib.inf\r
+ DxeHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/DxeHardwareInfoLib.inf\r
!if $(SMM_REQUIRE) == FALSE\r
LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf\r
!endif\r
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf\r
+ MemEncryptTdxLib|OvmfPkg/Library/BaseMemEncryptTdxLib/BaseMemEncryptTdxLib.inf\r
\r
!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf\r
PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf\r
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf\r
SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf\r
+ PlatformPKProtectionLib|SecurityPkg/Library/PlatformPKProtectionLibVarPolicy/PlatformPKProtectionLibVarPolicy.inf\r
SecureBootVariableProvisionLib|SecurityPkg/Library/SecureBootVariableProvisionLib/SecureBootVariableProvisionLib.inf\r
!else\r
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf\r
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf\r
VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf\r
+ VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf\r
\r
\r
#\r
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf\r
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf\r
\r
-!include OvmfPkg/OvmfTpmLibs.dsc.inc\r
+!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc\r
\r
[LibraryClasses.common]\r
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
- VmgExitLib|OvmfPkg/Library/VmgExitLib/VmgExitLib.inf\r
+ CcExitLib|OvmfPkg/Library/CcExitLib/CcExitLib.inf\r
+ TdxLib|MdePkg/Library/TdxLib/TdxLib.inf\r
+ TdxMailboxLib|OvmfPkg/Library/TdxMailboxLib/TdxMailboxLibNull.inf\r
\r
[LibraryClasses.common.SEC]\r
TimerLib|OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf\r
- QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSecLib.inf\r
!ifdef $(DEBUG_ON_SERIAL_PORT)\r
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
!else\r
!else\r
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf\r
!endif\r
- VmgExitLib|OvmfPkg/Library/VmgExitLib/SecVmgExitLib.inf\r
+ CcExitLib|OvmfPkg/Library/CcExitLib/SecCcExitLib.inf\r
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLib.inf\r
\r
[LibraryClasses.common.PEI_CORE]\r
MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf\r
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
- QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
-\r
-!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc\r
+ QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf\r
\r
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf\r
+ PlatformInitLib|OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf\r
\r
[LibraryClasses.common.DXE_CORE]\r
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf\r
PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf\r
- QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf\r
VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf\r
!if $(SMM_REQUIRE) == TRUE\r
MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf\r
!endif\r
PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf\r
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
+ NestedInterruptTplLib|OvmfPkg/Library/NestedInterruptTplLib/NestedInterruptTplLib.inf\r
QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf\r
QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf\r
\r
-!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc\r
-\r
[LibraryClasses.common.UEFI_APPLICATION]\r
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf\r
!endif\r
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf\r
PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf\r
+ SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuRendezvousLib.inf\r
\r
[LibraryClasses.common.SMM_CORE]\r
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE\r
gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE\r
-!ifdef $(CSM_ENABLE)\r
- gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE\r
-!endif\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|TRUE\r
gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache|FALSE\r
!endif\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdRequireSelfSignedPk|TRUE\r
+!endif\r
\r
[PcdsFixedAtBuild]\r
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1\r
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F\r
!endif\r
\r
- # This PCD is used to set the base address of the PCI express hierarchy. It\r
- # is only consulted when OVMF runs on Q35. In that case it is programmed into\r
- # the PCIEXBAR register.\r
- #\r
- # On Q35 machine types that QEMU intends to support in the long term, QEMU\r
- # never lets the RAM below 4 GB exceed 2816 MB.\r
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000\r
-\r
!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
!endif\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
!endif\r
\r
- # IRQs 5, 9, 10, 11 are level-triggered\r
- gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20\r
-\r
# Point to the MdeModulePkg/Application/UiApp/UiApp.inf\r
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }\r
\r
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0\r
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0\r
!endif\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600\r
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciIoBase|0x0\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Base|0x0\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio32Size|0x0\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Base|0x0\r
-!ifdef $(CSM_ENABLE)\r
- gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size|0x0\r
-!else\r
gUefiOvmfPkgTokenSpaceGuid.PcdPciMmio64Size|0x800000000\r
-!endif\r
\r
+ gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000\r
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0\r
\r
- # Set video resolution for text setup.\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480\r
-\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0208\r
gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0\r
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE\r
# Set memory encryption mask\r
gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0\r
\r
+ # Set Tdx shared bit mask\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask|0x0\r
+\r
# Set SEV-ES defaults\r
gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase|0\r
gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbSize|0\r
gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled|0\r
\r
!if $(SMM_REQUIRE) == TRUE\r
- gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes|8\r
- gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|100000\r
!endif\r
\r
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00\r
\r
-!include OvmfPkg/OvmfTpmPcds.dsc.inc\r
+!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc\r
\r
# IPv4 and IPv6 PXE Boot support.\r
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01\r
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0\r
\r
[PcdsDynamicHii]\r
-!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc\r
+!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc\r
\r
################################################################################\r
#\r
#\r
################################################################################\r
[Components]\r
- OvmfPkg/ResetVector/ResetVector.inf\r
+ OvmfPkg/XenResetVector/XenResetVector.inf\r
\r
#\r
# SEC Phase modules\r
}\r
MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
\r
- OvmfPkg/PlatformPei/PlatformPei.inf\r
+ OvmfPkg/PlatformPei/PlatformPei.inf {\r
+ <LibraryClasses>\r
+ NULL|OvmfPkg/IntelTdx/TdxHelperLib/TdxHelperLibNull.inf\r
+ }\r
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {\r
<LibraryClasses>\r
!if $(SMM_REQUIRE) == TRUE\r
!endif\r
UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
\r
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc\r
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc\r
\r
#\r
# DXE Phase modules\r
<LibraryClasses>\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
-!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc\r
!endif\r
+!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc\r
}\r
\r
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
- OvmfPkg/8259InterruptControllerDxe/8259.inf\r
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
UefiCpuPkg/CpuDxe/CpuDxe.inf\r
- OvmfPkg/8254TimerDxe/8254Timer.inf\r
+ OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf\r
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {\r
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {\r
<LibraryClasses>\r
XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf\r
-!ifdef $(CSM_ENABLE)\r
- NULL|OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf\r
- NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
-!endif\r
}\r
MdeModulePkg/Logo/LogoDxe.inf\r
MdeModulePkg/Application/UiApp/UiApp.inf {\r
NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf\r
NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf\r
NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf\r
-!ifdef $(CSM_ENABLE)\r
- NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
- NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf\r
-!endif\r
}\r
OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf {\r
<LibraryClasses>\r
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
\r
-!ifndef $(CSM_ENABLE)\r
- OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
-!endif\r
- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf\r
- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
-\r
#\r
- # ISA Support\r
+ # Serial Support\r
#\r
- OvmfPkg/SioBusDxe/SioBusDxe.inf\r
- MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
- MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
+ MdeModulePkg/Universal/SerialDxe/SerialDxe.inf\r
\r
#\r
# SMBIOS Support\r
# Network Support\r
#\r
!include NetworkPkg/NetworkComponents.dsc.inc\r
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc\r
\r
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {\r
- <LibraryClasses>\r
- NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf\r
- }\r
-\r
-!if $(NETWORK_TLS_ENABLE) == TRUE\r
- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
- <LibraryClasses>\r
- NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r
- }\r
-!endif\r
OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
\r
- #\r
- # Usb Support\r
- #\r
- MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
- MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
- MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
- MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
- MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
-\r
-!ifdef $(CSM_ENABLE)\r
- OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf {\r
- <LibraryClasses>\r
- PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
- }\r
- OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
- OvmfPkg/Csm/Csm16/Csm16.inf\r
-!endif\r
-\r
!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
<PcdsFixedAtBuild>\r
#\r
# Variable driver stack (SMM)\r
#\r
- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf\r
+ OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf {\r
+ <LibraryClasses>\r
+ CcExitLib|UefiCpuPkg/Library/CcExitLibNull/CcExitLibNull.inf\r
+ }\r
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf\r
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {\r
<LibraryClasses>\r
#\r
# TPM support\r
#\r
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc\r
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc\r