diff options
| author | Jagan Teki <jagan@amarulasolutions.com> | 2017-05-12 11:48:21 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2017-05-31 08:21:38 (GMT) |
| commit | 6d931fd569c040bc6b168c270d84266ae56d4465 (patch) | |
| tree | 416c65b997f56030edc1a80f5bb0ce405be8d83b | |
| parent | 2e87c440f610ca99d5103c39b370e5b5d2481720 (diff) | |
| download | u-boot-fsl-qoriq-6d931fd569c040bc6b168c270d84266ae56d4465.tar.xz | |
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>
| -rw-r--r-- | include/configs/imx6qdl_icore.h | 4 | ||||
| -rw-r--r-- | include/configs/imx6qdl_icore_rqs.h | 5 | ||||
| -rw-r--r-- | include/configs/imx6ul_geam.h | 4 | ||||
| -rw-r--r-- | 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 741bdfa..1fc418e 100644 --- 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 f52865b..f36a6c6 100644 --- 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 2e12b97..73b4239 100644 --- 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 76ae159..d262e82 100644 --- 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 |