dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[ARM] 4513/1: S3C: Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT 

Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT to be
CONFIG_S3C_LOWLEVEL_UART_PORT as we move to using
plat-s3c for base of S3C operations.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Ben Dooks 2007-07-22 16:11:20 +01:00 committed by Russell King
parent cbc4dbffc8
commit c76578460f
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig.debug
View File

@ -100,6 +100,6 @@ config DEBUG_S3C2410_UART
initialised by the boot-loader before use. initialised by the boot-loader before use.
The uncompressor code port configuration is now handled The uncompressor code port configuration is now handled
by CONFIG_S3C2410_LOWLEVEL_UART_PORT. by CONFIG_S3C_LOWLEVEL_UART_PORT.
endmenu endmenu

2
arch/arm/boot/compressed/head.S
View File

@ -55,7 +55,7 @@
#elif defined(CONFIG_ARCH_S3C2410) #elif defined(CONFIG_ARCH_S3C2410)
.macro loadsp, rb .macro loadsp, rb
mov \rb, #0x50000000 mov \rb, #0x50000000
add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT
.endm .endm
#else #else
.macro loadsp, rb .macro loadsp, rb

2
arch/arm/configs/s3c2410_defconfig
View File

@ -142,7 +142,7 @@ CONFIG_PM_SIMTEC=y
# CONFIG_S3C2410_BOOT_ERROR_RESET is not set # CONFIG_S3C2410_BOOT_ERROR_RESET is not set
# CONFIG_S3C2410_PM_DEBUG is not set # CONFIG_S3C2410_PM_DEBUG is not set
# CONFIG_S3C2410_PM_CHECK is not set # CONFIG_S3C2410_PM_CHECK is not set
CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 CONFIG_S3C_LOWLEVEL_UART_PORT=0
CONFIG_S3C2410_DMA=y CONFIG_S3C2410_DMA=y
# CONFIG_S3C2410_DMA_DEBUG is not set # CONFIG_S3C2410_DMA_DEBUG is not set
CONFIG_MACH_SMDK=y CONFIG_MACH_SMDK=y

4
arch/arm/plat-s3c/Kconfig
View File

@ -93,8 +93,8 @@ config S3C2410_PM_CHECK_CHUNKSIZE
See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
config S3C2410_LOWLEVEL_UART_PORT config S3C_LOWLEVEL_UART_PORT
int "S3C2410 UART to use for low-level messages" int "S3C UART to use for low-level messages"
depends on PLAT_S3C depends on PLAT_S3C
default 0 default 0
help help

2
include/asm-arm/arch-s3c2410/uncompress.h
View File

@ -32,7 +32,7 @@ typedef unsigned int upf_t; /* cannot include linux/serial_core.h */
/* how many bytes we allow into the FIFO at a time in FIFO mode */ /* how many bytes we allow into the FIFO at a time in FIFO mode */
#define FIFO_MAX (14) #define FIFO_MAX (14)
#define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT) #define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C_LOWLEVEL_UART_PORT)
static __inline__ void static __inline__ void
uart_wr(unsigned int reg, unsigned int val) uart_wr(unsigned int reg, unsigned int val)