diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index e02aa4b..b53fc37 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -19,6 +19,7 @@ boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
+uboot_fdt_auto_detection="enabled"
 
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
@@ -36,6 +37,7 @@ conf_fdtaddr="0x815f0000"
 #initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
 #u-boot: conf_initrdaddr="0x81000000" (locksup)
 conf_initrdaddr="0x81600000"
+conf_fdtfile="am335x-bone.dtb"
 need_dtbs=1
 need_am335x_firmware=1
 
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index 16c86ac..6ad752d 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -19,6 +19,7 @@ boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
+uboot_fdt_auto_detection="enabled"
 
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
@@ -36,6 +37,7 @@ conf_fdtaddr="0x815f0000"
 #initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
 #u-boot: conf_initrdaddr="0x81000000" (locksup)
 conf_initrdaddr="0x81600000"
+conf_fdtfile="am335x-bone.dtb"
 need_dtbs=1
 need_am335x_firmware=1
 
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index 40df0b9..051481b 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -19,6 +19,7 @@ boot_script="uEnv.txt"
 boot_fstype="fat"
 uboot_SCRIPT_ENTRY="uenvcmd"
 uboot_CMD_LOAD="load"
+uboot_fdt_auto_detection="enabled"
 
 #Kernel:
 #http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
diff --git a/hwpack/am335x-evmsk.conf b/hwpack/am335x-evmsk.conf
deleted file mode 100644
index 335afb0..0000000
--- a/hwpack/am335x-evmsk.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=tree;f=arch/arm/boot/dts;hb=refs/tags/v3.8-rc5
-#        --dtb am335x-evmsk (AM335X EVM-SK (v3.8.x))
-
-#Bootloader:
-conf_board="BEAGLEBONE_A"
-conf_bl_http="http://rcn-ee.net/deb/tools/latest"
-conf_bl_listfile="bootloader-ng"
-
-#Bootloader Partition:
-bootloader_location="fatfs_boot"
-boot_partition_size="100"
-spl_name="MLO"
-boot_name="u-boot.img"
-
-#Bootloader: u-boot settings
-boot_image="bootz"
-boot_script="uEnv.txt"
-boot_fstype="fat"
-uboot_SCRIPT_ENTRY="uenvcmd"
-uboot_CMD_LOAD="load"
-
-#Kernel:
-#http://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
-kernel_subarch="omap-psp"
-kernel_repo="TESTING"
-
-usbnet_mem=
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x80008000"
-#u-boot: conf_loadaddr="0x80200000" (locksup)
-conf_loadaddr="0x80300000"
-conf_fdtaddr="0x815f0000"
-#u-boot:rdaddr="0x81000000"
-#initrdaddr = 0x80200000 + 10(mb) * 10 0000 = 0x80C0 0000 (10MB)
-#u-boot: conf_initrdaddr="0x81000000" (locksup)
-conf_initrdaddr="0x81600000"
-need_dtbs=1
-need_am335x_firmware=1
-
-SERIAL="ttyO0"
-SERIAL_CONSOLE="${SERIAL},115200n8"
-
-SERIAL_MODE=1
-USE_KMS=1
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 4597ada..4f2c70a 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -351,7 +351,7 @@ function boot_uenv_txt_template {
 		__EOF__
 	fi
 
-	if [ "${need_dtbs}" ] && [ "x${conf_board}" != "xBEAGLEBONE_A" ]; then
+	if [ "${need_dtbs}" ] && [ "x${uboot_fdt_auto_detection}" != "xenabled" ]; then
 		cat >> ${TEMPDIR}/bootscripts/normal.cmd <<-__EOF__
 			initrd_high=0xffffffff
 			fdt_high=0xffffffff