From 221caa43e79204dba34be7d42b8c7fed104e2e64 Mon Sep 17 00:00:00 2001 From: Shenwei Wang Date: Mon, 1 Oct 2018 08:50:49 -0500 Subject: MLK-19767-1: imx7ulp: configs: Enable DEFAULT_FDT_FILE Specify the default dtb file for kernel boot per i.MX7ULP board config. Signed-off-by: Shenwei Wang Reviewed-by: Frank Li Reviewed-by: Ye Li --- configs/mx7ulp_evk_defconfig | 1 + configs/mx7ulp_evk_emmc_defconfig | 1 + configs/mx7ulp_evk_m4boot_defconfig | 1 + include/configs/mx7ulp_evk.h | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index 07b9c7bf1f..dcc2d7dc51 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" +CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/mx7ulp_evk_emmc_defconfig b/configs/mx7ulp_evk_emmc_defconfig index 3922984bed..5288405700 100644 --- a/configs/mx7ulp_evk_emmc_defconfig +++ b/configs/mx7ulp_evk_emmc_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-emmc" +CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk-emmc" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/configs/mx7ulp_evk_m4boot_defconfig b/configs/mx7ulp_evk_m4boot_defconfig index 330210e1cf..4ef9b55b26 100644 --- a/configs/mx7ulp_evk_m4boot_defconfig +++ b/configs/mx7ulp_evk_m4boot_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" +CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index bbb7cb287d..fd5c6716f7 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -105,7 +105,7 @@ "console=ttyLP0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx7ulp-evk.dtb\0" \ + "fdt_file=" CONFIG_DEFAULT_FDT_FILE ".dtb\0" \ "fdt_addr=0x63000000\0" \ "tee_addr=0x64000000\0" \ "tee_file=uTee-7ulp\0" \ -- cgit v1.2.3