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/Library/PlatformBdsLib | |
| parent | 7849538e0e3453db93a3ce8875b73121e7088e3a (diff) | |
| download | edk2-platforms-f4e7aa05a3fe348dda4c1f491a48789ef5b7e4d1.tar.xz | |
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/Library/PlatformBdsLib')
| -rw-r--r-- | Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c | 20 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c index 903b46d583..ad16267eca 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c @@ -1,6 +1,6 @@ /** @file
- Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 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.
@@ -1763,10 +1763,12 @@ PlatformBdsPolicyBehavior ( }
-#ifdef TPM_ENABLED
- TcgPhysicalPresenceLibProcessRequest();
-#endif
-
+ #ifdef TPM_ENABLED
+ TcgPhysicalPresenceLibProcessRequest();
+ #endif
+ #ifdef FTPM_ENABLE
+ TrEEPhysicalPresenceLibProcessRequest(NULL);
+ #endif
//
// Close boot script and install ready to lock
//
@@ -1951,10 +1953,12 @@ FULL_CONFIGURATION: PlatformBdsConnectSequence ();
}
}
-#ifdef TPM_ENABLED
+ #ifdef TPM_ENABLED
TcgPhysicalPresenceLibProcessRequest();
-#endif
-
+ #endif
+ #ifdef FTPM_ENABLE
+ TrEEPhysicalPresenceLibProcessRequest(NULL);
+ #endif
//
// Close boot script and install ready to lock
//
diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf index da268b2a54..45578e8df4 100644 --- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf +++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/PlatformBdsLib.inf @@ -68,7 +68,7 @@ PrintLib
BaseCryptLib
# TcgPhysicalPresenceLib
-# TrEEPhysicalPresenceLib
+ TrEEPhysicalPresenceLib
FileHandleLib
S3BootScriptLib
SerialPortLib
|