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 840fe757c48d836faa36b77b1c94e32585552b70..58691a1fe779cc172b84d0290a0beaea98431ef5 100644 (file)
--- a/arch/mips/txx9/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -71,6 +71,13 @@ config SOC_TX4938
        select PCI_TX4927
        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_TXX9
@@ -94,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