diff options
Diffstat (limited to 'core/arch/arm/plat-zynqmp/main.c')
| -rw-r--r-- | core/arch/arm/plat-zynqmp/main.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/core/arch/arm/plat-zynqmp/main.c b/core/arch/arm/plat-zynqmp/main.c index 31b8475..a00d1ae 100644 --- a/core/arch/arm/plat-zynqmp/main.c +++ b/core/arch/arm/plat-zynqmp/main.c @@ -46,11 +46,12 @@ static void main_fiq(void); static struct gic_data gic_data; +static struct cdns_uart_data console_data __early_bss; static const struct thread_handlers handlers = { .std_smc = tee_entry_std, .fast_smc = tee_entry_fast, - .fiq = main_fiq, + .nintr = main_fiq, #if defined(CFG_WITH_ARM_TRUSTED_FW) .cpu_on = cpu_on_handler, .cpu_off = pm_do_nothing, @@ -90,33 +91,9 @@ static void main_fiq(void) gic_it_handle(&gic_data); } -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_SEC); - return (vaddr_t)va; - } - - return CONSOLE_UART_BASE; -} - void console_init(void) { - cdns_uart_init(console_base(), CONSOLE_UART_CLK_IN_HZ, - CONSOLE_BAUDRATE); -} - -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, + CONSOLE_UART_CLK_IN_HZ, CONSOLE_BAUDRATE); + register_serial_console(&console_data.chip); } |