Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 3c893f116b1119f82e99efcb9a6abdbb9f79b71d

Authored by Ye Li
1 parent 85b24c878d
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

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)

Showing 2 changed files with 2 additions and 9 deletions Side-by-side Diff

include/configs/mx6sabre_common.h
Diff comments   View file @ 3c893f1
... ... @@ -43,7 +43,7 @@
43 43 #endif
44 44  
45 45 #ifdef CONFIG_NAND_BOOT
46   -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) "
  46 +#define MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
47 47 #else
48 48 #define MFG_NAND_PARTITION ""
49 49 #endif
... ... @@ -103,7 +103,7 @@
103 103 TEE_ENV \
104 104 "fdt_addr=0x18000000\0" \
105 105 "fdt_high=0xffffffff\0" \
106   - "bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=5 " \
  106 + "bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=6 " \
107 107 "root=ubi0:rootfs rootfstype=ubifs " \
108 108 MFG_NAND_PARTITION \
109 109 "\0" \
include/configs/mx6sabreauto.h
Diff comments   View file @ 3c893f1
... ... @@ -26,13 +26,6 @@
26 26  
27 27 #include "mx6sabre_common.h"
28 28  
29   -#undef MFG_NAND_PARTITION
30   -#ifdef CONFIG_NAND_BOOT
31   -#define MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
32   -#else
33   -#define MFG_NAND_PARTITION ""
34   -#endif
35   -
36 29 #define CONFIG_SYS_FSL_USDHC_NUM 2
37 30 #if defined(CONFIG_ENV_IS_IN_MMC)
38 31 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */