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

ARM: debug-ll: rework footbridge handling

Footbridge has two debug ports that are handled a bit differently:

The 8250 port uses the normal debug/8250.S implementation that is shared
with a lot of other platforms, but it relies on the DEBUG_UART_8250
option to be turned on automatically instead of being selected by
DEBUG_FOOTBRIDGE_COM1 as we do for most other platforms. I'm changing
this to use a 'select' and change the dependency to the debug symbol
rather than the platform symbol for consistency.

The DC21285 UART has a separate top-level option, and relies on
the traditional include/mach/debug-macro.S method. With the s3c64xx
multiplatform series queued up for 4.5, it is now the last one that does
this, so by moving this file to include/debug/dc21285.S, we can get
all platforms to do things the same way.

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

+7 -5
+7 -5
arch/arm/Kconfig.debug
··· 274 274 config DEBUG_FOOTBRIDGE_COM1 275 275 bool "Kernel low-level debugging messages via footbridge 8250 at PCI COM1" 276 276 depends on FOOTBRIDGE 277 + select DEBUG_UART_8250 277 278 help 278 279 Say Y here if you want the debug print routines to direct 279 280 their output to the 8250 at PCI COM1. ··· 1375 1374 default "debug/at91.S" if DEBUG_AT91_UART 1376 1375 default "debug/asm9260.S" if DEBUG_ASM9260_UART 1377 1376 default "debug/clps711x.S" if DEBUG_CLPS711X_UART1 || DEBUG_CLPS711X_UART2 1377 + default "debug/dc21285.S" if DEBUG_DC21285_PORT 1378 1378 default "debug/meson.S" if DEBUG_MESON_UARTAO 1379 1379 default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X 1380 1380 default "debug/exynos.S" if DEBUG_EXYNOS_UART ··· 1426 1424 1427 1425 # Compatibility options for 8250 1428 1426 config DEBUG_UART_8250 1429 - def_bool ARCH_EBSA110 || (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \ 1427 + def_bool ARCH_EBSA110 || \ 1430 1428 ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \ 1431 1429 ARCH_RPC 1432 1430 ··· 1481 1479 default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \ 1482 1480 DEBUG_S3C2410_UART2) 1483 1481 default 0x78000000 if DEBUG_CNS3XXX 1484 - default 0x7c0003f8 if FOOTBRIDGE 1482 + default 0x7c0003f8 if DEBUG_FOOTBRIDGE_COM1 1485 1483 default 0x80010000 if DEBUG_ASM9260_UART 1486 1484 default 0x80070000 if DEBUG_IMX23_UART 1487 1485 default 0x80074000 if DEBUG_IMX28_UART ··· 1612 1610 default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2 1613 1611 default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3 1614 1612 default 0xfedc0000 if DEBUG_EP93XX 1615 - default 0xfee003f8 if FOOTBRIDGE 1613 + default 0xfee003f8 if DEBUG_FOOTBRIDGE_COM1 1616 1614 default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART 1617 1615 default 0xfee82340 if ARCH_IOP13XX 1618 1616 default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN ··· 1635 1633 config DEBUG_UART_8250_SHIFT 1636 1634 int "Register offset shift for the 8250 debug UART" 1637 1635 depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 1638 - default 0 if FOOTBRIDGE || ARCH_IOP32X || DEBUG_BCM_5301X || \ 1636 + default 0 if DEBUG_FOOTBRIDGE_COM1 || ARCH_IOP32X || DEBUG_BCM_5301X || \ 1639 1637 DEBUG_OMAP7XXUART1 || DEBUG_OMAP7XXUART2 || DEBUG_OMAP7XXUART3 1640 1638 default 2 1641 1639 ··· 1655 1653 config DEBUG_UART_8250_FLOW_CONTROL 1656 1654 bool "Enable flow control for 8250 UART" 1657 1655 depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 1658 - default y if ARCH_EBSA110 || FOOTBRIDGE || DEBUG_GEMINI || ARCH_RPC 1656 + default y if ARCH_EBSA110 || DEBUG_FOOTBRIDGE_COM1 || DEBUG_GEMINI || ARCH_RPC 1659 1657 1660 1658 config DEBUG_UNCOMPRESS 1661 1659 bool
arch/arm/mach-footbridge/include/mach/debug-macro.S arch/arm/include/debug/dc21285.S