diff options
author | Peng Fan <peng.fan@nxp.com> | 2018-08-06 17:47:22 +0800 |
---|---|---|
committer | Ye Li <ye.li@nxp.com> | 2020-04-26 23:24:05 -0700 |
commit | 5ab66e0944bbbeb7b36bf0874844870e440321f3 (patch) | |
tree | 9b4ed7fea1eb56b418696d6c5dc8e378545e5da3 /include/configs/imx8mm_evk.h | |
parent | 8aa9c7bb36f17bda72b7347c7823b04a6b16a0b8 (diff) |
MLK-19131 configs: imx8mm_evk: add jailhouse boot command
Add jailhouse env. Currently need to pass clk_ignore_unused to bootargs
to avoid linux root cell shutdown clocks used by inmates.
If only want a minimal clk being on in inmates, the clks could
be added in clk_inits_on in linux kernel drivers/clk/imx/clk-imx8mm.c
or use init-on-array under clk node.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 7732b3b87423069c1c31d25ec07201098062b717)
(cherry picked from commit 718b0792dfedcf68b6c2e93d3eefe499ec463433)
(cherry picked from commit d18597669c701aebbf0a29c22f68a2347ea4eaf2)
Diffstat (limited to 'include/configs/imx8mm_evk.h')
-rw-r--r-- | include/configs/imx8mm_evk.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index bb0d8fb71d0..84385cdddbc 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -67,6 +67,15 @@ #define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandfit),32m(nandkernel),16m(nanddtb),8m(nandtee),-(nandrootfs) " #endif +/* + * Another approach is add the clocks for inmates into clks_init_on + * in clk-imx8mm.c, then clk_ingore_unused could be removed. + */ +#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 " + /* Initial environment variables */ #if defined(CONFIG_NAND_BOOT) #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -84,6 +93,7 @@ #else #define CONFIG_EXTRA_ENV_SETTINGS \ + JAILHOUSE_ENV \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc1,115200\0" \ @@ -97,7 +107,7 @@ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs console=${console} root=${mmcroot}\0 " \ + "mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ @@ -114,7 +124,7 @@ "echo WARN: Cannot load the DT; " \ "fi; " \ "fi;\0" \ - "netargs=setenv bootargs console=${console} " \ + "netargs=setenv bootargs ${jh_clk} console=${console} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ |