ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs

For this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

1 files changed, 6 insertions, 13 deletions

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index a5353fc0793..0665c1f7e93 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -14,20 +14,13 @@ choice
         prompt "Freescale CPU family:"
         default ARCH_MX3
 
-config ARCH_MX1
-        bool "MX1-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.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"
-        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"