diff --git a/conf/machine/smarcimx8mq2g.conf b/conf/machine/smarcimx8mq2g.conf
index df17617..d3e63cc 100644
--- a/conf/machine/smarcimx8mq2g.conf
+++ b/conf/machine/smarcimx8mq2g.conf
@@ -26,6 +26,12 @@ KERNEL_DEVICETREE = " \
         embedian/imx8mq-smarc-hdmi.dtb \
         embedian/imx8mq-smarc-dp.dtb \
         embedian/imx8mq-smarc-dual-display.dtb \
+        embedian/imx8mq-smarc-m4.dtb \
+        embedian/imx8mq-smarc-m4-dcss-lvds.dtb \
+        embedian/imx8mq-smarc-m4-lcdif-lvds.dtb \
+        embedian/imx8mq-smarc-m4-hdmi.dtb \
+        embedian/imx8mq-smarc-m4-dp.dtb \
+        embedian/imx8mq-smarc-m4-dual-display.dtb \
 "
 MACHINE_EXTRA_RRECOMMENDS_append_mx8mq  = " imx-m4-demos"
 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
diff --git a/conf/machine/smarcimx8mq4g.conf b/conf/machine/smarcimx8mq4g.conf
index 8095884..3ae9e63 100644
--- a/conf/machine/smarcimx8mq4g.conf
+++ b/conf/machine/smarcimx8mq4g.conf
@@ -26,6 +26,12 @@ KERNEL_DEVICETREE = " \
         embedian/imx8mq-smarc-hdmi.dtb \
         embedian/imx8mq-smarc-dp.dtb \
         embedian/imx8mq-smarc-dual-display.dtb \
+        embedian/imx8mq-smarc-m4.dtb \
+        embedian/imx8mq-smarc-m4-dcss-lvds.dtb \
+        embedian/imx8mq-smarc-m4-lcdif-lvds.dtb \
+        embedian/imx8mq-smarc-m4-hdmi.dtb \
+        embedian/imx8mq-smarc-m4-dp.dtb \
+        embedian/imx8mq-smarc-m4-dual-display.dtb \
 "
 MACHINE_EXTRA_RRECOMMENDS_append_mx8mq  = " imx-m4-demos"
 IMAGE_BOOTFILES_DEPENDS += "imx-m4-demos:do_deploy"
diff --git a/recipes-bsp/u-boot/u-boot-smarcimx8mq_2020.04.bb b/recipes-bsp/u-boot/u-boot-smarcimx8mq_2020.04.bb
index 7dff9e7..4631a64 100644
--- a/recipes-bsp/u-boot/u-boot-smarcimx8mq_2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-smarcimx8mq_2020.04.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a
 UBOOT_SRC ?= "${EMB_UBOOT_MIRROR};protocol=ssh"
 SRCBRANCH = "smarc_8mq-imx_v2020.04_5.4.24_2.1.0"
 SRC_URI = "${UBOOT_SRC};branch=${SRCBRANCH}"
-SRCREV = "e44dd05afd50171f1c89a5f4530e2e7cdfe4c23e"
+SRCREV = "c2f85087ffef4f99b60d98622371af4ffc5372f9"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kernel/linux/linux-smarcimx8mq_5.4.bb b/recipes-kernel/linux/linux-smarcimx8mq_5.4.bb
index 6ae5bc5..a7b5422 100644
--- a/recipes-kernel/linux/linux-smarcimx8mq_5.4.bb
+++ b/recipes-kernel/linux/linux-smarcimx8mq_5.4.bb
@@ -20,7 +20,7 @@ KERNEL_DEFCONFIG = "${S}/arch/arm64/configs/smarcimx8mq_defconfig"
 
 KERNEL_SRC ?= "git@git.embedian.com:developer/smarc-fsl-linux-kernel.git;protocol=git"
 SRC_URI = "${EMB_KERNEL_MIRROR};protocol=ssh;branch=${SRCBRANCH}"
-SRCREV = "acd8a316f05af41aa051e50215b3e4e301767235"
+SRCREV = "d0b156720daed973213a749162ac1d66d6c62ea8"
 
 S = "${WORKDIR}/git"