diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 879300f..20340fe 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -8,54 +8,22 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_fstype="fat"
-
 bootloader_location="fatfs_boot"
 spl_name="MLO"
 boot_name="u-boot.img"
 
 #Bootloader: u-boot features:
-
-#CONFIG_CMD_BOOTZ
-#bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
-
-#CONFIG_SUPPORT_RAW_INITRD
-#allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
-
-#CONFIG_CMD_FS_GENERIC
-#allows using "load" over "fatload"/"ext2load"
-conf_uboot_CONFIG_CMD_FS_GENERIC=1
-
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
-#with mainline u-boot, the variable for the *.dtb file can vary
-#uboot_fdt_variable_name="fdt_file"
+conf_smart_uboot="enable"
 
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
 kernel_repo="STABLE"
 #kernel_repo="TESTING"
-
+dtb=
 usbnet_mem="16384"
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x80008000"
-conf_loadaddr="0x82000000"
-conf_fdtaddr="0x88000000"
-conf_initrdaddr="0x88080000"
-need_ti_connectivity_firmware=1
-
-SYSTEM="video"
+#need_ti_connectivity_firmware=1
 
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
-
-di_kms_mode=enable
 drm_device_identifier="DVI-D-1"
diff --git a/hwpack/omap3-beagle.conf b/hwpack/omap3-beagle.conf
index 900deeb..f1c883e 100644
--- a/hwpack/omap3-beagle.conf
+++ b/hwpack/omap3-beagle.conf
@@ -8,55 +8,24 @@ conf_bl_listfile="bootloader-ng"
 
 #Bootloader Partition:
 conf_boot_fstype="fat"
-
 bootloader_location="fatfs_boot"
 spl_name="MLO"
 boot_name="u-boot.img"
 
 #Bootloader: u-boot features:
-
-#CONFIG_CMD_BOOTZ
-#bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
-
-#CONFIG_SUPPORT_RAW_INITRD
-#allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
-
-#CONFIG_CMD_FS_GENERIC
-#allows using "load" over "fatload"/"ext2load"
-conf_uboot_CONFIG_CMD_FS_GENERIC=1
-
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
-#with mainline u-boot, the variable for the *.dtb file can vary
-#uboot_fdt_variable_name="fdt_file"
+conf_smart_uboot="enable"
 
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
 kernel_repo="STABLE"
 #kernel_repo="TESTING"
-
+dtb=
 usbnet_mem="8192"
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x80008000"
-conf_loadaddr="0x82000000"
-conf_fdtaddr="0x88000000"
-conf_initrdaddr="0x88080000"
 #need_ti_connectivity_firmware=1
 
-SYSTEM="video-musb"
-
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
-
-di_kms_mode=enable
 drm_device_identifier="DVI-D-1"
 di_serial_mode=enable
+cmdline="musb_hdrc.fifo_mode=5"