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

[repository service]

Author: wmb
Date: Sat Aug 11 02:29:52 2012
New Revision: 3152
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3152

Log:
OLPC ARM - refactor svn 3148 for stylistic consistency with other ec-version-dependent addresses.  Should be no substantive difference.

Modified:
   cpu/arm/olpc/ecflash.fth
   cpu/arm/olpc/edi.fth

Modified: cpu/arm/olpc/ecflash.fth
==============================================================================
--- cpu/arm/olpc/ecflash.fth	Fri Aug 10 15:54:46 2012	(r3151)
+++ cpu/arm/olpc/ecflash.fth	Sat Aug 11 02:29:52 2012	(r3152)
@@ -26,11 +26,7 @@
    load-base swap ?ec-image-valid
 ;
 \ Tells the EC to auto-restart after power cycling
-: set-ec-reboot  ( -- )
-  1
-  kb9010? if h# ff01 else h# f018 then
-  edi-b!
-;
+: set-ec-reboot  ( -- )  1 ecreboot edi-b!  ;
 : ?reflash-ec-flags  ( adr -- )
    use-edi-spi                          ( adr )
    edi-open-active                      ( adr )  \ avoids holding EC in reset

Modified: cpu/arm/olpc/edi.fth
==============================================================================
--- cpu/arm/olpc/edi.fth	Fri Aug 10 15:54:46 2012	(r3151)
+++ cpu/arm/olpc/edi.fth	Sat Aug 11 02:29:52 2012	(r3152)
@@ -20,6 +20,7 @@
 : efcmd    ( -- reg# )  kb9010?  if  h# feac  else  h# fea7   then  ;
 : efdat    ( -- reg# )  kb9010?  if  h# feab  else  h# feaa   then  ;
 : rst8051  ( -- reg# )  kb9010?  if  h# ff14  else  h# f010   then  ;
+: ecreboot ( -- reg# )  kb9010?  if  h# ff01  else  h# f018   then  ;
 
 \ Issues with .py code
 \ A14:A8 should be A15:A8 several places