December 2009 - openfirmware - mail.coreboot.org

r1611 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: wmb Date: 2009-12-15 06:26:00 +0100 (Tue, 15 Dec 2009) New Revision: 1611 Added: cpu/x86/pc/olpc/via/help.fth Modified: cpu/x86/pc/olpc/via/fw.bth Log: OLPC trac 9882 - updated help command for XO-1.5 Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-12-15 05:02:15 UTC (rev 1610) +++ cpu/x86/pc/olpc/via/fw.bth 2009-12-15 05:26:00 UTC (rev 1611) @@ -348,12 +348,12 @@ fload ${BP}/cpu/x86/pc/olpc/setwp.fth -fload ${BP}/cpu/x86/pc/olpc/help.fth +fload ${BP}/cpu/x86/pc/olpc/via/help.fth \ Help for common user tasks fload ${BP}/cpu/x86/pc/olpc/gui.fth fload ${BP}/cpu/x86/pc/olpc/via/suspend.fth \ Suspend/resume setup -fload ${BP}/cpu/x86/pc/olpc/via/switches.fth \ Lid and ebook switches -fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs +fload ${BP}/cpu/x86/pc/olpc/via/switches.fth \ Lid and ebook switches +fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools fload ${BP}/cpu/x86/pc/olpc/disptest.fth Added: cpu/x86/pc/olpc/via/help.fth =================================================================== --- cpu/x86/pc/olpc/via/help.fth (rev 0) +++ cpu/x86/pc/olpc/via/help.fth 2009-12-15 05:26:00 UTC (rev 1611) @@ -0,0 +1,33 @@ +purpose: Basic help for OLPC OFW + +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 + 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 + 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 + 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 + 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 + 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 + blue-letters ." More information: " black-letters mcr + green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr +; +warning !

1 0

