Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index be3a0f7..f283938 100644 (file)
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -65,13 +65,71 @@ config DEBUG_USER
 
 # These options are only for real kernel hackers who want to get their hands dirty.
 config DEBUG_LL
-       bool "Kernel low-level debugging functions"
+       bool "Kernel low-level debugging functions (read help!)"
        depends on DEBUG_KERNEL
        help
          Say Y here to include definitions of printascii, printch, printhex
          in the kernel.  This is helpful if you are debugging code that
          executes before the console is initialized.
 
+         Note that selecting this option will limit the kernel to a single
+         UART definition, as specified below. Attempting to boot the kernel
+         image on a different platform *will not work*, so this option should
+         not be enabled for kernels that are intended to be portable.
+
+choice
+       prompt "Kernel low-level debugging port"
+       depends on DEBUG_LL
+
+       config DEBUG_LL_UART_NONE
+               bool "No low-level debugging UART"
+               help
+                 Say Y here if your platform doesn't provide a UART option
+                 below. This relies on your platform choosing the right UART
+                 definition internally in order for low-level debugging to
+                 work.
+
+       config DEBUG_ICEDCC
+               bool "Kernel low-level debugging via EmbeddedICE DCC channel"
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the EmbeddedICE macrocell's DCC channel using
+                 co-processor 14. This is known to work on the ARM9 style ICE
+                 channel and on the XScale with the PEEDI.
+
+                 Note that the system will appear to hang during boot if there
+                 is nothing connected to read from the DCC.
+
+       config DEBUG_FOOTBRIDGE_COM1
+               bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1"
+               depends on FOOTBRIDGE
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the 8250 at PCI COM1.
+
+       config DEBUG_DC21285_PORT
+               bool "Kernel low-level debugging messages via footbridge serial port"
+               depends on FOOTBRIDGE
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the serial port in the DC21285 (Footbridge).
+
+       config DEBUG_CLPS711X_UART1
+               bool "Kernel low-level debugging messages via UART1"
+               depends on ARCH_CLPS711X
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the first serial port on these devices.
+
+       config DEBUG_CLPS711X_UART2
+               bool "Kernel low-level debugging messages via UART2"
+               depends on ARCH_CLPS711X
+               help
+                 Say Y here if you want the debug print routines to direct
+                 their output to the second serial port on these devices.
+
+endchoice
+
 config EARLY_PRINTK
        bool "Early printk"
        depends on DEBUG_LL
@@ -80,43 +138,14 @@ config EARLY_PRINTK
          kernel low-level debugging functions. Add earlyprintk to your
          kernel parameters to enable this console.
 
-config DEBUG_ICEDCC
-       bool "Kernel low-level debugging via EmbeddedICE DCC channel"
-       depends on DEBUG_LL
-       help
-         Say Y here if you want the debug print routines to direct their
-         output to the EmbeddedICE macrocell's DCC channel using
-         co-processor 14. This is known to work on the ARM9 style ICE
-         channel and on the XScale with the PEEDI.
-
-         It does include a timeout to ensure that the system does not
-         totally freeze when there is nothing connected to read.
-
 config OC_ETM
        bool "On-chip ETM and ETB"
-       select ARM_AMBA
+       depends on ARM_AMBA
        help
          Enables the on-chip embedded trace macrocell and embedded trace
          buffer driver that will allow you to collect traces of the
          kernel code.
 
-config DEBUG_DC21285_PORT
-       bool "Kernel low-level debugging messages via footbridge serial port"
-       depends on DEBUG_LL && FOOTBRIDGE
-       help
-         Say Y here if you want the debug print routines to direct their
-         output to the serial port in the DC21285 (Footbridge). Saying N
-         will cause the debug messages to appear on the first 16550
-         serial port.
-
-config DEBUG_CLPS711X_UART2
-       bool "Kernel low-level debugging messages via UART2"
-       depends on DEBUG_LL && ARCH_CLPS711X
-       help
-         Say Y here if you want the debug print routines to direct their
-         output to the second serial port on these devices.  Saying N will
-         cause the debug messages to appear on the first serial port.
-
 config DEBUG_S3C_UART
        depends on PLAT_SAMSUNG
        int "S3C UART to use for low-level debug"