Eric Lee / smarc-uboot

14
Download as
Browse Code ยป

Commit 718b0792dfedcf68b6c2e93d3eefe499ec463433

Authored by Peng Fan
1 parent 44d97952c6
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

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)

Showing 1 changed file with 12 additions and 2 deletions Side-by-side Diff

include/configs/imx8mm_evk.h
Diff comments   View file @ 718b079
... ... @@ -101,6 +101,15 @@
101 101 #define CONFIG_PHY_ATHEROS
102 102 #endif
103 103  
  104 +/*
  105 + * Another approach is add the clocks for inmates into clks_init_on
  106 + * in clk-imx8mm.c, then clk_ingore_unused could be removed.
  107 + */
  108 +#define JAILHOUSE_ENV \
  109 + "jh_clk= \0 " \
  110 + "jh_mmcboot=setenv fdt_file fsl-imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run mmcboot\0 " \
  111 + "jh_netboot=setenv fdt_file fsl-imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot\0 "
  112 +
104 113 #define CONFIG_MFG_ENV_SETTINGS \
105 114 CONFIG_MFG_ENV_SETTINGS_DEFAULT \
106 115 "initrd_addr=0x43800000\0" \
... ... @@ -111,6 +120,7 @@
111 120 /* Initial environment variables */
112 121 #define CONFIG_EXTRA_ENV_SETTINGS \
113 122 CONFIG_MFG_ENV_SETTINGS \
  123 + JAILHOUSE_ENV \
114 124 "script=boot.scr\0" \
115 125 "image=Image\0" \
116 126 "console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \
... ... @@ -124,7 +134,7 @@
124 134 "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
125 135 "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
126 136 "mmcautodetect=yes\0" \
127   - "mmcargs=setenv bootargs console=${console} root=${mmcroot}console=${console} root=${mmcroot}\0 " \ " \
  137 + "mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}console=${console} root=${mmcroot}\0 " \ " \
128 138 "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
129 139 "bootscript=echo Running bootscript from mmc ...; " \
130 140 "source\0" \
... ... @@ -141,7 +151,7 @@
141 151 "else " \
142 152 "echo wait for boot; " \
143 153 "fi;\0" \
144   - "netargs=setenv bootargs console=${console} " \
  154 + "netargs=setenv bootargs ${jh_clk} console=${console} " \
145 155 "root=/dev/nfs " \
146 156 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
147 157 "netboot=echo Booting from net ...; " \