aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2004-11-18 22:53:42 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-11-18 22:53:42 -0800
commit5b6c534999948ad1032adc44fab17a6e01d0a29f (patch)
tree627aaa205737e1b8663a340dbfb6c2886c50c8bc /kernel
parentfa3f122042c31da97267a7d357a8274d3c199d22 (diff)
downloadhistory-5b6c534999948ad1032adc44fab17a6e01d0a29f.tar.gz
[PATCH] early uart console support
This adds an early polled-mode "uart" console driver, based on Andi Kleen's early_printk work. The difference is that this locates the UART device directly by its MMIO or I/O port address, so we don't have to make assumptions about how ttyS devices will be named. After the normal serial driver starts, we try to locate the matching ttyS device and start a console there. Sample usage: console=uart,io,0x3f8 console=uart,mmio,0xff5e0000,115200n8 If the baud rate isn't specified, we peek at the UART to figure it out. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 1b41c96f715172..4e9fd492f30ec5 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -142,7 +142,7 @@ static int __init console_setup(char *str)
strcpy(name, "ttyS1");
#endif
for(s = name; *s; s++)
- if (*s >= '0' && *s <= '9')
+ if ((*s >= '0' && *s <= '9') || *s == ',')
break;
idx = simple_strtoul(s, NULL, 10);
*s = 0;