Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[pandora-kernel.git] / arch / arm / plat-mxc / Kconfig

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 0527e65..64e3a64 100644 (file)
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -43,6 +43,7 @@ config ARCH_MXC91231
 config ARCH_MX5
        bool "MX5-based"
        select CPU_V7
+       select ARM_L1_CACHE_SHIFT_6
        help
          This enables support for systems based on the Freescale i.MX51 family
 
@@ -91,6 +92,18 @@ config MXC_DEBUG_BOARD
          data/address de-multiplexing and decode, signal level shift,
          interrupt control and various board functions.
 
+config HAVE_EPIT
+       bool
+
+config MXC_USE_EPIT
+       bool "Use EPIT instead of GPT"
+       depends on HAVE_EPIT
+       help
+         Use EPIT as the system timer on systems that have it. Normally you
+         don't have a reason to do so as the EPIT has the same features and
+         uses the same clocks as the GPT. Anyway, on some systems the GPT
+         may be in use for other purposes.
+
 config MXC_ULPI
        bool
 
@@ -109,4 +122,8 @@ config ARCH_MXC_AUDMUX_V1
 config ARCH_MXC_AUDMUX_V2
        bool
 
+config IRAM_ALLOC
+       bool
+       select GENERIC_ALLOCATOR
+
 endif