Remove hide TPM support.

[mirror_edk2.git] / SecurityPkg / Tcg / TcgConfigDxe / TcgConfig.vfr

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
index 291f9239f4886ac16c0374fa5111e6fd87560860..9e4e63d761aaf5606727589d11c7a141a57360f8 100644 (file)
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
@@ -1,7 +1,7 @@
 /** @file\r
   VFR file used by the TCG configuration component.\r
 \r
-Copyright (c) 2011, 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
@@ -44,13 +44,6 @@ formset
       endcheckbox;\r
     endif;\r
 \r
-    suppressif TRUE;\r
-      checkbox varid   = TCG_CONFIGURATION.OriginalHideTpm,\r
-              prompt   = STRING_TOKEN(STR_NULL),\r
-              help     = STRING_TOKEN(STR_NULL),\r
-      endcheckbox;\r
-    endif;\r
-\r
     text\r
       help   = STRING_TOKEN(STR_TPM_STATE_HELP),\r
       text   = STRING_TOKEN(STR_TPM_STATE_PROMPT),\r
@@ -58,18 +51,6 @@ formset
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r
-    label LABEL_TCG_CONFIGURATION_HIDETPM;\r
-\r
-    checkbox varid = TCG_CONFIGURATION.HideTpm,\r
-          questionid  = KEY_HIDE_TPM,\r
-          prompt      = STRING_TOKEN(STR_HIDE_TPM_PROMPT),\r
-          help        = STRING_TOKEN(STR_HIDE_TPM_HELP),\r
-          flags       = RESET_REQUIRED,\r
-    endcheckbox;\r
-\r
-    label LABEL_END;\r
-\r
-    grayoutif ideqval TCG_CONFIGURATION.OriginalHideTpm == 1;\r
     oneof varid  = TCG_CONFIGURATION.TpmOperation,\r
           questionid = KEY_TPM_ACTION,\r
           prompt = STRING_TOKEN(STR_TPM_OPERATION),\r
@@ -80,35 +61,28 @@ formset
           // Activate/deactivate (TPM_ORD_physicalSetDeactivated) command is not available when disabled.\r
           //\r
           suppressif ideqval TCG_CONFIGURATION.TpmEnable == 0;\r
-            option text = STRING_TOKEN(STR_DISABLE), value = DISABLE, flags = 0;\r
-            option text = STRING_TOKEN(STR_TPM_ACTIVATE), value = ACTIVATE, flags = 0;\r
-            option text = STRING_TOKEN(STR_TPM_DEACTIVATE), value = DEACTIVATE, flags = 0;\r
-            option text = STRING_TOKEN(STR_TPM_DEACTIVATE_DISABLE), value = DEACTIVATE_DISABLE, flags = 0;\r
+            option text = STRING_TOKEN(STR_DISABLE), value = PHYSICAL_PRESENCE_DISABLE, flags = RESET_REQUIRED;\r
+            option text = STRING_TOKEN(STR_TPM_ACTIVATE), value = PHYSICAL_PRESENCE_ACTIVATE, flags = RESET_REQUIRED;\r
+            option text = STRING_TOKEN(STR_TPM_DEACTIVATE), value = PHYSICAL_PRESENCE_DEACTIVATE, flags = RESET_REQUIRED;\r
+            option text = STRING_TOKEN(STR_TPM_DEACTIVATE_DISABLE), value = PHYSICAL_PRESENCE_DEACTIVATE_DISABLE, flags = RESET_REQUIRED;\r
           endif\r
           //\r
           // Clear (TPM_ORD_ForceClear) command is not available when disabled or deactivated. \r
           //\r
           suppressif ideqval TCG_CONFIGURATION.TpmEnable == 0 OR\r
                      ideqval TCG_CONFIGURATION.TpmActivate == 0;\r
-            option text = STRING_TOKEN(STR_TPM_CLEAR), value = CLEAR, flags = 0;\r
-            option text = STRING_TOKEN(STR_TPM_CLEAR_ENABLE_ACTIVATE), value = CLEAR_ENABLE_ACTIVATE, flags = 0;\r
+            option text = STRING_TOKEN(STR_TPM_CLEAR), value = PHYSICAL_PRESENCE_CLEAR, flags = RESET_REQUIRED;\r
+            option text = STRING_TOKEN(STR_TPM_CLEAR_ENABLE_ACTIVATE), value = PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE, flags = RESET_REQUIRED;\r
           endif\r
 \r
-          option text = STRING_TOKEN(STR_ENABLE), value = ENABLE, flags = 0;\r
-          option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE), value = ENABLE_ACTIVATE, flags = 0;          \r
-          option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR), value = ENABLE_ACTIVATE_CLEAR, flags = 0;\r
-          option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR_E_A), value = ENABLE_ACTIVATE_CLEAR_ENABLE_ACTIVATE, flags = 0;\r
+          option text = STRING_TOKEN(STR_ENABLE), value = PHYSICAL_PRESENCE_ENABLE, flags = RESET_REQUIRED;\r
+          option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE, flags = RESET_REQUIRED;          \r
+          option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR, flags = RESET_REQUIRED;\r
+          option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR_E_A), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR_ENABLE_ACTIVATE, flags = RESET_REQUIRED;\r
     endoneof;\r
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
 \r
-    checkbox varid = TCG_CONFIGURATION.MorState,\r
-          questionid = KEY_TPM_MOR_ENABLE,\r
-          prompt = STRING_TOKEN(STR_MOR_PROMPT),\r
-          help   = STRING_TOKEN(STR_MOR_HELP),\r
-    endcheckbox; \r
-    endif;\r
-\r
   endform;\r
 \r
 endformset;\r