Fixup to point to real RAM and NOR addressess.

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

diff --git a/ArmEbPkg/ArmEbPkg.dsc b/ArmEbPkg/ArmEbPkg.dsc
index dd0d24c4fe4e82657e70ad598ad7891baedb1d78..911d7ae3022bdf2b505010ca731439b1281cef4f 100644 (file)
--- a/ArmEbPkg/ArmEbPkg.dsc
+++ b/ArmEbPkg/ArmEbPkg.dsc
@@ -300,14 +300,14 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|10
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0
 
-  gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0x80001000
-  gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0x87FE0000 # stack at top of memory
+  gEmbeddedTokenSpaceGuid.PcdPrePiHobBase|0x00001000
+  gEmbeddedTokenSpaceGuid.PcdPrePiStackBase|0x07FE0000 # stack at top of memory
   gEmbeddedTokenSpaceGuid.PcdPrePiStackSize|0x20000    # 128K stack
-  gEmbeddedTokenSpaceGuid.PcdMemoryBase|0x80000000
-  gEmbeddedTokenSpaceGuid.PcdMemorySize|0x10000000
+  gEmbeddedTokenSpaceGuid.PcdMemoryBase|0x00000000
+  gEmbeddedTokenSpaceGuid.PcdMemorySize|0x10000000     # 256 MB
 
-  gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x80000000
-  gArmTokenSpaceGuid.PcdCpuResetAddress|0x80008000
+  gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x00000000
+  gArmTokenSpaceGuid.PcdCpuResetAddress|0x40000000       # set to start of NOR
   
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterPeriodInNanoseconds|77

diff --git a/ArmEbPkg/ArmEbPkg.fdf b/ArmEbPkg/ArmEbPkg.fdf
index aebc44c858929c2fca2c5cfb6284b32c58ca9e62..beb103bedccd7b4fc36d5e3fd587936c09f15bd9 100755 (executable)
--- a/ArmEbPkg/ArmEbPkg.fdf
+++ b/ArmEbPkg/ArmEbPkg.fdf
@@ -27,12 +27,11 @@
 
 
 [FD.ArmEb_EFI]
-####BaseAddress   = 0x80208000|gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress  #The base address of the FLASH Device.
-BaseAddress   = 0x80008000|gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress  #The base address of the FLASH Device.
-Size          = 0x00080000|gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize         #The size in bytes of the FLASH Device
+BaseAddress   = 0x40000000|gEmbeddedTokenSpaceGuid.PcdEmbeddedFdBaseAddress  #The base address of the FLASH Device.
+Size          = 0x00200000|gEmbeddedTokenSpaceGuid.PcdEmbeddedFdSize         #The size in bytes of the FLASH Device
 ErasePolarity = 1
-BlockSize     = 0x40
-NumBlocks     = 0x2000
+BlockSize     = 0x00001000
+NumBlocks     = 0x200
 
 ################################################################################
 #
@@ -50,10 +49,7 @@ NumBlocks     = 0x2000
 #
 ################################################################################
 
-# 512 bytes of configuration header & 8 bytes of image header
-0x00000000|0x00000208
-
-0x00000208|0x0007FDF8
+0x00000000|0x00200000
 gEmbeddedTokenSpaceGuid.PcdFlashFvMainBase|gEmbeddedTokenSpaceGuid.PcdFlashFvMainSize
 FV = FVMAIN_COMPACT
 

diff --git a/ArmEbPkg/Sec/ModuleEntryPoint.S b/ArmEbPkg/Sec/ModuleEntryPoint.S
index a586b8947e621379562c0a75014844c69dccfdbe..27b5cff9dac162131fd08f162ec632cce9fce217 100755 (executable)
--- a/ArmEbPkg/Sec/ModuleEntryPoint.S
+++ b/ArmEbPkg/Sec/ModuleEntryPoint.S
@@ -1,5 +1,11 @@
 #------------------------------------------------------------------------------ \r
 #\r
+# ARM EB Entry point. Reset vector in FV header will brach to\r
+# _ModuleEntryPoint. \r
+#\r
+# We use crazy macros, like LoadConstantToReg, since Xcode assembler \r
+# does not support = assembly syntax for ldr.\r
+#\r
 # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials\r
@@ -13,7 +19,9 @@
 #------------------------------------------------------------------------------\r
 \r
 #include <AsmMacroIoLib.h>\r
+#include <Base.h>\r
 #include <Library/PcdLib.h>\r
+#include <ArmEb/ArmEb.h>\r
 \r
 .text\r
 .align 3\r
@@ -22,29 +30,49 @@
 .globl ASM_PFX(_ModuleEntryPoint)\r
 \r
 ASM_PFX(_ModuleEntryPoint):\r
