ArmVirtPkg/QemuVirtMemInfoLib: use HOB not PCD to record the memory size

Due to the way we inherited the formerly fixed PCDs to describe the
system memory base and size from ArmPlatformPkg, we ended up with a
MemoryInit PEIM that relies on dynamic PCDs to communicate the size of
system memory between the constructor of one of its library dependencies
and the core module. This is unnecessary, and forces us to incorporate
the PCD PEIM as well, for no good reason. So instead, let's use a HOB.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index d9c43e294c..e3686c7ee3 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -221,6 +221,9 @@
   # Shadowing PEI modules is absolutely pointless when the NOR flash is emulated

   gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnBoot|FALSE

 

+  # System Memory Size -- 128 MB initially, actual size will be fetched from DT

+  gArmTokenSpaceGuid.PcdSystemMemorySize|0x8000000

+

 [PcdsFixedAtBuild.AARCH64]

   # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point,

   # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the

@@ -237,9 +240,6 @@
   #  enumeration to complete before installing ACPI tables.

   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE

 

-  # System Memory Size -- 1 MB initially, actual size will be fetched from DT

-  gArmTokenSpaceGuid.PcdSystemMemorySize|0x00100000

-

   gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0

   gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x0

   gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x0