diff options
| author | Tim He <tim.he@intel.com> | 2015-05-08 03:13:37 +0000 |
|---|---|---|
| committer | timhe <timhe@Edk2> | 2015-05-08 03:13:37 +0000 |
| commit | f4e7aa05a3fe348dda4c1f491a48789ef5b7e4d1 (patch) | |
| tree | 3b56943e4a4a070ff581de41e2db27a6f50b2354 /Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | |
| parent | 7849538e0e3453db93a3ce8875b73121e7088e3a (diff) | |
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
Diffstat (limited to 'Vlv2TbltDevicePkg/PlatformPkgGcc.fdf')
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf index 7d281ea0a..43cdb121e 100644 --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf @@ -1,7 +1,7 @@ #/** @file # FDF file of Platform. # -# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR> # # This program and the accompanying materials are licensed and made available under # the terms and conditions of the BSD License that accompanies this distribution. @@ -252,6 +252,9 @@ INF SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf INF SecurityPkg/Tcg/TcgPei/TcgPei.inf INF SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf !endif +!if $(FTPM_ENABLE) == TRUE +INF SecurityPkg/Tcg/TrEEPei/TrEEPei.inf #use PCD config +!endif INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf !if $(ACPI50_ENABLE) == TRUE @@ -307,6 +310,10 @@ INF $(PLATFORM_PACKAGE)/PlatformPei/PlatformPei.inf INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/SeCUma.inf !endif +!if $(FTPM_ENABLE) == TRUE +INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf +!endif + !if $(SOURCE_DEBUG_ENABLE) == TRUE INF SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.inf !endif @@ -455,11 +462,24 @@ INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET INF IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf INF Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf !endif +!if $(MINNOW2_FSP_BUILD) == FALSE + !if $(SEC_ENABLE) == TRUE + INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/HeciDrv.inf + INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/SeCPolicyInitDxe.inf + !endif +!endif !if $(TPM_ENABLED) == TRUE INF SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf INF RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf !endif +!if $(FTPM_ENABLE) == TRUE +INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Tpm2DeviceSeCPei.inf +INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf +INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf +INF SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf +INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf +!endif # # EDK II Related Platform codes @@ -968,6 +988,7 @@ FV = BiosUpdate FILE SMM = $(NAMED_GUID) { SMM_DEPEX SMM_DEPEX |.depex PE32 PE32 |.efi + RAW BIN Optional |.aml UI STRING="$(MODULE_NAME)" Optional VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) } |