[U-Boot] [PATCH 2/9] engicam: Move SPL mmc configs under CONFIG_SPL_BUILD

[Jagan Teki]

From: Jagan Teki <jagan at amarulasolutions.com>

- CONFIG_SYS_FSL_USDHC_NUM
- CONFIG_SYS_FSL_ESDHC_ADDR

Signed-off-by: Jagan Teki <jagan at amarulasolutions.com>
---
 include/configs/imx6qdl_icore.h     | 4 ++--
 include/configs/imx6qdl_icore_rqs.h | 5 +++--
 include/configs/imx6ul_geam.h       | 4 ++--
 include/configs/imx6ul_isiot.h      | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index f783eac..e4efad2 100644
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -139,8 +139,6 @@
 /* MMC */
 #ifdef CONFIG_FSL_USDHC
 # define CONFIG_SYS_MMC_ENV_DEV		0
-# define CONFIG_SYS_FSL_USDHC_NUM	1
-# define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #endif
 
 /* NAND */
@@ -205,6 +203,8 @@
 
 # include "imx6_spl.h"
 # ifdef CONFIG_SPL_BUILD
+#  define CONFIG_SYS_FSL_USDHC_NUM	1
+#  define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #  undef CONFIG_DM_GPIO
 #  undef CONFIG_DM_MMC
 # endif
diff --git a/include/configs/imx6qdl_icore_rqs.h b/include/configs/imx6qdl_icore_rqs.h
index a639468..4bc42eb 100644
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -121,8 +121,6 @@
 /* MMC */
 #ifdef CONFIG_FSL_USDHC
 # define CONFIG_SYS_MMC_ENV_DEV		0
-# define CONFIG_SYS_FSL_USDHC_NUM	2
-# define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #endif
 
 /* Ethernet */
@@ -139,8 +137,11 @@
 /* SPL */
 #ifdef CONFIG_SPL
 # define CONFIG_SPL_MMC_SUPPORT
+
 # include "imx6_spl.h"
 # ifdef CONFIG_SPL_BUILD
+#  define CONFIG_SYS_FSL_USDHC_NUM	2
+#  define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #  undef CONFIG_DM_GPIO
 #  undef CONFIG_DM_MMC
 # endif
diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 9f66dd3..19b366e 100644
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -138,8 +138,6 @@
 /* MMC */
 #ifdef CONFIG_FSL_USDHC
 # define CONFIG_SYS_MMC_ENV_DEV		0
-# define CONFIG_SYS_FSL_USDHC_NUM	1
-# define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #endif
 
 /* NAND */
@@ -189,6 +187,8 @@
 
 # include "imx6_spl.h"
 # ifdef CONFIG_SPL_BUILD
+#  define CONFIG_SYS_FSL_USDHC_NUM	1
+#  define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #  undef CONFIG_DM_GPIO
 #  undef CONFIG_DM_MMC
 # endif
diff --git a/include/configs/imx6ul_isiot.h b/include/configs/imx6ul_isiot.h
index 5ce70ae..ac89cee 100644
--- a/include/configs/imx6ul_isiot.h
+++ b/include/configs/imx6ul_isiot.h
@@ -138,8 +138,6 @@
 /* MMC */
 #ifdef CONFIG_FSL_USDHC
 # define CONFIG_SYS_MMC_ENV_DEV		0
-# define CONFIG_SYS_FSL_USDHC_NUM	2
-# define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #endif
 
 /* NAND */
@@ -190,6 +188,8 @@
 
 # include "imx6_spl.h"
 # ifdef CONFIG_SPL_BUILD
+#  define CONFIG_SYS_FSL_USDHC_NUM	2
+#  define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #  undef CONFIG_DM_GPIO
 #  undef CONFIG_DM_MMC
 # endif
-- 
1.9.1