1 files changed, 10 insertions, 29 deletions

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index a5353fc0793f..502e45f03178 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -4,50 +4,31 @@ source "arch/arm/plat-mxc/devices/Kconfig"
 
 menu "Freescale MXC Implementations"
 
-config ARCH_MX50_SUPPORTED
-        bool
-
-config ARCH_MX53_SUPPORTED
-        bool
-
 choice
         prompt "Freescale CPU family:"
         default ARCH_MX3
 
-config ARCH_MX1
-        bool "MX1-based"
-        help
-          This enables support for systems based on the Freescale i.MX1 family
-
-config ARCH_MX2
-        bool "MX2-based"
-        help
-          This enables support for systems based on the Freescale i.MX2 family
-
-config ARCH_MX25
-        bool "MX25-based"
+config ARCH_IMX_V4_V5
+        bool "i.MX1, i.MX21, i.MX25, i.MX27"
+        select AUTO_ZRELADDR
+        select ARM_PATCH_PHYS_VIRT
         help
-          This enables support for systems based on the Freescale i.MX25 family
+          This enables support for systems based on the Freescale i.MX ARMv4
+          and ARMv5 SoCs
 
 config ARCH_MX3
         bool "MX3-based"
         help
           This enables support for systems based on the Freescale i.MX3 family
 
-config ARCH_MX503
-        bool "i.MX50 + i.MX53"
-        select ARCH_MX50_SUPPORTED
-        select ARCH_MX53_SUPPORTED
+config ARCH_MX5
+        bool "i.MX50, i.MX51, i.MX53"
+        select AUTO_ZRELADDR
+        select ARM_PATCH_PHYS_VIRT
         help
           This enables support for machines using Freescale's i.MX50 and i.MX51
           processors.
 
-config ARCH_MX51
-        bool "i.MX51"
-        select ARCH_MX51_SUPPORTED
-        help
-          This enables support for systems based on the Freescale i.MX51 family
-
 endchoice
 
 source "arch/arm/mach-imx/Kconfig"