diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-01-29 04:02:17 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-23 20:52:06 -0500 |
commit | 89f1fa080b5dca259c9779bcf81b95a409fdbf5b (patch) | |
tree | 1d8246f9974cabf37239af909b6dc5f7be620c86 /arch/arm/plat-samsung | |
parent | 6c6971dc4e8c23bb61bf309898e1693f9c5c8c24 (diff) |
ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx
Move the Kconfig entries from plat-s3c to plat-samsung and plat-s3c24xx
as necessary. The S3C_BOOT entries and the DMA configuration can go to
plat-samsung. The low-level UART configurations are currently S3C2XX
specific and can go to plat-s3c24xx.
Eliminating plat-s3c from the build process will be submitted seperately.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/Kconfig | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 72da6461db12..93bd89385f59 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig | |||
@@ -13,6 +13,43 @@ config PLAT_SAMSUNG | |||
13 | 13 | ||
14 | if PLAT_SAMSUNG | 14 | if PLAT_SAMSUNG |
15 | 15 | ||
16 | # boot configurations | ||
17 | |||
18 | comment "Boot options" | ||
19 | |||
20 | config S3C_BOOT_WATCHDOG | ||
21 | bool "S3C Initialisation watchdog" | ||
22 | depends on S3C2410_WATCHDOG | ||
23 | help | ||
24 | Say y to enable the watchdog during the kernel decompression | ||
25 | stage. If the kernel fails to uncompress, then the watchdog | ||
26 | will trigger a reset and the system should restart. | ||
27 | |||
28 | config S3C_BOOT_ERROR_RESET | ||
29 | bool "S3C Reboot on decompression error" | ||
30 | help | ||
31 | Say y here to use the watchdog to reset the system if the | ||
32 | kernel decompressor detects an error during decompression. | ||
33 | |||
34 | config S3C_BOOT_UART_FORCE_FIFO | ||
35 | bool "Force UART FIFO on during boot process" | ||
36 | default y | ||
37 | help | ||
38 | Say Y here to force the UART FIFOs on during the kernel | ||
39 | uncompressor | ||
40 | |||
41 | |||
42 | config S3C_LOWLEVEL_UART_PORT | ||
43 | int "S3C UART to use for low-level messages" | ||
44 | default 0 | ||
45 | help | ||
46 | Choice of which UART port to use for the low-level messages, | ||
47 | such as the `Uncompressing...` at start time. The value of | ||
48 | this configuration should be between zero and two. The port | ||
49 | must have been initialised by the boot-loader before use. | ||
50 | |||
51 | # clock options | ||
52 | |||
16 | config SAMSUNG_CLKSRC | 53 | config SAMSUNG_CLKSRC |
17 | bool | 54 | bool |
18 | help | 55 | help |
@@ -81,6 +118,21 @@ config SAMSUNG_GPIO_EXTRA | |||
81 | provides. This allows expanding the GPIO space for use with | 118 | provides. This allows expanding the GPIO space for use with |
82 | GPIO expanders. | 119 | GPIO expanders. |
83 | 120 | ||
121 | config S3C_GPIO_SPACE | ||
122 | int "Space between gpio banks" | ||
123 | default 0 | ||
124 | help | ||
125 | Add a number of spare GPIO entries between each bank for debugging | ||
126 | purposes. This allows any problems where an counter overflows from | ||
127 | one bank to another to be caught, at the expense of using a little | ||
128 | more memory. | ||
129 | |||
130 | config S3C_GPIO_TRACK | ||
131 | bool | ||
132 | help | ||
133 | Internal configuration option to enable the s3c specific gpio | ||
134 | chip tracking if the platform requires it. | ||
135 | |||
84 | # ADC driver | 136 | # ADC driver |
85 | 137 | ||
86 | config S3C_ADC | 138 | config S3C_ADC |
@@ -138,6 +190,13 @@ config S3C64XX_DEV_SPI | |||
138 | Compile in platform device definitions for S3C64XX's type | 190 | Compile in platform device definitions for S3C64XX's type |
139 | SPI controllers. | 191 | SPI controllers. |
140 | 192 | ||
193 | # DMA | ||
194 | |||
195 | config S3C_DMA | ||
196 | bool | ||
197 | help | ||
198 | Internal configuration for S3C DMA core | ||
199 | |||
141 | comment "Power management" | 200 | comment "Power management" |
142 | 201 | ||
143 | config SAMSUNG_PM_DEBUG | 202 | config SAMSUNG_PM_DEBUG |