1 files changed, 15 insertions, 14 deletions
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index ebbf759..67491e7 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -7,6 +7,8 @@ MACHINE_NAME = "Colibri-iMX8X"
 
 MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:"
 
+MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf"
+
 IMX_DEFAULT_BSP = "nxp"
 
 require conf/machine/include/imx-base.inc
@@ -23,18 +25,18 @@ LOADADDR = ""
 # auto-serial-console there
 USE_VT = "0"
 
-#KERNEL_DEVICETREE = " \
-#    freescale/imx8dx-colibri-aster.dtb \
-#    freescale/imx8dx-colibri-eval-v3.dtb \
-#    freescale/imx8dx-colibri-iris.dtb \
-#    freescale/imx8dx-colibri-iris-v2.dtb \
-#    freescale/imx8qxp-colibri-aster.dtb \
-#    freescale/imx8qxp-colibri-eval-v3.dtb \
-#    freescale/imx8qxp-colibri-iris.dtb \
-#    freescale/imx8qxp-colibri-iris-v2.dtb \
-#"
-KERNEL_DEVICETREE = "freescale/imx8qxp-colibri-eval-v3.dtb"
-KERNEL_DEVICETREE:use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb"
+KERNEL_DTB_PREFIX = "freescale/"
+KERNEL_DEVICETREE = " \
+    ${KERNEL_DTB_PREFIX}imx8dx-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx8dx-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx8dx-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx8dx-colibri-iris-v2.dtb \
+    ${KERNEL_DTB_PREFIX}imx8qxp-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx8qxp-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx8qxp-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx8qxp-colibri-iris-v2.dtb \
+"
+KERNEL_DEVICETREE:use-mainline-bsp = "${KERNEL_DTB_PREFIX}imx8qxp-colibri-eval-v3.dtb"
 
 KERNEL_IMAGETYPE:aarch64 = "Image.gz"
 
@@ -68,7 +70,6 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 PREFERRED_VERSION_u-boot-toradex = "2022.04%"
 
 MACHINE_FIRMWARE:append = " linux-firmware-pcie8997"
-MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
 
 IMXBOOT_TARGETS = "flash"
 IMX_BOOT_SOC_TARGET = "iMX8QX"
@@ -84,7 +85,7 @@ IMAGE_FSTYPES += "teziimg"
 UBOOT_BINARY_TEZI_EMMC = "imx-boot"
 OFFSET_BOOTROM_PAYLOAD = "0"
 
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx8x_parallel-rgb_overlay.dtbo colibri-imx8x_ad7879_overlay.dtbo display-vga_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx8x_vga-640x480_overlay.dtbo"
 
 TORADEX_PRODUCT_IDS = "0038 0050 0051 0052"
 TORADEX_PRODUCT_IDS[0038] = "imx8qxp-colibri-eval-v3.dtb"