Changeset 3057

Timestamp:

Jul 12, 2012 10:35:00 PM (11 months ago)

Author:

wmb

Message:

OLPC ARM - Moved ec-platform$ from ecflash.fth to */config.fth

Location:

cpu/arm/olpc

Files:

• 1.75/config.fth (modified) (1 diff)
• 3.0/config.fth (modified) (1 diff)
• cl4/config.fth (modified) (1 diff)
• ecflash.fth (modified) (2 diffs)

cpu/arm/olpc/1.75/config.fth

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

cpu/arm/olpc/3.0/config.fth

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

cpu/arm/olpc/cl4/config.fth

@@ -20 +20 @@
 : model$       " olpc,XO-CL4"  ;
 : compatible$  " olpc,xo-cl4"  ;
+: ec-platform$  ( -- adr len )  " 6"  ;
 
 d# 10001 constant machine-type  \ Backwards compatibility with non-device-tree kernel

cpu/arm/olpc/ecflash.fth

@@ -88 +88 @@
    ofd @ fclose
 ;
-\+ olpc-cl2  : ec-platform$  ( -- adr len )  " 4"  ;
-\+ olpc-cl3  : ec-platform$  ( -- adr len )  " 5"  ;
 : ec-up-to-date?  ( img$ -- flag )
    \ If the new image has an invalid length, the old one is considered up to date
@@ -101 +99 @@
    bl left-parse-string ec-platform$ $= 0=  if  2drop true exit  then  ( version&date$ )
    bl left-parse-string 2nip                                           ( version$ )
-   ec-name$  $caps-compare  0<=                                        ( flag )
+   ['] ec-name$ catch  if                                              ( version$ )
+      2drop ." Can't get EC name" cr  true                             ( flag )
+   else                                                                ( version$ ec-name$ )
+      $caps-compare  0<=                                               ( flag )
+   then                                                                ( flag )
 ;