diff options
| author | Ye Li <ye.li@nxp.com> | 2018-09-16 23:58:06 -0700 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2018-09-17 18:49:16 -0700 |
| commit | ab8d565f8a57474773d1a86dfa9690dc72d0104d (patch) | |
| tree | 900ff845f38603c9302cbc2d04613ee842cb2b8b | |
| parent | 818e636a2b4f73006f1a9546193dac865fee7041 (diff) | |
MLK-19602 imx8mq_arm2: Fix environments issue for burning NAND in uuu
When running uuu to burning NAND on imx8mq DDR4 ARM2, meet two u-boot environments problems.
1. fastboot won't be run in regular u-boot, due the bootcmd_mfg is not correct.
2. mtdparts in bootargs are not updated to align with uuu.
Signed-off-by: Ye Li <ye.li@nxp.com>
| -rw-r--r-- | include/configs/imx8mq_arm2.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/include/configs/imx8mq_arm2.h b/include/configs/imx8mq_arm2.h index bf587dc5bb..478ab7276f 100644 --- a/include/configs/imx8mq_arm2.h +++ b/include/configs/imx8mq_arm2.h @@ -67,7 +67,6 @@ #define CONFIG_SPL_NAND_MXS #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x4000000 /* Put the FIT out of first 64MB boot area */ #endif -#define CONFIG_SPL_DMA_SUPPORT #endif /* CONFIG_SPL_BUILD*/ @@ -117,23 +116,15 @@ #endif #ifdef CONFIG_NAND_BOOT -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(fit),32m(kernel),16m(dtb),8m(misc),-(rootfs) " -#else -#define MFG_NAND_PARTITION "" +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandfit),32m(nandkernel),16m(nanddtb),8m(nandtee),-(nandrootfs) " #endif #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ - MFG_NAND_PARTITION \ - "clk_ignore_unused "\ - "\0" \ + CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ + "emmc_dev=0\0"\ + "sd_dev=1\0" \ /* Initial environment variables */ #if defined(CONFIG_NAND_BOOT) @@ -141,6 +132,7 @@ CONFIG_MFG_ENV_SETTINGS \ "fdt_addr=0x43000000\0" \ "fdt_high=0xffffffffffffffff\0" \ + "mtdparts=" MFG_NAND_PARTITION "\0" \ "console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200\0" \ "bootargs=console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 ubi.mtd=5 " \ "root=ubi0:rootfs rootfstype=ubifs " \ |