July 2011 - openfirmware - mail.coreboot.org

[commit] r2326 - cpu/arm/olpc/1.75
by repository service July 1, 2011

July 1, 2011

Author: wmb Date: Fri Jul 1 20:52:55 2011 New Revision: 2326 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2326 Log: OLPC XO-1.75 - Tell the EC to auto-reboot after reflashing the EC code. Modified: cpu/arm/olpc/1.75/ecflash.fth Modified: cpu/arm/olpc/1.75/ecflash.fth ============================================================================== --- cpu/arm/olpc/1.75/ecflash.fth Fri Jul 1 20:48:15 2011 (r2325) +++ cpu/arm/olpc/1.75/ecflash.fth Fri Jul 1 20:52:55 2011 (r2326) @@ -34,6 +34,8 @@ ifd @ fclose ( len ) load-base swap ?ec-image-valid ; +\ Tells the EC to auto-restart after power cycling +: set-ec-reboot ( -- ) 1 h# f018 edi-b! ; : reflash-ec [ifdef] cl2-a1 " enter-updater" $call-ec @@ -54,6 +56,7 @@ [ifndef] cl2-a1 ." Restarting EC and rebooting" cr d# 2000 ms + set-ec-reboot unreset-8051 [then] ec-power-cycle @@ -100,6 +103,7 @@ .error ." Skipping EC reflash" cr else + ." Updating EC code" cr reflash-ec then then

1 0

[commit] r2325 - dev/olpc/kb3700
by repository service July 1, 2011

July 1, 2011

Author: wmb Date: Fri Jul 1 20:48:15 2011 New Revision: 2325 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2325 Log: OLPC XO-1.75 - EC-SPI command protocol: don't complain if the EC has queued-up a couple of upstream events and extend the command timeout to 50 ms. Modified: dev/olpc/kb3700/spicmd.fth Modified: dev/olpc/kb3700/spicmd.fth ============================================================================== --- dev/olpc/kb3700/spicmd.fth Fri Jul 1 20:46:54 2011 (r2324) +++ dev/olpc/kb3700/spicmd.fth Fri Jul 1 20:48:15 2011 (r2325) @@ -262,7 +262,6 @@ pulse-ack ; : (upstream) ( -- ) - rxavail 2 <> if ." ec-spi rxavail = " rxavail . cr then ssp-ssdr rl@ ssp-ssdr rl@ ( channel# data ) debug? if ." UP: " over . dup . cr @@ -290,7 +289,7 @@ lock[ ssp-ready? if do-state then ]unlock - debug? if key? if key drop debug-me then then +\ debug? if key? if key drop debug-me then then ; : cancel-command ( -- ) \ Called when the command child times out clr-cmd @@ -371,7 +370,7 @@ ec-cmdbuf 3 + swap bounds ?do i c! loop ( ) ; : timed-get-results ( -- b ) - get-msecs d# 20 + begin ( limit ) + get-msecs d# 50 + begin ( limit ) 2 deque? if ( limit b ) nip exit ( -- b ) then ( limit )

1 0

[commit] r2324 - cpu/arm/olpc/1.75
by repository service July 1, 2011

July 1, 2011

Author: wmb Date: Fri Jul 1 20:46:54 2011 New Revision: 2324 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2324 Log: OLPC XO-1.75 - use the "keyboard" and "mouse" aliases in the graphical test menu, instead of the direct device names, so the auto-keyboard-interface selection works. Modified: cpu/arm/olpc/1.75/mfgtest.fth Modified: cpu/arm/olpc/1.75/mfgtest.fth ============================================================================== --- cpu/arm/olpc/1.75/mfgtest.fth Fri Jul 1 20:45:24 2011 (r2323) +++ cpu/arm/olpc/1.75/mfgtest.fth Fri Jul 1 20:46:54 2011 (r2324) @@ -136,8 +136,8 @@ : camera-item ( -- ) " /camera" mfg-test-dev ; : wlan-item ( -- ) " /wlan" mfg-test-dev ; : timer-item ( -- ) " /timer" mfg-test-dev ; -: touchpad-item ( -- ) " /ec-spi/mouse" mfg-test-dev ; -: keyboard-item ( -- ) " /ec-spi/keyboard" mfg-test-dev ; +: touchpad-item ( -- ) " mouse" mfg-test-dev ; +: keyboard-item ( -- ) " keyboard" mfg-test-dev ; : switch-item ( -- ) " /switches" mfg-test-dev " /accelerometer" mfg-test-dev ; : leds-item ( -- ) " /leds" mfg-test-dev ; \ XXX need to test sensors like accelerometer and compass

1 0

[commit] r2323 - in cpu/arm: mmp2 olpc/1.75
by repository service July 1, 2011

July 1, 2011

Author: wmb Date: Fri Jul 1 20:45:24 2011 New Revision: 2323 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2323 Log: OLPC XO-1.75 - use the EC for rebooting instead of the watchdog timer. That lets the EC clean up its state too, which helps with the SPI command protocol synchronization. Modified: cpu/arm/mmp2/watchdog.fth cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/mmp2/watchdog.fth ============================================================================== --- cpu/arm/mmp2/watchdog.fth Thu Jun 30 10:34:11 2011 (r2322) +++ cpu/arm/mmp2/watchdog.fth Fri Jul 1 20:45:24 2011 (r2323) @@ -14,18 +14,13 @@ (wdt!) ; : wdt@ ( offset -- value ) wdt-pa + l@ ; -: (reset-all) ( -- ) +: wdt-reset ( -- ) enable-wdt-clock 2 h# 68 wdt! \ set match register 3 h# 64 wdt! \ match enable: just interrupt, no reset yet 1 h# 98 wdt! \ Reset counter begin again ; -' (reset-all) to reset-all - -stand-init: - ['] reset-all to bye -; 0 [if] : test-wdt ( -- ) Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Thu Jun 30 10:34:11 2011 (r2322) +++ cpu/arm/olpc/1.75/devices.fth Fri Jul 1 20:45:24 2011 (r2323) @@ -104,13 +104,6 @@ fload ${BP}/cpu/arm/mmp2/irq.fth fload ${BP}/cpu/arm/mmp2/watchdog.fth \ reset-all using watchdog timer -: olpc-reset-all ( -- ) - " screen" " dcon-off" ['] execute-device-method catch if - 2drop 2drop - then - (reset-all) -; -' olpc-reset-all to reset-all 0 0 " d4018000" " /" begin-package \ UART3 fload ${BP}/cpu/arm/mmp2/uart.fth @@ -168,6 +161,18 @@ : stand-power-off ( -- ) ec-power-off begin wfi again ; ' stand-power-off to power-off +: olpc-reset-all ( -- ) + " screen" " dcon-off" ['] execute-device-method catch if + 2drop 2drop + then + ec-power-cycle + begin wfi again +; +' olpc-reset-all to reset-all +stand-init: + ['] reset-all to bye +; + fload ${BP}/dev/olpc/kb3700/batstat.fth \ Battery status reports fload ${BP}/cpu/arm/olpc/1.75/boardrev.fth \ Board revision decoding

1 0