aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-09-28 02:40:00 -0400
committerMichal Simek <monstr@monstr.eu>2010-10-21 01:51:52 -0400
commit51f5fa50942ab013aa2e321bdfdba1c34ebf3256 (patch)
tree6031a794ca762444f1baca38d71e619efd3ac1c3 /arch/microblaze
parent9a7e8d805ea042a7f37c8d3cef8350db63df9d57 (diff)
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 @@
24static u32 early_console_initialized; 24static u32 early_console_initialized;
25static u32 base_addr; 25static u32 base_addr;
26 26
27#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
27static void early_printk_uartlite_putc(char c) 28static void early_printk_uartlite_putc(char c)
28{ 29{
29 /* 30 /*
@@ -62,6 +63,7 @@ static struct console early_serial_uartlite_console = {
62 .flags = CON_PRINTBUFFER, 63 .flags = CON_PRINTBUFFER,
63 .index = -1, 64 .index = -1,
64}; 65};
66#endif /* CONFIG_SERIAL_UARTLITE_CONSOLE */
65 67
66static struct console *early_console; 68static struct console *early_console;
67 69
@@ -84,6 +86,7 @@ int __init setup_early_printk(char *opt)
84 if (early_console_initialized) 86 if (early_console_initialized)
85 return 1; 87 return 1;
86 88
89#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
87 base_addr = early_uartlite_console(); 90 base_addr = early_uartlite_console();
88 if (base_addr) { 91 if (base_addr) {
89 early_console_initialized = 1; 92 early_console_initialized = 1;
@@ -97,8 +100,10 @@ int __init setup_early_printk(char *opt)
97 /* register_console(early_console); */ 100 /* register_console(early_console); */
98 101
99 return 0; 102 return 0;
100 } else 103 }
101 return 1; 104#endif /* CONFIG_SERIAL_UARTLITE_CONSOLE */
105
106 return 1;
102} 107}
103 108
104void __init disable_early_printk(void) 109void __init disable_early_printk(void)