From: khilman@ti•com (Kevin Hilman)
To: linux-arm-kernel@lists•infradead.org
Subject: [RESEND PATCH 1/2] ARM: OMAP2+: nand: Make board_onenand_init() visible to board code
Date: Tue, 15 May 2012 11:13:42 -0700 [thread overview]
Message-ID: <87zk99jort.fsf@ti.com> (raw)
In-Reply-To: <20120508231653.GP5088@atomide.com> (Tony Lindgren's message of "Tue, 8 May 2012 16:16:54 -0700")
Tony Lindgren <tony@atomide•com> writes:
> * Javier Martinez Canillas <javier@dowhile0•org> [120427 02:33]:
>> On Wed, Apr 25, 2012 at 9:59 AM, Enric Balletb? i Serra
>> <eballetbo@gmail•com> wrote:
>> >
>> > Tony, as this is a fix ,may be included ?
>> >
>> > Acked-by: Enric Balletbo i Serra <eballetbo@gmail•com>
>> > Tested-by: Enric Balletbo i Serra <eballetbo@gmail•com>
>> >
>> > 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) || \
next prev parent reply other threads:[~2012-05-15 18:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-04 18:36 [RESEND PATCH 1/2] ARM: OMAP2+: nand: Make board_onenand_init() visible to board code Javier Martinez Canillas
2012-04-04 18:36 ` [RESEND PATCH 2/2] OMAP3: igep0020: Add support for Micron NAND Flash storage memory Javier Martinez Canillas
2012-04-25 8:00 ` Enric Balletbò i Serra
2012-04-30 16:52 ` Javier Martinez Canillas
2012-04-25 7:59 ` [RESEND PATCH 1/2] ARM: OMAP2+: nand: Make board_onenand_init() visible to board code Enric Balletbò i Serra
2012-04-27 9:30 ` Javier Martinez Canillas
2012-05-08 23:16 ` Tony Lindgren
2012-05-09 13:30 ` Javier Martinez Canillas
2012-05-15 18:13 ` Kevin Hilman [this message]
2012-05-15 19:58 ` Tony Lindgren
2012-05-15 20:13 ` Kevin Hilman
2012-05-15 20:31 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zk99jort.fsf@ti.com \
--to=khilman@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox