Commit d698ee7f authored by danh-arm's avatar danh-arm
Browse files

Merge pull request #534 from jcastillo-arm/jc/fix_pl011

Fix potential deadlock in PL011 init function
parents 9931932b 8dadabd2
...@@ -69,15 +69,6 @@ func console_core_init ...@@ -69,15 +69,6 @@ func console_core_init
mov w4, #PL011_UARTCR_UARTEN mov w4, #PL011_UARTCR_UARTEN
bic w3, w3, w4 bic w3, w3, w4
str w3, [x0, #UARTCR] str w3, [x0, #UARTCR]
/* Flush the transmit FIFO */
ldr w3, [x0, #UARTLCR_H]
mov w4, #PL011_UARTLCR_H_FEN
bic w3, w3, w4
str w3, [x0, #UARTLCR_H]
/* Wait for the end of Tx of current character */
busy_loop:
ldr w3, [x0, #UARTFR]
tbnz w3, #PL011_UARTFR_BUSY_BIT, busy_loop
/* Program the baudrate */ /* Program the baudrate */
/* Divisor = (Uart clock * 4) / baudrate */ /* Divisor = (Uart clock * 4) / baudrate */
lsl w1, w1, #2 lsl w1, w1, #2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment