MIPS: Drop unnecessary CONFIG_ISA from RBTX49XX

[safe/jmp/linux-2.6] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9fe9050..b7cb048 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -8,6 +8,9 @@ mainmenu "Linux/MIPS Kernel Configuration"
 
 menu "Machine selection"
 
 
 menu "Machine selection"
 

+config ZONE_DMA
+       bool
+

 choice
        prompt "System type"
        default SGI_IP22
 choice
        prompt "System type"
        default SGI_IP22


@@ -16,6 +19,7 @@ config MIPS_MTX1
        bool "4G Systems MTX-1 board"
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        bool "4G Systems MTX-1 board"
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select RESOURCES_64BIT if PCI

        select SOC_AU1500
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SOC_AU1500
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN


@@ -32,6 +36,7 @@ config MIPS_PB1000
        select SOC_AU1000
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select SOC_AU1000
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select RESOURCES_64BIT if PCI

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN


@@ -41,6 +46,7 @@ config MIPS_PB1100
        select SOC_AU1100
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select SOC_AU1100
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select RESOURCES_64BIT if PCI

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN


@@ -50,6 +56,7 @@ config MIPS_PB1500
        select SOC_AU1500
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select SOC_AU1500
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select RESOURCES_64BIT if PCI

        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 


@@ -59,6 +66,7 @@ config MIPS_PB1550
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_DISABLE_OBSOLETE_IDE
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_DISABLE_OBSOLETE_IDE

+       select RESOURCES_64BIT if PCI

        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 


@@ -67,6 +75,7 @@ config MIPS_PB1200
        select SOC_AU1200
        select DMA_NONCOHERENT
        select MIPS_DISABLE_OBSOLETE_IDE
        select SOC_AU1200
        select DMA_NONCOHERENT
        select MIPS_DISABLE_OBSOLETE_IDE

+       select RESOURCES_64BIT if PCI

        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 


@@ -75,6 +84,7 @@ config MIPS_DB1000
        select SOC_AU1000
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select SOC_AU1000
        select DMA_NONCOHERENT
        select HW_HAS_PCI

+       select RESOURCES_64BIT if PCI

        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 


@@ -91,6 +101,7 @@ config MIPS_DB1500
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_DISABLE_OBSOLETE_IDE
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_DISABLE_OBSOLETE_IDE

+       select RESOURCES_64BIT if PCI

        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN


@@ -101,6 +112,7 @@ config MIPS_DB1550
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select MIPS_DISABLE_OBSOLETE_IDE
        select HW_HAS_PCI
        select DMA_NONCOHERENT
        select MIPS_DISABLE_OBSOLETE_IDE

+       select RESOURCES_64BIT if PCI

        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_LITTLE_ENDIAN
 


@@ -120,7 +132,7 @@ config MIPS_MIRAGE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config BASLER_EXCITE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config BASLER_EXCITE

-       bool "Basler eXcite smart camera support"
+       bool "Basler eXcite smart camera"

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


@@ -131,9 +143,10 @@ config BASLER_EXCITE
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN

+       select SYS_SUPPORTS_KGDB

        help
          The eXcite is a smart camera platform manufactured by
        help
          The eXcite is a smart camera platform manufactured by

-         Basler Vision Technologies AG
+         Basler Vision Technologies AG.

 
 config BASLER_EXCITE_PROTOTYPE
        bool "Support for pre-release units"
 
 config BASLER_EXCITE_PROTOTYPE
        bool "Support for pre-release units"


@@ -151,17 +164,19 @@ config MIPS_COBALT
        select HW_HAS_PCI
        select I8259
        select IRQ_CPU
        select HW_HAS_PCI
        select I8259
        select IRQ_CPU

-       select MIPS_GT64111
+       select PCI_GT64XXX_PCI0

        select SYS_HAS_CPU_NEVADA
        select SYS_HAS_CPU_NEVADA

+       select SYS_HAS_EARLY_PRINTK

        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 GENERIC_HARDIRQS_NO__DO_IRQ

 
 config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32
        select DMA_NONCOHERENT
 
 config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32
        select DMA_NONCOHERENT

-       select EARLY_PRINTK
+       select SYS_HAS_EARLY_PRINTK

        select IRQ_CPU
        select SYS_HAS_CPU_R3000
        select SYS_HAS_CPU_R4X00
        select IRQ_CPU
        select SYS_HAS_CPU_R3000
        select SYS_HAS_CPU_R4X00


@@ -191,11 +206,12 @@ config MIPS_EV64120
        depends on EXPERIMENTAL
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        depends on EXPERIMENTAL
        select DMA_NONCOHERENT
        select HW_HAS_PCI

