From patchwork Wed Dec 14 11:39:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v4, REPOST, 5/5] imx6q: Remove unconditional dependency on l2x0 L2 cache support Date: Wed, 14 Dec 2011 01:39:41 -0000 From: Dave Martin X-Patchwork-Id: 131354 Message-Id: <1323862781-3465-6-git-send-email-dave.martin@linaro.org> To: linux-arm-kernel@lists.infradead.org Cc: Will Deacon , Kukjin Kim , Pawel Moll , patches@linaro.org, linux-sh@vger.kernel.org, Catalin Marinas , Linus Walleij , Anton Vorontsov , Magnus Damm , Haojian Zhuang , Colin Cross , Shawn Guo , Tony Lindgren , Paul Mundt , linux-samsung-soc@vger.kernel.org, Rob Herring , Sascha Hauer , Barry Song , linux-tegra@vger.kernel.org, linux-omap@vger.kernel.org, John Linn The i.MX6 Quad SoC will work without the l2x0 L2 cache controller support built into the kernel, so this patch removes the dependency on CACHE_L2X0 and selects MIGHT_HAVE_CACHE_L2X0 instead. This makes the l2x0 support optional, so that it can be turned off when desired for debugging purposes etc. Thanks to Shawn Guo for this suggestion. [1] Signed-off-by: Dave Martin [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2011-November/074602.html --- arch/arm/mach-imx/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 29a3d61..1fb93f2 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -609,13 +609,13 @@ comment "i.MX6 family:" config SOC_IMX6Q bool "i.MX6 Quad support" select ARM_GIC - select CACHE_L2X0 select CPU_V7 select HAVE_ARM_SCU select HAVE_IMX_GPC select HAVE_IMX_MMDC select HAVE_IMX_SRC select HAVE_SMP + select MIGHT_HAVE_CACHE_L2X0 select USE_OF help