engicam: Move SPL mmc configs under CONFIG_SPL_BUILD

- CONFIG_SYS_FSL_USDHC_NUM
- CONFIG_SYS_FSL_ESDHC_ADDR

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index 741bdfa80750e66d014005e17ab7f3afc9e3f899..1fc418ed0d5855aa8a8c1f0fae91738937fe9ca6 100644 (file)
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -137,8 +137,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 */
@@ -203,6 +201,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 f52865b5a07dedb1e563a63439c99903e2c147e4..f36a6c69365a0b57e7cb0829a5aa21d612a122e8 100644 (file)
--- a/include/configs/imx6qdl_icore_rqs.h
+++ b/include/configs/imx6qdl_icore_rqs.h
@@ -119,8 +119,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 */
@@ -137,8 +135,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 2e12b977676ffb75a69362403d03e978dd8a0b63..73b42390b8cd0dbf8bbbd8561689980e142555d3 100644 (file)
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -136,8 +136,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 */
@@ -187,6 +185,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 76ae159da3c97e6c3b4df1289701b942c09cddc8..d262e82210d9d455726bec0002b5005a99d14ed9 100644 (file)
--- a/include/configs/imx6ul_isiot.h
+++ b/include/configs/imx6ul_isiot.h
@@ -136,8 +136,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 */
@@ -188,6 +186,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