From 848630d9f477e55deaaadcf2278852a4ddf80f0b Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 1 Nov 2017 05:41:59 -0500 Subject: MLK-16749 imx8qm/qxp: Fix mmcpart env variable issue When booting from flexspi, the mmcpart variable is not defined because the CONFIG_SYS_MMC_IMG_LOAD_PART binds to SD/eMMC boot image only. This cause we fails to load kernel image from SD after booting from flexspi. Signed-off-by: Ye Li (cherry picked from commit f0815e8a2434b5239d386267d53b3e65d0eccd43) --- include/configs/imx8qm_arm2.h | 3 ++- include/configs/imx8qm_mek.h | 3 ++- include/configs/imx8qxp_arm2.h | 3 ++- include/configs/imx8qxp_mek.h | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h index b7e78e293e..b1e6301b74 100644 --- a/include/configs/imx8qm_arm2.h +++ b/include/configs/imx8qm_arm2.h @@ -217,10 +217,11 @@ #else #define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #endif +#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 + /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board, USDHC3 is for SD on base board * On DDR4 board, USDHC1 is mux for NAND, USDHC2 is for SD, USDHC3 is for SD on base board */ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 70c9de708e..32350fecc0 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -216,10 +216,11 @@ #else #define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #endif +#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 + #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #define CONFIG_SYS_FSL_USDHC_NUM 2 diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index ee826d6a50..4fcf4d2da8 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -216,10 +216,11 @@ #else #define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #endif +#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 + /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */ #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index d19303b779..a2e021386a 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -205,10 +205,11 @@ #else #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (64 * SZ_64K) -#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #endif +#define CONFIG_SYS_MMC_IMG_LOAD_PART 1 + /* On LPDDR4 board, USDHC1 is for eMMC, USDHC2 is for SD on CPU board */ #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ -- cgit v1.2.3