summaryrefslogtreecommitdiffstats
path: root/ArmPlatformPkg
diff options
context:
space:
mode:
authorOlivier Martin <olivier.martin@arm.com>2013-06-19 17:58:26 +0000
committeroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>2013-06-19 17:58:26 +0000
commit9d94fa2da2ee112cf3f4d5b0afc70dc915a72195 (patch)
treeb9ed14159bb3104ba7c39a16b60ad0cae34b628c /ArmPlatformPkg
parent8e1f06124c1631da5619def8c09ca4d7236f75b5 (diff)
downloadedk2-9d94fa2da2ee112cf3f4d5b0afc70dc915a72195.tar.gz
edk2-9d94fa2da2ee112cf3f4d5b0afc70dc915a72195.tar.bz2
edk2-9d94fa2da2ee112cf3f4d5b0afc70dc915a72195.zip
ArmPlatformPkg/ArmVExpressLibCTA15-A7: Fixed ARM Toolchain build
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.martin@arm.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14429 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPlatformPkg')
-rw-r--r--ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
index 0ae95f5dbd..ec2093adc9 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
@@ -61,7 +61,7 @@ ArmPlatformIsPrimaryCore FUNCTION
orr r1, r1, r2
// Keep the Cluster ID and Core ID from the MPID
- LoadConstantToReg (ARM_CLUSTER_MASK | ARM_CORE_MASK, r2)
+ LoadConstantToReg (ARM_CLUSTER_MASK :OR: ARM_CORE_MASK, r2)
and r0, r0, r2
// Compare mpid and boot cpu from ARM_SCC_CFGREG48