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

[pandora-kernel.git] / arch / cris / arch-v10 / Kconfig

diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig
index 1d61fae..df9a38b 100644 (file)
--- a/arch/cris/arch-v10/Kconfig
+++ b/arch/cris/arch-v10/Kconfig
@@ -1,5 +1,7 @@
 if ETRAX_ARCH_V10
 
 if ETRAX_ARCH_V10
 

+menu "CRIS v10 options"
+

 # ETRAX 100LX v1 has a MMU "feature" requiring a low mapping
 config CRIS_LOW_MAP
        bool
 # ETRAX 100LX v1 has a MMU "feature" requiring a low mapping
 config CRIS_LOW_MAP
        bool


@@ -22,8 +24,8 @@ config ETRAX_PA_LEDS
        help
          The ETRAX network driver is responsible for flashing LED's when
          packets arrive and are sent.  It uses macros defined in
        help
          The ETRAX network driver is responsible for flashing LED's when
          packets arrive and are sent.  It uses macros defined in

-         <file:include/asm-cris/io.h>, and those macros are defined after what
-         YOU choose in this option.  The actual bits used are configured
+         <file:arch/cris/include/asm/io.h>, and those macros are defined after
+         what YOU choose in this option.  The actual bits used are configured

          separately.  Select this if the LEDs are on port PA.  Some products
          put the leds on PB or a memory-mapped latch (CSP0) instead.
 
          separately.  Select this if the LEDs are on port PA.  Some products
          put the leds on PB or a memory-mapped latch (CSP0) instead.
 


@@ -32,8 +34,8 @@ config ETRAX_PB_LEDS
        help
          The ETRAX network driver is responsible for flashing LED's when
          packets arrive and are sent.  It uses macros defined in
        help
          The ETRAX network driver is responsible for flashing LED's when
          packets arrive and are sent.  It uses macros defined in

-         <file:include/asm-cris/io.h>, and those macros are defined after what
-         YOU choose in this option.  The actual bits used are configured
+         <file:arch/cris/include/asm/io.h>, and those macros are defined after
+         what YOU choose in this option.  The actual bits used are configured

          separately.  Select this if the LEDs are on port PB.  Some products
          put the leds on PA or a memory-mapped latch (CSP0) instead.
 
          separately.  Select this if the LEDs are on port PB.  Some products
          put the leds on PA or a memory-mapped latch (CSP0) instead.
 


@@ -42,8 +44,8 @@ config ETRAX_CSP0_LEDS
        help
          The ETRAX network driver is responsible for flashing LED's when
          packets arrive and are sent. It uses macros defined in
        help
          The ETRAX network driver is responsible for flashing LED's when
          packets arrive and are sent. It uses macros defined in

-         <file:include/asm-cris/io.h>, and those macros are defined after what
-         YOU choose in this option.  The actual bits used are configured
+         <file:arch/cris/include/asm/io.h>, and those macros are defined after
+         what YOU choose in this option.  The actual bits used are configured

          separately.  Select this if the LEDs are on a memory-mapped latch
          using chip select CSP0, this is mapped at 0x90000000.
          Some products put the leds on PA or PB instead.
          separately.  Select this if the LEDs are on a memory-mapped latch
          using chip select CSP0, this is mapped at 0x90000000.
          Some products put the leds on PA or PB instead.


@@ -228,69 +230,6 @@ config ETRAX_LED12R
          For products with only one or two controllable LEDs,
          set this to same as CONFIG_ETRAX_LED1G (normally 2).
 
          For products with only one or two controllable LEDs,
          set this to same as CONFIG_ETRAX_LED1G (normally 2).
 

-choice
-       prompt "Product debug-port"
-       depends on ETRAX_ARCH_V10
-       default ETRAX_DEBUG_PORT0
-
-config ETRAX_DEBUG_PORT0
-       bool "Serial-0"
-       help
-         Choose a serial port for the ETRAX debug console.  Default to
-         port 0.
-
-config ETRAX_DEBUG_PORT1
-       bool "Serial-1"
-       help
-         Use serial port 1 for the console.
-
-config ETRAX_DEBUG_PORT2
-       bool "Serial-2"
-       help
-         Use serial port 2 for the console.
-
-config ETRAX_DEBUG_PORT3
-       bool "Serial-3"
-       help
-         Use serial port 3 for the console.
-
-config ETRAX_DEBUG_PORT_NULL
-       bool "disabled"
-       help
-         Disable serial-port debugging.
-
-endchoice
-
-choice
-       prompt "Kernel GDB port"
-       depends on ETRAX_KGDB
-       default ETRAX_KGDB_PORT0
-       help
-         Choose a serial port for kernel debugging.  NOTE: This port should
-         not be enabled under Drivers for built-in interfaces (as it has its
-         own initialization code) and should not be the same as the debug port.
-
-config ETRAX_KGDB_PORT0
-       bool "Serial-0"
-       help
-         Use serial port 0 for kernel debugging.
-
-config ETRAX_KGDB_PORT1
-       bool "Serial-1"
-       help
-         Use serial port 1 for kernel debugging.
-
-config ETRAX_KGDB_PORT2
-       bool "Serial-2"
-       help
-         Use serial port 2 for kernel debugging.
-
-config ETRAX_KGDB_PORT3
-       bool "Serial-3"
-       help
-         Use serial port 3 for kernel debugging.
-
-endchoice

 
 choice
        prompt "Product rescue-port"
 
 choice
        prompt "Product rescue-port"


@@ -454,4 +393,6 @@ config ETRAX_POWERBUTTON_BIT
        help
          Configure where power button is connected.
 
        help
          Configure where power button is connected.
 

+endmenu
+

 endif
 endif