[openfirmware] [commit] r3340 - in cpu/arm/olpc: . 4.0

[repository service]

Author: wmb
Date: Thu Sep 27 03:23:16 2012
New Revision: 3340
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3340

Log:
OLPC XO-4 - Complete the job of adding the MV8787 firmware to the OFW image.

Added:
   cpu/arm/olpc/build-mv8787.fth
Modified:
   cpu/arm/olpc/4.0/olpc.bth
   cpu/arm/olpc/4.0/wlan-version.fth

Modified: cpu/arm/olpc/4.0/olpc.bth
==============================================================================
--- cpu/arm/olpc/4.0/olpc.bth	Thu Sep 27 03:22:07 2012	(r3339)
+++ cpu/arm/olpc/4.0/olpc.bth	Thu Sep 27 03:23:16 2012	(r3340)
@@ -6,6 +6,7 @@
 in: ${BP}/cpu/arm/olpc/4.0/build/resetvec.img
 in: ${BP}/cpu/arm/olpc/4.0/build/mcastnand.bin
 in: sd8686.bin
+in: mv8787.bin
 in: verify.img
 in: ${BP}/dev/usb2/device/hub/build/hub.fc
 in: ${BP}/dev/usb2/device/generic/build/generic.fc
@@ -84,7 +85,7 @@
 
    " sd8686_helper.bin"                          " helper_sd.bin" $add-deflated-dropin
    " sd8686.bin"                                 " sd8686.bin"    $add-deflated-dropin
-\  " mv8787.bin"                                 " mv8787.bin"    $add-deflated-dropin
+   " mv8787.bin"                                 " mv8787.bin"    $add-deflated-dropin
 
    " builton.fth"                       " probe-"          $add-dropin
 

Modified: cpu/arm/olpc/4.0/wlan-version.fth
==============================================================================
--- cpu/arm/olpc/4.0/wlan-version.fth	Thu Sep 27 03:22:07 2012	(r3339)
+++ cpu/arm/olpc/4.0/wlan-version.fth	Thu Sep 27 03:23:16 2012	(r3340)
@@ -5,6 +5,8 @@
 macro: WLAN_PREFIX lbtf_sdio-
 macro: WLAN_VERSION 9.0.7.p2
 
+macro: WLAN_8787_VERSION dd7193bc187a5182a6236cb6337699d2229c54b0
+
 \ Non-thin version
 \ macro: WLAN_SUBDIR
 \ macro: WLAN_PREFIX sd8686-

Added: cpu/arm/olpc/build-mv8787.fth
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ cpu/arm/olpc/build-mv8787.fth	Thu Sep 27 03:23:16 2012	(r3340)
@@ -0,0 +1,17 @@
+purpose: Common code for fetching and building the WLAN microcode
+
+\ The macro WLAN_VERSION, and optionally GET_WLAN, must be defined externally
+
+\needs to-file       fload ${BP}/forth/lib/tofile.fth
+\needs $md5sum-file  fload ${BP}/forth/lib/md5file.fth
+
+" ${GET_WLAN}" expand$  nip  [if]
+   " ${GET_WLAN}" expand$ $sh
+[else]
+
+" wget -q -O mv8787.bin 'http://git.marvell.com/?p=mwifiex-firmware.git;a=blob_plain;f=mrvl/sd8787_uapsta.bin;hb=${WLAN_8787_VERSION}'"  expand$ $sh
+
+\ This forces the creation of a .log file, so we don't re-fetch
+writing mv8787.version
+" ${WLAN_8787_VERSION}"n" expand$  ofd @ fputs
+ofd @ fclose