diff --git a/hwpack/udoo.conf b/hwpack/udoo.conf
index 9611e8e..a04d882 100644
--- a/hwpack/udoo.conf
+++ b/hwpack/udoo.conf
@@ -34,8 +34,6 @@ kernel_subarch="armv7"
 kernel_repo="LTS"
 #kernel_repo="STABLE"
 #kernel_repo="TESTING"
-#
-need_udoo_firmware=1
 
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/hwpack/wandboard.conf b/hwpack/wandboard.conf
index b97cb8c..edd7397 100644
--- a/hwpack/wandboard.conf
+++ b/hwpack/wandboard.conf
@@ -34,8 +34,6 @@ kernel_subarch="armv7"
 kernel_repo="LTS"
 #kernel_repo="STABLE"
 #kernel_repo="TESTING"
-#
-need_wandboard_firmware=1
 
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index a7f1997..d3f7434 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -448,7 +448,7 @@ dl_device_firmware () {
 		cp -r "${DIR}/dl/linux-firmware/ti-connectivity" ${TEMPDIR}/firmware/
 	fi
 
-	if [ "${need_wandboard_firmware}" ] ; then
+	if [ "x${conf_board}" = "xwandboard" ] ; then
 		dl_linux_firmware
 		echo "-----------------------------"
 		echo "Adding Firmware for onboard WiFi/Bluetooth module"
@@ -467,7 +467,7 @@ dl_device_firmware () {
 		${wget_brcm} ${http_brcm}/brcmfmac4330-sdio.txt
 	fi
 
-	if [ "${need_udoo_firmware}" ] ; then
+	if [ "x${conf_board}" = "xudoo" ] ; then
 		dl_linux_firmware
 		echo "-----------------------------"
 		echo "Adding Firmware for onboard WiFi/Bluetooth module"
@@ -478,7 +478,6 @@ dl_device_firmware () {
 			cp -v "${DIR}/dl/linux-firmware/rt2870.bin" ${TEMPDIR}/firmware/rt2870.bin
 		fi
 	fi
-
 }
 
 initrd_add_firmware () {