[openfirmware] [commit] r3384 - in cpu/arm/olpc: . 4.0

[repository service]

Author: quozl
Date: Thu Oct 25 12:18:46 2012
New Revision: 3384
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3384

Log:
OLPC XO-4 - avoid abort during version check, remove from build as we have no permission to ship yet

Modified:
   cpu/arm/olpc/4.0/olpc.bth
   cpu/arm/olpc/build-fw.fth

Modified: cpu/arm/olpc/4.0/olpc.bth
==============================================================================
--- cpu/arm/olpc/4.0/olpc.bth	Thu Oct 25 09:30:24 2012	(r3383)
+++ cpu/arm/olpc/4.0/olpc.bth	Thu Oct 25 12:18:46 2012	(r3384)
@@ -2,7 +2,7 @@
 
 command: &builder &this
 in: ${BP}/cpu/arm/olpc/4.0/build/ec.img
-in: ${BP}/cpu/arm/olpc/4.0/build/nn.img
+\ in: ${BP}/cpu/arm/olpc/4.0/build/nn.hex
 in: ${BP}/cpu/arm/olpc/4.0/build/fw.img
 in: ${BP}/cpu/arm/olpc/4.0/build/resetvec.img
 in: ${BP}/cpu/arm/olpc/4.0/build/mcastnand.bin
@@ -155,7 +155,7 @@
    " nandblaster_tx.bin"   " nb_tx"    $add-deflated-dropin
 
    " ec.img"                                    " ecimage.bin"   $add-deflated-dropin
-   " nn.hex"                                    " nn.hex"        $add-deflated-dropin
+\   " nn.hex"                                    " nn.hex"        $add-deflated-dropin
    " ${BP}/clients/emacs/x86/emacs.rc"          " emacs.rc"      $add-deflated-dropin
    " ${BP}/clients/emacs/emacs.hlp"             " emacs.hlp"     $add-deflated-dropin
    " ${BP}/clients/emacs/arm/emacs"             " emacs"         $add-deflated-dropin

Modified: cpu/arm/olpc/build-fw.fth
==============================================================================
--- cpu/arm/olpc/build-fw.fth	Thu Oct 25 09:30:24 2012	(r3383)
+++ cpu/arm/olpc/build-fw.fth	Thu Oct 25 12:18:46 2012	(r3384)
@@ -366,7 +366,7 @@
 fload ${BP}/cpu/arm/mmp2/fuse.fth
 [ifdef] bsl-uart-base
 fload ${BP}/cpu/arm/olpc/bsl.fth
-fload ${BP}/cpu/arm/olpc/nnflash.fth
+\ fload ${BP}/cpu/arm/olpc/nnflash.fth
 [then]
 
 [ifndef] virtual-mode
@@ -859,15 +859,19 @@
       then
    then
 [ifdef] update-nn-flash?
-   update-nn-flash?  if
-      ['] ?enough-power catch  ?dup  if  ( error )
-         show-no-power
-         .error
-         ." Skipping NN reflash, not enough power" cr
-         d# 1000 ms
-      else
-         jots  ['] jot to bsl-progress
-         update-nn-flash
+   ['] update-nn-flash?  catch  ?dup if  ( error )
+      .error
+   else
+      if
+         ['] ?enough-power catch  ?dup  if  ( error )
+            show-no-power
+            .error
+            ." Skipping NN reflash, not enough power" cr
+            d# 1000 ms
+         else
+            jots  ['] jot to bsl-progress
+            update-nn-flash
+         then
       then
    then
 [then]