Revert "ICXD: SGX: Added SGX launch control to SBL."
This reverts commit a7adcc2d5e
.
This commit is contained in:
parent
2edbfbe447
commit
91f39ba742
|
@ -50,7 +50,7 @@
|
||||||
option : 0x80000000:2GB, 0x100000000:4GB, 0x200000000:8GB, 0x400000000:16GB, 0x400000000:32GB, 0x800000000:64GB, 0x1000000000:128GB, 0x2000000000:256GB, 0x4000000000:512GB
|
option : 0x80000000:2GB, 0x100000000:4GB, 0x200000000:8GB, 0x400000000:16GB, 0x400000000:32GB, 0x800000000:64GB, 0x1000000000:128GB, 0x2000000000:256GB, 0x4000000000:512GB
|
||||||
help : >
|
help : >
|
||||||
Setting the PRMRR Size
|
Setting the PRMRR Size
|
||||||
length : 0x08
|
length : 0x04
|
||||||
value : 0x80000000
|
value : 0x80000000
|
||||||
- SgxQos :
|
- SgxQos :
|
||||||
name : SGX Qos
|
name : SGX Qos
|
||||||
|
@ -79,48 +79,7 @@
|
||||||
Enable/Disable SGX Debug Mode
|
Enable/Disable SGX Debug Mode
|
||||||
length : 0x01
|
length : 0x01
|
||||||
value : 0x0
|
value : 0x0
|
||||||
- SgxLeWr :
|
|
||||||
name : SGX Flexible Launch control
|
|
||||||
condition : $(COND_SGX_EN)
|
|
||||||
type : Combo
|
|
||||||
option : 0:Disabled, 1:Enabled
|
|
||||||
help : >
|
|
||||||
Enable/Disable SGX Flexible Launch control
|
|
||||||
length : 0x01
|
|
||||||
value : 0x0
|
|
||||||
- SgxLePubKeyHash0 :
|
|
||||||
name : SGX Flexible Launch control Hash 0
|
|
||||||
condition : $(COND_SGX_EN)
|
|
||||||
type : EditNum, HEX, (0x0,0xFFFFFFFFFFFFFFFF)
|
|
||||||
help : >
|
|
||||||
SGX Flexible Launch control Hash 0 value
|
|
||||||
length : 0x08
|
|
||||||
value : 0x0
|
|
||||||
- SgxLePubKeyHash1 :
|
|
||||||
name : SGX Flexible Launch control Hash 1
|
|
||||||
condition : $(COND_SGX_EN)
|
|
||||||
type : EditNum, HEX, (0x0,0xFFFFFFFFFFFFFFFF)
|
|
||||||
help : >
|
|
||||||
SGX Flexible Launch control Hash 1 value
|
|
||||||
length : 0x08
|
|
||||||
value : 0x0
|
|
||||||
- SgxLePubKeyHash2 :
|
|
||||||
name : SGX Flexible Launch control Hash 2
|
|
||||||
condition : $(COND_SGX_EN)
|
|
||||||
type : EditNum, HEX, (0x0,0xFFFFFFFFFFFFFFFF)
|
|
||||||
help : >
|
|
||||||
SGX Flexible Launch control Hash 2 value
|
|
||||||
length : 0x08
|
|
||||||
value : 0x0
|
|
||||||
- SgxLePubKeyHash3 :
|
|
||||||
name : SGX Flexible Launch control Hash 3
|
|
||||||
condition : $(COND_SGX_EN)
|
|
||||||
type : EditNum, HEX, (0x0,0xFFFFFFFFFFFFFFFF)
|
|
||||||
help : >
|
|
||||||
SGX Flexible Launch control Hash 3 value
|
|
||||||
length : 0x08
|
|
||||||
value : 0x0
|
|
||||||
- PaddingBytes :
|
- PaddingBytes :
|
||||||
length : 0x02
|
length : 0x03
|
||||||
value : 0x0
|
value : 0x0
|
||||||
|
|
||||||
|
|
|
@ -537,11 +537,6 @@ UpdateFspmSgxConfig (
|
||||||
FspmUpd->FspmConfig.PcdSgxAutoRegistrationAgent = SgxCfgData->SgxAutoRegistration;
|
FspmUpd->FspmConfig.PcdSgxAutoRegistrationAgent = SgxCfgData->SgxAutoRegistration;
|
||||||
FspmUpd->FspmConfig.PcdSgxQoS = SgxCfgData->SgxQos;;
|
FspmUpd->FspmConfig.PcdSgxQoS = SgxCfgData->SgxQos;;
|
||||||
FspmUpd->FspmConfig.PcdSgxDebugMode = SgxCfgData->SgxDebugMode;
|
FspmUpd->FspmConfig.PcdSgxDebugMode = SgxCfgData->SgxDebugMode;
|
||||||
FspmUpd->FspmConfig.PcdSgxLeWr = SgxCfgData->SgxLeWr;
|
|
||||||
FspmUpd->FspmConfig.PcdSgxLePubKeyHash0 = SgxCfgData->SgxLePubKeyHash0;
|
|
||||||
FspmUpd->FspmConfig.PcdSgxLePubKeyHash1 = SgxCfgData->SgxLePubKeyHash1;
|
|
||||||
FspmUpd->FspmConfig.PcdSgxLePubKeyHash2 = SgxCfgData->SgxLePubKeyHash2;
|
|
||||||
FspmUpd->FspmConfig.PcdSgxLePubKeyHash3 = SgxCfgData->SgxLePubKeyHash3;
|
|
||||||
UpdateFspmSgxConfigStatus = TRUE;
|
UpdateFspmSgxConfigStatus = TRUE;
|
||||||
} else if (SgxCfgData->EnableSgx == CONFIG_SGX_DISABLED) {
|
} else if (SgxCfgData->EnableSgx == CONFIG_SGX_DISABLED) {
|
||||||
DEBUG ((DEBUG_WARN, "Intel(R) SGX set to disabled in config.\n"));
|
DEBUG ((DEBUG_WARN, "Intel(R) SGX set to disabled in config.\n"));
|
||||||
|
|
Loading…
Reference in New Issue