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

[linux-2.6] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5080ea1799a43807c31f718b439b21b441d487aa..35e038a974c6227940cc4ebe7c5ead85d52e4a65 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -13,7 +13,7 @@ choice
        default SGI_IP22
 
 config MIPS_MTX1
        default SGI_IP22
 
 config MIPS_MTX1

-       bool "Support for 4G Systems MTX-1 board"
+       bool "4G Systems MTX-1 board"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select SOC_AU1500
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select SOC_AU1500


@@ -119,8 +119,34 @@ config MIPS_MIRAGE
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        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 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"
+       bool "Cobalt Server"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select I8259
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select I8259


@@ -132,7 +158,7 @@ config MIPS_COBALT
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config MACH_DECSTATION
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config MACH_DECSTATION

-       bool "Support for DECstations"
+       bool "DECstations"

        select BOOT_ELF32
        select DMA_NONCOHERENT
        select EARLY_PRINTK
        select BOOT_ELF32
        select DMA_NONCOHERENT
        select EARLY_PRINTK


@@ -142,6 +168,9 @@ config MACH_DECSTATION
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        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
        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


@@ -158,7 +187,7 @@ 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


@@ -175,7 +204,7 @@ config MIPS_EV64120
          kernel for this platform.
 
 config MIPS_EV96100
          kernel for this platform.
 
 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
        depends on EXPERIMENTAL
        select DMA_NONCOHERENT
        select HW_HAS_PCI


@@ -195,7 +224,7 @@ 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 ITE_BOARD_GEN
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select ITE_BOARD_GEN


@@ -211,7 +240,7 @@ config MIPS_IVR
          build a kernel for this platform.
 
 config MIPS_ITE8172
          build a kernel for this platform.
 
 config MIPS_ITE8172

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

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select ITE_BOARD_GEN
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select ITE_BOARD_GEN


@@ -228,16 +257,18 @@ config MIPS_ITE8172
          a kernel for this platform.
 
 config MACH_JAZZ
          a kernel for this platform.
 
 config MACH_JAZZ

-       bool "Support for the Jazz family of machines"
+       bool "Jazz family of machines"

        select ARC
        select ARC32
        select ARCH_MAY_HAVE_PC_FDC
        select GENERIC_ISA_DMA
        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 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
         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.
        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.


@@ -245,7 +276,7 @@ config MACH_JAZZ
         Olivetti M700-10 workstations.
 
 config LASAT
         Olivetti M700-10 workstations.
 
 config LASAT

-       bool "Support for LASAT Networks platforms"
+       bool "LASAT Networks platforms"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_GT64120
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_GT64120


@@ -257,7 +288,7 @@ config LASAT
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config MIPS_ATLAS
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config MIPS_ATLAS

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

        select BOOT_ELF32
        select DMA_NONCOHERENT
        select IRQ_CPU
        select BOOT_ELF32
        select DMA_NONCOHERENT
        select IRQ_CPU


@@ -282,7 +313,7 @@ config MIPS_ATLAS
          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 ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
        select HAVE_STD_PC_SERIAL_PORT


@@ -310,7 +341,7 @@ config MIPS_MALTA
          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


@@ -326,8 +357,29 @@ config MIPS_SEAD
          This enables support for the MIPS Technologies SEAD evaluation
          board.
 
          This enables support for the MIPS Technologies SEAD evaluation
          board.
 

+config WR_PPMC
+       bool "Support for 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
 config MIPS_SIM

-       bool 'Support for MIPS simulator (MIPSsim)'
+       bool 'MIPS simulator (MIPSsim)'

        select DMA_NONCOHERENT
        select IRQ_CPU
        select SYS_HAS_CPU_MIPS32_R1
        select DMA_NONCOHERENT
        select IRQ_CPU
        select SYS_HAS_CPU_MIPS32_R1


@@ -340,7 +392,7 @@ config MIPS_SIM
          emulator.
 
 config MOMENCO_JAGUAR_ATX
          emulator.
 
 config MOMENCO_JAGUAR_ATX

-       bool "Support for Momentum Jaguar board"
+       bool "Momentum Jaguar board"

        select BOOT_ELF32
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select BOOT_ELF32
        select DMA_NONCOHERENT
        select HW_HAS_PCI