-       select MIPS_GT64120
+       select PCI_GT64XXX_PCI0

        select SYS_HAS_CPU_R5000
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_HAS_CPU_R5000
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN

+       select SYS_SUPPORTS_KGDB

        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


@@ -216,6 +232,7 @@ config MACH_JAZZ
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_SUPPORTS_100HZ
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_SUPPORTS_100HZ

+       select GENERIC_HARDIRQS_NO__DO_IRQ

        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.


@@ -225,24 +242,27 @@ config MACH_JAZZ
 config LASAT
        bool "LASAT Networks platforms"
        select DMA_NONCOHERENT
 config LASAT
        bool "LASAT Networks platforms"
        select DMA_NONCOHERENT

+       select SYS_HAS_EARLY_PRINTK

        select HW_HAS_PCI
        select HW_HAS_PCI

-       select MIPS_GT64120
+       select PCI_GT64XXX_PCI0

        select MIPS_NILE4
        select R5000_CPU_SCACHE
        select SYS_HAS_CPU_R5000
        select SYS_SUPPORTS_32BIT_KERNEL
        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_64BIT_KERNEL if BROKEN

        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN

+       select GENERIC_HARDIRQS_NO__DO_IRQ

 
 config MIPS_ATLAS
        bool "MIPS Atlas board"
        select BOOT_ELF32
        select DMA_NONCOHERENT
 
 config MIPS_ATLAS
        bool "MIPS Atlas board"
        select BOOT_ELF32
        select DMA_NONCOHERENT

+       select SYS_HAS_EARLY_PRINTK

        select IRQ_CPU
        select HW_HAS_PCI
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64
        select IRQ_CPU
        select HW_HAS_PCI
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64

-       select MIPS_GT64120
+       select PCI_GT64XXX_PCI0

        select MIPS_MSC
        select RM7000_CPU_SCACHE
        select SWAP_IO_SPACE
        select MIPS_MSC
        select RM7000_CPU_SCACHE
        select SWAP_IO_SPACE


@@ -256,6 +276,8 @@ config MIPS_ATLAS
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL

+       select SYS_SUPPORTS_SMARTMIPS
+       select GENERIC_HARDIRQS_NO__DO_IRQ

        help
          This enables support for the MIPS Technologies Atlas evaluation
          board.
        help
          This enables support for the MIPS Technologies Atlas evaluation
          board.


@@ -266,14 +288,14 @@ config MIPS_MALTA
        select BOOT_ELF32
        select HAVE_STD_PC_SERIAL_PORT
        select DMA_NONCOHERENT
        select BOOT_ELF32
        select HAVE_STD_PC_SERIAL_PORT
        select DMA_NONCOHERENT

-       select IRQ_CPU

        select GENERIC_ISA_DMA
        select GENERIC_ISA_DMA

+       select IRQ_CPU

        select HW_HAS_PCI
        select I8259
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64
        select MIPS_CPU_SCACHE
        select HW_HAS_PCI
        select I8259
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64
        select MIPS_CPU_SCACHE

-       select MIPS_GT64120
+       select PCI_GT64XXX_PCI0

        select MIPS_MSC
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1
        select MIPS_MSC
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1


@@ -281,11 +303,13 @@ config MIPS_MALTA
        select SYS_HAS_CPU_MIPS64_R1
        select SYS_HAS_CPU_NEVADA
        select SYS_HAS_CPU_RM7000
        select SYS_HAS_CPU_MIPS64_R1
        select SYS_HAS_CPU_NEVADA
        select SYS_HAS_CPU_RM7000

+       select SYS_HAS_EARLY_PRINTK

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_MULTITHREADING
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_MULTITHREADING

+       select SYS_SUPPORTS_SMARTMIPS

        help
          This enables support for the MIPS Technologies Malta evaluation
          board.
        help
          This enables support for the MIPS Technologies Malta evaluation
          board.


@@ -295,6 +319,7 @@ config MIPS_SEAD
        depends on EXPERIMENTAL
        select IRQ_CPU
        select DMA_NONCOHERENT
        depends on EXPERIMENTAL
        select IRQ_CPU
        select DMA_NONCOHERENT

+       select SYS_HAS_EARLY_PRINTK

        select MIPS_BOARDS_GEN
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_HAS_CPU_MIPS32_R2
        select MIPS_BOARDS_GEN
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_HAS_CPU_MIPS32_R2


@@ -303,6 +328,7 @@ config MIPS_SEAD
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN

+       select SYS_SUPPORTS_SMARTMIPS

        help
          This enables support for the MIPS Technologies SEAD evaluation
          board.
        help
          This enables support for the MIPS Technologies SEAD evaluation
          board.


