[openfirmware] [commit] r2574 - cpu/arm/olpc/1.75 dev/olpc/kb3700
repository service
svn at openfirmware.info
Tue Oct 4 03:02:09 CEST 2011
Author: wmb
Date: Tue Oct 4 03:02:09 2011
New Revision: 2574
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2574
Log:
OLPC XO-1.75 - trac #11292 - OFW no longer supports routing the keyboard and mouse through the EC.
Modified:
cpu/arm/olpc/1.75/fw.bth
dev/olpc/kb3700/spicmd.fth
Modified: cpu/arm/olpc/1.75/fw.bth
==============================================================================
--- cpu/arm/olpc/1.75/fw.bth Tue Oct 4 02:42:45 2011 (r2573)
+++ cpu/arm/olpc/1.75/fw.bth Tue Oct 4 03:02:09 2011 (r2574)
@@ -266,15 +266,9 @@
fload ${BP}/dev/logdev.fth
fload ${BP}/cpu/x86/pc/olpc/disptest.fth
-dev /ec-spi/keyboard
-fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic
-device-end
dev /ap-sp/keyboard
fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic
device-end
-dev /ec-spi/mouse
-fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic
-device-end
dev /ap-sp/mouse
fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic
device-end
@@ -380,21 +374,10 @@
fload ${BP}/dev/hdaudio/noiseburst.fth \ audio-test support package
-: select-keyboard ( -- )
- " /ap-sp/keyboard" open-dev ?dup 0= if exit then >r ( r: ih )
- " kbd-reset" r@ $call-method ( failed? )
- 0= if
- " keyboard" " /ap-sp/keyboard" $devalias
- " mouse" " /ap-sp/mouse" $devalias
- else
- " keyboard" " /ec-spi/keyboard" $devalias
- " mouse" " /ec-spi/mouse" $devalias
- then
- r> close-dev
-;
+devalias keyboard /ap-sp/keyboard
+devalias mouse /ap-sp/mouse
: console-start ( -- )
- select-keyboard
install-mux-io
cursor-off
true to text-on?
Modified: dev/olpc/kb3700/spicmd.fth
==============================================================================
--- dev/olpc/kb3700/spicmd.fth Tue Oct 4 02:42:45 2011 (r2573)
+++ dev/olpc/kb3700/spicmd.fth Tue Oct 4 03:02:09 2011 (r2574)
@@ -491,17 +491,6 @@
drop ( )
;
-new-device
- " " " 3" set-args
- fload ${BP}/dev/pckbd.fth
-finish-device
-
-new-device
- " " " 4" set-args
- fload ${BP}/dev/ps2mouse.fth
-finish-device
-
-
end-package
\ LICENSE_BEGIN
More information about the openfirmware
mailing list