mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-17 01:54:22 +00:00
Merge "fix(stm32mp2): correct early/crash console init" into integration
This commit is contained in:
commit
64187603b2
1 changed files with 10 additions and 10 deletions
|
@ -90,19 +90,19 @@ endfunc plat_my_core_pos
|
|||
func plat_crash_console_init
|
||||
/* Reset UART peripheral */
|
||||
mov_imm x1, (RCC_BASE + DEBUG_UART_RST_REG)
|
||||
ldr x2, =DEBUG_UART_RST_BIT
|
||||
ldr x0, [x1]
|
||||
orr x0, x0, x2
|
||||
str x0, [x1]
|
||||
ldr w2, =DEBUG_UART_RST_BIT
|
||||
ldr w0, [x1]
|
||||
orr w0, w0, w2
|
||||
str w0, [x1]
|
||||
1:
|
||||
ldr x0, [x1]
|
||||
tst x0, #DEBUG_UART_RST_BIT
|
||||
ldr w0, [x1]
|
||||
tst w0, #DEBUG_UART_RST_BIT
|
||||
beq 1b
|
||||
bic x0, x0, #DEBUG_UART_RST_BIT
|
||||
str x0, [x1]
|
||||
bic w0, w0, #DEBUG_UART_RST_BIT
|
||||
str w0, [x1]
|
||||
2:
|
||||
ldr x0, [x1]
|
||||
tst x0, #DEBUG_UART_RST_BIT
|
||||
ldr w0, [x1]
|
||||
tst w0, #DEBUG_UART_RST_BIT
|
||||
bne 2b
|
||||
/* Enable GPIOs for UART TX */
|
||||
mov_imm x1, (RCC_BASE + DEBUG_UART_TX_GPIO_BANK_CLK_REG)
|
||||
|
|
Loading…
Add table
Reference in a new issue