@@ -313,7 +339,7 @@ config WR_PPMC
        select BOOT_ELF32
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select BOOT_ELF32
        select DMA_NONCOHERENT
        select HW_HAS_PCI

-       select MIPS_GT64120
+       select PCI_GT64XXX_PCI0

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_HAS_CPU_MIPS32_R2
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_HAS_CPU_MIPS32_R2


@@ -331,9 +357,11 @@ config WR_PPMC
 config MIPS_SIM
        bool 'MIPS simulator (MIPSsim)'
        select DMA_NONCOHERENT
 config MIPS_SIM
        bool 'MIPS simulator (MIPSsim)'
        select DMA_NONCOHERENT

+       select SYS_HAS_EARLY_PRINTK

        select IRQ_CPU
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_HAS_CPU_MIPS32_R2
        select IRQ_CPU
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_HAS_CPU_MIPS32_R2

+       select SYS_HAS_EARLY_PRINTK

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN


@@ -354,9 +382,11 @@ config MOMENCO_JAGUAR_ATX
        select RM7000_CPU_SCACHE
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_RM9000
        select RM7000_CPU_SCACHE
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_RM9000

+       select SYS_HAS_EARLY_PRINTK

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN

+       select SYS_SUPPORTS_KGDB

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


@@ -367,13 +397,14 @@ config MOMENCO_OCELOT
        select HW_HAS_PCI
        select IRQ_CPU
        select IRQ_CPU_RM7K
        select HW_HAS_PCI
        select IRQ_CPU
        select IRQ_CPU_RM7K

-       select MIPS_GT64120
+       select PCI_GT64XXX_PCI0

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

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


@@ -410,6 +441,7 @@ config MOMENCO_OCELOT_C
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN

+       select GENERIC_HARDIRQS_NO__DO_IRQ

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


@@ -425,9 +457,8 @@ config MOMENCO_OCELOT_G
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_RM7000
        select SYS_SUPPORTS_32BIT_KERNEL
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_RM7000
        select SYS_SUPPORTS_32BIT_KERNEL

-       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if BROKEN

        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN

-       select ARCH_SPARSEMEM_ENABLE

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


@@ -438,15 +469,13 @@ config MIPS_XXS1500
        select SOC_AU1500
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SOC_AU1500
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config PNX8550_V2PCI
-       bool "Philips PNX8550 based Viper2-PCI board"
-       depends on BROKEN
+config PNX8550_JBS
+       bool "Philips PNX8550 based JBS board"

        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config PNX8550_JBS
-       bool "Philips PNX8550 based JBS board"
-       depends on BROKEN
+config PNX8550_STB810
+       bool "Support for Philips PNX8550 based STB810 board"

        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 


@@ -460,6 +489,8 @@ config DDB5477
        select SYS_HAS_CPU_R5432
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
        select SYS_HAS_CPU_R5432
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL

+       select SYS_SUPPORTS_KGDB
+       select SYS_SUPPORTS_KGDB

        select SYS_SUPPORTS_LITTLE_ENDIAN
        help
          This enables support for the R5432-based NEC DDB Vrc-5477,
        select SYS_SUPPORTS_LITTLE_ENDIAN
        help
          This enables support for the R5432-based NEC DDB Vrc-5477,


@@ -469,10 +500,9 @@ config DDB5477
          ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX
          ether port USB, AC97, PCI, etc.
 
 config MACH_VR41XX

-       bool "NEC VR41XX-based machines"
+       bool "NEC VR4100 series based machines"

        select SYS_HAS_CPU_VR41XX
        select SYS_HAS_CPU_VR41XX

-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
+       select GENERIC_HARDIRQS_NO__DO_IRQ

 
 config PMC_YOSEMITE
        bool "PMC-Sierra Yosemite eval board"
 
 config PMC_YOSEMITE
        bool "PMC-Sierra Yosemite eval board"


@@ -483,10 +513,12 @@ config PMC_YOSEMITE
        select IRQ_CPU_RM9K
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_RM9000
        select IRQ_CPU_RM9K
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_RM9000

+       select SYS_HAS_EARLY_PRINTK

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM

+       select SYS_SUPPORTS_KGDB

        select SYS_SUPPORTS_SMP
        help
          Yosemite is an evaluation board for the RM9000x2 processor
        select SYS_SUPPORTS_SMP
        help
          Yosemite is an evaluation board for the RM9000x2 processor


@@ -506,6 +538,9 @@ config QEMU
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select ARCH_SPARSEMEM_ENABLE
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select ARCH_SPARSEMEM_ENABLE

