plat/marvell: Migrate to multi-console API
Migrate Marvell platforms from legacy console API to
multi-console API.
Change-Id: I647f5f49148b463a257a747af05b5f0c967f267c
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
diff --git a/plat/marvell/a8k/common/plat_pm.c b/plat/marvell/a8k/common/plat_pm.c
index 0c74b2f..1b68d07 100644
--- a/plat/marvell/a8k/common/plat_pm.c
+++ b/plat/marvell/a8k/common/plat_pm.c
@@ -19,7 +19,6 @@
#include <plat_marvell.h>
#include <platform.h>
#include <plat_pm_trace.h>
-#include <platform.h>
#define MVEBU_PRIVATE_UID_REG 0x30
#define MVEBU_RFU_GLOBL_SW_RST 0x84
@@ -614,6 +613,8 @@
INFO("Suspending to RAM\n");
+ marvell_console_runtime_end();
+
/* Prevent interrupts from spuriously waking up this cpu */
gicv2_cpuif_disable();
@@ -687,9 +688,7 @@
/* Initialize the console to provide
* early debug support
*/
- console_init(PLAT_MARVELL_BOOT_UART_BASE,
- PLAT_MARVELL_BOOT_UART_CLK_IN_HZ,
- MARVELL_CONSOLE_BAUDRATE);
+ marvell_console_runtime_init();
bl31_plat_arch_setup();
marvell_bl31_platform_setup();