From patchwork Sat Oct 8 15:15:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 118545 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 706EFB70C2 for ; Sun, 9 Oct 2011 02:16:09 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RCYdA-00042L-Dy; Sat, 08 Oct 2011 15:16:04 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RCYdA-0001t2-68; Sat, 08 Oct 2011 15:16:04 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RCYd6-0001sj-Ou for linux-arm-kernel@lists.infradead.org; Sat, 08 Oct 2011 15:16:01 +0000 Received: from wuerfel.localnet (port-92-200-84-51.dynamic.qsc.de [92.200.84.51]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LtQrQ-1R4thL34aq-010xWN; Sat, 08 Oct 2011 17:15:59 +0200 From: Arnd Bergmann To: Sascha Hauer Subject: [PATCH 1/3] ARM: imx: always select CACHE_L2X0 on i.MX3 Date: Sat, 08 Oct 2011 17:15:50 +0200 Message-ID: <101401532.609jSdenqo@wuerfel> User-Agent: KMail/4.7.1 (Linux/3.1.0-rc8nosema+; KDE/4.7.1; x86_64; ; ) In-Reply-To: <109850802.HMOqKGRdrl@wuerfel> References: <20111004092015.GM31404@pengutronix.de> <20111008101322.GH31404@pengutronix.de> <109850802.HMOqKGRdrl@wuerfel> MIME-Version: 1.0 X-Provags-ID: V02:K0:NAimnY8a5rk08qP2icjxFZVAQcMyq5TyeqHhAVdPI1g t3rgulcwaMmdB5nKNla4NCY6YHNuA61yTRdrR/LSe1GfjmFfII THFGDn29XE2QRRemLF7scay9P4q8lukQrKQbM6NWxAegUhqVVC haHqQhlYiTWYc8RIXgxZLDmFUCmlpPUhqDJBju3iqHjzhkV1yy rJvbKab2XGDoJGpJOpvJSBQdhRZdXkcxjxtrYm87yaVHVMYNFT d4fTKMsYec+Jo3ctV47pk2VQUTHV5MJAOILMLB6SWnGdDg5VGs EiKz0cDp0H2Sg0x/YoWEodM9FQXWFy89GEyKWrCRTTvQRz5zaD B0ckCY3oNfkYqz2Q60kU= X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111008_111601_094572_226C4D2F X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The i.MX3 and i.MX35 files unconditionally call the l2x0_init function, so we should make sure that this is built into the kernel. arch/arm/mach-imx/built-in.o: In function `imx3_init_l2x0': mm-imx3.c:(.text+0x154): undefined reference to `l2x0_init' Signed-off-by: Arnd Bergmann Acked-by: Shawn Guo --- arch/arm/mach-imx/Kconfig | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 6c12836..3de9ac9 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -64,6 +64,7 @@ config SOC_IMX31 select ARCH_MXC_AUDMUX_V2 select ARCH_MX31 select MXC_AVIC + select CACHE_L2X0 config SOC_IMX35 bool @@ -73,7 +74,7 @@ config SOC_IMX35 select HAVE_EPIT select ARCH_MX35 select MXC_AVIC - + select CACHE_L2X0 if ARCH_IMX_V4_V5