diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-05 07:47:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-05 07:47:21 -0500 |
| commit | ed02c532be690b3d0c3e15c81531785a788fd949 (patch) | |
| tree | fe6790c023fe118cb24d07106cddfc592a39d1e3 /common | |
| parent | 60b25259a5540686add02cf6c94cd7494a3e2d23 (diff) | |
| parent | 4b6d09449fdeaa5659c5d277bdf133457521e70b (diff) | |
| download | blackbird-obmc-uboot-ed02c532be690b3d0c3e15c81531785a788fd949.tar.gz blackbird-obmc-uboot-ed02c532be690b3d0c3e15c81531785a788fd949.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_console.c | 3 | ||||
| -rw-r--r-- | common/stdio.c | 4 | ||||
| -rw-r--r-- | common/usb_kbd.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/common/cmd_console.c b/common/cmd_console.c index 93dc505056..9a356ecfc3 100644 --- a/common/cmd_console.c +++ b/common/cmd_console.c @@ -27,10 +27,9 @@ static int do_coninfo(cmd_tbl_t *cmd, int flag, int argc, char * const argv[]) list_for_each(pos, list) { dev = list_entry(pos, struct stdio_dev, list); - printf ("%-8s %08x %c%c%c ", + printf ("%-8s %08x %c%c ", dev->name, dev->flags, - (dev->flags & DEV_FLAGS_SYSTEM) ? 'S' : '.', (dev->flags & DEV_FLAGS_INPUT) ? 'I' : '.', (dev->flags & DEV_FLAGS_OUTPUT) ? 'O' : '.'); diff --git a/common/stdio.c b/common/stdio.c index adbfc890dd..ab4df20f6b 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -88,7 +88,7 @@ static void drv_system_init (void) memset (&dev, 0, sizeof (dev)); strcpy (dev.name, "serial"); - dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.putc = stdio_serial_putc; dev.puts = stdio_serial_puts; dev.getc = stdio_serial_getc; @@ -99,7 +99,7 @@ static void drv_system_init (void) memset (&dev, 0, sizeof (dev)); strcpy (dev.name, "nulldev"); - dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.putc = nulldev_putc; dev.puts = nulldev_puts; dev.getc = nulldev_input; diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 95912f99c7..0302e5bc93 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -503,7 +503,7 @@ static int probe_usb_keyboard(struct usb_device *dev) debug("USB KBD: register.\n"); memset(&usb_kbd_dev, 0, sizeof(struct stdio_dev)); strcpy(usb_kbd_dev.name, DEVNAME); - usb_kbd_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; + usb_kbd_dev.flags = DEV_FLAGS_INPUT; usb_kbd_dev.getc = usb_kbd_getc; usb_kbd_dev.tstc = usb_kbd_testc; usb_kbd_dev.priv = (void *)dev; |
