From 225fa189faa518a334729d01176bc966e0259b8d Mon Sep 17 00:00:00 2001 From: Han Xu Date: Fri, 7 Sep 2018 16:41:21 -0500 Subject: MLK-19524: configs: add fastboot support for nand u-boot add fastboot support for nand u-boot. 1. Add fastboot related configs 2. enlarge the SPL size for i.MX8MQ DDR4 NAND config 3. include the imx_env for boot command settings Signed-off-by: Han Xu --- include/configs/imx8qxp_arm2.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'include/configs/imx8qxp_arm2.h') diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index 5fda6e8baf..33308cf061 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -10,6 +10,8 @@ #include #include +#include "imx_env.h" + #define CONFIG_REMAKE_ELF #define CONFIG_BOARD_EARLY_INIT_F @@ -102,33 +104,28 @@ "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ #ifdef CONFIG_NAND_BOOT -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:128m(boot),32m(kernel),16m(dtb),8m(misc),-(rootfs) " +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:128m(nandboot),32m(nandkernel),16m(nanddtb),8m(nandtee),-(nandrootfs) " #else #define MFG_NAND_PARTITION "" #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 \ + "clk_ignore_unused "\ + "\0" \ "initrd_addr=0x83100000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then "\ - "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ - "else fastboot 1; fi\0" \ + "mtdparts=" MFG_NAND_PARTITION \ + "\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"\ + "root=ubi0:nandrootfs rootfstype=ubifs " \ + MFG_NAND_PARTITION \ + "\0"\ "console=ttyLP0,115200 earlycon=lpuart32,0x5a060000,115200\0" \ "fdt_addr=0x83000000\0" #else -- cgit v1.2.3