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>

19 files changed, 185 insertions, 359 deletions

diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index 59bd17f..04ae61c 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 b25035c..14b5b55 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

 

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

 

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index f8873d5..085cc7e 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -32,10 +32,10 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE

   DEFINE SMM_REQUIRE             = FALSE

   DEFINE SOURCE_DEBUG_ENABLE     = FALSE

-  DEFINE TPM_ENABLE              = FALSE

-  DEFINE TPM_CONFIG_ENABLE       = FALSE

   DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE

 

+!include OvmfPkg/OvmfTpmDefines.dsc.inc

+

   #

   # Network definition

   #

@@ -229,16 +229,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

@@ -310,11 +301,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

 

@@ -402,10 +389,8 @@
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf

   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf

   QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.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

@@ -645,9 +630,7 @@
 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

 

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

 

   # IPv4 and IPv6 PXE Boot support.

   gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01

@@ -657,10 +640,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0

 

 [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

 

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

 #

@@ -710,24 +690,7 @@
 !endif

   UefiCpuPkg/CpuMpPei/CpuMpPei.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

@@ -752,10 +715,7 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

 !endif

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

@@ -1024,31 +984,5 @@
   #

   # 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

 

-!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE

-  OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf

-!endif

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index cc73180..a6b2142 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -161,13 +161,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif

 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.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

 

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

 

@@ -360,14 +354,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

 

 !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE

 INF  OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 9b72575..0ce122d 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -32,8 +32,8 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE

   DEFINE SMM_REQUIRE             = FALSE

   DEFINE SOURCE_DEBUG_ENABLE     = FALSE

-  DEFINE TPM_ENABLE              = FALSE

-  DEFINE TPM_CONFIG_ENABLE       = FALSE

+

+!include OvmfPkg/OvmfTpmDefines.dsc.inc

 

   #

   # Network definition

@@ -233,16 +233,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

@@ -314,11 +305,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

 

@@ -406,10 +393,8 @@
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf

   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf

   QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.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

@@ -657,9 +642,7 @@
 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

 

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

 

   # Set ConfidentialComputing defaults

   gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0

@@ -670,10 +653,7 @@
   gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01

 

 [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

 

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

 #

@@ -723,24 +703,7 @@
 !endif

   UefiCpuPkg/CpuMpPei/CpuMpPei.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

 

 [Components.X64]

   #

@@ -766,10 +729,7 @@
 !if $(SECURE_BOOT_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

 !endif

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

@@ -1042,27 +1002,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/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index ad4b159..49266dd 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -164,13 +164,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif

 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.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

 

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

 

@@ -370,14 +364,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

 

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

 

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 190cb7f..4589adf 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -32,8 +32,8 @@
   DEFINE SECURE_BOOT_ENABLE      = FALSE

   DEFINE SMM_REQUIRE             = FALSE

   DEFINE SOURCE_DEBUG_ENABLE     = FALSE

-  DEFINE TPM_ENABLE              = FALSE

-  DEFINE TPM_CONFIG_ENABLE       = FALSE

+

+!include OvmfPkg/OvmfTpmDefines.dsc.inc

 

   #

   # Network definition

@@ -233,16 +233,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

@@ -315,11 +306,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

 

@@ -407,10 +394,8 @@
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf

   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf

   QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.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

@@ -656,9 +641,7 @@
 

   gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00

 

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

 

   # IPv4 and IPv6 PXE Boot support.

   gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01

@@ -668,10 +651,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0

 

 [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

 

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

 #

@@ -721,24 +701,7 @@
 !endif

   UefiCpuPkg/CpuMpPei/CpuMpPei.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

@@ -762,10 +725,7 @@
     <LibraryClasses>

 !if $(SECURE_BOOT_ENABLE) == TRUE

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf

-!endif

-!if $(TPM_ENABLE) == TRUE

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

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

+!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc

 !endif

   }

 

@@ -1039,27 +999,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/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 1420ae8..ba7f26d 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -186,13 +186,7 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !endif

 INF  UefiCpuPkg/CpuMpPei/CpuMpPei.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

 

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

 

@@ -392,14 +386,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

 

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

 

diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
new file mode 100644
index 0000000..d5c2586
--- /dev/null
+++ b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
@@ -0,0 +1,28 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

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

diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
new file mode 100644
index 0000000..99fa7c1
--- /dev/null
+++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
@@ -0,0 +1,22 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

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

diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/OvmfTpmDefines.dsc.inc
new file mode 100644
index 0000000..51da750
--- /dev/null
+++ b/OvmfPkg/OvmfTpmDefines.dsc.inc
@@ -0,0 +1,6 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

+  DEFINE TPM_ENABLE              = FALSE

+  DEFINE TPM_CONFIG_ENABLE       = FALSE

diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/OvmfTpmDxe.fdf.inc
new file mode 100644
index 0000000..9dcdaaf
--- /dev/null
+++ b/OvmfPkg/OvmfTpmDxe.fdf.inc
@@ -0,0 +1,12 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

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

diff --git a/OvmfPkg/OvmfTpmLibs.dsc.inc b/OvmfPkg/OvmfTpmLibs.dsc.inc
new file mode 100644
index 0000000..50100f2
--- /dev/null
+++ b/OvmfPkg/OvmfTpmLibs.dsc.inc
@@ -0,0 +1,14 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

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

diff --git a/OvmfPkg/OvmfTpmLibsDxe.dsc.inc b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc
new file mode 100644
index 0000000..67d5027
--- /dev/null
+++ b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc
@@ -0,0 +1,8 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

+!if $(TPM_ENABLE) == TRUE

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

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

+!endif

diff --git a/OvmfPkg/OvmfTpmLibsPeim.dsc.inc b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc
new file mode 100644
index 0000000..4e84e3d
--- /dev/null
+++ b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc
@@ -0,0 +1,9 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

+!if $(TPM_ENABLE) == TRUE

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

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

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

+!endif

diff --git a/OvmfPkg/OvmfTpmPcds.dsc.inc b/OvmfPkg/OvmfTpmPcds.dsc.inc
new file mode 100644
index 0000000..0e7f83c
--- /dev/null
+++ b/OvmfPkg/OvmfTpmPcds.dsc.inc
@@ -0,0 +1,7 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

+!if $(TPM_ENABLE) == TRUE

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

+!endif

diff --git a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc
new file mode 100644
index 0000000..164bc9c
--- /dev/null
+++ b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc
@@ -0,0 +1,8 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

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

diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc
new file mode 100644
index 0000000..9aefd73
--- /dev/null
+++ b/OvmfPkg/OvmfTpmPei.fdf.inc
@@ -0,0 +1,11 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

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

diff --git a/OvmfPkg/OvmfTpmSecurityStub.dsc.inc b/OvmfPkg/OvmfTpmSecurityStub.dsc.inc
new file mode 100644
index 0000000..4bd4066
--- /dev/null
+++ b/OvmfPkg/OvmfTpmSecurityStub.dsc.inc
@@ -0,0 +1,8 @@
+##

+#    SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

+!if $(TPM_ENABLE) == TRUE

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

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

+!endif