diff options
| author | Abhijit Adsule <adsule@google.com> | 2019-06-22 05:01:02 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2019-06-22 05:01:02 +0000 |
| commit | 358ea4a1cea80da9e87dfa32bf0b87a7e95080c8 (patch) | |
| tree | e124d68131a407a63a10b434227eec3961f396ad | |
| parent | ba0ff4a41a538f95eab69c7fa114f51ca22707b4 (diff) | |
| parent | c5f62a9365a32e625593de68ba67822ab1a1feb6 (diff) | |
Merge "Re-enable: msm-fossil-cw: ARCH: arm: add delay in boot-up path of non boot cpus" into android-msm-fossil-4.9android-wear-9.0.0_r0.25
| -rw-r--r-- | arch/arm/kernel/head.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 04286fd9e09c..d3e63667248a 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -408,6 +408,13 @@ ARM_BE8(eor r4, r4, r5) @ without using a temp reg. ldr r12, [r10, #PROCINFO_INITFUNC] add r12, r12, r10 @ initialise processor @ (return control reg) + movw r10, #0x93E0 + movt r10, #0x0004 +.L8: + sub r10, r10, #1 + cmp r10, #0 + bne .L8 + ret r12 ENDPROC(secondary_startup) ENDPROC(secondary_startup_arm) |