diff options
Diffstat (limited to 'core/arch/arm/plat-rcar/main.c')
-rw-r--r-- | core/arch/arm/plat-rcar/main.c | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/core/arch/arm/plat-rcar/main.c b/core/arch/arm/plat-rcar/main.c index 8f9482e..6a7e332 100644 --- a/core/arch/arm/plat-rcar/main.c +++ b/core/arch/arm/plat-rcar/main.c @@ -46,7 +46,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, @@ -55,6 +55,8 @@ static const struct thread_handlers handlers = { .system_reset = pm_do_nothing, }; +static struct scif_uart_data console_data __early_bss; + const struct thread_handlers *generic_boot_get_handlers(void) { return &handlers; @@ -65,31 +67,8 @@ 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_SEC); - return (vaddr_t)va; - } - return CONSOLE_UART_BASE; -} - void console_init(void) { - scif_uart_init(console_base()); -} - -void console_putc(int ch) -{ - if (ch == '\n') - scif_uart_putc('\r', console_base()); - scif_uart_putc(ch, console_base()); -} - -void console_flush(void) -{ - scif_uart_flush(console_base()); + scif_uart_init(&console_data, CONSOLE_UART_BASE); + register_serial_console(&console_data.chip); } |