openfirmware July 2011

openfirmware@openfirmware.info

1 participants
74 discussions

[commit] r2336 - cpu/arm/olpc/1.75
by repository service 06 Jul '11

06 Jul '11

Author: wmb Date: Wed Jul 6 21:16:03 2011 New Revision: 2336 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2336 Log: OLPC XO-1.75 - fixed broken first try at OLS LED selftest. Modified: cpu/arm/olpc/1.75/leds.fth Modified: cpu/arm/olpc/1.75/leds.fth ============================================================================== --- cpu/arm/olpc/1.75/leds.fth Wed Jul 6 08:33:31 2011 (r2335) +++ cpu/arm/olpc/1.75/leds.fth Wed Jul 6 21:16:03 2011 (r2336) @@ -8,13 +8,18 @@ : close ( -- ) ; : hdd-led-on ( -- ) d# 10 gpio-set ; : hdd-led-off ( -- ) d# 10 gpio-clr ; -: ols-led-on ( -- ) d# 57 ec-cmd ; -: ols-led-off ( -- ) d# 58 ec-cmd ; +: ols-led-on ( -- ) h# 57 ec-cmd ; +: ols-led-off ( -- ) h# 58 ec-cmd ; +: ols-assy-mode-on ( -- ) h# 59 ec-cmd ; +: ols-assy-mode-off ( -- ) h# 5a ec-cmd ; +: ols-led-ec-control ( -- ) h# 5b ec-cmd ; + : selftest ( -- ) ." Flashing LEDs" cr " /wlan" test-dev " /wlan" test-dev \ Twice for longer flashing d# 20 0 do hdd-led-on d# 100 ms hdd-led-off d# 100 ms loop d# 20 0 do ols-led-on d# 100 ms ols-led-off d# 100 ms loop + ols-led-ec-control confirm-selftest? ;

1 0

[commit] r2335 - dev/hdaudio ofw/gui
by repository service 06 Jul '11

06 Jul '11

Author: wmb Date: Wed Jul 6 08:33:31 2011 New Revision: 2335 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2335 Log: OLPC XO-1.75 - Eliminated some isn't unique compilation warnings. Modified: dev/hdaudio/test.fth ofw/gui/ofpong.fth Modified: dev/hdaudio/test.fth ============================================================================== --- dev/hdaudio/test.fth Wed Jul 6 08:32:32 2011 (r2334) +++ dev/hdaudio/test.fth Wed Jul 6 08:33:31 2011 (r2335) @@ -196,6 +196,7 @@ test-with-loopback throw disconnect-loopback ; +warning @ warning off : selftest ( -- error? ) diagnostic-mode? if open 0= if ." Failed to open /audio" cr true exit then @@ -207,6 +208,7 @@ selftest ( error? ) then ; +warning ! \ LICENSE_BEGIN \ Copyright (c) 2009 Luke Gorrie Modified: ofw/gui/ofpong.fth ============================================================================== --- ofw/gui/ofpong.fth Wed Jul 6 08:32:32 2011 (r2334) +++ ofw/gui/ofpong.fth Wed Jul 6 08:33:31 2011 (r2335) @@ -213,7 +213,7 @@ erasecol -rot swap swap unscale ballsize batsize paintrect ; -: redraw ( -- ) +: redraw-table ( -- ) drawcol 0 0 screenw ballsize paintrect drawcol 0 screenh ballsize - screenw ballsize paintrect @@ -230,7 +230,7 @@ : drawboard ( -- ) drawcol 0 0 screenw screenh paintrect erasecol 0 0 screenw screenh paintrect - redraw + redraw-table ; : resetball ( -- )

1 0

[commit] r2334 - cpu/arm/olpc
by repository service 06 Jul '11

06 Jul '11

Author: wmb Date: Wed Jul 6 08:32:32 2011 New Revision: 2334 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2334 Log: OLPC XO-1.75 - SP PS2 interface code - time out if command is not accepted by put-data, instead of hanging. Modified: cpu/arm/olpc/spcmd.fth Modified: cpu/arm/olpc/spcmd.fth ============================================================================== --- cpu/arm/olpc/spcmd.fth Wed Jul 6 08:31:27 2011 (r2333) +++ cpu/arm/olpc/spcmd.fth Wed Jul 6 08:32:32 2011 (r2334) @@ -139,8 +139,15 @@ ; : put-data ( byte -- ) - begin h# c4 reg@ 7 and 0= until - port# bwjoin h# 40 reg! + get-msecs d# 100 + ( byte time-limit ) + begin ( byte time-limit ) + dup get-msecs - 0< if ( byte time-limit ) + 2drop exit ( -- ) + then ( byte time-limit ) + h# c4 reg@ 7 and 0= ( byte time-limit flag ) + until ( byte time-limit ) + drop ( byte ) + port# bwjoin h# 40 reg! ( ) ; : put-get-data ( cmd -- data | -1 ) put-data get-data ;

