diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf
index 10122a5b..9e808247 100644
--- a/conf/machine/nitrogen8mm.conf
+++ b/conf/machine/nitrogen8mm.conf
@@ -13,14 +13,20 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 
 # Kernel configuration
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
-KERNEL_DEVICETREE = "freescale/imx8mm-nitrogen8mm.dtb \
-	freescale/imx8mm-nitrogen8mm_som.dtb \
+KERNEL_DEVICETREE = "\
+	freescale/imx8mm-nitrogen8mm.dtb \
+	freescale/imx8mm-nitrogen8mm-m4.dtb \
+	freescale/imx8mm-nitrogen8mm-tc358743.dtb \
 	freescale/imx8mm-nitrogen8mm_rev2.dtb \
 	freescale/imx8mm-nitrogen8mm_rev2-m4.dtb \
+	freescale/imx8mm-nitrogen8mm_rev2-tc358743.dtb \
+	freescale/imx8mm-nitrogen8mm_som.dtb \
 	freescale/imx8mm-nitrogen8mm_som-m4.dtb \
-	freescale/imx8mm-nitrogen8mm-m4.dtb \
-	freescale/imx8mm-nitrogen8mm-tc358743.dtb \
+	freescale/imx8mm-nitrogen8mm_som-mcp2518fd.dtb \
+	freescale/imx8mm-nitrogen8mm_som-mcp25625.dtb \
 	freescale/imx8mm-nitrogen8mm_som-tc358743.dtb \
+	freescale/imx8mm-nitrogen8mm_tab.dtb \
+	freescale/imx8mm-nitrogen_smarc.dtb \
 "
 KERNEL_IMAGETYPE = "Image"
 RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = ""
diff --git a/recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc b/recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc
index 4d6f3852..31e5b338 100644
--- a/recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc
+++ b/recipes-bsp/u-boot/u-boot-boundary-common_2022.04.inc
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
 PV = "v2022.04+git${SRCPV}"
 
-SRCREV = "4c491b47f4b6954f6e35e2a4594a0d12ac342d58"
+SRCREV = "89df34f4cd8c23a75d6bcaa3b6da9a06c70faa08"
 SRCBRANCH = "boundary-v2022.04"
 SRC_URI = "git://github.com/boundarydevices/u-boot.git;branch=${SRCBRANCH};protocol=https"
 
diff --git a/recipes-kernel/linux/linux-boundary_6.1.bb b/recipes-kernel/linux/linux-boundary_6.1.bb
index 3d3ecc13..4838a8e0 100644
--- a/recipes-kernel/linux/linux-boundary_6.1.bb
+++ b/recipes-kernel/linux/linux-boundary_6.1.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/boundarydevices/linux.git;branch=${SRCBRANCH};protoc
 
 LOCALVERSION = "+yocto"
 SRCBRANCH = "boundary-imx_6.1.y"
-SRCREV = "ba56160ecafbdd386f6a60d7339f15821186b6a6"
+SRCREV = "f6aefb45c69b0a252a46179cadc7855d343f4a3c"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|nitrogen6sx|nitrogen7|nitrogen8m|nitrogen8mm|nitrogen8mn|nitrogen8mp)"