Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 598cace09645fc10f8150e4adc982922cbd214ed

Authored by David Howells
Committed by Linus Torvalds
1 parent 012c79bad5
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mn10300: update the ASB2303 defconfig 

Update the defconfig for the ASB2303 platform.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 70 additions and 37 deletions Side-by-side Diff

arch/mn10300/configs/asb2303_defconfig
Diff comments   View file @ 598cace
1 1 #
2 2 # Automatically generated make config: don't edit
3   -# Linux kernel version: 2.6.30-rc2
4   -# Sat Apr 18 11:13:22 2009
  3 +# Linux kernel version: 2.6.33-rc1
  4 +# Tue Dec 22 19:26:25 2009
5 5 #
6 6 CONFIG_MN10300=y
7 7 CONFIG_AM33=y
... ... @@ -22,6 +22,7 @@
22 22 # CONFIG_HOTPLUG_CPU is not set
23 23 CONFIG_HZ=1000
24 24 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  25 +CONFIG_CONSTRUCTORS=y
25 26  
26 27 #
27 28 # General setup
28 29  
29 30  
... ... @@ -43,11 +44,10 @@
43 44 #
44 45 # RCU Subsystem
45 46 #
46   -CONFIG_CLASSIC_RCU=y
47 47 # CONFIG_TREE_RCU is not set
48   -# CONFIG_PREEMPT_RCU is not set
  48 +# CONFIG_TREE_PREEMPT_RCU is not set
  49 +CONFIG_TINY_RCU=y
49 50 # CONFIG_TREE_RCU_TRACE is not set
50   -# CONFIG_PREEMPT_RCU_TRACE is not set
51 51 # CONFIG_IKCONFIG is not set
52 52 CONFIG_LOG_BUF_SHIFT=14
53 53 # CONFIG_GROUP_SCHED is not set
... ... @@ -62,7 +62,6 @@
62 62 CONFIG_EMBEDDED=y
63 63 CONFIG_SYSCTL_SYSCALL=y
64 64 # CONFIG_KALLSYMS is not set
65   -CONFIG_STRIP_ASM_SYMS=y
66 65 # CONFIG_HOTPLUG is not set
67 66 CONFIG_PRINTK=y
68 67 CONFIG_BUG=y
69 68  
70 69  
... ... @@ -75,14 +74,22 @@
75 74 CONFIG_EVENTFD=y
76 75 CONFIG_SHMEM=y
77 76 CONFIG_AIO=y
  77 +
  78 +#
  79 +# Kernel Performance Events And Counters
  80 +#
78 81 # CONFIG_VM_EVENT_COUNTERS is not set
79 82 CONFIG_COMPAT_BRK=y
80 83 CONFIG_SLAB=y
81 84 # CONFIG_SLUB is not set
82 85 # CONFIG_SLOB is not set
83 86 CONFIG_PROFILING=y
84   -# CONFIG_MARKERS is not set
85 87 CONFIG_HAVE_OPROFILE=y
  88 +CONFIG_HAVE_ARCH_TRACEHOOK=y
  89 +
  90 +#
  91 +# GCOV-based kernel profiling
  92 +#
