From 2bc363714e6bb2192a10b7b921c682eddd7cf8ec Mon Sep 17 00:00:00 2001
From: Dong Guo <guo.dong@intel.com>
Date: Thu, 27 Mar 2014 11:03:04 +0000
Subject: Remove hide TPM support.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dong Guo <guo.dong@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>
Reviewed-by: Ni, Ruiyu <ruiyu.ni@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15405 6f19259b-4bc3-4df7-8a09-765794883524
---
 SecurityPkg/Tcg/TcgPei/TcgPei.c   | 6 +-----
 SecurityPkg/Tcg/TcgPei/TcgPei.inf | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'SecurityPkg/Tcg/TcgPei')

diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.c b/SecurityPkg/Tcg/TcgPei/TcgPei.c
index ae905f7653..f3f4b3f4c0 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.c
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.c
@@ -1,7 +1,7 @@
 /** @file
   Initialize TPM device and measure FVs before handing off control to DXE.
 
-Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2014, 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 
 which accompanies this distribution.  The full text of the license may be found at 
@@ -711,10 +711,6 @@ PeimEntryMA (
     return EFI_UNSUPPORTED;
   }
 
-  if (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm)) {
-    return EFI_UNSUPPORTED;
-  }
-
   //
   // Initialize TPM device
   //
diff --git a/SecurityPkg/Tcg/TcgPei/TcgPei.inf b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
index 48a3e64362..cf90eaec81 100644
--- a/SecurityPkg/Tcg/TcgPei/TcgPei.inf
+++ b/SecurityPkg/Tcg/TcgPei/TcgPei.inf
@@ -1,7 +1,7 @@
 ## @file
 #  This module will initialize TPM device and measure FVs in PEI phase.
 #
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, 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
 # which accompanies this distribution. The full text of the license may be found at
@@ -63,7 +63,6 @@
   gEfiEndOfPeiSignalPpiGuid
 
 [Pcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm
   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceLifetimeLock
   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceCmdEnable
   gEfiSecurityPkgTokenSpaceGuid.PcdPhysicalPresenceHwEnable
@@ -73,7 +72,6 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmScrtmPolicy
 
 [FixedPcd]
-  gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES
 
 [Depex]
-- 
cgit v1.2.3