mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <l.stach@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 10/20] arm: imx: properly stub out NAND bbu handler
Date: Mon, 24 Nov 2014 12:06:50 +0100	[thread overview]
Message-ID: <1416827220-3103-11-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1416827220-3103-1-git-send-email-l.stach@pengutronix.de>

The nand handler is only built in if config
BAREBOX_UPDATE_IMX6_NAND is selected.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/include/mach/bbu.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-imx/include/mach/bbu.h b/arch/arm/mach-imx/include/mach/bbu.h
index 74c334a075a7..5eb9a47363af 100644
--- a/arch/arm/mach-imx/include/mach/bbu.h
+++ b/arch/arm/mach-imx/include/mach/bbu.h
@@ -27,8 +27,6 @@ int imx6_bbu_internal_mmc_register_handler(const char *name, char *devicefile,
 int imx6_bbu_internal_spi_i2c_register_handler(const char *name, char *devicefile,
 		unsigned long flags);
 
-int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
-
 int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
 		unsigned long flags);
 
@@ -70,13 +68,17 @@ static inline int imx6_bbu_internal_spi_i2c_register_handler(const char *name, c
 	return -ENOSYS;
 }
 
-static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
+static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
+		unsigned long flags)
 {
 	return -ENOSYS;
 }
+#endif
 
-static inline int imx_bbu_external_nor_register_handler(const char *name, char *devicefile,
-		unsigned long flags)
+#if defined(CONFIG_BAREBOX_UPDATE_IMX6_NAND)
+int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
+#else
+static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
 {
 	return -ENOSYS;
 }
-- 
2.1.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-11-24 11:07 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-24 11:06 [PATCH 00/20] First batch of randconfig fixes Lucas Stach
2014-11-24 11:06 ` [PATCH 01/20] firmware: socfpga: depend on ARCH_SOCFPGA Lucas Stach
2014-11-24 11:06 ` [PATCH 02/20] firmware: altera-serial: depend on SPI Lucas Stach
2014-11-24 11:06 ` [PATCH 03/20] firmware: altera-serial: don't try to check void return value Lucas Stach
2014-11-24 11:06 ` [PATCH 04/20] firmware: altera-serial: fix printf message Lucas Stach
2014-11-24 11:06 ` [PATCH 05/20] common: firmware: include libfile Lucas Stach
2014-11-24 11:06 ` [PATCH 06/20] arm: imx: select MFD_MC13XXX for all boards that need it Lucas Stach
2014-11-24 11:06 ` [PATCH 07/20] arm: imx: select I2C for all boards that need it in their board init Lucas Stach
2014-11-24 11:06 ` [PATCH 08/20] arm: imx: pca100: select USB ULPI support Lucas Stach
2014-11-24 12:48   ` Sascha Hauer
2014-11-24 11:06 ` [PATCH 09/20] arm: imx: nand update handler depends on MTD layer Lucas Stach
2014-11-24 11:06 ` Lucas Stach [this message]
2014-11-24 12:50   ` [PATCH 10/20] arm: imx: properly stub out NAND bbu handler Sascha Hauer
2014-11-24 11:06 ` [PATCH 11/20] arm: phyflex-imx6: move common.h before other includes Lucas Stach
2014-11-24 12:52   ` Sascha Hauer
2014-11-24 11:06 ` [PATCH 12/20] video: ipuv3: select OFDEVICE for HDMI and LVDS Lucas Stach
2014-11-24 11:06 ` [PATCH 13/20] mci: esdhc: add back PIO_TIMEOUT Lucas Stach
2014-11-24 11:06 ` [PATCH 14/20] arm: don't allow to select BUILTIN_DTB when building multiimage Lucas Stach
2014-11-24 11:06 ` [PATCH 15/20] arm: fill BUILTIN_DTB_NAME for boards that still use this option Lucas Stach
2014-11-24 11:06 ` [PATCH 16/20] net: ethoc: depend on OPENRISC Lucas Stach
2014-11-24 12:57   ` Sascha Hauer
2014-11-24 11:06 ` [PATCH 17/20] blspec: depend on, not select flexible bootargs Lucas Stach
2014-11-24 12:59   ` Sascha Hauer
2014-11-25 17:00     ` Lucas Stach
2014-11-24 11:06 ` [PATCH 18/20] common: menu needs PROCESS_ESCAPE_SEQUENCE Lucas Stach
2014-11-24 11:06 ` [PATCH 19/20] usb: gadget: fastboot: select BANNER Lucas Stach
2014-11-24 11:07 ` [PATCH 20/20] lib: decompress_xz: fix function header to match prototype Lucas Stach
2014-11-24 13:03 ` [PATCH 00/20] First batch of randconfig fixes Sascha Hauer
2014-11-26 19:59 ` Sascha Hauer

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=1416827220-3103-11-git-send-email-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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