diff options
| author | Michal Simek <monstr@monstr.eu> | 2010-09-28 16:40:00 +1000 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2010-10-21 15:51:52 +1000 |
| commit | 51f5fa50942ab013aa2e321bdfdba1c34ebf3256 (patch) | |
| tree | 6031a794ca762444f1baca38d71e619efd3ac1c3 | |
| parent | 9a7e8d805ea042a7f37c8d3cef8350db63df9d57 (diff) | |
| download | kernel_samsung_espresso10-51f5fa50942ab013aa2e321bdfdba1c34ebf3256.zip kernel_samsung_espresso10-51f5fa50942ab013aa2e321bdfdba1c34ebf3256.tar.gz kernel_samsung_espresso10-51f5fa50942ab013aa2e321bdfdba1c34ebf3256.tar.bz2 | |
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>
| -rw-r--r-- | arch/microblaze/kernel/early_printk.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c index 41e285c..685a64e 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) |