From cfa451c84a6a4dad6fa96da56802ef8112de301f Mon Sep 17 00:00:00 2001 From: Chao Zhang Date: Fri, 10 Jul 2015 06:19:32 +0000 Subject: [PATCH] SecurityPkg: Add default value for TPM action question 1. Add default value for TPM action question. F9 restore default can get the right value 2. Remove redundant suppressif Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Chao Zhang Reviewed-by: Eric Dong git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17918 6f19259b-4bc3-4df7-8a09-765794883524 --- SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr | 38 +++++++--------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr index 9e4e63d761..94e3229e88 100644 --- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr +++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr @@ -1,7 +1,7 @@ /** @file VFR file used by the TCG configuration component. -Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.
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 @@ -30,20 +30,6 @@ formset subtitle text = STRING_TOKEN(STR_NULL); - suppressif TRUE; - checkbox varid = TCG_CONFIGURATION.TpmEnable, - prompt = STRING_TOKEN(STR_NULL), - help = STRING_TOKEN(STR_NULL), - endcheckbox; - endif; - - suppressif TRUE; - checkbox varid = TCG_CONFIGURATION.TpmActivate, - prompt = STRING_TOKEN(STR_NULL), - help = STRING_TOKEN(STR_NULL), - endcheckbox; - endif; - text help = STRING_TOKEN(STR_TPM_STATE_HELP), text = STRING_TOKEN(STR_TPM_STATE_PROMPT), @@ -55,30 +41,30 @@ formset questionid = KEY_TPM_ACTION, prompt = STRING_TOKEN(STR_TPM_OPERATION), help = STRING_TOKEN(STR_TPM_OPERATION_HELP), - flags = INTERACTIVE, + flags = INTERACTIVE | RESET_REQUIRED, // // Disable (TPM_ORD_PhysicalDisable) command is not available when disabled. // Activate/deactivate (TPM_ORD_physicalSetDeactivated) command is not available when disabled. // suppressif ideqval TCG_CONFIGURATION.TpmEnable == 0; - option text = STRING_TOKEN(STR_DISABLE), value = PHYSICAL_PRESENCE_DISABLE, flags = RESET_REQUIRED; - option text = STRING_TOKEN(STR_TPM_ACTIVATE), value = PHYSICAL_PRESENCE_ACTIVATE, flags = RESET_REQUIRED; - option text = STRING_TOKEN(STR_TPM_DEACTIVATE), value = PHYSICAL_PRESENCE_DEACTIVATE, flags = RESET_REQUIRED; - option text = STRING_TOKEN(STR_TPM_DEACTIVATE_DISABLE), value = PHYSICAL_PRESENCE_DEACTIVATE_DISABLE, flags = RESET_REQUIRED; + option text = STRING_TOKEN(STR_DISABLE), value = PHYSICAL_PRESENCE_DISABLE, flags = 0; + option text = STRING_TOKEN(STR_TPM_ACTIVATE), value = PHYSICAL_PRESENCE_ACTIVATE, flags = 0; + option text = STRING_TOKEN(STR_TPM_DEACTIVATE), value = PHYSICAL_PRESENCE_DEACTIVATE, flags = 0; + option text = STRING_TOKEN(STR_TPM_DEACTIVATE_DISABLE), value = PHYSICAL_PRESENCE_DEACTIVATE_DISABLE, flags = 0; endif // // Clear (TPM_ORD_ForceClear) command is not available when disabled or deactivated. // suppressif ideqval TCG_CONFIGURATION.TpmEnable == 0 OR ideqval TCG_CONFIGURATION.TpmActivate == 0; - option text = STRING_TOKEN(STR_TPM_CLEAR), value = PHYSICAL_PRESENCE_CLEAR, flags = RESET_REQUIRED; - option text = STRING_TOKEN(STR_TPM_CLEAR_ENABLE_ACTIVATE), value = PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE, flags = RESET_REQUIRED; + option text = STRING_TOKEN(STR_TPM_CLEAR), value = PHYSICAL_PRESENCE_CLEAR, flags = 0; + option text = STRING_TOKEN(STR_TPM_CLEAR_ENABLE_ACTIVATE), value = PHYSICAL_PRESENCE_CLEAR_ENABLE_ACTIVATE, flags = 0; endif - option text = STRING_TOKEN(STR_ENABLE), value = PHYSICAL_PRESENCE_ENABLE, flags = RESET_REQUIRED; - option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE, flags = RESET_REQUIRED; - option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR, flags = RESET_REQUIRED; - option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR_E_A), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR_ENABLE_ACTIVATE, flags = RESET_REQUIRED; + option text = STRING_TOKEN(STR_ENABLE), value = PHYSICAL_PRESENCE_ENABLE, flags = DEFAULT; + option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE, flags = 0; + option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR, flags = 0; + option text = STRING_TOKEN(STR_TPM_ENABLE_ACTIVATE_CLEAR_E_A), value = PHYSICAL_PRESENCE_ENABLE_ACTIVATE_CLEAR_ENABLE_ACTIVATE, flags = 0; endoneof; subtitle text = STRING_TOKEN(STR_NULL); -- 2.39.2