6 files changed, 143 insertions, 101 deletions
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index eac7c21..8507628 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -1,33 +1,43 @@
 IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES:append = " teziimg"
-TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
 # The payload offsets are given in number of 512 byte blocks.
 OFFSET_BOOTROM_PAYLOAD = "2"
 OFFSET_SPL_PAYLOAD = "138"
+TORADEX_PRODUCT_IDS = "0027 0028 0029 0035 0082 0083 0084 0085"
 
 MACHINE_NAME = "Apalis-iMX6"
 
-KERNEL_DEVICETREE += "imx6q-apalis-ixora-v1.2.dtb"
-KERNEL_DEVICETREE:use-mainline-bsp += " \
-    imx6q-apalis-eval.dtb \
-    imx6q-apalis-ixora-v1.1.dtb \
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = "nxp/imx/"
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:apalis-imx6 = " \
+    ${KERNEL_DTB_PREFIX}imx6q-apalis-eval.dtb \
+    ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora.dtb \
+    ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora-v1.1.dtb \
+    ${KERNEL_DTB_PREFIX}imx6q-apalis-ixora-v1.2.dtb \
 "
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
+    apalis-imx6_hdmi_overlay.dtbo \
+    apalis-imx6_spi1_spidev_overlay.dtbo \
+    apalis-imx6_spi2_spidev_overlay.dtbo \
+"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
-IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot"
+IMX_DEFAULT_BOOTLOADER:apalis-imx6 = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_SUFFIX = "img"
 
-UBOOT_ENTRYPOINT:apalis-imx6 = "0x11000000"
-UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x17000000"
-
 MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
 
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "apalis-imx6_hdmi_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "apalis-imx6_parallel-rgb_overlay.dtbo display-edt7_overlay.dtbo apalis-imx6_stmpe-ts_overlay.dtbo apalis-imx6_hdmi_overlay.dtbo apalis-imx6_vga_overlay.dtbo"
+UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x18200000"
+UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x18300000"
+UBOOT_ENTRYPOINT:apalis-imx6 = "0x14200000"
+UBOOT_RD_LOADADDRESS:apalis-imx6 = "0x1A400000"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 6a5b577..7c0a339 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -1,32 +1,41 @@
 IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES:append = " teziimg"
-TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
 # The payload offsets are given in number of 512 byte blocks.
 OFFSET_BOOTROM_PAYLOAD = "2"
 OFFSET_SPL_PAYLOAD = "138"
+TORADEX_PRODUCT_IDS = "0014 0015 0016 0017 0077 0078 0079 0080"
 
 MACHINE_NAME = "Colibri-iMX6"
 
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx6_lcd-vga_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "colibri-imx6_parallel-rgb_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo display-vga_overlay.dtbo"
-
-KERNEL_DEVICETREE += " \
-    imx6dl-colibri-iris.dtb \
-    imx6dl-colibri-iris-v2.dtb \
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = "nxp/imx/"
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:colibri-imx6 = " \
+    ${KERNEL_DTB_PREFIX}imx6dl-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx6dl-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx6dl-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx6dl-colibri-iris-v2.dtb \
+"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
+    colibri-imx6_vga-640x480_overlay.dtbo \
 "
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx6 = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx6 = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_SUFFIX = "img"
 
 MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
 
-UBOOT_ENTRYPOINT:colibri-imx6 = "0x11000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x17000000"
+UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x18200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x18300000"
+UBOOT_ENTRYPOINT:colibri-imx6 = "0x14200000"
+UBOOT_RD_LOADADDRESS:colibri-imx6 = "0x1A400000"
diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc
index f71c6a3..bf56ae8 100644
--- a/conf/machine/include/colibri-imx6ull-emmc.inc
+++ b/conf/machine/include/colibri-imx6ull-emmc.inc
@@ -9,21 +9,24 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
 
 MACHINE_NAME = "Colibri-iMX6ULL-eMMC"
 
-MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
-
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot"
-PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx"
-UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx"
-UBOOT_ENTRYPOINT:colibri-imx6ull-emmc = "0x81000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x82100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6ull-emmc = "0x87000000"
-
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx6ull_parallel-rgb_vga_overlay.dtbo colibri-imx6ull_ad7879_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "colibri-imx6ull_parallel-rgb_overlay.dtbo colibri-imx6ull_ad7879_overlay.dtbo display-vga_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
+	colibri-imx6ull_vga-640x480_overlay.dtbo \
+"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
+
+IMX_DEFAULT_BOOTLOADER:colibri-imx6ull-emmc = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
+
+UBOOT_DTB_LOADADDRESS:colibri-imx6ull-emmc = "0x88200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6ull-emmc = "0x88300000"
+UBOOT_ENTRYPOINT:colibri-imx6ull-emmc = "0x84200000"
+UBOOT_MAKE_TARGET:colibri-imx6ull-emmc = "u-boot.imx"
+UBOOT_RD_LOADADDRESS:colibri-imx6ull-emmc = "0x8A400000"
+UBOOT_SUFFIX:colibri-imx6ull-emmc = "imx"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index b4d2501..f1c0fc0 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -11,27 +11,37 @@ WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
 
 MACHINE_NAME = "Colibri-iMX6ULL"
 
-MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+MACHINE_EXTRA_RRECOMMENDS:append = " mwifiexconf"
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot"
-PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"
-UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x82100000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x87000000"
-
-KERNEL_DEVICETREE:append:use-nxp-bsp = " \
-    imx6ull-colibri-aster.dtb \
-    imx6ull-colibri-iris.dtb \
-    imx6ull-colibri-iris-v2.dtb \
-    imx6ull-colibri-wifi-aster.dtb \
-    imx6ull-colibri-wifi-iris.dtb \
-    imx6ull-colibri-wifi-iris-v2.dtb \
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = "nxp/imx/"
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:colibri-imx6ull = " \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-iris-v2.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx6ull-colibri-wifi-iris-v2.dtb \
 "
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
+
+IMX_DEFAULT_BOOTLOADER:colibri-imx6ull = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
+PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
+
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+
+UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x88200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x88300000"
+UBOOT_ENTRYPOINT:colibri-imx6ull = "0x84200000"
+UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot-nand.imx"
+UBOOT_RD_LOADADDRESS:colibri-imx6ull = "0x8A400000"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index c7c3b21..cd37422 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -7,34 +7,39 @@ TORADEX_FLASH_TYPE = "emmc"
 
 MACHINE_NAME = "Colibri-iMX7-eMMC"
 
-MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = "nxp/imx/"
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:colibri-imx7-emmc = " \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-emmc-iris-v2.dtb \
+"
 
-MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \
+    colibri-imx7_vga-640x480_overlay.dtbo \
+"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
-KERNEL_DEVICETREE:append:use-nxp-bsp = " \
-    imx7d-colibri-emmc-iris.dtb \
-    imx7d-colibri-emmc-iris-v2.dtb \
-"
-KERNEL_DEVICETREE:append:use-mainline-bsp = " \
-    imx7d-colibri-emmc-aster.dtb \
-"
-
-IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx7-emmc = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx7_lcd-vga_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "colibri-imx7_parallel-rgb_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo display-vga_overlay.dtbo"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 UBOOT_BINARY:colibri-imx7-emmc = "u-boot.imx"
-UBOOT_DTB_LOADADDRESS:colibri-imx7-emmc = "0x82000000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx7-emmc = "0x87000000"
-UBOOT_ENTRYPOINT:colibri-imx7-emmc = "0x81000000"
-UBOOT_MAKE_TARGET = "u-boot.imx"
+UBOOT_DTB_LOADADDRESS:colibri-imx7-emmc = "0x88200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx7-emmc = "0x88300000"
+UBOOT_ENTRYPOINT:colibri-imx7-emmc = "0x84200000"
+UBOOT_MAKE_TARGET:colibri-imx7-emmc = "u-boot.imx"
+UBOOT_RD_LOADADDRESS:colibri-imx7-emmc = "0x8A400000"
 UBOOT_SUFFIX:${MACHINE} = "imx"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 164c574..5aa7a04 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -1,39 +1,44 @@
 IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES:append = " teziimg"
-TORADEX_PRODUCT_IDS = "0032 0033 0041"
+TORADEX_PRODUCT_IDS = "0032 0033 0041 0081"
 TORADEX_PRODUCT_IDS[0032] = "imx7s-colibri-eval-v3.dtb"
 TORADEX_PRODUCT_IDS[0033] = "imx7d-colibri-eval-v3.dtb"
 TORADEX_PRODUCT_IDS[0041] = "imx7d-colibri-eval-v3.dtb"
+TORADEX_PRODUCT_IDS[0081] = "imx7d-colibri-eval-v3.dtb"
 TORADEX_FLASH_TYPE = "rawnand"
 
 MACHINE_NAME = "Colibri-iMX7"
 
-MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
-
-MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
-
-KERNEL_DEVICETREE:append:use-nxp-bsp = " \
-    imx7d-colibri-iris.dtb \
-    imx7d-colibri-iris-v2.dtb \
-    imx7s-colibri-iris.dtb \
-    imx7s-colibri-iris-v2.dtb \
-"
-KERNEL_DEVICETREE:append:use-mainline-bsp = " \
-    imx7d-colibri-aster.dtb \
-    imx7s-colibri-aster.dtb \
+# with kernel 6.5 the device trees were moved to vendor subdirs
+KERNEL_DTB_PREFIX = "nxp/imx/"
+KERNEL_DTB_PREFIX:preempt-rt = "nxp/imx/"
+KERNEL_DTB_PREFIX:use-nxp-bsp = ""
+KERNEL_DEVICETREE:colibri-imx7 = " \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx7d-colibri-iris-v2.dtb \
+    ${KERNEL_DTB_PREFIX}imx7s-colibri-aster.dtb \
+    ${KERNEL_DTB_PREFIX}imx7s-colibri-eval-v3.dtb \
+    ${KERNEL_DTB_PREFIX}imx7s-colibri-iris.dtb \
+    ${KERNEL_DTB_PREFIX}imx7s-colibri-iris-v2.dtb \
 "
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel:preempt-rt = "linux-toradex"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp = "linux-toradex-upstream"
+PREFERRED_PROVIDER_virtual/kernel:use-mainline-bsp:preempt-rt = "linux-toradex-upstream-rt"
 PREFERRED_PROVIDER_virtual/dtb:use-mainline-bsp = "device-tree-overlays-mainline"
 
-IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot"
+IMX_DEFAULT_BOOTLOADER:colibri-imx7 = "u-boot-toradex"
+PREFERRED_VERSION_u-boot-toradex:use-mainline-bsp = "mainline"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
-UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx"
-UBOOT_ENTRYPOINT:colibri-imx7 = "0x81000000"
-UBOOT_DTB_LOADADDRESS:colibri-imx7 = "0x82000000"
-UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x87000000"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+
+UBOOT_DTB_LOADADDRESS:colibri-imx7 = "0x88200000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x88300000"
+UBOOT_ENTRYPOINT:colibri-imx7 = "0x84200000"
+UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot-nand.imx"
+UBOOT_RD_LOADADDRESS:colibri-imx7 = "0x88400000"