From: Sascha Hauer <s.hauer@pengutronix.de>
To: Lucas Stach <l.stach@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 3/5] ARM: omap: move GPMC calls under config define
Date: Mon, 20 Apr 2015 13:17:19 +0200 [thread overview]
Message-ID: <20150420111719.GO6325@pengutronix.de> (raw)
In-Reply-To: <1429520152-27399-3-git-send-email-l.stach@pengutronix.de>
On Mon, Apr 20, 2015 at 10:55:50AM +0200, Lucas Stach wrote:
> Fixes build failures on a few boards if CONFIG_OMAP_GPMC
> is not set.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> arch/arm/boards/beagle/board.c | 4 +++-
> arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c | 11 +++++++----
> arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c | 10 +++++++---
> arch/arm/boards/phytec-phycore-omap4460/board.c | 9 +++++++--
> 4 files changed, 24 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
> index 775621069c27..c7fd5a30542e 100644
> --- a/arch/arm/boards/beagle/board.c
> +++ b/arch/arm/boards/beagle/board.c
> @@ -74,11 +74,13 @@ static struct i2c_board_info i2c_devices[] = {
> },
> };
>
> +#ifdef CONFIG_OMAP_GPMC
> static struct gpmc_nand_platform_data nand_plat = {
> .device_width = 16,
> .ecc_mode = OMAP_ECC_HAMMING_CODE_HW_ROMCODE,
> .nand_cfg = &omap3_nand_cfg,
> };
> +#endif
>
> static int beagle_mem_init(void)
> {
> @@ -100,8 +102,8 @@ static int beagle_devices_init(void)
> #ifdef CONFIG_OMAP_GPMC
> /* WP is made high and WAIT1 active Low */
> gpmc_generic_init(0x10);
> -#endif
> omap_add_gpmc_nand_device(&nand_plat);
> +#endif
Maybe add a static inline no-op wrapper instead? This would save us some
ifdefs.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-04-20 11:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-20 8:55 [PATCH 1/5] usb: gadget: pxa27x: depend on right symbol Lucas Stach
2015-04-20 8:55 ` [PATCH 2/5] MCI: pxa: " Lucas Stach
2015-04-20 21:24 ` Robert Jarzmik
2015-04-20 8:55 ` [PATCH 3/5] ARM: omap: move GPMC calls under config define Lucas Stach
2015-04-20 9:09 ` Marc Kleine-Budde
2015-04-20 11:17 ` Sascha Hauer [this message]
2015-04-20 8:55 ` [PATCH 4/5] ARM: socfpga: add default ARCH_TEXT_BASE Lucas Stach
2015-04-20 8:55 ` [PATCH 5/5] ARM: pxa: move lubbock TEXTBASE to Kconfig Lucas Stach
2015-04-20 21:26 ` Robert Jarzmik
2015-04-20 21:22 ` [PATCH 1/5] usb: gadget: pxa27x: depend on right symbol Robert Jarzmik
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=20150420111719.GO6325@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=l.stach@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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