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>
This commit is contained in:
Jagan Teki 2017-05-12 17:18:21 +05:30 committed by Stefano Babic
parent 2e87c440f6
commit 6d931fd569
4 changed files with 9 additions and 8 deletions

View file

@ -137,8 +137,6 @@
/* MMC */ /* MMC */
#ifdef CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC
# define CONFIG_SYS_MMC_ENV_DEV 0 # define CONFIG_SYS_MMC_ENV_DEV 0
# define CONFIG_SYS_FSL_USDHC_NUM 1
# define CONFIG_SYS_FSL_ESDHC_ADDR 0
#endif #endif
/* NAND */ /* NAND */
@ -203,6 +201,8 @@
# include "imx6_spl.h" # include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD # 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_GPIO
# undef CONFIG_DM_MMC # undef CONFIG_DM_MMC
# endif # endif

View file

@ -119,8 +119,6 @@
/* MMC */ /* MMC */
#ifdef CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC
# define CONFIG_SYS_MMC_ENV_DEV 0 # define CONFIG_SYS_MMC_ENV_DEV 0
# define CONFIG_SYS_FSL_USDHC_NUM 2
# define CONFIG_SYS_FSL_ESDHC_ADDR 0
#endif #endif
/* Ethernet */ /* Ethernet */
@ -137,8 +135,11 @@
/* SPL */ /* SPL */
#ifdef CONFIG_SPL #ifdef CONFIG_SPL
# define CONFIG_SPL_MMC_SUPPORT # define CONFIG_SPL_MMC_SUPPORT
# include "imx6_spl.h" # include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD # 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_GPIO
# undef CONFIG_DM_MMC # undef CONFIG_DM_MMC
# endif # endif

View file

@ -136,8 +136,6 @@
/* MMC */ /* MMC */
#ifdef CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC
# define CONFIG_SYS_MMC_ENV_DEV 0 # define CONFIG_SYS_MMC_ENV_DEV 0
# define CONFIG_SYS_FSL_USDHC_NUM 1
# define CONFIG_SYS_FSL_ESDHC_ADDR 0
#endif #endif
/* NAND */ /* NAND */
@ -187,6 +185,8 @@
# include "imx6_spl.h" # include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD # 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_GPIO
# undef CONFIG_DM_MMC # undef CONFIG_DM_MMC
# endif # endif

View file

@ -136,8 +136,6 @@
/* MMC */ /* MMC */
#ifdef CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC
# define CONFIG_SYS_MMC_ENV_DEV 0 # define CONFIG_SYS_MMC_ENV_DEV 0
# define CONFIG_SYS_FSL_USDHC_NUM 2
# define CONFIG_SYS_FSL_ESDHC_ADDR 0
#endif #endif
/* NAND */ /* NAND */
@ -188,6 +186,8 @@
# include "imx6_spl.h" # include "imx6_spl.h"
# ifdef CONFIG_SPL_BUILD # 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_GPIO
# undef CONFIG_DM_MMC # undef CONFIG_DM_MMC
# endif # endif