r709 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-11-04 18:29:50 +0100 (Sun, 04 Nov 2007)
New Revision: 709

Added:
   cpu/x86/pc/olpc/verify.bth
Removed:
   cpu/x86/pc/olpc/crypto.bth
Modified:
   cpu/x86/pc/olpc/olpc.bth
   cpu/x86/pc/olpc/versions.fth
Log:
OLPC - Fixed a build dependency problem that sometimes prevented the crypto keys from
being re-fetched automatically.

Deleted: cpu/x86/pc/olpc/crypto.bth
===================================================================
--- cpu/x86/pc/olpc/crypto.bth	2007-11-04 16:57:41 UTC (rev 708)
+++ cpu/x86/pc/olpc/crypto.bth	2007-11-04 17:29:50 UTC (rev 709)
@@ -1,18 +0,0 @@
-purpose: Fetch the Crypto code and keys
-
-command: &builder &this
-build-now
-
-fload ${BP}/cpu/x86/pc/olpc/versions.fth
-
-" wget http://dev.laptop.org/pub/firmware/crypto/bios_verify-$%7BCRYPTO_VERSION%7D.... -O verify.img" expand$ $sh
-" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/os.public        -O os.public"        expand$ $sh
-" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/fw.public        -O fw.public"        expand$ $sh
-" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/fs.public        -O fs.public"        expand$ $sh
-" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/lease.public     -O lease.public"     expand$ $sh
-" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/developer.public -O developer.public" expand$ $sh
-
-\ This forces the creation of an crypto.log file, so we don't re-fetch
-writing crypto.version
-" ${CRYPTO_VERSION}"n" expand$  ofd @ fputs
-ofd @ fclose

Modified: cpu/x86/pc/olpc/olpc.bth
===================================================================
--- cpu/x86/pc/olpc/olpc.bth	2007-11-04 16:57:41 UTC (rev 708)
+++ cpu/x86/pc/olpc/olpc.bth	2007-11-04 17:29:50 UTC (rev 709)
@@ -22,9 +22,8 @@
 in: ${BP}/dev/olpc/cafenand/build/cafenand.fc
 in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc
 in: ${BP}/clients/memtest86/memtest
-in: ec.img
-in: crypto.img
-in: usb8388.bin
+in: ${BP}/cpu/x86/pc/olpc/build/verify.img
+in: ${BP}/cpu/x86/pc/olpc/build/usb8388.bin
 in: ${BP}/dev/pci/build/pcibridg.fc

build-now

Added: cpu/x86/pc/olpc/verify.bth
===================================================================
--- cpu/x86/pc/olpc/verify.bth	                        (rev 0)
+++ cpu/x86/pc/olpc/verify.bth	2007-11-04 17:29:50 UTC (rev 709)
@@ -0,0 +1,18 @@
+purpose: Fetch the Crypto code and keys
+
+command: &builder &this
+build-now
+
+fload ${BP}/cpu/x86/pc/olpc/versions.fth
+
+" wget -nv http://dev.laptop.org/pub/firmware/crypto/$%7BKEYS%7D/os.public        -O os.public"        expand$ $sh
+" wget -nv http://dev.laptop.org/pub/firmware/crypto/$%7BKEYS%7D/fw.public        -O fw.public"        expand$ $sh
+" wget -nv http://dev.laptop.org/pub/firmware/crypto/$%7BKEYS%7D/fs.public        -O fs.public"        expand$ $sh
+" wget -nv http://dev.laptop.org/pub/firmware/crypto/$%7BKEYS%7D/lease.public     -O lease.public"     expand$ $sh
+" wget -nv http://dev.laptop.org/pub/firmware/crypto/$%7BKEYS%7D/developer.public -O developer.public" expand$ $sh
+" wget -nv http://dev.laptop.org/pub/firmware/crypto/bios_verify-$%7BCRYPTO_VERSION%7D.... -O verify.img" expand$ $sh
+
+\ This forces the creation of an verify.log file, so we don't re-fetch
+writing verify.version
+" ${CRYPTO_VERSION}"n" expand$  ofd @ fputs
+ofd @ fclose

Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth	2007-11-04 16:57:41 UTC (rev 708)
+++ cpu/x86/pc/olpc/versions.fth	2007-11-04 17:29:50 UTC (rev 709)
@@ -2,7 +2,7 @@

\ The overall firmware revision
 macro: FW_MAJOR D
-macro: FW_MINOR 03
+macro: FW_MINOR 03c

\ The EC microcode
 macro: EC_VERSION d02
@@ -11,6 +11,9 @@
 \ Temporarily uncomment the line and modify the path as necessary
 \ macro: GET_EC wget http://dev.laptop.org/~rsmith/shiny6.bin -O ec.img

+macro: KEYS mpkeys
+\ macro: KEYS testkeys
+
 \ The wireless LAN module firmware
 macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1
 macro: WLAN_VERSION 5.110.19.p0