+       select GENERIC_HARDIRQS_NO__DO_IRQ
+       select NR_CPUS_DEFAULT_1
+       select SYS_SUPPORTS_SMP

        help
          Qemu is a software emulator which among other architectures also
          can simulate a MIPS32 4Kc system.  This patch adds support for the
        help
          Qemu is a software emulator which among other architectures also
          can simulate a MIPS32 4Kc system.  This patch adds support for the


@@ -537,10 +572,11 @@ 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 GENERIC_ISA_DMA_SUPPORT_BROKEN

        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

+       select SYS_HAS_EARLY_PRINTK

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN


@@ -555,13 +591,17 @@ config SGI_IP27
        select ARC64
        select BOOT_ELF64
        select DMA_IP27
        select ARC64
        select BOOT_ELF64
        select DMA_IP27

-       select EARLY_PRINTK
+       select SYS_HAS_EARLY_PRINTK

        select HW_HAS_PCI
        select HW_HAS_PCI

+       select NR_CPUS_DEFAULT_64

        select PCI_DOMAINS
        select SYS_HAS_CPU_R10000
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN
        select PCI_DOMAINS
        select SYS_HAS_CPU_R10000
        select SYS_SUPPORTS_64BIT_KERNEL
        select SYS_SUPPORTS_BIG_ENDIAN

+       select SYS_SUPPORTS_KGDB

        select SYS_SUPPORTS_NUMA
        select SYS_SUPPORTS_NUMA

+       select SYS_SUPPORTS_SMP
+       select GENERIC_HARDIRQS_NO__DO_IRQ

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


@@ -573,8 +613,6 @@ config SGI_IP32
        select ARC
        select ARC32
        select BOOT_ELF32
        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 DMA_NONCOHERENT
        select HW_HAS_PCI
        select R5000_CPU_SCACHE


@@ -592,6 +630,7 @@ config SIBYTE_BIGSUR
        bool "Sibyte BCM91480B-BigSur"
        select BOOT_ELF32
        select DMA_COHERENT
        bool "Sibyte BCM91480B-BigSur"
        select BOOT_ELF32
        select DMA_COHERENT

+       select NR_CPUS_DEFAULT_4

        select PCI_DOMAINS
        select SIBYTE_BCM1x80
        select SWAP_IO_SPACE
        select PCI_DOMAINS
        select SIBYTE_BCM1x80
        select SWAP_IO_SPACE


@@ -603,11 +642,13 @@ config SIBYTE_SWARM
        bool "Sibyte BCM91250A-SWARM"
        select BOOT_ELF32
        select DMA_COHERENT
        bool "Sibyte BCM91250A-SWARM"
        select BOOT_ELF32
        select DMA_COHERENT

+       select NR_CPUS_DEFAULT_2

        select SIBYTE_SB1250
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM
        select SIBYTE_SB1250
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_HIGHMEM

+       select SYS_SUPPORTS_KGDB

        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SENTOSA
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_SENTOSA


@@ -615,6 +656,7 @@ config SIBYTE_SENTOSA
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT

+       select NR_CPUS_DEFAULT_2

        select SIBYTE_SB1250
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SIBYTE_SB1250
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1


@@ -648,6 +690,7 @@ config SIBYTE_PTSWARM
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT

+       select NR_CPUS_DEFAULT_2

        select SIBYTE_SB1250
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SIBYTE_SB1250
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1


@@ -660,6 +703,7 @@ config SIBYTE_LITTLESUR
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT
        depends on EXPERIMENTAL
        select BOOT_ELF32
        select DMA_COHERENT

+       select NR_CPUS_DEFAULT_2

        select SIBYTE_SB1250
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SIBYTE_SB1250
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1


@@ -690,32 +734,34 @@ config SIBYTE_CRHONE
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config SNI_RM200_PCI
-       bool "SNI RM200 PCI"
+config SNI_RM
+       bool "SNI RM200/300/400"

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

-       select HAVE_STD_PC_SERIAL_PORT

        select HW_HAS_EISA
        select HW_HAS_PCI
        select HW_HAS_EISA
        select HW_HAS_PCI

+       select IRQ_CPU

        select I8253
        select I8259
        select ISA
        select SWAP_IO_SPACE if CPU_BIG_ENDIAN
        select SYS_HAS_CPU_R4X00
        select SYS_HAS_CPU_R5000
        select I8253
        select I8259
        select ISA
        select SWAP_IO_SPACE if CPU_BIG_ENDIAN
        select SYS_HAS_CPU_R4X00
        select SYS_HAS_CPU_R5000

+       select SYS_HAS_CPU_R10000

        select R5000_CPU_SCACHE
        select R5000_CPU_SCACHE

+       select SYS_HAS_EARLY_PRINTK

        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
        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
