Author: quozl
Date: Fri Apr 29 07:10:28 2011
New Revision: 2193
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2193
Log:
OLPC XO-1.5 - fs-update, remove erase support because it broke
NANDblaster. The microSD card is used to hold the received .zd file,
and erasing the card erases the file, causing fs-update to see a zero
filled file beyond a certain point. This revision tested with sparse
.zd files on NANDblaster and fs-update from USB.
Modified:
cpu/x86/pc/olpc/via/fsupdate.fth
Modified: cpu/x86/pc/olpc/via/fsupdate.fth
==============================================================================
--- cpu/x86/pc/olpc/via/fsupdate.fth Wed Apr 27 09:14:27 2011 (r2192)
+++ cpu/x86/pc/olpc/via/fsupdate.fth Fri Apr 29 07:10:28 2011 (r2193)
@@ -66,24 +66,6 @@
vocabulary nand-commands
also nand-commands definitions
-\ some cards do not respond in a reasonable time,
-\ some cards lock up and cause a command timeout in get-status,
-\ so split the erase into many parts.
-: erase-blocks
- [char] ~ emit \ visual hint of erase delay
- #image-eblocks /nand-block h# 200 */ ( #blocks )
- dup d# 16 / swap ( /part #blocks )
- 0 do ( /part )
- i over " erase-blocks" $call-nand
- hdd-led-toggle \ visual hint of progress
- dup +loop ( /part )
- drop
- bs emit space bs emit hdd-led-off \ visual hint remove
-;
-
-\ : erase-blocks
-\ 0 #image-eblocks /nand-block h# 200 */ " erase-blocks" $call-nand ;
-
: zblocks: ( "eblock-size" "#eblocks" ... -- )
hdd-led-toggle
?compare-spec-line
@@ -94,7 +76,6 @@
" size" $call-nand #image-eblocks /nand-block um* d<
" Image size is larger than output device" ?nand-abort
#image-eblocks show-init
- erase-blocks
get-inflater
\ Separate the two buffers by enough space for both the compressed
\ and uncompressed copies of the data. 4x is overkill, but there
Author: quozl
Date: Mon Apr 18 12:02:45 2011
New Revision: 2190
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2190
Log:
OLPC - fs-update was not erasing the whole part, because the image
block count, typically a number of 131072-byte blocks, was used as
a 512-byte block count in invokation of erase-blocks.
Modified:
cpu/x86/pc/olpc/via/fsupdate.fth
Modified: cpu/x86/pc/olpc/via/fsupdate.fth
==============================================================================
--- cpu/x86/pc/olpc/via/fsupdate.fth Mon Apr 18 07:04:30 2011 (r2189)
+++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Apr 18 12:02:45 2011 (r2190)
@@ -60,7 +60,7 @@
" size" $call-nand #image-eblocks /nand-block um* d<
" Image size is larger than output device" ?nand-abort
#image-eblocks show-init
- 0 #image-eblocks " erase-blocks" $call-nand
+ 0 #image-eblocks /nand-block 200 */ " erase-blocks" $call-nand
get-inflater
\ Separate the two buffers by enough space for both the compressed
\ and uncompressed copies of the data. 4x is overkill, but there
Author: quozl
Date: Mon Apr 18 07:04:30 2011
New Revision: 2189
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2189
Log:
OLPC XO-1.5 - "help" output review; avoid mentioning q2c series, use
.zd4 file in example, change USB key to USB drive, vertically align
comments, drop "boot u:\boot\vmlinuz" as it is unlikely to be used,
explain "printenv boot-device" as a new line, expand configuration
variable meanings, change "initrd.imz" to "initrd.img", indent URL of
OFW_FAQ.
Modified:
cpu/x86/pc/olpc/via/help.fth
Modified: cpu/x86/pc/olpc/via/help.fth
==============================================================================
--- cpu/x86/pc/olpc/via/help.fth Thu Apr 14 08:06:40 2011 (r2188)
+++ cpu/x86/pc/olpc/via/help.fth Mon Apr 18 07:04:30 2011 (r2189)
@@ -3,31 +3,31 @@
warning @ warning off
: help ( -- )
blue-letters ." UPDATES:" black-letters mcr
- ." flash u:\q2c18.rom Rewrite the firmware from USB key" mcr
- ." flash ext:\q2c18.rom Rewrite the firmware from external SD file" mcr
- ." fs-update u:\boot\os51.zd Rewrite the OS on internal SD from USB key" mcr
+ \ ================================================================================
+ ." fs-update u:\os1.zd4 Rewrite the OS on internal SD from USB drive" mcr
+ ." flash u:\q3a64.rom Rewrite the firmware from USB drive" mcr
+ ." flash ext:\q3a64.rom Rewrite the firmware from external SD file" mcr
blue-letters ." DIRECTORY LISTING:" black-letters mcr
- ." dir u:\ List USB key root directory" mcr
- ." dir u:\boot\ List USB key /boot directory" mcr
- ." dir int:\boot\*.zip List .zip files in internal SD /boot directory" mcr
+ ." dir u:\ List USB drive root directory" mcr
+ ." dir u:\boot\ List USB drive /boot directory" mcr
+ ." dir int:\boot\*.zip List .zip files in internal SD /boot directory" mcr
blue-letters ." BOOTING:" black-letters mcr
- ." boot Load the OS from list of default locations" mcr
- ." 'printenv boot-device' shows the list" mcr
- ." boot <cmdline> Load the OS, passing <cmdline> to kernel" mcr
- ." boot u:\boot\vmlinuz Load the OS from a specific location" mcr
+ ." boot Start the OS from list of default locations" mcr
+ ." printenv boot-device Show the list of default locations used by boot" mcr
+ ." boot u:\test.fth Start the OS from a specific location" mcr
blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters mcr
- ." boot-device Kernel or boot script path. Example: ext:\boot\olpc.fth" mcr
- ." boot-file Default cmdline. Example: console=ttyS0,115200" mcr
- ." ramdisk initrd pathname. Example: disk:\boot\initrd.imz" mcr
+ ." boot-device Kernel or boot script paths. Example: ext:\boot\olpc.fth" mcr
+ ." boot-file Default kernel command line. Example: console=ttyS0,115200" mcr
+ ." ramdisk Initial RAMDISK path. Example: int:\boot\initrd.img" mcr
blue-letters ." MANAGING CONFIGURATION VARIABLES:" black-letters mcr
- ." printenv [ <name> ] Show configuration variables" mcr
- ." setenv <name> <value> Set configuration variable" mcr
- ." editenv <name> Edit configuration variable" mcr
+ ." printenv [ <name> ] Show configuration variables" mcr
+ ." setenv <name> <value> Set configuration variable" mcr
+ ." editenv <name> Edit configuration variable" mcr
blue-letters ." DIAGNOSTICS:" black-letters mcr
- ." test <device-name> Test device. Example: test mouse" mcr
- ." test-all Test all devices that have test routines" mcr
- ." menu Graphical interface to selftests" mcr
+ ." test <device-name> Test device. Example: test mouse" mcr
+ ." test-all Test all devices that have test routines" mcr
+ ." menu Graphical interface to selftests" mcr
blue-letters ." More information: " black-letters mcr
- green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr
+ green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr
;
warning !