From c1d36ff16bc1eda3c6808b46501bae384c1544ab Mon Sep 17 00:00:00 2001 From: Han Xu Date: Thu, 1 Feb 2018 11:58:01 -0600 Subject: [PATCH] MLK-17494: imx8mq: config: fix the mscale u-boot env setting for NAND boot Fix the NAND environment settings including save environment to NAND, correct offset and console settings. Signed-off-by: Han Xu Reviewed-by: Ye Li --- include/configs/imx8mq_arm2.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/configs/imx8mq_arm2.h b/include/configs/imx8mq_arm2.h index e8718d8adf..b9613080d9 100644 --- a/include/configs/imx8mq_arm2.h +++ b/include/configs/imx8mq_arm2.h @@ -144,7 +144,7 @@ "fdt_addr=0x43000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200\0" \ - "bootargs=console=${console} ubi.mtd=5 " \ + "bootargs=console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 ubi.mtd=5 " \ "root=ubi0:rootfs rootfstype=ubifs " \ MFG_NAND_PARTITION \ "\0" \ @@ -232,10 +232,17 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +#define CONFIG_ENV_SIZE 0x1000 +#ifdef CONFIG_NAND_BOOT +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET (60 << 20) +#else #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_OFFSET (64 * SZ_64K) -#define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_IS_IN_MMC +#endif + #define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ #define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ -- 2.17.1