From patchwork Tue May 15 18:13:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 159406 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 15647B6FB9 for ; Wed, 16 May 2012 04:16:24 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SUMFn-0007Pm-7n; Tue, 15 May 2012 18:13:47 +0000 Received: from na3sys009aog110.obsmtp.com ([74.125.149.203]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1SUMFj-0007PB-92 for linux-arm-kernel@lists.infradead.org; Tue, 15 May 2012 18:13:44 +0000 Received: from mail-pz0-f44.google.com ([209.85.210.44]) (using TLSv1) by na3sys009aob110.postini.com ([74.125.148.12]) with SMTP ID DSNKT7Kc1RSu2yOXBTOgqn4bP4scbibUtwcC@postini.com; Tue, 15 May 2012 11:13:43 PDT Received: by dacx6 with SMTP id x6so6961153dac.3 for ; Tue, 15 May 2012 11:13:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:organization:references:date:in-reply-to :message-id:user-agent:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=vY9nGI1nWKfv79ARteYsJte+4IbtNSwWTLNFBFglbGs=; b=X5C+H9oNmwWRztcT+hT88k7garU8FeFoJUGTAlxeYG9tR0AQQE5U3UPicN4Er/FivL QHIMbt6iZP654EAWVGL3yrDbYi5pb6JPANyX/sJSQWjQj71riVc2VPOX/exSFhqmevsX uSZwKUg/xiu1Ld92bpSj5gdUWGrSsjaN7NsJmsSVOTx4DprBRQAVteYPXJn1DuuL8FXL X3kCz1xf/34Tro83k3m0fAvJajfOnECZw8Cuy8TXTbIrJTq+SnoaLMR8s9UtMber4kJe 3kdH++mq8BuDW155ycsXdw2tP8oLsWa+JvYXeuUpu4b30FH1VMWvq48TUqu+w6q6scxi hh9Q== Received: by 10.68.212.138 with SMTP id nk10mr7953082pbc.21.1337105621087; Tue, 15 May 2012 11:13:41 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id wn3sm2517064pbc.74.2012.05.15.11.13.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 May 2012 11:13:40 -0700 (PDT) From: Kevin Hilman To: Tony Lindgren Subject: Re: [RESEND PATCH 1/2] ARM: OMAP2+: nand: Make board_onenand_init() visible to board code Organization: Texas Instruments, Inc. References: <1333564586-3259-1-git-send-email-javier@dowhile0.org> <20120508231653.GP5088@atomide.com> Date: Tue, 15 May 2012 11:13:42 -0700 In-Reply-To: <20120508231653.GP5088@atomide.com> (Tony Lindgren's message of "Tue, 8 May 2012 16:16:54 -0700") Message-ID: <87zk99jort.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlwuqp2S1UPcCPZDUf/csHX1dNoRODqpNHiFIgw6Of4/vtoG1XomLQL3vkvbD15uDcrLP3V X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.203 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linaro-kernel@lists.linaro.org, Russell King , patches@linaro.org, Enric =?utf-8?Q?Balle?= =?utf-8?Q?tb=C3=B2?= i Serra , linaro-dev@lists.linaro.org, Javier Martinez Canillas , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 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 Tony Lindgren writes: > * Javier Martinez Canillas [120427 02:33]: >> On Wed, Apr 25, 2012 at 9:59 AM, Enric Balletbò i Serra >> wrote: >> > >> > Tony, as this is a fix ,may be included ? >> > >> > Acked-by: Enric Balletbo i Serra >> > Tested-by: Enric Balletbo i Serra >> > >> > Cheers, >> >    Enric >> >> Hi Tony, Russel: >> >> This patch is a requirement for patch: >> >> [RESEND PATCH 2/2] OMAP3: igep0020: Add support for Micron NAND Flash >> storage memory >> >> which is really important since newer IGEPv2 boards have changed their >> flash memory from OneNAND to NAND. >> >> This patch-set is necessary to make the board work, otherwise it >> doesn't even boot. >> >> Could we please include these patches? > > Thanks for the patience, applying now into board branch finally. This patch breaks the build for platforms that don't use ONENAND. Using omap2plus_defconfig, set CONFIG_MTD_ONENAND_OMAP2=n and you'll get the build error below[1] By removing the static, there is now duplicate definitions in the .c and .h files. The solution is to remove the dummy definition from the .c file. Tony, feel free to fold the diff below[2] into the original patch to fix this compile problem. Kevin [1] /work/kernel/omap/dev/arch/arm/mach-omap2/board-flash.c:102:111: error: redefinition of 'board_onenand_init' /work/kernel/omap/dev/arch/arm/mach-omap2/board-flash.h:56:51: note: previous definition of 'board_onenand_init' was here make[2]: *** [arch/arm/mach-omap2/board-flash.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/arm/mach-omap2] Error 2 make: *** [sub-make] Error 2 [2] diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c index 70a81f9..53c39d2 100644 --- a/arch/arm/mach-omap2/board-flash.c +++ b/arch/arm/mach-omap2/board-flash.c @@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts, gpmc_onenand_init(&board_onenand_data); } -#else -void -__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs) -{ -} #endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */ #if defined(CONFIG_MTD_NAND_OMAP2) || \