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 <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.c b/ArmVirtPkg/HighMemDxe/HighMemDxe.c
index 4963164fbd8ab213209a6d60e9140e402fc40504..7fd7e8e9a5390ee8e4ba417521dce3bfe53e7927 100644 (file)
--- a/ArmVirtPkg/HighMemDxe/HighMemDxe.c
+++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.c
@@ -74,7 +74,7 @@ InitializeHighMemDxe (
         CurBase = fdt64_to_cpu (((UINT64 *)RegProp)[0]);\r
         CurSize = fdt64_to_cpu (((UINT64 *)RegProp)[1]);\r
 \r
-        if (FixedPcdGet64 (PcdSystemMemoryBase) != CurBase) {\r
+        if (PcdGet64 (PcdSystemMemoryBase) != CurBase) {\r
           Status = gDS->AddMemorySpace (\r
                           EfiGcdMemoryTypeSystemMemory,\r
                           CurBase, CurSize,\r

diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
index 2b397626a4506590bc4f0eef57008c1bbd8ffe87..ae632a8bee9300d9c97667373e35f9f9bb399215 100644 (file)
--- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
+++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
@@ -45,7 +45,7 @@
 [Guids]\r
   gFdtHobGuid\r
 \r
-[FixedPcd]\r
+[Pcd]\r
   gArmTokenSpaceGuid.PcdSystemMemoryBase\r
 \r
 [Depex]\r