diff options
author | Shenwei Wang <shenwei.wang@nxp.com> | 2018-09-28 15:37:32 -0500 |
---|---|---|
committer | Shenwei Wang <shenwei.wang@nxp.com> | 2018-09-28 16:13:13 -0500 |
commit | 26766be89286cad4946655b3004ab0fc4ef63a65 (patch) | |
tree | e19cfb6ef44ee683c7688184fd1ec5502f78c104 /include | |
parent | 2e8a6b6ec6fec342c1076668e11a28676e8c27eb (diff) |
MLK-19767: imx7ulp: configs: add a new macro for kernel dtb
The current u-boot configures the fdt_file environment variable
to the file name of that built together with u-boot. Sometimes
Linux kernel needs another dtb file other than the one built with
u-boot. For example, imx7ulp needs to build imx7ulp-evk-qspi.dts for
u-boot, but the kernel needs imx7ulp-evk.dts. Adding this new
macro to let the user have an option to specify a dtb file to run
Linux kernel.
Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/mx7ulp_evk.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index bbb7cb287d6..449fb3512a0 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -90,6 +90,13 @@ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_SIZE >> 1)) + +#ifdef CONFIG_KERNEL_USE_STD_DTB +#define LD_FDT_FILE CONFIG_KERNEL_USE_STD_DTB +#else +#define LD_FDT_FILE CONFIG_DEFAULT_DEVICE_TREE +#endif + #define CONFIG_MFG_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x63800000\0" \ @@ -105,7 +112,7 @@ "console=ttyLP0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx7ulp-evk.dtb\0" \ + "fdt_file=" LD_FDT_FILE ".dtb\0" \ "fdt_addr=0x63000000\0" \ "tee_addr=0x64000000\0" \ "tee_file=uTee-7ulp\0" \ |