diff options
| author | Michalis Pappas <mpappas@fastmail.fm> | 2018-03-24 12:38:31 +0800 |
|---|---|---|
| committer | Michalis Pappas <mpappas@fastmail.fm> | 2018-03-24 20:59:34 +0800 |
| commit | 4c746fc56c3e849a297d42cbc00115bd590b1216 (patch) | |
| tree | 200b56a10752b8ee0140bfc7cda226da3df6ed62 /plat/qemu | |
| parent | 0d48df84b3bd2b9167ec9cb92e6ccdb15ac7de95 (diff) | |
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>
Diffstat (limited to 'plat/qemu')
| -rw-r--r-- | plat/qemu/platform.mk | 7 | ||||
| -rw-r--r-- | plat/qemu/qemu_console.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/plat/qemu/platform.mk b/plat/qemu/platform.mk index a9fbcd73..017807b0 100644 --- 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 9c02957e..1cf84aa7 100644 --- 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) { |