diff options
author | Peng Fan <peng.fan@nxp.com> | 2017-06-01 11:11:00 +0800 |
---|---|---|
committer | Jason Liu <jason.hui.liu@nxp.com> | 2017-11-03 02:36:52 +0800 |
commit | 2cb64bf1e17366c14d8189f704a38c582e6e45e9 (patch) | |
tree | 06b277fcb342115a16d19dd289b3693c59652056 | |
parent | d7bef9e046f01a840646b6e8ff426db772ea5e44 (diff) |
MLK-14996-1 configs: qm/qxp_arm2: add mfg env settings
Add MFG ENV settings.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
-rw-r--r-- | include/configs/imx8qm_arm2.h | 21 | ||||
-rw-r--r-- | include/configs/imx8qxp_arm2.h | 21 |
2 files changed, 42 insertions, 0 deletions
diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h index d70cb96f81..6a12ae0fd1 100644 --- a/include/configs/imx8qm_arm2.h +++ b/include/configs/imx8qm_arm2.h @@ -102,8 +102,29 @@ "m4boot_0=run loadm4image_0; bootaux ${loadaddr} 0\0" \ "m4boot_1=run loadm4image_1; bootaux ${loadaddr} 1\0" \ +#ifdef CONFIG_NAND_BOOT +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " +#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 \ + "video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off " \ + "clk_ignore_unused "\ + "\0" \ + "initrd_addr=0x83800000\0" \ + "initrd_high=0xffffffff\0" \ + "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ "image=Image\0" \ diff --git a/include/configs/imx8qxp_arm2.h b/include/configs/imx8qxp_arm2.h index c8b39d958c..dff895f2d1 100644 --- a/include/configs/imx8qxp_arm2.h +++ b/include/configs/imx8qxp_arm2.h @@ -90,8 +90,29 @@ "loadm4image_0=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${m4_0_image}\0" \ "m4boot_0=run loadm4image_0; bootaux ${loadaddr} 0\0" \ +#ifdef CONFIG_NAND_BOOT +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " +#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 \ + "video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off "\ + "clk_ignore_unused "\ + "\0" \ + "initrd_addr=0x83800000\0" \ + "initrd_high=0xffffffff\0" \ + "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \ + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ "script=boot.scr\0" \ "image=Image\0" \ |