Author: wmb Date: Thu Nov 17 00:11:05 2011 New Revision: 2692 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2692
Log: OLPC XO-1.75 - svn 2676 introduced a problem with EC communication by loading some code at the wrong time.
Modified: cpu/arm/olpc/1.75/fw.bth
Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Nov 15 05:25:45 2011 (r2691) +++ cpu/arm/olpc/1.75/fw.bth Thu Nov 17 00:11:05 2011 (r2692) @@ -128,7 +128,6 @@ then ; warning ! -[then]
: (.firmware) ( -- ) ." Open Firmware " .built cr @@ -169,6 +168,47 @@
fload ${BP}/cpu/x86/pc/olpc/via/banner.fth
+devalias keyboard /ap-sp/keyboard +devalias mouse /ap-sp/mouse + +: console-start ( -- ) + install-mux-io + cursor-off + true to text-on? + + " //null" open-dev to null-ih \ For text-off state +; +: keyboard-off ( -- ) + keyboard-ih if + keyboard-ih remove-input + keyboard-ih close-dev + 0 to keyboard-ih + then +; + +: teardown-mux-io ( -- ) + install-uart-io + text-off + keyboard-off + fallback-out-ih remove-output + fallback-in-ih remove-input + stdin off + stdout off + in-mux-ih close-dev + out-mux-ih close-dev +; +: quiesce ( -- ) + teardown-mux-io + timers-off + usb-quiet + close-ec + \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) + d# 125 af@ h# 100 invert and d# 125 af! +; + +\ This must precede the loading of gui.fth, which chains from linux-hook's behavior +' quiesce to linux-hook + \ This must be defined after spiui.fth, otherwise spiui will choose some wrong code : rom-pa ( -- adr ) mfg-data-buf mfg-data-offset - ; \ Fake out setwp.fth fload ${BP}/cpu/x86/pc/olpc/setwp.fth @@ -394,45 +434,6 @@
fload ${BP}/dev/hdaudio/noiseburst.fth \ audio-test support package
-devalias keyboard /ap-sp/keyboard -devalias mouse /ap-sp/mouse - -: console-start ( -- ) - install-mux-io - cursor-off - true to text-on? - - " //null" open-dev to null-ih \ For text-off state -; -: keyboard-off ( -- ) - keyboard-ih if - keyboard-ih remove-input - keyboard-ih close-dev - 0 to keyboard-ih - then -; - -: teardown-mux-io ( -- ) - install-uart-io - text-off - keyboard-off - fallback-out-ih remove-output - fallback-in-ih remove-input - stdin off - stdout off - in-mux-ih close-dev - out-mux-ih close-dev -; -: quiesce ( -- ) - teardown-mux-io - timers-off - usb-quiet - close-ec - \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) - d# 125 af@ h# 100 invert and d# 125 af! -; - -' quiesce to linux-hook \ Because visible doesn't work sometimes when calling back from Linux dev /client-services patch noop visible enter dend