From patchwork Tue Dec 13 17:56:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 5641 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 9C3C223E0C for ; Tue, 13 Dec 2011 17:56:48 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9217CA1829B for ; Tue, 13 Dec 2011 17:56:48 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id 13so1589962eaa.11 for ; Tue, 13 Dec 2011 09:56:48 -0800 (PST) Received: by 10.204.156.208 with SMTP id y16mr13553276bkw.72.1323799008363; Tue, 13 Dec 2011 09:56:48 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs88576bkc; Tue, 13 Dec 2011 09:56:48 -0800 (PST) Received: by 10.227.203.131 with SMTP id fi3mr21385513wbb.17.1323799006882; Tue, 13 Dec 2011 09:56:46 -0800 (PST) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id gd21si12559505wbb.105.2011.12.13.09.56.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Dec 2011 09:56:46 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of dave.martin@linaro.org) smtp.mail=dave.martin@linaro.org Received: by mail-ww0-f50.google.com with SMTP id dr11so14211355wgb.31 for ; Tue, 13 Dec 2011 09:56:46 -0800 (PST) Received: by 10.227.207.133 with SMTP id fy5mr17427911wbb.23.1323799006530; Tue, 13 Dec 2011 09:56:46 -0800 (PST) Received: from e103592.peterhouse.linaro.org (fw-lnat.cambridge.arm.com. [217.140.96.63]) by mx.google.com with ESMTPS id dd4sm30779779wib.1.2011.12.13.09.56.45 (version=SSLv3 cipher=OTHER); Tue, 13 Dec 2011 09:56:45 -0800 (PST) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: patches@linaro.org Subject: [PATCH v4 5/5] imx6q: Remove unconditional dependency on l2x0 L2 cache support Date: Tue, 13 Dec 2011 17:56:33 +0000 Message-Id: <1323798993-8727-6-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1323798993-8727-1-git-send-email-dave.martin@linaro.org> References: <1323798993-8727-1-git-send-email-dave.martin@linaro.org> 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