summaryrefslogtreecommitdiffstats
path: root/ArmVirtPkg
diff options
context:
space:
mode:
authorArd Biesheuvel <ardb@kernel.org>2024-07-24 23:04:35 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-07-25 14:41:09 +0000
commit43130ae4034cdcf0fa0ff928105fbe3e52d9f628 (patch)
treed28e85ad4aa3609e6451a1dcd82959fcff92c61c /ArmVirtPkg
parent8665187b017b0e4e4febf2241b433e6371f6e7e1 (diff)
downloadedk2-43130ae4034cdcf0fa0ff928105fbe3e52d9f628.tar.gz
edk2-43130ae4034cdcf0fa0ff928105fbe3e52d9f628.tar.bz2
edk2-43130ae4034cdcf0fa0ff928105fbe3e52d9f628.zip
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 <ardb@kernel.org>
Diffstat (limited to 'ArmVirtPkg')
-rw-r--r--ArmVirtPkg/ArmVirt.dsc.inc4
1 files changed, 2 insertions, 2 deletions
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