diff options
| author | Peng Fan <peng.fan@nxp.com> | 2018-11-20 10:04:16 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2018-11-23 10:31:37 +0800 |
| commit | 691dafdca642f8693d67d452df3555fe6748008c (patch) | |
| tree | 06f03aa02dd45968eb2a7c9c8dcd8c40f353dee1 /include | |
| parent | 9a5c5cb1251249b5d34ec600948794303f8490f0 (diff) | |
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>
(cherry picked from commit 016bb84267ff3882228ffbde64c2c670be7a8f16)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/imx8mm_evk.h | 8 | ||||
| -rw-r--r-- | include/configs/imx8mq_evk.h | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 04342887d26..10e1a465dd8 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -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) " diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index b59aec5b37c..6cff7fea2b1 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -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 \ |