From 6d931fd569c040bc6b168c270d84266ae56d4465 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Fri, 12 May 2017 17:18:21 +0530 Subject: [PATCH] engicam: Move SPL mmc configs under CONFIG_SPL_BUILD - CONFIG_SYS_FSL_USDHC_NUM - CONFIG_SYS_FSL_ESDHC_ADDR Signed-off-by: Jagan Teki --- 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 741bdfa807..1fc418ed0d 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 f52865b5a0..f36a6c6936 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 2e12b97767..73b42390b8 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 76ae159da3..d262e82210 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 -- 2.39.5