86 93 # CONFIG_SLOW_WORK is not set
87 94 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
88 95 CONFIG_SLABINFO=y
... ... @@ -90,6 +97,35 @@
90 97 CONFIG_BASE_SMALL=0
91 98 # CONFIG_MODULES is not set
92 99 # CONFIG_BLOCK is not set
  100 +# CONFIG_INLINE_SPIN_TRYLOCK is not set
  101 +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
  102 +# CONFIG_INLINE_SPIN_LOCK is not set
  103 +# CONFIG_INLINE_SPIN_LOCK_BH is not set
  104 +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
  105 +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
  106 +# CONFIG_INLINE_SPIN_UNLOCK is not set
  107 +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
  108 +# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
  109 +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
  110 +# CONFIG_INLINE_READ_TRYLOCK is not set
  111 +# CONFIG_INLINE_READ_LOCK is not set
  112 +# CONFIG_INLINE_READ_LOCK_BH is not set
  113 +# CONFIG_INLINE_READ_LOCK_IRQ is not set
  114 +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
  115 +# CONFIG_INLINE_READ_UNLOCK is not set
  116 +# CONFIG_INLINE_READ_UNLOCK_BH is not set
  117 +# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
  118 +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
  119 +# CONFIG_INLINE_WRITE_TRYLOCK is not set
  120 +# CONFIG_INLINE_WRITE_LOCK is not set
  121 +# CONFIG_INLINE_WRITE_LOCK_BH is not set
  122 +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
  123 +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
  124 +# CONFIG_INLINE_WRITE_UNLOCK is not set
  125 +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
  126 +# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
  127 +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
  128 +# CONFIG_MUTEX_SPIN_ON_OWNER is not set
93 129 # CONFIG_FREEZER is not set
94 130  
95 131 #
... ... @@ -145,9 +181,8 @@
145 181 CONFIG_ZONE_DMA_FLAG=0
146 182 CONFIG_NR_QUICK=1
147 183 CONFIG_VIRT_TO_BUS=y
148   -CONFIG_UNEVICTABLE_LRU=y
149   -CONFIG_HAVE_MLOCK=y
150   -CONFIG_HAVE_MLOCKED_PAGE_BIT=y
  184 +# CONFIG_KSM is not set
  185 +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
151 186  
152 187 #
153 188 # Power management options
... ... @@ -202,6 +237,7 @@
202 237 # CONFIG_NETFILTER is not set
203 238 # CONFIG_IP_DCCP is not set
204 239 # CONFIG_IP_SCTP is not set
  240 +# CONFIG_RDS is not set
205 241 # CONFIG_TIPC is not set
206 242 # CONFIG_ATM is not set
207 243 # CONFIG_BRIDGE is not set
... ... @@ -216,6 +252,7 @@
216 252 # CONFIG_ECONET is not set
217 253 # CONFIG_WAN_ROUTER is not set
218 254 # CONFIG_PHONET is not set
  255 +# CONFIG_IEEE802154 is not set
219 256 # CONFIG_NET_SCHED is not set
220 257 # CONFIG_DCB is not set
221 258  
... ... @@ -341,7 +378,6 @@
341 378 # CONFIG_SCSI_DMA is not set
342 379 # CONFIG_SCSI_NETLINK is not set
343 380 CONFIG_NETDEVICES=y
344   -CONFIG_COMPAT_NET_DEV_OPS=y
345 381 # CONFIG_DUMMY is not set
346 382 # CONFIG_BONDING is not set
347 383 # CONFIG_MACVLAN is not set
348 384  
349 385  
... ... @@ -362,16 +398,13 @@
362 398 # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
363 399 # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
364 400 # CONFIG_B44 is not set
  401 +# CONFIG_KS8842 is not set
  402 +# CONFIG_KS8851_MLL is not set
365 403 # CONFIG_NETDEV_1000 is not set
366 404 # CONFIG_NETDEV_10000 is not set
  405 +# CONFIG_WLAN is not set
367 406  
368 407 #
369   -# Wireless LAN
370   -#
371   -# CONFIG_WLAN_PRE80211 is not set
372   -# CONFIG_WLAN_80211 is not set
373   -
374   -#
375 408 # Enable WiMAX (Networking options) to see the WiMAX drivers
376 409 #
377 410 # CONFIG_WAN is not set
378 411  
... ... @@ -430,11 +463,15 @@
430 463 # CONFIG_TCG_TPM is not set
431 464 # CONFIG_I2C is not set
432 465 # CONFIG_SPI is not set
  466 +
  467 +#
  468 +# PPS support
  469 +#
  470 +# CONFIG_PPS is not set
