SecurityPkg: SecureBootConfigDxe: Remove useless code in VFR

[mirror_edk2.git] / SecurityPkg / Tcg / TcgConfigDxe / TcgConfigImpl.c

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
index 631441a0e4b76845e554554369e0f2adf065f3a2..c2e3b34a25e3cad2a65c3060cb8b8b984cfc2cd2 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   HII Config Access protocol implementation of TCG configuration module.\r
 \r
-Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials \r
 are licensed and made available under the terms and conditions of the BSD License \r
 which accompanies this distribution.  The full text of the license may be found at \r
@@ -181,13 +181,7 @@ TcgExtractConfig (
   //  \r
   ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));\r
 \r
-  Configuration.MorState        = PcdGetBool (PcdMorEnable);\r
   Configuration.TpmOperation    = PHYSICAL_PRESENCE_ENABLE;\r
-  Configuration.HideTpm         = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));\r
-  //\r
-  // Read the original value of HideTpm from PrivateData which won't be changed by Setup in this boot.\r
-  //\r
-  Configuration.OriginalHideTpm = PrivateData->HideTpm;\r
 \r
   //\r
   // Display current TPM state.\r
@@ -308,9 +302,6 @@ TcgRouteConfig (
     return Status;\r
   }\r
 \r
-  PcdSetBool (PcdMorEnable,  TcgConfiguration.MorState);\r
-  PcdSetBool (PcdHideTpm,    TcgConfiguration.HideTpm);\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -427,11 +418,6 @@ InstallTcgConfigForm (
   EFI_STATUS                      Status;\r
   EFI_HII_HANDLE                  HiiHandle;\r
   EFI_HANDLE                      DriverHandle;\r
-  VOID                            *StartOpCodeHandle;\r
-  VOID                            *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL              *StartLabel;\r
-  EFI_IFR_GUID_LABEL              *EndLabel;\r
-\r
   EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;\r
 \r
   DriverHandle = NULL;\r
@@ -475,39 +461,6 @@ InstallTcgConfigForm (
   \r
   PrivateData->HiiHandle = HiiHandle;\r
 \r
-  //\r
-  // Remove the Hide TPM question from the IFR\r
-  //\r
-  if (!PcdGetBool (PcdHideTpmSupport)) {\r
-    //\r
-    // Allocate space for creation of UpdateData Buffer\r
-    //\r
-    StartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
-    ASSERT (StartOpCodeHandle != NULL);\r
-\r
-    EndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
-    ASSERT (EndOpCodeHandle != NULL);\r
-\r
-    //\r
-    // Create Hii Extend Label OpCode as the start opcode\r
-    //\r
-    StartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
-    StartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
-    StartLabel->Number       = LABEL_TCG_CONFIGURATION_HIDETPM;\r
-\r
-    //\r
-    // Create Hii Extend Label OpCode as the end opcode\r
-    //\r
-    EndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
-    EndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
-    EndLabel->Number       = LABEL_END;\r
-    \r
-    HiiUpdateForm (HiiHandle, NULL, TCG_CONFIGURATION_FORM_ID, StartOpCodeHandle, EndOpCodeHandle);\r
-\r
-    HiiFreeOpCodeHandle (StartOpCodeHandle);\r
-    HiiFreeOpCodeHandle (EndOpCodeHandle);\r
-  }\r
-\r
   return EFI_SUCCESS;  \r
 }\r
 \r