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: 8660 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 A0C5623E42 for ; Tue, 15 May 2012 18:13:46 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3EE3AA181CF for ; Tue, 15 May 2012 18:13:46 +0000 (UTC) Received: by yenq6 with SMTP id q6so7108378yen.11 for ; Tue, 15 May 2012 11:13:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf: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=NP09HZS5By7H/HLnKOF3qdLDXu97XTLaPcl7aZQyeg7mr4xjoJIrk+cuJxaLaq9LqG JXSm/QrTsGQfsPMe5wQWRlzMX2XBO/Q2FUkIi3wscLpd5bRgrFvdeBYsUfIf3jhI0brR i4oo5K0vjKCNtoOTHXsNtdyzHGNtEGVUraN7GGcV1N489u/KfkVHD9tr4xvZ2FyWM6JO llzH+zN/h1MQFKF1eEP8g9BvN9OtSU+7zy51astoxZPBYPghWMybhve15DGhJGI7AIDR o+TyAw5LQVg+GLEBeuKoz46Me0vYo+hWxOs+NH3EANHX5hnY1woVBOkgH+/GiO6IdzUy hHdw== Received: by 10.50.163.99 with SMTP id yh3mr3091936igb.53.1337105625358; Tue, 15 May 2012 11:13:45 -0700 (PDT) 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.231.35.72 with SMTP id o8csp439039ibd; Tue, 15 May 2012 11:13:43 -0700 (PDT) Received: by 10.68.239.231 with SMTP id vv7mr7817996pbc.104.1337105623299; Tue, 15 May 2012 11:13:43 -0700 (PDT) Received: from na3sys009aog109.obsmtp.com ([74.125.149.201]) by mx.google.com with SMTP id gt5si3273210pbc.32.2012.05.15.11.13.42 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 May 2012 11:13:43 -0700 (PDT) Received-SPF: pass (google.com: domain of khilman@ti.com designates 74.125.149.201 as permitted sender) client-ip=74.125.149.201; Authentication-Results: mx.google.com; spf=pass (google.com: domain of khilman@ti.com designates 74.125.149.201 as permitted sender) smtp.mail=khilman@ti.com Received: from mail-pz0-f51.google.com ([209.85.210.51]) (using TLSv1) by na3sys009aob109.postini.com ([74.125.148.12]) with SMTP ID DSNKT7Kc1RSu2yOXBTOgqn4bP4scbibUtwcC@postini.com; Tue, 15 May 2012 11:13:43 PDT Received: by dajt11 with SMTP id t11so6826762daj.10 for ; Tue, 15 May 2012 11:13:41 -0700 (PDT) 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 Cc: Javier Martinez Canillas , Enric =?utf-8?Q?Balle?= =?utf-8?Q?tb=C3=B2?= i Serra , Russell King , linux-omap@vger.kernel.org, linaro-kernel@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org, patches@linaro.org 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: ALoCoQkQE7l0sTCQFgNEPH86ELHg5BfMHkHzcH2hUMh+vhaMXpuMgBQomYhP4XfYzQYKlrFbpk9z 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) || \