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 <ye.li@nxp.com>

diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h
index b7e78e2..b1e6301 100644 (file)
--- 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 70c9de7..32350fe 100644 (file)
--- 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 ee826d6..4fcf4d2 100644 (file)
--- 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 d19303b..a2e0213 100644 (file)
--- 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 */