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

6 files changed, 0 insertions, 12 deletions

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index ee88d0e7fd..971efd6d84 100644
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -140,9 +140,6 @@
   ## The PCD is used to control whether to hide the TPM.

   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]

   ## This PCD indicates the presence or absence of the platform operator.

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmPhysicalPresence|TRUE|BOOLEAN|0x00010001

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
index 173fa34661..fc601471d0 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfig.vfr
@@ -102,11 +102,6 @@ formset
 

     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;

 

   endform;

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
index 44abdc0acb..5edd6ab4b8 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigDxe.inf
@@ -66,7 +66,6 @@
   gEfiSecurityPkgTokenSpaceGuid.PcdHideTpmSupport

 

 [Pcd]

-  gEfiSecurityPkgTokenSpaceGuid.PcdMorEnable

   gEfiSecurityPkgTokenSpaceGuid.PcdHideTpm

 

 [Depex]

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
index 631441a0e4..5a52a6b87c 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigImpl.c
@@ -181,7 +181,6 @@ TcgExtractConfig (
   //  

   ZeroMem (&Configuration, sizeof (TCG_CONFIGURATION));

 

-  Configuration.MorState        = PcdGetBool (PcdMorEnable);

   Configuration.TpmOperation    = PHYSICAL_PRESENCE_ENABLE;

   Configuration.HideTpm         = (BOOLEAN) (PcdGetBool (PcdHideTpmSupport) && PcdGetBool (PcdHideTpm));

   //

@@ -308,7 +307,6 @@ TcgRouteConfig (
     return Status;

   }

 

-  PcdSetBool (PcdMorEnable,  TcgConfiguration.MorState);

   PcdSetBool (PcdHideTpm,    TcgConfiguration.HideTpm);

 

   return EFI_SUCCESS;

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
index 30f4dbfba6..359f4a2bf6 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigNvData.h
@@ -35,7 +35,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 typedef struct {

   BOOLEAN HideTpm;

   BOOLEAN OriginalHideTpm;

-  BOOLEAN MorState;

   UINT8   TpmOperation;

   BOOLEAN TpmEnable;

   BOOLEAN TpmActivate;

diff --git a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni
index df39f62093..6010b80c7d 100644
--- a/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni
+++ b/SecurityPkg/Tcg/TcgConfigDxe/TcgConfigStrings.uni