diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2008-11-10 14:10:13 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2008-11-10 14:10:13 +0000 |
| commit | 2c0aec814d259e35366a0a22747f8c9d5e39ee9c (patch) | |
| tree | 4b679910154b90edaf3707b13d4974ca4c8b79d3 | |
| parent | 4eccca20a3528804d6d4583f312fbb0d59b6540b (diff) | |
| download | linux-2c0aec814d259e35366a0a22747f8c9d5e39ee9c.tar.gz linux-2c0aec814d259e35366a0a22747f8c9d5e39ee9c.tar.bz2 linux-2c0aec814d259e35366a0a22747f8c9d5e39ee9c.zip | |
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>
| -rw-r--r-- | arch/arm/mach-realview/include/mach/debug-macro.S | 26 |
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 @@ * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. - * -*/ + */ + +#if defined(CONFIG_MACH_REALVIEW_EB) || \ + defined(CONFIG_MACH_REALVIEW_PB11MP) +#ifndef DEBUG_LL_UART_OFFSET +#define DEBUG_LL_UART_OFFSET 0x00009000 +#elif DEBUG_LL_UART_OFFSET != 0x00009000 +#warning "DEBUG_LL_UART_OFFSET already defined to a different value" +#endif +#endif + +#ifdef CONFIG_MACH_REALVIEW_PB1176 +#ifndef DEBUG_LL_UART_OFFSET +#define DEBUG_LL_UART_OFFSET 0x0010c000 +#elif DEBUG_LL_UART_OFFSET != 0x0010c000 +#warning "DEBUG_LL_UART_OFFSET already defined to a different value" +#endif +#endif + +#ifndef DEBUG_LL_UART_OFFSET +#error "Unknown RealView platform" +#endif .macro addruart,rx mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? moveq \rx, #0x10000000 movne \rx, #0xf0000000 @ virtual base - orr \rx, \rx, #0x00009000 + orr \rx, \rx, #DEBUG_LL_UART_OFFSET .endm #include <asm/hardware/debug-pl01x.S> |