diff options
Diffstat (limited to 'core/arch/arm/plat-zynq7k/main.c')
-rw-r--r-- | core/arch/arm/plat-zynq7k/main.c | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/core/arch/arm/plat-zynq7k/main.c b/core/arch/arm/plat-zynq7k/main.c index 74bc1ce..2991b94 100644 --- a/core/arch/arm/plat-zynq7k/main.c +++ b/core/arch/arm/plat-zynq7k/main.c @@ -51,7 +51,7 @@ static void platform_tee_entry_fast(struct thread_smc_args *args); static const struct thread_handlers handlers = { .std_smc = tee_entry_std, .fast_smc = platform_tee_entry_fast, - .fiq = main_fiq, + .nintr = main_fiq, .cpu_on = pm_panic, .cpu_off = pm_panic, .cpu_suspend = pm_panic, @@ -61,6 +61,7 @@ static const struct thread_handlers handlers = { }; static struct gic_data gic_data; +static struct cdns_uart_data console_data __early_bss; register_phys_mem(MEM_AREA_IO_NSEC, CONSOLE_UART_BASE, CORE_MMU_DEVICE_SIZE); register_phys_mem(MEM_AREA_IO_SEC, GIC_BASE, CORE_MMU_DEVICE_SIZE); @@ -117,33 +118,10 @@ void plat_cpu_reset_late(void) } } -static vaddr_t console_base(void) -{ - static void *va __early_bss; - - 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) { -} - -void console_putc(int ch) -{ - if (ch == '\n') - cdns_uart_putc('\r', console_base()); - cdns_uart_putc(ch, console_base()); -} - -void console_flush(void) -{ - cdns_uart_flush(console_base()); + cdns_uart_init(&console_data, CONSOLE_UART_BASE, 0, 0); + register_serial_console(&console_data.chip); } vaddr_t pl310_base(void) |