commit cb9f629e882251b7456176ee555f1b6b0c097d20
author Ard Biesheuvel <ard.biesheuvel@linaro.org> Tue Jul 12 14:54:28 2016 +0200
committer Ard Biesheuvel <ard.biesheuvel@linaro.org> Tue Jul 12 15:19:42 2016 +0200
tree b5f1260fdc27d429683ea824c8943dba6869f4af
parent 4c33f8b190a439bb931a92eb63eb3cc1806c7ccc

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>

ArmVirtPkg/HighMemDxe/HighMemDxe.c

diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.c b/ArmVirtPkg/HighMemDxe/HighMemDxe.c
index 4963164..7fd7e8e 100644
--- a/ArmVirtPkg/HighMemDxe/HighMemDxe.c
+++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.c
@@ -74,7 +74,7 @@
         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,

ArmVirtPkg/HighMemDxe/HighMemDxe.inf

diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
index 2b39762..ae632a8 100644
--- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
+++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
@@ -45,7 +45,7 @@
 [Guids]

   gFdtHobGuid

 

-[FixedPcd]

+[Pcd]

   gArmTokenSpaceGuid.PcdSystemMemoryBase

 

 [Depex]