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

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7441a2cf523ee929edbddb072a5764032422d934..73455389257afa3f4bcb4341aa83947aa7e93e50 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -15,121 +15,8 @@ choice
        prompt "System type"
        default SGI_IP22
 
        prompt "System type"
        default SGI_IP22
 

-config MIPS_MTX1
-       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
-
-config MIPS_BOSPORUS
-       bool "AMD Alchemy Bosporus board"
-       select SOC_AU1500
-       select DMA_NONCOHERENT
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-
-config MIPS_PB1000
-       bool "AMD Alchemy PB1000 board"
-       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
-
-config MIPS_PB1100
-       bool "AMD Alchemy PB1100 board"
-       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
-
-config MIPS_PB1500
-       bool "AMD Alchemy PB1500 board"
-       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
-
-config MIPS_PB1550
-       bool "AMD Alchemy PB1550 board"
-       select SOC_AU1550
-       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
-
-config MIPS_PB1200
-       bool "AMD Alchemy PB1200 board"
-       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
-
-config MIPS_DB1000
-       bool "AMD Alchemy DB1000 board"
-       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
-
-config MIPS_DB1100
-       bool "AMD Alchemy DB1100 board"
-       select SOC_AU1100
-       select DMA_NONCOHERENT
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-
-config MIPS_DB1500
-       bool "AMD Alchemy DB1500 board"
-       select SOC_AU1500
-       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
-
-config MIPS_DB1550
-       bool "AMD Alchemy DB1550 board"
-       select SOC_AU1550
-       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
-
-config MIPS_DB1200
-       bool "AMD Alchemy DB1200 board"
-       select SOC_AU1200
-       select DMA_COHERENT
-       select MIPS_DISABLE_OBSOLETE_IDE
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-
-config MIPS_MIRAGE
-       bool "AMD Alchemy Mirage board"
-       select DMA_NONCOHERENT
-       select SOC_AU1500
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_SUPPORTS_LITTLE_ENDIAN
+config MACH_ALCHEMY
+       bool "Alchemy processor based machines"

 
 config BASLER_EXCITE
        bool "Basler eXcite smart camera"
 
 config BASLER_EXCITE
        bool "Basler eXcite smart camera"


@@ -369,28 +256,6 @@ 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_JAGUAR_ATX
-       bool "Momentum Jaguar board"
-       select BOOT_ELF32
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select IRQ_CPU_RM7K
-       select IRQ_MV64340
-       select LIMITED_DMA
-       select PCI_MARVELL
-       select RM7000_CPU_SCACHE
-       select 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_KGDB
-       help
-         The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by
-         Momentum Computer <http://www.momenco.com/>.
-

 config MOMENCO_OCELOT
        bool "Momentum Ocelot board"
        select DMA_NONCOHERENT
 config MOMENCO_OCELOT
        bool "Momentum Ocelot board"
        select DMA_NONCOHERENT


@@ -446,36 +311,13 @@ config MOMENCO_OCELOT_C
          The Ocelot is a MIPS-based Single Board Computer (SBC) made by
          Momentum Computer <http://www.momenco.com/>.
 
          The Ocelot is a MIPS-based Single Board Computer (SBC) made by
          Momentum Computer <http://www.momenco.com/>.
 

-config MOMENCO_OCELOT_G
-       bool "Momentum Ocelot-G board"
-       select DMA_NONCOHERENT
-       select HW_HAS_PCI
-       select IRQ_CPU
-       select IRQ_CPU_RM7K
-       select PCI_MARVELL
-       select RM7000_CPU_SCACHE
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_RM7000
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
-       select SYS_SUPPORTS_BIG_ENDIAN
-       help
-         The Ocelot is a MIPS-based Single Board Computer (SBC) made by
-         Momentum Computer <http://www.momenco.com/>.
-
-config MIPS_XXS1500
-       bool "MyCable XXS1500 board"
-       select DMA_NONCOHERENT
-       select SOC_AU1500
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-

 config PNX8550_JBS
        bool "Philips PNX8550 based JBS board"
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_STB810
 config PNX8550_JBS
        bool "Philips PNX8550 based JBS board"
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
 config PNX8550_STB810

