OpenBIOS May 2007

openbios@openbios.org

5 participants
108 discussions

r431 - dev/olpc/kb3700
by svn＠openbios.org 31 May '07

31 May '07

Author: wmb Date: 2007-05-31 22:15:17 +0200 (Thu, 31 May 2007) New Revision: 431 Modified: dev/olpc/kb3700/ecio.fth Log: Support new EC command protocol. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-31 00:05:36 UTC (rev 430) +++ dev/olpc/kb3700/ecio.fth 2007-05-31 20:15:17 UTC (rev 431) @@ -27,12 +27,25 @@ : flash-write-protect-off ( -- ) GPIO5 ec@ h# 80 or GPIO5 ec! ; - -: ec-cmd ( cmd -- response ) - h# 6c pc! begin 1 ms h# 6c pc@ 3 and 1 = until 1 ms h# 68 pc@ - h# ff h# 6c pc! \ Release ownership +: wait-ib-empty ( -- ) + d# 1000 0 do h# 6c pc@ 2 and 0= if unloop exit then 1 ms loop + true abort" EC port 6c input buffer timeout" ; +: ec-cmd-out ( cmd -- ) wait-ib-empty h# 6c pc! ; +: ec-wb ( -- ) wait-ib-empty h# 68 pc! ; +: ec-rb ( -- b ) + d# 1000 0 do + h# 6c pc@ 3 and 1 = if + h# 68 pc@ + unloop exit + then + 1 ms + loop + true abort" EC port 6c output buffer timeout" +; +: ec-cmd ( cmd -- response ) ec-cmd-out ec-rb ; + : ec-cmd66 ( byte -- ) h# 66 pc! \ It typically requires about 200 polls @@ -40,53 +53,13 @@ true abort" EC didn't respond to port 66 command" ; -: ec-cmd@ ( -- b ) h# 6c pc@ ; - -: ec-release ( -- ) h# ff h# 6c pc! 1 ms h# 68 pc@ drop ; -: ec-wait-wr ( -- ) - d# 140 0 do - ec-cmd@ 2 and 0= if unloop exit then - 5 ms - loop - ." EC write timed out" cr -; -\ Empirically, it can take a long time for the EC to sense the game -\ keys when several are down at once. 500 mS is not enough. -: ec-wait-rd ( -- ) - d# 700 0 do - ec-cmd@ 1 and if unloop exit then - d# 1 ms - loop - ." EC read timed out" cr -; -: flush-ec ( -- ) - begin ec-cmd@ dup h# 80 and while - drop ." EC release" cr ec-release d# 10 ms - repeat ( 6c-val ) - - begin 1 and while ( ) - h# 68 pc@ drop ( ) - d# 200 us ( ) - ec-cmd@ ( 6c-val ) - repeat ( 6c-val ) -; -: ec-cmd! ( b -- ) ec-wait-wr h# 6c pc! ec-wait-wr ; - -: ec-dat@ ( -- b ) ec-wait-rd h# 68 pc@ ; -: ec-dat! ( b -- ) ec-wait-wr h# 68 pc! ec-wait-wr ; - -: ec-rb ( -- b ) 0 ec-dat! ec-dat@ ; : ec-rw ( -- w ) ec-rb ec-rb swap bwjoin ; -: ec-wb ( -- w ) ec-dat! ; : ec-ww ( -- w ) wbsplit ec-wb ec-wb ; -: ec-cmda ( b -- ) flush-ec ec-cmd! ec-dat@ drop ; -: ec-cmd0 ( -- ) ec-cmda ec-release ; +: ec-cmd-w@ ( cmd -- w ) ec-cmd-out ec-rw ; +: ec-cmd-b@ ( cmd -- b ) ec-cmd ; +: ec-cmd-b! ( b cmd -- ) ec-cmd-out ec-wb ; -: ec-cmd-w@ ( cmd -- w ) ec-cmda ec-rw ec-release ; -: ec-cmd-b@ ( cmd -- w ) ec-cmda ec-rb ec-release ; -: ec-cmd-b! ( b cmd -- ) ec-cmda ec-wb ec-release ; - : bat-voltage@ ( -- w ) h# 10 ec-cmd-w@ ; : bat-current@ ( -- w ) h# 11 ec-cmd-w@ ; : bat-acr@ ( -- w ) h# 12 ec-cmd-w@ ; @@ -94,51 +67,48 @@ : ambient-temp@ ( -- w ) h# 14 ec-cmd-w@ ; : bat-status@ ( -- b ) h# 15 ec-cmd-b@ ; : bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; -: bat-gauge-id@ ( -- sn0 .. sn7 ) - h# 17 ec-cmda - 8 0 do ec-rb loop - ec-release -; -: bat-gauge@ ( -- b ) h# 18 ec-cmda h# 31 ec-wb ec-dat@ ec-release ; \ 31 is the EEPROM address +: bat-gauge-id@ ( -- sn0 .. sn7 ) h# 17 ec-cmd-out 8 0 do ec-rb loop ; +: bat-gauge@ ( -- b ) h# 18 ec-cmd-out h# 31 ec-wb ec-rb ; \ 31 is the EEPROM address : board-id@ ( -- b ) h# 19 ec-cmd-b@ ; : sci-source@ ( -- b ) h# 1a ec-cmd-w@ ; : sci-mask! ( b -- ) h# 1b ec-cmd-b! ; : sci-mask@ ( -- b ) h# 1c ec-cmd-b@ ; -: game-key@ ( -- w ) h# 1d ec-cmda ec-rw ec-release ; -: ec-date! ( day month year -- ) h# 1e ec-cmda ec-wb ec-wb ec-wb ec-release ; +: game-key@ ( -- w ) h# 1d ec-cmd-out ec-rw ; +: ec-date! ( day month year -- ) h# 1e ec-cmd-out ec-wb ec-wb ec-wb ; : ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; \ XXX is this byte or word? -: bat-init-lifepo4 ( -- ) h# 21 ec-cmd0 ; -: bat-init-nimh ( -- ) h# 22 ec-cmd0 ; +: bat-init-lifepo4 ( -- ) h# 21 ec-cmd-out ; +: bat-init-nimh ( -- ) h# 22 ec-cmd-out ; : wlan-off ( -- ) 0 h# 23 ec-cmd-b! ; : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; -: wlan-wake ( -- ) h# 24 ec-cmd0 ; -: wlan-rst ( -- ) h# 25 ec-cmd0 ; +: wlan-wake ( -- ) h# 24 ec-cmd-out ; +: wlan-rst ( -- ) h# 25 ec-cmd-out ; : dcon-disable ( -- ) 0 h# 26 ec-cmd-b! ; : dcon-enable ( -- ) 1 h# 26 ec-cmd-b! ; -: reset-ec-warm ( -- ) h# 27 ec-cmd0 ; -: reset-ec ( -- ) h# 28 ec-cmd0 ; -: write-protect-fw ( -- ) h# 29 ec-cmd0 ; -\ : disable-ec-io ( -- ) h# 2a ec-cmd0 ; \ ??? +: reset-ec-warm ( -- ) h# 27 ec-cmd-out ; +: reset-ec ( -- ) h# 28 ec-cmd-out ; +: write-protect-fw ( -- ) h# 29 ec-cmd-out ; +: ebook-mode? ( -- ) h# 2a ec-cmd-b@ ; \ EC mailbox access words -: ec-mb-adr@ ( -- w ) h# 80 ec-cmda ec-rw ; -: ec-mb-adr! ( w -- ) h# 81 ec-cmda ec-ww ; -: ec-mb-setup ( cmd w -- ) ec-mb-adr! ec-cmda ; +: ec-mb-adr@ ( -- w ) h# 80 ec-cmd-out ec-rw ; +: ec-mb-adr! ( w -- ) h# 81 ec-cmd-out ec-ww ; +: ec-mb-setup ( cmd w -- ) ec-mb-adr! ec-cmd-out ; : ec-mb-b@ ( adr -- b ) h# 8a ec-mb-setup h# 84 ec-cmd-b@ ; : ec-mb-w@ ( adr -- w ) h# 88 ec-mb-setup h# 82 ec-cmd-w@ ; -: ec-mb-b! ( b adr -- ) h# 85 ec-mb-setup ec-wb h# 8b ec-cmda ec-release ; -: ec-mb-w! ( w adr -- ) h# 83 ec-mb-setup ec-ww h# 89 ec-cmda ec-release ; +: ec-mb-b! ( b adr -- ) h# 85 ec-mb-setup ec-wb h# 8b ec-cmd-out ; +: ec-mb-w! ( w adr -- ) h# 83 ec-mb-setup ec-ww h# 89 ec-cmd-out ; \ SCI source codes: \ SCI_WAKEUP_EVENT 0x01 // Game button, \ SCI_BATTERY_STATUS_CHANGE 0x02 // AC plugged/unplugged, ... \ Battery inserted/remove, Battery Low, Battery full, Battery destroy \ SCI_SOC_CHANGE 0x04 // SOC Change -\ SCI_ABNORMAL_EVENT 0x08 +\ SCI_ABNORMAL_EVENT 0x08 \ SCI_EB_MODE_CHANGE 0x10 +\ SCI_WAKEUP_WLAN_EVENT 0x20 \ This command hard-resets the EC deeply enough for the SP write-protect to \ be off when the system is powered up again.

