diff options
| author | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-07-11 10:20:59 +0200 |
|---|---|---|
| committer | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-07-11 10:20:59 +0200 |
| commit | 7746fb2aaace7a1f93de47d206b1c7b5e7204e57 (patch) | |
| tree | e924250b15f5300610a2b160a60932e296740844 /include | |
| parent | 7b4f7a7e6a804c832bd914da876bbb40276f7d7a (diff) | |
| parent | 690b4c0593e24665b95fb5b03bc63ddf0b9bdfaa (diff) | |
Merge remote-tracking branch 'origin/imx_v2022.04' into lf_v2022.04
* origin/imx_v2022.04:
LF-6555 imx8m[m/n/p/q]_evk: add bootargs to support mcore
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/imx8mm_evk.h | 5 | ||||
| -rw-r--r-- | include/configs/imx8mn_evk.h | 5 | ||||
| -rw-r--r-- | include/configs/imx8mp_evk.h | 5 | ||||
| -rw-r--r-- | include/configs/imx8mq_evk.h | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 257ac79a1e6..3d992ffa134 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -123,6 +123,7 @@ CONFIG_MFG_ENV_SETTINGS \ BOOTENV \ JAILHOUSE_ENV \ + "prepare_mcore=setenv mcore_clk clk-imx8mm.mcore_booted;\0" \ "scriptaddr=0x43500000\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bsp_script=boot.scr\0" \ @@ -139,7 +140,7 @@ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \ + "mmcargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bsp_script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ @@ -156,7 +157,7 @@ "echo WARN: Cannot load the DT; " \ "fi; " \ "fi;\0" \ - "netargs=setenv bootargs ${jh_clk} console=${console} " \ + "netargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 41e272a09ea..1bdf68ab83a 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -102,6 +102,7 @@ CONFIG_MFG_ENV_SETTINGS \ JAILHOUSE_ENV \ BOOTENV \ + "prepare_mcore=setenv mcore_clk clk-imx8mn.mcore_booted;\0" \ "scriptaddr=0x43500000\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bsp_script=boot.scr\0" \ @@ -118,7 +119,7 @@ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \ + "mmcargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bsp_script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ @@ -135,7 +136,7 @@ "echo WARN: Cannot load the DT; " \ "fi; " \ "fi;\0" \ - "netargs=setenv bootargs ${jh_clk} console=${console} " \ + "netargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index af499376bb0..a26c651dcf5 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -117,6 +117,7 @@ CONFIG_MFG_ENV_SETTINGS \ JAILHOUSE_ENV \ BOOTENV \ + "prepare_mcore=setenv mcore_clk clk-imx8mp.mcore_booted;\0" \ "scriptaddr=0x43500000\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bsp_script=boot.scr\0" \ @@ -134,7 +135,7 @@ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \ + "mmcargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bsp_script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ @@ -151,7 +152,7 @@ "echo WARN: Cannot load the DT; " \ "fi; " \ "fi;\0" \ - "netargs=setenv bootargs ${jh_clk} console=${console} " \ + "netargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index b43dce87516..96f72fdbe47 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -84,6 +84,7 @@ CONFIG_MFG_ENV_SETTINGS \ BOOTENV \ JAILHOUSE_ENV \ + "prepare_mcore=setenv mcore_clk clk-imx8mq.mcore_booted;\0" \ "scriptaddr=0x43500000\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "bsp_script=boot.scr\0" \ @@ -100,7 +101,7 @@ "mmcpart=1\0" \ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ "mmcautodetect=yes\0" \ - "mmcargs=setenv bootargs ${jh_clk} console=${console} root=${mmcroot}\0 " \ + "mmcargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} root=${mmcroot}\0 " \ "loadbootscript=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bsp_script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source\0" \ @@ -117,7 +118,7 @@ "else " \ "echo wait for boot; " \ "fi;\0" \ - "netargs=setenv bootargs ${jh_clk} console=${console} " \ + "netargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} " \ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ |