[openfirmware] [commit] r3057 - in cpu/arm/olpc: . 1.75 3.0 cl4

[repository service]

Author: wmb
Date: Thu Jul 12 22:35:00 2012
New Revision: 3057
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3057

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

Modified:
   cpu/arm/olpc/1.75/config.fth
   cpu/arm/olpc/3.0/config.fth
   cpu/arm/olpc/cl4/config.fth
   cpu/arm/olpc/ecflash.fth

Modified: cpu/arm/olpc/1.75/config.fth
==============================================================================
--- cpu/arm/olpc/1.75/config.fth	Thu Jul 12 22:27:38 2012	(r3056)
+++ cpu/arm/olpc/1.75/config.fth	Thu Jul 12 22:35:00 2012	(r3057)
@@ -23,6 +23,7 @@
 : signature$    " CL2"  ;
 : 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
 

Modified: cpu/arm/olpc/3.0/config.fth
==============================================================================
--- cpu/arm/olpc/3.0/config.fth	Thu Jul 12 22:27:38 2012	(r3056)
+++ cpu/arm/olpc/3.0/config.fth	Thu Jul 12 22:35:00 2012	(r3057)
@@ -22,6 +22,7 @@
 : signature$   " CL3"  ;
 : 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
 

Modified: cpu/arm/olpc/cl4/config.fth
==============================================================================
--- cpu/arm/olpc/cl4/config.fth	Thu Jul 12 22:27:38 2012	(r3056)
+++ cpu/arm/olpc/cl4/config.fth	Thu Jul 12 22:35:00 2012	(r3057)
@@ -19,6 +19,7 @@
 : signature$   " CL4"  ;
 : 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
 

Modified: cpu/arm/olpc/ecflash.fth
==============================================================================
--- cpu/arm/olpc/ecflash.fth	Thu Jul 12 22:27:38 2012	(r3056)
+++ cpu/arm/olpc/ecflash.fth	Thu Jul 12 22:35:00 2012	(r3057)
@@ -87,8 +87,6 @@
    load-base /ec-flash ofd @ fputs
    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
    dup /ec-flash <>  if
@@ -100,7 +98,11 @@
    bl left-parse-string " XO-EC" $= 0=  if  2drop true exit  then      ( version&date$ )
    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 )
 ;
 
 : update-ec-flash  ( -- )