diff options
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/include/asm/setup.h | 6 | ||||
-rw-r--r-- | arch/microblaze/kernel/setup.c | 6 | ||||
-rw-r--r-- | arch/microblaze/kernel/timer.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h index 782b5c89248e..5f910ebe0325 100644 --- a/arch/microblaze/include/asm/setup.h +++ b/arch/microblaze/include/asm/setup.h | |||
@@ -25,6 +25,12 @@ void early_printk(const char *fmt, ...); | |||
25 | int setup_early_printk(char *opt); | 25 | int setup_early_printk(char *opt); |
26 | void disable_early_printk(void); | 26 | void disable_early_printk(void); |
27 | 27 | ||
28 | #if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE) | ||
29 | #define eprintk early_printk | ||
30 | #else | ||
31 | #define eprintk printk | ||
32 | #endif | ||
33 | |||
28 | void heartbeat(void); | 34 | void heartbeat(void); |
29 | void setup_heartbeat(void); | 35 | void setup_heartbeat(void); |
30 | 36 | ||
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index f5f768842354..bb1558e4b283 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c | |||
@@ -92,12 +92,6 @@ inline unsigned get_romfs_len(unsigned *addr) | |||
92 | } | 92 | } |
93 | #endif /* CONFIG_MTD_UCLINUX_EBSS */ | 93 | #endif /* CONFIG_MTD_UCLINUX_EBSS */ |
94 | 94 | ||
95 | #if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE) | ||
96 | #define eprintk early_printk | ||
97 | #else | ||
98 | #define eprintk printk | ||
99 | #endif | ||
100 | |||
101 | void __init machine_early_init(const char *cmdline, unsigned int ram, | 95 | void __init machine_early_init(const char *cmdline, unsigned int ram, |
102 | unsigned int fdt, unsigned int msr) | 96 | unsigned int fdt, unsigned int msr) |
103 | { | 97 | { |
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index b1380ae93ae1..ec7df67006ba 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c | |||
@@ -278,7 +278,7 @@ void __init time_init(void) | |||
278 | timer_num = | 278 | timer_num = |
279 | *(int *) of_get_property(timer, "xlnx,one-timer-only", NULL); | 279 | *(int *) of_get_property(timer, "xlnx,one-timer-only", NULL); |
280 | if (timer_num) { | 280 | if (timer_num) { |
281 | printk(KERN_EMERG "Please enable two timers in HW\n"); | 281 | eprintk(KERN_EMERG "Please enable two timers in HW\n"); |
282 | BUG(); | 282 | BUG(); |
283 | } | 283 | } |
284 | 284 | ||