summaryrefslogtreecommitdiffstats
path: root/ArmVirtPkg/ArmVirtQemu.dsc
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2024-07-22 12:49:19 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-07-27 15:51:27 +0000
commit52eb643d0785a19c7f1c107d390c7bb52a79789e (patch)
tree8b7aae4c6986c5a764c8af8b43e2d85384b2dbde /ArmVirtPkg/ArmVirtQemu.dsc
parent08c60b40da2a850bfa760832d040710cfde39760 (diff)
downloadedk2-52eb643d0785a19c7f1c107d390c7bb52a79789e.tar.gz
ArmVirtPkg/ArmVirtQemu: Switch to generic ResetSystemLib
Retire the special ResetSystemLib implementation for the PEI phase on virtual platforms, which has been superseded by the generic version combined with a PEI-compatible implementation of ArmMonitorLib. Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'ArmVirtPkg/ArmVirtQemu.dsc')
-rw-r--r--ArmVirtPkg/ArmVirtQemu.dsc8
1 files changed, 3 insertions, 5 deletions
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 6a0e99bc64..942a602706 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -104,8 +104,9 @@
ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
!if $(TPM2_ENABLE) == TRUE
+ ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf
- ResetSystemLib|MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf
+ FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf
!endif
@@ -355,10 +356,7 @@
<LibraryClasses>
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
}
- MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf {
- <LibraryClasses>
- ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf
- }
+ MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf
OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {
<LibraryClasses>