diff options
| author | Tetsuyuki Kobayashi <koba@kmckk.co.jp> | 2013-07-09 21:56:35 -0400 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-17 19:35:21 -0400 |
| commit | bdea6c657e15a709e666ea707e72327c555e8e04 (patch) | |
| tree | 89366dcabb48fe2259aacc8500a7708c0a9eb7d8 | |
| parent | 2c408d149299e99c89fc4be80fb4fe00a7016f02 (diff) | |
ARM: shmobile: fix compile error when CONFIG_THUMB2_KERNEL=y
On KZM-A9-GT board (SMP), when CONFIG_THUMB2_KERNEL=y it fails to compile
AS arch/arm/mach-shmobile/headsmp-scu.o
/proj/koba/kernel/arm-soc/arch/arm/mach-shmobile/headsmp-scu.S: Assembler messages:
/proj/koba/kernel/arm-soc/arch/arm/mach-shmobile/headsmp-scu.S:41: Error: shift must be constant -- `bic r2,r2,r3,lsl r1'
make[2]: *** [arch/arm/mach-shmobile/headsmp-scu.o] Error 1
make[1]: *** [arch/arm/mach-shmobile] Error 2
make: *** [sub-make] Error 2
Instruction `bic r2,r2,r3,lsl r1' is not supported in thumb mode. This patch split it into 2 instructions.
Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/mach-shmobile/headsmp-scu.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S index 6f9865467258..5ce416c090e1 100644 --- a/arch/arm/mach-shmobile/headsmp-scu.S +++ b/arch/arm/mach-shmobile/headsmp-scu.S | |||
| @@ -38,7 +38,8 @@ ENTRY(shmobile_boot_scu) | |||
| 38 | lsl r1, r1, #3 @ we will shift by cpu_id * 8 bits | 38 | lsl r1, r1, #3 @ we will shift by cpu_id * 8 bits |
| 39 | ldr r2, [r0, #8] @ SCU Power Status Register | 39 | ldr r2, [r0, #8] @ SCU Power Status Register |
| 40 | mov r3, #3 | 40 | mov r3, #3 |
| 41 | bic r2, r2, r3, lsl r1 @ Clear bits of our CPU (Run Mode) | 41 | lsl r3, r3, r1 |
| 42 | bic r2, r2, r3 @ Clear bits of our CPU (Run Mode) | ||
| 42 | str r2, [r0, #8] @ write back | 43 | str r2, [r0, #8] @ write back |
| 43 | 44 | ||
| 44 | b shmobile_invalidate_start | 45 | b shmobile_invalidate_start |