Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e91fb3bd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: at91: avoid defining CONFIG_* symbols in source code 



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: default avatarArnd Bergmann <arnd@arndb.de>
Suggested-by: default avatarRussell King <linux@arm.linux.org.uk>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 1c277cae

arch/arm/include/debug/at91.S

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define AT91_IO_P2V(x) (x)

#endif



#define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS)

#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 */
@@ -24,7 +24,7 @@ 


	.macro	addruart, rp, rv, tmp

	ldr	\rp, =CONFIG_DEBUG_UART_PHYS		@ System peripherals (phys address)

	ldr	\rv, =CONFIG_DEBUG_UART_VIRT		@ System peripherals (virt address)

	ldr	\rv, =AT91_DEBUG_UART_VIRT		@ System peripherals (virt address)

	.endm



	.macro	senduart,rd,rx