diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2024-06-07 10:23:14 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-06-10 08:44:48 +0000 |
| commit | 3dcc7b73df2b1c38c3c1a31724d577f4085f3ab1 (patch) | |
| tree | 477ac5a5173b974aa125f4f581a9ddf63c0eb397 /ArmVirtPkg | |
| parent | 2c19297e6cf004379415ec1dd7f8655befe2e536 (diff) | |
| download | edk2-3dcc7b73df2b1c38c3c1a31724d577f4085f3ab1.tar.gz edk2-3dcc7b73df2b1c38c3c1a31724d577f4085f3ab1.tar.bz2 edk2-3dcc7b73df2b1c38c3c1a31724d577f4085f3ab1.zip | |
ArmPkg: Revert "Allow SMC/HVC monitor conduit to be specified at runtime"
This reverts commit 32460bb5b17b5caec29037a4e9462ca149a190e6, which is
no longer needed as ArmVirtQemu now has its own special implementation
for ArmMonitorLib.
Continuous-integration-options: PatchCheck.ignore-multi-package
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'ArmVirtPkg')
| -rw-r--r-- | ArmVirtPkg/ArmVirt.dsc.inc | 2 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtKvmTool.dsc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 7044790a1e..038931562c 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -289,6 +289,8 @@ gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE
+ gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
+
[PcdsFeatureFlag.AARCH64]
#
# Activate AcpiSdtProtocol
diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index ae0dd1497f..da6737d9d7 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -165,8 +165,6 @@ #
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16
- gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE
-
[PcdsPatchableInModule.common]
#
# This will be overridden in the code
|