ARM i.MX: allow to compile together all i.MX5 based SoCs

For this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT.

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

2 files changed, 4 insertions, 22 deletions

diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 0665c1f7e93d..502e45f03178 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -4,12 +4,6 @@ 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
@@ -27,20 +21,14 @@ config ARCH_MX3
         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"
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h
index cbe2e3d08067..35e6c7f4ffd1 100644
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
@@ -23,12 +23,6 @@
 #if !defined(CONFIG_RUNTIME_PHYS_OFFSET)
 # if defined CONFIG_ARCH_MX3
 #  define PLAT_PHYS_OFFSET              MX3x_PHYS_OFFSET
-# elif defined CONFIG_ARCH_MX50
-#  define PLAT_PHYS_OFFSET              MX50_PHYS_OFFSET
-# elif defined CONFIG_ARCH_MX51
-#  define PLAT_PHYS_OFFSET              MX51_PHYS_OFFSET
-# elif defined CONFIG_ARCH_MX53
-#  define PLAT_PHYS_OFFSET              MX53_PHYS_OFFSET
 # endif
 #endif