diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-21 22:18:19 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-23 11:27:08 -0400 |
commit | ba7f4daeea46424f968f697d2012272f14483707 (patch) | |
tree | cd7c904c35cb8405208ae2c40972988ed1b22faa /arch | |
parent | 5435009287d092055e3777addc8d36a7b3e1fa29 (diff) |
ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34
Update the s5p6442_defconfig to the latest kernel version v2.6.34
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/s5p6442_defconfig | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/arch/arm/configs/s5p6442_defconfig b/arch/arm/configs/s5p6442_defconfig index 74e20bfc0487..d7ea27509cf4 100644 --- a/arch/arm/configs/s5p6442_defconfig +++ b/arch/arm/configs/s5p6442_defconfig | |||
@@ -1,11 +1,12 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.33-rc4 | 3 | # Linux kernel version: 2.6.34 |
4 | # Mon Jan 25 08:50:28 2010 | 4 | # Sat May 22 03:18:19 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_HAVE_PROC_CPU=y | ||
9 | CONFIG_NO_IOPORT=y | 10 | CONFIG_NO_IOPORT=y |
10 | CONFIG_GENERIC_HARDIRQS=y | 11 | CONFIG_GENERIC_HARDIRQS=y |
11 | CONFIG_STACKTRACE_SUPPORT=y | 12 | CONFIG_STACKTRACE_SUPPORT=y |
@@ -17,6 +18,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
17 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 18 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
18 | CONFIG_GENERIC_HWEIGHT=y | 19 | CONFIG_GENERIC_HWEIGHT=y |
19 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 20 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
21 | CONFIG_NEED_DMA_MAP_STATE=y | ||
20 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | 22 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y |
21 | CONFIG_VECTORS_BASE=0xffff0000 | 23 | CONFIG_VECTORS_BASE=0xffff0000 |
22 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -52,7 +54,6 @@ CONFIG_RCU_FANOUT=32 | |||
52 | # CONFIG_TREE_RCU_TRACE is not set | 54 | # CONFIG_TREE_RCU_TRACE is not set |
53 | # CONFIG_IKCONFIG is not set | 55 | # CONFIG_IKCONFIG is not set |
54 | CONFIG_LOG_BUF_SHIFT=17 | 56 | CONFIG_LOG_BUF_SHIFT=17 |
55 | # CONFIG_GROUP_SCHED is not set | ||
56 | # CONFIG_CGROUPS is not set | 57 | # CONFIG_CGROUPS is not set |
57 | CONFIG_SYSFS_DEPRECATED=y | 58 | CONFIG_SYSFS_DEPRECATED=y |
58 | CONFIG_SYSFS_DEPRECATED_V2=y | 59 | CONFIG_SYSFS_DEPRECATED_V2=y |
@@ -88,10 +89,14 @@ CONFIG_TIMERFD=y | |||
88 | CONFIG_EVENTFD=y | 89 | CONFIG_EVENTFD=y |
89 | CONFIG_SHMEM=y | 90 | CONFIG_SHMEM=y |
90 | CONFIG_AIO=y | 91 | CONFIG_AIO=y |
92 | CONFIG_HAVE_PERF_EVENTS=y | ||
93 | CONFIG_PERF_USE_VMALLOC=y | ||
91 | 94 | ||
92 | # | 95 | # |
93 | # Kernel Performance Events And Counters | 96 | # Kernel Performance Events And Counters |
94 | # | 97 | # |
98 | # CONFIG_PERF_EVENTS is not set | ||
99 | # CONFIG_PERF_COUNTERS is not set | ||
95 | CONFIG_VM_EVENT_COUNTERS=y | 100 | CONFIG_VM_EVENT_COUNTERS=y |
96 | CONFIG_SLUB_DEBUG=y | 101 | CONFIG_SLUB_DEBUG=y |
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
@@ -174,6 +179,7 @@ CONFIG_MMU=y | |||
174 | # CONFIG_ARCH_REALVIEW is not set | 179 | # CONFIG_ARCH_REALVIEW is not set |
175 | # CONFIG_ARCH_VERSATILE is not set | 180 | # CONFIG_ARCH_VERSATILE is not set |
176 | # CONFIG_ARCH_AT91 is not set | 181 | # CONFIG_ARCH_AT91 is not set |
182 | # CONFIG_ARCH_BCMRING is not set | ||
177 | # CONFIG_ARCH_CLPS711X is not set | 183 | # CONFIG_ARCH_CLPS711X is not set |
178 | # CONFIG_ARCH_GEMINI is not set | 184 | # CONFIG_ARCH_GEMINI is not set |
179 | # CONFIG_ARCH_EBSA110 is not set | 185 | # CONFIG_ARCH_EBSA110 is not set |
@@ -183,7 +189,6 @@ CONFIG_MMU=y | |||
183 | # CONFIG_ARCH_STMP3XXX is not set | 189 | # CONFIG_ARCH_STMP3XXX is not set |
184 | # CONFIG_ARCH_NETX is not set | 190 | # CONFIG_ARCH_NETX is not set |
185 | # CONFIG_ARCH_H720X is not set | 191 | # CONFIG_ARCH_H720X is not set |
186 | # CONFIG_ARCH_NOMADIK is not set | ||
187 | # CONFIG_ARCH_IOP13XX is not set | 192 | # CONFIG_ARCH_IOP13XX is not set |
188 | # CONFIG_ARCH_IOP32X is not set | 193 | # CONFIG_ARCH_IOP32X is not set |
189 | # CONFIG_ARCH_IOP33X is not set | 194 | # CONFIG_ARCH_IOP33X is not set |
@@ -200,9 +205,11 @@ CONFIG_MMU=y | |||
200 | # CONFIG_ARCH_KS8695 is not set | 205 | # CONFIG_ARCH_KS8695 is not set |
201 | # CONFIG_ARCH_NS9XXX is not set | 206 | # CONFIG_ARCH_NS9XXX is not set |
202 | # CONFIG_ARCH_W90X900 is not set | 207 | # CONFIG_ARCH_W90X900 is not set |
208 | # CONFIG_ARCH_NUC93X is not set | ||
203 | # CONFIG_ARCH_PNX4008 is not set | 209 | # CONFIG_ARCH_PNX4008 is not set |
204 | # CONFIG_ARCH_PXA is not set | 210 | # CONFIG_ARCH_PXA is not set |
205 | # CONFIG_ARCH_MSM is not set | 211 | # CONFIG_ARCH_MSM is not set |
212 | # CONFIG_ARCH_SHMOBILE is not set | ||
206 | # CONFIG_ARCH_RPC is not set | 213 | # CONFIG_ARCH_RPC is not set |
207 | # CONFIG_ARCH_SA1100 is not set | 214 | # CONFIG_ARCH_SA1100 is not set |
208 | # CONFIG_ARCH_S3C2410 is not set | 215 | # CONFIG_ARCH_S3C2410 is not set |
@@ -210,14 +217,22 @@ CONFIG_MMU=y | |||
210 | # CONFIG_ARCH_S5P6440 is not set | 217 | # CONFIG_ARCH_S5P6440 is not set |
211 | CONFIG_ARCH_S5P6442=y | 218 | CONFIG_ARCH_S5P6442=y |
212 | # CONFIG_ARCH_S5PC1XX is not set | 219 | # CONFIG_ARCH_S5PC1XX is not set |
220 | # CONFIG_ARCH_S5PV210 is not set | ||
213 | # CONFIG_ARCH_SHARK is not set | 221 | # CONFIG_ARCH_SHARK is not set |
214 | # CONFIG_ARCH_LH7A40X is not set | 222 | # CONFIG_ARCH_LH7A40X is not set |
215 | # CONFIG_ARCH_U300 is not set | 223 | # CONFIG_ARCH_U300 is not set |
224 | # CONFIG_ARCH_U8500 is not set | ||
225 | # CONFIG_ARCH_NOMADIK is not set | ||
216 | # CONFIG_ARCH_DAVINCI is not set | 226 | # CONFIG_ARCH_DAVINCI is not set |
217 | # CONFIG_ARCH_OMAP is not set | 227 | # CONFIG_ARCH_OMAP is not set |
218 | # CONFIG_ARCH_BCMRING is not set | ||
219 | # CONFIG_ARCH_U8500 is not set | ||
220 | CONFIG_PLAT_SAMSUNG=y | 228 | CONFIG_PLAT_SAMSUNG=y |
229 | |||
230 | # | ||
231 | # Boot options | ||
232 | # | ||
233 | # CONFIG_S3C_BOOT_ERROR_RESET is not set | ||
234 | CONFIG_S3C_BOOT_UART_FORCE_FIFO=y | ||
235 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 | ||
221 | CONFIG_SAMSUNG_CLKSRC=y | 236 | CONFIG_SAMSUNG_CLKSRC=y |
222 | CONFIG_SAMSUNG_IRQ_VIC_TIMER=y | 237 | CONFIG_SAMSUNG_IRQ_VIC_TIMER=y |
223 | CONFIG_SAMSUNG_IRQ_UART=y | 238 | CONFIG_SAMSUNG_IRQ_UART=y |
@@ -226,21 +241,13 @@ CONFIG_S3C_GPIO_CFG_S3C24XX=y | |||
226 | CONFIG_S3C_GPIO_CFG_S3C64XX=y | 241 | CONFIG_S3C_GPIO_CFG_S3C64XX=y |
227 | CONFIG_S3C_GPIO_PULL_UPDOWN=y | 242 | CONFIG_S3C_GPIO_PULL_UPDOWN=y |
228 | CONFIG_SAMSUNG_GPIO_EXTRA=0 | 243 | CONFIG_SAMSUNG_GPIO_EXTRA=0 |
244 | CONFIG_S3C_GPIO_SPACE=0 | ||
245 | CONFIG_S3C_GPIO_TRACK=y | ||
229 | # CONFIG_S3C_ADC is not set | 246 | # CONFIG_S3C_ADC is not set |
230 | 247 | ||
231 | # | 248 | # |
232 | # Power management | 249 | # Power management |
233 | # | 250 | # |
234 | CONFIG_PLAT_S3C=y | ||
235 | |||
236 | # | ||
237 | # Boot options | ||
238 | # | ||
239 | # CONFIG_S3C_BOOT_ERROR_RESET is not set | ||
240 | CONFIG_S3C_BOOT_UART_FORCE_FIFO=y | ||
241 | CONFIG_S3C_LOWLEVEL_UART_PORT=1 | ||
242 | CONFIG_S3C_GPIO_SPACE=0 | ||
243 | CONFIG_S3C_GPIO_TRACK=y | ||
244 | CONFIG_PLAT_S5P=y | 251 | CONFIG_PLAT_S5P=y |
245 | CONFIG_CPU_S5P6442=y | 252 | CONFIG_CPU_S5P6442=y |
246 | CONFIG_MACH_SMDK6442=y | 253 | CONFIG_MACH_SMDK6442=y |
@@ -269,6 +276,7 @@ CONFIG_ARM_THUMB=y | |||
269 | # CONFIG_CPU_DCACHE_DISABLE is not set | 276 | # CONFIG_CPU_DCACHE_DISABLE is not set |
270 | # CONFIG_CPU_BPREDICT_DISABLE is not set | 277 | # CONFIG_CPU_BPREDICT_DISABLE is not set |
271 | CONFIG_ARM_L1_CACHE_SHIFT=5 | 278 | CONFIG_ARM_L1_CACHE_SHIFT=5 |
279 | CONFIG_CPU_HAS_PMU=y | ||
272 | # CONFIG_ARM_ERRATA_411920 is not set | 280 | # CONFIG_ARM_ERRATA_411920 is not set |
273 | CONFIG_ARM_VIC=y | 281 | CONFIG_ARM_VIC=y |
274 | CONFIG_ARM_VIC_NR=2 | 282 | CONFIG_ARM_VIC_NR=2 |
@@ -394,6 +402,7 @@ CONFIG_HAVE_IDE=y | |||
394 | # | 402 | # |
395 | # SCSI device support | 403 | # SCSI device support |
396 | # | 404 | # |
405 | CONFIG_SCSI_MOD=y | ||
397 | # CONFIG_RAID_ATTRS is not set | 406 | # CONFIG_RAID_ATTRS is not set |
398 | CONFIG_SCSI=y | 407 | CONFIG_SCSI=y |
399 | CONFIG_SCSI_DMA=y | 408 | CONFIG_SCSI_DMA=y |
@@ -515,6 +524,7 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y | |||
515 | CONFIG_SERIAL_S5PV210=y | 524 | CONFIG_SERIAL_S5PV210=y |
516 | CONFIG_SERIAL_CORE=y | 525 | CONFIG_SERIAL_CORE=y |
517 | CONFIG_SERIAL_CORE_CONSOLE=y | 526 | CONFIG_SERIAL_CORE_CONSOLE=y |
527 | # CONFIG_SERIAL_TIMBERDALE is not set | ||
518 | CONFIG_UNIX98_PTYS=y | 528 | CONFIG_UNIX98_PTYS=y |
519 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 529 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
520 | CONFIG_LEGACY_PTYS=y | 530 | CONFIG_LEGACY_PTYS=y |
@@ -540,6 +550,7 @@ CONFIG_GPIOLIB=y | |||
540 | # | 550 | # |
541 | # Memory mapped GPIO expanders: | 551 | # Memory mapped GPIO expanders: |
542 | # | 552 | # |
553 | # CONFIG_GPIO_IT8761E is not set | ||
543 | 554 | ||
544 | # | 555 | # |
545 | # I2C GPIO expanders: | 556 | # I2C GPIO expanders: |
@@ -685,6 +696,7 @@ CONFIG_MISC_FILESYSTEMS=y | |||
685 | # CONFIG_BEFS_FS is not set | 696 | # CONFIG_BEFS_FS is not set |
686 | # CONFIG_BFS_FS is not set | 697 | # CONFIG_BFS_FS is not set |
687 | # CONFIG_EFS_FS is not set | 698 | # CONFIG_EFS_FS is not set |
699 | # CONFIG_LOGFS is not set | ||
688 | CONFIG_CRAMFS=y | 700 | CONFIG_CRAMFS=y |
689 | # CONFIG_SQUASHFS is not set | 701 | # CONFIG_SQUASHFS is not set |
690 | # CONFIG_VXFS_FS is not set | 702 | # CONFIG_VXFS_FS is not set |