aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2012-10-09 14:34:27 +0100
committerPeter Maydell <peter.maydell@linaro.org>2012-10-09 14:34:27 +0100
commit43b951490cd783e5c9823560ca1e682a7547209c (patch)
treecaa5a0209537c7728b59a35ec1f824f64ba19b2d
parent2a42e4cbc40484bb21303358e656c4c716148b10 (diff)
downloadboot-wrapper-43b951490cd783e5c9823560ca1e682a7547209c.tar.gz
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>
-rw-r--r--boot.S2
1 files changed, 1 insertions, 1 deletions
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