Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ec20520 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c7657846

arch/arm/Kconfig.debug

+8 −8
Original line number Diff line number Diff line
@@ -82,20 +82,20 @@ config DEBUG_CLPS711X_UART2 
	  output to the second serial port on these devices.  Saying N will

	  cause the debug messages to appear on the first serial port.



config DEBUG_S3C2410_PORT

	depends on DEBUG_LL && ARCH_S3C2410

	bool "Kernel low-level debugging messages via S3C2410 UART"

config DEBUG_S3C_PORT

	depends on DEBUG_LL && PLAT_S3C

	bool "Kernel low-level debugging messages via S3C UART"

	help

	  Say Y here if you want debug print routines to go to one of the

	  S3C2410 internal UARTs. The chosen UART must have been configured

	  S3C internal UARTs. The chosen UART must have been configured

	  before it is used.



config DEBUG_S3C2410_UART

	depends on ARCH_S3C2410

	int "S3C2410 UART to use for low-level debug"

config DEBUG_S3C_UART

	depends on PLAT_S3C

	int "S3C UART to use for low-level debug"

	default "0"

	help

	  Choice for UART for kernel low-level using S3C2410 UARTS,

	  Choice for UART for kernel low-level using S3C UARTS,

	  should be between zero and two. The port must have been

	  initialised by the boot-loader before use.

arch/arm/configs/s3c2410_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -1392,8 +1392,8 @@ CONFIG_DEBUG_USER=y 
# CONFIG_DEBUG_ERRORS is not set

CONFIG_DEBUG_LL=y

# CONFIG_DEBUG_ICEDCC is not set

CONFIG_DEBUG_S3C2410_PORT=y

CONFIG_DEBUG_S3C2410_UART=0

CONFIG_DEBUG_S3C_PORT=y

CONFIG_DEBUG_S3C_UART=0



#

# Security options

include/asm-arm/arch-s3c2410/debug-macro.S

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
		tst	\rx, #1

		ldreq	\rx, = S3C24XX_PA_UART

		ldrne	\rx, = S3C24XX_VA_UART

#if CONFIG_DEBUG_S3C2410_UART != 0

		add	\rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART)

#if CONFIG_DEBUG_S3C_UART != 0

		add	\rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)

#endif

	.endm