public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 4/6] arm: socfpga: Enable SPL MMC/SPI support only if DM_MMC/SPI is enabled
Date: Sun, 20 Dec 2015 04:00:44 +0100	[thread overview]
Message-ID: <1450580446-6435-4-git-send-email-marex@denx.de> (raw)
In-Reply-To: <1450580446-6435-1-git-send-email-marex@denx.de>

It is not possible to compile MMC/SPI SPL if the respective DM_MMC/DM_SPI
bits are not enabled. Secure the code with an ifdef to prevent compiler
splat.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Chin Liang See <clsee@altera.com>
---
 include/configs/socfpga_common.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 3a4df63..3d46330 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -294,8 +294,12 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_WATCHDOG_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
+#ifdef CONFIG_DM_MMC
 #define CONFIG_SPL_MMC_SUPPORT
+#endif
+#ifdef CONFIG_DM_SPI
 #define CONFIG_SPL_SPI_SUPPORT
+#endif
 
 /* SPL SDMMC boot support */
 #ifdef CONFIG_SPL_MMC_SUPPORT
-- 
2.1.4

  parent reply	other threads:[~2015-12-20  3:00 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-20  3:00 [U-Boot] [PATCH 1/6] arm: socfpga: Define NAND reset bit Marek Vasut
2015-12-20  3:00 ` [U-Boot] [PATCH 2/6] arm: socfpga: Unreset NAND in SPL Marek Vasut
2015-12-20  3:00 ` [U-Boot] [PATCH 3/6] arm: socfpga: Unreset NAND in U-Boot Marek Vasut
2015-12-22 15:36   ` Chin Liang See
2015-12-20  3:00 ` Marek Vasut [this message]
2015-12-22 15:40   ` [U-Boot] [PATCH 4/6] arm: socfpga: Enable SPL MMC/SPI support only if DM_MMC/SPI is enabled Chin Liang See
2015-12-20  3:00 ` [U-Boot] [PATCH 5/6] arm: socfpga: Enable DFU MMC support only if DM_MMC " Marek Vasut
2015-12-22 15:19   ` Chin Liang See
2015-12-20  3:00 ` [U-Boot] [PATCH 6/6] arm: socfpga: Add support for Denali NAND controller Marek Vasut
2015-12-22 15:17   ` Chin Liang See
2015-12-22 15:51     ` Marek Vasut
2015-12-22 20:23     ` Marek Vasut
2015-12-23  0:26       ` Chin Liang See

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=1450580446-6435-4-git-send-email-marex@denx.de \
    --to=marex@denx.de \
    --cc=u-boot@lists.denx.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