OvmfPkg: create Tcg12ConfigPei.inf

Split Tcg2ConfigPei.inf into two variants: Tcg12ConfigPei.inf with
TPM 1.2 support included and Tcg2ConfigPei.inf supporting TPM 2.0 only.
This allows x86 builds to choose whenever TPM 1.2 support should be
included or not by picking the one or the other inf file.

Switch x86 builds to Tcg12ConfigPei.inf, so they continue to
have TPM 1.2 support.

No functional change.

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

4 files changed, 59 insertions, 12 deletions

diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
index 99fa7c13b3..87d491da50 100644
--- a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
+++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc
@@ -4,7 +4,7 @@
 

 !if $(TPM_ENABLE) == TRUE

   OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf

-  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

+  OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf

   SecurityPkg/Tcg/TcgPei/TcgPei.inf

   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

     <LibraryClasses>

diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc
index 9aefd73d21..709a608cc3 100644
--- a/OvmfPkg/OvmfTpmPei.fdf.inc
+++ b/OvmfPkg/OvmfTpmPei.fdf.inc
@@ -4,7 +4,7 @@
 

 !if $(TPM_ENABLE) == TRUE

 INF  OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf

-INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

+INF  OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf

 INF  SecurityPkg/Tcg/TcgPei/TcgPei.inf

 INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf

 INF  SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
new file mode 100644
index 0000000000..e8e0b88e60
--- /dev/null
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
@@ -0,0 +1,56 @@
+## @file

+# Set TPM device type - supports TPM 1.2 and 2.0

+#

+# In SecurityPkg, this module initializes the TPM device type based on a UEFI

+# variable and/or hardware detection. In OvmfPkg, the module only performs TPM

+# hardware detection.

+#

+# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>

+# Copyright (C) 2018, Red Hat, Inc.

+#

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

+##

+

+[Defines]

+  INF_VERSION                    = 0x00010005

+  BASE_NAME                      = Tcg2ConfigPei

+  FILE_GUID                      = 8AD3148F-945F-46B4-8ACD-71469EA73945

+  MODULE_TYPE                    = PEIM

+  VERSION_STRING                 = 1.0

+  ENTRY_POINT                    = Tcg2ConfigPeimEntryPoint

+

+[Sources]

+  Tcg2ConfigPeim.c

+  Tpm12Support.h

+  Tpm12Support.c

+

+[Packages]

+  MdePkg/MdePkg.dec

+  MdeModulePkg/MdeModulePkg.dec

+  OvmfPkg/OvmfPkg.dec

+  SecurityPkg/SecurityPkg.dec

+

+[LibraryClasses]

+  PeimEntryPoint

+  DebugLib

+  PeiServicesLib

+  Tpm2DeviceLib

+  BaseLib

+  Tpm12DeviceLib

+

+[Guids]

+  gEfiTpmDeviceSelectedGuid           ## PRODUCES ## GUID # Used as a PPI GUID

+  gEfiTpmDeviceInstanceTpm20DtpmGuid  ## SOMETIMES_CONSUMES

+  gEfiTpmDeviceInstanceTpm12Guid      ## SOMETIMES_CONSUMES

+

+[Ppis]

+  gPeiTpmInitializationDonePpiGuid    ## SOMETIMES_PRODUCES

+

+[Pcd]

+  gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid                 ## PRODUCES

+

+[Depex.IA32, Depex.X64]

+  gOvmfTpmMmioAccessiblePpiGuid

+

+[Depex.ARM, Depex.AARCH64]

+  gOvmfTpmDiscoveredPpiGuid

diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index 39d1deeed1..51078c9813 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
@@ -1,5 +1,5 @@
 ## @file

-# Set TPM device type

+# Set TPM device type - supports TPM 2.0 only

 #

 # In SecurityPkg, this module initializes the TPM device type based on a UEFI

 # variable and/or hardware detection. In OvmfPkg, the module only performs TPM

@@ -22,11 +22,6 @@
 [Sources]

   Tcg2ConfigPeim.c

   Tpm12Support.h

-

-[Sources.IA32, Sources.X64]

-  Tpm12Support.c

-

-[Sources.ARM, Sources.AARCH64]

   Tpm12SupportNull.c

 

 [Packages]

@@ -41,10 +36,6 @@
   PeiServicesLib

   Tpm2DeviceLib

 

-[LibraryClasses.IA32, LibraryClasses.X64]

-  BaseLib

-  Tpm12DeviceLib

-

 [Guids]

   gEfiTpmDeviceSelectedGuid           ## PRODUCES ## GUID # Used as a PPI GUID

   gEfiTpmDeviceInstanceTpm20DtpmGuid  ## SOMETIMES_CONSUMES