qemu: MULTI_CONSOLE_API=0 causes build error

Add crash_console_init declaration to console.h
Only enable MULTI_CONSOLE_API for AArch64

Fixes ARM-software/tf-issues#571

Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>

diff --git a/include/drivers/console.h b/include/drivers/console.h
index f8ec83d2fa15e500de45ca579ad381c793c0cf05..c8a43a288334f4467ac5abfca7430c0fe3310edd 100644 (file)
--- a/include/drivers/console.h
+++ b/include/drivers/console.h
@@ -66,6 +66,8 @@ int console_flush(void);
 /* REMOVED on AArch64 -- use console_<driver>_register() instead! */
 int console_init(uintptr_t base_addr,
                 unsigned int uart_clk, unsigned int baud_rate);
+int console_core_init(uintptr_t base_addr,
+                     unsigned int uart_clk, unsigned int baud_rate);
 void console_uninit(void);
 #endif
 

diff --git a/plat/qemu/platform.mk b/plat/qemu/platform.mk
index a9fbcd7320b658dcc7de310fcda3b44524414a32..017807b000904650479a2dd226e1704277ce924b 100644 (file)
--- a/plat/qemu/platform.mk
+++ b/plat/qemu/platform.mk
@@ -169,7 +169,12 @@ $(eval $(call TOOL_ADD_IMG,bl32_extra2,--tos-fw-extra2))
 endif
 
 SEPARATE_CODE_AND_RODATA := 1
-MULTI_CONSOLE_API       := 1
+
+# 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
 
 # Disable the PSCI platform compatibility layer
 ENABLE_PLAT_COMPAT     :=      0

diff --git a/plat/qemu/qemu_console.c b/plat/qemu/qemu_console.c
index 9c02957ec140ba4801d668fe5a33e417740a492a..1cf84aa78a7f8c8ff11b012b74fb0e5af817eef0 100644 (file)
--- a/plat/qemu/qemu_console.c
+++ b/plat/qemu/qemu_console.c
@@ -7,8 +7,10 @@
 #include <pl011.h>
 #include <platform_def.h>
 
+#if MULTI_CONSOLE_API
 static console_pl011_t console;
 static console_pl011_t crash_console;
+#endif /* MULTI_CONSOLE_API */
 
 void qemu_console_init(void)
 {