diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-27 01:48:02 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:26:28 -0400 |
| commit | a89cf59b5c344e50b7be3cabb67dc1ed94439b6e (patch) | |
| tree | 8a0a76073e6e0d618910621d1cebaf1787f9574b /arch/arm/mm | |
| parent | a1f1c7efb0c1c78b5e84455bb5a6c8b2bee3059c (diff) | |
arm/imx: merge i.MX3 and i.MX6
The patch merges the build of imx3 and imx6. The Kconfig symbol
ARCH_IMX_V6_V7 is introduced to replace ARCH_MX3 and ARCH_MX6.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c3ce146e29fe..9ab5be07061a 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -819,10 +819,10 @@ config CACHE_FEROCEON_L2_WRITETHROUGH | |||
| 819 | config CACHE_L2X0 | 819 | config CACHE_L2X0 |
| 820 | bool "Enable the L2x0 outer cache controller" | 820 | bool "Enable the L2x0 outer cache controller" |
| 821 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ | 821 | depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ |
| 822 | REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ | 822 | REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \ |
| 823 | ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ | 823 | ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ |
| 824 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \ | 824 | ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \ |
| 825 | ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_MX6 | 825 | ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX |
| 826 | default y | 826 | default y |
| 827 | select OUTER_CACHE | 827 | select OUTER_CACHE |
| 828 | select OUTER_CACHE_SYNC | 828 | select OUTER_CACHE_SYNC |