diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-03-22 06:54:35 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-05-19 07:11:29 -0400 |
commit | 91350f6677f988b2342b214338520d1c3ed1ea0e (patch) | |
tree | 82cdaa0b868a767cda164d957c783749b474253b /arch/arm/mach-mx5 | |
parent | 13cf8df97d075cf61445c689a30c8b0ce70b415f (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-mx5')
-rw-r--r-- | arch/arm/mach-mx5/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 49b5661f01c2..b3570e6c8e12 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig | |||
@@ -13,6 +13,8 @@ config ARCH_MX53 | |||
13 | 13 | ||
14 | config SOC_IMX50 | 14 | config SOC_IMX50 |
15 | bool | 15 | bool |
16 | select CPU_V7 | ||
17 | select ARM_L1_CACHE_SHIFT_6 | ||
16 | select MXC_TZIC | 18 | select MXC_TZIC |
17 | select ARCH_MXC_IOMUX_V3 | 19 | select ARCH_MXC_IOMUX_V3 |
18 | select ARCH_MXC_AUDMUX_V2 | 20 | select ARCH_MXC_AUDMUX_V2 |
@@ -21,6 +23,8 @@ config SOC_IMX50 | |||
21 | 23 | ||
22 | config SOC_IMX51 | 24 | config SOC_IMX51 |
23 | bool | 25 | bool |
26 | select CPU_V7 | ||
27 | select ARM_L1_CACHE_SHIFT_6 | ||
24 | select MXC_TZIC | 28 | select MXC_TZIC |
25 | select ARCH_MXC_IOMUX_V3 | 29 | select ARCH_MXC_IOMUX_V3 |
26 | select ARCH_MXC_AUDMUX_V2 | 30 | select ARCH_MXC_AUDMUX_V2 |
@@ -29,6 +33,8 @@ config SOC_IMX51 | |||
29 | 33 | ||
30 | config SOC_IMX53 | 34 | config SOC_IMX53 |
31 | bool | 35 | bool |
36 | select CPU_V7 | ||
37 | select ARM_L1_CACHE_SHIFT_6 | ||
32 | select MXC_TZIC | 38 | select MXC_TZIC |
33 | select ARCH_MXC_IOMUX_V3 | 39 | select ARCH_MXC_IOMUX_V3 |
34 | select ARCH_MX53 | 40 | select ARCH_MX53 |