September 2012 - openfirmware - mail.coreboot.org

[commit] r3285 - cpu/x86/pc/olpc
by repository service Sept. 4, 2012

Sept. 4, 2012

Author: quozl Date: Wed Sep 5 03:38:05 2012 New Revision: 3285 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3285 Log: OLPC - security, use signature-offset for locating version number in next firmware image, #12079 Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Wed Sep 5 02:59:42 2012 (r3284) +++ cpu/x86/pc/olpc/security.fth Wed Sep 5 03:38:05 2012 (r3285) @@ -889,7 +889,7 @@ pop-base ; : (fw-version) ( base-adr -- n ) - h# f.ffc7 + ((fw-version)) + signature-offset + 7 + ((fw-version)) ; \ Returns an integer that is derived from a base-36 decoding @@ -901,7 +901,7 @@ : firmware-up-to-date? ( img$ -- flag ) /flash <> if show-x " Invalid Firmware image" .security-failure then ( adr ) - h# f.ffc7 + ((fw-version)) ( file-version# ) + (fw-version) ( file-version# ) ofw-version-int ( file-version# rom-version# ) u<= ;

1 0

[commit] r3284 - cpu/arm/olpc
by repository service Sept. 4, 2012

Sept. 4, 2012

Author: quozl Date: Wed Sep 5 02:59:42 2012 New Revision: 3284 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3284 Log: OLPC XO-4 - Neonode, complete Lightguide Tooling test Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Wed Sep 5 01:46:39 2012 (r3283) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Sep 5 02:59:42 2012 (r3284) @@ -691,6 +691,11 @@ ; +: lg-tooling ( -- error? ) + open if test-os test-fll else fault then + faults +; + : ir-pcb-smt ( -- error? ) hold-reset connect open if test-os else fault then @@ -732,6 +737,7 @@ h# 2 of mb-assy exit endof h# 11 of ir-pcb-smt exit endof h# 12 of ir-pcb-assy exit endof + h# 13 of lg-tooling exit endof endcase \ MB FINAL @@ -765,18 +771,21 @@ : test-pass-or-fail ( function -- error? ) catch if - show-fail + show-fail true else - show-pass + show-pass false then ; -: test-ir-pcb-assy ( -- error? ) - test-station h# 12 to test-station ( test-station ) +\ touch screen (test by) test station +: tsts ( test-station -- error? ) + test-station swap to test-station ( test-station ) ['] test-touchscreen test-pass-or-fail ( test-station error? ) swap to test-station ( error? ) ; +: test-ir-pcb-assy ( -- error? ) h# 12 tsts ; +: test-lightguide ( -- error? ) h# 13 tsts ; \ LICENSE_BEGIN \ Copyright (c) 2012 FirmWorks

1 0

[commit] r3283 - in cpu/arm/olpc: . 1.75
by repository service Sept. 4, 2012

Sept. 4, 2012

Author: quozl Date: Wed Sep 5 01:46:39 2012 New Revision: 3283 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3283 Log: OLPC XO-4 - Neonode, complete IR PCB ASSY test Modified: cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Sep 4 20:07:11 2012 (r3282) +++ cpu/arm/olpc/1.75/fw.bth Wed Sep 5 01:46:39 2012 (r3283) @@ -26,7 +26,6 @@ fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth fload ${BP}/cpu/arm/olpc/1.75/usb.fth fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth -fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth fload ${BP}/cpu/arm/olpc/1.75/compass.fth fload ${BP}/cpu/arm/olpc/1.75/switches.fth fload ${BP}/cpu/arm/olpc/1.75/leds.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Tue Sep 4 20:07:11 2012 (r3282) +++ cpu/arm/olpc/nn-touchscreen.fth Wed Sep 5 01:46:39 2012 (r3283) @@ -186,7 +186,7 @@ (.version) 2+ [char] . emit loop ( addr ) - (.version) ( ) + (.version) drop ( ) ; : test-version ( -- ) @@ -544,6 +544,7 @@ : ev ( handler -- ) to (ev) + get-msecs d# 30000 + ( to ) begin in? if pbuf 2+ c@ h# 04 = if \ touch notification event @@ -555,11 +556,12 @@ (ev) ( ) loop then - then - key? dup if key drop then ( key? ) - remaining 0= or ( exit? ) - \ FIXME: add 30-second timeout - until + then ( to ) + dup get-msecs - 0< ( to timeout? ) + dup if fault then ( to timeout? ) + key? dup if key drop then ( to timeout? key? ) + or remaining 0= or ( to exit? ) + until drop ( ) ; : ev( @@ -755,6 +757,27 @@ finish-device device-end +: test-touchscreen ( -- error? ) + " /touchscreen" " selftest" execute-device-method if + throw + then +; + +: test-pass-or-fail ( function -- error? ) + catch if + show-fail + else + show-pass + then +; + +: test-ir-pcb-assy ( -- error? ) + test-station h# 12 to test-station ( test-station ) + ['] test-touchscreen test-pass-or-fail ( test-station error? ) + swap to test-station ( error? ) +; + + \ LICENSE_BEGIN \ Copyright (c) 2012 FirmWorks \

