1 files changed, 4 insertions, 63 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 2ea6fff88811..72baa1a70fcb 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -550,66 +550,11 @@ config SNI_RM
           Technology and now in turn merged with Fujitsu.  Say Y here to
           support this machine type.
 
-config TOSHIBA_JMR3927
-        bool "Toshiba JMR-TX3927 board"
-        select CEVT_TXX9
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select MIPS_TX3927
-        select IRQ_TXX9
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_TX39XX
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        select GPIO_TXX9
+config MACH_TX39XX
+        bool "Toshiba TX39 series based machines"
 
-config TOSHIBA_RBTX4927
-        bool "Toshiba RBTX49[23]7 board"
-        select CEVT_R4K
-        select CSRC_R4K
-        select CEVT_TXX9
-        select DMA_NONCOHERENT
-        select HAS_TXX9_SERIAL
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select IRQ_TXX9
-        select PCI_TX4927
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_TX49XX
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_64BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_KGDB
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        help
-          This Toshiba board is based on the TX4927 processor. Say Y here to
-          support this machine type
-
-config TOSHIBA_RBTX4938
-        bool "Toshiba RBTX4938 board"
-        select CEVT_R4K
-        select CSRC_R4K
-        select CEVT_TXX9
-        select DMA_NONCOHERENT
-        select HAS_TXX9_SERIAL
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select IRQ_TXX9
-        select PCI_TX4927
-        select SWAP_IO_SPACE
-        select SYS_HAS_CPU_TX49XX
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_KGDB
-        select GENERIC_HARDIRQS_NO__DO_IRQ
-        select GPIO_TXX9
-        help
-          This Toshiba board is based on the TX4938 processor. Say Y here to
-          support this machine type
+config MACH_TX49XX
+        bool "Toshiba TX49 series based machines"
 
 config WR_PPMC
         bool "Wind River PPMC board"
@@ -887,10 +832,6 @@ config PCI_GT64XXX_PCI0
 config NO_EXCEPT_FILL
         bool
 
-config MIPS_TX3927
-        bool
-        select HAS_TXX9_SERIAL
-
 config MIPS_RM9122
         bool
         select SERIAL_RM9000