diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-05-15 13:12:50 +0100 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-05-15 13:17:55 +0100 |
commit | bf4698fdef67d867a402488df86724b807372e61 (patch) | |
tree | 4ddbdbed96e35a211386058f7cab06849b12be9a /plat/arm/common/arm_console.c | |
parent | 2f18aa1fa35305f8feec25867473d30975b242fe (diff) |
Revert "plat/arm: Migrate AArch64 port to the multi console driver"
This reverts commit 2f18aa1fa35305f8feec25867473d30975b242fe.
It is causing some tests to fail. Until the cause is found and fixed, it
is needed to remove this commit from master.
Change-Id: Ic5ff7a841903a15613e00379e87cbbd8a0e85152
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/arm/common/arm_console.c')
-rw-r--r-- | plat/arm/common/arm_console.c | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/plat/arm/common/arm_console.c b/plat/arm/common/arm_console.c deleted file mode 100644 index 20b8f87e..00000000 --- a/plat/arm/common/arm_console.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#include <assert.h> -#include <console.h> -#include <debug.h> -#include <pl011.h> -#include <plat_arm.h> -#include <platform_def.h> - -/******************************************************************************* - * Functions that set up the console - ******************************************************************************/ -#if MULTI_CONSOLE_API -static console_pl011_t arm_boot_console; -static console_pl011_t arm_runtime_console; -#endif - -/* Initialize the console to provide early debug support */ -void arm_console_boot_init(void) -{ -#if MULTI_CONSOLE_API - int rc = console_pl011_register(PLAT_ARM_BOOT_UART_BASE, - PLAT_ARM_BOOT_UART_CLK_IN_HZ, - ARM_CONSOLE_BAUDRATE, - &arm_boot_console); - if (rc == 0) { - /* - * The crash console doesn't use the multi console API, it uses - * the core console functions directly. It is safe to call panic - * and let it print debug information. - */ - panic(); - } - - console_set_scope(&arm_boot_console.console, CONSOLE_FLAG_BOOT); -#else - (void)console_init(PLAT_ARM_BOOT_UART_BASE, - PLAT_ARM_BOOT_UART_CLK_IN_HZ, - ARM_CONSOLE_BAUDRATE); -#endif /* MULTI_CONSOLE_API */ -} - -void arm_console_boot_end(void) -{ -#if MULTI_CONSOLE_API - (void)console_flush(); - - (void)console_unregister(&arm_boot_console.console); -#else - console_uninit(); -#endif /* MULTI_CONSOLE_API */ -} - -/* Initialize the runtime console */ -void arm_console_runtime_init(void) -{ -#if MULTI_CONSOLE_API - int rc = console_pl011_register(PLAT_ARM_BL31_RUN_UART_BASE, - PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ, - ARM_CONSOLE_BAUDRATE, - &arm_runtime_console); - if (rc == 0) - panic(); - - console_set_scope(&arm_runtime_console.console, CONSOLE_FLAG_RUNTIME); -#else - (void)console_init(PLAT_ARM_BL31_RUN_UART_BASE, - PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ, - ARM_CONSOLE_BAUDRATE); -#endif /* MULTI_CONSOLE_API */ -} - -void arm_console_runtime_end(void) -{ -#if MULTI_CONSOLE_API - (void)console_flush(); - - (void)console_unregister(&arm_runtime_console.console); -#else - console_uninit(); -#endif /* MULTI_CONSOLE_API */ -} |