1 0

[commit] r3282 - cpu/arm/mmp2
by repository service Sept. 4, 2012

Sept. 4, 2012

Author: wmb Date: Tue Sep 4 20:07:11 2012 New Revision: 3282 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3282 Log: OLPC XO-4 - Increased the temporary suspend power threshold to 500 mW to cover boards with different VCore settings. Modified: cpu/arm/mmp2/rtc.fth Modified: cpu/arm/mmp2/rtc.fth ============================================================================== --- cpu/arm/mmp2/rtc.fth Tue Sep 4 19:38:42 2012 (r3281) +++ cpu/arm/mmp2/rtc.fth Tue Sep 4 20:07:11 2012 (r3282) @@ -57,7 +57,7 @@ d# -250 constant suspend-power-limit [ifdef] mmp3 .( mmp2/rtc.fth: Temporarily increasing suspend-power-limit) cr - d# -400 to suspend-power-limit + d# -500 to suspend-power-limit [then] : s3-selftest ( -- error? )

1 0

[commit] r3281 - cpu/arm/olpc
by repository service Sept. 4, 2012

Sept. 4, 2012

Author: wmb Date: Tue Sep 4 19:38:42 2012 New Revision: 3281 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3281 Log: OLPC ARM - Moved the security Processor communication protocol driver after the USB driver in the load sequence so the ambiguous pathname /keyboard will resolve to /ap-sp/keyboard instead of /usb/keyboard after a USB keyboard has been attached. Manufacturing test scripts need that behavior per OLPC trac #12074. Modified: cpu/arm/olpc/build-fw.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Tue Sep 4 19:14:17 2012 (r3280) +++ cpu/arm/olpc/build-fw.fth Tue Sep 4 19:38:42 2012 (r3281) @@ -241,12 +241,6 @@ fload ${BP}/dev/olpc/kb3700/spicmd.fth \ EC SPI Command Protocol -[ifdef] has-sp-kbd -fload ${BP}/cpu/arm/olpc/spcmd.fth \ Security Processor communication protocol -devalias keyboard /ap-sp/keyboard -devalias mouse /ap-sp/mouse -[then] - : wlan-reset ( -- ) wlan-reset-gpio# gpio-clr d# 20 ms wlan-reset-gpio# gpio-set ; fload ${BP}/ofw/core/fdt.fth @@ -302,6 +296,15 @@ [then] fload ${BP}/cpu/arm/olpc/usb.fth +[ifdef] has-sp-kbd +\ Load this after the USB driver so the ambiguous pathname /keyboard will +\ resolve to /ap-sp/keyboard instead of /usb/keyboard after a USB keyboard +\ has been attached. Manufacturing test scripts need that behavior. +fload ${BP}/cpu/arm/olpc/spcmd.fth \ Security Processor communication protocol +devalias keyboard /ap-sp/keyboard +devalias mouse /ap-sp/mouse +[then] + fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth fload ${BP}/cpu/arm/firfilter.fth

1 0

[commit] r3280 - cpu/arm/mmp3
by repository service Sept. 4, 2012

Sept. 4, 2012

Author: pgf Date: Tue Sep 4 19:14:17 2012 New Revision: 3280 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3280 Log: thermal: fix typo in high-range thermal table Modified: cpu/arm/mmp3/thermal.fth Modified: cpu/arm/mmp3/thermal.fth ============================================================================== --- cpu/arm/mmp3/thermal.fth Tue Sep 4 12:40:05 2012 (r3279) +++ cpu/arm/mmp3/thermal.fth Tue Sep 4 19:14:17 2012 (r3280) @@ -31,9 +31,9 @@ create gc0 \ high range d# 780 w, \ 0000 -d# 830 w, \ 0001 +d# 805 w, \ 0001 d# 855 w, \ 0010 -d# 805 w, \ 0011 +d# 830 w, \ 0011 d# 955 w, \ 0100 d# 930 w, \ 0101 d# 880 w, \ 0110

1 0

[commit] r3279 - cpu/arm/olpc
by repository service Sept. 4, 2012

Sept. 4, 2012

