mirror of
https://github.com/torvalds/linux.git
synced 2024-09-28 02:43:02 +00:00
microblaze: Remove eprintk macro
eprintk macro was used for printing early_printk messages. Early console registration was changed that's why this is not needed. Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
parent
a8c2e555b0
commit
b6d5b28e44
|
@ -26,12 +26,6 @@ int setup_early_printk(char *opt);
|
||||||
void remap_early_printk(void);
|
void remap_early_printk(void);
|
||||||
void disable_early_printk(void);
|
void disable_early_printk(void);
|
||||||
|
|
||||||
#if defined(CONFIG_EARLY_PRINTK)
|
|
||||||
#define eprintk early_printk
|
|
||||||
#else
|
|
||||||
#define eprintk printk
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void heartbeat(void);
|
void heartbeat(void);
|
||||||
void setup_heartbeat(void);
|
void setup_heartbeat(void);
|
||||||
|
|
||||||
|
|
|
@ -145,32 +145,32 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,
|
||||||
setup_early_printk(NULL);
|
setup_early_printk(NULL);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
eprintk("Ramdisk addr 0x%08x, ", ram);
|
printk("Ramdisk addr 0x%08x, ", ram);
|
||||||
if (fdt)
|
if (fdt)
|
||||||
eprintk("FDT at 0x%08x\n", fdt);
|
printk("FDT at 0x%08x\n", fdt);
|
||||||
else
|
else
|
||||||
eprintk("Compiled-in FDT at 0x%08x\n",
|
printk("Compiled-in FDT at 0x%08x\n",
|
||||||
(unsigned int)_fdt_start);
|
(unsigned int)_fdt_start);
|
||||||
|
|
||||||
#ifdef CONFIG_MTD_UCLINUX
|
#ifdef CONFIG_MTD_UCLINUX
|
||||||
eprintk("Found romfs @ 0x%08x (0x%08x)\n",
|
printk("Found romfs @ 0x%08x (0x%08x)\n",
|
||||||
romfs_base, romfs_size);
|
romfs_base, romfs_size);
|
||||||
eprintk("#### klimit %p ####\n", old_klimit);
|
printk("#### klimit %p ####\n", old_klimit);
|
||||||
BUG_ON(romfs_size < 0); /* What else can we do? */
|
BUG_ON(romfs_size < 0); /* What else can we do? */
|
||||||
|
|
||||||
eprintk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n",
|
printk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n",
|
||||||
romfs_size, romfs_base, (unsigned)&_ebss);
|
romfs_size, romfs_base, (unsigned)&_ebss);
|
||||||
|
|
||||||
eprintk("New klimit: 0x%08x\n", (unsigned)klimit);
|
printk("New klimit: 0x%08x\n", (unsigned)klimit);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
|
#if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
|
||||||
if (msr)
|
if (msr)
|
||||||
eprintk("!!!Your kernel has setup MSR instruction but "
|
printk("!!!Your kernel has setup MSR instruction but "
|
||||||
"CPU don't have it %x\n", msr);
|
"CPU don't have it %x\n", msr);
|
||||||
#else
|
#else
|
||||||
if (!msr)
|
if (!msr)
|
||||||
eprintk("!!!Your kernel not setup MSR instruction but "
|
printk("!!!Your kernel not setup MSR instruction but "
|
||||||
"CPU have it %x\n", msr);
|
"CPU have it %x\n", msr);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -267,7 +267,7 @@ void __init time_init(void)
|
||||||
timer_num = be32_to_cpup(of_get_property(timer,
|
timer_num = be32_to_cpup(of_get_property(timer,
|
||||||
"xlnx,one-timer-only", NULL));
|
"xlnx,one-timer-only", NULL));
|
||||||
if (timer_num) {
|
if (timer_num) {
|
||||||
eprintk(KERN_EMERG "Please enable two timers in HW\n");
|
printk(KERN_EMERG "Please enable two timers in HW\n");
|
||||||
BUG();
|
BUG();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user