diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-03-19 11:01:36 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-08 13:59:09 +0200 |
| commit | f87b95dd2e4a8832b1d6034f15a5324db42608a0 (patch) | |
| tree | 95c3811973753dde3d241d9d9f4452b335c51e29 | |
| parent | 55b175d7e6327939df82592ef279c534da323354 (diff) | |
| download | olio-linux-3.10-f87b95dd2e4a8832b1d6034f15a5324db42608a0.tar.xz olio-linux-3.10-f87b95dd2e4a8832b1d6034f15a5324db42608a0.zip | |
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>
| -rw-r--r-- | arch/arm/Kconfig.debug | 8 | ||||
| -rw-r--r-- | arch/arm/include/debug/ux500.S (renamed from arch/arm/mach-ux500/include/mach/debug-macro.S) | 0 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index ecfcdba2d17..2ac4a20115e 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -414,6 +414,13 @@ choice Say Y here if you want the debug print routines to direct their output to the uart1 port on SiRFmarco devices. + config DEBUG_UX500_UART + depends on ARCH_U8500 + bool "Use Ux500 UART for low-level debug" + help + Say Y here if you want kernel low-level debugging support + on Ux500 based platforms. + config DEBUG_VEXPRESS_UART0_DETECT bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" depends on ARCH_VEXPRESS && CPU_CP15_MMU @@ -598,6 +605,7 @@ config DEBUG_LL_INCLUDE DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 default "debug/vt8500.S" if DEBUG_VT8500_UART0 default "debug/tegra.S" if DEBUG_TEGRA_UART + default "debug/ux500.S" if DEBUG_UX500_UART default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "mach/debug-macro.S" diff --git a/arch/arm/mach-ux500/include/mach/debug-macro.S b/arch/arm/include/debug/ux500.S index 67035223334..67035223334 100644 --- a/arch/arm/mach-ux500/include/mach/debug-macro.S +++ b/arch/arm/include/debug/ux500.S |