[openfirmware] [commit] r3035 - cpu/arm/olpc

[repository service]

Author: wmb
Date: Tue Jul  3 08:28:56 2012
New Revision: 3035
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3035

Log:
OLPC XO-1.75 - support new EC version.

Modified:
   cpu/arm/olpc/build-fw.fth
   cpu/arm/olpc/ecflash.fth

Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth	Tue Jul  3 08:19:40 2012	(r3034)
+++ cpu/arm/olpc/build-fw.fth	Tue Jul  3 08:28:56 2012	(r3035)
@@ -197,6 +197,19 @@
 
 load-base constant flash-buf
 
+
+[ifdef] cl2-a1
+h# 10000 value /ec-flash
+char 3 value expected-ec-version
+[else]
+h# 8000 value /ec-flash
+: clx-touch?  ( -- )  board-revision h# 3a18 >=  ;
+\+ olpc-cl2 : expected-ec-version  clx-touch?  if  [char] 6  else  [char] 4  then  ;
+\+ olpc-cl3 char 5 value expected-ec-version
+[then]
+
+[ifndef] cl2-a1
+[then]
 fload ${BP}/cpu/arm/olpc/ecflash.fth
 
 : ec-spi-reprogrammed   ( -- )
@@ -340,7 +353,6 @@
 fload ${BP}/cpu/arm/olpc/sdhci.fth
 
 [ifndef] cl2-a1
-: clx-touch?  ( -- )  board-revision h# 3a18 >=  ;
 : boot-dev-gpio#  ( -- n )  clx-touch?  if  2  else  d# 56  then  ;
 fload ${BP}/cpu/arm/olpc/emmc.fth
 [then]

Modified: cpu/arm/olpc/ecflash.fth
==============================================================================
--- cpu/arm/olpc/ecflash.fth	Tue Jul  3 08:19:40 2012	(r3034)
+++ cpu/arm/olpc/ecflash.fth	Tue Jul  3 08:28:56 2012	(r3035)
@@ -1,16 +1,6 @@
 \ See license at end of file
 purpose: Reflash the EC code
 
-
-[ifdef] cl2-a1
-h# 10000 value /ec-flash
-char 3 value expected-ec-version
-[else]
-h# 8000 value /ec-flash
-\+ olpc-cl2 char 4 value expected-ec-version
-\+ olpc-cl3 char 5 value expected-ec-version
-[then]
-
 : check-signature  ( adr -- )
    /ec-flash +  h# 100 -                                 ( adr' )
    dup  " XO-EC" comp abort" Bad signature in EC image"  ( adr )