openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: 8753/1: decompressor: add a missing parameter to the addruart macro 

In commit 639da5ee37 ("ARM: add an extra temp register to the low
level debugging addruart macro") an additional temporary register was
added to the addruart macro, but the decompressor code wasn't updated.

Fixes: 639da5ee37 ("ARM: add an extra temp register to the low level debugging addruart macro")
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Łukasz Stelmach 2018-04-03 09:04:57 +01:00 committed by Russell King
parent 60cc43fc88
commit e07e3c33b9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/boot/compressed/head.S
View File

@ -29,19 +29,19 @@
#if defined(CONFIG_DEBUG_ICEDCC) #if defined(CONFIG_DEBUG_ICEDCC)
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7) #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
.macro loadsp, rb, tmp .macro loadsp, rb, tmp1, tmp2
.endm .endm
.macro writeb, ch, rb .macro writeb, ch, rb
mcr p14, 0, \ch, c0, c5, 0 mcr p14, 0, \ch, c0, c5, 0
.endm .endm
#elif defined(CONFIG_CPU_XSCALE) #elif defined(CONFIG_CPU_XSCALE)
.macro loadsp, rb, tmp .macro loadsp, rb, tmp1, tmp2
.endm .endm
.macro writeb, ch, rb .macro writeb, ch, rb
mcr p14, 0, \ch, c8, c0, 0 mcr p14, 0, \ch, c8, c0, 0
.endm .endm
#else #else
.macro loadsp, rb, tmp .macro loadsp, rb, tmp1, tmp2
.endm .endm
.macro writeb, ch, rb .macro writeb, ch, rb
mcr p14, 0, \ch, c1, c0, 0 mcr p14, 0, \ch, c1, c0, 0
@ -57,7 +57,7 @@
.endm .endm
#if defined(CONFIG_ARCH_SA1100) #if defined(CONFIG_ARCH_SA1100)
.macro loadsp, rb, tmp .macro loadsp, rb, tmp1, tmp2
mov \rb, #0x80000000 @ physical base address mov \rb, #0x80000000 @ physical base address
#ifdef CONFIG_DEBUG_LL_SER3 #ifdef CONFIG_DEBUG_LL_SER3
add \rb, \rb, #0x00050000 @ Ser3 add \rb, \rb, #0x00050000 @ Ser3
@ -66,8 +66,8 @@
#endif #endif
.endm .endm
#else #else
.macro loadsp, rb, tmp .macro loadsp, rb, tmp1, tmp2
addruart \rb, \tmp addruart \rb, \tmp1, \tmp2
.endm .endm
#endif #endif
#endif #endif
@ -1297,7 +1297,7 @@ phex: adr r3, phexbuf
b 1b b 1b
@ puts corrupts {r0, r1, r2, r3} @ puts corrupts {r0, r1, r2, r3}
puts: loadsp r3, r1 puts: loadsp r3, r2, r1
1: ldrb r2, [r0], #1 1: ldrb r2, [r0], #1
teq r2, #0 teq r2, #0
moveq pc, lr moveq pc, lr
@ -1314,8 +1314,8 @@ puts: loadsp r3, r1
@ putc corrupts {r0, r1, r2, r3} @ putc corrupts {r0, r1, r2, r3}
putc: putc:
mov r2, r0 mov r2, r0
loadsp r3, r1, r0
mov r0, #0 mov r0, #0
loadsp r3, r1
b 2b b 2b
@ memdump corrupts {r0, r1, r2, r3, r10, r11, r12, lr} @ memdump corrupts {r0, r1, r2, r3, r10, r11, r12, lr}