andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes from topic "uart1_console" into integration 

* changes:
  feat(versal): add UART1 as console
  feat(zynqmp): add uart1 as console
This commit is contained in:
Madhukar Pappireddy 2021-12-22 19:18:15 +01:00 committed by TrustedFirmware Code Review
parent 0ca4b4b79e 2c791499c2
commit b3c4101541
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plat/xilinx/versal/bl31_versal_setup.c
View File

@ -64,7 +64,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
{
uint64_t atf_handoff_addr;
if (VERSAL_CONSOLE_IS(pl011)) {
if (VERSAL_CONSOLE_IS(pl011) || (VERSAL_CONSOLE_IS(pl011_1))) {
static console_t versal_runtime_console;
/* Initialize the console to provide early debug support */
int rc = console_pl011_register((unsigned long)VERSAL_UART_BASE,

2
plat/xilinx/zynqmp/bl31_zynqmp_setup.c
View File

@ -68,7 +68,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
{
uint64_t atf_handoff_addr;
if (ZYNQMP_CONSOLE_IS(cadence)) {
if (ZYNQMP_CONSOLE_IS(cadence) || (ZYNQMP_CONSOLE_IS(cadence1))) {
/* Register the console to provide early debug support */
static console_t bl31_boot_console;
(void)console_cdns_register(ZYNQMP_UART_BASE,