aboutsummaryrefslogtreecommitdiff
path: root/plat/marvell/a8k/common
diff options
context:
space:
mode:
authorKonstantin Porotchkin <kostap@marvell.com>2018-11-14 17:15:08 +0200
committerKonstantin Porotchkin <kostap@marvell.com>2018-11-15 13:42:45 +0200
commitd7c4420cb8a745bf61c1de0df8858526002e16b0 (patch)
tree34c99fa20fa8a1b720c1263df6691dc5a45de365 /plat/marvell/a8k/common
parent076374c9b97d47b10ba5c6034817866c08d66ed4 (diff)
downloadtrusted-firmware-a-d7c4420cb8a745bf61c1de0df8858526002e16b0.tar.gz
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>
Diffstat (limited to 'plat/marvell/a8k/common')
-rw-r--r--plat/marvell/a8k/common/a8k_common.mk1
-rw-r--r--plat/marvell/a8k/common/ble/ble.mk5
-rw-r--r--plat/marvell/a8k/common/ble/ble_main.c6
-rw-r--r--plat/marvell/a8k/common/plat_pm.c7
4 files changed, 8 insertions, 11 deletions
diff --git a/plat/marvell/a8k/common/a8k_common.mk b/plat/marvell/a8k/common/a8k_common.mk
index a589004bd5..6136a1f596 100644
--- a/plat/marvell/a8k/common/a8k_common.mk
+++ b/plat/marvell/a8k/common/a8k_common.mk
@@ -25,7 +25,6 @@ $(eval $(call add_define,BL31_CACHE_DISABLE))
$(eval $(call add_define,PCI_EP_SUPPORT))
$(eval $(call assert_boolean,PCI_EP_SUPPORT))
-
AP_NUM := 1
$(eval $(call add_define,AP_NUM))
diff --git a/plat/marvell/a8k/common/ble/ble.mk b/plat/marvell/a8k/common/ble/ble.mk
index a76083ebfc..5f24ced23b 100644
--- a/plat/marvell/a8k/common/ble/ble.mk
+++ b/plat/marvell/a8k/common/ble/ble.mk
@@ -12,8 +12,9 @@ PLAT_MARVELL = plat/marvell
BLE_SOURCES += $(BLE_PATH)/ble_main.c \
$(BLE_PATH)/ble_mem.S \
- drivers/delay_timer/delay_timer.c \
- $(PLAT_MARVELL)/common/plat_delay_timer.c
+ drivers/delay_timer/delay_timer.c \
+ $(PLAT_MARVELL)/common/plat_delay_timer.c \
+ $(PLAT_MARVELL)/common/marvell_console.c
PLAT_INCLUDES += -I$(MV_DDR_PATH) \
-I$(CURDIR)/include/ \
diff --git a/plat/marvell/a8k/common/ble/ble_main.c b/plat/marvell/a8k/common/ble/ble_main.c
index e52c738d32..b04e8b7a66 100644
--- a/plat/marvell/a8k/common/ble/ble_main.c
+++ b/plat/marvell/a8k/common/ble/ble_main.c
@@ -35,13 +35,11 @@ int exec_ble_main(int bootrom_flags)
* initialize the console and prints will be ignored
*/
if ((bootrom_flags & BR_FLAG_SILENT) == 0)
- console_init(PLAT_MARVELL_BOOT_UART_BASE,
- PLAT_MARVELL_BOOT_UART_CLK_IN_HZ,
- MARVELL_CONSOLE_BAUDRATE);
+ marvell_console_boot_init();
NOTICE("Starting binary extension\n");
- /* initiliaze time (for delay functionality) */
+ /* initialize time (for delay functionality) */
plat_delay_timer_init();
ble_plat_setup(&skip);
diff --git a/plat/marvell/a8k/common/plat_pm.c b/plat/marvell/a8k/common/plat_pm.c
index 0c74b2fe55..1b68d0767e 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 @@ static void a8k_pwr_domain_suspend(const psci_power_state_t *target_state)
INFO("Suspending to RAM\n");
+ marvell_console_runtime_end();
+
/* Prevent interrupts from spuriously waking up this cpu */
gicv2_cpuif_disable();
@@ -687,9 +688,7 @@ static void a8k_pwr_domain_suspend_finish(
/* 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();