Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-20 11:34:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(versal-net): use correct macro name for uart baudrate" into integration

Browse source
This commit is contained in:
Joanna Farley 2023-10-04 11:00:34 +02:00 • committed by TrustedFirmware Code Review
commit 18b47a9ca4
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_net/bl31_versal_net_setup.c
View file

@ -106,7 +106,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
/* Initialize the console to provide early debug support */ /* Initialize the console to provide early debug support */
rc = console_pl011_register(UART_BASE, uart_clock, rc = console_pl011_register(UART_BASE, uart_clock,
UART_BAUDATE, UART_BAUDRATE,
&versal_net_runtime_console); &versal_net_runtime_console);
if (rc == 0) { if (rc == 0) {
panic(); panic();

2
plat/xilinx/versal_net/include/versal_net_def.h
View file

@ -135,7 +135,7 @@
#define VERSAL_NET_UART0_BASE U(0xF1920000) #define VERSAL_NET_UART0_BASE U(0xF1920000)
#define VERSAL_NET_UART1_BASE U(0xF1930000) #define VERSAL_NET_UART1_BASE U(0xF1930000)
#define UART_BAUDATE 115200 #define UART_BAUDRATE 115200
#if CONSOLE_IS(pl011_1) #if CONSOLE_IS(pl011_1)
#define UART_BASE VERSAL_NET_UART1_BASE #define UART_BASE VERSAL_NET_UART1_BASE