SecurityPkg/dec: remove TrEE.

TrEE is deprecated. We need use Tcg2.

Cc: Chao B Zhang <chao.b.zhang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Chao B Zhang <chao.b.zhang@intel.com>

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 77d6b073d4010472fae9b19ecd63fcc6d9009ebb..497354634b9813252d381dcad8c5288833c4c3c7 100644 (file)
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -64,15 +64,7 @@
   ##  @libraryclass  Provides TPM Interface Specification (TIS) interfaces for TPM command.\r
   #\r
   TpmCommLib|Include/Library/TpmCommLib.h\r
   ##  @libraryclass  Provides TPM Interface Specification (TIS) interfaces for TPM command.\r
   #\r
   TpmCommLib|Include/Library/TpmCommLib.h\r

-  \r
-  ##  @libraryclass  Provides interfaces to handle TPM 2.0 request.\r
-  #\r
-  TrEEPhysicalPresenceLib|Include/Library/TrEEPhysicalPresenceLib.h\r
-  \r
-  ##  @libraryclass  Provides support for TrEE PP >= 128 Vendor Specific PPI Operation.\r
-  #\r
-  TrEEPpVendorLib|Include/Library/TrEEPpVendorLib.h\r
-  \r
+\r

   ##  @libraryclass  Provides support for TCG Physical Presence Interface (PPI) specification \r
   #   >= 128 Vendor Specific PPI Operation.\r
   #\r
   ##  @libraryclass  Provides support for TCG Physical Presence Interface (PPI) specification \r
   #   >= 128 Vendor Specific PPI Operation.\r
   #\r


@@ -175,10 +167,6 @@
   #  Include/Guid/SecureBootConfigHii.h\r
   gSecureBootConfigFormSetGuid       = { 0x5daf50a5, 0xea81, 0x4de2, {0x8f, 0x9b, 0xca, 0xbd, 0xa9, 0xcf, 0x5c, 0x14}}\r
 \r
   #  Include/Guid/SecureBootConfigHii.h\r
   gSecureBootConfigFormSetGuid       = { 0x5daf50a5, 0xea81, 0x4de2, {0x8f, 0x9b, 0xca, 0xbd, 0xa9, 0xcf, 0x5c, 0x14}}\r
 \r

-  ## GUID used to "TrEEPhysicalPresence" variable and "TrEEPhysicalPresenceFlags" variable for TPM2 request and response.\r
-  #  Include/Guid/TrEEPhysicalPresenceData.h\r
-  gEfiTrEEPhysicalPresenceGuid = { 0xf24643c2, 0xc622, 0x494e, { 0x8a, 0xd, 0x46, 0x32, 0x57, 0x9c, 0x2d, 0x5b }}\r
-\r

   ## GUID value used for PcdTpmInstanceGuid to indicate TPM is disabled.\r
   #  Include/Guid/TpmInstance.h\r
   gEfiTpmDeviceInstanceNoneGuid      = { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }\r
   ## GUID value used for PcdTpmInstanceGuid to indicate TPM is disabled.\r
   #  Include/Guid/TpmInstance.h\r
   gEfiTpmDeviceInstanceNoneGuid      = { 0x00000000, 0x0000, 0x0000, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }\r


@@ -195,10 +183,6 @@
   #  Include/Guid/TpmInstance.h\r
   gEfiTpmDeviceSelectedGuid          = { 0x7f4158d3, 0x74d, 0x456d, { 0x8c, 0xb2, 0x1, 0xf9, 0xc8, 0xf7, 0x9d, 0xaa } }\r
 \r
   #  Include/Guid/TpmInstance.h\r
   gEfiTpmDeviceSelectedGuid          = { 0x7f4158d3, 0x74d, 0x456d, { 0x8c, 0xb2, 0x1, 0xf9, 0xc8, 0xf7, 0x9d, 0xaa } }\r
 \r

-  ## GUID used for FormSet and config variable.\r
-  #  Include/Guid/TrEEConfigHii.h\r
-  gTrEEConfigFormSetGuid              = {0xc54b425f, 0xaa79, 0x48b4, { 0x98, 0x1f, 0x99, 0x8b, 0x3c, 0x4b, 0x64, 0x1c }}\r
-\r

   ## Include/OpalPasswordExtraInfoVariable.h\r
   gOpalExtraInfoVariableGuid =  {0x44a2ad5d, 0x612c, 0x47b3, {0xb0, 0x6e, 0xc8, 0xf5, 0x0b, 0xfb, 0xf0, 0x7d}}\r
 \r
   ## Include/OpalPasswordExtraInfoVariable.h\r
   gOpalExtraInfoVariableGuid =  {0x44a2ad5d, 0x612c, 0x47b3, {0xb0, 0x6e, 0xc8, 0xf5, 0x0b, 0xfb, 0xf0, 0x7d}}\r
 \r