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
This commit is contained in:
Tim He
2015-05-08 03:13:37 +00:00
committed by timhe
parent 7849538e0e
commit f4e7aa05a3
26 changed files with 1320 additions and 38 deletions

View File

@@ -37,19 +37,32 @@ form formid = SECURITY_CONFIGURATION_FORM_ID,
//
form formid = SECURITY_CONFIGURATION_FORM_ID,
title = STRING_TOKEN(STR_SECURITY_CONFIGURATION_TITLE);
subtitle text = STRING_TOKEN(STR_NULL_STRING);
//
//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),
subtitle text = STRING_TOKEN(STR_NULL_STRING);
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 = 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,