From: Jagan Teki jagan@amarulasolutions.com
setenv_fdt_file to common code and set dtb based on CONFIG_DEFAULT_DEVICE_TREE and cpu_type.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- board/engicam/common/board.c | 24 ++++++++++++++++++++++++ board/engicam/common/board.h | 1 - board/engicam/geam6ul/geam6ul.c | 6 ------ board/engicam/icorem6/icorem6.c | 8 -------- board/engicam/icorem6_rqs/icorem6_rqs.c | 8 -------- board/engicam/isiotmx6ul/isiotmx6ul.c | 11 ----------- 6 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index c7ec55f..f86fb2b 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -32,6 +32,30 @@ static void mmc_late_init(void) } #endif
+static void setenv_fdt_file(void) +{ + const char *cmp_dtb = CONFIG_DEFAULT_DEVICE_TREE; + + if (!strcmp(cmp_dtb, "imx6q-icore")) { + if (is_mx6dq()) + env_set("fdt_file", "imx6q-icore.dtb"); + else if(is_mx6dl() || is_mx6solo()) + env_set("fdt_file", "imx6dl-icore.dtb"); + } else if (!strcmp(cmp_dtb, "imx6q-icore-rqs")) { + if (is_mx6dq()) + env_set("fdt_file", "imx6q-icore-rqs.dtb"); + else if(is_mx6dl() || is_mx6solo()) + env_set("fdt_file", "imx6dl-icore-rqs.dtb"); + } else if (!strcmp(cmp_dtb, "imx6ul-geam-kit")) + env_set("fdt_file", "imx6ul-geam-kit.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-mmc")) + env_set("fdt_file", "imx6ul-isiot-mmc.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-emmc")) + env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-nand")) + env_set("fdt_file", "imx6ul-isiot-nand.dtb"); +} + int board_late_init(void) { switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> diff --git a/board/engicam/common/board.h b/board/engicam/common/board.h index f364a23..c720b0b 100644 --- a/board/engicam/common/board.h +++ b/board/engicam/common/board.h @@ -6,7 +6,6 @@
#ifndef _BOARD_H_ #define _BOARD_H_ -void setenv_fdt_file(void); void setup_gpmi_nand(void); void setup_display(void); #endif /* _BOARD_H_ */ diff --git a/board/engicam/geam6ul/geam6ul.c b/board/engicam/geam6ul/geam6ul.c index ffd383a..15bd8b2 100644 --- a/board/engicam/geam6ul/geam6ul.c +++ b/board/engicam/geam6ul/geam6ul.c @@ -90,12 +90,6 @@ void setup_gpmi_nand(void) } #endif /* CONFIG_NAND_MXS */
-void setenv_fdt_file(void) -{ - if (is_mx6ul()) - env_set("fdt_file", "imx6ul-geam-kit.dtb"); -} - #ifdef CONFIG_SPL_BUILD /* MMC board initialization is needed till adding DM support in SPL */ #if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index 3d4f713..59c085b 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -192,14 +192,6 @@ void setup_display(void) } #endif /* CONFIG_VIDEO_IPUV3 */
-void setenv_fdt_file(void) -{ - if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore.dtb"); - else if(is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore.dtb"); -} - #ifdef CONFIG_SPL_BUILD /* MMC board initialization is needed till adding DM support in SPL */ #if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index 2a321dc..edf9d086 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -32,14 +32,6 @@ int board_mmc_get_env_dev(int devno) } #endif
-void setenv_fdt_file(void) -{ - if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore-rqs.dtb"); - else if(is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore-rqs.dtb"); -} - #ifdef CONFIG_SPL_BUILD #include <spl.h>
diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c b/board/engicam/isiotmx6ul/isiotmx6ul.c index fbf1724..9afa8e4 100644 --- a/board/engicam/isiotmx6ul/isiotmx6ul.c +++ b/board/engicam/isiotmx6ul/isiotmx6ul.c @@ -98,17 +98,6 @@ int board_mmc_get_env_dev(int devno) } #endif
-void setenv_fdt_file(void) -{ - if (is_mx6ul()) { -#ifdef CONFIG_ENV_IS_IN_MMC - env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); -#else - env_set("fdt_file", "imx6ul-isiot-nand.dtb"); -#endif - } -} - #ifdef CONFIG_SPL_BUILD #include <spl.h>