X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=SecurityPkg%2FTcg%2FTcgConfigDxe%2FTcgConfigImpl.c;fp=SecurityPkg%2FTcg%2FTcgConfigDxe%2FTcgConfigImpl.c;h=c2e3b34a25e3cad2a65c3060cb8b8b984cfc2cd2;hp=5a52a6b87c32cc02ea1cce6c0910d85ff1de31be;hb=2bc363714e6bb2192a10b7b921c682eddd7cf8ec;hpb=9a12e5825aa338f9a81fca3d451bb032fadaad33

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
index 5a52a6b87c..c2e3b34a25 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
@@ -1,7 +1,7 @@
 /** @file
   HII Config Access protocol implementation of TCG configuration module.
 
-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 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 
@@ -182,11 +182,6 @@ TcgExtractConfig (
   ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));
 
   Configuration.TpmOperation    = PHYSICAL_PRESENCE_ENABLE;
-  Configuration.HideTpm         = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));
-  //
-  // Read the original value of HideTpm from PrivateData which won't be changed by Setup in this boot.
-  //
-  Configuration.OriginalHideTpm = PrivateData->HideTpm;
 
   //
   // Display current TPM state.
@@ -307,8 +302,6 @@ TcgRouteConfig (
     return Status;
   }
 
-  PcdSetBool (PcdHideTpm,    TcgConfiguration.HideTpm);
-
   return EFI_SUCCESS;
 }
 
@@ -425,11 +418,6 @@ InstallTcgConfigForm (
   EFI_STATUS                      Status;
   EFI_HII_HANDLE                  HiiHandle;
   EFI_HANDLE                      DriverHandle;
-  VOID                            *StartOpCodeHandle;
-  VOID                            *EndOpCodeHandle;
-  EFI_IFR_GUID_LABEL              *StartLabel;
-  EFI_IFR_GUID_LABEL              *EndLabel;
-
   EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;
 
   DriverHandle = NULL;
@@ -473,39 +461,6 @@ InstallTcgConfigForm (
   
   PrivateData->HiiHandle = HiiHandle;
 
-  //
-  // Remove the Hide TPM question from the IFR
-  //
-  if (!PcdGetBool (PcdHideTpmSupport)) {
-    //
-    // Allocate space for creation of UpdateData Buffer
-    //
-    StartOpCodeHandle = HiiAllocateOpCodeHandle ();
-    ASSERT (StartOpCodeHandle != NULL);
-
-    EndOpCodeHandle = HiiAllocateOpCodeHandle ();
-    ASSERT (EndOpCodeHandle != NULL);
-
-    //
-    // Create Hii Extend Label OpCode as the start opcode
-    //
-    StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));
-    StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;
-    StartLabel->Number       = LABEL_TCG_CONFIGURATION_HIDETPM;
-
-    //
-    // Create Hii Extend Label OpCode as the end opcode
-    //
-    EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));
-    EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;
-    EndLabel->Number       = LABEL_END;
-    
-    HiiUpdateForm (HiiHandle, NULL, TCG_CONFIGURATION_FORM_ID, StartOpCodeHandle, EndOpCodeHandle);
-
-    HiiFreeOpCodeHandle (StartOpCodeHandle);
-    HiiFreeOpCodeHandle (EndOpCodeHandle);
-  }
-
   return EFI_SUCCESS;  
 }