Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 70dba16689077dc0440cf12cc607f000bd5bdbdf..5021db2217eddfbecd628aba53ca44f6fb62ade9 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration"
 config ARM
        bool
        default y
 config ARM
        bool
        default y

+       select HAVE_AOUT

        select HAVE_IDE
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
        select HAVE_IDE
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION


@@ -140,15 +141,11 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
        bool
        default y
 

-config ARCH_SUPPORTS_AOUT
-       def_bool y
-

 config ARCH_MAY_HAVE_PC_FDC
        bool
 
 config ZONE_DMA
        bool
 config ARCH_MAY_HAVE_PC_FDC
        bool
 
 config ZONE_DMA
        bool

-       default y

 
 config GENERIC_ISA_DMA
        bool
 
 config GENERIC_ISA_DMA
        bool


@@ -178,6 +175,11 @@ config OPROFILE_MPCORE
 config OPROFILE_ARM11_CORE
        bool
 
 config OPROFILE_ARM11_CORE
        bool
 

+config OPROFILE_ARMV7
+       def_bool y
+       depends on CPU_V7 && !SMP
+       bool
+

 endif
 
 config VECTORS_BASE
 endif
 
 config VECTORS_BASE


@@ -190,6 +192,8 @@ config VECTORS_BASE
 
 source "init/Kconfig"
 
 
 source "init/Kconfig"
 

+source "kernel/Kconfig.freezer"
+

 menu "System Type"
 
 choice
 menu "System Type"
 
 choice


@@ -245,6 +249,7 @@ config ARCH_CLPS7500
        select TIMER_ACORN
        select ISA
        select NO_IOPORT
        select TIMER_ACORN
        select ISA
        select NO_IOPORT

+       select ARCH_SPARSEMEM_ENABLE

        help
          Support for the Cirrus Logic PS7500FE system-on-a-chip.
 
        help
          Support for the Cirrus Logic PS7500FE system-on-a-chip.
 


@@ -306,6 +311,7 @@ config ARCH_IOP13XX
        select PLAT_IOP
        select PCI
        select ARCH_SUPPORTS_MSI
        select PLAT_IOP
        select PCI
        select ARCH_SUPPORTS_MSI

+       select VMSPLIT_1G

        help
          Support for Intel's IOP13XX (XScale) family of processors.
 
        help
          Support for Intel's IOP13XX (XScale) family of processors.
 


@@ -350,6 +356,7 @@ config ARCH_IXP4XX
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS

+       select DMABOUNCE if PCI

        help
          Support for Intel's IXP4XX (XScale) family of processors.
 
        help
          Support for Intel's IXP4XX (XScale) family of processors.
 


@@ -434,7 +441,7 @@ config ARCH_ORION5X
        help
          Support for the following Marvell Orion 5x series SoCs:
          Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
        help
          Support for the following Marvell Orion 5x series SoCs:
          Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

-         Orion-2 (5281).
+         Orion-2 (5281), Orion-1-90 (6183).

 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"


@@ -464,6 +471,7 @@ config ARCH_RPC
        select HAVE_PATA_PLATFORM
        select ISA_DMA_API
        select NO_IOPORT
        select HAVE_PATA_PLATFORM
        select ISA_DMA_API
        select NO_IOPORT

+       select ARCH_SPARSEMEM_ENABLE

        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.
        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.


@@ -471,9 +479,7 @@ config ARCH_RPC
 config ARCH_SA1100
        bool "SA1100-based"
        select ISA
 config ARCH_SA1100
        bool "SA1100-based"
        select ISA

-       select ARCH_DISCONTIGMEM_ENABLE

        select ARCH_SPARSEMEM_ENABLE
        select ARCH_SPARSEMEM_ENABLE

-       select ARCH_SELECT_MEMORY_MODEL

        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select GENERIC_TIME
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select GENERIC_TIME


@@ -497,6 +503,7 @@ config ARCH_SHARK
        bool "Shark"
        select ISA
        select ISA_DMA
        bool "Shark"
        select ISA
        select ISA_DMA

+       select ZONE_DMA

        select PCI
        help
          Support for the StrongARM based Digital DNARD machine, also known
        select PCI
        help
          Support for the StrongARM based Digital DNARD machine, also known


@@ -504,6 +511,8 @@ config ARCH_SHARK
 
 config ARCH_LH7A40X
        bool "Sharp LH7A40X"
 
 config ARCH_LH7A40X
        bool "Sharp LH7A40X"

+       select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
+       select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM

        help
          Say Y here for systems based on one of the Sharp LH7A40X
          System on a Chip processors.  These CPUs include an ARM922T
        help
          Say Y here for systems based on one of the Sharp LH7A40X
          System on a Chip processors.  These CPUs include an ARM922T


@@ -515,7 +524,9 @@ config ARCH_DAVINCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO

+       select ARCH_REQUIRE_GPIOLIB

        select HAVE_CLK
        select HAVE_CLK

+       select ZONE_DMA

        help
          Support for TI's DaVinci platform.
 
        help
          Support for TI's DaVinci platform.
 