+         The SNI RM200/300/400 are MIPS-based machines 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.
 
          Technology and now in turn merged with Fujitsu.  Say Y here to
          support this machine type.
 


@@ -727,8 +773,10 @@ config TOSHIBA_JMR3927
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX39XX
        select SYS_SUPPORTS_32BIT_KERNEL
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX39XX
        select SYS_SUPPORTS_32BIT_KERNEL

+       select SYS_SUPPORTS_LITTLE_ENDIAN

        select SYS_SUPPORTS_BIG_ENDIAN
        select TOSHIBA_BOARDS
        select SYS_SUPPORTS_BIG_ENDIAN
        select TOSHIBA_BOARDS

+       select GENERIC_HARDIRQS_NO__DO_IRQ

 
 config TOSHIBA_RBTX4927
        bool "Toshiba TBTX49[23]7 board"
 
 config TOSHIBA_RBTX4927
        bool "Toshiba TBTX49[23]7 board"


@@ -736,13 +784,15 @@ config TOSHIBA_RBTX4927
        select HAS_TXX9_SERIAL
        select HW_HAS_PCI
        select I8259
        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_64BIT_KERNEL
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX49XX
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL

+       select SYS_SUPPORTS_LITTLE_ENDIAN

        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN

+       select SYS_SUPPORTS_KGDB

        select TOSHIBA_BOARDS
        select TOSHIBA_BOARDS

+       select GENERIC_HARDIRQS_NO__DO_IRQ

        help
          This Toshiba board is based on the TX4927 processor. Say Y here to
          support this machine type
        help
          This Toshiba board is based on the TX4927 processor. Say Y here to
          support this machine type


@@ -755,13 +805,14 @@ config TOSHIBA_RBTX4938
        select HAS_TXX9_SERIAL
        select HW_HAS_PCI
        select I8259
        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 SWAP_IO_SPACE
        select SYS_HAS_CPU_TX49XX
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN

+       select SYS_SUPPORTS_KGDB

        select TOSHIBA_BOARDS
        select TOSHIBA_BOARDS

+       select GENERIC_HARDIRQS_NO__DO_IRQ

        help
          This Toshiba board is based on the TX4938 processor. Say Y here to
          support this machine type
        help
          This Toshiba board is based on the TX4938 processor. Say Y here to
          support this machine type


@@ -780,7 +831,6 @@ 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/tx4938/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 source "arch/mips/philips/pnx8550/common/Kconfig"

-source "arch/mips/cobalt/Kconfig"

 
 endmenu
 
 
 endmenu
 


@@ -791,6 +841,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
 config RWSEM_XCHGADD_ALGORITHM
        bool
 

+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+

 config GENERIC_FIND_NEXT_BIT
        bool
        default y
 config GENERIC_FIND_NEXT_BIT
        bool
        default y


@@ -803,10 +861,18 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
        bool
        default y
 

+config GENERIC_TIME
+       bool
+       default y
+

 config SCHED_NO_NO_OMIT_FRAME_POINTER
        bool
        default y
 
 config SCHED_NO_NO_OMIT_FRAME_POINTER
        bool
        default y
 

+config GENERIC_HARDIRQS_NO__DO_IRQ
+       bool
+       default n
+

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


@@ -833,14 +899,26 @@ config DMA_NONCOHERENT
 config DMA_NEED_PCI_MAP_STATE
        bool
 
 config DMA_NEED_PCI_MAP_STATE
        bool
 

-config OWN_DMA
-       bool
-

 config EARLY_PRINTK
 config EARLY_PRINTK

+       bool "Early printk" if EMBEDDED && DEBUG_KERNEL
+       depends on SYS_HAS_EARLY_PRINTK
+       default y
+       help
+         This option enables special console drivers which allow the kernel
+         to print messages very early in the bootup process.
+
+         This is useful for kernel debugging when your machine crashes very
+         early before the console code is initialized. For normal operation
+         it is not recommended because it looks on some machines ugly and
+         oesn't cooperate with an X server. You should normally N here,
+         unless you want to debug such a crash.
+
+config SYS_HAS_EARLY_PRINTK

        bool
 
 config GENERIC_ISA_DMA
        bool
        bool
 
 config GENERIC_ISA_DMA
        bool

+       select ZONE_DMA

 
 config I8259
        bool
 
 config I8259
        bool


@@ -862,8 +940,12 @@ config MIPS_NILE4
 config MIPS_DISABLE_OBSOLETE_IDE
        bool
 
 config MIPS_DISABLE_OBSOLETE_IDE
        bool
 

+config GENERIC_ISA_DMA_SUPPORT_BROKEN
+       bool
+       select ZONE_DMA
+

 #
 #

