summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2020-05-21 00:58:39 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2020-05-21 12:23:37 +0000
commit08c77cce0edd80547a527304c6b4a75e2de2ac9e (patch)
tree9d9b0aefb9787852e28c9f23f1c1dc2fd8240640
parent3f89db869028fa65a37756fd7f391cbd69f4579c (diff)
downloadedk2-08c77cce0edd80547a527304c6b4a75e2de2ac9e.tar.gz
edk2-08c77cce0edd80547a527304c6b4a75e2de2ac9e.tar.bz2
edk2-08c77cce0edd80547a527304c6b4a75e2de2ac9e.zip
OvmfPkg/Tcg2ConfigPei: clean up some lib class dependencies
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.biesheuvel@arm.com> Cc: Eric Auger <eric.auger@redhat.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Cc: Marc-André Lureau <marcandre.lureau@redhat.com> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> Cc: Simon Hardy <simon.hardy@itdev.co.uk> Cc: Stefan Berger <stefanb@linux.ibm.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2728 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Message-Id: <20200520225841.17793-2-lersek@redhat.com> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com> Tested-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
-rw-r--r--OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf2
-rw-r--r--OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
index 97c529c91d..b79d0a3fb9 100644
--- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
@@ -30,9 +30,9 @@
[LibraryClasses]
PeimEntryPoint
+ BaseLib
DebugLib
PeiServicesLib
- Tpm12CommandLib
Tpm12DeviceLib
Tpm2DeviceLib
diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPeim.c
index 5b5075bded..44abd6c541 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 = {