March 2008 - OpenBIOS - mail.coreboot.org

r821 - cpu/x86/pc/olpc
by svn＠openbios.org March 13, 2008

March 13, 2008

Author: rsmith Date: 2008-03-13 08:58:09 +0100 (Thu, 13 Mar 2008) New Revision: 821 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC: Tweak do-firmware-update so that it does not print the buffer@<address> message when it skips the firmware update due to an error. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-03-10 17:39:13 UTC (rev 820) +++ cpu/x86/pc/olpc/security.fth 2008-03-13 07:58:09 UTC (rev 821) @@ -653,8 +653,13 @@ ; : do-firmware-update ( img$ -- ) - visible +\ Keep .error from printing an input sream position report +\ which makes a buffer@<address> show up in the error message + ['] noop to show-error + + visible + tuck flash-buf swap move ( len ) ['] ?image-valid catch ?dup if ( )

1 0

r820 - cpu/x86/pc/olpc
by svn＠openbios.org March 10, 2008

March 10, 2008

Author: wmb Date: 2008-03-10 18:39:13 +0100 (Mon, 10 Mar 2008) New Revision: 820 Modified: cpu/x86/pc/olpc/parsekbd0.py Log: OLPC parsekbd0 - fixed a bug in one of the keyboard table parsers. It was claiming to replace a key entry with a better choice, but not actually doing it. Test case: python parsekbd0.py OLPC_Thailand_Keyboard resulted in a keymap that used the wrong stations for - and / . Modified: cpu/x86/pc/olpc/parsekbd0.py =================================================================== --- cpu/x86/pc/olpc/parsekbd0.py 2008-03-06 16:29:11 UTC (rev 819) +++ cpu/x86/pc/olpc/parsekbd0.py 2008-03-10 17:39:13 UTC (rev 820) @@ -103,6 +103,8 @@ if (ascii >= 0x20) & (((modifier & 1) == 0) & (keys[ascii] != keyid)): if modifier < modifiers[ascii]: print "Replacing", chr(ascii), "at keyid", keys[ascii], "modifier", modifiers[ascii], "with keyid", keyid, "modifier", modifier + modifiers[ascii] = modifier + keys[ascii] = keyid else: print "Discarding", chr(ascii), "at keyid", keyid, "modifier", modifier, "because keyid", keys[ascii], "modifier", modifiers[ascii], "is better" return

1 0

r819 - forth/lib
by svn＠openbios.org March 6, 2008

March 6, 2008

Author: wmb Date: 2008-03-06 17:29:11 +0100 (Thu, 06 Mar 2008) New Revision: 819 Modified: forth/lib/editcmd.fth Log: Added an error handler to do-command so that the system won't crash if one of the keystroke commands aborts. Modified: forth/lib/editcmd.fth =================================================================== --- forth/lib/editcmd.fth 2008-03-06 05:28:23 UTC (rev 818) +++ forth/lib/editcmd.fth 2008-03-06 16:29:11 UTC (rev 819) @@ -44,7 +44,7 @@ name-buf "copy name-buf lastchar @ add-char-to-name name-buf count keys token@ search-wordlist ( false | cfa true ) - if execute else not-found then + if catch drop else not-found then ; defer printable-char

1 0

r818 - cpu/x86/pc/olpc
by svn＠openbios.org March 6, 2008

March 6, 2008

Author: rsmith Date: 2008-03-06 06:28:23 +0100 (Thu, 06 Mar 2008) New Revision: 818 Modified: cpu/x86/pc/olpc/versions.fth Log: Bump version to q2d14 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-03-05 20:50:35 UTC (rev 817) +++ cpu/x86/pc/olpc/versions.fth 2008-03-06 05:28:23 UTC (rev 818) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 13 +macro: FW_MINOR 14 \ The EC microcode macro: EC_VERSION d13

1 0

r817 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org March 5, 2008

March 5, 2008

Author: wmb Date: 2008-03-05 21:50:35 +0100 (Wed, 05 Mar 2008) New Revision: 817 Modified: cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/battery.fth Log: OLPC Trac #5422 - continue booting if the firmware update is deferred due to insufficient power. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-02-27 04:40:24 UTC (rev 816) +++ cpu/x86/pc/olpc/security.fth 2008-03-05 20:50:35 UTC (rev 817) @@ -652,6 +652,51 @@ drop ; +: do-firmware-update ( img$ -- ) + visible + + tuck flash-buf swap move ( len ) + + ['] ?image-valid catch ?dup if ( ) + visible + red-letters + ." Bad firmware image file - " .error + ." Continuing with old firmware" cr + black-letters + exit + then + + true to file-loaded? + + d# 12,000 wait-until \ Wait for EC to notice the battery + + ['] ?enough-power catch ?dup if + visible + red-letters + ." Unsafe to update firmware now - " .error + ." Continuing with old firmware" cr + black-letters + exit + then + + " Updating firmware" ?lease-debug-cr + + ec-indexed-io-off? if + visible + ." Restarting to enable SPI FLASH writing." cr + d# 3000 ms + ec-ixio-reboot + security-failure + then + + \ Latch alternate? flag for next startup + alternate? if [char] A h# 82 cmos! then + + reflash \ Should power-off and reboot + show-x + " Reflash returned, unexpectedly" .security-failure +; + : load-from-device ( devname$ -- done? ) d# 16 0 +icon-xy show-dot @@ -667,36 +712,7 @@ " new - " ?lease-debug fwkey$ to pubkey$ img$ sig$ fw-valid? if - visible - - img$ tuck flash-buf swap move ( len ) - - ?image-valid ( ) - true to file-loaded? - " Updating firmware" ?lease-debug-cr - - ec-indexed-io-off? if - visible - ." Restarting to enable SPI FLASH writing." cr - d# 3000 ms - ec-ixio-reboot - security-failure - then - - d# 12,000 wait-until \ Wait for EC to notice the battery - - ['] ?enough-power catch ?dup if - visible - red-letters .error black-letters - security-failure - then - - \ Latch alternate? flag for next startup - alternate? if [char] A h# 82 cmos! then - - reflash \ Should power-off and reboot - show-x - " Reflash returned, unexpectedly" .security-failure + img$ do-firmware-update then show-lock then Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2008-02-27 04:40:24 UTC (rev 816) +++ dev/olpc/kb3700/battery.fth 2008-03-05 20:50:35 UTC (rev 817) @@ -105,9 +105,9 @@ ; : ?enough-power ( ) - bat-status@ ( stat ) - dup h# 10 and 0= abort" AC not present" ( stat ) - dup 1 and 0= abort" Battery not present" ( stat ) + bat-status@ ( stat ) + dup h# 10 and 0= abort" No external power" ( stat ) + dup 1 and 0= abort" No battery" ( stat ) 4 and abort" Battery low" ;

1 0