73 lines
3.3 KiB
Diff
73 lines
3.3 KiB
Diff
From 454595840418dce7e227a70ff297b1d11593e768 Mon Sep 17 00:00:00 2001
|
|
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
Date: Thu, 27 Feb 2020 15:24:21 +0100
|
|
Subject: [PATCH 10/13] ArmVirtPkg: unshare TpmMeasurementLib resolution
|
|
between platforms
|
|
|
|
In preparation of conditializing the choice of resolution based on
|
|
TPM2_ENABLE for ArmVirtQemu, move the TpmMeasurementLib out of the
|
|
shared .DSC include and into the individual DSCs.
|
|
|
|
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2560
|
|
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
Signed-off-by: jiangfangjie <jiangfangjie@huawei.com>
|
|
---
|
|
ArmVirtPkg/ArmVirt.dsc.inc | 1 -
|
|
ArmVirtPkg/ArmVirtQemu.dsc | 1 +
|
|
ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 +
|
|
ArmVirtPkg/ArmVirtXen.dsc | 1 +
|
|
4 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
|
|
index 398aa7b..0a28d3a 100644
|
|
--- a/ArmVirtPkg/ArmVirt.dsc.inc
|
|
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
|
|
@@ -172,7 +172,6 @@
|
|
!else
|
|
AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
|
|
!endif
|
|
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
|
|
VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
|
|
UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
|
|
|
|
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
index 44138e5..83c4dea 100644
|
|
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
|
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
@@ -74,6 +74,7 @@
|
|
PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
|
|
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
|
|
PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
|
|
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
|
|
|
|
!if $(TPM2_ENABLE) == TRUE
|
|
Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
|
|
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
index 8243876..7bd50e4 100644
|
|
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
@@ -73,6 +73,7 @@
|
|
PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
|
|
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
|
|
PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
|
|
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
|
|
|
|
[LibraryClasses.common.DXE_DRIVER]
|
|
ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
|
|
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
|
|
index 8a6ace2..2a4ef8d 100644
|
|
--- a/ArmVirtPkg/ArmVirtXen.dsc
|
|
+++ b/ArmVirtPkg/ArmVirtXen.dsc
|
|
@@ -47,6 +47,7 @@
|
|
BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
|
|
PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
|
|
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
|
|
+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
|
|
|
|
[LibraryClasses.common.UEFI_DRIVER]
|
|
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
|
|
--
|
|
2.18.2
|
|
|