diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/fsp/fsp-console.c | 9 | ||||
| -rw-r--r-- | hw/lpc-uart.c | 7 |
2 files changed, 3 insertions, 13 deletions
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c index 8589e8c0..66836794 100644 --- a/hw/fsp/fsp-console.c +++ b/hw/fsp/fsp-console.c @@ -384,7 +384,7 @@ static void fsp_close_vserial(struct fsp_msg *msg) set_console(NULL); } #endif - + lock(&fsp_con_lock); if (fs->open) { fs->open = false; @@ -783,11 +783,6 @@ void fsp_console_init(void) if (!fsp_present()) return; - opal_register(OPAL_CONSOLE_READ, fsp_console_read, 3); - opal_register(OPAL_CONSOLE_WRITE_BUFFER_SPACE, - fsp_console_write_buffer_space, 2); - opal_register(OPAL_CONSOLE_WRITE, fsp_console_write, 3); - /* Wait until we got the intf query before moving on */ while (!got_intf_query) opal_run_pollers(); @@ -816,6 +811,8 @@ void fsp_console_init(void) } op_display(OP_LOG, OP_MOD_FSPCON, 0x0005); + + set_opal_console(&fsp_opal_con); } static int64_t fsp_console_flush(int64_t terminal __unused) diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c index cc1c1650..0b78a764 100644 --- a/hw/lpc-uart.c +++ b/hw/lpc-uart.c @@ -450,13 +450,6 @@ void uart_setup_opal_console(void) /* Allocate an input buffer */ in_buf = zalloc(IN_BUF_SIZE); out_buf = zalloc(OUT_BUF_SIZE); - prlog(PR_DEBUG, "UART: Enabled as OS console\n"); - - /* Register OPAL APIs */ - opal_register(OPAL_CONSOLE_READ, uart_opal_read, 3); - opal_register(OPAL_CONSOLE_WRITE_BUFFER_SPACE, - uart_opal_write_buffer_space, 2); - opal_register(OPAL_CONSOLE_WRITE, uart_opal_write, 3); opal_add_poller(uart_console_poll, NULL); } |
