MLK-22697: configs: fix the imx6ul/ull mtdparts settings

imx6ul/ull were not set the mtdparts properly which causes the uuu cannot recognized the correct mtd partition.

Signed-off-by: Han Xu <han.xu@nxp.com>
(cherry picked from commit e7bbaadd03df7acbd84e5fbdbce037a369b82d68)

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 3efac02..100ff30 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -62,7 +62,7 @@
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #ifdef CONFIG_NAND_BOOT
-#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
+#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs)"
 #else
 #define MFG_NAND_PARTITION ""
 #endif
@@ -78,6 +78,8 @@
        "emmc_dev=1\0"\
        "emmc_ack=1\0"\
        "sd_dev=1\0" \
+       "mtdparts=" MFG_NAND_PARTITION \
+       "\0"\
 
 #if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index ac98c03..639d45e 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -62,7 +62,7 @@
 #define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 #ifdef CONFIG_NAND_BOOT
-#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
+#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs)"
 #else
 #define MFG_NAND_PARTITION ""
 #endif
@@ -78,6 +78,8 @@
        "emmc_dev=1\0"\
        "emmc_ack=1\0"\
        "sd_dev=1\0" \
+       "mtdparts=" MFG_NAND_PARTITION \
+       "\0"\
 
 #if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \