[PATCH] SecurityPkg Tcg2ConfigDxe: Align Attempt TPM Device help with options

[PATCH] SecurityPkg Tcg2ConfigDxe: Align Attempt TPM Device help with options

[Star Zeng]

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 <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 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.<BR>
 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

Re: [PATCH] SecurityPkg Tcg2ConfigDxe: Align Attempt TPM Device help with options

[Yao, Jiewen]

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 <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Zhang, Chao B <chao.b.zhang@intel.com>
> Subject: [PATCH] SecurityPkg Tcg2ConfigDxe: Align Attempt TPM Device help
> with options
> 
> 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 <jiewen.yao@intel.com>
> Cc: Chao Zhang <chao.b.zhang@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  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.<BR>
>  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