Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...

[linux-2.6.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 03562f5..1f9a0c9 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -4,162 +4,174 @@ config MIPS
        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
 
        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
 

-config MIPS64
-       bool "64-bit kernel"
-       help
-         Select this option if you want to build a 64-bit kernel.  You should
-         only select this option if you have hardware that actually has a
-         64-bit processor and if your application will actually benefit from
-         64-bit processing, otherwise say N.  You must say Y for kernels for
-         SGI IP27 (Origin 200 and 2000).  If in doubt say N.
-
-config 64BIT
-       def_bool MIPS64
-
-config MIPS32
-       bool
-       depends on MIPS64 = 'n'
-       default y
-

 mainmenu "Linux/MIPS Kernel Configuration"
 
 mainmenu "Linux/MIPS Kernel Configuration"
 

-source "init/Kconfig"
-

 menu "Machine selection"
 
 menu "Machine selection"
 

-config MACH_JAZZ
-       bool "Support for the Jazz family of machines"
-       select ISA
-       help
-        This a family of machines based on the MIPS R4030 chipset which was
-        used by several vendors to build RISC/os and Windows NT workstations.
-        Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
-        Olivetti M700-10 workstations.
+choice
+       prompt "System type"
+       default SGI_IP22

 
 

-config ACER_PICA_61
-       bool "Support for Acer PICA 1 chipset (EXPERIMENTAL)"
-       depends on MACH_JAZZ && EXPERIMENTAL
+config MIPS_MTX1
+       bool "4G Systems MTX-1 board"

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       help
-         This is a machine with a R4400 133/150 MHz CPU. To compile a Linux
-         kernel that runs on these, say Y here. For details about Linux on
-         the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-         <http://www.linux-mips.org/>.
+       select HW_HAS_PCI
+       select SOC_AU1500
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config MIPS_MAGNUM_4000
-       bool "Support for MIPS Magnum 4000"
-       depends on MACH_JAZZ
+config MIPS_BOSPORUS
+       bool "AMD Alchemy Bosporus board"
+       select SOC_AU1500

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       help
-         This is a machine with a R4000 100 MHz CPU. To compile a Linux
-         kernel that runs on these, say Y here. For details about Linux on
-         the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-         <http://www.linux-mips.org/>.
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config OLIVETTI_M700
-       bool "Support for Olivetti M700-10"
-       depends on MACH_JAZZ
+config MIPS_PB1000
+       bool "AMD Alchemy PB1000 board"
+       select SOC_AU1000

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       help
-         This is a machine with a R4000 100 MHz CPU. To compile a Linux
-         kernel that runs on these, say Y here. For details about Linux on
-         the MIPS architecture, check out the Linux/MIPS FAQ on the WWW at
-         <http://www.linux-mips.org/>.
-
-config BAGET_MIPS
-       bool "Support for BAGET MIPS series (EXPERIMENTAL)"
-       depends on MIPS32 && EXPERIMENTAL
-       help
-         This enables support for the Baget, a Russian embedded system.  For
-         more details about the Baget see the Linux/MIPS FAQ on
-         <http://www.linux-mips.org/>.
-
-config MACH_VR41XX
-       bool "Support for NEC VR41XX-based machines"
+       select HW_HAS_PCI
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config CASIO_E55
-       bool "Support for CASIO CASSIOPEIA E-10/15/55/65"
-       depends on MACH_VR41XX
+config MIPS_PB1100
+       bool "AMD Alchemy PB1100 board"
+       select SOC_AU1100

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       select IRQ_CPU
-       select ISA
+       select HW_HAS_PCI
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config IBM_WORKPAD
-       bool "Support for IBM WorkPad z50"
-       depends on MACH_VR41XX
+config MIPS_PB1500
+       bool "AMD Alchemy PB1500 board"
+       select SOC_AU1500

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       select IRQ_CPU
-       select ISA
+       select HW_HAS_PCI
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config TANBAC_TB0226
-       bool "Support for TANBAC TB0226 (Mbase)"
-       depends on MACH_VR41XX
+config MIPS_PB1550
+       bool "AMD Alchemy PB1550 board"
+       select SOC_AU1550

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select HW_HAS_PCI

-       select IRQ_CPU
-       help
-         The TANBAC TB0226 (Mbase) is a MIPS-based platform manufactured by TANBAC.
-         Please refer to <http://www.tanbac.co.jp/> about Mbase.
+       select MIPS_DISABLE_OBSOLETE_IDE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config TANBAC_TB0229
-       bool "Support for TANBAC TB0229 (VR4131DIMM)"
-       depends on MACH_VR41XX
+config MIPS_PB1200
+       bool "AMD Alchemy PB1200 board"
+       select SOC_AU1200

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       select HW_HAS_PCI
-       select IRQ_CPU
-       help
-         The TANBAC TB0229 (VR4131DIMM) is a MIPS-based platform manufactured by TANBAC.
-         Please refer to <http://www.tanbac.co.jp/> about VR4131DIMM.
+       select MIPS_DISABLE_OBSOLETE_IDE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config VICTOR_MPC30X
-       bool "Support for Victor MP-C303/304"
+config MIPS_DB1000
+       bool "AMD Alchemy DB1000 board"
+       select SOC_AU1000

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select HW_HAS_PCI

-       select IRQ_CPU
-       depends on MACH_VR41XX
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config ZAO_CAPCELLA
-       bool "Support for ZAO Networks Capcella"
-       depends on MACH_VR41XX
+config MIPS_DB1100
+       bool "AMD Alchemy DB1100 board"
+       select SOC_AU1100

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       select HW_HAS_PCI
-       select IRQ_CPU
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config PCI_VR41XX
-       bool "Add PCI control unit support of NEC VR4100 series"
-       depends on MACH_VR41XX && PCI
+config MIPS_DB1500
+       bool "AMD Alchemy DB1500 board"
+       select SOC_AU1500
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select MIPS_DISABLE_OBSOLETE_IDE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config VRC4171
-       tristate "Add NEC VRC4171 companion chip support"
-       depends on MACH_VR41XX && ISA
-       ---help---
-         The NEC VRC4171/4171A is a companion chip for NEC VR4111/VR4121.
+config MIPS_DB1550
+       bool "AMD Alchemy DB1550 board"
+       select SOC_AU1550
+       select HW_HAS_PCI
+       select DMA_NONCOHERENT
+       select MIPS_DISABLE_OBSOLETE_IDE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config VRC4173
-       tristate "Add NEC VRC4173 companion chip support"
-       depends on MACH_VR41XX && PCI_VR41XX
-       ---help---
-         The NEC VRC4173 is a companion chip for NEC VR4122/VR4131.
+config MIPS_DB1200
+       bool "AMD Alchemy DB1200 board"
+       select SOC_AU1200
+       select DMA_COHERENT
+       select MIPS_DISABLE_OBSOLETE_IDE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config TOSHIBA_JMR3927
-       bool "Support for Toshiba JMR-TX3927 board"
-       depends on MIPS32
+config MIPS_MIRAGE
+       bool "AMD Alchemy Mirage board"

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

+       select SOC_AU1500
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+
+config BASLER_EXCITE
+       bool "Basler eXcite smart camera support"
+       select DMA_COHERENT

        select HW_HAS_PCI
        select HW_HAS_PCI

+       select IRQ_CPU
+       select IRQ_CPU_RM7K
+       select IRQ_CPU_RM9K
+       select SERIAL_RM9000
+       select SYS_HAS_CPU_RM9000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       help
+         The eXcite is a smart camera platform manufactured by
+         Basler Vision Technologies AG
+
+config BASLER_EXCITE_PROTOTYPE
+       bool "Support for pre-release units"
+       depends on BASLER_EXCITE
+       default n
+       help
+         Pre-series (prototype) units are different from later ones in
+         some ways. Select this option if you have one of these. Please
+         note that a kernel built with this option selected will not be
+         able to run on normal units.

 
 config MIPS_COBALT
 
 config MIPS_COBALT

-       bool "Support for Cobalt Server (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "Cobalt Server"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select I8259

        select IRQ_CPU
        select IRQ_CPU

+       select MIPS_GT64111
+       select SYS_HAS_CPU_NEVADA
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config MACH_DECSTATION
 
 config MACH_DECSTATION

-       bool "Support for DECstations"
+       bool "DECstations"
+       select BOOT_ELF32

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

+       select EARLY_PRINTK

        select IRQ_CPU
        select IRQ_CPU

-       depends on MIPS32 || EXPERIMENTAL
-       ---help---
+       select SYS_HAS_CPU_R3000
+       select SYS_HAS_CPU_R4X00
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select SYS_SUPPORTS_128HZ
+       select SYS_SUPPORTS_256HZ
+       select SYS_SUPPORTS_1024HZ
+       help

          This enables support for DEC's MIPS based workstations.  For details
          see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the
          DECstation porting pages on <http://decstation.unix-ag.org/>.
          This enables support for DEC's MIPS based workstations.  For details
          see the Linux/MIPS FAQ on <http://www.linux-mips.org/> and the
          DECstation porting pages on <http://decstation.unix-ag.org/>.


@@ -175,10 +187,15 @@ config MACH_DECSTATION
          otherwise choose R3000.
 
 config MIPS_EV64120
          otherwise choose R3000.
 
 config MIPS_EV64120

-       bool "Support for Galileo EV64120 Evaluation board (EXPERIMENTAL)"
+       bool "Galileo EV64120 Evaluation board (EXPERIMENTAL)"

        depends on EXPERIMENTAL
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        depends on EXPERIMENTAL
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select MIPS_GT64120
+       select SYS_HAS_CPU_R5000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN

        help
          This is an evaluation board based on the Galileo GT-64120
          single-chip system controller that contains a MIPS R5000 compatible
        help
          This is an evaluation board based on the Galileo GT-64120
          single-chip system controller that contains a MIPS R5000 compatible


@@ -186,18 +203,20 @@ config MIPS_EV64120
          <http://www.marvell.com/>.  Say Y here if you wish to build a
          kernel for this platform.
 
          <http://www.marvell.com/>.  Say Y here if you wish to build a
          kernel for this platform.
 

-config EVB_PCI1
-       bool "Enable Second PCI (PCI1)"
-       depends on MIPS_EV64120
-

 config MIPS_EV96100
 config MIPS_EV96100

-       bool "Support for Galileo EV96100 Evaluation board (EXPERIMENTAL)"
+       bool "Galileo EV96100 Evaluation board (EXPERIMENTAL)"

        depends on EXPERIMENTAL
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select MIPS_GT96100
        select RM7000_CPU_SCACHE
        depends on EXPERIMENTAL
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select MIPS_GT96100
        select RM7000_CPU_SCACHE

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_R5000
+       select SYS_HAS_CPU_RM7000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_BIG_ENDIAN

        help
          This is an evaluation board based on the Galileo GT-96100 LAN/WAN
          communications controllers containing a MIPS R5000 compatible core
        help
          This is an evaluation board based on the Galileo GT-96100 LAN/WAN
          communications controllers containing a MIPS R5000 compatible core


@@ -205,9 +224,14 @@ config MIPS_EV96100
          here if you wish to build a kernel for this platform.
 
 config MIPS_IVR
          here if you wish to build a kernel for this platform.
 
 config MIPS_IVR

-       bool "Support for Globespan IVR board"
+       bool "Globespan IVR board"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select ITE_BOARD_GEN
+       select SYS_HAS_CPU_NEVADA
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_LITTLE_ENDIAN

        help
          This is an evaluation board built by Globespan to showcase thir
          iVR (Internet Video Recorder) design. It utilizes a QED RM5231
        help
          This is an evaluation board built by Globespan to showcase thir
          iVR (Internet Video Recorder) design. It utilizes a QED RM5231


@@ -215,39 +239,16 @@ config MIPS_IVR
          located at <http://www.globespan.net/>. Say Y here if you wish to
          build a kernel for this platform.
 
          located at <http://www.globespan.net/>. Say Y here if you wish to
          build a kernel for this platform.
 

-config LASAT
-       bool "Support for LASAT Networks platforms"
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select R5000_CPU_SCACHE
-
-config PICVUE
-       tristate "PICVUE LCD display driver"
-       depends on LASAT
-
-config PICVUE_PROC
-       tristate "PICVUE LCD display driver /proc interface"
-       depends on PICVUE
-
-config DS1603
-       bool "DS1603 RTC driver"
-       depends on LASAT
-
-config LASAT_SYSCTL
-       bool "LASAT sysctl interface"
-       depends on LASAT
-
-config HP_LASERJET
-       bool "Support for Hewlett Packard LaserJet board"
-       depends on BROKEN
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select IRQ_CPU
-

 config MIPS_ITE8172
 config MIPS_ITE8172

-       bool "Support for ITE 8172G board"
+       bool "ITE 8172G board"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select ITE_BOARD_GEN
+       select SYS_HAS_CPU_R5432
+       select SYS_HAS_CPU_NEVADA
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_LITTLE_ENDIAN

        help
          Ths is an evaluation board made by ITE <http://www.ite.com.tw/>
          with ATX form factor that utilizes a MIPS R5000 to work with its
        help
          Ths is an evaluation board made by ITE <http://www.ite.com.tw/>
          with ATX form factor that utilizes a MIPS R5000 to work with its


@@ -255,140 +256,264 @@ config MIPS_ITE8172
          either a NEC Vr5432 or QED RM5231. Say Y here if you wish to build
          a kernel for this platform.
 
          either a NEC Vr5432 or QED RM5231. Say Y here if you wish to build
          a kernel for this platform.
 

-config IT8172_REVC
-       bool "Support for older IT8172 (Rev C)"
-       depends on MIPS_ITE8172
+config MACH_JAZZ
+       bool "Jazz family of machines"
+       select ARC
+       select ARC32
+       select ARCH_MAY_HAVE_PC_FDC
+       select GENERIC_ISA_DMA
+       select I8253
+       select I8259
+       select ISA
+       select SYS_HAS_CPU_R4X00
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_100HZ

        help
        help

-         Say Y here to support the older, Revision C version of the Integrated
-         Technology Express, Inc. ITE8172 SBC.  Vendor page at
-         <http://www.ite.com.tw/ia/brief_it8172bsp.htm>; picture of the
-         board at <http://www.mvista.com/partners/semiconductor/ite.html>.
+        This a family of machines based on the MIPS R4030 chipset which was
+        used by several vendors to build RISC/os and Windows NT workstations.
+        Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
+        Olivetti M700-10 workstations.
+
+config LASAT
+       bool "LASAT Networks platforms"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select MIPS_GT64120
+       select MIPS_NILE4
+       select R5000_CPU_SCACHE
+       select SYS_HAS_CPU_R5000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config MIPS_ATLAS
 
 config MIPS_ATLAS

-       bool "Support for MIPS Atlas board"
+       bool "MIPS Atlas board"
+       select BOOT_ELF32

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

+       select IRQ_CPU

        select HW_HAS_PCI
        select HW_HAS_PCI

-       help
-         This enables support for the QED R5231-based MIPS Atlas evaluation
+       select MIPS_BOARDS_GEN
+       select MIPS_BONITO64
+       select MIPS_GT64120
+       select MIPS_MSC
+       select RM7000_CPU_SCACHE
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_HAS_CPU_MIPS64_R1
+       select SYS_HAS_CPU_NEVADA
+       select SYS_HAS_CPU_RM7000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
+       help
+         This enables support for the MIPS Technologies Atlas evaluation

          board.
 
 config MIPS_MALTA
          board.
 
 config MIPS_MALTA

-       bool "Support for MIPS Malta board"
+       bool "MIPS Malta board"
+       select ARCH_MAY_HAVE_PC_FDC
+       select BOOT_ELF32

        select HAVE_STD_PC_SERIAL_PORT
        select DMA_NONCOHERENT
        select HAVE_STD_PC_SERIAL_PORT
        select DMA_NONCOHERENT

+       select IRQ_CPU
+       select GENERIC_ISA_DMA

        select HW_HAS_PCI
        select HW_HAS_PCI

-       help
-         This enables support for the VR5000-based MIPS Malta evaluation
+       select I8259
+       select MIPS_BOARDS_GEN
+       select MIPS_BONITO64
+       select MIPS_CPU_SCACHE
+       select MIPS_GT64120
+       select MIPS_MSC
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_HAS_CPU_MIPS64_R1
+       select SYS_HAS_CPU_NEVADA
+       select SYS_HAS_CPU_RM7000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select SYS_SUPPORTS_MULTITHREADING
+       help
+         This enables support for the MIPS Technologies Malta evaluation

          board.
 
 config MIPS_SEAD
          board.
 
 config MIPS_SEAD

-       bool "Support for MIPS SEAD board (EXPERIMENTAL)"
+       bool "MIPS SEAD board (EXPERIMENTAL)"

        depends on EXPERIMENTAL
        select IRQ_CPU
        select DMA_NONCOHERENT
        depends on EXPERIMENTAL
        select IRQ_CPU
        select DMA_NONCOHERENT

+       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
+       help
+         This enables support for the MIPS Technologies SEAD evaluation
+         board.

 
 

-config MOMENCO_OCELOT
-       bool "Support for Momentum Ocelot board"
+config WR_PPMC
+       bool "Wind River PPMC board"
+       select IRQ_CPU
+       select BOOT_ELF32
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select MIPS_GT64120
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_HAS_CPU_MIPS64_R1
+       select SYS_HAS_CPU_NEVADA
+       select SYS_HAS_CPU_RM7000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       help
+         This enables support for the Wind River MIPS32 4KC PPMC evaluation
+         board, which is based on GT64120 bridge chip.
+
+config MIPS_SIM
+       bool 'MIPS simulator (MIPSsim)'
+       select DMA_NONCOHERENT
+       select IRQ_CPU
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_HAS_CPU_MIPS32_R2
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       help
+         This option enables support for MIPS Technologies MIPSsim software
+         emulator.
+
+config MOMENCO_JAGUAR_ATX
+       bool "Momentum Jaguar board"
+       select BOOT_ELF32

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select IRQ_CPU_RM7K
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select IRQ_CPU_RM7K

+       select IRQ_MV64340
+       select LIMITED_DMA
+       select PCI_MARVELL

        select RM7000_CPU_SCACHE
        select RM7000_CPU_SCACHE

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_RM9000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN

        help
        help

-         The Ocelot is a MIPS-based Single Board Computer (SBC) made by
+         The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by

          Momentum Computer <http://www.momenco.com/>.
 
          Momentum Computer <http://www.momenco.com/>.
 

-config MOMENCO_OCELOT_G
-       bool "Support for Momentum Ocelot-G board"
+config MOMENCO_OCELOT
+       bool "Momentum Ocelot board"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select IRQ_CPU_RM7K
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select IRQ_CPU_RM7K

-       select PCI_MARVELL
+       select MIPS_GT64120

        select RM7000_CPU_SCACHE
        select RM7000_CPU_SCACHE

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_RM7000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN

        help
          The Ocelot is a MIPS-based Single Board Computer (SBC) made by
          Momentum Computer <http://www.momenco.com/>.
 
        help
          The Ocelot is a MIPS-based Single Board Computer (SBC) made by
          Momentum Computer <http://www.momenco.com/>.
 

-config MOMENCO_OCELOT_C
-       bool "Support for Momentum Ocelot-C board"
+config MOMENCO_OCELOT_3
+       bool "Momentum Ocelot-3 board"
+       select BOOT_ELF32

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU

+       select IRQ_CPU_RM7K

        select IRQ_MV64340
        select PCI_MARVELL
        select RM7000_CPU_SCACHE
        select IRQ_MV64340
        select PCI_MARVELL
        select RM7000_CPU_SCACHE

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_RM9000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN

        help
        help

-         The Ocelot is a MIPS-based Single Board Computer (SBC) made by
-         Momentum Computer <http://www.momenco.com/>.
+         The Ocelot-3 is based off Discovery III System Controller and
+         PMC-Sierra Rm79000 core.

 
 

-config MOMENCO_JAGUAR_ATX
-       bool "Support for Momentum Jaguar board"
+config MOMENCO_OCELOT_C
+       bool "Momentum Ocelot-C board"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select IRQ_CPU

-       select IRQ_CPU_RM7K

        select IRQ_MV64340
        select IRQ_MV64340

-       select LIMITED_DMA

        select PCI_MARVELL
        select RM7000_CPU_SCACHE
        select PCI_MARVELL
        select RM7000_CPU_SCACHE

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_RM7000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN

        help
        help

-         The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by
+         The Ocelot is a MIPS-based Single Board Computer (SBC) made by

          Momentum Computer <http://www.momenco.com/>.
 
          Momentum Computer <http://www.momenco.com/>.
 

-config JAGUAR_DMALOW
-       bool "Low DMA Mode"
-       depends on MOMENCO_JAGUAR_ATX
-       help
-         Select to Y if jump JP5 is set on your board, N otherwise.  Normally
-         the jumper is set, so if you feel unsafe, just say Y.
-
-config PMC_YOSEMITE
-       bool "Support for PMC-Sierra Yosemite eval board"
-       select DMA_COHERENT
+config MOMENCO_OCELOT_G
+       bool "Momentum Ocelot-G board"
+       select DMA_NONCOHERENT

        select HW_HAS_PCI
        select IRQ_CPU
        select IRQ_CPU_RM7K
        select HW_HAS_PCI
        select IRQ_CPU
        select IRQ_CPU_RM7K

+       select PCI_MARVELL
+       select RM7000_CPU_SCACHE
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_RM7000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select ARCH_SPARSEMEM_ENABLE

        help
        help

-         Yosemite is an evaluation board for the RM9000x2 processor
-         manufactured by PMC-Sierra
-
-config HYPERTRANSPORT
-       bool "Hypertransport Support for PMC-Sierra Yosemite"
-       depends on PMC_YOSEMITE
+         The Ocelot is a MIPS-based Single Board Computer (SBC) made by
+         Momentum Computer <http://www.momenco.com/>.

 
 

-config DDB5074
-       bool "Support for NEC DDB Vrc-5074 (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+config MIPS_XXS1500
+       bool "MyCable XXS1500 board"

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       select HAVE_STD_PC_SERIAL_PORT
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select ISA
-       help
-         This enables support for the VR5000-based NEC DDB Vrc-5074
-         evaluation board.
+       select SOC_AU1500
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-config DDB5476
-       bool "Support for NEC DDB Vrc-5476"
-       select DMA_NONCOHERENT
-       select HAVE_STD_PC_SERIAL_PORT
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select ISA
-       help
-         This enables support for the R5432-based NEC DDB Vrc-5476
-         evaluation board.
+config PNX8550_V2PCI
+       bool "Philips PNX8550 based Viper2-PCI board"
+       depends on BROKEN
+       select PNX8550
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 

-         Features : kernel debugging, serial terminal, NFS root fs, on-board
-         ether port USB, AC97, PCI, PCI VGA card & framebuffer console,
-         IDE controller, PS2 keyboard, PS2 mouse, etc.
+config PNX8550_JBS
+       bool "Philips PNX8550 based JBS board"
+       depends on BROKEN
+       select PNX8550
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config DDB5477
 
 config DDB5477

-       bool "Support for NEC DDB Vrc-5477"
+       bool "NEC DDB Vrc-5477"
+       select DDB5XXX_COMMON

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select I8259

        select IRQ_CPU
        select IRQ_CPU

+       select SYS_HAS_CPU_R5432
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_LITTLE_ENDIAN

        help
          This enables support for the R5432-based NEC DDB Vrc-5477,
          or Rockhopper/SolutionGear boards with R5432/R5500 CPUs.
        help
          This enables support for the R5432-based NEC DDB Vrc-5477,
          or Rockhopper/SolutionGear boards with R5432/R5500 CPUs.


@@ -396,428 +521,321 @@ config DDB5477
          Features : kernel debugging, serial terminal, NFS root fs, on-board
          ether port USB, AC97, PCI, etc.
 
          Features : kernel debugging, serial terminal, NFS root fs, on-board
          ether port USB, AC97, PCI, etc.
 

-config DDB5477_BUS_FREQUENCY
-       int "bus frequency (in kHZ, 0 for auto-detect)"
-       depends on DDB5477
-       default 0
+config MACH_VR41XX
+       bool "NEC VR41XX-based machines"
+       select SYS_HAS_CPU_VR41XX
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+
+config PMC_YOSEMITE
+       bool "PMC-Sierra Yosemite eval board"
+       select DMA_COHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select IRQ_CPU_RM7K
+       select IRQ_CPU_RM9K
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_RM9000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_HIGHMEM
+       select SYS_SUPPORTS_SMP
+       help
+         Yosemite is an evaluation board for the RM9000x2 processor
+         manufactured by PMC-Sierra.

 
 

-config NEC_OSPREY
-       bool "Support for NEC Osprey board"
+config QEMU
+       bool "Qemu"
+       select DMA_COHERENT
+       select GENERIC_ISA_DMA
+       select HAVE_STD_PC_SERIAL_PORT
+       select I8253
+       select I8259
+       select ISA
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select ARCH_SPARSEMEM_ENABLE
+       help
+         Qemu is a software emulator which among other architectures also
+         can simulate a MIPS32 4Kc system.  This patch adds support for the
+         system architecture that currently is being simulated by Qemu.  It
+         will eventually be removed again when Qemu has the capability to
+         simulate actual MIPS hardware platforms.  More information on Qemu
+         can be found at http://www.linux-mips.org/wiki/Qemu.
+
+config MARKEINS
+       bool "Support for NEC EMMA2RH Mark-eins"

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

+       select HW_HAS_PCI

        select IRQ_CPU
        select IRQ_CPU

+       select SWAP_IO_SPACE
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select SYS_HAS_CPU_R5000
+       help
+         This enables support for the R5432-based NEC Mark-eins
+         boards with R5500 CPU.

 
 config SGI_IP22
 
 config SGI_IP22

-       bool "Support for SGI IP22 (Indy/Indigo2)"
+       bool "SGI IP22 (Indy/Indigo2)"
+       select ARC
+       select ARC32
+       select BOOT_ELF32

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

+       select HW_HAS_EISA

        select IP22_CPU_SCACHE
        select IRQ_CPU
        select IP22_CPU_SCACHE
        select IRQ_CPU

+       select NO_ISA if ISA
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_R4X00
+       select SYS_HAS_CPU_R5000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN

        help
          This are the SGI Indy, Challenge S and Indigo2, as well as certain
          OEM variants like the Tandem CMN B006S. To compile a Linux kernel
          that runs on these, say Y here.
 
 config SGI_IP27
        help
          This are the SGI Indy, Challenge S and Indigo2, as well as certain
          OEM variants like the Tandem CMN B006S. To compile a Linux kernel
          that runs on these, say Y here.
 
 config SGI_IP27

-       bool "Support for SGI IP27 (Origin200/2000)"
-       depends on MIPS64
+       bool "SGI IP27 (Origin200/2000)"
+       select ARC
+       select ARC64
+       select BOOT_ELF64

        select DMA_IP27
        select DMA_IP27

+       select EARLY_PRINTK

        select HW_HAS_PCI
        select HW_HAS_PCI

+       select PCI_DOMAINS
+       select SYS_HAS_CPU_R10000
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_NUMA

        help
          This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics
          workstations.  To compile a Linux kernel that runs on these, say Y
          here.
 
        help
          This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics
          workstations.  To compile a Linux kernel that runs on these, say Y
          here.
 

-#config SGI_SN0_XXL
-#      bool "IP27 XXL"
-#      depends on SGI_IP27
-#        This options adds support for userspace processes upto 16TB size.
-#        Normally the limit is just .5TB.
-
-config SGI_SN0_N_MODE
-       bool "IP27 N-Mode"
-       depends on SGI_IP27
-       help
-         The nodes of Origin 200, Origin 2000 and Onyx 2 systems can be
-         configured in either N-Modes which allows for more nodes or M-Mode
-         which allows for more memory.  Your system is most probably
-         running in M-Mode, so you should say N here.
-
-config DISCONTIGMEM
-       bool
-       default y if SGI_IP27
-       help
-         Say Y to upport efficient handling of discontiguous physical memory,
-         for architectures which are either NUMA (Non-Uniform Memory Access)
-         or have huge holes in the physical address space for other reasons.
-         See <file:Documentation/vm/numa> for more.
-
-config NUMA
-       bool "NUMA Support"
-       depends on SGI_IP27
-       help
-         Say Y to compile the kernel to support NUMA (Non-Uniform Memory
-         Access).  This option is for configuring high-end multiprocessor
-         server machines.  If in doubt, say N.
-
-config MAPPED_KERNEL
-       bool "Mapped kernel support"
-       depends on SGI_IP27
-       help
-         Change the way a Linux kernel is loaded unto memory on a MIPS64
-         machine.  This is required in order to support text replication and
-         NUMA.  If you need to undersatand it, read the source code.
-
-config REPLICATE_KTEXT
-       bool "Kernel text replication support"
-       depends on SGI_IP27
-       help
-         Say Y here to enable replicating the kernel text across multiple
-         nodes in a NUMA cluster.  This trades memory for speed.
-
-config REPLICATE_EXHANDLERS
-       bool "Exception handler replication support"
-       depends on SGI_IP27
-       help
-         Say Y here to enable replicating the kernel exception handlers
-         across multiple nodes in a NUMA cluster. This trades memory for
-         speed.
-

 config SGI_IP32
 config SGI_IP32

-       bool "Support for SGI IP32 (O2) (EXPERIMENTAL)"
+       bool "SGI IP32 (O2) (EXPERIMENTAL)"

        depends on EXPERIMENTAL
        depends on EXPERIMENTAL

+       select ARC
+       select ARC32
+       select BOOT_ELF32
+       select OWN_DMA
+       select DMA_IP32

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select R5000_CPU_SCACHE
        select RM7000_CPU_SCACHE
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select R5000_CPU_SCACHE
        select RM7000_CPU_SCACHE

+       select SYS_HAS_CPU_R5000
+       select SYS_HAS_CPU_R10000 if BROKEN
+       select SYS_HAS_CPU_RM7000
+       select SYS_HAS_CPU_NEVADA
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN

        help
          If you want this kernel to run on SGI O2 workstation, say Y here.
 
        help
          If you want this kernel to run on SGI O2 workstation, say Y here.
 

-config SOC_AU1X00
-       depends on MIPS32
-       bool "Support for AMD/Alchemy Au1X00 SOCs"
-
-choice
-       prompt "Au1X00 SOC Type"
-       depends on SOC_AU1X00
-        help
-           Say Y here to enable support for one of three AMD/Alchemy
-           SOCs. For additional documentation see www.amd.com.
-
-config SOC_AU1000
-        bool "SOC_AU1000"
-config SOC_AU1100
-        bool "SOC_AU1100"
-config SOC_AU1500
-        bool "SOC_AU1500"
-config SOC_AU1550
-        bool "SOC_AU1550"
-
-endchoice
-
-choice
-        prompt "AMD/Alchemy Au1x00 board support"
-        depends on SOC_AU1X00
-       help
-         These are evaluation boards built by AMD/Alchemy to
-         showcase their Au1X00 Internet Edge Processors. The SOC design
-         is based on the MIPS32 architecture running at 266/400/500MHz
-          with many integrated peripherals. Further information can be
-          found at their website, <http://www.amd.com/>. Say Y here if you
-          wish to build a kernel for this platform.
-
-config MIPS_PB1000
-       bool "PB1000 board"
-       depends on SOC_AU1000
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-
-config MIPS_PB1100
-       bool "PB1100 board"
-       depends on SOC_AU1100
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-
-config MIPS_PB1500
-       bool "PB1500 board"
-       depends on SOC_AU1500
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-
-config MIPS_PB1550
-       bool "PB1550 board"
-       depends on SOC_AU1550
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-
-config MIPS_DB1000
-       bool "DB1000 board"
-       depends on SOC_AU1000
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-
-config MIPS_DB1100
-       bool "DB1100 board"
-       depends on SOC_AU1100
-       select DMA_NONCOHERENT
-
-config MIPS_DB1500
-       bool "DB1500 board"
-       depends on SOC_AU1500
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-
-config MIPS_DB1550
-       bool "DB1550 board"
-       depends on SOC_AU1550
-       select HW_HAS_PCI
-
-config MIPS_BOSPORUS
-       bool "Bosporus board"
-       depends on SOC_AU1500
-       select DMA_NONCOHERENT
-
-config MIPS_MIRAGE
-       bool "Mirage board"
-       depends on SOC_AU1500
-       select DMA_NONCOHERENT
-
-config MIPS_XXS1500
-       bool "MyCable XXS1500 board"
-       depends on SOC_AU1500
-       select DMA_NONCOHERENT
-
-config MIPS_MTX1
-       bool "4G Systems MTX-1 board"
-       depends on SOC_AU1500
-       select DMA_NONCOHERENT
-
-endchoice
-
-config SIBYTE_SB1xxx_SOC
-       bool "Support for Broadcom BCM1xxx SOCs (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+config SIBYTE_BIGSUR
+       bool "Sibyte BCM91480B-BigSur"
+       select BOOT_ELF32

        select DMA_COHERENT
        select DMA_COHERENT

-
-choice
-       prompt "BCM1xxx SOC-based board"
-       depends on SIBYTE_SB1xxx_SOC
-       default SIBYTE_SWARM
-       help
-         Enable support for boards based on the SiByte line of SOCs
-         from Broadcom.  There are configurations for the known
-         evaluation boards, or you can choose "Other" and add your
-         own board support code.
+       select PCI_DOMAINS
+       select SIBYTE_BCM1x80
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SIBYTE_SWARM
 
 config SIBYTE_SWARM

-       bool "BCM91250A-SWARM"
+       bool "Sibyte BCM91250A-SWARM"
+       select BOOT_ELF32
+       select DMA_COHERENT

        select SIBYTE_SB1250
        select SIBYTE_SB1250

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_HIGHMEM
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SIBYTE_SENTOSA
 
 config SIBYTE_SENTOSA

-       bool "BCM91250E-Sentosa"
+       bool "Sibyte BCM91250E-Sentosa"
+       depends on EXPERIMENTAL
+       select BOOT_ELF32
+       select DMA_COHERENT

        select SIBYTE_SB1250
        select SIBYTE_SB1250

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SIBYTE_RHONE
 
 config SIBYTE_RHONE

-       bool "BCM91125E-Rhone"
+       bool "Sibyte BCM91125E-Rhone"
+       depends on EXPERIMENTAL
+       select BOOT_ELF32
+       select DMA_COHERENT

        select SIBYTE_BCM1125H
        select SIBYTE_BCM1125H

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SIBYTE_CARMEL
 
 config SIBYTE_CARMEL

-       bool "BCM91120x-Carmel"
+       bool "Sibyte BCM91120x-Carmel"
+       depends on EXPERIMENTAL
+       select BOOT_ELF32
+       select DMA_COHERENT

        select SIBYTE_BCM1120
        select SIBYTE_BCM1120

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SIBYTE_PTSWARM
 
 config SIBYTE_PTSWARM

-       bool "BCM91250PT-PTSWARM"
+       bool "Sibyte BCM91250PT-PTSWARM"
+       depends on EXPERIMENTAL
+       select BOOT_ELF32
+       select DMA_COHERENT

        select SIBYTE_SB1250
        select SIBYTE_SB1250

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_HIGHMEM
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SIBYTE_LITTLESUR
 
 config SIBYTE_LITTLESUR

-       bool "BCM91250C2-LittleSur"
+       bool "Sibyte BCM91250C2-LittleSur"
+       depends on EXPERIMENTAL
+       select BOOT_ELF32
+       select DMA_COHERENT

        select SIBYTE_SB1250
        select SIBYTE_SB1250

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_HIGHMEM
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SIBYTE_CRHINE
 
 config SIBYTE_CRHINE

-       bool "BCM91120C-CRhine"
+       bool "Sibyte BCM91120C-CRhine"
+       depends on EXPERIMENTAL
+       select BOOT_ELF32
+       select DMA_COHERENT

        select SIBYTE_BCM1120
        select SIBYTE_BCM1120

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SIBYTE_CRHONE
 
 config SIBYTE_CRHONE

-       bool "BCM91125C-CRhone"
-       select SIBYTE_BCM1125
-
-config SIBYTE_UNKNOWN
-       bool "Other"
-
-endchoice
-
-config SIBYTE_BOARD
-       bool
-       depends on SIBYTE_SB1xxx_SOC && !SIBYTE_UNKNOWN
-       default y
-
-choice
-       prompt "BCM1xxx SOC Type"
-       depends on SIBYTE_UNKNOWN
-       default SIBYTE_UNK_BCM1250
-       help
-         Since you haven't chosen a known evaluation board from
-         Broadcom, you must explicitly pick the SOC this kernel is
-         targetted for.
-
-config SIBYTE_UNK_BCM1250
-       bool "BCM1250"
-       select SIBYTE_SB1250
-
-config SIBYTE_UNK_BCM1120
-       bool "BCM1120"
-       select SIBYTE_BCM1120
-
-config SIBYTE_UNK_BCM1125
-       bool "BCM1125"
+       bool "Sibyte BCM91125C-CRhone"
+       depends on EXPERIMENTAL
+       select BOOT_ELF32
+       select DMA_COHERENT

        select SIBYTE_BCM1125
        select SIBYTE_BCM1125

-
-config SIBYTE_UNK_BCM1125H
-       bool "BCM1125H"
-       select SIBYTE_BCM1125H
-
-endchoice
-
-config SIBYTE_SB1250
-       bool
-       select HW_HAS_PCI
-
-config SIBYTE_BCM1120
-       bool
-       select SIBYTE_BCM112X
-
-config SIBYTE_BCM1125
-       bool
-       select HW_HAS_PCI
-       select SIBYTE_BCM112X
-
-config SIBYTE_BCM1125H
-       bool
-       select HW_HAS_PCI
-       select SIBYTE_BCM112X
-
-config SIBYTE_BCM112X
-       bool
-
-choice
-       prompt "SiByte SOC Stepping"
-       depends on SIBYTE_SB1xxx_SOC
-
-config CPU_SB1_PASS_1
-       bool "1250 Pass1"
-       depends on SIBYTE_SB1250
-
-config CPU_SB1_PASS_2_1250
-       bool "1250 An"
-       depends on SIBYTE_SB1250
-       select CPU_SB1_PASS_2
-       help
-         Also called BCM1250 Pass 2
-
-config CPU_SB1_PASS_2_2
-       bool "1250 Bn"
-       depends on SIBYTE_SB1250
-       help
-         Also called BCM1250 Pass 2.2
-
-config CPU_SB1_PASS_4
-       bool "1250 Cn"
-       depends on SIBYTE_SB1250
-       help
-         Also called BCM1250 Pass 3
-
-config CPU_SB1_PASS_2_112x
-       bool "112x Hybrid"
-       depends on SIBYTE_BCM112X
-       select CPU_SB1_PASS_2
-
-config CPU_SB1_PASS_3
-       bool "112x An"
-       depends on SIBYTE_BCM112X
-
-endchoice
-
-config CPU_SB1_PASS_2
-       bool
-
-config SIBYTE_HAS_LDT
-       bool
-       depends on PCI && (SIBYTE_SB1250 || SIBYTE_BCM1125H)
-       default y
-
-config SIMULATION
-       bool "Running under simulation"
-       depends on SIBYTE_SB1xxx_SOC
-       help
-         Build a kernel suitable for running under the GDB simulator.
-         Primarily adjusts the kernel's notion of time.
-
-config SIBYTE_CFE
-       bool "Booting from CFE"
-       depends on SIBYTE_SB1xxx_SOC
-       help
-         Make use of the CFE API for enumerating available memory,
-         controlling secondary CPUs, and possibly console output.
-
-config SIBYTE_CFE_CONSOLE
-       bool "Use firmware console"
-       depends on SIBYTE_CFE
-       help
-         Use the CFE API's console write routines during boot.  Other console
-         options (VT console, sb1250 duart console, etc.) should not be
-         configured.
-
-config SIBYTE_STANDALONE
-       bool
-       depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE
-       default y
-
-config SIBYTE_STANDALONE_RAM_SIZE
-       int "Memory size (in megabytes)"
-       depends on SIBYTE_STANDALONE
-       default "32"
-
-config SIBYTE_BUS_WATCHER
-       bool "Support for Bus Watcher statistics"
-       depends on SIBYTE_SB1xxx_SOC
-       help
-         Handle and keep statistics on the bus error interrupts (COR_ECC,
-         BAD_ECC, IO_BUS).
-
-config SIBYTE_BW_TRACE
-       bool "Capture bus trace before bus error"
-       depends on SIBYTE_BUS_WATCHER
-       help
-         Run a continuous bus trace, dumping the raw data as soon as
-         a ZBbus error is detected.  Cannot work if ZBbus profiling
-         is turned on, and also will interfere with JTAG-based trace
-         buffer activity.  Raw buffer data is dumped to console, and
-         must be processed off-line.
-
-config SIBYTE_SB1250_PROF
-       bool "Support for SB1/SOC profiling - SB1/SCD perf counters"
-       depends on SIBYTE_SB1xxx_SOC
-
-config SIBYTE_TBPROF
-       bool "Support for ZBbus profiling"
-       depends on SIBYTE_SB1xxx_SOC
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_SB1
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_HIGHMEM
+       select SYS_SUPPORTS_LITTLE_ENDIAN

 
 config SNI_RM200_PCI
 
 config SNI_RM200_PCI

-       bool "Support for SNI RM200 PCI"
+       bool "SNI RM200 PCI"
+       select ARC if CPU_LITTLE_ENDIAN
+       select ARC32 if CPU_LITTLE_ENDIAN
+       select ARCH_MAY_HAVE_PC_FDC
+       select BOOT_ELF32

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

+       select GENERIC_ISA_DMA

        select HAVE_STD_PC_SERIAL_PORT
        select HAVE_STD_PC_SERIAL_PORT

+       select HW_HAS_EISA

        select HW_HAS_PCI
        select HW_HAS_PCI

+       select I8253
+       select I8259

        select ISA
        select ISA

+       select SWAP_IO_SPACE if CPU_BIG_ENDIAN
+       select SYS_HAS_CPU_R4X00
+       select SYS_HAS_CPU_R5000
+       select R5000_CPU_SCACHE
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select SYS_SUPPORTS_HIGHMEM
+       select SYS_SUPPORTS_LITTLE_ENDIAN

        help
          The SNI RM200 PCI was a MIPS-based platform manufactured by Siemens
          Nixdorf Informationssysteme (SNI), parent company of Pyramid
          Technology and now in turn merged with Fujitsu.  Say Y here to
          support this machine type.
 
        help
          The SNI RM200 PCI was a MIPS-based platform manufactured by Siemens
          Nixdorf Informationssysteme (SNI), parent company of Pyramid
          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 DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select MIPS_TX3927
+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_TX39XX
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select TOSHIBA_BOARDS
+

 config TOSHIBA_RBTX4927
 config TOSHIBA_RBTX4927

-       bool "Support for Toshiba TBTX49[23]7 board"
-       depends on MIPS32
+       bool "Toshiba TBTX49[23]7 board"

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

+       select HAS_TXX9_SERIAL

        select HW_HAS_PCI
        select HW_HAS_PCI

+       select I8259

        select ISA
        select ISA

+       select SWAP_IO_SPACE
+       select SYS_HAS_CPU_TX49XX
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_BIG_ENDIAN
+       select TOSHIBA_BOARDS
+       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 HAVE_STD_PC_SERIAL_PORT
+       select DMA_NONCOHERENT
+       select GENERIC_ISA_DMA
+       select HAS_TXX9_SERIAL
+       select HW_HAS_PCI
+       select I8259
+       select ISA
+       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 TOSHIBA_BOARDS
+       help
+         This Toshiba board is based on the TX4938 processor. Say Y here to
+         support this machine type
+
+endchoice
+
+source "arch/mips/ddb5xxx/Kconfig"
+source "arch/mips/gt64120/ev64120/Kconfig"
+source "arch/mips/jazz/Kconfig"
+source "arch/mips/ite-boards/Kconfig"
+source "arch/mips/lasat/Kconfig"
+source "arch/mips/momentum/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/vr41xx/Kconfig"
+source "arch/mips/philips/pnx8550/common/Kconfig"
+source "arch/mips/cobalt/Kconfig"
+
+endmenu

 
 config RWSEM_GENERIC_SPINLOCK
        bool
 
 config RWSEM_GENERIC_SPINLOCK
        bool


@@ -826,7 +844,19 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
 config RWSEM_XCHGADD_ALGORITHM
        bool
 

-config HAVE_DEC_LOCK
+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
+config SCHED_NO_NO_OMIT_FRAME_POINTER

        bool
        default y
 
        bool
        default y
 


@@ -835,60 +865,86 @@ config HAVE_DEC_LOCK
 #
 config ARC
        bool
 #
 config ARC
        bool

-       depends on SNI_RM200_PCI || SGI_IP32 || SGI_IP27 || SGI_IP22 || MIPS_MAGNUM_4000 || OLIVETTI_M700 || ACER_PICA_61
-       default y

 
 

-config DMA_COHERENT
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+
+config DMA_COHERENT
+       bool
+
+config DMA_IP27
+       bool
+
+config DMA_IP32

        bool
        bool

+       select DMA_NEED_PCI_MAP_STATE

 
 

-config DMA_IP27
+config DMA_NONCOHERENT

        bool
        bool

+       select DMA_NEED_PCI_MAP_STATE

 
 

-config DMA_NONCOHERENT
+config DMA_NEED_PCI_MAP_STATE
+       bool
+
+config OWN_DMA

        bool
 
 config EARLY_PRINTK
        bool
        bool
 
 config EARLY_PRINTK
        bool

-       depends on MACH_DECSTATION
-       default y

 
 config GENERIC_ISA_DMA
        bool
 
 config GENERIC_ISA_DMA
        bool

-       depends on SNI_RM200_PCI || MIPS_MAGNUM_4000 || OLIVETTI_M700 || ACER_PICA_61 || MIPS_MALTA
-       default y

 
 config I8259
        bool
 
 config I8259
        bool

-       depends on SNI_RM200_PCI || DDB5477 || DDB5476 || DDB5074 || MACH_JAZZ || MIPS_MALTA || MIPS_COBALT
-       default y

 
 config LIMITED_DMA
        bool
        select HIGHMEM
 
 config LIMITED_DMA
        bool
        select HIGHMEM

+       select SYS_SUPPORTS_HIGHMEM

 
 config MIPS_BONITO64
        bool
 
 config MIPS_BONITO64
        bool

-       depends on MIPS_ATLAS || MIPS_MALTA
-       default y

 
 config MIPS_MSC
        bool
 
 config MIPS_MSC
        bool

-       depends on MIPS_ATLAS || MIPS_MALTA
-       default y

 
 config MIPS_NILE4
        bool
 
 config MIPS_NILE4
        bool

-       depends on LASAT
-       default y

 
 

-config CPU_LITTLE_ENDIAN
-       bool "Generate little endian code"
-       default y if ACER_PICA_61 || CASIO_E55 || DDB5074 || DDB5476 || DDB5477 || MACH_DECSTATION || HP_LASERJET || IBM_WORKPAD || LASAT || MIPS_COBALT || MIPS_ITE8172 || MIPS_IVR || SOC_AU1X00 || NEC_OSPREY || OLIVETTI_M700 || SNI_RM200_PCI || VICTOR_MPC30X || ZAO_CAPCELLA
-       default n if BAGET_MIPS || MIPS_EV64120 || MIPS_EV96100 || MOMENCO_OCELOT || MOMENCO_OCELOT_G || SGI_IP22 || SGI_IP27 || SGI_IP32 || TOSHIBA_JMR3927
+config MIPS_DISABLE_OBSOLETE_IDE
+       bool
+
+#
+# Endianess selection.  Suffiently obscure so many users don't know what to
+# answer,so we try hard to limit the available choices.  Also the use of a
+# choice statement should be more obvious to the user.
+#
+choice
+       prompt "Endianess selection"

        help
          Some MIPS machines can be configured for either little or big endian
        help
          Some MIPS machines can be configured for either little or big endian

-         byte order. These modes require different kernels. Say Y if your
-         machine is little endian, N if it's a big endian machine.
+         byte order. These modes require different kernels and a different
+         Linux distribution.  In general there is one prefered byteorder for a
+         particular system but some systems are just as commonly used in the
+         one or the other endianess.
+
+config CPU_BIG_ENDIAN
+       bool "Big endian"
+       depends on SYS_SUPPORTS_BIG_ENDIAN
+
+config CPU_LITTLE_ENDIAN
+       bool "Little endian"
+       depends on SYS_SUPPORTS_LITTLE_ENDIAN
+       help
+
+endchoice
+
+config SYS_SUPPORTS_BIG_ENDIAN
+       bool
+
+config SYS_SUPPORTS_LITTLE_ENDIAN
+       bool

 
 config IRQ_CPU
        bool
 
 config IRQ_CPU
        bool


@@ -896,45 +952,76 @@ config IRQ_CPU
 config IRQ_CPU_RM7K
        bool
 
 config IRQ_CPU_RM7K
        bool
 

+config IRQ_CPU_RM9K
+       bool
+

 config IRQ_MV64340
        bool
 
 config DDB5XXX_COMMON
        bool
 config IRQ_MV64340
        bool
 
 config DDB5XXX_COMMON
        bool

-       depends on DDB5074 || DDB5476 || DDB5477
-       default y

 
 config MIPS_BOARDS_GEN
        bool
 
 config MIPS_BOARDS_GEN
        bool

-       depends on MIPS_ATLAS || MIPS_MALTA || MIPS_SEAD
-       default y

 
 config MIPS_GT64111
        bool
 
 config MIPS_GT64111
        bool

-       depends on MIPS_COBALT
-       default y

 
 config MIPS_GT64120
        bool
 
 config MIPS_GT64120
        bool

-       depends on MIPS_EV64120 || MIPS_EV96100 || LASAT || MIPS_ATLAS || MIPS_MALTA || MOMENCO_OCELOT
-       default y

 
 config MIPS_TX3927
        bool
 
 config MIPS_TX3927
        bool

-       depends on TOSHIBA_JMR3927
-       default y
+       select HAS_TXX9_SERIAL

 
 config PCI_MARVELL
        bool
 
 config ITE_BOARD_GEN
        bool
 
 config PCI_MARVELL
        bool
 
 config ITE_BOARD_GEN
        bool

-       depends on MIPS_IVR || MIPS_ITE8172
-       default y
+
+config SOC_AU1000
+       bool
+       select SOC_AU1X00
+
+config SOC_AU1100
+       bool
+       select SOC_AU1X00
+
+config SOC_AU1500
+       bool
+       select SOC_AU1X00
+
+config SOC_AU1550
+       bool
+       select SOC_AU1X00
+
+config SOC_AU1200
+       bool
+       select SOC_AU1X00
+
+config SOC_AU1X00
+       bool
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_32BIT_KERNEL
+
+config PNX8550
+       bool
+       select SOC_PNX8550
+
+config SOC_PNX8550
+       bool
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_32BIT_KERNEL

 
 config SWAP_IO_SPACE
        bool
 
 config SWAP_IO_SPACE
        bool

-       depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927 || SIBYTE_SB1xxx_SOC || SGI_IP22 || MOMENCO_OCELOT_C || MOMENCO_OCELOT_G || MOMENCO_OCELOT || MOMENCO_JAGUAR_ATX || MIPS_MALTA || MIPS_ATLAS || MIPS_EV96100 || MIPS_PB1100 || MIPS_PB1000
+
+config EMMA2RH
+       bool
+       depends on MARKEINS

        default y
 
 #
        default y
 
 #


@@ -959,18 +1046,17 @@ config SYSCLK_100
 
 endchoice
 
 
 endchoice
 

-config AU1000_USB_DEVICE
+config ARC32
+       bool
+
+config AU1X00_USB_DEVICE

        bool
        depends on MIPS_PB1500 || MIPS_PB1100 || MIPS_PB1000
        default n
 
 config MIPS_GT96100
        bool
        bool
        depends on MIPS_PB1500 || MIPS_PB1100 || MIPS_PB1000
        default n
 
 config MIPS_GT96100
        bool

-       depends on MIPS_EV96100
-       default y
-       help
-         Say Y here to support the Galileo Technology GT96100 communications
-         controller card.  There is a web page at <http://www.galileot.com/>.
+       select MIPS_GT64120

 
 config IT8172_CIR
        bool
 
 config IT8172_CIR
        bool


@@ -984,8 +1070,6 @@ config IT8712
 
 config BOOT_ELF32
        bool
 
 config BOOT_ELF32
        bool

-       depends on MACH_DECSTATION || MIPS_ATLAS || MIPS_MALTA || MOMENCO_JAGUAR_ATX || SIBYTE_SB1xxx_SOC || SGI_IP32 || SGI_IP22 || SNI_RM200_PCI
-       default y

 
 config MIPS_L1_CACHE_SHIFT
        int
 
 config MIPS_L1_CACHE_SHIFT
        int


@@ -993,59 +1077,9 @@ config MIPS_L1_CACHE_SHIFT
        default "7" if SGI_IP27
        default "5"
 
        default "7" if SGI_IP27
        default "5"
 

-config ARC32
-       bool
-       depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP22 || SGI_IP32
-       default y
-
-config FB
-       bool
-       depends on MIPS_MAGNUM_4000 || OLIVETTI_M700
-       default y
-       ---help---
-         The frame buffer device provides an abstraction for the graphics
-         hardware. It represents the frame buffer of some video hardware and
-         allows application software to access the graphics hardware through
-         a well-defined interface, so the software doesn't need to know
-         anything about the low-level (hardware register) stuff.
-
-         Frame buffer devices work identically across the different
-         architectures supported by Linux and make the implementation of
-         application programs easier and more portable; at this point, an X
-         server exists which uses the frame buffer device exclusively.
-         On several non-X86 architectures, the frame buffer device is the
-         only way to use the graphics hardware.
-
-         The device is accessed through special device nodes, usually located
-         in the /dev directory, i.e. /dev/fb*.
-
-         You need an utility program called fbset to make full use of frame
-         buffer devices. Please read <file:Documentation/fb/framebuffer.txt>
-         and the Framebuffer-HOWTO at <http://www.tldp.org/docs.html#howto>
-         for more information.
-
-         Say Y here and to the driver for your graphics board below if you
-         are compiling a kernel for a non-x86 architecture.
-
-         If you are compiling for the x86 architecture, you can say Y if you
-         want to play with it, but it is not essential. Please note that
-         running graphical applications that directly touch the hardware
-         (e.g. an accelerated X server) and that are not frame buffer
-         device-aware may cause unexpected results. If unsure, say N.
-
-config FB_G364
-       bool
-       depends on MIPS_MAGNUM_4000 || OLIVETTI_M700
-       default y
-

 config HAVE_STD_PC_SERIAL_PORT
        bool
 
 config HAVE_STD_PC_SERIAL_PORT
        bool
 

-config VR4181
-       bool
-       depends on NEC_OSPREY
-       default y
-

 config ARC_CONSOLE
        bool "ARC console support"
        depends on SGI_IP22 || SNI_RM200_PCI
 config ARC_CONSOLE
        bool "ARC console support"
        depends on SGI_IP22 || SNI_RM200_PCI


@@ -1062,34 +1096,12 @@ config ARC_PROMLIB
 
 config ARC64
        bool
 
 config ARC64
        bool

-       depends on SGI_IP27
-       default y

 
 config BOOT_ELF64
        bool
 
 config BOOT_ELF64
        bool

-       depends on SGI_IP27
-       default y
-
-#config MAPPED_PCI_IO y
-#      bool
-#      depends on SGI_IP27
-#      default y
-
-config QL_ISP_A64
-       bool
-       depends on SGI_IP27
-       default y

 
 config TOSHIBA_BOARDS
        bool
 
 config TOSHIBA_BOARDS
        bool

-       depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
-       default y
-
-config TANBAC_TB0219
-       bool "Added TANBAC TB0219 Base board support"
-       depends on TANBAC_TB0229
-
-endmenu

 
 menu "CPU selection"
 
 
 menu "CPU selection"
 


@@ -1097,15 +1109,78 @@ choice
        prompt "CPU type"
        default CPU_R4X00
 
        prompt "CPU type"
        default CPU_R4X00
 

-config CPU_MIPS32
-       bool "MIPS32"
-
-config CPU_MIPS64
-       bool "MIPS64"
+config CPU_MIPS32_R1
+       bool "MIPS32 Release 1"
+       depends on SYS_HAS_CPU_MIPS32_R1
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM
+       help
+         Choose this option to build a kernel for release 1 or later of the
+         MIPS32 architecture.  Most modern embedded systems with a 32-bit
+         MIPS processor are based on a MIPS32 processor.  If you know the
+         specific type of processor in your system, choose those that one
+         otherwise CPU_MIPS32_R1 is a safe bet for any MIPS32 system.
+         Release 2 of the MIPS32 architecture is available since several
+         years so chances are you even have a MIPS32 Release 2 processor
+         in which case you should choose CPU_MIPS32_R2 instead for better
+         performance.
+
+config CPU_MIPS32_R2
+       bool "MIPS32 Release 2"
+       depends on SYS_HAS_CPU_MIPS32_R2
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM
+       help
+         Choose this option to build a kernel for release 2 or later of the
+         MIPS32 architecture.  Most modern embedded systems with a 32-bit
+         MIPS processor are based on a MIPS32 processor.  If you know the
+         specific type of processor in your system, choose those that one
+         otherwise CPU_MIPS32_R1 is a safe bet for any MIPS32 system.
+
+config CPU_MIPS64_R1
+       bool "MIPS64 Release 1"
+       depends on SYS_HAS_CPU_MIPS64_R1
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM
+       help
+         Choose this option to build a kernel for release 1 or later of the
+         MIPS64 architecture.  Many modern embedded systems with a 64-bit
+         MIPS processor are based on a MIPS64 processor.  If you know the
+         specific type of processor in your system, choose those that one
+         otherwise CPU_MIPS64_R1 is a safe bet for any MIPS64 system.
+         Release 2 of the MIPS64 architecture is available since several
+         years so chances are you even have a MIPS64 Release 2 processor
+         in which case you should choose CPU_MIPS64_R2 instead for better
+         performance.
+
+config CPU_MIPS64_R2
+       bool "MIPS64 Release 2"
+       depends on SYS_HAS_CPU_MIPS64_R2
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM
+       help
+         Choose this option to build a kernel for release 2 or later of the
+         MIPS64 architecture.  Many modern embedded systems with a 64-bit
+         MIPS processor are based on a MIPS64 processor.  If you know the
+         specific type of processor in your system, choose those that one
+         otherwise CPU_MIPS64_R1 is a safe bet for any MIPS64 system.

 
 config CPU_R3000
        bool "R3000"
 
 config CPU_R3000
        bool "R3000"

-       depends on MIPS32
+       depends on SYS_HAS_CPU_R3000
+       select CPU_HAS_WB
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM

        help
          Please make sure to pick the right CPU type. Linux/MIPS is not
          designed to be generic, i.e. Kernels compiled for R3000 CPUs will
        help
          Please make sure to pick the right CPU type. Linux/MIPS is not
          designed to be generic, i.e. Kernels compiled for R3000 CPUs will


@@ -1116,70 +1191,244 @@ config CPU_R3000
 
 config CPU_TX39XX
        bool "R39XX"
 
 config CPU_TX39XX
        bool "R39XX"

-       depends on MIPS32
+       depends on SYS_HAS_CPU_TX39XX
+       select CPU_SUPPORTS_32BIT_KERNEL

 
 config CPU_VR41XX
        bool "R41xx"
 
 config CPU_VR41XX
        bool "R41xx"

+       depends on SYS_HAS_CPU_VR41XX
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL

        help
        help

-         The options selects support for the NEC VR41xx series of processors.
+         The options selects support for the NEC VR4100 series of processors.

          Only choose this option if you have one of these processors as a
          kernel built with this option will not run on any other type of
          processor or vice versa.
 
 config CPU_R4300
        bool "R4300"
          Only choose this option if you have one of these processors as a
          kernel built with this option will not run on any other type of
          processor or vice versa.
 
 config CPU_R4300
        bool "R4300"

+       depends on SYS_HAS_CPU_R4300
+       select CPU_HAS_LLSC
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL

        help
          MIPS Technologies R4300-series processors.
 
 config CPU_R4X00
        bool "R4x00"
        help
          MIPS Technologies R4300-series processors.
 
 config CPU_R4X00
        bool "R4x00"

+       depends on SYS_HAS_CPU_R4X00
+       select CPU_HAS_LLSC
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL

        help
          MIPS Technologies R4000-series processors other than 4300, including
          the R4000, R4400, R4600, and 4700.
 
 config CPU_TX49XX
        bool "R49XX"
        help
          MIPS Technologies R4000-series processors other than 4300, including
          the R4000, R4400, R4600, and 4700.
 
 config CPU_TX49XX
        bool "R49XX"

+       depends on SYS_HAS_CPU_TX49XX
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL

 
 config CPU_R5000
        bool "R5000"
 
 config CPU_R5000
        bool "R5000"

+       depends on SYS_HAS_CPU_R5000
+       select CPU_HAS_LLSC
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL

        help
          MIPS Technologies R5000-series processors other than the Nevada.
 
 config CPU_R5432
        bool "R5432"
        help
          MIPS Technologies R5000-series processors other than the Nevada.
 
 config CPU_R5432
        bool "R5432"

+       depends on SYS_HAS_CPU_R5432
+       select CPU_HAS_LLSC
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL

 
 config CPU_R6000
        bool "R6000"
 
 config CPU_R6000
        bool "R6000"

-       depends on MIPS32 && EXPERIMENTAL
+       depends on EXPERIMENTAL
+       select CPU_HAS_LLSC
+       depends on SYS_HAS_CPU_R6000
+       select CPU_SUPPORTS_32BIT_KERNEL

        help
          MIPS Technologies R6000 and R6000A series processors.  Note these
        help
          MIPS Technologies R6000 and R6000A series processors.  Note these

-         processors are extremly rare and the support for them is incomplete.
+         processors are extremely rare and the support for them is incomplete.

 
 config CPU_NEVADA
 
 config CPU_NEVADA

-       bool "R52xx"
+       bool "RM52xx"
+       depends on SYS_HAS_CPU_NEVADA
+       select CPU_HAS_LLSC
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL

        help
        help

-         MIPS Technologies R52x0-series ("Nevada") processors.
+         QED / PMC-Sierra RM52xx-series ("Nevada") processors.

 
 config CPU_R8000
        bool "R8000"
 
 config CPU_R8000
        bool "R8000"

-       depends on MIPS64 && EXPERIMENTAL
+       depends on EXPERIMENTAL
+       depends on SYS_HAS_CPU_R8000
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_64BIT_KERNEL

        help
          MIPS Technologies R8000 processors.  Note these processors are
          uncommon and the support for them is incomplete.
 
 config CPU_R10000
        bool "R10000"
        help
          MIPS Technologies R8000 processors.  Note these processors are
          uncommon and the support for them is incomplete.
 
 config CPU_R10000
        bool "R10000"

+       depends on SYS_HAS_CPU_R10000
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM

        help
          MIPS Technologies R10000-series processors.
 
 config CPU_RM7000
        bool "RM7000"
        help
          MIPS Technologies R10000-series processors.
 
 config CPU_RM7000
        bool "RM7000"

+       depends on SYS_HAS_CPU_RM7000
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM

 
 config CPU_RM9000
        bool "RM9000"
 
 config CPU_RM9000
        bool "RM9000"

+       depends on SYS_HAS_CPU_RM9000
+       select CPU_HAS_LLSC
+       select CPU_HAS_PREFETCH
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM

 
 config CPU_SB1
        bool "SB1"
 
 config CPU_SB1
        bool "SB1"

+       depends on SYS_HAS_CPU_SB1
+       select CPU_HAS_LLSC
+       select CPU_SUPPORTS_32BIT_KERNEL
+       select CPU_SUPPORTS_64BIT_KERNEL
+       select CPU_SUPPORTS_HIGHMEM
+
+endchoice
+
+config SYS_HAS_CPU_MIPS32_R1
+       bool
+
+config SYS_HAS_CPU_MIPS32_R2
+       bool
+
+config SYS_HAS_CPU_MIPS64_R1
+       bool
+
+config SYS_HAS_CPU_MIPS64_R2
+       bool
+
+config SYS_HAS_CPU_R3000
+       bool
+
+config SYS_HAS_CPU_TX39XX
+       bool
+
+config SYS_HAS_CPU_VR41XX
+       bool
+
+config SYS_HAS_CPU_R4300
+       bool
+
+config SYS_HAS_CPU_R4X00
+       bool
+
+config SYS_HAS_CPU_TX49XX
+       bool
+
+config SYS_HAS_CPU_R5000
+       bool
+
+config SYS_HAS_CPU_R5432
+       bool
+
+config SYS_HAS_CPU_R6000
+       bool
+
+config SYS_HAS_CPU_NEVADA
+       bool
+
+config SYS_HAS_CPU_R8000
+       bool
+
+config SYS_HAS_CPU_R10000
+       bool
+
+config SYS_HAS_CPU_RM7000
+       bool
+
+config SYS_HAS_CPU_RM9000
+       bool
+
+config SYS_HAS_CPU_SB1
+       bool
+
+endmenu
+
+#
+# These two indicate any level of the MIPS32 and MIPS64 architecture
+#
+config CPU_MIPS32
+       bool
+       default y if CPU_MIPS32_R1 || CPU_MIPS32_R2
+
+config CPU_MIPS64
+       bool
+       default y if CPU_MIPS64_R1 || CPU_MIPS64_R2
+
+#
+# These two indicate the revision of the architecture, either Release 1 or Release 2
+#
+config CPU_MIPSR1
+       bool
+       default y if CPU_MIPS32_R1 || CPU_MIPS64_R1
+
+config CPU_MIPSR2
+       bool
+       default y if CPU_MIPS32_R2 || CPU_MIPS64_R2
+
+config SYS_SUPPORTS_32BIT_KERNEL
+       bool
+config SYS_SUPPORTS_64BIT_KERNEL
+       bool
+config CPU_SUPPORTS_32BIT_KERNEL
+       bool
+config CPU_SUPPORTS_64BIT_KERNEL
+       bool
+
+menu "Kernel type"
+
+choice
+
+       prompt "Kernel code model"
+       help
+         You should only select this option if you have a workload that
+         actually benefits from 64-bit processing or if your machine has
+         large memory.  You will only be presented a single option in this
+         menu if your system does not support both 32-bit and 64-bit kernels.
+
+config 32BIT
+       bool "32-bit kernel"
+       depends on CPU_SUPPORTS_32BIT_KERNEL && SYS_SUPPORTS_32BIT_KERNEL
+       select TRAD_SIGNALS
+       help
+         Select this option if you want to build a 32-bit kernel.
+config 64BIT
+       bool "64-bit kernel"
+       depends on CPU_SUPPORTS_64BIT_KERNEL && SYS_SUPPORTS_64BIT_KERNEL
+       help
+         Select this option if you want to build a 64-bit kernel.

 
 endchoice
 
 
 endchoice
 


@@ -1207,13 +1456,12 @@ config PAGE_SIZE_8KB
 
 config PAGE_SIZE_16KB
        bool "16kB"
 
 config PAGE_SIZE_16KB
        bool "16kB"

-       depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX
+       depends on !CPU_R3000 && !CPU_TX39XX

        help
          Using 16kB page size will result in higher performance kernel at
          the price of higher memory consumption.  This option is available on
        help
          Using 16kB page size will result in higher performance kernel at
          the price of higher memory consumption.  This option is available on

-         all non-R3000 family processor.  Not that at the time of this
-         writing this option is still high experimental; there are also
-         issues with compatibility of user applications.
+         all non-R3000 family processors.  Note that you will need a suitable
+         Linux distribution to support this.

 
 config PAGE_SIZE_64KB
        bool "64kB"
 
 config PAGE_SIZE_64KB
        bool "64kB"


@@ -1222,8 +1470,7 @@ config PAGE_SIZE_64KB
          Using 64kB page size will result in higher performance kernel at
          the price of higher memory consumption.  This option is available on
          all non-R3000 family processor.  Not that at the time of this
          Using 64kB page size will result in higher performance kernel at
          the price of higher memory consumption.  This option is available on
          all non-R3000 family processor.  Not that at the time of this

-         writing this option is still high experimental; there are also
-         issues with compatibility of user applications.
+         writing this option is still high experimental.

 
 endchoice
 
 
 endchoice
 


@@ -1234,6 +1481,13 @@ config IP22_CPU_SCACHE
        bool
        select BOARD_SCACHE
 
        bool
        select BOARD_SCACHE
 

+#
+# Support for a MIPS32 / MIPS64 style S-caches
+#
+config MIPS_CPU_SCACHE
+       bool
+       select BOARD_SCACHE
+

 config R5000_CPU_SCACHE
        bool
        select BOARD_SCACHE
 config R5000_CPU_SCACHE
        bool
        select BOARD_SCACHE


@@ -1251,12 +1505,89 @@ config SIBYTE_DMA_PAGEOPS
          SiByte Linux port.  Seems to give a small performance benefit.
 
 config CPU_HAS_PREFETCH
          SiByte Linux port.  Seems to give a small performance benefit.
 
 config CPU_HAS_PREFETCH

-       bool "Enable prefetches" if CPU_SB1 && !CPU_SB1_PASS_2
-       default y if CPU_MIPS32 || CPU_MIPS64 || CPU_RM7000 || CPU_RM9000 || CPU_R10000
+       bool
+
+choice
+       prompt "MIPS MT options"
+
+config MIPS_MT_DISABLED
+       bool "Disable multithreading support."
+       help
+         Use this option if your workload can't take advantage of
+         MIPS hardware multithreading support.  On systems that don't have
+         the option of an MT-enabled processor this option will be the only
+         option in this menu.
+
+config MIPS_MT_SMTC
+       bool "SMTC: Use all TCs on all VPEs for SMP"
+       depends on CPU_MIPS32_R2
+       #depends on CPU_MIPS64_R2               # once there is hardware ...
+       depends on SYS_SUPPORTS_MULTITHREADING
+       select CPU_MIPSR2_IRQ_VI
+       select CPU_MIPSR2_SRS
+       select MIPS_MT
+       select SMP
+       help
+         This is a kernel model which is known a SMTC or lately has been
+         marketesed into SMVP.
+
+config MIPS_MT_SMP
+       bool "Use 1 TC on each available VPE for SMP"
+       depends on SYS_SUPPORTS_MULTITHREADING
+       select CPU_MIPSR2_IRQ_VI
+       select CPU_MIPSR2_SRS
+       select MIPS_MT
+       select SMP
+       help
+         This is a kernel model which is also known a VSMP or lately
+         has been marketesed into SMVP.
+
+config MIPS_VPE_LOADER
+       bool "VPE loader support."
+       depends on SYS_SUPPORTS_MULTITHREADING
+       select MIPS_MT
+       help
+         Includes a loader for loading an elf relocatable object
+         onto another VPE and running it.
+
+endchoice
+
+config MIPS_MT
+       bool
+
+config SYS_SUPPORTS_MULTITHREADING
+       bool
+
+config MIPS_MT_FPAFF
+       bool "Dynamic FPU affinity for FP-intensive threads"
+       depends on MIPS_MT
+       default y
+
+config MIPS_VPE_LOADER_TOM
+       bool "Load VPE program into memory hidden from linux"
+       depends on MIPS_VPE_LOADER
+       default y
+       help
+         The loader can use memory that is present but has been hidden from
+         Linux using the kernel command line option "mem=xxMB". It's up to
+         you to ensure the amount you put in the option and the space your
+         program requires is less or equal to the amount physically present.

 
 

-config VTAG_ICACHE
-       bool "Support for Virtual Tagged I-cache" if CPU_MIPS64 || CPU_MIPS32
-       default y if CPU_SB1
+# this should possibly be in drivers/char, but it is rather cpu related. Hmmm
+config MIPS_VPE_APSP_API
+       bool "Enable support for AP/SP API (RTLX)"
+       depends on MIPS_VPE_LOADER
+       help
+
+config MIPS_APSP_KSPD
+       bool "Enable KSPD"
+       depends on MIPS_VPE_APSP_API
+       default y
+       help
+         KSPD is a kernel daemon that accepts syscall requests from the SP
+         side, actions them and returns the results. It also handles the
+         "exit" syscall notifying other kernel modules the SP program is
+         exiting.  You probably want to say yes here.

 
 config SB1_PASS_1_WORKAROUNDS
        bool
 
 config SB1_PASS_1_WORKAROUNDS
        bool


@@ -1275,48 +1606,53 @@ config SB1_PASS_2_1_WORKAROUNDS
 
 config 64BIT_PHYS_ADDR
        bool "Support for 64-bit physical address space"
 
 config 64BIT_PHYS_ADDR
        bool "Support for 64-bit physical address space"

-       depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && MIPS32
-
-config CPU_ADVANCED
-       bool "Override CPU Options"
-       depends on MIPS32
-       help
-         Saying yes here allows you to select support for various features
-         your CPU may or may not have.  Most people should say N here.
+       depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT

 
 config CPU_HAS_LLSC
 
 config CPU_HAS_LLSC

-       bool "ll/sc Instructions available" if CPU_ADVANCED
-       default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX
-       help
-         MIPS R4000 series and later provide the Load Linked (ll)
-         and Store Conditional (sc) instructions. More information is
-         available at <http://www.go-ecs.com/mips/miptek1.htm>.
+       bool

 
 

-         Say Y here if your CPU has the ll and sc instructions.  Say Y here
-         for better performance, N if you don't know.  You must say Y here
-         for multiprocessor machines.
+config CPU_HAS_WB
+       bool

 
 

-config CPU_HAS_LLDSCD
-       bool "lld/scd Instructions available" if CPU_ADVANCED
-       default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX && !CPU_MIPS32
-       help
-         Say Y here if your CPU has the lld and scd instructions, the 64-bit
-         equivalents of ll and sc.  Say Y here for better performance, N if
-         you don't know.  You must say Y here for multiprocessor machines.
+#
+# Vectored interrupt mode is an R2 feature
+#
+config CPU_MIPSR2_IRQ_VI
+       bool

 
 

-config CPU_HAS_WB
-       bool "Writeback Buffer available" if CPU_ADVANCED
-       default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION
-       help
-         Say N here for slightly better performance.  You must say Y here for
-         machines which require flushing of write buffers in software.  Saying
-         Y is the safe option; N may result in kernel malfunction and crashes.
+#
+# Extended interrupt mode is an R2 feature
+#
+config CPU_MIPSR2_IRQ_EI
+       bool
+
+#
+# Shadow registers are an R2 feature
+#
+config CPU_MIPSR2_SRS
+       bool

 
 config CPU_HAS_SYNC
        bool
        depends on !CPU_R3000
        default y
 
 
 config CPU_HAS_SYNC
        bool
        depends on !CPU_R3000
        default y
 

+#
+# Use the generic interrupt handling code in kernel/irq/:
+#
+config GENERIC_HARDIRQS
+       bool
+       default y
+
+config GENERIC_IRQ_PROBE
+       bool
+       default y
+
+config IRQ_PER_CPU
+       depends on SMP
+       bool
+       default y
+

 #
 # - Highmem only makes sense for the 32-bit kernel.
 # - The current highmem code will only work properly on physically indexed
 #
 # - Highmem only makes sense for the 32-bit kernel.
 # - The current highmem code will only work properly on physically indexed


@@ -1326,19 +1662,64 @@ config CPU_HAS_SYNC
 #   where it's known to be safe.  This will not offer highmem on a few systems
 #   such as MIPS32 and MIPS64 CPUs which may have virtual and physically
 #   indexed CPUs but we're playing safe.
 #   where it's known to be safe.  This will not offer highmem on a few systems
 #   such as MIPS32 and MIPS64 CPUs which may have virtual and physically
 #   indexed CPUs but we're playing safe.

-# - We should not offer highmem for system of which we already know that they
-#   don't have memory configurations that could gain from highmem support in
-#   the kernel because they don't support configurations with RAM at physical
-#   addresses > 0x20000000.
+# - We use SYS_SUPPORTS_HIGHMEM to offer highmem only for systems where we
+#   know they might have memory configurations that could make use of highmem
+#   support.

 #
 config HIGHMEM
        bool "High Memory Support"
 #
 config HIGHMEM
        bool "High Memory Support"

-       depends on MIPS32 && (CPU_R3000 || CPU_SB1 || CPU_R7000 || CPU_RM9000 || CPU_R10000) && !(BAGET_MIPS || MACH_DECSTATION || MOMENCO_JAGUAR_ATX)
+       depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM
+
+config CPU_SUPPORTS_HIGHMEM
+       bool
+
+config SYS_SUPPORTS_HIGHMEM
+       bool
+
+config ARCH_FLATMEM_ENABLE
+       def_bool y
+       depends on !NUMA
+
+config ARCH_DISCONTIGMEM_ENABLE
+       bool
+       default y if SGI_IP27
+       help
+         Say Y to upport efficient handling of discontiguous physical memory,
+         for architectures which are either NUMA (Non-Uniform Memory Access)
+         or have huge holes in the physical address space for other reasons.
+         See <file:Documentation/vm/numa> for more.
+
+config ARCH_SPARSEMEM_ENABLE
+       bool
+
+config ARCH_SPARSEMEM_ENABLE
+       bool
+       select SPARSEMEM_STATIC
+
+config NUMA
+       bool "NUMA Support"
+       depends on SYS_SUPPORTS_NUMA
+       help
+         Say Y to compile the kernel to support NUMA (Non-Uniform Memory
+         Access).  This option improves performance on systems with more
+         than two nodes; on two node systems it is generally better to
+         leave it disabled; on single node systems disable this option
+         disabled.
+
+config SYS_SUPPORTS_NUMA
+       bool
+
+config NODES_SHIFT
+       int
+       default "6"
+       depends on NEED_MULTIPLE_NODES
+
+source "mm/Kconfig"

 
 config SMP
        bool "Multi-Processing support"
 
 config SMP
        bool "Multi-Processing support"

-       depends on CPU_RM9000 || (SIBYTE_SB1250 && !SIBYTE_STANDALONE) || SGI_IP27
-       ---help---
+       depends on SYS_SUPPORTS_SMP
+       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
          you have a system with more than one CPU, say Y.
          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
          you have a system with more than one CPU, say Y.


@@ -1357,6 +1738,9 @@ config SMP
 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 

+config SYS_SUPPORTS_SMP
+       bool
+

 config NR_CPUS
        int "Maximum number of CPUs (2-64)"
        range 2 64
 config NR_CPUS
        int "Maximum number of CPUs (2-64)"
        range 2 64


@@ -1372,14 +1756,78 @@ config NR_CPUS
          This is purely to save memory - each supported CPU adds
          approximately eight kilobytes to the kernel image.
 
          This is purely to save memory - each supported CPU adds
          approximately eight kilobytes to the kernel image.
 

-config PREEMPT
-       bool "Preemptible Kernel"
+#
+# Timer Interrupt Frequency Configuration
+#
+
+choice
+       prompt "Timer frequency"
+       default HZ_250

        help
        help

-         This option reduces the latency of the kernel when reacting to
-         real-time or interactive events by allowing a low priority process to
-         be preempted even if it is in kernel mode executing a system call.
-         This allows applications to run more reliably even when the system is
-         under load.
+        Allows the configuration of the timer frequency.
+
+       config HZ_48
+               bool "48 HZ" if SYS_SUPPORTS_48HZ
+
+       config HZ_100
+               bool "100 HZ" if SYS_SUPPORTS_100HZ || SYS_SUPPORTS_ARBIT_HZ
+
+       config HZ_128
+               bool "128 HZ" if SYS_SUPPORTS_128HZ || SYS_SUPPORTS_ARBIT_HZ
+
+       config HZ_250
+               bool "250 HZ" if SYS_SUPPORTS_250HZ || SYS_SUPPORTS_ARBIT_HZ
+
+       config HZ_256
+               bool "256 HZ" if SYS_SUPPORTS_256HZ || SYS_SUPPORTS_ARBIT_HZ
+
+       config HZ_1000
+               bool "1000 HZ" if SYS_SUPPORTS_1000HZ || SYS_SUPPORTS_ARBIT_HZ
+
+       config HZ_1024
+               bool "1024 HZ" if SYS_SUPPORTS_1024HZ || SYS_SUPPORTS_ARBIT_HZ
+
+endchoice
+
+config SYS_SUPPORTS_48HZ
+       bool
+
+config SYS_SUPPORTS_100HZ
+       bool
+
+config SYS_SUPPORTS_128HZ
+       bool
+
+config SYS_SUPPORTS_250HZ
+       bool
+
+config SYS_SUPPORTS_256HZ
+       bool
+
+config SYS_SUPPORTS_1000HZ
+       bool
+
+config SYS_SUPPORTS_1024HZ
+       bool
+
+config SYS_SUPPORTS_ARBIT_HZ
+       bool
+       default y if !SYS_SUPPORTS_48HZ && !SYS_SUPPORTS_100HZ && \
+                    !SYS_SUPPORTS_128HZ && !SYS_SUPPORTS_250HZ && \
+                    !SYS_SUPPORTS_256HZ && !SYS_SUPPORTS_1000HZ && \
+                    !SYS_SUPPORTS_1024HZ
+
+config HZ
+       int
+       default 48 if HZ_48
+       default 100 if HZ_100
+       default 128 if HZ_128
+       default 250 if HZ_250
+       default 256 if HZ_256
+       default 1000 if HZ_1000
+       default 1024 if HZ_1024
+
+source "kernel/Kconfig.preempt"

 
 config RTC_DS1742
        bool "DS1742 BRAM/RTC support"
 
 config RTC_DS1742
        bool "DS1742 BRAM/RTC support"


@@ -1387,7 +1835,7 @@ config RTC_DS1742
 
 config MIPS_INSANE_LARGE
        bool "Support for large 64-bit configurations"
 
 config MIPS_INSANE_LARGE
        bool "Support for large 64-bit configurations"

-       depends on CPU_R10000 && MIPS64
+       depends on CPU_R10000 && 64BIT

        help
          MIPS R10000 does support a 44 bit / 16TB address space as opposed to
          previous 64-bit processors which only supported 40 bit / 1TB. If you
        help
          MIPS R10000 does support a 44 bit / 16TB address space as opposed to
          previous 64-bit processors which only supported 40 bit / 1TB. If you


@@ -1395,14 +1843,18 @@ config MIPS_INSANE_LARGE
          This will result in additional memory usage, so it is not
          recommended for normal users.
 
          This will result in additional memory usage, so it is not
          recommended for normal users.
 

+endmenu
+

 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 

-endmenu
+source "init/Kconfig"

 
 menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
 
 
 menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
 

+config HW_HAS_EISA
+       bool

 config HW_HAS_PCI
        bool
 
 config HW_HAS_PCI
        bool
 


@@ -1420,6 +1872,10 @@ config PCI
          information about which PCI hardware does work under Linux and which
          doesn't.
 
          information about which PCI hardware does work under Linux and which
          doesn't.
 

+config PCI_DOMAINS
+       bool
+       depends on PCI
+

 source "drivers/pci/Kconfig"
 
 #
 source "drivers/pci/Kconfig"
 
 #


@@ -1430,9 +1886,12 @@ source "drivers/pci/Kconfig"
 config ISA
        bool
 
 config ISA
        bool
 

+config NO_ISA
+       bool
+

 config EISA
        bool "EISA support"
 config EISA
        bool "EISA support"

-       depends on SGI_IP22 || SNI_RM200_PCI
+       depends on HW_HAS_EISA

        select ISA
        ---help---
          The Extended Industry Standard Architecture (EISA) bus was
        select ISA
        ---help---
          The Extended Industry Standard Architecture (EISA) bus was


@@ -1466,10 +1925,7 @@ config MMU
        bool
        default y
 
        bool
        default y
 

-config MCA
-       bool
-
-config SBUS
+config I8253

        bool
 
 source "drivers/pcmcia/Kconfig"
        bool
 
 source "drivers/pcmcia/Kconfig"


@@ -1484,15 +1940,29 @@ source "fs/Kconfig.binfmt"
 
 config TRAD_SIGNALS
        bool
 
 config TRAD_SIGNALS
        bool

-       default y if MIPS32
+
+config BUILD_ELF64
+       bool "Use 64-bit ELF format for building"
+       depends on 64BIT
+       help
+         A 64-bit kernel is usually built using the 64-bit ELF binary object
+         format as it's one that allows arbitrary 64-bit constructs.  For
+         kernels that are loaded within the KSEG compatibility segments the
+         32-bit ELF format can optionally be used resulting in a somewhat
+         smaller binary, but this option is not explicitly supported by the
+         toolchain and since binutils 2.14 it does not even work at all.
+
+         Say Y to use the 64-bit format or N to use the 32-bit one.
+
+         If unsure say Y.

 
 config BINFMT_IRIX
        bool "Include IRIX binary compatibility"
 
 config BINFMT_IRIX
        bool "Include IRIX binary compatibility"

-       depends on !CPU_LITTLE_ENDIAN && MIPS32
+       depends on CPU_BIG_ENDIAN && 32BIT && BROKEN

 
 config MIPS32_COMPAT
        bool "Kernel support for Linux/MIPS 32-bit binary compatibility"
 
 config MIPS32_COMPAT
        bool "Kernel support for Linux/MIPS 32-bit binary compatibility"

-       depends on MIPS64
+       depends on 64BIT

        help
          Select this option if you want Linux/MIPS 32-bit binary
          compatibility. Since all software available for Linux/MIPS is
        help
          Select this option if you want Linux/MIPS 32-bit binary
          compatibility. Since all software available for Linux/MIPS is


@@ -1528,34 +1998,63 @@ config BINFMT_ELF32
        bool
        default y if MIPS32_O32 || MIPS32_N32
 
        bool
        default y if MIPS32_O32 || MIPS32_N32
 

+config SECCOMP
+       bool "Enable seccomp to safely compute untrusted bytecode"
+       depends on PROC_FS && BROKEN
+       default y
+       help
+         This kernel feature is useful for number crunching applications
+         that may need to compute untrusted bytecode during their
+         execution. By using pipes or other transports made available to
+         the process as file descriptors supporting the read/write
+         syscalls, it's possible to isolate those applications in
+         their own address space using seccomp. Once seccomp is
+         enabled via /proc/<pid>/seccomp, it cannot be disabled
+         and the task is only allowed to execute a few safe syscalls
+         defined by each seccomp mode.
+
+         If unsure, say Y. Only embedded should say N here.
+

 config PM
        bool "Power Management support (EXPERIMENTAL)"
 config PM
        bool "Power Management support (EXPERIMENTAL)"

-       depends on EXPERIMENTAL && MACH_AU1X00
+       depends on EXPERIMENTAL && SOC_AU1X00
+
+config APM
+        tristate "Advanced Power Management Emulation"
+       depends on PM
+        ---help---
+         APM is a BIOS specification for saving power using several different
+         techniques. This is mostly useful for battery powered systems with
+         APM compliant BIOSes. If you say Y here, the system time will be
+         reset after a RESUME operation, the /proc/apm device will provide
+         battery status information, and user-space programs will receive
+         notification of APM "events" (e.g. battery status change).
+
+         In order to use APM, you will need supporting software. For location
+         and more information, read <file:Documentation/pm.txt> and the
+         Battery Powered Linux mini-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>.
+
+         This driver does not spin down disk drives (see the hdparm(8)
+         manpage ("man 8 hdparm") for that), and it doesn't turn off
+         VESA-compliant "green" monitors.
+
+         Generally, if you don't have a battery in your machine, there isn't
+         much point in using this driver and you should say N. If you get
+         random kernel OOPSes or reboots that don't seem to be related to
+         anything, try disabling/enabling this option (or disabling/enabling
+         APM in your BIOS).

 
 endmenu
 
 
 endmenu
 

-menu "MIPS initrd options"
-       depends on BLK_DEV_INITRD
-
-config EMBEDDED_RAMDISK
-       bool "Embed root filesystem ramdisk into the kernel"
-
-config EMBEDDED_RAMDISK_IMAGE
-       string "Filename of gziped ramdisk image"
-       depends on EMBEDDED_RAMDISK
-       default "ramdisk.gz"
-       help
-         This is the filename of the ramdisk image to be built into the
-         kernel.  Relative pathnames are relative to arch/mips/ramdisk/.
-         The ramdisk image is not part of the kernel distribution; you must
-         provide one yourself.
-
-endmenu
+source "net/Kconfig"

 
 source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "drivers/Kconfig"
 
 source "fs/Kconfig"
 

+source "arch/mips/oprofile/Kconfig"
+

 source "arch/mips/Kconfig.debug"
 
 source "kernel/vserver/Kconfig"
 source "arch/mips/Kconfig.debug"
 
 source "kernel/vserver/Kconfig"