1 0

[commit] r2333 - cpu/arm/olpc/1.75
by repository service 06 Jul '11

06 Jul '11

Author: wmb Date: Wed Jul 6 08:31:27 2011 New Revision: 2333 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2333 Log: OLPC XO-1.75 - test OLS LED by blinking it. Modified: cpu/arm/olpc/1.75/leds.fth Modified: cpu/arm/olpc/1.75/leds.fth ============================================================================== --- cpu/arm/olpc/1.75/leds.fth Wed Jul 6 08:30:58 2011 (r2332) +++ cpu/arm/olpc/1.75/leds.fth Wed Jul 6 08:31:27 2011 (r2333) @@ -8,10 +8,13 @@ : close ( -- ) ; : hdd-led-on ( -- ) d# 10 gpio-set ; : hdd-led-off ( -- ) d# 10 gpio-clr ; +: ols-led-on ( -- ) d# 57 ec-cmd ; +: ols-led-off ( -- ) d# 58 ec-cmd ; : selftest ( -- ) ." Flashing LEDs" cr " /wlan" test-dev " /wlan" test-dev \ Twice for longer flashing d# 20 0 do hdd-led-on d# 100 ms hdd-led-off d# 100 ms loop + d# 20 0 do ols-led-on d# 100 ms ols-led-off d# 100 ms loop confirm-selftest? ;

1 0

[commit] r2332 - cpu/arm/olpc/1.75
by repository service 06 Jul '11

06 Jul '11

Author: wmb Date: Wed Jul 6 08:30:58 2011 New Revision: 2332 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2332 Log: OLPC XO-1.75 - shorter memory test and simplified accelerometer test in final test stage. Modified: cpu/arm/olpc/1.75/accelerometer.fth cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/accelerometer.fth ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.fth Wed Jul 6 04:22:55 2011 (r2331) +++ cpu/arm/olpc/1.75/accelerometer.fth Wed Jul 6 08:30:58 2011 (r2332) @@ -73,6 +73,8 @@ : selftest ( -- error? ) open 0= if true exit then + final-test? if accelerometer-off false exit then + \ Use the device's selftest function to force a change in one direction delay ( ) average-acceleration@ ( x y z ) Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Jul 6 04:22:55 2011 (r2331) +++ cpu/arm/olpc/1.75/devices.fth Wed Jul 6 08:30:58 2011 (r2332) @@ -351,8 +351,6 @@ stand-init: RTC " /rtc" open-dev clock-node ! ; -fload ${BP}/cpu/arm/olpc/1.75/accelerometer.fth -fload ${BP}/cpu/arm/olpc/1.75/compass.fth warning @ warning off : stand-init Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Wed Jul 6 04:22:55 2011 (r2331) +++ cpu/arm/olpc/1.75/fw.bth Wed Jul 6 08:30:58 2011 (r2332) @@ -151,6 +151,26 @@ fload ${BP}/cpu/arm/olpc/1.75/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools +fload ${BP}/cpu/arm/olpc/1.75/accelerometer.fth +fload ${BP}/cpu/arm/olpc/1.75/compass.fth + +\ Suppress long memory test at final test stage +dev /memory +defer old-diagnostic-mode? +: not-final-test? ( -- flag ) + final-test? if false exit then + old-diagnostic-mode? +; +warning @ warning off +: selftest ( -- error? ) + ['] (diagnostic-mode?) behavior to old-diagnostic-mode? + ['] not-final-test? to (diagnostic-mode?) + selftest + ['] old-diagnostic-mode? behavior to (diagnostic-mode?) +; +warning ! +device-end + \ When reprogramming this machine's SPI FLASH, rebooting the EC is unnecessary : no-kbc-reboot ['] noop to spi-reprogrammed ; : kbc-on ;

1 0

[commit] r2331 - cpu/arm/olpc/1.75 ofw/gui
by repository service 06 Jul '11

06 Jul '11

