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:12:45 -0700 |
| commit | 3c893f116b1119f82e99efcb9a6abdbb9f79b71d (patch) | |
| tree | f59c14cb196074e34dc9fef5f2d9bce97661a7fa /include/configs | |
| parent | 85b24c878d9f51af58ee90b14c7c88067e28bcfb (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>
(cherry picked from commit b495fb882339191593019074cf8b421c84469f31)
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 4 | ||||
| -rw-r--r-- | include/configs/mx6sabreauto.h | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index e949d262925..990a2e8437d 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -43,7 +43,7 @@ #endif #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 @@ -103,7 +103,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" \ diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 4c972e0a8a6..a95c947f10d 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -26,13 +26,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 #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ |