Vlv2TbltDevicePkg/dsc/fdf: use Tcg2 instead of TrEE.

TrEE is deprecated. We need use Tcg2.

Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
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>
Reviewed-by: Mang Guo <mang.guo@intel.com>

5 files changed, 27 insertions, 27 deletions

diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index 148553828c..846db044b4 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -321,12 +321,12 @@ INF EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/Acpi
 

 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf

 !if $(TPM_ENABLED) == TRUE

-INF SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf

+INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

 INF SecurityPkg/Tcg/TcgPei/TcgPei.inf

 INF SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf

 !endif

 !if $(FTPM_ENABLE) == TRUE

-INF  SecurityPkg/Tcg/TrEEPei/TrEEPei.inf #use PCD config

+INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf #use PCD config

 !endif

 INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 

@@ -556,7 +556,7 @@ INF RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Tpm2DeviceSeCPei.inf

 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf

 INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf

-INF SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf

+INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf

 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf

 !endif

 

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index d208871ae6..479c4c7264 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -278,12 +278,12 @@ INF EdkCompatibilityPkg/Compatibility/AcpiVariableHobOnSmramReserveHobThunk/Acpi
 

 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/PiSmmCommunicationPei.inf

 !if $(TPM_ENABLED) == TRUE

-INF SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf

+INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

 INF SecurityPkg/Tcg/TcgPei/TcgPei.inf

 INF SecurityPkg/Tcg/PhysicalPresencePei/PhysicalPresencePei.inf

 !endif

 !if $(FTPM_ENABLE) == TRUE

-INF  SecurityPkg/Tcg/TrEEPei/TrEEPei.inf #use PCD config

+INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf #use PCD config

 !endif

 INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 

@@ -513,7 +513,7 @@ INF RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/TcgSmm/TcgSmm.inf
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/Tpm2DeviceSeCPei.inf

 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf

 INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf

-INF SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf

+INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf

 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf

 !endif

 

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index 824dbc9101..682e090a99 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -291,9 +291,9 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

 !endif

   TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

-  TrEEPhysicalPresenceLib|SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf

+  Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

 !if $(FTPM_ENABLE) == TRUE

-  TrEEPpVendorLib|SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf

+  Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

 !endif

 

 

@@ -1070,7 +1070,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

 

 !if $(FTPM_ENABLE) == TRUE

-   SecurityPkg/Tcg/TrEEPei/TrEEPei.inf {

+   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

     <PcdsPatchableInModule>

       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046

     <LibraryClasses>

@@ -1081,7 +1081,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }

 !endif

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   }

@@ -1201,7 +1201,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     !if $(FTPM_ENABLE) == TRUE

       Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf

     !else

-      TrEEPhysicalPresenceLib|$(PLATFORM_PACKAGE)/Library/DxeTrEEPhysicalPresenceLibNull/DxeTrEEPhysicalPresenceLibNull.inf

+      Tcg2PhysicalPresenceLib|$(PLATFORM_PACKAGE)/Library/DxeTcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLibNull.inf

     !endif

   }

 

@@ -1321,7 +1321,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 !if $(FTPM_ENABLE) == TRUE

   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf

   SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf

-  SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf{

+  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf{

     <LibraryClasses>

       NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

@@ -1331,7 +1331,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf

 !endif

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   }

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index 6a65e2e610..baba5e2055 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -291,9 +291,9 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

 !endif

   TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

-  TrEEPhysicalPresenceLib|SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf

+  Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

 !if $(FTPM_ENABLE) == TRUE

-  TrEEPpVendorLib|SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf

+  Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

 !endif

 

 

@@ -1070,7 +1070,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

 

 !if $(FTPM_ENABLE) == TRUE

-   SecurityPkg/Tcg/TrEEPei/TrEEPei.inf {

+   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

     <PcdsPatchableInModule>

       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046

     <LibraryClasses>

@@ -1081,7 +1081,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }

 !endif

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   }

@@ -1189,7 +1189,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     !if $(FTPM_ENABLE) == TRUE

       Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf

     !else

-      TrEEPhysicalPresenceLib|$(PLATFORM_PACKAGE)/Library/DxeTrEEPhysicalPresenceLibNull/DxeTrEEPhysicalPresenceLibNull.inf

+      Tcg2PhysicalPresenceLib|$(PLATFORM_PACKAGE)/Library/DxeTcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLibNull.inf

     !endif

   }

 

@@ -1309,7 +1309,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 !if $(FTPM_ENABLE) == TRUE

   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf

   SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf

-  SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf{

+  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf{

     <LibraryClasses>

       NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

@@ -1319,7 +1319,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf

 !endif

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   }

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 3c29b17ea8..1f0be98944 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -291,9 +291,9 @@
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf

 !endif

   TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

-  TrEEPhysicalPresenceLib|SecurityPkg/Library/DxeTrEEPhysicalPresenceLib/DxeTrEEPhysicalPresenceLib.inf

+  Tcg2PhysicalPresenceLib|SecurityPkg/Library/DxeTcg2PhysicalPresenceLib/DxeTcg2PhysicalPresenceLib.inf

 !if $(FTPM_ENABLE) == TRUE

-  TrEEPpVendorLib|SecurityPkg/Library/TrEEPpVendorLibNull/TrEEPpVendorLibNull.inf

+  Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

 !endif

 

 

@@ -1070,7 +1070,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
  MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

 

 !if $(FTPM_ENABLE) == TRUE

-   SecurityPkg/Tcg/TrEEPei/TrEEPei.inf {

+   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

     <PcdsPatchableInModule>

       gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000046

     <LibraryClasses>

@@ -1081,7 +1081,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   }

 !endif

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   }

@@ -1201,7 +1201,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
     !if $(FTPM_ENABLE) == TRUE

       Tpm2DeviceLib|Vlv2TbltDevicePkg/Library/Tpm2DeviceLibSeCDxe/Tpm2DeviceLibSeC.inf

     !else

-      TrEEPhysicalPresenceLib|$(PLATFORM_PACKAGE)/Library/DxeTrEEPhysicalPresenceLibNull/DxeTrEEPhysicalPresenceLibNull.inf

+      Tcg2PhysicalPresenceLib|$(PLATFORM_PACKAGE)/Library/DxeTcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLibNull.inf

     !endif

   }

 

@@ -1321,7 +1321,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
 !if $(FTPM_ENABLE) == TRUE

   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/Tpm2DeviceSeCDxe.inf

   SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf

-  SecurityPkg/Tcg/TrEEDxe/TrEEDxe.inf{

+  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf{

     <LibraryClasses>

       NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

       NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

@@ -1331,7 +1331,7 @@ $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fTPMInitPeim.inf
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/FtpmSmm.inf

 !endif

 !if $(TPM_ENABLED) == TRUE

-  SecurityPkg/Tcg/TrEEConfig/TrEEConfigPei.inf {

+  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   }