summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc/Kconfig
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-14 17:39:21 +0200
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-30 08:59:48 +0200
commite780d2392dd37fcc231d97400c1cdd8d261ed556 (patch)
tree4aba6fbbf17de429c5c95491cf7b7adefca8ff31 /arch/arm/plat-mxc/Kconfig
parentb6b06be062daf3a8a2a2bb93585564c7aa1fa8d3 (diff)
downloadblackbird-op-linux-e780d2392dd37fcc231d97400c1cdd8d261ed556.tar.gz
blackbird-op-linux-e780d2392dd37fcc231d97400c1cdd8d261ed556.zip
ARM: imx: prepare deprecating ARCH_MX1, MACH_MX2, MACH_MX21 and MACH_MX27
MACH_... is reserved for machine support, so use SOC as prefix, not MACH. This introduces new symbols SOC_IMX1, SOC_IMX21 and SOC_IMX27. They are selected by the old symbols for now. There is no substitute for MACH_MX2 as most usages of MX2 only means MX21 + MX27 but not MX25. Later the choice about CPU and CPU family should go away and the individual machines should select the right SOC symbol. This is a precondition to support more than one SOC in a single kernel image. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/Kconfig')
-rw-r--r--arch/arm/plat-mxc/Kconfig5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 3adad3822279..d80de4eacd2a 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -8,15 +8,12 @@ choice
config ARCH_MX1
bool "MX1-based"
- select CPU_ARM920T
- select IMX_HAVE_IOMUX_V1
+ select SOC_IMX1
help
This enables support for systems based on the Freescale i.MX1 family
config ARCH_MX2
bool "MX2-based"
- select CPU_ARM926T
- select IMX_HAVE_IOMUX_V1
help
This enables support for systems based on the Freescale i.MX2 family
OpenPOWER on IntegriCloud