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/ccimx6/boot-sd.txt
similarity index 92%
rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6sbc/boot-sd.txt
rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6/boot-sd.txt
index 47de07c22..b516e0d4c 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/ccimx6/boot-sd.txt
@@ -12,5 +12,5 @@
 #
 setenv mmcroot /dev/mmcblk${mmcdev}p2
 setenv uimage uImage
-setenv fdt_file imx6q-ccimx6sbc.dtb
+setenv fdt_file imx6q-${board}.dtb
 dboot linux mmc ${mmcdev}:${mmcpart}
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
deleted file mode 100644
index 81c82f8ba..000000000
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2013.04/ccimx6adpt/boot-sd.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# U-Boot bootscript for SD images created by Yocto.
-#
-# Layout:
-#   * U-Boot (raw copied)
-#   * Boot partion (FAT) with kernel images and DTB
-#   * Rootfs partion (EXT4)
-#
-# +--------------+----------------------+-------------------------+
-# | U-BOOT (RAW) | BOOT_PARTITION (FAT) | ROOTFS_PARTITION (EXT4) |
-# +--------------+----------------------+-------------------------+
-#
-setenv mmcroot /dev/mmcblk${mmcdev}p2
-setenv uimage uImage
-setenv fdt_file imx6q-ccimx6adpt.dtb
-dboot linux mmc ${mmcdev}:${mmcpart}
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils-2013.04/ccimx6adpt/fw_env.config b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils-2013.04/ccimx6/fw_env.config
similarity index 100%
rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils-2013.04/ccimx6adpt/fw_env.config
rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils-2013.04/ccimx6/fw_env.config
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils-2013.04/ccimx6sbc/fw_env.config b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils-2013.04/ccimx6sbc/fw_env.config
deleted file mode 100644
index 040cd8e30..000000000
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils-2013.04/ccimx6sbc/fw_env.config
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration file for fw_(printenv/setenv) utility.
-# Up to two entries are valid, in this case the redundant
-# environment sector is assumed present.
-
-# Device name        Offset	 Size
-/dev/mmcblk0boot1    0x1C0000    0x4000
-/dev/mmcblk0boot1    0x1E0000    0x4000
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils_2013.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils_2013.04.bb
index 2b9e6363a..586c55605 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils_2013.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-fw-utils_2013.04.bb
@@ -30,4 +30,4 @@ do_install() {
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-COMPATIBLE_MACHINE = "(mx6)"
+COMPATIBLE_MACHINE = "(ccimx6)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb
index 8776f95c9..eaebe1d43 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2013.04.bb
@@ -22,4 +22,4 @@ do_deploy_append() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6)"
+COMPATIBLE_MACHINE = "(ccimx6)"