433 471 # CONFIG_W1 is not set
434 472 # CONFIG_POWER_SUPPLY is not set
435 473 # CONFIG_HWMON is not set
436 474 # CONFIG_THERMAL is not set
437   -# CONFIG_THERMAL_HWMON is not set
438 475 # CONFIG_WATCHDOG is not set
439 476 CONFIG_SSB_POSSIBLE=y
440 477  
441 478  
... ... @@ -451,24 +488,9 @@
451 488 # CONFIG_HTC_PASIC3 is not set
452 489 # CONFIG_MFD_TMIO is not set
453 490 # CONFIG_REGULATOR is not set
  491 +# CONFIG_MEDIA_SUPPORT is not set
454 492  
455 493 #
456   -# Multimedia devices
457   -#
458   -
459   -#
460   -# Multimedia core support
461   -#
462   -# CONFIG_VIDEO_DEV is not set
463   -# CONFIG_DVB_CORE is not set
464   -# CONFIG_VIDEO_MEDIA is not set
465   -
466   -#
467   -# Multimedia drivers
468   -#
469   -# CONFIG_DAB is not set
470   -
471   -#
472 494 # Graphics support
473 495 #
474 496 # CONFIG_VGASTATE is not set
475 497  
... ... @@ -490,11 +512,17 @@
490 512 # CONFIG_DMADEVICES is not set
491 513 # CONFIG_AUXDISPLAY is not set
492 514 # CONFIG_UIO is not set
  515 +
  516 +#
  517 +# TI VLYNQ
  518 +#
493 519 # CONFIG_STAGING is not set
494 520  
495 521 #
496 522 # File systems
497 523 #
  524 +CONFIG_FILE_LOCKING=y
  525 +CONFIG_FSNOTIFY=y
498 526 CONFIG_DNOTIFY=y
499 527 CONFIG_INOTIFY=y
500 528 CONFIG_INOTIFY_USER=y
... ... @@ -539,6 +567,7 @@
539 567 # CONFIG_NFS_V3_ACL is not set
540 568 # CONFIG_NFS_V4 is not set
541 569 CONFIG_ROOT_NFS=y
  570 +# CONFIG_NFSD is not set
542 571 CONFIG_LOCKD=y
543 572 CONFIG_LOCKD_V4=y
544 573 CONFIG_NFS_COMMON=y
545 574  
546 575  
... ... @@ -561,13 +590,13 @@
561 590 CONFIG_ENABLE_MUST_CHECK=y
562 591 CONFIG_FRAME_WARN=1024
563 592 CONFIG_MAGIC_SYSRQ=y
  593 +CONFIG_STRIP_ASM_SYMS=y
564 594 # CONFIG_UNUSED_SYMBOLS is not set
565 595 # CONFIG_DEBUG_FS is not set
566 596 # CONFIG_HEADERS_CHECK is not set
567 597 # CONFIG_DEBUG_KERNEL is not set
568   -# CONFIG_DEBUG_BUGVERBOSE is not set
  598 +CONFIG_DEBUG_BUGVERBOSE=y
569 599 # CONFIG_DEBUG_MEMORY_INIT is not set
570   -# CONFIG_RCU_CPU_STALL_DETECTOR is not set
571 600 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
572 601 # CONFIG_SAMPLES is not set
573 602  
... ... @@ -577,7 +606,11 @@
577 606 # CONFIG_KEYS is not set
578 607 # CONFIG_SECURITY is not set
579 608 # CONFIG_SECURITYFS is not set
580   -# CONFIG_SECURITY_FILE_CAPABILITIES is not set
  609 +# CONFIG_DEFAULT_SECURITY_SELINUX is not set
  610 +# CONFIG_DEFAULT_SECURITY_SMACK is not set
  611 +# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
  612 +CONFIG_DEFAULT_SECURITY_DAC=y
  613 +CONFIG_DEFAULT_SECURITY=""
581 614 # CONFIG_CRYPTO is not set
582 615 # CONFIG_BINARY_PRINTF is not set
583 616