Update to use DEBUG/RELEASE properly in DSC now tools have been fixed. Add VectorBase...

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

diff --git a/ArmEbPkg/ArmEbPkg.dsc b/ArmEbPkg/ArmEbPkg.dsc
index 723de37e7d4e5b226787b901796cd3f92aa8c4ab..4a9e07e0da80e0d5a4d8851025ce21c85481d9f4 100644 (file)
--- a/ArmEbPkg/ArmEbPkg.dsc
+++ b/ArmEbPkg/ArmEbPkg.dsc
@@ -34,7 +34,7 @@
 
 
 [LibraryClasses.common]
-!if DEBUG_TARGET == RELEASE
+!if $(BUILD_TARGETS) == RELEASE
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
 !else
   DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf

diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
index eef6c3dc6be2307377cb60bb64ac643b466b784e..414adcb266a48f88ae6ce59f9e52add945f684cd 100644 (file)
--- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
+++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm
@@ -40,7 +40,7 @@ _ModuleEntryPoint
   mcr     p15, 0, r0, c1, c0, 0\r
  \r
   // Set CPU vectors to start of DRAM\r
-  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) /* memory size arg0         */\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
@@ -60,8 +60,8 @@ stack_pointer_setup
   // 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
@@ -70,9 +70,9 @@ stack_pointer_setup
   mov     r13,r4\r
 \r
   // Call C entry point\r
-  LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1)    /* memory size arg1          */\r
-//  LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0)  Done above  \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

diff --git a/BeagleBoardPkg/Sec/Sec.inf b/BeagleBoardPkg/Sec/Sec.inf
index 93ad6e0ebc4eaa865a97c164bd55f2b1b5d907be..5f003562d0c8e5ea92bde22138c13ff947b18a4d 100644 (file)
--- a/BeagleBoardPkg/Sec/Sec.inf
+++ b/BeagleBoardPkg/Sec/Sec.inf
@@ -65,4 +65,6 @@
   
   gOmap35xxTokenSpaceGuid.PcdBeagleConsoleUart
   gOmap35xxTokenSpaceGuid.PcdBeagleFreeTimer
+  
+  gArmTokenSpaceGuid.PcdCpuVectorBaseAddress