diff options
author | Ben Dooks <ben-linux@fluff.org> | 2006-02-08 16:09:07 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-02-08 16:09:07 -0500 |
commit | 29fe3cf384e69cec98b638cae6ad5811705a0f3f (patch) | |
tree | 01d381a70d56aecf9651f650667e66649c26ef90 | |
parent | f6c8965ab8de61e26875d48c9e00a018c44d74f7 (diff) |
[ARM] 3306/1: S3C24XX - update defconfig
Patch from Ben Dooks
Bring s3c2410 defconfig up to date
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 51 |
1 files changed, 38 insertions, 13 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 1964ccd8a71f..6695b07cf1ba 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
@@ -1,11 +1,10 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.16-rc2 |
4 | # Sun Nov 13 17:41:24 2005 | 4 | # Mon Feb 6 11:17:23 2006 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_MMU=y | 7 | CONFIG_MMU=y |
8 | CONFIG_UID16=y | ||
9 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 8 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
10 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 9 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
11 | 10 | ||
@@ -28,27 +27,31 @@ CONFIG_SYSVIPC=y | |||
28 | # CONFIG_BSD_PROCESS_ACCT is not set | 27 | # CONFIG_BSD_PROCESS_ACCT is not set |
29 | CONFIG_SYSCTL=y | 28 | CONFIG_SYSCTL=y |
30 | # CONFIG_AUDIT is not set | 29 | # CONFIG_AUDIT is not set |
31 | # CONFIG_HOTPLUG is not set | ||
32 | CONFIG_KOBJECT_UEVENT=y | ||
33 | # CONFIG_IKCONFIG is not set | 30 | # CONFIG_IKCONFIG is not set |
34 | CONFIG_INITRAMFS_SOURCE="" | 31 | CONFIG_INITRAMFS_SOURCE="" |
32 | CONFIG_UID16=y | ||
33 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
35 | # CONFIG_EMBEDDED is not set | 34 | # CONFIG_EMBEDDED is not set |
36 | CONFIG_KALLSYMS=y | 35 | CONFIG_KALLSYMS=y |
37 | # CONFIG_KALLSYMS_ALL is not set | 36 | # CONFIG_KALLSYMS_ALL is not set |
38 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 37 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
38 | CONFIG_HOTPLUG=y | ||
39 | CONFIG_PRINTK=y | 39 | CONFIG_PRINTK=y |
40 | CONFIG_BUG=y | 40 | CONFIG_BUG=y |
41 | CONFIG_ELF_CORE=y | ||
41 | CONFIG_BASE_FULL=y | 42 | CONFIG_BASE_FULL=y |
42 | CONFIG_FUTEX=y | 43 | CONFIG_FUTEX=y |
43 | CONFIG_EPOLL=y | 44 | CONFIG_EPOLL=y |
44 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
45 | CONFIG_SHMEM=y | 45 | CONFIG_SHMEM=y |
46 | CONFIG_CC_ALIGN_FUNCTIONS=0 | 46 | CONFIG_CC_ALIGN_FUNCTIONS=0 |
47 | CONFIG_CC_ALIGN_LABELS=0 | 47 | CONFIG_CC_ALIGN_LABELS=0 |
48 | CONFIG_CC_ALIGN_LOOPS=0 | 48 | CONFIG_CC_ALIGN_LOOPS=0 |
49 | CONFIG_CC_ALIGN_JUMPS=0 | 49 | CONFIG_CC_ALIGN_JUMPS=0 |
50 | CONFIG_SLAB=y | ||
50 | # CONFIG_TINY_SHMEM is not set | 51 | # CONFIG_TINY_SHMEM is not set |
51 | CONFIG_BASE_SMALL=0 | 52 | CONFIG_BASE_SMALL=0 |
53 | # CONFIG_SLOB is not set | ||
54 | CONFIG_OBSOLETE_INTERMODULE=y | ||
52 | 55 | ||
53 | # | 56 | # |
54 | # Loadable module support | 57 | # Loadable module support |
@@ -102,6 +105,7 @@ CONFIG_ARCH_S3C2410=y | |||
102 | # CONFIG_ARCH_IMX is not set | 105 | # CONFIG_ARCH_IMX is not set |
103 | # CONFIG_ARCH_H720X is not set | 106 | # CONFIG_ARCH_H720X is not set |
104 | # CONFIG_ARCH_AAEC2000 is not set | 107 | # CONFIG_ARCH_AAEC2000 is not set |
108 | # CONFIG_ARCH_AT91RM9200 is not set | ||
105 | 109 | ||
106 | # | 110 | # |
107 | # S3C24XX Implementations | 111 | # S3C24XX Implementations |
@@ -160,7 +164,6 @@ CONFIG_CPU_TLB_V4WBI=y | |||
160 | # Bus support | 164 | # Bus support |
161 | # | 165 | # |
162 | CONFIG_ISA=y | 166 | CONFIG_ISA=y |
163 | CONFIG_ISA_DMA_API=y | ||
164 | 167 | ||
165 | # | 168 | # |
166 | # PCCARD (PCMCIA/CardBus) support | 169 | # PCCARD (PCMCIA/CardBus) support |
@@ -172,6 +175,7 @@ CONFIG_ISA_DMA_API=y | |||
172 | # | 175 | # |
173 | # CONFIG_PREEMPT is not set | 176 | # CONFIG_PREEMPT is not set |
174 | # CONFIG_NO_IDLE_HZ is not set | 177 | # CONFIG_NO_IDLE_HZ is not set |
178 | # CONFIG_AEABI is not set | ||
175 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 179 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
176 | CONFIG_SELECT_MEMORY_MODEL=y | 180 | CONFIG_SELECT_MEMORY_MODEL=y |
177 | CONFIG_FLATMEM_MANUAL=y | 181 | CONFIG_FLATMEM_MANUAL=y |
@@ -214,6 +218,8 @@ CONFIG_BINFMT_AOUT=y | |||
214 | # Power management options | 218 | # Power management options |
215 | # | 219 | # |
216 | CONFIG_PM=y | 220 | CONFIG_PM=y |
221 | CONFIG_PM_LEGACY=y | ||
222 | # CONFIG_PM_DEBUG is not set | ||
217 | CONFIG_APM=y | 223 | CONFIG_APM=y |
218 | 224 | ||
219 | # | 225 | # |
@@ -259,6 +265,11 @@ CONFIG_TCP_CONG_BIC=y | |||
259 | # SCTP Configuration (EXPERIMENTAL) | 265 | # SCTP Configuration (EXPERIMENTAL) |
260 | # | 266 | # |
261 | # CONFIG_IP_SCTP is not set | 267 | # CONFIG_IP_SCTP is not set |
268 | |||
269 | # | ||
270 | # TIPC Configuration (EXPERIMENTAL) | ||
271 | # | ||
272 | # CONFIG_TIPC is not set | ||
262 | # CONFIG_ATM is not set | 273 | # CONFIG_ATM is not set |
263 | # CONFIG_BRIDGE is not set | 274 | # CONFIG_BRIDGE is not set |
264 | # CONFIG_VLAN_8021Q is not set | 275 | # CONFIG_VLAN_8021Q is not set |
@@ -276,7 +287,6 @@ CONFIG_TCP_CONG_BIC=y | |||
276 | # QoS and/or fair queueing | 287 | # QoS and/or fair queueing |
277 | # | 288 | # |
278 | # CONFIG_NET_SCHED is not set | 289 | # CONFIG_NET_SCHED is not set |
279 | # CONFIG_NET_CLS_ROUTE is not set | ||
280 | 290 | ||
281 | # | 291 | # |
282 | # Network testing | 292 | # Network testing |
@@ -300,6 +310,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
300 | # CONFIG_DEBUG_DRIVER is not set | 310 | # CONFIG_DEBUG_DRIVER is not set |
301 | 311 | ||
302 | # | 312 | # |
313 | # Connector - unified userspace <-> kernelspace linker | ||
314 | # | ||
315 | # CONFIG_CONNECTOR is not set | ||
316 | |||
317 | # | ||
303 | # Memory Technology Devices (MTD) | 318 | # Memory Technology Devices (MTD) |
304 | # | 319 | # |
305 | CONFIG_MTD=y | 320 | CONFIG_MTD=y |
@@ -412,8 +427,6 @@ CONFIG_PARPORT_1284=y | |||
412 | # | 427 | # |
413 | # Block devices | 428 | # Block devices |
414 | # | 429 | # |
415 | # CONFIG_BLK_DEV_XD is not set | ||
416 | # CONFIG_PARIDE is not set | ||
417 | # CONFIG_BLK_DEV_COW_COMMON is not set | 430 | # CONFIG_BLK_DEV_COW_COMMON is not set |
418 | CONFIG_BLK_DEV_LOOP=y | 431 | CONFIG_BLK_DEV_LOOP=y |
419 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 432 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
@@ -502,7 +515,6 @@ CONFIG_NETDEVICES=y | |||
502 | CONFIG_NET_ETHERNET=y | 515 | CONFIG_NET_ETHERNET=y |
503 | CONFIG_MII=y | 516 | CONFIG_MII=y |
504 | # CONFIG_NET_VENDOR_3COM is not set | 517 | # CONFIG_NET_VENDOR_3COM is not set |
505 | # CONFIG_LANCE is not set | ||
506 | # CONFIG_NET_VENDOR_SMC is not set | 518 | # CONFIG_NET_VENDOR_SMC is not set |
507 | # CONFIG_SMC91X is not set | 519 | # CONFIG_SMC91X is not set |
508 | CONFIG_DM9000=y | 520 | CONFIG_DM9000=y |
@@ -607,11 +619,11 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
607 | # CONFIG_ROCKETPORT is not set | 619 | # CONFIG_ROCKETPORT is not set |
608 | # CONFIG_CYCLADES is not set | 620 | # CONFIG_CYCLADES is not set |
609 | # CONFIG_DIGIEPCA is not set | 621 | # CONFIG_DIGIEPCA is not set |
610 | # CONFIG_ESPSERIAL is not set | ||
611 | # CONFIG_MOXA_INTELLIO is not set | 622 | # CONFIG_MOXA_INTELLIO is not set |
612 | # CONFIG_MOXA_SMARTIO is not set | 623 | # CONFIG_MOXA_SMARTIO is not set |
613 | # CONFIG_ISI is not set | 624 | # CONFIG_ISI is not set |
614 | # CONFIG_SYNCLINKMP is not set | 625 | # CONFIG_SYNCLINKMP is not set |
626 | # CONFIG_SYNCLINK_GT is not set | ||
615 | # CONFIG_N_HDLC is not set | 627 | # CONFIG_N_HDLC is not set |
616 | # CONFIG_RISCOM8 is not set | 628 | # CONFIG_RISCOM8 is not set |
617 | # CONFIG_SPECIALIX is not set | 629 | # CONFIG_SPECIALIX is not set |
@@ -625,6 +637,7 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
625 | CONFIG_SERIAL_8250=y | 637 | CONFIG_SERIAL_8250=y |
626 | CONFIG_SERIAL_8250_CONSOLE=y | 638 | CONFIG_SERIAL_8250_CONSOLE=y |
627 | CONFIG_SERIAL_8250_NR_UARTS=8 | 639 | CONFIG_SERIAL_8250_NR_UARTS=8 |
640 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
628 | CONFIG_SERIAL_8250_EXTENDED=y | 641 | CONFIG_SERIAL_8250_EXTENDED=y |
629 | CONFIG_SERIAL_8250_MANY_PORTS=y | 642 | CONFIG_SERIAL_8250_MANY_PORTS=y |
630 | CONFIG_SERIAL_8250_SHARE_IRQ=y | 643 | CONFIG_SERIAL_8250_SHARE_IRQ=y |
@@ -687,6 +700,7 @@ CONFIG_S3C2410_RTC=y | |||
687 | # | 700 | # |
688 | # TPM devices | 701 | # TPM devices |
689 | # | 702 | # |
703 | # CONFIG_TCG_TPM is not set | ||
690 | # CONFIG_TELCLOCK is not set | 704 | # CONFIG_TELCLOCK is not set |
691 | 705 | ||
692 | # | 706 | # |
@@ -731,6 +745,12 @@ CONFIG_SENSORS_EEPROM=m | |||
731 | # CONFIG_I2C_DEBUG_CHIP is not set | 745 | # CONFIG_I2C_DEBUG_CHIP is not set |
732 | 746 | ||
733 | # | 747 | # |
748 | # SPI support | ||
749 | # | ||
750 | # CONFIG_SPI is not set | ||
751 | # CONFIG_SPI_MASTER is not set | ||
752 | |||
753 | # | ||
734 | # Hardware Monitoring support | 754 | # Hardware Monitoring support |
735 | # | 755 | # |
736 | CONFIG_HWMON=y | 756 | CONFIG_HWMON=y |
@@ -863,6 +883,7 @@ CONFIG_FS_MBCACHE=y | |||
863 | # CONFIG_JFS_FS is not set | 883 | # CONFIG_JFS_FS is not set |
864 | # CONFIG_FS_POSIX_ACL is not set | 884 | # CONFIG_FS_POSIX_ACL is not set |
865 | # CONFIG_XFS_FS is not set | 885 | # CONFIG_XFS_FS is not set |
886 | # CONFIG_OCFS2_FS is not set | ||
866 | # CONFIG_MINIX_FS is not set | 887 | # CONFIG_MINIX_FS is not set |
867 | CONFIG_ROMFS_FS=y | 888 | CONFIG_ROMFS_FS=y |
868 | CONFIG_INOTIFY=y | 889 | CONFIG_INOTIFY=y |
@@ -897,6 +918,7 @@ CONFIG_SYSFS=y | |||
897 | # CONFIG_HUGETLB_PAGE is not set | 918 | # CONFIG_HUGETLB_PAGE is not set |
898 | CONFIG_RAMFS=y | 919 | CONFIG_RAMFS=y |
899 | # CONFIG_RELAYFS_FS is not set | 920 | # CONFIG_RELAYFS_FS is not set |
921 | # CONFIG_CONFIGFS_FS is not set | ||
900 | 922 | ||
901 | # | 923 | # |
902 | # Miscellaneous filesystems | 924 | # Miscellaneous filesystems |
@@ -965,6 +987,7 @@ CONFIG_SOLARIS_X86_PARTITION=y | |||
965 | # CONFIG_SGI_PARTITION is not set | 987 | # CONFIG_SGI_PARTITION is not set |
966 | # CONFIG_ULTRIX_PARTITION is not set | 988 | # CONFIG_ULTRIX_PARTITION is not set |
967 | # CONFIG_SUN_PARTITION is not set | 989 | # CONFIG_SUN_PARTITION is not set |
990 | # CONFIG_KARMA_PARTITION is not set | ||
968 | # CONFIG_EFI_PARTITION is not set | 991 | # CONFIG_EFI_PARTITION is not set |
969 | 992 | ||
970 | # | 993 | # |
@@ -1020,12 +1043,13 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1020 | # Kernel hacking | 1043 | # Kernel hacking |
1021 | # | 1044 | # |
1022 | # CONFIG_PRINTK_TIME is not set | 1045 | # CONFIG_PRINTK_TIME is not set |
1023 | CONFIG_DEBUG_KERNEL=y | ||
1024 | CONFIG_MAGIC_SYSRQ=y | 1046 | CONFIG_MAGIC_SYSRQ=y |
1047 | CONFIG_DEBUG_KERNEL=y | ||
1025 | CONFIG_LOG_BUF_SHIFT=16 | 1048 | CONFIG_LOG_BUF_SHIFT=16 |
1026 | CONFIG_DETECT_SOFTLOCKUP=y | 1049 | CONFIG_DETECT_SOFTLOCKUP=y |
1027 | # CONFIG_SCHEDSTATS is not set | 1050 | # CONFIG_SCHEDSTATS is not set |
1028 | # CONFIG_DEBUG_SLAB is not set | 1051 | # CONFIG_DEBUG_SLAB is not set |
1052 | CONFIG_DEBUG_MUTEXES=y | ||
1029 | # CONFIG_DEBUG_SPINLOCK is not set | 1053 | # CONFIG_DEBUG_SPINLOCK is not set |
1030 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1054 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1031 | # CONFIG_DEBUG_KOBJECT is not set | 1055 | # CONFIG_DEBUG_KOBJECT is not set |
@@ -1034,6 +1058,7 @@ CONFIG_DEBUG_INFO=y | |||
1034 | # CONFIG_DEBUG_FS is not set | 1058 | # CONFIG_DEBUG_FS is not set |
1035 | # CONFIG_DEBUG_VM is not set | 1059 | # CONFIG_DEBUG_VM is not set |
1036 | CONFIG_FRAME_POINTER=y | 1060 | CONFIG_FRAME_POINTER=y |
1061 | CONFIG_FORCED_INLINING=y | ||
1037 | # CONFIG_RCU_TORTURE_TEST is not set | 1062 | # CONFIG_RCU_TORTURE_TEST is not set |
1038 | CONFIG_DEBUG_USER=y | 1063 | CONFIG_DEBUG_USER=y |
1039 | # CONFIG_DEBUG_WAITQ is not set | 1064 | # CONFIG_DEBUG_WAITQ is not set |