diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-03-19 06:01:36 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-08 07:59:09 -0400 |
commit | f87b95dd2e4a8832b1d6034f15a5324db42608a0 (patch) | |
tree | 95c3811973753dde3d241d9d9f4452b335c51e29 /arch/arm/mach-ux500/include | |
parent | 55b175d7e6327939df82592ef279c534da323354 (diff) |
ARM: ux500: move debugmacro to debug includes
This moves the Ux500 debug macro to the debug headers to
make way for multiplatform support.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500/include')
-rw-r--r-- | arch/arm/mach-ux500/include/mach/debug-macro.S | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/arm/mach-ux500/include/mach/debug-macro.S b/arch/arm/mach-ux500/include/mach/debug-macro.S deleted file mode 100644 index 67035223334a..000000000000 --- a/arch/arm/mach-ux500/include/mach/debug-macro.S +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * Debugging macro include header | ||
3 | * | ||
4 | * Copyright (C) 2009 ST-Ericsson | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | * | ||
10 | */ | ||
11 | #include <mach/hardware.h> | ||
12 | |||
13 | #if CONFIG_UX500_DEBUG_UART > 2 | ||
14 | #error Invalid Ux500 debug UART | ||
15 | #endif | ||
16 | |||
17 | /* | ||
18 | * DEBUG_LL only works if only one SOC is built in. We don't use #else below | ||
19 | * in order to get "__UX500_UART redefined" warnings if more than one SOC is | ||
20 | * built, so that there's some hint during the build that something is wrong. | ||
21 | */ | ||
22 | |||
23 | #ifdef CONFIG_UX500_SOC_DB8500 | ||
24 | #define __UX500_UART(n) U8500_UART##n##_BASE | ||
25 | #endif | ||
26 | |||
27 | #ifndef __UX500_UART | ||
28 | #error Unknown SOC | ||
29 | #endif | ||
30 | |||
31 | #define UX500_UART(n) __UX500_UART(n) | ||
32 | #define UART_BASE UX500_UART(CONFIG_UX500_DEBUG_UART) | ||
33 | |||
34 | .macro addruart, rp, rv, tmp | ||
35 | ldr \rp, =UART_BASE @ no, physical address | ||
36 | ldr \rv, =IO_ADDRESS(UART_BASE) @ yes, virtual address | ||
37 | .endm | ||
38 | |||
39 | #include <asm/hardware/debug-pl01x.S> | ||