From 3dcc7b73df2b1c38c3c1a31724d577f4085f3ab1 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 7 Jun 2024 10:23:14 +0200 Subject: 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 --- ArmVirtPkg/ArmVirt.dsc.inc | 2 ++ ArmVirtPkg/ArmVirtKvmTool.dsc | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ArmVirtPkg') 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 -- cgit v1.2.3