[openfirmware] r1016 - cpu/x86/pc/olpc
svn at openfirmware.info
svn at openfirmware.info
Thu Dec 4 10:18:00 CET 2008
Author: wmb
Date: 2008-12-04 10:18:00 +0100 (Thu, 04 Dec 2008)
New Revision: 1016
Added:
cpu/x86/pc/olpc/nandcastui.fth
Modified:
cpu/x86/pc/olpc/fw.bth
cpu/x86/pc/olpc/mcastnand.bth
cpu/x86/pc/olpc/olpc.bth
Log:
OLPC - Moved nandcast user interface into separate file and added
commands to run the cloner and blaster.
Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth 2008-12-04 09:17:55 UTC (rev 1015)
+++ cpu/x86/pc/olpc/fw.bth 2008-12-04 09:18:00 UTC (rev 1016)
@@ -624,23 +624,8 @@
\ " wifi media lab 802.11" eval
\ " flash http:\\18.85.46.172\new.rom" eval
;
-: mcastnand
- " boot rom:mcastnand 239.255.1.2 12345 /nandflash" eval
- false to already-go?
-;
-: ucastnand
- " boot rom:mcastnand 10.20.0.16,,10.20.0.44 12345 /nandflash" eval
- false to already-go?
-;
-: nmcastnand \ Boot from network, for testing
- " boot http:\\10.20.0.14\mcastnand 239.255.1.2 12345 /nandflash" eval
- false to already-go?
-;
-: dmcastnand \ Boot from USB disk, for testing
- " boot disk:\mcnand 239.255.1.2 12345 /nandflash" eval
- false to already-go?
-;
+fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth
\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix
also hidden also keys-forth definitions
Modified: cpu/x86/pc/olpc/mcastnand.bth
===================================================================
--- cpu/x86/pc/olpc/mcastnand.bth 2008-12-04 09:17:55 UTC (rev 1015)
+++ cpu/x86/pc/olpc/mcastnand.bth 2008-12-04 09:18:00 UTC (rev 1016)
@@ -19,7 +19,7 @@
" rm multicast-nand.tar.gz" $sh
[then]
-" (cd multicast-nand; make BPDIR=../../../../../.. mcastnand.bin; cp mcastnand.bin ..)" expand$ $sh
+" (cd multicast-nand; make BPDIR=../../../../../.. mcastnand.bin blaster.bin cloner.bin; cp mcastnand.bin blaster.bin cloner.bin ..)" expand$ $sh
\ This forces the creation of a .log file, so we don't re-fetch
writing mcastnand.version
Added: cpu/x86/pc/olpc/nandcastui.fth
===================================================================
--- cpu/x86/pc/olpc/nandcastui.fth (rev 0)
+++ cpu/x86/pc/olpc/nandcastui.fth 2008-12-04 09:18:00 UTC (rev 1016)
@@ -0,0 +1,68 @@
+purpose: User interface for NAND multicast updater
+
+: mesh-ssids ( -- $ )
+ " olpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh"
+;
+
+: use-mesh ( -- )
+ \ Check for already set because re-setting it will force rescanning
+ ['] mesh-ssids to default-ssids
+ wifi-cfg >wc-ssid pstr@ " olpc-mesh" $= 0= if
+ " olpc-mesh" $essid
+ then
+;
+
+: ether-clone1
+ false to already-go?
+ " boot rom:cloner ether: 1 /nandflash" eval
+;
+: ether-clone6
+ false to already-go?
+ " boot rom:cloner ether: 6 /nandflash" eval
+;
+: ether-clone11
+ false to already-go?
+ " boot rom:cloner ether: 11 /nandflash" eval
+;
+
+: enand1
+ false to already-go?
+ " boot rom:mcastnand ether: 1 /nandflash" eval
+;
+: enand6
+ false to already-go?
+ " boot rom:mcastnand ether: 6 /nandflash" eval
+;
+: enand11
+ false to already-go?
+ " boot rom:mcastnand ether: 11 /nandflash" eval
+;
+
+: mesh-clone
+ use-mesh
+ false to already-go?
+ " boot rom:cloner 239.255.1.2 12345 /nandflash" eval
+;
+
+: meshnand
+ use-mesh
+ false to already-go?
+ " boot rom:mcastnand 239.255.1.2 12345 /nandflash" eval
+;
+
+: mcastnand
+ false to already-go?
+ " boot rom:mcastnand 239.255.1.2 12345 /nandflash" eval
+;
+: ucastnand
+ false to already-go?
+ " boot rom:mcastnand 10.20.0.16,,10.20.0.44 12345 /nandflash" eval
+;
+: nmcastnand \ Boot from network, for testing
+ false to already-go?
+ " boot http:\\10.20.0.14\mcastnand 239.255.1.2 12345 /nandflash" eval
+;
+: dmcastnand \ Boot from USB disk, for testing
+ false to already-go?
+ " boot disk:\mcnand 239.255.1.2 12345 /nandflash" eval
+;
Modified: cpu/x86/pc/olpc/olpc.bth
===================================================================
--- cpu/x86/pc/olpc/olpc.bth 2008-12-04 09:17:55 UTC (rev 1015)
+++ cpu/x86/pc/olpc/olpc.bth 2008-12-04 09:18:00 UTC (rev 1016)
@@ -75,6 +75,8 @@
\ " ${BP}/cpu/x86/pc/olpc/build/ssdt.aml" " ssdt" $add-deflated-dropin
" ${BP}/cpu/x86/pc/olpc/build/mcastnand.bin" " mcastnand" $add-deflated-dropin
+ " ${BP}/cpu/x86/pc/olpc/build/blaster.bin" " blaster" $add-deflated-dropin
+ " ${BP}/cpu/x86/pc/olpc/build/cloner.bin" " cloner" $add-deflated-dropin
/rom h# 400 - pad-file \ rmstart image must start 0x400 from end
" rmstart.img" $add-file
More information about the openfirmware
mailing list