Commit 224b5be6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0a5709b2

arch/arm/boot/compressed/head.S

+11 −19
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
 */

#ifdef DEBUG



#include <asm/arch/debug-macro.S>



#if defined(CONFIG_DEBUG_ICEDCC)

		.macro	loadsp, rb

		.endm
@@ -28,25 +26,17 @@ 
		mcr	p14, 0, \ch, c0, c1, 0

		.endm

#else



#include <asm/arch/debug-macro.S>



		.macro	writeb,	ch, rb

		senduart \ch, \rb

		.endm



#if defined(CONFIG_FOOTBRIDGE) || \

    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)

#if defined(CONFIG_ARCH_SA1100)

		.macro	loadsp, rb

		mov	\rb, #0x80000000	@ physical base address

#  if defined(CONFIG_DEBUG_LL_SER3)

#ifdef CONFIG_DEBUG_LL_SER3

		add	\rb, \rb, #0x00050000	@ Ser3

#else

		add	\rb, \rb, #0x00010000	@ Ser1
@@ -64,7 +54,9 @@ 
		add	\rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT

		.endm

#else

#error no serial architecture defined

		.macro	loadsp,	rb

		addruart \rb

		.endm

#endif

#endif

#endif