aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-11-16 09:59:51 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-16 09:59:51 -0500
commit224b5be6ddc12fa7587433878866cd39e7b935f5 (patch)
tree25e4a47d9c21a3b927f1ea793f0d14628afa86f7 /arch/arm
parent0a5709b2dc84140082ea235130a05c05d51f94a2 (diff)
[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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/compressed/head.S30
1 files changed, 11 insertions, 19 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 7c7f475e213..6abafb6f184 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -19,38 +19,28 @@
19 */ 19 */
20#ifdef DEBUG 20#ifdef DEBUG
21 21
22#include <asm/arch/debug-macro.S>
23
24#if defined(CONFIG_DEBUG_ICEDCC) 22#if defined(CONFIG_DEBUG_ICEDCC)
25 .macro loadsp, rb 23 .macro loadsp, rb
26 .endm 24 .endm
27 .macro writeb, ch, rb 25 .macro writeb, ch, rb
28 mcr p14, 0, \ch, c0, c1, 0 26 mcr p14, 0, \ch, c0, c1, 0
29 .endm 27 .endm
30#else 28#else
29
30#include <asm/arch/debug-macro.S>
31
31 .macro writeb, ch, rb 32 .macro writeb, ch, rb
32 senduart \ch, \rb 33 senduart \ch, \rb
33 .endm 34 .endm
34 35
35#if defined(CONFIG_FOOTBRIDGE) || \ 36#if defined(CONFIG_ARCH_SA1100)
36 defined(CONFIG_ARCH_RPC) || \
37 defined(CONFIG_ARCH_INTEGRATOR) || \
38 defined(CONFIG_ARCH_PXA) || \
39 defined(CONFIG_ARCH_IXP4XX) || \
40 defined(CONFIG_ARCH_IXP2000) || \
41 defined(CONFIG_ARCH_LH7A40X) || \
42 defined(CONFIG_ARCH_OMAP)
43 .macro loadsp, rb
44 addruart \rb
45 .endm
46#elif defined(CONFIG_ARCH_SA1100)
47 .macro loadsp, rb 37 .macro loadsp, rb
48 mov \rb, #0x80000000 @ physical base address 38 mov \rb, #0x80000000 @ physical base address
49# if defined(CONFIG_DEBUG_LL_SER3) 39#ifdef CONFIG_DEBUG_LL_SER3
50 add \rb, \rb, #0x00050000 @ Ser3 40 add \rb, \rb, #0x00050000 @ Ser3
51# else 41#else
52 add \rb, \rb, #0x00010000 @ Ser1 42 add \rb, \rb, #0x00010000 @ Ser1
53# endif 43#endif
54 .endm 44 .endm
55#elif defined(CONFIG_ARCH_IOP331) 45#elif defined(CONFIG_ARCH_IOP331)
56 .macro loadsp, rb 46 .macro loadsp, rb
@@ -64,7 +54,9 @@
64 add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT 54 add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
65 .endm 55 .endm
66#else 56#else
67#error no serial architecture defined 57 .macro loadsp, rb
58 addruart \rb
59 .endm
68#endif 60#endif
69#endif 61#endif
70#endif 62#endif