Sync up ARMASM and GCC version

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10261 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
index d8cabeb25faca477f993dc1207f8fc7a90b137b8..950ba43c691ec71642c21bed1b5ea7c147df0e3e 100644 (file)
--- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
+++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
@@ -37,11 +37,20 @@ ASM_PFX(_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
   isb                               // Sync changes to control registers\r
 \r
-  /* before we call C code, lets setup the stack pointer in internal RAM*/\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

diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
index 414adcb266a48f88ae6ce59f9e52add945f684cd..033f03c684693612121c54079232cac3bd5312e8 100644 (file)
--- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
+++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
@@ -53,7 +53,7 @@ FillVectors
   cmp     r2, #32\r
   bne     FillVectors\r
    \r
-  /* before we call C code, lets setup the stack pointer in internal RAM*/\r
+  /* before we call C code, lets setup the stack pointer in internal RAM */\r
 stack_pointer_setup\r
 \r
   //\r