From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Tue, 12 Jul 2016 12:54:28 +0000 (+0200)
Subject: ArmVirtPkg/HighMemDxe: allow patchable PCD for PcdSystemMemoryBase
X-Git-Tag: edk2-stable201903~6341
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=cb9f629e882251b7456176ee555f1b6b0c097d20;hp=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>
---

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]