From eca17051a58e16003622c6103341420bad4754d8 Mon Sep 17 00:00:00 2001 From: Han Xu Date: Thu, 16 Nov 2017 16:57:29 -0600 Subject: MLK-16882: imx8qxp: config: add NAND boot environment add the nand boot related environments for i.MX8QXP ARM2 board. Signed-off-by: Han Xu (cherry picked from commit 345bcc28e52eff7a8cee7fee787db9453bcd457f) --- include/configs/imx8qxp_arm2.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index 54c03cc984..2536783da0 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -114,6 +114,15 @@ "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ /* Initial environment variables */ +#ifdef CONFIG_NAND_BOOT +#define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_MFG_ENV_SETTINGS \ + "bootargs=console=ttyLP0,115200 ubi.mtd=5 " \ + "root=ubi0:rootfs rootfstype=ubifs " \ + "mtdparts=gpmi-nand:128m(boot),32m(kernel),16m(dtb),8m(misc),-(rootfs)\0"\ + "console=ttyLP0,115200 earlycon=lpuart32,0x5a060000,115200\0" \ + "fdt_addr=0x83000000\0" +#else #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ @@ -170,6 +179,7 @@ "else " \ "booti; " \ "fi;\0" +#endif #ifdef CONFIG_NAND_BOOT #define CONFIG_BOOTCOMMAND \ -- cgit v1.2.3