-# Endianess selection.  Suffiently obscure so many users don't know what to
+# Endianess selection.  Sufficiently 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.
 #
 # answer,so we try hard to limit the available choices.  Also the use of a
 # choice statement should be more obvious to the user.
 #


@@ -872,7 +954,7 @@ choice
        help
          Some MIPS machines can be configured for either little or big endian
          byte order. These modes require different kernels and a different
        help
          Some MIPS machines can be configured for either little or big endian
          byte order. These modes require different kernels and a different

-         Linux distribution.  In general there is one prefered byteorder for a
+         Linux distribution.  In general there is one preferred byteorder for a

          particular system but some systems are just as commonly used in the
          one or the other endianess.
 
          particular system but some systems are just as commonly used in the
          one or the other endianess.
 


@@ -887,6 +969,9 @@ config CPU_LITTLE_ENDIAN
 
 endchoice
 
 
 endchoice
 

+config SYS_SUPPORTS_APM_EMULATION
+       bool
+

 config SYS_SUPPORTS_BIG_ENDIAN
        bool
 
 config SYS_SUPPORTS_BIG_ENDIAN
        bool
 


@@ -907,14 +992,12 @@ config IRQ_MV64340
 
 config DDB5XXX_COMMON
        bool
 
 config DDB5XXX_COMMON
        bool

+       select SYS_SUPPORTS_KGDB

 
 config MIPS_BOARDS_GEN
        bool
 
 
 config MIPS_BOARDS_GEN
        bool
 

-config MIPS_GT64111
-       bool
-
-config MIPS_GT64120
+config PCI_GT64XXX_PCI0

        bool
 
 config MIPS_TX3927
        bool
 
 config MIPS_TX3927


@@ -954,6 +1037,11 @@ config SOC_AU1X00
        bool
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_32BIT_KERNEL
        bool
        select SYS_HAS_CPU_MIPS32_R1
        select SYS_SUPPORTS_32BIT_KERNEL

+       select SYS_SUPPORTS_APM_EMULATION
+       select SYS_SUPPORTS_KGDB
+
+config SERIAL_RM9000
+       bool

 
 config PNX8550
        bool
 
 config PNX8550
        bool


@@ -964,7 +1052,10 @@ config SOC_PNX8550
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select SYS_HAS_CPU_MIPS32_R1
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select SYS_HAS_CPU_MIPS32_R1

+       select SYS_HAS_EARLY_PRINTK

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_32BIT_KERNEL

+       select GENERIC_HARDIRQS_NO__DO_IRQ
+       select SYS_SUPPORTS_KGDB

 
 config SWAP_IO_SPACE
        bool
 
 config SWAP_IO_SPACE
        bool


@@ -1008,17 +1099,12 @@ endchoice
 config ARC32
        bool
 
 config ARC32
        bool
 

-config AU1X00_USB_DEVICE
-       bool
-       depends on MIPS_PB1500 || MIPS_PB1100 || MIPS_PB1000
-       default n
-

 config BOOT_ELF32
        bool
 
 config MIPS_L1_CACHE_SHIFT
        int
 config BOOT_ELF32
        bool
 
 config MIPS_L1_CACHE_SHIFT
        int

-       default "4" if MACH_DECSTATION
+       default "4" if MACH_DECSTATION || SNI_RM

        default "7" if SGI_IP27
        default "5"
 
        default "7" if SGI_IP27
        default "5"
 


@@ -1027,16 +1113,16 @@ config HAVE_STD_PC_SERIAL_PORT
 
 config ARC_CONSOLE
        bool "ARC console support"
 
 config ARC_CONSOLE
        bool "ARC console support"

-       depends on SGI_IP22 || SNI_RM200_PCI
+       depends on SGI_IP22 || (SNI_RM && CPU_LITTLE_ENDIAN)

 
 config ARC_MEMORY
        bool
 
 config ARC_MEMORY
        bool

-       depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP32
+       depends on MACH_JAZZ || SNI_RM || SGI_IP32

        default y
 
 config ARC_PROMLIB
        bool
        default y
 
 config ARC_PROMLIB
        bool

-       depends on MACH_JAZZ || SNI_RM200_PCI || SGI_IP22 || SGI_IP32
+       depends on MACH_JAZZ || SNI_RM || SGI_IP22 || SGI_IP32

        default y
 
 config ARC64
        default y
 
 config ARC64


@@ -1251,6 +1337,7 @@ config CPU_RM9000
        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

+       select WEAK_ORDERING

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


@@ -1259,6 +1346,7 @@ config CPU_SB1
        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

+       select WEAK_ORDERING

 
 endchoice
 
 
 endchoice
 


