Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 01740ef7782425262da5679efe3836bb06dcab97..ade230d445d9fd1ed952bc191720e60c679d9073 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,6 +1,8 @@
 config MIPS
        bool
        default y
 config MIPS
        bool
        default y

+       select HAVE_IDE
+       select HAVE_OPROFILE

        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
        select RTC_LIB
        # Horrible source of confusion.  Die, die, die ...
        select EMBEDDED
        select RTC_LIB


@@ -37,16 +39,6 @@ config BASLER_EXCITE
          The eXcite is a smart camera platform manufactured by
          Basler Vision Technologies AG.
 
          The eXcite is a smart camera platform manufactured by
          Basler Vision Technologies AG.
 

-config BASLER_EXCITE_PROTOTYPE
-       bool "Support for pre-release units"
-       depends on BASLER_EXCITE
-       default n
-       help
-         Pre-series (prototype) units are different from later ones in
-         some ways. Select this option if you have one of these. Please
-         note that a kernel built with this option selected will not be
-         able to run on normal units.
-

 config BCM47XX
        bool "BCM47XX based boards"
        select CEVT_R4K
 config BCM47XX
        bool "BCM47XX based boards"
        select CEVT_R4K


@@ -82,7 +74,7 @@ config MIPS_COBALT
        select SYS_HAS_CPU_NEVADA
        select SYS_HAS_EARLY_PRINTK
        select SYS_SUPPORTS_32BIT_KERNEL
        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_64BIT_KERNEL

        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
 
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
 


@@ -190,6 +182,7 @@ config LEMOTE_FULONG
 config MIPS_ATLAS
        bool "MIPS Atlas board"
        select BOOT_ELF32
 config MIPS_ATLAS
        bool "MIPS Atlas board"
        select BOOT_ELF32

+       select BOOT_RAW

        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT
        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT


@@ -222,6 +215,7 @@ config MIPS_MALTA
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32

+       select BOOT_RAW

        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT
        select CEVT_R4K
        select CSRC_R4K
        select DMA_NONCOHERENT


@@ -367,34 +361,6 @@ config PMC_YOSEMITE
          Yosemite is an evaluation board for the RM9000x2 processor
          manufactured by PMC-Sierra.
 
          Yosemite is an evaluation board for the RM9000x2 processor
          manufactured by PMC-Sierra.
 

-config QEMU
-       bool "Qemu"
-       select CEVT_R4K
-       select CSRC_R4K
-       select DMA_COHERENT
-       select GENERIC_ISA_DMA
-       select HAVE_STD_PC_SERIAL_PORT
-       select I8253
-       select I8259
-       select IRQ_CPU
-       select ISA
-       select SWAP_IO_SPACE
-       select SYS_HAS_CPU_MIPS32_R1
-       select SYS_HAS_EARLY_PRINTK
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_BIG_ENDIAN
-       select SYS_SUPPORTS_LITTLE_ENDIAN
-       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
-         system architecture that currently is being simulated by Qemu.  It
-         will eventually be removed again when Qemu has the capability to
-         simulate actual MIPS hardware platforms.  More information on Qemu
-         can be found at http://www.linux-mips.org/wiki/Qemu.
-

 config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"
        select ARC
 config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"
        select ARC


@@ -602,6 +568,7 @@ config SNI_RM
        bool "SNI RM200/300/400"
        select ARC if CPU_LITTLE_ENDIAN
        select ARC32 if CPU_LITTLE_ENDIAN
        bool "SNI RM200/300/400"
        select ARC if CPU_LITTLE_ENDIAN
        select ARC32 if CPU_LITTLE_ENDIAN

+       select SNIPROM if CPU_BIG_ENDIAN

        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
        select CEVT_R4K
        select ARCH_MAY_HAVE_PC_FDC
        select BOOT_ELF32
        select CEVT_R4K


@@ -717,6 +684,7 @@ config WR_PPMC
 endchoice
 
 source "arch/mips/au1000/Kconfig"
 endchoice
 
 source "arch/mips/au1000/Kconfig"

+source "arch/mips/basler/excite/Kconfig"

 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"


@@ -728,6 +696,11 @@ source "arch/mips/vr41xx/Kconfig"
 
 endmenu
 
 
 endmenu
 

+config GENERIC_LOCKBREAK
+       bool
+       default y
+       depends on SMP && PREEMPT
+

 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y


@@ -1003,6 +976,9 @@ config DEFAULT_SGI_PARTITION
 config ARC32
        bool
 
 config ARC32
        bool
 

+config SNIPROM
+       bool
+

 config BOOT_ELF32
        bool
 
 config BOOT_ELF32
        bool
 


@@ -1780,8 +1756,8 @@ config SMP
          People using multiprocessor machines who say Y here should also say
          Y to "Enhanced Real Time Clock Support", below.
 
          People using multiprocessor machines who say Y here should also say
          Y to "Enhanced Real Time Clock Support", below.
 

-         See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-         available at <http://www.tldp.org/docs.html#howto>.
+         See also the SMP-HOWTO available at
+         <http://www.tldp.org/docs.html#howto>.

 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 


@@ -1987,11 +1963,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
          say Y, otherwise N.
 
          your box. Other bus systems are ISA, EISA, or VESA. If you have PCI,
          say Y, otherwise N.
 

-         The PCI-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-

 config PCI_DOMAINS
        bool
 
 config PCI_DOMAINS
        bool
 


@@ -2112,6 +2083,10 @@ endmenu
 
 menu "Power management options"
 
 
 menu "Power management options"
 

+config ARCH_SUSPEND_POSSIBLE
+       def_bool y
+       depends on !SMP
+

 source "kernel/power/Kconfig"
 
 endmenu
 source "kernel/power/Kconfig"
 
 endmenu


@@ -2122,8 +2097,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

-source "kernel/Kconfig.instrumentation"
-

 source "arch/mips/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/mips/Kconfig.debug"
 
 source "security/Kconfig"