Changeset 3384


Ignore:
Timestamp:
Oct 25, 2012, 12:18:46 PM (2 years 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:
2 edited

Legend:

Unmodified
Added
Removed
  • cpu/arm/olpc/4.0/olpc.bth

    r3383 r3384  
    33command: &builder &this
    44in: ${BP}/cpu/arm/olpc/4.0/build/ec.img
    5 in: ${BP}/cpu/arm/olpc/4.0/build/nn.img
     5\ in: ${BP}/cpu/arm/olpc/4.0/build/nn.hex
    66in: ${BP}/cpu/arm/olpc/4.0/build/fw.img
    77in: ${BP}/cpu/arm/olpc/4.0/build/resetvec.img
     
    156156
    157157   " ec.img"                                    " ecimage.bin"   $add-deflated-dropin
    158    " nn.hex"                                    " nn.hex"        $add-deflated-dropin
     158\   " nn.hex"                                    " nn.hex"        $add-deflated-dropin
    159159   " ${BP}/clients/emacs/x86/emacs.rc"          " emacs.rc"      $add-deflated-dropin
    160160   " ${BP}/clients/emacs/emacs.hlp"             " emacs.hlp"     $add-deflated-dropin
  • cpu/arm/olpc/build-fw.fth

    r3383 r3384  
    367367[ifdef] bsl-uart-base
    368368fload ${BP}/cpu/arm/olpc/bsl.fth
    369 fload ${BP}/cpu/arm/olpc/nnflash.fth
     369\ fload ${BP}/cpu/arm/olpc/nnflash.fth
    370370[then]
    371371
     
    860860   then
    861861[ifdef] update-nn-flash?
    862    update-nn-flash?  if
    863       ['] ?enough-power catch  ?dup  if  ( error )
    864          show-no-power
    865          .error
    866          ." Skipping NN reflash, not enough power" cr
    867          d# 1000 ms
    868       else
    869          jots  ['] jot to bsl-progress
    870          update-nn-flash
     862   ['] update-nn-flash?  catch  ?dup if  ( error )
     863      .error
     864   else
     865      if
     866         ['] ?enough-power catch  ?dup  if  ( error )
     867            show-no-power
     868            .error
     869            ." Skipping NN reflash, not enough power" cr
     870            d# 1000 ms
     871         else
     872            jots  ['] jot to bsl-progress
     873            update-nn-flash
     874         then
    871875      then
    872876   then
Note: See TracChangeset for help on using the changeset viewer.