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

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm
index 0ae95f5dbd5a2d876daa3238d5e37be148e42c9e..ec2093adc9ce61553aa23294dcd964ae49d172f9 100644 (file)
--- 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\r
 \r
   // Keep the Cluster ID and Core ID from the MPID\r
-  LoadConstantToReg (ARM_CLUSTER_MASK | ARM_CORE_MASK, r2)\r
+  LoadConstantToReg (ARM_CLUSTER_MASK :OR: ARM_CORE_MASK, r2)\r
   and   r0, r0, r2\r
 \r
   // Compare mpid and boot cpu from ARM_SCC_CFGREG48\r