Author: quozl Date: Tue Sep 4 12:40:05 2012 New Revision: 3279 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3279 Log: OLPC XO-4 - Neonode, remove packet dump from Forced LED Levels test, no longer required Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Tue Sep 4 02:11:44 2012 (r3278) +++ cpu/arm/olpc/nn-touchscreen.fth Tue Sep 4 12:40:05 2012 (r3279) @@ -499,7 +499,6 @@ : test-fll-axis ( axis -- ) h# 20 h# 02 h# ee 4 bytes-out h# 1c d# 200 anticipate - pbuf plen cdump cr pbuf 4 + c@ 2/ 0 do i pbuf 5 + over 3 * + >r ( i r:frag ) 2* dup r@ 1+ c@ r@ c@ 4 rshift h# f and test-fll-signal

1 0

[commit] r3278 - cpu/x86/pc/olpc
by repository service Sept. 3, 2012

Sept. 3, 2012

Author: quozl Date: Tue Sep 4 02:11:44 2012 New Revision: 3278 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3278 Log: OLPC XO-1 - avoid lid close shutdown after warm reboot from Linux, caused by GPIO invert input pin bit left set by Linux, fixes a regression introduced in r2991 ticket #11095, solves ticket #12077 Modified: cpu/x86/pc/olpc/fw.bth Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Mon Sep 3 10:41:03 2012 (r3277) +++ cpu/x86/pc/olpc/fw.bth Tue Sep 4 02:11:44 2012 (r3278) @@ -482,7 +482,7 @@ " dhcp" ' ip-address set-config-string-default -: lid? ( -- flag ) h# 30 >hi gpio@ h# 400 and 0= ; +: lid? ( -- flag ) h# 30 >hi gpio@ h# 24 >hi gpio@ xor h# 400 and 0= ; fload ${BP}/dev/olpc/lid.fth : c1-idle ( -- ) interrupts-enabled? if halt then do-lid ;

1 0

[commit] r3277 - cpu/arm/olpc
by repository service Sept. 3, 2012

Sept. 3, 2012

