diff --git a/hwpack/imx6dl-udoo.conf b/hwpack/imx6dl-udoo.conf
index a4ed42d..89c5004 100644
--- a/hwpack/imx6dl-udoo.conf
+++ b/hwpack/imx6dl-udoo.conf
@@ -34,13 +34,16 @@ conf_uboot_use_uenvcmd=1
 #conf_uboot_no_uenvcmd="loaduimage"
 
 #can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
+uboot_fdt_auto_detection=1
+
+#with mainline u-boot, the variable for the *.dtb file can vary
+uboot_fdt_variable_name="fdt_file"
 
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
-kernel_repo="STABLE"
-#kernel_repo="TESTING"
+#kernel_repo="STABLE"
+kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -50,13 +53,12 @@ conf_loadaddr="0x12000000"
 conf_fdtaddr="0x11000000"
 #initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
 conf_initrdaddr="0x12A00000"
-conf_fdtfile="imx6dl-udoo.dtb"
 
-#SYSTEM="video"
-SYSTEM="serial"
+SYSTEM="video"
 
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
 USE_KMS=1
+#usb broken...
 SERIAL_MODE=1
diff --git a/hwpack/imx6q-udoo.conf b/hwpack/imx6q-udoo.conf
index bb141c3..571c03b 100644
--- a/hwpack/imx6q-udoo.conf
+++ b/hwpack/imx6q-udoo.conf
@@ -34,13 +34,16 @@ conf_uboot_use_uenvcmd=1
 #conf_uboot_no_uenvcmd="loaduimage"
 
 #can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
+uboot_fdt_auto_detection=1
+
+#with mainline u-boot, the variable for the *.dtb file can vary
+uboot_fdt_variable_name="fdt_file"
 
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
-kernel_repo="STABLE"
-#kernel_repo="TESTING"
+#kernel_repo="STABLE"
+kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -50,13 +53,12 @@ conf_loadaddr="0x12000000"
 conf_fdtaddr="0x11000000"
 #initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
 conf_initrdaddr="0x12A00000"
-conf_fdtfile="imx6q-udoo.dtb"
 
-#SYSTEM="video"
-SYSTEM="serial"
+SYSTEM="video"
 
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
 USE_KMS=1
+#usb broken...
 SERIAL_MODE=1