OvmfPkg: rename TPM2 config prefix to TPM

A following patch is going to use the same configuration for TPM1.2
and TPM2.0, and it's simpler to support both than variable
configurations.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200226152433.1295789-2-marcandre.lureau@redhat.com>
Tested-by: Simon Hardy <simon.hardy@itdev.co.uk>

6 files changed, 48 insertions, 48 deletions

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 8d91903f8b..71a157aad3 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -31,8 +31,8 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE

   DEFINE SMM_REQUIRE             = FALSE

   DEFINE SOURCE_DEBUG_ENABLE     = FALSE

-  DEFINE TPM2_ENABLE             = FALSE

-  DEFINE TPM2_CONFIG_ENABLE      = FALSE

+  DEFINE TPM_ENABLE              = FALSE

+  DEFINE TPM_CONFIG_ENABLE       = FALSE

   DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE

 

   #

@@ -206,7 +206,7 @@
   XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf

   XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf

   Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

@@ -280,7 +280,7 @@
   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf

 !endif

@@ -361,7 +361,7 @@
   PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf

   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

 !endif

 

@@ -576,12 +576,12 @@
 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}

 !endif

 

 [PcdsDynamicHii]

-!if $(TPM2_ENABLE) == TRUE && $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE

   gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS

   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS

 !endif

@@ -632,7 +632,7 @@
 !endif

   UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

     <LibraryClasses>

@@ -668,7 +668,7 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

 !endif

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf

 !endif

   }

@@ -915,9 +915,9 @@
 !endif

 

   #

-  # TPM2 support

+  # TPM support

   #

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {

     <LibraryClasses>

       Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf

@@ -929,7 +929,7 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf

       NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf

   }

-!if $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_CONFIG_ENABLE) == TRUE

   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

 !endif

 !endif

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index f57de4a26f..3e1fdcd1cf 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -159,7 +159,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif

 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

 INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf

 !endif

@@ -345,11 +345,11 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 !endif

 

 #

-# TPM2 support

+# TPM support

 #

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf

-!if $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_CONFIG_ENABLE) == TRUE

 INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

 !endif

 !endif

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 842b4a0289..cb8a15ee61 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -31,8 +31,8 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE

   DEFINE SMM_REQUIRE             = FALSE

   DEFINE SOURCE_DEBUG_ENABLE     = FALSE

-  DEFINE TPM2_ENABLE             = FALSE

-  DEFINE TPM2_CONFIG_ENABLE      = FALSE

+  DEFINE TPM_ENABLE              = FALSE

+  DEFINE TPM_CONFIG_ENABLE       = FALSE

 

   #

   # Network definition

@@ -210,7 +210,7 @@
   XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf

   XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf

   Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

@@ -284,7 +284,7 @@
   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf

 !endif

@@ -365,7 +365,7 @@
   PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf

   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

 !endif

 

@@ -587,12 +587,12 @@
 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}

 !endif

 

 [PcdsDynamicHii]

-!if $(TPM2_ENABLE) == TRUE && $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE

   gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS

   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS

 !endif

@@ -643,7 +643,7 @@
 !endif

   UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

     <LibraryClasses>

@@ -680,7 +680,7 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

 !endif

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf

 !endif

   }

@@ -928,9 +928,9 @@
 !endif

 

   #

-  # TPM2 support

+  # TPM support

   #

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {

     <LibraryClasses>

       Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf

@@ -942,7 +942,7 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf

       NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf

   }

-!if $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_CONFIG_ENABLE) == TRUE

   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

 !endif

 !endif

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index 69c133ec08..f2d4f9f171 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -159,7 +159,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif

 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

 INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf

 !endif

@@ -352,11 +352,11 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 !endif

 

 #

-# TPM2 support

+# TPM support

 #

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf

-!if $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_CONFIG_ENABLE) == TRUE

 INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

 !endif

 !endif

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 0b1e45d1f1..bdfd30d535 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -31,8 +31,8 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE

   DEFINE SMM_REQUIRE             = FALSE

   DEFINE SOURCE_DEBUG_ENABLE     = FALSE

-  DEFINE TPM2_ENABLE             = FALSE

-  DEFINE TPM2_CONFIG_ENABLE      = FALSE

+  DEFINE TPM_ENABLE              = FALSE

+  DEFINE TPM_CONFIG_ENABLE       = FALSE

 

   #

   # Network definition

@@ -210,7 +210,7 @@
   XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf

   XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

   Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf

   Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf

@@ -284,7 +284,7 @@
   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf

 !endif

@@ -365,7 +365,7 @@
   PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf

   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf

   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

 !endif

 

@@ -586,12 +586,12 @@
 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}

 !endif

 

 [PcdsDynamicHii]

-!if $(TPM2_ENABLE) == TRUE && $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE

   gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS

   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS

 !endif

@@ -642,7 +642,7 @@
 !endif

   UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

     <LibraryClasses>

@@ -678,7 +678,7 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

 !endif

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf

 !endif

   }

@@ -926,9 +926,9 @@
 !endif

 

   #

-  # TPM2 support

+  # TPM support

   #

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

   SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {

     <LibraryClasses>

       Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf

@@ -940,7 +940,7 @@
       NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf

       NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf

   }

-!if $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_CONFIG_ENABLE) == TRUE

   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

 !endif

 !endif

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 69c133ec08..f2d4f9f171 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -159,7 +159,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif

 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

 INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

 INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf

 !endif

@@ -352,11 +352,11 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 !endif

 

 #

-# TPM2 support

+# TPM support

 #

-!if $(TPM2_ENABLE) == TRUE

+!if $(TPM_ENABLE) == TRUE

 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf

-!if $(TPM2_CONFIG_ENABLE) == TRUE

+!if $(TPM_CONFIG_ENABLE) == TRUE

 INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

 !endif

 !endif