-       bool "Support for Philips PNX8550 based STB810 board"
+       bool "Philips PNX8550 based STB810 board"

        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 
        select PNX8550
        select SYS_SUPPORTS_LITTLE_ENDIAN
 


@@ -550,7 +392,7 @@ config QEMU
          can be found at http://www.linux-mips.org/wiki/Qemu.
 
 config MARKEINS
          can be found at http://www.linux-mips.org/wiki/Qemu.
 
 config MARKEINS

-       bool "Support for NEC EMMA2RH Mark-eins"
+       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


@@ -775,7 +617,6 @@ config TOSHIBA_JMR3927
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN

-       select TOSHIBA_BOARDS

        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config TOSHIBA_RBTX4927
        select GENERIC_HARDIRQS_NO__DO_IRQ
 
 config TOSHIBA_RBTX4927


@@ -784,7 +625,6 @@ 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 SWAP_IO_SPACE
        select SYS_HAS_CPU_TX49XX
        select SYS_SUPPORTS_32BIT_KERNEL


@@ -792,7 +632,6 @@ config TOSHIBA_RBTX4927
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_KGDB
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_BIG_ENDIAN
        select SYS_SUPPORTS_KGDB

-       select TOSHIBA_BOARDS

        select GENERIC_HARDIRQS_NO__DO_IRQ
        help
          This Toshiba board is based on the TX4927 processor. Say Y here to
        select GENERIC_HARDIRQS_NO__DO_IRQ
        help
          This Toshiba board is based on the TX4927 processor. Say Y here to


@@ -806,14 +645,12 @@ 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 SYS_SUPPORTS_KGDB
        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 GENERIC_HARDIRQS_NO__DO_IRQ
        help
          This Toshiba board is based on the TX4938 processor. Say Y here to
        select GENERIC_HARDIRQS_NO__DO_IRQ
        help
          This Toshiba board is based on the TX4938 processor. Say Y here to


@@ -821,11 +658,11 @@ config TOSHIBA_RBTX4938
 
 endchoice
 
 
 endchoice
 

+source "arch/mips/au1000/Kconfig"

 source "arch/mips/ddb5xxx/Kconfig"
 source "arch/mips/gt64120/ev64120/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/ddb5xxx/Kconfig"
 source "arch/mips/gt64120/ev64120/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"

-source "arch/mips/momentum/Kconfig"

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


@@ -910,9 +747,9 @@ config EARLY_PRINTK
          to print messages very early in the bootup process.
 
          This is useful for kernel debugging when your machine crashes very
          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,
+         early before the console code is initialized. For normal operation,
+         it is not recommended because it looks ugly on some machines and
+         doesn't cooperate with an X server. You should normally say N here,

          unless you want to debug such a crash.
 
 config SYS_HAS_EARLY_PRINTK
          unless you want to debug such a crash.
 
 config SYS_HAS_EARLY_PRINTK


@@ -925,11 +762,6 @@ config GENERIC_ISA_DMA
 config I8259
        bool
 
 config I8259
        bool
 

-config LIMITED_DMA
-       bool
-       select HIGHMEM
-       select SYS_SUPPORTS_HIGHMEM
-

 config MIPS_BONITO64
        bool
 
 config MIPS_BONITO64
        bool
 


@@ -958,7 +790,7 @@ choice
          byte order. These modes require different kernels and a different
          Linux distribution.  In general there is one preferred byteorder for a
          particular system but some systems are just as commonly used in the
          byte order. These modes require different kernels and a different
          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.
+         one or the other endianness.

 
 config CPU_BIG_ENDIAN
        bool "Big endian"
 
 config CPU_BIG_ENDIAN
        bool "Big endian"


@@ -1015,33 +847,6 @@ config MIPS_RM9122
 config PCI_MARVELL
        bool
 
 config PCI_MARVELL
        bool
 

-config SOC_AU1000
-       bool
-       select SOC_AU1X00
-
-config SOC_AU1100
-       bool
-       select SOC_AU1X00
-
-config SOC_AU1500
-       bool
-       select SOC_AU1X00
-
-config SOC_AU1550
-       bool
-       select SOC_AU1X00
-
-config SOC_AU1200
-       bool
-       select SOC_AU1X00
-
-config SOC_AU1X00
-       bool
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_APM_EMULATION
-       select SYS_SUPPORTS_KGDB
-

 config SERIAL_RM9000
        bool
 
 config SERIAL_RM9000
        bool
 


