diff options
| author | Tim He <tim.he@intel.com> | 2015-05-08 03:13:37 +0000 |
|---|---|---|
| committer | timhe <timhe@Edk2> | 2015-05-08 03:13:37 +0000 |
| commit | f4e7aa05a3fe348dda4c1f491a48789ef5b7e4d1 (patch) | |
| tree | 3b56943e4a4a070ff581de41e2db27a6f50b2354 /Vlv2TbltDevicePkg/PlatformSetupDxe | |
| parent | 7849538e0e3453db93a3ce8875b73121e7088e3a (diff) | |
| download | edk2-f4e7aa05a3fe348dda4c1f491a48789ef5b7e4d1.tar.gz edk2-f4e7aa05a3fe348dda4c1f491a48789ef5b7e4d1.tar.bz2 edk2-f4e7aa05a3fe348dda4c1f491a48789ef5b7e4d1.zip | |
Sync the branch changes to trunk.
Support fTPM feature, and update the BiosID to 0.80.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tim He <tim.he@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17362 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Vlv2TbltDevicePkg/PlatformSetupDxe')
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi index f4922ff0b6..52470edf6b 100644 --- a/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi +++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/Security.vfi @@ -37,19 +37,32 @@ form formid = SECURITY_CONFIGURATION_FORM_ID, //TPM related
//
subtitle text = STRING_TOKEN(STR_TPM_CONFIGURATION_PROMPT);
+grayoutif ideqval Setup.ETpm== 0x1;
+ oneof varid = Setup.fTPM,
+ prompt = STRING_TOKEN(STR_PTT_PROMPT),
+ help = STRING_TOKEN(STR_PTT_HELP),
+ option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;
+ option text = STRING_TOKEN(STR_DISABLE), value= 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
+ endoneof;
+endif;
+
+grayoutif ideqval Setup.fTPM == 0x1;
oneof varid = Setup.ETpm,
prompt = STRING_TOKEN(STR_TPM_PROMPT),
help = STRING_TOKEN(STR_TPM_HELP),
- option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
- option text = STRING_TOKEN(STR_DISABLE), value= 0, flags= RESET_REQUIRED;
+ option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;
+ option text = STRING_TOKEN(STR_DISABLE), value= 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
endoneof;
+endif;
+suppressif ideqval Setup.fTPM == 0;
oneof varid = Setup.MeasuredBootEnable,
prompt = STRING_TOKEN(STR_MEASURED_BOOT_ENABLE_PROMPT),
help = STRING_TOKEN(STR_MEASURED_BOOT_ENABLE_HELP),
option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = RESET_REQUIRED;
option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
endoneof;
+endif;
subtitle text = STRING_TOKEN(STR_NULL_STRING);
|