Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index f15f82bf3a50f808005af479ff9c334f100c1044..b0f3857b3a4c647714a4d748726524e20f01bd4c 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -224,6 +224,20 @@ choice
                  Say Y here if you want kernel low-level debugging support
                  on i.MX6Q UART4.
 
+       config DEBUG_MMP_UART2
+               bool "Kernel low-level debugging message via MMP UART2"
+               depends on ARCH_MMP
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on MMP UART2.
+
+       config DEBUG_MMP_UART3
+               bool "Kernel low-level debugging message via MMP UART3"
+               depends on ARCH_MMP
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on MMP UART3.
+
        config DEBUG_MSM_UART1
                bool "Kernel low-level debugging messages via MSM UART1"
                depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
@@ -261,6 +275,20 @@ choice
                  Say Y here if you want the debug print routines to direct
                  their output to the serial port on MSM 8960 devices.
 
+       config DEBUG_MVEBU_UART
+               bool "Kernel low-level debugging messages via MVEBU UART"
+               depends on ARCH_MVEBU
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on MVEBU based platforms.
+
+       config DEBUG_PICOXCELL_UART
+               depends on ARCH_PICOXCELL
+               bool "Use PicoXcell UART for low-level debug"
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on PicoXcell based platforms.
+
        config DEBUG_REALVIEW_STD_PORT
                bool "RealView Default UART"
                depends on ARCH_REALVIEW
@@ -310,6 +338,13 @@ choice
                  The uncompressor code port configuration is now handled
                  by CONFIG_S3C_LOWLEVEL_UART_PORT.
 
+       config DEBUG_SOCFPGA_UART
+               depends on ARCH_SOCFPGA
+               bool "Use SOCFPGA UART for low-level debug"
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on SOCFPGA based platforms.
+
        config DEBUG_VEXPRESS_UART0_DETECT
                bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
                depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -338,6 +373,7 @@ choice
 
        config DEBUG_LL_UART_NONE
                bool "No low-level debugging UART"
+               depends on !ARCH_MULTIPLATFORM
                help
                  Say Y here if your platform doesn't provide a UART option
                  below. This relies on your platform choosing the right UART
@@ -356,15 +392,15 @@ choice
                  is nothing connected to read from the DCC.
 
        config DEBUG_SEMIHOSTING
-               bool "Kernel low-level debug output via semihosting I"
+               bool "Kernel low-level debug output via semihosting I/O"
                help
                  Semihosting enables code running on an ARM target to use
                  the I/O facilities on a host debugger/emulator through a
-                 simple SVC calls. The host debugger or emulator must have
+                 simple SVC call. The host debugger or emulator must have
                  semihosting enabled for the special svc call to be trapped
                  otherwise the kernel will crash.
 
-                 This is known to work with OpenOCD, as wellas
+                 This is known to work with OpenOCD, as well as
                  ARM's Fast Models, or any other controlling environment
                  that implements semihosting.
 
@@ -373,6 +409,17 @@ choice
 
 endchoice
 
+config DEBUG_LL_INCLUDE
+       string
+       default "debug/icedcc.S" if DEBUG_ICEDCC
+       default "debug/highbank.S" if DEBUG_HIGHBANK_UART
+       default "debug/mvebu.S" if DEBUG_MVEBU_UART
+       default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
+       default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
+       default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
+               DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
+       default "mach/debug-macro.S"
+
 config EARLY_PRINTK
        bool "Early printk"
        depends on DEBUG_LL