Author: wmb Date: 2009-08-18 18:31:24 +0200 (Tue, 18 Aug 2009) New Revision: 1299
Modified: cpu/x86/pc/olpc/via/boardrev.fth cpu/x86/pc/olpc/via/fw.bth Log: Via - enable serial on atest even if the serial_en jumper is not installed. atest boards have no pads for such a jumper, so a blue wire would be required.
Modified: cpu/x86/pc/olpc/via/boardrev.fth =================================================================== --- cpu/x86/pc/olpc/via/boardrev.fth 2009-08-13 04:49:18 UTC (rev 1298) +++ cpu/x86/pc/olpc/via/boardrev.fth 2009-08-18 16:31:24 UTC (rev 1299) @@ -19,7 +19,9 @@ 2dup + 2- 2 upper ( model$ ) \ Upper case for base model ;
-stand-init: board revision +\ stand-init: board revision +: stand-init-io + stand-init-io ['] board-id@ catch if 0 then case 0 of 0 endof \ EC broken ( board-id ) dup h# 10 * 8 + swap \ E.g. b3 -> b38 @@ -29,6 +31,11 @@ \ Cache the board revision in CMOS RAM so the early startup code \ can get it without having to wait for the EC. board-revision dup h# 82 cmos! invert h# 83 cmos! + + \ Force the serial port back on for A-test, even when SERIAL_EN is + \ not asserted, because many developers use serial on A-test systems + \ and it is not easy to jumper SERIAL_EN on A-test. + atest? if h# 40 h# 8846 config-b! then ;
\ LICENSE_BEGIN
Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-08-13 04:49:18 UTC (rev 1298) +++ cpu/x86/pc/olpc/via/fw.bth 2009-08-18 16:31:24 UTC (rev 1299) @@ -240,12 +240,12 @@ \ true to stand-init-debug?
hex -: serial-enabled? ( -- flag ) h# 48 acpi-b@ h# 10 and 0= ; +: serial-enabled? ( -- flag ) h# 8846 config-b@ h# 40 and 0<> ;
: i-key-wait ( ms -- pressed? ) - serial-enabled? 0= if drop false exit then + serial-enabled? 0= if drop false exit then ( ms )
- cr ." Type 'i' to interrupt stand-init sequence" cr + cr ." Type 'i' to interrupt stand-init sequence" cr ( ms ) 0 do ukey? if ukey upc ascii I = if true unloop exit then