diff options
Diffstat (limited to 'core/arch/arm/plat-hikey/main.c')
| -rw-r--r-- | core/arch/arm/plat-hikey/main.c | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/core/arch/arm/plat-hikey/main.c b/core/arch/arm/plat-hikey/main.c index 36789ce..8d72f38 100644 --- a/core/arch/arm/plat-hikey/main.c +++ b/core/arch/arm/plat-hikey/main.c @@ -49,7 +49,7 @@ static void main_fiq(void); static const struct thread_handlers handlers = { .std_smc = tee_entry_std, .fast_smc = tee_entry_fast, - .fiq = main_fiq, + .nintr = main_fiq, .cpu_on = cpu_on_handler, .cpu_off = pm_do_nothing, .cpu_suspend = pm_do_nothing, @@ -58,6 +58,8 @@ static const struct thread_handlers handlers = { .system_reset = pm_do_nothing, }; +static struct pl011_data console_data __early_bss; + register_phys_mem(MEM_AREA_IO_NSEC, CONSOLE_UART_BASE, PL011_REG_SIZE); register_phys_mem(MEM_AREA_IO_NSEC, PMUSSI_BASE, PMUSSI_REG_SIZE); #ifdef CFG_SPI @@ -78,35 +80,11 @@ static void main_fiq(void) panic(); } -static vaddr_t console_base(void) -{ - static void *va; - - if (cpu_mmu_enabled()) { - if (!va) - va = phys_to_virt(CONSOLE_UART_BASE, MEM_AREA_IO_NSEC); - return (vaddr_t)va; - } - return CONSOLE_UART_BASE; -} - void console_init(void) { - pl011_init(console_base(), CONSOLE_UART_CLK_IN_HZ, CONSOLE_BAUDRATE); -} - -void console_putc(int ch) -{ - vaddr_t base = console_base(); - - if (ch == '\n') - pl011_putc('\r', base); - pl011_putc(ch, base); -} - -void console_flush(void) -{ - pl011_flush(console_base()); + pl011_init(&console_data, CONSOLE_UART_BASE, CONSOLE_UART_CLK_IN_HZ, + CONSOLE_BAUDRATE); + register_serial_console(&console_data.chip); } vaddr_t nsec_periph_base(paddr_t pa) |