On 1/16/24 16:42, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
> ---
> OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc | 6 ------
> OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc | 5 -----
> OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc | 3 ---
> OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc | 9 ---------
> OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc | 6 ------
> OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc | 3 ---
> OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc | 5 -----
> OvmfPkg/PlatformCI/ReadMe.md | 2 +-
> 8 files changed, 1 insertion(+), 38 deletions(-)
>
> diff --git a/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
> b/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
> index 75ae09571e8c..eef20b77149a 100644
> --- a/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
> +++ b/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
> @@ -15,12 +15,6 @@
> NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf
> }
> SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
> -!if $(TPM1_ENABLE) == TRUE
> - SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {
> - <LibraryClasses>
> -
> Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
> - }
> -!endif
> SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf {
> <LibraryClasses>
>
> TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf
> diff --git a/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
> b/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
> index fa486eed82d2..b91f29e5a64b 100644
> --- a/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
> +++ b/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
> @@ -4,12 +4,7 @@
>
> !if $(TPM2_ENABLE) == TRUE
> OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf
> -!if $(TPM1_ENABLE) == TRUE
> - OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
> - SecurityPkg/Tcg/TcgPei/TcgPei.inf
> -!else
> OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
> -!endif
> SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {
> <LibraryClasses>
>
> HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf
> diff --git a/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
> b/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
> index a65564d8d9d2..ad3740a4737a 100644
> --- a/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
> +++ b/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
> @@ -3,6 +3,3 @@
> ##
>
> DEFINE TPM2_ENABLE = FALSE
> -
> - # has no effect unless TPM2_ENABLE == TRUE
> - DEFINE TPM1_ENABLE = TRUE
> diff --git a/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
> b/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
> index b97244695b52..e02a5d02d1a5 100644
> --- a/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
> +++ b/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
> @@ -4,9 +4,6 @@
>
> [LibraryClasses]
> !if $(TPM2_ENABLE) == TRUE
> -!if $(TPM1_ENABLE) == TRUE
> - Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
> -!endif
> Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
>
> Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf
>
> Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf
> @@ -27,16 +24,10 @@ [LibraryClasses]
> [LibraryClasses.common.PEIM]
> !if $(TPM2_ENABLE) == TRUE
> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
> -!if $(TPM1_ENABLE) == TRUE
> -
> Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf
> -!endif
> Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
> !endif
>
> [LibraryClasses.common.DXE_DRIVER]
> !if $(TPM2_ENABLE) == TRUE
> -!if $(TPM1_ENABLE) == TRUE
> - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf
> -!endif
> Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf
> !endif
> diff --git a/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> b/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> index 89455feca4d9..c40d6b0a0e78 100644
> --- a/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> +++ b/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> @@ -2,12 +2,6 @@
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> ##
>
> -!if $(TPM2_ENABLE) == TRUE
> -!if $(TPM1_ENABLE) == TRUE
> - NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf
> -!endif
> -!endif
> -
> !if $(TPM2_ENABLE) == TRUE || $(CC_MEASUREMENT_ENABLE) == TRUE
> #
> # DxeTpm2MeasureBootLib provides security service of TPM2 measure boot
> and
> diff --git a/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
> b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
> index 7fc2bf8590a4..bd0be8fedbd5 100644
> --- a/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
> +++ b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
> @@ -3,9 +3,6 @@
> ##
>
> !if $(TPM2_ENABLE) == TRUE
> -!if $(TPM1_ENABLE) == TRUE
> -INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf
> -!endif
> INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
> INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf
> INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
> diff --git a/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
> b/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
> index 9f8b9bdd5bed..add012afab67 100644
> --- a/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
> +++ b/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
> @@ -4,12 +4,7 @@
>
> !if $(TPM2_ENABLE) == TRUE
> INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf
> -!if $(TPM1_ENABLE) == TRUE
> -INF OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf
> -INF SecurityPkg/Tcg/TcgPei/TcgPei.inf
> -!else
> INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
> -!endif
> INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf
> INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> !endif
> diff --git a/OvmfPkg/PlatformCI/ReadMe.md b/OvmfPkg/PlatformCI/ReadMe.md
> index 10fa32ac489f..33b89df17bc5 100644
> --- a/OvmfPkg/PlatformCI/ReadMe.md
> +++ b/OvmfPkg/PlatformCI/ReadMe.md
> @@ -14,7 +14,7 @@ supported and are described below.
> | IA32 | IA32 | OvmfPkgIa32.dsc | None
> |
> | X64 | X64 | OvmfPkgIa64.dsc | None
> |
> | IA32 X64 | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | None
> |
> -| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc |
> SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM1_ENABLE=1 TPM2_ENABLE=1
> NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 |
> +| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc |
> SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM2_ENABLE=1 NETWORK_TLS_ENABLE=1
> NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 |
>
> ## EDK2 Developer environment
>
Reviewed-by: Laszlo Ersek <ler...@redhat.com>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113939): https://edk2.groups.io/g/devel/message/113939
Mute This Topic: https://groups.io/mt/103764206/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe:
https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
