diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-26 06:04:32 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-26 06:04:32 -0400 |
commit | d51843ef190aed188d72e228fc8d1ae378b662cd (patch) | |
tree | ac21f102b04795cfce2ff099b3ca6c7a4729544f /arch | |
parent | 4678ffa5023c74d8ccd4c93ed2327af4cc1ef9c7 (diff) |
ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-git
Update the s5p6440_defconfig to the latest kernel version v2.6.34-git
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/s5p6440_defconfig | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/arch/arm/configs/s5p6440_defconfig b/arch/arm/configs/s5p6440_defconfig index 619bfab3ab39..532e987beb4d 100644 --- a/arch/arm/configs/s5p6440_defconfig +++ b/arch/arm/configs/s5p6440_defconfig | |||
@@ -1,11 +1,13 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.34 | 3 | # Linux kernel version: 2.6.34 |
4 | # Sat May 22 03:18:18 2010 | 4 | # Wed May 26 19:04:32 2010 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
8 | CONFIG_GENERIC_GPIO=y | 8 | CONFIG_GENERIC_GPIO=y |
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_ARCH_USES_GETTIMEOFFSET=y | ||
9 | CONFIG_HAVE_PROC_CPU=y | 11 | CONFIG_HAVE_PROC_CPU=y |
10 | CONFIG_NO_IOPORT=y | 12 | CONFIG_NO_IOPORT=y |
11 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
@@ -33,6 +35,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
33 | CONFIG_LOCALVERSION="" | 35 | CONFIG_LOCALVERSION="" |
34 | CONFIG_LOCALVERSION_AUTO=y | 36 | CONFIG_LOCALVERSION_AUTO=y |
35 | CONFIG_HAVE_KERNEL_GZIP=y | 37 | CONFIG_HAVE_KERNEL_GZIP=y |
38 | CONFIG_HAVE_KERNEL_LZMA=y | ||
36 | CONFIG_HAVE_KERNEL_LZO=y | 39 | CONFIG_HAVE_KERNEL_LZO=y |
37 | CONFIG_KERNEL_GZIP=y | 40 | CONFIG_KERNEL_GZIP=y |
38 | # CONFIG_KERNEL_BZIP2 is not set | 41 | # CONFIG_KERNEL_BZIP2 is not set |
@@ -178,9 +181,11 @@ CONFIG_MMU=y | |||
178 | # CONFIG_ARCH_INTEGRATOR is not set | 181 | # CONFIG_ARCH_INTEGRATOR is not set |
179 | # CONFIG_ARCH_REALVIEW is not set | 182 | # CONFIG_ARCH_REALVIEW is not set |
180 | # CONFIG_ARCH_VERSATILE is not set | 183 | # CONFIG_ARCH_VERSATILE is not set |
184 | # CONFIG_ARCH_VEXPRESS is not set | ||
181 | # CONFIG_ARCH_AT91 is not set | 185 | # CONFIG_ARCH_AT91 is not set |
182 | # CONFIG_ARCH_BCMRING is not set | 186 | # CONFIG_ARCH_BCMRING is not set |
183 | # CONFIG_ARCH_CLPS711X is not set | 187 | # CONFIG_ARCH_CLPS711X is not set |
188 | # CONFIG_ARCH_CNS3XXX is not set | ||
184 | # CONFIG_ARCH_GEMINI is not set | 189 | # CONFIG_ARCH_GEMINI is not set |
185 | # CONFIG_ARCH_EBSA110 is not set | 190 | # CONFIG_ARCH_EBSA110 is not set |
186 | # CONFIG_ARCH_EP93XX is not set | 191 | # CONFIG_ARCH_EP93XX is not set |
@@ -216,7 +221,7 @@ CONFIG_MMU=y | |||
216 | # CONFIG_ARCH_S3C64XX is not set | 221 | # CONFIG_ARCH_S3C64XX is not set |
217 | CONFIG_ARCH_S5P6440=y | 222 | CONFIG_ARCH_S5P6440=y |
218 | # CONFIG_ARCH_S5P6442 is not set | 223 | # CONFIG_ARCH_S5P6442 is not set |
219 | # CONFIG_ARCH_S5PC1XX is not set | 224 | # CONFIG_ARCH_S5PC100 is not set |
220 | # CONFIG_ARCH_S5PV210 is not set | 225 | # CONFIG_ARCH_S5PV210 is not set |
221 | # CONFIG_ARCH_SHARK is not set | 226 | # CONFIG_ARCH_SHARK is not set |
222 | # CONFIG_ARCH_LH7A40X is not set | 227 | # CONFIG_ARCH_LH7A40X is not set |
@@ -225,6 +230,7 @@ CONFIG_ARCH_S5P6440=y | |||
225 | # CONFIG_ARCH_NOMADIK is not set | 230 | # CONFIG_ARCH_NOMADIK is not set |
226 | # CONFIG_ARCH_DAVINCI is not set | 231 | # CONFIG_ARCH_DAVINCI is not set |
227 | # CONFIG_ARCH_OMAP is not set | 232 | # CONFIG_ARCH_OMAP is not set |
233 | # CONFIG_PLAT_SPEAR is not set | ||
228 | CONFIG_PLAT_SAMSUNG=y | 234 | CONFIG_PLAT_SAMSUNG=y |
229 | 235 | ||
230 | # | 236 | # |
@@ -240,10 +246,15 @@ CONFIG_SAMSUNG_GPIOLIB_4BIT=y | |||
240 | CONFIG_S3C_GPIO_CFG_S3C24XX=y | 246 | CONFIG_S3C_GPIO_CFG_S3C24XX=y |
241 | CONFIG_S3C_GPIO_CFG_S3C64XX=y | 247 | CONFIG_S3C_GPIO_CFG_S3C64XX=y |
242 | CONFIG_S3C_GPIO_PULL_UPDOWN=y | 248 | CONFIG_S3C_GPIO_PULL_UPDOWN=y |
249 | CONFIG_S5P_GPIO_DRVSTR=y | ||
243 | CONFIG_SAMSUNG_GPIO_EXTRA=0 | 250 | CONFIG_SAMSUNG_GPIO_EXTRA=0 |
244 | CONFIG_S3C_GPIO_SPACE=0 | 251 | CONFIG_S3C_GPIO_SPACE=0 |
245 | CONFIG_S3C_GPIO_TRACK=y | 252 | CONFIG_S3C_GPIO_TRACK=y |
246 | # CONFIG_S3C_ADC is not set | 253 | # CONFIG_S3C_ADC is not set |
254 | CONFIG_S3C_DEV_WDT=y | ||
255 | CONFIG_SAMSUNG_DEV_ADC=y | ||
256 | CONFIG_SAMSUNG_DEV_TS=y | ||
257 | CONFIG_S3C_PL330_DMA=y | ||
247 | 258 | ||
248 | # | 259 | # |
249 | # Power management | 260 | # Power management |
@@ -276,10 +287,12 @@ CONFIG_ARM_THUMB=y | |||
276 | # CONFIG_CPU_DCACHE_DISABLE is not set | 287 | # CONFIG_CPU_DCACHE_DISABLE is not set |
277 | # CONFIG_CPU_BPREDICT_DISABLE is not set | 288 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
278 | CONFIG_ARM_L1_CACHE_SHIFT=5 | 289 | CONFIG_ARM_L1_CACHE_SHIFT=5 |
290 | CONFIG_ARM_DMA_MEM_BUFFERABLE=y | ||
279 | CONFIG_CPU_HAS_PMU=y | 291 | CONFIG_CPU_HAS_PMU=y |
280 | # CONFIG_ARM_ERRATA_411920 is not set | 292 | # CONFIG_ARM_ERRATA_411920 is not set |
281 | CONFIG_ARM_VIC=y | 293 | CONFIG_ARM_VIC=y |
282 | CONFIG_ARM_VIC_NR=2 | 294 | CONFIG_ARM_VIC_NR=2 |
295 | CONFIG_PL330=y | ||
283 | 296 | ||
284 | # | 297 | # |
285 | # Bus support | 298 | # Bus support |
@@ -326,6 +339,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
326 | CONFIG_ZBOOT_ROM_TEXT=0 | 339 | CONFIG_ZBOOT_ROM_TEXT=0 |
327 | CONFIG_ZBOOT_ROM_BSS=0 | 340 | CONFIG_ZBOOT_ROM_BSS=0 |
328 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" | 341 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" |
342 | # CONFIG_CMDLINE_FORCE is not set | ||
329 | # CONFIG_XIP_KERNEL is not set | 343 | # CONFIG_XIP_KERNEL is not set |
330 | # CONFIG_KEXEC is not set | 344 | # CONFIG_KEXEC is not set |
331 | 345 | ||
@@ -490,7 +504,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
490 | CONFIG_INPUT_TOUCHSCREEN=y | 504 | CONFIG_INPUT_TOUCHSCREEN=y |
491 | # CONFIG_TOUCHSCREEN_AD7879 is not set | 505 | # CONFIG_TOUCHSCREEN_AD7879 is not set |
492 | # CONFIG_TOUCHSCREEN_DYNAPRO is not set | 506 | # CONFIG_TOUCHSCREEN_DYNAPRO is not set |
507 | # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set | ||
493 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | 508 | # CONFIG_TOUCHSCREEN_FUJITSU is not set |
509 | # CONFIG_TOUCHSCREEN_S3C2410 is not set | ||
494 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 510 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
495 | # CONFIG_TOUCHSCREEN_ELO is not set | 511 | # CONFIG_TOUCHSCREEN_ELO is not set |
496 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set | 512 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set |
@@ -546,6 +562,8 @@ CONFIG_SERIAL_S3C6400=y | |||
546 | CONFIG_SERIAL_CORE=y | 562 | CONFIG_SERIAL_CORE=y |
547 | CONFIG_SERIAL_CORE_CONSOLE=y | 563 | CONFIG_SERIAL_CORE_CONSOLE=y |
548 | # CONFIG_SERIAL_TIMBERDALE is not set | 564 | # CONFIG_SERIAL_TIMBERDALE is not set |
565 | # CONFIG_SERIAL_ALTERA_JTAGUART is not set | ||
566 | # CONFIG_SERIAL_ALTERA_UART is not set | ||
549 | CONFIG_UNIX98_PTYS=y | 567 | CONFIG_UNIX98_PTYS=y |
550 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 568 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
551 | CONFIG_LEGACY_PTYS=y | 569 | CONFIG_LEGACY_PTYS=y |
@@ -593,6 +611,7 @@ CONFIG_GPIOLIB=y | |||
593 | # CONFIG_HWMON is not set | 611 | # CONFIG_HWMON is not set |
594 | # CONFIG_THERMAL is not set | 612 | # CONFIG_THERMAL is not set |
595 | # CONFIG_WATCHDOG is not set | 613 | # CONFIG_WATCHDOG is not set |
614 | CONFIG_HAVE_S3C2410_WATCHDOG=y | ||
596 | CONFIG_SSB_POSSIBLE=y | 615 | CONFIG_SSB_POSSIBLE=y |
597 | 616 | ||
598 | # | 617 | # |
@@ -649,10 +668,6 @@ CONFIG_RTC_LIB=y | |||
649 | # CONFIG_DMADEVICES is not set | 668 | # CONFIG_DMADEVICES is not set |
650 | # CONFIG_AUXDISPLAY is not set | 669 | # CONFIG_AUXDISPLAY is not set |
651 | # CONFIG_UIO is not set | 670 | # CONFIG_UIO is not set |
652 | |||
653 | # | ||
654 | # TI VLYNQ | ||
655 | # | ||
656 | # CONFIG_STAGING is not set | 671 | # CONFIG_STAGING is not set |
657 | 672 | ||
658 | # | 673 | # |
@@ -850,6 +865,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
850 | CONFIG_TRACING_SUPPORT=y | 865 | CONFIG_TRACING_SUPPORT=y |
851 | CONFIG_FTRACE=y | 866 | CONFIG_FTRACE=y |
852 | # CONFIG_FUNCTION_TRACER is not set | 867 | # CONFIG_FUNCTION_TRACER is not set |
868 | # CONFIG_IRQSOFF_TRACER is not set | ||
853 | # CONFIG_SCHED_TRACER is not set | 869 | # CONFIG_SCHED_TRACER is not set |
854 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set | 870 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
855 | # CONFIG_BOOT_TRACER is not set | 871 | # CONFIG_BOOT_TRACER is not set |
@@ -860,6 +876,7 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
860 | # CONFIG_KMEMTRACE is not set | 876 | # CONFIG_KMEMTRACE is not set |
861 | # CONFIG_WORKQUEUE_TRACER is not set | 877 | # CONFIG_WORKQUEUE_TRACER is not set |
862 | # CONFIG_BLK_DEV_IO_TRACE is not set | 878 | # CONFIG_BLK_DEV_IO_TRACE is not set |
879 | # CONFIG_ATOMIC64_SELFTEST is not set | ||
863 | # CONFIG_SAMPLES is not set | 880 | # CONFIG_SAMPLES is not set |
864 | CONFIG_HAVE_ARCH_KGDB=y | 881 | CONFIG_HAVE_ARCH_KGDB=y |
865 | # CONFIG_KGDB is not set | 882 | # CONFIG_KGDB is not set |