@@ -360,7 +412,7 @@ config MOMENCO_JAGUAR_ATX
          Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT
          Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT

-       bool "Support for Momentum Ocelot board"
+       bool "Momentum Ocelot board"

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


@@ -377,7 +429,7 @@ config MOMENCO_OCELOT
          Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT_3
          Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT_3

-       bool "Support for Momentum Ocelot-3 board"
+       bool "Momentum Ocelot-3 board"

        select BOOT_ELF32
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select BOOT_ELF32
        select DMA_NONCOHERENT
        select HW_HAS_PCI


@@ -396,7 +448,7 @@ config MOMENCO_OCELOT_3
          PMC-Sierra Rm79000 core.
 
 config MOMENCO_OCELOT_C
          PMC-Sierra Rm79000 core.
 
 config MOMENCO_OCELOT_C

-       bool "Support for Momentum Ocelot-C board"
+       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


@@ -413,7 +465,7 @@ config MOMENCO_OCELOT_C
          Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT_G
          Momentum Computer <http://www.momenco.com/>.
 
 config MOMENCO_OCELOT_G

-       bool "Support for Momentum Ocelot-G board"
+       bool "Momentum Ocelot-G board"

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


@@ -430,62 +482,25 @@ config MOMENCO_OCELOT_G
          Momentum Computer <http://www.momenco.com/>.
 
 config MIPS_XXS1500
          Momentum Computer <http://www.momenco.com/>.
 
 config MIPS_XXS1500

-       bool "Support for MyCable XXS1500 board"
+       bool "MyCable XXS1500 board"

        select DMA_NONCOHERENT
        select SOC_AU1500
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_V2PCI
        select DMA_NONCOHERENT
        select SOC_AU1500
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_V2PCI

-       bool "Support for Philips PNX8550 based Viper2-PCI board"
+       bool "Philips PNX8550 based Viper2-PCI board"
+       depends on BROKEN

        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_JBS
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_JBS

-       bool "Support for Philips PNX8550 based JBS board"
+       bool "Philips PNX8550 based JBS board"
+       depends on BROKEN

        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config DDB5074
-       bool "Support for NEC DDB Vrc-5074 (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       select DDB5XXX_COMMON
-       select DMA_NONCOHERENT
-       select HAVE_STD_PC_SERIAL_PORT
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select I8259
-       select ISA
-       select SYS_HAS_CPU_R5000
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       help
-         This enables support for the VR5000-based NEC DDB Vrc-5074
-         evaluation board.
-
-config DDB5476
-       bool "Support for NEC DDB Vrc-5476"
-       select DDB5XXX_COMMON
-       select DMA_NONCOHERENT
-       select HAVE_STD_PC_SERIAL_PORT
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select I8259
-       select ISA
-       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-5476
-         evaluation board.
-
-         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 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 DDB5XXX_COMMON
        select DMA_NONCOHERENT
        select HW_HAS_PCI


@@ -503,13 +518,13 @@ config DDB5477
          ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX
          ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX

-       bool "Support for NEC VR4100 series based machines"
+       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
        select SYS_HAS_CPU_VR41XX
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
 
 config PMC_YOSEMITE

-       bool "Support for PMC-Sierra Yosemite eval board"
+       bool "PMC-Sierra Yosemite eval board"

        select DMA_COHERENT
        select HW_HAS_PCI
        select IRQ_CPU
        select DMA_COHERENT
        select HW_HAS_PCI
        select IRQ_CPU


@@ -526,10 +541,11 @@ config PMC_YOSEMITE
          manufactured by PMC-Sierra.
 
 config QEMU
          manufactured by PMC-Sierra.
 
 config QEMU

-       bool "Support for Qemu"
+       bool "Qemu"

        select DMA_COHERENT
        select GENERIC_ISA_DMA
        select HAVE_STD_PC_SERIAL_PORT
        select DMA_COHERENT
        select GENERIC_ISA_DMA
        select HAVE_STD_PC_SERIAL_PORT

+       select I8253

        select I8259
        select ISA
        select SWAP_IO_SPACE
        select I8259
        select ISA
        select SWAP_IO_SPACE