Author: quozl Date: Mon Sep 3 10:41:03 2012 New Revision: 3277 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3277 Log: OLPC XO-4 - Neonode, implement motherboard and IR PCB assembly tests, swiping adjacent axes, not yet tested with revision B IR PCB. Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Mon Sep 3 01:42:54 2012 (r3276) +++ cpu/arm/olpc/nn-touchscreen.fth Mon Sep 3 10:41:03 2012 (r3277) @@ -26,9 +26,14 @@ \ create nn-ir-pcb-rev-b \ support for revision b of the ir pcb assembly +d# 15 value xleds +d# 11 value yleds + \ XXX these are really platform-related, not touchscreen-related : targets? ( -- flag ) final-test? ; -: .tsmsg ( -- ) 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr ; +: (.tsmsg) ( -- ) 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr ; +defer .tsmsg +' (.tsmsg) to .tsmsg [ifndef] set-geometry fload ${BP}/cpu/arm/olpc/touchscreen-common.fth @@ -534,7 +539,12 @@ key drop ; -: (scribble) +defer (ev) ( x y -- ) \ touch event handler for tests +' noop to (ev) +0 value remaining + +: ev ( handler -- ) + to (ev) begin in? if pbuf 2+ c@ h# 04 = if \ touch notification event @@ -543,25 +553,143 @@ screen-w r@ w@ - ( x r:addr ) r@ wa1+ w@ ( x y r:addr ) r> 4 + c@ 2 rshift setcolor ( x y ) - dot + (ev) ( ) loop then then - exit-test? until + key? dup if key drop then ( key? ) + remaining 0= or ( exit? ) + \ FIXME: add 30-second timeout + until ; -: scribble +: ev( configure - \ FIXME: tune with set scanning frequency request cursor-off consume begin in? 0= until background - (scribble) + -1 to remaining +; + +: )ev cursor-on page + ['] (.tsmsg) to .tsmsg +; + + +: scribble + ev( ['] dot ev )ev +; + + +0 value dx +0 value dy + +xleds yleds * constant /boxen +create boxen /boxen allot \ non-zero means box is expected to be hit + +: 0boxen ( -- ) boxen /boxen erase ; +: >boxen ( bx by -- addr ) yleds * + + dup /boxen > if debug-me then + boxen + ; + +: dxdy ( xleds yleds -- ) + 0boxen + screen-h swap / to dy + screen-w swap / to dx + 0 to remaining +; + +: bxby>xy ( bx by -- x y ) + swap dx * swap dy * +; + +: xy>bxby ( x y -- bx by ) + swap dx / swap dy / +; + +: box ( bx by colour -- ) + -rot ( colour bx by ) + bxby>xy ( colour x y ) + dx dy ( colour x y w h ) + fill-rectangle-noff +; + +: hit ( bx by -- ) + 2dup >boxen dup c@ if ( bx by >boxen ) + 0 swap c! ( bx by ) + remaining 1- to remaining ( bx by ) + green box ( ) + else ( bx by >boxen ) + drop 2drop ( ) + then ( ) +; + +: unhit ( bx by -- ) + remaining 1+ to remaining + 2dup >boxen 1 swap c! ( bx by ) + red box ( ) ; +: unhit-all ( -- ) + xleds 0 do + yleds 0 do + j i unhit + loop + loop +; + +: prep + xleds yleds dxdy + unhit-all +; + +: hit-xy ( x y -- ) + screen-h mod swap screen-w mod swap \ coerce stupid coordinates seen + xy>bxby hit +; + +: boxes + ev( prep ['] hit-xy ev )ev +; + + +: .ta ( -- ) d# 32 d# 4 at-xy ." Top Axis Test " cr ; +: .ba ( -- ) d# 32 d# 25 at-xy ." Bottom Axis Test " cr ; +: .la ( -- ) d# 8 d# 14 at-xy ." Left Axis Test " cr ; +: .ra ( -- ) d# 55 d# 14 at-xy ." Right Axis Test " cr ; + +: ta0 ( -- ) xleds yleds dxdy xleds 0 do i 0 unhit loop ; +: ba0 ( -- ) xleds 1+ yleds dxdy xleds 1+ 0 do i yleds 1- unhit loop ; +: la0 ( -- ) xleds yleds dxdy yleds 0 do 0 i unhit loop ; +: ra0 ( -- ) xleds yleds 1+ dxdy yleds 1+ 0 do xleds 1- i unhit loop ; + +: (ta) ( x y -- ) dup dy >= if 2drop exit then hit-xy ; +: (ba) ( x y -- ) dup screen-h dy - <= if 2drop exit then hit-xy ; +: (la) ( x y -- ) over dx >= if 2drop exit then hit-xy ; +: (ra) ( x y -- ) over screen-w dx - <= if 2drop exit then hit-xy ; + +\ translate a premature keyboard exit into a fault +: r-fault? ( -- ) remaining if fault then ; + +: ta ['] .ta to .tsmsg ev( ta0 ['] (ta) ev )ev r-fault? ; +: ba ['] .ba to .tsmsg ev( ba0 ['] (ba) ev )ev r-fault? ; +: la ['] .la to .tsmsg ev( la0 ['] (la) ev )ev r-fault? ; +: ra ['] .ra to .tsmsg ev( ra0 ['] (ra) ev )ev r-fault? ; + +: test-adjacent-axes + get-msecs 3 and \ pick random corner + case + 0 of ta ra exit endof + 1 of ra ba exit endof + 2 of ba la exit endof + 3 of la ta exit endof + endcase +; + + : ir-pcb-smt ( -- error? ) hold-reset connect open if test-os else fault then @@ -571,7 +699,12 @@ : ir-pcb-assy ( -- error? ) hold-reset connect - open if test-fll else fault then + open if + test-fll + faults 0= if test-adjacent-axes then + else + fault + then hold-reset disconnect faults ; @@ -584,12 +717,9 @@ ; : mb-assy ( -- error? ) -[ifdef] nn-ir-pcb-rev-b open 0= if true exit then - test-finger-down-each-edge + test-adjacent-axes faults -[then] - true ; : selftest ( -- error? ) @@ -618,12 +748,7 @@ faults if close true exit then then -[ifdef] nn-ir-pcb-rev-b scribble -[else] - ." dumping events from touchscreen controller, press a key to stop" cr - dump-events -[then] close false ;

1 0

[commit] r3276 - cpu/arm/olpc
by repository service Sept. 2, 2012

Sept. 2, 2012

Author: quozl Date: Mon Sep 3 01:42:54 2012 New Revision: 3276 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3276 Log: OLPC XO-4 - fix broken selftest logic, reported by John Modified: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- cpu/arm/olpc/nn-touchscreen.fth Sun Sep 2 02:07:25 2012 (r3275) +++ cpu/arm/olpc/nn-touchscreen.fth Mon Sep 3 01:42:54 2012 (r3276) @@ -589,6 +589,7 @@ test-finger-down-each-edge faults [then] + true ; : selftest ( -- error? ) @@ -596,10 +597,10 @@ 0 to faults test-station case - h# 1 = of mb-smt exit endof - h# 2 = of mb-assy exit endof - h# 11 = of ir-pcb-smt exit endof - h# 12 = of ir-pcb-assy exit endof + h# 1 of mb-smt exit endof + h# 2 of mb-assy exit endof + h# 11 of ir-pcb-smt exit endof + h# 12 of ir-pcb-assy exit endof endcase \ MB FINAL

1 0