## @file\r
# EFI/Framework Open Virtual Machine Firmware (OVMF) platform\r
#\r
-# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
#\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
##\r
\r
# -D FLAG=VALUE\r
#\r
DEFINE SECURE_BOOT_ENABLE = FALSE\r
- DEFINE NETWORK_IP6_ENABLE = FALSE\r
- DEFINE HTTP_BOOT_ENABLE = FALSE\r
DEFINE SMM_REQUIRE = FALSE\r
- DEFINE TLS_ENABLE = FALSE\r
+ DEFINE SOURCE_DEBUG_ENABLE = FALSE\r
+ DEFINE TPM2_ENABLE = FALSE\r
+ DEFINE TPM2_CONFIG_ENABLE = FALSE\r
+\r
+ #\r
+ # Network definition\r
+ #\r
+ DEFINE NETWORK_TLS_ENABLE = FALSE\r
+ DEFINE NETWORK_IP6_ENABLE = FALSE\r
+ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE\r
+ DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE\r
+\r
+!include NetworkPkg/NetworkDefines.dsc.inc\r
\r
#\r
# Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to\r
!endif\r
\r
[BuildOptions]\r
- GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG\r
GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG\r
INTEL:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG\r
MSFT:RELEASE_*_*_CC_FLAGS = /D MDEPKG_NDEBUG\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(TOOL_CHAIN_TAG) != "CLANGPDB"\r
GCC:*_*_*_CC_FLAGS = -mno-mmx -mno-sse\r
+!endif\r
\r
#\r
# Disable deprecated APIs.\r
[BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
XCODE:*_*_*_DLINK_FLAGS =\r
+ CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096\r
\r
# Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
# protection of DXE_SMM_DRIVER/SMM_CORE modules\r
[BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
XCODE:*_*_*_DLINK_FLAGS =\r
+ CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096\r
\r
################################################################################\r
#\r
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf\r
BaseLib|MdePkg/Library/BaseLib/BaseLib.inf\r
+ SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf\r
+ BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf\r
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf\r
CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf\r
PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf\r
PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf\r
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
+ PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf\r
+ PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf\r
+ PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.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
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf\r
SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf\r
QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf\r
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf\r
\r
-!ifdef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
PeCoffExtraActionLib|SourceLevelDebugPkg/Library/PeCoffExtraActionLibDebug/PeCoffExtraActionLibDebug.inf\r
DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf\r
!else\r
DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
\r
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
!else\r
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf\r
- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf\r
AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf\r
!else\r
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf\r
!endif\r
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf\r
\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
- TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf\r
-!endif\r
\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf\r
-!endif\r
+ #\r
+ # Network libraries\r
+ #\r
+!include NetworkPkg/NetworkLibs.dsc.inc\r
\r
-!if $(TLS_ENABLE) == TRUE\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf\r
!endif\r
\r
+ ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+ ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf\r
S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf\r
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf\r
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf\r
XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf\r
+ XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf\r
+\r
+!if $(TPM2_ENABLE) == TRUE\r
+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf\r
+ Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf\r
+ Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf\r
+ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf\r
+!else\r
+ Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf\r
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
+!endif\r
\r
[LibraryClasses.common]\r
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
!ifdef $(DEBUG_ON_SERIAL_PORT)\r
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
!else\r
- DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf\r
+ DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformRomDebugLibIoPort.inf\r
!endif\r
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf\r
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf\r
-!ifdef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf\r
!endif\r
HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf\r
!endif\r
PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
- PeiResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf\r
+ ResourcePublicationLib|MdePkg/Library/PeiResourcePublicationLib/PeiResourcePublicationLib.inf\r
ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf\r
-!ifdef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf\r
!endif\r
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf\r
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
\r
+!if $(TPM2_ENABLE) == TRUE\r
+ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r
+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
+!endif\r
+\r
[LibraryClasses.common.DXE_CORE]\r
HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
DxeCoreEntryPoint|MdePkg/Library/DxeCoreEntryPoint/DxeCoreEntryPoint.inf\r
DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf\r
!endif\r
ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf\r
-!ifdef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
!endif\r
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf\r
!else\r
DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf\r
!endif\r
- NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
- IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf\r
- UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf\r
- DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf\r
PlatformBootManagerLib|OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
+ PlatformBmPrintScLib|OvmfPkg/Library/PlatformBmPrintScLib/PlatformBmPrintScLib.inf\r
QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf\r
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf\r
!if $(SMM_REQUIRE) == TRUE\r
!else\r
LockBoxLib|OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf\r
!endif\r
-!ifdef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf\r
!endif\r
PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf\r
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf\r
+!if $(TPM2_ENABLE) == TRUE\r
+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf\r
+!endif\r
\r
[LibraryClasses.common.UEFI_APPLICATION]\r
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf\r
HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf\r
+ MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf\r
SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf\r
!ifdef $(DEBUG_ON_SERIAL_PORT)\r
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf\r
DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf\r
!endif\r
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf\r
-!ifdef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf\r
!endif\r
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.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.PcdCpuSmmEnableBspElection|FALSE\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache|FALSE\r
!endif\r
\r
[PcdsFixedAtBuild]\r
gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1\r
gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x10\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported|6\r
- gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv|32\r
!if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048)\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
+ # match PcdFlashNvStorageVariableSize purely for convenience\r
gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000\r
!endif\r
+!endif\r
!if $(FD_SIZE_IN_KB) == 4096\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400\r
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400\r
+!if $(NETWORK_TLS_ENABLE) == FALSE\r
+ # match PcdFlashNvStorageVariableSize purely for convenience\r
gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000\r
!endif\r
+!endif\r
+!if $(NETWORK_TLS_ENABLE) == TRUE\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000\r
+ gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000\r
+!endif\r
\r
gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0\r
\r
# DEBUG_ERROR 0x80000000 // Error\r
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F\r
\r
-!ifdef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17\r
!else\r
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x2F\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 2 GB.\r
- gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x80000000\r
+ # never lets the RAM below 4 GB exceed 2816 MB.\r
+ gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xB0000000\r
\r
-!ifdef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == TRUE\r
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2\r
!endif\r
\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE\r
-!endif\r
-\r
-!ifndef $(USE_OLD_SHELL)\r
- gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
-!endif\r
+ #\r
+ # Network Pcds\r
+ #\r
+!include NetworkPkg/NetworkPcds.dsc.inc\r
\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000\r
!endif\r
\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
- gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00\r
-!endif\r
-\r
# IRQs 5, 9, 10, 11 are level-triggered\r
- gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20\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
# UefiCpuPkg PCDs related to initial AP bringup and general AP management.\r
gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64\r
- gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|50000\r
+ gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber|0\r
\r
# Set memory encryption mask\r
gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0\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
+!if $(TPM2_ENABLE) == TRUE\r
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\r
+!endif\r
+\r
+[PcdsDynamicHii]\r
+!if $(TPM2_ENABLE) == TRUE && $(TPM2_CONFIG_ENABLE) == TRUE\r
+ gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS\r
+ gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS\r
+!endif\r
+\r
################################################################################\r
#\r
# Components Section - list of all EDK II Modules needed by this Platform.\r
!endif\r
UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
\r
+!if $(TPM2_ENABLE) == TRUE\r
+ OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+ SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {\r
+ <LibraryClasses>\r
+ HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
+ }\r
+!endif\r
+\r
#\r
# DXE Phase modules\r
#\r
\r
MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
<LibraryClasses>\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
- }\r
-!else\r
- MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
!endif\r
+!if $(TPM2_ENABLE) == TRUE\r
+ NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf\r
+!endif\r
+ }\r
\r
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
- PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
+ OvmfPkg/8259InterruptControllerDxe/8259.inf\r
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
UefiCpuPkg/CpuDxe/CpuDxe.inf\r
- PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
+ OvmfPkg/8254TimerDxe/8254Timer.inf\r
OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {\r
<LibraryClasses>\r
PciHostBridgeLib|OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf\r
+ NULL|OvmfPkg/Library/PlatformHasIoMmuLib/PlatformHasIoMmuLib.inf\r
}\r
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {\r
<LibraryClasses>\r
<LibraryClasses>\r
!ifdef $(CSM_ENABLE)\r
NULL|OvmfPkg/Csm/CsmSupportLib/CsmSupportLib.inf\r
- NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
+ NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
!endif\r
}\r
MdeModulePkg/Logo/LogoDxe.inf\r
NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf\r
NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf\r
!ifdef $(CSM_ENABLE)\r
- NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
- NULL|IntelFrameworkModulePkg/Library/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf\r
+ NULL|OvmfPkg/Csm/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
+ NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf\r
!endif\r
}\r
- OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf\r
OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
OvmfPkg/Virtio10Dxe/Virtio10.inf\r
OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
FatPkg/EnhancedFatDxe/Fat.inf\r
+ MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
OvmfPkg/SataControllerDxe/SataControllerDxe.inf\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
#\r
- PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
- IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
- IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
- IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
- IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf\r
+ OvmfPkg/SioBusDxe/SioBusDxe.inf\r
+ MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
+ MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
\r
#\r
# SMBIOS Support\r
#\r
# Network Support\r
#\r
- MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
- NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
- NetworkPkg/TcpDxe/TcpDxe.inf\r
- NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
- NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
- NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
- NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
- NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- NetworkPkg/DnsDxe/DnsDxe.inf\r
- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
- NetworkPkg/HttpDxe/HttpDxe.inf\r
- NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
-!if $(TLS_ENABLE) == TRUE\r
- NetworkPkg/TlsDxe/TlsDxe.inf\r
- NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
+!include NetworkPkg/NetworkComponents.dsc.inc\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
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
\r
!ifdef $(CSM_ENABLE)\r
- IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf {\r
+ OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf {\r
<LibraryClasses>\r
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
}\r
- IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
+ OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
-!ifndef $(USE_OLD_SHELL)\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+ ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {\r
+ <PcdsFixedAtBuild>\r
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+ }\r
+!endif\r
ShellPkg/Application/Shell/Shell.inf {\r
<LibraryClasses>\r
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
!if $(NETWORK_IP6_ENABLE) == TRUE\r
NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf\r
!endif\r
- NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf\r
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf\r
- ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
- FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
-# SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf\r
-# SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf\r
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf\r
\r
<PcdsFixedAtBuild>\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
+ OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf\r
!endif\r
\r
OvmfPkg/PlatformDxe/Platform.inf\r
<LibraryClasses>\r
NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf\r
}\r
+!endif\r
+\r
+ #\r
+ # TPM2 support\r
+ #\r
+!if $(TPM2_ENABLE) == TRUE\r
+ SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {\r
+ <LibraryClasses>\r
+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf\r
+ NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf\r
+ HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
+ NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
+ }\r
+!if $(TPM2_CONFIG_ENABLE) == TRUE\r
+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
+!endif\r
!endif\r