diff options
author | Ben Dooks <ben-linux@fluff.org> | 2007-07-22 11:11:20 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-22 11:44:32 -0400 |
commit | c76578460f1a0c4b77c33b2e8e295ccdfa893cdc (patch) | |
tree | 7bbc2afbffea1cee400c4dee843af766877e95a4 | |
parent | cbc4dbffc89fbaada94ae7873ad6631a701fd00e (diff) |
[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>
-rw-r--r-- | arch/arm/Kconfig.debug | 2 | ||||
-rw-r--r-- | arch/arm/boot/compressed/head.S | 2 | ||||
-rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c/Kconfig | 4 | ||||
-rw-r--r-- | include/asm-arm/arch-s3c2410/uncompress.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 40c5eb1f55c7..7d067071dc6c 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
@@ -100,6 +100,6 @@ config DEBUG_S3C2410_UART | |||
100 | initialised by the boot-loader before use. | 100 | initialised by the boot-loader before use. |
101 | 101 | ||
102 | The uncompressor code port configuration is now handled | 102 | The uncompressor code port configuration is now handled |
103 | by CONFIG_S3C2410_LOWLEVEL_UART_PORT. | 103 | by CONFIG_S3C_LOWLEVEL_UART_PORT. |
104 | 104 | ||
105 | endmenu | 105 | endmenu |
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index d7fb5ee1637e..b9b03eda70e5 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
@@ -55,7 +55,7 @@ | |||
55 | #elif defined(CONFIG_ARCH_S3C2410) | 55 | #elif defined(CONFIG_ARCH_S3C2410) |
56 | .macro loadsp, rb | 56 | .macro loadsp, rb |
57 | mov \rb, #0x50000000 | 57 | mov \rb, #0x50000000 |
58 | add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT | 58 | add \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT |
59 | .endm | 59 | .endm |
60 | #else | 60 | #else |
61 | .macro loadsp, rb | 61 | .macro loadsp, rb |
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 1d5150e4d6b3..0bdbbe0997f9 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
@@ -142,7 +142,7 @@ CONFIG_PM_SIMTEC=y | |||
142 | # CONFIG_S3C2410_BOOT_ERROR_RESET is not set | 142 | # CONFIG_S3C2410_BOOT_ERROR_RESET is not set |
143 | # CONFIG_S3C2410_PM_DEBUG is not set | 143 | # CONFIG_S3C2410_PM_DEBUG is not set |
144 | # CONFIG_S3C2410_PM_CHECK is not set | 144 | # CONFIG_S3C2410_PM_CHECK is not set |
145 | CONFIG_S3C2410_LOWLEVEL_UART_PORT=0 | 145 | CONFIG_S3C_LOWLEVEL_UART_PORT=0 |
146 | CONFIG_S3C2410_DMA=y | 146 | CONFIG_S3C2410_DMA=y |
147 | # CONFIG_S3C2410_DMA_DEBUG is not set | 147 | # CONFIG_S3C2410_DMA_DEBUG is not set |
148 | CONFIG_MACH_SMDK=y | 148 | CONFIG_MACH_SMDK=y |
diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig index 6c206ab3a1d5..88d797099bf0 100644 --- a/arch/arm/plat-s3c/Kconfig +++ b/arch/arm/plat-s3c/Kconfig | |||
@@ -93,8 +93,8 @@ config S3C2410_PM_CHECK_CHUNKSIZE | |||
93 | 93 | ||
94 | See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> | 94 | See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt> |
95 | 95 | ||
96 | config S3C2410_LOWLEVEL_UART_PORT | 96 | config S3C_LOWLEVEL_UART_PORT |
97 | int "S3C2410 UART to use for low-level messages" | 97 | int "S3C UART to use for low-level messages" |
98 | depends on PLAT_S3C | 98 | depends on PLAT_S3C |
99 | default 0 | 99 | default 0 |
100 | help | 100 | help |
diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/include/asm-arm/arch-s3c2410/uncompress.h index 295c89c8ff2c..d78f3dca7d7e 100644 --- a/include/asm-arm/arch-s3c2410/uncompress.h +++ b/include/asm-arm/arch-s3c2410/uncompress.h | |||
@@ -32,7 +32,7 @@ typedef unsigned int upf_t; /* cannot include linux/serial_core.h */ | |||
32 | /* how many bytes we allow into the FIFO at a time in FIFO mode */ | 32 | /* how many bytes we allow into the FIFO at a time in FIFO mode */ |
33 | #define FIFO_MAX (14) | 33 | #define FIFO_MAX (14) |
34 | 34 | ||
35 | #define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT) | 35 | #define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C_LOWLEVEL_UART_PORT) |
36 | 36 | ||
37 | static __inline__ void | 37 | static __inline__ void |
38 | uart_wr(unsigned int reg, unsigned int val) | 38 | uart_wr(unsigned int reg, unsigned int val) |