| Message ID | 1400055127.31197.1.camel@x220 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 14 May 2014 10:12:07 Paul Bolle wrote: > #if defined(CONFIG_ARCH_SA1100) > .macro loadsp, rb, tmp > mov \rb, #0x80000000 @ physical base address > -#ifdef CONFIG_DEBUG_LL_SER3 > - add \rb, \rb, #0x00050000 @ Ser3 > -#else > add \rb, \rb, #0x00010000 @ Ser1 > -#endif > .endm > #elif defined(CONFIG_ARCH_S3C24XX) > .macro loadsp, rb, tmp I wonder if the entire CONFIG_ARCH_SA1100 section here is actually needed at all, or if it should just use the #else path that calls addruart, which is defined as .macro addruart, rp, rv, tmp mrc p15, 0, \rp, c1, c0 tst \rp, #1 @ MMU enabled? moveq \rp, #0x80000000 @ physical base address movne \rp, #0xf8000000 @ virtual address @ We probe for the active serial port here, coherently with @ the comment in arch/arm/mach-sa1100/include/mach/uncompress.h. @ We assume r1 can be clobbered. @ see if Ser3 is active add \rp, \rp, #0x00050000 ldr \rv, [\rp, #UTCR3] tst \rv, #UTCR3_TXE @ if Ser3 is inactive, then try Ser1 addeq \rp, \rp, #(0x00010000 - 0x00050000) ldreq \rv, [\rp, #UTCR3] tsteq \rv, #UTCR3_TXE @ if Ser1 is inactive, then try Ser2 addeq \rp, \rp, #(0x00030000 - 0x00010000) ldreq \rv, [\rp, #UTCR3] tsteq \rv, #UTCR3_TXE @ clear top bits, and generate both phys and virt addresses lsl \rp, \rp, #8 lsr \rp, \rp, #8 orr \rv, \rp, #0xf8000000 @ virtual orr \rp, \rp, #0x80000000 @ physical .endm There is a CONFIG_ARCH_S3C24XX case just below it, and I'm pretty sure that one can be removed, because the loadsp implementation for s3c24xx is basically the same as the addruart code. Russell removed most of the other cases in 5cd0c3442021 "ARM: decompressor: use platform debug macros", but I can't find an explanation for why s3c24xx, sa1100 and iop331 were left at the time. Arnd
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 066b03480b63..c16e8bf31e0b 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -54,11 +54,7 @@ #if defined(CONFIG_ARCH_SA1100) .macro loadsp, rb, tmp mov \rb, #0x80000000 @ physical base address -#ifdef CONFIG_DEBUG_LL_SER3 - add \rb, \rb, #0x00050000 @ Ser3 -#else add \rb, \rb, #0x00010000 @ Ser1 -#endif .endm #elif defined(CONFIG_ARCH_S3C24XX) .macro loadsp, rb, tmp
A check for CONFIG_DEBUG_LL_SER3 was added in v2.5.43. But the related symbol DEBUG_LL_SER3 was already removed in v2.5.8. This check has always evaluated to false. Remove it. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> --- Untested. arch/arm/boot/compressed/head.S | 4 ---- 1 file changed, 4 deletions(-)