Commit b495fb88 authored by Ye Li's avatar Ye Li

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: 's avatarYe Li <ye.li@nxp.com>
parent 240475ec
......@@ -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 */
......
......@@ -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" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment