diff options
| author | Ye Li <ye.li@nxp.com> | 2018-10-08 19:34:37 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-10-10 02:00:30 -0700 |
| commit | 1c2c7b61a3c2838051f2fdd54914e837f4ed874e (patch) | |
| tree | d14e2c3f11d60e599cfb82bf5aa0103f5248e50d | |
| parent | bf3b7492ab1e9f9d901d783ef361845bd41199ec (diff) | |
MLK-19783-1 mx6sx_ard/sdb: Fix wrong mmcdev value in qspi build image
We are using CONFIG_SYS_MMC_ENV_DEV for default value of mmcdev env.
But this config is bound with CONFIG_ENV_IS_IN_MMC, so it is not valid
for qspi build image.
Fix the issue by decoupling two configs.
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 52b48188ec1cc4e352beb034991657df8ce78129)
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresd.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index eaae42a455..9b1f93ca2a 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -275,10 +275,8 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */ -#if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 0 /*USDHC3*/ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ -#endif #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_ENV_OFFSET (14 * SZ_64K) diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index ea4e55c5a6..c08e01a99e 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -301,10 +301,8 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_MMCROOT "/dev/mmcblk3p2" /* USDHC4 */ -#if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 2 /*USDHC4*/ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ -#endif #if defined(CONFIG_ANDROID_SUPPORT) #include "mx6sxsabresdandroid.h" |