ArmPkg,ArmPlatformPkg: Allow dynamic PCDs for memory base and size

[mirror_edk2.git] / ArmPlatformPkg / MemoryInitPei / MemoryInitPeim.c

diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index 4821fdc2fa89cfa2b3bca8b39b3a9af2a2f570a9..587c4b5ce3a3fa87db1127ca15ea3bbdcb1a2ef5 100755 (executable)
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -103,14 +103,6 @@ InitializeMemory (
 \r
   DEBUG ((EFI_D_ERROR, "Memory Init PEIM Loaded\n"));\r
 \r
-  // Ensure PcdSystemMemorySize has been set\r
-  ASSERT (FixedPcdGet64 (PcdSystemMemorySize) != 0);\r
-\r
-  SystemMemoryBase = (UINTN)FixedPcdGet64 (PcdSystemMemoryBase);\r
-  SystemMemoryTop = SystemMemoryBase + (UINTN)FixedPcdGet64 (PcdSystemMemorySize);\r
-  FdBase = (UINTN)PcdGet32 (PcdFdBaseAddress);\r
-  FdTop = FdBase + (UINTN)PcdGet32 (PcdFdSize);\r
-\r
   //\r
   // Initialize the System Memory (DRAM)\r
   //\r
@@ -119,6 +111,14 @@ InitializeMemory (
     ArmPlatformInitializeSystemMemory ();\r
   }\r
 \r
+  // Ensure PcdSystemMemorySize has been set\r
+  ASSERT (PcdGet64 (PcdSystemMemorySize) != 0);\r
+\r
+  SystemMemoryBase = (UINTN)PcdGet64 (PcdSystemMemoryBase);\r
+  SystemMemoryTop = SystemMemoryBase + (UINTN)PcdGet64 (PcdSystemMemorySize);\r
+  FdBase = (UINTN)PcdGet32 (PcdFdBaseAddress);\r
+  FdTop = FdBase + (UINTN)PcdGet32 (PcdFdSize);\r
+\r
   //\r
   // Declare the UEFI memory to PEI\r
   //\r