## @file\r
# EFI/Framework Open Virtual Machine Firmware (OVMF) platform\r
#\r
-# Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>\r
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
# Copyright (c) Microsoft Corporation.\r
#\r
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
+ # Shell can be useful for debugging but should not be enabled for production\r
+ #\r
+ DEFINE BUILD_SHELL = TRUE\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
!endif\r
!endif\r
\r
+ #\r
+ # Define the FILE_GUID of CpuMpPei/CpuDxe for unique-processor version.\r
+ #\r
+ DEFINE UP_CPU_PEI_GUID = 280251c4-1d09-4035-9062-839acb5f18c1\r
+ DEFINE UP_CPU_DXE_GUID = 6490f1c5-ebcc-4665-8892-0075b9bb49b7\r
+\r
[BuildOptions]\r
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG\r
INTEL:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG\r
INTEL:*_*_*_CC_FLAGS = /D TDX_GUEST_SUPPORTED\r
GCC:*_*_*_CC_FLAGS = -D TDX_GUEST_SUPPORTED\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
VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf\r
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf\r
+ MemEncryptTdxLib|OvmfPkg/Library/BaseMemEncryptTdxLib/BaseMemEncryptTdxLib.inf\r
+ PeiHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/PeiHardwareInfoLib.inf\r
+ DxeHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/DxeHardwareInfoLib.inf\r
+\r
!if $(SMM_REQUIRE) == FALSE\r
LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxBaseLib.inf\r
+ CcProbeLib|OvmfPkg/Library/CcProbeLib/DxeCcProbeLib.inf\r
+!else\r
+ CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf\r
!endif\r
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.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
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
!endif\r
\r
+!if $(BUILD_SHELL) == TRUE\r
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+!endif\r
ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
+\r
S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf\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/TdxMailboxLib.inf\r
\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
+ CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf\r
\r
[LibraryClasses.common.PEI_CORE]\r
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf\r
!endif\r
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
+ CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf\r
\r
[LibraryClasses.common.PEIM]\r
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
PlatformInitLib|OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf\r
\r
-!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc\r
-\r
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf\r
+ CcProbeLib|OvmfPkg/Library/CcProbeLib/SecPeiCcProbeLib.inf\r
\r
[LibraryClasses.common.DXE_CORE]\r
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.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
# unknown) workloads / boot paths.\r
#\r
gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0x80\r
- gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x10\r
+ gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0x12\r
gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0x80\r
gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|0x100\r
gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|0x100\r
!endif\r
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1280\r
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|800\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0\r
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|FALSE\r
gUefiOvmfPkgTokenSpaceGuid.PcdVideoResolutionSource|0\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId|0\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
\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
# Set ConfidentialComputing defaults\r
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0\r
\r
+!if $(CSM_ENABLE) == FALSE\r
+ gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000\r
+!endif\r
+\r
[PcdsDynamicHii]\r
-!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc\r
+!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc\r
\r
################################################################################\r
#\r
MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
OvmfPkg/SmmAccess/SmmAccessPei.inf\r
!endif\r
- UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
\r
-!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc\r
+ UefiCpuPkg/CpuMpPei/CpuMpPei.inf {\r
+ <LibraryClasses>\r
+ #\r
+ # Directly use PeiMpInitLib. It depends on PeiMpInitLibMpDepLib which\r
+ # checks the PPI of gEfiPeiMpInitLibMpDepPpiGuid.\r
+ #\r
+ MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
+ NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibMpDepLib.inf\r
+ }\r
+\r
+ UefiCpuPkg/CpuMpPei/CpuMpPei.inf {\r
+ <Defines>\r
+ FILE_GUID = $(UP_CPU_PEI_GUID)\r
+\r
+ <LibraryClasses>\r
+ #\r
+ # Directly use MpInitLibUp. It depends on PeiMpInitLibUpDepLib which\r
+ # checks the PPI of gEfiPeiMpInitLibUpDepPpiGuid.\r
+ #\r
+ MpInitLib|UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf\r
+ NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf\r
+ }\r
+\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
+!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc\r
!endif\r
}\r
\r
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
- OvmfPkg/8259InterruptControllerDxe/8259.inf\r
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
- UefiCpuPkg/CpuDxe/CpuDxe.inf\r
+\r
+ UefiCpuPkg/CpuDxe/CpuDxe.inf {\r
+ <LibraryClasses>\r
+ #\r
+ # Directly use DxeMpInitLib. It depends on DxeMpInitLibMpDepLib which\r
+ # checks the Protocol of gEfiMpInitLibMpDepProtocolGuid.\r
+ #\r
+ MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
+ NULL|OvmfPkg/Library/MpInitLibDepLib/DxeMpInitLibMpDepLib.inf\r
+ }\r
+\r
+ UefiCpuPkg/CpuDxe/CpuDxe.inf {\r
+ <Defines>\r
+ FILE_GUID = $(UP_CPU_DXE_GUID)\r
+\r
+ <LibraryClasses>\r
+ #\r
+ # Directly use MpInitLibUp. It depends on DxeMpInitLibUpDepLib which\r
+ # checks the Protocol of gEfiMpInitLibUpDepProtocolGuid.\r
+ #\r
+ MpInitLib|UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf\r
+ NULL|OvmfPkg/Library/MpInitLibDepLib/DxeMpInitLibUpDepLib.inf\r
+ }\r
+\r
+!ifdef $(CSM_ENABLE)\r
+ OvmfPkg/8259InterruptControllerDxe/8259.inf\r
OvmfPkg/8254TimerDxe/8254Timer.inf\r
+!else\r
+ OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf\r
+!endif\r
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {\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
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
-!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE\r
ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
<PcdsFixedAtBuild>\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
}\r
!endif\r
+!if $(BUILD_SHELL) == TRUE\r
ShellPkg/Application/Shell/Shell.inf {\r
<LibraryClasses>\r
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000\r
}\r
+!endif\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
}\r
OvmfPkg/IoMmuDxe/IoMmuDxe.inf\r
\r
+ OvmfPkg/TdxDxe/TdxDxe.inf\r
+\r
!if $(SMM_REQUIRE) == TRUE\r
OvmfPkg/SmmAccess/SmmAccess2Dxe.inf\r
OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf\r
#\r
OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf {\r
<LibraryClasses>\r
- VmgExitLib|UefiCpuPkg/Library/VmgExitLibNull/VmgExitLibNull.inf\r
+ CcExitLib|UefiCpuPkg/Library/CcExitLibNull/CcExitLibNull.inf\r
}\r
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf\r
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {\r
#\r
# TPM support\r
#\r
-!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc\r
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc\r