1 0

r430 - cpu/x86/pc/olpc
by svn＠openbios.org 31 May '07

31 May '07

Author: wmb Date: 2007-05-31 02:05:36 +0200 (Thu, 31 May 2007) New Revision: 430 Modified: cpu/x86/pc/olpc/copynand.fth Log: OLPC copy-nand - Trac #498 - Check the nand.img file against the nand.crc file if there is one. Also changed "crc-img" to require only one argument, the name of the .img file (the .crc filename is synthesized from the .img filename.). Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-05-30 22:41:42 UTC (rev 429) +++ cpu/x86/pc/olpc/copynand.fth 2007-05-31 00:05:36 UTC (rev 430) @@ -3,14 +3,35 @@ 0 value fileih 0 value nandih +0 value crc-ih + 0 value /nand-block 0 value /nand-page 0 value nand-pages/block 0 value #nand-pages +: close-nand-ihs ( -- ) + fileih ?dup if 0 to fileih close-dev then + nandih ?dup if 0 to nandih close-dev then + crc-ih ?dup if 0 to crc-ih close-dev then +; + +: ?nand-abort ( flag msg$ -- ) + rot if + close-nand-ihs $abort + else + 2drop + then +; + +: ?key-stop ( -- ) + key? dup if key drop then ( stop? ) + " Stopped by keystroke" ?nand-abort +; + : open-nand ( -- ) " /nandflash" open-dev to nandih - nandih 0= abort" Can't open NAND FLASH device" + nandih 0= " Can't open NAND FLASH device" ?nand-abort " erase-size" nandih $call-method to /nand-block " block-size" nandih $call-method to /nand-page " size" nandih $call-method /nand-page um/mod nip to #nand-pages @@ -18,18 +39,66 @@ " start-scan" nandih $call-method ; +h# 20 buffer: line-buf +: next-crc ( -- false | crc true ) + line-buf 9 " read" crc-ih $call-method ( len ) + dup 0= if exit then ( len ) + 9 <> " Bad CRC line length" ?nand-abort ( ) + line-buf 8 $number " Bad number in CRC file" ?nand-abort ( crc ) + true +; + + +: open-crcs ( name$ -- ) + open-dev to crc-ih + crc-ih 0= " Can't open CRC file" ?nand-abort +; + +h# 100 buffer: image-name-buf +: image-name$ ( -- adr len ) image-name-buf count ; + + +: ?open-crcs ( -- ) + image-name$ + 4 - 4 " .img" $= if + " crc" image-name$ + 3 - swap move + image-name$ open-crcs + else + 0 to crc-ih + then + crc-ih if ." Check file is " image-name$ type cr then +; + : open-img ( "devspec" -- ) - safe-parse-word open-dev to fileih - fileih 0= abort" Can't open NAND image file" + safe-parse-word 2dup image-name-buf place ( devspec$ ) + open-dev to fileih + fileih 0= " Can't open NAND image file" ?nand-abort ; : #records ( ih /record -- n ) swap " size" rot $call-method rot um/mod nip ; +: check-mem-crc ( crc -- ) + load-base /nand-block $crc ( crc actual-crc ) + 2dup <> if + cr ." CRC miscompare - expected " swap . ." got " . cr + true " Stopping" ?nand-abort + ?key-stop + else + 2drop + then ( ) +; + +: ?check-crc ( -- ) + crc-ih if + next-crc 0= " Premature end of .crc file" ?nand-abort + check-mem-crc + then +; : copy-nand ( "devspec" -- ) open-nand open-img + ?open-crcs ['] noop to show-progress @@ -42,11 +111,11 @@ load-base /nand-block " read" fileih $call-method 0> while (cr dup . 1+ + ?check-crc load-base " copy-block" nandih $call-method repeat drop - fileih close-dev - nandih close-dev + close-nand-ihs ; : verify-nand ( "devspec" -- ) @@ -65,37 +134,19 @@ load-base load-base /nand-block + /nand-block comp if ( block# ) cr ." Miscompare in block starting at page# " ( block# ) " scan-page#" nandih $call-method .x cr ( block# ) - key? if - nandih close-dev fileih close-dev ( block# ) - key drop true abort" Aborted by keystroke" - then + ?key-stop then ( block# ) repeat ( block# ) drop ( ) - fileih close-dev - nandih close-dev + close-nand-ihs ; -0 value crc-ih -h# 20 buffer: line-buf -: next-crc ( -- false | crc true ) - line-buf 9 " read" crc-ih $call-method ( len ) - dup 0= if exit then ( len ) - 9 <> abort" Bad CRC line length" ( ) - line-buf 8 $number abort" Bad number in CRC file" ( crc ) - true -; - -: open-crcs ( -- ) - safe-parse-word open-dev to crc-ih - crc-ih 0= abort" Can't open CRC file" -; - -: crc-img ( "img-devspec" "crc-devspec" -- ) +: crc-img ( "img-devspec" -- ) hex - open-nand nandih close-dev \ To set sizes + open-nand close-nand-ihs \ To set sizes open-img - open-crcs + ?open-crcs + crc-ih 0= " No CRC file" ?nand-abort ['] noop to show-progress @@ -106,28 +157,18 @@ swap (cr dup . 1+ swap ( block#' crc ) load-base /nand-block " read" fileih $call-method ( block# crc len ) - /nand-block <> abort" Short img file" ( block# crc ) + /nand-block <> " Short img file" ?nand-abort ( block# crc ) - load-base /nand-block $crc ( block# crc actual-crc ) - 2dup <> if - cr ." CRC miscompare - expected " swap . ." got " . cr - key? if - crc-ih close-dev fileih close-dev - key drop true abort" Aborted by keystroke" - then - else - 2drop - then ( block# ) + check-mem-crc ( block# ) repeat ( block# ) drop ( ) - fileih close-dev - crc-ih close-dev + close-nand-ihs ; : crc-nand ( "crc-devspec" -- ) hex open-nand - open-crcs + safe-parse-word open-crcs ['] noop to show-progress ." Verifying " crc-ih 9 #records . ." blocks" cr @@ -143,17 +184,13 @@ cr ." CRC miscompare - expected " swap . ." got " . ." in NAND block starting at page " " scan-page#" nandih $call-method . cr - key? if - nandih close-dev crc-ih close-dev - key drop true abort" Aborted by keystroke" - then + ?key-stop else 2drop then ( block# ) repeat ( block# ) drop ( ) - nandih close-dev - crc-ih close-dev + close-nand-ihs ; @@ -181,7 +218,7 @@ then to fileih - fileih 0= if nandih close-dev true abort" Can't open output" then + fileih 0= " Can't open output" ?nand-abort \ The stack is empty at the end of each line unless otherwise noted #nand-pages 0 do @@ -202,8 +239,7 @@ nand-pages/block +loop cr ." Done" cr - fileih close-dev - nandih close-dev + close-nand-ihs ; : dump-nand ( "devspec" -- ) true to dump-oob? (dump-nand) ; : save-nand ( "devspec" -- ) false to dump-oob? (dump-nand) ; @@ -213,13 +249,11 @@ open-nand safe-parse-word open-dev to fileih - fileih 0= abort" Can't open NAND fastboot image file" + fileih 0= " Can't open NAND fastboot image file" ?nand-abort - " size" fileih $call-method drop ( len ) - " start-fastcopy" nandih $call-method if ( ) - nandih close-dev fileih close-dev - true abort" Not enough spare NAND space for fast copy" - then ( ) + " size" fileih $call-method drop ( len ) + " start-fastcopy" nandih $call-method ( error? ) + " Not enough spare NAND space for fast copy" ?nand-abort begin ( ) load-base /nand-block " read" fileih $call-method ( len ) @@ -232,8 +266,7 @@ drop ( ) " end-fastcopy" nandih $call-method ( ) - fileih close-dev - nandih close-dev + close-nand-ihs ; \ LICENSE_BEGIN

