aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/early_printk.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2009-12-14 10:24:42 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-12-15 12:06:29 +0900
commit7b6fd3bf82c4901f6ba0101ba71a5c507c24f9cf (patch)
tree088bfc0216c0a0db902d3df1f8f6cd9695381f3b /arch/sh/kernel/early_printk.c
parentsh: Stub in P3 ioremap support for nommu parts. (diff)
downloadlinux-dev-7b6fd3bf82c4901f6ba0101ba71a5c507c24f9cf.tar.xz
linux-dev-7b6fd3bf82c4901f6ba0101ba71a5c507c24f9cf.zip
sh-sci: Extend sh-sci driver with early console V2
This is V2 of early serial console support for the sh-sci driver. The early serial console is using early platform devices and "earlyprintk". To use this feature the early platform devices must be broken out to one device per port and the desired port should be selected on the kernel command line like: "earlyprintk=sh-sci.N[,baudrate][,keep]" Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/early_printk.c')
-rw-r--r--arch/sh/kernel/early_printk.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/sh/kernel/early_printk.c b/arch/sh/kernel/early_printk.c
index 81a46145ffa5..fe7dc3fe1db1 100644
--- a/arch/sh/kernel/early_printk.c
+++ b/arch/sh/kernel/early_printk.c
@@ -191,15 +191,7 @@ static void scif_sercon_init(char *s)
* Setup a default console, if more than one is compiled in, rely on the
* earlyprintk= parsing to give priority.
*/
-static struct console *early_console =
-#ifdef CONFIG_SH_STANDARD_BIOS
- &bios_console
-#elif defined(CONFIG_EARLY_SCIF_CONSOLE)
- &scif_console
-#else
- NULL
-#endif
- ;
+static struct console *early_console;
static int __init setup_early_printk(char *buf)
{