diff options
| author | Peng Fan <peng.fan@nxp.com> | 2018-07-23 15:29:07 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2018-07-23 15:36:32 +0800 |
| commit | 8a575a160b8e4f8cfdd79177a8f9551106395cf9 (patch) | |
| tree | 0ffebece8fedd30a076bdbcc0e077fe3b1852931 | |
| parent | f3309b27f48e896c2d84f9d1b7cd8df87aef276f (diff) | |
MLK-19011-1 configs: imx8qxp_mek: add jailhouse boot env
Add jailhouse boot env. Use `run jh_netboot` or `jh_mmcboot`
to boot Linux.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | include/configs/imx8qxp_mek.h | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index d72b09aae2..a5da415607 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -119,6 +119,16 @@ "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ "else fastboot 1; fi\0" \ +#define JAILHOUSE_ENV \ + "jh_mmcboot=" \ + "setenv fdt_file fsl-imx8qxp-mek-root.dtb;"\ + "setenv boot_os 'scu_rm dtb ${fdt_addr}; booti ${loadaddr} - ${fdt_addr};'; " \ + "run mmcboot; \0" \ + "jh_netboot=" \ + "setenv fdt_file fsl-imx8qxp-mek-root.dtb;"\ + "setenv boot_os 'scu_rm dtb ${fdt_addr}; booti ${loadaddr} - ${fdt_addr};'; " \ + "run netboot; \0" + #define XEN_BOOT_ENV \ "xenhyper_bootargs=console=dtuart dtuart=/serial@5a060000 dom0_mem=1024M dom0_max_vcpus=2 dom0_vcpus_pin=true\0" \ "xenlinux_bootargs= \0" \ @@ -153,6 +163,7 @@ CONFIG_MFG_ENV_SETTINGS \ M4_BOOT_ENV \ XEN_BOOT_ENV \ + JAILHOUSE_ENV\ AHAB_ENV \ "script=boot.scr\0" \ "image=Image\0" \ @@ -179,18 +190,19 @@ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "loadcntr=fatload mmc ${mmcdev}:${mmcpart} ${cntr_addr} ${cntr_file}\0" \ "auth_os=auth_cntr ${cntr_addr}\0" \ + "boot_os=booti ${loadaddr} - ${fdt_addr};\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "if test ${sec_boot} = yes; then " \ "if run auth_os; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ + "run boot_os; " \ "else " \ "echo ERR: failed to authenticate; " \ "fi; " \ "else " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ + "run boot_os; " \ "else " \ "echo WARN: Cannot load the DT; " \ "fi; " \ @@ -212,7 +224,7 @@ "if test ${sec_boot} = yes; then " \ "${get_cmd} ${cntr_addr} ${cntr_file}; " \ "if run auth_os; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ + "run boot_os; " \ "else " \ "echo ERR: failed to authenticate; " \ "fi; " \ @@ -220,7 +232,7 @@ "${get_cmd} ${loadaddr} ${image}; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "booti ${loadaddr} - ${fdt_addr}; " \ + "run boot_os; " \ "else " \ "echo WARN: Cannot load the DT; " \ "fi; " \ |