r1610 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: wmb Date: 2009-12-15 06:02:15 +0100 (Tue, 15 Dec 2009) New Revision: 1610 Modified: cpu/x86/pc/olpc/via/copynand.fth cpu/x86/pc/olpc/via/fsupdate.fth Log: OLPC trac 9873 - fixed secure reflash. Modified: cpu/x86/pc/olpc/via/copynand.fth =================================================================== --- cpu/x86/pc/olpc/via/copynand.fth 2009-12-15 05:01:14 UTC (rev 1609) +++ cpu/x86/pc/olpc/via/copynand.fth 2009-12-15 05:02:15 UTC (rev 1610) @@ -1,7 +1,7 @@ \ See license at end of file purpose: Copy a file onto the NAND FLASH -0 value fileih +0 value filefd 0 value nandih h# 20000 value /nand-block @@ -14,7 +14,7 @@ : $call-nand ( ?? method$ -- ?? ) nandih $call-method ; : close-image-file ( -- ) - fileih ?dup if 0 to fileih close-dev then + filefd ?dup if 0 to filefd close-file drop then ; : close-nand ( -- ) nandih ?dup if 0 to nandih close-dev then @@ -32,11 +32,6 @@ then ; -: ?key-stop ( -- ) - key? dup if key drop then ( stop? ) - " Stopped by keystroke" ?nand-abort -; - : set-nand-vars ( -- ) " size" $call-nand /nand-page um/mod nip to #nand-pages ; @@ -49,35 +44,6 @@ h# 100 buffer: image-name-buf : image-name$ ( -- adr len ) image-name-buf count ; -: get-img-filename ( -- ) safe-parse-word image-name-buf place ; - -: open-img ( "devspec" -- ) - image-name$ open-dev to fileih - fileih 0= " Can't open NAND image file" ?nand-abort - " size" fileih $call-method ( d.size ) - - 2dup h# 20000 um/mod swap if 1+ then ( d.size #eblocks ) - nip nip ( #eblocks ) - - to #image-eblocks - - #image-eblocks 0= " Image file is empty" ?nand-abort -; - -: read-image-block ( -- ) - load-base /nand-block " read" fileih $call-method ( len ) - dup /nand-block <> if ( len ) - load-base over + /nand-page rot - h# ff fill - else - drop - then -; - -: check-mem-hash ( record# -- ) - drop \ XXX -; - - defer show-init ( #eblocks -- ) ' drop to show-init Modified: cpu/x86/pc/olpc/via/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth 2009-12-15 05:01:14 UTC (rev 1609) +++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-12-15 05:02:15 UTC (rev 1610) @@ -44,6 +44,13 @@ : swap-buffers ( -- ) data-buffer dma-buffer to data-buffer to dma-buffer ; +: force-line-delimiter ( delimiter fd -- ) + file @ ( delim fd fd' ) + swap file ! ( delim fd' ) + swap line-delimiter c! ( fd' ) + file ! ( ) +; + vocabulary nand-commands also nand-commands definitions @@ -71,7 +78,16 @@ : data: ( "filename" -- ) safe-parse-word fn-buf place " ${DN}${PN}\${CN}${FN}" expand$ image-name-buf place - open-img + image-name$ r/o open-file if + drop ." Can't open " image-name$ type cr + true " " ?nand-abort + then to filefd + linefeed filefd force-line-delimiter + \ Eat the initial "zblocks:" line + load-base /spec-maxline filefd read-line ( len not-eof? error? ) + " Read error on .zd file" ?nand-abort ( len not-eof? ) + 0= " Premature EOF on .zd file" ?nand-abort ( len ) + drop ( ) true to secure-fsupdate? ; @@ -82,13 +98,13 @@ : get-zdata ( comprlen -- ) secure-fsupdate? if - data-buffer /spec-maxline fileih read-line ( len end? error? ) + data-buffer /spec-maxline filefd read-line ( len end? error? ) " Spec line read error" ?nand-abort ( len end? ) 0= " Spec line too long" ?nand-abort ( len ) data-buffer swap ( adr len ) source $= 0= " Spec line mismatch" ?nand-abort ( ) - fileih ( ih ) + filefd ( ih ) else ( ) source-id ( ih ) then ( ih ) @@ -181,9 +197,7 @@ safe-parse-word r/o open-file ( fd ) abort" Can't open file" ( fd ) - file @ ( fd fd' ) - over file ! linefeed line-delimiter c! ( fd fd' ) - file ! ( fd ) + linefeed over force-line-delimiter ( fd ) t( ( fd ) also nand-commands ( fd ) @@ -217,7 +231,7 @@ show-done ?all-written close-nand-ihs - )t-hms + )t-hms cr ; : fs-update-from-list ( devlist$ -- )

1 0

r1609 - ofw/inet
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: wmb Date: 2009-12-15 06:01:14 +0100 (Tue, 15 Dec 2009) New Revision: 1609 Modified: ofw/inet/tcp.fth Log: TCP - randomize local port numbers to prevent reuse. Modified: ofw/inet/tcp.fth =================================================================== --- ofw/inet/tcp.fth 2009-12-15 04:16:21 UTC (rev 1608) +++ ofw/inet/tcp.fth 2009-12-15 05:01:14 UTC (rev 1609) @@ -2341,6 +2341,10 @@ first-time? if false to first-time? + [ifdef] random-long + random-long h# f000 mod h# 555 + to next-tcp-local-port + [then] + " next-xid" $call-parent to tcp_iss then

1 0