@@ -544,8 +560,22 @@ config QEMU
          simulate actual MIPS hardware platforms.  More information on Qemu
          can be found at http://www.linux-mips.org/wiki/Qemu.
 
          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 HW_HAS_PCI
+       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 ARC
        select ARC32
        select BOOT_ELF32


@@ -553,6 +583,7 @@ config SGI_IP22
        select HW_HAS_EISA
        select IP22_CPU_SCACHE
        select IRQ_CPU
        select HW_HAS_EISA
        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 SWAP_IO_SPACE
        select SYS_HAS_CPU_R4X00
        select SYS_HAS_CPU_R5000


@@ -565,7 +596,7 @@ config SGI_IP22
          that runs on these, say Y here.
 
 config SGI_IP27
          that runs on these, say Y here.
 
 config SGI_IP27

-       bool "Support for SGI IP27 (Origin200/2000)"
+       bool "SGI IP27 (Origin200/2000)"

        select ARC
        select ARC64
        select BOOT_ELF64
        select ARC
        select ARC64
        select BOOT_ELF64


@@ -575,13 +606,14 @@ config SGI_IP27
        select SYS_HAS_CPU_R10000
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        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.
 
 config SGI_IP32
        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_IP32

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

        depends on EXPERIMENTAL
        select ARC
        select ARC32
        depends on EXPERIMENTAL
        select ARC
        select ARC32


@@ -602,7 +634,7 @@ config SGI_IP32
          If you want this kernel to run on SGI O2 workstation, say Y here.
 
 config SIBYTE_BIGSUR
          If you want this kernel to run on SGI O2 workstation, say Y here.
 
 config SIBYTE_BIGSUR

-       bool "Support for Sibyte BCM91480B-BigSur"
+       bool "Sibyte BCM91480B-BigSur"

        select BOOT_ELF32
        select DMA_COHERENT
        select PCI_DOMAINS
        select BOOT_ELF32
        select DMA_COHERENT
        select PCI_DOMAINS


@@ -613,7 +645,7 @@ config SIBYTE_BIGSUR
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SWARM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SWARM

-       bool "Support for Sibyte BCM91250A-SWARM"
+       bool "Sibyte BCM91250A-SWARM"

        select BOOT_ELF32
        select DMA_COHERENT
        select SIBYTE_SB1250
        select BOOT_ELF32
        select DMA_COHERENT
        select SIBYTE_SB1250


@@ -624,7 +656,7 @@ config SIBYTE_SWARM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SENTOSA
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SENTOSA

-       bool "Support for Sibyte BCM91250E-Sentosa"
+       bool "Sibyte BCM91250E-Sentosa"

        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT


@@ -635,7 +667,7 @@ config SIBYTE_SENTOSA
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_RHONE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_RHONE

-       bool "Support for Sibyte BCM91125E-Rhone"
+       bool "Sibyte BCM91125E-Rhone"

        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT


@@ -646,7 +678,7 @@ config SIBYTE_RHONE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CARMEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CARMEL

-       bool "Support for Sibyte BCM91120x-Carmel"
+       bool "Sibyte BCM91120x-Carmel"

        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT


@@ -657,7 +689,7 @@ config SIBYTE_CARMEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_PTSWARM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_PTSWARM

-       bool "Support for Sibyte BCM91250PT-PTSWARM"
+       bool "Sibyte BCM91250PT-PTSWARM"

        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT


@@ -669,7 +701,7 @@ config SIBYTE_PTSWARM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_LITTLESUR
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_LITTLESUR

-       bool "Support for Sibyte BCM91250C2-LittleSur"
+       bool "Sibyte BCM91250C2-LittleSur"

        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT


@@ -681,7 +713,7 @@ config SIBYTE_LITTLESUR
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CRHINE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CRHINE

-       bool "Support for Sibyte BCM91120C-CRhine"
+       bool "Sibyte BCM91120C-CRhine"

        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT


@@ -692,7 +724,7 @@ config SIBYTE_CRHINE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CRHONE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_CRHONE

-       bool "Support for Sibyte BCM91125C-CRhone"
+       bool "Sibyte BCM91125C-CRhone"

        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT


@@ -704,9 +736,9 @@ config SIBYTE_CRHONE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SNI_RM200_PCI
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SNI_RM200_PCI

