[openfirmware] r1696 - cpu/x86/pc/olpc/via
svn at openfirmware.info
svn at openfirmware.info
Mon Jan 25 09:34:06 CET 2010
Author: wmb
Date: 2010-01-25 09:34:05 +0100 (Mon, 25 Jan 2010)
New Revision: 1696
Added:
cpu/x86/pc/olpc/via/crypto-version.fth
cpu/x86/pc/olpc/via/ec-version.fth
cpu/x86/pc/olpc/via/fw-version.fth
cpu/x86/pc/olpc/via/mcnand-version.fth
cpu/x86/pc/olpc/via/wlan-version.fth
Modified:
cpu/x86/pc/olpc/via/ec.bth
cpu/x86/pc/olpc/via/mcastnand.bth
cpu/x86/pc/olpc/via/olpc.bth
cpu/x86/pc/olpc/via/sd8686.bth
cpu/x86/pc/olpc/via/verify.bth
cpu/x86/pc/olpc/via/versions.fth
Log:
XO-1.5 - Split the versions.fth file into separate files for each versioned component to eliminate unnecessary rebuilding.
Added: cpu/x86/pc/olpc/via/crypto-version.fth
===================================================================
--- cpu/x86/pc/olpc/via/crypto-version.fth (rev 0)
+++ cpu/x86/pc/olpc/via/crypto-version.fth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -0,0 +1,6 @@
+\ The public keys
+macro: KEYS mpkeys
+\ macro: KEYS testkeys
+
+\ The bios_verify image
+macro: CRYPTO_VERSION 0.5
Added: cpu/x86/pc/olpc/via/ec-version.fth
===================================================================
--- cpu/x86/pc/olpc/via/ec-version.fth (rev 0)
+++ cpu/x86/pc/olpc/via/ec-version.fth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -0,0 +1,7 @@
+\ The EC microcode
+macro: EC_VERSION 1_9_21
+
+\ Alternate command for getting EC microcode, for testing new versions.
+\ Temporarily uncomment the line and modify the path as necessary
+\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img
+\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img
Modified: cpu/x86/pc/olpc/via/ec.bth
===================================================================
--- cpu/x86/pc/olpc/via/ec.bth 2010-01-24 22:52:12 UTC (rev 1695)
+++ cpu/x86/pc/olpc/via/ec.bth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -3,7 +3,7 @@
command: &builder &this
build-now
-fload ${BP}/cpu/x86/pc/olpc/via/versions.fth
+fload ${BP}/cpu/x86/pc/olpc/via/ec-version.fth
\ If there is a GET_EC macro, use it instead of fetching the released version.
" ${GET_EC}" expand$ nip [if]
Added: cpu/x86/pc/olpc/via/fw-version.fth
===================================================================
--- cpu/x86/pc/olpc/via/fw-version.fth (rev 0)
+++ cpu/x86/pc/olpc/via/fw-version.fth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -0,0 +1,3 @@
+\ The overall firmware revision
+macro: FW_MAJOR A
+macro: FW_MINOR 29c
Modified: cpu/x86/pc/olpc/via/mcastnand.bth
===================================================================
--- cpu/x86/pc/olpc/via/mcastnand.bth 2010-01-24 22:52:12 UTC (rev 1695)
+++ cpu/x86/pc/olpc/via/mcastnand.bth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -3,7 +3,7 @@
command: &builder &this
build-now
-fload ${BP}/cpu/x86/pc/olpc/via/versions.fth
+fload ${BP}/cpu/x86/pc/olpc/via/mcnand-version.fth
1 [if]
" ${MCNAND_VERSION}" expand$ " test" $= [if]
Added: cpu/x86/pc/olpc/via/mcnand-version.fth
===================================================================
--- cpu/x86/pc/olpc/via/mcnand-version.fth (rev 0)
+++ cpu/x86/pc/olpc/via/mcnand-version.fth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -0,0 +1,8 @@
+\ The multicast NAND updater code version
+\ Use a specific git commit ID for a formal release or "test" for development.
+\ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
+\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
+\ is not already present, then you can modify the git subtree as needed.
+macro: MCNAND_VERSION 4ead46ac3b8b2a52e20661c27f7c72a77b38a16b
+\ macro: MCNAND_VERSION test
+\ macro: MCNAND_VERSION HEAD
Modified: cpu/x86/pc/olpc/via/olpc.bth
===================================================================
--- cpu/x86/pc/olpc/via/olpc.bth 2010-01-24 22:52:12 UTC (rev 1695)
+++ cpu/x86/pc/olpc/via/olpc.bth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -39,7 +39,7 @@
build-now
-fload ${BP}/cpu/x86/pc/olpc/via/versions.fth
+fload ${BP}/cpu/x86/pc/olpc/via/fw-version.fth
" macro: FW_VERSION Q3${FW_MAJOR}${FW_MINOR}" expand$ eval
Modified: cpu/x86/pc/olpc/via/sd8686.bth
===================================================================
--- cpu/x86/pc/olpc/via/sd8686.bth 2010-01-24 22:52:12 UTC (rev 1695)
+++ cpu/x86/pc/olpc/via/sd8686.bth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -3,7 +3,7 @@
command: &builder &this
build-now
-fload ${BP}/cpu/x86/pc/olpc/via/versions.fth
+fload ${BP}/cpu/x86/pc/olpc/via/wlan-version.fth
" ${GET_WLAN}" expand$ nip [if]
" ${GET_WLAN}" expand$ $sh
Modified: cpu/x86/pc/olpc/via/verify.bth
===================================================================
--- cpu/x86/pc/olpc/via/verify.bth 2010-01-24 22:52:12 UTC (rev 1695)
+++ cpu/x86/pc/olpc/via/verify.bth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -3,7 +3,7 @@
command: &builder &this
build-now
-fload ${BP}/cpu/x86/pc/olpc/via/versions.fth
+fload ${BP}/cpu/x86/pc/olpc/via/crypto-version.fth
" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh
" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh
Modified: cpu/x86/pc/olpc/via/versions.fth
===================================================================
--- cpu/x86/pc/olpc/via/versions.fth 2010-01-24 22:52:12 UTC (rev 1695)
+++ cpu/x86/pc/olpc/via/versions.fth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -1,35 +1,7 @@
\ Version numbers of items included in the OLPC firmware image
-\ The overall firmware revision
-macro: FW_MAJOR A
-macro: FW_MINOR 29
-
-\ The EC microcode
-macro: EC_VERSION 1_9_21
-
-\ Alternate command for getting EC microcode, for testing new versions.
-\ Temporarily uncomment the line and modify the path as necessary
-\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img
-\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img
-
-macro: KEYS mpkeys
-\ macro: KEYS testkeys
-
-\ The wireless LAN module firmware
-macro: WLAN_VERSION 9.70.7.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
-
-\ The bios_verify image
-macro: CRYPTO_VERSION 0.5
-
-\ The multicast NAND updater code version
-\ Use a specific git commit ID for a formal release or "test" for development.
-\ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
-\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
-\ is not already present, then you can modify the git subtree as needed.
-macro: MCNAND_VERSION 0fcff94005b9570e4b7f1406f2f9e155f828b6d2
-\ macro: MCNAND_VERSION test
-\ macro: MCNAND_VERSION HEAD
+fload ${BP}/cpu/x86/pc/olpc/via/fw-version.fth
+fload ${BP}/cpu/x86/pc/olpc/via/ec-version.fth
+fload ${BP}/cpu/x86/pc/olpc/via/wlan-version.fth
+fload ${BP}/cpu/x86/pc/olpc/via/crypto-version.fth
+fload ${BP}/cpu/x86/pc/olpc/via/mcnand-version.fth
Added: cpu/x86/pc/olpc/via/wlan-version.fth
===================================================================
--- cpu/x86/pc/olpc/via/wlan-version.fth (rev 0)
+++ cpu/x86/pc/olpc/via/wlan-version.fth 2010-01-25 08:34:05 UTC (rev 1696)
@@ -0,0 +1,6 @@
+\ The wireless LAN module firmware
+macro: WLAN_VERSION 9.70.7.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
More information about the openfirmware
mailing list