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)
(cherry picked from commit b3b1b44f6eea2d811f6bbb2d398997513c43775a)
(cherry picked from commit 8272cbb15eec2401b7292afc07f2952574ff8467)

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index a1b3ea9..7893591 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -84,8 +84,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 fdtfile 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 fdtfile imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
 
 /* Initial environment variables */
 #if defined(CONFIG_NAND_BOOT)

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 5eb5c52..cc7b192 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -74,8 +74,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 fdtfile 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 fdtfile imx8mq-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
 
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS              \