diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-03-22 11:54:35 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-05-19 13:11:29 +0200 |
| commit | 91350f6677f988b2342b214338520d1c3ed1ea0e (patch) | |
| tree | 82cdaa0b868a767cda164d957c783749b474253b | |
| parent | 13cf8df97d075cf61445c689a30c8b0ce70b415f (diff) | |
| download | kernel_samsung_aries-91350f6677f988b2342b214338520d1c3ed1ea0e.zip kernel_samsung_aries-91350f6677f988b2342b214338520d1c3ed1ea0e.tar.gz kernel_samsung_aries-91350f6677f988b2342b214338520d1c3ed1ea0e.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/Kconfig | 6 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/Kconfig | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 4ac00e9..2995806 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -40,6 +40,7 @@ config MACH_MXLADS config ARCH_MX1ADS bool "MX1ADS platform" select MACH_MXLADS + select SOC_IMX1 select IMX_HAVE_PLATFORM_IMX_I2C select IMX_HAVE_PLATFORM_IMX_UART help diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig index cb7d4a3..647811e 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 diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index 49b5661..b3570e6 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig @@ -13,6 +13,8 @@ config ARCH_MX53 config SOC_IMX50 bool + select CPU_V7 + select ARM_L1_CACHE_SHIFT_6 select MXC_TZIC select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 @@ -21,6 +23,8 @@ config SOC_IMX50 config SOC_IMX51 bool + select CPU_V7 + select ARM_L1_CACHE_SHIFT_6 select MXC_TZIC select ARCH_MXC_IOMUX_V3 select ARCH_MXC_AUDMUX_V2 @@ -29,6 +33,8 @@ config SOC_IMX51 config SOC_IMX53 bool + select CPU_V7 + select ARM_L1_CACHE_SHIFT_6 select MXC_TZIC select ARCH_MXC_IOMUX_V3 select ARCH_MX53 diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig index debd7be..8b7ab8c 100644 --- a/arch/arm/plat-mxc/Kconfig +++ b/arch/arm/plat-mxc/Kconfig @@ -10,7 +10,6 @@ choice config ARCH_MX1 bool "MX1-based" - select SOC_IMX1 help This enables support for systems based on the Freescale i.MX1 family @@ -26,14 +25,11 @@ config ARCH_MX25 config ARCH_MX3 bool "MX3-based" - select CPU_V6 help This enables support for systems based on the Freescale i.MX3 family config ARCH_MX5 bool "MX5-based" - select CPU_V7 - select ARM_L1_CACHE_SHIFT_6 help This enables support for systems based on the Freescale i.MX51 family |