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] 4514/1: S3C: Rename DEBUG_S3C2410_PORT and DEBUG_S3C_UART

Rename DEBUG_S3C2410_PORT to DEBUG_S3C_PORT as well as
DEBUG_S3C2410_UART to DEBUG_S3C_UART as part of the updates
to moving to plat-s3c for S3C base support.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Ben Dooks and committed by Russell King 3ec20520 c7657846

+12 -12
unified split
+8 -8
arch/arm/Kconfig.debug
··· 82 output to the second serial port on these devices. Saying N will 83 cause the debug messages to appear on the first serial port. 84 85 - config DEBUG_S3C2410_PORT 86 - depends on DEBUG_LL && ARCH_S3C2410 87 - bool "Kernel low-level debugging messages via S3C2410 UART" 88 help 89 Say Y here if you want debug print routines to go to one of the 90 - S3C2410 internal UARTs. The chosen UART must have been configured 91 before it is used. 92 93 - config DEBUG_S3C2410_UART 94 - depends on ARCH_S3C2410 95 - int "S3C2410 UART to use for low-level debug" 96 default "0" 97 help 98 - Choice for UART for kernel low-level using S3C2410 UARTS, 99 should be between zero and two. The port must have been 100 initialised by the boot-loader before use. 101
··· 82 output to the second serial port on these devices. Saying N will 83 cause the debug messages to appear on the first serial port. 84 85 + config DEBUG_S3C_PORT 86 + depends on DEBUG_LL && PLAT_S3C 87 + bool "Kernel low-level debugging messages via S3C UART" 88 help 89 Say Y here if you want debug print routines to go to one of the 90 + S3C internal UARTs. The chosen UART must have been configured 91 before it is used. 92 93 + config DEBUG_S3C_UART 94 + depends on PLAT_S3C 95 + int "S3C UART to use for low-level debug" 96 default "0" 97 help 98 + Choice for UART for kernel low-level using S3C UARTS, 99 should be between zero and two. The port must have been 100 initialised by the boot-loader before use. 101
+2 -2
arch/arm/configs/s3c2410_defconfig
··· 1392 # CONFIG_DEBUG_ERRORS is not set 1393 CONFIG_DEBUG_LL=y 1394 # CONFIG_DEBUG_ICEDCC is not set 1395 - CONFIG_DEBUG_S3C2410_PORT=y 1396 - CONFIG_DEBUG_S3C2410_UART=0 1397 1398 # 1399 # Security options
··· 1392 # CONFIG_DEBUG_ERRORS is not set 1393 CONFIG_DEBUG_LL=y 1394 # CONFIG_DEBUG_ICEDCC is not set 1395 + CONFIG_DEBUG_S3C_PORT=y 1396 + CONFIG_DEBUG_S3C_UART=0 1397 1398 # 1399 # Security options
+2 -2
include/asm-arm/arch-s3c2410/debug-macro.S
··· 24 tst \rx, #1 25 ldreq \rx, = S3C24XX_PA_UART 26 ldrne \rx, = S3C24XX_VA_UART 27 - #if CONFIG_DEBUG_S3C2410_UART != 0 28 - add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART) 29 #endif 30 .endm 31
··· 24 tst \rx, #1 25 ldreq \rx, = S3C24XX_PA_UART 26 ldrne \rx, = S3C24XX_VA_UART 27 + #if CONFIG_DEBUG_S3C_UART != 0 28 + add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART) 29 #endif 30 .endm 31