Author: wmb Date: Wed Jul 6 04:22:55 2011 New Revision: 2331 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2331 Log: GUI - interact with mouse in stream mode instead of remote-polling mode to decrease command traffic over the PS/2 bus. Modified: cpu/arm/olpc/1.75/mfgtest.fth ofw/gui/dialog.fth ofw/gui/iconmenu.fth ofw/gui/mouse.fth Modified: cpu/arm/olpc/1.75/mfgtest.fth ============================================================================== --- cpu/arm/olpc/1.75/mfgtest.fth Wed Jul 6 04:20:34 2011 (r2330) +++ cpu/arm/olpc/1.75/mfgtest.fth Wed Jul 6 04:22:55 2011 (r2331) @@ -24,7 +24,7 @@ begin key? if key drop refresh exit then mouse-ih if - 10 get-event if + mouse-event? if \ Ignore movement, act only on a button down event nip nip if wait-buttons-up refresh exit then then Modified: ofw/gui/dialog.fth ============================================================================== --- ofw/gui/dialog.fth Wed Jul 6 04:20:34 2011 (r2330) +++ ofw/gui/dialog.fth Wed Jul 6 04:22:55 2011 (r2331) @@ -287,7 +287,7 @@ mouse-ih 0= if drop false exit then >r false to dialog-ready? - begin 10 get-event while ( x y buttons ) + begin mouse-event? while ( x y buttons ) remove-mouse-cursor ( x y buttons ) -rot update-position ( buttons ) r@ mouse-buttons ( ?? ) Modified: ofw/gui/iconmenu.fth ============================================================================== --- ofw/gui/iconmenu.fth Wed Jul 6 04:20:34 2011 (r2330) +++ ofw/gui/iconmenu.fth Wed Jul 6 04:22:55 2011 (r2331) @@ -424,7 +424,7 @@ : do-mouse ( - ) mouse-ih 0= if exit then - begin 10 get-event while ( x y buttons ) + begin mouse-event? while ( x y buttons ) remove-mouse-cursor -rot update-position ( buttons ) new-sq? @@ -452,15 +452,6 @@ " screen" open-dev is screen-ih then ; -: ?open-mouse ( -- ) - mouse-ih 0= if - " mouse" open-dev is mouse-ih - mouse-ih 0= if - " /mouse" open-dev to mouse-ih - then - mouse-ih if alloc-mouse-cursor then - then -; true config-flag menu? 0 value default-selection @@ -472,7 +463,13 @@ : .menu ( -- ) ." Type 'menu' to return to the menu" cr ; -: wait-buttons-up ( -- ) begin 0 get-event drop nip nip 0= until ; +: wait-buttons-up ( -- ) + begin + mouse-event? if ( x y buttons ) + nip nip 0= if exit then + then + again +; headers : wait-return ( -- ) ." ... Press any key to return to the menu ... " @@ -481,7 +478,7 @@ begin key? if key drop refresh exit then mouse-ih if - 10 get-event if + mouse-event? if \ Ignore movement, act only on a button down event nip nip if wait-buttons-up refresh exit then then @@ -505,13 +502,15 @@ ' menu-interact to run-menu : setup-graphics ( -- ) - ?open-screen set-menu-colors ?open-mouse + ?open-screen set-menu-colors ; : setup-menu ( -- ) setup-graphics + ?open-mouse cursor-off gui-alerts ; +: unsetup-menu ( -- ) ?close-mouse restore-scroller ; defer current-menu ' clear to current-menu : set-menu ( xt -- ) to current-menu current-menu ; @@ -538,7 +537,7 @@ screen-wh ( color x y w y ) fill-rectangle-noff ( ) - restore-scroller + unsetup-menu ; \ Note that menu establishes a new return stack state. Be sure to Modified: ofw/gui/mouse.fth ============================================================================== --- ofw/gui/mouse.fth Wed Jul 6 04:20:34 2011 (r2330) +++ ofw/gui/mouse.fth Wed Jul 6 04:22:55 2011 (r2331) @@ -172,6 +172,27 @@ endcase ; headers + +0 value close-mouse? +: ?close-mouse ( -- ) + close-mouse? if + mouse-ih close-dev + 0 to mouse-ih + then +; +: ?open-mouse ( -- ) + mouse-ih 0= dup to close-mouse? if + " mouse" open-dev is mouse-ih + mouse-ih 0= if + " /mouse" open-dev to mouse-ih + then + mouse-ih if alloc-mouse-cursor then + then +; +: mouse-event? ( -- false | x y buttons true ) + " stream-poll?" mouse-ih $call-method +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

[commit] r2330 - cpu/arm/olpc
by repository service 06 Jul '11

06 Jul '11

