[openfirmware] [commit] r3575 - cpu/x86/pc/olpc

[repository service]

Author: quozl
Date: Wed Feb 27 05:25:20 2013
New Revision: 3575
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3575

Log:
OLPC XO-1 - backport serial terminal, without logging, tested without r3569 (breaks build).

Modified:
   cpu/x86/pc/olpc/fw.bth
   cpu/x86/pc/olpc/terminal.fth

Modified: cpu/x86/pc/olpc/fw.bth
==============================================================================
--- cpu/x86/pc/olpc/fw.bth	Tue Feb 26 19:38:09 2013	(r3574)
+++ cpu/x86/pc/olpc/fw.bth	Wed Feb 27 05:25:20 2013	(r3575)
@@ -657,6 +657,7 @@
 : enable-serial ;
 fload ${BP}/cpu/x86/pc/olpc/charge.fth     \ Fancy battery charge logger
 fload ${BP}/cpu/x86/pc/olpc/diskspeed.fth  \ Mass storage speed test
+fload ${BP}/cpu/x86/pc/olpc/terminal.fth   \ Serial terminal emulator
 fload ${BP}/cpu/x86/pc/olpc/apt.fth        \ Common developer utilities
 
 tag-file @ fclose  tag-file off

Modified: cpu/x86/pc/olpc/terminal.fth
==============================================================================
--- cpu/x86/pc/olpc/terminal.fth	Tue Feb 26 19:38:09 2013	(r3574)
+++ cpu/x86/pc/olpc/terminal.fth	Wed Feb 27 05:25:20 2013	(r3575)
@@ -199,8 +199,12 @@
 0 value serial-ih
 
 : usb-open  ( -- )
-   " /usb/serial" open-dev dup 0= abort" can't open USB serial adapter"
-   to serial-ih
+   " /usb/serial" open-dev ?dup if  to serial-ih  exit  then
+[ifdef] olpc-cl1
+   " /usb at f,4/serial" open-dev ?dup if  to serial-ih  exit  then
+   " /usb at f,5/serial" open-dev ?dup if  to serial-ih  exit  then
+[then]
+   true abort" can't open USB serial adapter"
 ;
 
 : usb-close  ( -- )
@@ -313,6 +317,7 @@
 
 : serial  serial{  {serial}  }serial  ;
 
+[ifdef] log-ih
 : serial-log  ( "filename" -- )
    serial{
    safe-parse-word $create-file to log-ih
@@ -322,6 +327,7 @@
    log-ih close-dev
    }serial
 ;
+[then]
 
 : use-uart  use-uart  ;
 : use-usb   use-usb   ;