Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69717607 authored by Michal Simek's avatar Michal Simek
Browse files

microblaze: Report if only one timer is used 



Kernel needs two timers because of clocksource and clockevent.
It is better to show warning message directly on early
console if available. If it isn't available kernel log buffer
contains it.

Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 7d432095

arch/microblaze/include/asm/setup.h

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,12 @@ void early_printk(const char *fmt, ...); 
int setup_early_printk(char *opt);

void disable_early_printk(void);



#if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE)

#define eprintk early_printk

#else

#define eprintk printk

#endif



void heartbeat(void);

void setup_heartbeat(void);

arch/microblaze/kernel/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -92,12 +92,6 @@ inline unsigned get_romfs_len(unsigned *addr) 
}

#endif	/* CONFIG_MTD_UCLINUX_EBSS */



#if defined(CONFIG_EARLY_PRINTK) && defined(CONFIG_SERIAL_UARTLITE_CONSOLE)

#define eprintk early_printk

#else

#define eprintk printk

#endif



void __init machine_early_init(const char *cmdline, unsigned int ram,

		unsigned int fdt, unsigned int msr)

{

arch/microblaze/kernel/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ void __init time_init(void) 
	timer_num =

		*(int *) of_get_property(timer, "xlnx,one-timer-only", NULL);

	if (timer_num) {

		printk(KERN_EMERG "Please enable two timers in HW\n");

		eprintk(KERN_EMERG "Please enable two timers in HW\n");

		BUG();

	}