colibri-imx8x: construct fdtfile dynamically

The following expression is used to construct the device tree name:
fdtfile=${soc}-colibri-${fdt_board}.dtb

- soc is set dynamically (either imx8qxp or imx8dx)
- fdt_board can be modified by the user (eval-v3, aster, iris/iris-v2)

Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>

diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 88eddbddaef4e762addcc120074a341d206ea797..6ed9cc4fa80580858f046eab8866187c6da6ebe8 100644 (file)
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -123,6 +123,18 @@ int checkboard(void)
        return 0;
 }
 
+static void select_dt_from_module_version(void)
+{
+       /*
+        * The dtb filename is constructed from ${soc}-colibri-${fdt_board}.dtb.
+        * Set soc depending on the used SoC.
+        */
+       if (is_imx8dx())
+               env_set("soc", "imx8dx");
+       else
+               env_set("soc", "imx8qxp");
+}
+
 int board_init(void)
 {
        board_gpio_init();
@@ -158,5 +170,7 @@ int board_late_init(void)
        env_set("board_rev", "v1.0");
 #endif
 
+       select_dt_from_module_version();
+
        return 0;
 }

diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig
index e1d375c72a7ebe9d1c46dc3963a2147c661f09f0..24ccaa96dbfad18bd367d0db3b8f1c684ad47716 100644 (file)
--- a/configs/colibri-imx8x_defconfig
+++ b/configs/colibri-imx8x_defconfig
@@ -20,6 +20,8 @@ CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-colibri-${fdt_board}.dtb"
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 7826596a331b569112f72e65855721ac008775ca..9a4a5f3b5de66ca0b5a753f389d1466b4ad87615 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -61,8 +61,7 @@
        "boot_script_dhcp=boot.scr\0" \
        "console=ttyLP3\0" \
        "fdt_addr=0x83000000\0" \
-       "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
-       "fdtfile=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
+       "fdt_board=eval-v3\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "image=Image\0" \
        "initrd_addr=0x83800000\0" \