[PATCH] MdeModulePkg/Library: change TpmMeasurementLibNull to BASE library.


Qi Zhang
 

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2940

TpmMeasurementLib includes DxeTpmMeasurementLib and PeiTpmMeasurementLib.
So need to change TpmMeasurementLibNull to BASE library to avoid build
error in some platform.

Signed-off-by: Qi Zhang <qi1.zhang@...>
Cc: Jian J Wang <jian.j.wang@...>
Cc: Hao A Wu <hao.a.wu@...>
Cc: Jiewen Yao <jiewen.yao@...>
---
.../Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c | 4 +++-
.../Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu=
ll.c b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c
index b9c5b68de8..ee3be62fc6 100644
--- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c
+++ b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c
@@ -1,11 +1,13 @@
/** @file=0D
This library is used by other modules to measure data to TPM.=0D
=0D
-Copyright (c) 2015, Intel Corporation. All rights reserved. <BR>=0D
+Copyright (c) 2015-2020, Intel Corporation. All rights reserved. <BR>=0D
SPDX-License-Identifier: BSD-2-Clause-Patent=0D
=0D
**/=0D
=0D
+#include <Uefi/UefiBaseType.h>=0D
+=0D
/**=0D
Tpm measure and log data, and extend the measurement result into a speci=
fic PCR.=0D
=0D
diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNu=
ll.inf b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.i=
nf
index 61abcfa2ec..1db2c0d6a7 100644
--- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
+++ b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
@@ -1,7 +1,7 @@
## @file=0D
# Provides NULL TPM measurement function.=0D
#=0D
-# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>=0D
+# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.<BR>=0D
# SPDX-License-Identifier: BSD-2-Clause-Patent=0D
#=0D
##=0D
@@ -10,9 +10,9 @@
INF_VERSION =3D 0x00010005=0D
BASE_NAME =3D TpmMeasurementLibNull=0D
FILE_GUID =3D 6DFD6E9F-9278-48D8-8F45-B6CFF2C2B69C=
=0D
- MODULE_TYPE =3D UEFI_DRIVER=0D
+ MODULE_TYPE =3D BASE=0D
VERSION_STRING =3D 1.0=0D
- LIBRARY_CLASS =3D TpmMeasurementLib|DXE_DRIVER DXE_RUNT=
IME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER=0D
+ LIBRARY_CLASS =3D TpmMeasurementLib=0D
MODULE_UNI_FILE =3D TpmMeasurementLibNull.uni=0D
=0D
#=0D
--=20
2.26.2.windows.1

Join devel@edk2.groups.io to automatically receive all group messages.