Changeset 3349

Timestamp:

Oct 3, 2012 11:40:57 PM (8 months ago)

Author:

wmb

Message:

OLPC trac 12129 - Changed the search order for .zip bundles to look for the platform-specific suffix first, falling back to the generic name.

Location:

cpu

Files:

• arm/olpc/1.75/config.fth (modified) (1 diff)
• arm/olpc/3.0/config.fth (modified) (1 diff)
• arm/olpc/4.0/config.fth (modified) (1 diff)
• arm/olpc/build-fw.fth (modified) (1 diff)
• arm/olpc/cl4/config.fth (modified) (1 diff)
• x86/pc/olpc/config.fth (modified) (1 diff)
• x86/pc/olpc/security.fth (modified) (1 diff)
• x86/pc/olpc/via/config.fth (modified) (1 diff)
• x86/pc/olpc/via/fw.bth (modified) (1 diff)

cpu/arm/olpc/1.75/config.fth

@@ -27 +27 @@
 : compatible$   " olpc,xo-1.75"  ;
 : ec-platform$  ( -- adr len )  " 4"  ;
+: bundle-suffix$  ( -- adr len )  " 4"  ;
 
 d#  9999 constant machine-type  \ Backwards compatibility with non-device-tree kernel

cpu/arm/olpc/3.0/config.fth

@@ -26 +26 @@
 : compatible$  " olpcxo-3.0"  ;
 : ec-platform$  ( -- adr len )  " 5"  ;
+: bundle-suffix$  ( -- adr len )  " 3"  ;
 
 d# 10000 constant machine-type  \ Backwards compatibility with non-device-tree kernel

cpu/arm/olpc/4.0/config.fth

@@ -24 +24 @@
 : compatible$  " olpc,xo-cl4"  ;
 : ec-platform$  ( -- adr len )  " 7"  ;
+: bundle-suffix$  ( -- adr len )  " 5"  ;
 
 d# 10001 constant machine-type  \ Backwards compatibility with non-device-tree kernel

cpu/arm/olpc/build-fw.fth

@@ -669 +669 @@
 fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth
 fload ${BP}/cpu/x86/pc/olpc/security.fth
-[ifdef] olpc-cl4  4  [else]  2  [then]  to bundle-suffix
 
 stand-init: xid

cpu/arm/olpc/cl4/config.fth

@@ -23 +23 @@
 : compatible$  " olpc,xo-cl4"  ;
 : ec-platform$  ( -- adr len )  " 7"  ;
+: bundle-suffix$  ( -- adr len )  " 4"  ;
 
 d# 10001 constant machine-type  \ Backwards compatibility with non-device-tree kernel

cpu/x86/pc/olpc/config.fth

@@ -41 +41 @@
 create machine-signature ," CL1"
 : signature$  machine-signature count  ;
+: bundle-suffix$  ( -- adr len )  " 0"  ;
 
 fload ${BP}/cpu/x86/pc/olpc/addrs.fth

cpu/x86/pc/olpc/security.fth

@@ -442 +442 @@
    " Trying " ?lease-debug  2dup ?lease-debug-cr
 ;
-0 value bundle-suffix
-: bundle-present?  ( fn$ -- flag )
-   fn-buf place
-
-   \ unadorned names not supported from XO-4 onwards
-   bundle-suffix 4 < if
-      \ Try the unadorned name first
-      bundle-name$  .trying
-      ['] (boot-read) catch  0=  if  true exit  then   ( x x )
-      2drop                                            ( )
-   then
-
-   \ Unadorned name not present; try again with architecture-dependent numeric suffix
-   bundle-suffix push-decimal (.) pop-base   ( adr len )
-   fn-buf $cat                               ( )
-
+
+: $try-name  ( basename$ suffix$ -- found? )
+   2swap fn-buf place  fn-buf $cat
    bundle-name$  .trying
-   ['] (boot-read) catch  0=  if  true exit  then   ( x x )
-   2drop                                            ( )
-
-   false
+   ['] (boot-read) catch  if  2drop false  else  true  then
+;
+
+: bundle-present?  ( fn$ -- found? )
+   \ Try first with architecture-dependent numeric suffix
+   2dup bundle-suffix$ $try-name  if   ( fn$ )
+      2drop true exit                  ( -- true )
+   then                                ( fn$ )
+
+   \ Failing that, try the unadorned name
+   " "  $try-name
 ;
 

cpu/x86/pc/olpc/via/config.fth

@@ -53 +53 @@
 create machine-signature ," CL1"
 : signature$  machine-signature count  ;
+: bundle-suffix$  ( -- adr len )  " 1"  ;
 
 fload ${BP}/cpu/x86/pc/olpc/via/addrs.fth

cpu/x86/pc/olpc/via/fw.bth

@@ -432 +432 @@
 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