diff options
| author | Magnus Damm <damm@opensource.se> | 2009-12-14 10:24:42 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-15 12:06:29 +0900 |
| commit | 7b6fd3bf82c4901f6ba0101ba71a5c507c24f9cf (patch) | |
| tree | 088bfc0216c0a0db902d3df1f8f6cd9695381f3b /arch | |
| parent | 0eb37e26ed332b2a96630cf7f7ebe9fddb41cc3c (diff) | |
| download | linux-7b6fd3bf82c4901f6ba0101ba71a5c507c24f9cf.tar.gz linux-7b6fd3bf82c4901f6ba0101ba71a5c507c24f9cf.tar.bz2 linux-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')
| -rw-r--r-- | arch/sh/kernel/early_printk.c | 10 | ||||
| -rw-r--r-- | arch/sh/kernel/setup.c | 3 |
2 files changed, 4 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) { diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index 5a947a2567e4..8b0e69792cf4 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -423,6 +423,9 @@ void __init setup_arch(char **cmdline_p) plat_early_device_setup(); + /* Let earlyprintk output early console messages */ + early_platform_driver_probe("earlyprintk", 1, 1); + sh_mv_setup(); /* |