diff options
| author | Han Xu <han.xu@nxp.com> | 2020-03-13 14:56:47 -0500 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2020-04-26 23:36:43 -0700 |
| commit | edb23478dab03acf1f40b1e4c75304cde72a066a (patch) | |
| tree | 73ad7bfdc1b315746b3e93180597a07d65ada452 | |
| parent | decbde4eb67c2c8d7077f6406e6001215d2b69d6 (diff) | |
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)
| -rw-r--r-- | include/configs/imx8mm_evk.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6ul_14x14_evk.h | 2 | ||||
| -rw-r--r-- | include/configs/mx6ullevk.h | 2 | ||||
| -rw-r--r-- | 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 051c354da3..944b1ffe43 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -101,7 +101,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 812a992fd8..1fe446fbe6 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -95,7 +95,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 5e1b7d5e02..f8caa870c7 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -74,7 +74,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 334009ac64..d4b651710e 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 ac1bb7db8d..fef70695d5 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 78f1ed85d3..68ae7ad1a2 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" \ |