imx: console: Use CONSOLE_T_BASE for UART base address
Since commit ac71344e9e
we have the UART base address in the generic
console_t structure. For most platforms the platform-specific struct
console is gone, so we *must* use the embedded base address, since there
is no storage behind the generic console_t anymore.
Replace the usage of CONSOLE_T_DRVDATA with CONSOLE_T_BASE to fix this.
Change-Id: I6d2ab0bc2c845c71f98b9dd64d89eef3252f4591
Reported-by: Varun Wadekar <vwadekar@nvidia.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
parent
9e7e98671d
commit
6627de5320
|
@ -20,7 +20,7 @@ func console_imx_uart_register
|
||||||
mov r4, r3
|
mov r4, r3
|
||||||
cmp r4, #0
|
cmp r4, #0
|
||||||
beq register_fail
|
beq register_fail
|
||||||
str r0, [r4, #CONSOLE_T_DRVDATA]
|
str r0, [r4, #CONSOLE_T_BASE]
|
||||||
|
|
||||||
bl console_imx_uart_core_init
|
bl console_imx_uart_core_init
|
||||||
cmp r0, #0
|
cmp r0, #0
|
||||||
|
@ -35,16 +35,16 @@ register_fail:
|
||||||
endfunc console_imx_uart_register
|
endfunc console_imx_uart_register
|
||||||
|
|
||||||
func console_imx_uart_putc
|
func console_imx_uart_putc
|
||||||
ldr r1, [r1, #CONSOLE_T_DRVDATA]
|
ldr r1, [r1, #CONSOLE_T_BASE]
|
||||||
b console_imx_uart_core_putc
|
b console_imx_uart_core_putc
|
||||||
endfunc console_imx_uart_putc
|
endfunc console_imx_uart_putc
|
||||||
|
|
||||||
func console_imx_uart_getc
|
func console_imx_uart_getc
|
||||||
ldr r0, [r0, #CONSOLE_T_DRVDATA]
|
ldr r0, [r0, #CONSOLE_T_BASE]
|
||||||
b console_imx_uart_core_getc
|
b console_imx_uart_core_getc
|
||||||
endfunc console_imx_uart_getc
|
endfunc console_imx_uart_getc
|
||||||
|
|
||||||
func console_imx_uart_flush
|
func console_imx_uart_flush
|
||||||
ldr r0, [r0, #CONSOLE_T_DRVDATA]
|
ldr r0, [r0, #CONSOLE_T_BASE]
|
||||||
b console_imx_uart_core_flush
|
b console_imx_uart_core_flush
|
||||||
endfunc console_imx_uart_flush
|
endfunc console_imx_uart_flush
|
||||||
|
|
|
@ -25,7 +25,7 @@ func console_imx_uart_register
|
||||||
mov x7, x30
|
mov x7, x30
|
||||||
mov x6, x3
|
mov x6, x3
|
||||||
cbz x6, register_fail
|
cbz x6, register_fail
|
||||||
str x0, [x6, #CONSOLE_T_DRVDATA]
|
str x0, [x6, #CONSOLE_T_BASE]
|
||||||
|
|
||||||
bl console_imx_uart_init
|
bl console_imx_uart_init
|
||||||
cbz x0, register_fail
|
cbz x0, register_fail
|
||||||
|
@ -44,7 +44,7 @@ func console_imx_uart_init
|
||||||
endfunc console_imx_uart_init
|
endfunc console_imx_uart_init
|
||||||
|
|
||||||
func console_imx_uart_putc
|
func console_imx_uart_putc
|
||||||
ldr x1, [x1, #CONSOLE_T_DRVDATA]
|
ldr x1, [x1, #CONSOLE_T_BASE]
|
||||||
cbz x1, putc_error
|
cbz x1, putc_error
|
||||||
|
|
||||||
/* Prepare '\r' to '\n' */
|
/* Prepare '\r' to '\n' */
|
||||||
|
@ -68,7 +68,7 @@ putc_error:
|
||||||
endfunc console_imx_uart_putc
|
endfunc console_imx_uart_putc
|
||||||
|
|
||||||
func console_imx_uart_getc
|
func console_imx_uart_getc
|
||||||
ldr x0, [x0, #CONSOLE_T_DRVDATA]
|
ldr x0, [x0, #CONSOLE_T_BASE]
|
||||||
cbz x0, getc_error
|
cbz x0, getc_error
|
||||||
1:
|
1:
|
||||||
ldr w1, [x0, #UTS]
|
ldr w1, [x0, #UTS]
|
||||||
|
|
|
@ -20,7 +20,7 @@ func console_lpuart_register
|
||||||
mov x7, x30
|
mov x7, x30
|
||||||
mov x6, x3
|
mov x6, x3
|
||||||
cbz x6, register_fail
|
cbz x6, register_fail
|
||||||
str x0, [x6, #CONSOLE_T_DRVDATA]
|
str x0, [x6, #CONSOLE_T_BASE]
|
||||||
|
|
||||||
bl console_lpuart_init
|
bl console_lpuart_init
|
||||||
cbz x0, register_fail
|
cbz x0, register_fail
|
||||||
|
@ -39,7 +39,7 @@ func console_lpuart_init
|
||||||
endfunc console_lpuart_init
|
endfunc console_lpuart_init
|
||||||
|
|
||||||
func console_lpuart_putc
|
func console_lpuart_putc
|
||||||
ldr x1, [x1, #CONSOLE_T_DRVDATA]
|
ldr x1, [x1, #CONSOLE_T_BASE]
|
||||||
cbz x1, putc_error
|
cbz x1, putc_error
|
||||||
/* Prepare '\r' to '\n' */
|
/* Prepare '\r' to '\n' */
|
||||||
cmp w0, #0xA
|
cmp w0, #0xA
|
||||||
|
@ -62,7 +62,7 @@ putc_error:
|
||||||
endfunc console_lpuart_putc
|
endfunc console_lpuart_putc
|
||||||
|
|
||||||
func console_lpuart_getc
|
func console_lpuart_getc
|
||||||
ldr x0, [x0, #CONSOLE_T_DRVDATA]
|
ldr x0, [x0, #CONSOLE_T_BASE]
|
||||||
cbz x0, getc_error
|
cbz x0, getc_error
|
||||||
/* Check if the receive FIFO state */
|
/* Check if the receive FIFO state */
|
||||||
ret
|
ret
|
||||||
|
|
Loading…
Reference in New Issue