MLK-23588: configs: change nand boot partition from mtd index to partition name

The previous NAND boot looking the rootfs by the mtd index, which is
easy get impacted by other mtd devices, such as SPI NOR. Changed it to
the unique nand rootfs partition name can avoid this issue.

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

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index c42a58a..e6c9aa2 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -112,7 +112,7 @@
        "fdt_high=0xffffffffffffffff\0" \
        "mtdparts=" MFG_NAND_PARTITION "\0" \
        "console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \
-       "bootargs=console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200 ubi.mtd=5 "  \
+       "bootargs=console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200 ubi.mtd=nandrootfs "  \
                "root=ubi0:nandrootfs rootfstype=ubifs "                     \
                MFG_NAND_PARTITION \
                "\0" \

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 0fbdf17..2f54d5e 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -92,7 +92,7 @@
        "tee_addr=0x20000000\0" \
        "fdt_high=0xffffffff\0"   \
        "console=" CONSOLE_DEV "\0" \
-       "bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=6 "  \
+       "bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=nandrootfs "  \
                "root=ubi0:nandrootfs rootfstype=ubifs "                     \
                MFG_NAND_PARTITION \
                "\0" \

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index cbc7ead..5cd1bfa 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -73,7 +73,7 @@
        "fdt_addr=0x83000000\0" \
        "fdt_high=0xffffffff\0"   \
        "console=ttymxc0\0" \
-       "bootargs=console=ttymxc0,115200 ubi.mtd=6 "  \
+       "bootargs=console=ttymxc0,115200 ubi.mtd=nandrootfs "  \
                "root=ubi0:nandrootfs rootfstype=ubifs "                     \
                MFG_NAND_PARTITION \
                "\0" \

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index fc4eabb..1ac18a3 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -91,7 +91,7 @@
        "fdt_high=0xffffffff\0"   \
        "tee_addr=0x84000000\0" \
        "console=ttymxc0\0" \
-       "bootargs=console=ttymxc0,115200 ubi.mtd=4 "  \
+       "bootargs=console=ttymxc0,115200 ubi.mtd=nandrootfs "  \
                "root=ubi0:rootfs rootfstype=ubifs "                 \
                BOOTARGS_CMA_SIZE \
                MFG_NAND_PARTITION \

diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index c8e2906..0bc6a04 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -85,7 +85,7 @@
        "fdt_high=0xffffffff\0"   \
        "tee_addr=0x84000000\0" \
        "console=ttymxc0\0" \
-       "bootargs=console=ttymxc0,115200 ubi.mtd=4 "  \
+       "bootargs=console=ttymxc0,115200 ubi.mtd=nandrootfs "  \
                "root=ubi0:rootfs rootfstype=ubifs "                 \
                BOOTARGS_CMA_SIZE \
                MFG_NAND_PARTITION \

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index 74cfcd3..496a1d5 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -92,7 +92,7 @@
        "tee_addr=0x84000000\0" \
        "fdt_high=0xffffffff\0"   \
        "console=ttymxc0\0" \
-       "bootargs=console=ttymxc0,115200 ubi.mtd=4 "  \
+       "bootargs=console=ttymxc0,115200 ubi.mtd=nandrootfs "  \
                "root=ubi0:nandrootfs rootfstype=ubifs "                     \
                MFG_NAND_PARTITION \
                "\0" \