diff --git a/ArmPkg/Drivers/CpuPei/CpuPei.c b/ArmPkg/Drivers/CpuPei/CpuPei.c
index d06ecd743e..0a97745fa3 100755
--- a/ArmPkg/Drivers/CpuPei/CpuPei.c
+++ b/ArmPkg/Drivers/CpuPei/CpuPei.c
@@ -163,6 +163,9 @@ Returns:
   // Enable program flow prediction, if supported.
   ArmEnableBranchPrediction ();
 
+  // publish the CPU memory and io spaces sizes
+  BuildCpuHob (PcdGet8 (PcdPrePiCpuMemorySize), PcdGet8 (PcdPrePiCpuIoSize));
+
   ConfigureMmu();
 
   return EFI_SUCCESS;
diff --git a/ArmPkg/Drivers/CpuPei/CpuPei.inf b/ArmPkg/Drivers/CpuPei/CpuPei.inf
index 4237d365f9..5016f8a5cd 100755
--- a/ArmPkg/Drivers/CpuPei/CpuPei.inf
+++ b/ArmPkg/Drivers/CpuPei/CpuPei.inf
@@ -46,6 +46,8 @@
 [Ppis]
 
 [FixedPcd]
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize
 
 [FeaturePcd]  
   gEmbeddedTokenSpaceGuid.PcdCacheEnable