April 2011 - openfirmware - mail.coreboot.org

[commit] r2194 - cpu/x86/pc/olpc/via
by repository service April 30, 2011

April 30, 2011

Author: quozl Date: Sat Apr 30 02:01:18 2011 New Revision: 2194 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2194 Log: Q3A65 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Fri Apr 29 07:10:28 2011 (r2193) +++ cpu/x86/pc/olpc/via/fw-version.fth Sat Apr 30 02:01:18 2011 (r2194) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 64 +macro: FW_MINOR 65

1 0

[commit] r2193 - cpu/x86/pc/olpc/via
by repository service April 29, 2011

April 29, 2011

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

1 0

[commit] r2192 - cpu/x86/pc/olpc/via dev/mmc/sdhci
by repository service April 27, 2011

April 27, 2011

Author: quozl Date: Wed Apr 27 09:14:27 2011 New Revision: 2192 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2192 Log: OLPC XO-1.5 - fs-update, add support for sparse .zd files, undo -r2186 meaning of zblocks: parameter, split card erasure to avoid card lockup, and show progress during erasure. SDHCI - erase blocks, wait for card to leave programming state, and ignore spurious data timeout. Modified: cpu/x86/pc/olpc/via/fsupdate.fth dev/mmc/sdhci/sdhci.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Mon Apr 18 12:11:06 2011 (r2191) +++ cpu/x86/pc/olpc/via/fsupdate.fth Wed Apr 27 09:14:27 2011 (r2192) @@ -8,14 +8,28 @@ push-hex $number pop-base " Bad number" ?nand-abort ; -0 value #eblocks-written +0 value min-eblock# +0 value max-eblock# + +: written ( eblock# -- ) + dup + max-eblock# max to max-eblock# ( eblock# ) + min-eblock# min to min-eblock# +; : ?all-written ( -- ) - #eblocks-written #image-eblocks <> if + max-eblock# 1+ #image-eblocks <> if cr red-letters - ." WARNING: The file specified " #image-eblocks .d - ." chunks but wrote only " #eblocks-written .d ." chunks" cr + ." WARNING: The file said highest block " #image-eblocks .d + ." but wrote only as high as block " max-eblock# .d cr + black-letters + then + min-eblock# 0 <> if + cr + red-letters + ." WARNING: The file did not write a zero block, " + ." but wrote only as low as block " min-eblock# .d cr black-letters then ; @@ -52,15 +66,35 @@ 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 get-hex# to /nand-block get-hex# to #image-eblocks + #image-eblocks to min-eblock# + 0 to max-eblock# " 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 /nand-block h# 200 */ " erase-blocks" $call-nand + 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 @@ -200,8 +234,8 @@ swap-buffers ( eblock# ) \ then + dup written ( eblock# ) show-written ( ) - #eblocks-written 1+ to #eblocks-written ( ) show-temperature hdd-led-toggle ; Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Mon Apr 18 12:11:06 2011 (r2191) +++ dev/mmc/sdhci/sdhci.fth Wed Apr 27 09:14:27 2011 (r2192) @@ -284,7 +284,7 @@ then ( isr esr ) allow-timeout? if ( isr esr ) - dup 1 = if true to timeout? 2drop exit then + dup 1 = over h# 10 = or if true to timeout? 2drop exit then then ( isr esr ) ." SDHCI: Error: ISR = " swap u. @@ -489,16 +489,6 @@ 0 instance value writing? -: erase-blocks ( block# #blocks -- ) \ UNTESTED - intstat-on - dup 0= if 2drop exit then - 1- bounds ( last first ) - h# 201a 0 cmd ( last ) \ CMD32 - R1 - h# 211a 0 cmd ( ) \ CMD33 - R1 - 0 h# 261b 0 cmd \ CMD38 - R1b (wait for busy) - intstat-off -; - \ CMD40 is MMC \ See table 4-5 in sandisk spec @@ -1034,6 +1024,21 @@ : detach-sdio-card ( -- ) ; +: erase-blocks ( block# #blocks -- ) + intstat-on + dup 0= if 2drop exit then + 1- bounds ( last first ) + h# 201a 0 cmd ( last ) \ CMD32 - R1 + h# 211a 0 cmd ( ) \ CMD33 - R1 + 0 h# 261b 0 cmd \ CMD38 - R1b (wait for busy) + true to writing? ( ) + true to allow-timeout? + false to timeout? + wait-write-done drop + false to allow-timeout? + intstat-off +; + \ Asynchronous poll for completion : r/w-blocks-end? ( in? -- false | error? true ) drop

1 0

[commit] r2191 - cpu/x86/pc/olpc/via
by repository service April 18, 2011

April 18, 2011

Author: quozl Date: Mon Apr 18 12:11:06 2011 New Revision: 2191 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2191 Log: OLPC - fs-update, -r2190, make radix explicit. 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 12:02:45 2011 (r2190) +++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Apr 18 12:11:06 2011 (r2191) @@ -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 /nand-block 200 */ " erase-blocks" $call-nand + 0 #image-eblocks /nand-block h# 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

1 0

[commit] r2190 - cpu/x86/pc/olpc/via
by repository service April 18, 2011

April 18, 2011

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

1 0

[commit] r2189 - cpu/x86/pc/olpc/via
by repository service April 18, 2011

April 18, 2011

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 !

1 0

[commit] r2188 - forth/lib
by repository service April 14, 2011

April 14, 2011

Author: quozl Date: Thu Apr 14 08:06:40 2011 New Revision: 2188 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2188 Log: stack effect comment for $case example of use Modified: forth/lib/strcase.fth Modified: forth/lib/strcase.fth ============================================================================== --- forth/lib/strcase.fth Thu Apr 14 00:03:26 2011 (r2187) +++ forth/lib/strcase.fth Thu Apr 14 08:06:40 2011 (r2188) @@ -9,7 +9,7 @@ \ " abc" $of ." The string starts with abc" $endof \ " xyz" $of ." Oh, it's an xyz string" $endof \ ( $ ) ." **** It was " 2dup type -\ $endcase +\ $endcase ( $ ) \ The default clause is optional. \ When an $of clause is executed, the remaining selector string (past

1 0

[commit] r2187 - cpu/x86/pc/olpc/via
by repository service April 13, 2011

April 13, 2011

Author: quozl Date: Thu Apr 14 00:03:26 2011 New Revision: 2187 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2187 Log: Q3A64 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Wed Apr 13 23:37:18 2011 (r2186) +++ cpu/x86/pc/olpc/via/fw-version.fth Thu Apr 14 00:03:26 2011 (r2187) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 63 +macro: FW_MINOR 64

1 0

[commit] r2186 - cpu/x86/pc/olpc/via
by repository service April 13, 2011

April 13, 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 ;

1 0

[commit] r2185 - cpu/x86/pc/olpc/via
by repository service April 12, 2011

April 12, 2011

Author: rsmith Date: Tue Apr 12 05:50:42 2011 New Revision: 2185 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2185 Log: * XO-1.5: Ver: Q3a63 - New EC code 2.1.0 with active MPPT. Modified: cpu/x86/pc/olpc/via/ec-version.fth cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/ec-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/ec-version.fth Tue Apr 12 05:36:31 2011 (r2184) +++ cpu/x86/pc/olpc/via/ec-version.fth Tue Apr 12 05:50:42 2011 (r2185) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 2_0_1 +macro: EC_VERSION 2_1_0 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Tue Apr 12 05:36:31 2011 (r2184) +++ cpu/x86/pc/olpc/via/fw-version.fth Tue Apr 12 05:50:42 2011 (r2185) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 62 +macro: FW_MINOR 63

1 0