aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-realview
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2008-11-10 09:10:13 -0500
committerCatalin Marinas <catalin.marinas@arm.com>2008-11-10 09:10:13 -0500
commit2c0aec814d259e35366a0a22747f8c9d5e39ee9c (patch)
tree4b679910154b90edaf3707b13d4974ca4c8b79d3 /arch/arm/mach-realview
parent4eccca20a3528804d6d4583f312fbb0d59b6540b (diff)
RealView: Add debug-macro.S support for the PB1176 platform
The UART0 address is different on PB1176 from EB or PB11MPCore. This patch adds the necessary #ifdef's to this file. The disadvantage is that enabling CONFIG_DEBUG_LL will work properly on PB1176 if only this platform is enabled. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/mach-realview')
-rw-r--r--arch/arm/mach-realview/include/mach/debug-macro.S26
1 files changed, 23 insertions, 3 deletions
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S
index 7196bcadff0c..d0076ca588a6 100644
--- a/arch/arm/mach-realview/include/mach/debug-macro.S
+++ b/arch/arm/mach-realview/include/mach/debug-macro.S
@@ -8,15 +8,35 @@
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License version 2 as 9 * it under the terms of the GNU General Public License version 2 as
10 * published by the Free Software Foundation. 10 * published by the Free Software Foundation.
11 * 11 */
12*/ 12
13#if defined(CONFIG_MACH_REALVIEW_EB) || \
14 defined(CONFIG_MACH_REALVIEW_PB11MP)
15#ifndef DEBUG_LL_UART_OFFSET
16#define DEBUG_LL_UART_OFFSET 0x00009000
17#elif DEBUG_LL_UART_OFFSET != 0x00009000
18#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
19#endif
20#endif
21
22#ifdef CONFIG_MACH_REALVIEW_PB1176
23#ifndef DEBUG_LL_UART_OFFSET
24#define DEBUG_LL_UART_OFFSET 0x0010c000
25#elif DEBUG_LL_UART_OFFSET != 0x0010c000
26#warning "DEBUG_LL_UART_OFFSET already defined to a different value"
27#endif
28#endif
29
30#ifndef DEBUG_LL_UART_OFFSET
31#error "Unknown RealView platform"
32#endif
13 33
14 .macro addruart,rx 34 .macro addruart,rx
15 mrc p15, 0, \rx, c1, c0 35 mrc p15, 0, \rx, c1, c0
16 tst \rx, #1 @ MMU enabled? 36 tst \rx, #1 @ MMU enabled?
17 moveq \rx, #0x10000000 37 moveq \rx, #0x10000000
18 movne \rx, #0xf0000000 @ virtual base 38 movne \rx, #0xf0000000 @ virtual base
19 orr \rx, \rx, #0x00009000 39 orr \rx, \rx, #DEBUG_LL_UART_OFFSET
20 .endm 40 .endm
21 41
22#include <asm/hardware/debug-pl01x.S> 42#include <asm/hardware/debug-pl01x.S>