diff options
| author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-03-05 03:17:47 +0000 |
|---|---|---|
| committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-03-05 03:17:47 +0000 |
| commit | 0f023148143c8662997b900618eca763b6f693e4 (patch) | |
| tree | 0cf7638a9d4a9bfe0c31b483a5f89139a58f7c3a | |
| parent | 4951b2482fe1d279e51110aedd157ed1628bc34c (diff) | |
| download | edk2-0f023148143c8662997b900618eca763b6f693e4.tar.gz edk2-0f023148143c8662997b900618eca763b6f693e4.tar.bz2 edk2-0f023148143c8662997b900618eca763b6f693e4.zip | |
Update to use DEBUG/RELEASE properly in DSC now tools have been fixed. Add VectorBase PCD to SEC. Don't assume it is at start of DRAM.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10200 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | ArmEbPkg/ArmEbPkg.dsc | 2 | ||||
| -rw-r--r-- | BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm | 12 | ||||
| -rw-r--r-- | BeagleBoardPkg/Sec/Sec.inf | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/ArmEbPkg/ArmEbPkg.dsc b/ArmEbPkg/ArmEbPkg.dsc index 723de37e7d..4a9e07e0da 100644 --- 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 eef6c3dc6b..414adcb266 100644 --- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm +++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.asm @@ -40,7 +40,7 @@ _ModuleEntryPoint mcr p15, 0, r0, c1, c0, 0
// Set CPU vectors to start of DRAM
- LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) /* memory size arg0 */
+ LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base
mcr p15, 0, r0, c12, c0, 0
isb // Sync changes to control registers
@@ -60,8 +60,8 @@ stack_pointer_setup // Set stack based on PCD values. Need to do it this way to make C code work
// when it runs from FLASH.
//
- LoadConstantToReg (FixedPcdGet32(PcdPrePiStackBase) ,r2) /* stack base arg2 */
- LoadConstantToReg (FixedPcdGet32(PcdPrePiStackSize) ,r3) /* stack size arg3 */
+ LoadConstantToReg (FixedPcdGet32(PcdPrePiStackBase) ,r2) // stack base arg2
+ LoadConstantToReg (FixedPcdGet32(PcdPrePiStackSize) ,r3) // stack size arg3
add r4, r2, r3
//Enter SVC mode and set up SVC stack pointer
@@ -70,9 +70,9 @@ stack_pointer_setup mov r13,r4
// Call C entry point
- LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1) /* memory size arg1 */
-// LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) Done above
- blx CEntryPoint /* Assume C code is thumb */
+ LoadConstantToReg (FixedPcdGet32(PcdMemorySize) ,r1) // memory size arg1
+ LoadConstantToReg (FixedPcdGet32(PcdMemoryBase) ,r0) // memory start arg0
+ blx CEntryPoint // Assume C code is thumb
ShouldNeverGetHere
/* _CEntryPoint should never return */
diff --git a/BeagleBoardPkg/Sec/Sec.inf b/BeagleBoardPkg/Sec/Sec.inf index 93ad6e0ebc..5f003562d0 100644 --- a/BeagleBoardPkg/Sec/Sec.inf +++ b/BeagleBoardPkg/Sec/Sec.inf @@ -65,4 +65,6 @@ gOmap35xxTokenSpaceGuid.PcdBeagleConsoleUart gOmap35xxTokenSpaceGuid.PcdBeagleFreeTimer + + gArmTokenSpaceGuid.PcdCpuVectorBaseAddress |