From 43130ae4034cdcf0fa0ff928105fbe3e52d9f628 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 24 Jul 2024 23:04:35 +0200 Subject: ArmPkg: Convert PcdMonitorConduitHvc to FixedAtBuild Feature PCDs and fixed-at-build PCDs are identical in concept, but the latter are accessible from assembler, whereas the former are not. So convert the SMCCC conduit selection PCD to fixed-at-build so we can make use of this in a subsequent patch. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ArmVirtPkg') diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 038931562c..eb0bca24ea 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -289,8 +289,6 @@ gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE - gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE - [PcdsFeatureFlag.AARCH64] # # Activate AcpiSdtProtocol @@ -298,6 +296,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE [PcdsFixedAtBuild.common] + gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE + !ifdef $(FIRMWARE_VER) gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" !endif -- cgit v1.2.3