@@ -529,16 +540,15 @@ config ARCH_OMAP
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 

-config ARCH_MSM7X00A
-       bool "Qualcomm MSM7X00A"
+config ARCH_MSM
+       bool "Qualcomm MSM"

        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help

-         Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
-         apps processor of the MSM7X00A and depends on a shared memory
+         Support for Qualcomm MSM7K based systems.  This runs on the ARM11
+         apps processor of the MSM7K and depends on a shared memory

          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).

-         <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>

 
 endchoice
 
 
 endchoice
 


@@ -734,6 +744,29 @@ config SMP
 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 

+choice
+       prompt "Memory split"
+       default VMSPLIT_3G
+       help
+         Select the desired split between kernel and user memory.
+
+         If you are not absolutely sure what you are doing, leave this
+         option alone!
+
+       config VMSPLIT_3G
+               bool "3G/1G user/kernel split"
+       config VMSPLIT_2G
+               bool "2G/2G user/kernel split"
+       config VMSPLIT_1G
+               bool "1G/3G user/kernel split"
+endchoice
+
+config PAGE_OFFSET
+       hex
+       default 0x40000000 if VMSPLIT_1G
+       default 0x80000000 if VMSPLIT_2G
+       default 0xC0000000
+

 config NR_CPUS
        int "Maximum number of CPUs (2-32)"
        range 2 32
 config NR_CPUS
        int "Maximum number of CPUs (2-32)"
        range 2 32


@@ -815,20 +848,18 @@ config ARCH_FLATMEM_HAS_HOLES
        default y
        depends on FLATMEM
 
        default y
        depends on FLATMEM
 

+# Discontigmem is deprecated

 config ARCH_DISCONTIGMEM_ENABLE
        bool
 config ARCH_DISCONTIGMEM_ENABLE
        bool

-       default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
-       help
-         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.

 
 config ARCH_SPARSEMEM_ENABLE
        bool
 
 
 config ARCH_SPARSEMEM_ENABLE
        bool
 

+config ARCH_SPARSEMEM_DEFAULT
+       def_bool ARCH_SPARSEMEM_ENABLE
+

 config ARCH_SELECT_MEMORY_MODEL
 config ARCH_SELECT_MEMORY_MODEL

-       bool
+       def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE

 
 config NODES_SHIFT
        int
 
 config NODES_SHIFT
        int


@@ -845,7 +876,7 @@ config LEDS
                   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
                   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

-                  ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
+                  ARCH_AT91 || ARCH_DAVINCI || \

                   ARCH_KS8695 || MACH_RD88F5182
        help
          If you say Y here, the LEDs on your machine will be used
                   ARCH_KS8695 || MACH_RD88F5182
        help
          If you say Y here, the LEDs on your machine will be used


@@ -1005,9 +1036,9 @@ config ATAGS_PROC
 
 endmenu
 
 
 endmenu
 

-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
+menu "CPU Power Management"

 
 

-menu "CPU Frequency scaling"
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)

 
 source "drivers/cpufreq/Kconfig"
 
 
 source "drivers/cpufreq/Kconfig"
 


@@ -1047,10 +1078,12 @@ config CPU_FREQ_PXA
        default y
        select CPU_FREQ_DEFAULT_GOV_USERSPACE
 
        default y
        select CPU_FREQ_DEFAULT_GOV_USERSPACE
 

-endmenu
-

 endif
 
 endif
 

+source "drivers/cpuidle/Kconfig"
+
+endmenu
+

 menu "Floating point emulation"
 
 comment "At least one emulation must be selected"
 menu "Floating point emulation"
 
 comment "At least one emulation must be selected"


@@ -1202,6 +1235,8 @@ source "drivers/power/Kconfig"
 
 source "drivers/hwmon/Kconfig"
 
 
 source "drivers/hwmon/Kconfig"
 

+source "drivers/thermal/Kconfig"
+

 source "drivers/watchdog/Kconfig"
 
 source "drivers/ssb/Kconfig"
 source "drivers/watchdog/Kconfig"
 
 source "drivers/ssb/Kconfig"


@@ -1220,8 +1255,14 @@ source "drivers/hid/Kconfig"
 
 source "drivers/usb/Kconfig"
 
 
 source "drivers/usb/Kconfig"
 

+source "drivers/uwb/Kconfig"
+

 source "drivers/mmc/Kconfig"
 
 source "drivers/mmc/Kconfig"
 

+source "drivers/memstick/Kconfig"
+
+source "drivers/accessibility/Kconfig"
+

 source "drivers/leds/Kconfig"
 
 source "drivers/rtc/Kconfig"
 source "drivers/leds/Kconfig"
 
 source "drivers/rtc/Kconfig"


@@ -1230,6 +1271,8 @@ source "drivers/dma/Kconfig"
 
 source "drivers/dca/Kconfig"
 
 
 source "drivers/dca/Kconfig"
 

+source "drivers/auxdisplay/Kconfig"
+

 source "drivers/regulator/Kconfig"
 
 source "drivers/uio/Kconfig"
 source "drivers/regulator/Kconfig"
 
 source "drivers/uio/Kconfig"