CRIS: Rearrange Kconfigs for v10 and v32 to allow compilation without warnings.

- Remove some unneeded configs and add some new ones.
- Merge common config items to common file instead of duplicating them.
- Pull in standard Kconfig.preempt.
- Remove some unneeded Kconfigs for subsystems not (yet) available on CRIS
  (md, scsi, ieee1394, i2o, isdn, telephony, media, pcmcia, pci)
- Rename CRISv32 config items which had different types from CRISv10.
  (ETRAX_LED2G, ETRAX_LED2R, ETRAX_LED3G, ETRAX_LED3R, ETRAX_I2C_DATA_PORT,
  ETRAX_I2C_CLK_PORT)

1 files changed, 4 insertions, 63 deletions

diff --git a/arch/cris/arch-v10/Kconfig b/arch/cris/arch-v10/Kconfig
index 1d61faec77cd..adc164e99339 100644
--- a/arch/cris/arch-v10/Kconfig
+++ b/arch/cris/arch-v10/Kconfig
@@ -1,5 +1,7 @@
 if ETRAX_ARCH_V10
 
+menu "CRIS v10 options"
+
 # ETRAX 100LX v1 has a MMU "feature" requiring a low mapping
 config CRIS_LOW_MAP
         bool
@@ -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).
 
-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"
@@ -454,4 +393,6 @@ config ETRAX_POWERBUTTON_BIT
         help
           Configure where power button is connected.
 
+endmenu
+
 endif