aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-14 11:39:21 -0400
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-30 02:59:48 -0400
commite780d2392dd37fcc231d97400c1cdd8d261ed556 (patch)
tree4aba6fbbf17de429c5c95491cf7b7adefca8ff31 /arch/arm/mach-imx
parentb6b06be062daf3a8a2a2bb93585564c7aa1fa8d3 (diff)
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/mach-imx')
-rw-r--r--arch/arm/mach-imx/Kconfig21
1 files changed, 19 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 3ca8fa7d91ae..5edead235bd1 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,5 +1,10 @@
1if ARCH_MX1 1if ARCH_MX1
2 2
3config SOC_IMX1
4 select CPU_ARM920T
5 select IMX_HAVE_IOMUX_V1
6 bool
7
3comment "MX1 platforms:" 8comment "MX1 platforms:"
4config MACH_MXLADS 9config MACH_MXLADS
5 bool 10 bool
@@ -19,19 +24,31 @@ endif
19 24
20if ARCH_MX2 25if ARCH_MX2
21 26
27config SOC_IMX21
28 select CPU_ARM926T
29 select ARCH_MXC_AUDMUX_V1
30 select IMX_HAVE_IOMUX_V1
31 bool
32
33config SOC_IMX27
34 select CPU_ARM926T
35 select ARCH_MXC_AUDMUX_V1
36 select IMX_HAVE_IOMUX_V1
37 bool
38
22choice 39choice
23 prompt "CPUs:" 40 prompt "CPUs:"
24 default MACH_MX21 41 default MACH_MX21
25 42
26config MACH_MX21 43config MACH_MX21
27 bool "i.MX21 support" 44 bool "i.MX21 support"
28 select ARCH_MXC_AUDMUX_V1 45 select SOC_IMX21
29 help 46 help
30 This enables support for Freescale's MX2 based i.MX21 processor. 47 This enables support for Freescale's MX2 based i.MX21 processor.
31 48
32config MACH_MX27 49config MACH_MX27
33 bool "i.MX27 support" 50 bool "i.MX27 support"
34 select ARCH_MXC_AUDMUX_V1 51 select SOC_IMX27
35 help 52 help
36 This enables support for Freescale's MX2 based i.MX27 processor. 53 This enables support for Freescale's MX2 based i.MX27 processor.
37 54