Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / m32r / Kconfig

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 0d90ea5..41fd490 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -12,10 +12,6 @@ config M32R
 config SBUS
        bool
 
-config UID16
-       bool
-       default n
-
 config GENERIC_ISA_DMA
        bool
        default y
@@ -78,6 +74,15 @@ config PLAT_OAKS32R
 config PLAT_MAPPI2
        bool "Mappi-II(M3A-ZA36/M3A-ZA52)"
 
+config PLAT_MAPPI3
+       bool "Mappi-III(M3A-2170)"
+
+config PLAT_M32104UT
+       bool "M32104UT"
+       help
+         The M3T-M32104UT is an reference board based on uT-Engine
+         specification.  This board has a M32104 chip.
+
 endchoice
 
 choice
@@ -90,6 +95,10 @@ config CHIP_M32700
 config CHIP_M32102
        bool "M32102"
 
+config CHIP_M32104
+       bool "M32104"
+       depends on PLAT_M32104UT
+
 config CHIP_VDEC2
        bool "VDEC2"
 
@@ -112,7 +121,7 @@ config TLB_ENTRIES
 
 config ISA_M32R
         bool
-       depends on CHIP_M32102
+       depends on CHIP_M32102 || CHIP_M32104
        default y
 
 config ISA_M32R2
@@ -134,8 +143,10 @@ config BUS_CLOCK
        int "Bus Clock [Hz] (integer)"
        default "70000000" if PLAT_MAPPI
        default "25000000" if PLAT_USRV
+       default "50000000" if PLAT_MAPPI3
        default "50000000" if PLAT_M32700UT
        default "50000000" if PLAT_OPSPUT
+       default "54000000" if PLAT_M32104UT
        default "33333333" if PLAT_OAKS32R
        default "20000000" if PLAT_MAPPI2
 
@@ -149,39 +160,45 @@ config CPU_LITTLE_ENDIAN
 
 config MEMORY_START
        hex "Physical memory start address (hex)"
-       default "08000000" if PLAT_MAPPI || PLAT_MAPPI2
+       default "08000000" if PLAT_MAPPI || PLAT_MAPPI2 || PLAT_MAPPI3
        default "08000000" if PLAT_USRV
        default "08000000" if PLAT_M32700UT
        default "08000000" if PLAT_OPSPUT
+       default "04000000" if PLAT_M32104UT
        default "01000000" if PLAT_OAKS32R
 
 config MEMORY_SIZE
        hex "Physical memory size (hex)"
+       default "08000000" if PLAT_MAPPI3
        default "04000000" if PLAT_MAPPI || PLAT_MAPPI2
        default "02000000" if PLAT_USRV
        default "01000000" if PLAT_M32700UT
        default "01000000" if PLAT_OPSPUT
+       default "01000000" if PLAT_M32104UT
        default "00800000" if PLAT_OAKS32R
 
 config NOHIGHMEM
        bool
        default y
 
-config DISCONTIGMEM
+config ARCH_DISCONTIGMEM_ENABLE
        bool "Internal RAM Support"
-       depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP
+       depends on CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104
        default y
 
+source "mm/Kconfig"
+
 config IRAM_START
        hex "Internal memory start address (hex)"
-       default "00f00000"
-       depends on (CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP) && DISCONTIGMEM
+       default "00f00000" if !CHIP_M32104
+       default "00700000" if CHIP_M32104
+       depends on (CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104) && DISCONTIGMEM
 
 config IRAM_SIZE
        hex "Internal memory size (hex)"
-       depends on (CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP) && DISCONTIGMEM
+       depends on (CHIP_M32700 || CHIP_M32102 || CHIP_VDEC2 || CHIP_OPSP || CHIP_M32104) && DISCONTIGMEM
        default "00080000" if CHIP_M32700
-       default "00010000" if CHIP_M32102 || CHIP_OPSP
+       default "00010000" if CHIP_M32102 || CHIP_OPSP || CHIP_M32104
        default "00008000" if CHIP_VDEC2
 
 #
@@ -197,6 +214,14 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default n
 
+config GENERIC_FIND_NEXT_BIT
+       bool
+       default y
+
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -213,11 +238,6 @@ config PREEMPT
          Say Y here if you are building a kernel for a desktop, embedded
          or real-time system.  Say N if you are unsure.
 
-config HAVE_DEC_LOCK
-       bool
-       depends on (SMP || PREEMPT)
-       default n
-
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
@@ -235,8 +255,8 @@ 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.tex>,
-         <file:Documentation/smp.txt> and the SMP-HOWTO available at
+         See also the <file:Documentation/smp.txt>,
+         and the SMP-HOWTO available at
          <http://www.linuxdoc.org/docs.html#howto>.
 
          If you don't know what to do here, say N.
@@ -262,9 +282,14 @@ config NR_CPUS
 # Common NUMA Features
 config NUMA
        bool "Numa Memory Allocation Support"
-       depends on SMP
+       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
@@ -279,6 +304,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
 
 config PCI
        bool "PCI support"
+       depends on BROKEN
        default n
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
@@ -352,6 +378,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"