diff options
| author | danh-arm <dan.handley@arm.com> | 2016-12-08 12:20:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 12:20:21 +0000 |
| commit | 535f185a5c7ed3ef1958b6382320418093c5f6eb (patch) | |
| tree | 73d0286149b093d91c807f7880e7ee42d2a9bf2b /drivers | |
| parent | 7ffd088fe3267e56c42838e19222bde7321bd406 (diff) | |
| parent | 69d59e0ce9f713b0fd4929908ec1649d29f2cbd4 (diff) | |
Merge pull request #770 from yatharth-arm/yk/AArch32_fixes
AArch32: Miscellaneous fixes in the AArch32 code
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/pl011/aarch32/pl011_console.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index 21ed7ab8..5b735283 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S @@ -118,15 +118,15 @@ func console_core_putc 1: /* Check if the transmit FIFO is full */ ldr r2, [r1, #UARTFR] - tst r2, #PL011_UARTFR_TXFF_BIT - beq 1b + tst r2, #PL011_UARTFR_TXFF + bne 1b mov r2, #0xD str r2, [r1, #UARTDR] 2: /* Check if the transmit FIFO is full */ ldr r2, [r1, #UARTFR] - tst r2, #PL011_UARTFR_TXFF_BIT - beq 2b + tst r2, #PL011_UARTFR_TXFF + bne 2b str r0, [r1, #UARTDR] bx lr putc_error: @@ -149,8 +149,8 @@ func console_core_getc 1: /* Check if the receive FIFO is empty */ ldr r1, [r0, #UARTFR] - tst r1, #PL011_UARTFR_RXFE_BIT - beq 1b + tst r1, #PL011_UARTFR_RXFE + bne 1b ldr r1, [r0, #UARTDR] mov r0, r1 bx lr |