-       bool "Support for SNI RM200 PCI"
-       select ARC
-       select ARC32
+       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 ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
        select DMA_NONCOHERENT


@@ -714,12 +746,16 @@ config SNI_RM200_PCI
        select HAVE_STD_PC_SERIAL_PORT
        select HW_HAS_EISA
        select HW_HAS_PCI
        select HAVE_STD_PC_SERIAL_PORT
        select HW_HAS_EISA
        select HW_HAS_PCI

+       select I8253

        select I8259
        select ISA
        select I8259
        select ISA

+       select SWAP_IO_SPACE if CPU_BIG_ENDIAN

        select SYS_HAS_CPU_R4X00
        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_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

-       select SYS_SUPPORTS_BIG_ENDIAN if EXPERIMENTAL
+       select SYS_SUPPORTS_BIG_ENDIAN

        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_LITTLE_ENDIAN
        help
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_LITTLE_ENDIAN
        help


@@ -729,7 +765,7 @@ config SNI_RM200_PCI
          support this machine type.
 
 config TOSHIBA_JMR3927
          support this machine type.
 
 config TOSHIBA_JMR3927

-       bool "Support for Toshiba JMR-TX3927 board"
+       bool "Toshiba JMR-TX3927 board"

        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_TX3927
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_TX3927


@@ -740,7 +776,7 @@ config TOSHIBA_JMR3927
        select TOSHIBA_BOARDS
 
 config TOSHIBA_RBTX4927
        select TOSHIBA_BOARDS
 
 config TOSHIBA_RBTX4927

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

        select DMA_NONCOHERENT
        select HAS_TXX9_SERIAL
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select HAS_TXX9_SERIAL
        select HW_HAS_PCI


@@ -757,7 +793,7 @@ config TOSHIBA_RBTX4927
          support this machine type
 
 config TOSHIBA_RBTX4938
          support this machine type
 
 config TOSHIBA_RBTX4938

-       bool "Support for Toshiba RBTX4938 board"
+       bool "Toshiba RBTX4938 board"

        select HAVE_STD_PC_SERIAL_PORT
        select DMA_NONCOHERENT
        select GENERIC_ISA_DMA
        select HAVE_STD_PC_SERIAL_PORT
        select DMA_NONCOHERENT
        select GENERIC_ISA_DMA


@@ -813,6 +849,10 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
        bool
        default y
 

+config SCHED_NO_NO_OMIT_FRAME_POINTER
+       bool
+       default y
+

 #
 # Select some configuration options automatically based on user selections.
 #
 #
 # Select some configuration options automatically based on user selections.
 #


@@ -972,6 +1012,11 @@ config SOC_PNX8550
 config SWAP_IO_SPACE
        bool
 
 config SWAP_IO_SPACE
        bool
 

+config EMMA2RH
+       bool
+       depends on MARKEINS
+       default y
+

 #
 # Unfortunately not all GT64120 systems run the chip at the same clock.
 # As the user for the clock rate and try to minimize the available options.
 #
 # Unfortunately not all GT64120 systems run the chip at the same clock.
 # As the user for the clock rate and try to minimize the available options.


@@ -1060,6 +1105,7 @@ choice
 config CPU_MIPS32_R1
        bool "MIPS32 Release 1"
        depends on SYS_HAS_CPU_MIPS32_R1
 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
        select CPU_HAS_PREFETCH
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_HIGHMEM


@@ -1077,6 +1123,7 @@ config CPU_MIPS32_R1
 config CPU_MIPS32_R2
        bool "MIPS32 Release 2"
        depends on SYS_HAS_CPU_MIPS32_R2
 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
        select CPU_HAS_PREFETCH
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_HIGHMEM


@@ -1090,6 +1137,7 @@ config CPU_MIPS32_R2
 config CPU_MIPS64_R1
        bool "MIPS64 Release 1"
        depends on SYS_HAS_CPU_MIPS64_R1
 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_HAS_PREFETCH
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL


@@ -1108,6 +1156,7 @@ config CPU_MIPS64_R1
 config CPU_MIPS64_R2
        bool "MIPS64 Release 2"
        depends on SYS_HAS_CPU_MIPS64_R2
 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_HAS_PREFETCH
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL


@@ -1122,6 +1171,7 @@ config CPU_MIPS64_R2
 config CPU_R3000
        bool "R3000"
        depends on SYS_HAS_CPU_R3000
 config CPU_R3000
        bool "R3000"
        depends on SYS_HAS_CPU_R3000

+       select CPU_HAS_WB

        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_HIGHMEM
        help
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_HIGHMEM
        help


@@ -1151,6 +1201,7 @@ config CPU_VR41XX
 config CPU_R4300
        bool "R4300"
        depends on SYS_HAS_CPU_R4300
 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
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
        help


@@ -1159,6 +1210,7 @@ config CPU_R4300
 config CPU_R4X00
        bool "R4x00"
        depends on SYS_HAS_CPU_R4X00
 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
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
        help


@@ -1168,6 +1220,7 @@ config CPU_R4X00
 config CPU_TX49XX
        bool "R49XX"
        depends on SYS_HAS_CPU_TX49XX
 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
        select CPU_HAS_PREFETCH
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL


@@ -1175,6 +1228,7 @@ config CPU_TX49XX
 config CPU_R5000
        bool "R5000"
        depends on SYS_HAS_CPU_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
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
        help


@@ -1183,12 +1237,14 @@ config CPU_R5000
 config CPU_R5432
        bool "R5432"
        depends on SYS_HAS_CPU_R5432
 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"
        depends on EXPERIMENTAL
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
 
 config CPU_R6000
        bool "R6000"
        depends on EXPERIMENTAL

+       select CPU_HAS_LLSC

        depends on SYS_HAS_CPU_R6000
        select CPU_SUPPORTS_32BIT_KERNEL
        help
        depends on SYS_HAS_CPU_R6000
        select CPU_SUPPORTS_32BIT_KERNEL
        help


@@ -1198,6 +1254,7 @@ config CPU_R6000
 config CPU_NEVADA
        bool "RM52xx"
        depends on SYS_HAS_CPU_NEVADA
 config CPU_NEVADA
        bool "RM52xx"
        depends on SYS_HAS_CPU_NEVADA

+       select CPU_HAS_LLSC

        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
        help
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
        help


@@ -1207,6 +1264,7 @@ config CPU_R8000
        bool "R8000"
        depends on EXPERIMENTAL
        depends on SYS_HAS_CPU_R8000
        bool "R8000"
        depends on EXPERIMENTAL
        depends on SYS_HAS_CPU_R8000

+       select CPU_HAS_LLSC

        select CPU_HAS_PREFETCH
        select CPU_SUPPORTS_64BIT_KERNEL
        help
        select CPU_HAS_PREFETCH
        select CPU_SUPPORTS_64BIT_KERNEL
        help


@@ -1216,6 +1274,7 @@ config CPU_R8000
 config CPU_R10000
        bool "R10000"
        depends on SYS_HAS_CPU_R10000
 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_HAS_PREFETCH
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL


@@ -1226,6 +1285,7 @@ config CPU_R10000
 config CPU_RM7000
        bool "RM7000"
        depends on SYS_HAS_CPU_RM7000
 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_HAS_PREFETCH
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL


@@ -1234,6 +1294,7 @@ config CPU_RM7000
 config CPU_RM9000
        bool "RM9000"
        depends on SYS_HAS_CPU_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_HAS_PREFETCH
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL


@@ -1242,6 +1303,7 @@ config CPU_RM9000
 config CPU_SB1
        bool "SB1"
        depends on SYS_HAS_CPU_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
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
        select CPU_SUPPORTS_HIGHMEM


@@ -1387,13 +1449,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"


@@ -1402,8 +1463,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
 


@@ -1440,6 +1500,12 @@ choice
        prompt "MIPS MT options"
        depends on MIPS_MT
 
        prompt "MIPS MT options"
        depends on MIPS_MT
 

+config MIPS_MT_SMTC
+       bool "SMTC: Use all TCs on all VPEs for SMP"
+       select CPU_MIPSR2_IRQ_VI
+       select CPU_MIPSR2_SRS
+       select SMP
+

 config MIPS_MT_SMP
        bool "Use 1 TC on each available VPE for SMP"
        select SMP
 config MIPS_MT_SMP
        bool "Use 1 TC on each available VPE for SMP"
        select SMP


