wl12xx-scripts: drop inc file, enable wifi earlier, load atmel_mci always

3 files changed, 22 insertions, 22 deletions

diff --git a/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0.inc b/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0.inc
deleted file mode 100644
index fee4c53..0000000
--- a/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "GPL"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "enable-wifi.sh"
-INITSCRIPT_PARAMS = "start 91 S ."
-
-S = ${WORKDIR}/wl12xx-scripts-1.0/
-
-do_install() {
-	install -d ${D}${sbindir}
-	install -m 755 ${WORKDIR}/wl12xx-scripts-1.0/calibrate-wifi.sh ${D}${sbindir}
-	install -d ${D}${sysconfdir}/init.d
-	install -m 755 ${WORKDIR}/wl12xx-scripts-1.0/enable-wifi.sh ${D}${sysconfdir}/init.d
-	install -d ${D}${sysconfdir}/default
-	install -m 644 ${WORKDIR}/wl12xx-scripts-1.0/wifi ${D}${sysconfdir}/default/
-}
diff --git a/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0/enable-wifi.sh b/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0/enable-wifi.sh
index 976d82d..2da1e24 100644
--- a/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0/enable-wifi.sh
+++ b/multitech/recipes/wl12xx-scripts/wl12xx-scripts-1.0/enable-wifi.sh
@@ -9,7 +9,7 @@ NVS_FILE="/lib/firmware/ti-connectivity/wl1271-nvs.bin"
 NVS_DEFAULT_FILE="$NVS_FILE.factory"
 
 if [[ $WIFIENABLED == "yes" ]]; then
-	echo "wl12xx: enabling wifi"
+	echo "Wifi: enabling"
 
 	# make sure nvs file exists in /var/oem/mts/
 	if [[ ! -f $NVS_OEM_FILE ]]; then
@@ -34,5 +34,7 @@ if [[ $WIFIENABLED == "yes" ]]; then
 	modprobe atmel_mci
 	sleep 3
 else
-	echo "NOT enabling wifi"
+	echo "Wifi: disabled"
+	mts-io-sysfs store wlan-enabled 0
+	modprobe atmel_mci
 fi
diff --git a/multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb b/multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb
index fa7eacb..98a6797 100644
--- a/multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb
+++ b/multitech/recipes/wl12xx-scripts/wl12xx-scripts_1.0.bb
@@ -1,11 +1,27 @@
 DESCRIPTION = "Scripts to enable and calibrate the wifi chip on the OCG"
+HOMEPAGE = "http://www.multitech.net/"
+LICENSE = "GPL"
 
-require wl12xx-scripts-1.0.inc
+PR = "r3"
 
-PR = "r2"
+inherit update-rc.d
 
 SRC_URI = "file://wl12xx-scripts-1.0/calibrate-wifi.sh \
 	file://wl12xx-scripts-1.0/wifi \
 	file://wl12xx-scripts-1.0/enable-wifi.sh"
 
 CONFFILES_${PN} += "${sysconfdir}/default/wifi"
+
+INITSCRIPT_NAME = "enable-wifi.sh"
+INITSCRIPT_PARAMS = "start 40 S ."
+
+S = ${WORKDIR}/wl12xx-scripts-1.0/
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 755 ${WORKDIR}/wl12xx-scripts-1.0/calibrate-wifi.sh ${D}${sbindir}
+	install -d ${D}${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/wl12xx-scripts-1.0/enable-wifi.sh ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/default
+	install -m 644 ${WORKDIR}/wl12xx-scripts-1.0/wifi ${D}${sysconfdir}/default/
+}