summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap/omap3_core.S
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-01-15 21:39:02 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-01-17 18:51:10 +0100
commitfc5b5e71ac7dbf29bad21d057501ba0728b71301 (patch)
tree5d87502071220a211d424c0425cb09eaad088d72 /arch/arm/mach-omap/omap3_core.S
parent7762f9627a3ec971e4122abf0b3d831b619dcad7 (diff)
downloadbarebox-fc5b5e71ac7dbf29bad21d057501ba0728b71301.tar.gz
barebox-fc5b5e71ac7dbf29bad21d057501ba0728b71301.tar.xz
ARM omap3: make omap3_core.S thumb safe
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Sanjeev Premi <premi@ti.com>
Diffstat (limited to 'arch/arm/mach-omap/omap3_core.S')
-rw-r--r--arch/arm/mach-omap/omap3_core.S8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-omap/omap3_core.S b/arch/arm/mach-omap/omap3_core.S
index dffbe99d12..ceb3c76ee5 100644
--- a/arch/arm/mach-omap/omap3_core.S
+++ b/arch/arm/mach-omap/omap3_core.S
@@ -71,8 +71,12 @@ inval_loop1:
inval_loop2:
mov r9, r4 /* create working copy of max way size */
inval_loop3:
- orr r11, r10, r9, lsl r5 /* factor way and cache number into r11*/
- orr r11, r11, r7, lsl r2 /* factor index number into r11 */
+ARM( orr r11, r10, r9, lsl r5 ) /* factor way and cache number into r11 */
+ARM( orr r11, r11, r7, lsl r2 ) /* factor index number into r11 */
+THUMB( lsl r6, r9, r5 )
+THUMB( orr r11, r10, r6 ) /* factor way and cache number into r11 */
+THUMB( lsl r6, r7, r2 )
+THUMB( orr r11, r11, r6 ) /* factor index number into r11 */
mcr p15, 0, r11, c7, c6, 2 /* invalidate by set/way */
subs r9, r9, #1 /* decrement the way */
bge inval_loop3