@@ -1319,6 +1407,8 @@ config SYS_HAS_CPU_RM9000
 config SYS_HAS_CPU_SB1
        bool
 
 config SYS_HAS_CPU_SB1
        bool
 

+config WEAK_ORDERING
+       bool

 endmenu
 
 #
 endmenu
 
 #


@@ -1463,31 +1553,33 @@ config MIPS_MT_DISABLED
          the option of an MT-enabled processor this option will be the only
          option in this menu.
 
          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 ...
+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
        depends on SYS_SUPPORTS_MULTITHREADING
        select CPU_MIPSR2_IRQ_VI
        select CPU_MIPSR2_SRS
        select MIPS_MT

+       select NR_CPUS_DEFAULT_2

        select SMP
        select SYS_SUPPORTS_SMP
        help
        select SMP
        select SYS_SUPPORTS_SMP
        help

-         This is a kernel model which is known a SMTC or lately has been
-         marketesed into SMVP.
+         This is a kernel model which is also known a VSMP or lately
+         has been marketesed into SMVP.

 
 

-config MIPS_MT_SMP
-       bool "Use 1 TC on each available VPE for SMP"
+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
        depends on SYS_SUPPORTS_MULTITHREADING
        select CPU_MIPSR2_IRQ_VI
        select CPU_MIPSR2_SRS
        select MIPS_MT

+       select NR_CPUS_DEFAULT_8

        select SMP
        select SYS_SUPPORTS_SMP
        help
        select SMP
        select SYS_SUPPORTS_SMP
        help

-         This is a kernel model which is also known a VSMP or lately
-         has been marketesed into SMVP.
+         This is a kernel model which is known a SMTC or lately has been
+         marketesed into SMVP.

 
 config MIPS_VPE_LOADER
        bool "VPE loader support."
 
 config MIPS_VPE_LOADER
        bool "VPE loader support."


@@ -1510,6 +1602,20 @@ config MIPS_MT_FPAFF
        depends on MIPS_MT
        default y
 
        depends on MIPS_MT
        default y
 

+config MIPS_MT_SMTC_INSTANT_REPLAY
+       bool "Low-latency Dispatch of Deferred SMTC IPIs"
+       depends on MIPS_MT_SMTC && !PREEMPT
+       default y
+       help
+         SMTC pseudo-interrupts between TCs are deferred and queued
+         if the target TC is interrupt-inhibited (IXMT). In the first
+         SMTC prototypes, these queued IPIs were serviced on return
+         to user mode, or on entry into the kernel idle loop. The
+         INSTANT_REPLAY option dispatches them as part of local_irq_restore()
+         processing, which adds runtime overhead (hence the option to turn
+         it off), but ensures that IPIs are handled promptly even under
+         heavy I/O interrupt load.
+

 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


@@ -1558,6 +1664,18 @@ config 64BIT_PHYS_ADDR
 config CPU_HAS_LLSC
        bool
 
 config CPU_HAS_LLSC
        bool
 

+config CPU_HAS_SMARTMIPS
+       depends on SYS_SUPPORTS_SMARTMIPS
+       bool "Support for the SmartMIPS ASE"
+       help
+         SmartMIPS is a extension of the MIPS32 architecture aimed at
+         increased security at both hardware and software level for
+         smartcards.  Enabling this option will allow proper use of the
+         SmartMIPS instructions by Linux applications.  However a kernel with
+         this option will not work on a MIPS core without SmartMIPS core.  If
+         you don't know you probably don't have SmartMIPS and should say N
+         here.
+

 config CPU_HAS_WB
        bool
 
 config CPU_HAS_WB
        bool
 


@@ -1621,6 +1739,9 @@ config CPU_SUPPORTS_HIGHMEM
 config SYS_SUPPORTS_HIGHMEM
        bool
 
 config SYS_SUPPORTS_HIGHMEM
        bool
 

+config SYS_SUPPORTS_SMARTMIPS
+       bool
+

 config ARCH_FLATMEM_ENABLE
        def_bool y
        depends on !NUMA
 config ARCH_FLATMEM_ENABLE
        def_bool y
        depends on !NUMA


@@ -1636,9 +1757,6 @@ config ARCH_DISCONTIGMEM_ENABLE
 
 config ARCH_SPARSEMEM_ENABLE
        bool
 
 config ARCH_SPARSEMEM_ENABLE
        bool

-
-config ARCH_SPARSEMEM_ENABLE
-       bool

        select SPARSEMEM_STATIC
 
 config NUMA
        select SPARSEMEM_STATIC
 
 config NUMA


@@ -1687,20 +1805,49 @@ config SMP
 config SYS_SUPPORTS_SMP
        bool
 
 config SYS_SUPPORTS_SMP
        bool
 

