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

[repository service]

Author: wmb
Date: Thu Aug 16 04:16:12 2012
New Revision: 3181
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3181

Log:
OLPC ARM - Tweaks to the last EDI checkin so that EDI operations are
always bracketed exactly the same way, with  use-edi-spi ... use-ssp-spi

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	Thu Aug 16 04:01:14 2012	(r3180)
+++ cpu/arm/olpc/build-fw.fth	Thu Aug 16 04:16:12 2012	(r3181)
@@ -195,13 +195,14 @@
 fload ${BP}/cpu/arm/olpc/ecflash.fth
 
 : ec-spi-reprogrammed   ( -- )
-   edi-spi-start
+   use-edi-spi  spi-start
    set-ec-reboot
    unreset-8051
+   use-ssp-spi
 ;
 
 : ignore-power-button  ( -- )
-   edi-spi-start
+   use-edi-spi
    edi-open-active
    ['] reset-8051 catch if
       ['] reset-8051 catch if ." Write Protected EC" cr then

Modified: cpu/arm/olpc/ecflash.fth
==============================================================================
--- cpu/arm/olpc/ecflash.fth	Thu Aug 16 04:01:14 2012	(r3180)
+++ cpu/arm/olpc/ecflash.fth	Thu Aug 16 04:16:12 2012	(r3181)
@@ -66,6 +66,7 @@
    ." Restarting EC and rebooting" cr
    set-ec-reboot
    unreset-8051
+   use-ssp-spi
 [then]
    ec-power-cycle
 ;
@@ -79,6 +80,7 @@
 [else]
    use-edi-spi  edi-open
    flash-buf /ec-flash 0 edi-read-flash
+   use-ssp-spi
 [then]
 ;
 : save-ec-flash  ( "name" -- )