On 06/12/21 22:43, Rebecca Cran wrote: > TPM support hasn't been tested and any lines in the .dsc and .fdf files > that appear to show support are bogus. Remove them. > > This fixes https://bugzilla.tianocore.org/show_bug.cgi?id=3354 . > > Signed-off-by: Rebecca Cran <rebe...@bsdio.com> > --- > OvmfPkg/Bhyve/BhyveX64.dsc | 64 -------------------- > OvmfPkg/Bhyve/BhyveX64.fdf | 15 ----- > 2 files changed, 79 deletions(-) > > diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc > index d8792812ab..cbf896e89b 100644 > --- a/OvmfPkg/Bhyve/BhyveX64.dsc > +++ b/OvmfPkg/Bhyve/BhyveX64.dsc > @@ -31,8 +31,6 @@ > DEFINE SECURE_BOOT_ENABLE = FALSE > DEFINE SMM_REQUIRE = FALSE > DEFINE SOURCE_DEBUG_ENABLE = FALSE > - DEFINE TPM_ENABLE = FALSE > - DEFINE TPM_CONFIG_ENABLE = FALSE > > # > # Network definition > @@ -221,16 +219,8 @@ > > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf > XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf > > - > -!if $(TPM_ENABLE) == TRUE > - 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 > > [LibraryClasses.common] > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > @@ -292,11 +282,6 @@ > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > > -!if $(TPM_ENABLE) == TRUE > - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf > - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf > -!endif > - > > MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf > > [LibraryClasses.common.DXE_CORE] > @@ -366,9 +351,6 @@ > !endif > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > MpInitLib|UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf > -!if $(TPM_ENABLE) == TRUE > - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf > -!endif > > [LibraryClasses.common.UEFI_APPLICATION] > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > @@ -563,22 +545,12 @@ > > 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 > - > # MdeModulePkg resolution sets up the system display resolution > gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0 > gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0 > gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0 > gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|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 > - > > ################################################################################ > # > # Components Section - list of all EDK II Modules needed by this Platform. > @@ -618,19 +590,6 @@ > <LibraryClasses> > } > > -!if $(TPM_ENABLE) == TRUE > - OvmfPkg/Bhyve/Tcg/Tcg2Config/Tcg2ConfigPei.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 > - } > -!endif > - > # > # DXE Phase modules > # > @@ -653,9 +612,6 @@ > <LibraryClasses> > !if $(SECURE_BOOT_ENABLE) == TRUE > > NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf > -!endif > -!if $(TPM_ENABLE) == TRUE > - > NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf > !endif > } > > @@ -841,23 +797,3 @@ > NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf > } > > - > - # > - # 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 > -!endif > diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf > index 3eff36dac1..fbd63a395a 100644 > --- a/OvmfPkg/Bhyve/BhyveX64.fdf > +++ b/OvmfPkg/Bhyve/BhyveX64.fdf > @@ -158,11 +158,6 @@ INF > UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf > INF OvmfPkg/Bhyve/SmmAccess/SmmAccessPei.inf > !endif > > -!if $(TPM_ENABLE) == TRUE > -INF OvmfPkg/Bhyve/Tcg/Tcg2Config/Tcg2ConfigPei.inf > -INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf > -!endif > - > > ################################################################################ > > [FV.DXEFV] > @@ -333,16 +328,6 @@ INF > MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf > INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > !endif > > -# > -# TPM support > -# > -!if $(TPM_ENABLE) == TRUE > -INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf > -!if $(TPM_CONFIG_ENABLE) == TRUE > -INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf > -!endif > -!endif > - > > ################################################################################ > > [FV.FVMAIN_COMPACT] >
Reviewed-by: Laszlo Ersek <ler...@redhat.com> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#77047): https://edk2.groups.io/g/devel/message/77047 Mute This Topic: https://groups.io/mt/83497624/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
