Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c76578460f1a0c4b77c33b2e8e295ccdfa893cdc

Authored by Ben Dooks
Committed by Russell King
1 parent cbc4dbffc8

[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>

Showing 5 changed files with 6 additions and 6 deletions Side-by-side Diff

arch/arm/Kconfig.debug
Diff comments   View file @ c765784
... ... @@ -100,7 +100,7 @@
100 100 initialised by the boot-loader before use.
101 101  
102 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 105 endmenu
arch/arm/boot/compressed/head.S
Diff comments   View file @ c765784
... ... @@ -55,7 +55,7 @@
55 55 #elif defined(CONFIG_ARCH_S3C2410)
56 56 .macro loadsp, rb
57 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 59 .endm
60 60 #else
61 61 .macro loadsp, rb
arch/arm/configs/s3c2410_defconfig
Diff comments   View file @ c765784
... ... @@ -142,7 +142,7 @@
142 142 # CONFIG_S3C2410_BOOT_ERROR_RESET is not set
143 143 # CONFIG_S3C2410_PM_DEBUG is not set
144 144 # CONFIG_S3C2410_PM_CHECK is not set
145   -CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
  145 +CONFIG_S3C_LOWLEVEL_UART_PORT=0
146 146 CONFIG_S3C2410_DMA=y
147 147 # CONFIG_S3C2410_DMA_DEBUG is not set
148 148 CONFIG_MACH_SMDK=y
arch/arm/plat-s3c/Kconfig
Diff comments   View file @ c765784
... ... @@ -93,8 +93,8 @@
93 93  
94 94 See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
95 95  
96   -config S3C2410_LOWLEVEL_UART_PORT
97   - int "S3C2410 UART to use for low-level messages"
  96 +config S3C_LOWLEVEL_UART_PORT
  97 + int "S3C UART to use for low-level messages"
98 98 depends on PLAT_S3C
99 99 default 0
100 100 help
include/asm-arm/arch-s3c2410/uncompress.h
Diff comments   View file @ c765784
... ... @@ -32,7 +32,7 @@
32 32 /* how many bytes we allow into the FIFO at a time in FIFO mode */
33 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 37 static __inline__ void
38 38 uart_wr(unsigned int reg, unsigned int val)