aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx3
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-03-22 11:54:35 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-05-19 13:11:29 +0200
commit91350f6677f988b2342b214338520d1c3ed1ea0e (patch)
tree82cdaa0b868a767cda164d957c783749b474253b /arch/arm/mach-mx3
parent13cf8df97d075cf61445c689a30c8b0ce70b415f (diff)
ARM: mxc: don't use the symbols in the CPU family choice to select others
The symbols in this choice should only be used to select between the available machines that can be built into a single kernel. As these sets (will) differ e.g. depending on ARM_PATCH_PHYS_VIRT and AUTO_ZRELADDR letting them select other symbols makes the logic more complex and needs to duplicate some things. So let the machines select the corresponding symbols (indirectly via SOC_XYZ). LAKML-Reference: 1302464943-20721-2-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3')
-rw-r--r--arch/arm/mach-mx3/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
index cb7d4a3a092..647811e539d 100644
--- a/arch/arm/mach-mx3/Kconfig
+++ b/arch/arm/mach-mx3/Kconfig
@@ -12,6 +12,7 @@ config ARCH_MX35
config SOC_IMX31
bool
+ select CPU_V6
select IMX_HAVE_PLATFORM_MXC_RNGA
select ARCH_MXC_AUDMUX_V2
select ARCH_MX31
@@ -19,6 +20,7 @@ config SOC_IMX31
config SOC_IMX35
bool
+ select CPU_V6
select ARCH_MXC_IOMUX_V3
select ARCH_MXC_AUDMUX_V2
select HAVE_EPIT