1 0

r429 - ofw/fs/jffs2
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-31 00:41:42 +0200 (Thu, 31 May 2007) New Revision: 429 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - OLPC Trac #1609 - Handle truncated files without crashing (don't erase a negative length). Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-30 07:32:30 UTC (rev 428) +++ ofw/fs/jffs2/jffs2.fth 2007-05-30 22:41:42 UTC (rev 429) @@ -820,7 +820,7 @@ 2 pick ( final write hiwater final ) over - ( final write hiwater extra ) swap file-buf + swap ( final write buf-adr extra ) - erase ( final write ) + 0 max erase ( final write ) \ 0 max accounts for truncation then ( final write ) drop to file-size \ Set overall length ;

1 0

r428 - dev/olpc/cafecamera
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 09:32:30 +0200 (Wed, 30 May 2007) New Revision: 428 Modified: dev/olpc/cafecamera/cafecamera.fth Log: OLPC cafecamera.fth - Trac #1577 - Turn off camera power at probe time. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-05-30 06:11:53 UTC (rev 427) +++ dev/olpc/cafecamera/cafecamera.fth 2007-05-30 07:32:30 UTC (rev 428) @@ -555,6 +555,11 @@ 0 close ( error? ) ; +\ Do this at probe time to make sure the camera power is off +map-regs +0000.0008 3038 cl! \ Turn on CaFe GPIO3 to enable power +0008.0000 315c cl! \ Set VDD to off +unmap-regs \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

