diff --git a/INSTALL.Debian b/INSTALL.Debian
index 3da72b5..b0c9545 100644
--- a/INSTALL.Debian
+++ b/INSTALL.Debian
@@ -53,10 +53,8 @@ Required Options:
         imx51-babbage
         imx53-qsb
         imx53-qsrb
-        imx6dl-udoo
         imx6q-sabrelite
         imx6q-sabresd
-        imx6q-udoo
         omap3-beagle
         omap3-beagle-xm
         omap4-panda
@@ -65,6 +63,7 @@ Required Options:
         omap4-panda-es-b3
         omap5-uevm
         tegra124-jetson-tk1
+        udoo
         wandboard
 
 Optional:
diff --git a/README b/README
index ac84d74..a5aeca3 100644
--- a/README
+++ b/README
@@ -19,10 +19,8 @@ Required Options:
         imx51-babbage
         imx53-qsb
         imx53-qsrb
-        imx6dl-udoo
         imx6q-sabrelite
         imx6q-sabresd
-        imx6q-udoo
         omap3-beagle
         omap3-beagle-xm
         omap4-panda
@@ -31,6 +29,7 @@ Required Options:
         omap4-panda-es-b3
         omap5-uevm
         tegra124-jetson-tk1
+        udoo
         wandboard
 
 Optional:
diff --git a/hwpack/imx6q-udoo.conf b/hwpack/imx6q-udoo.conf
deleted file mode 100644
index 75ce155..0000000
--- a/hwpack/imx6q-udoo.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#        --dtb imx6q-udoo (Freescale based i.MX6 UDOO (Quad Core):supported)
-
-#Bootloader:
-conf_board="udoo_quad"
-conf_bl_http="https://rcn-ee.com/repos/bootloader/latest"
-conf_bl_listfile="bootloader-ng"
-
-#Bootloader Partition:
-conf_boot_fstype="ext2"
-
-bootloader_location="dd_uboot_boot"
-uboot_name="u-boot.imx"
-dd_uboot_count=""
-dd_uboot_seek="2"
-dd_uboot_conf=""
-dd_uboot_bs="512"
-unset spl_name
-boot_name="u-boot.imx"
-
-#Bootloader: u-boot features:
-conf_smart_uboot="enable"
-
-#Kernel:
-#https://rcn-ee.com/repos/deb/wheezy-armhf/LATEST-armv7
-kernel_subarch="armv7"
-kernel_repo="LTS"
-#kernel_repo="STABLE"
-#kernel_repo="TESTING"
-dtb=
-usbnet_mem=
-need_udoo_firmware=1
-
-SERIAL="ttymxc1"
-SERIAL_CONSOLE="${SERIAL},115200n8"
-drm_device_identifier="HDMI-A-1"
diff --git a/hwpack/imx6dl-udoo.conf b/hwpack/udoo.conf
similarity index 58%
rename from hwpack/imx6dl-udoo.conf
rename to hwpack/udoo.conf
index a68e255..9611e8e 100644
--- a/hwpack/imx6dl-udoo.conf
+++ b/hwpack/udoo.conf
@@ -1,22 +1,29 @@
 #!/bin/bash
-#        --dtb imx6dl-udoo (Freescale based i.MX6 UDOO (Dual Core):supported)
+#        --dtb udoo (Freescale based i.MX6 UDOO (Quad/Dual):supported)
 
 #Bootloader:
-conf_board="udoo_dl"
+conf_board="udoo"
 conf_bl_http="https://rcn-ee.com/repos/bootloader/latest"
 conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_fstype="ext2"
 
-bootloader_location="dd_uboot_boot"
-uboot_name="u-boot.imx"
+bootloader_location="dd_spl_uboot_boot"
+
+spl_uboot_name="SPL"
+dd_spl_uboot_count=""
+dd_spl_uboot_seek="1"
+dd_spl_uboot_conf=""
+dd_spl_uboot_bs="1k"
+spl_name="SPL"
+
+uboot_name="u-boot.img"
 dd_uboot_count=""
-dd_uboot_seek="2"
+dd_uboot_seek="69"
 dd_uboot_conf=""
-dd_uboot_bs="512"
-unset spl_name
-boot_name="u-boot.imx"
+dd_uboot_bs="1k"
+boot_name="u-boot.img"
 
 #Bootloader: u-boot features:
 conf_smart_uboot="enable"
@@ -27,10 +34,11 @@ kernel_subarch="armv7"
 kernel_repo="LTS"
 #kernel_repo="STABLE"
 #kernel_repo="TESTING"
-dtb=
-usbnet_mem=
+#
 need_udoo_firmware=1
 
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
+
+#drm_read_edid_broken="enable"
 drm_device_identifier="HDMI-A-1"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 5969d27..a7f1997 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1416,10 +1416,8 @@ usage () {
 			        imx51-babbage
 			        imx53-qsb
 			        imx53-qsrb
-			        imx6dl-udoo
 			        imx6q-sabrelite
 			        imx6q-sabresd
-			        imx6q-udoo
 			        omap3-beagle
 			        omap3-beagle-xm
 			        omap4-panda
@@ -1428,6 +1426,7 @@ usage () {
 			        omap4-panda-es-b3
 			        omap5-uevm
 			        tegra124-jetson-tk1
+			        udoo
 			        wandboard
 
 			Optional: