diff options
| author | Ye Li <ye.li@nxp.com> | 2018-07-25 12:55:17 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-07-26 06:08:18 -0700 |
| commit | b495fb882339191593019074cf8b421c84469f31 (patch) | |
| tree | bc4ca67e1fead778e69911c6a0e0d1df2af2733a | |
| parent | 240475ecb29aff22fb362ea39f3bf8e7045281db (diff) | |
MLK-19049 mx6qsabreauto: Fix kernel NAND boot issue in bootargs
When enabling NAND boot, the ubi.mtd should be set to 6 because the
one mtdpart is added for tee.
Also the MFG_NAND_PARTITION is duplicated in mx6qsabreauto.h and
mx6sabre_common.h. We can remove it from mx6qsabreauto.h, since only
the sabreauto board have NAND.
Signed-off-by: Ye Li <ye.li@nxp.com>
| -rw-r--r-- | include/configs/mx6qsabreauto.h | 7 | ||||
| -rw-r--r-- | include/configs/mx6sabre_common.h | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 0ead8ada06..e726eb67bf 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -22,13 +22,6 @@ #include "mx6sabre_common.h" -#undef MFG_NAND_PARTITION -#ifdef CONFIG_NAND_BOOT -#define MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) " -#else -#define MFG_NAND_PARTITION "" -#endif - #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 2457049834..56f987f2e3 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -46,7 +46,7 @@ #define CONFIG_CMD_BMODE #ifdef CONFIG_NAND_BOOT -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " +#define MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) " #else #define MFG_NAND_PARTITION "" #endif @@ -106,7 +106,7 @@ TEE_ENV \ "fdt_addr=0x18000000\0" \ "fdt_high=0xffffffff\0" \ - "bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=5 " \ + "bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=6 " \ "root=ubi0:rootfs rootfstype=ubifs " \ MFG_NAND_PARTITION \ "\0" \ |