aboutsummaryrefslogtreecommitdiff
path: root/plat/qemu
diff options
context:
space:
mode:
authorAmbroise Vincent <ambroise.vincent@arm.com>2019-04-04 09:13:28 +0100
committerAmbroise Vincent <ambroise.vincent@arm.com>2019-06-28 10:52:48 +0100
commit5b6ebeec9c99f8d6a539d3b15e5dfb827891174a (patch)
tree1e72bd9f7afdc361596977491a88e6ee89176658 /plat/qemu
parent51e24ec2c6f4d72df50cf62766311f3773d4e117 (diff)
downloadtrusted-firmware-a-5b6ebeec9c99f8d6a539d3b15e5dfb827891174a.tar.gz
Remove MULTI_CONSOLE_API flag and references to it
The new API becomes the default one. Change-Id: Ic1d602da3dff4f4ebbcc158b885295c902a24fec Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
Diffstat (limited to 'plat/qemu')
-rw-r--r--plat/qemu/platform.mk6
-rw-r--r--plat/qemu/qemu_console.c8
2 files changed, 0 insertions, 14 deletions
diff --git a/plat/qemu/platform.mk b/plat/qemu/platform.mk
index f086ddc6ca..85d83eaa78 100644
--- a/plat/qemu/platform.mk
+++ b/plat/qemu/platform.mk
@@ -151,12 +151,6 @@ ifneq ($(ENABLE_STACK_PROTECTOR), 0)
PLAT_BL_COMMON_SOURCES += plat/qemu/qemu_stack_protector.c
endif
-# Use MULTI_CONSOLE_API by default only on AArch64
-# as it is not yet supported on AArch32
-ifeq ($(ARCH),aarch64)
-MULTI_CONSOLE_API := 1
-endif
-
BL32_RAM_LOCATION := tdram
ifeq (${BL32_RAM_LOCATION}, tsram)
BL32_RAM_LOCATION_ID = SEC_SRAM_ID
diff --git a/plat/qemu/qemu_console.c b/plat/qemu/qemu_console.c
index 759f997dcb..fec1828921 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 */
}