diff options
| author | Paul Beesley <paul.beesley@arm.com> | 2019-06-28 11:04:02 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-06-28 11:04:02 +0000 |
| commit | 39c92b6271f4bde4e84f2459dbc18228cedd7825 (patch) | |
| tree | 93ee53f056c6fc9a1ca7d0e03c892aa859ea6877 /plat/qemu/qemu_console.c | |
| parent | e54b4dd9da3a8e19df497ed6a42a66fa8ec54789 (diff) | |
| parent | e6ffc254a9da9ca4623f94903e92e363d30f3d63 (diff) | |
Merge changes from topic "av/console-port" into integration
* changes:
qemu: use new console interface in aarch32
warp7: remove old console from makefile
Remove MULTI_CONSOLE_API flag and references to it
Console: removed legacy console API
Diffstat (limited to 'plat/qemu/qemu_console.c')
| -rw-r--r-- | plat/qemu/qemu_console.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/plat/qemu/qemu_console.c b/plat/qemu/qemu_console.c index 759f997d..fec18289 100644 --- a/plat/qemu/qemu_console.c +++ b/plat/qemu/qemu_console.c @@ -9,23 +9,15 @@ #include <drivers/console.h> #include <drivers/arm/pl011.h> -#if MULTI_CONSOLE_API static console_pl011_t console; -#endif /* MULTI_CONSOLE_API */ void qemu_console_init(void) { -#if MULTI_CONSOLE_API (void)console_pl011_register(PLAT_QEMU_BOOT_UART_BASE, PLAT_QEMU_BOOT_UART_CLK_IN_HZ, PLAT_QEMU_CONSOLE_BAUDRATE, &console); console_set_scope(&console.console, CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME); -#else - console_init(PLAT_QEMU_BOOT_UART_BASE, - PLAT_QEMU_BOOT_UART_CLK_IN_HZ, - PLAT_QEMU_CONSOLE_BAUDRATE); -#endif /* MULTI_CONSOLE_API */ } |