1 files changed, 56 insertions, 36 deletions

diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig
index 92f41f6f934a..8f4d3e74c230 100644
--- a/arch/mips/vr41xx/Kconfig
+++ b/arch/mips/vr41xx/Kconfig
@@ -1,6 +1,10 @@
-config CASIO_E55
-        bool "Support for CASIO CASSIOPEIA E-10/15/55/65"
+choice
+        prompt "Machine type"
         depends on MACH_VR41XX
+        default TANBAC_TB022X
+
+config CASIO_E55
+        bool "CASIO CASSIOPEIA E-10/15/55/65"
         select DMA_NONCOHERENT
         select IRQ_CPU
         select ISA
@@ -8,8 +12,7 @@ config CASIO_E55
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config IBM_WORKPAD
-        bool "Support for IBM WorkPad z50"
-        depends on MACH_VR41XX
+        bool "IBM WorkPad z50"
         select DMA_NONCOHERENT
         select IRQ_CPU
         select ISA
@@ -17,26 +20,18 @@ config IBM_WORKPAD
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config NEC_CMBVR4133
-        bool "Support for NEC CMB-VR4133"
-        depends on MACH_VR41XX
+        bool "NEC CMB-VR4133"
         select DMA_NONCOHERENT
         select IRQ_CPU
         select HW_HAS_PCI
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
 
-config ROCKHOPPER
-        bool "Support for Rockhopper baseboard"
-        depends on NEC_CMBVR4133
-        select I8259
-        select HAVE_STD_PC_SERIAL_PORT
-
 config TANBAC_TB022X
-        bool "Support for TANBAC VR4131 multichip module and TANBAC VR4131DIMM"
-        depends on MACH_VR41XX
+        bool "TANBAC VR4131 multichip module and TANBAC VR4131DIMM"
         select DMA_NONCOHERENT
-        select HW_HAS_PCI
         select IRQ_CPU
+        select HW_HAS_PCI
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
         help
@@ -46,40 +41,65 @@ config TANBAC_TB022X
           Please refer to <http://www.tanbac.co.jp/>
           about VR4131 multichip module and VR4131DIMM.
 
-config TANBAC_TB0226
-        bool "Support for TANBAC Mbase(TB0226)"
+config VICTOR_MPC30X
+        bool "Victor MP-C303/304"
+        select DMA_NONCOHERENT
+        select IRQ_CPU
+        select HW_HAS_PCI
+        select PCI_VR41XX
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+
+config ZAO_CAPCELLA
+        bool "ZAO Networks Capcella"
+        select DMA_NONCOHERENT
+        select IRQ_CPU
+        select HW_HAS_PCI
+        select PCI_VR41XX
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+
+endchoice
+
+config ROCKHOPPER
+        bool "Support for Rockhopper base board"
+        depends on NEC_CMBVR4133
+        select PCI_VR41XX
+        select I8259
+        select HAVE_STD_PC_SERIAL_PORT
+
+choice
+        prompt "Base board type"
         depends on TANBAC_TB022X
+        default TANBAC_TB0287
+
+config TANBAC_TB0219
+        bool "TANBAC DIMM Evaluation Kit(TB0219)"
         select GPIO_VR41XX
+        select PCI_VR41XX
+        help
+          The TANBAC DIMM Evaluation Kit(TB0219) is a MIPS-based platform
+          manufactured by TANBAC.
+          Please refer to <http://www.tanbac.co.jp/> about DIMM Evaluation Kit.
+
+config TANBAC_TB0226
+        bool "TANBAC Mbase(TB0226)"
+        select GPIO_VR41XX
+        select PCI_VR41XX
         help
           The TANBAC Mbase(TB0226) is a MIPS-based platform
           manufactured by TANBAC.
           Please refer to <http://www.tanbac.co.jp/> about Mbase.
 
 config TANBAC_TB0287
-        bool "Support for TANBAC Mini-ITX DIMM base(TB0287)"
-        depends on TANBAC_TB022X
+        bool "TANBAC Mini-ITX DIMM base(TB0287)"
+        select PCI_VR41XX
         help
           The TANBAC Mini-ITX DIMM base(TB0287) is a MIPS-based platform
           manufactured by TANBAC.
           Please refer to <http://www.tanbac.co.jp/> about Mini-ITX DIMM base.
 
-config VICTOR_MPC30X
-        bool "Support for Victor MP-C303/304"
-        depends on MACH_VR41XX
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-
-config ZAO_CAPCELLA
-        bool "Support for ZAO Networks Capcella"
-        depends on MACH_VR41XX
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
+endchoice
 
 config PCI_VR41XX
         bool "Add PCI control unit support of NEC VR4100 series"