diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-26 06:04:34 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-26 06:04:34 -0400 |
| commit | dfd820314be39aa0bacd3a968f361f76c3c594f3 (patch) | |
| tree | 19ddaf29e7bf5922f1b27a33e403c2a5f1af865b | |
| parent | d51843ef190aed188d72e228fc8d1ae378b662cd (diff) | |
ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-git
Update the s5p6442_defconfig to the latest kernel version v2.6.34-git
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/configs/s5p6442_defconfig | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/arch/arm/configs/s5p6442_defconfig b/arch/arm/configs/s5p6442_defconfig index d7ea27509cf4..068219b360f5 100644 --- a/arch/arm/configs/s5p6442_defconfig +++ b/arch/arm/configs/s5p6442_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:19 2010 | 4 | # Wed May 26 19:04:34 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 is not set | 222 | # CONFIG_ARCH_S5P6440 is not set |
| 218 | CONFIG_ARCH_S5P6442=y | 223 | CONFIG_ARCH_S5P6442=y |
| 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_S5P6442=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,12 @@ 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_PL330_DMA=y | ||
| 247 | 255 | ||
| 248 | # | 256 | # |
| 249 | # Power management | 257 | # Power management |
| @@ -276,10 +284,12 @@ CONFIG_ARM_THUMB=y | |||
| 276 | # CONFIG_CPU_DCACHE_DISABLE is not set | 284 | # CONFIG_CPU_DCACHE_DISABLE is not set |
| 277 | # CONFIG_CPU_BPREDICT_DISABLE is not set | 285 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
| 278 | CONFIG_ARM_L1_CACHE_SHIFT=5 | 286 | CONFIG_ARM_L1_CACHE_SHIFT=5 |
| 287 | CONFIG_ARM_DMA_MEM_BUFFERABLE=y | ||
| 279 | CONFIG_CPU_HAS_PMU=y | 288 | CONFIG_CPU_HAS_PMU=y |
| 280 | # CONFIG_ARM_ERRATA_411920 is not set | 289 | # CONFIG_ARM_ERRATA_411920 is not set |
| 281 | CONFIG_ARM_VIC=y | 290 | CONFIG_ARM_VIC=y |
| 282 | CONFIG_ARM_VIC_NR=2 | 291 | CONFIG_ARM_VIC_NR=2 |
| 292 | CONFIG_PL330=y | ||
| 283 | 293 | ||
| 284 | # | 294 | # |
| 285 | # Bus support | 295 | # Bus support |
| @@ -326,6 +336,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
| 326 | CONFIG_ZBOOT_ROM_TEXT=0 | 336 | CONFIG_ZBOOT_ROM_TEXT=0 |
| 327 | CONFIG_ZBOOT_ROM_BSS=0 | 337 | CONFIG_ZBOOT_ROM_BSS=0 |
| 328 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" | 338 | CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x20800000,8M console=ttySAC1,115200 init=/linuxrc" |
| 339 | # CONFIG_CMDLINE_FORCE is not set | ||
| 329 | # CONFIG_XIP_KERNEL is not set | 340 | # CONFIG_XIP_KERNEL is not set |
| 330 | # CONFIG_KEXEC is not set | 341 | # CONFIG_KEXEC is not set |
| 331 | 342 | ||
| @@ -471,6 +482,7 @@ CONFIG_INPUT_EVDEV=y | |||
| 471 | CONFIG_INPUT_TOUCHSCREEN=y | 482 | CONFIG_INPUT_TOUCHSCREEN=y |
| 472 | # CONFIG_TOUCHSCREEN_AD7879 is not set | 483 | # CONFIG_TOUCHSCREEN_AD7879 is not set |
| 473 | # CONFIG_TOUCHSCREEN_DYNAPRO is not set | 484 | # CONFIG_TOUCHSCREEN_DYNAPRO is not set |
| 485 | # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set | ||
| 474 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | 486 | # CONFIG_TOUCHSCREEN_FUJITSU is not set |
| 475 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 487 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
| 476 | # CONFIG_TOUCHSCREEN_ELO is not set | 488 | # CONFIG_TOUCHSCREEN_ELO is not set |
| @@ -525,6 +537,8 @@ CONFIG_SERIAL_S5PV210=y | |||
| 525 | CONFIG_SERIAL_CORE=y | 537 | CONFIG_SERIAL_CORE=y |
| 526 | CONFIG_SERIAL_CORE_CONSOLE=y | 538 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 527 | # CONFIG_SERIAL_TIMBERDALE is not set | 539 | # CONFIG_SERIAL_TIMBERDALE is not set |
| 540 | # CONFIG_SERIAL_ALTERA_JTAGUART is not set | ||
| 541 | # CONFIG_SERIAL_ALTERA_UART is not set | ||
| 528 | CONFIG_UNIX98_PTYS=y | 542 | CONFIG_UNIX98_PTYS=y |
| 529 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 543 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
| 530 | CONFIG_LEGACY_PTYS=y | 544 | CONFIG_LEGACY_PTYS=y |
| @@ -624,10 +638,6 @@ CONFIG_RTC_LIB=y | |||
| 624 | # CONFIG_DMADEVICES is not set | 638 | # CONFIG_DMADEVICES is not set |
| 625 | # CONFIG_AUXDISPLAY is not set | 639 | # CONFIG_AUXDISPLAY is not set |
| 626 | # CONFIG_UIO is not set | 640 | # CONFIG_UIO is not set |
| 627 | |||
| 628 | # | ||
| 629 | # TI VLYNQ | ||
| 630 | # | ||
| 631 | # CONFIG_STAGING is not set | 641 | # CONFIG_STAGING is not set |
| 632 | 642 | ||
| 633 | # | 643 | # |
| @@ -836,6 +846,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y | |||
| 836 | CONFIG_TRACING_SUPPORT=y | 846 | CONFIG_TRACING_SUPPORT=y |
| 837 | CONFIG_FTRACE=y | 847 | CONFIG_FTRACE=y |
| 838 | # CONFIG_FUNCTION_TRACER is not set | 848 | # CONFIG_FUNCTION_TRACER is not set |
| 849 | # CONFIG_IRQSOFF_TRACER is not set | ||
| 839 | # CONFIG_SCHED_TRACER is not set | 850 | # CONFIG_SCHED_TRACER is not set |
| 840 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set | 851 | # CONFIG_ENABLE_DEFAULT_TRACERS is not set |
| 841 | # CONFIG_BOOT_TRACER is not set | 852 | # CONFIG_BOOT_TRACER is not set |
| @@ -846,6 +857,7 @@ CONFIG_BRANCH_PROFILE_NONE=y | |||
| 846 | # CONFIG_KMEMTRACE is not set | 857 | # CONFIG_KMEMTRACE is not set |
| 847 | # CONFIG_WORKQUEUE_TRACER is not set | 858 | # CONFIG_WORKQUEUE_TRACER is not set |
| 848 | # CONFIG_BLK_DEV_IO_TRACE is not set | 859 | # CONFIG_BLK_DEV_IO_TRACE is not set |
| 860 | # CONFIG_ATOMIC64_SELFTEST is not set | ||
| 849 | # CONFIG_SAMPLES is not set | 861 | # CONFIG_SAMPLES is not set |
| 850 | CONFIG_HAVE_ARCH_KGDB=y | 862 | CONFIG_HAVE_ARCH_KGDB=y |
| 851 | # CONFIG_KGDB is not set | 863 | # CONFIG_KGDB is not set |
