[openfirmware] [commit] r3099 - cpu/x86/pc/olpc/via

[repository service]

Author: quozl
Date: Mon Jul 30 10:25:06 2012
New Revision: 3099
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3099

Log:
OLPC XO-1.5 XO-1.75 - handle exceptions in open-nand during fs-update, #12025

Modified:
   cpu/x86/pc/olpc/via/fsupdate.fth

Modified: cpu/x86/pc/olpc/via/fsupdate.fth
==============================================================================
--- cpu/x86/pc/olpc/via/fsupdate.fth	Mon Jul 30 09:58:46 2012	(r3098)
+++ cpu/x86/pc/olpc/via/fsupdate.fth	Mon Jul 30 10:25:06 2012	(r3099)
@@ -290,7 +290,7 @@
 
    ['] noop to show-progress               ( adr len )
 
-   open-nand                               ( adr len )
+   ['] open-nand  catch  ?dup  if  .error  security-failure  then  ( adr len )
 
 \  clear-context  nand-commands
    t-hms(
@@ -309,7 +309,7 @@
 ;
 
 : fs-update-from-list  ( devlist$ -- )
-   load-crypto  if  visible  ." Crytpo load failed" cr  show-sad  security-failure   then
+   load-crypto  if  visible  ." Crypto load failed" cr  show-sad  security-failure   then
 
    visible                            ( devlist$ )
    begin  dup  while                  ( rem$ )