]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
arch/arm/cpu/arm_cortexa8/omap3/cache.S: make build with older tools
authorWolfgang Denk <wd@denx.de>
Fri, 18 Jun 2010 13:55:15 +0000 (15:55 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 18 Jun 2010 14:01:07 +0000 (16:01 +0200)
The push / pop instructions used in this file are available only with
more recent tool chains:

cache.S: Assembler messages:
cache.S:133: Error: bad instruction `push {r0,r1,r2,lr}'
cache.S:160: Error: bad instruction `pop {r1,r2,r3,pc}'
cache.S:164: Error: bad instruction `push {r0,r1,r2,lr}'
cache.S:191: Error: bad instruction `pop {r1,r2,r3,pc}'

Change push/pop into stmfd/ldmfd instructions to support older
versions of binutils as well.

I verified that the modified source code generates exactly the same
binary code.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Tom Rix <tom@bumblecow.com>
arch/arm/cpu/arm_cortexa8/omap3/cache.S

index 0f63815359e40c3e31282355d6a72f459205c639..4b65ac58a57a3f30cfdd96617f323f153e67296e 100644 (file)
@@ -130,7 +130,7 @@ finished_inval:
 
 
 l2_cache_enable:
-       push    {r0, r1, r2, lr}
+       stmfd   r13!, {r0, r1, r2, lr}
        @ ES2 onwards we can disable/enable L2 ourselves
        bl      get_cpu_rev
        cmp     r0, #CPU_3XX_ES20
@@ -157,11 +157,11 @@ l2_cache_enable_EARLIER_THAN_ES2:
        mov     ip, r3
        str     r3, [sp, #4]
 l2_cache_enable_END:
-       pop     {r1, r2, r3, pc}
+       ldmfd   r13!, {r1, r2, r3, pc}
 
 
 l2_cache_disable:
-       push    {r0, r1, r2, lr}
+       stmfd   r13!, {r0, r1, r2, lr}
        @ ES2 onwards we can disable/enable L2 ourselves
        bl      get_cpu_rev
        cmp     r0, #CPU_3XX_ES20
@@ -188,4 +188,4 @@ l2_cache_disable_EARLIER_THAN_ES2:
        mov     ip, r3
        str     r3, [sp, #4]
 l2_cache_disable_END:
-       pop     {r1, r2, r3, pc}
+       ldmfd   r13!, {r1, r2, r3, pc}