Author: wmb Date: Wed Jul 6 04:20:34 2011 New Revision: 2330 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2330 Log: OLPC SP PS/2 interface - fixed locking and queuing problems that were causing flakiness in "menu" and "test mouse". Modified: cpu/arm/olpc/spcmd.fth Modified: cpu/arm/olpc/spcmd.fth ============================================================================== --- cpu/arm/olpc/spcmd.fth Wed Jul 6 04:17:56 2011 (r2329) +++ cpu/arm/olpc/spcmd.fth Wed Jul 6 04:20:34 2011 (r2330) @@ -41,7 +41,7 @@ 2 constant #ports #ports constant #queues -d# 16 constant /q +d# 64 constant /q 0 value queue# #queues /n* buffer: heads : head ( -- adr ) heads queue# na+ ; @@ -61,6 +61,11 @@ dup @ q-end >= if 0 swap ! else /c swap +! then ; +false value locked? \ Interrupt lockout for get-scan + +: lock ( -- ) true to locked? ; +: unlock ( -- ) false to locked? ; + : select-queue ( channel# -- error? ) to queue# queue# #queues >= @@ -73,14 +78,14 @@ ; : deque? ( channel# -- false | entry true ) - select-queue if false exit then - lock[ + lock + select-queue if unlock false exit then head @ tail @ <> if q head @ ca+ c@ head inc-q-ptr true else false then - ]unlock + unlock ; 0 value reg-base @@ -89,21 +94,23 @@ : data? ( -- flag ) h# c8 reg@ 1 and ; : send-rdy ( -- ) h# ff00 h# 40 reg! ; + : poll ( -- ) - lock[ - data? if + begin data? while h# 80 reg@ wbsplit enque 1 h# c8 reg! send-rdy - then - ]unlock + repeat ; 0 instance value port# : set-port ( port# -- ) to port# ; : get-data? ( -- false | data true ) + locked? if false exit then + lock port# deque? ( false | data true ) poll + unlock ; : get-data ( -- data | -1 ) \ Wait for data from our device d# 1000 0 do @@ -131,7 +138,10 @@ open-count 1- 0 max to open-count ; -: put-data ( byte -- ) port# bwjoin h# 40 reg! ; +: put-data ( byte -- ) + begin h# c4 reg@ 7 and 0= until + port# bwjoin h# 40 reg! +; : put-get-data ( cmd -- data | -1 ) put-data get-data ; new-device

1 0

[commit] r2329 - cpu/arm
by repository service 06 Jul '11

06 Jul '11

Author: wmb Date: Wed Jul 6 04:17:56 2011 New Revision: 2329 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2329 Log: ARM - fixed hang when dividing by 0. Modified: cpu/arm/muldiv.fth Modified: cpu/arm/muldiv.fth ============================================================================== --- cpu/arm/muldiv.fth Sat Jul 2 08:07:31 2011 (r2328) +++ cpu/arm/muldiv.fth Wed Jul 6 04:17:56 2011 (r2329) @@ -97,8 +97,11 @@ \ r0 / tos = r0.rem tos.quot code (32/32division) mov r3,#1 -\ cmp tos,#0 + cmp tos,#0 \ ' divide-error dolink eq branch + mvneq tos,#0 + moveq pc,lk + begin cmp tos,#0x80000000 cmpcc tos,r0 @@ -118,13 +121,18 @@ end-code code (u64division) + orrs r4,r2,r3 +\ ' divide-error bleq * + mvneq r4,#0 \ Max out quotient for divide by 0 + mvneq r5,#0 + moveq pc,lk + stmdb sp!,{r7,r8,r9} mov r6,#0 mov r7,#1 mov r4,#0 mov r5,#0 - orrs r8,r2,r3 -\ ' divide-error bleq * + begin cmp r2,#0x80000000 u< if

1 0

[commit] r2328 - cpu/arm/olpc/1.75
by repository service 02 Jul '11

02 Jul '11

Author: wmb Date: Sat Jul 2 08:07:31 2011 New Revision: 2328 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2328 Log: Q4B01 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sat Jul 2 08:00:18 2011 (r2327) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Jul 2 08:07:31 2011 (r2328) @@ -1,6 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 00 - - - +macro: FW_MINOR 01

1 0

[commit] r2327 - cpu/arm/olpc/1.75
by repository service 02 Jul '11

02 Jul '11

Author: wmb Date: Sat Jul 2 08:00:18 2011 New Revision: 2327 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2327 Log: OLPC XO-1.75 - EC 4.0.0.02 Modified: cpu/arm/olpc/1.75/ec-version.fth Modified: cpu/arm/olpc/1.75/ec-version.fth ============================================================================== --- cpu/arm/olpc/1.75/ec-version.fth Fri Jul 1 20:52:55 2011 (r2326) +++ cpu/arm/olpc/1.75/ec-version.fth Sat Jul 2 08:00:18 2011 (r2327) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 4_0_1_01 +macro: EC_VERSION 4_0_1_02 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware July 2011