2 files changed, 4 insertions, 3 deletions
diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
index 3a26c3599..d74535716 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c
@@ -112,7 +112,7 @@ InitializeMemory (
   //
   // Initialize the System Memory (DRAM)
   //
-  if (FeaturePcdGet(PcdStandalone)) {
+  if (PcdGet32 (PcdStandalone)) {
     // In case of a standalone version, the DRAM is already initialized
     ArmPlatformInitializeSystemMemory();
   }
@@ -120,7 +120,7 @@ InitializeMemory (
   //
   // Declare the UEFI memory to PEI
   //
-  if (FeaturePcdGet(PcdStandalone)) {
+  if (PcdGet32 (PcdStandalone)) {
     // In case of standalone UEFI, we set the UEFI memory region at the top of the DRAM
     UefiMemoryBase = SystemMemoryTop - FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);
   } else {
diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
index c0971b30f..0d578648a 100755
--- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
+++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
@@ -49,9 +49,10 @@
 
 [FeaturePcd]
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob
-  gArmPlatformTokenSpaceGuid.PcdStandalone
 
 [FixedPcd]
+  gArmPlatformTokenSpaceGuid.PcdStandalone
+
   gArmTokenSpaceGuid.PcdNormalFdBaseAddress
   gArmTokenSpaceGuid.PcdNormalFdSize