summaryrefslogtreecommitdiff
path: root/board/logicpd
diff options
context:
space:
mode:
authorTom Rix <Tom.Rix@windriver.com>2009-10-31 12:37:45 -0500
committerRemy Bohmer <linux@bohmer.net>2009-12-20 12:51:51 +0100
commit2ec1abea4359b94523d45a20d68d8582e09ace46 (patch)
tree8ca03b8cc3f5fb14c2711950c87bda5ddb805a42 /board/logicpd
parent6299487ef5dcdb06e0394f5955755c8dd9ce707b (diff)
downloadu-boot-imx-2ec1abea4359b94523d45a20d68d8582e09ace46.zip
u-boot-imx-2ec1abea4359b94523d45a20d68d8582e09ace46.tar.gz
u-boot-imx-2ec1abea4359b94523d45a20d68d8582e09ace46.tar.bz2
OMAP3 zoom2 Use usbtty if the debug board is not connected.
The preferred serial output comes from the debug board. When the debug board is disconnected, fall back on using usbtty from the usb connector on the Zoom2 board. This shows up as /dev/ttyACM0 in a linux host. Signed-off-by: Tom Rix <Tom.Rix@windriver.com>
Diffstat (limited to 'board/logicpd')
-rw-r--r--board/logicpd/zoom2/zoom2_serial.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/board/logicpd/zoom2/zoom2_serial.c b/board/logicpd/zoom2/zoom2_serial.c
index a3d777d..ba58e39 100644
--- a/board/logicpd/zoom2/zoom2_serial.c
+++ b/board/logicpd/zoom2/zoom2_serial.c
@@ -86,6 +86,8 @@ void quad_putc_dev (unsigned long base, const char c)
quad_putc_dev (base, '\r');
NS16550_putc ((NS16550_t) base, c);
+ } else {
+ usbtty_putc(c);
}
}
@@ -94,6 +96,8 @@ void quad_puts_dev (unsigned long base, const char *s)
if (zoom2_debug_board_connected ()) {
while ((s != NULL) && (*s != '\0'))
quad_putc_dev (base, *s++);
+ } else {
+ usbtty_puts(s);
}
}
@@ -101,16 +105,16 @@ int quad_getc_dev (unsigned long base)
{
if (zoom2_debug_board_connected ())
return NS16550_getc ((NS16550_t) base);
- else
- return 0;
+
+ return usbtty_getc();
}
int quad_tstc_dev (unsigned long base)
{
if (zoom2_debug_board_connected ())
return NS16550_tstc ((NS16550_t) base);
- else
- return 0;
+
+ return usbtty_tstc();
}
void quad_setbrg_dev (unsigned long base)