Changeset 3384

Timestamp:

Oct 25, 2012 12:18:46 PM (7 months ago)

Author:

quozl

Message:

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

Location:

cpu/arm/olpc

Files:

• 4.0/olpc.bth (modified) (2 diffs)
• build-fw.fth (modified) (2 diffs)

cpu/arm/olpc/4.0/olpc.bth

@@ -3 +3 @@
 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
@@ -156 +156 @@
 
    " 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

cpu/arm/olpc/build-fw.fth

@@ -367 +367 @@
 [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]
 
@@ -860 +860 @@
    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