r677 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-10-12 11:03:59 +0200 (Fri, 12 Oct 2007)
New Revision: 677

Modified:
   cpu/x86/pc/olpc/security.fth
Log:
Fixed a bug introduced by svn 671.  Also reverted the Indexed I/O turn-off
because the kernel isn't ready for it yet.

Modified: cpu/x86/pc/olpc/security.fth
===================================================================
--- cpu/x86/pc/olpc/security.fth	2007-10-12 09:00:06 UTC (rev 676)
+++ cpu/x86/pc/olpc/security.fth	2007-10-12 09:03:59 UTC (rev 677)
@@ -361,7 +361,7 @@

: check-machine-signature  ( sig$ expiration$ -- -1|1 )
    machine-id-buf d# 51 +  swap  move  ( sig$ )
-   machine-id-buf d# 67  2swap  sha-valid?  if  1  else  -1  then
+   machine-id-buf d# 67  2swap  " sha256" invalid?  if  -1  else  1  then
 ;

: set-disposition  ( adr -- )  c@  machine-id-buf d# 49 + c!  ;
@@ -696,6 +696,7 @@
          then                               ( list$ )

load-from-device  if               ( list$ )
+\           write-protect-fw ec-indexed-io-off  ( list$ )
             2drop                           ( )
             ['] secure-load-ramdisk to load-ramdisk
             " init-program" $find  if