From 43b951490cd783e5c9823560ca1e682a7547209c Mon Sep 17 00:00:00 2001
From: Jon Medhurst <tixy@linaro.org>
Date: Tue, 9 Oct 2012 14:34:27 +0100
Subject: bootwrapper: Allow for multiple clusters in boot CPU detection

Check all the CPU affinity fields of MPIDR, so we select only
the first CPU of the first cluster as the one to boot on.

Signed-off-by: Jon Medhurst <tixy@linaro.org>
Acked-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 boot.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.S b/boot.S
index 727119a..40ebd33 100644
--- a/boot.S
+++ b/boot.S
@@ -121,7 +121,7 @@ start:
 
 	@ Check CPU nr again
 	mrc	p15, 0, r0, c0, c0, 5		@ MPIDR (ARMv7 only)
-	and	r0, r0, #15			@ CPU number
+	bfc	r0, #24, #8			@ CPU number, taking multicluster into account
 	cmp	r0, #0				@ primary CPU?
 	beq	2f
 
-- 
cgit v1.2.3