Skip to content

Commit

Permalink
microblaze: Do not compile early console support for uartlite if is d…
Browse files Browse the repository at this point in the history
…isabled

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>
  • Loading branch information
Michal Simek committed Oct 21, 2010
1 parent 9a7e8d8 commit 51f5fa5
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions arch/microblaze/kernel/early_printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
/*
Expand Down Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 51f5fa5

Please sign in to comment.