+ \r
+  // Turn off remapping NOR to 0. We can now use DRAM in low memory\r
+  MmioOr32 (EB_SP810_CTRL_BASE ,BIT8) \r
+\r
+  // Enable NEON register in case folks want to use them for optimizations (CopyMem)\r
+  mrc     p15, 0, r0, c1, c0, 2\r
+  orr     r0, r0, #0x00f00000   // Enable VPF access (V* instructions)\r
+  mcr     p15, 0, r0, c1, c0, 2\r
+  mov     r0, #0x40000000       // Set EN bit in FPEXC\r
+  msr     FPEXC,r0\r
+  \r
+   \r
+  // Set CPU vectors to start of DRAM\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
+  // Fill vector table with branchs to current pc (jmp $)\r
+  // CPU DXE driver likes known values so it can let GDB stub hook vectors\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
   //\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
-  sub     r4, r4, #0x400\r
-  mov     r13,r4\r
+  mov     r13, r4\r
 \r
   // Call C entry point\r
-  LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1)    /* memory size arg1          */\r
-  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0)    /* memory size arg0         */\r
-\r
-  blx      ASM_PFX(CEntryPoint) /* Assume C code is ARM      */\r
+  LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1)    // memory size arg1      \r
+  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0)    // memory size arg0       \r
+  blx      ASM_PFX(CEntryPoint) \r
 \r
 ShouldNeverGetHere:\r
-  /* _CEntryPoint should never return */\r
+  // _CEntryPoint should never return \r
   b       ShouldNeverGetHere\r
 \r
-  \r
+ \r

diff --git a/ArmEbPkg/Sec/ModuleEntryPoint.asm b/ArmEbPkg/Sec/ModuleEntryPoint.asm
index b669f2f7c14e92dff95a32d0c5d365ac0452f517..d9d5bb64f2e9d4e12471e83d36a0c1105055f9d7 100755 (executable)
--- a/ArmEbPkg/Sec/ModuleEntryPoint.asm
+++ b/ArmEbPkg/Sec/ModuleEntryPoint.asm
@@ -13,8 +13,11 @@
 //------------------------------------------------------------------------------\r
 \r
 #include <AsmMacroIoLib.h>\r
+#include <Base.h>\r
 #include <Library/PcdLib.h>\r
+#include <ArmEb/ArmEb.h>\r
 #include <AutoGen.h>\r
+\r
   INCLUDE AsmMacroIoLib.inc\r
   \r
   IMPORT  CEntryPoint\r
@@ -26,28 +29,50 @@
 \r
 _ModuleEntryPoint\r
  \r
+  // Turn off remapping NOR to 0. We can now use DRAM in low memory\r
+  MmioOr32 (0x10001000 ,BIT8) //EB_SP810_CTRL_BASE\r
+\r
+  // Enable NEON register in case folks want to use them for optimizations (CopyMem)\r
+  mrc     p15, 0, r0, c1, c0, 2\r
+  orr     r0, r0, #0x00f00000   // Enable VPF access (V* instructions)\r
+  mcr     p15, 0, r0, c1, c0, 2\r
+  mov     r0, #0x40000000       // Set EN bit in FPEXC\r
+  msr     FPEXC,r0\r
+  \r
+   \r
+  // Set CPU vectors to start of DRAM\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
+  // Fill vector table with branchs to current pc (jmp $)\r
+  // CPU DXE driver likes known values so it can let GDB stub hook vectors\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
   //\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     r13,r4\r
+  mov     r13, r4\r
 \r
   // Call C entry point\r
-  LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1)    /* memory size arg1          */\r
-  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0)    /* memory size arg0         */\r
-  blx     CEntryPoint       /* Assume C code is thumb    */\r
+  LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1)    // memory size arg1      \r
+  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0)    // memory size arg0       \r
+  blx     CEntryPoint \r
 \r
 ShouldNeverGetHere\r
-  /* _CEntryPoint should never return */\r
+  // _CEntryPoint should never return \r
   b       ShouldNeverGetHere\r
   \r
   END\r
 \r
+\r

diff --git a/ArmEbPkg/Sec/Sec.inf b/ArmEbPkg/Sec/Sec.inf
index ed46f96f211441128c06861d39a7d828414ece3e..6c416729fbdefe06549734f788f2d2d6416515ae 100755 (executable)
--- a/ArmEbPkg/Sec/Sec.inf
+++ b/ArmEbPkg/Sec/Sec.inf
@@ -62,4 +62,7 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiStackBase
   gEmbeddedTokenSpaceGuid.PcdMemoryBase
   gEmbeddedTokenSpaceGuid.PcdMemorySize
+
+  gArmTokenSpaceGuid.PcdCpuVectorBaseAddress
+