Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6383c700686c3f6000474b485b8094e40580465a..d21df5f1b1f3a4eff9ce168a4116bb2e0dd9c6ca 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -217,26 +217,6 @@ config MIPS_MALTA
          This enables support for the MIPS Technologies Malta evaluation
          board.
 
-config MIPS_SEAD
-       bool "MIPS SEAD board"
-       select CEVT_R4K
-       select CSRC_R4K
-       select IRQ_CPU
-       select DMA_NONCOHERENT
-       select SYS_HAS_EARLY_PRINTK
-       select MIPS_BOARDS_GEN
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_HAS_CPU_MIPS64_R1
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_SUPPORTS_SMARTMIPS
-       help
-         This enables support for the MIPS Technologies SEAD evaluation
-         board.
-
 config MIPS_SIM
        bool 'MIPS simulator (MIPSsim)'
        select CEVT_R4K
@@ -405,6 +385,8 @@ config SGI_IP28
        select SGI_HAS_DS1286
        select SGI_HAS_I8042
        select SGI_HAS_INDYDOG
+       select SGI_HAS_HAL2
+       select SGI_HAS_HAL2
        select SGI_HAS_SEEQ
        select SGI_HAS_WD93
        select SGI_HAS_ZILOG
@@ -570,65 +552,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 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 I8259 if TOSHIBA_FPCIB0
-       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 MACH_TX39XX
+       bool "Toshiba TX39 series based machines"
 
-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 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"
@@ -662,8 +590,7 @@ source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
-source "arch/mips/tx4927/Kconfig"
-source "arch/mips/tx4938/Kconfig"
+source "arch/mips/txx9/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 
 endmenu
@@ -907,10 +834,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
@@ -947,6 +870,9 @@ config SGI_HAS_DS1286
 config SGI_HAS_INDYDOG
        bool
 
+config SGI_HAS_HAL2
+       bool
+
 config SGI_HAS_SEEQ
        bool
 
@@ -1731,6 +1657,7 @@ config SMP
        bool "Multi-Processing support"
        depends on SYS_SUPPORTS_SMP
        select IRQ_PER_CPU
+       select USE_GENERIC_SMP_HELPERS
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If