From 507ebc1a35a395e173a7871ec7de2aeda71d6ead Mon Sep 17 00:00:00 2001 From: andrewfish Date: Thu, 3 Feb 2011 01:49:07 +0000 Subject: 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 --- ArmPkg/Library/ArmLib/Common/ArmLibSupport.asm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'ArmPkg/Library/ArmLib/Common') 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 + + 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 -- cgit v1.2.3