Merge ../linus

[linux-drm-fsl-dcu.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0fb17bbb86bce0d046a7cce05eff7f24ce1c1376..aa1d400d721a662f3dbae57a3cb9eea8bc6b6522 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -17,6 +17,10 @@ config ARM
          Europe.  There is an ARM Linux project with a web page at
          <http://www.arm.linux.org.uk/>.
 
+config GENERIC_TIME
+       bool
+       default n
+
 config MMU
        bool
        default y
@@ -70,6 +74,14 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
        bool
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 config GENERIC_HWEIGHT
        bool
        default y
@@ -95,7 +107,7 @@ config ARCH_MTD_XIP
 
 config VECTORS_BASE
        hex
-       default 0xffff0000 if MMU
+       default 0xffff0000 if MMU || CPU_HIGH_VECTOR
        default DRAM_BASE if REMAP_VECTORS_TO_RAM
        default 0x00000000
        help
@@ -205,6 +217,7 @@ config ARCH_IMX
 config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
+       select PLAT_IOP
        select PCI
        help
          Support for Intel's 80219 and IOP32X (XScale) family of
@@ -213,13 +226,21 @@ config ARCH_IOP32X
 config ARCH_IOP33X
        bool "IOP33x-based"
        depends on MMU
+       select PLAT_IOP
        select PCI
        help
          Support for Intel's IOP33X (XScale) family of processors.
 
+config ARCH_IOP13XX
+       bool "IOP13xx-based"
+       select PCI
+       help
+         Support for Intel's IOP13XX (XScale) family of processors.
+
 config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
+       select GENERIC_TIME
        help
          Support for Intel's IXP4XX (XScale) family of processors.
 
@@ -324,6 +345,8 @@ source "arch/arm/mach-iop32x/Kconfig"
 
 source "arch/arm/mach-iop33x/Kconfig"
 
+source "arch/arm/mach-iop13xx/Kconfig"
+
 source "arch/arm/mach-ixp4xx/Kconfig"
 
 source "arch/arm/mach-ixp2000/Kconfig"
@@ -362,8 +385,19 @@ source "arch/arm/mach-netx/Kconfig"
 config ARCH_ACORN
        bool
 
+config PLAT_IOP
+       bool
+
 source arch/arm/mm/Kconfig
 
+config IWMMXT
+       bool "Enable iWMMXt support"
+       depends CPU_XSCALE || CPU_XSC3
+       default y if PXA27x
+       help
+         Enable support for iWMMXt context switching at run time if
+         running on a CPU that supports it.
+
 #  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
 config XSCALE_PMU
        bool
@@ -573,7 +607,7 @@ config LEDS
                   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
-                  ARCH_AT91RM9200 || MACH_TRIZEPS4
+                  ARCH_AT91 || MACH_TRIZEPS4
        help
          If you say Y here, the LEDs on your machine will be used
          to provide useful information about your current system status.
@@ -616,9 +650,10 @@ config LEDS_CPU
 
 config ALIGNMENT_TRAP
        bool
+       depends on CPU_CP15_MMU
        default y if !ARCH_EBSA110
        help
-         ARM processors can not fetch/store information which is not
+         ARM processors cannot fetch/store information which is not
          naturally aligned on the bus, i.e., a 4 byte fetch must start at an
          address divisible by 4. On 32-bit ARM processors, these non-aligned
          fetch/store instructions will be emulated in software if you say
@@ -647,11 +682,12 @@ config ZBOOT_ROM_BSS
        hex "Compressed ROM boot loader BSS address"
        default "0"
        help
-         The base address of 64KiB of read/write memory in the target
-         for the ROM-able zImage, which must be available while the
-         decompressor is running.  Platforms which normally make use of
-         ROM-able zImage formats normally set this to a suitable
-         value in their defconfig file.
+         The base address of an area of read/write memory in the target
+         for the ROM-able zImage which must be available while the
+         decompressor is running. It must be large enough to hold the
+         entire decompressed kernel plus an additional 128 KiB.
+         Platforms which normally make use of ROM-able zImage formats
+         normally set this to a suitable value in their defconfig file.
 
          If ZBOOT_ROM is not enabled, this has no effect.
 
@@ -846,7 +882,7 @@ source "drivers/base/Kconfig"
 
 source "drivers/connector/Kconfig"
 
-if ALIGNMENT_TRAP
+if ALIGNMENT_TRAP || !CPU_CP15_MMU
 source "drivers/mtd/Kconfig"
 endif
 
@@ -867,6 +903,8 @@ endif
 
 source "drivers/scsi/Kconfig"
 
+source "drivers/ata/Kconfig"
+
 source "drivers/md/Kconfig"
 
 source "drivers/message/fusion/Kconfig"