Merge branch 'for-rmk' of git://git.marvell.com/orion

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

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 05c864c..cabba33 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -8,6 +8,9 @@ mainmenu "Linux/M32R Kernel Configuration"
 config M32R
        bool
        default y
+       select HAVE_IDE
+       select HAVE_OPROFILE
+       select INIT_ALL_POSSIBLE
 
 config SBUS
        bool
@@ -16,6 +19,10 @@ config GENERIC_ISA_DMA
        bool
        default y
 
+config ZONE_DMA
+       bool
+       default y
+
 config GENERIC_HARDIRQS
        bool
        default y
@@ -24,8 +31,20 @@ config GENERIC_IRQ_PROBE
        bool
        default y
 
+config NO_IOPORT
+       def_bool y
+
+config NO_DMA
+       def_bool y
+
+config HZ
+       int
+       default 100
+
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 
 menu "Processor type and features"
 
@@ -47,9 +66,13 @@ config PLAT_MAPPI
 
 config PLAT_USRV
        bool "uServer"
+       select PLAT_HAS_INT1ICU
 
 config PLAT_M32700UT
        bool "M32700UT"
+       select PLAT_HAS_INT0ICU
+       select PLAT_HAS_INT1ICU
+       select PLAT_HAS_INT2ICU
        help
          The M3T-M32700UT is an evaluation board based on uT-Engine
          specification.  This board has an M32700 (Chaos) evaluation chip.
@@ -58,6 +81,9 @@ config PLAT_M32700UT
 
 config PLAT_OPSPUT
        bool "OPSPUT"
+       select PLAT_HAS_INT0ICU
+       select PLAT_HAS_INT1ICU
+       select PLAT_HAS_INT2ICU
        help
          The OPSPUT is an evaluation board based on uT-Engine
          specification.  This board has a OPSP-REP chip.
@@ -79,6 +105,7 @@ config PLAT_MAPPI3
 
 config PLAT_M32104UT
        bool "M32104UT"
+       select PLAT_HAS_INT1ICU
        help
          The M3T-M32104UT is an reference board based on uT-Engine
          specification.  This board has a M32104 chip.
@@ -139,6 +166,18 @@ config ISA_DUAL_ISSUE
        depends on CHIP_M32700 || CHIP_OPSP
        default y
 
+config PLAT_HAS_INT0ICU
+       bool
+       default n
+
+config PLAT_HAS_INT1ICU
+       bool
+       default n
+
+config PLAT_HAS_INT2ICU
+       bool
+       default n
+
 config BUS_CLOCK
        int "Bus Clock [Hz] (integer)"
        default "70000000" if PLAT_MAPPI
@@ -177,10 +216,6 @@ config MEMORY_SIZE
        default "01000000" if PLAT_M32104UT
        default "00800000" if PLAT_OAKS32R
 
-config NOHIGHMEM
-       bool
-       default y
-
 config ARCH_DISCONTIGMEM_ENABLE
        bool "Internal RAM Support"
        depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104
@@ -205,6 +240,11 @@ config IRAM_SIZE
 # Define implied options from the CPU selection here
 #
 
+config GENERIC_LOCKBREAK
+       bool
+       default y
+       depends on SMP && PREEMPT
+
 config RWSEM_GENERIC_SPINLOCK
        bool
        depends on M32R
@@ -214,6 +254,14 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default n
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 config GENERIC_FIND_NEXT_BIT
        bool
        default y
@@ -226,6 +274,10 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
+config SCHED_OMIT_FRAME_POINTER
+        bool
+        default y
+
 config PREEMPT
        bool "Preemptible Kernel"
        help
@@ -240,6 +292,7 @@ config PREEMPT
 
 config SMP
        bool "Symmetric multi-processing support"
+       select USE_GENERIC_SMP_HELPERS
        ---help---
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
@@ -255,8 +308,7 @@ config SMP
          Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
          Management" code will be disabled if you say Y here.
 
-         See also the <file:Documentation/smp.txt>,
-         and the SMP-HOWTO available at
+         See also the SMP-HOWTO available at
          <http://www.linuxdoc.org/docs.html#howto>.
 
          If you don't know what to do here, say N.
@@ -285,6 +337,11 @@ config NUMA
        depends on SMP && BROKEN
        default n
 
+config NODES_SHIFT
+       int
+       default "1"
+       depends on NEED_MULTIPLE_NODES
+
 # turning this on wastes a bunch of space.
 # Summit needs it only when NUMA is on
 config BOOT_IOREMAP
@@ -307,11 +364,6 @@ config PCI
          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
          VESA. If you have PCI, say Y, otherwise N.
 
-         The PCI-HOWTO, available from
-         <http://www.linuxdoc.org/docs.html#howto>, contains valuable
-         information about which PCI hardware does work under Linux and which
-         doesn't.
-
 choice
        prompt "PCI access mode"
        depends on PCI
@@ -354,11 +406,7 @@ config PCI_DIRECT
 source "drivers/pci/Kconfig"
 
 config ISA
-       bool "ISA support"
-       help
-         Find out whether you have ISA slots on your motherboard.  ISA is the
-         name of a bus system, i.e. the way the CPU talks to the other stuff
-         inside your box.  If you have ISA, say Y, otherwise N.
+       bool
 
 source "drivers/pcmcia/Kconfig"
 
@@ -379,8 +427,6 @@ source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-source "arch/m32r/oprofile/Kconfig"
-
 source "arch/m32r/Kconfig.debug"
 
 source "security/Kconfig"