MIPS: TXx9: Add TX4939 SoC support

[linux-2.6-omap-h63xx.git] / arch / mips / txx9 / Kconfig

diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
index 6de4c5aa92bea002115b07c58351c4776efbf7fb..58691a1fe779cc172b84d0290a0beaea98431ef5 100644 (file)
--- a/arch/mips/txx9/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -1,3 +1,27 @@
+config MACH_TX39XX
+       bool
+       select MACH_TXX9
+       select SYS_HAS_CPU_TX39XX
+
+config MACH_TX49XX
+       bool
+       select MACH_TXX9
+       select CEVT_R4K
+       select CSRC_R4K
+       select IRQ_CPU
+       select SYS_HAS_CPU_TX49XX
+       select SYS_SUPPORTS_64BIT_KERNEL
+
+config MACH_TXX9
+       bool
+       select DMA_NONCOHERENT
+       select SWAP_IO_SPACE
+       select SYS_HAS_EARLY_PRINTK
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select GENERIC_HARDIRQS_NO__DO_IRQ
+
 config TOSHIBA_JMR3927
        bool "Toshiba JMR-TX3927 board"
        depends on MACH_TX39XX
@@ -24,68 +48,44 @@ config TOSHIBA_RBTX4938
 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 SOC_TX4939
+       bool
+       select CEVT_TXX9
+       select HAS_TXX9_SERIAL
+       select HW_HAS_PCI
+       select PCI_TX4927
+
 config TOSHIBA_FPCIB0
        bool "FPCIB0 Backplane Support"
-       depends on PCI && (MACH_TX39XX || MACH_TX49XX)
+       depends on PCI && MACH_TXX9
        select I8259
 
 config PICMG_PCI_BACKPLANE_DEFAULT
        bool "Support for PICMG PCI Backplane"
-       depends on PCI && (MACH_TX39XX || MACH_TX49XX)
+       depends on PCI && MACH_TXX9
        default y if !TOSHIBA_FPCIB0
 
 if TOSHIBA_RBTX4938
@@ -101,16 +101,11 @@ config TOSHIBA_RBTX4938_MPLEX_NAND
        bool "NAND"
 config TOSHIBA_RBTX4938_MPLEX_ATA
        bool "ATA"
+config TOSHIBA_RBTX4938_MPLEX_KEEP
+       bool "Keep firmware settings"
 
 endchoice
 
-config TX4938_NAND_BOOT
-       depends on EXPERIMENTAL && TOSHIBA_RBTX4938_MPLEX_NAND
-       bool "NAND Boot Support (EXPERIMENTAL)"
-       help
-         This is only for Toshiba RBTX4938 reference board, which has NAND IPL.
-         Select this option if you need to use NAND boot.
-
 endif
 
 config PCI_TX4927