[ARM] compressed/head.S debugging defaults to asm/arch/debug-macro.S
Since we want new platforms to use debug-macro.S, make the decompressor debugging method default to using this include file rather than having new platforms add to an #if defined(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
0a5709b2dc
commit
224b5be6dd
|
@ -19,8 +19,6 @@
|
||||||
*/
|
*/
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
|
||||||
#include <asm/arch/debug-macro.S>
|
|
||||||
|
|
||||||
#if defined(CONFIG_DEBUG_ICEDCC)
|
#if defined(CONFIG_DEBUG_ICEDCC)
|
||||||
.macro loadsp, rb
|
.macro loadsp, rb
|
||||||
.endm
|
.endm
|
||||||
|
@ -28,29 +26,21 @@
|
||||||
mcr p14, 0, \ch, c0, c1, 0
|
mcr p14, 0, \ch, c0, c1, 0
|
||||||
.endm
|
.endm
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
#include <asm/arch/debug-macro.S>
|
||||||
|
|
||||||
.macro writeb, ch, rb
|
.macro writeb, ch, rb
|
||||||
senduart \ch, \rb
|
senduart \ch, \rb
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
#if defined(CONFIG_FOOTBRIDGE) || \
|
#if defined(CONFIG_ARCH_SA1100)
|
||||||
defined(CONFIG_ARCH_RPC) || \
|
|
||||||
defined(CONFIG_ARCH_INTEGRATOR) || \
|
|
||||||
defined(CONFIG_ARCH_PXA) || \
|
|
||||||
defined(CONFIG_ARCH_IXP4XX) || \
|
|
||||||
defined(CONFIG_ARCH_IXP2000) || \
|
|
||||||
defined(CONFIG_ARCH_LH7A40X) || \
|
|
||||||
defined(CONFIG_ARCH_OMAP)
|
|
||||||
.macro loadsp, rb
|
|
||||||
addruart \rb
|
|
||||||
.endm
|
|
||||||
#elif defined(CONFIG_ARCH_SA1100)
|
|
||||||
.macro loadsp, rb
|
.macro loadsp, rb
|
||||||
mov \rb, #0x80000000 @ physical base address
|
mov \rb, #0x80000000 @ physical base address
|
||||||
# if defined(CONFIG_DEBUG_LL_SER3)
|
#ifdef CONFIG_DEBUG_LL_SER3
|
||||||
add \rb, \rb, #0x00050000 @ Ser3
|
add \rb, \rb, #0x00050000 @ Ser3
|
||||||
# else
|
#else
|
||||||
add \rb, \rb, #0x00010000 @ Ser1
|
add \rb, \rb, #0x00010000 @ Ser1
|
||||||
# endif
|
#endif
|
||||||
.endm
|
.endm
|
||||||
#elif defined(CONFIG_ARCH_IOP331)
|
#elif defined(CONFIG_ARCH_IOP331)
|
||||||
.macro loadsp, rb
|
.macro loadsp, rb
|
||||||
|
@ -64,7 +54,9 @@
|
||||||
add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
|
add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
|
||||||
.endm
|
.endm
|
||||||
#else
|
#else
|
||||||
#error no serial architecture defined
|
.macro loadsp, rb
|
||||||
|
addruart \rb
|
||||||
|
.endm
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue