[MIPS] Add support for BCM47XX CPUs.

[powerpc.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5c863bc..6648f9b 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -15,29 +15,6 @@ choice
        prompt "System type"
        default SGI_IP22
 
        prompt "System type"
        default SGI_IP22
 

-config LEMOTE_FULONG
-       bool "Lemote Fulong mini-PC"
-       select ARCH_SPARSEMEM_ENABLE
-       select SYS_HAS_CPU_LOONGSON2
-       select DMA_NONCOHERENT
-       select BOOT_ELF32
-       select BOARD_SCACHE
-       select HAVE_STD_PC_SERIAL_PORT
-       select HW_HAS_PCI
-       select I8259
-       select ISA
-       select IRQ_CPU
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       select SYS_SUPPORTS_HIGHMEM
-       select SYS_HAS_EARLY_PRINTK
-       select GENERIC_HARDIRQS_NO__DO_IRQ
-       select CPU_HAS_WB
-       help
-         Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
-         an FPGA northbridge
-

 config MACH_ALCHEMY
        bool "Alchemy processor based machines"
 
 config MACH_ALCHEMY
        bool "Alchemy processor based machines"
 


@@ -51,7 +28,6 @@ config BASLER_EXCITE
        select MIPS_RM9122
        select SYS_HAS_CPU_RM9000
        select SYS_SUPPORTS_32BIT_KERNEL
        select MIPS_RM9122
        select SYS_HAS_CPU_RM9000
        select SYS_SUPPORTS_32BIT_KERNEL

-       select SYS_SUPPORTS_64BIT_KERNEL

        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_KGDB
        help
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_KGDB
        help


@@ -68,6 +44,20 @@ config BASLER_EXCITE_PROTOTYPE
          note that a kernel built with this option selected will not be
          able to run on normal units.
 
          note that a kernel built with this option selected will not be
          able to run on normal units.
 

+config BCM47XX
+       bool "BCM47XX based boards"
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select IRQ_CPU
+       select SYS_HAS_CPU_MIPS32_R1
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select SSB
+       select SSB_DRIVER_MIPS
+       select GENERIC_GPIO
+       help
+        Support for BCM47XX based boards
+

 config MIPS_COBALT
        bool "Cobalt Server"
        select DMA_NONCOHERENT
 config MIPS_COBALT
        bool "Cobalt Server"
        select DMA_NONCOHERENT


@@ -104,10 +94,10 @@ config MACH_DECSTATION
          If you have one of the following DECstation Models you definitely
          want to choose R4xx0 for the CPU Type:
 
          If you have one of the following DECstation Models you definitely
          want to choose R4xx0 for the CPU Type:
 

-               DECstation 5000/50
-               DECstation 5000/150
-               DECstation 5000/260
-               DECsystem 5900/260
+               DECstation 5000/50
+               DECstation 5000/150
+               DECstation 5000/260
+               DECsystem 5900/260

 
          otherwise choose R3000.
 
 
          otherwise choose R3000.
 


@@ -117,6 +107,7 @@ config MACH_JAZZ
        select ARC32
        select ARCH_MAY_HAVE_PC_FDC
        select GENERIC_ISA_DMA
        select ARC32
        select ARCH_MAY_HAVE_PC_FDC
        select GENERIC_ISA_DMA

+       select IRQ_CPU

        select I8259
        select ISA
        select PCSPEAKER
        select I8259
        select ISA
        select PCSPEAKER


@@ -131,6 +122,44 @@ config MACH_JAZZ
         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
         Olivetti M700-10 workstations.
 
         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
         Olivetti M700-10 workstations.
 

+config LASAT
+       bool "LASAT Networks platforms"
+       select DMA_NONCOHERENT
+       select SYS_HAS_EARLY_PRINTK
+       select HW_HAS_PCI
+       select PCI_GT64XXX_PCI0
+       select MIPS_NILE4
+       select R5000_CPU_SCACHE
+       select SYS_HAS_CPU_R5000
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select GENERIC_HARDIRQS_NO__DO_IRQ
+
+config LEMOTE_FULONG
+       bool "Lemote Fulong mini-PC"
+       select ARCH_SPARSEMEM_ENABLE
+       select SYS_HAS_CPU_LOONGSON2
+       select DMA_NONCOHERENT
+       select BOOT_ELF32
+       select BOARD_SCACHE
+       select HAVE_STD_PC_SERIAL_PORT
+       select HW_HAS_PCI
+       select I8259
+       select ISA
+       select IRQ_CPU
+       select SYS_SUPPORTS_32BIT_KERNEL
+       select SYS_SUPPORTS_64BIT_KERNEL
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select SYS_SUPPORTS_HIGHMEM
+       select SYS_HAS_EARLY_PRINTK
+       select GENERIC_HARDIRQS_NO__DO_IRQ
+       select GENERIC_ISA_DMA_SUPPORT_BROKEN
+       select CPU_HAS_WB
+       help
+         Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
+         an FPGA northbridge
+

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


@@ -192,8 +221,7 @@ config MIPS_MALTA
          board.
 
 config MIPS_SEAD
          board.
 
 config MIPS_SEAD

-       bool "MIPS SEAD board (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "MIPS SEAD board"

        select IRQ_CPU
        select DMA_NONCOHERENT
        select SYS_HAS_EARLY_PRINTK
        select IRQ_CPU
        select DMA_NONCOHERENT
        select SYS_HAS_EARLY_PRINTK


@@ -210,27 +238,6 @@ 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 "Wind River PPMC board"
-       select IRQ_CPU
-       select BOOT_ELF32
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select PCI_GT64XXX_PCI0
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_HAS_CPU_MIPS32_R2
-       select SYS_HAS_CPU_MIPS64_R1
-       select SYS_HAS_CPU_NEVADA
-       select SYS_HAS_CPU_RM7000
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       help
-         This enables support for the Wind River MIPS32 4KC PPMC evaluation
-         board, which is based on GT64120 bridge chip.
-

 config MIPS_SIM
        bool 'MIPS simulator (MIPSsim)'
        select DMA_NONCOHERENT
 config MIPS_SIM
        bool 'MIPS simulator (MIPSsim)'
        select DMA_NONCOHERENT


@@ -248,23 +255,24 @@ config MIPS_SIM
          This option enables support for MIPS Technologies MIPSsim software
          emulator.
 
          This option enables support for MIPS Technologies MIPSsim software
          emulator.
 

-config MOMENCO_OCELOT
-       bool "Momentum Ocelot board"
+config MARKEINS
+       bool "NEC EMMA2RH Mark-eins"

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

-       select IRQ_CPU_RM7K
-       select PCI_GT64XXX_PCI0
-       select RM7000_CPU_SCACHE

        select SWAP_IO_SPACE
        select SWAP_IO_SPACE

-       select SYS_HAS_CPU_RM7000

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_32BIT_KERNEL

-       select SYS_SUPPORTS_64BIT_KERNEL

        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN

-       select SYS_SUPPORTS_KGDB
+       select SYS_SUPPORTS_LITTLE_ENDIAN
+       select SYS_HAS_CPU_R5000

        help
        help

-         The Ocelot is a MIPS-based Single Board Computer (SBC) made by
-         Momentum Computer <http://www.momenco.com/>.
+         This enables support for the R5432-based NEC Mark-eins
+         boards with R5500 CPU.
+
+config MACH_VR41XX
+       bool "NEC VR4100 series based machines"
+       select SYS_HAS_CPU_VR41XX
+       select GENERIC_HARDIRQS_NO__DO_IRQ

 
 config PNX8550_JBS
        bool "Philips PNX8550 based JBS board"
 
 config PNX8550_JBS
        bool "Philips PNX8550 based JBS board"


@@ -276,31 +284,6 @@ config PNX8550_STB810
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config DDB5477
-       bool "NEC DDB Vrc-5477"
-       select DDB5XXX_COMMON
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select I8259
-       select IRQ_CPU
-       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,
-         or Rockhopper/SolutionGear boards with R5432/R5500 CPUs.
-
-         Features : kernel debugging, serial terminal, NFS root fs, on-board
-         ether port USB, AC97, PCI, etc.
-
-config MACH_VR41XX
-       bool "NEC VR4100 series based machines"
-       select SYS_HAS_CPU_VR41XX
-       select GENERIC_HARDIRQS_NO__DO_IRQ
-

 config PMC_MSP
        bool "PMC-Sierra MSP chipsets"
        depends on EXPERIMENTAL
 config PMC_MSP
        bool "PMC-Sierra MSP chipsets"
        depends on EXPERIMENTAL


@@ -367,20 +350,6 @@ 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 "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
        bool "SGI IP22 (Indy/Indigo2)"
        select ARC
 config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"
        select ARC


@@ -443,41 +412,38 @@ config SGI_IP32
        help
          If you want this kernel to run on SGI O2 workstation, say Y here.
 
        help
          If you want this kernel to run on SGI O2 workstation, say Y here.
 

-config SIBYTE_BIGSUR
-       bool "Sibyte BCM91480B-BigSur"
+config SIBYTE_CRHINE
+       bool "Sibyte BCM91120C-CRhine"
+       depends on EXPERIMENTAL

        select BOOT_ELF32
        select DMA_COHERENT
        select BOOT_ELF32
        select DMA_COHERENT

-       select NR_CPUS_DEFAULT_4
-       select PCI_DOMAINS
-       select SIBYTE_BCM1x80
+       select SIBYTE_BCM1120

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

-config SIBYTE_SWARM
-       bool "Sibyte BCM91250A-SWARM"
+config SIBYTE_CARMEL
+       bool "Sibyte BCM91120x-Carmel"
+       depends on EXPERIMENTAL

        select BOOT_ELF32
        select DMA_COHERENT
        select BOOT_ELF32
        select DMA_COHERENT

-       select NR_CPUS_DEFAULT_2
-       select SIBYTE_SB1250
+       select SIBYTE_BCM1120

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        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
 
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config SIBYTE_SENTOSA
-       bool "Sibyte BCM91250E-Sentosa"
+config SIBYTE_CRHONE
+       bool "Sibyte BCM91125C-CRhone"

        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 SIBYTE_BCM1125

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN

+       select SYS_SUPPORTS_HIGHMEM

        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_RHONE
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SIBYTE_RHONE


@@ -491,19 +457,21 @@ config SIBYTE_RHONE
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config SIBYTE_CARMEL
-       bool "Sibyte BCM91120x-Carmel"
-       depends on EXPERIMENTAL
+config SIBYTE_SWARM
+       bool "Sibyte BCM91250A-SWARM"

        select BOOT_ELF32
        select DMA_COHERENT
        select BOOT_ELF32
        select DMA_COHERENT

-       select SIBYTE_BCM1120
+       select NR_CPUS_DEFAULT_2
+       select SIBYTE_SB1250

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        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
 
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config SIBYTE_PTSWARM
-       bool "Sibyte BCM91250PT-PTSWARM"
+config SIBYTE_LITTLESUR
+       bool "Sibyte BCM91250C2-LittleSur"

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


@@ -515,8 +483,8 @@ config SIBYTE_PTSWARM
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_SUPPORTS_HIGHMEM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config SIBYTE_LITTLESUR
-       bool "Sibyte BCM91250C2-LittleSur"
+config SIBYTE_SENTOSA
+       bool "Sibyte BCM91250E-Sentosa"

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


@@ -525,30 +493,31 @@ config SIBYTE_LITTLESUR
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN

-       select SYS_SUPPORTS_HIGHMEM

        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config SIBYTE_CRHINE
-       bool "Sibyte BCM91120C-CRhine"
+config SIBYTE_PTSWARM
+       bool "Sibyte BCM91250PT-PTSWARM"

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

-       select SIBYTE_BCM1120
+       select NR_CPUS_DEFAULT_2
+       select SIBYTE_SB1250

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN

+       select SYS_SUPPORTS_HIGHMEM

        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select SYS_SUPPORTS_LITTLE_ENDIAN
 

-config SIBYTE_CRHONE
-       bool "Sibyte BCM91125C-CRhone"
-       depends on EXPERIMENTAL
+config SIBYTE_BIGSUR
+       bool "Sibyte BCM91480B-BigSur"

        select BOOT_ELF32
        select DMA_COHERENT
        select BOOT_ELF32
        select DMA_COHERENT

-       select SIBYTE_BCM1125
+       select NR_CPUS_DEFAULT_4
+       select PCI_DOMAINS
+       select SIBYTE_BCM1x80

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_SB1
        select SYS_SUPPORTS_BIG_ENDIAN

-       select SYS_SUPPORTS_HIGHMEM

        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SNI_RM
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config SNI_RM


@@ -587,6 +556,7 @@ config TOSHIBA_JMR3927
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_TX3927
        select DMA_NONCOHERENT
        select HW_HAS_PCI
        select MIPS_TX3927

+       select IRQ_TXX9

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX39XX
        select SYS_SUPPORTS_32BIT_KERNEL
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX39XX
        select SYS_SUPPORTS_32BIT_KERNEL


@@ -595,11 +565,13 @@ config TOSHIBA_JMR3927
        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config TOSHIBA_RBTX4927
        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config TOSHIBA_RBTX4927

-       bool "Toshiba TBTX49[23]7 board"
+       bool "Toshiba RBTX49[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

-       select I8259
+       select IRQ_CPU
+       select IRQ_TXX9
+       select I8259 if TOSHIBA_FPCIB0

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX49XX
        select SYS_SUPPORTS_32BIT_KERNEL
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX49XX
        select SYS_SUPPORTS_32BIT_KERNEL


@@ -614,12 +586,11 @@ config TOSHIBA_RBTX4927
 
 config TOSHIBA_RBTX4938
        bool "Toshiba RBTX4938 board"
 
 config TOSHIBA_RBTX4938
        bool "Toshiba RBTX4938 board"

-       select HAVE_STD_PC_SERIAL_PORT

        select DMA_NONCOHERENT
        select DMA_NONCOHERENT

-       select GENERIC_ISA_DMA

        select HAS_TXX9_SERIAL
        select HW_HAS_PCI
        select HAS_TXX9_SERIAL
        select HW_HAS_PCI

-       select I8259
+       select IRQ_CPU
+       select IRQ_TXX9

        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX49XX
        select SYS_SUPPORTS_32BIT_KERNEL
        select SWAP_IO_SPACE
        select SYS_HAS_CPU_TX49XX
        select SYS_SUPPORTS_32BIT_KERNEL


@@ -632,18 +603,38 @@ config TOSHIBA_RBTX4938
          This Toshiba board is based on the TX4938 processor. Say Y here to
          support this machine type
 
          This Toshiba board is based on the TX4938 processor. Say Y here to
          support this machine type
 

+config WR_PPMC
+       bool "Wind River PPMC board"
+       select IRQ_CPU
+       select BOOT_ELF32
+       select DMA_NONCOHERENT
+       select HW_HAS_PCI
+       select PCI_GT64XXX_PCI0
+       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.
+

 endchoice
 
 source "arch/mips/au1000/Kconfig"
 endchoice
 
 source "arch/mips/au1000/Kconfig"

-source "arch/mips/ddb5xxx/Kconfig"

 source "arch/mips/jazz/Kconfig"
 source "arch/mips/jazz/Kconfig"

+source "arch/mips/lasat/Kconfig"

 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
 source "arch/mips/tx4927/Kconfig"
 source "arch/mips/tx4938/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
 source "arch/mips/tx4927/Kconfig"
 source "arch/mips/tx4938/Kconfig"
 source "arch/mips/vr41xx/Kconfig"

-source "arch/mips/philips/pnx8550/common/Kconfig"

 
 endmenu
 
 
 endmenu
 


@@ -732,9 +723,9 @@ config EARLY_PRINTK
 config SYS_HAS_EARLY_PRINTK
        bool
 
 config SYS_HAS_EARLY_PRINTK
        bool
 

-config GENERIC_ISA_DMA
+config HOTPLUG_CPU

        bool
        bool

-       select ZONE_DMA
+       default n

 
 config I8259
        bool
 
 config I8259
        bool


@@ -745,15 +736,22 @@ config MIPS_BONITO64
 config MIPS_MSC
        bool
 
 config MIPS_MSC
        bool
 

+config MIPS_NILE4
+       bool
+

 config MIPS_DISABLE_OBSOLETE_IDE
        bool
 
 config NO_IOPORT
        def_bool n
 
 config MIPS_DISABLE_OBSOLETE_IDE
        bool
 
 config NO_IOPORT
        def_bool n
 

+config GENERIC_ISA_DMA
+       bool
+       select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
+

 config GENERIC_ISA_DMA_SUPPORT_BROKEN
        bool
 config GENERIC_ISA_DMA_SUPPORT_BROKEN
        bool

-       select ZONE_DMA
+       select GENERIC_ISA_DMA

 
 config GENERIC_GPIO
        bool
 
 config GENERIC_GPIO
        bool


@@ -807,9 +805,8 @@ config IRQ_MSP_SLP
 config IRQ_MSP_CIC
        bool
 
 config IRQ_MSP_CIC
        bool
 

-config DDB5XXX_COMMON
+config IRQ_TXX9

        bool
        bool

-       select SYS_SUPPORTS_KGDB

 
 config MIPS_BOARDS_GEN
        bool
 
 config MIPS_BOARDS_GEN
        bool


@@ -854,20 +851,6 @@ config EMMA2RH
 config SERIAL_RM9000
        bool
 
 config SERIAL_RM9000
        bool
 

-#
-# 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.
-#
-choice
-       prompt "Galileo Chip Clock"
-       depends on MOMENCO_OCELOT
-       default SYSCLK_100 if MOMENCO_OCELOT
-
-config SYSCLK_100
-       bool "100" if MOMENCO_OCELOT
-
-endchoice
-

 config ARC32
        bool
 
 config ARC32
        bool
 


@@ -1190,8 +1173,19 @@ config SYS_HAS_CPU_RM9000
 config SYS_HAS_CPU_SB1
        bool
 
 config SYS_HAS_CPU_SB1
        bool
 

+#
+# CPU may reorder R->R, R->W, W->R, W->W
+# Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
+#

 config WEAK_ORDERING
        bool
 config WEAK_ORDERING
        bool

+
+#
+# CPU may reorder reads and writes beyond LL/SC
+# CPU may reorder R->LL, R->LL, W->LL, W->LL, R->SC, R->SC, W->SC, W->SC
+#
+config WEAK_REORDERING_BEYOND_LLSC
+       bool

 endmenu
 
 #
 endmenu
 
 #


@@ -1366,17 +1360,6 @@ config MIPS_MT_SMTC
          This is a kernel model which is known a SMTC 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."
-       depends on SYS_SUPPORTS_MULTITHREADING
-       select CPU_MIPSR2_IRQ_VI
-       select CPU_MIPSR2_IRQ_EI
-       select CPU_MIPSR2_SRS
-       select MIPS_MT
-       help
-         Includes a loader for loading an elf relocatable object
-         onto another VPE and running it.
-

 endchoice
 
 config MIPS_MT
 endchoice
 
 config MIPS_MT


@@ -1387,8 +1370,19 @@ config SYS_SUPPORTS_MULTITHREADING
 
 config MIPS_MT_FPAFF
        bool "Dynamic FPU affinity for FP-intensive threads"
 
 config MIPS_MT_FPAFF
        bool "Dynamic FPU affinity for FP-intensive threads"

-       depends on MIPS_MT

        default y
        default y

+       depends on MIPS_MT_SMP || MIPS_MT_SMTC
+
+config MIPS_VPE_LOADER
+       bool "VPE loader support."
+       depends on SYS_SUPPORTS_MULTITHREADING
+       select CPU_MIPSR2_IRQ_VI
+       select CPU_MIPSR2_IRQ_EI
+       select CPU_MIPSR2_SRS
+       select MIPS_MT
+       help
+         Includes a loader for loading an elf relocatable object
+         onto another VPE and running it.

 
 config MIPS_MT_SMTC_INSTANT_REPLAY
        bool "Low-latency Dispatch of Deferred SMTC IPIs"
 
 config MIPS_MT_SMTC_INSTANT_REPLAY
        bool "Low-latency Dispatch of Deferred SMTC IPIs"


@@ -1417,6 +1411,19 @@ config MIPS_MT_SMTC_IM_BACKSTOP
          impact on interrupt service overhead. Disable it only if you know
          what you are doing.
 
          impact on interrupt service overhead. Disable it only if you know
          what you are doing.
 

+config MIPS_MT_SMTC_IRQAFF
+       bool "Support IRQ affinity API"
+       depends on MIPS_MT_SMTC
+       default n
+       help
+         Enables SMP IRQ affinity API (/proc/irq/*/smp_affinity, etc.)
+         for SMTC Linux kernel. Requires platform support, of which
+         an example can be found in the MIPS kernel i8259 and Malta
+         platform code.  It is recommended that MIPS_MT_SMTC_INSTANT_REPLAY
+         be enabled if MIPS_MT_SMTC_IRQAFF is used. Adds overhead to
+         interrupt dispatch, and should be used only if you know what
+         you are doing.
+

 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


@@ -1459,8 +1466,7 @@ config SB1_PASS_2_1_WORKAROUNDS
        default y
 
 config 64BIT_PHYS_ADDR
        default y
 
 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

 
 config CPU_HAS_LLSC
        bool
 
 config CPU_HAS_LLSC
        bool


@@ -1761,7 +1767,7 @@ config KEXEC
 
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"
 
 config SECCOMP
        bool "Enable seccomp to safely compute untrusted bytecode"

-       depends on PROC_FS && BROKEN
+       depends on PROC_FS

        default y
        help
          This kernel feature is useful for number crunching applications
        default y
        help
          This kernel feature is useful for number crunching applications


@@ -1880,21 +1886,6 @@ source "fs/Kconfig.binfmt"
 config TRAD_SIGNALS
        bool
 
 config TRAD_SIGNALS
        bool
 

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

 config BINFMT_IRIX
        bool "Include IRIX binary compatibility"
        depends on CPU_BIG_ENDIAN && 32BIT && BROKEN
 config BINFMT_IRIX
        bool "Include IRIX binary compatibility"
        depends on CPU_BIG_ENDIAN && 32BIT && BROKEN