diff --git a/meta-digi-arm/conf/machine/ccimx6adpt.conf b/meta-digi-arm/conf/machine/ccimx6adpt.conf
index 5a2abae53..0497396ba 100644
--- a/meta-digi-arm/conf/machine/ccimx6adpt.conf
+++ b/meta-digi-arm/conf/machine/ccimx6adpt.conf
@@ -5,7 +5,7 @@
 # Contains the ConnectCore 6 module.
 include conf/machine/include/ccimx6.inc
 
-KERNEL_DEVICETREE = "imx6-${MACHINE}.dtb imx6-${MACHINE}-ldo.dtb imx6-${MACHINE}-hdcp.dtb"
+KERNEL_DEVICETREE = "imx6q-${MACHINE}.dtb"
 
 SERIAL_CONSOLES = "115200;ttymxc0"
 
diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf
index f7971afa1..82e687639 100644
--- a/meta-digi-arm/conf/machine/ccimx6sbc.conf
+++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf
@@ -5,7 +5,7 @@
 # Contains the ConnectCore 6 module.
 include conf/machine/include/ccimx6.inc
 
-KERNEL_DEVICETREE = "imx6-${MACHINE}.dtb imx6-${MACHINE}-ldo.dtb imx6-${MACHINE}-hdcp.dtb"
+KERNEL_DEVICETREE = "imx6q-${MACHINE}.dtb"
 
 SERIAL_CONSOLES = "115200;ttymxc3"
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6adpt/boot-sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6adpt/boot-sd.txt
index 3992a98bd..81c82f8ba 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6adpt/boot-sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6adpt/boot-sd.txt
@@ -12,5 +12,5 @@
 #
 setenv mmcroot /dev/mmcblk${mmcdev}p2
 setenv uimage uImage
-setenv fdt_file imx6-ccimx6adpt-ldo.dtb
+setenv fdt_file imx6q-ccimx6adpt.dtb
 dboot linux mmc ${mmcdev}:${mmcpart}
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6sbc/boot-sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6sbc/boot-sd.txt
index 3e526aae1..47de07c22 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6sbc/boot-sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6sbc/boot-sd.txt
@@ -12,5 +12,5 @@
 #
 setenv mmcroot /dev/mmcblk${mmcdev}p2
 setenv uimage uImage
-setenv fdt_file imx6-ccimx6sbc-ldo.dtb
+setenv fdt_file imx6q-ccimx6sbc.dtb
 dboot linux mmc ${mmcdev}:${mmcpart}