summaryrefslogtreecommitdiff
path: root/ArmPkg/Library/ArmLib/Common
diff options
context:
space:
mode:
authorandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2011-02-03 01:49:07 +0000
committerandrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>2011-02-03 01:49:07 +0000
commit507ebc1a35a395e173a7871ec7de2aeda71d6ead (patch)
tree93bcb18ae472f22702585a4134a8d9470448f9f8 /ArmPkg/Library/ArmLib/Common
parent2ac288f9199196dfc4ab05bee0a7815ca361174a (diff)
downloadedk2-platforms-507ebc1a35a395e173a7871ec7de2aeda71d6ead.tar.xz
Fixes to get CodeSourcery GCC and RVCT 3.1 compiling.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11298 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPkg/Library/ArmLib/Common')
-rw-r--r--ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm10
1 files changed, 7 insertions, 3 deletions
diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
index 4d6c253cd2..850bb9691c 100644
--- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
+++ b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm
@@ -12,6 +12,9 @@
//
//------------------------------------------------------------------------------
+#include <AsmMacroIoLib.h>
+
+ INCLUDE AsmMacroIoLib.inc
EXPORT Cp15IdCode
EXPORT Cp15CacheInfo
@@ -41,9 +44,9 @@ Cp15CacheInfo
ArmIsMPCore
mrc p15,0,R0,c0,c0,5
- # Get Multiprocessing extension (bit31) & U bit (bit30)
+ // Get Multiprocessing extension (bit31) & U bit (bit30)
and R0, R0, #0xC0000000
- # if bit30 == 0 then the processor is part of a multiprocessor system)
+ // if bit30 == 0 then the processor is part of a multiprocessor system)
and R0, R0, #0x80000000
bx LR
@@ -102,7 +105,8 @@ ArmSetTTBR0
ArmGetTTBR0BaseAddress
mrc p15,0,r0,c2,c0,0
- and r0, r0, #0xFFFFC000
+ LoadConstantToReg(0xFFFFC000,r1) // and r0, r0, #0xFFFFC000
+ and r0, r0, r1
bx lr
ArmSetDomainAccessControl