Sync the branch changes to trunk.
Support fTPM feature, and update the BiosID to 0.80. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Tim He <tim.he@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17362 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Tim He
timhe
@@ -76,7 +76,10 @@
|
||||
!endif
|
||||
|
||||
DEFINE PLATFORM_PCIEXPRESS_BASE = 0E0000000
|
||||
|
||||
|
||||
DEFINE SEC_ENABLE = FALSE
|
||||
DEFINE SEC_DEBUG_INFO_ENABLE = FALSE
|
||||
DEFINE FTPM_ENABLE = FALSE
|
||||
|
||||
################################################################################
|
||||
#
|
||||
@@ -266,9 +269,18 @@
|
||||
ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
|
||||
FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
|
||||
SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
|
||||
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
|
||||
OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
|
||||
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
|
||||
!endif
|
||||
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
|
||||
TrEEPhysicalPresenceLib|SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
TrEEPpVendorLib|SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf
|
||||
!endif
|
||||
|
||||
|
||||
Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
|
||||
!if $(MINNOW2_FSP_BUILD) == TRUE
|
||||
FspApiLib|IntelFspWrapperPkg/Library/BaseFspApiLib/BaseFspApiLib.inf
|
||||
@@ -319,8 +331,9 @@
|
||||
!if $(MINNOW2_FSP_BUILD) == TRUE
|
||||
PlatformFspLib|Vlv2TbltDevicePkg/Library/PlatformFspLib/PlatformFspLib.inf
|
||||
!endif
|
||||
|
||||
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCPei/Tpm2DeviceLibSeC.inf
|
||||
!endif
|
||||
|
||||
[LibraryClasses.X64]
|
||||
#
|
||||
@@ -898,12 +911,20 @@
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/MemoryInit.inf {
|
||||
<PcdsPatchableInModule>
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
|
||||
<BuildOptions>
|
||||
!if $(FTPM_ENABLE)==TRUE
|
||||
*_*_IA32_CC_FLAGS = /D FTPM_ENABLE
|
||||
!endif
|
||||
}
|
||||
|
||||
!if $(RC_BINARY_RELEASE) == TRUE
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf
|
||||
!endif
|
||||
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
|
||||
!endif
|
||||
|
||||
!if $(RC_BINARY_RELEASE) == TRUE
|
||||
$(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf {
|
||||
<BuildOptions>
|
||||
@@ -925,6 +946,9 @@
|
||||
}
|
||||
!endif
|
||||
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Tpm2DeviceSeCPei.inf
|
||||
!endif
|
||||
|
||||
!if $(TPM_ENABLED) == TRUE
|
||||
SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf
|
||||
@@ -985,6 +1009,17 @@
|
||||
!endif
|
||||
MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf
|
||||
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
SecurityPkg/Tcg/TrEEPei/TrEEPei.inf {
|
||||
<PcdsPatchableInModule>
|
||||
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046
|
||||
<LibraryClasses>
|
||||
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
||||
NULL|SecurityPkg/Library\HashInstanceLibSha1/HashInstanceLibSha1.inf
|
||||
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
|
||||
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
|
||||
}
|
||||
!endif
|
||||
!if $(TPM_ENABLED) == TRUE
|
||||
SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {
|
||||
<LibraryClasses>
|
||||
@@ -1078,6 +1113,9 @@
|
||||
!endif
|
||||
!if $(TPM_ENABLED) == TRUE
|
||||
NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
|
||||
!endif
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
|
||||
!endif
|
||||
}
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/MpCpu.inf
|
||||
@@ -1092,6 +1130,11 @@
|
||||
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
|
||||
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
|
||||
SerialPortLib|$(PLATFORM_PACKAGE)/Library/SerialPortLib/SerialPortLib.inf
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf
|
||||
!else
|
||||
TrEEPhysicalPresenceLib|$(PLATFORM_PACKAGE)/Library/DxeTrEEPhysicalPresenceLibNull/DxeTrEEPhysicalPresenceLibNull.inf
|
||||
!endif
|
||||
}
|
||||
|
||||
$(PLATFORM_PACKAGE)/UiApp/UiApp.inf
|
||||
@@ -1195,6 +1238,32 @@
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Dptf.inf
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PnpDxe.inf
|
||||
|
||||
!if $(SEC_ENABLE) == TRUE
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/HeciDrv.inf {
|
||||
!if $(SEC_DEBUG_INFO_ENABLE) == TRUE
|
||||
<BuildOptions>
|
||||
*_*_X64_CC_FLAGS = /DSEC_DEBUG_INFO=1
|
||||
!else
|
||||
<BuildOptions>
|
||||
*_*_X64_CC_FLAGS = /DSEC_DEBUG_INFO=0
|
||||
!endif
|
||||
}
|
||||
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SeCPolicyInitDxe.inf
|
||||
!endif
|
||||
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf
|
||||
SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
|
||||
SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf{
|
||||
<LibraryClasses>
|
||||
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
|
||||
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
|
||||
PcdLib|MdePkg/Library\DxePcdLib/DxePcdLib.inf
|
||||
Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf
|
||||
}
|
||||
$(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf
|
||||
!endif
|
||||
!if $(TPM_ENABLED) == TRUE
|
||||
SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {
|
||||
<LibraryClasses>
|
||||
@@ -1483,6 +1552,11 @@
|
||||
DEFINE X64_BUILD_ENABLE =
|
||||
!endif
|
||||
|
||||
!if $(FTPM_ENABLE) == TRUE
|
||||
DEFINE DSC_FTPM_BUILD_OPTIONS = /DFTPM_ENABLE
|
||||
!else
|
||||
DEFINE DSC_FTPM_BUILD_OPTIONS =
|
||||
!endif
|
||||
!if $(TPM_ENABLED) == TRUE
|
||||
DEFINE DSC_TPM_BUILD_OPTIONS = /DTPM_ENABLED
|
||||
!else
|
||||
@@ -1490,7 +1564,7 @@
|
||||
!endif
|
||||
|
||||
|
||||
DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
|
||||
DEFINE EDK_EDKII_DSC_FEATURE_BUILD_OPTIONS = $(MINNOW2_FSP_OPTION) $(MINNOW2_BUILD_OPTION) $(ENBDT_PF_ENABLE) $(EXTERNAL_VGA_BUILD_OPTION) $(PCIE_ENUM_WA_BUILD_OPTION) $(X0_WA_ENABLE_BUILD_OPTION) $(A0_WA_ENABLE_BUILD_OPTION) $(MICROCODE_FREE_BUILD_OPTIONS) $(SIMICS_BUILD_OPTIONS) $(HYBRID_BUILD_OPTIONS) $(COMPACT_BUILD_OPTIONS) $(VP_BUILD_OPTIONS) $(SYSCTL_ID_BUILD_OPTION) $(CLKGEN_CONFIG_EXTRA_BUILD_OPTION) $(SYSCTL_X0_CONVERT_BOARD_OPTION) $(ENBDT_S3_SUPPORT_OPTIONS) $(SATA_SUPPORT_BUILD_OPTION) $(PCIESC_SUPPORT_BUILD_OPTION) $(DSC_FTPM_BUILD_OPTIONS) $(DSC_FTPM_ERROR_WR_BUILD_OPTIONS) $(DSC_TPM_BUILD_OPTIONS) $(DSC_BYTI_SECURE_BOOT_BUILD_OPTIONS)
|
||||
!if $(PERFORMANCE_ENABLE) == TRUE
|
||||
DEFINE PDB_BUILD_OPTION = /Zi
|
||||
!endif
|
||||
|
||||
Reference in New Issue
Block a user