+config NR_CPUS_DEFAULT_1
+       bool
+
+config NR_CPUS_DEFAULT_2
+       bool
+
+config NR_CPUS_DEFAULT_4
+       bool
+
+config NR_CPUS_DEFAULT_8
+       bool
+
+config NR_CPUS_DEFAULT_16
+       bool
+
+config NR_CPUS_DEFAULT_32
+       bool
+
+config NR_CPUS_DEFAULT_64
+       bool
+

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

-       range 2 64
+       range 1 64 if NR_CPUS_DEFAULT_1

        depends on SMP
        depends on SMP

-       default "64" if SGI_IP27
-       default "2"
+       default "1" if NR_CPUS_DEFAULT_1
+       default "2" if NR_CPUS_DEFAULT_2
+       default "4" if NR_CPUS_DEFAULT_4
+       default "8" if NR_CPUS_DEFAULT_8
+       default "16" if NR_CPUS_DEFAULT_16
+       default "32" if NR_CPUS_DEFAULT_32
+       default "64" if NR_CPUS_DEFAULT_64

        help
          This allows you to specify the maximum number of CPUs which this
          kernel will support.  The maximum supported value is 32 for 32-bit
          kernel and 64 for 64-bit kernels; the minimum value which makes
        help
          This allows you to specify the maximum number of CPUs which this
          kernel will support.  The maximum supported value is 32 for 32-bit
          kernel and 64 for 64-bit kernels; the minimum value which makes

-         sense is 2.
+         sense is 1 for Qemu (useful only for kernel debugging purposes)
+         and 2 for all others.

 
          This is purely to save memory - each supported CPU adds
 
          This is purely to save memory - each supported CPU adds

-         approximately eight kilobytes to the kernel image.
+         approximately eight kilobytes to the kernel image.  For best
+         performance should round up your number of processors to the next
+         power of two.

 
 #
 # Timer Interrupt Frequency Configuration
 
 #
 # Timer Interrupt Frequency Configuration


@@ -1775,10 +1922,6 @@ config HZ
 
 source "kernel/Kconfig.preempt"
 
 
 source "kernel/Kconfig.preempt"
 

-config RTC_DS1742
-       bool "DS1742 BRAM/RTC support"
-       depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
-

 config MIPS_INSANE_LARGE
        bool "Support for large 64-bit configurations"
        depends on CPU_R10000 && 64BIT
 config MIPS_INSANE_LARGE
        bool "Support for large 64-bit configurations"
        depends on CPU_R10000 && 64BIT


@@ -1789,6 +1932,40 @@ 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.
 

+config KEXEC
+       bool "Kexec system call (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       help
+         kexec is a system call that implements the ability to shutdown your
+         current kernel, and to start another kernel.  It is like a reboot
+         but it is indepedent of the system firmware.   And like a reboot
+         you can start any kernel with it, not just Linux.
+
+         The name comes from the similiarity to the exec system call.
+
+         It is an ongoing process to be certain the hardware in a machine
+         is properly shutdown, so do not be surprised if this code does not
+         initially work for you.  It may help to enable device hotplugging
+         support.  As of this writing the exact hardware interface is
+         strongly in flux, so no good recommendation can be made.
+
+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.
+

 endmenu
 
 config RWSEM_GENERIC_SPINLOCK
 endmenu
 
 config RWSEM_GENERIC_SPINLOCK


@@ -1840,13 +2017,11 @@ source "drivers/pci/Kconfig"
 config ISA
        bool
 
 config ISA
        bool
 

-config NO_ISA
-       bool
-

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

+       select GENERIC_ISA_DMA

        ---help---
          The Extended Industry Standard Architecture (EISA) bus was
          developed as an open alternative to the IBM MicroChannel bus.
        ---help---
          The Extended Industry Standard Architecture (EISA) bus was
          developed as an open alternative to the IBM MicroChannel bus.


@@ -1927,6 +2102,11 @@ config COMPAT
        depends on MIPS32_COMPAT
        default y
 
        depends on MIPS32_COMPAT
        default y
 

+config SYSVIPC_COMPAT
+       bool
+       depends on COMPAT && SYSVIPC
+       default y
+

 config MIPS32_O32
        bool "Kernel support for o32 binaries"
        depends on MIPS32_COMPAT
 config MIPS32_O32
        bool "Kernel support for o32 binaries"
        depends on MIPS32_COMPAT


@@ -1952,52 +2132,11 @@ 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.
+endmenu

 
 

-         If unsure, say Y. Only embedded should say N here.
+menu "Power management options"

 
 

-config PM
-       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).
+source "kernel/power/Kconfig"

 
 endmenu
 
 
 endmenu