MLK-20414 imx8m: jailhouse: loadimage before mmcboot

Need loadimage before execute mmcboot.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
This commit is contained in:
Peng Fan 2018-11-20 10:04:16 +08:00
parent 21d4e35d94
commit 016bb84267
2 changed files with 12 additions and 4 deletions

View File

@ -117,8 +117,12 @@
*/
#define JAILHOUSE_ENV \
"jh_clk= \0 " \
"jh_mmcboot=setenv fdt_file fsl-imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run mmcboot\0 " \
"jh_netboot=setenv fdt_file fsl-imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot\0 "
"jh_mmcboot=setenv fdt_file fsl-imx8mm-evk-root.dtb;" \
"setenv jh_clk clk_ignore_unused; " \
"if run loadimage; then " \
"run mmcboot; " \
"else run jh_netboot; fi; \0" \
"jh_netboot=setenv fdt_file fsl-imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
#ifdef CONFIG_NAND_BOOT
#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandfit),32m(nandkernel),16m(nanddtb),8m(nandtee),-(nandrootfs) "

View File

@ -107,8 +107,12 @@
*/
#define JAILHOUSE_ENV \
"jh_clk= \0 " \
"jh_mmcboot=setenv fdt_file fsl-imx8mq-evk-root.dtb; setenv jh_clk clk_ignore_unused; run mmcboot\0 " \
"jh_netboot=setenv fdt_file fsl-imx8mq-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot\0 "
"jh_mmcboot=setenv fdt_file fsl-imx8mq-evk-root.dtb; " \
"setenv jh_clk clk_ignore_unused; " \
"if run loadimage; then " \
"run mmcboot; " \
"else run jh_netboot; fi; \0" \
"jh_netboot=setenv fdt_file fsl-imx8mq-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
#define CONFIG_MFG_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS_DEFAULT \