OvmfPkg: Add dependency of VariableSmm driver to make it work normally.

[mirror_edk2.git] / OvmfPkg / CloudHv / CloudHvX64.dsc

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 961b1775c4021b6e4244a5c6764e001b14660d13..20f3bc340807e250941062e227b7fa036b320c07 100644 (file)
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -173,7 +173,6 @@
   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
   QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf\r
@@ -185,6 +184,7 @@
 !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
@@ -238,10 +238,10 @@
 [LibraryClasses.common]\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   VmgExitLib|OvmfPkg/Library/VmgExitLib/VmgExitLib.inf\r
+  TdxLib|MdePkg/Library/TdxLib/TdxLib.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
@@ -309,6 +309,7 @@
 !include OvmfPkg/OvmfTpmLibsPeim.dsc.inc\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
@@ -343,7 +344,6 @@
   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
@@ -432,6 +432,7 @@
 !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
@@ -462,9 +463,6 @@
   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
@@ -581,8 +579,6 @@
   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
@@ -590,19 +586,11 @@
   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
@@ -617,6 +605,9 @@
   # 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
@@ -647,7 +638,7 @@
 #\r
 ################################################################################\r
 [Components]\r
-  OvmfPkg/ResetVector/ResetVector.inf\r
+  OvmfPkg/XenResetVector/XenResetVector.inf\r
 \r
   #\r
   # SEC Phase modules\r
@@ -720,7 +711,7 @@
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
   UefiCpuPkg/CpuDxe/CpuDxe.inf\r
-  OvmfPkg/XenTimerDxe/XenTimerDxe.inf\r
+  OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf\r
   OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
   OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
   MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {\r
@@ -740,10 +731,6 @@
   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
@@ -751,10 +738,6 @@
       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
@@ -807,12 +790,6 @@
   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
   # Serial Support\r
   #\r
@@ -854,25 +831,6 @@
 !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
@@ -955,7 +913,10 @@
   #\r
   # Variable driver stack (SMM)\r
   #\r
-  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf\r
+  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf {\r
+    <LibraryClasses>\r
+    VmgExitLib|UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.inf\r
+  }\r
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf\r
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {\r
     <LibraryClasses>\r