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)

2 files changed, 4 insertions, 217 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
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index 96740ef497d4..10e9b507c1b3 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -9,37 +9,6 @@ config ETRAX_ETHERNET
           This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet
           controller.
 
-choice
-        prompt "Network LED behavior"
-        depends on ETRAX_ETHERNET
-        default ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY
-
-config ETRAX_NETWORK_LED_ON_WHEN_LINK
-        bool "LED_on_when_link"
-        help
-          Selecting LED_on_when_link will light the LED when there is a
-          connection and will flash off when there is activity.
-
-          Selecting LED_on_when_activity will light the LED only when
-          there is activity.
-
-          This setting will also affect the behaviour of other activity LEDs
-          e.g. Bluetooth.
-
-config ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY
-        bool "LED_on_when_activity"
-        help
-          Selecting LED_on_when_link will light the LED when there is a
-          connection and will flash off when there is activity.
-
-          Selecting LED_on_when_activity will light the LED only when
-          there is activity.
-
-          This setting will also affect the behaviour of other activity LEDs
-          e.g. Bluetooth.
-
-endchoice
-
 config ETRAX_SERIAL
         bool "Serial-port support"
         depends on ETRAX_ARCH_V10
@@ -84,32 +53,6 @@ config ETRAX_SERIAL_PORT0
           the same DMA channels.
 
 choice
-        prompt "Ser0 DMA out assignment"
-        depends on ETRAX_SERIAL_PORT0
-        default ETRAX_SERIAL_PORT0_DMA6_OUT
-
-config ETRAX_SERIAL_PORT0_NO_DMA_OUT
-        bool "No DMA out"
-
-config ETRAX_SERIAL_PORT0_DMA6_OUT
-        bool "DMA 6"
-
-endchoice
-
-choice
-        prompt "Ser0 DMA in assignment"
-        depends on ETRAX_SERIAL_PORT0
-        default ETRAX_SERIAL_PORT0_DMA7_IN
-
-config ETRAX_SERIAL_PORT0_NO_DMA_IN
-        bool "No DMA in"
-
-config ETRAX_SERIAL_PORT0_DMA7_IN
-        bool "DMA 7"
-
-endchoice
-
-choice
         prompt "Ser0 DTR, RI, DSR and CD assignment"
         depends on ETRAX_SERIAL_PORT0
         default ETRAX_SER0_DTR_RI_DSR_CD_ON_NONE
@@ -198,32 +141,6 @@ config ETRAX_SERIAL_PORT1
           Enables the ETRAX 100 serial driver for ser1 (ttyS1).
 
 choice
-        prompt "Ser1 DMA out assignment"
-        depends on ETRAX_SERIAL_PORT1
-        default ETRAX_SERIAL_PORT1_DMA8_OUT
-
-config ETRAX_SERIAL_PORT1_NO_DMA_OUT
-        bool "No DMA out"
-
-config ETRAX_SERIAL_PORT1_DMA8_OUT
-        bool "DMA 8"
-
-endchoice
-
-choice
-        prompt "Ser1 DMA in assignment"
-        depends on ETRAX_SERIAL_PORT1
-        default ETRAX_SERIAL_PORT1_DMA9_IN
-
-config ETRAX_SERIAL_PORT1_NO_DMA_IN
-        bool "No DMA in"
-
-config ETRAX_SERIAL_PORT1_DMA9_IN
-        bool "DMA 9"
-
-endchoice
-
-choice
         prompt "Ser1 DTR, RI, DSR and CD assignment"
         depends on ETRAX_SERIAL_PORT1
         default ETRAX_SER1_DTR_RI_DSR_CD_ON_NONE
@@ -315,32 +232,6 @@ config ETRAX_SERIAL_PORT2
           Enables the ETRAX 100 serial driver for ser2 (ttyS2).
 
 choice
-        prompt "Ser2 DMA out assignment"
-        depends on ETRAX_SERIAL_PORT2
-        default ETRAX_SERIAL_PORT2_DMA2_OUT
-
-config ETRAX_SERIAL_PORT2_NO_DMA_OUT
-        bool "No DMA out"
-
-config ETRAX_SERIAL_PORT2_DMA2_OUT
-        bool "DMA 2"
-
-endchoice
-
-choice
-        prompt "Ser2 DMA in assignment"
-        depends on ETRAX_SERIAL_PORT2
-        default ETRAX_SERIAL_PORT2_DMA3_IN
-
-config ETRAX_SERIAL_PORT2_NO_DMA_IN
-        bool "No DMA in"
-
-config ETRAX_SERIAL_PORT2_DMA3_IN
-        bool "DMA 3"
-
-endchoice
-
-choice
         prompt "Ser2 DTR, RI, DSR and CD assignment"
         depends on ETRAX_SERIAL_PORT2
         default ETRAX_SER2_DTR_RI_DSR_CD_ON_NONE
@@ -429,32 +320,6 @@ config ETRAX_SERIAL_PORT3
           Enables the ETRAX 100 serial driver for ser3 (ttyS3).
 
 choice
-        prompt "Ser3 DMA out assignment"
-        depends on ETRAX_SERIAL_PORT3
-        default ETRAX_SERIAL_PORT3_DMA4_OUT
-
-config ETRAX_SERIAL_PORT3_NO_DMA_OUT
-        bool "No DMA out"
-
-config ETRAX_SERIAL_PORT3_DMA4_OUT
-        bool "DMA 4"
-
-endchoice
-
-choice
-        prompt "Ser3 DMA in assignment"
-        depends on ETRAX_SERIAL_PORT3
-        default ETRAX_SERIAL_PORT3_DMA5_IN
-
-config ETRAX_SERIAL_PORT3_NO_DMA_IN
-        bool "No DMA in"
-
-config ETRAX_SERIAL_PORT3_DMA5_IN
-        bool "DMA 5"
-
-endchoice
-
-choice
         prompt "Ser3 DTR, RI, DSR and CD assignment"
         depends on ETRAX_SERIAL_PORT3
         default ETRAX_SER3_DTR_RI_DSR_CD_ON_NONE
@@ -743,25 +608,6 @@ config ETRAX_RTC
           normal time reading should be done using libc function time and
           friends.
 
-choice
-        prompt "RTC chip"
-        depends on ETRAX_RTC
-        default ETRAX_DS1302
-
-config ETRAX_DS1302
-        bool "DS1302"
-        help
-          Enables the driver for the DS1302 Real-Time Clock battery-backed
-          chip on some products.
-
-config ETRAX_PCF8563
-        bool "PCF8563"
-        help
-          Enables the driver for the PCF8563 Real-Time Clock battery-backed
-          chip on some products.
-
-endchoice
-
 config ETRAX_DS1302_RST_ON_GENERIC_PORT
         bool "DS1302 RST on Generic Port"
         depends on ETRAX_DS1302