[openfirmware] [commit] r1872 - in cpu/x86/pc/olpc: build via via/build

repository service svn at openfirmware.info
Wed Jul 14 23:01:12 CEST 2010


Author: wmb
Date: Wed Jul 14 23:01:11 2010
New Revision: 1872
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1872

Log:
OLPC XO-1.5 - Fixed build problems related to the use of the new thin firmware

Modified:
   cpu/x86/pc/olpc/build/Makefile
   cpu/x86/pc/olpc/via/build/Makefile
   cpu/x86/pc/olpc/via/sd8686.bth
   cpu/x86/pc/olpc/via/wlan-version.fth

Modified: cpu/x86/pc/olpc/build/Makefile
==============================================================================
--- cpu/x86/pc/olpc/build/Makefile	Wed Jul 14 22:34:18 2010	(r1871)
+++ cpu/x86/pc/olpc/build/Makefile	Wed Jul 14 23:01:11 2010	(r1872)
@@ -36,7 +36,7 @@
 	@ln -sf ../../../${OS}/forth build
 
 clean:
-	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom ec.version olpc.version
+	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version *.bin *.tag tags
 
 clean-all: clean
 	@make -C ../../../build clean

Modified: cpu/x86/pc/olpc/via/build/Makefile
==============================================================================
--- cpu/x86/pc/olpc/via/build/Makefile	Wed Jul 14 22:34:18 2010	(r1871)
+++ cpu/x86/pc/olpc/via/build/Makefile	Wed Jul 14 23:01:11 2010	(r1872)
@@ -37,7 +37,7 @@
 	@ln -sf ${CPUDIR}/${OS}/forth build
 
 clean:
-	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom ec.version olpc.version
+	rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version *.bin *.tag tags
 
 clean-all: clean
 	@make -C ${CPUDIR}/build clean

Modified: cpu/x86/pc/olpc/via/sd8686.bth
==============================================================================
--- cpu/x86/pc/olpc/via/sd8686.bth	Wed Jul 14 22:34:18 2010	(r1871)
+++ cpu/x86/pc/olpc/via/sd8686.bth	Wed Jul 14 23:01:11 2010	(r1872)
@@ -5,22 +5,24 @@
 
 fload ${BP}/cpu/x86/pc/olpc/via/wlan-version.fth
 
+" macro: WLAN_FILE lbtf_sdio-${WLAN_VERSION}" 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/sd8686-${WLAN_VERSION}.bin" expand$ $sh
-" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-${WLAN_VERSION}.bin.md5" expand$ $sh
-" md5sum -b sd8686-${WLAN_VERSION}.bin | cmp - sd8686-${WLAN_VERSION}.bin.md5" expand$ $sh
+" wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin" expand$ $sh
+" wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin.md5" expand$ $sh
+" md5sum ${WLAN_FILE}.bin | cmp - ${WLAN_FILE}.bin.md5" expand$ $sh
 
-" mv sd8686-${WLAN_VERSION}.bin sd8686.bin" expand$ $sh
+" mv ${WLAN_FILE}.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
+" rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5" expand$ $sh
 [then]
 
 \ This forces the creation of a .log file, so we don't re-fetch

Modified: cpu/x86/pc/olpc/via/wlan-version.fth
==============================================================================
--- cpu/x86/pc/olpc/via/wlan-version.fth	Wed Jul 14 22:34:18 2010	(r1871)
+++ cpu/x86/pc/olpc/via/wlan-version.fth	Wed Jul 14 23:01:11 2010	(r1872)
@@ -1,7 +1,7 @@
 \ The wireless LAN module firmware
-\ macro: WLAN_VERSION 9.70.7.p0
+macro: WLAN_VERSION 9.0.7.p2
 
 \ 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
-macro: GET_WLAN wget http://dev.laptop.org/pub/firmware/libertas/thinfirm/lbtf_sdio-9.0.7.p2.bin -O sd8686.bin
+\ macro: GET_WLAN wget http://dev.laptop.org/pub/firmware/libertas/thinfirm/lbtf_sdio-9.0.7.p2.bin -O sd8686.bin



More information about the openfirmware mailing list