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

[repository service]

Author: quozl
Date: Fri Aug 31 11:44:22 2012
New Revision: 3266
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3266

Log:
OLPC XO-4 - bsl, stack effect error in force-erase, junk left, caught by Chia-Hsiu.

Modified:
   cpu/arm/olpc/bsl.fth

Modified: cpu/arm/olpc/bsl.fth
==============================================================================
--- cpu/arm/olpc/bsl.fth	Fri Aug 31 08:19:41 2012	(r3265)
+++ cpu/arm/olpc/bsl.fth	Fri Aug 31 11:44:22 2012	(r3266)
@@ -356,21 +356,27 @@
 
 : force-erase  ( -- )
    rst-bsl
-   ff-password ack? dup 0= if
-	drop
-	neo-password ack? dup 0= if
-	    drop
-	    ff-password ack? dup 0= if
-		drop
-		." BSL is locked" exit
-	    then
-	then
-   then
+   ff-password ack? dup 0= if           ( ff? )
+      drop                              ( )
+      neo-password ack? dup 0= if       ( neo? )
+         drop                           ( )
+         ff-password ack? dup 0= if     ( ff-neo-ff? )
+            drop                        ( )
+            ." BSL is locked" exit      ( )
+         else                           ( ff-neo-ff? )
+            drop                        ( )
+         then                           ( )
+      else                              ( neo? )
+         drop                           ( )
+      then                              ( )
+   else                                 ( ff? )
+      drop                              ( )
+   then                                 ( )
    erase-main
    null-ffde!
 
    calibration-missing if
-	do-calibration null-ffde!
+      do-calibration null-ffde!
    then
 ;