@@ -1453,6 +1519,11 @@ config MIPS_VPE_LOADER
 
 endchoice
 
 
 endchoice
 

+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
 config MIPS_VPE_LOADER_TOM
        bool "Load VPE program into memory hidden from linux"
        depends on MIPS_VPE_LOADER


@@ -1469,6 +1540,16 @@ config MIPS_VPE_APSP_API
        depends on MIPS_VPE_LOADER
        help
 
        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
        depends on CPU_SB1_PASS_1
 config SB1_PASS_1_WORKAROUNDS
        bool
        depends on CPU_SB1_PASS_1


@@ -1488,38 +1569,15 @@ 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) && 32BIT
 
        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) && 32BIT
 

-config CPU_ADVANCED
-       bool "Override CPU Options"
-       depends on 32BIT
-       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.
-

 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>.
-
-         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.
+       bool

 
 config CPU_HAS_WB
 
 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.
-
-menu "MIPSR2 Interrupt handling"
-       depends on CPU_MIPSR2 && CPU_ADVANCED
+       bool

 
 config CPU_MIPSR2_IRQ_VI
        bool "Vectored interrupt mode"
 
 config CPU_MIPSR2_IRQ_VI
        bool "Vectored interrupt mode"

+       depends on CPU_MIPSR2

        help
           Vectored interrupt mode allowing faster dispatching of interrupts.
           The board support code needs to be written to take advantage of this
        help
           Vectored interrupt mode allowing faster dispatching of interrupts.
           The board support code needs to be written to take advantage of this


@@ -1529,6 +1587,7 @@ config CPU_MIPSR2_IRQ_VI
 
 config CPU_MIPSR2_IRQ_EI
        bool "External interrupt controller mode"
 
 config CPU_MIPSR2_IRQ_EI
        bool "External interrupt controller mode"

+       depends on CPU_MIPSR2

        help
           Extended interrupt mode takes advantage of an external interrupt
           controller to allow fast dispatching from many possible interrupt
        help
           Extended interrupt mode takes advantage of an external interrupt
           controller to allow fast dispatching from many possible interrupt


@@ -1542,7 +1601,6 @@ config CPU_MIPSR2_SRS
           Allow the kernel to use shadow register sets for fast interrupts.
           Interrupt handlers must be specially written to use shadow sets.
           Say N unless you know that shadow register set upport is needed.
           Allow the kernel to use shadow register sets for fast interrupts.
           Interrupt handlers must be specially written to use shadow sets.
           Say N unless you know that shadow register set upport is needed.

-endmenu

 
 config CPU_HAS_SYNC
        bool
 
 config CPU_HAS_SYNC
        bool


@@ -1587,11 +1645,38 @@ config ARCH_FLATMEM_ENABLE
        def_bool y
        depends on !NUMA
 
        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 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"
 source "mm/Kconfig"
 
 config SMP
        bool "Multi-Processing support"

-       depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP
+       depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP || MIPS_MT_SMTC

        ---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
        ---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


@@ -1626,6 +1711,77 @@ 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.
 

+#
+# Timer Interrupt Frequency Configuration
+#
+
+choice
+       prompt "Timer frequency"
+       default HZ_250
+       help
+        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
 source "kernel/Kconfig.preempt"
 
 config RTC_DS1742


@@ -1685,6 +1841,9 @@ source "drivers/pci/Kconfig"
 config ISA
        bool
 
 config ISA
        bool
 

+config NO_ISA
+       bool
+

 config EISA
        bool "EISA support"
        depends on HW_HAS_EISA
 config EISA
        bool "EISA support"
        depends on HW_HAS_EISA


@@ -1721,6 +1880,9 @@ config MMU
        bool
        default y
 
        bool
        default y
 

+config I8253
+       bool
+

 source "drivers/pcmcia/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
 source "drivers/pcmcia/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"


@@ -1812,6 +1974,32 @@ config PM
        bool "Power Management support (EXPERIMENTAL)"
        depends on EXPERIMENTAL && SOC_AU1X00
 
        bool "Power Management support (EXPERIMENTAL)"
        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
 
 source "net/Kconfig"
 endmenu
 
 source "net/Kconfig"