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 <shenwei.wang@nxp.com>
Reviewed-by: Frank Li <Frank.li@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 3fba1c1a76cadfe0177e61a85eac3da10ee086e0)
(cherry picked from commit 013eb1fdfdb33df19a0917fd554160a84ec45dd1)
(cherry picked from commit 6052c4d6059f7f545f2f6d73bf77dd4fc5687130)
(cherry picked from commit 25bc40364344a414282c16052d044f7000c94aa8)
(cherry picked from commit 734368dc183a9d8e3b9fb46d30dac5efe4639556)

diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig
index 544564b..5c76c64 100644 (file)
--- a/configs/mx7ulp_evk_defconfig
+++ b/configs/mx7ulp_evk_defconfig
@@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y
 CONFIG_TARGET_MX7ULP_EVK=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi"
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/configs/mx7ulp_evk_emmc_defconfig b/configs/mx7ulp_evk_emmc_defconfig
index 4d0e136..b3662cc 100644 (file)
--- a/configs/mx7ulp_evk_emmc_defconfig
+++ b/configs/mx7ulp_evk_emmc_defconfig
@@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y
 CONFIG_TARGET_MX7ULP_EVK=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-emmc"
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk-emmc"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/configs/mx7ulp_evk_m4boot_defconfig b/configs/mx7ulp_evk_m4boot_defconfig
index 52634fb..4e894d2 100644 (file)
--- a/configs/mx7ulp_evk_m4boot_defconfig
+++ b/configs/mx7ulp_evk_m4boot_defconfig
@@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y
 CONFIG_TARGET_MX7ULP_EVK=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi"
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig
index 8c6d9dc..b24789d 100644 (file)
--- a/configs/mx7ulp_evk_plugin_defconfig
+++ b/configs/mx7ulp_evk_plugin_defconfig
@@ -10,6 +10,7 @@ CONFIG_DM_GPIO=y
 CONFIG_TARGET_MX7ULP_EVK=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi"
 CONFIG_USE_IMXIMG_PLUGIN=y
+CONFIG_DEFAULT_FDT_FILE="imx7ulp-evk"
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
 CONFIG_BOARD_LATE_INIT=y
 CONFIG_BOARD_EARLY_INIT_F=y

diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 2d3ec83..514feea 100644 (file)
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -55,7 +55,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,0x402D0000\0" \