[commit] r1912 - cpu/x86/pc/olpc

[repository service]

Author: wmb
Date: Wed Aug  4 18:51:00 2010
New Revision: 1912
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1912

Log:
OLPC NANDblaster - added nb-update and related words to make the XO-1.5 syntax for NANDblasting very similar to the XO-1 syntax.

Modified:
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/nandcastui.fth
   cpu/x86/pc/olpc/nb15tx.fth
   cpu/x86/pc/olpc/wifichannel.fth

Modified: cpu/x86/pc/olpc/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/fw.bth	Wed Aug  4 11:08:59 2010	(r1911)
+++ cpu/x86/pc/olpc/fw.bth	Wed Aug  4 18:51:00 2010	(r1912)
@@ -465,8 +465,8 @@

create use-mesh
 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/nandcastui.fth
 fload ${BP}/cpu/x86/pc/olpc/nbrx.fth
 fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth

Modified: cpu/x86/pc/olpc/nandcastui.fth
==============================================================================
--- cpu/x86/pc/olpc/nandcastui.fth	Wed Aug  4 11:08:59 2010	(r1911)
+++ cpu/x86/pc/olpc/nandcastui.fth	Wed Aug  4 18:51:00 2010	(r1912)
@@ -51,6 +51,10 @@
 : #nb-update-def  ( channel# -- )  >r " u:\fs.plc" " u:\fs.img" r> #nb-update  ;
 : #nb-secure-def  ( channel# -- )  >r " u:\fs.zip" " u:\fs.img" r> #nb-secure  ;

+: nb-clone    ( -- )  nb-auto-channel  #nb-clone  ;
+: nb-secure   ( -- )  nb-auto-channel  #nb-secure-def  ;
+: nb-update   ( -- )  nb-auto-channel  #nb-update-def  ;
+
 : nb-clone1   ( -- )      1 #nb-clone  ;
 : nb-clone6   ( -- )      6 #nb-clone  ;
 : nb-clone11  ( -- )  d# 11 #nb-clone  ;

Modified: cpu/x86/pc/olpc/nb15tx.fth
==============================================================================
--- cpu/x86/pc/olpc/nb15tx.fth	Wed Aug  4 11:08:59 2010	(r1911)
+++ cpu/x86/pc/olpc/nb15tx.fth	Wed Aug  4 18:51:00 2010	(r1912)
@@ -47,6 +47,7 @@

" boot rom:nb_tx thinmac:OLPC-NANDblaster,%d %s %d 131072" sprintf eval
 ;
+
 : #nb-secure  ( zip-filename$ image-filename$ channel# -- )
    depth 5 < abort" #nb-secure-update - too few arguments"
    >r 2>r                             ( placement-filename$ r: channel# image-filename$ )
@@ -57,7 +58,17 @@
 ;
 : #nb-secure-def  ( channel# -- )  >r " u:\fs.zip" " u:\fs.zd" r> #nb-secure  ;

+: #nb-update-def  ( channel# -- )  >r  " u:\fs.zd"  r> $nb-tx  ;
+: nb-update1   ( -- )      1 #nb-update-def  ;
+: nb-update6   ( -- )      6 #nb-update-def  ;
+: nb-update11  ( -- )  d# 11 #nb-update-def  ;
+
+: nb-secure1   ( -- )      1 #nb-secure-def  ;
+: nb-secure6   ( -- )      6 #nb-secure-def  ;
+: nb-secure11  ( -- )  d# 11 #nb-secure-def  ;
+
 : nb-secure   ( -- )  nb-auto-channel  #nb-secure-def  ;
+: nb-update   ( -- )  nb-auto-channel  #nb-update-def  ;

[ifdef] use-nb15-precomputed
 \ NANDblaster sender using thin firmware on XO-1.5, with precomputed

Modified: cpu/x86/pc/olpc/wifichannel.fth
==============================================================================
--- cpu/x86/pc/olpc/wifichannel.fth	Wed Aug  4 11:08:59 2010	(r1911)
+++ cpu/x86/pc/olpc/wifichannel.fth	Wed Aug  4 18:51:00 2010	(r1912)
@@ -314,12 +314,6 @@
    d# 4000 ms
 ;

-[ifdef] use-mesh
-: nb-clone    ( -- )  nb-auto-channel  #nb-clone  ;
-: nb-secure   ( -- )  nb-auto-channel  #nb-secure-def  ;
-: nb-update   ( -- )  nb-auto-channel  #nb-update-def  ;
-[then]
-
 : load-read  ( filename$ -- )
    open-dev  dup 0=  abort" Can't open file"  >r  ( r: ih )
    load-base " load" r@ $call-method  !load-size