Skip to content

Commit b475758

Browse files
kraxelmergify[bot]
kraxel
authored and
mergify[bot]
committed
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>
1 parent 3a72ec7 commit b475758

19 files changed

+185
-359
lines changed

‎OvmfPkg/AmdSev/AmdSevX64.dsc

Lines changed: 11 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
# -D FLAG=VALUE
3333
#
3434
DEFINE SOURCE_DEBUG_ENABLE = FALSE
35-
DEFINE TPM_ENABLE = FALSE
36-
DEFINE TPM_CONFIG_ENABLE = FALSE
35+
36+
!include OvmfPkg/OvmfTpmDefines.dsc.inc
3737

3838
#
3939
# Shell can be useful for debugging but should not be enabled for production
@@ -203,16 +203,7 @@
203203
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
204204
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
205205

206-
!if $(TPM_ENABLE) == TRUE
207-
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
208-
Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
209-
Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf
210-
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
211-
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
212-
!else
213-
Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf
214-
TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
215-
!endif
206+
!include OvmfPkg/OvmfTpmLibs.dsc.inc
216207

217208
[LibraryClasses.common]
218209
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -286,11 +277,7 @@
286277
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
287278
QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
288279

289-
!if $(TPM_ENABLE) == TRUE
290-
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
291-
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
292-
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
293-
!endif
280+
!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc
294281

295282
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf
296283

@@ -371,10 +358,8 @@
371358
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
372359
QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
373360
QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
374-
!if $(TPM_ENABLE) == TRUE
375-
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
376-
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
377-
!endif
361+
362+
!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc
378363

379364
[LibraryClasses.common.UEFI_APPLICATION]
380365
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -580,15 +565,10 @@
580565
# Set ConfidentialComputing defaults
581566
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0
582567

583-
!if $(TPM_ENABLE) == TRUE
584-
gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
585-
!endif
568+
!include OvmfPkg/OvmfTpmPcds.dsc.inc
586569

587570
[PcdsDynamicHii]
588-
!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE
589-
gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS
590-
gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS
591-
!endif
571+
!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc
592572

593573
################################################################################
594574
#
@@ -629,24 +609,7 @@
629609
UefiCpuPkg/CpuMpPei/CpuMpPei.inf
630610
OvmfPkg/AmdSev/SecretPei/SecretPei.inf
631611

632-
!if $(TPM_ENABLE) == TRUE
633-
OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf
634-
OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
635-
SecurityPkg/Tcg/TcgPei/TcgPei.inf
636-
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {
637-
<LibraryClasses>
638-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
639-
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
640-
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
641-
NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
642-
NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
643-
NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
644-
}
645-
SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf {
646-
<LibraryClasses>
647-
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf
648-
}
649-
!endif
612+
!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
650613

651614
#
652615
# DXE Phase modules
@@ -668,10 +631,7 @@
668631

669632
MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {
670633
<LibraryClasses>
671-
!if $(TPM_ENABLE) == TRUE
672-
NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
673-
NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
674-
!endif
634+
!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc
675635
}
676636

677637
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -843,27 +803,4 @@
843803
#
844804
# TPM support
845805
#
846-
!if $(TPM_ENABLE) == TRUE
847-
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {
848-
<LibraryClasses>
849-
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
850-
NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
851-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
852-
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
853-
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
854-
NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
855-
NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
856-
NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
857-
}
858-
!if $(TPM_CONFIG_ENABLE) == TRUE
859-
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
860-
!endif
861-
SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
862-
<LibraryClasses>
863-
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
864-
}
865-
SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf {
866-
<LibraryClasses>
867-
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf
868-
}
869-
!endif
806+
!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc

‎OvmfPkg/AmdSev/AmdSevX64.fdf

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,7 @@ INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
156156
INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
157157
INF OvmfPkg/AmdSev/SecretPei/SecretPei.inf
158158

159-
!if $(TPM_ENABLE) == TRUE
160-
INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf
161-
INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
162-
INF SecurityPkg/Tcg/TcgPei/TcgPei.inf
163-
INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
164-
INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
165-
!endif
159+
!include OvmfPkg/OvmfTpmPei.fdf.inc
166160

167161
################################################################################
168162

@@ -317,14 +311,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
317311
#
318312
# TPM support
319313
#
320-
!if $(TPM_ENABLE) == TRUE
321-
INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
322-
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
323-
INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
324-
!if $(TPM_CONFIG_ENABLE) == TRUE
325-
INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
326-
!endif
327-
!endif
314+
!include OvmfPkg/OvmfTpmDxe.fdf.inc
328315

329316
################################################################################
330317

‎OvmfPkg/OvmfPkgIa32.dsc

Lines changed: 11 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
DEFINE SECURE_BOOT_ENABLE = FALSE
3333
DEFINE SMM_REQUIRE = FALSE
3434
DEFINE SOURCE_DEBUG_ENABLE = FALSE
35-
DEFINE TPM_ENABLE = FALSE
36-
DEFINE TPM_CONFIG_ENABLE = FALSE
3735
DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE
3836

37+
!include OvmfPkg/OvmfTpmDefines.dsc.inc
38+
3939
#
4040
# Network definition
4141
#
@@ -229,16 +229,7 @@
229229
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
230230
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
231231

232-
!if $(TPM_ENABLE) == TRUE
233-
Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
234-
Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
235-
Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf
236-
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
237-
TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
238-
!else
239-
Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf
240-
TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
241-
!endif
232+
!include OvmfPkg/OvmfTpmLibs.dsc.inc
242233

243234
[LibraryClasses.common]
244235
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -310,11 +301,7 @@
310301
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
311302
QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
312303

313-
!if $(TPM_ENABLE) == TRUE
314-
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
315-
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
316-
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
317-
!endif
304+
!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc
318305

319306
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf
320307

@@ -402,10 +389,8 @@
402389
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
403390
QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
404391
QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf
405-
!if $(TPM_ENABLE) == TRUE
406-
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
407-
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
408-
!endif
392+
393+
!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc
409394

410395
[LibraryClasses.common.UEFI_APPLICATION]
411396
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -645,9 +630,7 @@
645630

646631
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
647632

648-
!if $(TPM_ENABLE) == TRUE
649-
gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
650-
!endif
633+
!include OvmfPkg/OvmfTpmPcds.dsc.inc
651634

652635
# IPv4 and IPv6 PXE Boot support.
653636
gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01
@@ -657,10 +640,7 @@
657640
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0
658641

659642
[PcdsDynamicHii]
660-
!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE
661-
gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS
662-
gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS
663-
!endif
643+
!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc
664644

665645
################################################################################
666646
#
@@ -710,24 +690,7 @@
710690
!endif
711691
UefiCpuPkg/CpuMpPei/CpuMpPei.inf
712692

713-
!if $(TPM_ENABLE) == TRUE
714-
OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf
715-
OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
716-
SecurityPkg/Tcg/TcgPei/TcgPei.inf
717-
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {
718-
<LibraryClasses>
719-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
720-
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
721-
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
722-
NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
723-
NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
724-
NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
725-
}
726-
SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf {
727-
<LibraryClasses>
728-
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf
729-
}
730-
!endif
693+
!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc
731694

732695
#
733696
# DXE Phase modules
@@ -752,10 +715,7 @@
752715
!if $(SECURE_BOOT_ENABLE) == TRUE
753716
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
754717
!endif
755-
!if $(TPM_ENABLE) == TRUE
756-
NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
757-
NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf
758-
!endif
718+
!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc
759719
}
760720

761721
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -1024,31 +984,5 @@
1024984
#
1025985
# TPM support
1026986
#
1027-
!if $(TPM_ENABLE) == TRUE
1028-
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {
1029-
<LibraryClasses>
1030-
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf
1031-
NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
1032-
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf
1033-
NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf
1034-
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
1035-
NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
1036-
NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf
1037-
NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
1038-
}
1039-
!if $(TPM_CONFIG_ENABLE) == TRUE
1040-
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
1041-
!endif
1042-
SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
1043-
<LibraryClasses>
1044-
Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
1045-
}
1046-
SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf {
1047-
<LibraryClasses>
1048-
TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf
1049-
}
1050-
!endif
987+
!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
1051988

1052-
!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE
1053-
OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf
1054-
!endif

‎OvmfPkg/OvmfPkgIa32.fdf

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,7 @@ INF OvmfPkg/SmmAccess/SmmAccessPei.inf
161161
!endif
162162
INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf
163163

164-
!if $(TPM_ENABLE) == TRUE
165-
INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf
166-
INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
167-
INF SecurityPkg/Tcg/TcgPei/TcgPei.inf
168-
INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
169-
INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
170-
!endif
164+
!include OvmfPkg/OvmfTpmPei.fdf.inc
171165

172166
################################################################################
173167

@@ -360,14 +354,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
360354
#
361355
# TPM support
362356
#
363-
!if $(TPM_ENABLE) == TRUE
364-
INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
365-
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
366-
INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
367-
!if $(TPM_CONFIG_ENABLE) == TRUE
368-
INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
369-
!endif
370-
!endif
357+
!include OvmfPkg/OvmfTpmDxe.fdf.inc
371358

372359
!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE
373360
INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf

0 commit comments

Comments
 (0)