diff options
| author | Peng Fan <peng.fan@nxp.com> | 2018-07-06 14:07:02 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2018-07-09 21:07:52 +0800 |
| commit | 0d33db00e96e7addb6910a7097a62222ff75480f (patch) | |
| tree | 083fa34d925bc2994fd2fd6a002fd0470aface2c | |
| parent | c990e96a89a4d8dfe7fb5d2dee296d16d3b6aa71 (diff) | |
MLK-18793 imx8mq: config: add jailhouse env
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-imx8mq.c
Signed-off-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | include/configs/imx8mq_evk.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index d1617134dc..4c4a488ed6 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -1,5 +1,5 @@ /* - * Copyright 2017 NXP + * Copyright 2017-2018 NXP * * SPDX-License-Identifier: GPL-2.0+ */ @@ -100,6 +100,15 @@ #define CONFIG_PHY_ATHEROS #endif +/* + * Another approach is add the clocks for inmates into clks_init_on + * in clk-imx8mq.c, then clk_ingore_unused could be removed. + */ +#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 " + #define CONFIG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ @@ -114,6 +123,7 @@ /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ + JAILHOUSE_ENV \ "script=boot.scr\0" \ "image=Image\0" \ "console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200\0" \ @@ -127,7 +137,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" \ @@ -144,7 +154,7 @@ "else " \ "echo wait for boot; " \ "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 ...; " \ |