aboutsummaryrefslogtreecommitdiff
path: root/plat/hisilicon/poplar/bl1_plat_setup.c
diff options
context:
space:
mode:
authorJerome Forissier <jerome.forissier@linaro.org>2018-11-08 11:57:30 +0000
committerJerome Forissier <jerome.forissier@linaro.org>2018-11-08 16:29:43 +0100
commit5c58c8b1ee81b5f5e4565ae4c14f777d283227c1 (patch)
treeb31a68f851b00c71c4f615d031b13467016b43e5 /plat/hisilicon/poplar/bl1_plat_setup.c
parent5189ea27503d47d640252a57d63527d6ab2f53c0 (diff)
downloadtrusted-firmware-a-5c58c8b1ee81b5f5e4565ae4c14f777d283227c1.tar.gz
poplar: Use new console APIs
Switch to the new console APIs enabled by setting MULTI_CONSOLE_API=1. Enables building with ERROR_DEPRECATED=1. Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Diffstat (limited to 'plat/hisilicon/poplar/bl1_plat_setup.c')
-rw-r--r--plat/hisilicon/poplar/bl1_plat_setup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/plat/hisilicon/poplar/bl1_plat_setup.c b/plat/hisilicon/poplar/bl1_plat_setup.c
index c2adc44ec..d0b12ad2b 100644
--- a/plat/hisilicon/poplar/bl1_plat_setup.c
+++ b/plat/hisilicon/poplar/bl1_plat_setup.c
@@ -7,13 +7,13 @@
#include <arch_helpers.h>
#include <assert.h>
#include <bl_common.h>
-#include <console.h>
#include <debug.h>
#include <dw_mmc.h>
#include <errno.h>
#include <generic_delay_timer.h>
#include <mmc.h>
#include <mmio.h>
+#include <pl011.h>
#include <pl061_gpio.h>
#include <platform.h>
#include <platform_def.h>
@@ -26,6 +26,7 @@
/* Data structure which holds the extents of the trusted RAM for BL1 */
static meminfo_t bl1_tzram_layout;
static meminfo_t bl2_tzram_layout;
+static console_pl011_t console;
/*
* Cannot use default weak implementation in bl1_main.c because BL1 RW data is
@@ -62,7 +63,8 @@ int bl1_plat_handle_post_image_load(unsigned int image_id)
void bl1_early_platform_setup(void)
{
/* Initialize the console to provide early debug support */
- console_init(PL011_UART0_BASE, PL011_UART0_CLK_IN_HZ, PL011_BAUDRATE);
+ console_pl011_register(PL011_UART0_BASE, PL011_UART0_CLK_IN_HZ,
+ PL011_BAUDRATE, &console);
/* Allow BL1 to see the whole Trusted RAM */
bl1_tzram_layout.total_base = BL1_RW_BASE;