[openfirmware] r1705 - in cpu/x86/pc/olpc: . via

[svn at openfirmware.info]

Author: wmb
Date: 2010-01-26 09:19:58 +0100 (Tue, 26 Jan 2010)
New Revision: 1705

Modified:
   cpu/x86/pc/olpc/nandcastui.fth
   cpu/x86/pc/olpc/via/fw.bth
Log:
Use new boot-as-call facility so that calling the nandblaster
retains Forth execution state - useful for assembly test.


Modified: cpu/x86/pc/olpc/nandcastui.fth
===================================================================
--- cpu/x86/pc/olpc/nandcastui.fth	2010-01-26 08:18:17 UTC (rev 1704)
+++ cpu/x86/pc/olpc/nandcastui.fth	2010-01-26 08:19:58 UTC (rev 1705)
@@ -100,9 +100,11 @@
    " boot rom:nb_rx ,,239.255.1.2" eval
 ;
 
-: nb_rx
+: nb-rx
    false to already-go?
+   boot-as-call(
    " boot rom:nb_rx ,,239.255.1.2" eval
+   )boot-as-call
 ;
 : ucastnand
    false to already-go?

Modified: cpu/x86/pc/olpc/via/fw.bth
===================================================================
--- cpu/x86/pc/olpc/via/fw.bth	2010-01-26 08:18:17 UTC (rev 1704)
+++ cpu/x86/pc/olpc/via/fw.bth	2010-01-26 08:19:58 UTC (rev 1705)
@@ -498,6 +498,7 @@
 ;
 ' olpc-ssids to default-ssids
 
+fload ${BP}/cpu/x86/bootascall.fth
 fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth
 fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth
 fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth