Sync the branch changes to trunk.

[mirror_edk2.git] / Vlv2TbltDevicePkg / PlatformSetupDxe / Security.vfi

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi
index f4922ff0b66c1ef6ec520ba6d452beedc0c15d98..52470edf6b3019df560c0c140117e044d049b9ca 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi
@@ -37,19 +37,32 @@ form formid = SECURITY_CONFIGURATION_FORM_ID,
   //TPM related\r
   //\r
   subtitle text = STRING_TOKEN(STR_TPM_CONFIGURATION_PROMPT);\r
+grayoutif ideqval Setup.ETpm== 0x1;\r
+  oneof   varid   = Setup.fTPM,\r
+    prompt      = STRING_TOKEN(STR_PTT_PROMPT),\r
+    help        = STRING_TOKEN(STR_PTT_HELP),\r
+      option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;\r
+      option text = STRING_TOKEN(STR_DISABLE), value= 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
+  endoneof;\r
+endif;\r
+\r
+grayoutif ideqval Setup.fTPM == 0x1;\r
   oneof   varid   = Setup.ETpm,\r
     prompt      = STRING_TOKEN(STR_TPM_PROMPT),\r
     help        = STRING_TOKEN(STR_TPM_HELP),\r
-      option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
-      option text = STRING_TOKEN(STR_DISABLE), value= 0, flags= RESET_REQUIRED;\r
+      option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;\r
+      option text = STRING_TOKEN(STR_DISABLE), value= 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
   endoneof;\r
+endif;\r
 \r
+suppressif ideqval Setup.fTPM == 0;\r
   oneof varid = Setup.MeasuredBootEnable,\r
     prompt      = STRING_TOKEN(STR_MEASURED_BOOT_ENABLE_PROMPT),\r
     help        = STRING_TOKEN(STR_MEASURED_BOOT_ENABLE_HELP),\r
     option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = RESET_REQUIRED;\r
     option text = STRING_TOKEN(STR_ENABLE), value = 1, flags =  DEFAULT | MANUFACTURING | RESET_REQUIRED;\r
   endoneof;\r
+endif;\r
 \r
   subtitle text = STRING_TOKEN(STR_NULL_STRING);\r
 \r