r1585 - cpu/x86/pc/olpc/via

Author: wmb
Date: 2009-12-11 23:49:18 +0100 (Fri, 11 Dec 2009)
New Revision: 1585

Modified:
   cpu/x86/pc/olpc/via/fsupdate.fth
   cpu/x86/pc/olpc/via/fw.bth
Log:
OLPC trac 9873 - secure reflash via button keys was turned off; it is now turned on.

Modified: cpu/x86/pc/olpc/via/fsupdate.fth
===================================================================
--- cpu/x86/pc/olpc/via/fsupdate.fth	2009-12-11 22:26:46 UTC (rev 1584)
+++ cpu/x86/pc/olpc/via/fsupdate.fth	2009-12-11 22:49:18 UTC (rev 1585)
@@ -191,6 +191,7 @@
       nip .error
    then                                ( )
    previous definitions
+
    show-done
    ?all-written
    close-nand-ihs
@@ -204,6 +205,7 @@
    ['] noop to show-progress

\  clear-context  nand-commands
+   t(
    also nand-commands

true to secure-fsupdate?
@@ -213,7 +215,9 @@
 \  only forth also definitions

show-done
+   ?all-written
    close-nand-ihs
+   )t-hms
 ;

: fs-update-from-list  ( devlist$ -- )

Modified: cpu/x86/pc/olpc/via/fw.bth
===================================================================
--- cpu/x86/pc/olpc/via/fw.bth	2009-12-11 22:26:46 UTC (rev 1584)
+++ cpu/x86/pc/olpc/via/fw.bth	2009-12-11 22:49:18 UTC (rev 1585)
@@ -627,11 +627,12 @@
       protect-fw  text-on  ['] scan-nand guarded
    then
 ;
+[then]
+
 : ?fs-update  ( -- )
    button-check button-x or  button-o or  button-square or   ( mask )
    game-key-mask =  if  protect-fw try-fs-update  then
 ;
-[then]

: pci-fixup  ( -- )
    h#   43 h# 8804 config-b!  \ Enable parity checking on D17F0
@@ -681,8 +682,8 @@
    ?diags
 [ifdef] Later
    ?scan-nand
+[then]
    ?fs-update
-[then]
    secure-startup
    unblock-exceptions
    ['] (interrupt-auto-boot?) to interrupt-auto-boot?