[openfirmware] [commit] r2186 - cpu/x86/pc/olpc/via
repository service
svn at openfirmware.info
Wed Apr 13 23:37:19 CEST 2011
Author: wmb
Date: Wed Apr 13 23:37:18 2011
New Revision: 2186
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2186
Log:
OLPC fsupdate - changed the error checking to work correctly for .zd and .zsp files that write block 0 last.
Modified:
cpu/x86/pc/olpc/via/fsupdate.fth
Modified: cpu/x86/pc/olpc/via/fsupdate.fth
==============================================================================
--- cpu/x86/pc/olpc/via/fsupdate.fth Tue Apr 12 05:50:42 2011 (r2185)
+++ cpu/x86/pc/olpc/via/fsupdate.fth Wed Apr 13 23:37:18 2011 (r2186)
@@ -8,18 +8,14 @@
push-hex $number pop-base " Bad number" ?nand-abort
;
-0 value last-eblock#
-: erase-eblock ( eblock# -- )
- \ XXX
- to last-eblock#
-;
+0 value #eblocks-written
: ?all-written ( -- )
- last-eblock# 1+ #image-eblocks <> if
+ #eblocks-written #image-eblocks <> if
cr
red-letters
." WARNING: The file specified " #image-eblocks .d
- ." chunks but wrote only " last-eblock# 1+ .d ." chunks" cr
+ ." chunks but wrote only " #eblocks-written .d ." chunks" cr
black-letters
then
;
@@ -27,14 +23,6 @@
0 value secure-fsupdate?
d# 128 constant /spec-maxline
-: erase-gap ( end-block -- )
- dup last-eblock# > if
- last-eblock# 1+ ?do i erase-eblock loop
- else
- drop
- then
-;
-
\ We simultaneously DMA one data buffer onto NAND while unpacking the
\ next block of data into another. The buffers exchange roles after
\ each block.
@@ -87,7 +75,6 @@
\ Asynchronous writes
" write-blocks-end" $call-nand ( error? )
" Write error" ?nand-abort
-\ #image-eblocks erase-gap
hdd-led-off
release-inflater
fexit
@@ -111,7 +98,6 @@
;
: erase-all ( -- )
- #image-eblocks 0 ?do i erase-eblock loop
#image-eblocks show-writing
;
@@ -214,8 +200,8 @@
swap-buffers ( eblock# )
\ then
- dup to last-eblock# ( eblock# )
- show-written ( )
+ show-written ( )
+ #eblocks-written 1+ to #eblocks-written ( )
show-temperature
hdd-led-toggle
;
More information about the openfirmware
mailing list