summaryrefslogtreecommitdiff
path: root/arch/arm/configs/versatile_defconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-12-17 16:35:20 +0100
committerArnd Bergmann <arnd@arndb.de>2015-12-17 16:39:08 +0100
commite45a1e18a57ccc2457429f3bd42d93330c0fee3c (patch)
tree7fb629bc8c9235dff8c10f5110a415d8d8a2f20e /arch/arm/configs/versatile_defconfig
parent3081dc9eff32519bc3298c6dba0b877675d4c1cd (diff)
ARM: defconfig: use correct debug_ll settings
The debug-ll infrastructure can be configured in two ways, either by selecting a platform specific debug option, or by picking one of the generic options (8250 or pl01x typically). For compatibility with multiplatform kernels, we have changed a couple of platforms to use the former method now when they used to use the latter. Unfortunately, this broke the defconfigs because now they still enable CONFIG_DEBUG_LL_UART_PL01X or CONFIG_DEBUG_LL_UART_8250, and we no longer configure the correct register addresses automatically. Embarrassingly, this was only found in linux-next when the defconfig builds turned up errors for multiple people, and I had not caught those in my own tests, which were done using the randconfig fixes patchset on top, and that has a workaround to avoid a build error when the addresses are not configured. The error was something like: .config:2010:warning: symbol value '' invalid for DEBUG_UART_PHYS .config:2011:warning: symbol value '' invalid for DEBUG_UART_VIRT This patch avoids the problem by removing the respective statements from the defconfig files. Any out of tree defconfig files on the platforms I have changed will have to do the same change or run into the build error above. Any users that have a full .config already set the correct DEBUG_UART_PHYS/VIRT addresses and do not need to change anything. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: 4db22c1 ("ARM: debug-ll: rework integrator/versatile handling") Fixes: f06455f ("ARM: debug-ll: rework ep93xx handling") Fixes: c047f52 ("ARM: debug-ll: reorganize mvebu debug uart config") Fixes: 59bd4c3 ("ARM: debug-ll: rework lpc32xx handling")
Diffstat (limited to 'arch/arm/configs/versatile_defconfig')
-rw-r--r--arch/arm/configs/versatile_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index 01f402ddb1e7..64bef9775bb6 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -82,6 +82,5 @@ CONFIG_MAGIC_SYSRQ=y
CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_UART_PL01X=y
CONFIG_FONTS=y
CONFIG_FONT_ACORN_8x8=y