r1608 - dev/hdaudio
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: wmb Date: 2009-12-15 05:16:21 +0100 (Tue, 15 Dec 2009) New Revision: 1608 Modified: dev/hdaudio/test.fth Log: HDaudio selftest - fixed channel format problem that was causing low volume for speaker playback test. Modified: dev/hdaudio/test.fth =================================================================== --- dev/hdaudio/test.fth 2009-12-15 02:55:53 UTC (rev 1607) +++ dev/hdaudio/test.fth 2009-12-15 04:16:21 UTC (rev 1608) @@ -15,6 +15,7 @@ ; : speaker-test ( -- ) h# 19 to node + 2 to #channels pin-sense? if ." Disconnect headphones to continue.. " begin ?key-abort pin-sense? 0= until cr @@ -25,6 +26,7 @@ : headphones-test ( -- ) h# 19 to node + 2 to #channels pin-sense? 0= if ." Connect headphones to continue.. " begin ?key-abort pin-sense? until cr @@ -34,6 +36,13 @@ h# 1f to node power-on \ turn speaker back on ; +: louder-mic-test ( -- ) + ." Recording ..." cr + record + ." Playing ..." cr + d# 0 set-volume play +; + : builtin-mic-test ( -- ) h# 1a to node pin-sense? if @@ -42,7 +51,7 @@ then ." Press a key to test recording / playback on the built-in microphone.. " key drop cr - mic-test + louder-mic-test ; : external-mic-test ( -- )

1 0

r1607 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: pgf Date: 2009-12-15 03:55:53 +0100 (Tue, 15 Dec 2009) New Revision: 1607 Modified: cpu/x86/pc/olpc/via/mfgtests.txt Log: remove reference to DL tag, clarify Command: description Modified: cpu/x86/pc/olpc/via/mfgtests.txt =================================================================== --- cpu/x86/pc/olpc/via/mfgtests.txt 2009-12-15 02:46:02 UTC (rev 1606) +++ cpu/x86/pc/olpc/via/mfgtests.txt 2009-12-15 02:55:53 UTC (rev 1607) @@ -54,17 +54,16 @@ BD=u:\boot\olpc.fth net The booted (from the net, using TFTP etc) script does the tag -exchange, runs the download (with command line given by the tag -exchange response), and rewrites the tags. The next state is RUNIN. -The "DL" state never shows up in the tags. +exchange, runs any "Command:" pseudo-tags, and rewrites the tags. +The next state is RUNIN. The response includes one or more "Command:<Forth_commands>" lines. -Those lines are executed to perform the download steps. +Those lines are executed, in order, to perform the download steps. An example value for such a line is "fs-update http:\\10.0.0.1\os41.zd". -The Doing it this way instead of hardcoding it in the script permits -country-specific -images without having to edit the script. The file could also be -served from a Windows server if desired; it need not be http. +Doing it this way instead of hardcoding it in the script permits +country-specific images without having to edit the script. The +file could also be served from a Windows server if desired; it +need not be http. The response tags from this stage include the ones shown in entry condition for the RUNIN state.

1 0

r1606 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: rsmith Date: 2009-12-15 03:46:02 +0100 (Tue, 15 Dec 2009) New Revision: 1606 Modified: cpu/x86/pc/olpc/via/runin.fth Log: OLPC 1.5: Override the final LCD tests with this until we change it in the firmware Modified: cpu/x86/pc/olpc/via/runin.fth =================================================================== --- cpu/x86/pc/olpc/via/runin.fth 2009-12-15 00:10:05 UTC (rev 1605) +++ cpu/x86/pc/olpc/via/runin.fth 2009-12-15 02:46:02 UTC (rev 1606) @@ -317,4 +317,21 @@ power-off ; +\ Override the display self test +dev /display + +warning @ warning off +: selftest ( -- error? ) + depth d# 16 < if false exit then + + .vertical-bars16 wait + hgradient + + confirm-selftest? +; + +device-end + +warning ! + after-runin

1 0

