From 6052c4d6059f7f545f2f6d73bf77dd4fc5687130 Mon Sep 17 00:00:00 2001 From: Shenwei Wang Date: Mon, 1 Oct 2018 08:50:49 -0500 Subject: [PATCH] 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 (cherry picked from commit 3fba1c1a76cadfe0177e61a85eac3da10ee086e0) (cherry picked from commit 013eb1fdfdb33df19a0917fd554160a84ec45dd1) --- configs/mx7ulp_evk_defconfig | 1 + configs/mx7ulp_evk_emmc_defconfig | 1 + configs/mx7ulp_evk_m4boot_defconfig | 1 + configs/mx7ulp_evk_plugin_defconfig | 1 + include/configs/mx7ulp_evk.h | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index b053612314..6908c733b0 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_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOUNCE_BUFFER=y CONFIG_BOARD_LATE_INIT=y diff --git a/configs/mx7ulp_evk_emmc_defconfig b/configs/mx7ulp_evk_emmc_defconfig index 67e0789de8..348d34c3e9 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_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk-emmc" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOUNCE_BUFFER=y CONFIG_BOARD_LATE_INIT=y diff --git a/configs/mx7ulp_evk_m4boot_defconfig b/configs/mx7ulp_evk_m4boot_defconfig index a11f833191..24e34e1627 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_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOUNCE_BUFFER=y CONFIG_BOARD_LATE_INIT=y diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index b4da176355..9a60b5792e 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_TARGET_MX7ULP_EVK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_USE_IMXIMG_PLUGIN=y +CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk" CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOUNCE_BUFFER=y CONFIG_BOARD_LATE_INIT=y diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 6fac043849..dc24744c25 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -88,7 +88,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" \ "boot_fdt=try\0" \ "earlycon=lpuart32,0x402D0010\0" \ -- 2.17.1