Merge "zynqmp: add support for multi console interface" into integration
This commit is contained in:
commit
b01e0ad5cd
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -90,7 +90,7 @@ func plat_crash_console_init
|
||||||
mov_imm x0, ZYNQMP_CRASH_UART_BASE
|
mov_imm x0, ZYNQMP_CRASH_UART_BASE
|
||||||
mov_imm x1, ZYNQMP_CRASH_UART_CLK_IN_HZ
|
mov_imm x1, ZYNQMP_CRASH_UART_CLK_IN_HZ
|
||||||
mov_imm x2, ZYNQMP_UART_BAUDRATE
|
mov_imm x2, ZYNQMP_UART_BAUDRATE
|
||||||
b console_core_init
|
b console_cdns_core_init
|
||||||
endfunc plat_crash_console_init
|
endfunc plat_crash_console_init
|
||||||
|
|
||||||
/* ---------------------------------------------
|
/* ---------------------------------------------
|
||||||
|
@ -102,7 +102,7 @@ endfunc plat_crash_console_init
|
||||||
*/
|
*/
|
||||||
func plat_crash_console_putc
|
func plat_crash_console_putc
|
||||||
mov_imm x1, ZYNQMP_CRASH_UART_BASE
|
mov_imm x1, ZYNQMP_CRASH_UART_BASE
|
||||||
b console_core_putc
|
b console_cdns_core_putc
|
||||||
endfunc plat_crash_console_putc
|
endfunc plat_crash_console_putc
|
||||||
|
|
||||||
/* ---------------------------------------------
|
/* ---------------------------------------------
|
||||||
|
@ -115,7 +115,7 @@ endfunc plat_crash_console_putc
|
||||||
*/
|
*/
|
||||||
func plat_crash_console_flush
|
func plat_crash_console_flush
|
||||||
mov_imm x0, ZYNQMP_CRASH_UART_BASE
|
mov_imm x0, ZYNQMP_CRASH_UART_BASE
|
||||||
b console_core_flush
|
b console_cdns_core_flush
|
||||||
endfunc plat_crash_console_flush
|
endfunc plat_crash_console_flush
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------
|
/* ---------------------------------------------------------------------
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -57,9 +57,14 @@ static inline void bl31_set_default_config(void)
|
||||||
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
|
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
|
||||||
u_register_t arg2, u_register_t arg3)
|
u_register_t arg2, u_register_t arg3)
|
||||||
{
|
{
|
||||||
/* Initialize the console to provide early debug support */
|
/* Register the console to provide early debug support */
|
||||||
console_init(ZYNQMP_UART_BASE, zynqmp_get_uart_clk(),
|
static console_cdns_t bl31_boot_console;
|
||||||
ZYNQMP_UART_BAUDRATE);
|
(void)console_cdns_register(ZYNQMP_UART_BASE,
|
||||||
|
zynqmp_get_uart_clk(),
|
||||||
|
ZYNQMP_UART_BAUDRATE,
|
||||||
|
&bl31_boot_console);
|
||||||
|
console_set_scope(&bl31_boot_console.console,
|
||||||
|
CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_BOOT);
|
||||||
|
|
||||||
/* Initialize the platform config for future decision making */
|
/* Initialize the platform config for future decision making */
|
||||||
zynqmp_config_setup();
|
zynqmp_config_setup();
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
#include <bl31/interrupt_mgmt.h>
|
#include <bl31/interrupt_mgmt.h>
|
||||||
#include <common/bl_common.h>
|
#include <common/bl_common.h>
|
||||||
|
#include <drivers/cadence/cdns_uart.h>
|
||||||
|
|
||||||
void zynqmp_config_setup(void);
|
void zynqmp_config_setup(void);
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
|
# Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
# SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
|
||||||
|
@ -59,7 +59,6 @@ PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \
|
||||||
drivers/arm/gic/v2/gicv2_main.c \
|
drivers/arm/gic/v2/gicv2_main.c \
|
||||||
drivers/arm/gic/v2/gicv2_helpers.c \
|
drivers/arm/gic/v2/gicv2_helpers.c \
|
||||||
drivers/cadence/uart/aarch64/cdns_console.S \
|
drivers/cadence/uart/aarch64/cdns_console.S \
|
||||||
drivers/console/aarch64/console.S \
|
|
||||||
plat/arm/common/arm_cci.c \
|
plat/arm/common/arm_cci.c \
|
||||||
plat/arm/common/arm_common.c \
|
plat/arm/common/arm_common.c \
|
||||||
plat/arm/common/arm_gicv2.c \
|
plat/arm/common/arm_gicv2.c \
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -18,11 +18,16 @@
|
||||||
void tsp_early_platform_setup(void)
|
void tsp_early_platform_setup(void)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Initialize a different console than already in use to display
|
* Register a different console than already in use to display
|
||||||
* messages from TSP
|
* messages from TSP
|
||||||
*/
|
*/
|
||||||
console_init(ZYNQMP_UART_BASE, zynqmp_get_uart_clk(),
|
static console_cdns_t tsp_boot_console;
|
||||||
ZYNQMP_UART_BAUDRATE);
|
(void)console_cdns_register(ZYNQMP_UART_BASE,
|
||||||
|
zynqmp_get_uart_clk(),
|
||||||
|
ZYNQMP_UART_BAUDRATE,
|
||||||
|
&tsp_boot_console);
|
||||||
|
console_set_scope(&tsp_boot_console.console,
|
||||||
|
CONSOLE_FLAG_RUNTIME | CONSOLE_FLAG_BOOT);
|
||||||
|
|
||||||
/* Initialize the platform config for future decision making */
|
/* Initialize the platform config for future decision making */
|
||||||
zynqmp_config_setup();
|
zynqmp_config_setup();
|
||||||
|
|
Loading…
Reference in New Issue