From 23699121519e3131076ac23166b66c25088124dd Mon Sep 17 00:00:00 2001
From: Mike Fiore <mfiore@multitech.com>
Date: Wed, 24 Apr 2013 16:34:16 -0500
Subject: wl12xx-scripts: calibrate script takes mac as param or reads it from
 sysfs

---
 .../wl12xx-scripts/wl12xx-scripts-1.0/calibrate-wifi.sh    | 14 ++++++++------
 multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb     |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0/calibrate-wifi.sh b/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0/calibrate-wifi.sh
index bb14702..8d4f8d0 100644
--- a/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0/calibrate-wifi.sh
+++ b/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0/calibrate-wifi.sh
@@ -1,17 +1,19 @@
 #!/bin/bash
 
-if [[ $# -ne 1 ]]; then
-	echo "usage: $0 <wifi-mac-address>"
-	exit 1
-fi
-
-WIFIMAC=$1
 OEM_DIR="/var/oem"
 NVS_DIR="mts"
 NVS_OEM_FILE="$OEM_DIR/$NVS_DIR/wl1271-nvs.bin"
 NVS_FILE="/lib/firmware/ti-connectivity/wl1271-nvs.bin"
 NVS_DEFAULT_FILE="$NVS_FILE.factory"
 
+WIFIMAC=`mts-io-sysfs show mac-wifi`
+
+if [[ $# -eq 1 ]]; then
+	WIFIMAC=$1
+fi
+
+echo "mac-wifi: $WIFIMAC"
+
 # detect mci driver
 if find /lib/modules -name "atmel-mci.ko" | grep -q "atmel-mci"; then
 	MCI_MODULE="atmel_mci"
diff --git a/multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb b/multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb
index d43d010..23f0160 100644
--- a/multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb
+++ b/multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Scripts to enable and calibrate the wifi chip on the OCG"
 HOMEPAGE = "http://www.multitech.net/"
 LICENSE = "GPL"
 
-PR = "r4"
+PR = "r5"
 
 inherit update-rc.d
 
-- 
cgit v1.2.3