OvmfPkg: include TcgDxe module

Mirrors TPM 2.0 commit 0c0a50d6b3ff ("OvmfPkg: include Tcg2Dxe
module", 2018-03-09).

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

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index e168642b40af1cbe7d04175661f04ac991ae3f75..3f1a0a9598a47eae4a08ed023ccd1cee48543b30 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -364,6 +364,7 @@
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf\r
 !if $(TPM_ENABLE) == TRUE\r
+  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf\r
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf\r
 !endif\r
 \r
@@ -935,6 +936,10 @@
 !if $(TPM_CONFIG_ENABLE) == TRUE\r
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
 !endif\r
+  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {\r
+    <LibraryClasses>\r
+      Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf\r
+  }\r
 !endif\r
 \r
 !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE\r

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 65ff6c723d9e98dcca5ea354ff8fbac071641348..2e12807282becf204e98c2d4de87c1d63f0eec80 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -349,6 +349,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 # TPM support\r
 #\r
 !if $(TPM_ENABLE) == TRUE\r
+INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
 !if $(TPM_CONFIG_ENABLE) == TRUE\r
 INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index 5f34b655a7c509a4a255cfa3236b38f0744db1dc..c2c0c2af27256b0ea23f5af18eea66b290e2e812 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -368,6 +368,7 @@
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf\r
 !if $(TPM_ENABLE) == TRUE\r
+  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf\r
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf\r
 !endif\r
 \r
@@ -948,4 +949,8 @@
 !if $(TPM_CONFIG_ENABLE) == TRUE\r
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
 !endif\r
+  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {\r
+    <LibraryClasses>\r
+      Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf\r
+  }\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index f5cfc2cc347f854b8dd18a61ae835546b604729c..d67d3368764272438b066c650f2d8f1ce17e35cb 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -356,6 +356,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 # TPM support\r
 #\r
 !if $(TPM_ENABLE) == TRUE\r
+INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
 !if $(TPM_CONFIG_ENABLE) == TRUE\r
 INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 3a41ad95f5227acacf344013ffb8f9968dbab1d9..a1faf537f4073f16b1faeaabeee4bcec251619fa 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -368,6 +368,7 @@
   MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf\r
 !if $(TPM_ENABLE) == TRUE\r
+  Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf\r
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf\r
 !endif\r
 \r
@@ -946,4 +947,8 @@
 !if $(TPM_CONFIG_ENABLE) == TRUE\r
   SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
 !endif\r
+  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {\r
+    <LibraryClasses>\r
+      Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf\r
+  }\r
 !endif\r

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index f5cfc2cc347f854b8dd18a61ae835546b604729c..d67d3368764272438b066c650f2d8f1ce17e35cb 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -356,6 +356,7 @@ INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
 # TPM support\r
 #\r
 !if $(TPM_ENABLE) == TRUE\r
+INF  SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
 INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
 !if $(TPM_CONFIG_ENABLE) == TRUE\r
 INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r