OvmfPkg: move tcg configuration to dsc and fdf include files

With this in place the tpm configuration is not duplicated for each of
our four ovmf config variants (ia32, ia32x64, x64, amdsev) and it is
easier to keep them all in sync when updating the tpm configuration.

No functional change.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>

2 files changed, 13 insertions, 89 deletions

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index 59bd17f31b..04ae61cf69 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -32,8 +32,8 @@
   # -D FLAG=VALUE

   #

   DEFINE SOURCE_DEBUG_ENABLE     = FALSE

-  DEFINE TPM_ENABLE              = FALSE

-  DEFINE TPM_CONFIG_ENABLE       = FALSE

+

+!include OvmfPkg/OvmfTpmDefines.dsc.inc

 

   #

   # Shell can be useful for debugging but should not be enabled for production

@@ -203,16 +203,7 @@
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf

   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf

 

-!if $(TPM_ENABLE) == TRUE

-  Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf

-  Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf

-  Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf

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

-  TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf

-!else

-  Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf

-  TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

-!endif

+!include OvmfPkg/OvmfTpmLibs.dsc.inc

 

 [LibraryClasses.common]

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf

@@ -286,11 +277,7 @@
   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

   QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf

 

-!if $(TPM_ENABLE) == TRUE

-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf

-  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf

-  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf

-!endif

+!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc

 

   MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf

 

@@ -371,10 +358,8 @@
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf

   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf

   QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf

-!if $(TPM_ENABLE) == TRUE

-  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf

-  Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf

-!endif

+

+!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc

 

 [LibraryClasses.common.UEFI_APPLICATION]

   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

@@ -580,15 +565,10 @@
   # Set ConfidentialComputing defaults

   gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0

 

-!if $(TPM_ENABLE) == TRUE

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

-!endif

+!include OvmfPkg/OvmfTpmPcds.dsc.inc

 

 [PcdsDynamicHii]

-!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

+!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc

 

 ################################################################################

 #

@@ -629,24 +609,7 @@
   UefiCpuPkg/CpuMpPei/CpuMpPei.inf

   OvmfPkg/AmdSev/SecretPei/SecretPei.inf

 

-!if $(TPM_ENABLE) == TRUE

-  OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf

-  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

-  SecurityPkg/Tcg/TcgPei/TcgPei.inf

-  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

-    <LibraryClasses>

-      HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf

-  }

-  SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf {

-    <LibraryClasses>

-      TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf

-  }

-!endif

+!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc

 

   #

   # DXE Phase modules

@@ -668,10 +631,7 @@
 

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {

     <LibraryClasses>

-!if $(TPM_ENABLE) == TRUE

-      NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf

-      NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf

-!endif

+!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc

   }

 

   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

@@ -843,27 +803,4 @@
   #

   # TPM support

   #

-!if $(TPM_ENABLE) == TRUE

-  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {

-    <LibraryClasses>

-      Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf

-      NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf

-      HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf

-      NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf

-  }

-!if $(TPM_CONFIG_ENABLE) == TRUE

-  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

-!endif

-  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {

-    <LibraryClasses>

-      Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf

-  }

-  SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf {

-    <LibraryClasses>

-      TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf

-  }

-!endif

+!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc

diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
index b25035c164..14b5b5593f 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -156,13 +156,7 @@ INF  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf

 INF  OvmfPkg/AmdSev/SecretPei/SecretPei.inf

 

-!if $(TPM_ENABLE) == TRUE

-INF  OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf

-INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

-INF  SecurityPkg/Tcg/TcgPei/TcgPei.inf

-INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf

-INF  SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf

-!endif

+!include OvmfPkg/OvmfTpmPei.fdf.inc

 

 ################################################################################

 

@@ -317,14 +311,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 #

 # TPM support

 #

-!if $(TPM_ENABLE) == TRUE

-INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf

-INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf

-INF  SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf

-!if $(TPM_CONFIG_ENABLE) == TRUE

-INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf

-!endif

-!endif

+!include OvmfPkg/OvmfTpmDxe.fdf.inc

 

 ################################################################################