From 5801d481046708dc0efb6f663f9d5ce640726803 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Fri, 13 Mar 2020 14:56:47 -0500 Subject: [PATCH] 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 (cherry picked from commit a69e5febae6c1f98b2f2304501ca8fed085299b8) (cherry picked from commit e2ed53bd9add7effac9fe620db4a79d7aee39205) --- include/configs/imx8mm_evk.h | 2 +- include/configs/mx6sabre_common.h | 2 +- include/configs/mx6sxsabreauto.h | 2 +- include/configs/mx6ul_14x14_evk.h | 2 +- include/configs/mx6ullevk.h | 2 +- include/configs/mx7dsabresd.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index c42a58a0bb..e6c9aa26cb 100644 --- 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 0fbdf17adf..2f54d5e4ac 100644 --- 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 cbc7ead501..5cd1bfa383 100644 --- 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 fc4eabba20..1ac18a3afa 100644 --- 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 c8e2906e2e..0bc6a04056 100644 --- 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 74cfcd3f6c..496a1d5899 100644 --- 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" \ -- 2.17.1