1 files changed, 25 insertions, 0 deletions
diff --git a/board/toradex/colibri-imx8x/colibri-imx8x.c b/board/toradex/colibri-imx8x/colibri-imx8x.c
index 5bc4fba5b9..e4e96a207e 100644
--- a/board/toradex/colibri-imx8x/colibri-imx8x.c
+++ b/board/toradex/colibri-imx8x/colibri-imx8x.c
@@ -168,6 +168,30 @@ static void init_gpio_expander(void)
 #endif
 }
 
+static void select_dt_from_module_version(void)
+{
+        switch (tdx_hw_tag.prodid) {
+                /* Select Colibri iMX8QXP device trees */
+                case COLIBRI_IMX8QXP_WIFI_BT_IT:
+                case COLIBRI_IMX8QXP_IT:
+                        env_set("soc", "imx8qxp");
+                        break;
+
+                /* Select Colibri iMX8DX device trees */
+                case COLIBRI_IMX8DX_WIFI_BT:
+                case COLIBRI_IMX8DX:
+                        env_set("soc", "imx8dx");
+                        break;
+        default:
+                printf("Unknown Colibri iMX8x module\n");
+                return;
+        }
+
+#ifndef CONFIG_ENV_IS_NOWHERE
+        env_save();
+#endif
+}
+
 int board_init(void)
 {
 	init_gpio_expander();
@@ -249,6 +273,7 @@ int board_late_init(void)
 	board_late_mmc_env_init();
 #endif
 
+	select_dt_from_module_version();
 	return 0;
 }