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