mirror of https://github.com/acidanthera/audk.git
Remove MOR check box feature. should not have a switch to turn off MOR.
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com> Reviewed-by : Dong, Guo <guo.dong@intel.com> Reviewed-by : Mike, Wu <mike.wu@intel.com> Reviewed-by : Erik C Bjorge <erick.c.bjorge@intel.com> git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13675 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
ae837d36df
commit
db999bd39b
|
@ -140,9 +140,6 @@
|
||||||
## The PCD is used to control whether to hide the TPM.
|
## The PCD is used to control whether to hide the TPM.
|
||||||
gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm|FALSE|BOOLEAN|0x00010002
|
gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm|FALSE|BOOLEAN|0x00010002
|
||||||
|
|
||||||
## The PCD is used to specify whether or not MOR (MemoryOverwriteControl) feature is enabled.
|
|
||||||
gEfiSecurityPkgTokenSpaceGuid.PcdMorEnable|FALSE|BOOLEAN|0x00010000
|
|
||||||
|
|
||||||
[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
|
[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
|
||||||
## This PCD indicates the presence or absence of the platform operator.
|
## This PCD indicates the presence or absence of the platform operator.
|
||||||
gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence|TRUE|BOOLEAN|0x00010001
|
gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence|TRUE|BOOLEAN|0x00010001
|
||||||
|
|
|
@ -102,11 +102,6 @@ formset
|
||||||
|
|
||||||
subtitle text = STRING_TOKEN(STR_NULL);
|
subtitle text = STRING_TOKEN(STR_NULL);
|
||||||
|
|
||||||
checkbox varid = TCG_CONFIGURATION.MorState,
|
|
||||||
questionid = KEY_TPM_MOR_ENABLE,
|
|
||||||
prompt = STRING_TOKEN(STR_MOR_PROMPT),
|
|
||||||
help = STRING_TOKEN(STR_MOR_HELP),
|
|
||||||
endcheckbox;
|
|
||||||
endif;
|
endif;
|
||||||
|
|
||||||
endform;
|
endform;
|
||||||
|
|
|
@ -66,7 +66,6 @@
|
||||||
gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport
|
gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport
|
||||||
|
|
||||||
[Pcd]
|
[Pcd]
|
||||||
gEfiSecurityPkgTokenSpaceGuid.PcdMorEnable
|
|
||||||
gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm
|
gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm
|
||||||
|
|
||||||
[Depex]
|
[Depex]
|
||||||
|
|
|
@ -181,7 +181,6 @@ TcgExtractConfig (
|
||||||
//
|
//
|
||||||
ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));
|
ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));
|
||||||
|
|
||||||
Configuration.MorState = PcdGetBool (PcdMorEnable);
|
|
||||||
Configuration.TpmOperation = PHYSICAL_PRESENCE_ENABLE;
|
Configuration.TpmOperation = PHYSICAL_PRESENCE_ENABLE;
|
||||||
Configuration.HideTpm = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));
|
Configuration.HideTpm = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));
|
||||||
//
|
//
|
||||||
|
@ -308,7 +307,6 @@ TcgRouteConfig (
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
PcdSetBool (PcdMorEnable, TcgConfiguration.MorState);
|
|
||||||
PcdSetBool (PcdHideTpm, TcgConfiguration.HideTpm);
|
PcdSetBool (PcdHideTpm, TcgConfiguration.HideTpm);
|
||||||
|
|
||||||
return EFI_SUCCESS;
|
return EFI_SUCCESS;
|
||||||
|
|
|
@ -35,7 +35,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||||
typedef struct {
|
typedef struct {
|
||||||
BOOLEAN HideTpm;
|
BOOLEAN HideTpm;
|
||||||
BOOLEAN OriginalHideTpm;
|
BOOLEAN OriginalHideTpm;
|
||||||
BOOLEAN MorState;
|
|
||||||
UINT8 TpmOperation;
|
UINT8 TpmOperation;
|
||||||
BOOLEAN TpmEnable;
|
BOOLEAN TpmEnable;
|
||||||
BOOLEAN TpmActivate;
|
BOOLEAN TpmActivate;
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue