Cleanup Cache an MMU operations.

[mirror_edk2.git] / BeagleBoardPkg / Sec / Arm / ModuleEntryPoint.asm

diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
old mode 100755 (executable)
new mode 100644 (file)
index 71e60b7..033f03c
--- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
+++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
@@ -40,28 +40,39 @@ _ModuleEntryPoint
   mcr     p15, 0, r0, c1, c0, 0\r
  \r
   // Set CPU vectors to start of DRAM\r
-  mov     r0, #0x80000000\r
+  LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base\r
   mcr     p15, 0, r0, c12, c0, 0\r
-  /* before we call C code, lets setup the stack pointer in internal RAM*/\r
+  isb                               // Sync changes to control registers\r
+\r
+  // Fill vector table with branchs to current pc (jmp $)\r
+  ldr     r1, ShouldNeverGetHere\r
+  movs    r2, #0\r
+FillVectors\r
+  str     r1, [r0, r2]\r
+  adds    r2, r2, #4\r
+  cmp     r2, #32\r
+  bne     FillVectors\r
+   \r
+  /* before we call C code, lets setup the stack pointer in internal RAM */\r
 stack_pointer_setup\r
 \r
   //\r
   // Set stack based on PCD values. Need to do it this way to make C code work \r
   // when it runs from FLASH. \r
   //  \r
-  LoadConstantToReg (FixedPcdGet32(PcdPrePiStackBase) ,r2)    /* stack base arg2  */\r
-  LoadConstantToReg (FixedPcdGet32(PcdPrePiStackSize) ,r3)    /* stack size arg3  */\r
+  LoadConstantToReg (FixedPcdGet32(PcdPrePiStackBase) ,r2)    // stack base arg2  \r
+  LoadConstantToReg (FixedPcdGet32(PcdPrePiStackSize) ,r3)    // stack size arg3  \r
   add     r4, r2, r3\r
 \r
   //Enter SVC mode and set up SVC stack pointer\r
-  mov     r0,#0x13|0x80|0x40\r
-  msr     CPSR_c,r0\r
+  mov     r5,#0x13|0x80|0x40\r
+  msr     CPSR_c,r5\r
   mov     r13,r4\r
 \r
   // Call C entry point\r
-  mov     r0, #0x80000000   /* memory base arg0          */\r
-  mov     r1, #0x10000000   /* memory size arg1          */\r
-  blx     CEntryPoint       /* Assume C code is thumb    */\r
+  LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1)    // memory size arg1         \r
+  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0)    // memory start arg0\r
+  blx     CEntryPoint                                     // Assume C code is thumb    \r
 \r
 ShouldNeverGetHere\r
   /* _CEntryPoint should never return */\r