Fix execution status & DEBUG message level mismatch. EFI_D_ERROR is used only...

[mirror_edk2.git] / SecurityPkg / Tcg / TrEEConfig / TrEEConfig.vfr

diff --git a/SecurityPkg/Tcg/TrEEConfig/TrEEConfig.vfr b/SecurityPkg/Tcg/TrEEConfig/TrEEConfig.vfr
index 74e23631993a6c620ee40fd55c6c6c3c1ac76fac..84b55a9f158f8b32adbb3b7fcf4d602c272b92d1 100644 (file)
--- a/SecurityPkg/Tcg/TrEEConfig/TrEEConfig.vfr
+++ b/SecurityPkg/Tcg/TrEEConfig/TrEEConfig.vfr
@@ -20,8 +20,9 @@ formset
   help      = STRING_TOKEN(STR_TREE_HELP),\r
   classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,\r
 \r
-  varstore TREE_CONFIGURATION,\r
+  efivarstore TREE_CONFIGURATION,\r
     varid = TREE_CONFIGURATION_VARSTORE_ID,\r
+    attribute = 0x03,  // EFI variable attribures  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE\r
     name  = TREE_CONFIGURATION,\r
     guid  = TREE_CONFIG_FORM_SET_GUID;\r
 \r
@@ -40,7 +41,6 @@ formset
           prompt = STRING_TOKEN(STR_TREE_DEVICE_PROMPT),\r
           help   = STRING_TOKEN(STR_TREE_DEVICE_HELP),\r
           flags  = INTERACTIVE,\r
-            option text = STRING_TOKEN(STR_TREE_TPM_DISABLE),      value = TPM_DEVICE_NULL,         flags = RESET_REQUIRED;\r
             option text = STRING_TOKEN(STR_TREE_TPM_1_2),          value = TPM_DEVICE_1_2,          flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
             option text = STRING_TOKEN(STR_TREE_TPM_2_0_DTPM),     value = TPM_DEVICE_2_0_DTPM,     flags = RESET_REQUIRED;\r
     endoneof;\r
@@ -52,10 +52,11 @@ formset
     subtitle text = STRING_TOKEN(STR_NULL);\r
     subtitle text = STRING_TOKEN(STR_TREE_PP_OPERATION);\r
 \r
-    oneof varid  = TREE_CONFIGURATION.Tpm2Operation,\r
+    oneof name = Tpm2Operation,\r
+          questionid = KEY_TPM2_OPERATION,\r
           prompt = STRING_TOKEN(STR_TREE_OPERATION),\r
           help   = STRING_TOKEN(STR_TREE_OPERATION_HELP),\r
-          flags  = INTERACTIVE,\r
+          flags  = INTERACTIVE | NUMERIC_SIZE_1,\r
             option text = STRING_TOKEN(STR_TREE_NO_ACTION), value = TREE_PHYSICAL_PRESENCE_NO_ACTION, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
             option text = STRING_TOKEN(STR_TREE_CLEAR), value = TREE_PHYSICAL_PRESENCE_CLEAR_CONTROL_CLEAR, flags = RESET_REQUIRED;\r
     endoneof;\r