diff options
author | Jerome Forissier <jerome.forissier@linaro.org> | 2018-11-08 09:59:29 +0100 |
---|---|---|
committer | Jerome Forissier <jerome.forissier@linaro.org> | 2018-11-08 16:29:40 +0100 |
commit | 5189ea27503d47d640252a57d63527d6ab2f53c0 (patch) | |
tree | dec4fae0adbb71c1a91dd338862023fb7a6e281e /plat/hisilicon/hikey960/hikey960_bl1_setup.c | |
parent | c779b15992b6cbe2b245981576b098af665bf4f8 (diff) | |
download | trusted-firmware-a-5189ea27503d47d640252a57d63527d6ab2f53c0.tar.gz |
hikey960: 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/hikey960/hikey960_bl1_setup.c')
-rw-r--r-- | plat/hisilicon/hikey960/hikey960_bl1_setup.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c index ea5eb47ba1..ff2c77a60d 100644 --- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c @@ -7,7 +7,6 @@ #include <arch_helpers.h> #include <assert.h> #include <bl_common.h> -#include <console.h> #include <debug.h> #include <delay_timer.h> #include <dw_ufs.h> @@ -17,6 +16,7 @@ #include <hi3660.h> #include <interrupt_props.h> #include <mmio.h> +#include <pl011.h> #include <platform.h> #include <platform_def.h> #include <string.h> @@ -40,6 +40,7 @@ enum { /* Data structure which holds the extents of the trusted RAM for BL1 */ static meminfo_t bl1_tzram_layout; +static console_pl011_t console; /****************************************************************************** * On a GICv2 system, the Group 1 secure interrupts are treated as Group 0 @@ -78,7 +79,8 @@ void bl1_early_platform_setup(void) else uart_base = PL011_UART6_BASE; /* Initialize the console to provide early debug support */ - console_init(uart_base, PL011_UART_CLK_IN_HZ, PL011_BAUDRATE); + console_pl011_register(uart_base, PL011_UART_CLK_IN_HZ, + PL011_BAUDRATE, &console); /* Allow BL1 to see the whole Trusted RAM */ bl1_tzram_layout.total_base = BL1_RW_BASE; |