Author: wmb Date: 2009-11-19 07:58:58 +0100 (Thu, 19 Nov 2009) New Revision: 1491
Modified: cpu/x86/pc/olpc/addrs.fth cpu/x86/pc/olpc/rtcwake.fth cpu/x86/pc/olpc/via/addrs.fth cpu/x86/pc/olpc/via/rtcwake.fth Log: OLPC trac 9704 - rtc-wackup failed due to inclusion of wrong version of file, which used the wrong offsets for auxiliary alarm registers.
Modified: cpu/x86/pc/olpc/addrs.fth =================================================================== --- cpu/x86/pc/olpc/addrs.fth 2009-11-19 06:55:04 UTC (rev 1490) +++ cpu/x86/pc/olpc/addrs.fth 2009-11-19 06:58:58 UTC (rev 1491) @@ -66,6 +66,11 @@ h# fc000 constant dsdt-adr h# fd000 constant ssdt-adr
+\ Must agree with lxmsrs.fth +h# 3d constant cmos-alarm-day \ Offset of day alarm in CMOS +h# 3e constant cmos-alarm-month \ Offset of month alarm in CMOS +h# 32 constant cmos-century \ Offset of century byte in CMOS + fload ${BP}/cpu/x86/pc/virtaddr.fth [ifndef] virtual-mode h# ff80.0000 to fw-virt-base \ Override the usual setting; we use an MSR to double-map some memory up high
Modified: cpu/x86/pc/olpc/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/rtcwake.fth 2009-11-19 06:55:04 UTC (rev 1490) +++ cpu/x86/pc/olpc/rtcwake.fth 2009-11-19 06:58:58 UTC (rev 1491) @@ -1,11 +1,6 @@ purpose: Suspend/resume test with RTC wakeup \ See license at end of file
-\ Must agree with lxmsrs.fth -h# 3d constant cmos-alarm-day \ Offset of day alarm in CMOS -h# 3e constant cmos-alarm-month \ Offset of month alarm in CMOS -h# 32 constant cmos-century \ Offset of century byte in CMOS - dev /rtc
cmos-alarm-day " alarm_day" integer-property
Modified: cpu/x86/pc/olpc/via/addrs.fth =================================================================== --- cpu/x86/pc/olpc/via/addrs.fth 2009-11-19 06:55:04 UTC (rev 1490) +++ cpu/x86/pc/olpc/via/addrs.fth 2009-11-19 06:58:58 UTC (rev 1491) @@ -94,6 +94,10 @@ h# 3e.0000 constant inflate-base h# 30.0000 constant workspace
+h# 7d constant cmos-alarm-day \ Offset of day alarm in CMOS +h# 7e constant cmos-alarm-month \ Offset of month alarm in CMOS +h# 7f constant cmos-century \ Offset of century byte in CMOS + fload ${BP}/cpu/x86/pc/virtaddr.fth
Modified: cpu/x86/pc/olpc/via/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/via/rtcwake.fth 2009-11-19 06:55:04 UTC (rev 1490) +++ cpu/x86/pc/olpc/via/rtcwake.fth 2009-11-19 06:58:58 UTC (rev 1491) @@ -1,10 +1,6 @@ purpose: Suspend/resume test with RTC wakeup \ See license at end of file
-h# 7d constant cmos-alarm-day \ Offset of day alarm in CMOS -h# 7e constant cmos-alarm-month \ Offset of month alarm in CMOS -h# 7f constant cmos-century \ Offset of century byte in CMOS - dev /rtc
cmos-alarm-day " alarm_day" integer-property