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)

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 7e65163..ad84fd6 100644 (file)
--- 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 "
 
 /* Initial environment variables */
 #if defined(CONFIG_NAND_BOOT)

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index 30cc2c6..d457a39 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -101,8 +101,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 \
        "mfgtool_args=setenv bootargs console=${console},${baudrate} " \