Author: wmb Date: Thu Dec 22 03:17:42 2011 New Revision: 2779 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2779
Log: OLPC XO-1.75 and XO-3 - revised build-wlan.fth and */wlan-version.fth to make it easier to select thin vs. non-thin WLAN firmware.
Modified: cpu/arm/olpc/1.75/wlan-version.fth cpu/arm/olpc/3.0/wlan-version.fth cpu/arm/olpc/build-wlan.fth
Modified: cpu/arm/olpc/1.75/wlan-version.fth ============================================================================== --- cpu/arm/olpc/1.75/wlan-version.fth Wed Dec 21 23:52:55 2011 (r2778) +++ cpu/arm/olpc/1.75/wlan-version.fth Thu Dec 22 03:17:42 2011 (r2779) @@ -1,6 +1,15 @@ \ The wireless LAN module firmware + +\ Thin firmware version +macro: WLAN_SUBDIR thinfirm/ +macro: WLAN_PREFIX lbtf_sdio- macro: WLAN_VERSION 9.0.7.p2
+\ Non-thin version +\ macro: WLAN_SUBDIR +\ macro: WLAN_PREFIX sd8686- +\ macro: WLAN_VERSION 9.70.20.p0 + \ Alternate command for getting WLAN firmware, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary \ macro: GET_WLAN cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686-9.70.7.p0.bin" sd8686.bin; cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686_helper.bin" sd8686_helper.bin
Modified: cpu/arm/olpc/3.0/wlan-version.fth ============================================================================== --- cpu/arm/olpc/3.0/wlan-version.fth Wed Dec 21 23:52:55 2011 (r2778) +++ cpu/arm/olpc/3.0/wlan-version.fth Thu Dec 22 03:17:42 2011 (r2779) @@ -1,6 +1,15 @@ \ The wireless LAN module firmware + +\ Thin firmware version +macro: WLAN_SUBDIR thinfirm/ +macro: WLAN_PREFIX lbtf_sdio- macro: WLAN_VERSION 9.0.7.p2
+\ Non-thin version +\ macro: WLAN_SUBDIR +\ macro: WLAN_PREFIX sd8686- +\ macro: WLAN_VERSION 9.70.20.p0 + \ Alternate command for getting WLAN firmware, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary \ macro: GET_WLAN cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686-9.70.7.p0.bin" sd8686.bin; cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686_helper.bin" sd8686_helper.bin
Modified: cpu/arm/olpc/build-wlan.fth ============================================================================== --- cpu/arm/olpc/build-wlan.fth Wed Dec 21 23:52:55 2011 (r2778) +++ cpu/arm/olpc/build-wlan.fth Thu Dec 22 03:17:42 2011 (r2779) @@ -5,27 +5,27 @@ \needs to-file fload ${BP}/forth/lib/tofile.fth \needs $md5sum-file fload ${BP}/forth/lib/md5file.fth
-" macro: WLAN_FILE lbtf_sdio-${WLAN_VERSION}" expand$ eval +" macro: WLAN_FILE ${WLAN_PREFIX}${WLAN_VERSION}.bin" expand$ eval
" ${GET_WLAN}" expand$ nip [if] " ${GET_WLAN}" expand$ $sh [else] " rm -f sd8686.bin sd8686_helper.bin" expand$ $sh
-" wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/$%7BWLAN_FILE%7D.bin" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/$%7BWLAN_FILE%7D.bin.md..." expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/libertas/$%7BWLAN_SUBDIR%7D$%7BWLAN_FILE%..." expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/libertas/$%7BWLAN_SUBDIR%7D$%7BWLAN_FILE%..." expand$ $sh
-to-file md5string " " " ${WLAN_FILE}.bin" expand$ $md5sum-file -" cmp md5string ${WLAN_FILE}.bin.md5" expand$ $sh +to-file md5string " " " ${WLAN_FILE}" expand$ $md5sum-file +" cmp md5string ${WLAN_FILE}.md5" expand$ $sh
-" cp ${WLAN_FILE}.bin sd8686.bin" expand$ $sh +" cp ${WLAN_FILE} 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 to-file md5string " *" " sd8686_helper.bin" $md5sum-file " cmp md5string sd8686_helper.bin.md5" expand$ $sh
-" rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5 md5string" expand$ $sh +" rm ${WLAN_FILE}.md5 sd8686_helper.bin.md5 md5string" expand$ $sh [then]
\ This forces the creation of a .log file, so we don't re-fetch