1 files changed, 80 insertions, 2 deletions

diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
index b8cdb192543a..b92a134ef124 100644
--- a/arch/mips/txx9/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -1,11 +1,89 @@
+config TOSHIBA_JMR3927
+        bool "Toshiba JMR-TX3927 board"
+        depends on MACH_TX39XX
+        select SOC_TX3927
+
+config TOSHIBA_RBTX4927
+        bool "Toshiba RBTX49[23]7 board"
+        depends on MACH_TX49XX
+        select SOC_TX4927
+        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"
+        depends on MACH_TX49XX
+        select SOC_TX4938
+        help
+          This Toshiba board is based on the TX4938 processor. Say Y here to
+          support this machine type
+
+config SOC_TX3927
+        bool
+        select CEVT_TXX9
+        select DMA_NONCOHERENT
+        select HAS_TXX9_SERIAL
+        select HW_HAS_PCI
+        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 SOC_TX4927
+        bool
+        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
+        select GPIO_TXX9
+
+config SOC_TX4938
+        bool
+        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
+        select GPIO_TXX9
+
 config TOSHIBA_FPCIB0
         bool "FPCIB0 Backplane Support"
-        depends on PCI && (SYS_HAS_CPU_TX49XX || SYS_HAS_CPU_TX39XX)
+        depends on PCI && (MACH_TX39XX || MACH_TX49XX)
         select I8259
 
 config PICMG_PCI_BACKPLANE_DEFAULT
         bool "Support for PICMG PCI Backplane"
-        depends on PCI && (SYS_HAS_CPU_TX49XX || SYS_HAS_CPU_TX39XX)
+        depends on PCI && (MACH_TX39XX || MACH_TX49XX)
         default y if !TOSHIBA_FPCIB0
 
 if TOSHIBA_RBTX4938