From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 A48D681EB3 for ; Thu, 24 Nov 2016 18:50:29 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 24 Nov 2016 18:50:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,693,1473145200"; d="scan'208";a="9117949" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga002.jf.intel.com with ESMTP; 24 Nov 2016 18:50:28 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.248.2; Thu, 24 Nov 2016 18:50:28 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.248.2; Thu, 24 Nov 2016 18:50:28 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.239]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.96]) with mapi id 14.03.0248.002; Fri, 25 Nov 2016 10:50:26 +0800 From: "Yao, Jiewen" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Zhang, Chao B" Thread-Topic: [PATCH] SecurityPkg Tcg2ConfigDxe: Align Attempt TPM Device help with options Thread-Index: AQHSRsVH6QN3Sjhg8EuYQMjfRhFR0aDo/8Gg Date: Fri, 25 Nov 2016 02:50:25 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C50386DAA3E@shsmsx102.ccr.corp.intel.com> References: <1480041605-103840-1-git-send-email-star.zeng@intel.com> In-Reply-To: <1480041605-103840-1-git-send-email-star.zeng@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [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:50:29 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: jiewen.yao@intel.com > -----Original Message----- > From: Zeng, Star > Sent: Friday, November 25, 2016 10:40 AM > To: edk2-devel@lists.01.org > Cc: Zeng, Star ; Yao, Jiewen ; > Zhang, Chao B > Subject: [PATCH] SecurityPkg Tcg2ConfigDxe: Align Attempt TPM Device help > with options >=20 > Current options only have TPM 1.2 and TPM 2.0, > but help shows Disable, TPM1.2, or TPM2.0, > they are mismatched. >=20 > 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(-) >=20 > 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. >=20 > 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 "" >=20 > #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 "" >=20 > #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)" >=20 > -#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" >=20 > -- > 2.7.0.windows.1