r427 - dev/olpc/cafecamera
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:11:53 +0200 (Wed, 30 May 2007) New Revision: 427 Modified: dev/olpc/cafecamera/cafecamera.fth Log: OLPC cafecamera.fth - Trac #1580 - Must reinit camera on every open, now that we power it off on close. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-05-30 06:10:31 UTC (rev 426) +++ dev/olpc/cafecamera/cafecamera.fth 2007-05-30 06:11:53 UTC (rev 427) @@ -22,7 +22,6 @@ : my-w@ ( offset -- w ) my-space + " config-w@" $call-parent ; : my-w! ( w offset -- ) my-space + " config-w!" $call-parent ; -true value first-open? 0 instance value chip : cl! ( l adr -- ) chip + rl! ; @@ -467,9 +466,8 @@ : open ( -- flag ) map-regs - first-open? if init then + init ov7670-detected? 0= if unmap-regs false exit then - false to first-open? alloc-dma-bufs read-setup true

1 0

r426 - cpu/x86/pc/olpc
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:10:31 +0200 (Wed, 30 May 2007) New Revision: 426 Modified: cpu/x86/pc/olpc/copynand.fth Log: OLPC copynand.fth - Close files when aborting via the keyboard. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-05-30 06:09:43 UTC (rev 425) +++ cpu/x86/pc/olpc/copynand.fth 2007-05-30 06:10:31 UTC (rev 426) @@ -65,7 +65,10 @@ load-base load-base /nand-block + /nand-block comp if ( block# ) cr ." Miscompare in block starting at page# " ( block# ) " scan-page#" nandih $call-method .x cr ( block# ) - key? abort" Aborted by keystroke" ( block# ) + key? if + nandih close-dev fileih close-dev ( block# ) + key drop true abort" Aborted by keystroke" + then then ( block# ) repeat ( block# ) drop ( ) @@ -108,7 +111,10 @@ load-base /nand-block $crc ( block# crc actual-crc ) 2dup <> if cr ." CRC miscompare - expected " swap . ." got " . cr - key? abort" Aborted by keystroke" + key? if + crc-ih close-dev fileih close-dev + key drop true abort" Aborted by keystroke" + then else 2drop then ( block# ) @@ -137,7 +143,10 @@ cr ." CRC miscompare - expected " swap . ." got " . ." in NAND block starting at page " " scan-page#" nandih $call-method . cr - key? abort" Aborted by keystroke" + key? if + nandih close-dev crc-ih close-dev + key drop true abort" Aborted by keystroke" + then else 2drop then ( block# )

1 0

r425 - cpu/x86/pc/olpc
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:09:43 +0200 (Wed, 30 May 2007) New Revision: 425 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC fw.bth - Don't load fixkbd.fth; there is no need to switch the keyboard scan set on x86 OSs. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-30 06:08:53 UTC (rev 424) +++ cpu/x86/pc/olpc/fw.bth 2007-05-30 06:09:43 UTC (rev 425) @@ -172,8 +172,6 @@ fload ${BP}/ofw/core/symdebug.fth : release-load-area ( boundary-adr -- ) drop ; -fload ${BP}/cpu/x86/pc/fixkbd.fth \ Switch keyboard scan codes - [ifdef] use-elf fload ${BP}/ofw/elf/elf.fth fload ${BP}/ofw/elf/elfdebug.fth

1 0

r424 - cpu/x86/pc/olpc
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:08:53 +0200 (Wed, 30 May 2007) New Revision: 424 Modified: cpu/x86/pc/olpc/devices.fth Log: OLPC devices.fth - deleted some commented-out code that will never be reinstated. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-30 06:07:35 UTC (rev 423) +++ cpu/x86/pc/olpc/devices.fth 2007-05-30 06:08:53 UTC (rev 424) @@ -315,24 +315,6 @@ fload ${BP}/cpu/x86/adpcm.fth \ ADPCM decoding -[ifdef] notdef-olpc -\ fload ${BP}/dev/olpc/plccflash.fth \ PLCC LPC debug FLASH - -0 0 " " " /" begin-package \ DCON driver -fload ${BP}/dev/olpc/dcon/dconsmb.fth \ SMB access to DCON chip -fload ${BP}/dev/olpc/dcon/dcon.fth \ DCON control -fload ${BP}/dev/olpc/dcon/methods.fth \ DCON interface methods -end-package - -: dcon-present? ( -- flag ) - " /dcon" open-dev ?dup if close-dev true else false then -; -\ Doing this has the useful side effect of turning on the backlight -stand-init: DCON - dcon-present? drop -; -[then] - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r423 - cpu/x86/pc/olpc
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:07:35 +0200 (Wed, 30 May 2007) New Revision: 423 Modified: cpu/x86/pc/olpc/lxmsrs.fth Log: OLPC - changed the PCI latency timer to 0x40 to conform to the setting that the kernel tries to establish by writing to (nonexistent) PCI config header registers. Modified: cpu/x86/pc/olpc/lxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/lxmsrs.fth 2007-05-29 18:47:52 UTC (rev 422) +++ cpu/x86/pc/olpc/lxmsrs.fth 2007-05-30 06:07:35 UTC (rev 423) @@ -107,7 +107,7 @@ msr: 5000.2003 00000000.00370037. \ No ERRs msr: 5000.2004 00000000.00000015. \ Clock gating for 3 clocks msr: 5000.2005 00000000.00000000. \ Enable some PCI errors - msr: 5000.2010 fff01120.001a021d. \ PCI timings - LB has the latency timer at max + msr: 5000.2010 fff01140.001a021d. \ PCI timings - LB has the latency timer at max msr: 5000.2011 04000300.00800f01. \ GLPCI_ARB - LX page 581 \ I don't think we need to do anything special for the DOS hole from PCI

1 0

r422 - cpu/x86/pc/biosload
by svn＠openbios.org 29 May '07

29 May '07

Author: wmb Date: 2007-05-29 20:47:52 +0200 (Tue, 29 May 2007) New Revision: 422 Modified: cpu/x86/pc/biosload/addrs.fth Log: Added ResetBase definition to fix biosload build. Modified: cpu/x86/pc/biosload/addrs.fth =================================================================== --- cpu/x86/pc/biosload/addrs.fth 2007-05-24 02:27:49 UTC (rev 421) +++ cpu/x86/pc/biosload/addrs.fth 2007-05-29 18:47:52 UTC (rev 422) @@ -11,10 +11,12 @@ [ifdef] linuxbios-loaded h# fff8.0000 constant dropin-base \ Location of payload in FLASH h# 08.0000 constant dropin-size +dropin-base h# 80 + h# 20 + constant ResetBase \ Location of "reset" dropin in ROM [then] \needs dropin-base h# 198.0000 constant dropin-base \needs dropin-size h# 8.0000 constant dropin-size +\needs ResetBase dropin-base h# 20 + constant ResetBase \ Location of "reset" dropin in ROM \ This is considerably more memory than Open Firmware needs \ on platforms where you have a well bounded set of I/O devices.

1 0