On Thu, 16 Jun 2022 at 14:56, Gerd Hoffmann <[email protected]> wrote:
>
> We can have multiple [LibraryClasses] sections, so we can place
> all TPM-related library configuration to a single include file.
>
> Signed-off-by: Gerd Hoffmann <[email protected]>

Reviewed-by: Ard Biesheuvel <[email protected]>

Merged as #3000,



> ---
>  OvmfPkg/OvmfTpmLibs.dsc.inc     | 18 ++++++++++++++++++
>  OvmfPkg/OvmfTpmLibsDxe.dsc.inc  | 10 ----------
>  OvmfPkg/OvmfTpmLibsPeim.dsc.inc | 11 -----------
>  OvmfPkg/AmdSev/AmdSevX64.dsc    |  4 ----
>  OvmfPkg/CloudHv/CloudHvX64.dsc  |  4 ----
>  OvmfPkg/OvmfPkgIa32.dsc         |  4 ----
>  OvmfPkg/OvmfPkgIa32X64.dsc      |  4 ----
>  OvmfPkg/OvmfPkgX64.dsc          |  4 ----
>  8 files changed, 18 insertions(+), 41 deletions(-)
>  delete mode 100644 OvmfPkg/OvmfTpmLibsDxe.dsc.inc
>  delete mode 100644 OvmfPkg/OvmfTpmLibsPeim.dsc.inc
>
> diff --git a/OvmfPkg/OvmfTpmLibs.dsc.inc b/OvmfPkg/OvmfTpmLibs.dsc.inc
> index 418747b13487..cd1a899d68f7 100644
> --- a/OvmfPkg/OvmfTpmLibs.dsc.inc
> +++ b/OvmfPkg/OvmfTpmLibs.dsc.inc
> @@ -2,6 +2,7 @@
>  #    SPDX-License-Identifier: BSD-2-Clause-Patent
>  ##
>
> +[LibraryClasses]
>  !if $(TPM2_ENABLE) == TRUE
>  !if $(TPM1_ENABLE) == TRUE
>    Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf
> @@ -14,3 +15,20 @@
>    
> Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf
>    
> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
>  !endif
> +
> +[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/OvmfTpmLibsDxe.dsc.inc b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc
> deleted file mode 100644
> index 1d66cdac778c..000000000000
> --- a/OvmfPkg/OvmfTpmLibsDxe.dsc.inc
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -##
> -#    SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -
> -!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/OvmfTpmLibsPeim.dsc.inc b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc
> deleted file mode 100644
> index 03caccd7c688..000000000000
> --- a/OvmfPkg/OvmfTpmLibsPeim.dsc.inc
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -##
> -#    SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -
> -!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
> diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
> index 6b3827f7f6ed..fa081e4fea53 100644
> --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
> +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
> @@ -273,8 +273,6 @@ [LibraryClasses.common.PEIM]
>    PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
>    QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc
> -
>    
> MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf
>    PlatformInitLib|OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf
>
> @@ -356,8 +354,6 @@ [LibraryClasses.common.DXE_DRIVER]
>    QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
>    
> QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc
> -
>  [LibraryClasses.common.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
> diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
> index 8a111444f867..c568662313c5 100644
> --- a/OvmfPkg/CloudHv/CloudHvX64.dsc
> +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
> @@ -308,8 +308,6 @@ [LibraryClasses.common.PEIM]
>    PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf
>    QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf
>
> -!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc
> -
>    
> MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf
>    PlatformInitLib|OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf
>
> @@ -397,8 +395,6 @@ [LibraryClasses.common.DXE_DRIVER]
>    QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
>    
> QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc
> -
>  [LibraryClasses.common.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index a9841cbfc3ca..c94b29205fde 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -305,8 +305,6 @@ [LibraryClasses.common.PEIM]
>    QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
>    PlatformInitLib|OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc
> -
>    
> MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf
>
>  [LibraryClasses.common.DXE_CORE]
> @@ -394,8 +392,6 @@ [LibraryClasses.common.DXE_DRIVER]
>    QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
>    
> QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc
> -
>  [LibraryClasses.common.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index f7949780fa38..dc37c73074fe 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -311,8 +311,6 @@ [LibraryClasses.common.PEIM]
>    QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
>    PlatformInitLib|OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc
> -
>    
> MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf
>
>  [LibraryClasses.common.DXE_CORE]
> @@ -400,8 +398,6 @@ [LibraryClasses.common.DXE_DRIVER]
>    QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
>    
> QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc
> -
>  [LibraryClasses.common.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index 1448f925b782..c742fd9aa6d1 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -328,8 +328,6 @@ [LibraryClasses.common.PEIM]
>    QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf
>    PlatformInitLib|OvmfPkg/Library/PlatformInitLib/PlatformInitLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc
> -
>    
> MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf
>
>  [LibraryClasses.common.DXE_CORE]
> @@ -417,8 +415,6 @@ [LibraryClasses.common.DXE_DRIVER]
>    QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf
>    
> QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf
>
> -!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc
> -
>  [LibraryClasses.common.UEFI_APPLICATION]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
> --
> 2.36.1
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#90688): https://edk2.groups.io/g/devel/message/90688
Mute This Topic: https://groups.io/mt/91798158/21656
Group Owner: [email protected]
Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-


Reply via email to