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

[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
...@@ -82,20 +82,20 @@ config DEBUG_CLPS711X_UART2 ...@@ -82,20 +82,20 @@ config DEBUG_CLPS711X_UART2
output to the second serial port on these devices. Saying N will output to the second serial port on these devices. Saying N will
cause the debug messages to appear on the first serial port. cause the debug messages to appear on the first serial port.
config DEBUG_S3C2410_PORT config DEBUG_S3C_PORT
depends on DEBUG_LL && ARCH_S3C2410 depends on DEBUG_LL && PLAT_S3C
bool "Kernel low-level debugging messages via S3C2410 UART" bool "Kernel low-level debugging messages via S3C UART"
help help
Say Y here if you want debug print routines to go to one of the 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. before it is used.
config DEBUG_S3C2410_UART config DEBUG_S3C_UART
depends on ARCH_S3C2410 depends on PLAT_S3C
int "S3C2410 UART to use for low-level debug" int "S3C UART to use for low-level debug"
default "0" default "0"
help 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 should be between zero and two. The port must have been
initialised by the boot-loader before use. initialised by the boot-loader before use.
......
...@@ -1392,8 +1392,8 @@ CONFIG_DEBUG_USER=y ...@@ -1392,8 +1392,8 @@ CONFIG_DEBUG_USER=y
# CONFIG_DEBUG_ERRORS is not set # CONFIG_DEBUG_ERRORS is not set
CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL=y
# CONFIG_DEBUG_ICEDCC is not set # CONFIG_DEBUG_ICEDCC is not set
CONFIG_DEBUG_S3C2410_PORT=y CONFIG_DEBUG_S3C_PORT=y
CONFIG_DEBUG_S3C2410_UART=0 CONFIG_DEBUG_S3C_UART=0
# #
# Security options # Security options
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
tst \rx, #1 tst \rx, #1
ldreq \rx, = S3C24XX_PA_UART ldreq \rx, = S3C24XX_PA_UART
ldrne \rx, = S3C24XX_VA_UART ldrne \rx, = S3C24XX_VA_UART
#if CONFIG_DEBUG_S3C2410_UART != 0 #if CONFIG_DEBUG_S3C_UART != 0
add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C2410_UART) add \rx, \rx, #(S3C2410_UART1_OFF * CONFIG_DEBUG_S3C_UART)
#endif #endif
.endm .endm
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment