From 9d94fa2da2ee112cf3f4d5b0afc70dc915a72195 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Wed, 19 Jun 2013 17:58:26 +0000 Subject: [PATCH] ArmPlatformPkg/ArmVExpressLibCTA15-A7: Fixed ARM Toolchain build Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14429 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Library/ArmVExpressLibCTA15-A7/CTA15-A7Helper.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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