[commit] r2270 - in cpu: arm/olpc/1.75 x86/pc/olpc x86/pc/olpc/via

[repository service]

Author: wmb
Date: Tue Jun 14 04:10:25 2011
New Revision: 2270
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2270

Log:
OLPC XO-1.75 trac #10900 - Implemented multi-platform USB/SD imaging support.

Modified:
   cpu/arm/olpc/1.75/fw.bth
   cpu/x86/pc/olpc/security.fth
   cpu/x86/pc/olpc/via/fw.bth

Modified: cpu/arm/olpc/1.75/fw.bth
==============================================================================
--- cpu/arm/olpc/1.75/fw.bth	Mon Jun 13 21:12:02 2011	(r2269)
+++ cpu/arm/olpc/1.75/fw.bth	Tue Jun 14 04:10:25 2011	(r2270)
@@ -245,6 +245,7 @@
 fload ${BP}/cpu/x86/pc/olpc/sound.fth
 fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth
 fload ${BP}/cpu/x86/pc/olpc/security.fth
+2 to bundle-suffix

stand-init: xid
    0 cmos@  dup 1+  0 cmos!   ( n )

Modified: cpu/x86/pc/olpc/security.fth
==============================================================================
--- cpu/x86/pc/olpc/security.fth	Mon Jun 13 21:12:02 2011	(r2269)
+++ cpu/x86/pc/olpc/security.fth	Tue Jun 14 04:10:25 2011	(r2270)
@@ -436,11 +436,24 @@
 : .trying  ( name$ -- name$ )
    " Trying " ?lease-debug  2dup ?lease-debug-cr
 ;
+0 value bundle-suffix
 : bundle-present?  ( fn$ -- flag )
+   \ Try the unadorned name first
    fn-buf place
+
    bundle-name$  .trying
-   ['] (boot-read) catch  if  2drop false exit  then
-   true
+   ['] (boot-read) catch  0=  if  true exit  then   ( x x )
+   2drop                                            ( )
+
+   \ Unadorned name not present; try again with architecture-dependent numeric suffix
+   bundle-suffix push-decimal (.) pop-base   ( adr len )
+   fn-buf $cat                               ( )
+
+   bundle-name$  .trying
+   ['] (boot-read) catch  0=  if  true exit  then   ( x x )
+   2drop                                            ( )
+
+   false
 ;

\ exp-hashname$ remembers the most recently used hashname to guard against

Modified: cpu/x86/pc/olpc/via/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/via/fw.bth	Mon Jun 13 21:12:02 2011	(r2269)
+++ cpu/x86/pc/olpc/via/fw.bth	Tue Jun 14 04:10:25 2011	(r2270)
@@ -411,6 +411,7 @@
 fload ${BP}/cpu/x86/pc/olpc/via/sound.fth
 fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth
 fload ${BP}/cpu/x86/pc/olpc/security.fth
+1 to bundle-suffix
 fload ${BP}/cpu/x86/pc/olpc/xpsecure.fth
 fload ${BP}/ofw/gui/ofpong.fth
 fload ${BP}/cpu/x86/pc/olpc/life.fth