From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4948181EDF for ; Thu, 24 Nov 2016 18:40:09 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP; 24 Nov 2016 18:40:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,692,1473145200"; d="scan'208";a="9115084" Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.9]) by orsmga002.jf.intel.com with ESMTP; 24 Nov 2016 18:40:07 -0800 From: Star Zeng To: edk2-devel@lists.01.org Cc: Star Zeng , Jiewen Yao , Chao Zhang Date: Fri, 25 Nov 2016 10:40:05 +0800 Message-Id: <1480041605-103840-1-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 Subject: [PATCH] SecurityPkg Tcg2ConfigDxe: Align Attempt TPM Device help with options X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2016 02:40:09 -0000 Current options only have TPM 1.2 and TPM 2.0, but help shows Disable, TPM1.2, or TPM2.0, they are mismatched. Cc: Jiewen Yao Cc: Chao Zhang Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng --- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni index 948179d336bd..f55efb471f64 100644 --- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni +++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigStrings.uni @@ -1,5 +1,5 @@ /** @file - String definitions for TCG configuration form. + String definitions for TCG2 configuration form. Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
This program and the accompanying materials @@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #string STR_TCG2_DEVICE_STATE_CONTENT #language en-US "" #string STR_TCG2_DEVICE_PROMPT #language en-US "Attempt TPM Device" -#string STR_TCG2_DEVICE_HELP #language en-US "Attempt TPM Device: Disable, TPM1.2, or TPM2.0" +#string STR_TCG2_DEVICE_HELP #language en-US "Attempt TPM Device: TPM1.2, or TPM2.0" #string STR_TCG2_DEVICE_CONTENT #language en-US "" #string STR_TCG2_DEVICE_INTERFACE_STATE_PROMPT #language en-US "Current TPM Device Interface" @@ -58,7 +58,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #string STR_TCG2_OPERATION_PARAMETER #language en-US "TPM2 Operation Parameter" #string STR_TCG2_OPERATION_PARAMETER_HELP #language en-US "Additional TPM2 Operation Parameter need be sent with Operation Code (required for SetPCRBanks)" -#string STR_TCG2_TPM_DISABLE #language en-US "Disable" #string STR_TCG2_TPM_1_2 #language en-US "TPM 1.2" #string STR_TCG2_TPM_2_0_DTPM #language en-US "TPM 2.0" -- 2.7.0.windows.1