Author: wmb
Date: Thu Jul 14 08:14:19 2011
New Revision: 2362
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2362
Log:
OLPC XO-1.75 - RTC driver - force the Clock Halt bit off if necessary, and verify that it worked.
Modified:
cpu/arm/olpc/1.75/rtc.fth
Modified: cpu/arm/olpc/1.75/rtc.fth
==============================================================================
--- cpu/arm/olpc/1.75/rtc.fth Thu Jul 14 07:39:10 2011 (r2361)
+++ cpu/arm/olpc/1.75/rtc.fth Thu Jul 14 08:14:19 2011 (r2362)
@@ -1,3 +1,5 @@
+purpose: Driver for external IDT1338 RTC chip on XO-1.75
+
0 0 " " " /" begin-package
" rtc" name
@@ -20,8 +22,22 @@
headerless
headers
-: open ( -- true )
- true
+: open ( -- okay )
+ 0 ['] rtc@ catch if ( x )
+ drop false exit ( -- false )
+ then ( value )
+
+ \ Ensure that the Clock Halt bit is off
+ dup h# 80 and if ( value )
+ \ Turn off Clock Halt
+ h# 7f and 0 rtc! ( )
+ \ Verify that it went off
+ 0 rtc@ h# 80 and ( error? )
+ dup if ." RTC Clock Halt is stuck on" cr then ( error? )
+ 0= ( okay? )
+ else ( value )
+ drop true ( true )
+ then ( okay? )
;
: close ( -- )
;
Author: wmb
Date: Thu Jul 14 05:41:20 2011
New Revision: 2356
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2356
Log:
Use latest NANDblaster source for 1.5 and 1.75 to pick up the move of memcmp() to the library.
Modified:
cpu/arm/olpc/1.75/mcnand-version.fth
cpu/x86/pc/olpc/via/mcnand-version.fth
Modified: cpu/arm/olpc/1.75/mcnand-version.fth
==============================================================================
--- cpu/arm/olpc/1.75/mcnand-version.fth Thu Jul 14 04:36:29 2011 (r2355)
+++ cpu/arm/olpc/1.75/mcnand-version.fth Thu Jul 14 05:41:20 2011 (r2356)
@@ -3,6 +3,7 @@
\ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
\ is not already present, then you can modify the git subtree as needed.
-macro: MCNAND_VERSION c535151a3f7f396006eb0d5ebd25d135351ffc06
+macro: MCNAND_VERSION 059bd03137c19d67a28c67665c4ce50fd5d35565
+
\ macro: MCNAND_VERSION test
\ macro: MCNAND_VERSION HEAD
Modified: cpu/x86/pc/olpc/via/mcnand-version.fth
==============================================================================
--- cpu/x86/pc/olpc/via/mcnand-version.fth Thu Jul 14 04:36:29 2011 (r2355)
+++ cpu/x86/pc/olpc/via/mcnand-version.fth Thu Jul 14 05:41:20 2011 (r2356)
@@ -3,6 +3,6 @@
\ With a specific ID, mcastnand.bth will download a tarball without .git stuff.
\ With "test", mcastnand.bth will clone the git head if build/multicast-nand/
\ is not already present, then you can modify the git subtree as needed.
-macro: MCNAND_VERSION 506d22f97f71632efa353dc347646d24570024b1
+macro: MCNAND_VERSION 059bd03137c19d67a28c67665c4ce50fd5d35565
\ macro: MCNAND_VERSION test
\ macro: MCNAND_VERSION HEAD