Sync the branch changes to trunk.

[mirror_edk2.git] / Vlv2TbltDevicePkg / Library / PlatformBdsLib / BdsPlatform.c

diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index 903b46d583853f157e085a77241fe9497c42e6a7..ad16267ecaa6f58102208c378463b5a27ec066cb 100644 (file)
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-  Copyright (c) 2004  - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>\r

                                                                                    \r\r
   This program and the accompanying materials are licensed and made available under\r\r
   the terms and conditions of the BSD License that accompanies this distribution.  \r\r
                                                                                    \r\r
   This program and the accompanying materials are licensed and made available under\r\r
   the terms and conditions of the BSD License that accompanies this distribution.  \r\r


@@ -1763,10 +1763,12 @@ PlatformBdsPolicyBehavior (
     }\r
 \r
 \r
     }\r
 \r
 \r

-#ifdef TPM_ENABLED\r
-       TcgPhysicalPresenceLibProcessRequest();\r
-#endif\r
-\r
+    #ifdef TPM_ENABLED\r
+    TcgPhysicalPresenceLibProcessRequest();\r
+    #endif\r
+    #ifdef FTPM_ENABLE\r
+    TrEEPhysicalPresenceLibProcessRequest(NULL);\r
+    #endif\r

     //\r
     // Close boot script and install ready to lock\r
     //\r
     //\r
     // Close boot script and install ready to lock\r
     //\r


@@ -1951,10 +1953,12 @@ FULL_CONFIGURATION:
         PlatformBdsConnectSequence ();\r
       }\r
     }\r
         PlatformBdsConnectSequence ();\r
       }\r
     }\r

-#ifdef TPM_ENABLED\r
+   #ifdef TPM_ENABLED\r

    TcgPhysicalPresenceLibProcessRequest();\r
    TcgPhysicalPresenceLibProcessRequest();\r

-#endif\r
-\r
+   #endif\r
+   #ifdef FTPM_ENABLE\r
+   TrEEPhysicalPresenceLibProcessRequest(NULL);\r
+   #endif\r

     //\r
     // Close boot script and install ready to lock\r
     //\r
     //\r
     // Close boot script and install ready to lock\r
     //\r