r1605 - dev/usb2/device/keyboard
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: wmb Date: 2009-12-15 01:10:05 +0100 (Tue, 15 Dec 2009) New Revision: 1605 Modified: dev/usb2/device/keyboard/kbd.fth Log: USB keyboard - clarified error messages and suppressed the "Failed to set idle" message since it is not critical. Modified: dev/usb2/device/keyboard/kbd.fth =================================================================== --- dev/usb2/device/keyboard/kbd.fth 2009-12-15 00:01:16 UTC (rev 1604) +++ dev/usb2/device/keyboard/kbd.fth 2009-12-15 00:10:05 UTC (rev 1605) @@ -379,9 +379,11 @@ null-entry /qe erase key-state /key-state erase device set-target - configuration set-config if ." Failed to set keyboard configuration" cr then - set-boot-protocol if ." Failed to set boot protocol" cr then - idle-rate set-idle if ." Failed to set idle" cr then + configuration set-config if ." Failed to set USB keyboard configuration" cr then + set-boot-protocol if ." Failed to set USB keyboard boot protocol" cr then + \ Some USB keyboards don't implement set-idle properly, and it's not critical, + \ so we suppress the message to avoid confusing the user + idle-rate set-idle drop \ if ." Failed to set USB keyboard idle" cr then 0 set-leds free-kbd-buf ;

1 0

r1604 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: wmb Date: 2009-12-15 01:01:16 +0100 (Tue, 15 Dec 2009) New Revision: 1604 Modified: cpu/x86/pc/olpc/via/factory.fth Log: Via manufacturing tests - if scanner needs to be plugged in after booting, call ?usb-keyboard to hook it into the console mux. Modified: cpu/x86/pc/olpc/via/factory.fth =================================================================== --- cpu/x86/pc/olpc/via/factory.fth 2009-12-14 23:57:18 UTC (rev 1603) +++ cpu/x86/pc/olpc/via/factory.fth 2009-12-15 00:01:16 UTC (rev 1604) @@ -105,8 +105,9 @@ scanner? 0= if " Connect USB barcode scanner" .instructions begin d# 1000 ms silent-probe-usb scanner? until + ?usb-keyboard then - ; +; : wired-lan? ( -- flag ) " /usb/ethernet" locate-device if false else drop true then ;

1 0

r1603 - cpu/x86
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: wmb Date: 2009-12-15 00:57:18 +0100 (Tue, 15 Dec 2009) New Revision: 1603 Modified: cpu/x86/target.fth Log: x86 kernel - increased return stack and data stack sizes from 256 to 512 cells, thus preventing return stack overflow into the data stack on deeply nested fcode interpretation scenarios. Modified: cpu/x86/target.fth =================================================================== --- cpu/x86/target.fth 2009-12-14 23:29:32 UTC (rev 1602) +++ cpu/x86/target.fth 2009-12-14 23:57:18 UTC (rev 1603) @@ -38,8 +38,8 @@ /n-t th c00 * constant user-size-t [then] [then] -/n-t th 100 * constant ps-size-t -/n-t th 100 * constant rs-size-t +/n-t th 200 * constant ps-size-t +/n-t th 200 * constant rs-size-t \t16-t /w-t constant /user#-t \t32-t /l-t constant /user#-t

1 0

r1602 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Dec. 15, 2009

Dec. 15, 2009

Author: pgf Date: 2009-12-15 00:29:32 +0100 (Tue, 15 Dec 2009) New Revision: 1602 Modified: cpu/x86/pc/olpc/via/runin.fth Log: fixed final tempfile generation. also added ?usb-keyboard call to try to pick up freshly plugged scanner. Modified: cpu/x86/pc/olpc/via/runin.fth =================================================================== --- cpu/x86/pc/olpc/via/runin.fth 2009-12-14 23:28:13 UTC (rev 1601) +++ cpu/x86/pc/olpc/via/runin.fth 2009-12-14 23:29:32 UTC (rev 1602) @@ -54,11 +54,9 @@ 0 0 2value response$ -: final-filename$ ( -- adr len ) board#$ " %s.txt" ; - \ Send the board number as the request and return the response data : final-tag-exchange ( -- ) - final-filename$ open-temp-file + board#$ " %s.txt" sprintf open-temp-file sn$ " SN:" put-key+value " Request" submit-file " Response" get-response to response$ @@ -257,6 +255,7 @@ : wait-connections ( -- ) silent-probe-usb wait-scanner + ?usb-keyboard wait-lan \ wait-usb-key ;

1 0