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

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

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index b2a7e3fad117f44c97160c191ab8e34eff66dc0a..9cc2b16fdf793af36302108b4a65588342257e44 100644 (file)
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -6,18 +6,27 @@ choice
        prompt "MXC/iMX Base Type"
        default ARCH_MX3
 
+config ARCH_MX1
+       bool "MX1-based"
+       select CPU_ARM920T
+       help
+         This enables support for systems based on the Freescale i.MX1 family
+
 config ARCH_MX2
        bool "MX2-based"
+       select CPU_ARM926T
        help
          This enables support for systems based on the Freescale i.MX2 family
 
 config ARCH_MX3
        bool "MX3-based"
+       select CPU_V6
        help
          This enables support for systems based on the Freescale i.MX3 family
 
 endchoice
 
+source "arch/arm/mach-mx1/Kconfig"
 source "arch/arm/mach-mx2/Kconfig"
 source "arch/arm/mach-mx3/Kconfig"