lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap4: Fix build break when used with gcc-4.4.1 (2009-q3)

Browse Source 
This patch adds  argument to smc calls as gcc-4.4.1 requires it
otherwise the build breaks with 2009-q3 toolchanin.

arch/arm/mach-omap2/omap-headsmp.S: Assembler messages:
arch/arm/mach-omap2/omap-headsmp.S:36: Error: missing expression -- `smc'
arch/arm/mach-omap2/omap-headsmp.S:55: Error: missing expression -- `smc'
arch/arm/mach-omap2/omap-headsmp.S:63: Error: missing expression -- `smc'
make[1]: *** [arch/arm/mach-omap2/omap-headsmp.o] Error 1

Signed-off-by: Richard Woodruff <r-woodruff2@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Richard Woodruff
2010-04-07 07:47:21 +00:00
committed by Tony Lindgren
parent 519e61666f
commit df571c4ab3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-omap2/omap-headsmp.S
View File

@@ -33,7 +33,7 @@
ENTRY(omap_secondary_startup) ENTRY(omap_secondary_startup)
hold: ldr r12,=0x103 hold: ldr r12,=0x103
dsb dsb
smc @ read from AuxCoreBoot0 smc #0 @ read from AuxCoreBoot0
mov r0, r0, lsr #9 mov r0, r0, lsr #9
mrc p15, 0, r4, c0, c0, 5 mrc p15, 0, r4, c0, c0, 5
and r4, r4, #0x0f and r4, r4, #0x0f
@@ -52,7 +52,7 @@ ENTRY(omap_modify_auxcoreboot0)
stmfd sp!, {r1-r12, lr} stmfd sp!, {r1-r12, lr}
ldr r12, =0x104 ldr r12, =0x104
dsb dsb
smc smc #0
ldmfd sp!, {r1-r12, pc} ldmfd sp!, {r1-r12, pc}
END(omap_modify_auxcoreboot0) END(omap_modify_auxcoreboot0)
@@ -60,6 +60,6 @@ ENTRY(omap_auxcoreboot_addr)
stmfd sp!, {r2-r12, lr} stmfd sp!, {r2-r12, lr}
ldr r12, =0x105 ldr r12, =0x105
dsb dsb
smc smc #0
ldmfd sp!, {r2-r12, pc} ldmfd sp!, {r2-r12, pc}
END(omap_auxcoreboot_addr) END(omap_auxcoreboot_addr)

2
arch/arm/mach-omap2/omap44xx-smc.S
View File

@@ -27,6 +27,6 @@ ENTRY(omap_smc1)
mov r12, r0 mov r12, r0
mov r0, r1 mov r0, r1
dsb dsb
smc smc #0
ldmfd sp!, {r2-r12, pc} ldmfd sp!, {r2-r12, pc}
END(omap_smc1) END(omap_smc1)