[openfirmware] [commit] r1759 - cpu/x86/pc/olpc

repository service svn at openfirmware.info
Thu Feb 25 23:16:34 CET 2010


Author: wmb
Date: Thu Feb 25 23:16:34 2010
New Revision: 1759
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1759

Log:
OLPC trac 10022 - Power wait must happen before turning off the EC, otherwise you can't read the AC and battery state.

Modified:
   cpu/x86/pc/olpc/keyject.fth

Modified: cpu/x86/pc/olpc/keyject.fth
==============================================================================
--- cpu/x86/pc/olpc/keyject.fth	Thu Feb 25 01:54:44 2010	(r1758)
+++ cpu/x86/pc/olpc/keyject.fth	Thu Feb 25 23:16:34 2010	(r1759)
@@ -168,7 +168,6 @@
 
 \ Firmware is in flash-buf
 : update-firmware  ( -- )
-   wait-enough-power
    write-firmware
 
    ['] verify-firmware catch  if
@@ -185,6 +184,7 @@
    \ Get the new firmware first, so any security checks use the old keys
    get-new-firmware
    do-keyject?  if
+      wait-enough-power
       flash-write-enable
       inject-keys
       new-firmware?  if  update-firmware  then
@@ -194,6 +194,7 @@
       \ we get into an infinite reboot cycle.
       new-firmware?  if
          ." Updating firmware ..." cr
+         wait-enough-power
          flash-write-enable
          update-firmware
          flash-write-disable  \ Should reboot



More information about the openfirmware mailing list