@@ -1083,9 +888,9 @@ config WDT_RM9000
 choice
        prompt "Galileo Chip Clock"
        #default SYSCLK_83 if MIPS_EV64120
 choice
        prompt "Galileo Chip Clock"
        #default SYSCLK_83 if MIPS_EV64120

-       depends on MIPS_EV64120 || MOMENCO_OCELOT || MOMENCO_OCELOT_G
+       depends on MIPS_EV64120 || MOMENCO_OCELOT

        default SYSCLK_83 if MIPS_EV64120
        default SYSCLK_83 if MIPS_EV64120

-       default SYSCLK_100 if MOMENCO_OCELOT || MOMENCO_OCELOT_G
+       default SYSCLK_100 if MOMENCO_OCELOT

 
 config SYSCLK_75
        bool "75" if MIPS_EV64120
 
 config SYSCLK_75
        bool "75" if MIPS_EV64120


@@ -1094,7 +899,7 @@ config SYSCLK_83
        bool "83.3" if MIPS_EV64120
 
 config SYSCLK_100
        bool "83.3" if MIPS_EV64120
 
 config SYSCLK_100

-       bool "100" if MIPS_EV64120 || MOMENCO_OCELOT || MOMENCO_OCELOT_G
+       bool "100" if MIPS_EV64120 || MOMENCO_OCELOT

 
 endchoice
 
 
 endchoice
 


@@ -1133,9 +938,6 @@ config ARC64
 config BOOT_ELF64
        bool
 
 config BOOT_ELF64
        bool
 

-config TOSHIBA_BOARDS
-       bool
-

 menu "CPU selection"
 
 choice
 menu "CPU selection"
 
 choice


@@ -1559,6 +1361,7 @@ config MIPS_MT_SMP
        bool "Use 1 TC on each available VPE for SMP"
        depends on SYS_SUPPORTS_MULTITHREADING
        select CPU_MIPSR2_IRQ_VI
        bool "Use 1 TC on each available VPE for SMP"
        depends on SYS_SUPPORTS_MULTITHREADING
        select CPU_MIPSR2_IRQ_VI

+       select CPU_MIPSR2_IRQ_EI

        select CPU_MIPSR2_SRS
        select MIPS_MT
        select NR_CPUS_DEFAULT_2
        select CPU_MIPSR2_SRS
        select MIPS_MT
        select NR_CPUS_DEFAULT_2


@@ -1574,6 +1377,7 @@ config MIPS_MT_SMTC
        #depends on CPU_MIPS64_R2               # once there is hardware ...
        depends on SYS_SUPPORTS_MULTITHREADING
        select CPU_MIPSR2_IRQ_VI
        #depends on CPU_MIPS64_R2               # once there is hardware ...
        depends on SYS_SUPPORTS_MULTITHREADING
        select CPU_MIPSR2_IRQ_VI

+       select CPU_MIPSR2_IRQ_EI

        select CPU_MIPSR2_SRS
        select MIPS_MT
        select NR_CPUS_DEFAULT_8
        select CPU_MIPSR2_SRS
        select MIPS_MT
        select NR_CPUS_DEFAULT_8


@@ -1586,6 +1390,9 @@ config MIPS_MT_SMTC
 config MIPS_VPE_LOADER
        bool "VPE loader support."
        depends on SYS_SUPPORTS_MULTITHREADING
 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
        select MIPS_MT
        help
          Includes a loader for loading an elf relocatable object


@@ -1752,7 +1559,7 @@ config ARCH_DISCONTIGMEM_ENABLE
        bool
        default y if SGI_IP27
        help
        bool
        default y if SGI_IP27
        help

-         Say Y to upport efficient handling of discontiguous physical memory,
+         Say Y to support 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.
          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.


@@ -1940,7 +1747,7 @@ config KEXEC
        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
        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
+         but it is independent 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.
          you can start any kernel with it, not just Linux.
 
          The name comes from the similiarity to the exec system call.