Commit a43acfbb authored by Michal Simek's avatar Michal Simek

microblaze_mmu_v2: Alocate TLB for early console

Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 5846cc60
/* /*
* Copyright (C) 2007-2008 Michal Simek <monstr@monstr.eu> * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
* Copyright (C) 2007-2009 PetaLogix
* Copyright (C) 2006 Atmark Techno, Inc. * Copyright (C) 2006 Atmark Techno, Inc.
* *
* This file is subject to the terms and conditions of the GNU General Public * This file is subject to the terms and conditions of the GNU General Public
...@@ -18,7 +19,6 @@ ...@@ -18,7 +19,6 @@
extern unsigned int boot_cpuid; /* move to smp.h */ extern unsigned int boot_cpuid; /* move to smp.h */
extern char cmd_line[COMMAND_LINE_SIZE]; extern char cmd_line[COMMAND_LINE_SIZE];
# endif/* __KERNEL__ */
void early_printk(const char *fmt, ...); void early_printk(const char *fmt, ...);
...@@ -30,6 +30,11 @@ void setup_heartbeat(void); ...@@ -30,6 +30,11 @@ void setup_heartbeat(void);
unsigned long long sched_clock(void); unsigned long long sched_clock(void);
# ifdef CONFIG_MMU
extern void mmu_reset(void);
extern void early_console_reg_tlb_alloc(unsigned int addr);
# endif /* CONFIG_MMU */
void time_init(void); void time_init(void);
void init_IRQ(void); void init_IRQ(void);
void machine_early_init(const char *cmdline, unsigned int ram, void machine_early_init(const char *cmdline, unsigned int ram,
...@@ -40,5 +45,6 @@ void machine_shutdown(void); ...@@ -40,5 +45,6 @@ void machine_shutdown(void);
void machine_halt(void); void machine_halt(void);
void machine_power_off(void); void machine_power_off(void);
# endif/* __KERNEL__ */
# endif /* __ASSEMBLY__ */ # endif /* __ASSEMBLY__ */
#endif /* _ASM_MICROBLAZE_SETUP_H */ #endif /* _ASM_MICROBLAZE_SETUP_H */
...@@ -87,6 +87,9 @@ int __init setup_early_printk(char *opt) ...@@ -87,6 +87,9 @@ int __init setup_early_printk(char *opt)
base_addr = early_uartlite_console(); base_addr = early_uartlite_console();
if (base_addr) { if (base_addr) {
early_console_initialized = 1; early_console_initialized = 1;
#ifdef CONFIG_MMU
early_console_reg_tlb_alloc(base_addr);
#endif
early_printk("early_printk_console is enabled at 0x%08x\n", early_printk("early_printk_console is enabled at 0x%08x\n",
base_addr); base_addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment