From cb9f629e882251b7456176ee555f1b6b0c097d20 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Tue, 12 Jul 2016 14:54:28 +0200 Subject: [PATCH] ArmVirtPkg/HighMemDxe: allow patchable PCD for PcdSystemMemoryBase Redefine the reference to PcdSystemMemoryBase in HighMemDxe.inf as a plain [Pcd] rather than [FixedPcd] (and fix up the code as appropriate). This allows us to align ArmVirtQemuKernel with ArmVirtQemu, given that the former uses a patchable PCD not a fixed PCD. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/HighMemDxe/HighMemDxe.c | 2 +- ArmVirtPkg/HighMemDxe/HighMemDxe.inf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.c b/ArmVirtPkg/HighMemDxe/HighMemDxe.c index 4963164fbd..7fd7e8e9a5 100644 --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.c +++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.c @@ -74,7 +74,7 @@ InitializeHighMemDxe ( CurBase = fdt64_to_cpu (((UINT64 *)RegProp)[0]); CurSize = fdt64_to_cpu (((UINT64 *)RegProp)[1]); - if (FixedPcdGet64 (PcdSystemMemoryBase) != CurBase) { + if (PcdGet64 (PcdSystemMemoryBase) != CurBase) { Status = gDS->AddMemorySpace ( EfiGcdMemoryTypeSystemMemory, CurBase, CurSize, diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf index 2b397626a4..ae632a8bee 100644 --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf +++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf @@ -45,7 +45,7 @@ [Guids] gFdtHobGuid -[FixedPcd] +[Pcd] gArmTokenSpaceGuid.PcdSystemMemoryBase [Depex] -- 2.39.2