wl12xx-firmware_r5: fix default wl1271-nvs.bin

4 files changed, 10 insertions, 6 deletions

diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/wl1271-nvs.bin b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/wl1271-nvs.bin
new file mode 100644
index 0000000..91978f9
--- /dev/null
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp4.01/wl1271-nvs.bin
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/wl1271-nvs.bin b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/wl1271-nvs.bin
new file mode 100644
index 0000000..91978f9
--- /dev/null
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware-r5.sp7.01/wl1271-nvs.bin
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
index 6805797..15e1711 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp4.01.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI wl1271 firmware"
 HOMEPAGE = "http://processors.wiki.ti.com/index.php/ARM_Processor_Open_Source_Wireless_Connectivity"
-PR="r3"
+PR="r5"
 
 # bluetooth firmware from TI-ECS on github.com:
 # https://github.com/TI-ECS/bt-firmware.git
@@ -16,6 +16,7 @@ SRCREV = "ol_R5.SP4.01"
 
 SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git \
 			file://TIInit_7.6.15.bts \
+            file://wl1271-nvs.bin \
 			"
 
 S = "${WORKDIR}/git"
@@ -31,8 +32,9 @@ do_install() {
 	install -d ${D}/lib/firmware/ti-connectivity
 	# wifi firmware
 	install ${S}/hw/firmware/wl127*-fw-*.bin ${D}/lib/firmware/ti-connectivity
-	# factory nvs file
-	install ${S}/hw/firmware/wl1271-nvs.bin ${D}/lib/firmware/ti-connectivity/wl1271-nvs.bin.factory
+	# uncalibrated nvs file
+	# use local copy since the one in hw/firmware dir is *wrong*
+	install ${WORKDIR}/wl1271-nvs.bin ${D}/lib/firmware/ti-connectivity/wl1271-nvs.bin.factory
 	# bluetooth firmware
 	install ${WORKDIR}/TIInit_7.6.15.bts ${D}/lib/firmware/TIInit_7.6.15.bts
 }
diff --git a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp7.01.bb b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp7.01.bb
index d31d921..364ea95 100644
--- a/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp7.01.bb
+++ b/multitech/recipes/wl12xx-firmware/wl12xx-firmware_r5.sp7.01.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TI wl1271 firmware"
 HOMEPAGE = "http://processors.wiki.ti.com/index.php/ARM_Processor_Open_Source_Wireless_Connectivity"
-PR="r2"
+PR="r3"
 
 # bluetooth firmware from TI-ECS on github.com:
 # https://github.com/TI-ECS/bt-firmware.git
@@ -16,6 +16,7 @@ SRCREV = "ol_R5.SP7.01"
 
 SRC_URI = "git://github.com/TI-OpenLink/ti-utils.git;protocol=git \
 			file://TIInit_7.6.15.bts \
+            file://wl1271-nvs.bin \
 			"
 
 S = "${WORKDIR}/git"
@@ -31,8 +32,9 @@ do_install() {
 	install -d ${D}/lib/firmware/ti-connectivity
 	# wifi firmware
 	install ${S}/hw/firmware/wl127*-fw-*.bin ${D}/lib/firmware/ti-connectivity
-	# factory nvs file
-	install ${S}/hw/firmware/wl1271-nvs.bin ${D}/lib/firmware/ti-connectivity/wl1271-nvs.bin.factory
+	# uncalibrated nvs file
+	# use local copy since the one in hw/firmware dir is *wrong*
+	install ${WORKDIR}/wl1271-nvs.bin ${D}/lib/firmware/ti-connectivity/wl1271-nvs.bin.factory
 	# bluetooth firmware
 	install ${WORKDIR}/TIInit_7.6.15.bts ${D}/lib/firmware/TIInit_7.6.15.bts
 }