Author: wmb Date: 2009-11-25 23:18:33 +0100 (Wed, 25 Nov 2009) New Revision: 1510
Modified: cpu/x86/pc/olpc/via/ cpu/x86/pc/olpc/via/config.fth cpu/x86/pc/olpc/via/fsupdate.fth cpu/x86/pc/olpc/via/romreset.bth cpu/x86/pc/olpc/via/smbus.fth cpu/x86/pc/olpc/via/versions.fth Log: svn ignore
Property changes on: cpu/x86/pc/olpc/via ___________________________________________________________________ Added: svn:ignore + testicons
Modified: cpu/x86/pc/olpc/via/config.fth =================================================================== --- cpu/x86/pc/olpc/via/config.fth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/config.fth 2009-11-25 22:18:33 UTC (rev 1510) @@ -29,12 +29,12 @@ \ The disadvantage of the timestamp counter is that it changes speed with \ CPU throttling. The advantage is that it is 64 bits, so no rollover. create use-timestamp-counter \ Use CPU's timestamp counter for "ms" -create use-tsc-timing \ Use timestamp counter for t( .. )t +\ create use-tsc-timing \ Use timestamp counter for t( .. )t
\ The advantage of the ACPI counter is that its speed is independent of \ CPU throttling. The disadvantage is that it is 32 bits, so it rolls \ over every 20 minutes or so, unless you extend it with an SMI handler. -\ create use-acpi-timing +create use-acpi-timing \ create use-acpi-delays
create resident-packages
Modified: cpu/x86/pc/olpc/via/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-11-25 22:18:33 UTC (rev 1510) @@ -127,6 +127,7 @@ load-base to dma-buffer load-base /nand-block 4 * + to data-buffer /nand-block /nand-page / to nand-pages/block + t-update \ Handle possible timer rollover ;
: zblocks-end: ( -- )
Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-11-25 22:18:33 UTC (rev 1510) @@ -76,7 +76,6 @@ [ifdef] debug-startup fload ${BP}/cpu/x86/pc/mmxdotcode.fth \ Memoryless numeric output fload ${BP}/cpu/x86/pc/dot.fth \ Numeric output subroutine -\ fload ${BP}/cpu/x86/pc/olpc/via/startinteract.fth \ emitpause subroutine [then]
fload ${BP}/cpu/x86/pc/olpc/via/startusdelay.fth \ microsecond delay subroutine
Modified: cpu/x86/pc/olpc/via/smbus.fth =================================================================== --- cpu/x86/pc/olpc/via/smbus.fth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/smbus.fth 2009-11-25 22:18:33 UTC (rev 1510) @@ -12,7 +12,7 @@ : smb-hoststat@ ( -- byte ) 0 smb-reg@ ; \ Various status bits - busy bit is bit 0 : smb-hoststat! ( byte -- ) 0 smb-reg! ; \ Lots of Write 1 to Clear bits herein : smb-hostctl! ( byte -- ) 2 smb-reg! ; \ Write this register to start the transaction -: smb-hostcmd@ ( -- byte ) 2 smb-reg@ ; \ Reads reset the block data counter +: smb-hostctl@ ( -- byte ) 2 smb-reg@ ; \ Reads reset the block data counter : smb-hostcmd! ( byte -- ) 3 smb-reg! ; \ Send in protocol Command Field : smb-xmitadr! ( byte -- ) 4 smb-reg! ; \ Target address : smb-hostdata0! ( byte -- ) 5 smb-reg! ; \ Data0 out @@ -61,7 +61,7 @@ smbus-target smb-xmitadr! ( adr len offset ) smb-hostcmd! ( adr len ) \ Starting offset dup smb-hostdata0! ( adr len ) \ Length - smb-hostcmd@ drop ( adr len ) \ Reset block transfer counter + smb-hostctl@ drop ( adr len ) \ Reset block transfer counter bounds ?do i c@ smb-blockdata! loop ( ) \ Copy data to chip h# 34 smbus-cmd ( ) \ I2C block command ; @@ -70,7 +70,7 @@ smb-hostcmd! ( adr maxlen ) \ Starting offset h# 34 smbus-cmd ( adr maxlen ) \ I2C block command smb-hostdata0@ min ( adr actlen ) \ Number of bytes returned - smb-hostcmd@ drop ( adr actlen ) \ Reset block transfer counter + smb-hostctl@ drop ( adr actlen ) \ Reset block transfer counter tuck bounds ?do smb-blockdata@ i c! loop ( actlen ) \ Copy data from chip ;
@@ -78,7 +78,7 @@ smbus-target smb-xmitadr! ( adr len offset ) smb-hostcmd! ( adr len ) \ Starting offset dup smb-hostdata0! ( adr len ) \ Length - smb-hostcmd@ drop ( adr len ) \ Reset block transfer counter + smb-hostctl@ drop ( adr len ) \ Reset block transfer counter bounds ?do i c@ smb-blockdata! loop ( ) \ Copy data to chip h# 14 smbus-cmd ( ) \ SMBus block command ; @@ -87,7 +87,7 @@ smb-hostcmd! ( adr maxlen ) \ Starting offset h# 14 smbus-cmd ( adr maxlen ) \ SMBus block command smb-hostdata0@ min ( adr actlen ) \ Number of bytes returned - smb-hostcmd@ drop ( adr actlen ) \ Reset block transfer counter + smb-hostctl@ drop ( adr actlen ) \ Reset block transfer counter tuck bounds ?do smb-blockdata@ i c! loop ( actlen ) \ Copy data from chip ;
Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-11-25 21:38:32 UTC (rev 1509) +++ cpu/x86/pc/olpc/via/versions.fth 2009-11-25 22:18:33 UTC (rev 1510) @@ -2,7 +2,7 @@
\ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 16c +macro: FW_MINOR 16e
\ The EC microcode macro: EC_VERSION 1_9_14
openfirmware@openfirmware.info