3 files changed, 8 insertions, 6 deletions
diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
index 0ae8da6a24..89bcab77ef 100644
--- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
+++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
@@ -81,10 +81,11 @@ stack_pointer_setup:
   mov     r13,r4
 
   // Call C entry point
-  mov     r0, #0x80000000   /* memory base arg0          */
-  mov     r1, #0x10000000   /* memory size arg1          */
+  LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1)    /* memory size arg1          */
+  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0)    /* memory size arg0         */
+  
 
-  bl      ASM_PFX(CEntryPoint) /* Assume C code is ARM      */
+  blx      ASM_PFX(CEntryPoint) /* Assume C code is ARM      */
 
 ShouldNeverGetHere:
   /* _CEntryPoint should never return */
diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
index 71e60b707a..52171692b5 100644
--- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
+++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
@@ -59,8 +59,8 @@ stack_pointer_setup
   mov     r13,r4
 
   // Call C entry point
-  mov     r0, #0x80000000   /* memory base arg0          */
-  mov     r1, #0x10000000   /* memory size arg1          */
+  LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1)    /* memory size arg1          */
+  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0)    /* memory size arg0         */
   blx     CEntryPoint       /* Assume C code is thumb    */
 
 ShouldNeverGetHere
diff --git a/BeagleBoardPkg/Sec/Sec.inf b/BeagleBoardPkg/Sec/Sec.inf
index a74dfb6bc3..93ad6e0ebc 100644
--- a/BeagleBoardPkg/Sec/Sec.inf
+++ b/BeagleBoardPkg/Sec/Sec.inf
@@ -60,8 +60,9 @@
   gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize
   gEmbeddedTokenSpaceGuid.PcdPrePiStackSize
   gEmbeddedTokenSpaceGuid.PcdPrePiStackBase
+  gEmbeddedTokenSpaceGuid.PcdMemoryBase
+  gEmbeddedTokenSpaceGuid.PcdMemorySize
   
   gOmap35xxTokenSpaceGuid.PcdBeagleConsoleUart
   gOmap35xxTokenSpaceGuid.PcdBeagleFreeTimer
-  gOmap35xxTokenSpaceGuid.PcdBeagleBoardIRAMFullSize