From: Marek Vasut <marex@denx.de>
Date: Sun, 20 Dec 2015 03:00:44 +0000 (+0100)
Subject: arm: socfpga: Enable SPL MMC/SPI support only if DM_MMC/SPI is enabled
X-Git-Tag: v2016.01-rc4~17^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4197a0f45b655c00eae738ddecee2a1009e972a3;p=u-boot

arm: socfpga: Enable SPL MMC/SPI support only if DM_MMC/SPI is enabled

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>
---

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index 35e4a75c3f..ff7a3005a5 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -330,8 +330,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