[openfirmware] r1237 - in cpu/x86/pc/olpc: . via
svn at openfirmware.info
svn at openfirmware.info
Fri Jul 3 07:58:09 CEST 2009
Author: rsmith
Date: 2009-07-03 07:58:09 +0200 (Fri, 03 Jul 2009)
New Revision: 1237
Modified:
cpu/x86/pc/olpc/rtcwake.fth
cpu/x86/pc/olpc/via/devices.fth
cpu/x86/pc/olpc/via/versions.fth
Log:
- Version bump to q3a05
- Include EC code 1.9.5
- Add EC wakeup testing words
- Re-enable battery.fth so OFW can talk with the EC about the battery
Modified: cpu/x86/pc/olpc/rtcwake.fth
===================================================================
--- cpu/x86/pc/olpc/rtcwake.fth 2009-07-03 04:25:06 UTC (rev 1236)
+++ cpu/x86/pc/olpc/rtcwake.fth 2009-07-03 05:58:09 UTC (rev 1237)
@@ -69,6 +69,18 @@
key drop
;
+: autowack-test ( ms -- )
+ autowack-delay
+ autowack-on
+ 0 begin
+ s
+ dup space .d (cr 1+ key?
+ until
+ ." Keypress Exit key= "
+ key . drop
+ autowack-off
+;
+
\ for testing wakeups from the EC
: wackup-test-ec ( ms -- )
d# 3000 autowack-delay \ At small ms delays the host can miss the SCI so this
@@ -80,7 +92,8 @@
swap dup ( ms count count )
space .d (cr 1+ key? ( ms count+1 )
until
- key drop 2drop
+ ." Keypress Exit key= "
+ key . 2drop
autowack-off
;
Modified: cpu/x86/pc/olpc/via/devices.fth
===================================================================
--- cpu/x86/pc/olpc/via/devices.fth 2009-07-03 04:25:06 UTC (rev 1236)
+++ cpu/x86/pc/olpc/via/devices.fth 2009-07-03 05:58:09 UTC (rev 1237)
@@ -319,7 +319,7 @@
.( XXX Reinstate kbdtype.fth) cr
\ fload ${BP}/cpu/x86/pc/olpc/kbdtype.fth \ Export keyboard type
-[ifdef] use-ec-Later
+[ifdef] use-ec
fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports
[else]
: ?enough-power ;
Modified: cpu/x86/pc/olpc/via/versions.fth
===================================================================
--- cpu/x86/pc/olpc/via/versions.fth 2009-07-03 04:25:06 UTC (rev 1236)
+++ cpu/x86/pc/olpc/via/versions.fth 2009-07-03 05:58:09 UTC (rev 1237)
@@ -2,16 +2,15 @@
\ The overall firmware revision
macro: FW_MAJOR A
-macro: FW_MINOR 04b
+macro: FW_MINOR 05
\ The EC microcode
-macro: EC_VERSION 1_9_4
+macro: EC_VERSION 1_9_5
\ Alternate command for getting EC microcode, for testing new versions.
\ Temporarily uncomment the line and modify the path as necessary
-\ macro: GET_EC cp pq3a00.img ec.img
-\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_via_test.img -O ec.img
-\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/cl1b-1_9_0rc2.img -O ec.img
+\ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img
+\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img
macro: KEYS mpkeys
\ macro: KEYS testkeys
More information about the openfirmware
mailing list