diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-04-15 10:02:47 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-04-15 10:02:47 -0400 |
commit | 2ba4d47210354e5595ceb4464525b5ae7cff3774 (patch) | |
tree | b64f7b97388eabe42c58fde3a0ec1c5b4c61115f /arch/arm | |
parent | 7fa6bed89af1ddb14511fddc47133e574d92dcb2 (diff) |
[ARM] s3c2410_defconfig: Update machine configuration
Update the machine configuration of s3c2410_defconfig to
add support for newer machines, and update the s3c24xx
specific options.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 5b92cae6155..e347de13467 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # Linux kernel version: 2.6.30-rc2 | 3 | # Linux kernel version: 2.6.30-rc2 |
4 | # | 4 | # |
5 | CONFIG_ARM=y | 5 | CONFIG_ARM=y |
6 | CONFIG_HAVE_PWM=y | ||
6 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
7 | CONFIG_GENERIC_GPIO=y | 8 | CONFIG_GENERIC_GPIO=y |
8 | # CONFIG_GENERIC_TIME is not set | 9 | # CONFIG_GENERIC_TIME is not set |
@@ -179,14 +180,14 @@ CONFIG_PLAT_S3C24XX=y | |||
179 | CONFIG_S3C2410_CLOCK=y | 180 | CONFIG_S3C2410_CLOCK=y |
180 | CONFIG_S3C24XX_DCLK=y | 181 | CONFIG_S3C24XX_DCLK=y |
181 | CONFIG_CPU_S3C244X=y | 182 | CONFIG_CPU_S3C244X=y |
182 | # CONFIG_S3C24XX_PWM is not set | 183 | CONFIG_S3C24XX_PWM=y |
183 | CONFIG_S3C24XX_GPIO_EXTRA=128 | 184 | CONFIG_S3C24XX_GPIO_EXTRA=128 |
184 | CONFIG_S3C24XX_GPIO_EXTRA64=y | 185 | CONFIG_S3C24XX_GPIO_EXTRA64=y |
185 | CONFIG_S3C24XX_GPIO_EXTRA128=y | 186 | CONFIG_S3C24XX_GPIO_EXTRA128=y |
186 | CONFIG_PM_SIMTEC=y | 187 | CONFIG_PM_SIMTEC=y |
187 | CONFIG_S3C2410_DMA=y | 188 | CONFIG_S3C2410_DMA=y |
188 | # CONFIG_S3C2410_DMA_DEBUG is not set | 189 | # CONFIG_S3C2410_DMA_DEBUG is not set |
189 | # CONFIG_S3C24XX_ADC is not set | 190 | CONFIG_S3C24XX_ADC=y |
190 | CONFIG_MACH_SMDK=y | 191 | CONFIG_MACH_SMDK=y |
191 | CONFIG_PLAT_S3C=y | 192 | CONFIG_PLAT_S3C=y |
192 | CONFIG_CPU_LLSERIAL_S3C2410=y | 193 | CONFIG_CPU_LLSERIAL_S3C2410=y |
@@ -196,7 +197,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y | |||
196 | # Boot options | 197 | # Boot options |
197 | # | 198 | # |
198 | # CONFIG_S3C_BOOT_WATCHDOG is not set | 199 | # CONFIG_S3C_BOOT_WATCHDOG is not set |
199 | # CONFIG_S3C_BOOT_ERROR_RESET is not set | 200 | CONFIG_S3C_BOOT_ERROR_RESET=y |
200 | CONFIG_S3C_BOOT_UART_FORCE_FIFO=y | 201 | CONFIG_S3C_BOOT_UART_FORCE_FIFO=y |
201 | 202 | ||
202 | # | 203 | # |
@@ -229,7 +230,7 @@ CONFIG_ARCH_BAST=y | |||
229 | CONFIG_MACH_OTOM=y | 230 | CONFIG_MACH_OTOM=y |
230 | CONFIG_MACH_AML_M5900=y | 231 | CONFIG_MACH_AML_M5900=y |
231 | CONFIG_BAST_PC104_IRQ=y | 232 | CONFIG_BAST_PC104_IRQ=y |
232 | # CONFIG_MACH_TCT_HAMMER is not set | 233 | CONFIG_MACH_TCT_HAMMER=y |
233 | CONFIG_MACH_VR1000=y | 234 | CONFIG_MACH_VR1000=y |
234 | CONFIG_MACH_QT2410=y | 235 | CONFIG_MACH_QT2410=y |
235 | CONFIG_CPU_S3C2412=y | 236 | CONFIG_CPU_S3C2412=y |
@@ -239,10 +240,11 @@ CONFIG_S3C2412_PM=y | |||
239 | # | 240 | # |
240 | # S3C2412 Machines | 241 | # S3C2412 Machines |
241 | # | 242 | # |
242 | # CONFIG_MACH_JIVE is not set | 243 | CONFIG_MACH_JIVE=y |
244 | # CONFIG_MACH_JIVE_SHOW_BOOTLOADER is not set | ||
243 | CONFIG_MACH_SMDK2413=y | 245 | CONFIG_MACH_SMDK2413=y |
244 | CONFIG_MACH_S3C2413=y | 246 | CONFIG_MACH_S3C2413=y |
245 | # CONFIG_MACH_SMDK2412 is not set | 247 | CONFIG_MACH_SMDK2412=y |
246 | CONFIG_MACH_VSTMS=y | 248 | CONFIG_MACH_VSTMS=y |
247 | CONFIG_CPU_S3C2440=y | 249 | CONFIG_CPU_S3C2440=y |
248 | CONFIG_S3C2440_DMA=y | 250 | CONFIG_S3C2440_DMA=y |
@@ -256,7 +258,7 @@ CONFIG_MACH_RX3715=y | |||
256 | CONFIG_ARCH_S3C2440=y | 258 | CONFIG_ARCH_S3C2440=y |
257 | CONFIG_MACH_NEXCODER_2440=y | 259 | CONFIG_MACH_NEXCODER_2440=y |
258 | CONFIG_SMDK2440_CPU2440=y | 260 | CONFIG_SMDK2440_CPU2440=y |
259 | # CONFIG_MACH_AT2440EVB is not set | 261 | CONFIG_MACH_AT2440EVB=y |
260 | CONFIG_CPU_S3C2442=y | 262 | CONFIG_CPU_S3C2442=y |
261 | 263 | ||
262 | # | 264 | # |
@@ -402,8 +404,6 @@ CONFIG_NET_KEY=m | |||
402 | CONFIG_INET=y | 404 | CONFIG_INET=y |
403 | CONFIG_IP_MULTICAST=y | 405 | CONFIG_IP_MULTICAST=y |
404 | # CONFIG_IP_ADVANCED_ROUTER is not set | 406 | # CONFIG_IP_ADVANCED_ROUTER is not set |
405 | # CONFIG_ASK_IP_FIB_HASH is not set | ||
406 | # CONFIG_IP_FIB_TRIE is not set | ||
407 | CONFIG_IP_FIB_HASH=y | 407 | CONFIG_IP_FIB_HASH=y |
408 | CONFIG_IP_PNP=y | 408 | CONFIG_IP_PNP=y |
409 | CONFIG_IP_PNP_DHCP=y | 409 | CONFIG_IP_PNP_DHCP=y |
@@ -1612,6 +1612,7 @@ CONFIG_LEDS_H1940=m | |||
1612 | # CONFIG_LEDS_LP5521 is not set | 1612 | # CONFIG_LEDS_LP5521 is not set |
1613 | # CONFIG_LEDS_PCA955X is not set | 1613 | # CONFIG_LEDS_PCA955X is not set |
1614 | # CONFIG_LEDS_DAC124S085 is not set | 1614 | # CONFIG_LEDS_DAC124S085 is not set |
1615 | # CONFIG_LEDS_PWM is not set | ||
1615 | # CONFIG_LEDS_BD2802 is not set | 1616 | # CONFIG_LEDS_BD2802 is not set |
1616 | 1617 | ||
1617 | # | 1618 | # |