tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: debug-ll: rework integrator/versatile handling

Enabling one of the integrator platforms in a multiplatform kernel
while trying to use DEBUG_LL for another platform can default to
the wrong UART address, as the options are purely based on the
architecture being enabled or not.

This changes the logic to use the integrator default addresses only
if we have also picked the respective Kconfig symbols introduced
here. Versatile is not yet part of multiplatform, but hopefully
soon will be, so we do the same change for versatile as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 4db22c10 375d84cf

+20 -4
+20 -4
arch/arm/Kconfig.debug
··· 433 433 Say Y here if you want kernel low-level debugging support 434 434 on i.MX7D. 435 435 436 + config DEBUG_INTEGRATOR 437 + bool "Kernel low-level debugging messages via ARM Integrator UART" 438 + depends on ARCH_INTEGRATOR 439 + select DEBUG_UART_PL01X 440 + help 441 + Say Y here if you want kernel low-level debugging support 442 + on ARM Integrator platforms. 443 + 436 444 config DEBUG_KEYSTONE_UART0 437 445 bool "Kernel low-level debugging on KEYSTONE2 using UART0" 438 446 depends on ARCH_KEYSTONE ··· 1145 1137 Say Y here if you want kernel low-level debugging support 1146 1138 for Mediatek mt6589 based platforms on UART0. 1147 1139 1140 + config DEBUG_VERSATILE 1141 + bool "Kernel low-level debugging messages via ARM Versatile UART" 1142 + depends on ARCH_VERSATILE 1143 + select DEBUG_UART_PL01X 1144 + help 1145 + Say Y here if you want kernel low-level debugging support 1146 + on ARM Versatile platforms. 1147 + 1148 1148 config DEBUG_MT8127_UART0 1149 1149 bool "Mediatek mt8127/mt6592 UART0" 1150 1150 depends on ARCH_MEDIATEK ··· 1435 1419 default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT 1436 1420 default 0x10124000 if DEBUG_RK3X_UART0 1437 1421 default 0x10126000 if DEBUG_RK3X_UART1 1438 - default 0x101f1000 if ARCH_VERSATILE 1422 + default 0x101f1000 if DEBUG_VERSATILE 1439 1423 default 0x101fb000 if DEBUG_NOMADIK_UART 1440 1424 default 0x11002000 if DEBUG_MT8127_UART0 1441 1425 default 0x11006000 if DEBUG_MT6589_UART0 1442 1426 default 0x11009000 if DEBUG_MT8135_UART3 1443 - default 0x16000000 if ARCH_INTEGRATOR 1427 + default 0x16000000 if DEBUG_INTEGRATOR 1444 1428 default 0x18000300 if DEBUG_BCM_5301X 1445 1429 default 0x18010000 if DEBUG_SIRFATLAS7_UART0 1446 1430 default 0x18020000 if DEBUG_SIRFATLAS7_UART1 ··· 1536 1520 default 0xf1002000 if DEBUG_MT8127_UART0 1537 1521 default 0xf1006000 if DEBUG_MT6589_UART0 1538 1522 default 0xf1009000 if DEBUG_MT8135_UART3 1539 - default 0xf11f1000 if ARCH_VERSATILE 1540 - default 0xf1600000 if ARCH_INTEGRATOR 1523 + default 0xf11f1000 if DEBUG_VERSATILE 1524 + default 0xf1600000 if DEBUG_INTEGRATOR 1541 1525 default 0xf1c28000 if DEBUG_SUNXI_UART0 1542 1526 default 0xf1c28400 if DEBUG_SUNXI_UART1 1543 1527 default 0xf1f02800 if DEBUG_SUNXI_R_UART