summaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-09-28 08:40:00 +0200
committerMichal Simek <monstr@monstr.eu>2010-10-21 07:51:52 +0200
commit51f5fa50942ab013aa2e321bdfdba1c34ebf3256 (patch)
tree6031a794ca762444f1baca38d71e619efd3ac1c3 /arch/microblaze
parentmicroblaze: Setup early console dynamically (diff)
downloadlinux-51f5fa50942ab013aa2e321bdfdba1c34ebf3256.tar.xz
linux-51f5fa50942ab013aa2e321bdfdba1c34ebf3256.zip
microblaze: Do not compile early console support for uartlite if is disabled
Kconfig blocks to select any other early console support that's why this patch has no real impact on current kernel version. But it is done because of uart16550. Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/kernel/early_printk.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c
index 41e285c354b6..685a64e93ede 100644
--- a/arch/microblaze/kernel/early_printk.c
+++ b/arch/microblaze/kernel/early_printk.c
@@ -24,6 +24,7 @@
static u32 early_console_initialized;
static u32 base_addr;
+#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
static void early_printk_uartlite_putc(char c)
{
/*
@@ -62,6 +63,7 @@ static struct console early_serial_uartlite_console = {
.flags = CON_PRINTBUFFER,
.index = -1,
};
+#endif /* CONFIG_SERIAL_UARTLITE_CONSOLE */
static struct console *early_console;
@@ -84,6 +86,7 @@ int __init setup_early_printk(char *opt)
if (early_console_initialized)
return 1;
+#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
base_addr = early_uartlite_console();
if (base_addr) {
early_console_initialized = 1;
@@ -97,8 +100,10 @@ int __init setup_early_printk(char *opt)
/* register_console(early_console); */
return 0;
- } else
- return 1;
+ }
+#endif /* CONFIG_SERIAL_UARTLITE_CONSOLE */
+
+ return 1;
}
void __init disable_early_printk(void)