Commit 89236992913f introduced an explicit Tpm12CommandLib dependency to Tcg2ConfigPei.
In reality this lib class is not consumed by Tcg2ConfigPei at all (such a dependency is not even inherited from other lib instances). Simplify the module by dropping the superfluous dependency. (The Tpm12CommandLib class resolution that was also added in commit 89236992913f is not useless, at the platform build level: it is consumed by TcgPei and TcgDxe. Meaning that said Tpm12CommandLib resolution should have likely been a part of the subsequent patch in the original series, namely commit 6be54f15a0c9.) Commit 89236992913f also introduced SwapBytesXx() calls. Those functions are provided by BaseLib. Spell out the BaseLib dependency. Functionally, this patch is a no-op. Cc: Ard Biesheuvel <ard.biesheu...@arm.com> Cc: Eric Auger <eric.au...@redhat.com> Cc: Jordan Justen <jordan.l.jus...@intel.com> Cc: Marc-André Lureau <marcandre.lur...@redhat.com> Cc: Philippe Mathieu-Daudé <phi...@redhat.com> Cc: Simon Hardy <simon.ha...@itdev.co.uk> Cc: Stefan Berger <stef...@linux.ibm.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2728 Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 2 +- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf index 97c529c91d0b..b79d0a3fb912 100644 --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf @@ -30,9 +30,9 @@ [Packages] [LibraryClasses] PeimEntryPoint + BaseLib DebugLib PeiServicesLib - Tpm12CommandLib Tpm12DeviceLib Tpm2DeviceLib diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c index 5b5075bded92..44abd6c541f9 100644 --- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c +++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c @@ -15,11 +15,11 @@ #include <PiPei.h> #include <Guid/TpmInstance.h> +#include <Library/BaseLib.h> #include <Library/DebugLib.h> #include <Library/PeiServicesLib.h> #include <Library/Tpm2DeviceLib.h> #include <Library/Tpm12DeviceLib.h> -#include <Library/Tpm12CommandLib.h> #include <Ppi/TpmInitialized.h> STATIC CONST EFI_PEI_PPI_DESCRIPTOR mTpmSelectedPpi = { -- 2.19.1.3.g30247aa5d201 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#60004): https://edk2.groups.io/g/devel/message/60004 Mute This Topic: https://groups.io/mt/74362541/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-