diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-02-23 15:39:38 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-03-02 17:31:08 +0100 |
| commit | e91fb3bd757569aca48785358a4adbf41334d382 (patch) | |
| tree | 1cd0278d9bcda3a31495d530bbf3e4e394f679d0 /arch/arm/include | |
| parent | Merge tag 'pxa-for-4.6' of https://github.com/rjarzmik/linux into next/soc (diff) | |
| download | linux-dev-e91fb3bd757569aca48785358a4adbf41334d382.tar.xz linux-dev-e91fb3bd757569aca48785358a4adbf41334d382.zip | |
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: 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>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/debug/at91.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S index 43243be94cfc..d4ae3b8e2426 100644 --- a/arch/arm/include/debug/at91.S +++ b/arch/arm/include/debug/at91.S @@ -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 |