mirror of
https://github.com/torvalds/linux.git
synced 2024-12-26 04:42:12 +00:00
e91fb3bd75
In an invalid randconfig build (fixed by another patch), I ran across this warning: arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror] #define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) As Russell pointed out, we should never #define a macro starting with CONFIG_ in a source file, as that is rather confusing. This renames the macro to avoid the symbol clash. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Suggested-by: Russell King <linux@arm.linux.org.uk> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
46 lines
1.3 KiB
ArmAsm
46 lines
1.3 KiB
ArmAsm
/*
|
|
* Copyright (C) 2003-2005 SAN People
|
|
*
|
|
* Debugging macro include header
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#ifdef CONFIG_MMU
|
|
#define AT91_IO_P2V(x) ((x) - 0x01000000)
|
|
#else
|
|
#define AT91_IO_P2V(x) (x)
|
|
#endif
|
|
|
|
#define AT91_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS)
|
|
|
|
#define AT91_DBGU_SR (0x14) /* Status Register */
|
|
#define AT91_DBGU_THR (0x1c) /* Transmitter Holding Register */
|
|
#define AT91_DBGU_TXRDY (1 << 1) /* Transmitter Ready */
|
|
#define AT91_DBGU_TXEMPTY (1 << 9) /* Transmitter Empty */
|
|
|
|
.macro addruart, rp, rv, tmp
|
|
ldr \rp, =CONFIG_DEBUG_UART_PHYS @ System peripherals (phys address)
|
|
ldr \rv, =AT91_DEBUG_UART_VIRT @ System peripherals (virt address)
|
|
.endm
|
|
|
|
.macro senduart,rd,rx
|
|
strb \rd, [\rx, #(AT91_DBGU_THR)] @ Write to Transmitter Holding Register
|
|
.endm
|
|
|
|
.macro waituart,rd,rx
|
|
1001: ldr \rd, [\rx, #(AT91_DBGU_SR)] @ Read Status Register
|
|
tst \rd, #AT91_DBGU_TXRDY @ DBGU_TXRDY = 1 when ready to transmit
|
|
beq 1001b
|
|
.endm
|
|
|
|
.macro busyuart,rd,rx
|
|
1001: ldr \rd, [\rx, #(AT91_DBGU_SR)] @ Read Status Register
|
|
tst \rd, #AT91_DBGU_TXEMPTY @ DBGU_TXEMPTY = 1 when transmission complete
|
|
beq 1001b
|
|
.endm
|
|
|