Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[pandora-kernel.git] / arch / arm / Kconfig.debug

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 5f0cdf2..acdddda 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -205,12 +205,19 @@ choice
                  Say Y here if you want kernel low-level debugging support
                  on i.MX28.
 
-       config DEBUG_IMX31_IMX35_UART
-               bool "i.MX31 and i.MX35 Debug UART"
-               depends on SOC_IMX31 || SOC_IMX35
+       config DEBUG_IMX31_UART
+               bool "i.MX31 Debug UART"
+               depends on SOC_IMX31
                help
                  Say Y here if you want kernel low-level debugging support
-                 on i.MX31 or i.MX35.
+                 on i.MX31.
+
+       config DEBUG_IMX35_UART
+               bool "i.MX35 Debug UART"
+               depends on SOC_IMX35
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on i.MX35.
 
        config DEBUG_IMX51_UART
                bool "i.MX51 Debug UART"
@@ -393,6 +400,20 @@ choice
                  Say Y here if you want kernel low-level debugging support
                  on Tegra based platforms.
 
+       config DEBUG_SIRFPRIMA2_UART1
+               bool "Kernel low-level debugging messages via SiRFprimaII UART1"
+               depends on ARCH_PRIMA2
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the uart1 port on SiRFprimaII devices.
+
+       config DEBUG_SIRFMARCO_UART1
+               bool "Kernel low-level debugging messages via SiRFmarco UART1"
+               depends on ARCH_MARCO
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the uart1 port on SiRFmarco devices.
+
        config DEBUG_VEXPRESS_UART0_DETECT
                bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
                depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -464,11 +485,16 @@ choice
 
 endchoice
 
-config DEBUG_IMX6Q_UART_PORT
-       int "i.MX6Q Debug UART Port (1-5)" if DEBUG_IMX6Q_UART
-       range 1 5
+config DEBUG_IMX_UART_PORT
+       int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \
+                                               DEBUG_IMX25_UART || \
+                                               DEBUG_IMX21_IMX27_UART || \
+                                               DEBUG_IMX31_UART || \
+                                               DEBUG_IMX35_UART || \
+                                               DEBUG_IMX51_UART || \
+                                               DEBUG_IMX50_IMX53_UART || \
+                                               DEBUG_IMX6Q_UART
        default 1
-       depends on SOC_IMX6Q
        help
          Choose UART port on which kernel low-level debug messages
          should be output.
@@ -557,7 +583,8 @@ config DEBUG_LL_INCLUDE
        default "debug/imx.S" if DEBUG_IMX1_UART || \
                                 DEBUG_IMX25_UART || \
                                 DEBUG_IMX21_IMX27_UART || \
-                                DEBUG_IMX31_IMX35_UART || \
+                                DEBUG_IMX31_UART || \
+                                DEBUG_IMX35_UART || \
                                 DEBUG_IMX51_UART || \
                                 DEBUG_IMX53_UART ||\
                                 DEBUG_IMX6Q_UART