From 2a1aae2558928c1d6c9ec78015b170e9b1c5594d Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 31 Jul 2013 16:47:34 -0500
Subject: [PATCH] wandboard: quad/dl: enable the wifi firmware

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/imx6dl-wandboard.conf |  1 +
 hwpack/imx6q-wandboard.conf  |  1 +
 hwpack/wandboard-dl.conf     |  1 +
 hwpack/wandboard-quad.conf   |  1 +
 mk_mmc.sh                    | 28 ++++++++++++++++++++--------
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/hwpack/imx6dl-wandboard.conf b/hwpack/imx6dl-wandboard.conf
index c4d2da6..5323a7d 100644
--- a/hwpack/imx6dl-wandboard.conf
+++ b/hwpack/imx6dl-wandboard.conf
@@ -53,6 +53,7 @@ conf_fdtaddr="0x11000000"
 conf_initrdaddr="0x12A00000"
 conf_fdtfile="imx6dl-wandboard.dtb"
 need_dtbs=1
+need_wandboard_firmware=1
 
 SYSTEM="video"
 
diff --git a/hwpack/imx6q-wandboard.conf b/hwpack/imx6q-wandboard.conf
index bfa5391..44861c5 100644
--- a/hwpack/imx6q-wandboard.conf
+++ b/hwpack/imx6q-wandboard.conf
@@ -53,6 +53,7 @@ conf_fdtaddr="0x11000000"
 conf_initrdaddr="0x12A00000"
 conf_fdtfile="imx6q-wandboard.dtb"
 need_dtbs=1
+need_wandboard_firmware=1
 
 SYSTEM="video"
 
diff --git a/hwpack/wandboard-dl.conf b/hwpack/wandboard-dl.conf
index 8ad028d..4b4020e 100644
--- a/hwpack/wandboard-dl.conf
+++ b/hwpack/wandboard-dl.conf
@@ -53,6 +53,7 @@ conf_fdtaddr="0x11000000"
 conf_initrdaddr="0x12A00000"
 #conf_fdtfile="imx6dl-wandboard.dtb"
 #need_dtbs=1
+need_wandboard_firmware=1
 
 SYSTEM="video"
 
diff --git a/hwpack/wandboard-quad.conf b/hwpack/wandboard-quad.conf
index 99450ad..78262a9 100644
--- a/hwpack/wandboard-quad.conf
+++ b/hwpack/wandboard-quad.conf
@@ -53,6 +53,7 @@ conf_fdtaddr="0x11000000"
 conf_initrdaddr="0x12A00000"
 #conf_fdtfile="imx6q-wandboard.dtb"
 #need_dtbs=1
+need_wandboard_firmware=1
 
 SYSTEM="video"
 
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 0c2e009..b4edc4b 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -699,14 +699,6 @@ dl_device_firmware () {
 	mkdir -p ${TEMPDIR}/firmware/
 	DL_WGET="wget --directory-prefix=${TEMPDIR}/firmware/"
 
-	if [ "${need_ti_connectivity_firmware}" ] ; then
-		dl_linux_firmware
-		echo "-----------------------------"
-		echo "Adding Firmware for onboard WiFi/Bluetooth module"
-		echo "-----------------------------"
-		cp -r "${DIR}/dl/linux-firmware/ti-connectivity" ${TEMPDIR}/firmware/
-	fi
-
 	if [ "${need_am335x_firmware}" ] ; then
 		dl_am335_firmware
 		echo "-----------------------------"
@@ -722,6 +714,26 @@ dl_device_firmware () {
 			cp -v "${TEMPDIR}/cape-firmware"/*.dtbo ${TEMPDIR}/firmware/ || true
 		fi
 	fi
+
+	if [ "${need_ti_connectivity_firmware}" ] ; then
+		dl_linux_firmware
+		echo "-----------------------------"
+		echo "Adding Firmware for onboard WiFi/Bluetooth module"
+		echo "-----------------------------"
+		cp -r "${DIR}/dl/linux-firmware/ti-connectivity" ${TEMPDIR}/firmware/
+	fi
+
+	if [ "${need_wandboard_firmware}" ] ; then
+		dl_linux_firmware
+		echo "-----------------------------"
+		echo "Adding Firmware for onboard WiFi/Bluetooth module"
+		echo "-----------------------------"
+		mkdir -p ${TEMPDIR}/firmware/brcm/
+		cp -v "${DIR}/dl/linux-firmware/brcm/brcmfmac4329.bin" ${TEMPDIR}/firmware/brcm/brcmfmac-sdio.bin
+		wget --directory-prefix=${TEMPDIR}/firmware/brcm/ https://raw.github.com/Freescale/meta-fsl-arm-extra/master/recipes-bsp/broadcom-nvram-config/files/wandboard/nvram.txt
+		mv -v ${TEMPDIR}/firmware/brcm/nvram.txt  ${TEMPDIR}/firmware/brcm/brcmfmac-sdio.txt
+	fi
+
 }
 
 initrd_add_firmware () {