r1186 - in cpu/x86/pc: biosload olpc/via

Author: wmb
Date: 2009-05-13 23:59:04 +0200 (Wed, 13 May 2009)
New Revision: 1186

Added:
   cpu/x86/pc/olpc/via/sd8686.bth
Modified:
   cpu/x86/pc/biosload/sd8686.bth
   cpu/x86/pc/olpc/via/versions.fth
Log:
OLPC VIA - added versioning support for the wireless firmware checkout.

Modified: cpu/x86/pc/biosload/sd8686.bth
===================================================================
--- cpu/x86/pc/biosload/sd8686.bth	2009-05-13 20:15:07 UTC (rev 1185)
+++ cpu/x86/pc/biosload/sd8686.bth	2009-05-13 21:59:04 UTC (rev 1186)
@@ -3,21 +3,4 @@
 command: &builder &this
 build-now

-\ fload ${BP}/cpu/x86/pc/biosload/versions.fth
-
-" rm -f sd8686.bin sd8686_helper.bin" expand$ $sh
-
-" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686.bin" expand$ $sh
-" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686.bin.md5" expand$ $sh
-" md5sum -b sd8686.bin | cmp - sd8686.bin.md5" expand$ $sh
-
-" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh
-" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh
-" md5sum -b sd8686_helper.bin | cmp - sd8686_helper.bin.md5" expand$ $sh
-
-" rm sd8686.bin.md5 sd8686_helper.bin.md5" expand$ $sh
-
-\ This forces the creation of a .log file, so we don't re-fetch
-writing sd8686.version
-" ${WLAN_VERSION}"n" expand$  ofd @ fputs
-ofd @ fclose
+fload ${BP}/cpu/x86/pc/olpc/via/sd8686.bth

Added: cpu/x86/pc/olpc/via/sd8686.bth
===================================================================
--- cpu/x86/pc/olpc/via/sd8686.bth	                        (rev 0)
+++ cpu/x86/pc/olpc/via/sd8686.bth	2009-05-13 21:59:04 UTC (rev 1186)
@@ -0,0 +1,25 @@
+purpose: Fetch the firmware for the Marvell 8686 wireless LAN module
+
+command: &builder &this
+build-now
+
+fload ${BP}/cpu/x86/pc/olpc/via/versions.fth
+
+" rm -f sd8686.bin sd8686_helper.bin" expand$ $sh
+
+" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-$%7BWLAN_VERSION%7D.bin" expand$ $sh
+" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-$%7BWLAN_VERSION%7D.bin.m..." expand$ $sh
+" md5sum -b sd8686-${WLAN_VERSION}.bin | cmp - sd8686-${WLAN_VERSION}.bin.md5" expand$ $sh
+
+" mv sd8686-${WLAN_VERSION}.bin sd8686.bin" expand$ $sh
+
+" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh
+" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh
+" md5sum -b sd8686_helper.bin | cmp - sd8686_helper.bin.md5" expand$ $sh
+
+" rm sd8686-${WLAN_VERSION}.bin.md5 sd8686_helper.bin.md5" expand$ $sh
+
+\ This forces the creation of a .log file, so we don't re-fetch
+writing sd8686.version
+" ${WLAN_VERSION}"n" expand$  ofd @ fputs
+ofd @ fclose

Modified: cpu/x86/pc/olpc/via/versions.fth
===================================================================
--- cpu/x86/pc/olpc/via/versions.fth	2009-05-13 20:15:07 UTC (rev 1185)
+++ cpu/x86/pc/olpc/via/versions.fth	2009-05-13 21:59:04 UTC (rev 1186)
@@ -2,7 +2,7 @@

\ The overall firmware revision
 macro: FW_MAJOR A
-macro: FW_MINOR 02a
+macro: FW_MINOR 02c

\ The EC microcode
 macro: EC_VERSION e34
@@ -15,8 +15,7 @@
 \ macro: KEYS testkeys

\ The wireless LAN module firmware
-macro: WLAN_RPM ${WLAN_VERSION}.olpc1
-macro: WLAN_VERSION 5.110.22.p23
+macro: WLAN_VERSION 9.70.7.p0

\ The bios_verify image
 macro: CRYPTO_VERSION 0.2