diff --git a/tools/hwpack/bbb-blank-eeprom.conf b/tools/hwpack/bbb-blank-eeprom.conf
index 0fb8c0454d3a8733e6938be068920be5bd4038e4..eb9f62a1ef19b9bcdd9fcc832f24ced3bea82892 100644
--- a/tools/hwpack/bbb-blank-eeprom.conf
+++ b/tools/hwpack/bbb-blank-eeprom.conf
@@ -24,9 +24,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
 #Preferred Kernel
 conf_kernel="bone"
 
diff --git a/tools/hwpack/beaglebone.conf b/tools/hwpack/beaglebone.conf
index d895e36d9b610e3b0e99e27ef8bf6e924a4b4a13..8852e9b4754faec8ab1e0eb2e53a061a6a1e3d22 100644
--- a/tools/hwpack/beaglebone.conf
+++ b/tools/hwpack/beaglebone.conf
@@ -23,9 +23,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
 #Preferred Kernel
 conf_kernel="bone"
 
diff --git a/tools/hwpack/imx6q-sabresd.conf b/tools/hwpack/imx6q-sabresd.conf
index 806ee9a1906221974cfd9e968632b32a41bd8d9e..3e866a7923a260e220595fb19f0a19f0187ddc44 100644
--- a/tools/hwpack/imx6q-sabresd.conf
+++ b/tools/hwpack/imx6q-sabresd.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.imx"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
 usbnet_mem=
 conf_fdtfile="imx6q-sabresd.dtb"
 
diff --git a/tools/hwpack/omap3-beagle-xm.conf b/tools/hwpack/omap3-beagle-xm.conf
index f0b97ff2ea97d60aa857c46b8cd5e708c57ccc7c..7ba64837b6f2f06b49b787a4aae409f3987fb73d 100644
--- a/tools/hwpack/omap3-beagle-xm.conf
+++ b/tools/hwpack/omap3-beagle-xm.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
 usbnet_mem="16384"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/tools/hwpack/omap3-beagle.conf b/tools/hwpack/omap3-beagle.conf
index 9657755120500ac804f2fe5034a65cae01a4003c..f77432c6eb9c25888ea2d6e94c5ea49d129fa097 100644
--- a/tools/hwpack/omap3-beagle.conf
+++ b/tools/hwpack/omap3-beagle.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
 usbnet_mem="8192"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/tools/hwpack/omap4-panda-a4.conf b/tools/hwpack/omap4-panda-a4.conf
index ed40f50dbe0f3131fa916959b0879dadb0ffd9f4..d081710139eb200a856d34530ceb4b1a23cf1b2c 100644
--- a/tools/hwpack/omap4-panda-a4.conf
+++ b/tools/hwpack/omap4-panda-a4.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
 usbnet_mem="16384"
 conf_fdtfile="omap4-panda-a4.dtb"
 #need_ti_connectivity_firmware=1
diff --git a/tools/hwpack/omap4-panda-es-b3.conf b/tools/hwpack/omap4-panda-es-b3.conf
index e8cd1d3fd20e1f696f96b95a9eb276ae2dc96add..cb0ecb469679d6071dee7179e59e719a830d3cf5 100644
--- a/tools/hwpack/omap4-panda-es-b3.conf
+++ b/tools/hwpack/omap4-panda-es-b3.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
 usbnet_mem="16384"
 conf_fdtfile="omap4-panda-es-b3.dtb"
 #need_ti_connectivity_firmware=1
diff --git a/tools/hwpack/omap4-panda-es.conf b/tools/hwpack/omap4-panda-es.conf
index a60445485683c4e539bb9c75526b7a6c4e5daca4..886d1652150887105a516ed281e74bbe3567398a 100644
--- a/tools/hwpack/omap4-panda-es.conf
+++ b/tools/hwpack/omap4-panda-es.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
 usbnet_mem="16384"
 conf_fdtfile="omap4-panda-es.dtb"
 #need_ti_connectivity_firmware=1
diff --git a/tools/hwpack/omap4-panda.conf b/tools/hwpack/omap4-panda.conf
index a4e6aa2ff8e4244c55715ba4bf042359205b1970..8b022bcf74e1494b8c6c10920f4bf1ad429135f7 100644
--- a/tools/hwpack/omap4-panda.conf
+++ b/tools/hwpack/omap4-panda.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
 usbnet_mem="16384"
 conf_fdtfile="omap4-panda.dtb"
 #need_ti_connectivity_firmware=1
diff --git a/tools/hwpack/omap5-uevm.conf b/tools/hwpack/omap5-uevm.conf
index 2458bc0de6164e7af2a3c4733b8a953de8a341e4..778b4ac432f473f9e8de479ae88e2ac8d9677eba 100644
--- a/tools/hwpack/omap5-uevm.conf
+++ b/tools/hwpack/omap5-uevm.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.img"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
 #Preferred Kernel
 conf_kernel="armv7_lpae"
 
diff --git a/tools/hwpack/wandboard-dual.conf b/tools/hwpack/wandboard-dual.conf
index 1b256eca055006c0f51174f940550326627e0088..bc949af5e20fb8355c92d772e5112b1ae18b30aa 100644
--- a/tools/hwpack/wandboard-dual.conf
+++ b/tools/hwpack/wandboard-dual.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.imx"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
 usbnet_mem=
 conf_fdtfile="imx6dl-wandboard.dtb"
 need_wandboard_firmware=1
diff --git a/tools/hwpack/wandboard-quad.conf b/tools/hwpack/wandboard-quad.conf
index 24e06894d004ca3c0b0bdf5d8288988270a71de9..2e4de5e37cb6f245cdf011e81f48acebbb00ffb2 100644
--- a/tools/hwpack/wandboard-quad.conf
+++ b/tools/hwpack/wandboard-quad.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.imx"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
 usbnet_mem=
 conf_fdtfile="imx6q-wandboard.dtb"
 need_wandboard_firmware=1
diff --git a/tools/hwpack/wandboard-solo.conf b/tools/hwpack/wandboard-solo.conf
index a2fceb321a2e72da85294f9c3ccea0c2f4c4f104..c5be482eba22e33b10584fe889ea27aff73d5afd 100644
--- a/tools/hwpack/wandboard-solo.conf
+++ b/tools/hwpack/wandboard-solo.conf
@@ -21,9 +21,6 @@ boot_name="u-boot.imx"
 #CONFIG_SUPPORT_RAW_INITRD
 #CONFIG_CMD_FS_GENERIC
 
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
 usbnet_mem=
 conf_fdtfile="imx6dl-wandboard.dtb"
 need_wandboard_firmware=1