diff options
621 files changed, 28203 insertions, 5661 deletions
diff --git a/Documentation/ABI/testing/sysfs-firmware-sgi_uv b/Documentation/ABI/testing/sysfs-firmware-sgi_uv new file mode 100644 index 000000000000..4573fd4b7876 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-firmware-sgi_uv | |||
@@ -0,0 +1,27 @@ | |||
1 | What: /sys/firmware/sgi_uv/ | ||
2 | Date: August 2008 | ||
3 | Contact: Russ Anderson <rja@sgi.com> | ||
4 | Description: | ||
5 | The /sys/firmware/sgi_uv directory contains information | ||
6 | about the SGI UV platform. | ||
7 | |||
8 | Under that directory are a number of files: | ||
9 | |||
10 | partition_id | ||
11 | coherence_id | ||
12 | |||
13 | The partition_id entry contains the partition id. | ||
14 | SGI UV systems can be partitioned into multiple physical | ||
15 | machines, which each partition running a unique copy | ||
16 | of the operating system. Each partition will have a unique | ||
17 | partition id. To display the partition id, use the command: | ||
18 | |||
19 | cat /sys/firmware/sgi_uv/partition_id | ||
20 | |||
21 | The coherence_id entry contains the coherence id. | ||
22 | A partitioned SGI UV system can have one or more coherence | ||
23 | domain. The coherence id indicates which coherence domain | ||
24 | this partition is in. To display the coherence id, use the | ||
25 | command: | ||
26 | |||
27 | cat /sys/firmware/sgi_uv/coherence_id | ||
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 881e6dd03aea..27809357da58 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
@@ -5,6 +5,8 @@ | |||
5 | *.css | 5 | *.css |
6 | *.dvi | 6 | *.dvi |
7 | *.eps | 7 | *.eps |
8 | *.fw.gen.S | ||
9 | *.fw | ||
8 | *.gif | 10 | *.gif |
9 | *.grep | 11 | *.grep |
10 | *.grp | 12 | *.grp |
diff --git a/Documentation/filesystems/ntfs.txt b/Documentation/filesystems/ntfs.txt index e79ee2db183a..ac2a261c5f7d 100644 --- a/Documentation/filesystems/ntfs.txt +++ b/Documentation/filesystems/ntfs.txt | |||
@@ -40,7 +40,7 @@ Web site | |||
40 | ======== | 40 | ======== |
41 | 41 | ||
42 | There is plenty of additional information on the linux-ntfs web site | 42 | There is plenty of additional information on the linux-ntfs web site |
43 | at http://linux-ntfs.sourceforge.net/ | 43 | at http://www.linux-ntfs.org/ |
44 | 44 | ||
45 | The web site has a lot of additional information, such as a comprehensive | 45 | The web site has a lot of additional information, such as a comprehensive |
46 | FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS | 46 | FAQ, documentation on the NTFS on-disk format, information on the Linux-NTFS |
@@ -272,7 +272,7 @@ And you would know that /dev/hda2 has a size of 37768814 - 4209030 + 1 = | |||
272 | For Win2k and later dynamic disks, you can for example use the ldminfo utility | 272 | For Win2k and later dynamic disks, you can for example use the ldminfo utility |
273 | which is part of the Linux LDM tools (the latest version at the time of | 273 | which is part of the Linux LDM tools (the latest version at the time of |
274 | writing is linux-ldm-0.0.8.tar.bz2). You can download it from: | 274 | writing is linux-ldm-0.0.8.tar.bz2). You can download it from: |
275 | http://linux-ntfs.sourceforge.net/downloads.html | 275 | http://www.linux-ntfs.org/ |
276 | Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go | 276 | Simply extract the downloaded archive (tar xvjf linux-ldm-0.0.8.tar.bz2), go |
277 | into it (cd linux-ldm-0.0.8) and change to the test directory (cd test). You | 277 | into it (cd linux-ldm-0.0.8) and change to the test directory (cd test). You |
278 | will find the precompiled (i386) ldminfo utility there. NOTE: You will not be | 278 | will find the precompiled (i386) ldminfo utility there. NOTE: You will not be |
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt index 64557821ee59..394eb2cc1c39 100644 --- a/Documentation/filesystems/proc.txt +++ b/Documentation/filesystems/proc.txt | |||
@@ -1339,6 +1339,25 @@ Enables/Disables the protection of the per-process proc entries "maps" and | |||
1339 | "smaps". When enabled, the contents of these files are visible only to | 1339 | "smaps". When enabled, the contents of these files are visible only to |
1340 | readers that are allowed to ptrace() the given process. | 1340 | readers that are allowed to ptrace() the given process. |
1341 | 1341 | ||
1342 | msgmni | ||
1343 | ------ | ||
1344 | |||
1345 | Maximum number of message queue ids on the system. | ||
1346 | This value scales to the amount of lowmem. It is automatically recomputed | ||
1347 | upon memory add/remove or ipc namespace creation/removal. | ||
1348 | When a value is written into this file, msgmni's value becomes fixed, i.e. it | ||
1349 | is not recomputed anymore when one of the above events occurs. | ||
1350 | Use auto_msgmni to change this behavior. | ||
1351 | |||
1352 | auto_msgmni | ||
1353 | ----------- | ||
1354 | |||
1355 | Enables/Disables automatic recomputing of msgmni upon memory add/remove or | ||
1356 | upon ipc namespace creation/removal (see the msgmni description above). | ||
1357 | Echoing "1" into this file enables msgmni automatic recomputing. | ||
1358 | Echoing "0" turns it off. | ||
1359 | auto_msgmni default value is 1. | ||
1360 | |||
1342 | 1361 | ||
1343 | 2.4 /proc/sys/vm - The virtual memory subsystem | 1362 | 2.4 /proc/sys/vm - The virtual memory subsystem |
1344 | ----------------------------------------------- | 1363 | ----------------------------------------------- |
diff --git a/MAINTAINERS b/MAINTAINERS index 28c69aaefcd9..ced3c202f8e6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -419,6 +419,12 @@ L: linux-laptop@vger.kernel.org | |||
419 | W: http://www.canb.auug.org.au/~sfr/ | 419 | W: http://www.canb.auug.org.au/~sfr/ |
420 | S: Supported | 420 | S: Supported |
421 | 421 | ||
422 | APPLE BCM5974 MULTITOUCH DRIVER | ||
423 | P: Henrik Rydberg | ||
424 | M: rydberg@euromail.se | ||
425 | L: linux-input@vger.kernel.org | ||
426 | S: Maintained | ||
427 | |||
422 | APPLE SMC DRIVER | 428 | APPLE SMC DRIVER |
423 | P: Nicolas Boichat | 429 | P: Nicolas Boichat |
424 | M: nicolas@boichat.ch | 430 | M: nicolas@boichat.ch |
@@ -3051,7 +3057,7 @@ P: Anton Altaparmakov | |||
3051 | M: aia21@cantab.net | 3057 | M: aia21@cantab.net |
3052 | L: linux-ntfs-dev@lists.sourceforge.net | 3058 | L: linux-ntfs-dev@lists.sourceforge.net |
3053 | L: linux-kernel@vger.kernel.org | 3059 | L: linux-kernel@vger.kernel.org |
3054 | W: http://linux-ntfs.sf.net/ | 3060 | W: http://www.linux-ntfs.org/ |
3055 | T: git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git | 3061 | T: git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git |
3056 | S: Maintained | 3062 | S: Maintained |
3057 | 3063 | ||
@@ -4005,7 +4011,7 @@ S: Maintained | |||
4005 | 4011 | ||
4006 | TI OMAP MMC INTERFACE DRIVER | 4012 | TI OMAP MMC INTERFACE DRIVER |
4007 | P: Carlos Aguiar, Anderson Briglia and Syed Khasim | 4013 | P: Carlos Aguiar, Anderson Briglia and Syed Khasim |
4008 | M: linux-omap-open-source@linux.omap.com (subscribers only) | 4014 | M: linux-omap@vger.kernel.org |
4009 | W: http://linux.omap.com | 4015 | W: http://linux.omap.com |
4010 | W: http://www.muru.com/linux/omap/ | 4016 | W: http://www.muru.com/linux/omap/ |
4011 | S: Maintained | 4017 | S: Maintained |
@@ -1,7 +1,7 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 27 | 3 | SUBLEVEL = 27 |
4 | EXTRAVERSION = -rc4 | 4 | EXTRAVERSION = -rc5 |
5 | NAME = Rotary Wombat | 5 | NAME = Rotary Wombat |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 6e943135f0e0..8509dad31204 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
@@ -121,24 +121,29 @@ osf_filldir(void *__buf, const char *name, int namlen, loff_t offset, | |||
121 | if (reclen > buf->count) | 121 | if (reclen > buf->count) |
122 | return -EINVAL; | 122 | return -EINVAL; |
123 | d_ino = ino; | 123 | d_ino = ino; |
124 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 124 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
125 | buf->error = -EOVERFLOW; | ||
125 | return -EOVERFLOW; | 126 | return -EOVERFLOW; |
127 | } | ||
126 | if (buf->basep) { | 128 | if (buf->basep) { |
127 | if (put_user(offset, buf->basep)) | 129 | if (put_user(offset, buf->basep)) |
128 | return -EFAULT; | 130 | goto Efault; |
129 | buf->basep = NULL; | 131 | buf->basep = NULL; |
130 | } | 132 | } |
131 | dirent = buf->dirent; | 133 | dirent = buf->dirent; |
132 | put_user(d_ino, &dirent->d_ino); | 134 | if (put_user(d_ino, &dirent->d_ino) || |
133 | put_user(namlen, &dirent->d_namlen); | 135 | put_user(namlen, &dirent->d_namlen) || |
134 | put_user(reclen, &dirent->d_reclen); | 136 | put_user(reclen, &dirent->d_reclen) || |
135 | if (copy_to_user(dirent->d_name, name, namlen) || | 137 | copy_to_user(dirent->d_name, name, namlen) || |
136 | put_user(0, dirent->d_name + namlen)) | 138 | put_user(0, dirent->d_name + namlen)) |
137 | return -EFAULT; | 139 | goto Efault; |
138 | dirent = (void __user *)dirent + reclen; | 140 | dirent = (void __user *)dirent + reclen; |
139 | buf->dirent = dirent; | 141 | buf->dirent = dirent; |
140 | buf->count -= reclen; | 142 | buf->count -= reclen; |
141 | return 0; | 143 | return 0; |
144 | Efault: | ||
145 | buf->error = -EFAULT; | ||
146 | return -EFAULT; | ||
142 | } | 147 | } |
143 | 148 | ||
144 | asmlinkage int | 149 | asmlinkage int |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4b8acd2851f4..70dba1668907 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -810,6 +810,11 @@ config OABI_COMPAT | |||
810 | UNPREDICTABLE (in fact it can be predicted that it won't work | 810 | UNPREDICTABLE (in fact it can be predicted that it won't work |
811 | at all). If in doubt say Y. | 811 | at all). If in doubt say Y. |
812 | 812 | ||
813 | config ARCH_FLATMEM_HAS_HOLES | ||
814 | bool | ||
815 | default y | ||
816 | depends on FLATMEM | ||
817 | |||
813 | config ARCH_DISCONTIGMEM_ENABLE | 818 | config ARCH_DISCONTIGMEM_ENABLE |
814 | bool | 819 | bool |
815 | default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) | 820 | default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM) |
diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig new file mode 100644 index 000000000000..2c4aa11f0b0d --- /dev/null +++ b/arch/arm/configs/ams_delta_defconfig | |||
@@ -0,0 +1,1314 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.22-rc1-omap1 | ||
4 | # Thu Jun 7 04:28:32 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # Code maturity level options | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_LOCK_KERNEL=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | |||
36 | # | ||
37 | # General setup | ||
38 | # | ||
39 | CONFIG_LOCALVERSION="" | ||
40 | CONFIG_LOCALVERSION_AUTO=y | ||
41 | # CONFIG_SWAP is not set | ||
42 | CONFIG_SYSVIPC=y | ||
43 | # CONFIG_IPC_NS is not set | ||
44 | CONFIG_SYSVIPC_SYSCTL=y | ||
45 | # CONFIG_POSIX_MQUEUE is not set | ||
46 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
47 | # CONFIG_TASKSTATS is not set | ||
48 | # CONFIG_UTS_NS is not set | ||
49 | # CONFIG_AUDIT is not set | ||
50 | # CONFIG_IKCONFIG is not set | ||
51 | CONFIG_LOG_BUF_SHIFT=14 | ||
52 | CONFIG_SYSFS_DEPRECATED=y | ||
53 | # CONFIG_RELAY is not set | ||
54 | CONFIG_BLK_DEV_INITRD=y | ||
55 | CONFIG_INITRAMFS_SOURCE="" | ||
56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
57 | CONFIG_SYSCTL=y | ||
58 | # CONFIG_EMBEDDED is not set | ||
59 | CONFIG_UID16=y | ||
60 | CONFIG_SYSCTL_SYSCALL=y | ||
61 | CONFIG_KALLSYMS=y | ||
62 | # CONFIG_KALLSYMS_ALL is not set | ||
63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
64 | CONFIG_HOTPLUG=y | ||
65 | CONFIG_PRINTK=y | ||
66 | CONFIG_BUG=y | ||
67 | CONFIG_ELF_CORE=y | ||
68 | CONFIG_BASE_FULL=y | ||
69 | CONFIG_FUTEX=y | ||
70 | CONFIG_ANON_INODES=y | ||
71 | CONFIG_EPOLL=y | ||
72 | CONFIG_SIGNALFD=y | ||
73 | CONFIG_TIMERFD=y | ||
74 | CONFIG_EVENTFD=y | ||
75 | CONFIG_SHMEM=y | ||
76 | CONFIG_VM_EVENT_COUNTERS=y | ||
77 | CONFIG_SLAB=y | ||
78 | # CONFIG_SLUB is not set | ||
79 | # CONFIG_SLOB is not set | ||
80 | CONFIG_RT_MUTEXES=y | ||
81 | # CONFIG_TINY_SHMEM is not set | ||
82 | CONFIG_BASE_SMALL=0 | ||
83 | |||
84 | # | ||
85 | # Loadable module support | ||
86 | # | ||
87 | CONFIG_MODULES=y | ||
88 | CONFIG_MODULE_UNLOAD=y | ||
89 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
90 | # CONFIG_MODVERSIONS is not set | ||
91 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
92 | CONFIG_KMOD=y | ||
93 | |||
94 | # | ||
95 | # Block layer | ||
96 | # | ||
97 | CONFIG_BLOCK=y | ||
98 | # CONFIG_LBD is not set | ||
99 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
100 | # CONFIG_LSF is not set | ||
101 | |||
102 | # | ||
103 | # IO Schedulers | ||
104 | # | ||
105 | CONFIG_IOSCHED_NOOP=y | ||
106 | CONFIG_IOSCHED_AS=y | ||
107 | CONFIG_IOSCHED_DEADLINE=y | ||
108 | CONFIG_IOSCHED_CFQ=y | ||
109 | CONFIG_DEFAULT_AS=y | ||
110 | # CONFIG_DEFAULT_DEADLINE is not set | ||
111 | # CONFIG_DEFAULT_CFQ is not set | ||
112 | # CONFIG_DEFAULT_NOOP is not set | ||
113 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
114 | |||
115 | # | ||
116 | # System Type | ||
117 | # | ||
118 | # CONFIG_ARCH_AAEC2000 is not set | ||
119 | # CONFIG_ARCH_INTEGRATOR is not set | ||
120 | # CONFIG_ARCH_REALVIEW is not set | ||
121 | # CONFIG_ARCH_VERSATILE is not set | ||
122 | # CONFIG_ARCH_AT91 is not set | ||
123 | # CONFIG_ARCH_CLPS7500 is not set | ||
124 | # CONFIG_ARCH_CLPS711X is not set | ||
125 | # CONFIG_ARCH_CO285 is not set | ||
126 | # CONFIG_ARCH_EBSA110 is not set | ||
127 | # CONFIG_ARCH_EP93XX is not set | ||
128 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
129 | # CONFIG_ARCH_NETX is not set | ||
130 | # CONFIG_ARCH_H720X is not set | ||
131 | # CONFIG_ARCH_IMX is not set | ||
132 | # CONFIG_ARCH_IOP13XX is not set | ||
133 | # CONFIG_ARCH_IOP32X is not set | ||
134 | # CONFIG_ARCH_IOP33X is not set | ||
135 | # CONFIG_ARCH_IXP23XX is not set | ||
136 | # CONFIG_ARCH_IXP2000 is not set | ||
137 | # CONFIG_ARCH_IXP4XX is not set | ||
138 | # CONFIG_ARCH_L7200 is not set | ||
139 | # CONFIG_ARCH_KS8695 is not set | ||
140 | # CONFIG_ARCH_NS9XXX is not set | ||
141 | # CONFIG_ARCH_PNX4008 is not set | ||
142 | # CONFIG_ARCH_PXA is not set | ||
143 | # CONFIG_ARCH_RPC is not set | ||
144 | # CONFIG_ARCH_SA1100 is not set | ||
145 | # CONFIG_ARCH_S3C2410 is not set | ||
146 | # CONFIG_ARCH_SHARK is not set | ||
147 | # CONFIG_ARCH_LH7A40X is not set | ||
148 | # CONFIG_ARCH_DAVINCI is not set | ||
149 | CONFIG_ARCH_OMAP=y | ||
150 | |||
151 | # | ||
152 | # TI OMAP Implementations | ||
153 | # | ||
154 | CONFIG_ARCH_OMAP1=y | ||
155 | # CONFIG_ARCH_OMAP2 is not set | ||
156 | |||
157 | # | ||
158 | # OMAP Feature Selections | ||
159 | # | ||
160 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
161 | # CONFIG_OMAP_BOOT_TAG is not set | ||
162 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
163 | CONFIG_OMAP_MUX=y | ||
164 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
165 | CONFIG_OMAP_MUX_WARNINGS=y | ||
166 | CONFIG_OMAP_MCBSP=y | ||
167 | CONFIG_OMAP_MMU_FWK=y | ||
168 | CONFIG_OMAP_MBOX_FWK=m | ||
169 | CONFIG_OMAP_MPU_TIMER=y | ||
170 | # CONFIG_OMAP_32K_TIMER is not set | ||
171 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
172 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
173 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
174 | # CONFIG_OMAP_LL_DEBUG_LCD is not set | ||
175 | CONFIG_OMAP_SERIAL_WAKE=y | ||
176 | CONFIG_OMAP_DSP=m | ||
177 | # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set | ||
178 | # CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set | ||
179 | # CONFIG_OMAP_DSP_FBEXPORT is not set | ||
180 | |||
181 | # | ||
182 | # OMAP Core Type | ||
183 | # | ||
184 | # CONFIG_ARCH_OMAP730 is not set | ||
185 | CONFIG_ARCH_OMAP15XX=y | ||
186 | # CONFIG_ARCH_OMAP16XX is not set | ||
187 | |||
188 | # | ||
189 | # OMAP Board Type | ||
190 | # | ||
191 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
192 | # CONFIG_MACH_VOICEBLUE is not set | ||
193 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
194 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
195 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
196 | # CONFIG_MACH_SX1 is not set | ||
197 | CONFIG_MACH_AMS_DELTA=y | ||
198 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
199 | |||
200 | # | ||
201 | # OMAP CPU Speed | ||
202 | # | ||
203 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
204 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
205 | CONFIG_OMAP_ARM_150MHZ=y | ||
206 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
207 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
208 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
209 | |||
210 | # | ||
211 | # Processor Type | ||
212 | # | ||
213 | CONFIG_CPU_32=y | ||
214 | CONFIG_CPU_ARM925T=y | ||
215 | CONFIG_CPU_32v4T=y | ||
216 | CONFIG_CPU_ABRT_EV4T=y | ||
217 | CONFIG_CPU_CACHE_V4WT=y | ||
218 | CONFIG_CPU_CACHE_VIVT=y | ||
219 | CONFIG_CPU_COPY_V4WB=y | ||
220 | CONFIG_CPU_TLB_V4WBI=y | ||
221 | CONFIG_CPU_CP15=y | ||
222 | CONFIG_CPU_CP15_MMU=y | ||
223 | |||
224 | # | ||
225 | # Processor Features | ||
226 | # | ||
227 | # CONFIG_ARM_THUMB is not set | ||
228 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
229 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
230 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | ||
231 | # CONFIG_OUTER_CACHE is not set | ||
232 | |||
233 | # | ||
234 | # Bus support | ||
235 | # | ||
236 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
237 | |||
238 | # | ||
239 | # PCCARD (PCMCIA/CardBus) support | ||
240 | # | ||
241 | # CONFIG_PCCARD is not set | ||
242 | |||
243 | # | ||
244 | # Kernel Features | ||
245 | # | ||
246 | # CONFIG_TICK_ONESHOT is not set | ||
247 | # CONFIG_NO_HZ is not set | ||
248 | # CONFIG_HIGH_RES_TIMERS is not set | ||
249 | CONFIG_PREEMPT=y | ||
250 | CONFIG_HZ=100 | ||
251 | # CONFIG_AEABI is not set | ||
252 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
253 | CONFIG_SELECT_MEMORY_MODEL=y | ||
254 | CONFIG_FLATMEM_MANUAL=y | ||
255 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
256 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
257 | CONFIG_FLATMEM=y | ||
258 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
259 | # CONFIG_SPARSEMEM_STATIC is not set | ||
260 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
261 | # CONFIG_RESOURCES_64BIT is not set | ||
262 | CONFIG_ZONE_DMA_FLAG=1 | ||
263 | # CONFIG_LEDS is not set | ||
264 | CONFIG_ALIGNMENT_TRAP=y | ||
265 | |||
266 | # | ||
267 | # Boot options | ||
268 | # | ||
269 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
270 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
271 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=/dev/ram0 initrd=0x11c00000,4M" | ||
272 | # CONFIG_XIP_KERNEL is not set | ||
273 | # CONFIG_KEXEC is not set | ||
274 | |||
275 | # | ||
276 | # CPU Frequency scaling | ||
277 | # | ||
278 | # CONFIG_CPU_FREQ is not set | ||
279 | |||
280 | # | ||
281 | # Floating point emulation | ||
282 | # | ||
283 | |||
284 | # | ||
285 | # At least one emulation must be selected | ||
286 | # | ||
287 | CONFIG_FPE_NWFPE=y | ||
288 | # CONFIG_FPE_NWFPE_XP is not set | ||
289 | # CONFIG_FPE_FASTFPE is not set | ||
290 | |||
291 | # | ||
292 | # Userspace binary formats | ||
293 | # | ||
294 | CONFIG_BINFMT_ELF=y | ||
295 | # CONFIG_BINFMT_AOUT is not set | ||
296 | # CONFIG_BINFMT_MISC is not set | ||
297 | # CONFIG_ARTHUR is not set | ||
298 | |||
299 | # | ||
300 | # Power management options | ||
301 | # | ||
302 | # CONFIG_PM is not set | ||
303 | |||
304 | # | ||
305 | # Networking | ||
306 | # | ||
307 | CONFIG_NET=y | ||
308 | |||
309 | # | ||
310 | # Networking options | ||
311 | # | ||
312 | CONFIG_PACKET=y | ||
313 | # CONFIG_PACKET_MMAP is not set | ||
314 | CONFIG_UNIX=y | ||
315 | CONFIG_XFRM=y | ||
316 | # CONFIG_XFRM_USER is not set | ||
317 | # CONFIG_XFRM_SUB_POLICY is not set | ||
318 | # CONFIG_XFRM_MIGRATE is not set | ||
319 | # CONFIG_NET_KEY is not set | ||
320 | CONFIG_INET=y | ||
321 | CONFIG_IP_MULTICAST=y | ||
322 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
323 | CONFIG_IP_FIB_HASH=y | ||
324 | # CONFIG_IP_PNP is not set | ||
325 | # CONFIG_NET_IPIP is not set | ||
326 | # CONFIG_NET_IPGRE is not set | ||
327 | # CONFIG_IP_MROUTE is not set | ||
328 | # CONFIG_ARPD is not set | ||
329 | # CONFIG_SYN_COOKIES is not set | ||
330 | # CONFIG_INET_AH is not set | ||
331 | # CONFIG_INET_ESP is not set | ||
332 | # CONFIG_INET_IPCOMP is not set | ||
333 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
334 | CONFIG_INET_TUNNEL=y | ||
335 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
336 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
337 | CONFIG_INET_XFRM_MODE_BEET=y | ||
338 | CONFIG_INET_DIAG=y | ||
339 | CONFIG_INET_TCP_DIAG=y | ||
340 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
341 | CONFIG_TCP_CONG_CUBIC=y | ||
342 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
343 | # CONFIG_TCP_MD5SIG is not set | ||
344 | CONFIG_IPV6=y | ||
345 | # CONFIG_IPV6_PRIVACY is not set | ||
346 | # CONFIG_IPV6_ROUTER_PREF is not set | ||
347 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | ||
348 | # CONFIG_INET6_AH is not set | ||
349 | # CONFIG_INET6_ESP is not set | ||
350 | # CONFIG_INET6_IPCOMP is not set | ||
351 | # CONFIG_IPV6_MIP6 is not set | ||
352 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
353 | # CONFIG_INET6_TUNNEL is not set | ||
354 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | ||
355 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | ||
356 | CONFIG_INET6_XFRM_MODE_BEET=y | ||
357 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | ||
358 | CONFIG_IPV6_SIT=y | ||
359 | # CONFIG_IPV6_TUNNEL is not set | ||
360 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | ||
361 | # CONFIG_NETWORK_SECMARK is not set | ||
362 | # CONFIG_NETFILTER is not set | ||
363 | |||
364 | # | ||
365 | # DCCP Configuration (EXPERIMENTAL) | ||
366 | # | ||
367 | # CONFIG_IP_DCCP is not set | ||
368 | |||
369 | # | ||
370 | # SCTP Configuration (EXPERIMENTAL) | ||
371 | # | ||
372 | # CONFIG_IP_SCTP is not set | ||
373 | |||
374 | # | ||
375 | # TIPC Configuration (EXPERIMENTAL) | ||
376 | # | ||
377 | # CONFIG_TIPC is not set | ||
378 | # CONFIG_ATM is not set | ||
379 | # CONFIG_BRIDGE is not set | ||
380 | # CONFIG_VLAN_8021Q is not set | ||
381 | # CONFIG_DECNET is not set | ||
382 | # CONFIG_LLC2 is not set | ||
383 | # CONFIG_IPX is not set | ||
384 | # CONFIG_ATALK is not set | ||
385 | # CONFIG_X25 is not set | ||
386 | # CONFIG_LAPB is not set | ||
387 | # CONFIG_ECONET is not set | ||
388 | # CONFIG_WAN_ROUTER is not set | ||
389 | |||
390 | # | ||
391 | # QoS and/or fair queueing | ||
392 | # | ||
393 | # CONFIG_NET_SCHED is not set | ||
394 | |||
395 | # | ||
396 | # Network testing | ||
397 | # | ||
398 | # CONFIG_NET_PKTGEN is not set | ||
399 | # CONFIG_HAMRADIO is not set | ||
400 | # CONFIG_IRDA is not set | ||
401 | # CONFIG_BT is not set | ||
402 | # CONFIG_AF_RXRPC is not set | ||
403 | |||
404 | # | ||
405 | # Wireless | ||
406 | # | ||
407 | # CONFIG_CFG80211 is not set | ||
408 | # CONFIG_WIRELESS_EXT is not set | ||
409 | # CONFIG_MAC80211 is not set | ||
410 | # CONFIG_IEEE80211 is not set | ||
411 | # CONFIG_RFKILL is not set | ||
412 | |||
413 | # | ||
414 | # Device Drivers | ||
415 | # | ||
416 | |||
417 | # | ||
418 | # Generic Driver Options | ||
419 | # | ||
420 | CONFIG_STANDALONE=y | ||
421 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
422 | # CONFIG_FW_LOADER is not set | ||
423 | # CONFIG_DEBUG_DRIVER is not set | ||
424 | # CONFIG_DEBUG_DEVRES is not set | ||
425 | # CONFIG_SYS_HYPERVISOR is not set | ||
426 | |||
427 | # | ||
428 | # Connector - unified userspace <-> kernelspace linker | ||
429 | # | ||
430 | # CONFIG_CONNECTOR is not set | ||
431 | CONFIG_MTD=y | ||
432 | # CONFIG_MTD_DEBUG is not set | ||
433 | # CONFIG_MTD_CONCAT is not set | ||
434 | CONFIG_MTD_PARTITIONS=y | ||
435 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
436 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
437 | # CONFIG_MTD_AFS_PARTS is not set | ||
438 | |||
439 | # | ||
440 | # User Modules And Translation Layers | ||
441 | # | ||
442 | CONFIG_MTD_CHAR=y | ||
443 | CONFIG_MTD_BLKDEVS=y | ||
444 | CONFIG_MTD_BLOCK=y | ||
445 | # CONFIG_FTL is not set | ||
446 | # CONFIG_NFTL is not set | ||
447 | # CONFIG_INFTL is not set | ||
448 | # CONFIG_RFD_FTL is not set | ||
449 | # CONFIG_SSFDC is not set | ||
450 | |||
451 | # | ||
452 | # RAM/ROM/Flash chip drivers | ||
453 | # | ||
454 | # CONFIG_MTD_CFI is not set | ||
455 | # CONFIG_MTD_JEDECPROBE is not set | ||
456 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
457 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
458 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
459 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
460 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
461 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
462 | CONFIG_MTD_CFI_I1=y | ||
463 | CONFIG_MTD_CFI_I2=y | ||
464 | # CONFIG_MTD_CFI_I4 is not set | ||
465 | # CONFIG_MTD_CFI_I8 is not set | ||
466 | # CONFIG_MTD_RAM is not set | ||
467 | # CONFIG_MTD_ROM is not set | ||
468 | # CONFIG_MTD_ABSENT is not set | ||
469 | |||
470 | # | ||
471 | # Mapping drivers for chip access | ||
472 | # | ||
473 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
474 | # CONFIG_MTD_PLATRAM is not set | ||
475 | |||
476 | # | ||
477 | # Self-contained MTD device drivers | ||
478 | # | ||
479 | # CONFIG_MTD_SLRAM is not set | ||
480 | # CONFIG_MTD_PHRAM is not set | ||
481 | # CONFIG_MTD_MTDRAM is not set | ||
482 | # CONFIG_MTD_BLOCK2MTD is not set | ||
483 | |||
484 | # | ||
485 | # Disk-On-Chip Device Drivers | ||
486 | # | ||
487 | # CONFIG_MTD_DOC2000 is not set | ||
488 | # CONFIG_MTD_DOC2001 is not set | ||
489 | # CONFIG_MTD_DOC2001PLUS is not set | ||
490 | CONFIG_MTD_NAND=y | ||
491 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
492 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
493 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
494 | CONFIG_MTD_NAND_AMS_DELTA=y | ||
495 | CONFIG_MTD_NAND_IDS=y | ||
496 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
497 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
498 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
499 | # CONFIG_MTD_ONENAND is not set | ||
500 | |||
501 | # | ||
502 | # UBI - Unsorted block images | ||
503 | # | ||
504 | # CONFIG_MTD_UBI is not set | ||
505 | |||
506 | # | ||
507 | # Parallel port support | ||
508 | # | ||
509 | # CONFIG_PARPORT is not set | ||
510 | |||
511 | # | ||
512 | # Plug and Play support | ||
513 | # | ||
514 | # CONFIG_PNPACPI is not set | ||
515 | |||
516 | # | ||
517 | # Block devices | ||
518 | # | ||
519 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
520 | CONFIG_BLK_DEV_LOOP=y | ||
521 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
522 | # CONFIG_BLK_DEV_NBD is not set | ||
523 | # CONFIG_BLK_DEV_UB is not set | ||
524 | CONFIG_BLK_DEV_RAM=y | ||
525 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
526 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
527 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
528 | # CONFIG_CDROM_PKTCDVD is not set | ||
529 | # CONFIG_ATA_OVER_ETH is not set | ||
530 | |||
531 | # | ||
532 | # SCSI device support | ||
533 | # | ||
534 | # CONFIG_RAID_ATTRS is not set | ||
535 | CONFIG_SCSI=y | ||
536 | # CONFIG_SCSI_TGT is not set | ||
537 | # CONFIG_SCSI_NETLINK is not set | ||
538 | CONFIG_SCSI_PROC_FS=y | ||
539 | |||
540 | # | ||
541 | # SCSI support type (disk, tape, CD-ROM) | ||
542 | # | ||
543 | CONFIG_BLK_DEV_SD=y | ||
544 | # CONFIG_CHR_DEV_ST is not set | ||
545 | # CONFIG_CHR_DEV_OSST is not set | ||
546 | # CONFIG_BLK_DEV_SR is not set | ||
547 | # CONFIG_CHR_DEV_SG is not set | ||
548 | # CONFIG_CHR_DEV_SCH is not set | ||
549 | |||
550 | # | ||
551 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
552 | # | ||
553 | # CONFIG_SCSI_MULTI_LUN is not set | ||
554 | # CONFIG_SCSI_CONSTANTS is not set | ||
555 | # CONFIG_SCSI_LOGGING is not set | ||
556 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
557 | CONFIG_SCSI_WAIT_SCAN=m | ||
558 | |||
559 | # | ||
560 | # SCSI Transports | ||
561 | # | ||
562 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
563 | # CONFIG_SCSI_FC_ATTRS is not set | ||
564 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
565 | # CONFIG_SCSI_SAS_ATTRS is not set | ||
566 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
567 | |||
568 | # | ||
569 | # SCSI low-level drivers | ||
570 | # | ||
571 | # CONFIG_ISCSI_TCP is not set | ||
572 | # CONFIG_SCSI_DEBUG is not set | ||
573 | # CONFIG_SCSI_ESP_CORE is not set | ||
574 | # CONFIG_ATA is not set | ||
575 | |||
576 | # | ||
577 | # Multi-device support (RAID and LVM) | ||
578 | # | ||
579 | # CONFIG_MD is not set | ||
580 | |||
581 | # | ||
582 | # Network device support | ||
583 | # | ||
584 | CONFIG_NETDEVICES=y | ||
585 | # CONFIG_DUMMY is not set | ||
586 | # CONFIG_BONDING is not set | ||
587 | # CONFIG_EQUALIZER is not set | ||
588 | # CONFIG_TUN is not set | ||
589 | # CONFIG_PHYLIB is not set | ||
590 | |||
591 | # | ||
592 | # Ethernet (10 or 100Mbit) | ||
593 | # | ||
594 | CONFIG_NET_ETHERNET=y | ||
595 | CONFIG_MII=y | ||
596 | # CONFIG_SMC91X is not set | ||
597 | # CONFIG_DM9000 is not set | ||
598 | CONFIG_NETDEV_1000=y | ||
599 | CONFIG_NETDEV_10000=y | ||
600 | |||
601 | # | ||
602 | # Token Ring devices | ||
603 | # | ||
604 | |||
605 | # | ||
606 | # Wireless LAN | ||
607 | # | ||
608 | # CONFIG_WLAN_PRE80211 is not set | ||
609 | # CONFIG_WLAN_80211 is not set | ||
610 | |||
611 | # | ||
612 | # USB Network Adapters | ||
613 | # | ||
614 | CONFIG_USB_CATC=y | ||
615 | CONFIG_USB_KAWETH=y | ||
616 | CONFIG_USB_PEGASUS=y | ||
617 | CONFIG_USB_RTL8150=y | ||
618 | CONFIG_USB_USBNET_MII=y | ||
619 | CONFIG_USB_USBNET=y | ||
620 | CONFIG_USB_NET_AX8817X=y | ||
621 | CONFIG_USB_NET_CDCETHER=y | ||
622 | # CONFIG_USB_NET_DM9601 is not set | ||
623 | # CONFIG_USB_NET_GL620A is not set | ||
624 | CONFIG_USB_NET_NET1080=y | ||
625 | # CONFIG_USB_NET_PLUSB is not set | ||
626 | # CONFIG_USB_NET_MCS7830 is not set | ||
627 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
628 | CONFIG_USB_NET_CDC_SUBSET=y | ||
629 | # CONFIG_USB_ALI_M5632 is not set | ||
630 | # CONFIG_USB_AN2720 is not set | ||
631 | CONFIG_USB_BELKIN=y | ||
632 | CONFIG_USB_ARMLINUX=y | ||
633 | # CONFIG_USB_EPSON2888 is not set | ||
634 | # CONFIG_USB_KC2190 is not set | ||
635 | CONFIG_USB_NET_ZAURUS=y | ||
636 | # CONFIG_WAN is not set | ||
637 | CONFIG_PPP=y | ||
638 | CONFIG_PPP_MULTILINK=y | ||
639 | # CONFIG_PPP_FILTER is not set | ||
640 | # CONFIG_PPP_ASYNC is not set | ||
641 | # CONFIG_PPP_SYNC_TTY is not set | ||
642 | # CONFIG_PPP_DEFLATE is not set | ||
643 | # CONFIG_PPP_BSDCOMP is not set | ||
644 | # CONFIG_PPP_MPPE is not set | ||
645 | # CONFIG_PPPOE is not set | ||
646 | # CONFIG_SLIP is not set | ||
647 | CONFIG_SLHC=y | ||
648 | # CONFIG_SHAPER is not set | ||
649 | # CONFIG_NETCONSOLE is not set | ||
650 | # CONFIG_NETPOLL is not set | ||
651 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
652 | |||
653 | # | ||
654 | # ISDN subsystem | ||
655 | # | ||
656 | # CONFIG_ISDN is not set | ||
657 | |||
658 | # | ||
659 | # Input device support | ||
660 | # | ||
661 | CONFIG_INPUT=y | ||
662 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
663 | |||
664 | # | ||
665 | # Userland interfaces | ||
666 | # | ||
667 | CONFIG_INPUT_MOUSEDEV=y | ||
668 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
669 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
670 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
671 | # CONFIG_INPUT_JOYDEV is not set | ||
672 | # CONFIG_INPUT_TSDEV is not set | ||
673 | # CONFIG_INPUT_EVDEV is not set | ||
674 | # CONFIG_INPUT_EVBUG is not set | ||
675 | |||
676 | # | ||
677 | # Input Device Drivers | ||
678 | # | ||
679 | CONFIG_INPUT_KEYBOARD=y | ||
680 | CONFIG_KEYBOARD_ATKBD=y | ||
681 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
682 | # CONFIG_KEYBOARD_LKKBD is not set | ||
683 | # CONFIG_KEYBOARD_XTKBD is not set | ||
684 | # CONFIG_KEYBOARD_NEWTON is not set | ||
685 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
686 | CONFIG_KEYBOARD_OMAP=y | ||
687 | # CONFIG_KEYBOARD_GPIO is not set | ||
688 | # CONFIG_INPUT_MOUSE is not set | ||
689 | # CONFIG_INPUT_JOYSTICK is not set | ||
690 | # CONFIG_INPUT_TABLET is not set | ||
691 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
692 | # CONFIG_INPUT_MISC is not set | ||
693 | |||
694 | # | ||
695 | # Hardware I/O ports | ||
696 | # | ||
697 | CONFIG_SERIO=y | ||
698 | CONFIG_SERIO_SERPORT=y | ||
699 | CONFIG_SERIO_LIBPS2=y | ||
700 | # CONFIG_SERIO_RAW is not set | ||
701 | # CONFIG_GAMEPORT is not set | ||
702 | |||
703 | # | ||
704 | # Character devices | ||
705 | # | ||
706 | CONFIG_VT=y | ||
707 | CONFIG_VT_CONSOLE=y | ||
708 | CONFIG_HW_CONSOLE=y | ||
709 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
710 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
711 | |||
712 | # | ||
713 | # Serial drivers | ||
714 | # | ||
715 | CONFIG_SERIAL_8250=y | ||
716 | CONFIG_SERIAL_8250_CONSOLE=y | ||
717 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
718 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
719 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
720 | |||
721 | # | ||
722 | # Non-8250 serial port support | ||
723 | # | ||
724 | CONFIG_SERIAL_CORE=y | ||
725 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
726 | CONFIG_UNIX98_PTYS=y | ||
727 | # CONFIG_LEGACY_PTYS is not set | ||
728 | |||
729 | # | ||
730 | # IPMI | ||
731 | # | ||
732 | # CONFIG_IPMI_HANDLER is not set | ||
733 | # CONFIG_WATCHDOG is not set | ||
734 | CONFIG_HW_RANDOM=y | ||
735 | # CONFIG_NVRAM is not set | ||
736 | # CONFIG_R3964 is not set | ||
737 | # CONFIG_RAW_DRIVER is not set | ||
738 | |||
739 | # | ||
740 | # TPM devices | ||
741 | # | ||
742 | # CONFIG_TCG_TPM is not set | ||
743 | CONFIG_I2C=y | ||
744 | CONFIG_I2C_BOARDINFO=y | ||
745 | CONFIG_I2C_CHARDEV=y | ||
746 | |||
747 | # | ||
748 | # I2C Algorithms | ||
749 | # | ||
750 | CONFIG_I2C_ALGOBIT=y | ||
751 | # CONFIG_I2C_ALGOPCF is not set | ||
752 | # CONFIG_I2C_ALGOPCA is not set | ||
753 | |||
754 | # | ||
755 | # I2C Hardware Bus support | ||
756 | # | ||
757 | # CONFIG_I2C_GPIO is not set | ||
758 | # CONFIG_I2C_OCORES is not set | ||
759 | CONFIG_I2C_OMAP=y | ||
760 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
761 | # CONFIG_I2C_SIMTEC is not set | ||
762 | # CONFIG_I2C_STUB is not set | ||
763 | # CONFIG_I2C_TINY_USB is not set | ||
764 | |||
765 | # | ||
766 | # Miscellaneous I2C Chip support | ||
767 | # | ||
768 | # CONFIG_SENSORS_DS1337 is not set | ||
769 | # CONFIG_SENSORS_DS1374 is not set | ||
770 | # CONFIG_SENSORS_EEPROM is not set | ||
771 | # CONFIG_SENSORS_PCF8574 is not set | ||
772 | # CONFIG_SENSORS_PCA9539 is not set | ||
773 | # CONFIG_SENSORS_PCF8591 is not set | ||
774 | # CONFIG_TPS65010 is not set | ||
775 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
776 | # CONFIG_SENSORS_MAX6875 is not set | ||
777 | # CONFIG_I2C_DEBUG_CORE is not set | ||
778 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
779 | # CONFIG_I2C_DEBUG_BUS is not set | ||
780 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
781 | |||
782 | # | ||
783 | # SPI support | ||
784 | # | ||
785 | # CONFIG_SPI is not set | ||
786 | # CONFIG_SPI_MASTER is not set | ||
787 | |||
788 | # | ||
789 | # Dallas's 1-wire bus | ||
790 | # | ||
791 | # CONFIG_W1 is not set | ||
792 | # CONFIG_HWMON is not set | ||
793 | |||
794 | # | ||
795 | # Misc devices | ||
796 | # | ||
797 | # CONFIG_BLINK is not set | ||
798 | |||
799 | # | ||
800 | # Multifunction device drivers | ||
801 | # | ||
802 | # CONFIG_MFD_SM501 is not set | ||
803 | |||
804 | # | ||
805 | # LED devices | ||
806 | # | ||
807 | CONFIG_NEW_LEDS=y | ||
808 | CONFIG_LEDS_CLASS=y | ||
809 | |||
810 | # | ||
811 | # LED drivers | ||
812 | # | ||
813 | CONFIG_LEDS_AMS_DELTA=y | ||
814 | # CONFIG_LEDS_OMAP_DEBUG is not set | ||
815 | # CONFIG_LEDS_OMAP is not set | ||
816 | |||
817 | # | ||
818 | # LED Triggers | ||
819 | # | ||
820 | CONFIG_LEDS_TRIGGERS=y | ||
821 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
822 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
823 | |||
824 | # | ||
825 | # Multimedia devices | ||
826 | # | ||
827 | # CONFIG_VIDEO_DEV is not set | ||
828 | # CONFIG_DVB_CORE is not set | ||
829 | CONFIG_DAB=y | ||
830 | # CONFIG_USB_DABUSB is not set | ||
831 | |||
832 | # | ||
833 | # Graphics support | ||
834 | # | ||
835 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
836 | |||
837 | # | ||
838 | # Display device support | ||
839 | # | ||
840 | # CONFIG_DISPLAY_SUPPORT is not set | ||
841 | # CONFIG_VGASTATE is not set | ||
842 | CONFIG_FB=y | ||
843 | CONFIG_FIRMWARE_EDID=y | ||
844 | # CONFIG_FB_DDC is not set | ||
845 | # CONFIG_FB_CFB_FILLRECT is not set | ||
846 | # CONFIG_FB_CFB_COPYAREA is not set | ||
847 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
848 | # CONFIG_FB_SYS_FILLRECT is not set | ||
849 | # CONFIG_FB_SYS_COPYAREA is not set | ||
850 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
851 | # CONFIG_FB_SYS_FOPS is not set | ||
852 | CONFIG_FB_DEFERRED_IO=y | ||
853 | # CONFIG_FB_SVGALIB is not set | ||
854 | # CONFIG_FB_MACMODES is not set | ||
855 | # CONFIG_FB_BACKLIGHT is not set | ||
856 | # CONFIG_FB_MODE_HELPERS is not set | ||
857 | # CONFIG_FB_TILEBLITTING is not set | ||
858 | |||
859 | # | ||
860 | # Frame buffer hardware drivers | ||
861 | # | ||
862 | # CONFIG_FB_S1D13XXX is not set | ||
863 | CONFIG_FB_OMAP=y | ||
864 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
865 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
866 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
867 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
868 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
869 | # CONFIG_FB_VIRTUAL is not set | ||
870 | |||
871 | # | ||
872 | # Console display driver support | ||
873 | # | ||
874 | # CONFIG_VGA_CONSOLE is not set | ||
875 | CONFIG_DUMMY_CONSOLE=y | ||
876 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
877 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
878 | CONFIG_FONTS=y | ||
879 | # CONFIG_FONT_8x8 is not set | ||
880 | # CONFIG_FONT_8x16 is not set | ||
881 | CONFIG_FONT_6x11=y | ||
882 | # CONFIG_FONT_7x14 is not set | ||
883 | # CONFIG_FONT_PEARL_8x8 is not set | ||
884 | # CONFIG_FONT_ACORN_8x8 is not set | ||
885 | # CONFIG_FONT_MINI_4x6 is not set | ||
886 | # CONFIG_FONT_CLEAN_4x6 is not set | ||
887 | # CONFIG_FONT_CLEAN_5x8 is not set | ||
888 | # CONFIG_FONT_SUN8x16 is not set | ||
889 | # CONFIG_FONT_SUN12x22 is not set | ||
890 | # CONFIG_FONT_10x18 is not set | ||
891 | CONFIG_LOGO=y | ||
892 | # CONFIG_LOGO_LINUX_MONO is not set | ||
893 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
894 | CONFIG_LOGO_LINUX_CLUT224=y | ||
895 | |||
896 | # | ||
897 | # Sound | ||
898 | # | ||
899 | # CONFIG_SOUND is not set | ||
900 | |||
901 | # | ||
902 | # HID Devices | ||
903 | # | ||
904 | CONFIG_HID=y | ||
905 | # CONFIG_HID_DEBUG is not set | ||
906 | |||
907 | # | ||
908 | # USB Input Devices | ||
909 | # | ||
910 | CONFIG_USB_HID=y | ||
911 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
912 | # CONFIG_HID_FF is not set | ||
913 | # CONFIG_USB_HIDDEV is not set | ||
914 | |||
915 | # | ||
916 | # USB support | ||
917 | # | ||
918 | CONFIG_USB_ARCH_HAS_HCD=y | ||
919 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
920 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
921 | CONFIG_USB=y | ||
922 | # CONFIG_USB_DEBUG is not set | ||
923 | |||
924 | # | ||
925 | # Miscellaneous USB options | ||
926 | # | ||
927 | CONFIG_USB_DEVICEFS=y | ||
928 | # CONFIG_USB_DEVICE_CLASS is not set | ||
929 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
930 | # CONFIG_USB_OTG is not set | ||
931 | |||
932 | # | ||
933 | # USB Host Controller Drivers | ||
934 | # | ||
935 | # CONFIG_USB_ISP116X_HCD is not set | ||
936 | CONFIG_USB_OHCI_HCD=y | ||
937 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
938 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
939 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
940 | # CONFIG_USB_SL811_HCD is not set | ||
941 | # CONFIG_USB_MUSB_HDRC is not set | ||
942 | |||
943 | # | ||
944 | # USB Device Class drivers | ||
945 | # | ||
946 | # CONFIG_USB_ACM is not set | ||
947 | # CONFIG_USB_PRINTER is not set | ||
948 | |||
949 | # | ||
950 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
951 | # | ||
952 | |||
953 | # | ||
954 | # may also be needed; see USB_STORAGE Help for more information | ||
955 | # | ||
956 | CONFIG_USB_STORAGE=y | ||
957 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
958 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
959 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
960 | # CONFIG_USB_STORAGE_DPCM is not set | ||
961 | # CONFIG_USB_STORAGE_USBAT is not set | ||
962 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
963 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
964 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
965 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
966 | # CONFIG_USB_STORAGE_KARMA is not set | ||
967 | # CONFIG_USB_LIBUSUAL is not set | ||
968 | |||
969 | # | ||
970 | # USB Imaging devices | ||
971 | # | ||
972 | # CONFIG_USB_MDC800 is not set | ||
973 | # CONFIG_USB_MICROTEK is not set | ||
974 | CONFIG_USB_MON=y | ||
975 | |||
976 | # | ||
977 | # USB port drivers | ||
978 | # | ||
979 | |||
980 | # | ||
981 | # USB Serial Converter support | ||
982 | # | ||
983 | # CONFIG_USB_SERIAL is not set | ||
984 | |||
985 | # | ||
986 | # USB Miscellaneous drivers | ||
987 | # | ||
988 | # CONFIG_USB_EMI62 is not set | ||
989 | # CONFIG_USB_EMI26 is not set | ||
990 | # CONFIG_USB_ADUTUX is not set | ||
991 | # CONFIG_USB_AUERSWALD is not set | ||
992 | # CONFIG_USB_RIO500 is not set | ||
993 | # CONFIG_USB_LEGOTOWER is not set | ||
994 | # CONFIG_USB_LCD is not set | ||
995 | # CONFIG_USB_BERRY_CHARGE is not set | ||
996 | # CONFIG_USB_LED is not set | ||
997 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
998 | # CONFIG_USB_CYTHERM is not set | ||
999 | # CONFIG_USB_PHIDGET is not set | ||
1000 | # CONFIG_USB_IDMOUSE is not set | ||
1001 | # CONFIG_USB_FTDI_ELAN is not set | ||
1002 | # CONFIG_USB_APPLEDISPLAY is not set | ||
1003 | # CONFIG_USB_LD is not set | ||
1004 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
1005 | # CONFIG_USB_IOWARRIOR is not set | ||
1006 | # CONFIG_USB_TEST is not set | ||
1007 | |||
1008 | # | ||
1009 | # USB DSL modem support | ||
1010 | # | ||
1011 | |||
1012 | # | ||
1013 | # USB Gadget Support | ||
1014 | # | ||
1015 | # CONFIG_USB_GADGET is not set | ||
1016 | # CONFIG_MMC is not set | ||
1017 | |||
1018 | # | ||
1019 | # Real Time Clock | ||
1020 | # | ||
1021 | CONFIG_RTC_LIB=y | ||
1022 | CONFIG_RTC_CLASS=y | ||
1023 | CONFIG_RTC_HCTOSYS=y | ||
1024 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
1025 | # CONFIG_RTC_DEBUG is not set | ||
1026 | |||
1027 | # | ||
1028 | # RTC interfaces | ||
1029 | # | ||
1030 | CONFIG_RTC_INTF_SYSFS=y | ||
1031 | CONFIG_RTC_INTF_PROC=y | ||
1032 | CONFIG_RTC_INTF_DEV=y | ||
1033 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
1034 | # CONFIG_RTC_DRV_TEST is not set | ||
1035 | |||
1036 | # | ||
1037 | # I2C RTC drivers | ||
1038 | # | ||
1039 | # CONFIG_RTC_DRV_DS1307 is not set | ||
1040 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1041 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1042 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1043 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1044 | # CONFIG_RTC_DRV_X1205 is not set | ||
1045 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1046 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1047 | |||
1048 | # | ||
1049 | # SPI RTC drivers | ||
1050 | # | ||
1051 | |||
1052 | # | ||
1053 | # Platform RTC drivers | ||
1054 | # | ||
1055 | # CONFIG_RTC_DRV_CMOS is not set | ||
1056 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1057 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1058 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1059 | # CONFIG_RTC_DRV_V3020 is not set | ||
1060 | |||
1061 | # | ||
1062 | # on-CPU RTC drivers | ||
1063 | # | ||
1064 | CONFIG_RTC_DRV_OMAP=y | ||
1065 | |||
1066 | # | ||
1067 | # CBUS support | ||
1068 | # | ||
1069 | # CONFIG_CBUS is not set | ||
1070 | |||
1071 | # | ||
1072 | # File systems | ||
1073 | # | ||
1074 | CONFIG_EXT2_FS=y | ||
1075 | # CONFIG_EXT2_FS_XATTR is not set | ||
1076 | # CONFIG_EXT2_FS_XIP is not set | ||
1077 | CONFIG_EXT3_FS=y | ||
1078 | CONFIG_EXT3_FS_XATTR=y | ||
1079 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
1080 | # CONFIG_EXT3_FS_SECURITY is not set | ||
1081 | # CONFIG_EXT4DEV_FS is not set | ||
1082 | CONFIG_JBD=y | ||
1083 | # CONFIG_JBD_DEBUG is not set | ||
1084 | CONFIG_FS_MBCACHE=y | ||
1085 | # CONFIG_REISERFS_FS is not set | ||
1086 | # CONFIG_JFS_FS is not set | ||
1087 | # CONFIG_FS_POSIX_ACL is not set | ||
1088 | # CONFIG_XFS_FS is not set | ||
1089 | # CONFIG_GFS2_FS is not set | ||
1090 | # CONFIG_OCFS2_FS is not set | ||
1091 | # CONFIG_MINIX_FS is not set | ||
1092 | # CONFIG_ROMFS_FS is not set | ||
1093 | CONFIG_INOTIFY=y | ||
1094 | CONFIG_INOTIFY_USER=y | ||
1095 | # CONFIG_QUOTA is not set | ||
1096 | CONFIG_DNOTIFY=y | ||
1097 | CONFIG_AUTOFS_FS=y | ||
1098 | CONFIG_AUTOFS4_FS=y | ||
1099 | # CONFIG_FUSE_FS is not set | ||
1100 | |||
1101 | # | ||
1102 | # CD-ROM/DVD Filesystems | ||
1103 | # | ||
1104 | # CONFIG_ISO9660_FS is not set | ||
1105 | # CONFIG_UDF_FS is not set | ||
1106 | |||
1107 | # | ||
1108 | # DOS/FAT/NT Filesystems | ||
1109 | # | ||
1110 | CONFIG_FAT_FS=y | ||
1111 | CONFIG_MSDOS_FS=y | ||
1112 | CONFIG_VFAT_FS=y | ||
1113 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1114 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1115 | # CONFIG_NTFS_FS is not set | ||
1116 | |||
1117 | # | ||
1118 | # Pseudo filesystems | ||
1119 | # | ||
1120 | CONFIG_PROC_FS=y | ||
1121 | CONFIG_PROC_SYSCTL=y | ||
1122 | CONFIG_SYSFS=y | ||
1123 | CONFIG_TMPFS=y | ||
1124 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
1125 | # CONFIG_HUGETLB_PAGE is not set | ||
1126 | CONFIG_RAMFS=y | ||
1127 | # CONFIG_CONFIGFS_FS is not set | ||
1128 | |||
1129 | # | ||
1130 | # Miscellaneous filesystems | ||
1131 | # | ||
1132 | # CONFIG_ADFS_FS is not set | ||
1133 | # CONFIG_AFFS_FS is not set | ||
1134 | # CONFIG_HFS_FS is not set | ||
1135 | # CONFIG_HFSPLUS_FS is not set | ||
1136 | # CONFIG_BEFS_FS is not set | ||
1137 | # CONFIG_BFS_FS is not set | ||
1138 | # CONFIG_EFS_FS is not set | ||
1139 | CONFIG_JFFS2_FS=y | ||
1140 | CONFIG_JFFS2_FS_DEBUG=0 | ||
1141 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
1142 | CONFIG_JFFS2_SUMMARY=y | ||
1143 | # CONFIG_JFFS2_FS_XATTR is not set | ||
1144 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
1145 | CONFIG_JFFS2_ZLIB=y | ||
1146 | CONFIG_JFFS2_RTIME=y | ||
1147 | # CONFIG_JFFS2_RUBIN is not set | ||
1148 | # CONFIG_CRAMFS is not set | ||
1149 | # CONFIG_VXFS_FS is not set | ||
1150 | # CONFIG_HPFS_FS is not set | ||
1151 | # CONFIG_QNX4FS_FS is not set | ||
1152 | # CONFIG_SYSV_FS is not set | ||
1153 | # CONFIG_UFS_FS is not set | ||
1154 | |||
1155 | # | ||
1156 | # Network File Systems | ||
1157 | # | ||
1158 | CONFIG_NFS_FS=y | ||
1159 | # CONFIG_NFS_V3 is not set | ||
1160 | # CONFIG_NFS_V4 is not set | ||
1161 | # CONFIG_NFS_DIRECTIO is not set | ||
1162 | # CONFIG_NFSD is not set | ||
1163 | CONFIG_LOCKD=y | ||
1164 | CONFIG_NFS_COMMON=y | ||
1165 | CONFIG_SUNRPC=y | ||
1166 | # CONFIG_SUNRPC_BIND34 is not set | ||
1167 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1168 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1169 | # CONFIG_SMB_FS is not set | ||
1170 | # CONFIG_CIFS is not set | ||
1171 | # CONFIG_NCP_FS is not set | ||
1172 | # CONFIG_CODA_FS is not set | ||
1173 | # CONFIG_AFS_FS is not set | ||
1174 | # CONFIG_9P_FS is not set | ||
1175 | |||
1176 | # | ||
1177 | # Partition Types | ||
1178 | # | ||
1179 | CONFIG_PARTITION_ADVANCED=y | ||
1180 | # CONFIG_ACORN_PARTITION is not set | ||
1181 | # CONFIG_OSF_PARTITION is not set | ||
1182 | # CONFIG_AMIGA_PARTITION is not set | ||
1183 | # CONFIG_ATARI_PARTITION is not set | ||
1184 | # CONFIG_MAC_PARTITION is not set | ||
1185 | CONFIG_MSDOS_PARTITION=y | ||
1186 | # CONFIG_BSD_DISKLABEL is not set | ||
1187 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1188 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1189 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
1190 | # CONFIG_LDM_PARTITION is not set | ||
1191 | # CONFIG_SGI_PARTITION is not set | ||
1192 | # CONFIG_ULTRIX_PARTITION is not set | ||
1193 | # CONFIG_SUN_PARTITION is not set | ||
1194 | # CONFIG_KARMA_PARTITION is not set | ||
1195 | # CONFIG_EFI_PARTITION is not set | ||
1196 | # CONFIG_SYSV68_PARTITION is not set | ||
1197 | |||
1198 | # | ||
1199 | # Native Language Support | ||
1200 | # | ||
1201 | CONFIG_NLS=y | ||
1202 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1203 | CONFIG_NLS_CODEPAGE_437=y | ||
1204 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1205 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1206 | CONFIG_NLS_CODEPAGE_850=y | ||
1207 | CONFIG_NLS_CODEPAGE_852=y | ||
1208 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1209 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1210 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1211 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1212 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1213 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1214 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1215 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1216 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1217 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1218 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1219 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1220 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1221 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1222 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1223 | # CONFIG_NLS_ISO8859_8 is not set | ||
1224 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1225 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1226 | # CONFIG_NLS_ASCII is not set | ||
1227 | CONFIG_NLS_ISO8859_1=y | ||
1228 | CONFIG_NLS_ISO8859_2=y | ||
1229 | # CONFIG_NLS_ISO8859_3 is not set | ||
1230 | # CONFIG_NLS_ISO8859_4 is not set | ||
1231 | # CONFIG_NLS_ISO8859_5 is not set | ||
1232 | # CONFIG_NLS_ISO8859_6 is not set | ||
1233 | # CONFIG_NLS_ISO8859_7 is not set | ||
1234 | # CONFIG_NLS_ISO8859_9 is not set | ||
1235 | # CONFIG_NLS_ISO8859_13 is not set | ||
1236 | # CONFIG_NLS_ISO8859_14 is not set | ||
1237 | # CONFIG_NLS_ISO8859_15 is not set | ||
1238 | # CONFIG_NLS_KOI8_R is not set | ||
1239 | # CONFIG_NLS_KOI8_U is not set | ||
1240 | # CONFIG_NLS_UTF8 is not set | ||
1241 | |||
1242 | # | ||
1243 | # Distributed Lock Manager | ||
1244 | # | ||
1245 | # CONFIG_DLM is not set | ||
1246 | |||
1247 | # | ||
1248 | # Profiling support | ||
1249 | # | ||
1250 | # CONFIG_PROFILING is not set | ||
1251 | |||
1252 | # | ||
1253 | # Kernel hacking | ||
1254 | # | ||
1255 | # CONFIG_PRINTK_TIME is not set | ||
1256 | CONFIG_ENABLE_MUST_CHECK=y | ||
1257 | CONFIG_MAGIC_SYSRQ=y | ||
1258 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1259 | # CONFIG_DEBUG_FS is not set | ||
1260 | # CONFIG_HEADERS_CHECK is not set | ||
1261 | CONFIG_DEBUG_KERNEL=y | ||
1262 | # CONFIG_DEBUG_SHIRQ is not set | ||
1263 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1264 | # CONFIG_SCHEDSTATS is not set | ||
1265 | # CONFIG_TIMER_STATS is not set | ||
1266 | # CONFIG_DEBUG_SLAB is not set | ||
1267 | CONFIG_DEBUG_PREEMPT=y | ||
1268 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1269 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1270 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1271 | # CONFIG_DEBUG_MUTEXES is not set | ||
1272 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1273 | # CONFIG_PROVE_LOCKING is not set | ||
1274 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1275 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1276 | # CONFIG_DEBUG_KOBJECT is not set | ||
1277 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1278 | # CONFIG_DEBUG_INFO is not set | ||
1279 | # CONFIG_DEBUG_VM is not set | ||
1280 | # CONFIG_DEBUG_LIST is not set | ||
1281 | CONFIG_FRAME_POINTER=y | ||
1282 | CONFIG_FORCED_INLINING=y | ||
1283 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1284 | # CONFIG_FAULT_INJECTION is not set | ||
1285 | # CONFIG_DEBUG_USER is not set | ||
1286 | # CONFIG_DEBUG_ERRORS is not set | ||
1287 | # CONFIG_DEBUG_LL is not set | ||
1288 | |||
1289 | # | ||
1290 | # Security options | ||
1291 | # | ||
1292 | # CONFIG_KEYS is not set | ||
1293 | # CONFIG_SECURITY is not set | ||
1294 | |||
1295 | # | ||
1296 | # Cryptographic options | ||
1297 | # | ||
1298 | # CONFIG_CRYPTO is not set | ||
1299 | |||
1300 | # | ||
1301 | # Library routines | ||
1302 | # | ||
1303 | CONFIG_BITREVERSE=y | ||
1304 | # CONFIG_CRC_CCITT is not set | ||
1305 | # CONFIG_CRC16 is not set | ||
1306 | # CONFIG_CRC_ITU_T is not set | ||
1307 | CONFIG_CRC32=y | ||
1308 | # CONFIG_LIBCRC32C is not set | ||
1309 | CONFIG_ZLIB_INFLATE=y | ||
1310 | CONFIG_ZLIB_DEFLATE=y | ||
1311 | CONFIG_PLIST=y | ||
1312 | CONFIG_HAS_IOMEM=y | ||
1313 | CONFIG_HAS_IOPORT=y | ||
1314 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/n770_defconfig b/arch/arm/configs/n770_defconfig new file mode 100644 index 000000000000..568ef1770d5f --- /dev/null +++ b/arch/arm/configs/n770_defconfig | |||
@@ -0,0 +1,1421 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.24-rc8-omap1 | ||
4 | # Fri Jan 18 10:21:06 2008 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
34 | CONFIG_LOCALVERSION="" | ||
35 | CONFIG_LOCALVERSION_AUTO=y | ||
36 | CONFIG_SWAP=y | ||
37 | CONFIG_SYSVIPC=y | ||
38 | CONFIG_SYSVIPC_SYSCTL=y | ||
39 | CONFIG_POSIX_MQUEUE=y | ||
40 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
41 | # CONFIG_TASKSTATS is not set | ||
42 | # CONFIG_USER_NS is not set | ||
43 | # CONFIG_PID_NS is not set | ||
44 | # CONFIG_AUDIT is not set | ||
45 | # CONFIG_IKCONFIG is not set | ||
46 | CONFIG_LOG_BUF_SHIFT=14 | ||
47 | # CONFIG_CGROUPS is not set | ||
48 | CONFIG_FAIR_GROUP_SCHED=y | ||
49 | CONFIG_FAIR_USER_SCHED=y | ||
50 | # CONFIG_FAIR_CGROUP_SCHED is not set | ||
51 | CONFIG_SYSFS_DEPRECATED=y | ||
52 | # CONFIG_RELAY is not set | ||
53 | # CONFIG_BLK_DEV_INITRD is not set | ||
54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
55 | CONFIG_SYSCTL=y | ||
56 | # CONFIG_EMBEDDED is not set | ||
57 | CONFIG_UID16=y | ||
58 | CONFIG_SYSCTL_SYSCALL=y | ||
59 | CONFIG_KALLSYMS=y | ||
60 | # CONFIG_KALLSYMS_ALL is not set | ||
61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
62 | CONFIG_HOTPLUG=y | ||
63 | CONFIG_PRINTK=y | ||
64 | CONFIG_BUG=y | ||
65 | CONFIG_ELF_CORE=y | ||
66 | CONFIG_BASE_FULL=y | ||
67 | CONFIG_FUTEX=y | ||
68 | CONFIG_ANON_INODES=y | ||
69 | CONFIG_EPOLL=y | ||
70 | CONFIG_SIGNALFD=y | ||
71 | CONFIG_EVENTFD=y | ||
72 | CONFIG_SHMEM=y | ||
73 | CONFIG_VM_EVENT_COUNTERS=y | ||
74 | CONFIG_SLAB=y | ||
75 | # CONFIG_SLUB is not set | ||
76 | # CONFIG_SLOB is not set | ||
77 | CONFIG_SLABINFO=y | ||
78 | CONFIG_RT_MUTEXES=y | ||
79 | # CONFIG_TINY_SHMEM is not set | ||
80 | CONFIG_BASE_SMALL=0 | ||
81 | CONFIG_MODULES=y | ||
82 | CONFIG_MODULE_UNLOAD=y | ||
83 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
84 | # CONFIG_MODVERSIONS is not set | ||
85 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
86 | # CONFIG_KMOD is not set | ||
87 | CONFIG_BLOCK=y | ||
88 | # CONFIG_LBD is not set | ||
89 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
90 | # CONFIG_LSF is not set | ||
91 | # CONFIG_BLK_DEV_BSG is not set | ||
92 | |||
93 | # | ||
94 | # IO Schedulers | ||
95 | # | ||
96 | CONFIG_IOSCHED_NOOP=y | ||
97 | # CONFIG_IOSCHED_AS is not set | ||
98 | # CONFIG_IOSCHED_DEADLINE is not set | ||
99 | CONFIG_IOSCHED_CFQ=y | ||
100 | # CONFIG_DEFAULT_AS is not set | ||
101 | # CONFIG_DEFAULT_DEADLINE is not set | ||
102 | CONFIG_DEFAULT_CFQ=y | ||
103 | # CONFIG_DEFAULT_NOOP is not set | ||
104 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
105 | |||
106 | # | ||
107 | # System Type | ||
108 | # | ||
109 | # CONFIG_ARCH_AAEC2000 is not set | ||
110 | # CONFIG_ARCH_INTEGRATOR is not set | ||
111 | # CONFIG_ARCH_REALVIEW is not set | ||
112 | # CONFIG_ARCH_VERSATILE is not set | ||
113 | # CONFIG_ARCH_AT91 is not set | ||
114 | # CONFIG_ARCH_CLPS7500 is not set | ||
115 | # CONFIG_ARCH_CLPS711X is not set | ||
116 | # CONFIG_ARCH_CO285 is not set | ||
117 | # CONFIG_ARCH_EBSA110 is not set | ||
118 | # CONFIG_ARCH_EP93XX is not set | ||
119 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
120 | # CONFIG_ARCH_NETX is not set | ||
121 | # CONFIG_ARCH_H720X is not set | ||
122 | # CONFIG_ARCH_IMX is not set | ||
123 | # CONFIG_ARCH_IOP13XX is not set | ||
124 | # CONFIG_ARCH_IOP32X is not set | ||
125 | # CONFIG_ARCH_IOP33X is not set | ||
126 | # CONFIG_ARCH_IXP23XX is not set | ||
127 | # CONFIG_ARCH_IXP2000 is not set | ||
128 | # CONFIG_ARCH_IXP4XX is not set | ||
129 | # CONFIG_ARCH_L7200 is not set | ||
130 | # CONFIG_ARCH_KS8695 is not set | ||
131 | # CONFIG_ARCH_NS9XXX is not set | ||
132 | # CONFIG_ARCH_MXC is not set | ||
133 | # CONFIG_ARCH_PNX4008 is not set | ||
134 | # CONFIG_ARCH_PXA is not set | ||
135 | # CONFIG_ARCH_RPC is not set | ||
136 | # CONFIG_ARCH_SA1100 is not set | ||
137 | # CONFIG_ARCH_S3C2410 is not set | ||
138 | # CONFIG_ARCH_SHARK is not set | ||
139 | # CONFIG_ARCH_LH7A40X is not set | ||
140 | # CONFIG_ARCH_DAVINCI is not set | ||
141 | CONFIG_ARCH_OMAP=y | ||
142 | |||
143 | # | ||
144 | # TI OMAP Implementations | ||
145 | # | ||
146 | CONFIG_ARCH_OMAP_OTG=y | ||
147 | CONFIG_ARCH_OMAP1=y | ||
148 | # CONFIG_ARCH_OMAP2 is not set | ||
149 | # CONFIG_ARCH_OMAP3 is not set | ||
150 | |||
151 | # | ||
152 | # OMAP Feature Selections | ||
153 | # | ||
154 | CONFIG_OMAP_DEBUG_SRAM_PATCH=y | ||
155 | CONFIG_OMAP_RESET_CLOCKS=y | ||
156 | CONFIG_OMAP_BOOT_TAG=y | ||
157 | CONFIG_OMAP_BOOT_REASON=y | ||
158 | CONFIG_OMAP_COMPONENT_VERSION=y | ||
159 | CONFIG_OMAP_GPIO_SWITCH=y | ||
160 | # CONFIG_OMAP_MUX is not set | ||
161 | CONFIG_OMAP_STI=y | ||
162 | CONFIG_OMAP_STI_CONSOLE=y | ||
163 | CONFIG_OMAP_MCBSP=y | ||
164 | CONFIG_OMAP_MMU_FWK=y | ||
165 | CONFIG_OMAP_MBOX_FWK=y | ||
166 | # CONFIG_OMAP_MPU_TIMER is not set | ||
167 | CONFIG_OMAP_32K_TIMER=y | ||
168 | CONFIG_OMAP_32K_TIMER_HZ=128 | ||
169 | CONFIG_OMAP_DM_TIMER=y | ||
170 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
171 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
172 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
173 | |||
174 | # | ||
175 | # OMAP Core Type | ||
176 | # | ||
177 | # CONFIG_ARCH_OMAP730 is not set | ||
178 | # CONFIG_ARCH_OMAP15XX is not set | ||
179 | CONFIG_ARCH_OMAP16XX=y | ||
180 | |||
181 | # | ||
182 | # OMAP Board Type | ||
183 | # | ||
184 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
185 | # CONFIG_MACH_OMAP_H2 is not set | ||
186 | # CONFIG_MACH_OMAP_H3 is not set | ||
187 | # CONFIG_MACH_OMAP_OSK is not set | ||
188 | CONFIG_MACH_NOKIA770=y | ||
189 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
190 | |||
191 | # | ||
192 | # OMAP CPU Speed | ||
193 | # | ||
194 | CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | ||
195 | CONFIG_OMAP_ARM_216MHZ=y | ||
196 | # CONFIG_OMAP_ARM_192MHZ is not set | ||
197 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
198 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
199 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
200 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
201 | |||
202 | # | ||
203 | # Boot options | ||
204 | # | ||
205 | |||
206 | # | ||
207 | # Power management | ||
208 | # | ||
209 | |||
210 | # | ||
211 | # Processor Type | ||
212 | # | ||
213 | CONFIG_CPU_32=y | ||
214 | CONFIG_CPU_ARM926T=y | ||
215 | CONFIG_CPU_32v5=y | ||
216 | CONFIG_CPU_ABRT_EV5TJ=y | ||
217 | CONFIG_CPU_PABRT_NOIFAR=y | ||
218 | CONFIG_CPU_CACHE_VIVT=y | ||
219 | CONFIG_CPU_COPY_V4WB=y | ||
220 | CONFIG_CPU_TLB_V4WBI=y | ||
221 | CONFIG_CPU_CP15=y | ||
222 | CONFIG_CPU_CP15_MMU=y | ||
223 | |||
224 | # | ||
225 | # Processor Features | ||
226 | # | ||
227 | CONFIG_ARM_THUMB=y | ||
228 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
229 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
230 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
231 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
232 | # CONFIG_OUTER_CACHE is not set | ||
233 | |||
234 | # | ||
235 | # Bus support | ||
236 | # | ||
237 | # CONFIG_PCI_SYSCALL is not set | ||
238 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
239 | # CONFIG_PCCARD is not set | ||
240 | |||
241 | # | ||
242 | # Kernel Features | ||
243 | # | ||
244 | # CONFIG_TICK_ONESHOT is not set | ||
245 | # CONFIG_NO_HZ is not set | ||
246 | # CONFIG_HIGH_RES_TIMERS is not set | ||
247 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
248 | # CONFIG_PREEMPT is not set | ||
249 | CONFIG_HZ=128 | ||
250 | # CONFIG_AEABI is not set | ||
251 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
252 | CONFIG_SELECT_MEMORY_MODEL=y | ||
253 | CONFIG_FLATMEM_MANUAL=y | ||
254 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
255 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
256 | CONFIG_FLATMEM=y | ||
257 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
258 | # CONFIG_SPARSEMEM_STATIC is not set | ||
259 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
260 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
261 | # CONFIG_RESOURCES_64BIT is not set | ||
262 | CONFIG_ZONE_DMA_FLAG=1 | ||
263 | CONFIG_BOUNCE=y | ||
264 | CONFIG_VIRT_TO_BUS=y | ||
265 | # CONFIG_LEDS is not set | ||
266 | CONFIG_ALIGNMENT_TRAP=y | ||
267 | |||
268 | # | ||
269 | # Boot options | ||
270 | # | ||
271 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
272 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
273 | CONFIG_CMDLINE="root=1f03 rootfstype=jffs2 time" | ||
274 | # CONFIG_XIP_KERNEL is not set | ||
275 | # CONFIG_KEXEC is not set | ||
276 | |||
277 | # | ||
278 | # CPU Frequency scaling | ||
279 | # | ||
280 | # CONFIG_CPU_FREQ is not set | ||
281 | |||
282 | # | ||
283 | # Floating point emulation | ||
284 | # | ||
285 | |||
286 | # | ||
287 | # At least one emulation must be selected | ||
288 | # | ||
289 | CONFIG_FPE_NWFPE=y | ||
290 | # CONFIG_FPE_NWFPE_XP is not set | ||
291 | # CONFIG_FPE_FASTFPE is not set | ||
292 | # CONFIG_VFP is not set | ||
293 | |||
294 | # | ||
295 | # Userspace binary formats | ||
296 | # | ||
297 | CONFIG_BINFMT_ELF=y | ||
298 | # CONFIG_BINFMT_AOUT is not set | ||
299 | # CONFIG_BINFMT_MISC is not set | ||
300 | # CONFIG_ARTHUR is not set | ||
301 | |||
302 | # | ||
303 | # Power management options | ||
304 | # | ||
305 | CONFIG_PM=y | ||
306 | # CONFIG_PM_LEGACY is not set | ||
307 | # CONFIG_PM_DEBUG is not set | ||
308 | CONFIG_PM_SLEEP=y | ||
309 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
310 | CONFIG_SUSPEND=y | ||
311 | # CONFIG_APM_EMULATION is not set | ||
312 | |||
313 | # | ||
314 | # Networking | ||
315 | # | ||
316 | CONFIG_NET=y | ||
317 | |||
318 | # | ||
319 | # Networking options | ||
320 | # | ||
321 | CONFIG_PACKET=y | ||
322 | # CONFIG_PACKET_MMAP is not set | ||
323 | CONFIG_UNIX=y | ||
324 | CONFIG_XFRM=y | ||
325 | # CONFIG_XFRM_USER is not set | ||
326 | # CONFIG_XFRM_SUB_POLICY is not set | ||
327 | # CONFIG_XFRM_MIGRATE is not set | ||
328 | # CONFIG_NET_KEY is not set | ||
329 | CONFIG_INET=y | ||
330 | CONFIG_IP_MULTICAST=y | ||
331 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
332 | CONFIG_IP_FIB_HASH=y | ||
333 | CONFIG_IP_PNP=y | ||
334 | CONFIG_IP_PNP_DHCP=y | ||
335 | CONFIG_IP_PNP_BOOTP=y | ||
336 | # CONFIG_IP_PNP_RARP is not set | ||
337 | # CONFIG_NET_IPIP is not set | ||
338 | # CONFIG_NET_IPGRE is not set | ||
339 | # CONFIG_IP_MROUTE is not set | ||
340 | # CONFIG_ARPD is not set | ||
341 | # CONFIG_SYN_COOKIES is not set | ||
342 | # CONFIG_INET_AH is not set | ||
343 | # CONFIG_INET_ESP is not set | ||
344 | # CONFIG_INET_IPCOMP is not set | ||
345 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
346 | # CONFIG_INET_TUNNEL is not set | ||
347 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
348 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
349 | CONFIG_INET_XFRM_MODE_BEET=y | ||
350 | # CONFIG_INET_LRO is not set | ||
351 | # CONFIG_INET_DIAG is not set | ||
352 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
353 | CONFIG_TCP_CONG_CUBIC=y | ||
354 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
355 | # CONFIG_TCP_MD5SIG is not set | ||
356 | # CONFIG_IP_VS is not set | ||
357 | # CONFIG_IPV6 is not set | ||
358 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
359 | # CONFIG_INET6_TUNNEL is not set | ||
360 | # CONFIG_NETLABEL is not set | ||
361 | # CONFIG_NETWORK_SECMARK is not set | ||
362 | CONFIG_NETFILTER=y | ||
363 | # CONFIG_NETFILTER_DEBUG is not set | ||
364 | |||
365 | # | ||
366 | # Core Netfilter Configuration | ||
367 | # | ||
368 | CONFIG_NETFILTER_NETLINK=y | ||
369 | # CONFIG_NETFILTER_NETLINK_QUEUE is not set | ||
370 | # CONFIG_NETFILTER_NETLINK_LOG is not set | ||
371 | # CONFIG_NF_CONNTRACK_ENABLED is not set | ||
372 | # CONFIG_NF_CONNTRACK is not set | ||
373 | # CONFIG_NETFILTER_XTABLES is not set | ||
374 | |||
375 | # | ||
376 | # IP: Netfilter Configuration | ||
377 | # | ||
378 | # CONFIG_IP_NF_QUEUE is not set | ||
379 | # CONFIG_IP_NF_IPTABLES is not set | ||
380 | # CONFIG_IP_NF_ARPTABLES is not set | ||
381 | # CONFIG_IP_DCCP is not set | ||
382 | # CONFIG_IP_SCTP is not set | ||
383 | # CONFIG_TIPC is not set | ||
384 | # CONFIG_ATM is not set | ||
385 | # CONFIG_BRIDGE is not set | ||
386 | # CONFIG_VLAN_8021Q is not set | ||
387 | # CONFIG_DECNET is not set | ||
388 | # CONFIG_LLC2 is not set | ||
389 | # CONFIG_IPX is not set | ||
390 | # CONFIG_ATALK is not set | ||
391 | # CONFIG_X25 is not set | ||
392 | # CONFIG_LAPB is not set | ||
393 | # CONFIG_ECONET is not set | ||
394 | # CONFIG_WAN_ROUTER is not set | ||
395 | # CONFIG_NET_SCHED is not set | ||
396 | |||
397 | # | ||
398 | # Network testing | ||
399 | # | ||
400 | # CONFIG_NET_PKTGEN is not set | ||
401 | # CONFIG_HAMRADIO is not set | ||
402 | # CONFIG_IRDA is not set | ||
403 | CONFIG_BT=y | ||
404 | CONFIG_BT_L2CAP=y | ||
405 | CONFIG_BT_SCO=y | ||
406 | CONFIG_BT_RFCOMM=y | ||
407 | CONFIG_BT_RFCOMM_TTY=y | ||
408 | CONFIG_BT_BNEP=y | ||
409 | # CONFIG_BT_BNEP_MC_FILTER is not set | ||
410 | # CONFIG_BT_BNEP_PROTO_FILTER is not set | ||
411 | CONFIG_BT_HIDP=y | ||
412 | |||
413 | # | ||
414 | # Bluetooth device drivers | ||
415 | # | ||
416 | # CONFIG_BT_HCIUSB is not set | ||
417 | # CONFIG_BT_HCIBTUSB is not set | ||
418 | # CONFIG_BT_HCIBTSDIO is not set | ||
419 | # CONFIG_BT_HCIUART is not set | ||
420 | # CONFIG_BT_HCIBCM203X is not set | ||
421 | # CONFIG_BT_HCIBPA10X is not set | ||
422 | # CONFIG_BT_HCIBFUSB is not set | ||
423 | CONFIG_BT_HCIBRF6150=y | ||
424 | # CONFIG_BT_HCIH4P is not set | ||
425 | # CONFIG_BT_HCIVHCI is not set | ||
426 | # CONFIG_AF_RXRPC is not set | ||
427 | |||
428 | # | ||
429 | # Wireless | ||
430 | # | ||
431 | # CONFIG_CFG80211 is not set | ||
432 | # CONFIG_WIRELESS_EXT is not set | ||
433 | # CONFIG_MAC80211 is not set | ||
434 | # CONFIG_IEEE80211 is not set | ||
435 | # CONFIG_RFKILL is not set | ||
436 | # CONFIG_NET_9P is not set | ||
437 | |||
438 | # | ||
439 | # Device Drivers | ||
440 | # | ||
441 | |||
442 | # | ||
443 | # Generic Driver Options | ||
444 | # | ||
445 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
446 | CONFIG_STANDALONE=y | ||
447 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
448 | CONFIG_FW_LOADER=y | ||
449 | # CONFIG_DEBUG_DRIVER is not set | ||
450 | # CONFIG_DEBUG_DEVRES is not set | ||
451 | # CONFIG_SYS_HYPERVISOR is not set | ||
452 | CONFIG_CONNECTOR=y | ||
453 | # CONFIG_PROC_EVENTS is not set | ||
454 | CONFIG_MTD=y | ||
455 | # CONFIG_MTD_DEBUG is not set | ||
456 | # CONFIG_MTD_CONCAT is not set | ||
457 | CONFIG_MTD_PARTITIONS=y | ||
458 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
459 | CONFIG_MTD_CMDLINE_PARTS=y | ||
460 | # CONFIG_MTD_AFS_PARTS is not set | ||
461 | |||
462 | # | ||
463 | # User Modules And Translation Layers | ||
464 | # | ||
465 | CONFIG_MTD_CHAR=y | ||
466 | CONFIG_MTD_BLKDEVS=y | ||
467 | CONFIG_MTD_BLOCK=y | ||
468 | # CONFIG_FTL is not set | ||
469 | # CONFIG_NFTL is not set | ||
470 | # CONFIG_INFTL is not set | ||
471 | # CONFIG_RFD_FTL is not set | ||
472 | # CONFIG_SSFDC is not set | ||
473 | # CONFIG_MTD_OOPS is not set | ||
474 | |||
475 | # | ||
476 | # RAM/ROM/Flash chip drivers | ||
477 | # | ||
478 | # CONFIG_MTD_CFI is not set | ||
479 | # CONFIG_MTD_JEDECPROBE is not set | ||
480 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
481 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
482 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
483 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
484 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
485 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
486 | CONFIG_MTD_CFI_I1=y | ||
487 | CONFIG_MTD_CFI_I2=y | ||
488 | # CONFIG_MTD_CFI_I4 is not set | ||
489 | # CONFIG_MTD_CFI_I8 is not set | ||
490 | # CONFIG_MTD_RAM is not set | ||
491 | # CONFIG_MTD_ROM is not set | ||
492 | # CONFIG_MTD_ABSENT is not set | ||
493 | |||
494 | # | ||
495 | # Mapping drivers for chip access | ||
496 | # | ||
497 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
498 | # CONFIG_MTD_PLATRAM is not set | ||
499 | |||
500 | # | ||
501 | # Self-contained MTD device drivers | ||
502 | # | ||
503 | # CONFIG_MTD_DATAFLASH is not set | ||
504 | # CONFIG_MTD_M25P80 is not set | ||
505 | # CONFIG_MTD_SLRAM is not set | ||
506 | # CONFIG_MTD_PHRAM is not set | ||
507 | # CONFIG_MTD_MTDRAM is not set | ||
508 | # CONFIG_MTD_BLOCK2MTD is not set | ||
509 | |||
510 | # | ||
511 | # Disk-On-Chip Device Drivers | ||
512 | # | ||
513 | # CONFIG_MTD_DOC2000 is not set | ||
514 | # CONFIG_MTD_DOC2001 is not set | ||
515 | # CONFIG_MTD_DOC2001PLUS is not set | ||
516 | CONFIG_MTD_NAND=y | ||
517 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
518 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
519 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
520 | CONFIG_MTD_NAND_OMAP_HW=y | ||
521 | CONFIG_MTD_NAND_IDS=y | ||
522 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
523 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
524 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
525 | # CONFIG_MTD_ALAUDA is not set | ||
526 | # CONFIG_MTD_ONENAND is not set | ||
527 | |||
528 | # | ||
529 | # UBI - Unsorted block images | ||
530 | # | ||
531 | # CONFIG_MTD_UBI is not set | ||
532 | # CONFIG_PARPORT is not set | ||
533 | CONFIG_BLK_DEV=y | ||
534 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
535 | CONFIG_BLK_DEV_LOOP=y | ||
536 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
537 | # CONFIG_BLK_DEV_NBD is not set | ||
538 | # CONFIG_BLK_DEV_UB is not set | ||
539 | # CONFIG_BLK_DEV_RAM is not set | ||
540 | # CONFIG_CDROM_PKTCDVD is not set | ||
541 | # CONFIG_ATA_OVER_ETH is not set | ||
542 | CONFIG_MISC_DEVICES=y | ||
543 | # CONFIG_EEPROM_93CX6 is not set | ||
544 | |||
545 | # | ||
546 | # SCSI device support | ||
547 | # | ||
548 | # CONFIG_RAID_ATTRS is not set | ||
549 | CONFIG_SCSI=y | ||
550 | CONFIG_SCSI_DMA=y | ||
551 | # CONFIG_SCSI_TGT is not set | ||
552 | # CONFIG_SCSI_NETLINK is not set | ||
553 | # CONFIG_SCSI_PROC_FS is not set | ||
554 | |||
555 | # | ||
556 | # SCSI support type (disk, tape, CD-ROM) | ||
557 | # | ||
558 | CONFIG_BLK_DEV_SD=y | ||
559 | # CONFIG_CHR_DEV_ST is not set | ||
560 | # CONFIG_CHR_DEV_OSST is not set | ||
561 | # CONFIG_BLK_DEV_SR is not set | ||
562 | # CONFIG_CHR_DEV_SG is not set | ||
563 | # CONFIG_CHR_DEV_SCH is not set | ||
564 | |||
565 | # | ||
566 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
567 | # | ||
568 | # CONFIG_SCSI_MULTI_LUN is not set | ||
569 | # CONFIG_SCSI_CONSTANTS is not set | ||
570 | # CONFIG_SCSI_LOGGING is not set | ||
571 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
572 | CONFIG_SCSI_WAIT_SCAN=m | ||
573 | |||
574 | # | ||
575 | # SCSI Transports | ||
576 | # | ||
577 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
578 | # CONFIG_SCSI_FC_ATTRS is not set | ||
579 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
580 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
581 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
582 | CONFIG_SCSI_LOWLEVEL=y | ||
583 | # CONFIG_ISCSI_TCP is not set | ||
584 | # CONFIG_SCSI_DEBUG is not set | ||
585 | # CONFIG_ATA is not set | ||
586 | # CONFIG_MD is not set | ||
587 | CONFIG_NETDEVICES=y | ||
588 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
589 | # CONFIG_DUMMY is not set | ||
590 | # CONFIG_BONDING is not set | ||
591 | # CONFIG_MACVLAN is not set | ||
592 | # CONFIG_EQUALIZER is not set | ||
593 | CONFIG_TUN=y | ||
594 | # CONFIG_VETH is not set | ||
595 | # CONFIG_PHYLIB is not set | ||
596 | CONFIG_NET_ETHERNET=y | ||
597 | CONFIG_MII=y | ||
598 | # CONFIG_AX88796 is not set | ||
599 | # CONFIG_SMC91X is not set | ||
600 | # CONFIG_DM9000 is not set | ||
601 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
602 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
603 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
604 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
605 | # CONFIG_B44 is not set | ||
606 | CONFIG_NETDEV_1000=y | ||
607 | CONFIG_NETDEV_10000=y | ||
608 | |||
609 | # | ||
610 | # Wireless LAN | ||
611 | # | ||
612 | # CONFIG_WLAN_PRE80211 is not set | ||
613 | # CONFIG_WLAN_80211 is not set | ||
614 | |||
615 | # | ||
616 | # USB Network Adapters | ||
617 | # | ||
618 | # CONFIG_USB_CATC is not set | ||
619 | # CONFIG_USB_KAWETH is not set | ||
620 | # CONFIG_USB_PEGASUS is not set | ||
621 | # CONFIG_USB_RTL8150 is not set | ||
622 | CONFIG_USB_USBNET=y | ||
623 | # CONFIG_USB_NET_AX8817X is not set | ||
624 | CONFIG_USB_NET_CDCETHER=y | ||
625 | # CONFIG_USB_NET_DM9601 is not set | ||
626 | # CONFIG_USB_NET_GL620A is not set | ||
627 | CONFIG_USB_NET_NET1080=y | ||
628 | # CONFIG_USB_NET_PLUSB is not set | ||
629 | # CONFIG_USB_NET_MCS7830 is not set | ||
630 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
631 | # CONFIG_USB_NET_CDC_SUBSET is not set | ||
632 | CONFIG_USB_NET_ZAURUS=y | ||
633 | # CONFIG_WAN is not set | ||
634 | CONFIG_PPP=y | ||
635 | # CONFIG_PPP_MULTILINK is not set | ||
636 | CONFIG_PPP_FILTER=y | ||
637 | CONFIG_PPP_ASYNC=y | ||
638 | # CONFIG_PPP_SYNC_TTY is not set | ||
639 | CONFIG_PPP_DEFLATE=y | ||
640 | CONFIG_PPP_BSDCOMP=y | ||
641 | # CONFIG_PPP_MPPE is not set | ||
642 | # CONFIG_PPPOE is not set | ||
643 | # CONFIG_PPPOL2TP is not set | ||
644 | # CONFIG_SLIP is not set | ||
645 | CONFIG_SLHC=y | ||
646 | # CONFIG_SHAPER is not set | ||
647 | # CONFIG_NETCONSOLE is not set | ||
648 | # CONFIG_NETPOLL is not set | ||
649 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
650 | # CONFIG_ISDN is not set | ||
651 | |||
652 | # | ||
653 | # Input device support | ||
654 | # | ||
655 | CONFIG_INPUT=y | ||
656 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
657 | # CONFIG_INPUT_POLLDEV is not set | ||
658 | |||
659 | # | ||
660 | # Userland interfaces | ||
661 | # | ||
662 | CONFIG_INPUT_MOUSEDEV=y | ||
663 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
664 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
665 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
666 | # CONFIG_INPUT_JOYDEV is not set | ||
667 | CONFIG_INPUT_EVDEV=y | ||
668 | # CONFIG_INPUT_EVBUG is not set | ||
669 | |||
670 | # | ||
671 | # Input Device Drivers | ||
672 | # | ||
673 | CONFIG_INPUT_KEYBOARD=y | ||
674 | # CONFIG_KEYBOARD_ATKBD is not set | ||
675 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
676 | # CONFIG_KEYBOARD_LKKBD is not set | ||
677 | # CONFIG_KEYBOARD_XTKBD is not set | ||
678 | # CONFIG_KEYBOARD_NEWTON is not set | ||
679 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
680 | CONFIG_KEYBOARD_OMAP=y | ||
681 | # CONFIG_KEYBOARD_GPIO is not set | ||
682 | # CONFIG_INPUT_MOUSE is not set | ||
683 | # CONFIG_INPUT_JOYSTICK is not set | ||
684 | # CONFIG_INPUT_TABLET is not set | ||
685 | CONFIG_INPUT_TOUCHSCREEN=y | ||
686 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
687 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
688 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
689 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
690 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
691 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
692 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
693 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
694 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
695 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
696 | # CONFIG_TOUCHSCREEN_TSC2102 is not set | ||
697 | # CONFIG_TOUCHSCREEN_TSC210X is not set | ||
698 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
699 | # CONFIG_INPUT_MISC is not set | ||
700 | |||
701 | # | ||
702 | # Hardware I/O ports | ||
703 | # | ||
704 | CONFIG_SERIO=y | ||
705 | CONFIG_SERIO_SERPORT=y | ||
706 | # CONFIG_SERIO_RAW is not set | ||
707 | # CONFIG_GAMEPORT is not set | ||
708 | |||
709 | # | ||
710 | # Character devices | ||
711 | # | ||
712 | CONFIG_VT=y | ||
713 | CONFIG_VT_CONSOLE=y | ||
714 | CONFIG_HW_CONSOLE=y | ||
715 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
716 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
717 | |||
718 | # | ||
719 | # Serial drivers | ||
720 | # | ||
721 | CONFIG_SERIAL_8250=y | ||
722 | CONFIG_SERIAL_8250_CONSOLE=y | ||
723 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
724 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
725 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
726 | |||
727 | # | ||
728 | # Non-8250 serial port support | ||
729 | # | ||
730 | CONFIG_SERIAL_CORE=y | ||
731 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
732 | CONFIG_UNIX98_PTYS=y | ||
733 | # CONFIG_LEGACY_PTYS is not set | ||
734 | # CONFIG_IPMI_HANDLER is not set | ||
735 | CONFIG_HW_RANDOM=m | ||
736 | CONFIG_HW_RANDOM_OMAP=m | ||
737 | # CONFIG_NVRAM is not set | ||
738 | # CONFIG_R3964 is not set | ||
739 | # CONFIG_RAW_DRIVER is not set | ||
740 | # CONFIG_TCG_TPM is not set | ||
741 | CONFIG_I2C=y | ||
742 | CONFIG_I2C_BOARDINFO=y | ||
743 | # CONFIG_I2C_CHARDEV is not set | ||
744 | |||
745 | # | ||
746 | # I2C Algorithms | ||
747 | # | ||
748 | # CONFIG_I2C_ALGOBIT is not set | ||
749 | # CONFIG_I2C_ALGOPCF is not set | ||
750 | # CONFIG_I2C_ALGOPCA is not set | ||
751 | |||
752 | # | ||
753 | # I2C Hardware Bus support | ||
754 | # | ||
755 | # CONFIG_I2C_GPIO is not set | ||
756 | # CONFIG_I2C_OCORES is not set | ||
757 | CONFIG_I2C_OMAP=y | ||
758 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
759 | # CONFIG_I2C_SIMTEC is not set | ||
760 | # CONFIG_I2C_TAOS_EVM is not set | ||
761 | # CONFIG_I2C_STUB is not set | ||
762 | # CONFIG_I2C_TINY_USB is not set | ||
763 | |||
764 | # | ||
765 | # Miscellaneous I2C Chip support | ||
766 | # | ||
767 | # CONFIG_SENSORS_DS1337 is not set | ||
768 | # CONFIG_SENSORS_DS1374 is not set | ||
769 | # CONFIG_DS1682 is not set | ||
770 | # CONFIG_SENSORS_EEPROM is not set | ||
771 | # CONFIG_SENSORS_PCF8574 is not set | ||
772 | # CONFIG_SENSORS_PCA9539 is not set | ||
773 | # CONFIG_SENSORS_PCF8591 is not set | ||
774 | # CONFIG_ISP1301_OMAP is not set | ||
775 | # CONFIG_TPS65010 is not set | ||
776 | CONFIG_SENSORS_TLV320AIC23=y | ||
777 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
778 | # CONFIG_SENSORS_MAX6875 is not set | ||
779 | # CONFIG_SENSORS_TSL2550 is not set | ||
780 | # CONFIG_I2C_DEBUG_CORE is not set | ||
781 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
782 | # CONFIG_I2C_DEBUG_BUS is not set | ||
783 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
784 | |||
785 | # | ||
786 | # SPI support | ||
787 | # | ||
788 | CONFIG_SPI=y | ||
789 | # CONFIG_SPI_DEBUG is not set | ||
790 | CONFIG_SPI_MASTER=y | ||
791 | |||
792 | # | ||
793 | # SPI Master Controller Drivers | ||
794 | # | ||
795 | CONFIG_SPI_BITBANG=y | ||
796 | CONFIG_SPI_OMAP_UWIRE=y | ||
797 | |||
798 | # | ||
799 | # SPI Protocol Masters | ||
800 | # | ||
801 | # CONFIG_SPI_AT25 is not set | ||
802 | # CONFIG_SPI_TSC2101 is not set | ||
803 | # CONFIG_SPI_TSC2102 is not set | ||
804 | # CONFIG_SPI_TSC210X is not set | ||
805 | # CONFIG_SPI_TSC2301 is not set | ||
806 | # CONFIG_SPI_SPIDEV is not set | ||
807 | # CONFIG_SPI_TLE62X0 is not set | ||
808 | # CONFIG_W1 is not set | ||
809 | # CONFIG_POWER_SUPPLY is not set | ||
810 | # CONFIG_HWMON is not set | ||
811 | CONFIG_WATCHDOG=y | ||
812 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
813 | |||
814 | # | ||
815 | # Watchdog Device Drivers | ||
816 | # | ||
817 | # CONFIG_SOFT_WATCHDOG is not set | ||
818 | CONFIG_OMAP_WATCHDOG=y | ||
819 | |||
820 | # | ||
821 | # USB-based Watchdog Cards | ||
822 | # | ||
823 | # CONFIG_USBPCWATCHDOG is not set | ||
824 | |||
825 | # | ||
826 | # Sonics Silicon Backplane | ||
827 | # | ||
828 | CONFIG_SSB_POSSIBLE=y | ||
829 | # CONFIG_SSB is not set | ||
830 | |||
831 | # | ||
832 | # Multifunction device drivers | ||
833 | # | ||
834 | # CONFIG_MFD_SM501 is not set | ||
835 | |||
836 | # | ||
837 | # Multimedia devices | ||
838 | # | ||
839 | # CONFIG_VIDEO_DEV is not set | ||
840 | # CONFIG_DVB_CORE is not set | ||
841 | CONFIG_DAB=y | ||
842 | # CONFIG_USB_DABUSB is not set | ||
843 | |||
844 | # | ||
845 | # Graphics support | ||
846 | # | ||
847 | # CONFIG_VGASTATE is not set | ||
848 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
849 | CONFIG_FB=y | ||
850 | # CONFIG_FIRMWARE_EDID is not set | ||
851 | # CONFIG_FB_DDC is not set | ||
852 | CONFIG_FB_CFB_FILLRECT=y | ||
853 | CONFIG_FB_CFB_COPYAREA=y | ||
854 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
855 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
856 | # CONFIG_FB_SYS_FILLRECT is not set | ||
857 | # CONFIG_FB_SYS_COPYAREA is not set | ||
858 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
859 | # CONFIG_FB_SYS_FOPS is not set | ||
860 | CONFIG_FB_DEFERRED_IO=y | ||
861 | # CONFIG_FB_SVGALIB is not set | ||
862 | # CONFIG_FB_MACMODES is not set | ||
863 | # CONFIG_FB_BACKLIGHT is not set | ||
864 | # CONFIG_FB_MODE_HELPERS is not set | ||
865 | # CONFIG_FB_TILEBLITTING is not set | ||
866 | |||
867 | # | ||
868 | # Frame buffer hardware drivers | ||
869 | # | ||
870 | # CONFIG_FB_UVESA is not set | ||
871 | # CONFIG_FB_S1D13XXX is not set | ||
872 | # CONFIG_FB_VIRTUAL is not set | ||
873 | CONFIG_FB_OMAP=y | ||
874 | CONFIG_FB_OMAP_LCDC_EXTERNAL=y | ||
875 | CONFIG_FB_OMAP_LCDC_HWA742=y | ||
876 | # CONFIG_FB_OMAP_LCDC_BLIZZARD is not set | ||
877 | CONFIG_FB_OMAP_MANUAL_UPDATE=y | ||
878 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
879 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
880 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
881 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
882 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
883 | |||
884 | # | ||
885 | # Display device support | ||
886 | # | ||
887 | # CONFIG_DISPLAY_SUPPORT is not set | ||
888 | |||
889 | # | ||
890 | # Console display driver support | ||
891 | # | ||
892 | # CONFIG_VGA_CONSOLE is not set | ||
893 | CONFIG_DUMMY_CONSOLE=y | ||
894 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
895 | # CONFIG_LOGO is not set | ||
896 | |||
897 | # | ||
898 | # Sound | ||
899 | # | ||
900 | CONFIG_SOUND=y | ||
901 | |||
902 | # | ||
903 | # Advanced Linux Sound Architecture | ||
904 | # | ||
905 | CONFIG_SND=y | ||
906 | CONFIG_SND_TIMER=y | ||
907 | CONFIG_SND_PCM=y | ||
908 | CONFIG_SND_HWDEP=y | ||
909 | CONFIG_SND_RAWMIDI=y | ||
910 | # CONFIG_SND_SEQUENCER is not set | ||
911 | # CONFIG_SND_MIXER_OSS is not set | ||
912 | # CONFIG_SND_PCM_OSS is not set | ||
913 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
914 | # CONFIG_SND_SUPPORT_OLD_API is not set | ||
915 | CONFIG_SND_VERBOSE_PROCFS=y | ||
916 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
917 | # CONFIG_SND_DEBUG is not set | ||
918 | |||
919 | # | ||
920 | # Generic devices | ||
921 | # | ||
922 | CONFIG_SND_DUMMY=y | ||
923 | # CONFIG_SND_MTPAV is not set | ||
924 | # CONFIG_SND_SERIAL_U16550 is not set | ||
925 | # CONFIG_SND_MPU401 is not set | ||
926 | |||
927 | # | ||
928 | # ALSA ARM devices | ||
929 | # | ||
930 | CONFIG_SND_OMAP_AIC23=y | ||
931 | # CONFIG_SND_OMAP_TSC2101 is not set | ||
932 | # CONFIG_SND_SX1 is not set | ||
933 | # CONFIG_SND_OMAP_TSC2102 is not set | ||
934 | # CONFIG_SND_OMAP24XX_EAC is not set | ||
935 | |||
936 | # | ||
937 | # SPI devices | ||
938 | # | ||
939 | |||
940 | # | ||
941 | # USB devices | ||
942 | # | ||
943 | CONFIG_SND_USB_AUDIO=y | ||
944 | # CONFIG_SND_USB_CAIAQ is not set | ||
945 | |||
946 | # | ||
947 | # System on Chip audio support | ||
948 | # | ||
949 | # CONFIG_SND_SOC is not set | ||
950 | |||
951 | # | ||
952 | # SoC Audio support for SuperH | ||
953 | # | ||
954 | |||
955 | # | ||
956 | # Open Sound System | ||
957 | # | ||
958 | # CONFIG_SOUND_PRIME is not set | ||
959 | CONFIG_HID_SUPPORT=y | ||
960 | CONFIG_HID=y | ||
961 | CONFIG_HID_DEBUG=y | ||
962 | # CONFIG_HIDRAW is not set | ||
963 | |||
964 | # | ||
965 | # USB Input Devices | ||
966 | # | ||
967 | CONFIG_USB_HID=y | ||
968 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
969 | # CONFIG_HID_FF is not set | ||
970 | # CONFIG_USB_HIDDEV is not set | ||
971 | CONFIG_USB_SUPPORT=y | ||
972 | CONFIG_USB_ARCH_HAS_HCD=y | ||
973 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
974 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
975 | CONFIG_USB=y | ||
976 | # CONFIG_USB_DEBUG is not set | ||
977 | |||
978 | # | ||
979 | # Miscellaneous USB options | ||
980 | # | ||
981 | CONFIG_USB_DEVICEFS=y | ||
982 | CONFIG_USB_DEVICE_CLASS=y | ||
983 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
984 | CONFIG_USB_SUSPEND=y | ||
985 | # CONFIG_USB_PERSIST is not set | ||
986 | CONFIG_USB_OTG=y | ||
987 | # CONFIG_USB_OTG_WHITELIST is not set | ||
988 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
989 | |||
990 | # | ||
991 | # USB Host Controller Drivers | ||
992 | # | ||
993 | # CONFIG_USB_ISP116X_HCD is not set | ||
994 | CONFIG_USB_OHCI_HCD=y | ||
995 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
996 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
997 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
998 | # CONFIG_USB_SL811_HCD is not set | ||
999 | # CONFIG_USB_R8A66597_HCD is not set | ||
1000 | # CONFIG_USB_MUSB_HDRC is not set | ||
1001 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
1002 | |||
1003 | # | ||
1004 | # USB Device Class drivers | ||
1005 | # | ||
1006 | # CONFIG_USB_ACM is not set | ||
1007 | # CONFIG_USB_PRINTER is not set | ||
1008 | |||
1009 | # | ||
1010 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
1011 | # | ||
1012 | |||
1013 | # | ||
1014 | # may also be needed; see USB_STORAGE Help for more information | ||
1015 | # | ||
1016 | CONFIG_USB_STORAGE=y | ||
1017 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
1018 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
1019 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
1020 | # CONFIG_USB_STORAGE_ISD200 is not set | ||
1021 | # CONFIG_USB_STORAGE_DPCM is not set | ||
1022 | # CONFIG_USB_STORAGE_USBAT is not set | ||
1023 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
1024 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
1025 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
1026 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
1027 | # CONFIG_USB_STORAGE_KARMA is not set | ||
1028 | # CONFIG_USB_LIBUSUAL is not set | ||
1029 | |||
1030 | # | ||
1031 | # USB Imaging devices | ||
1032 | # | ||
1033 | # CONFIG_USB_MDC800 is not set | ||
1034 | # CONFIG_USB_MICROTEK is not set | ||
1035 | # CONFIG_USB_MON is not set | ||
1036 | |||
1037 | # | ||
1038 | # USB port drivers | ||
1039 | # | ||
1040 | |||
1041 | # | ||
1042 | # USB Serial Converter support | ||
1043 | # | ||
1044 | CONFIG_USB_SERIAL=y | ||
1045 | CONFIG_USB_SERIAL_CONSOLE=y | ||
1046 | # CONFIG_USB_SERIAL_GENERIC is not set | ||
1047 | # CONFIG_USB_SERIAL_AIRCABLE is not set | ||
1048 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
1049 | # CONFIG_USB_SERIAL_ARK3116 is not set | ||
1050 | # CONFIG_USB_SERIAL_BELKIN is not set | ||
1051 | # CONFIG_USB_SERIAL_CH341 is not set | ||
1052 | # CONFIG_USB_SERIAL_WHITEHEAT is not set | ||
1053 | # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set | ||
1054 | # CONFIG_USB_SERIAL_CP2101 is not set | ||
1055 | # CONFIG_USB_SERIAL_CYPRESS_M8 is not set | ||
1056 | # CONFIG_USB_SERIAL_EMPEG is not set | ||
1057 | # CONFIG_USB_SERIAL_FTDI_SIO is not set | ||
1058 | # CONFIG_USB_SERIAL_FUNSOFT is not set | ||
1059 | # CONFIG_USB_SERIAL_VISOR is not set | ||
1060 | # CONFIG_USB_SERIAL_IPAQ is not set | ||
1061 | # CONFIG_USB_SERIAL_IR is not set | ||
1062 | # CONFIG_USB_SERIAL_EDGEPORT is not set | ||
1063 | # CONFIG_USB_SERIAL_EDGEPORT_TI is not set | ||
1064 | # CONFIG_USB_SERIAL_GARMIN is not set | ||
1065 | # CONFIG_USB_SERIAL_IPW is not set | ||
1066 | # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set | ||
1067 | # CONFIG_USB_SERIAL_KEYSPAN is not set | ||
1068 | # CONFIG_USB_SERIAL_KLSI is not set | ||
1069 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set | ||
1070 | # CONFIG_USB_SERIAL_MCT_U232 is not set | ||
1071 | # CONFIG_USB_SERIAL_MOS7720 is not set | ||
1072 | # CONFIG_USB_SERIAL_MOS7840 is not set | ||
1073 | # CONFIG_USB_SERIAL_NAVMAN is not set | ||
1074 | CONFIG_USB_SERIAL_PL2303=y | ||
1075 | # CONFIG_USB_SERIAL_OTI6858 is not set | ||
1076 | # CONFIG_USB_SERIAL_HP4X is not set | ||
1077 | # CONFIG_USB_SERIAL_SAFE is not set | ||
1078 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | ||
1079 | # CONFIG_USB_SERIAL_TI is not set | ||
1080 | # CONFIG_USB_SERIAL_CYBERJACK is not set | ||
1081 | # CONFIG_USB_SERIAL_XIRCOM is not set | ||
1082 | # CONFIG_USB_SERIAL_OPTION is not set | ||
1083 | # CONFIG_USB_SERIAL_OMNINET is not set | ||
1084 | # CONFIG_USB_SERIAL_DEBUG is not set | ||
1085 | |||
1086 | # | ||
1087 | # USB Miscellaneous drivers | ||
1088 | # | ||
1089 | # CONFIG_USB_EMI62 is not set | ||
1090 | # CONFIG_USB_EMI26 is not set | ||
1091 | # CONFIG_USB_ADUTUX is not set | ||
1092 | # CONFIG_USB_AUERSWALD is not set | ||
1093 | # CONFIG_USB_RIO500 is not set | ||
1094 | # CONFIG_USB_LEGOTOWER is not set | ||
1095 | # CONFIG_USB_LCD is not set | ||
1096 | # CONFIG_USB_BERRY_CHARGE is not set | ||
1097 | # CONFIG_USB_LED is not set | ||
1098 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
1099 | # CONFIG_USB_CYTHERM is not set | ||
1100 | # CONFIG_USB_PHIDGET is not set | ||
1101 | # CONFIG_USB_IDMOUSE is not set | ||
1102 | # CONFIG_USB_FTDI_ELAN is not set | ||
1103 | # CONFIG_USB_APPLEDISPLAY is not set | ||
1104 | # CONFIG_USB_LD is not set | ||
1105 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
1106 | # CONFIG_USB_IOWARRIOR is not set | ||
1107 | # CONFIG_USB_TEST is not set | ||
1108 | |||
1109 | # | ||
1110 | # USB DSL modem support | ||
1111 | # | ||
1112 | |||
1113 | # | ||
1114 | # USB Gadget Support | ||
1115 | # | ||
1116 | CONFIG_USB_GADGET=y | ||
1117 | # CONFIG_USB_GADGET_DEBUG is not set | ||
1118 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
1119 | CONFIG_USB_GADGET_SELECTED=y | ||
1120 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
1121 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | ||
1122 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
1123 | # CONFIG_USB_GADGET_NET2280 is not set | ||
1124 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
1125 | # CONFIG_USB_GADGET_M66592 is not set | ||
1126 | # CONFIG_USB_GADGET_GOKU is not set | ||
1127 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
1128 | CONFIG_USB_GADGET_OMAP=y | ||
1129 | CONFIG_USB_OMAP=y | ||
1130 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
1131 | # CONFIG_USB_GADGET_AT91 is not set | ||
1132 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
1133 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
1134 | # CONFIG_USB_ZERO is not set | ||
1135 | CONFIG_USB_ETH=m | ||
1136 | CONFIG_USB_ETH_RNDIS=y | ||
1137 | # CONFIG_USB_GADGETFS is not set | ||
1138 | CONFIG_USB_FILE_STORAGE=m | ||
1139 | CONFIG_USB_FILE_STORAGE_TEST=y | ||
1140 | # CONFIG_USB_G_SERIAL is not set | ||
1141 | # CONFIG_USB_MIDI_GADGET is not set | ||
1142 | CONFIG_MMC=y | ||
1143 | # CONFIG_MMC_DEBUG is not set | ||
1144 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
1145 | |||
1146 | # | ||
1147 | # MMC/SD Card Drivers | ||
1148 | # | ||
1149 | CONFIG_MMC_BLOCK=y | ||
1150 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
1151 | # CONFIG_SDIO_UART is not set | ||
1152 | |||
1153 | # | ||
1154 | # MMC/SD Host Controller Drivers | ||
1155 | # | ||
1156 | CONFIG_MMC_OMAP=y | ||
1157 | # CONFIG_MMC_SPI is not set | ||
1158 | # CONFIG_NEW_LEDS is not set | ||
1159 | CONFIG_RTC_LIB=y | ||
1160 | # CONFIG_RTC_CLASS is not set | ||
1161 | |||
1162 | # | ||
1163 | # CBUS support | ||
1164 | # | ||
1165 | CONFIG_CBUS=y | ||
1166 | CONFIG_CBUS_TAHVO=y | ||
1167 | CONFIG_CBUS_TAHVO_USER=y | ||
1168 | CONFIG_CBUS_TAHVO_USB=y | ||
1169 | # CONFIG_CBUS_TAHVO_USB_HOST_BY_DEFAULT is not set | ||
1170 | CONFIG_CBUS_RETU=y | ||
1171 | CONFIG_CBUS_RETU_USER=y | ||
1172 | CONFIG_CBUS_RETU_POWERBUTTON=y | ||
1173 | CONFIG_CBUS_RETU_RTC=y | ||
1174 | CONFIG_CBUS_RETU_WDT=y | ||
1175 | # CONFIG_CBUS_RETU_HEADSET is not set | ||
1176 | CONFIG_OMAP_DSP=y | ||
1177 | # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set | ||
1178 | CONFIG_OMAP_DSP_FBEXPORT=y | ||
1179 | |||
1180 | # | ||
1181 | # File systems | ||
1182 | # | ||
1183 | CONFIG_EXT2_FS=y | ||
1184 | # CONFIG_EXT2_FS_XATTR is not set | ||
1185 | # CONFIG_EXT2_FS_XIP is not set | ||
1186 | CONFIG_EXT3_FS=y | ||
1187 | CONFIG_EXT3_FS_XATTR=y | ||
1188 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
1189 | # CONFIG_EXT3_FS_SECURITY is not set | ||
1190 | # CONFIG_EXT4DEV_FS is not set | ||
1191 | CONFIG_JBD=y | ||
1192 | CONFIG_FS_MBCACHE=y | ||
1193 | # CONFIG_REISERFS_FS is not set | ||
1194 | # CONFIG_JFS_FS is not set | ||
1195 | # CONFIG_FS_POSIX_ACL is not set | ||
1196 | # CONFIG_XFS_FS is not set | ||
1197 | # CONFIG_GFS2_FS is not set | ||
1198 | # CONFIG_OCFS2_FS is not set | ||
1199 | # CONFIG_MINIX_FS is not set | ||
1200 | # CONFIG_ROMFS_FS is not set | ||
1201 | # CONFIG_INOTIFY is not set | ||
1202 | # CONFIG_QUOTA is not set | ||
1203 | CONFIG_DNOTIFY=y | ||
1204 | # CONFIG_AUTOFS_FS is not set | ||
1205 | # CONFIG_AUTOFS4_FS is not set | ||
1206 | # CONFIG_FUSE_FS is not set | ||
1207 | |||
1208 | # | ||
1209 | # CD-ROM/DVD Filesystems | ||
1210 | # | ||
1211 | # CONFIG_ISO9660_FS is not set | ||
1212 | # CONFIG_UDF_FS is not set | ||
1213 | |||
1214 | # | ||
1215 | # DOS/FAT/NT Filesystems | ||
1216 | # | ||
1217 | CONFIG_FAT_FS=y | ||
1218 | CONFIG_MSDOS_FS=y | ||
1219 | CONFIG_VFAT_FS=y | ||
1220 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1221 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1222 | # CONFIG_NTFS_FS is not set | ||
1223 | |||
1224 | # | ||
1225 | # Pseudo filesystems | ||
1226 | # | ||
1227 | CONFIG_PROC_FS=y | ||
1228 | CONFIG_PROC_SYSCTL=y | ||
1229 | CONFIG_SYSFS=y | ||
1230 | CONFIG_TMPFS=y | ||
1231 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
1232 | # CONFIG_HUGETLB_PAGE is not set | ||
1233 | # CONFIG_CONFIGFS_FS is not set | ||
1234 | |||
1235 | # | ||
1236 | # Miscellaneous filesystems | ||
1237 | # | ||
1238 | # CONFIG_ADFS_FS is not set | ||
1239 | # CONFIG_AFFS_FS is not set | ||
1240 | # CONFIG_HFS_FS is not set | ||
1241 | # CONFIG_HFSPLUS_FS is not set | ||
1242 | # CONFIG_BEFS_FS is not set | ||
1243 | # CONFIG_BFS_FS is not set | ||
1244 | # CONFIG_EFS_FS is not set | ||
1245 | CONFIG_JFFS2_FS=y | ||
1246 | CONFIG_JFFS2_FS_DEBUG=0 | ||
1247 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
1248 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1249 | CONFIG_JFFS2_SUMMARY=y | ||
1250 | # CONFIG_JFFS2_FS_XATTR is not set | ||
1251 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
1252 | CONFIG_JFFS2_ZLIB=y | ||
1253 | # CONFIG_JFFS2_LZO is not set | ||
1254 | CONFIG_JFFS2_RTIME=y | ||
1255 | # CONFIG_JFFS2_RUBIN is not set | ||
1256 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
1257 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
1258 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
1259 | # CONFIG_JFFS2_CMODE_FAVOURLZO is not set | ||
1260 | # CONFIG_CRAMFS is not set | ||
1261 | # CONFIG_VXFS_FS is not set | ||
1262 | # CONFIG_HPFS_FS is not set | ||
1263 | # CONFIG_QNX4FS_FS is not set | ||
1264 | # CONFIG_SYSV_FS is not set | ||
1265 | # CONFIG_UFS_FS is not set | ||
1266 | CONFIG_NETWORK_FILESYSTEMS=y | ||
1267 | CONFIG_NFS_FS=y | ||
1268 | CONFIG_NFS_V3=y | ||
1269 | # CONFIG_NFS_V3_ACL is not set | ||
1270 | # CONFIG_NFS_V4 is not set | ||
1271 | # CONFIG_NFS_DIRECTIO is not set | ||
1272 | # CONFIG_NFSD is not set | ||
1273 | # CONFIG_ROOT_NFS is not set | ||
1274 | CONFIG_LOCKD=y | ||
1275 | CONFIG_LOCKD_V4=y | ||
1276 | CONFIG_NFS_COMMON=y | ||
1277 | CONFIG_SUNRPC=y | ||
1278 | # CONFIG_SUNRPC_BIND34 is not set | ||
1279 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1280 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1281 | # CONFIG_SMB_FS is not set | ||
1282 | # CONFIG_CIFS is not set | ||
1283 | # CONFIG_NCP_FS is not set | ||
1284 | # CONFIG_CODA_FS is not set | ||
1285 | # CONFIG_AFS_FS is not set | ||
1286 | |||
1287 | # | ||
1288 | # Partition Types | ||
1289 | # | ||
1290 | CONFIG_PARTITION_ADVANCED=y | ||
1291 | # CONFIG_ACORN_PARTITION is not set | ||
1292 | # CONFIG_OSF_PARTITION is not set | ||
1293 | # CONFIG_AMIGA_PARTITION is not set | ||
1294 | # CONFIG_ATARI_PARTITION is not set | ||
1295 | # CONFIG_MAC_PARTITION is not set | ||
1296 | CONFIG_MSDOS_PARTITION=y | ||
1297 | # CONFIG_BSD_DISKLABEL is not set | ||
1298 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1299 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1300 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
1301 | # CONFIG_LDM_PARTITION is not set | ||
1302 | # CONFIG_SGI_PARTITION is not set | ||
1303 | # CONFIG_ULTRIX_PARTITION is not set | ||
1304 | # CONFIG_SUN_PARTITION is not set | ||
1305 | # CONFIG_KARMA_PARTITION is not set | ||
1306 | # CONFIG_EFI_PARTITION is not set | ||
1307 | # CONFIG_SYSV68_PARTITION is not set | ||
1308 | CONFIG_NLS=y | ||
1309 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1310 | CONFIG_NLS_CODEPAGE_437=y | ||
1311 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1312 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1313 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1314 | CONFIG_NLS_CODEPAGE_852=y | ||
1315 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1316 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1317 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1318 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1319 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1320 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1321 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1322 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1323 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1324 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1325 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1326 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1327 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1328 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1329 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1330 | # CONFIG_NLS_ISO8859_8 is not set | ||
1331 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1332 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1333 | # CONFIG_NLS_ASCII is not set | ||
1334 | CONFIG_NLS_ISO8859_1=y | ||
1335 | # CONFIG_NLS_ISO8859_2 is not set | ||
1336 | # CONFIG_NLS_ISO8859_3 is not set | ||
1337 | # CONFIG_NLS_ISO8859_4 is not set | ||
1338 | # CONFIG_NLS_ISO8859_5 is not set | ||
1339 | # CONFIG_NLS_ISO8859_6 is not set | ||
1340 | # CONFIG_NLS_ISO8859_7 is not set | ||
1341 | # CONFIG_NLS_ISO8859_9 is not set | ||
1342 | # CONFIG_NLS_ISO8859_13 is not set | ||
1343 | # CONFIG_NLS_ISO8859_14 is not set | ||
1344 | CONFIG_NLS_ISO8859_15=y | ||
1345 | # CONFIG_NLS_KOI8_R is not set | ||
1346 | # CONFIG_NLS_KOI8_U is not set | ||
1347 | CONFIG_NLS_UTF8=y | ||
1348 | # CONFIG_DLM is not set | ||
1349 | CONFIG_INSTRUMENTATION=y | ||
1350 | # CONFIG_PROFILING is not set | ||
1351 | # CONFIG_MARKERS is not set | ||
1352 | |||
1353 | # | ||
1354 | # Kernel hacking | ||
1355 | # | ||
1356 | # CONFIG_PRINTK_TIME is not set | ||
1357 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
1358 | CONFIG_ENABLE_MUST_CHECK=y | ||
1359 | CONFIG_MAGIC_SYSRQ=y | ||
1360 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1361 | # CONFIG_DEBUG_FS is not set | ||
1362 | # CONFIG_HEADERS_CHECK is not set | ||
1363 | CONFIG_DEBUG_KERNEL=y | ||
1364 | # CONFIG_DEBUG_SHIRQ is not set | ||
1365 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1366 | CONFIG_SCHED_DEBUG=y | ||
1367 | # CONFIG_SCHEDSTATS is not set | ||
1368 | # CONFIG_TIMER_STATS is not set | ||
1369 | # CONFIG_DEBUG_SLAB is not set | ||
1370 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1371 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1372 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1373 | CONFIG_DEBUG_MUTEXES=y | ||
1374 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1375 | # CONFIG_PROVE_LOCKING is not set | ||
1376 | # CONFIG_LOCK_STAT is not set | ||
1377 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1378 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1379 | # CONFIG_DEBUG_KOBJECT is not set | ||
1380 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1381 | # CONFIG_DEBUG_INFO is not set | ||
1382 | # CONFIG_DEBUG_VM is not set | ||
1383 | # CONFIG_DEBUG_LIST is not set | ||
1384 | # CONFIG_DEBUG_SG is not set | ||
1385 | CONFIG_FRAME_POINTER=y | ||
1386 | CONFIG_FORCED_INLINING=y | ||
1387 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1388 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1389 | # CONFIG_FAULT_INJECTION is not set | ||
1390 | # CONFIG_SAMPLES is not set | ||
1391 | # CONFIG_DEBUG_USER is not set | ||
1392 | CONFIG_DEBUG_ERRORS=y | ||
1393 | # CONFIG_DEBUG_LL is not set | ||
1394 | |||
1395 | # | ||
1396 | # Security options | ||
1397 | # | ||
1398 | # CONFIG_KEYS is not set | ||
1399 | CONFIG_SECURITY=y | ||
1400 | # CONFIG_SECURITY_NETWORK is not set | ||
1401 | # CONFIG_SECURITY_CAPABILITIES is not set | ||
1402 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
1403 | # CONFIG_SECURITY_LOWMEM is not set | ||
1404 | # CONFIG_CRYPTO is not set | ||
1405 | |||
1406 | # | ||
1407 | # Library routines | ||
1408 | # | ||
1409 | CONFIG_BITREVERSE=y | ||
1410 | CONFIG_CRC_CCITT=y | ||
1411 | # CONFIG_CRC16 is not set | ||
1412 | # CONFIG_CRC_ITU_T is not set | ||
1413 | CONFIG_CRC32=y | ||
1414 | # CONFIG_CRC7 is not set | ||
1415 | # CONFIG_LIBCRC32C is not set | ||
1416 | CONFIG_ZLIB_INFLATE=y | ||
1417 | CONFIG_ZLIB_DEFLATE=y | ||
1418 | CONFIG_PLIST=y | ||
1419 | CONFIG_HAS_IOMEM=y | ||
1420 | CONFIG_HAS_IOPORT=y | ||
1421 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_2430sdp_defconfig b/arch/arm/configs/omap_2430sdp_defconfig new file mode 100644 index 000000000000..b0617c0da2a1 --- /dev/null +++ b/arch/arm/configs/omap_2430sdp_defconfig | |||
@@ -0,0 +1,1304 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 11:47:37 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_LOCK_KERNEL=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | CONFIG_LOCALVERSION="" | ||
36 | CONFIG_LOCALVERSION_AUTO=y | ||
37 | CONFIG_SWAP=y | ||
38 | CONFIG_SYSVIPC=y | ||
39 | CONFIG_SYSVIPC_SYSCTL=y | ||
40 | # CONFIG_POSIX_MQUEUE is not set | ||
41 | CONFIG_BSD_PROCESS_ACCT=y | ||
42 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
43 | # CONFIG_TASKSTATS is not set | ||
44 | # CONFIG_USER_NS is not set | ||
45 | # CONFIG_AUDIT is not set | ||
46 | # CONFIG_IKCONFIG is not set | ||
47 | CONFIG_LOG_BUF_SHIFT=14 | ||
48 | CONFIG_SYSFS_DEPRECATED=y | ||
49 | # CONFIG_RELAY is not set | ||
50 | CONFIG_BLK_DEV_INITRD=y | ||
51 | CONFIG_INITRAMFS_SOURCE="" | ||
52 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
53 | CONFIG_SYSCTL=y | ||
54 | CONFIG_EMBEDDED=y | ||
55 | CONFIG_UID16=y | ||
56 | # CONFIG_SYSCTL_SYSCALL is not set | ||
57 | CONFIG_KALLSYMS=y | ||
58 | # CONFIG_KALLSYMS_ALL is not set | ||
59 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
60 | CONFIG_HOTPLUG=y | ||
61 | CONFIG_PRINTK=y | ||
62 | CONFIG_BUG=y | ||
63 | CONFIG_ELF_CORE=y | ||
64 | CONFIG_BASE_FULL=y | ||
65 | CONFIG_FUTEX=y | ||
66 | CONFIG_ANON_INODES=y | ||
67 | CONFIG_EPOLL=y | ||
68 | CONFIG_SIGNALFD=y | ||
69 | CONFIG_TIMERFD=y | ||
70 | CONFIG_EVENTFD=y | ||
71 | CONFIG_SHMEM=y | ||
72 | CONFIG_VM_EVENT_COUNTERS=y | ||
73 | CONFIG_SLAB=y | ||
74 | # CONFIG_SLUB is not set | ||
75 | # CONFIG_SLOB is not set | ||
76 | CONFIG_RT_MUTEXES=y | ||
77 | # CONFIG_TINY_SHMEM is not set | ||
78 | CONFIG_BASE_SMALL=0 | ||
79 | CONFIG_MODULES=y | ||
80 | CONFIG_MODULE_UNLOAD=y | ||
81 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
82 | CONFIG_MODVERSIONS=y | ||
83 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
84 | CONFIG_KMOD=y | ||
85 | CONFIG_BLOCK=y | ||
86 | # CONFIG_LBD is not set | ||
87 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
88 | # CONFIG_LSF is not set | ||
89 | # CONFIG_BLK_DEV_BSG is not set | ||
90 | |||
91 | # | ||
92 | # IO Schedulers | ||
93 | # | ||
94 | CONFIG_IOSCHED_NOOP=y | ||
95 | CONFIG_IOSCHED_AS=y | ||
96 | CONFIG_IOSCHED_DEADLINE=y | ||
97 | CONFIG_IOSCHED_CFQ=y | ||
98 | CONFIG_DEFAULT_AS=y | ||
99 | # CONFIG_DEFAULT_DEADLINE is not set | ||
100 | # CONFIG_DEFAULT_CFQ is not set | ||
101 | # CONFIG_DEFAULT_NOOP is not set | ||
102 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
103 | |||
104 | # | ||
105 | # System Type | ||
106 | # | ||
107 | # CONFIG_ARCH_AAEC2000 is not set | ||
108 | # CONFIG_ARCH_INTEGRATOR is not set | ||
109 | # CONFIG_ARCH_REALVIEW is not set | ||
110 | # CONFIG_ARCH_VERSATILE is not set | ||
111 | # CONFIG_ARCH_AT91 is not set | ||
112 | # CONFIG_ARCH_CLPS7500 is not set | ||
113 | # CONFIG_ARCH_CLPS711X is not set | ||
114 | # CONFIG_ARCH_CO285 is not set | ||
115 | # CONFIG_ARCH_EBSA110 is not set | ||
116 | # CONFIG_ARCH_EP93XX is not set | ||
117 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
118 | # CONFIG_ARCH_NETX is not set | ||
119 | # CONFIG_ARCH_H720X is not set | ||
120 | # CONFIG_ARCH_IMX is not set | ||
121 | # CONFIG_ARCH_IOP13XX is not set | ||
122 | # CONFIG_ARCH_IOP32X is not set | ||
123 | # CONFIG_ARCH_IOP33X is not set | ||
124 | # CONFIG_ARCH_IXP23XX is not set | ||
125 | # CONFIG_ARCH_IXP2000 is not set | ||
126 | # CONFIG_ARCH_IXP4XX is not set | ||
127 | # CONFIG_ARCH_L7200 is not set | ||
128 | # CONFIG_ARCH_KS8695 is not set | ||
129 | # CONFIG_ARCH_NS9XXX is not set | ||
130 | # CONFIG_ARCH_MXC is not set | ||
131 | # CONFIG_ARCH_PNX4008 is not set | ||
132 | # CONFIG_ARCH_PXA is not set | ||
133 | # CONFIG_ARCH_RPC is not set | ||
134 | # CONFIG_ARCH_SA1100 is not set | ||
135 | # CONFIG_ARCH_S3C2410 is not set | ||
136 | # CONFIG_ARCH_SHARK is not set | ||
137 | # CONFIG_ARCH_LH7A40X is not set | ||
138 | # CONFIG_ARCH_DAVINCI is not set | ||
139 | CONFIG_ARCH_OMAP=y | ||
140 | |||
141 | # | ||
142 | # TI OMAP Implementations | ||
143 | # | ||
144 | # CONFIG_ARCH_OMAP1 is not set | ||
145 | CONFIG_ARCH_OMAP2=y | ||
146 | # CONFIG_ARCH_OMAP3 is not set | ||
147 | |||
148 | # | ||
149 | # OMAP Feature Selections | ||
150 | # | ||
151 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
152 | CONFIG_OMAP_BOOT_TAG=y | ||
153 | # CONFIG_OMAP_BOOT_REASON is not set | ||
154 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
155 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
156 | CONFIG_OMAP_MUX=y | ||
157 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
158 | # CONFIG_OMAP_MUX_WARNINGS is not set | ||
159 | # CONFIG_OMAP_STI is not set | ||
160 | CONFIG_OMAP_MCBSP=y | ||
161 | # CONFIG_OMAP_MMU_FWK is not set | ||
162 | # CONFIG_OMAP_MBOX_FWK is not set | ||
163 | CONFIG_OMAP_MPU_TIMER=y | ||
164 | # CONFIG_OMAP_32K_TIMER is not set | ||
165 | CONFIG_OMAP_DM_TIMER=y | ||
166 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
167 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
168 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
169 | CONFIG_OMAP_SERIAL_WAKE=y | ||
170 | # CONFIG_OMAP_DSP is not set | ||
171 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
172 | |||
173 | # | ||
174 | # OMAP Core Type | ||
175 | # | ||
176 | CONFIG_ARCH_OMAP24XX=y | ||
177 | # CONFIG_ARCH_OMAP2420 is not set | ||
178 | CONFIG_ARCH_OMAP2430=y | ||
179 | |||
180 | # | ||
181 | # OMAP Board Type | ||
182 | # | ||
183 | # CONFIG_MACH_NOKIA_N800 is not set | ||
184 | # CONFIG_MACH_OMAP_H4 is not set | ||
185 | # CONFIG_MACH_OMAP_APOLLON is not set | ||
186 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
187 | CONFIG_MACH_OMAP_2430SDP=y | ||
188 | |||
189 | # | ||
190 | # Boot options | ||
191 | # | ||
192 | |||
193 | # | ||
194 | # Power management | ||
195 | # | ||
196 | |||
197 | # | ||
198 | # Processor Type | ||
199 | # | ||
200 | CONFIG_CPU_32=y | ||
201 | CONFIG_CPU_V6=y | ||
202 | # CONFIG_CPU_32v6K is not set | ||
203 | CONFIG_CPU_32v6=y | ||
204 | CONFIG_CPU_ABRT_EV6=y | ||
205 | CONFIG_CPU_PABRT_NOIFAR=y | ||
206 | CONFIG_CPU_CACHE_V6=y | ||
207 | CONFIG_CPU_CACHE_VIPT=y | ||
208 | CONFIG_CPU_COPY_V6=y | ||
209 | CONFIG_CPU_TLB_V6=y | ||
210 | CONFIG_CPU_HAS_ASID=y | ||
211 | CONFIG_CPU_CP15=y | ||
212 | CONFIG_CPU_CP15_MMU=y | ||
213 | |||
214 | # | ||
215 | # Processor Features | ||
216 | # | ||
217 | CONFIG_ARM_THUMB=y | ||
218 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
219 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
220 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
221 | # CONFIG_OUTER_CACHE is not set | ||
222 | |||
223 | # | ||
224 | # Bus support | ||
225 | # | ||
226 | # CONFIG_PCI_SYSCALL is not set | ||
227 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
228 | |||
229 | # | ||
230 | # PCCARD (PCMCIA/CardBus) support | ||
231 | # | ||
232 | # CONFIG_PCCARD is not set | ||
233 | |||
234 | # | ||
235 | # Kernel Features | ||
236 | # | ||
237 | # CONFIG_TICK_ONESHOT is not set | ||
238 | # CONFIG_NO_HZ is not set | ||
239 | # CONFIG_HIGH_RES_TIMERS is not set | ||
240 | CONFIG_PREEMPT=y | ||
241 | CONFIG_HZ=100 | ||
242 | CONFIG_AEABI=y | ||
243 | CONFIG_OABI_COMPAT=y | ||
244 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
245 | CONFIG_SELECT_MEMORY_MODEL=y | ||
246 | CONFIG_FLATMEM_MANUAL=y | ||
247 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
248 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
249 | CONFIG_FLATMEM=y | ||
250 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
251 | # CONFIG_SPARSEMEM_STATIC is not set | ||
252 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
253 | # CONFIG_RESOURCES_64BIT is not set | ||
254 | CONFIG_ZONE_DMA_FLAG=1 | ||
255 | CONFIG_BOUNCE=y | ||
256 | CONFIG_VIRT_TO_BUS=y | ||
257 | # CONFIG_LEDS is not set | ||
258 | CONFIG_ALIGNMENT_TRAP=y | ||
259 | |||
260 | # | ||
261 | # Boot options | ||
262 | # | ||
263 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
264 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
265 | CONFIG_CMDLINE="root=/dev/ram0 rw console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192" | ||
266 | # CONFIG_XIP_KERNEL is not set | ||
267 | # CONFIG_KEXEC is not set | ||
268 | |||
269 | # | ||
270 | # CPU Frequency scaling | ||
271 | # | ||
272 | # CONFIG_CPU_FREQ is not set | ||
273 | |||
274 | # | ||
275 | # Floating point emulation | ||
276 | # | ||
277 | |||
278 | # | ||
279 | # At least one emulation must be selected | ||
280 | # | ||
281 | CONFIG_FPE_NWFPE=y | ||
282 | # CONFIG_FPE_NWFPE_XP is not set | ||
283 | # CONFIG_FPE_FASTFPE is not set | ||
284 | # CONFIG_VFP is not set | ||
285 | |||
286 | # | ||
287 | # Userspace binary formats | ||
288 | # | ||
289 | CONFIG_BINFMT_ELF=y | ||
290 | # CONFIG_BINFMT_AOUT is not set | ||
291 | CONFIG_BINFMT_MISC=y | ||
292 | |||
293 | # | ||
294 | # Power management options | ||
295 | # | ||
296 | CONFIG_PM=y | ||
297 | # CONFIG_PM_LEGACY is not set | ||
298 | # CONFIG_PM_DEBUG is not set | ||
299 | CONFIG_PM_SLEEP=y | ||
300 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
301 | CONFIG_SUSPEND=y | ||
302 | # CONFIG_APM_EMULATION is not set | ||
303 | |||
304 | # | ||
305 | # Networking | ||
306 | # | ||
307 | CONFIG_NET=y | ||
308 | |||
309 | # | ||
310 | # Networking options | ||
311 | # | ||
312 | CONFIG_PACKET=y | ||
313 | # CONFIG_PACKET_MMAP is not set | ||
314 | CONFIG_UNIX=y | ||
315 | CONFIG_XFRM=y | ||
316 | # CONFIG_XFRM_USER is not set | ||
317 | # CONFIG_XFRM_SUB_POLICY is not set | ||
318 | # CONFIG_XFRM_MIGRATE is not set | ||
319 | CONFIG_NET_KEY=y | ||
320 | # CONFIG_NET_KEY_MIGRATE is not set | ||
321 | CONFIG_INET=y | ||
322 | # CONFIG_IP_MULTICAST is not set | ||
323 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
324 | CONFIG_IP_FIB_HASH=y | ||
325 | CONFIG_IP_PNP=y | ||
326 | CONFIG_IP_PNP_DHCP=y | ||
327 | # CONFIG_IP_PNP_BOOTP is not set | ||
328 | # CONFIG_IP_PNP_RARP is not set | ||
329 | # CONFIG_NET_IPIP is not set | ||
330 | # CONFIG_NET_IPGRE is not set | ||
331 | # CONFIG_ARPD is not set | ||
332 | # CONFIG_SYN_COOKIES is not set | ||
333 | # CONFIG_INET_AH is not set | ||
334 | # CONFIG_INET_ESP is not set | ||
335 | # CONFIG_INET_IPCOMP is not set | ||
336 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
337 | # CONFIG_INET_TUNNEL is not set | ||
338 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
339 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
340 | CONFIG_INET_XFRM_MODE_BEET=y | ||
341 | CONFIG_INET_DIAG=y | ||
342 | CONFIG_INET_TCP_DIAG=y | ||
343 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
344 | CONFIG_TCP_CONG_CUBIC=y | ||
345 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
346 | # CONFIG_TCP_MD5SIG is not set | ||
347 | # CONFIG_IPV6 is not set | ||
348 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
349 | # CONFIG_INET6_TUNNEL is not set | ||
350 | # CONFIG_NETWORK_SECMARK is not set | ||
351 | # CONFIG_NETFILTER is not set | ||
352 | # CONFIG_IP_DCCP is not set | ||
353 | # CONFIG_IP_SCTP is not set | ||
354 | # CONFIG_TIPC is not set | ||
355 | # CONFIG_ATM is not set | ||
356 | # CONFIG_BRIDGE is not set | ||
357 | # CONFIG_VLAN_8021Q is not set | ||
358 | # CONFIG_DECNET is not set | ||
359 | # CONFIG_LLC2 is not set | ||
360 | # CONFIG_IPX is not set | ||
361 | # CONFIG_ATALK is not set | ||
362 | # CONFIG_X25 is not set | ||
363 | # CONFIG_LAPB is not set | ||
364 | # CONFIG_ECONET is not set | ||
365 | # CONFIG_WAN_ROUTER is not set | ||
366 | |||
367 | # | ||
368 | # QoS and/or fair queueing | ||
369 | # | ||
370 | # CONFIG_NET_SCHED is not set | ||
371 | |||
372 | # | ||
373 | # Network testing | ||
374 | # | ||
375 | # CONFIG_NET_PKTGEN is not set | ||
376 | # CONFIG_HAMRADIO is not set | ||
377 | # CONFIG_IRDA is not set | ||
378 | # CONFIG_BT is not set | ||
379 | # CONFIG_AF_RXRPC is not set | ||
380 | |||
381 | # | ||
382 | # Wireless | ||
383 | # | ||
384 | # CONFIG_CFG80211 is not set | ||
385 | # CONFIG_WIRELESS_EXT is not set | ||
386 | # CONFIG_MAC80211 is not set | ||
387 | # CONFIG_IEEE80211 is not set | ||
388 | # CONFIG_RFKILL is not set | ||
389 | # CONFIG_NET_9P is not set | ||
390 | |||
391 | # | ||
392 | # Device Drivers | ||
393 | # | ||
394 | |||
395 | # | ||
396 | # Generic Driver Options | ||
397 | # | ||
398 | CONFIG_STANDALONE=y | ||
399 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
400 | # CONFIG_FW_LOADER is not set | ||
401 | # CONFIG_DEBUG_DRIVER is not set | ||
402 | # CONFIG_DEBUG_DEVRES is not set | ||
403 | # CONFIG_SYS_HYPERVISOR is not set | ||
404 | # CONFIG_CONNECTOR is not set | ||
405 | CONFIG_MTD=y | ||
406 | # CONFIG_MTD_DEBUG is not set | ||
407 | CONFIG_MTD_CONCAT=y | ||
408 | CONFIG_MTD_PARTITIONS=y | ||
409 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
410 | CONFIG_MTD_CMDLINE_PARTS=y | ||
411 | # CONFIG_MTD_AFS_PARTS is not set | ||
412 | |||
413 | # | ||
414 | # User Modules And Translation Layers | ||
415 | # | ||
416 | CONFIG_MTD_CHAR=y | ||
417 | CONFIG_MTD_BLKDEVS=y | ||
418 | CONFIG_MTD_BLOCK=y | ||
419 | # CONFIG_FTL is not set | ||
420 | # CONFIG_NFTL is not set | ||
421 | # CONFIG_INFTL is not set | ||
422 | # CONFIG_RFD_FTL is not set | ||
423 | # CONFIG_SSFDC is not set | ||
424 | |||
425 | # | ||
426 | # RAM/ROM/Flash chip drivers | ||
427 | # | ||
428 | CONFIG_MTD_CFI=y | ||
429 | # CONFIG_MTD_JEDECPROBE is not set | ||
430 | CONFIG_MTD_GEN_PROBE=y | ||
431 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
432 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
433 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
434 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
435 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
436 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
437 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
438 | CONFIG_MTD_CFI_I1=y | ||
439 | CONFIG_MTD_CFI_I2=y | ||
440 | # CONFIG_MTD_CFI_I4 is not set | ||
441 | # CONFIG_MTD_CFI_I8 is not set | ||
442 | CONFIG_MTD_CFI_INTELEXT=y | ||
443 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
444 | # CONFIG_MTD_CFI_STAA is not set | ||
445 | CONFIG_MTD_CFI_UTIL=y | ||
446 | # CONFIG_MTD_RAM is not set | ||
447 | # CONFIG_MTD_ROM is not set | ||
448 | # CONFIG_MTD_ABSENT is not set | ||
449 | |||
450 | # | ||
451 | # Mapping drivers for chip access | ||
452 | # | ||
453 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
454 | # CONFIG_MTD_PHYSMAP is not set | ||
455 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
456 | CONFIG_MTD_OMAP_NOR=y | ||
457 | # CONFIG_MTD_PLATRAM is not set | ||
458 | |||
459 | # | ||
460 | # Self-contained MTD device drivers | ||
461 | # | ||
462 | # CONFIG_MTD_DATAFLASH is not set | ||
463 | # CONFIG_MTD_M25P80 is not set | ||
464 | # CONFIG_MTD_SLRAM is not set | ||
465 | # CONFIG_MTD_PHRAM is not set | ||
466 | # CONFIG_MTD_MTDRAM is not set | ||
467 | # CONFIG_MTD_BLOCK2MTD is not set | ||
468 | |||
469 | # | ||
470 | # Disk-On-Chip Device Drivers | ||
471 | # | ||
472 | # CONFIG_MTD_DOC2000 is not set | ||
473 | # CONFIG_MTD_DOC2001 is not set | ||
474 | # CONFIG_MTD_DOC2001PLUS is not set | ||
475 | # CONFIG_MTD_NAND is not set | ||
476 | CONFIG_MTD_ONENAND=y | ||
477 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y | ||
478 | # CONFIG_MTD_ONENAND_GENERIC is not set | ||
479 | CONFIG_MTD_ONENAND_OMAP2=y | ||
480 | # CONFIG_MTD_ONENAND_OTP is not set | ||
481 | |||
482 | # | ||
483 | # UBI - Unsorted block images | ||
484 | # | ||
485 | # CONFIG_MTD_UBI is not set | ||
486 | # CONFIG_PARPORT is not set | ||
487 | CONFIG_BLK_DEV=y | ||
488 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
489 | CONFIG_BLK_DEV_LOOP=y | ||
490 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
491 | # CONFIG_BLK_DEV_NBD is not set | ||
492 | # CONFIG_BLK_DEV_UB is not set | ||
493 | CONFIG_BLK_DEV_RAM=y | ||
494 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
495 | CONFIG_BLK_DEV_RAM_SIZE=16384 | ||
496 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
497 | # CONFIG_CDROM_PKTCDVD is not set | ||
498 | # CONFIG_ATA_OVER_ETH is not set | ||
499 | |||
500 | # | ||
501 | # SCSI device support | ||
502 | # | ||
503 | # CONFIG_RAID_ATTRS is not set | ||
504 | CONFIG_SCSI=m | ||
505 | CONFIG_SCSI_DMA=y | ||
506 | # CONFIG_SCSI_TGT is not set | ||
507 | # CONFIG_SCSI_NETLINK is not set | ||
508 | CONFIG_SCSI_PROC_FS=y | ||
509 | |||
510 | # | ||
511 | # SCSI support type (disk, tape, CD-ROM) | ||
512 | # | ||
513 | CONFIG_BLK_DEV_SD=m | ||
514 | # CONFIG_CHR_DEV_ST is not set | ||
515 | # CONFIG_CHR_DEV_OSST is not set | ||
516 | # CONFIG_BLK_DEV_SR is not set | ||
517 | CONFIG_CHR_DEV_SG=m | ||
518 | # CONFIG_CHR_DEV_SCH is not set | ||
519 | |||
520 | # | ||
521 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
522 | # | ||
523 | # CONFIG_SCSI_MULTI_LUN is not set | ||
524 | # CONFIG_SCSI_CONSTANTS is not set | ||
525 | # CONFIG_SCSI_LOGGING is not set | ||
526 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
527 | CONFIG_SCSI_WAIT_SCAN=m | ||
528 | |||
529 | # | ||
530 | # SCSI Transports | ||
531 | # | ||
532 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
533 | # CONFIG_SCSI_FC_ATTRS is not set | ||
534 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
535 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
536 | CONFIG_SCSI_LOWLEVEL=y | ||
537 | # CONFIG_ISCSI_TCP is not set | ||
538 | # CONFIG_SCSI_DEBUG is not set | ||
539 | # CONFIG_ATA is not set | ||
540 | # CONFIG_MD is not set | ||
541 | CONFIG_NETDEVICES=y | ||
542 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
543 | # CONFIG_DUMMY is not set | ||
544 | # CONFIG_BONDING is not set | ||
545 | # CONFIG_MACVLAN is not set | ||
546 | # CONFIG_EQUALIZER is not set | ||
547 | # CONFIG_TUN is not set | ||
548 | # CONFIG_PHYLIB is not set | ||
549 | CONFIG_NET_ETHERNET=y | ||
550 | CONFIG_MII=y | ||
551 | # CONFIG_AX88796 is not set | ||
552 | CONFIG_SMC91X=y | ||
553 | # CONFIG_DM9000 is not set | ||
554 | CONFIG_NETDEV_1000=y | ||
555 | CONFIG_NETDEV_10000=y | ||
556 | |||
557 | # | ||
558 | # Wireless LAN | ||
559 | # | ||
560 | # CONFIG_WLAN_PRE80211 is not set | ||
561 | # CONFIG_WLAN_80211 is not set | ||
562 | |||
563 | # | ||
564 | # USB Network Adapters | ||
565 | # | ||
566 | # CONFIG_USB_CATC is not set | ||
567 | # CONFIG_USB_KAWETH is not set | ||
568 | # CONFIG_USB_PEGASUS is not set | ||
569 | # CONFIG_USB_RTL8150 is not set | ||
570 | # CONFIG_USB_USBNET_MII is not set | ||
571 | # CONFIG_USB_USBNET is not set | ||
572 | # CONFIG_WAN is not set | ||
573 | # CONFIG_PPP is not set | ||
574 | # CONFIG_SLIP is not set | ||
575 | # CONFIG_SHAPER is not set | ||
576 | # CONFIG_NETCONSOLE is not set | ||
577 | # CONFIG_NETPOLL is not set | ||
578 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
579 | # CONFIG_ISDN is not set | ||
580 | |||
581 | # | ||
582 | # Input device support | ||
583 | # | ||
584 | CONFIG_INPUT=y | ||
585 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
586 | # CONFIG_INPUT_POLLDEV is not set | ||
587 | |||
588 | # | ||
589 | # Userland interfaces | ||
590 | # | ||
591 | # CONFIG_INPUT_MOUSEDEV is not set | ||
592 | # CONFIG_INPUT_JOYDEV is not set | ||
593 | # CONFIG_INPUT_TSDEV is not set | ||
594 | CONFIG_INPUT_EVDEV=y | ||
595 | # CONFIG_INPUT_EVBUG is not set | ||
596 | |||
597 | # | ||
598 | # Input Device Drivers | ||
599 | # | ||
600 | CONFIG_INPUT_KEYBOARD=y | ||
601 | # CONFIG_KEYBOARD_ATKBD is not set | ||
602 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
603 | # CONFIG_KEYBOARD_LKKBD is not set | ||
604 | # CONFIG_KEYBOARD_XTKBD is not set | ||
605 | # CONFIG_KEYBOARD_NEWTON is not set | ||
606 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
607 | # CONFIG_KEYBOARD_OMAP is not set | ||
608 | CONFIG_KEYBOARD_TWL4030=y | ||
609 | # CONFIG_KEYBOARD_GPIO is not set | ||
610 | # CONFIG_INPUT_MOUSE is not set | ||
611 | # CONFIG_INPUT_JOYSTICK is not set | ||
612 | # CONFIG_INPUT_TABLET is not set | ||
613 | CONFIG_INPUT_TOUCHSCREEN=y | ||
614 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
615 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
616 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
617 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
618 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
619 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
620 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
621 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
622 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
623 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
624 | # CONFIG_TOUCHSCREEN_TSC2102 is not set | ||
625 | # CONFIG_TOUCHSCREEN_TSC210X is not set | ||
626 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
627 | # CONFIG_INPUT_MISC is not set | ||
628 | |||
629 | # | ||
630 | # Hardware I/O ports | ||
631 | # | ||
632 | # CONFIG_SERIO is not set | ||
633 | # CONFIG_GAMEPORT is not set | ||
634 | |||
635 | # | ||
636 | # Character devices | ||
637 | # | ||
638 | CONFIG_VT=y | ||
639 | CONFIG_VT_CONSOLE=y | ||
640 | CONFIG_HW_CONSOLE=y | ||
641 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
642 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
643 | |||
644 | # | ||
645 | # Serial drivers | ||
646 | # | ||
647 | CONFIG_SERIAL_8250=y | ||
648 | CONFIG_SERIAL_8250_CONSOLE=y | ||
649 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
650 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
651 | CONFIG_SERIAL_8250_EXTENDED=y | ||
652 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
653 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
654 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
655 | CONFIG_SERIAL_8250_RSA=y | ||
656 | |||
657 | # | ||
658 | # Non-8250 serial port support | ||
659 | # | ||
660 | CONFIG_SERIAL_CORE=y | ||
661 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
662 | CONFIG_UNIX98_PTYS=y | ||
663 | # CONFIG_LEGACY_PTYS is not set | ||
664 | # CONFIG_IPMI_HANDLER is not set | ||
665 | CONFIG_WATCHDOG=y | ||
666 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
667 | |||
668 | # | ||
669 | # Watchdog Device Drivers | ||
670 | # | ||
671 | # CONFIG_SOFT_WATCHDOG is not set | ||
672 | CONFIG_OMAP_WATCHDOG=y | ||
673 | |||
674 | # | ||
675 | # USB-based Watchdog Cards | ||
676 | # | ||
677 | # CONFIG_USBPCWATCHDOG is not set | ||
678 | CONFIG_HW_RANDOM=y | ||
679 | CONFIG_HW_RANDOM_OMAP=y | ||
680 | # CONFIG_NVRAM is not set | ||
681 | # CONFIG_R3964 is not set | ||
682 | # CONFIG_RAW_DRIVER is not set | ||
683 | # CONFIG_TCG_TPM is not set | ||
684 | CONFIG_I2C=y | ||
685 | CONFIG_I2C_BOARDINFO=y | ||
686 | CONFIG_I2C_CHARDEV=y | ||
687 | |||
688 | # | ||
689 | # I2C Algorithms | ||
690 | # | ||
691 | # CONFIG_I2C_ALGOBIT is not set | ||
692 | # CONFIG_I2C_ALGOPCF is not set | ||
693 | # CONFIG_I2C_ALGOPCA is not set | ||
694 | |||
695 | # | ||
696 | # I2C Hardware Bus support | ||
697 | # | ||
698 | # CONFIG_I2C_GPIO is not set | ||
699 | # CONFIG_I2C_OCORES is not set | ||
700 | CONFIG_I2C_OMAP=y | ||
701 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
702 | # CONFIG_I2C_SIMTEC is not set | ||
703 | # CONFIG_I2C_TAOS_EVM is not set | ||
704 | # CONFIG_I2C_STUB is not set | ||
705 | # CONFIG_I2C_TINY_USB is not set | ||
706 | |||
707 | # | ||
708 | # Miscellaneous I2C Chip support | ||
709 | # | ||
710 | # CONFIG_SENSORS_DS1337 is not set | ||
711 | # CONFIG_SENSORS_DS1374 is not set | ||
712 | # CONFIG_DS1682 is not set | ||
713 | # CONFIG_SENSORS_EEPROM is not set | ||
714 | # CONFIG_SENSORS_PCF8574 is not set | ||
715 | # CONFIG_SENSORS_PCA9539 is not set | ||
716 | # CONFIG_SENSORS_PCF8591 is not set | ||
717 | # CONFIG_TPS65010 is not set | ||
718 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
719 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
720 | CONFIG_TWL4030_CORE=y | ||
721 | CONFIG_TWL4030_GPIO=y | ||
722 | # CONFIG_SENSORS_MAX6875 is not set | ||
723 | # CONFIG_SENSORS_TSL2550 is not set | ||
724 | # CONFIG_MENELAUS is not set | ||
725 | # CONFIG_I2C_DEBUG_CORE is not set | ||
726 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
727 | # CONFIG_I2C_DEBUG_BUS is not set | ||
728 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
729 | |||
730 | # | ||
731 | # SPI support | ||
732 | # | ||
733 | CONFIG_SPI=y | ||
734 | # CONFIG_SPI_DEBUG is not set | ||
735 | CONFIG_SPI_MASTER=y | ||
736 | |||
737 | # | ||
738 | # SPI Master Controller Drivers | ||
739 | # | ||
740 | # CONFIG_SPI_BITBANG is not set | ||
741 | # CONFIG_SPI_OMAP24XX is not set | ||
742 | |||
743 | # | ||
744 | # SPI Protocol Masters | ||
745 | # | ||
746 | # CONFIG_SPI_AT25 is not set | ||
747 | # CONFIG_SPI_TSC2101 is not set | ||
748 | # CONFIG_SPI_TSC2102 is not set | ||
749 | # CONFIG_SPI_TSC210X is not set | ||
750 | # CONFIG_SPI_TSC2301 is not set | ||
751 | # CONFIG_SPI_SPIDEV is not set | ||
752 | # CONFIG_SPI_TLE62X0 is not set | ||
753 | # CONFIG_W1 is not set | ||
754 | # CONFIG_HWMON is not set | ||
755 | CONFIG_MISC_DEVICES=y | ||
756 | # CONFIG_EEPROM_93CX6 is not set | ||
757 | |||
758 | # | ||
759 | # Multifunction device drivers | ||
760 | # | ||
761 | # CONFIG_MFD_SM501 is not set | ||
762 | # CONFIG_NEW_LEDS is not set | ||
763 | |||
764 | # | ||
765 | # Multimedia devices | ||
766 | # | ||
767 | # CONFIG_VIDEO_DEV is not set | ||
768 | # CONFIG_DVB_CORE is not set | ||
769 | CONFIG_DAB=y | ||
770 | # CONFIG_USB_DABUSB is not set | ||
771 | |||
772 | # | ||
773 | # Graphics support | ||
774 | # | ||
775 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
776 | |||
777 | # | ||
778 | # Display device support | ||
779 | # | ||
780 | # CONFIG_DISPLAY_SUPPORT is not set | ||
781 | # CONFIG_VGASTATE is not set | ||
782 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
783 | CONFIG_FB=y | ||
784 | CONFIG_FIRMWARE_EDID=y | ||
785 | # CONFIG_FB_DDC is not set | ||
786 | # CONFIG_FB_CFB_FILLRECT is not set | ||
787 | # CONFIG_FB_CFB_COPYAREA is not set | ||
788 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
789 | # CONFIG_FB_SYS_FILLRECT is not set | ||
790 | # CONFIG_FB_SYS_COPYAREA is not set | ||
791 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
792 | # CONFIG_FB_SYS_FOPS is not set | ||
793 | CONFIG_FB_DEFERRED_IO=y | ||
794 | # CONFIG_FB_SVGALIB is not set | ||
795 | # CONFIG_FB_MACMODES is not set | ||
796 | # CONFIG_FB_BACKLIGHT is not set | ||
797 | # CONFIG_FB_MODE_HELPERS is not set | ||
798 | # CONFIG_FB_TILEBLITTING is not set | ||
799 | |||
800 | # | ||
801 | # Frame buffer hardware drivers | ||
802 | # | ||
803 | # CONFIG_FB_S1D13XXX is not set | ||
804 | CONFIG_FB_OMAP=y | ||
805 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
806 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
807 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
808 | # CONFIG_FB_VIRTUAL is not set | ||
809 | |||
810 | # | ||
811 | # Console display driver support | ||
812 | # | ||
813 | # CONFIG_VGA_CONSOLE is not set | ||
814 | CONFIG_DUMMY_CONSOLE=y | ||
815 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
816 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
817 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
818 | # CONFIG_FONTS is not set | ||
819 | CONFIG_FONT_8x8=y | ||
820 | CONFIG_FONT_8x16=y | ||
821 | CONFIG_LOGO=y | ||
822 | # CONFIG_LOGO_LINUX_MONO is not set | ||
823 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
824 | CONFIG_LOGO_LINUX_CLUT224=y | ||
825 | |||
826 | # | ||
827 | # Sound | ||
828 | # | ||
829 | # CONFIG_SOUND is not set | ||
830 | CONFIG_HID_SUPPORT=y | ||
831 | CONFIG_HID=y | ||
832 | # CONFIG_HID_DEBUG is not set | ||
833 | |||
834 | # | ||
835 | # USB Input Devices | ||
836 | # | ||
837 | CONFIG_USB_HID=m | ||
838 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
839 | # CONFIG_HID_FF is not set | ||
840 | # CONFIG_USB_HIDDEV is not set | ||
841 | |||
842 | # | ||
843 | # USB HID Boot Protocol drivers | ||
844 | # | ||
845 | # CONFIG_USB_KBD is not set | ||
846 | # CONFIG_USB_MOUSE is not set | ||
847 | CONFIG_USB_SUPPORT=y | ||
848 | CONFIG_USB_ARCH_HAS_HCD=y | ||
849 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
850 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
851 | CONFIG_USB=m | ||
852 | # CONFIG_USB_DEBUG is not set | ||
853 | |||
854 | # | ||
855 | # Miscellaneous USB options | ||
856 | # | ||
857 | # CONFIG_USB_DEVICEFS is not set | ||
858 | # CONFIG_USB_DEVICE_CLASS is not set | ||
859 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
860 | CONFIG_USB_SUSPEND=y | ||
861 | # CONFIG_USB_PERSIST is not set | ||
862 | CONFIG_USB_OTG=y | ||
863 | CONFIG_USB_OTG_WHITELIST=y | ||
864 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
865 | |||
866 | # | ||
867 | # USB Host Controller Drivers | ||
868 | # | ||
869 | # CONFIG_USB_ISP116X_HCD is not set | ||
870 | # CONFIG_USB_OHCI_HCD is not set | ||
871 | # CONFIG_USB_SL811_HCD is not set | ||
872 | # CONFIG_USB_R8A66597_HCD is not set | ||
873 | CONFIG_USB_MUSB_HDRC=m | ||
874 | CONFIG_USB_MUSB_SOC=y | ||
875 | |||
876 | # | ||
877 | # OMAP 243x high speed USB support | ||
878 | # | ||
879 | # CONFIG_USB_MUSB_HOST is not set | ||
880 | # CONFIG_USB_MUSB_PERIPHERAL is not set | ||
881 | CONFIG_USB_MUSB_OTG=y | ||
882 | CONFIG_USB_GADGET_MUSB_HDRC=y | ||
883 | CONFIG_USB_MUSB_HDRC_HCD=y | ||
884 | # CONFIG_MUSB_PIO_ONLY is not set | ||
885 | CONFIG_USB_INVENTRA_DMA=y | ||
886 | # CONFIG_USB_TI_CPPI_DMA is not set | ||
887 | CONFIG_USB_MUSB_LOGLEVEL=0 | ||
888 | |||
889 | # | ||
890 | # USB Device Class drivers | ||
891 | # | ||
892 | # CONFIG_USB_ACM is not set | ||
893 | # CONFIG_USB_PRINTER is not set | ||
894 | |||
895 | # | ||
896 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
897 | # | ||
898 | |||
899 | # | ||
900 | # may also be needed; see USB_STORAGE Help for more information | ||
901 | # | ||
902 | CONFIG_USB_STORAGE=m | ||
903 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
904 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
905 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
906 | # CONFIG_USB_STORAGE_DPCM is not set | ||
907 | # CONFIG_USB_STORAGE_USBAT is not set | ||
908 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
909 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
910 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
911 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
912 | # CONFIG_USB_STORAGE_KARMA is not set | ||
913 | # CONFIG_USB_LIBUSUAL is not set | ||
914 | |||
915 | # | ||
916 | # USB Imaging devices | ||
917 | # | ||
918 | # CONFIG_USB_MDC800 is not set | ||
919 | # CONFIG_USB_MICROTEK is not set | ||
920 | CONFIG_USB_MON=y | ||
921 | |||
922 | # | ||
923 | # USB port drivers | ||
924 | # | ||
925 | |||
926 | # | ||
927 | # USB Serial Converter support | ||
928 | # | ||
929 | # CONFIG_USB_SERIAL is not set | ||
930 | |||
931 | # | ||
932 | # USB Miscellaneous drivers | ||
933 | # | ||
934 | # CONFIG_USB_EMI62 is not set | ||
935 | # CONFIG_USB_EMI26 is not set | ||
936 | # CONFIG_USB_ADUTUX is not set | ||
937 | # CONFIG_USB_AUERSWALD is not set | ||
938 | # CONFIG_USB_RIO500 is not set | ||
939 | # CONFIG_USB_LEGOTOWER is not set | ||
940 | # CONFIG_USB_LCD is not set | ||
941 | # CONFIG_USB_BERRY_CHARGE is not set | ||
942 | # CONFIG_USB_LED is not set | ||
943 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
944 | # CONFIG_USB_CYTHERM is not set | ||
945 | # CONFIG_USB_PHIDGET is not set | ||
946 | # CONFIG_USB_IDMOUSE is not set | ||
947 | # CONFIG_USB_FTDI_ELAN is not set | ||
948 | # CONFIG_USB_APPLEDISPLAY is not set | ||
949 | # CONFIG_USB_LD is not set | ||
950 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
951 | # CONFIG_USB_IOWARRIOR is not set | ||
952 | |||
953 | # | ||
954 | # USB DSL modem support | ||
955 | # | ||
956 | |||
957 | # | ||
958 | # USB Gadget Support | ||
959 | # | ||
960 | CONFIG_USB_GADGET=m | ||
961 | # CONFIG_USB_GADGET_DEBUG is not set | ||
962 | CONFIG_USB_GADGET_DEBUG_FILES=y | ||
963 | CONFIG_USB_GADGET_SELECTED=y | ||
964 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
965 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
966 | # CONFIG_USB_GADGET_NET2280 is not set | ||
967 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
968 | # CONFIG_USB_GADGET_M66592 is not set | ||
969 | # CONFIG_USB_GADGET_GOKU is not set | ||
970 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
971 | # CONFIG_USB_GADGET_OMAP is not set | ||
972 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
973 | # CONFIG_USB_GADGET_AT91 is not set | ||
974 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
975 | CONFIG_USB_GADGET_DUALSPEED=y | ||
976 | CONFIG_USB_ZERO=m | ||
977 | # CONFIG_USB_ZERO_HNPTEST is not set | ||
978 | CONFIG_USB_ETH=m | ||
979 | CONFIG_USB_ETH_RNDIS=y | ||
980 | CONFIG_USB_GADGETFS=m | ||
981 | CONFIG_USB_FILE_STORAGE=m | ||
982 | # CONFIG_USB_FILE_STORAGE_TEST is not set | ||
983 | CONFIG_USB_G_SERIAL=m | ||
984 | # CONFIG_USB_MIDI_GADGET is not set | ||
985 | CONFIG_MMC=y | ||
986 | # CONFIG_MMC_DEBUG is not set | ||
987 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
988 | |||
989 | # | ||
990 | # MMC/SD Card Drivers | ||
991 | # | ||
992 | CONFIG_MMC_BLOCK=y | ||
993 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
994 | |||
995 | # | ||
996 | # MMC/SD Host Controller Drivers | ||
997 | # | ||
998 | CONFIG_MMC_OMAP_HS=y | ||
999 | CONFIG_RTC_LIB=y | ||
1000 | # CONFIG_RTC_CLASS is not set | ||
1001 | |||
1002 | # | ||
1003 | # DMA Engine support | ||
1004 | # | ||
1005 | # CONFIG_DMA_ENGINE is not set | ||
1006 | |||
1007 | # | ||
1008 | # DMA Clients | ||
1009 | # | ||
1010 | |||
1011 | # | ||
1012 | # DMA Devices | ||
1013 | # | ||
1014 | |||
1015 | # | ||
1016 | # CBUS support | ||
1017 | # | ||
1018 | # CONFIG_CBUS is not set | ||
1019 | |||
1020 | # | ||
1021 | # File systems | ||
1022 | # | ||
1023 | CONFIG_EXT2_FS=y | ||
1024 | # CONFIG_EXT2_FS_XATTR is not set | ||
1025 | # CONFIG_EXT2_FS_XIP is not set | ||
1026 | CONFIG_EXT3_FS=y | ||
1027 | # CONFIG_EXT3_FS_XATTR is not set | ||
1028 | # CONFIG_EXT4DEV_FS is not set | ||
1029 | CONFIG_JBD=y | ||
1030 | # CONFIG_JBD_DEBUG is not set | ||
1031 | # CONFIG_REISERFS_FS is not set | ||
1032 | # CONFIG_JFS_FS is not set | ||
1033 | # CONFIG_FS_POSIX_ACL is not set | ||
1034 | # CONFIG_XFS_FS is not set | ||
1035 | # CONFIG_GFS2_FS is not set | ||
1036 | # CONFIG_OCFS2_FS is not set | ||
1037 | # CONFIG_MINIX_FS is not set | ||
1038 | # CONFIG_ROMFS_FS is not set | ||
1039 | CONFIG_INOTIFY=y | ||
1040 | CONFIG_INOTIFY_USER=y | ||
1041 | CONFIG_QUOTA=y | ||
1042 | # CONFIG_QFMT_V1 is not set | ||
1043 | CONFIG_QFMT_V2=y | ||
1044 | CONFIG_QUOTACTL=y | ||
1045 | CONFIG_DNOTIFY=y | ||
1046 | # CONFIG_AUTOFS_FS is not set | ||
1047 | # CONFIG_AUTOFS4_FS is not set | ||
1048 | # CONFIG_FUSE_FS is not set | ||
1049 | |||
1050 | # | ||
1051 | # CD-ROM/DVD Filesystems | ||
1052 | # | ||
1053 | # CONFIG_ISO9660_FS is not set | ||
1054 | # CONFIG_UDF_FS is not set | ||
1055 | |||
1056 | # | ||
1057 | # DOS/FAT/NT Filesystems | ||
1058 | # | ||
1059 | CONFIG_FAT_FS=y | ||
1060 | CONFIG_MSDOS_FS=y | ||
1061 | CONFIG_VFAT_FS=y | ||
1062 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1063 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1064 | # CONFIG_NTFS_FS is not set | ||
1065 | |||
1066 | # | ||
1067 | # Pseudo filesystems | ||
1068 | # | ||
1069 | CONFIG_PROC_FS=y | ||
1070 | CONFIG_PROC_SYSCTL=y | ||
1071 | CONFIG_SYSFS=y | ||
1072 | CONFIG_TMPFS=y | ||
1073 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
1074 | # CONFIG_HUGETLB_PAGE is not set | ||
1075 | CONFIG_RAMFS=y | ||
1076 | # CONFIG_CONFIGFS_FS is not set | ||
1077 | |||
1078 | # | ||
1079 | # Miscellaneous filesystems | ||
1080 | # | ||
1081 | # CONFIG_ADFS_FS is not set | ||
1082 | # CONFIG_AFFS_FS is not set | ||
1083 | # CONFIG_HFS_FS is not set | ||
1084 | # CONFIG_HFSPLUS_FS is not set | ||
1085 | # CONFIG_BEFS_FS is not set | ||
1086 | # CONFIG_BFS_FS is not set | ||
1087 | # CONFIG_EFS_FS is not set | ||
1088 | CONFIG_JFFS2_FS=y | ||
1089 | CONFIG_JFFS2_FS_DEBUG=0 | ||
1090 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
1091 | # CONFIG_JFFS2_SUMMARY is not set | ||
1092 | # CONFIG_JFFS2_FS_XATTR is not set | ||
1093 | CONFIG_JFFS2_COMPRESSION_OPTIONS=y | ||
1094 | CONFIG_JFFS2_ZLIB=y | ||
1095 | CONFIG_JFFS2_RTIME=y | ||
1096 | # CONFIG_JFFS2_RUBIN is not set | ||
1097 | # CONFIG_JFFS2_CMODE_NONE is not set | ||
1098 | CONFIG_JFFS2_CMODE_PRIORITY=y | ||
1099 | # CONFIG_JFFS2_CMODE_SIZE is not set | ||
1100 | # CONFIG_CRAMFS is not set | ||
1101 | # CONFIG_VXFS_FS is not set | ||
1102 | # CONFIG_HPFS_FS is not set | ||
1103 | # CONFIG_QNX4FS_FS is not set | ||
1104 | # CONFIG_SYSV_FS is not set | ||
1105 | # CONFIG_UFS_FS is not set | ||
1106 | |||
1107 | # | ||
1108 | # Network File Systems | ||
1109 | # | ||
1110 | CONFIG_NFS_FS=y | ||
1111 | CONFIG_NFS_V3=y | ||
1112 | # CONFIG_NFS_V3_ACL is not set | ||
1113 | # CONFIG_NFS_V4 is not set | ||
1114 | # CONFIG_NFS_DIRECTIO is not set | ||
1115 | # CONFIG_NFSD is not set | ||
1116 | CONFIG_ROOT_NFS=y | ||
1117 | CONFIG_LOCKD=y | ||
1118 | CONFIG_LOCKD_V4=y | ||
1119 | CONFIG_NFS_COMMON=y | ||
1120 | CONFIG_SUNRPC=y | ||
1121 | # CONFIG_SUNRPC_BIND34 is not set | ||
1122 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1123 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1124 | # CONFIG_SMB_FS is not set | ||
1125 | # CONFIG_CIFS is not set | ||
1126 | # CONFIG_NCP_FS is not set | ||
1127 | # CONFIG_CODA_FS is not set | ||
1128 | # CONFIG_AFS_FS is not set | ||
1129 | |||
1130 | # | ||
1131 | # Partition Types | ||
1132 | # | ||
1133 | CONFIG_PARTITION_ADVANCED=y | ||
1134 | # CONFIG_ACORN_PARTITION is not set | ||
1135 | # CONFIG_OSF_PARTITION is not set | ||
1136 | # CONFIG_AMIGA_PARTITION is not set | ||
1137 | # CONFIG_ATARI_PARTITION is not set | ||
1138 | # CONFIG_MAC_PARTITION is not set | ||
1139 | CONFIG_MSDOS_PARTITION=y | ||
1140 | # CONFIG_BSD_DISKLABEL is not set | ||
1141 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1142 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1143 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
1144 | # CONFIG_LDM_PARTITION is not set | ||
1145 | # CONFIG_SGI_PARTITION is not set | ||
1146 | # CONFIG_ULTRIX_PARTITION is not set | ||
1147 | # CONFIG_SUN_PARTITION is not set | ||
1148 | # CONFIG_KARMA_PARTITION is not set | ||
1149 | # CONFIG_EFI_PARTITION is not set | ||
1150 | # CONFIG_SYSV68_PARTITION is not set | ||
1151 | |||
1152 | # | ||
1153 | # Native Language Support | ||
1154 | # | ||
1155 | CONFIG_NLS=y | ||
1156 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1157 | CONFIG_NLS_CODEPAGE_437=y | ||
1158 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1159 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1160 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1161 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1162 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1163 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1164 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1165 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1166 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1167 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1168 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1169 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1170 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1171 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1172 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1173 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1174 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1175 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1176 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1177 | # CONFIG_NLS_ISO8859_8 is not set | ||
1178 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1179 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1180 | # CONFIG_NLS_ASCII is not set | ||
1181 | # CONFIG_NLS_ISO8859_1 is not set | ||
1182 | # CONFIG_NLS_ISO8859_2 is not set | ||
1183 | # CONFIG_NLS_ISO8859_3 is not set | ||
1184 | # CONFIG_NLS_ISO8859_4 is not set | ||
1185 | # CONFIG_NLS_ISO8859_5 is not set | ||
1186 | # CONFIG_NLS_ISO8859_6 is not set | ||
1187 | # CONFIG_NLS_ISO8859_7 is not set | ||
1188 | # CONFIG_NLS_ISO8859_9 is not set | ||
1189 | # CONFIG_NLS_ISO8859_13 is not set | ||
1190 | # CONFIG_NLS_ISO8859_14 is not set | ||
1191 | # CONFIG_NLS_ISO8859_15 is not set | ||
1192 | # CONFIG_NLS_KOI8_R is not set | ||
1193 | # CONFIG_NLS_KOI8_U is not set | ||
1194 | # CONFIG_NLS_UTF8 is not set | ||
1195 | |||
1196 | # | ||
1197 | # Distributed Lock Manager | ||
1198 | # | ||
1199 | # CONFIG_DLM is not set | ||
1200 | |||
1201 | # | ||
1202 | # Profiling support | ||
1203 | # | ||
1204 | # CONFIG_PROFILING is not set | ||
1205 | |||
1206 | # | ||
1207 | # Kernel hacking | ||
1208 | # | ||
1209 | # CONFIG_PRINTK_TIME is not set | ||
1210 | CONFIG_ENABLE_MUST_CHECK=y | ||
1211 | CONFIG_MAGIC_SYSRQ=y | ||
1212 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1213 | # CONFIG_DEBUG_FS is not set | ||
1214 | # CONFIG_HEADERS_CHECK is not set | ||
1215 | CONFIG_DEBUG_KERNEL=y | ||
1216 | # CONFIG_DEBUG_SHIRQ is not set | ||
1217 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1218 | CONFIG_SCHED_DEBUG=y | ||
1219 | # CONFIG_SCHEDSTATS is not set | ||
1220 | CONFIG_TIMER_STATS=y | ||
1221 | # CONFIG_DEBUG_SLAB is not set | ||
1222 | CONFIG_DEBUG_PREEMPT=y | ||
1223 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1224 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1225 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1226 | CONFIG_DEBUG_MUTEXES=y | ||
1227 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1228 | # CONFIG_PROVE_LOCKING is not set | ||
1229 | # CONFIG_LOCK_STAT is not set | ||
1230 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1231 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1232 | # CONFIG_DEBUG_KOBJECT is not set | ||
1233 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
1234 | # CONFIG_DEBUG_INFO is not set | ||
1235 | # CONFIG_DEBUG_VM is not set | ||
1236 | # CONFIG_DEBUG_LIST is not set | ||
1237 | CONFIG_FRAME_POINTER=y | ||
1238 | CONFIG_FORCED_INLINING=y | ||
1239 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1240 | # CONFIG_FAULT_INJECTION is not set | ||
1241 | # CONFIG_DEBUG_USER is not set | ||
1242 | # CONFIG_DEBUG_ERRORS is not set | ||
1243 | # CONFIG_DEBUG_LL is not set | ||
1244 | |||
1245 | # | ||
1246 | # Security options | ||
1247 | # | ||
1248 | # CONFIG_KEYS is not set | ||
1249 | # CONFIG_SECURITY is not set | ||
1250 | CONFIG_CRYPTO=y | ||
1251 | CONFIG_CRYPTO_ALGAPI=y | ||
1252 | CONFIG_CRYPTO_BLKCIPHER=y | ||
1253 | CONFIG_CRYPTO_MANAGER=y | ||
1254 | # CONFIG_CRYPTO_HMAC is not set | ||
1255 | # CONFIG_CRYPTO_XCBC is not set | ||
1256 | # CONFIG_CRYPTO_NULL is not set | ||
1257 | # CONFIG_CRYPTO_MD4 is not set | ||
1258 | CONFIG_CRYPTO_MD5=y | ||
1259 | # CONFIG_CRYPTO_SHA1 is not set | ||
1260 | # CONFIG_CRYPTO_SHA256 is not set | ||
1261 | # CONFIG_CRYPTO_SHA512 is not set | ||
1262 | # CONFIG_CRYPTO_WP512 is not set | ||
1263 | # CONFIG_CRYPTO_TGR192 is not set | ||
1264 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1265 | CONFIG_CRYPTO_ECB=m | ||
1266 | CONFIG_CRYPTO_CBC=y | ||
1267 | CONFIG_CRYPTO_PCBC=m | ||
1268 | # CONFIG_CRYPTO_LRW is not set | ||
1269 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1270 | CONFIG_CRYPTO_DES=y | ||
1271 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1272 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1273 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1274 | # CONFIG_CRYPTO_SERPENT is not set | ||
1275 | # CONFIG_CRYPTO_AES is not set | ||
1276 | # CONFIG_CRYPTO_CAST5 is not set | ||
1277 | # CONFIG_CRYPTO_CAST6 is not set | ||
1278 | # CONFIG_CRYPTO_TEA is not set | ||
1279 | # CONFIG_CRYPTO_ARC4 is not set | ||
1280 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1281 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1282 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1283 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1284 | # CONFIG_CRYPTO_CRC32C is not set | ||
1285 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1286 | # CONFIG_CRYPTO_TEST is not set | ||
1287 | CONFIG_CRYPTO_HW=y | ||
1288 | |||
1289 | # | ||
1290 | # Library routines | ||
1291 | # | ||
1292 | CONFIG_BITREVERSE=y | ||
1293 | CONFIG_CRC_CCITT=y | ||
1294 | # CONFIG_CRC16 is not set | ||
1295 | # CONFIG_CRC_ITU_T is not set | ||
1296 | CONFIG_CRC32=y | ||
1297 | # CONFIG_CRC7 is not set | ||
1298 | CONFIG_LIBCRC32C=y | ||
1299 | CONFIG_ZLIB_INFLATE=y | ||
1300 | CONFIG_ZLIB_DEFLATE=y | ||
1301 | CONFIG_PLIST=y | ||
1302 | CONFIG_HAS_IOMEM=y | ||
1303 | CONFIG_HAS_IOPORT=y | ||
1304 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_apollon_2420_defconfig b/arch/arm/configs/omap_apollon_2420_defconfig new file mode 100644 index 000000000000..bb39dfc72d69 --- /dev/null +++ b/arch/arm/configs/omap_apollon_2420_defconfig | |||
@@ -0,0 +1,962 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 12:07:29 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_LOCK_KERNEL=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | CONFIG_LOCALVERSION="" | ||
36 | # CONFIG_LOCALVERSION_AUTO is not set | ||
37 | CONFIG_SWAP=y | ||
38 | CONFIG_SYSVIPC=y | ||
39 | CONFIG_SYSVIPC_SYSCTL=y | ||
40 | # CONFIG_POSIX_MQUEUE is not set | ||
41 | CONFIG_BSD_PROCESS_ACCT=y | ||
42 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
43 | # CONFIG_TASKSTATS is not set | ||
44 | # CONFIG_USER_NS is not set | ||
45 | # CONFIG_AUDIT is not set | ||
46 | # CONFIG_IKCONFIG is not set | ||
47 | CONFIG_LOG_BUF_SHIFT=14 | ||
48 | CONFIG_SYSFS_DEPRECATED=y | ||
49 | # CONFIG_RELAY is not set | ||
50 | # CONFIG_BLK_DEV_INITRD is not set | ||
51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
52 | CONFIG_SYSCTL=y | ||
53 | # CONFIG_EMBEDDED is not set | ||
54 | CONFIG_UID16=y | ||
55 | CONFIG_SYSCTL_SYSCALL=y | ||
56 | CONFIG_KALLSYMS=y | ||
57 | # CONFIG_KALLSYMS_ALL is not set | ||
58 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
59 | CONFIG_HOTPLUG=y | ||
60 | CONFIG_PRINTK=y | ||
61 | CONFIG_BUG=y | ||
62 | CONFIG_ELF_CORE=y | ||
63 | CONFIG_BASE_FULL=y | ||
64 | CONFIG_FUTEX=y | ||
65 | CONFIG_ANON_INODES=y | ||
66 | CONFIG_EPOLL=y | ||
67 | CONFIG_SIGNALFD=y | ||
68 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | ||
70 | CONFIG_SHMEM=y | ||
71 | CONFIG_VM_EVENT_COUNTERS=y | ||
72 | CONFIG_SLAB=y | ||
73 | # CONFIG_SLUB is not set | ||
74 | # CONFIG_SLOB is not set | ||
75 | CONFIG_RT_MUTEXES=y | ||
76 | # CONFIG_TINY_SHMEM is not set | ||
77 | CONFIG_BASE_SMALL=0 | ||
78 | CONFIG_MODULES=y | ||
79 | CONFIG_MODULE_UNLOAD=y | ||
80 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
81 | # CONFIG_MODVERSIONS is not set | ||
82 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
83 | CONFIG_KMOD=y | ||
84 | CONFIG_BLOCK=y | ||
85 | # CONFIG_LBD is not set | ||
86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
87 | # CONFIG_LSF is not set | ||
88 | # CONFIG_BLK_DEV_BSG is not set | ||
89 | |||
90 | # | ||
91 | # IO Schedulers | ||
92 | # | ||
93 | CONFIG_IOSCHED_NOOP=y | ||
94 | CONFIG_IOSCHED_AS=y | ||
95 | CONFIG_IOSCHED_DEADLINE=y | ||
96 | CONFIG_IOSCHED_CFQ=y | ||
97 | # CONFIG_DEFAULT_AS is not set | ||
98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
99 | CONFIG_DEFAULT_CFQ=y | ||
100 | # CONFIG_DEFAULT_NOOP is not set | ||
101 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
102 | |||
103 | # | ||
104 | # System Type | ||
105 | # | ||
106 | # CONFIG_ARCH_AAEC2000 is not set | ||
107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
108 | # CONFIG_ARCH_REALVIEW is not set | ||
109 | # CONFIG_ARCH_VERSATILE is not set | ||
110 | # CONFIG_ARCH_AT91 is not set | ||
111 | # CONFIG_ARCH_CLPS7500 is not set | ||
112 | # CONFIG_ARCH_CLPS711X is not set | ||
113 | # CONFIG_ARCH_CO285 is not set | ||
114 | # CONFIG_ARCH_EBSA110 is not set | ||
115 | # CONFIG_ARCH_EP93XX is not set | ||
116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
117 | # CONFIG_ARCH_NETX is not set | ||
118 | # CONFIG_ARCH_H720X is not set | ||
119 | # CONFIG_ARCH_IMX is not set | ||
120 | # CONFIG_ARCH_IOP13XX is not set | ||
121 | # CONFIG_ARCH_IOP32X is not set | ||
122 | # CONFIG_ARCH_IOP33X is not set | ||
123 | # CONFIG_ARCH_IXP23XX is not set | ||
124 | # CONFIG_ARCH_IXP2000 is not set | ||
125 | # CONFIG_ARCH_IXP4XX is not set | ||
126 | # CONFIG_ARCH_L7200 is not set | ||
127 | # CONFIG_ARCH_KS8695 is not set | ||
128 | # CONFIG_ARCH_NS9XXX is not set | ||
129 | # CONFIG_ARCH_MXC is not set | ||
130 | # CONFIG_ARCH_PNX4008 is not set | ||
131 | # CONFIG_ARCH_PXA is not set | ||
132 | # CONFIG_ARCH_RPC is not set | ||
133 | # CONFIG_ARCH_SA1100 is not set | ||
134 | # CONFIG_ARCH_S3C2410 is not set | ||
135 | # CONFIG_ARCH_SHARK is not set | ||
136 | # CONFIG_ARCH_LH7A40X is not set | ||
137 | # CONFIG_ARCH_DAVINCI is not set | ||
138 | CONFIG_ARCH_OMAP=y | ||
139 | |||
140 | # | ||
141 | # TI OMAP Implementations | ||
142 | # | ||
143 | CONFIG_ARCH_OMAP_OTG=y | ||
144 | # CONFIG_ARCH_OMAP1 is not set | ||
145 | CONFIG_ARCH_OMAP2=y | ||
146 | # CONFIG_ARCH_OMAP3 is not set | ||
147 | |||
148 | # | ||
149 | # OMAP Feature Selections | ||
150 | # | ||
151 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
152 | # CONFIG_OMAP_BOOT_TAG is not set | ||
153 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
154 | CONFIG_OMAP_MUX=y | ||
155 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
156 | CONFIG_OMAP_MUX_WARNINGS=y | ||
157 | # CONFIG_OMAP_STI is not set | ||
158 | # CONFIG_OMAP_MCBSP is not set | ||
159 | # CONFIG_OMAP_MMU_FWK is not set | ||
160 | # CONFIG_OMAP_MBOX_FWK is not set | ||
161 | # CONFIG_OMAP_MPU_TIMER is not set | ||
162 | CONFIG_OMAP_32K_TIMER=y | ||
163 | CONFIG_OMAP_32K_TIMER_HZ=128 | ||
164 | CONFIG_OMAP_DM_TIMER=y | ||
165 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
166 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
167 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
168 | CONFIG_OMAP_SERIAL_WAKE=y | ||
169 | # CONFIG_OMAP_DSP is not set | ||
170 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
171 | |||
172 | # | ||
173 | # OMAP Core Type | ||
174 | # | ||
175 | CONFIG_ARCH_OMAP24XX=y | ||
176 | CONFIG_ARCH_OMAP2420=y | ||
177 | # CONFIG_ARCH_OMAP2430 is not set | ||
178 | |||
179 | # | ||
180 | # OMAP Board Type | ||
181 | # | ||
182 | # CONFIG_MACH_NOKIA_N800 is not set | ||
183 | # CONFIG_MACH_OMAP_H4 is not set | ||
184 | CONFIG_MACH_OMAP_APOLLON=y | ||
185 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
186 | # CONFIG_MACH_OMAP_2430SDP is not set | ||
187 | |||
188 | # | ||
189 | # Boot options | ||
190 | # | ||
191 | |||
192 | # | ||
193 | # Power management | ||
194 | # | ||
195 | |||
196 | # | ||
197 | # Processor Type | ||
198 | # | ||
199 | CONFIG_CPU_32=y | ||
200 | CONFIG_CPU_V6=y | ||
201 | # CONFIG_CPU_32v6K is not set | ||
202 | CONFIG_CPU_32v6=y | ||
203 | CONFIG_CPU_ABRT_EV6=y | ||
204 | CONFIG_CPU_PABRT_NOIFAR=y | ||
205 | CONFIG_CPU_CACHE_V6=y | ||
206 | CONFIG_CPU_CACHE_VIPT=y | ||
207 | CONFIG_CPU_COPY_V6=y | ||
208 | CONFIG_CPU_TLB_V6=y | ||
209 | CONFIG_CPU_HAS_ASID=y | ||
210 | CONFIG_CPU_CP15=y | ||
211 | CONFIG_CPU_CP15_MMU=y | ||
212 | |||
213 | # | ||
214 | # Processor Features | ||
215 | # | ||
216 | # CONFIG_ARM_THUMB is not set | ||
217 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
218 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
219 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
220 | # CONFIG_OUTER_CACHE is not set | ||
221 | |||
222 | # | ||
223 | # Bus support | ||
224 | # | ||
225 | # CONFIG_PCI_SYSCALL is not set | ||
226 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
227 | |||
228 | # | ||
229 | # PCCARD (PCMCIA/CardBus) support | ||
230 | # | ||
231 | # CONFIG_PCCARD is not set | ||
232 | |||
233 | # | ||
234 | # Kernel Features | ||
235 | # | ||
236 | # CONFIG_TICK_ONESHOT is not set | ||
237 | # CONFIG_NO_HZ is not set | ||
238 | # CONFIG_HIGH_RES_TIMERS is not set | ||
239 | CONFIG_PREEMPT=y | ||
240 | CONFIG_HZ=128 | ||
241 | # CONFIG_AEABI is not set | ||
242 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
243 | CONFIG_SELECT_MEMORY_MODEL=y | ||
244 | CONFIG_FLATMEM_MANUAL=y | ||
245 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
246 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
247 | CONFIG_FLATMEM=y | ||
248 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
249 | # CONFIG_SPARSEMEM_STATIC is not set | ||
250 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
251 | # CONFIG_RESOURCES_64BIT is not set | ||
252 | CONFIG_ZONE_DMA_FLAG=1 | ||
253 | CONFIG_BOUNCE=y | ||
254 | CONFIG_VIRT_TO_BUS=y | ||
255 | # CONFIG_LEDS is not set | ||
256 | CONFIG_ALIGNMENT_TRAP=y | ||
257 | |||
258 | # | ||
259 | # Boot options | ||
260 | # | ||
261 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
262 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
263 | CONFIG_CMDLINE="root=/dev/ram0 rw mem=128M console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192" | ||
264 | # CONFIG_XIP_KERNEL is not set | ||
265 | # CONFIG_KEXEC is not set | ||
266 | |||
267 | # | ||
268 | # CPU Frequency scaling | ||
269 | # | ||
270 | # CONFIG_CPU_FREQ is not set | ||
271 | |||
272 | # | ||
273 | # Floating point emulation | ||
274 | # | ||
275 | |||
276 | # | ||
277 | # At least one emulation must be selected | ||
278 | # | ||
279 | # CONFIG_FPE_NWFPE is not set | ||
280 | # CONFIG_FPE_FASTFPE is not set | ||
281 | CONFIG_VFP=y | ||
282 | |||
283 | # | ||
284 | # Userspace binary formats | ||
285 | # | ||
286 | CONFIG_BINFMT_ELF=y | ||
287 | # CONFIG_BINFMT_AOUT is not set | ||
288 | # CONFIG_BINFMT_MISC is not set | ||
289 | # CONFIG_ARTHUR is not set | ||
290 | |||
291 | # | ||
292 | # Power management options | ||
293 | # | ||
294 | # CONFIG_PM is not set | ||
295 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
296 | |||
297 | # | ||
298 | # Networking | ||
299 | # | ||
300 | CONFIG_NET=y | ||
301 | |||
302 | # | ||
303 | # Networking options | ||
304 | # | ||
305 | CONFIG_PACKET=y | ||
306 | # CONFIG_PACKET_MMAP is not set | ||
307 | CONFIG_UNIX=y | ||
308 | CONFIG_XFRM=y | ||
309 | # CONFIG_XFRM_USER is not set | ||
310 | # CONFIG_XFRM_SUB_POLICY is not set | ||
311 | # CONFIG_XFRM_MIGRATE is not set | ||
312 | # CONFIG_NET_KEY is not set | ||
313 | CONFIG_INET=y | ||
314 | # CONFIG_IP_MULTICAST is not set | ||
315 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
316 | CONFIG_IP_FIB_HASH=y | ||
317 | CONFIG_IP_PNP=y | ||
318 | CONFIG_IP_PNP_DHCP=y | ||
319 | CONFIG_IP_PNP_BOOTP=y | ||
320 | # CONFIG_IP_PNP_RARP is not set | ||
321 | # CONFIG_NET_IPIP is not set | ||
322 | # CONFIG_NET_IPGRE is not set | ||
323 | # CONFIG_ARPD is not set | ||
324 | # CONFIG_SYN_COOKIES is not set | ||
325 | # CONFIG_INET_AH is not set | ||
326 | # CONFIG_INET_ESP is not set | ||
327 | # CONFIG_INET_IPCOMP is not set | ||
328 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
329 | # CONFIG_INET_TUNNEL is not set | ||
330 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
331 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
332 | CONFIG_INET_XFRM_MODE_BEET=y | ||
333 | CONFIG_INET_DIAG=y | ||
334 | CONFIG_INET_TCP_DIAG=y | ||
335 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
336 | CONFIG_TCP_CONG_CUBIC=y | ||
337 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
338 | # CONFIG_TCP_MD5SIG is not set | ||
339 | # CONFIG_IPV6 is not set | ||
340 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
341 | # CONFIG_INET6_TUNNEL is not set | ||
342 | # CONFIG_NETWORK_SECMARK is not set | ||
343 | # CONFIG_NETFILTER is not set | ||
344 | # CONFIG_IP_DCCP is not set | ||
345 | # CONFIG_IP_SCTP is not set | ||
346 | # CONFIG_TIPC is not set | ||
347 | # CONFIG_ATM is not set | ||
348 | # CONFIG_BRIDGE is not set | ||
349 | # CONFIG_VLAN_8021Q is not set | ||
350 | # CONFIG_DECNET is not set | ||
351 | # CONFIG_LLC2 is not set | ||
352 | # CONFIG_IPX is not set | ||
353 | # CONFIG_ATALK is not set | ||
354 | # CONFIG_X25 is not set | ||
355 | # CONFIG_LAPB is not set | ||
356 | # CONFIG_ECONET is not set | ||
357 | # CONFIG_WAN_ROUTER is not set | ||
358 | |||
359 | # | ||
360 | # QoS and/or fair queueing | ||
361 | # | ||
362 | # CONFIG_NET_SCHED is not set | ||
363 | |||
364 | # | ||
365 | # Network testing | ||
366 | # | ||
367 | # CONFIG_NET_PKTGEN is not set | ||
368 | # CONFIG_HAMRADIO is not set | ||
369 | # CONFIG_IRDA is not set | ||
370 | # CONFIG_BT is not set | ||
371 | # CONFIG_AF_RXRPC is not set | ||
372 | |||
373 | # | ||
374 | # Wireless | ||
375 | # | ||
376 | # CONFIG_CFG80211 is not set | ||
377 | # CONFIG_WIRELESS_EXT is not set | ||
378 | # CONFIG_MAC80211 is not set | ||
379 | # CONFIG_IEEE80211 is not set | ||
380 | # CONFIG_RFKILL is not set | ||
381 | # CONFIG_NET_9P is not set | ||
382 | |||
383 | # | ||
384 | # Device Drivers | ||
385 | # | ||
386 | |||
387 | # | ||
388 | # Generic Driver Options | ||
389 | # | ||
390 | CONFIG_STANDALONE=y | ||
391 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
392 | # CONFIG_FW_LOADER is not set | ||
393 | # CONFIG_DEBUG_DRIVER is not set | ||
394 | # CONFIG_DEBUG_DEVRES is not set | ||
395 | # CONFIG_SYS_HYPERVISOR is not set | ||
396 | # CONFIG_CONNECTOR is not set | ||
397 | CONFIG_MTD=y | ||
398 | # CONFIG_MTD_DEBUG is not set | ||
399 | CONFIG_MTD_CONCAT=y | ||
400 | CONFIG_MTD_PARTITIONS=y | ||
401 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
402 | CONFIG_MTD_CMDLINE_PARTS=y | ||
403 | # CONFIG_MTD_AFS_PARTS is not set | ||
404 | |||
405 | # | ||
406 | # User Modules And Translation Layers | ||
407 | # | ||
408 | CONFIG_MTD_CHAR=y | ||
409 | CONFIG_MTD_BLKDEVS=y | ||
410 | CONFIG_MTD_BLOCK=y | ||
411 | # CONFIG_FTL is not set | ||
412 | # CONFIG_NFTL is not set | ||
413 | # CONFIG_INFTL is not set | ||
414 | # CONFIG_RFD_FTL is not set | ||
415 | # CONFIG_SSFDC is not set | ||
416 | |||
417 | # | ||
418 | # RAM/ROM/Flash chip drivers | ||
419 | # | ||
420 | # CONFIG_MTD_CFI is not set | ||
421 | # CONFIG_MTD_JEDECPROBE is not set | ||
422 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
423 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
424 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
425 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
426 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
427 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
428 | CONFIG_MTD_CFI_I1=y | ||
429 | CONFIG_MTD_CFI_I2=y | ||
430 | # CONFIG_MTD_CFI_I4 is not set | ||
431 | # CONFIG_MTD_CFI_I8 is not set | ||
432 | # CONFIG_MTD_RAM is not set | ||
433 | # CONFIG_MTD_ROM is not set | ||
434 | # CONFIG_MTD_ABSENT is not set | ||
435 | |||
436 | # | ||
437 | # Mapping drivers for chip access | ||
438 | # | ||
439 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
440 | # CONFIG_MTD_PLATRAM is not set | ||
441 | |||
442 | # | ||
443 | # Self-contained MTD device drivers | ||
444 | # | ||
445 | # CONFIG_MTD_DATAFLASH is not set | ||
446 | # CONFIG_MTD_M25P80 is not set | ||
447 | # CONFIG_MTD_SLRAM is not set | ||
448 | # CONFIG_MTD_PHRAM is not set | ||
449 | # CONFIG_MTD_MTDRAM is not set | ||
450 | # CONFIG_MTD_BLOCK2MTD is not set | ||
451 | |||
452 | # | ||
453 | # Disk-On-Chip Device Drivers | ||
454 | # | ||
455 | # CONFIG_MTD_DOC2000 is not set | ||
456 | # CONFIG_MTD_DOC2001 is not set | ||
457 | # CONFIG_MTD_DOC2001PLUS is not set | ||
458 | # CONFIG_MTD_NAND is not set | ||
459 | CONFIG_MTD_ONENAND=y | ||
460 | # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set | ||
461 | CONFIG_MTD_ONENAND_GENERIC=y | ||
462 | # CONFIG_MTD_ONENAND_OMAP2 is not set | ||
463 | # CONFIG_MTD_ONENAND_OTP is not set | ||
464 | |||
465 | # | ||
466 | # UBI - Unsorted block images | ||
467 | # | ||
468 | # CONFIG_MTD_UBI is not set | ||
469 | # CONFIG_PARPORT is not set | ||
470 | CONFIG_BLK_DEV=y | ||
471 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
472 | CONFIG_BLK_DEV_LOOP=y | ||
473 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
474 | # CONFIG_BLK_DEV_NBD is not set | ||
475 | # CONFIG_BLK_DEV_RAM is not set | ||
476 | # CONFIG_CDROM_PKTCDVD is not set | ||
477 | # CONFIG_ATA_OVER_ETH is not set | ||
478 | |||
479 | # | ||
480 | # SCSI device support | ||
481 | # | ||
482 | # CONFIG_RAID_ATTRS is not set | ||
483 | # CONFIG_SCSI is not set | ||
484 | # CONFIG_SCSI_DMA is not set | ||
485 | # CONFIG_SCSI_NETLINK is not set | ||
486 | # CONFIG_ATA is not set | ||
487 | # CONFIG_MD is not set | ||
488 | CONFIG_NETDEVICES=y | ||
489 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
490 | # CONFIG_DUMMY is not set | ||
491 | # CONFIG_BONDING is not set | ||
492 | # CONFIG_MACVLAN is not set | ||
493 | # CONFIG_EQUALIZER is not set | ||
494 | # CONFIG_TUN is not set | ||
495 | # CONFIG_PHYLIB is not set | ||
496 | CONFIG_NET_ETHERNET=y | ||
497 | CONFIG_MII=y | ||
498 | # CONFIG_AX88796 is not set | ||
499 | CONFIG_SMC91X=y | ||
500 | # CONFIG_DM9000 is not set | ||
501 | CONFIG_NETDEV_1000=y | ||
502 | CONFIG_NETDEV_10000=y | ||
503 | |||
504 | # | ||
505 | # Wireless LAN | ||
506 | # | ||
507 | # CONFIG_WLAN_PRE80211 is not set | ||
508 | # CONFIG_WLAN_80211 is not set | ||
509 | # CONFIG_WAN is not set | ||
510 | # CONFIG_PPP is not set | ||
511 | # CONFIG_SLIP is not set | ||
512 | # CONFIG_SHAPER is not set | ||
513 | # CONFIG_NETCONSOLE is not set | ||
514 | # CONFIG_NETPOLL is not set | ||
515 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
516 | # CONFIG_ISDN is not set | ||
517 | |||
518 | # | ||
519 | # Input device support | ||
520 | # | ||
521 | CONFIG_INPUT=y | ||
522 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
523 | # CONFIG_INPUT_POLLDEV is not set | ||
524 | |||
525 | # | ||
526 | # Userland interfaces | ||
527 | # | ||
528 | CONFIG_INPUT_MOUSEDEV=y | ||
529 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
530 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
531 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
532 | # CONFIG_INPUT_JOYDEV is not set | ||
533 | # CONFIG_INPUT_TSDEV is not set | ||
534 | # CONFIG_INPUT_EVDEV is not set | ||
535 | # CONFIG_INPUT_EVBUG is not set | ||
536 | |||
537 | # | ||
538 | # Input Device Drivers | ||
539 | # | ||
540 | # CONFIG_INPUT_KEYBOARD is not set | ||
541 | # CONFIG_INPUT_MOUSE is not set | ||
542 | # CONFIG_INPUT_JOYSTICK is not set | ||
543 | # CONFIG_INPUT_TABLET is not set | ||
544 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
545 | # CONFIG_INPUT_MISC is not set | ||
546 | |||
547 | # | ||
548 | # Hardware I/O ports | ||
549 | # | ||
550 | # CONFIG_SERIO is not set | ||
551 | # CONFIG_GAMEPORT is not set | ||
552 | |||
553 | # | ||
554 | # Character devices | ||
555 | # | ||
556 | CONFIG_VT=y | ||
557 | CONFIG_VT_CONSOLE=y | ||
558 | CONFIG_HW_CONSOLE=y | ||
559 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
560 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
561 | |||
562 | # | ||
563 | # Serial drivers | ||
564 | # | ||
565 | CONFIG_SERIAL_8250=y | ||
566 | CONFIG_SERIAL_8250_CONSOLE=y | ||
567 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
568 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
569 | CONFIG_SERIAL_8250_EXTENDED=y | ||
570 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
571 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
572 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
573 | CONFIG_SERIAL_8250_RSA=y | ||
574 | |||
575 | # | ||
576 | # Non-8250 serial port support | ||
577 | # | ||
578 | CONFIG_SERIAL_CORE=y | ||
579 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
580 | CONFIG_UNIX98_PTYS=y | ||
581 | # CONFIG_LEGACY_PTYS is not set | ||
582 | # CONFIG_IPMI_HANDLER is not set | ||
583 | CONFIG_WATCHDOG=y | ||
584 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
585 | |||
586 | # | ||
587 | # Watchdog Device Drivers | ||
588 | # | ||
589 | # CONFIG_SOFT_WATCHDOG is not set | ||
590 | CONFIG_OMAP_WATCHDOG=y | ||
591 | CONFIG_HW_RANDOM=y | ||
592 | CONFIG_HW_RANDOM_OMAP=y | ||
593 | # CONFIG_NVRAM is not set | ||
594 | # CONFIG_R3964 is not set | ||
595 | # CONFIG_RAW_DRIVER is not set | ||
596 | # CONFIG_TCG_TPM is not set | ||
597 | # CONFIG_I2C is not set | ||
598 | |||
599 | # | ||
600 | # SPI support | ||
601 | # | ||
602 | CONFIG_SPI=y | ||
603 | # CONFIG_SPI_DEBUG is not set | ||
604 | CONFIG_SPI_MASTER=y | ||
605 | |||
606 | # | ||
607 | # SPI Master Controller Drivers | ||
608 | # | ||
609 | # CONFIG_SPI_BITBANG is not set | ||
610 | CONFIG_SPI_OMAP24XX=y | ||
611 | |||
612 | # | ||
613 | # SPI Protocol Masters | ||
614 | # | ||
615 | # CONFIG_SPI_AT25 is not set | ||
616 | # CONFIG_SPI_TSC2101 is not set | ||
617 | # CONFIG_SPI_TSC2102 is not set | ||
618 | # CONFIG_SPI_TSC210X is not set | ||
619 | # CONFIG_SPI_TSC2301 is not set | ||
620 | # CONFIG_SPI_SPIDEV is not set | ||
621 | # CONFIG_SPI_TLE62X0 is not set | ||
622 | # CONFIG_W1 is not set | ||
623 | # CONFIG_HWMON is not set | ||
624 | CONFIG_MISC_DEVICES=y | ||
625 | # CONFIG_EEPROM_93CX6 is not set | ||
626 | |||
627 | # | ||
628 | # Multifunction device drivers | ||
629 | # | ||
630 | # CONFIG_MFD_SM501 is not set | ||
631 | # CONFIG_NEW_LEDS is not set | ||
632 | |||
633 | # | ||
634 | # Multimedia devices | ||
635 | # | ||
636 | # CONFIG_VIDEO_DEV is not set | ||
637 | # CONFIG_DVB_CORE is not set | ||
638 | CONFIG_DAB=y | ||
639 | |||
640 | # | ||
641 | # Graphics support | ||
642 | # | ||
643 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
644 | |||
645 | # | ||
646 | # Display device support | ||
647 | # | ||
648 | # CONFIG_DISPLAY_SUPPORT is not set | ||
649 | # CONFIG_VGASTATE is not set | ||
650 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
651 | CONFIG_FB=y | ||
652 | CONFIG_FIRMWARE_EDID=y | ||
653 | # CONFIG_FB_DDC is not set | ||
654 | # CONFIG_FB_CFB_FILLRECT is not set | ||
655 | # CONFIG_FB_CFB_COPYAREA is not set | ||
656 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
657 | # CONFIG_FB_SYS_FILLRECT is not set | ||
658 | # CONFIG_FB_SYS_COPYAREA is not set | ||
659 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
660 | # CONFIG_FB_SYS_FOPS is not set | ||
661 | CONFIG_FB_DEFERRED_IO=y | ||
662 | # CONFIG_FB_SVGALIB is not set | ||
663 | # CONFIG_FB_MACMODES is not set | ||
664 | # CONFIG_FB_BACKLIGHT is not set | ||
665 | # CONFIG_FB_MODE_HELPERS is not set | ||
666 | # CONFIG_FB_TILEBLITTING is not set | ||
667 | |||
668 | # | ||
669 | # Frame buffer hardware drivers | ||
670 | # | ||
671 | # CONFIG_FB_S1D13XXX is not set | ||
672 | CONFIG_FB_OMAP=y | ||
673 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
674 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
675 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
676 | # CONFIG_FB_VIRTUAL is not set | ||
677 | |||
678 | # | ||
679 | # Console display driver support | ||
680 | # | ||
681 | # CONFIG_VGA_CONSOLE is not set | ||
682 | CONFIG_DUMMY_CONSOLE=y | ||
683 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
684 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
685 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
686 | CONFIG_FONTS=y | ||
687 | CONFIG_FONT_8x8=y | ||
688 | CONFIG_FONT_8x16=y | ||
689 | # CONFIG_FONT_6x11 is not set | ||
690 | # CONFIG_FONT_7x14 is not set | ||
691 | # CONFIG_FONT_PEARL_8x8 is not set | ||
692 | # CONFIG_FONT_ACORN_8x8 is not set | ||
693 | # CONFIG_FONT_MINI_4x6 is not set | ||
694 | # CONFIG_FONT_SUN8x16 is not set | ||
695 | # CONFIG_FONT_SUN12x22 is not set | ||
696 | # CONFIG_FONT_10x18 is not set | ||
697 | CONFIG_LOGO=y | ||
698 | # CONFIG_LOGO_LINUX_MONO is not set | ||
699 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
700 | CONFIG_LOGO_LINUX_CLUT224=y | ||
701 | |||
702 | # | ||
703 | # Sound | ||
704 | # | ||
705 | # CONFIG_SOUND is not set | ||
706 | CONFIG_HID_SUPPORT=y | ||
707 | # CONFIG_HID is not set | ||
708 | CONFIG_USB_SUPPORT=y | ||
709 | CONFIG_USB_ARCH_HAS_HCD=y | ||
710 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
711 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
712 | # CONFIG_USB is not set | ||
713 | # CONFIG_USB_MUSB_HDRC is not set | ||
714 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
715 | |||
716 | # | ||
717 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
718 | # | ||
719 | |||
720 | # | ||
721 | # USB Gadget Support | ||
722 | # | ||
723 | CONFIG_USB_GADGET=y | ||
724 | # CONFIG_USB_GADGET_DEBUG is not set | ||
725 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
726 | CONFIG_USB_GADGET_SELECTED=y | ||
727 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
728 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
729 | # CONFIG_USB_GADGET_NET2280 is not set | ||
730 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
731 | # CONFIG_USB_GADGET_M66592 is not set | ||
732 | # CONFIG_USB_GADGET_GOKU is not set | ||
733 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
734 | CONFIG_USB_GADGET_OMAP=y | ||
735 | CONFIG_USB_OMAP=y | ||
736 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
737 | # CONFIG_USB_GADGET_AT91 is not set | ||
738 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
739 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
740 | # CONFIG_USB_ZERO is not set | ||
741 | CONFIG_USB_ETH=m | ||
742 | CONFIG_USB_ETH_RNDIS=y | ||
743 | # CONFIG_USB_GADGETFS is not set | ||
744 | CONFIG_USB_FILE_STORAGE=m | ||
745 | # CONFIG_USB_FILE_STORAGE_TEST is not set | ||
746 | # CONFIG_USB_G_SERIAL is not set | ||
747 | # CONFIG_USB_MIDI_GADGET is not set | ||
748 | CONFIG_MMC=y | ||
749 | # CONFIG_MMC_DEBUG is not set | ||
750 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
751 | |||
752 | # | ||
753 | # MMC/SD Card Drivers | ||
754 | # | ||
755 | CONFIG_MMC_BLOCK=y | ||
756 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
757 | |||
758 | # | ||
759 | # MMC/SD Host Controller Drivers | ||
760 | # | ||
761 | CONFIG_MMC_OMAP=y | ||
762 | CONFIG_RTC_LIB=y | ||
763 | # CONFIG_RTC_CLASS is not set | ||
764 | |||
765 | # | ||
766 | # DMA Engine support | ||
767 | # | ||
768 | # CONFIG_DMA_ENGINE is not set | ||
769 | |||
770 | # | ||
771 | # DMA Clients | ||
772 | # | ||
773 | |||
774 | # | ||
775 | # DMA Devices | ||
776 | # | ||
777 | |||
778 | # | ||
779 | # CBUS support | ||
780 | # | ||
781 | # CONFIG_CBUS is not set | ||
782 | |||
783 | # | ||
784 | # File systems | ||
785 | # | ||
786 | CONFIG_EXT2_FS=y | ||
787 | # CONFIG_EXT2_FS_XATTR is not set | ||
788 | # CONFIG_EXT2_FS_XIP is not set | ||
789 | # CONFIG_EXT3_FS is not set | ||
790 | # CONFIG_EXT4DEV_FS is not set | ||
791 | # CONFIG_REISERFS_FS is not set | ||
792 | # CONFIG_JFS_FS is not set | ||
793 | # CONFIG_FS_POSIX_ACL is not set | ||
794 | # CONFIG_XFS_FS is not set | ||
795 | # CONFIG_GFS2_FS is not set | ||
796 | # CONFIG_OCFS2_FS is not set | ||
797 | # CONFIG_MINIX_FS is not set | ||
798 | # CONFIG_ROMFS_FS is not set | ||
799 | # CONFIG_INOTIFY is not set | ||
800 | # CONFIG_QUOTA is not set | ||
801 | CONFIG_DNOTIFY=y | ||
802 | # CONFIG_AUTOFS_FS is not set | ||
803 | CONFIG_AUTOFS4_FS=y | ||
804 | # CONFIG_FUSE_FS is not set | ||
805 | |||
806 | # | ||
807 | # CD-ROM/DVD Filesystems | ||
808 | # | ||
809 | # CONFIG_ISO9660_FS is not set | ||
810 | # CONFIG_UDF_FS is not set | ||
811 | |||
812 | # | ||
813 | # DOS/FAT/NT Filesystems | ||
814 | # | ||
815 | # CONFIG_MSDOS_FS is not set | ||
816 | # CONFIG_VFAT_FS is not set | ||
817 | # CONFIG_NTFS_FS is not set | ||
818 | |||
819 | # | ||
820 | # Pseudo filesystems | ||
821 | # | ||
822 | CONFIG_PROC_FS=y | ||
823 | CONFIG_PROC_SYSCTL=y | ||
824 | CONFIG_SYSFS=y | ||
825 | CONFIG_TMPFS=y | ||
826 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
827 | # CONFIG_HUGETLB_PAGE is not set | ||
828 | CONFIG_RAMFS=y | ||
829 | # CONFIG_CONFIGFS_FS is not set | ||
830 | |||
831 | # | ||
832 | # Miscellaneous filesystems | ||
833 | # | ||
834 | # CONFIG_ADFS_FS is not set | ||
835 | # CONFIG_AFFS_FS is not set | ||
836 | # CONFIG_HFS_FS is not set | ||
837 | # CONFIG_HFSPLUS_FS is not set | ||
838 | # CONFIG_BEFS_FS is not set | ||
839 | # CONFIG_BFS_FS is not set | ||
840 | # CONFIG_EFS_FS is not set | ||
841 | CONFIG_JFFS2_FS=y | ||
842 | CONFIG_JFFS2_FS_DEBUG=0 | ||
843 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
844 | # CONFIG_JFFS2_SUMMARY is not set | ||
845 | # CONFIG_JFFS2_FS_XATTR is not set | ||
846 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
847 | CONFIG_JFFS2_ZLIB=y | ||
848 | CONFIG_JFFS2_RTIME=y | ||
849 | # CONFIG_JFFS2_RUBIN is not set | ||
850 | CONFIG_CRAMFS=y | ||
851 | # CONFIG_VXFS_FS is not set | ||
852 | # CONFIG_HPFS_FS is not set | ||
853 | # CONFIG_QNX4FS_FS is not set | ||
854 | # CONFIG_SYSV_FS is not set | ||
855 | # CONFIG_UFS_FS is not set | ||
856 | |||
857 | # | ||
858 | # Network File Systems | ||
859 | # | ||
860 | CONFIG_NFS_FS=y | ||
861 | CONFIG_NFS_V3=y | ||
862 | # CONFIG_NFS_V3_ACL is not set | ||
863 | # CONFIG_NFS_V4 is not set | ||
864 | # CONFIG_NFS_DIRECTIO is not set | ||
865 | # CONFIG_NFSD is not set | ||
866 | CONFIG_ROOT_NFS=y | ||
867 | CONFIG_LOCKD=y | ||
868 | CONFIG_LOCKD_V4=y | ||
869 | CONFIG_NFS_COMMON=y | ||
870 | CONFIG_SUNRPC=y | ||
871 | # CONFIG_SUNRPC_BIND34 is not set | ||
872 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
873 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
874 | # CONFIG_SMB_FS is not set | ||
875 | # CONFIG_CIFS is not set | ||
876 | # CONFIG_NCP_FS is not set | ||
877 | # CONFIG_CODA_FS is not set | ||
878 | # CONFIG_AFS_FS is not set | ||
879 | |||
880 | # | ||
881 | # Partition Types | ||
882 | # | ||
883 | # CONFIG_PARTITION_ADVANCED is not set | ||
884 | CONFIG_MSDOS_PARTITION=y | ||
885 | |||
886 | # | ||
887 | # Native Language Support | ||
888 | # | ||
889 | # CONFIG_NLS is not set | ||
890 | |||
891 | # | ||
892 | # Distributed Lock Manager | ||
893 | # | ||
894 | # CONFIG_DLM is not set | ||
895 | |||
896 | # | ||
897 | # Profiling support | ||
898 | # | ||
899 | # CONFIG_PROFILING is not set | ||
900 | |||
901 | # | ||
902 | # Kernel hacking | ||
903 | # | ||
904 | # CONFIG_PRINTK_TIME is not set | ||
905 | CONFIG_ENABLE_MUST_CHECK=y | ||
906 | # CONFIG_MAGIC_SYSRQ is not set | ||
907 | # CONFIG_UNUSED_SYMBOLS is not set | ||
908 | # CONFIG_DEBUG_FS is not set | ||
909 | # CONFIG_HEADERS_CHECK is not set | ||
910 | CONFIG_DEBUG_KERNEL=y | ||
911 | # CONFIG_DEBUG_SHIRQ is not set | ||
912 | CONFIG_DETECT_SOFTLOCKUP=y | ||
913 | CONFIG_SCHED_DEBUG=y | ||
914 | # CONFIG_SCHEDSTATS is not set | ||
915 | # CONFIG_TIMER_STATS is not set | ||
916 | # CONFIG_DEBUG_SLAB is not set | ||
917 | CONFIG_DEBUG_PREEMPT=y | ||
918 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
919 | # CONFIG_RT_MUTEX_TESTER is not set | ||
920 | CONFIG_DEBUG_SPINLOCK=y | ||
921 | CONFIG_DEBUG_MUTEXES=y | ||
922 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
923 | # CONFIG_PROVE_LOCKING is not set | ||
924 | # CONFIG_LOCK_STAT is not set | ||
925 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | ||
926 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
927 | # CONFIG_DEBUG_KOBJECT is not set | ||
928 | CONFIG_DEBUG_BUGVERBOSE=y | ||
929 | # CONFIG_DEBUG_INFO is not set | ||
930 | # CONFIG_DEBUG_VM is not set | ||
931 | # CONFIG_DEBUG_LIST is not set | ||
932 | CONFIG_FRAME_POINTER=y | ||
933 | CONFIG_FORCED_INLINING=y | ||
934 | # CONFIG_RCU_TORTURE_TEST is not set | ||
935 | # CONFIG_FAULT_INJECTION is not set | ||
936 | # CONFIG_DEBUG_USER is not set | ||
937 | # CONFIG_DEBUG_ERRORS is not set | ||
938 | # CONFIG_DEBUG_LL is not set | ||
939 | |||
940 | # | ||
941 | # Security options | ||
942 | # | ||
943 | # CONFIG_KEYS is not set | ||
944 | # CONFIG_SECURITY is not set | ||
945 | # CONFIG_CRYPTO is not set | ||
946 | |||
947 | # | ||
948 | # Library routines | ||
949 | # | ||
950 | CONFIG_BITREVERSE=y | ||
951 | CONFIG_CRC_CCITT=y | ||
952 | # CONFIG_CRC16 is not set | ||
953 | # CONFIG_CRC_ITU_T is not set | ||
954 | CONFIG_CRC32=y | ||
955 | # CONFIG_CRC7 is not set | ||
956 | CONFIG_LIBCRC32C=y | ||
957 | CONFIG_ZLIB_INFLATE=y | ||
958 | CONFIG_ZLIB_DEFLATE=y | ||
959 | CONFIG_PLIST=y | ||
960 | CONFIG_HAS_IOMEM=y | ||
961 | CONFIG_HAS_IOPORT=y | ||
962 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_generic_1510_defconfig b/arch/arm/configs/omap_generic_1510_defconfig new file mode 100644 index 000000000000..4b1c252f2091 --- /dev/null +++ b/arch/arm/configs/omap_generic_1510_defconfig | |||
@@ -0,0 +1,1172 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 12:20:19 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_LOCK_KERNEL=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | CONFIG_LOCALVERSION="" | ||
36 | CONFIG_LOCALVERSION_AUTO=y | ||
37 | CONFIG_SWAP=y | ||
38 | CONFIG_SYSVIPC=y | ||
39 | CONFIG_SYSVIPC_SYSCTL=y | ||
40 | # CONFIG_POSIX_MQUEUE is not set | ||
41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
42 | # CONFIG_TASKSTATS is not set | ||
43 | # CONFIG_USER_NS is not set | ||
44 | # CONFIG_AUDIT is not set | ||
45 | # CONFIG_IKCONFIG is not set | ||
46 | CONFIG_LOG_BUF_SHIFT=14 | ||
47 | CONFIG_SYSFS_DEPRECATED=y | ||
48 | # CONFIG_RELAY is not set | ||
49 | CONFIG_BLK_DEV_INITRD=y | ||
50 | CONFIG_INITRAMFS_SOURCE="" | ||
51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
52 | CONFIG_SYSCTL=y | ||
53 | # CONFIG_EMBEDDED is not set | ||
54 | CONFIG_UID16=y | ||
55 | CONFIG_SYSCTL_SYSCALL=y | ||
56 | CONFIG_KALLSYMS=y | ||
57 | # CONFIG_KALLSYMS_ALL is not set | ||
58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
59 | CONFIG_HOTPLUG=y | ||
60 | CONFIG_PRINTK=y | ||
61 | CONFIG_BUG=y | ||
62 | CONFIG_ELF_CORE=y | ||
63 | CONFIG_BASE_FULL=y | ||
64 | CONFIG_FUTEX=y | ||
65 | CONFIG_ANON_INODES=y | ||
66 | CONFIG_EPOLL=y | ||
67 | CONFIG_SIGNALFD=y | ||
68 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | ||
70 | CONFIG_SHMEM=y | ||
71 | CONFIG_VM_EVENT_COUNTERS=y | ||
72 | CONFIG_SLAB=y | ||
73 | # CONFIG_SLUB is not set | ||
74 | # CONFIG_SLOB is not set | ||
75 | CONFIG_RT_MUTEXES=y | ||
76 | # CONFIG_TINY_SHMEM is not set | ||
77 | CONFIG_BASE_SMALL=0 | ||
78 | CONFIG_MODULES=y | ||
79 | CONFIG_MODULE_UNLOAD=y | ||
80 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
81 | # CONFIG_MODVERSIONS is not set | ||
82 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
83 | CONFIG_KMOD=y | ||
84 | CONFIG_BLOCK=y | ||
85 | # CONFIG_LBD is not set | ||
86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
87 | # CONFIG_LSF is not set | ||
88 | # CONFIG_BLK_DEV_BSG is not set | ||
89 | |||
90 | # | ||
91 | # IO Schedulers | ||
92 | # | ||
93 | CONFIG_IOSCHED_NOOP=y | ||
94 | CONFIG_IOSCHED_AS=y | ||
95 | CONFIG_IOSCHED_DEADLINE=y | ||
96 | CONFIG_IOSCHED_CFQ=y | ||
97 | # CONFIG_DEFAULT_AS is not set | ||
98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
99 | CONFIG_DEFAULT_CFQ=y | ||
100 | # CONFIG_DEFAULT_NOOP is not set | ||
101 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
102 | |||
103 | # | ||
104 | # System Type | ||
105 | # | ||
106 | # CONFIG_ARCH_AAEC2000 is not set | ||
107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
108 | # CONFIG_ARCH_REALVIEW is not set | ||
109 | # CONFIG_ARCH_VERSATILE is not set | ||
110 | # CONFIG_ARCH_AT91 is not set | ||
111 | # CONFIG_ARCH_CLPS7500 is not set | ||
112 | # CONFIG_ARCH_CLPS711X is not set | ||
113 | # CONFIG_ARCH_CO285 is not set | ||
114 | # CONFIG_ARCH_EBSA110 is not set | ||
115 | # CONFIG_ARCH_EP93XX is not set | ||
116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
117 | # CONFIG_ARCH_NETX is not set | ||
118 | # CONFIG_ARCH_H720X is not set | ||
119 | # CONFIG_ARCH_IMX is not set | ||
120 | # CONFIG_ARCH_IOP13XX is not set | ||
121 | # CONFIG_ARCH_IOP32X is not set | ||
122 | # CONFIG_ARCH_IOP33X is not set | ||
123 | # CONFIG_ARCH_IXP23XX is not set | ||
124 | # CONFIG_ARCH_IXP2000 is not set | ||
125 | # CONFIG_ARCH_IXP4XX is not set | ||
126 | # CONFIG_ARCH_L7200 is not set | ||
127 | # CONFIG_ARCH_KS8695 is not set | ||
128 | # CONFIG_ARCH_NS9XXX is not set | ||
129 | # CONFIG_ARCH_MXC is not set | ||
130 | # CONFIG_ARCH_PNX4008 is not set | ||
131 | # CONFIG_ARCH_PXA is not set | ||
132 | # CONFIG_ARCH_RPC is not set | ||
133 | # CONFIG_ARCH_SA1100 is not set | ||
134 | # CONFIG_ARCH_S3C2410 is not set | ||
135 | # CONFIG_ARCH_SHARK is not set | ||
136 | # CONFIG_ARCH_LH7A40X is not set | ||
137 | # CONFIG_ARCH_DAVINCI is not set | ||
138 | CONFIG_ARCH_OMAP=y | ||
139 | |||
140 | # | ||
141 | # TI OMAP Implementations | ||
142 | # | ||
143 | CONFIG_ARCH_OMAP1=y | ||
144 | # CONFIG_ARCH_OMAP2 is not set | ||
145 | # CONFIG_ARCH_OMAP3 is not set | ||
146 | |||
147 | # | ||
148 | # OMAP Feature Selections | ||
149 | # | ||
150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
153 | CONFIG_OMAP_MUX=y | ||
154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
156 | CONFIG_OMAP_MCBSP=y | ||
157 | # CONFIG_OMAP_MMU_FWK is not set | ||
158 | # CONFIG_OMAP_MBOX_FWK is not set | ||
159 | CONFIG_OMAP_MPU_TIMER=y | ||
160 | # CONFIG_OMAP_32K_TIMER is not set | ||
161 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
163 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
164 | CONFIG_OMAP_SERIAL_WAKE=y | ||
165 | # CONFIG_OMAP_DSP is not set | ||
166 | |||
167 | # | ||
168 | # OMAP Core Type | ||
169 | # | ||
170 | # CONFIG_ARCH_OMAP730 is not set | ||
171 | CONFIG_ARCH_OMAP15XX=y | ||
172 | # CONFIG_ARCH_OMAP16XX is not set | ||
173 | |||
174 | # | ||
175 | # OMAP Board Type | ||
176 | # | ||
177 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
178 | # CONFIG_MACH_VOICEBLUE is not set | ||
179 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
180 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
181 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
182 | # CONFIG_MACH_SX1 is not set | ||
183 | # CONFIG_MACH_AMS_DELTA is not set | ||
184 | CONFIG_MACH_OMAP_GENERIC=y | ||
185 | |||
186 | # | ||
187 | # OMAP CPU Speed | ||
188 | # | ||
189 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
190 | CONFIG_OMAP_ARM_168MHZ=y | ||
191 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
192 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
193 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
194 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
195 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
196 | |||
197 | # | ||
198 | # Boot options | ||
199 | # | ||
200 | |||
201 | # | ||
202 | # Power management | ||
203 | # | ||
204 | |||
205 | # | ||
206 | # Processor Type | ||
207 | # | ||
208 | CONFIG_CPU_32=y | ||
209 | CONFIG_CPU_ARM925T=y | ||
210 | CONFIG_CPU_32v4T=y | ||
211 | CONFIG_CPU_ABRT_EV4T=y | ||
212 | CONFIG_CPU_PABRT_NOIFAR=y | ||
213 | CONFIG_CPU_CACHE_V4WT=y | ||
214 | CONFIG_CPU_CACHE_VIVT=y | ||
215 | CONFIG_CPU_COPY_V4WB=y | ||
216 | CONFIG_CPU_TLB_V4WBI=y | ||
217 | CONFIG_CPU_CP15=y | ||
218 | CONFIG_CPU_CP15_MMU=y | ||
219 | |||
220 | # | ||
221 | # Processor Features | ||
222 | # | ||
223 | # CONFIG_ARM_THUMB is not set | ||
224 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
225 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
226 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | ||
227 | # CONFIG_OUTER_CACHE is not set | ||
228 | |||
229 | # | ||
230 | # Bus support | ||
231 | # | ||
232 | # CONFIG_PCI_SYSCALL is not set | ||
233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
234 | |||
235 | # | ||
236 | # PCCARD (PCMCIA/CardBus) support | ||
237 | # | ||
238 | # CONFIG_PCCARD is not set | ||
239 | |||
240 | # | ||
241 | # Kernel Features | ||
242 | # | ||
243 | # CONFIG_TICK_ONESHOT is not set | ||
244 | # CONFIG_NO_HZ is not set | ||
245 | # CONFIG_HIGH_RES_TIMERS is not set | ||
246 | CONFIG_PREEMPT=y | ||
247 | CONFIG_HZ=100 | ||
248 | # CONFIG_AEABI is not set | ||
249 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
250 | CONFIG_SELECT_MEMORY_MODEL=y | ||
251 | CONFIG_FLATMEM_MANUAL=y | ||
252 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
253 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
254 | CONFIG_FLATMEM=y | ||
255 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
256 | # CONFIG_SPARSEMEM_STATIC is not set | ||
257 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
258 | # CONFIG_RESOURCES_64BIT is not set | ||
259 | CONFIG_ZONE_DMA_FLAG=1 | ||
260 | CONFIG_BOUNCE=y | ||
261 | CONFIG_VIRT_TO_BUS=y | ||
262 | # CONFIG_LEDS is not set | ||
263 | CONFIG_ALIGNMENT_TRAP=y | ||
264 | |||
265 | # | ||
266 | # Boot options | ||
267 | # | ||
268 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
269 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
270 | CONFIG_CMDLINE="mem=64M console=ttyS2,115200 root=0803 ro init=/bin/sh" | ||
271 | # CONFIG_XIP_KERNEL is not set | ||
272 | # CONFIG_KEXEC is not set | ||
273 | |||
274 | # | ||
275 | # CPU Frequency scaling | ||
276 | # | ||
277 | # CONFIG_CPU_FREQ is not set | ||
278 | |||
279 | # | ||
280 | # Floating point emulation | ||
281 | # | ||
282 | |||
283 | # | ||
284 | # At least one emulation must be selected | ||
285 | # | ||
286 | CONFIG_FPE_NWFPE=y | ||
287 | # CONFIG_FPE_NWFPE_XP is not set | ||
288 | # CONFIG_FPE_FASTFPE is not set | ||
289 | |||
290 | # | ||
291 | # Userspace binary formats | ||
292 | # | ||
293 | CONFIG_BINFMT_ELF=y | ||
294 | # CONFIG_BINFMT_AOUT is not set | ||
295 | # CONFIG_BINFMT_MISC is not set | ||
296 | # CONFIG_ARTHUR is not set | ||
297 | |||
298 | # | ||
299 | # Power management options | ||
300 | # | ||
301 | CONFIG_PM=y | ||
302 | # CONFIG_PM_LEGACY is not set | ||
303 | # CONFIG_PM_DEBUG is not set | ||
304 | CONFIG_PM_SLEEP=y | ||
305 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
306 | CONFIG_SUSPEND=y | ||
307 | # CONFIG_APM_EMULATION is not set | ||
308 | |||
309 | # | ||
310 | # Networking | ||
311 | # | ||
312 | CONFIG_NET=y | ||
313 | |||
314 | # | ||
315 | # Networking options | ||
316 | # | ||
317 | CONFIG_PACKET=y | ||
318 | # CONFIG_PACKET_MMAP is not set | ||
319 | CONFIG_UNIX=y | ||
320 | CONFIG_XFRM=y | ||
321 | # CONFIG_XFRM_USER is not set | ||
322 | # CONFIG_XFRM_SUB_POLICY is not set | ||
323 | # CONFIG_XFRM_MIGRATE is not set | ||
324 | # CONFIG_NET_KEY is not set | ||
325 | CONFIG_INET=y | ||
326 | CONFIG_IP_MULTICAST=y | ||
327 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
328 | CONFIG_IP_FIB_HASH=y | ||
329 | CONFIG_IP_PNP=y | ||
330 | CONFIG_IP_PNP_DHCP=y | ||
331 | CONFIG_IP_PNP_BOOTP=y | ||
332 | # CONFIG_IP_PNP_RARP is not set | ||
333 | # CONFIG_NET_IPIP is not set | ||
334 | # CONFIG_NET_IPGRE is not set | ||
335 | # CONFIG_IP_MROUTE is not set | ||
336 | # CONFIG_ARPD is not set | ||
337 | # CONFIG_SYN_COOKIES is not set | ||
338 | # CONFIG_INET_AH is not set | ||
339 | # CONFIG_INET_ESP is not set | ||
340 | # CONFIG_INET_IPCOMP is not set | ||
341 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
342 | # CONFIG_INET_TUNNEL is not set | ||
343 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
344 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
345 | CONFIG_INET_XFRM_MODE_BEET=y | ||
346 | CONFIG_INET_DIAG=y | ||
347 | CONFIG_INET_TCP_DIAG=y | ||
348 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
349 | CONFIG_TCP_CONG_CUBIC=y | ||
350 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
351 | # CONFIG_TCP_MD5SIG is not set | ||
352 | # CONFIG_IPV6 is not set | ||
353 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
354 | # CONFIG_INET6_TUNNEL is not set | ||
355 | # CONFIG_NETWORK_SECMARK is not set | ||
356 | # CONFIG_NETFILTER is not set | ||
357 | # CONFIG_IP_DCCP is not set | ||
358 | # CONFIG_IP_SCTP is not set | ||
359 | # CONFIG_TIPC is not set | ||
360 | # CONFIG_ATM is not set | ||
361 | # CONFIG_BRIDGE is not set | ||
362 | # CONFIG_VLAN_8021Q is not set | ||
363 | # CONFIG_DECNET is not set | ||
364 | # CONFIG_LLC2 is not set | ||
365 | # CONFIG_IPX is not set | ||
366 | # CONFIG_ATALK is not set | ||
367 | # CONFIG_X25 is not set | ||
368 | # CONFIG_LAPB is not set | ||
369 | # CONFIG_ECONET is not set | ||
370 | # CONFIG_WAN_ROUTER is not set | ||
371 | |||
372 | # | ||
373 | # QoS and/or fair queueing | ||
374 | # | ||
375 | # CONFIG_NET_SCHED is not set | ||
376 | |||
377 | # | ||
378 | # Network testing | ||
379 | # | ||
380 | # CONFIG_NET_PKTGEN is not set | ||
381 | # CONFIG_HAMRADIO is not set | ||
382 | # CONFIG_IRDA is not set | ||
383 | # CONFIG_BT is not set | ||
384 | # CONFIG_AF_RXRPC is not set | ||
385 | |||
386 | # | ||
387 | # Wireless | ||
388 | # | ||
389 | # CONFIG_CFG80211 is not set | ||
390 | # CONFIG_WIRELESS_EXT is not set | ||
391 | # CONFIG_MAC80211 is not set | ||
392 | # CONFIG_IEEE80211 is not set | ||
393 | # CONFIG_RFKILL is not set | ||
394 | # CONFIG_NET_9P is not set | ||
395 | |||
396 | # | ||
397 | # Device Drivers | ||
398 | # | ||
399 | |||
400 | # | ||
401 | # Generic Driver Options | ||
402 | # | ||
403 | CONFIG_STANDALONE=y | ||
404 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
405 | # CONFIG_FW_LOADER is not set | ||
406 | # CONFIG_DEBUG_DRIVER is not set | ||
407 | # CONFIG_DEBUG_DEVRES is not set | ||
408 | # CONFIG_SYS_HYPERVISOR is not set | ||
409 | # CONFIG_CONNECTOR is not set | ||
410 | # CONFIG_MTD is not set | ||
411 | # CONFIG_PARPORT is not set | ||
412 | CONFIG_BLK_DEV=y | ||
413 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
414 | CONFIG_BLK_DEV_LOOP=y | ||
415 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
416 | # CONFIG_BLK_DEV_NBD is not set | ||
417 | # CONFIG_BLK_DEV_UB is not set | ||
418 | CONFIG_BLK_DEV_RAM=y | ||
419 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
420 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
421 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
422 | # CONFIG_CDROM_PKTCDVD is not set | ||
423 | # CONFIG_ATA_OVER_ETH is not set | ||
424 | |||
425 | # | ||
426 | # SCSI device support | ||
427 | # | ||
428 | # CONFIG_RAID_ATTRS is not set | ||
429 | CONFIG_SCSI=y | ||
430 | CONFIG_SCSI_DMA=y | ||
431 | # CONFIG_SCSI_TGT is not set | ||
432 | # CONFIG_SCSI_NETLINK is not set | ||
433 | CONFIG_SCSI_PROC_FS=y | ||
434 | |||
435 | # | ||
436 | # SCSI support type (disk, tape, CD-ROM) | ||
437 | # | ||
438 | CONFIG_BLK_DEV_SD=y | ||
439 | # CONFIG_CHR_DEV_ST is not set | ||
440 | # CONFIG_CHR_DEV_OSST is not set | ||
441 | CONFIG_BLK_DEV_SR=y | ||
442 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
443 | CONFIG_CHR_DEV_SG=y | ||
444 | # CONFIG_CHR_DEV_SCH is not set | ||
445 | |||
446 | # | ||
447 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
448 | # | ||
449 | CONFIG_SCSI_MULTI_LUN=y | ||
450 | # CONFIG_SCSI_CONSTANTS is not set | ||
451 | # CONFIG_SCSI_LOGGING is not set | ||
452 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
453 | CONFIG_SCSI_WAIT_SCAN=m | ||
454 | |||
455 | # | ||
456 | # SCSI Transports | ||
457 | # | ||
458 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
459 | # CONFIG_SCSI_FC_ATTRS is not set | ||
460 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
461 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
462 | CONFIG_SCSI_LOWLEVEL=y | ||
463 | # CONFIG_ISCSI_TCP is not set | ||
464 | # CONFIG_SCSI_DEBUG is not set | ||
465 | # CONFIG_ATA is not set | ||
466 | # CONFIG_MD is not set | ||
467 | CONFIG_NETDEVICES=y | ||
468 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
469 | # CONFIG_DUMMY is not set | ||
470 | # CONFIG_BONDING is not set | ||
471 | # CONFIG_MACVLAN is not set | ||
472 | # CONFIG_EQUALIZER is not set | ||
473 | # CONFIG_TUN is not set | ||
474 | # CONFIG_PHYLIB is not set | ||
475 | CONFIG_NET_ETHERNET=y | ||
476 | CONFIG_MII=y | ||
477 | # CONFIG_AX88796 is not set | ||
478 | # CONFIG_SMC91X is not set | ||
479 | # CONFIG_DM9000 is not set | ||
480 | CONFIG_NETDEV_1000=y | ||
481 | CONFIG_NETDEV_10000=y | ||
482 | |||
483 | # | ||
484 | # Wireless LAN | ||
485 | # | ||
486 | # CONFIG_WLAN_PRE80211 is not set | ||
487 | # CONFIG_WLAN_80211 is not set | ||
488 | |||
489 | # | ||
490 | # USB Network Adapters | ||
491 | # | ||
492 | # CONFIG_USB_CATC is not set | ||
493 | # CONFIG_USB_KAWETH is not set | ||
494 | # CONFIG_USB_PEGASUS is not set | ||
495 | CONFIG_USB_RTL8150=y | ||
496 | CONFIG_USB_USBNET_MII=y | ||
497 | CONFIG_USB_USBNET=y | ||
498 | CONFIG_USB_NET_AX8817X=y | ||
499 | CONFIG_USB_NET_CDCETHER=y | ||
500 | # CONFIG_USB_NET_DM9601 is not set | ||
501 | # CONFIG_USB_NET_GL620A is not set | ||
502 | CONFIG_USB_NET_NET1080=y | ||
503 | # CONFIG_USB_NET_PLUSB is not set | ||
504 | # CONFIG_USB_NET_MCS7830 is not set | ||
505 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
506 | CONFIG_USB_NET_CDC_SUBSET=y | ||
507 | # CONFIG_USB_ALI_M5632 is not set | ||
508 | CONFIG_USB_AN2720=y | ||
509 | CONFIG_USB_BELKIN=y | ||
510 | CONFIG_USB_ARMLINUX=y | ||
511 | CONFIG_USB_EPSON2888=y | ||
512 | # CONFIG_USB_KC2190 is not set | ||
513 | CONFIG_USB_NET_ZAURUS=y | ||
514 | # CONFIG_WAN is not set | ||
515 | CONFIG_PPP=y | ||
516 | CONFIG_PPP_MULTILINK=y | ||
517 | # CONFIG_PPP_FILTER is not set | ||
518 | # CONFIG_PPP_ASYNC is not set | ||
519 | # CONFIG_PPP_SYNC_TTY is not set | ||
520 | # CONFIG_PPP_DEFLATE is not set | ||
521 | # CONFIG_PPP_BSDCOMP is not set | ||
522 | # CONFIG_PPP_MPPE is not set | ||
523 | # CONFIG_PPPOE is not set | ||
524 | # CONFIG_PPPOL2TP is not set | ||
525 | # CONFIG_SLIP is not set | ||
526 | CONFIG_SLHC=y | ||
527 | # CONFIG_SHAPER is not set | ||
528 | # CONFIG_NETCONSOLE is not set | ||
529 | # CONFIG_NETPOLL is not set | ||
530 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
531 | # CONFIG_ISDN is not set | ||
532 | |||
533 | # | ||
534 | # Input device support | ||
535 | # | ||
536 | CONFIG_INPUT=y | ||
537 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
538 | # CONFIG_INPUT_POLLDEV is not set | ||
539 | |||
540 | # | ||
541 | # Userland interfaces | ||
542 | # | ||
543 | CONFIG_INPUT_MOUSEDEV=y | ||
544 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
545 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
546 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
547 | # CONFIG_INPUT_JOYDEV is not set | ||
548 | # CONFIG_INPUT_TSDEV is not set | ||
549 | # CONFIG_INPUT_EVDEV is not set | ||
550 | # CONFIG_INPUT_EVBUG is not set | ||
551 | |||
552 | # | ||
553 | # Input Device Drivers | ||
554 | # | ||
555 | CONFIG_INPUT_KEYBOARD=y | ||
556 | CONFIG_KEYBOARD_ATKBD=y | ||
557 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
558 | # CONFIG_KEYBOARD_LKKBD is not set | ||
559 | # CONFIG_KEYBOARD_XTKBD is not set | ||
560 | # CONFIG_KEYBOARD_NEWTON is not set | ||
561 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
562 | CONFIG_KEYBOARD_OMAP=y | ||
563 | # CONFIG_KEYBOARD_GPIO is not set | ||
564 | # CONFIG_INPUT_MOUSE is not set | ||
565 | # CONFIG_INPUT_JOYSTICK is not set | ||
566 | # CONFIG_INPUT_TABLET is not set | ||
567 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
568 | # CONFIG_INPUT_MISC is not set | ||
569 | |||
570 | # | ||
571 | # Hardware I/O ports | ||
572 | # | ||
573 | CONFIG_SERIO=y | ||
574 | CONFIG_SERIO_SERPORT=y | ||
575 | CONFIG_SERIO_LIBPS2=y | ||
576 | # CONFIG_SERIO_RAW is not set | ||
577 | # CONFIG_GAMEPORT is not set | ||
578 | |||
579 | # | ||
580 | # Character devices | ||
581 | # | ||
582 | CONFIG_VT=y | ||
583 | CONFIG_VT_CONSOLE=y | ||
584 | CONFIG_HW_CONSOLE=y | ||
585 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
586 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
587 | |||
588 | # | ||
589 | # Serial drivers | ||
590 | # | ||
591 | CONFIG_SERIAL_8250=y | ||
592 | CONFIG_SERIAL_8250_CONSOLE=y | ||
593 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
594 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
595 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
596 | |||
597 | # | ||
598 | # Non-8250 serial port support | ||
599 | # | ||
600 | CONFIG_SERIAL_CORE=y | ||
601 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
602 | CONFIG_UNIX98_PTYS=y | ||
603 | # CONFIG_LEGACY_PTYS is not set | ||
604 | # CONFIG_IPMI_HANDLER is not set | ||
605 | # CONFIG_WATCHDOG is not set | ||
606 | CONFIG_HW_RANDOM=m | ||
607 | # CONFIG_NVRAM is not set | ||
608 | # CONFIG_R3964 is not set | ||
609 | # CONFIG_RAW_DRIVER is not set | ||
610 | # CONFIG_TCG_TPM is not set | ||
611 | CONFIG_I2C=y | ||
612 | CONFIG_I2C_BOARDINFO=y | ||
613 | CONFIG_I2C_CHARDEV=y | ||
614 | |||
615 | # | ||
616 | # I2C Algorithms | ||
617 | # | ||
618 | CONFIG_I2C_ALGOBIT=y | ||
619 | # CONFIG_I2C_ALGOPCF is not set | ||
620 | # CONFIG_I2C_ALGOPCA is not set | ||
621 | |||
622 | # | ||
623 | # I2C Hardware Bus support | ||
624 | # | ||
625 | # CONFIG_I2C_GPIO is not set | ||
626 | # CONFIG_I2C_OCORES is not set | ||
627 | # CONFIG_I2C_OMAP is not set | ||
628 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
629 | # CONFIG_I2C_SIMTEC is not set | ||
630 | # CONFIG_I2C_TAOS_EVM is not set | ||
631 | # CONFIG_I2C_STUB is not set | ||
632 | # CONFIG_I2C_TINY_USB is not set | ||
633 | |||
634 | # | ||
635 | # Miscellaneous I2C Chip support | ||
636 | # | ||
637 | # CONFIG_SENSORS_DS1337 is not set | ||
638 | # CONFIG_SENSORS_DS1374 is not set | ||
639 | # CONFIG_DS1682 is not set | ||
640 | # CONFIG_SENSORS_EEPROM is not set | ||
641 | # CONFIG_SENSORS_PCF8574 is not set | ||
642 | # CONFIG_SENSORS_PCA9539 is not set | ||
643 | # CONFIG_SENSORS_PCF8591 is not set | ||
644 | # CONFIG_TPS65010 is not set | ||
645 | # CONFIG_SENSORS_MAX6875 is not set | ||
646 | # CONFIG_SENSORS_TSL2550 is not set | ||
647 | # CONFIG_I2C_DEBUG_CORE is not set | ||
648 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
649 | # CONFIG_I2C_DEBUG_BUS is not set | ||
650 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
651 | |||
652 | # | ||
653 | # SPI support | ||
654 | # | ||
655 | # CONFIG_SPI is not set | ||
656 | # CONFIG_SPI_MASTER is not set | ||
657 | # CONFIG_W1 is not set | ||
658 | CONFIG_HWMON=y | ||
659 | # CONFIG_HWMON_VID is not set | ||
660 | # CONFIG_SENSORS_ABITUGURU is not set | ||
661 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
662 | # CONFIG_SENSORS_AD7418 is not set | ||
663 | # CONFIG_SENSORS_ADM1021 is not set | ||
664 | # CONFIG_SENSORS_ADM1025 is not set | ||
665 | # CONFIG_SENSORS_ADM1026 is not set | ||
666 | # CONFIG_SENSORS_ADM1029 is not set | ||
667 | # CONFIG_SENSORS_ADM1031 is not set | ||
668 | # CONFIG_SENSORS_ADM9240 is not set | ||
669 | # CONFIG_SENSORS_ASB100 is not set | ||
670 | # CONFIG_SENSORS_ATXP1 is not set | ||
671 | # CONFIG_SENSORS_DS1621 is not set | ||
672 | # CONFIG_SENSORS_F71805F is not set | ||
673 | # CONFIG_SENSORS_FSCHER is not set | ||
674 | # CONFIG_SENSORS_FSCPOS is not set | ||
675 | # CONFIG_SENSORS_GL518SM is not set | ||
676 | # CONFIG_SENSORS_GL520SM is not set | ||
677 | # CONFIG_SENSORS_IT87 is not set | ||
678 | # CONFIG_SENSORS_LM63 is not set | ||
679 | # CONFIG_SENSORS_LM75 is not set | ||
680 | # CONFIG_SENSORS_LM77 is not set | ||
681 | # CONFIG_SENSORS_LM78 is not set | ||
682 | # CONFIG_SENSORS_LM80 is not set | ||
683 | # CONFIG_SENSORS_LM83 is not set | ||
684 | # CONFIG_SENSORS_LM85 is not set | ||
685 | # CONFIG_SENSORS_LM87 is not set | ||
686 | # CONFIG_SENSORS_LM90 is not set | ||
687 | # CONFIG_SENSORS_LM92 is not set | ||
688 | # CONFIG_SENSORS_LM93 is not set | ||
689 | # CONFIG_SENSORS_MAX1619 is not set | ||
690 | # CONFIG_SENSORS_MAX6650 is not set | ||
691 | # CONFIG_SENSORS_PC87360 is not set | ||
692 | # CONFIG_SENSORS_PC87427 is not set | ||
693 | # CONFIG_SENSORS_DME1737 is not set | ||
694 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
695 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
696 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
697 | # CONFIG_SENSORS_THMC50 is not set | ||
698 | # CONFIG_SENSORS_VT1211 is not set | ||
699 | # CONFIG_SENSORS_W83781D is not set | ||
700 | # CONFIG_SENSORS_W83791D is not set | ||
701 | # CONFIG_SENSORS_W83792D is not set | ||
702 | # CONFIG_SENSORS_W83793 is not set | ||
703 | # CONFIG_SENSORS_W83L785TS is not set | ||
704 | # CONFIG_SENSORS_W83627HF is not set | ||
705 | # CONFIG_SENSORS_W83627EHF is not set | ||
706 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
707 | CONFIG_MISC_DEVICES=y | ||
708 | # CONFIG_EEPROM_93CX6 is not set | ||
709 | |||
710 | # | ||
711 | # Multifunction device drivers | ||
712 | # | ||
713 | # CONFIG_MFD_SM501 is not set | ||
714 | # CONFIG_NEW_LEDS is not set | ||
715 | |||
716 | # | ||
717 | # Multimedia devices | ||
718 | # | ||
719 | # CONFIG_VIDEO_DEV is not set | ||
720 | # CONFIG_DVB_CORE is not set | ||
721 | CONFIG_DAB=y | ||
722 | # CONFIG_USB_DABUSB is not set | ||
723 | |||
724 | # | ||
725 | # Graphics support | ||
726 | # | ||
727 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
728 | |||
729 | # | ||
730 | # Display device support | ||
731 | # | ||
732 | # CONFIG_DISPLAY_SUPPORT is not set | ||
733 | # CONFIG_VGASTATE is not set | ||
734 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
735 | # CONFIG_FB is not set | ||
736 | |||
737 | # | ||
738 | # Console display driver support | ||
739 | # | ||
740 | # CONFIG_VGA_CONSOLE is not set | ||
741 | CONFIG_DUMMY_CONSOLE=y | ||
742 | |||
743 | # | ||
744 | # Sound | ||
745 | # | ||
746 | # CONFIG_SOUND is not set | ||
747 | CONFIG_HID_SUPPORT=y | ||
748 | CONFIG_HID=y | ||
749 | # CONFIG_HID_DEBUG is not set | ||
750 | |||
751 | # | ||
752 | # USB Input Devices | ||
753 | # | ||
754 | CONFIG_USB_HID=y | ||
755 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
756 | # CONFIG_HID_FF is not set | ||
757 | # CONFIG_USB_HIDDEV is not set | ||
758 | CONFIG_USB_SUPPORT=y | ||
759 | CONFIG_USB_ARCH_HAS_HCD=y | ||
760 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
761 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
762 | CONFIG_USB=y | ||
763 | CONFIG_USB_DEBUG=y | ||
764 | |||
765 | # | ||
766 | # Miscellaneous USB options | ||
767 | # | ||
768 | CONFIG_USB_DEVICEFS=y | ||
769 | # CONFIG_USB_DEVICE_CLASS is not set | ||
770 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
771 | # CONFIG_USB_SUSPEND is not set | ||
772 | # CONFIG_USB_PERSIST is not set | ||
773 | # CONFIG_USB_OTG is not set | ||
774 | |||
775 | # | ||
776 | # USB Host Controller Drivers | ||
777 | # | ||
778 | # CONFIG_USB_ISP116X_HCD is not set | ||
779 | CONFIG_USB_OHCI_HCD=y | ||
780 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
781 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
782 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
783 | # CONFIG_USB_SL811_HCD is not set | ||
784 | # CONFIG_USB_R8A66597_HCD is not set | ||
785 | # CONFIG_USB_MUSB_HDRC is not set | ||
786 | |||
787 | # | ||
788 | # USB Device Class drivers | ||
789 | # | ||
790 | # CONFIG_USB_ACM is not set | ||
791 | # CONFIG_USB_PRINTER is not set | ||
792 | |||
793 | # | ||
794 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
795 | # | ||
796 | |||
797 | # | ||
798 | # may also be needed; see USB_STORAGE Help for more information | ||
799 | # | ||
800 | CONFIG_USB_STORAGE=y | ||
801 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
802 | CONFIG_USB_STORAGE_DATAFAB=y | ||
803 | CONFIG_USB_STORAGE_FREECOM=y | ||
804 | CONFIG_USB_STORAGE_DPCM=y | ||
805 | # CONFIG_USB_STORAGE_USBAT is not set | ||
806 | CONFIG_USB_STORAGE_SDDR09=y | ||
807 | CONFIG_USB_STORAGE_SDDR55=y | ||
808 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
809 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
810 | # CONFIG_USB_STORAGE_KARMA is not set | ||
811 | # CONFIG_USB_LIBUSUAL is not set | ||
812 | |||
813 | # | ||
814 | # USB Imaging devices | ||
815 | # | ||
816 | # CONFIG_USB_MDC800 is not set | ||
817 | # CONFIG_USB_MICROTEK is not set | ||
818 | CONFIG_USB_MON=y | ||
819 | |||
820 | # | ||
821 | # USB port drivers | ||
822 | # | ||
823 | |||
824 | # | ||
825 | # USB Serial Converter support | ||
826 | # | ||
827 | # CONFIG_USB_SERIAL is not set | ||
828 | |||
829 | # | ||
830 | # USB Miscellaneous drivers | ||
831 | # | ||
832 | # CONFIG_USB_EMI62 is not set | ||
833 | # CONFIG_USB_EMI26 is not set | ||
834 | # CONFIG_USB_ADUTUX is not set | ||
835 | # CONFIG_USB_AUERSWALD is not set | ||
836 | # CONFIG_USB_RIO500 is not set | ||
837 | # CONFIG_USB_LEGOTOWER is not set | ||
838 | # CONFIG_USB_LCD is not set | ||
839 | # CONFIG_USB_BERRY_CHARGE is not set | ||
840 | # CONFIG_USB_LED is not set | ||
841 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
842 | # CONFIG_USB_CYTHERM is not set | ||
843 | # CONFIG_USB_PHIDGET is not set | ||
844 | # CONFIG_USB_IDMOUSE is not set | ||
845 | # CONFIG_USB_FTDI_ELAN is not set | ||
846 | # CONFIG_USB_APPLEDISPLAY is not set | ||
847 | # CONFIG_USB_LD is not set | ||
848 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
849 | # CONFIG_USB_IOWARRIOR is not set | ||
850 | # CONFIG_USB_TEST is not set | ||
851 | |||
852 | # | ||
853 | # USB DSL modem support | ||
854 | # | ||
855 | |||
856 | # | ||
857 | # USB Gadget Support | ||
858 | # | ||
859 | # CONFIG_USB_GADGET is not set | ||
860 | CONFIG_MMC=y | ||
861 | # CONFIG_MMC_DEBUG is not set | ||
862 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
863 | |||
864 | # | ||
865 | # MMC/SD Card Drivers | ||
866 | # | ||
867 | CONFIG_MMC_BLOCK=y | ||
868 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
869 | |||
870 | # | ||
871 | # MMC/SD Host Controller Drivers | ||
872 | # | ||
873 | CONFIG_MMC_OMAP=y | ||
874 | CONFIG_RTC_LIB=y | ||
875 | CONFIG_RTC_CLASS=y | ||
876 | CONFIG_RTC_HCTOSYS=y | ||
877 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
878 | # CONFIG_RTC_DEBUG is not set | ||
879 | |||
880 | # | ||
881 | # RTC interfaces | ||
882 | # | ||
883 | CONFIG_RTC_INTF_SYSFS=y | ||
884 | CONFIG_RTC_INTF_PROC=y | ||
885 | CONFIG_RTC_INTF_DEV=y | ||
886 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
887 | # CONFIG_RTC_DRV_TEST is not set | ||
888 | |||
889 | # | ||
890 | # I2C RTC drivers | ||
891 | # | ||
892 | # CONFIG_RTC_DRV_DS1307 is not set | ||
893 | # CONFIG_RTC_DRV_DS1672 is not set | ||
894 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
895 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
896 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
897 | # CONFIG_RTC_DRV_X1205 is not set | ||
898 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
899 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
900 | # CONFIG_RTC_DRV_M41T80 is not set | ||
901 | |||
902 | # | ||
903 | # SPI RTC drivers | ||
904 | # | ||
905 | |||
906 | # | ||
907 | # Platform RTC drivers | ||
908 | # | ||
909 | # CONFIG_RTC_DRV_CMOS is not set | ||
910 | # CONFIG_RTC_DRV_DS1553 is not set | ||
911 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
912 | # CONFIG_RTC_DRV_DS1742 is not set | ||
913 | # CONFIG_RTC_DRV_M48T86 is not set | ||
914 | # CONFIG_RTC_DRV_M48T59 is not set | ||
915 | # CONFIG_RTC_DRV_V3020 is not set | ||
916 | |||
917 | # | ||
918 | # on-CPU RTC drivers | ||
919 | # | ||
920 | CONFIG_RTC_DRV_OMAP=y | ||
921 | |||
922 | # | ||
923 | # DMA Engine support | ||
924 | # | ||
925 | # CONFIG_DMA_ENGINE is not set | ||
926 | |||
927 | # | ||
928 | # DMA Clients | ||
929 | # | ||
930 | |||
931 | # | ||
932 | # DMA Devices | ||
933 | # | ||
934 | |||
935 | # | ||
936 | # CBUS support | ||
937 | # | ||
938 | # CONFIG_CBUS is not set | ||
939 | |||
940 | # | ||
941 | # File systems | ||
942 | # | ||
943 | CONFIG_EXT2_FS=y | ||
944 | # CONFIG_EXT2_FS_XATTR is not set | ||
945 | # CONFIG_EXT2_FS_XIP is not set | ||
946 | CONFIG_EXT3_FS=y | ||
947 | CONFIG_EXT3_FS_XATTR=y | ||
948 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
949 | # CONFIG_EXT3_FS_SECURITY is not set | ||
950 | # CONFIG_EXT4DEV_FS is not set | ||
951 | CONFIG_JBD=y | ||
952 | # CONFIG_JBD_DEBUG is not set | ||
953 | CONFIG_FS_MBCACHE=y | ||
954 | # CONFIG_REISERFS_FS is not set | ||
955 | # CONFIG_JFS_FS is not set | ||
956 | # CONFIG_FS_POSIX_ACL is not set | ||
957 | # CONFIG_XFS_FS is not set | ||
958 | # CONFIG_GFS2_FS is not set | ||
959 | # CONFIG_OCFS2_FS is not set | ||
960 | # CONFIG_MINIX_FS is not set | ||
961 | # CONFIG_ROMFS_FS is not set | ||
962 | CONFIG_INOTIFY=y | ||
963 | CONFIG_INOTIFY_USER=y | ||
964 | # CONFIG_QUOTA is not set | ||
965 | CONFIG_DNOTIFY=y | ||
966 | CONFIG_AUTOFS_FS=y | ||
967 | CONFIG_AUTOFS4_FS=y | ||
968 | # CONFIG_FUSE_FS is not set | ||
969 | |||
970 | # | ||
971 | # CD-ROM/DVD Filesystems | ||
972 | # | ||
973 | CONFIG_ISO9660_FS=y | ||
974 | CONFIG_JOLIET=y | ||
975 | # CONFIG_ZISOFS is not set | ||
976 | # CONFIG_UDF_FS is not set | ||
977 | |||
978 | # | ||
979 | # DOS/FAT/NT Filesystems | ||
980 | # | ||
981 | CONFIG_FAT_FS=m | ||
982 | CONFIG_MSDOS_FS=m | ||
983 | CONFIG_VFAT_FS=m | ||
984 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
985 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
986 | # CONFIG_NTFS_FS is not set | ||
987 | |||
988 | # | ||
989 | # Pseudo filesystems | ||
990 | # | ||
991 | CONFIG_PROC_FS=y | ||
992 | CONFIG_PROC_SYSCTL=y | ||
993 | CONFIG_SYSFS=y | ||
994 | # CONFIG_TMPFS is not set | ||
995 | # CONFIG_HUGETLB_PAGE is not set | ||
996 | CONFIG_RAMFS=y | ||
997 | # CONFIG_CONFIGFS_FS is not set | ||
998 | |||
999 | # | ||
1000 | # Miscellaneous filesystems | ||
1001 | # | ||
1002 | # CONFIG_ADFS_FS is not set | ||
1003 | # CONFIG_AFFS_FS is not set | ||
1004 | # CONFIG_HFS_FS is not set | ||
1005 | # CONFIG_HFSPLUS_FS is not set | ||
1006 | # CONFIG_BEFS_FS is not set | ||
1007 | # CONFIG_BFS_FS is not set | ||
1008 | # CONFIG_EFS_FS is not set | ||
1009 | # CONFIG_CRAMFS is not set | ||
1010 | # CONFIG_VXFS_FS is not set | ||
1011 | # CONFIG_HPFS_FS is not set | ||
1012 | # CONFIG_QNX4FS_FS is not set | ||
1013 | # CONFIG_SYSV_FS is not set | ||
1014 | # CONFIG_UFS_FS is not set | ||
1015 | |||
1016 | # | ||
1017 | # Network File Systems | ||
1018 | # | ||
1019 | CONFIG_NFS_FS=y | ||
1020 | # CONFIG_NFS_V3 is not set | ||
1021 | # CONFIG_NFS_V4 is not set | ||
1022 | # CONFIG_NFS_DIRECTIO is not set | ||
1023 | # CONFIG_NFSD is not set | ||
1024 | # CONFIG_ROOT_NFS is not set | ||
1025 | CONFIG_LOCKD=y | ||
1026 | CONFIG_NFS_COMMON=y | ||
1027 | CONFIG_SUNRPC=y | ||
1028 | # CONFIG_SUNRPC_BIND34 is not set | ||
1029 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1030 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1031 | # CONFIG_SMB_FS is not set | ||
1032 | # CONFIG_CIFS is not set | ||
1033 | # CONFIG_NCP_FS is not set | ||
1034 | # CONFIG_CODA_FS is not set | ||
1035 | # CONFIG_AFS_FS is not set | ||
1036 | |||
1037 | # | ||
1038 | # Partition Types | ||
1039 | # | ||
1040 | CONFIG_PARTITION_ADVANCED=y | ||
1041 | # CONFIG_ACORN_PARTITION is not set | ||
1042 | # CONFIG_OSF_PARTITION is not set | ||
1043 | # CONFIG_AMIGA_PARTITION is not set | ||
1044 | # CONFIG_ATARI_PARTITION is not set | ||
1045 | # CONFIG_MAC_PARTITION is not set | ||
1046 | CONFIG_MSDOS_PARTITION=y | ||
1047 | # CONFIG_BSD_DISKLABEL is not set | ||
1048 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1049 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1050 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
1051 | # CONFIG_LDM_PARTITION is not set | ||
1052 | # CONFIG_SGI_PARTITION is not set | ||
1053 | # CONFIG_ULTRIX_PARTITION is not set | ||
1054 | # CONFIG_SUN_PARTITION is not set | ||
1055 | # CONFIG_KARMA_PARTITION is not set | ||
1056 | # CONFIG_EFI_PARTITION is not set | ||
1057 | # CONFIG_SYSV68_PARTITION is not set | ||
1058 | |||
1059 | # | ||
1060 | # Native Language Support | ||
1061 | # | ||
1062 | CONFIG_NLS=y | ||
1063 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1064 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1065 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1066 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1067 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1068 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1069 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1070 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1071 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1072 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1073 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1074 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1075 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1076 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1077 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1078 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1079 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1080 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1081 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1082 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1083 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1084 | # CONFIG_NLS_ISO8859_8 is not set | ||
1085 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1086 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1087 | # CONFIG_NLS_ASCII is not set | ||
1088 | # CONFIG_NLS_ISO8859_1 is not set | ||
1089 | # CONFIG_NLS_ISO8859_2 is not set | ||
1090 | # CONFIG_NLS_ISO8859_3 is not set | ||
1091 | # CONFIG_NLS_ISO8859_4 is not set | ||
1092 | # CONFIG_NLS_ISO8859_5 is not set | ||
1093 | # CONFIG_NLS_ISO8859_6 is not set | ||
1094 | # CONFIG_NLS_ISO8859_7 is not set | ||
1095 | # CONFIG_NLS_ISO8859_9 is not set | ||
1096 | # CONFIG_NLS_ISO8859_13 is not set | ||
1097 | # CONFIG_NLS_ISO8859_14 is not set | ||
1098 | # CONFIG_NLS_ISO8859_15 is not set | ||
1099 | # CONFIG_NLS_KOI8_R is not set | ||
1100 | # CONFIG_NLS_KOI8_U is not set | ||
1101 | # CONFIG_NLS_UTF8 is not set | ||
1102 | |||
1103 | # | ||
1104 | # Distributed Lock Manager | ||
1105 | # | ||
1106 | # CONFIG_DLM is not set | ||
1107 | |||
1108 | # | ||
1109 | # Profiling support | ||
1110 | # | ||
1111 | # CONFIG_PROFILING is not set | ||
1112 | |||
1113 | # | ||
1114 | # Kernel hacking | ||
1115 | # | ||
1116 | # CONFIG_PRINTK_TIME is not set | ||
1117 | CONFIG_ENABLE_MUST_CHECK=y | ||
1118 | CONFIG_MAGIC_SYSRQ=y | ||
1119 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1120 | # CONFIG_DEBUG_FS is not set | ||
1121 | # CONFIG_HEADERS_CHECK is not set | ||
1122 | CONFIG_DEBUG_KERNEL=y | ||
1123 | # CONFIG_DEBUG_SHIRQ is not set | ||
1124 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1125 | CONFIG_SCHED_DEBUG=y | ||
1126 | # CONFIG_SCHEDSTATS is not set | ||
1127 | # CONFIG_TIMER_STATS is not set | ||
1128 | # CONFIG_DEBUG_SLAB is not set | ||
1129 | CONFIG_DEBUG_PREEMPT=y | ||
1130 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1131 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1132 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1133 | # CONFIG_DEBUG_MUTEXES is not set | ||
1134 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1135 | # CONFIG_PROVE_LOCKING is not set | ||
1136 | # CONFIG_LOCK_STAT is not set | ||
1137 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1138 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1139 | # CONFIG_DEBUG_KOBJECT is not set | ||
1140 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1141 | # CONFIG_DEBUG_INFO is not set | ||
1142 | # CONFIG_DEBUG_VM is not set | ||
1143 | # CONFIG_DEBUG_LIST is not set | ||
1144 | CONFIG_FRAME_POINTER=y | ||
1145 | CONFIG_FORCED_INLINING=y | ||
1146 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1147 | # CONFIG_FAULT_INJECTION is not set | ||
1148 | # CONFIG_DEBUG_USER is not set | ||
1149 | # CONFIG_DEBUG_ERRORS is not set | ||
1150 | # CONFIG_DEBUG_LL is not set | ||
1151 | |||
1152 | # | ||
1153 | # Security options | ||
1154 | # | ||
1155 | # CONFIG_KEYS is not set | ||
1156 | # CONFIG_SECURITY is not set | ||
1157 | # CONFIG_CRYPTO is not set | ||
1158 | |||
1159 | # | ||
1160 | # Library routines | ||
1161 | # | ||
1162 | CONFIG_BITREVERSE=y | ||
1163 | # CONFIG_CRC_CCITT is not set | ||
1164 | # CONFIG_CRC16 is not set | ||
1165 | # CONFIG_CRC_ITU_T is not set | ||
1166 | CONFIG_CRC32=y | ||
1167 | # CONFIG_CRC7 is not set | ||
1168 | # CONFIG_LIBCRC32C is not set | ||
1169 | CONFIG_PLIST=y | ||
1170 | CONFIG_HAS_IOMEM=y | ||
1171 | CONFIG_HAS_IOPORT=y | ||
1172 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_generic_1610_defconfig b/arch/arm/configs/omap_generic_1610_defconfig new file mode 100644 index 000000000000..fc66f019d56c --- /dev/null +++ b/arch/arm/configs/omap_generic_1610_defconfig | |||
@@ -0,0 +1,1178 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 13:01:27 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_LOCK_KERNEL=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | CONFIG_LOCALVERSION="" | ||
36 | CONFIG_LOCALVERSION_AUTO=y | ||
37 | CONFIG_SWAP=y | ||
38 | CONFIG_SYSVIPC=y | ||
39 | CONFIG_SYSVIPC_SYSCTL=y | ||
40 | # CONFIG_POSIX_MQUEUE is not set | ||
41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
42 | # CONFIG_TASKSTATS is not set | ||
43 | # CONFIG_USER_NS is not set | ||
44 | # CONFIG_AUDIT is not set | ||
45 | # CONFIG_IKCONFIG is not set | ||
46 | CONFIG_LOG_BUF_SHIFT=14 | ||
47 | CONFIG_SYSFS_DEPRECATED=y | ||
48 | # CONFIG_RELAY is not set | ||
49 | CONFIG_BLK_DEV_INITRD=y | ||
50 | CONFIG_INITRAMFS_SOURCE="" | ||
51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
52 | CONFIG_SYSCTL=y | ||
53 | # CONFIG_EMBEDDED is not set | ||
54 | CONFIG_UID16=y | ||
55 | CONFIG_SYSCTL_SYSCALL=y | ||
56 | CONFIG_KALLSYMS=y | ||
57 | # CONFIG_KALLSYMS_ALL is not set | ||
58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
59 | CONFIG_HOTPLUG=y | ||
60 | CONFIG_PRINTK=y | ||
61 | CONFIG_BUG=y | ||
62 | CONFIG_ELF_CORE=y | ||
63 | CONFIG_BASE_FULL=y | ||
64 | CONFIG_FUTEX=y | ||
65 | CONFIG_ANON_INODES=y | ||
66 | CONFIG_EPOLL=y | ||
67 | CONFIG_SIGNALFD=y | ||
68 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | ||
70 | CONFIG_SHMEM=y | ||
71 | CONFIG_VM_EVENT_COUNTERS=y | ||
72 | CONFIG_SLAB=y | ||
73 | # CONFIG_SLUB is not set | ||
74 | # CONFIG_SLOB is not set | ||
75 | CONFIG_RT_MUTEXES=y | ||
76 | # CONFIG_TINY_SHMEM is not set | ||
77 | CONFIG_BASE_SMALL=0 | ||
78 | CONFIG_MODULES=y | ||
79 | CONFIG_MODULE_UNLOAD=y | ||
80 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
81 | # CONFIG_MODVERSIONS is not set | ||
82 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
83 | CONFIG_KMOD=y | ||
84 | CONFIG_BLOCK=y | ||
85 | # CONFIG_LBD is not set | ||
86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
87 | # CONFIG_LSF is not set | ||
88 | # CONFIG_BLK_DEV_BSG is not set | ||
89 | |||
90 | # | ||
91 | # IO Schedulers | ||
92 | # | ||
93 | CONFIG_IOSCHED_NOOP=y | ||
94 | CONFIG_IOSCHED_AS=y | ||
95 | CONFIG_IOSCHED_DEADLINE=y | ||
96 | CONFIG_IOSCHED_CFQ=y | ||
97 | # CONFIG_DEFAULT_AS is not set | ||
98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
99 | CONFIG_DEFAULT_CFQ=y | ||
100 | # CONFIG_DEFAULT_NOOP is not set | ||
101 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
102 | |||
103 | # | ||
104 | # System Type | ||
105 | # | ||
106 | # CONFIG_ARCH_AAEC2000 is not set | ||
107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
108 | # CONFIG_ARCH_REALVIEW is not set | ||
109 | # CONFIG_ARCH_VERSATILE is not set | ||
110 | # CONFIG_ARCH_AT91 is not set | ||
111 | # CONFIG_ARCH_CLPS7500 is not set | ||
112 | # CONFIG_ARCH_CLPS711X is not set | ||
113 | # CONFIG_ARCH_CO285 is not set | ||
114 | # CONFIG_ARCH_EBSA110 is not set | ||
115 | # CONFIG_ARCH_EP93XX is not set | ||
116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
117 | # CONFIG_ARCH_NETX is not set | ||
118 | # CONFIG_ARCH_H720X is not set | ||
119 | # CONFIG_ARCH_IMX is not set | ||
120 | # CONFIG_ARCH_IOP13XX is not set | ||
121 | # CONFIG_ARCH_IOP32X is not set | ||
122 | # CONFIG_ARCH_IOP33X is not set | ||
123 | # CONFIG_ARCH_IXP23XX is not set | ||
124 | # CONFIG_ARCH_IXP2000 is not set | ||
125 | # CONFIG_ARCH_IXP4XX is not set | ||
126 | # CONFIG_ARCH_L7200 is not set | ||
127 | # CONFIG_ARCH_KS8695 is not set | ||
128 | # CONFIG_ARCH_NS9XXX is not set | ||
129 | # CONFIG_ARCH_MXC is not set | ||
130 | # CONFIG_ARCH_PNX4008 is not set | ||
131 | # CONFIG_ARCH_PXA is not set | ||
132 | # CONFIG_ARCH_RPC is not set | ||
133 | # CONFIG_ARCH_SA1100 is not set | ||
134 | # CONFIG_ARCH_S3C2410 is not set | ||
135 | # CONFIG_ARCH_SHARK is not set | ||
136 | # CONFIG_ARCH_LH7A40X is not set | ||
137 | # CONFIG_ARCH_DAVINCI is not set | ||
138 | CONFIG_ARCH_OMAP=y | ||
139 | |||
140 | # | ||
141 | # TI OMAP Implementations | ||
142 | # | ||
143 | CONFIG_ARCH_OMAP_OTG=y | ||
144 | CONFIG_ARCH_OMAP1=y | ||
145 | # CONFIG_ARCH_OMAP2 is not set | ||
146 | # CONFIG_ARCH_OMAP3 is not set | ||
147 | |||
148 | # | ||
149 | # OMAP Feature Selections | ||
150 | # | ||
151 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
152 | # CONFIG_OMAP_BOOT_TAG is not set | ||
153 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
154 | CONFIG_OMAP_MUX=y | ||
155 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
156 | CONFIG_OMAP_MUX_WARNINGS=y | ||
157 | # CONFIG_OMAP_STI is not set | ||
158 | CONFIG_OMAP_MCBSP=y | ||
159 | # CONFIG_OMAP_MMU_FWK is not set | ||
160 | # CONFIG_OMAP_MBOX_FWK is not set | ||
161 | CONFIG_OMAP_MPU_TIMER=y | ||
162 | # CONFIG_OMAP_32K_TIMER is not set | ||
163 | # CONFIG_OMAP_DM_TIMER is not set | ||
164 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
165 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
166 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
167 | CONFIG_OMAP_SERIAL_WAKE=y | ||
168 | # CONFIG_OMAP_DSP is not set | ||
169 | |||
170 | # | ||
171 | # OMAP Core Type | ||
172 | # | ||
173 | # CONFIG_ARCH_OMAP730 is not set | ||
174 | # CONFIG_ARCH_OMAP15XX is not set | ||
175 | CONFIG_ARCH_OMAP16XX=y | ||
176 | |||
177 | # | ||
178 | # OMAP Board Type | ||
179 | # | ||
180 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
181 | # CONFIG_MACH_OMAP_H2 is not set | ||
182 | # CONFIG_MACH_OMAP_H3 is not set | ||
183 | # CONFIG_MACH_OMAP_OSK is not set | ||
184 | # CONFIG_MACH_NOKIA770 is not set | ||
185 | CONFIG_MACH_OMAP_GENERIC=y | ||
186 | |||
187 | # | ||
188 | # OMAP CPU Speed | ||
189 | # | ||
190 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
191 | # CONFIG_OMAP_ARM_216MHZ is not set | ||
192 | CONFIG_OMAP_ARM_192MHZ=y | ||
193 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
194 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
195 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
196 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
197 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
198 | |||
199 | # | ||
200 | # Boot options | ||
201 | # | ||
202 | |||
203 | # | ||
204 | # Power management | ||
205 | # | ||
206 | |||
207 | # | ||
208 | # Processor Type | ||
209 | # | ||
210 | CONFIG_CPU_32=y | ||
211 | CONFIG_CPU_ARM926T=y | ||
212 | CONFIG_CPU_32v5=y | ||
213 | CONFIG_CPU_ABRT_EV5TJ=y | ||
214 | CONFIG_CPU_PABRT_NOIFAR=y | ||
215 | CONFIG_CPU_CACHE_VIVT=y | ||
216 | CONFIG_CPU_COPY_V4WB=y | ||
217 | CONFIG_CPU_TLB_V4WBI=y | ||
218 | CONFIG_CPU_CP15=y | ||
219 | CONFIG_CPU_CP15_MMU=y | ||
220 | |||
221 | # | ||
222 | # Processor Features | ||
223 | # | ||
224 | # CONFIG_ARM_THUMB is not set | ||
225 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
226 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
227 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
228 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
229 | # CONFIG_OUTER_CACHE is not set | ||
230 | |||
231 | # | ||
232 | # Bus support | ||
233 | # | ||
234 | # CONFIG_PCI_SYSCALL is not set | ||
235 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
236 | |||
237 | # | ||
238 | # PCCARD (PCMCIA/CardBus) support | ||
239 | # | ||
240 | # CONFIG_PCCARD is not set | ||
241 | |||
242 | # | ||
243 | # Kernel Features | ||
244 | # | ||
245 | # CONFIG_TICK_ONESHOT is not set | ||
246 | # CONFIG_NO_HZ is not set | ||
247 | # CONFIG_HIGH_RES_TIMERS is not set | ||
248 | CONFIG_PREEMPT=y | ||
249 | CONFIG_HZ=100 | ||
250 | # CONFIG_AEABI is not set | ||
251 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
252 | CONFIG_SELECT_MEMORY_MODEL=y | ||
253 | CONFIG_FLATMEM_MANUAL=y | ||
254 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
255 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
256 | CONFIG_FLATMEM=y | ||
257 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
258 | # CONFIG_SPARSEMEM_STATIC is not set | ||
259 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
260 | # CONFIG_RESOURCES_64BIT is not set | ||
261 | CONFIG_ZONE_DMA_FLAG=1 | ||
262 | CONFIG_BOUNCE=y | ||
263 | CONFIG_VIRT_TO_BUS=y | ||
264 | # CONFIG_LEDS is not set | ||
265 | CONFIG_ALIGNMENT_TRAP=y | ||
266 | |||
267 | # | ||
268 | # Boot options | ||
269 | # | ||
270 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
271 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
272 | CONFIG_CMDLINE="mem=64M console=ttyS2,115200 root=0803 ro init=/bin/sh" | ||
273 | # CONFIG_XIP_KERNEL is not set | ||
274 | # CONFIG_KEXEC is not set | ||
275 | |||
276 | # | ||
277 | # CPU Frequency scaling | ||
278 | # | ||
279 | # CONFIG_CPU_FREQ is not set | ||
280 | |||
281 | # | ||
282 | # Floating point emulation | ||
283 | # | ||
284 | |||
285 | # | ||
286 | # At least one emulation must be selected | ||
287 | # | ||
288 | CONFIG_FPE_NWFPE=y | ||
289 | # CONFIG_FPE_NWFPE_XP is not set | ||
290 | # CONFIG_FPE_FASTFPE is not set | ||
291 | # CONFIG_VFP is not set | ||
292 | |||
293 | # | ||
294 | # Userspace binary formats | ||
295 | # | ||
296 | CONFIG_BINFMT_ELF=y | ||
297 | # CONFIG_BINFMT_AOUT is not set | ||
298 | # CONFIG_BINFMT_MISC is not set | ||
299 | # CONFIG_ARTHUR is not set | ||
300 | |||
301 | # | ||
302 | # Power management options | ||
303 | # | ||
304 | CONFIG_PM=y | ||
305 | # CONFIG_PM_LEGACY is not set | ||
306 | # CONFIG_PM_DEBUG is not set | ||
307 | CONFIG_PM_SLEEP=y | ||
308 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
309 | CONFIG_SUSPEND=y | ||
310 | # CONFIG_APM_EMULATION is not set | ||
311 | |||
312 | # | ||
313 | # Networking | ||
314 | # | ||
315 | CONFIG_NET=y | ||
316 | |||
317 | # | ||
318 | # Networking options | ||
319 | # | ||
320 | CONFIG_PACKET=y | ||
321 | # CONFIG_PACKET_MMAP is not set | ||
322 | CONFIG_UNIX=y | ||
323 | CONFIG_XFRM=y | ||
324 | # CONFIG_XFRM_USER is not set | ||
325 | # CONFIG_XFRM_SUB_POLICY is not set | ||
326 | # CONFIG_XFRM_MIGRATE is not set | ||
327 | # CONFIG_NET_KEY is not set | ||
328 | CONFIG_INET=y | ||
329 | CONFIG_IP_MULTICAST=y | ||
330 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
331 | CONFIG_IP_FIB_HASH=y | ||
332 | CONFIG_IP_PNP=y | ||
333 | CONFIG_IP_PNP_DHCP=y | ||
334 | CONFIG_IP_PNP_BOOTP=y | ||
335 | # CONFIG_IP_PNP_RARP is not set | ||
336 | # CONFIG_NET_IPIP is not set | ||
337 | # CONFIG_NET_IPGRE is not set | ||
338 | # CONFIG_IP_MROUTE is not set | ||
339 | # CONFIG_ARPD is not set | ||
340 | # CONFIG_SYN_COOKIES is not set | ||
341 | # CONFIG_INET_AH is not set | ||
342 | # CONFIG_INET_ESP is not set | ||
343 | # CONFIG_INET_IPCOMP is not set | ||
344 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
345 | # CONFIG_INET_TUNNEL is not set | ||
346 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
347 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
348 | CONFIG_INET_XFRM_MODE_BEET=y | ||
349 | CONFIG_INET_DIAG=y | ||
350 | CONFIG_INET_TCP_DIAG=y | ||
351 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
352 | CONFIG_TCP_CONG_CUBIC=y | ||
353 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
354 | # CONFIG_TCP_MD5SIG is not set | ||
355 | # CONFIG_IPV6 is not set | ||
356 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
357 | # CONFIG_INET6_TUNNEL is not set | ||
358 | # CONFIG_NETWORK_SECMARK is not set | ||
359 | # CONFIG_NETFILTER is not set | ||
360 | # CONFIG_IP_DCCP is not set | ||
361 | # CONFIG_IP_SCTP is not set | ||
362 | # CONFIG_TIPC is not set | ||
363 | # CONFIG_ATM is not set | ||
364 | # CONFIG_BRIDGE is not set | ||
365 | # CONFIG_VLAN_8021Q is not set | ||
366 | # CONFIG_DECNET is not set | ||
367 | # CONFIG_LLC2 is not set | ||
368 | # CONFIG_IPX is not set | ||
369 | # CONFIG_ATALK is not set | ||
370 | # CONFIG_X25 is not set | ||
371 | # CONFIG_LAPB is not set | ||
372 | # CONFIG_ECONET is not set | ||
373 | # CONFIG_WAN_ROUTER is not set | ||
374 | |||
375 | # | ||
376 | # QoS and/or fair queueing | ||
377 | # | ||
378 | # CONFIG_NET_SCHED is not set | ||
379 | |||
380 | # | ||
381 | # Network testing | ||
382 | # | ||
383 | # CONFIG_NET_PKTGEN is not set | ||
384 | # CONFIG_HAMRADIO is not set | ||
385 | # CONFIG_IRDA is not set | ||
386 | # CONFIG_BT is not set | ||
387 | # CONFIG_AF_RXRPC is not set | ||
388 | |||
389 | # | ||
390 | # Wireless | ||
391 | # | ||
392 | # CONFIG_CFG80211 is not set | ||
393 | # CONFIG_WIRELESS_EXT is not set | ||
394 | # CONFIG_MAC80211 is not set | ||
395 | # CONFIG_IEEE80211 is not set | ||
396 | # CONFIG_RFKILL is not set | ||
397 | # CONFIG_NET_9P is not set | ||
398 | |||
399 | # | ||
400 | # Device Drivers | ||
401 | # | ||
402 | |||
403 | # | ||
404 | # Generic Driver Options | ||
405 | # | ||
406 | CONFIG_STANDALONE=y | ||
407 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
408 | # CONFIG_FW_LOADER is not set | ||
409 | # CONFIG_DEBUG_DRIVER is not set | ||
410 | # CONFIG_DEBUG_DEVRES is not set | ||
411 | # CONFIG_SYS_HYPERVISOR is not set | ||
412 | # CONFIG_CONNECTOR is not set | ||
413 | # CONFIG_MTD is not set | ||
414 | # CONFIG_PARPORT is not set | ||
415 | CONFIG_BLK_DEV=y | ||
416 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
417 | CONFIG_BLK_DEV_LOOP=y | ||
418 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
419 | # CONFIG_BLK_DEV_NBD is not set | ||
420 | # CONFIG_BLK_DEV_UB is not set | ||
421 | CONFIG_BLK_DEV_RAM=y | ||
422 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
423 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
424 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
425 | # CONFIG_CDROM_PKTCDVD is not set | ||
426 | # CONFIG_ATA_OVER_ETH is not set | ||
427 | |||
428 | # | ||
429 | # SCSI device support | ||
430 | # | ||
431 | # CONFIG_RAID_ATTRS is not set | ||
432 | CONFIG_SCSI=y | ||
433 | CONFIG_SCSI_DMA=y | ||
434 | # CONFIG_SCSI_TGT is not set | ||
435 | # CONFIG_SCSI_NETLINK is not set | ||
436 | CONFIG_SCSI_PROC_FS=y | ||
437 | |||
438 | # | ||
439 | # SCSI support type (disk, tape, CD-ROM) | ||
440 | # | ||
441 | CONFIG_BLK_DEV_SD=y | ||
442 | # CONFIG_CHR_DEV_ST is not set | ||
443 | # CONFIG_CHR_DEV_OSST is not set | ||
444 | CONFIG_BLK_DEV_SR=y | ||
445 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
446 | CONFIG_CHR_DEV_SG=y | ||
447 | # CONFIG_CHR_DEV_SCH is not set | ||
448 | |||
449 | # | ||
450 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
451 | # | ||
452 | CONFIG_SCSI_MULTI_LUN=y | ||
453 | # CONFIG_SCSI_CONSTANTS is not set | ||
454 | # CONFIG_SCSI_LOGGING is not set | ||
455 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
456 | CONFIG_SCSI_WAIT_SCAN=m | ||
457 | |||
458 | # | ||
459 | # SCSI Transports | ||
460 | # | ||
461 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
462 | # CONFIG_SCSI_FC_ATTRS is not set | ||
463 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
464 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
465 | CONFIG_SCSI_LOWLEVEL=y | ||
466 | # CONFIG_ISCSI_TCP is not set | ||
467 | # CONFIG_SCSI_DEBUG is not set | ||
468 | # CONFIG_ATA is not set | ||
469 | # CONFIG_MD is not set | ||
470 | CONFIG_NETDEVICES=y | ||
471 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
472 | # CONFIG_DUMMY is not set | ||
473 | # CONFIG_BONDING is not set | ||
474 | # CONFIG_MACVLAN is not set | ||
475 | # CONFIG_EQUALIZER is not set | ||
476 | # CONFIG_TUN is not set | ||
477 | # CONFIG_PHYLIB is not set | ||
478 | CONFIG_NET_ETHERNET=y | ||
479 | CONFIG_MII=y | ||
480 | # CONFIG_AX88796 is not set | ||
481 | # CONFIG_SMC91X is not set | ||
482 | # CONFIG_DM9000 is not set | ||
483 | CONFIG_NETDEV_1000=y | ||
484 | CONFIG_NETDEV_10000=y | ||
485 | |||
486 | # | ||
487 | # Wireless LAN | ||
488 | # | ||
489 | # CONFIG_WLAN_PRE80211 is not set | ||
490 | # CONFIG_WLAN_80211 is not set | ||
491 | |||
492 | # | ||
493 | # USB Network Adapters | ||
494 | # | ||
495 | # CONFIG_USB_CATC is not set | ||
496 | # CONFIG_USB_KAWETH is not set | ||
497 | # CONFIG_USB_PEGASUS is not set | ||
498 | CONFIG_USB_RTL8150=y | ||
499 | CONFIG_USB_USBNET_MII=y | ||
500 | CONFIG_USB_USBNET=y | ||
501 | CONFIG_USB_NET_AX8817X=y | ||
502 | CONFIG_USB_NET_CDCETHER=y | ||
503 | # CONFIG_USB_NET_DM9601 is not set | ||
504 | # CONFIG_USB_NET_GL620A is not set | ||
505 | CONFIG_USB_NET_NET1080=y | ||
506 | # CONFIG_USB_NET_PLUSB is not set | ||
507 | # CONFIG_USB_NET_MCS7830 is not set | ||
508 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
509 | CONFIG_USB_NET_CDC_SUBSET=y | ||
510 | CONFIG_USB_ALI_M5632=y | ||
511 | CONFIG_USB_AN2720=y | ||
512 | CONFIG_USB_BELKIN=y | ||
513 | CONFIG_USB_ARMLINUX=y | ||
514 | CONFIG_USB_EPSON2888=y | ||
515 | # CONFIG_USB_KC2190 is not set | ||
516 | CONFIG_USB_NET_ZAURUS=y | ||
517 | # CONFIG_WAN is not set | ||
518 | CONFIG_PPP=y | ||
519 | CONFIG_PPP_MULTILINK=y | ||
520 | # CONFIG_PPP_FILTER is not set | ||
521 | # CONFIG_PPP_ASYNC is not set | ||
522 | # CONFIG_PPP_SYNC_TTY is not set | ||
523 | # CONFIG_PPP_DEFLATE is not set | ||
524 | # CONFIG_PPP_BSDCOMP is not set | ||
525 | # CONFIG_PPP_MPPE is not set | ||
526 | # CONFIG_PPPOE is not set | ||
527 | # CONFIG_PPPOL2TP is not set | ||
528 | # CONFIG_SLIP is not set | ||
529 | CONFIG_SLHC=y | ||
530 | # CONFIG_SHAPER is not set | ||
531 | # CONFIG_NETCONSOLE is not set | ||
532 | # CONFIG_NETPOLL is not set | ||
533 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
534 | # CONFIG_ISDN is not set | ||
535 | |||
536 | # | ||
537 | # Input device support | ||
538 | # | ||
539 | CONFIG_INPUT=y | ||
540 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
541 | # CONFIG_INPUT_POLLDEV is not set | ||
542 | |||
543 | # | ||
544 | # Userland interfaces | ||
545 | # | ||
546 | CONFIG_INPUT_MOUSEDEV=y | ||
547 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
548 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
549 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
550 | # CONFIG_INPUT_JOYDEV is not set | ||
551 | # CONFIG_INPUT_TSDEV is not set | ||
552 | # CONFIG_INPUT_EVDEV is not set | ||
553 | # CONFIG_INPUT_EVBUG is not set | ||
554 | |||
555 | # | ||
556 | # Input Device Drivers | ||
557 | # | ||
558 | CONFIG_INPUT_KEYBOARD=y | ||
559 | CONFIG_KEYBOARD_ATKBD=y | ||
560 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
561 | # CONFIG_KEYBOARD_LKKBD is not set | ||
562 | # CONFIG_KEYBOARD_XTKBD is not set | ||
563 | # CONFIG_KEYBOARD_NEWTON is not set | ||
564 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
565 | CONFIG_KEYBOARD_OMAP=y | ||
566 | # CONFIG_KEYBOARD_GPIO is not set | ||
567 | # CONFIG_INPUT_MOUSE is not set | ||
568 | # CONFIG_INPUT_JOYSTICK is not set | ||
569 | # CONFIG_INPUT_TABLET is not set | ||
570 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
571 | # CONFIG_INPUT_MISC is not set | ||
572 | |||
573 | # | ||
574 | # Hardware I/O ports | ||
575 | # | ||
576 | CONFIG_SERIO=y | ||
577 | CONFIG_SERIO_SERPORT=y | ||
578 | CONFIG_SERIO_LIBPS2=y | ||
579 | # CONFIG_SERIO_RAW is not set | ||
580 | # CONFIG_GAMEPORT is not set | ||
581 | |||
582 | # | ||
583 | # Character devices | ||
584 | # | ||
585 | CONFIG_VT=y | ||
586 | CONFIG_VT_CONSOLE=y | ||
587 | CONFIG_HW_CONSOLE=y | ||
588 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
589 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
590 | |||
591 | # | ||
592 | # Serial drivers | ||
593 | # | ||
594 | CONFIG_SERIAL_8250=y | ||
595 | CONFIG_SERIAL_8250_CONSOLE=y | ||
596 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
597 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
598 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
599 | |||
600 | # | ||
601 | # Non-8250 serial port support | ||
602 | # | ||
603 | CONFIG_SERIAL_CORE=y | ||
604 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
605 | CONFIG_UNIX98_PTYS=y | ||
606 | # CONFIG_LEGACY_PTYS is not set | ||
607 | # CONFIG_IPMI_HANDLER is not set | ||
608 | # CONFIG_WATCHDOG is not set | ||
609 | CONFIG_HW_RANDOM=m | ||
610 | CONFIG_HW_RANDOM_OMAP=m | ||
611 | # CONFIG_NVRAM is not set | ||
612 | # CONFIG_R3964 is not set | ||
613 | # CONFIG_RAW_DRIVER is not set | ||
614 | # CONFIG_TCG_TPM is not set | ||
615 | CONFIG_I2C=y | ||
616 | CONFIG_I2C_BOARDINFO=y | ||
617 | CONFIG_I2C_CHARDEV=y | ||
618 | |||
619 | # | ||
620 | # I2C Algorithms | ||
621 | # | ||
622 | CONFIG_I2C_ALGOBIT=y | ||
623 | # CONFIG_I2C_ALGOPCF is not set | ||
624 | # CONFIG_I2C_ALGOPCA is not set | ||
625 | |||
626 | # | ||
627 | # I2C Hardware Bus support | ||
628 | # | ||
629 | # CONFIG_I2C_GPIO is not set | ||
630 | # CONFIG_I2C_OCORES is not set | ||
631 | # CONFIG_I2C_OMAP is not set | ||
632 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
633 | # CONFIG_I2C_SIMTEC is not set | ||
634 | # CONFIG_I2C_TAOS_EVM is not set | ||
635 | # CONFIG_I2C_STUB is not set | ||
636 | # CONFIG_I2C_TINY_USB is not set | ||
637 | |||
638 | # | ||
639 | # Miscellaneous I2C Chip support | ||
640 | # | ||
641 | # CONFIG_SENSORS_DS1337 is not set | ||
642 | # CONFIG_SENSORS_DS1374 is not set | ||
643 | # CONFIG_DS1682 is not set | ||
644 | # CONFIG_SENSORS_EEPROM is not set | ||
645 | # CONFIG_SENSORS_PCF8574 is not set | ||
646 | # CONFIG_SENSORS_PCA9539 is not set | ||
647 | # CONFIG_SENSORS_PCF8591 is not set | ||
648 | # CONFIG_ISP1301_OMAP is not set | ||
649 | # CONFIG_TPS65010 is not set | ||
650 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
651 | # CONFIG_SENSORS_MAX6875 is not set | ||
652 | # CONFIG_SENSORS_TSL2550 is not set | ||
653 | # CONFIG_I2C_DEBUG_CORE is not set | ||
654 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
655 | # CONFIG_I2C_DEBUG_BUS is not set | ||
656 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
657 | |||
658 | # | ||
659 | # SPI support | ||
660 | # | ||
661 | # CONFIG_SPI is not set | ||
662 | # CONFIG_SPI_MASTER is not set | ||
663 | # CONFIG_W1 is not set | ||
664 | CONFIG_HWMON=y | ||
665 | # CONFIG_HWMON_VID is not set | ||
666 | # CONFIG_SENSORS_ABITUGURU is not set | ||
667 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
668 | # CONFIG_SENSORS_AD7418 is not set | ||
669 | # CONFIG_SENSORS_ADM1021 is not set | ||
670 | # CONFIG_SENSORS_ADM1025 is not set | ||
671 | # CONFIG_SENSORS_ADM1026 is not set | ||
672 | # CONFIG_SENSORS_ADM1029 is not set | ||
673 | # CONFIG_SENSORS_ADM1031 is not set | ||
674 | # CONFIG_SENSORS_ADM9240 is not set | ||
675 | # CONFIG_SENSORS_ASB100 is not set | ||
676 | # CONFIG_SENSORS_ATXP1 is not set | ||
677 | # CONFIG_SENSORS_DS1621 is not set | ||
678 | # CONFIG_SENSORS_F71805F is not set | ||
679 | # CONFIG_SENSORS_FSCHER is not set | ||
680 | # CONFIG_SENSORS_FSCPOS is not set | ||
681 | # CONFIG_SENSORS_GL518SM is not set | ||
682 | # CONFIG_SENSORS_GL520SM is not set | ||
683 | # CONFIG_SENSORS_IT87 is not set | ||
684 | # CONFIG_SENSORS_LM63 is not set | ||
685 | # CONFIG_SENSORS_LM75 is not set | ||
686 | # CONFIG_SENSORS_LM77 is not set | ||
687 | # CONFIG_SENSORS_LM78 is not set | ||
688 | # CONFIG_SENSORS_LM80 is not set | ||
689 | # CONFIG_SENSORS_LM83 is not set | ||
690 | # CONFIG_SENSORS_LM85 is not set | ||
691 | # CONFIG_SENSORS_LM87 is not set | ||
692 | # CONFIG_SENSORS_LM90 is not set | ||
693 | # CONFIG_SENSORS_LM92 is not set | ||
694 | # CONFIG_SENSORS_LM93 is not set | ||
695 | # CONFIG_SENSORS_MAX1619 is not set | ||
696 | # CONFIG_SENSORS_MAX6650 is not set | ||
697 | # CONFIG_SENSORS_PC87360 is not set | ||
698 | # CONFIG_SENSORS_PC87427 is not set | ||
699 | # CONFIG_SENSORS_DME1737 is not set | ||
700 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
701 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
702 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
703 | # CONFIG_SENSORS_THMC50 is not set | ||
704 | # CONFIG_SENSORS_VT1211 is not set | ||
705 | # CONFIG_SENSORS_W83781D is not set | ||
706 | # CONFIG_SENSORS_W83791D is not set | ||
707 | # CONFIG_SENSORS_W83792D is not set | ||
708 | # CONFIG_SENSORS_W83793 is not set | ||
709 | # CONFIG_SENSORS_W83L785TS is not set | ||
710 | # CONFIG_SENSORS_W83627HF is not set | ||
711 | # CONFIG_SENSORS_W83627EHF is not set | ||
712 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
713 | CONFIG_MISC_DEVICES=y | ||
714 | # CONFIG_EEPROM_93CX6 is not set | ||
715 | |||
716 | # | ||
717 | # Multifunction device drivers | ||
718 | # | ||
719 | # CONFIG_MFD_SM501 is not set | ||
720 | # CONFIG_NEW_LEDS is not set | ||
721 | |||
722 | # | ||
723 | # Multimedia devices | ||
724 | # | ||
725 | # CONFIG_VIDEO_DEV is not set | ||
726 | # CONFIG_DVB_CORE is not set | ||
727 | CONFIG_DAB=y | ||
728 | # CONFIG_USB_DABUSB is not set | ||
729 | |||
730 | # | ||
731 | # Graphics support | ||
732 | # | ||
733 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
734 | |||
735 | # | ||
736 | # Display device support | ||
737 | # | ||
738 | # CONFIG_DISPLAY_SUPPORT is not set | ||
739 | # CONFIG_VGASTATE is not set | ||
740 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
741 | # CONFIG_FB is not set | ||
742 | |||
743 | # | ||
744 | # Console display driver support | ||
745 | # | ||
746 | # CONFIG_VGA_CONSOLE is not set | ||
747 | CONFIG_DUMMY_CONSOLE=y | ||
748 | |||
749 | # | ||
750 | # Sound | ||
751 | # | ||
752 | # CONFIG_SOUND is not set | ||
753 | CONFIG_HID_SUPPORT=y | ||
754 | CONFIG_HID=y | ||
755 | # CONFIG_HID_DEBUG is not set | ||
756 | |||
757 | # | ||
758 | # USB Input Devices | ||
759 | # | ||
760 | CONFIG_USB_HID=y | ||
761 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
762 | # CONFIG_HID_FF is not set | ||
763 | # CONFIG_USB_HIDDEV is not set | ||
764 | CONFIG_USB_SUPPORT=y | ||
765 | CONFIG_USB_ARCH_HAS_HCD=y | ||
766 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
767 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
768 | CONFIG_USB=y | ||
769 | CONFIG_USB_DEBUG=y | ||
770 | |||
771 | # | ||
772 | # Miscellaneous USB options | ||
773 | # | ||
774 | CONFIG_USB_DEVICEFS=y | ||
775 | # CONFIG_USB_DEVICE_CLASS is not set | ||
776 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
777 | # CONFIG_USB_SUSPEND is not set | ||
778 | # CONFIG_USB_PERSIST is not set | ||
779 | # CONFIG_USB_OTG is not set | ||
780 | |||
781 | # | ||
782 | # USB Host Controller Drivers | ||
783 | # | ||
784 | # CONFIG_USB_ISP116X_HCD is not set | ||
785 | CONFIG_USB_OHCI_HCD=y | ||
786 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
787 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
788 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
789 | # CONFIG_USB_SL811_HCD is not set | ||
790 | # CONFIG_USB_R8A66597_HCD is not set | ||
791 | # CONFIG_USB_MUSB_HDRC is not set | ||
792 | |||
793 | # | ||
794 | # USB Device Class drivers | ||
795 | # | ||
796 | # CONFIG_USB_ACM is not set | ||
797 | # CONFIG_USB_PRINTER is not set | ||
798 | |||
799 | # | ||
800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
801 | # | ||
802 | |||
803 | # | ||
804 | # may also be needed; see USB_STORAGE Help for more information | ||
805 | # | ||
806 | CONFIG_USB_STORAGE=y | ||
807 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
808 | CONFIG_USB_STORAGE_DATAFAB=y | ||
809 | CONFIG_USB_STORAGE_FREECOM=y | ||
810 | CONFIG_USB_STORAGE_DPCM=y | ||
811 | # CONFIG_USB_STORAGE_USBAT is not set | ||
812 | CONFIG_USB_STORAGE_SDDR09=y | ||
813 | CONFIG_USB_STORAGE_SDDR55=y | ||
814 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
815 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
816 | # CONFIG_USB_STORAGE_KARMA is not set | ||
817 | # CONFIG_USB_LIBUSUAL is not set | ||
818 | |||
819 | # | ||
820 | # USB Imaging devices | ||
821 | # | ||
822 | # CONFIG_USB_MDC800 is not set | ||
823 | # CONFIG_USB_MICROTEK is not set | ||
824 | CONFIG_USB_MON=y | ||
825 | |||
826 | # | ||
827 | # USB port drivers | ||
828 | # | ||
829 | |||
830 | # | ||
831 | # USB Serial Converter support | ||
832 | # | ||
833 | # CONFIG_USB_SERIAL is not set | ||
834 | |||
835 | # | ||
836 | # USB Miscellaneous drivers | ||
837 | # | ||
838 | # CONFIG_USB_EMI62 is not set | ||
839 | # CONFIG_USB_EMI26 is not set | ||
840 | # CONFIG_USB_ADUTUX is not set | ||
841 | # CONFIG_USB_AUERSWALD is not set | ||
842 | # CONFIG_USB_RIO500 is not set | ||
843 | # CONFIG_USB_LEGOTOWER is not set | ||
844 | # CONFIG_USB_LCD is not set | ||
845 | # CONFIG_USB_BERRY_CHARGE is not set | ||
846 | # CONFIG_USB_LED is not set | ||
847 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
848 | # CONFIG_USB_CYTHERM is not set | ||
849 | # CONFIG_USB_PHIDGET is not set | ||
850 | # CONFIG_USB_IDMOUSE is not set | ||
851 | # CONFIG_USB_FTDI_ELAN is not set | ||
852 | # CONFIG_USB_APPLEDISPLAY is not set | ||
853 | # CONFIG_USB_LD is not set | ||
854 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
855 | # CONFIG_USB_IOWARRIOR is not set | ||
856 | # CONFIG_USB_TEST is not set | ||
857 | |||
858 | # | ||
859 | # USB DSL modem support | ||
860 | # | ||
861 | |||
862 | # | ||
863 | # USB Gadget Support | ||
864 | # | ||
865 | # CONFIG_USB_GADGET is not set | ||
866 | CONFIG_MMC=y | ||
867 | # CONFIG_MMC_DEBUG is not set | ||
868 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
869 | |||
870 | # | ||
871 | # MMC/SD Card Drivers | ||
872 | # | ||
873 | CONFIG_MMC_BLOCK=y | ||
874 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
875 | |||
876 | # | ||
877 | # MMC/SD Host Controller Drivers | ||
878 | # | ||
879 | CONFIG_MMC_OMAP=y | ||
880 | CONFIG_RTC_LIB=y | ||
881 | CONFIG_RTC_CLASS=y | ||
882 | CONFIG_RTC_HCTOSYS=y | ||
883 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
884 | # CONFIG_RTC_DEBUG is not set | ||
885 | |||
886 | # | ||
887 | # RTC interfaces | ||
888 | # | ||
889 | CONFIG_RTC_INTF_SYSFS=y | ||
890 | CONFIG_RTC_INTF_PROC=y | ||
891 | CONFIG_RTC_INTF_DEV=y | ||
892 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
893 | # CONFIG_RTC_DRV_TEST is not set | ||
894 | |||
895 | # | ||
896 | # I2C RTC drivers | ||
897 | # | ||
898 | # CONFIG_RTC_DRV_DS1307 is not set | ||
899 | # CONFIG_RTC_DRV_DS1672 is not set | ||
900 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
901 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
902 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
903 | # CONFIG_RTC_DRV_X1205 is not set | ||
904 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
905 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
906 | # CONFIG_RTC_DRV_M41T80 is not set | ||
907 | |||
908 | # | ||
909 | # SPI RTC drivers | ||
910 | # | ||
911 | |||
912 | # | ||
913 | # Platform RTC drivers | ||
914 | # | ||
915 | # CONFIG_RTC_DRV_CMOS is not set | ||
916 | # CONFIG_RTC_DRV_DS1553 is not set | ||
917 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
918 | # CONFIG_RTC_DRV_DS1742 is not set | ||
919 | # CONFIG_RTC_DRV_M48T86 is not set | ||
920 | # CONFIG_RTC_DRV_M48T59 is not set | ||
921 | # CONFIG_RTC_DRV_V3020 is not set | ||
922 | |||
923 | # | ||
924 | # on-CPU RTC drivers | ||
925 | # | ||
926 | CONFIG_RTC_DRV_OMAP=y | ||
927 | |||
928 | # | ||
929 | # DMA Engine support | ||
930 | # | ||
931 | # CONFIG_DMA_ENGINE is not set | ||
932 | |||
933 | # | ||
934 | # DMA Clients | ||
935 | # | ||
936 | |||
937 | # | ||
938 | # DMA Devices | ||
939 | # | ||
940 | |||
941 | # | ||
942 | # CBUS support | ||
943 | # | ||
944 | # CONFIG_CBUS is not set | ||
945 | |||
946 | # | ||
947 | # File systems | ||
948 | # | ||
949 | CONFIG_EXT2_FS=y | ||
950 | # CONFIG_EXT2_FS_XATTR is not set | ||
951 | # CONFIG_EXT2_FS_XIP is not set | ||
952 | CONFIG_EXT3_FS=y | ||
953 | CONFIG_EXT3_FS_XATTR=y | ||
954 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
955 | # CONFIG_EXT3_FS_SECURITY is not set | ||
956 | # CONFIG_EXT4DEV_FS is not set | ||
957 | CONFIG_JBD=y | ||
958 | # CONFIG_JBD_DEBUG is not set | ||
959 | CONFIG_FS_MBCACHE=y | ||
960 | # CONFIG_REISERFS_FS is not set | ||
961 | # CONFIG_JFS_FS is not set | ||
962 | # CONFIG_FS_POSIX_ACL is not set | ||
963 | # CONFIG_XFS_FS is not set | ||
964 | # CONFIG_GFS2_FS is not set | ||
965 | # CONFIG_OCFS2_FS is not set | ||
966 | # CONFIG_MINIX_FS is not set | ||
967 | # CONFIG_ROMFS_FS is not set | ||
968 | CONFIG_INOTIFY=y | ||
969 | CONFIG_INOTIFY_USER=y | ||
970 | # CONFIG_QUOTA is not set | ||
971 | CONFIG_DNOTIFY=y | ||
972 | CONFIG_AUTOFS_FS=y | ||
973 | CONFIG_AUTOFS4_FS=y | ||
974 | # CONFIG_FUSE_FS is not set | ||
975 | |||
976 | # | ||
977 | # CD-ROM/DVD Filesystems | ||
978 | # | ||
979 | CONFIG_ISO9660_FS=y | ||
980 | CONFIG_JOLIET=y | ||
981 | # CONFIG_ZISOFS is not set | ||
982 | # CONFIG_UDF_FS is not set | ||
983 | |||
984 | # | ||
985 | # DOS/FAT/NT Filesystems | ||
986 | # | ||
987 | CONFIG_FAT_FS=m | ||
988 | CONFIG_MSDOS_FS=m | ||
989 | CONFIG_VFAT_FS=m | ||
990 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
991 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
992 | # CONFIG_NTFS_FS is not set | ||
993 | |||
994 | # | ||
995 | # Pseudo filesystems | ||
996 | # | ||
997 | CONFIG_PROC_FS=y | ||
998 | CONFIG_PROC_SYSCTL=y | ||
999 | CONFIG_SYSFS=y | ||
1000 | # CONFIG_TMPFS is not set | ||
1001 | # CONFIG_HUGETLB_PAGE is not set | ||
1002 | CONFIG_RAMFS=y | ||
1003 | # CONFIG_CONFIGFS_FS is not set | ||
1004 | |||
1005 | # | ||
1006 | # Miscellaneous filesystems | ||
1007 | # | ||
1008 | # CONFIG_ADFS_FS is not set | ||
1009 | # CONFIG_AFFS_FS is not set | ||
1010 | # CONFIG_HFS_FS is not set | ||
1011 | # CONFIG_HFSPLUS_FS is not set | ||
1012 | # CONFIG_BEFS_FS is not set | ||
1013 | # CONFIG_BFS_FS is not set | ||
1014 | # CONFIG_EFS_FS is not set | ||
1015 | # CONFIG_CRAMFS is not set | ||
1016 | # CONFIG_VXFS_FS is not set | ||
1017 | # CONFIG_HPFS_FS is not set | ||
1018 | # CONFIG_QNX4FS_FS is not set | ||
1019 | # CONFIG_SYSV_FS is not set | ||
1020 | # CONFIG_UFS_FS is not set | ||
1021 | |||
1022 | # | ||
1023 | # Network File Systems | ||
1024 | # | ||
1025 | CONFIG_NFS_FS=y | ||
1026 | # CONFIG_NFS_V3 is not set | ||
1027 | # CONFIG_NFS_V4 is not set | ||
1028 | # CONFIG_NFS_DIRECTIO is not set | ||
1029 | # CONFIG_NFSD is not set | ||
1030 | # CONFIG_ROOT_NFS is not set | ||
1031 | CONFIG_LOCKD=y | ||
1032 | CONFIG_NFS_COMMON=y | ||
1033 | CONFIG_SUNRPC=y | ||
1034 | # CONFIG_SUNRPC_BIND34 is not set | ||
1035 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
1036 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1037 | # CONFIG_SMB_FS is not set | ||
1038 | # CONFIG_CIFS is not set | ||
1039 | # CONFIG_NCP_FS is not set | ||
1040 | # CONFIG_CODA_FS is not set | ||
1041 | # CONFIG_AFS_FS is not set | ||
1042 | |||
1043 | # | ||
1044 | # Partition Types | ||
1045 | # | ||
1046 | CONFIG_PARTITION_ADVANCED=y | ||
1047 | # CONFIG_ACORN_PARTITION is not set | ||
1048 | # CONFIG_OSF_PARTITION is not set | ||
1049 | # CONFIG_AMIGA_PARTITION is not set | ||
1050 | # CONFIG_ATARI_PARTITION is not set | ||
1051 | # CONFIG_MAC_PARTITION is not set | ||
1052 | CONFIG_MSDOS_PARTITION=y | ||
1053 | # CONFIG_BSD_DISKLABEL is not set | ||
1054 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1055 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1056 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
1057 | # CONFIG_LDM_PARTITION is not set | ||
1058 | # CONFIG_SGI_PARTITION is not set | ||
1059 | # CONFIG_ULTRIX_PARTITION is not set | ||
1060 | # CONFIG_SUN_PARTITION is not set | ||
1061 | # CONFIG_KARMA_PARTITION is not set | ||
1062 | # CONFIG_EFI_PARTITION is not set | ||
1063 | # CONFIG_SYSV68_PARTITION is not set | ||
1064 | |||
1065 | # | ||
1066 | # Native Language Support | ||
1067 | # | ||
1068 | CONFIG_NLS=y | ||
1069 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1070 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1071 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1072 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1073 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1074 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1075 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1076 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1077 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1078 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1079 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1080 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1081 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1082 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1083 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1084 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1085 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1086 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1087 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1088 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1089 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1090 | # CONFIG_NLS_ISO8859_8 is not set | ||
1091 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1092 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1093 | # CONFIG_NLS_ASCII is not set | ||
1094 | # CONFIG_NLS_ISO8859_1 is not set | ||
1095 | # CONFIG_NLS_ISO8859_2 is not set | ||
1096 | # CONFIG_NLS_ISO8859_3 is not set | ||
1097 | # CONFIG_NLS_ISO8859_4 is not set | ||
1098 | # CONFIG_NLS_ISO8859_5 is not set | ||
1099 | # CONFIG_NLS_ISO8859_6 is not set | ||
1100 | # CONFIG_NLS_ISO8859_7 is not set | ||
1101 | # CONFIG_NLS_ISO8859_9 is not set | ||
1102 | # CONFIG_NLS_ISO8859_13 is not set | ||
1103 | # CONFIG_NLS_ISO8859_14 is not set | ||
1104 | # CONFIG_NLS_ISO8859_15 is not set | ||
1105 | # CONFIG_NLS_KOI8_R is not set | ||
1106 | # CONFIG_NLS_KOI8_U is not set | ||
1107 | # CONFIG_NLS_UTF8 is not set | ||
1108 | |||
1109 | # | ||
1110 | # Distributed Lock Manager | ||
1111 | # | ||
1112 | # CONFIG_DLM is not set | ||
1113 | |||
1114 | # | ||
1115 | # Profiling support | ||
1116 | # | ||
1117 | # CONFIG_PROFILING is not set | ||
1118 | |||
1119 | # | ||
1120 | # Kernel hacking | ||
1121 | # | ||
1122 | # CONFIG_PRINTK_TIME is not set | ||
1123 | CONFIG_ENABLE_MUST_CHECK=y | ||
1124 | CONFIG_MAGIC_SYSRQ=y | ||
1125 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1126 | # CONFIG_DEBUG_FS is not set | ||
1127 | # CONFIG_HEADERS_CHECK is not set | ||
1128 | CONFIG_DEBUG_KERNEL=y | ||
1129 | # CONFIG_DEBUG_SHIRQ is not set | ||
1130 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1131 | CONFIG_SCHED_DEBUG=y | ||
1132 | # CONFIG_SCHEDSTATS is not set | ||
1133 | # CONFIG_TIMER_STATS is not set | ||
1134 | # CONFIG_DEBUG_SLAB is not set | ||
1135 | CONFIG_DEBUG_PREEMPT=y | ||
1136 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1137 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1138 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1139 | # CONFIG_DEBUG_MUTEXES is not set | ||
1140 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1141 | # CONFIG_PROVE_LOCKING is not set | ||
1142 | # CONFIG_LOCK_STAT is not set | ||
1143 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1144 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1145 | # CONFIG_DEBUG_KOBJECT is not set | ||
1146 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1147 | # CONFIG_DEBUG_INFO is not set | ||
1148 | # CONFIG_DEBUG_VM is not set | ||
1149 | # CONFIG_DEBUG_LIST is not set | ||
1150 | CONFIG_FRAME_POINTER=y | ||
1151 | CONFIG_FORCED_INLINING=y | ||
1152 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1153 | # CONFIG_FAULT_INJECTION is not set | ||
1154 | # CONFIG_DEBUG_USER is not set | ||
1155 | # CONFIG_DEBUG_ERRORS is not set | ||
1156 | # CONFIG_DEBUG_LL is not set | ||
1157 | |||
1158 | # | ||
1159 | # Security options | ||
1160 | # | ||
1161 | # CONFIG_KEYS is not set | ||
1162 | # CONFIG_SECURITY is not set | ||
1163 | # CONFIG_CRYPTO is not set | ||
1164 | |||
1165 | # | ||
1166 | # Library routines | ||
1167 | # | ||
1168 | CONFIG_BITREVERSE=y | ||
1169 | # CONFIG_CRC_CCITT is not set | ||
1170 | # CONFIG_CRC16 is not set | ||
1171 | # CONFIG_CRC_ITU_T is not set | ||
1172 | CONFIG_CRC32=y | ||
1173 | # CONFIG_CRC7 is not set | ||
1174 | # CONFIG_LIBCRC32C is not set | ||
1175 | CONFIG_PLIST=y | ||
1176 | CONFIG_HAS_IOMEM=y | ||
1177 | CONFIG_HAS_IOPORT=y | ||
1178 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_generic_1710_defconfig b/arch/arm/configs/omap_generic_1710_defconfig new file mode 100644 index 000000000000..0a00a708a4fc --- /dev/null +++ b/arch/arm/configs/omap_generic_1710_defconfig | |||
@@ -0,0 +1,1088 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 13:02:08 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
34 | CONFIG_LOCALVERSION="" | ||
35 | CONFIG_LOCALVERSION_AUTO=y | ||
36 | CONFIG_SWAP=y | ||
37 | CONFIG_SYSVIPC=y | ||
38 | CONFIG_SYSVIPC_SYSCTL=y | ||
39 | # CONFIG_POSIX_MQUEUE is not set | ||
40 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
41 | # CONFIG_TASKSTATS is not set | ||
42 | # CONFIG_USER_NS is not set | ||
43 | # CONFIG_AUDIT is not set | ||
44 | # CONFIG_IKCONFIG is not set | ||
45 | CONFIG_LOG_BUF_SHIFT=14 | ||
46 | CONFIG_SYSFS_DEPRECATED=y | ||
47 | # CONFIG_RELAY is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
51 | CONFIG_SYSCTL=y | ||
52 | # CONFIG_EMBEDDED is not set | ||
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
55 | CONFIG_KALLSYMS=y | ||
56 | # CONFIG_KALLSYMS_ALL is not set | ||
57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
58 | CONFIG_HOTPLUG=y | ||
59 | CONFIG_PRINTK=y | ||
60 | CONFIG_BUG=y | ||
61 | CONFIG_ELF_CORE=y | ||
62 | CONFIG_BASE_FULL=y | ||
63 | CONFIG_FUTEX=y | ||
64 | CONFIG_ANON_INODES=y | ||
65 | CONFIG_EPOLL=y | ||
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
69 | CONFIG_SHMEM=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | ||
71 | CONFIG_SLUB_DEBUG=y | ||
72 | # CONFIG_SLAB is not set | ||
73 | CONFIG_SLUB=y | ||
74 | # CONFIG_SLOB is not set | ||
75 | CONFIG_RT_MUTEXES=y | ||
76 | # CONFIG_TINY_SHMEM is not set | ||
77 | CONFIG_BASE_SMALL=0 | ||
78 | # CONFIG_MODULES is not set | ||
79 | CONFIG_BLOCK=y | ||
80 | # CONFIG_LBD is not set | ||
81 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
82 | # CONFIG_LSF is not set | ||
83 | # CONFIG_BLK_DEV_BSG is not set | ||
84 | |||
85 | # | ||
86 | # IO Schedulers | ||
87 | # | ||
88 | CONFIG_IOSCHED_NOOP=y | ||
89 | CONFIG_IOSCHED_AS=y | ||
90 | CONFIG_IOSCHED_DEADLINE=y | ||
91 | CONFIG_IOSCHED_CFQ=y | ||
92 | # CONFIG_DEFAULT_AS is not set | ||
93 | # CONFIG_DEFAULT_DEADLINE is not set | ||
94 | CONFIG_DEFAULT_CFQ=y | ||
95 | # CONFIG_DEFAULT_NOOP is not set | ||
96 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
97 | |||
98 | # | ||
99 | # System Type | ||
100 | # | ||
101 | # CONFIG_ARCH_AAEC2000 is not set | ||
102 | # CONFIG_ARCH_INTEGRATOR is not set | ||
103 | # CONFIG_ARCH_REALVIEW is not set | ||
104 | # CONFIG_ARCH_VERSATILE is not set | ||
105 | # CONFIG_ARCH_AT91 is not set | ||
106 | # CONFIG_ARCH_CLPS7500 is not set | ||
107 | # CONFIG_ARCH_CLPS711X is not set | ||
108 | # CONFIG_ARCH_CO285 is not set | ||
109 | # CONFIG_ARCH_EBSA110 is not set | ||
110 | # CONFIG_ARCH_EP93XX is not set | ||
111 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
112 | # CONFIG_ARCH_NETX is not set | ||
113 | # CONFIG_ARCH_H720X is not set | ||
114 | # CONFIG_ARCH_IMX is not set | ||
115 | # CONFIG_ARCH_IOP13XX is not set | ||
116 | # CONFIG_ARCH_IOP32X is not set | ||
117 | # CONFIG_ARCH_IOP33X is not set | ||
118 | # CONFIG_ARCH_IXP23XX is not set | ||
119 | # CONFIG_ARCH_IXP2000 is not set | ||
120 | # CONFIG_ARCH_IXP4XX is not set | ||
121 | # CONFIG_ARCH_L7200 is not set | ||
122 | # CONFIG_ARCH_KS8695 is not set | ||
123 | # CONFIG_ARCH_NS9XXX is not set | ||
124 | # CONFIG_ARCH_MXC is not set | ||
125 | # CONFIG_ARCH_PNX4008 is not set | ||
126 | # CONFIG_ARCH_PXA is not set | ||
127 | # CONFIG_ARCH_RPC is not set | ||
128 | # CONFIG_ARCH_SA1100 is not set | ||
129 | # CONFIG_ARCH_S3C2410 is not set | ||
130 | # CONFIG_ARCH_SHARK is not set | ||
131 | # CONFIG_ARCH_LH7A40X is not set | ||
132 | # CONFIG_ARCH_DAVINCI is not set | ||
133 | CONFIG_ARCH_OMAP=y | ||
134 | |||
135 | # | ||
136 | # TI OMAP Implementations | ||
137 | # | ||
138 | CONFIG_ARCH_OMAP_OTG=y | ||
139 | CONFIG_ARCH_OMAP1=y | ||
140 | # CONFIG_ARCH_OMAP2 is not set | ||
141 | # CONFIG_ARCH_OMAP3 is not set | ||
142 | |||
143 | # | ||
144 | # OMAP Feature Selections | ||
145 | # | ||
146 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
147 | CONFIG_OMAP_BOOT_TAG=y | ||
148 | # CONFIG_OMAP_BOOT_REASON is not set | ||
149 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
150 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
151 | # CONFIG_OMAP_MUX is not set | ||
152 | # CONFIG_OMAP_STI is not set | ||
153 | CONFIG_OMAP_MCBSP=y | ||
154 | # CONFIG_OMAP_MMU_FWK is not set | ||
155 | # CONFIG_OMAP_MBOX_FWK is not set | ||
156 | CONFIG_OMAP_MPU_TIMER=y | ||
157 | # CONFIG_OMAP_32K_TIMER is not set | ||
158 | # CONFIG_OMAP_DM_TIMER is not set | ||
159 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
160 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
161 | CONFIG_OMAP_LL_DEBUG_UART3=y | ||
162 | # CONFIG_OMAP_DSP is not set | ||
163 | |||
164 | # | ||
165 | # OMAP Core Type | ||
166 | # | ||
167 | # CONFIG_ARCH_OMAP730 is not set | ||
168 | # CONFIG_ARCH_OMAP15XX is not set | ||
169 | CONFIG_ARCH_OMAP16XX=y | ||
170 | |||
171 | # | ||
172 | # OMAP Board Type | ||
173 | # | ||
174 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
175 | # CONFIG_MACH_OMAP_H2 is not set | ||
176 | # CONFIG_MACH_OMAP_H3 is not set | ||
177 | # CONFIG_MACH_OMAP_OSK is not set | ||
178 | # CONFIG_MACH_NOKIA770 is not set | ||
179 | CONFIG_MACH_OMAP_GENERIC=y | ||
180 | |||
181 | # | ||
182 | # OMAP CPU Speed | ||
183 | # | ||
184 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
185 | # CONFIG_OMAP_ARM_216MHZ is not set | ||
186 | CONFIG_OMAP_ARM_192MHZ=y | ||
187 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
188 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
189 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
190 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
191 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
192 | |||
193 | # | ||
194 | # Boot options | ||
195 | # | ||
196 | |||
197 | # | ||
198 | # Power management | ||
199 | # | ||
200 | |||
201 | # | ||
202 | # Processor Type | ||
203 | # | ||
204 | CONFIG_CPU_32=y | ||
205 | CONFIG_CPU_ARM926T=y | ||
206 | CONFIG_CPU_32v5=y | ||
207 | CONFIG_CPU_ABRT_EV5TJ=y | ||
208 | CONFIG_CPU_PABRT_NOIFAR=y | ||
209 | CONFIG_CPU_CACHE_VIVT=y | ||
210 | CONFIG_CPU_COPY_V4WB=y | ||
211 | CONFIG_CPU_TLB_V4WBI=y | ||
212 | CONFIG_CPU_CP15=y | ||
213 | CONFIG_CPU_CP15_MMU=y | ||
214 | |||
215 | # | ||
216 | # Processor Features | ||
217 | # | ||
218 | # CONFIG_ARM_THUMB is not set | ||
219 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
220 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
221 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
222 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
223 | # CONFIG_OUTER_CACHE is not set | ||
224 | |||
225 | # | ||
226 | # Bus support | ||
227 | # | ||
228 | # CONFIG_PCI_SYSCALL is not set | ||
229 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
230 | |||
231 | # | ||
232 | # PCCARD (PCMCIA/CardBus) support | ||
233 | # | ||
234 | # CONFIG_PCCARD is not set | ||
235 | |||
236 | # | ||
237 | # Kernel Features | ||
238 | # | ||
239 | # CONFIG_TICK_ONESHOT is not set | ||
240 | # CONFIG_NO_HZ is not set | ||
241 | # CONFIG_HIGH_RES_TIMERS is not set | ||
242 | # CONFIG_PREEMPT is not set | ||
243 | CONFIG_HZ=100 | ||
244 | # CONFIG_AEABI is not set | ||
245 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
246 | CONFIG_SELECT_MEMORY_MODEL=y | ||
247 | CONFIG_FLATMEM_MANUAL=y | ||
248 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
249 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
250 | CONFIG_FLATMEM=y | ||
251 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
252 | # CONFIG_SPARSEMEM_STATIC is not set | ||
253 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
254 | # CONFIG_RESOURCES_64BIT is not set | ||
255 | CONFIG_ZONE_DMA_FLAG=1 | ||
256 | CONFIG_BOUNCE=y | ||
257 | CONFIG_VIRT_TO_BUS=y | ||
258 | # CONFIG_LEDS is not set | ||
259 | CONFIG_ALIGNMENT_TRAP=y | ||
260 | |||
261 | # | ||
262 | # Boot options | ||
263 | # | ||
264 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
265 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
266 | CONFIG_CMDLINE="mem=64M console=tty0 console=ttyS2,115200 root=0801" | ||
267 | # CONFIG_XIP_KERNEL is not set | ||
268 | # CONFIG_KEXEC is not set | ||
269 | |||
270 | # | ||
271 | # CPU Frequency scaling | ||
272 | # | ||
273 | # CONFIG_CPU_FREQ is not set | ||
274 | |||
275 | # | ||
276 | # Floating point emulation | ||
277 | # | ||
278 | |||
279 | # | ||
280 | # At least one emulation must be selected | ||
281 | # | ||
282 | CONFIG_FPE_NWFPE=y | ||
283 | # CONFIG_FPE_NWFPE_XP is not set | ||
284 | # CONFIG_FPE_FASTFPE is not set | ||
285 | # CONFIG_VFP is not set | ||
286 | |||
287 | # | ||
288 | # Userspace binary formats | ||
289 | # | ||
290 | CONFIG_BINFMT_ELF=y | ||
291 | # CONFIG_BINFMT_AOUT is not set | ||
292 | # CONFIG_BINFMT_MISC is not set | ||
293 | CONFIG_ARTHUR=y | ||
294 | |||
295 | # | ||
296 | # Power management options | ||
297 | # | ||
298 | CONFIG_PM=y | ||
299 | # CONFIG_PM_LEGACY is not set | ||
300 | # CONFIG_PM_DEBUG is not set | ||
301 | CONFIG_PM_SLEEP=y | ||
302 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
303 | CONFIG_SUSPEND=y | ||
304 | # CONFIG_APM_EMULATION is not set | ||
305 | |||
306 | # | ||
307 | # Networking | ||
308 | # | ||
309 | CONFIG_NET=y | ||
310 | |||
311 | # | ||
312 | # Networking options | ||
313 | # | ||
314 | CONFIG_PACKET=y | ||
315 | # CONFIG_PACKET_MMAP is not set | ||
316 | CONFIG_UNIX=y | ||
317 | CONFIG_XFRM=y | ||
318 | # CONFIG_XFRM_USER is not set | ||
319 | # CONFIG_XFRM_SUB_POLICY is not set | ||
320 | # CONFIG_XFRM_MIGRATE is not set | ||
321 | # CONFIG_NET_KEY is not set | ||
322 | CONFIG_INET=y | ||
323 | CONFIG_IP_MULTICAST=y | ||
324 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
325 | CONFIG_IP_FIB_HASH=y | ||
326 | CONFIG_IP_PNP=y | ||
327 | CONFIG_IP_PNP_DHCP=y | ||
328 | CONFIG_IP_PNP_BOOTP=y | ||
329 | # CONFIG_IP_PNP_RARP is not set | ||
330 | # CONFIG_NET_IPIP is not set | ||
331 | # CONFIG_NET_IPGRE is not set | ||
332 | # CONFIG_IP_MROUTE is not set | ||
333 | # CONFIG_ARPD is not set | ||
334 | # CONFIG_SYN_COOKIES is not set | ||
335 | # CONFIG_INET_AH is not set | ||
336 | # CONFIG_INET_ESP is not set | ||
337 | # CONFIG_INET_IPCOMP is not set | ||
338 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
339 | # CONFIG_INET_TUNNEL is not set | ||
340 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
341 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
342 | CONFIG_INET_XFRM_MODE_BEET=y | ||
343 | CONFIG_INET_DIAG=y | ||
344 | CONFIG_INET_TCP_DIAG=y | ||
345 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
346 | CONFIG_TCP_CONG_CUBIC=y | ||
347 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
348 | # CONFIG_TCP_MD5SIG is not set | ||
349 | # CONFIG_IPV6 is not set | ||
350 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
351 | # CONFIG_INET6_TUNNEL is not set | ||
352 | # CONFIG_NETLABEL is not set | ||
353 | # CONFIG_NETWORK_SECMARK is not set | ||
354 | # CONFIG_NETFILTER is not set | ||
355 | # CONFIG_IP_DCCP is not set | ||
356 | # CONFIG_IP_SCTP is not set | ||
357 | # CONFIG_TIPC is not set | ||
358 | # CONFIG_ATM is not set | ||
359 | # CONFIG_BRIDGE is not set | ||
360 | # CONFIG_VLAN_8021Q is not set | ||
361 | # CONFIG_DECNET is not set | ||
362 | # CONFIG_LLC2 is not set | ||
363 | # CONFIG_IPX is not set | ||
364 | # CONFIG_ATALK is not set | ||
365 | # CONFIG_X25 is not set | ||
366 | # CONFIG_LAPB is not set | ||
367 | # CONFIG_ECONET is not set | ||
368 | # CONFIG_WAN_ROUTER is not set | ||
369 | |||
370 | # | ||
371 | # QoS and/or fair queueing | ||
372 | # | ||
373 | # CONFIG_NET_SCHED is not set | ||
374 | |||
375 | # | ||
376 | # Network testing | ||
377 | # | ||
378 | # CONFIG_NET_PKTGEN is not set | ||
379 | # CONFIG_HAMRADIO is not set | ||
380 | # CONFIG_IRDA is not set | ||
381 | # CONFIG_BT is not set | ||
382 | # CONFIG_AF_RXRPC is not set | ||
383 | |||
384 | # | ||
385 | # Wireless | ||
386 | # | ||
387 | # CONFIG_CFG80211 is not set | ||
388 | # CONFIG_WIRELESS_EXT is not set | ||
389 | # CONFIG_MAC80211 is not set | ||
390 | # CONFIG_IEEE80211 is not set | ||
391 | # CONFIG_RFKILL is not set | ||
392 | # CONFIG_NET_9P is not set | ||
393 | |||
394 | # | ||
395 | # Device Drivers | ||
396 | # | ||
397 | |||
398 | # | ||
399 | # Generic Driver Options | ||
400 | # | ||
401 | CONFIG_STANDALONE=y | ||
402 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
403 | # CONFIG_FW_LOADER is not set | ||
404 | # CONFIG_DEBUG_DRIVER is not set | ||
405 | # CONFIG_DEBUG_DEVRES is not set | ||
406 | # CONFIG_SYS_HYPERVISOR is not set | ||
407 | # CONFIG_CONNECTOR is not set | ||
408 | # CONFIG_MTD is not set | ||
409 | # CONFIG_PARPORT is not set | ||
410 | CONFIG_BLK_DEV=y | ||
411 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
412 | CONFIG_BLK_DEV_LOOP=y | ||
413 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
414 | # CONFIG_BLK_DEV_NBD is not set | ||
415 | # CONFIG_BLK_DEV_UB is not set | ||
416 | CONFIG_BLK_DEV_RAM=y | ||
417 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
418 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
419 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
420 | # CONFIG_CDROM_PKTCDVD is not set | ||
421 | # CONFIG_ATA_OVER_ETH is not set | ||
422 | |||
423 | # | ||
424 | # SCSI device support | ||
425 | # | ||
426 | # CONFIG_RAID_ATTRS is not set | ||
427 | CONFIG_SCSI=y | ||
428 | CONFIG_SCSI_DMA=y | ||
429 | # CONFIG_SCSI_TGT is not set | ||
430 | # CONFIG_SCSI_NETLINK is not set | ||
431 | CONFIG_SCSI_PROC_FS=y | ||
432 | |||
433 | # | ||
434 | # SCSI support type (disk, tape, CD-ROM) | ||
435 | # | ||
436 | CONFIG_BLK_DEV_SD=y | ||
437 | # CONFIG_CHR_DEV_ST is not set | ||
438 | # CONFIG_CHR_DEV_OSST is not set | ||
439 | # CONFIG_BLK_DEV_SR is not set | ||
440 | # CONFIG_CHR_DEV_SG is not set | ||
441 | # CONFIG_CHR_DEV_SCH is not set | ||
442 | |||
443 | # | ||
444 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
445 | # | ||
446 | # CONFIG_SCSI_MULTI_LUN is not set | ||
447 | # CONFIG_SCSI_CONSTANTS is not set | ||
448 | # CONFIG_SCSI_LOGGING is not set | ||
449 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
450 | |||
451 | # | ||
452 | # SCSI Transports | ||
453 | # | ||
454 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
455 | # CONFIG_SCSI_FC_ATTRS is not set | ||
456 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
457 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
458 | CONFIG_SCSI_LOWLEVEL=y | ||
459 | # CONFIG_ISCSI_TCP is not set | ||
460 | # CONFIG_SCSI_DEBUG is not set | ||
461 | # CONFIG_ATA is not set | ||
462 | # CONFIG_MD is not set | ||
463 | CONFIG_NETDEVICES=y | ||
464 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
465 | # CONFIG_DUMMY is not set | ||
466 | # CONFIG_BONDING is not set | ||
467 | # CONFIG_MACVLAN is not set | ||
468 | # CONFIG_EQUALIZER is not set | ||
469 | # CONFIG_TUN is not set | ||
470 | # CONFIG_PHYLIB is not set | ||
471 | CONFIG_NET_ETHERNET=y | ||
472 | CONFIG_MII=y | ||
473 | # CONFIG_AX88796 is not set | ||
474 | # CONFIG_SMC91X is not set | ||
475 | # CONFIG_DM9000 is not set | ||
476 | CONFIG_NETDEV_1000=y | ||
477 | CONFIG_NETDEV_10000=y | ||
478 | |||
479 | # | ||
480 | # Wireless LAN | ||
481 | # | ||
482 | # CONFIG_WLAN_PRE80211 is not set | ||
483 | # CONFIG_WLAN_80211 is not set | ||
484 | |||
485 | # | ||
486 | # USB Network Adapters | ||
487 | # | ||
488 | # CONFIG_USB_CATC is not set | ||
489 | # CONFIG_USB_KAWETH is not set | ||
490 | # CONFIG_USB_PEGASUS is not set | ||
491 | # CONFIG_USB_RTL8150 is not set | ||
492 | CONFIG_USB_USBNET_MII=y | ||
493 | CONFIG_USB_USBNET=y | ||
494 | CONFIG_USB_NET_AX8817X=y | ||
495 | CONFIG_USB_NET_CDCETHER=y | ||
496 | # CONFIG_USB_NET_DM9601 is not set | ||
497 | # CONFIG_USB_NET_GL620A is not set | ||
498 | CONFIG_USB_NET_NET1080=y | ||
499 | # CONFIG_USB_NET_PLUSB is not set | ||
500 | # CONFIG_USB_NET_MCS7830 is not set | ||
501 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
502 | CONFIG_USB_NET_CDC_SUBSET=y | ||
503 | CONFIG_USB_ALI_M5632=y | ||
504 | # CONFIG_USB_AN2720 is not set | ||
505 | # CONFIG_USB_BELKIN is not set | ||
506 | # CONFIG_USB_ARMLINUX is not set | ||
507 | # CONFIG_USB_EPSON2888 is not set | ||
508 | # CONFIG_USB_KC2190 is not set | ||
509 | CONFIG_USB_NET_ZAURUS=y | ||
510 | # CONFIG_WAN is not set | ||
511 | CONFIG_PPP=y | ||
512 | # CONFIG_PPP_MULTILINK is not set | ||
513 | # CONFIG_PPP_FILTER is not set | ||
514 | # CONFIG_PPP_ASYNC is not set | ||
515 | # CONFIG_PPP_SYNC_TTY is not set | ||
516 | # CONFIG_PPP_DEFLATE is not set | ||
517 | # CONFIG_PPP_BSDCOMP is not set | ||
518 | # CONFIG_PPP_MPPE is not set | ||
519 | # CONFIG_PPPOE is not set | ||
520 | # CONFIG_PPPOL2TP is not set | ||
521 | # CONFIG_SLIP is not set | ||
522 | CONFIG_SLHC=y | ||
523 | # CONFIG_SHAPER is not set | ||
524 | # CONFIG_NETCONSOLE is not set | ||
525 | # CONFIG_NETPOLL is not set | ||
526 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
527 | # CONFIG_ISDN is not set | ||
528 | |||
529 | # | ||
530 | # Input device support | ||
531 | # | ||
532 | CONFIG_INPUT=y | ||
533 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
534 | # CONFIG_INPUT_POLLDEV is not set | ||
535 | |||
536 | # | ||
537 | # Userland interfaces | ||
538 | # | ||
539 | CONFIG_INPUT_MOUSEDEV=y | ||
540 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
541 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
542 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
543 | # CONFIG_INPUT_JOYDEV is not set | ||
544 | # CONFIG_INPUT_TSDEV is not set | ||
545 | CONFIG_INPUT_EVDEV=y | ||
546 | # CONFIG_INPUT_EVBUG is not set | ||
547 | |||
548 | # | ||
549 | # Input Device Drivers | ||
550 | # | ||
551 | CONFIG_INPUT_KEYBOARD=y | ||
552 | CONFIG_KEYBOARD_ATKBD=y | ||
553 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
554 | # CONFIG_KEYBOARD_LKKBD is not set | ||
555 | # CONFIG_KEYBOARD_XTKBD is not set | ||
556 | # CONFIG_KEYBOARD_NEWTON is not set | ||
557 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
558 | CONFIG_KEYBOARD_OMAP=y | ||
559 | # CONFIG_KEYBOARD_GPIO is not set | ||
560 | # CONFIG_INPUT_MOUSE is not set | ||
561 | # CONFIG_INPUT_JOYSTICK is not set | ||
562 | # CONFIG_INPUT_TABLET is not set | ||
563 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
564 | # CONFIG_INPUT_MISC is not set | ||
565 | |||
566 | # | ||
567 | # Hardware I/O ports | ||
568 | # | ||
569 | CONFIG_SERIO=y | ||
570 | CONFIG_SERIO_SERPORT=y | ||
571 | CONFIG_SERIO_LIBPS2=y | ||
572 | # CONFIG_SERIO_RAW is not set | ||
573 | # CONFIG_GAMEPORT is not set | ||
574 | |||
575 | # | ||
576 | # Character devices | ||
577 | # | ||
578 | CONFIG_VT=y | ||
579 | CONFIG_VT_CONSOLE=y | ||
580 | CONFIG_HW_CONSOLE=y | ||
581 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
582 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
583 | |||
584 | # | ||
585 | # Serial drivers | ||
586 | # | ||
587 | CONFIG_SERIAL_8250=y | ||
588 | CONFIG_SERIAL_8250_CONSOLE=y | ||
589 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
590 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
591 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
592 | |||
593 | # | ||
594 | # Non-8250 serial port support | ||
595 | # | ||
596 | CONFIG_SERIAL_CORE=y | ||
597 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
598 | CONFIG_UNIX98_PTYS=y | ||
599 | CONFIG_LEGACY_PTYS=y | ||
600 | CONFIG_LEGACY_PTY_COUNT=256 | ||
601 | # CONFIG_IPMI_HANDLER is not set | ||
602 | # CONFIG_WATCHDOG is not set | ||
603 | CONFIG_HW_RANDOM=y | ||
604 | CONFIG_HW_RANDOM_OMAP=y | ||
605 | # CONFIG_NVRAM is not set | ||
606 | # CONFIG_R3964 is not set | ||
607 | # CONFIG_RAW_DRIVER is not set | ||
608 | # CONFIG_TCG_TPM is not set | ||
609 | # CONFIG_I2C is not set | ||
610 | |||
611 | # | ||
612 | # SPI support | ||
613 | # | ||
614 | # CONFIG_SPI is not set | ||
615 | # CONFIG_SPI_MASTER is not set | ||
616 | # CONFIG_W1 is not set | ||
617 | CONFIG_HWMON=y | ||
618 | # CONFIG_HWMON_VID is not set | ||
619 | # CONFIG_SENSORS_ABITUGURU is not set | ||
620 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
621 | # CONFIG_SENSORS_F71805F is not set | ||
622 | # CONFIG_SENSORS_IT87 is not set | ||
623 | # CONFIG_SENSORS_PC87360 is not set | ||
624 | # CONFIG_SENSORS_PC87427 is not set | ||
625 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
626 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
627 | # CONFIG_SENSORS_VT1211 is not set | ||
628 | # CONFIG_SENSORS_W83627HF is not set | ||
629 | # CONFIG_SENSORS_W83627EHF is not set | ||
630 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
631 | CONFIG_MISC_DEVICES=y | ||
632 | # CONFIG_EEPROM_93CX6 is not set | ||
633 | |||
634 | # | ||
635 | # Multifunction device drivers | ||
636 | # | ||
637 | # CONFIG_MFD_SM501 is not set | ||
638 | # CONFIG_NEW_LEDS is not set | ||
639 | |||
640 | # | ||
641 | # Multimedia devices | ||
642 | # | ||
643 | # CONFIG_VIDEO_DEV is not set | ||
644 | # CONFIG_DVB_CORE is not set | ||
645 | CONFIG_DAB=y | ||
646 | # CONFIG_USB_DABUSB is not set | ||
647 | |||
648 | # | ||
649 | # Graphics support | ||
650 | # | ||
651 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
652 | |||
653 | # | ||
654 | # Display device support | ||
655 | # | ||
656 | # CONFIG_DISPLAY_SUPPORT is not set | ||
657 | # CONFIG_VGASTATE is not set | ||
658 | CONFIG_VIDEO_OUTPUT_CONTROL=y | ||
659 | # CONFIG_FB is not set | ||
660 | |||
661 | # | ||
662 | # Console display driver support | ||
663 | # | ||
664 | # CONFIG_VGA_CONSOLE is not set | ||
665 | CONFIG_DUMMY_CONSOLE=y | ||
666 | |||
667 | # | ||
668 | # Sound | ||
669 | # | ||
670 | # CONFIG_SOUND is not set | ||
671 | CONFIG_HID_SUPPORT=y | ||
672 | CONFIG_HID=y | ||
673 | CONFIG_HID_DEBUG=y | ||
674 | |||
675 | # | ||
676 | # USB Input Devices | ||
677 | # | ||
678 | CONFIG_USB_HID=y | ||
679 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
680 | # CONFIG_HID_FF is not set | ||
681 | # CONFIG_USB_HIDDEV is not set | ||
682 | CONFIG_USB_SUPPORT=y | ||
683 | CONFIG_USB_ARCH_HAS_HCD=y | ||
684 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
685 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
686 | CONFIG_USB=y | ||
687 | CONFIG_USB_DEBUG=y | ||
688 | |||
689 | # | ||
690 | # Miscellaneous USB options | ||
691 | # | ||
692 | CONFIG_USB_DEVICEFS=y | ||
693 | CONFIG_USB_DEVICE_CLASS=y | ||
694 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
695 | # CONFIG_USB_SUSPEND is not set | ||
696 | # CONFIG_USB_PERSIST is not set | ||
697 | # CONFIG_USB_OTG is not set | ||
698 | |||
699 | # | ||
700 | # USB Host Controller Drivers | ||
701 | # | ||
702 | # CONFIG_USB_ISP116X_HCD is not set | ||
703 | CONFIG_USB_OHCI_HCD=y | ||
704 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
705 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
706 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
707 | # CONFIG_USB_SL811_HCD is not set | ||
708 | # CONFIG_USB_R8A66597_HCD is not set | ||
709 | # CONFIG_USB_MUSB_HDRC is not set | ||
710 | |||
711 | # | ||
712 | # USB Device Class drivers | ||
713 | # | ||
714 | # CONFIG_USB_ACM is not set | ||
715 | # CONFIG_USB_PRINTER is not set | ||
716 | |||
717 | # | ||
718 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
719 | # | ||
720 | |||
721 | # | ||
722 | # may also be needed; see USB_STORAGE Help for more information | ||
723 | # | ||
724 | CONFIG_USB_STORAGE=y | ||
725 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
726 | # CONFIG_USB_STORAGE_DATAFAB is not set | ||
727 | # CONFIG_USB_STORAGE_FREECOM is not set | ||
728 | # CONFIG_USB_STORAGE_DPCM is not set | ||
729 | # CONFIG_USB_STORAGE_USBAT is not set | ||
730 | # CONFIG_USB_STORAGE_SDDR09 is not set | ||
731 | # CONFIG_USB_STORAGE_SDDR55 is not set | ||
732 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | ||
733 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
734 | # CONFIG_USB_STORAGE_KARMA is not set | ||
735 | # CONFIG_USB_LIBUSUAL is not set | ||
736 | |||
737 | # | ||
738 | # USB Imaging devices | ||
739 | # | ||
740 | # CONFIG_USB_MDC800 is not set | ||
741 | # CONFIG_USB_MICROTEK is not set | ||
742 | CONFIG_USB_MON=y | ||
743 | |||
744 | # | ||
745 | # USB port drivers | ||
746 | # | ||
747 | |||
748 | # | ||
749 | # USB Serial Converter support | ||
750 | # | ||
751 | # CONFIG_USB_SERIAL is not set | ||
752 | |||
753 | # | ||
754 | # USB Miscellaneous drivers | ||
755 | # | ||
756 | # CONFIG_USB_EMI62 is not set | ||
757 | # CONFIG_USB_EMI26 is not set | ||
758 | # CONFIG_USB_ADUTUX is not set | ||
759 | # CONFIG_USB_AUERSWALD is not set | ||
760 | # CONFIG_USB_RIO500 is not set | ||
761 | # CONFIG_USB_LEGOTOWER is not set | ||
762 | # CONFIG_USB_LCD is not set | ||
763 | # CONFIG_USB_BERRY_CHARGE is not set | ||
764 | # CONFIG_USB_LED is not set | ||
765 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
766 | # CONFIG_USB_CYTHERM is not set | ||
767 | # CONFIG_USB_PHIDGET is not set | ||
768 | # CONFIG_USB_IDMOUSE is not set | ||
769 | # CONFIG_USB_FTDI_ELAN is not set | ||
770 | # CONFIG_USB_APPLEDISPLAY is not set | ||
771 | # CONFIG_USB_LD is not set | ||
772 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
773 | # CONFIG_USB_IOWARRIOR is not set | ||
774 | # CONFIG_USB_TEST is not set | ||
775 | |||
776 | # | ||
777 | # USB DSL modem support | ||
778 | # | ||
779 | |||
780 | # | ||
781 | # USB Gadget Support | ||
782 | # | ||
783 | # CONFIG_USB_GADGET is not set | ||
784 | CONFIG_MMC=y | ||
785 | # CONFIG_MMC_DEBUG is not set | ||
786 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
787 | |||
788 | # | ||
789 | # MMC/SD Card Drivers | ||
790 | # | ||
791 | CONFIG_MMC_BLOCK=y | ||
792 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
793 | |||
794 | # | ||
795 | # MMC/SD Host Controller Drivers | ||
796 | # | ||
797 | CONFIG_MMC_OMAP=y | ||
798 | CONFIG_RTC_LIB=y | ||
799 | # CONFIG_RTC_CLASS is not set | ||
800 | |||
801 | # | ||
802 | # DMA Engine support | ||
803 | # | ||
804 | # CONFIG_DMA_ENGINE is not set | ||
805 | |||
806 | # | ||
807 | # DMA Clients | ||
808 | # | ||
809 | |||
810 | # | ||
811 | # DMA Devices | ||
812 | # | ||
813 | |||
814 | # | ||
815 | # CBUS support | ||
816 | # | ||
817 | # CONFIG_CBUS is not set | ||
818 | |||
819 | # | ||
820 | # File systems | ||
821 | # | ||
822 | CONFIG_EXT2_FS=y | ||
823 | # CONFIG_EXT2_FS_XATTR is not set | ||
824 | # CONFIG_EXT2_FS_XIP is not set | ||
825 | CONFIG_EXT3_FS=y | ||
826 | CONFIG_EXT3_FS_XATTR=y | ||
827 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
828 | # CONFIG_EXT3_FS_SECURITY is not set | ||
829 | # CONFIG_EXT4DEV_FS is not set | ||
830 | CONFIG_JBD=y | ||
831 | # CONFIG_JBD_DEBUG is not set | ||
832 | CONFIG_FS_MBCACHE=y | ||
833 | # CONFIG_REISERFS_FS is not set | ||
834 | # CONFIG_JFS_FS is not set | ||
835 | # CONFIG_FS_POSIX_ACL is not set | ||
836 | # CONFIG_XFS_FS is not set | ||
837 | # CONFIG_GFS2_FS is not set | ||
838 | # CONFIG_OCFS2_FS is not set | ||
839 | # CONFIG_MINIX_FS is not set | ||
840 | # CONFIG_ROMFS_FS is not set | ||
841 | CONFIG_INOTIFY=y | ||
842 | CONFIG_INOTIFY_USER=y | ||
843 | # CONFIG_QUOTA is not set | ||
844 | CONFIG_DNOTIFY=y | ||
845 | # CONFIG_AUTOFS_FS is not set | ||
846 | # CONFIG_AUTOFS4_FS is not set | ||
847 | # CONFIG_FUSE_FS is not set | ||
848 | |||
849 | # | ||
850 | # CD-ROM/DVD Filesystems | ||
851 | # | ||
852 | # CONFIG_ISO9660_FS is not set | ||
853 | # CONFIG_UDF_FS is not set | ||
854 | |||
855 | # | ||
856 | # DOS/FAT/NT Filesystems | ||
857 | # | ||
858 | # CONFIG_MSDOS_FS is not set | ||
859 | # CONFIG_VFAT_FS is not set | ||
860 | # CONFIG_NTFS_FS is not set | ||
861 | |||
862 | # | ||
863 | # Pseudo filesystems | ||
864 | # | ||
865 | CONFIG_PROC_FS=y | ||
866 | CONFIG_PROC_SYSCTL=y | ||
867 | CONFIG_SYSFS=y | ||
868 | CONFIG_TMPFS=y | ||
869 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
870 | # CONFIG_HUGETLB_PAGE is not set | ||
871 | CONFIG_RAMFS=y | ||
872 | # CONFIG_CONFIGFS_FS is not set | ||
873 | |||
874 | # | ||
875 | # Miscellaneous filesystems | ||
876 | # | ||
877 | # CONFIG_ADFS_FS is not set | ||
878 | # CONFIG_AFFS_FS is not set | ||
879 | # CONFIG_HFS_FS is not set | ||
880 | # CONFIG_HFSPLUS_FS is not set | ||
881 | # CONFIG_BEFS_FS is not set | ||
882 | # CONFIG_BFS_FS is not set | ||
883 | # CONFIG_EFS_FS is not set | ||
884 | # CONFIG_CRAMFS is not set | ||
885 | # CONFIG_VXFS_FS is not set | ||
886 | # CONFIG_HPFS_FS is not set | ||
887 | # CONFIG_QNX4FS_FS is not set | ||
888 | # CONFIG_SYSV_FS is not set | ||
889 | # CONFIG_UFS_FS is not set | ||
890 | |||
891 | # | ||
892 | # Network File Systems | ||
893 | # | ||
894 | CONFIG_NFS_FS=y | ||
895 | CONFIG_NFS_V3=y | ||
896 | # CONFIG_NFS_V3_ACL is not set | ||
897 | CONFIG_NFS_V4=y | ||
898 | # CONFIG_NFS_DIRECTIO is not set | ||
899 | # CONFIG_NFSD is not set | ||
900 | # CONFIG_ROOT_NFS is not set | ||
901 | CONFIG_LOCKD=y | ||
902 | CONFIG_LOCKD_V4=y | ||
903 | CONFIG_NFS_COMMON=y | ||
904 | CONFIG_SUNRPC=y | ||
905 | CONFIG_SUNRPC_GSS=y | ||
906 | # CONFIG_SUNRPC_BIND34 is not set | ||
907 | CONFIG_RPCSEC_GSS_KRB5=y | ||
908 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
909 | # CONFIG_SMB_FS is not set | ||
910 | # CONFIG_CIFS is not set | ||
911 | # CONFIG_NCP_FS is not set | ||
912 | # CONFIG_CODA_FS is not set | ||
913 | # CONFIG_AFS_FS is not set | ||
914 | |||
915 | # | ||
916 | # Partition Types | ||
917 | # | ||
918 | CONFIG_PARTITION_ADVANCED=y | ||
919 | # CONFIG_ACORN_PARTITION is not set | ||
920 | # CONFIG_OSF_PARTITION is not set | ||
921 | # CONFIG_AMIGA_PARTITION is not set | ||
922 | # CONFIG_ATARI_PARTITION is not set | ||
923 | # CONFIG_MAC_PARTITION is not set | ||
924 | CONFIG_MSDOS_PARTITION=y | ||
925 | # CONFIG_BSD_DISKLABEL is not set | ||
926 | # CONFIG_MINIX_SUBPARTITION is not set | ||
927 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
928 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
929 | # CONFIG_LDM_PARTITION is not set | ||
930 | # CONFIG_SGI_PARTITION is not set | ||
931 | # CONFIG_ULTRIX_PARTITION is not set | ||
932 | # CONFIG_SUN_PARTITION is not set | ||
933 | # CONFIG_KARMA_PARTITION is not set | ||
934 | # CONFIG_EFI_PARTITION is not set | ||
935 | # CONFIG_SYSV68_PARTITION is not set | ||
936 | |||
937 | # | ||
938 | # Native Language Support | ||
939 | # | ||
940 | CONFIG_NLS=y | ||
941 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
942 | CONFIG_NLS_CODEPAGE_437=y | ||
943 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
944 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
945 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
946 | CONFIG_NLS_CODEPAGE_852=y | ||
947 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
948 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
949 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
950 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
951 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
952 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
953 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
954 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
955 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
956 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
957 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
958 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
959 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
960 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
961 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
962 | # CONFIG_NLS_ISO8859_8 is not set | ||
963 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
964 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
965 | # CONFIG_NLS_ASCII is not set | ||
966 | CONFIG_NLS_ISO8859_1=y | ||
967 | # CONFIG_NLS_ISO8859_2 is not set | ||
968 | # CONFIG_NLS_ISO8859_3 is not set | ||
969 | # CONFIG_NLS_ISO8859_4 is not set | ||
970 | # CONFIG_NLS_ISO8859_5 is not set | ||
971 | # CONFIG_NLS_ISO8859_6 is not set | ||
972 | # CONFIG_NLS_ISO8859_7 is not set | ||
973 | # CONFIG_NLS_ISO8859_9 is not set | ||
974 | # CONFIG_NLS_ISO8859_13 is not set | ||
975 | # CONFIG_NLS_ISO8859_14 is not set | ||
976 | CONFIG_NLS_ISO8859_15=y | ||
977 | # CONFIG_NLS_KOI8_R is not set | ||
978 | # CONFIG_NLS_KOI8_U is not set | ||
979 | # CONFIG_NLS_UTF8 is not set | ||
980 | |||
981 | # | ||
982 | # Distributed Lock Manager | ||
983 | # | ||
984 | # CONFIG_DLM is not set | ||
985 | |||
986 | # | ||
987 | # Profiling support | ||
988 | # | ||
989 | # CONFIG_PROFILING is not set | ||
990 | |||
991 | # | ||
992 | # Kernel hacking | ||
993 | # | ||
994 | # CONFIG_PRINTK_TIME is not set | ||
995 | CONFIG_ENABLE_MUST_CHECK=y | ||
996 | CONFIG_MAGIC_SYSRQ=y | ||
997 | # CONFIG_UNUSED_SYMBOLS is not set | ||
998 | # CONFIG_DEBUG_FS is not set | ||
999 | # CONFIG_HEADERS_CHECK is not set | ||
1000 | CONFIG_DEBUG_KERNEL=y | ||
1001 | # CONFIG_DEBUG_SHIRQ is not set | ||
1002 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1003 | CONFIG_SCHED_DEBUG=y | ||
1004 | # CONFIG_SCHEDSTATS is not set | ||
1005 | # CONFIG_TIMER_STATS is not set | ||
1006 | # CONFIG_SLUB_DEBUG_ON is not set | ||
1007 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1008 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1009 | CONFIG_DEBUG_SPINLOCK=y | ||
1010 | # CONFIG_DEBUG_MUTEXES is not set | ||
1011 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1012 | # CONFIG_PROVE_LOCKING is not set | ||
1013 | # CONFIG_LOCK_STAT is not set | ||
1014 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1015 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1016 | # CONFIG_DEBUG_KOBJECT is not set | ||
1017 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1018 | # CONFIG_DEBUG_INFO is not set | ||
1019 | # CONFIG_DEBUG_VM is not set | ||
1020 | # CONFIG_DEBUG_LIST is not set | ||
1021 | CONFIG_FRAME_POINTER=y | ||
1022 | CONFIG_FORCED_INLINING=y | ||
1023 | # CONFIG_FAULT_INJECTION is not set | ||
1024 | # CONFIG_DEBUG_USER is not set | ||
1025 | CONFIG_DEBUG_ERRORS=y | ||
1026 | # CONFIG_DEBUG_LL is not set | ||
1027 | |||
1028 | # | ||
1029 | # Security options | ||
1030 | # | ||
1031 | # CONFIG_KEYS is not set | ||
1032 | CONFIG_SECURITY=y | ||
1033 | # CONFIG_SECURITY_NETWORK is not set | ||
1034 | CONFIG_SECURITY_CAPABILITIES=y | ||
1035 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
1036 | # CONFIG_SECURITY_LOWMEM is not set | ||
1037 | CONFIG_CRYPTO=y | ||
1038 | CONFIG_CRYPTO_ALGAPI=y | ||
1039 | CONFIG_CRYPTO_BLKCIPHER=y | ||
1040 | CONFIG_CRYPTO_MANAGER=y | ||
1041 | # CONFIG_CRYPTO_HMAC is not set | ||
1042 | # CONFIG_CRYPTO_XCBC is not set | ||
1043 | # CONFIG_CRYPTO_NULL is not set | ||
1044 | # CONFIG_CRYPTO_MD4 is not set | ||
1045 | CONFIG_CRYPTO_MD5=y | ||
1046 | # CONFIG_CRYPTO_SHA1 is not set | ||
1047 | # CONFIG_CRYPTO_SHA256 is not set | ||
1048 | # CONFIG_CRYPTO_SHA512 is not set | ||
1049 | # CONFIG_CRYPTO_WP512 is not set | ||
1050 | # CONFIG_CRYPTO_TGR192 is not set | ||
1051 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1052 | CONFIG_CRYPTO_ECB=y | ||
1053 | CONFIG_CRYPTO_CBC=y | ||
1054 | CONFIG_CRYPTO_PCBC=y | ||
1055 | # CONFIG_CRYPTO_LRW is not set | ||
1056 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1057 | CONFIG_CRYPTO_DES=y | ||
1058 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1059 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1060 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1061 | # CONFIG_CRYPTO_SERPENT is not set | ||
1062 | # CONFIG_CRYPTO_AES is not set | ||
1063 | # CONFIG_CRYPTO_CAST5 is not set | ||
1064 | # CONFIG_CRYPTO_CAST6 is not set | ||
1065 | # CONFIG_CRYPTO_TEA is not set | ||
1066 | # CONFIG_CRYPTO_ARC4 is not set | ||
1067 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1068 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1069 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1070 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1071 | # CONFIG_CRYPTO_CRC32C is not set | ||
1072 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1073 | CONFIG_CRYPTO_HW=y | ||
1074 | |||
1075 | # | ||
1076 | # Library routines | ||
1077 | # | ||
1078 | CONFIG_BITREVERSE=y | ||
1079 | # CONFIG_CRC_CCITT is not set | ||
1080 | # CONFIG_CRC16 is not set | ||
1081 | # CONFIG_CRC_ITU_T is not set | ||
1082 | CONFIG_CRC32=y | ||
1083 | # CONFIG_CRC7 is not set | ||
1084 | # CONFIG_LIBCRC32C is not set | ||
1085 | CONFIG_PLIST=y | ||
1086 | CONFIG_HAS_IOMEM=y | ||
1087 | CONFIG_HAS_IOPORT=y | ||
1088 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_generic_2420_defconfig b/arch/arm/configs/omap_generic_2420_defconfig new file mode 100644 index 000000000000..cf4073b47aaa --- /dev/null +++ b/arch/arm/configs/omap_generic_2420_defconfig | |||
@@ -0,0 +1,655 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 11:44:48 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
34 | CONFIG_LOCALVERSION="" | ||
35 | CONFIG_LOCALVERSION_AUTO=y | ||
36 | CONFIG_SWAP=y | ||
37 | CONFIG_SYSVIPC=y | ||
38 | CONFIG_SYSVIPC_SYSCTL=y | ||
39 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
40 | # CONFIG_USER_NS is not set | ||
41 | # CONFIG_IKCONFIG is not set | ||
42 | CONFIG_LOG_BUF_SHIFT=14 | ||
43 | CONFIG_SYSFS_DEPRECATED=y | ||
44 | # CONFIG_RELAY is not set | ||
45 | CONFIG_BLK_DEV_INITRD=y | ||
46 | CONFIG_INITRAMFS_SOURCE="" | ||
47 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
48 | CONFIG_SYSCTL=y | ||
49 | # CONFIG_EMBEDDED is not set | ||
50 | CONFIG_UID16=y | ||
51 | CONFIG_SYSCTL_SYSCALL=y | ||
52 | CONFIG_KALLSYMS=y | ||
53 | # CONFIG_KALLSYMS_ALL is not set | ||
54 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
55 | CONFIG_HOTPLUG=y | ||
56 | CONFIG_PRINTK=y | ||
57 | CONFIG_BUG=y | ||
58 | CONFIG_ELF_CORE=y | ||
59 | CONFIG_BASE_FULL=y | ||
60 | CONFIG_FUTEX=y | ||
61 | CONFIG_ANON_INODES=y | ||
62 | CONFIG_EPOLL=y | ||
63 | CONFIG_SIGNALFD=y | ||
64 | CONFIG_TIMERFD=y | ||
65 | CONFIG_EVENTFD=y | ||
66 | CONFIG_SHMEM=y | ||
67 | CONFIG_VM_EVENT_COUNTERS=y | ||
68 | CONFIG_SLUB_DEBUG=y | ||
69 | # CONFIG_SLAB is not set | ||
70 | CONFIG_SLUB=y | ||
71 | # CONFIG_SLOB is not set | ||
72 | CONFIG_RT_MUTEXES=y | ||
73 | # CONFIG_TINY_SHMEM is not set | ||
74 | CONFIG_BASE_SMALL=0 | ||
75 | CONFIG_MODULES=y | ||
76 | CONFIG_MODULE_UNLOAD=y | ||
77 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
78 | # CONFIG_MODVERSIONS is not set | ||
79 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
80 | # CONFIG_KMOD is not set | ||
81 | CONFIG_BLOCK=y | ||
82 | # CONFIG_LBD is not set | ||
83 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
84 | # CONFIG_LSF is not set | ||
85 | # CONFIG_BLK_DEV_BSG is not set | ||
86 | |||
87 | # | ||
88 | # IO Schedulers | ||
89 | # | ||
90 | CONFIG_IOSCHED_NOOP=y | ||
91 | CONFIG_IOSCHED_AS=y | ||
92 | CONFIG_IOSCHED_DEADLINE=y | ||
93 | CONFIG_IOSCHED_CFQ=y | ||
94 | # CONFIG_DEFAULT_AS is not set | ||
95 | # CONFIG_DEFAULT_DEADLINE is not set | ||
96 | CONFIG_DEFAULT_CFQ=y | ||
97 | # CONFIG_DEFAULT_NOOP is not set | ||
98 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
99 | |||
100 | # | ||
101 | # System Type | ||
102 | # | ||
103 | # CONFIG_ARCH_AAEC2000 is not set | ||
104 | # CONFIG_ARCH_INTEGRATOR is not set | ||
105 | # CONFIG_ARCH_REALVIEW is not set | ||
106 | # CONFIG_ARCH_VERSATILE is not set | ||
107 | # CONFIG_ARCH_AT91 is not set | ||
108 | # CONFIG_ARCH_CLPS7500 is not set | ||
109 | # CONFIG_ARCH_CLPS711X is not set | ||
110 | # CONFIG_ARCH_CO285 is not set | ||
111 | # CONFIG_ARCH_EBSA110 is not set | ||
112 | # CONFIG_ARCH_EP93XX is not set | ||
113 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
114 | # CONFIG_ARCH_NETX is not set | ||
115 | # CONFIG_ARCH_H720X is not set | ||
116 | # CONFIG_ARCH_IMX is not set | ||
117 | # CONFIG_ARCH_IOP13XX is not set | ||
118 | # CONFIG_ARCH_IOP32X is not set | ||
119 | # CONFIG_ARCH_IOP33X is not set | ||
120 | # CONFIG_ARCH_IXP23XX is not set | ||
121 | # CONFIG_ARCH_IXP2000 is not set | ||
122 | # CONFIG_ARCH_IXP4XX is not set | ||
123 | # CONFIG_ARCH_L7200 is not set | ||
124 | # CONFIG_ARCH_KS8695 is not set | ||
125 | # CONFIG_ARCH_NS9XXX is not set | ||
126 | # CONFIG_ARCH_MXC is not set | ||
127 | # CONFIG_ARCH_PNX4008 is not set | ||
128 | # CONFIG_ARCH_PXA is not set | ||
129 | # CONFIG_ARCH_RPC is not set | ||
130 | # CONFIG_ARCH_SA1100 is not set | ||
131 | # CONFIG_ARCH_S3C2410 is not set | ||
132 | # CONFIG_ARCH_SHARK is not set | ||
133 | # CONFIG_ARCH_LH7A40X is not set | ||
134 | # CONFIG_ARCH_DAVINCI is not set | ||
135 | CONFIG_ARCH_OMAP=y | ||
136 | |||
137 | # | ||
138 | # TI OMAP Implementations | ||
139 | # | ||
140 | CONFIG_ARCH_OMAP_OTG=y | ||
141 | # CONFIG_ARCH_OMAP1 is not set | ||
142 | CONFIG_ARCH_OMAP2=y | ||
143 | # CONFIG_ARCH_OMAP3 is not set | ||
144 | |||
145 | # | ||
146 | # OMAP Feature Selections | ||
147 | # | ||
148 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
149 | CONFIG_OMAP_BOOT_TAG=y | ||
150 | # CONFIG_OMAP_BOOT_REASON is not set | ||
151 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
153 | # CONFIG_OMAP_MUX is not set | ||
154 | # CONFIG_OMAP_STI is not set | ||
155 | CONFIG_OMAP_MCBSP=y | ||
156 | # CONFIG_OMAP_MMU_FWK is not set | ||
157 | # CONFIG_OMAP_MBOX_FWK is not set | ||
158 | CONFIG_OMAP_MPU_TIMER=y | ||
159 | # CONFIG_OMAP_32K_TIMER is not set | ||
160 | CONFIG_OMAP_DM_TIMER=y | ||
161 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
163 | CONFIG_OMAP_LL_DEBUG_UART3=y | ||
164 | # CONFIG_OMAP_DSP is not set | ||
165 | CONFIG_MACH_OMAP_GENERIC=y | ||
166 | |||
167 | # | ||
168 | # OMAP Core Type | ||
169 | # | ||
170 | CONFIG_ARCH_OMAP24XX=y | ||
171 | CONFIG_ARCH_OMAP2420=y | ||
172 | # CONFIG_ARCH_OMAP2430 is not set | ||
173 | |||
174 | # | ||
175 | # OMAP Board Type | ||
176 | # | ||
177 | # CONFIG_MACH_NOKIA_N800 is not set | ||
178 | # CONFIG_MACH_OMAP_H4 is not set | ||
179 | # CONFIG_MACH_OMAP_APOLLON is not set | ||
180 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
181 | # CONFIG_MACH_OMAP_2430SDP is not set | ||
182 | |||
183 | # | ||
184 | # Boot options | ||
185 | # | ||
186 | |||
187 | # | ||
188 | # Power management | ||
189 | # | ||
190 | |||
191 | # | ||
192 | # Processor Type | ||
193 | # | ||
194 | CONFIG_CPU_32=y | ||
195 | CONFIG_CPU_V6=y | ||
196 | # CONFIG_CPU_32v6K is not set | ||
197 | CONFIG_CPU_32v6=y | ||
198 | CONFIG_CPU_ABRT_EV6=y | ||
199 | CONFIG_CPU_PABRT_NOIFAR=y | ||
200 | CONFIG_CPU_CACHE_V6=y | ||
201 | CONFIG_CPU_CACHE_VIPT=y | ||
202 | CONFIG_CPU_COPY_V6=y | ||
203 | CONFIG_CPU_TLB_V6=y | ||
204 | CONFIG_CPU_HAS_ASID=y | ||
205 | CONFIG_CPU_CP15=y | ||
206 | CONFIG_CPU_CP15_MMU=y | ||
207 | |||
208 | # | ||
209 | # Processor Features | ||
210 | # | ||
211 | CONFIG_ARM_THUMB=y | ||
212 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
213 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
214 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
215 | # CONFIG_OUTER_CACHE is not set | ||
216 | |||
217 | # | ||
218 | # Bus support | ||
219 | # | ||
220 | # CONFIG_PCI_SYSCALL is not set | ||
221 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
222 | |||
223 | # | ||
224 | # PCCARD (PCMCIA/CardBus) support | ||
225 | # | ||
226 | # CONFIG_PCCARD is not set | ||
227 | |||
228 | # | ||
229 | # Kernel Features | ||
230 | # | ||
231 | # CONFIG_TICK_ONESHOT is not set | ||
232 | # CONFIG_NO_HZ is not set | ||
233 | # CONFIG_HIGH_RES_TIMERS is not set | ||
234 | # CONFIG_PREEMPT is not set | ||
235 | CONFIG_HZ=100 | ||
236 | # CONFIG_AEABI is not set | ||
237 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
238 | CONFIG_SELECT_MEMORY_MODEL=y | ||
239 | CONFIG_FLATMEM_MANUAL=y | ||
240 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
241 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
242 | CONFIG_FLATMEM=y | ||
243 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
244 | # CONFIG_SPARSEMEM_STATIC is not set | ||
245 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
246 | # CONFIG_RESOURCES_64BIT is not set | ||
247 | CONFIG_ZONE_DMA_FLAG=1 | ||
248 | CONFIG_BOUNCE=y | ||
249 | CONFIG_VIRT_TO_BUS=y | ||
250 | CONFIG_LEDS=y | ||
251 | CONFIG_ALIGNMENT_TRAP=y | ||
252 | |||
253 | # | ||
254 | # Boot options | ||
255 | # | ||
256 | CONFIG_ZBOOT_ROM_TEXT=0x10C08000 | ||
257 | CONFIG_ZBOOT_ROM_BSS=0x10200000 | ||
258 | # CONFIG_ZBOOT_ROM is not set | ||
259 | CONFIG_CMDLINE="" | ||
260 | # CONFIG_XIP_KERNEL is not set | ||
261 | # CONFIG_KEXEC is not set | ||
262 | |||
263 | # | ||
264 | # CPU Frequency scaling | ||
265 | # | ||
266 | # CONFIG_CPU_FREQ is not set | ||
267 | |||
268 | # | ||
269 | # Floating point emulation | ||
270 | # | ||
271 | |||
272 | # | ||
273 | # At least one emulation must be selected | ||
274 | # | ||
275 | CONFIG_FPE_NWFPE=y | ||
276 | # CONFIG_FPE_NWFPE_XP is not set | ||
277 | # CONFIG_FPE_FASTFPE is not set | ||
278 | # CONFIG_VFP is not set | ||
279 | |||
280 | # | ||
281 | # Userspace binary formats | ||
282 | # | ||
283 | CONFIG_BINFMT_ELF=y | ||
284 | # CONFIG_BINFMT_AOUT is not set | ||
285 | # CONFIG_BINFMT_MISC is not set | ||
286 | # CONFIG_ARTHUR is not set | ||
287 | |||
288 | # | ||
289 | # Power management options | ||
290 | # | ||
291 | # CONFIG_PM is not set | ||
292 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
293 | |||
294 | # | ||
295 | # Networking | ||
296 | # | ||
297 | # CONFIG_NET is not set | ||
298 | |||
299 | # | ||
300 | # Device Drivers | ||
301 | # | ||
302 | |||
303 | # | ||
304 | # Generic Driver Options | ||
305 | # | ||
306 | CONFIG_STANDALONE=y | ||
307 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
308 | CONFIG_FW_LOADER=y | ||
309 | # CONFIG_DEBUG_DRIVER is not set | ||
310 | # CONFIG_DEBUG_DEVRES is not set | ||
311 | # CONFIG_SYS_HYPERVISOR is not set | ||
312 | # CONFIG_MTD is not set | ||
313 | # CONFIG_PARPORT is not set | ||
314 | CONFIG_BLK_DEV=y | ||
315 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
316 | # CONFIG_BLK_DEV_LOOP is not set | ||
317 | CONFIG_BLK_DEV_RAM=y | ||
318 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
319 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
320 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
321 | # CONFIG_CDROM_PKTCDVD is not set | ||
322 | |||
323 | # | ||
324 | # SCSI device support | ||
325 | # | ||
326 | # CONFIG_RAID_ATTRS is not set | ||
327 | # CONFIG_SCSI is not set | ||
328 | # CONFIG_SCSI_DMA is not set | ||
329 | # CONFIG_SCSI_NETLINK is not set | ||
330 | # CONFIG_ATA is not set | ||
331 | # CONFIG_MD is not set | ||
332 | |||
333 | # | ||
334 | # Input device support | ||
335 | # | ||
336 | CONFIG_INPUT=y | ||
337 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
338 | # CONFIG_INPUT_POLLDEV is not set | ||
339 | |||
340 | # | ||
341 | # Userland interfaces | ||
342 | # | ||
343 | CONFIG_INPUT_MOUSEDEV=y | ||
344 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
345 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
346 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
347 | # CONFIG_INPUT_JOYDEV is not set | ||
348 | # CONFIG_INPUT_TSDEV is not set | ||
349 | CONFIG_INPUT_EVDEV=y | ||
350 | # CONFIG_INPUT_EVBUG is not set | ||
351 | |||
352 | # | ||
353 | # Input Device Drivers | ||
354 | # | ||
355 | # CONFIG_INPUT_KEYBOARD is not set | ||
356 | # CONFIG_INPUT_MOUSE is not set | ||
357 | # CONFIG_INPUT_JOYSTICK is not set | ||
358 | # CONFIG_INPUT_TABLET is not set | ||
359 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
360 | # CONFIG_INPUT_MISC is not set | ||
361 | |||
362 | # | ||
363 | # Hardware I/O ports | ||
364 | # | ||
365 | CONFIG_SERIO=y | ||
366 | CONFIG_SERIO_SERPORT=y | ||
367 | # CONFIG_SERIO_RAW is not set | ||
368 | # CONFIG_GAMEPORT is not set | ||
369 | |||
370 | # | ||
371 | # Character devices | ||
372 | # | ||
373 | CONFIG_VT=y | ||
374 | CONFIG_VT_CONSOLE=y | ||
375 | CONFIG_HW_CONSOLE=y | ||
376 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
377 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
378 | |||
379 | # | ||
380 | # Serial drivers | ||
381 | # | ||
382 | CONFIG_SERIAL_8250=y | ||
383 | CONFIG_SERIAL_8250_CONSOLE=y | ||
384 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
385 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
386 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
387 | |||
388 | # | ||
389 | # Non-8250 serial port support | ||
390 | # | ||
391 | CONFIG_SERIAL_CORE=y | ||
392 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
393 | CONFIG_UNIX98_PTYS=y | ||
394 | # CONFIG_LEGACY_PTYS is not set | ||
395 | # CONFIG_IPMI_HANDLER is not set | ||
396 | CONFIG_WATCHDOG=y | ||
397 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
398 | |||
399 | # | ||
400 | # Watchdog Device Drivers | ||
401 | # | ||
402 | # CONFIG_SOFT_WATCHDOG is not set | ||
403 | # CONFIG_OMAP_WATCHDOG is not set | ||
404 | CONFIG_HW_RANDOM=m | ||
405 | CONFIG_HW_RANDOM_OMAP=m | ||
406 | # CONFIG_NVRAM is not set | ||
407 | # CONFIG_R3964 is not set | ||
408 | # CONFIG_RAW_DRIVER is not set | ||
409 | # CONFIG_TCG_TPM is not set | ||
410 | # CONFIG_I2C is not set | ||
411 | |||
412 | # | ||
413 | # SPI support | ||
414 | # | ||
415 | # CONFIG_SPI is not set | ||
416 | # CONFIG_SPI_MASTER is not set | ||
417 | # CONFIG_W1 is not set | ||
418 | CONFIG_HWMON=y | ||
419 | # CONFIG_HWMON_VID is not set | ||
420 | # CONFIG_SENSORS_ABITUGURU is not set | ||
421 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
422 | # CONFIG_SENSORS_F71805F is not set | ||
423 | # CONFIG_SENSORS_IT87 is not set | ||
424 | # CONFIG_SENSORS_PC87360 is not set | ||
425 | # CONFIG_SENSORS_PC87427 is not set | ||
426 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
427 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
428 | # CONFIG_SENSORS_VT1211 is not set | ||
429 | # CONFIG_SENSORS_W83627HF is not set | ||
430 | # CONFIG_SENSORS_W83627EHF is not set | ||
431 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
432 | CONFIG_MISC_DEVICES=y | ||
433 | # CONFIG_EEPROM_93CX6 is not set | ||
434 | |||
435 | # | ||
436 | # Multifunction device drivers | ||
437 | # | ||
438 | # CONFIG_MFD_SM501 is not set | ||
439 | # CONFIG_NEW_LEDS is not set | ||
440 | |||
441 | # | ||
442 | # Multimedia devices | ||
443 | # | ||
444 | # CONFIG_VIDEO_DEV is not set | ||
445 | CONFIG_DAB=y | ||
446 | |||
447 | # | ||
448 | # Graphics support | ||
449 | # | ||
450 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
451 | |||
452 | # | ||
453 | # Display device support | ||
454 | # | ||
455 | # CONFIG_DISPLAY_SUPPORT is not set | ||
456 | # CONFIG_VGASTATE is not set | ||
457 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
458 | # CONFIG_FB is not set | ||
459 | |||
460 | # | ||
461 | # Console display driver support | ||
462 | # | ||
463 | # CONFIG_VGA_CONSOLE is not set | ||
464 | CONFIG_DUMMY_CONSOLE=y | ||
465 | |||
466 | # | ||
467 | # Sound | ||
468 | # | ||
469 | # CONFIG_SOUND is not set | ||
470 | CONFIG_HID_SUPPORT=y | ||
471 | CONFIG_HID=y | ||
472 | CONFIG_HID_DEBUG=y | ||
473 | CONFIG_USB_SUPPORT=y | ||
474 | CONFIG_USB_ARCH_HAS_HCD=y | ||
475 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
476 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
477 | # CONFIG_USB is not set | ||
478 | |||
479 | # | ||
480 | # Enable Host or Gadget support to see Inventra options | ||
481 | # | ||
482 | |||
483 | # | ||
484 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
485 | # | ||
486 | |||
487 | # | ||
488 | # USB Gadget Support | ||
489 | # | ||
490 | # CONFIG_USB_GADGET is not set | ||
491 | # CONFIG_MMC is not set | ||
492 | CONFIG_RTC_LIB=y | ||
493 | # CONFIG_RTC_CLASS is not set | ||
494 | |||
495 | # | ||
496 | # DMA Engine support | ||
497 | # | ||
498 | # CONFIG_DMA_ENGINE is not set | ||
499 | |||
500 | # | ||
501 | # DMA Clients | ||
502 | # | ||
503 | |||
504 | # | ||
505 | # DMA Devices | ||
506 | # | ||
507 | |||
508 | # | ||
509 | # CBUS support | ||
510 | # | ||
511 | # CONFIG_CBUS is not set | ||
512 | |||
513 | # | ||
514 | # File systems | ||
515 | # | ||
516 | CONFIG_EXT2_FS=y | ||
517 | CONFIG_EXT2_FS_XATTR=y | ||
518 | # CONFIG_EXT2_FS_POSIX_ACL is not set | ||
519 | # CONFIG_EXT2_FS_SECURITY is not set | ||
520 | # CONFIG_EXT2_FS_XIP is not set | ||
521 | # CONFIG_EXT3_FS is not set | ||
522 | # CONFIG_EXT4DEV_FS is not set | ||
523 | CONFIG_FS_MBCACHE=y | ||
524 | # CONFIG_REISERFS_FS is not set | ||
525 | # CONFIG_JFS_FS is not set | ||
526 | # CONFIG_FS_POSIX_ACL is not set | ||
527 | # CONFIG_XFS_FS is not set | ||
528 | # CONFIG_GFS2_FS is not set | ||
529 | # CONFIG_MINIX_FS is not set | ||
530 | CONFIG_ROMFS_FS=y | ||
531 | CONFIG_INOTIFY=y | ||
532 | CONFIG_INOTIFY_USER=y | ||
533 | # CONFIG_QUOTA is not set | ||
534 | CONFIG_DNOTIFY=y | ||
535 | # CONFIG_AUTOFS_FS is not set | ||
536 | # CONFIG_AUTOFS4_FS is not set | ||
537 | # CONFIG_FUSE_FS is not set | ||
538 | |||
539 | # | ||
540 | # CD-ROM/DVD Filesystems | ||
541 | # | ||
542 | # CONFIG_ISO9660_FS is not set | ||
543 | # CONFIG_UDF_FS is not set | ||
544 | |||
545 | # | ||
546 | # DOS/FAT/NT Filesystems | ||
547 | # | ||
548 | # CONFIG_MSDOS_FS is not set | ||
549 | # CONFIG_VFAT_FS is not set | ||
550 | # CONFIG_NTFS_FS is not set | ||
551 | |||
552 | # | ||
553 | # Pseudo filesystems | ||
554 | # | ||
555 | CONFIG_PROC_FS=y | ||
556 | CONFIG_PROC_SYSCTL=y | ||
557 | CONFIG_SYSFS=y | ||
558 | # CONFIG_TMPFS is not set | ||
559 | # CONFIG_HUGETLB_PAGE is not set | ||
560 | CONFIG_RAMFS=y | ||
561 | # CONFIG_CONFIGFS_FS is not set | ||
562 | |||
563 | # | ||
564 | # Miscellaneous filesystems | ||
565 | # | ||
566 | # CONFIG_ADFS_FS is not set | ||
567 | # CONFIG_AFFS_FS is not set | ||
568 | # CONFIG_HFS_FS is not set | ||
569 | # CONFIG_HFSPLUS_FS is not set | ||
570 | # CONFIG_BEFS_FS is not set | ||
571 | # CONFIG_BFS_FS is not set | ||
572 | # CONFIG_EFS_FS is not set | ||
573 | # CONFIG_CRAMFS is not set | ||
574 | # CONFIG_VXFS_FS is not set | ||
575 | # CONFIG_HPFS_FS is not set | ||
576 | # CONFIG_QNX4FS_FS is not set | ||
577 | # CONFIG_SYSV_FS is not set | ||
578 | # CONFIG_UFS_FS is not set | ||
579 | |||
580 | # | ||
581 | # Partition Types | ||
582 | # | ||
583 | # CONFIG_PARTITION_ADVANCED is not set | ||
584 | CONFIG_MSDOS_PARTITION=y | ||
585 | |||
586 | # | ||
587 | # Native Language Support | ||
588 | # | ||
589 | # CONFIG_NLS is not set | ||
590 | |||
591 | # | ||
592 | # Profiling support | ||
593 | # | ||
594 | # CONFIG_PROFILING is not set | ||
595 | |||
596 | # | ||
597 | # Kernel hacking | ||
598 | # | ||
599 | # CONFIG_PRINTK_TIME is not set | ||
600 | CONFIG_ENABLE_MUST_CHECK=y | ||
601 | # CONFIG_MAGIC_SYSRQ is not set | ||
602 | # CONFIG_UNUSED_SYMBOLS is not set | ||
603 | # CONFIG_DEBUG_FS is not set | ||
604 | # CONFIG_HEADERS_CHECK is not set | ||
605 | CONFIG_DEBUG_KERNEL=y | ||
606 | # CONFIG_DEBUG_SHIRQ is not set | ||
607 | CONFIG_DETECT_SOFTLOCKUP=y | ||
608 | CONFIG_SCHED_DEBUG=y | ||
609 | # CONFIG_SCHEDSTATS is not set | ||
610 | # CONFIG_TIMER_STATS is not set | ||
611 | # CONFIG_SLUB_DEBUG_ON is not set | ||
612 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
613 | # CONFIG_RT_MUTEX_TESTER is not set | ||
614 | # CONFIG_DEBUG_SPINLOCK is not set | ||
615 | # CONFIG_DEBUG_MUTEXES is not set | ||
616 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
617 | # CONFIG_PROVE_LOCKING is not set | ||
618 | # CONFIG_LOCK_STAT is not set | ||
619 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
620 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
621 | # CONFIG_DEBUG_KOBJECT is not set | ||
622 | CONFIG_DEBUG_BUGVERBOSE=y | ||
623 | CONFIG_DEBUG_INFO=y | ||
624 | # CONFIG_DEBUG_VM is not set | ||
625 | # CONFIG_DEBUG_LIST is not set | ||
626 | CONFIG_FRAME_POINTER=y | ||
627 | CONFIG_FORCED_INLINING=y | ||
628 | # CONFIG_RCU_TORTURE_TEST is not set | ||
629 | # CONFIG_FAULT_INJECTION is not set | ||
630 | CONFIG_DEBUG_USER=y | ||
631 | CONFIG_DEBUG_ERRORS=y | ||
632 | CONFIG_DEBUG_LL=y | ||
633 | # CONFIG_DEBUG_ICEDCC is not set | ||
634 | |||
635 | # | ||
636 | # Security options | ||
637 | # | ||
638 | # CONFIG_KEYS is not set | ||
639 | # CONFIG_SECURITY is not set | ||
640 | # CONFIG_CRYPTO is not set | ||
641 | |||
642 | # | ||
643 | # Library routines | ||
644 | # | ||
645 | CONFIG_BITREVERSE=y | ||
646 | CONFIG_CRC_CCITT=y | ||
647 | # CONFIG_CRC16 is not set | ||
648 | # CONFIG_CRC_ITU_T is not set | ||
649 | CONFIG_CRC32=y | ||
650 | # CONFIG_CRC7 is not set | ||
651 | # CONFIG_LIBCRC32C is not set | ||
652 | CONFIG_PLIST=y | ||
653 | CONFIG_HAS_IOMEM=y | ||
654 | CONFIG_HAS_IOPORT=y | ||
655 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig index 323c1deeb953..c03507202f3c 100644 --- a/arch/arm/configs/omap_h2_1610_defconfig +++ b/arch/arm/configs/omap_h2_1610_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc3 | 3 | # Linux kernel version: 2.6.25-rc2-omap1 |
4 | # Mon Mar 3 03:39:48 2008 | 4 | # Wed Feb 20 17:12:36 2008 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
@@ -31,7 +31,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | |||
31 | # | 31 | # |
32 | CONFIG_EXPERIMENTAL=y | 32 | CONFIG_EXPERIMENTAL=y |
33 | CONFIG_BROKEN_ON_SMP=y | 33 | CONFIG_BROKEN_ON_SMP=y |
34 | CONFIG_LOCK_KERNEL=y | ||
35 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 34 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
36 | CONFIG_LOCALVERSION="" | 35 | CONFIG_LOCALVERSION="" |
37 | CONFIG_LOCALVERSION_AUTO=y | 36 | CONFIG_LOCALVERSION_AUTO=y |
@@ -50,7 +49,7 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
50 | # CONFIG_RT_GROUP_SCHED is not set | 49 | # CONFIG_RT_GROUP_SCHED is not set |
51 | CONFIG_USER_SCHED=y | 50 | CONFIG_USER_SCHED=y |
52 | # CONFIG_CGROUP_SCHED is not set | 51 | # CONFIG_CGROUP_SCHED is not set |
53 | # CONFIG_SYSFS_DEPRECATED is not set | 52 | CONFIG_SYSFS_DEPRECATED=y |
54 | # CONFIG_RELAY is not set | 53 | # CONFIG_RELAY is not set |
55 | CONFIG_NAMESPACES=y | 54 | CONFIG_NAMESPACES=y |
56 | # CONFIG_UTS_NS is not set | 55 | # CONFIG_UTS_NS is not set |
@@ -65,6 +64,7 @@ CONFIG_SYSCTL=y | |||
65 | CONFIG_UID16=y | 64 | CONFIG_UID16=y |
66 | CONFIG_SYSCTL_SYSCALL=y | 65 | CONFIG_SYSCTL_SYSCALL=y |
67 | CONFIG_KALLSYMS=y | 66 | CONFIG_KALLSYMS=y |
67 | # CONFIG_KALLSYMS_ALL is not set | ||
68 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 68 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
69 | CONFIG_HOTPLUG=y | 69 | CONFIG_HOTPLUG=y |
70 | CONFIG_PRINTK=y | 70 | CONFIG_PRINTK=y |
@@ -165,20 +165,28 @@ CONFIG_ARCH_OMAP=y | |||
165 | CONFIG_ARCH_OMAP_OTG=y | 165 | CONFIG_ARCH_OMAP_OTG=y |
166 | CONFIG_ARCH_OMAP1=y | 166 | CONFIG_ARCH_OMAP1=y |
167 | # CONFIG_ARCH_OMAP2 is not set | 167 | # CONFIG_ARCH_OMAP2 is not set |
168 | # CONFIG_ARCH_OMAP3 is not set | ||
168 | 169 | ||
169 | # | 170 | # |
170 | # OMAP Feature Selections | 171 | # OMAP Feature Selections |
171 | # | 172 | # |
173 | CONFIG_OMAP_DEBUG_SRAM_PATCH=y | ||
172 | # CONFIG_OMAP_RESET_CLOCKS is not set | 174 | # CONFIG_OMAP_RESET_CLOCKS is not set |
175 | CONFIG_OMAP_BOOT_TAG=y | ||
176 | # CONFIG_OMAP_BOOT_REASON is not set | ||
177 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
178 | CONFIG_OMAP_GPIO_SWITCH=y | ||
173 | CONFIG_OMAP_MUX=y | 179 | CONFIG_OMAP_MUX=y |
174 | # CONFIG_OMAP_MUX_DEBUG is not set | 180 | CONFIG_OMAP_MUX_DEBUG=y |
175 | CONFIG_OMAP_MUX_WARNINGS=y | 181 | CONFIG_OMAP_MUX_WARNINGS=y |
182 | # CONFIG_OMAP_STI is not set | ||
176 | CONFIG_OMAP_MCBSP=y | 183 | CONFIG_OMAP_MCBSP=y |
177 | # CONFIG_OMAP_MMU_FWK is not set | 184 | # CONFIG_OMAP_MMU_FWK is not set |
185 | # CONFIG_OMAP_MBOX_FWK is not set | ||
178 | # CONFIG_OMAP_MPU_TIMER is not set | 186 | # CONFIG_OMAP_MPU_TIMER is not set |
179 | CONFIG_OMAP_32K_TIMER=y | 187 | CONFIG_OMAP_32K_TIMER=y |
180 | CONFIG_OMAP_32K_TIMER_HZ=128 | 188 | CONFIG_OMAP_32K_TIMER_HZ=128 |
181 | # CONFIG_OMAP_DM_TIMER is not set | 189 | CONFIG_OMAP_DM_TIMER=y |
182 | CONFIG_OMAP_LL_DEBUG_UART1=y | 190 | CONFIG_OMAP_LL_DEBUG_UART1=y |
183 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | 191 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set |
184 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | 192 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set |
@@ -206,10 +214,10 @@ CONFIG_MACH_OMAP_H2=y | |||
206 | # | 214 | # |
207 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | 215 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set |
208 | # CONFIG_OMAP_ARM_216MHZ is not set | 216 | # CONFIG_OMAP_ARM_216MHZ is not set |
209 | CONFIG_OMAP_ARM_192MHZ=y | 217 | # CONFIG_OMAP_ARM_192MHZ is not set |
210 | # CONFIG_OMAP_ARM_168MHZ is not set | 218 | # CONFIG_OMAP_ARM_168MHZ is not set |
211 | # CONFIG_OMAP_ARM_120MHZ is not set | 219 | # CONFIG_OMAP_ARM_120MHZ is not set |
212 | # CONFIG_OMAP_ARM_60MHZ is not set | 220 | CONFIG_OMAP_ARM_60MHZ=y |
213 | # CONFIG_OMAP_ARM_30MHZ is not set | 221 | # CONFIG_OMAP_ARM_30MHZ is not set |
214 | 222 | ||
215 | # | 223 | # |
@@ -227,6 +235,7 @@ CONFIG_CPU_32=y | |||
227 | CONFIG_CPU_ARM926T=y | 235 | CONFIG_CPU_ARM926T=y |
228 | CONFIG_CPU_32v5=y | 236 | CONFIG_CPU_32v5=y |
229 | CONFIG_CPU_ABRT_EV5TJ=y | 237 | CONFIG_CPU_ABRT_EV5TJ=y |
238 | CONFIG_CPU_PABRT_NOIFAR=y | ||
230 | CONFIG_CPU_CACHE_VIVT=y | 239 | CONFIG_CPU_CACHE_VIVT=y |
231 | CONFIG_CPU_COPY_V4WB=y | 240 | CONFIG_CPU_COPY_V4WB=y |
232 | CONFIG_CPU_TLB_V4WBI=y | 241 | CONFIG_CPU_TLB_V4WBI=y |
@@ -257,10 +266,9 @@ CONFIG_TICK_ONESHOT=y | |||
257 | CONFIG_NO_HZ=y | 266 | CONFIG_NO_HZ=y |
258 | CONFIG_HIGH_RES_TIMERS=y | 267 | CONFIG_HIGH_RES_TIMERS=y |
259 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 268 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
260 | CONFIG_PREEMPT=y | 269 | # CONFIG_PREEMPT is not set |
261 | CONFIG_HZ=128 | 270 | CONFIG_HZ=128 |
262 | CONFIG_AEABI=y | 271 | # CONFIG_AEABI is not set |
263 | CONFIG_OABI_COMPAT=y | ||
264 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 272 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
265 | CONFIG_SELECT_MEMORY_MODEL=y | 273 | CONFIG_SELECT_MEMORY_MODEL=y |
266 | CONFIG_FLATMEM_MANUAL=y | 274 | CONFIG_FLATMEM_MANUAL=y |
@@ -275,7 +283,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 | |||
275 | CONFIG_ZONE_DMA_FLAG=1 | 283 | CONFIG_ZONE_DMA_FLAG=1 |
276 | CONFIG_BOUNCE=y | 284 | CONFIG_BOUNCE=y |
277 | CONFIG_VIRT_TO_BUS=y | 285 | CONFIG_VIRT_TO_BUS=y |
278 | # CONFIG_LEDS is not set | 286 | CONFIG_LEDS=y |
287 | # CONFIG_LEDS_CPU is not set | ||
279 | CONFIG_ALIGNMENT_TRAP=y | 288 | CONFIG_ALIGNMENT_TRAP=y |
280 | 289 | ||
281 | # | 290 | # |
@@ -283,7 +292,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
283 | # | 292 | # |
284 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 293 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
285 | CONFIG_ZBOOT_ROM_BSS=0x0 | 294 | CONFIG_ZBOOT_ROM_BSS=0x0 |
286 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=0801 ro init=/bin/sh" | 295 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=/dev/ram0 rw initrd=0x10600000,8M ramdisk_size=8192" |
287 | # CONFIG_XIP_KERNEL is not set | 296 | # CONFIG_XIP_KERNEL is not set |
288 | # CONFIG_KEXEC is not set | 297 | # CONFIG_KEXEC is not set |
289 | # CONFIG_ATAGS_PROC is not set | 298 | # CONFIG_ATAGS_PROC is not set |
@@ -291,20 +300,7 @@ CONFIG_CMDLINE="mem=32M console=ttyS0,115200n8 root=0801 ro init=/bin/sh" | |||
291 | # | 300 | # |
292 | # CPU Frequency scaling | 301 | # CPU Frequency scaling |
293 | # | 302 | # |
294 | CONFIG_CPU_FREQ=y | 303 | # CONFIG_CPU_FREQ is not set |
295 | CONFIG_CPU_FREQ_TABLE=y | ||
296 | # CONFIG_CPU_FREQ_DEBUG is not set | ||
297 | CONFIG_CPU_FREQ_STAT=y | ||
298 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | ||
299 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set | ||
300 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y | ||
301 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
302 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
303 | # CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set | ||
304 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | ||
305 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | ||
306 | # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set | ||
307 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set | ||
308 | 304 | ||
309 | # | 305 | # |
310 | # Floating point emulation | 306 | # Floating point emulation |
@@ -322,8 +318,9 @@ CONFIG_FPE_NWFPE=y | |||
322 | # Userspace binary formats | 318 | # Userspace binary formats |
323 | # | 319 | # |
324 | CONFIG_BINFMT_ELF=y | 320 | CONFIG_BINFMT_ELF=y |
325 | CONFIG_BINFMT_AOUT=y | 321 | # CONFIG_BINFMT_AOUT is not set |
326 | # CONFIG_BINFMT_MISC is not set | 322 | # CONFIG_BINFMT_MISC is not set |
323 | # CONFIG_ARTHUR is not set | ||
327 | 324 | ||
328 | # | 325 | # |
329 | # Power management options | 326 | # Power management options |
@@ -433,21 +430,102 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
433 | CONFIG_STANDALONE=y | 430 | CONFIG_STANDALONE=y |
434 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 431 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
435 | # CONFIG_FW_LOADER is not set | 432 | # CONFIG_FW_LOADER is not set |
433 | CONFIG_DEBUG_DRIVER=y | ||
434 | # CONFIG_DEBUG_DEVRES is not set | ||
436 | # CONFIG_SYS_HYPERVISOR is not set | 435 | # CONFIG_SYS_HYPERVISOR is not set |
437 | # CONFIG_CONNECTOR is not set | 436 | # CONFIG_CONNECTOR is not set |
438 | # CONFIG_MTD is not set | 437 | CONFIG_MTD=y |
438 | CONFIG_MTD_DEBUG=y | ||
439 | CONFIG_MTD_DEBUG_VERBOSE=3 | ||
440 | # CONFIG_MTD_CONCAT is not set | ||
441 | CONFIG_MTD_PARTITIONS=y | ||
442 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
443 | CONFIG_MTD_CMDLINE_PARTS=y | ||
444 | # CONFIG_MTD_AFS_PARTS is not set | ||
445 | |||
446 | # | ||
447 | # User Modules And Translation Layers | ||
448 | # | ||
449 | CONFIG_MTD_CHAR=y | ||
450 | CONFIG_MTD_BLKDEVS=y | ||
451 | CONFIG_MTD_BLOCK=y | ||
452 | # CONFIG_FTL is not set | ||
453 | # CONFIG_NFTL is not set | ||
454 | # CONFIG_INFTL is not set | ||
455 | # CONFIG_RFD_FTL is not set | ||
456 | # CONFIG_SSFDC is not set | ||
457 | # CONFIG_MTD_OOPS is not set | ||
458 | |||
459 | # | ||
460 | # RAM/ROM/Flash chip drivers | ||
461 | # | ||
462 | CONFIG_MTD_CFI=y | ||
463 | # CONFIG_MTD_JEDECPROBE is not set | ||
464 | CONFIG_MTD_GEN_PROBE=y | ||
465 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
466 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
467 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
468 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
469 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
470 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
471 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
472 | CONFIG_MTD_CFI_I1=y | ||
473 | CONFIG_MTD_CFI_I2=y | ||
474 | # CONFIG_MTD_CFI_I4 is not set | ||
475 | # CONFIG_MTD_CFI_I8 is not set | ||
476 | CONFIG_MTD_CFI_INTELEXT=y | ||
477 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
478 | # CONFIG_MTD_CFI_STAA is not set | ||
479 | CONFIG_MTD_CFI_UTIL=y | ||
480 | # CONFIG_MTD_RAM is not set | ||
481 | # CONFIG_MTD_ROM is not set | ||
482 | # CONFIG_MTD_ABSENT is not set | ||
483 | |||
484 | # | ||
485 | # Mapping drivers for chip access | ||
486 | # | ||
487 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
488 | # CONFIG_MTD_PHYSMAP is not set | ||
489 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
490 | # CONFIG_MTD_OMAP_NOR is not set | ||
491 | # CONFIG_MTD_PLATRAM is not set | ||
492 | |||
493 | # | ||
494 | # Self-contained MTD device drivers | ||
495 | # | ||
496 | # CONFIG_MTD_DATAFLASH is not set | ||
497 | # CONFIG_MTD_M25P80 is not set | ||
498 | # CONFIG_MTD_SLRAM is not set | ||
499 | # CONFIG_MTD_PHRAM is not set | ||
500 | # CONFIG_MTD_MTDRAM is not set | ||
501 | # CONFIG_MTD_BLOCK2MTD is not set | ||
502 | |||
503 | # | ||
504 | # Disk-On-Chip Device Drivers | ||
505 | # | ||
506 | # CONFIG_MTD_DOC2000 is not set | ||
507 | # CONFIG_MTD_DOC2001 is not set | ||
508 | # CONFIG_MTD_DOC2001PLUS is not set | ||
509 | # CONFIG_MTD_NAND is not set | ||
510 | # CONFIG_MTD_ONENAND is not set | ||
511 | |||
512 | # | ||
513 | # UBI - Unsorted block images | ||
514 | # | ||
515 | # CONFIG_MTD_UBI is not set | ||
439 | # CONFIG_PARPORT is not set | 516 | # CONFIG_PARPORT is not set |
440 | CONFIG_BLK_DEV=y | 517 | CONFIG_BLK_DEV=y |
441 | # CONFIG_BLK_DEV_COW_COMMON is not set | 518 | # CONFIG_BLK_DEV_COW_COMMON is not set |
442 | CONFIG_BLK_DEV_LOOP=y | 519 | CONFIG_BLK_DEV_LOOP=y |
443 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 520 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
444 | # CONFIG_BLK_DEV_NBD is not set | 521 | # CONFIG_BLK_DEV_NBD is not set |
522 | # CONFIG_BLK_DEV_UB is not set | ||
445 | CONFIG_BLK_DEV_RAM=y | 523 | CONFIG_BLK_DEV_RAM=y |
446 | CONFIG_BLK_DEV_RAM_COUNT=16 | 524 | CONFIG_BLK_DEV_RAM_COUNT=16 |
447 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 525 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
448 | # CONFIG_BLK_DEV_XIP is not set | 526 | # CONFIG_BLK_DEV_XIP is not set |
449 | # CONFIG_CDROM_PKTCDVD is not set | 527 | # CONFIG_CDROM_PKTCDVD is not set |
450 | CONFIG_ATA_OVER_ETH=m | 528 | # CONFIG_ATA_OVER_ETH is not set |
451 | CONFIG_MISC_DEVICES=y | 529 | CONFIG_MISC_DEVICES=y |
452 | # CONFIG_EEPROM_93CX6 is not set | 530 | # CONFIG_EEPROM_93CX6 is not set |
453 | # CONFIG_ENCLOSURE_SERVICES is not set | 531 | # CONFIG_ENCLOSURE_SERVICES is not set |
@@ -457,42 +535,9 @@ CONFIG_MISC_DEVICES=y | |||
457 | # SCSI device support | 535 | # SCSI device support |
458 | # | 536 | # |
459 | # CONFIG_RAID_ATTRS is not set | 537 | # CONFIG_RAID_ATTRS is not set |
460 | CONFIG_SCSI=y | 538 | # CONFIG_SCSI is not set |
461 | CONFIG_SCSI_DMA=y | 539 | # CONFIG_SCSI_DMA is not set |
462 | # CONFIG_SCSI_TGT is not set | ||
463 | # CONFIG_SCSI_NETLINK is not set | 540 | # CONFIG_SCSI_NETLINK is not set |
464 | CONFIG_SCSI_PROC_FS=y | ||
465 | |||
466 | # | ||
467 | # SCSI support type (disk, tape, CD-ROM) | ||
468 | # | ||
469 | # CONFIG_BLK_DEV_SD is not set | ||
470 | # CONFIG_CHR_DEV_ST is not set | ||
471 | # CONFIG_CHR_DEV_OSST is not set | ||
472 | # CONFIG_BLK_DEV_SR is not set | ||
473 | # CONFIG_CHR_DEV_SG is not set | ||
474 | # CONFIG_CHR_DEV_SCH is not set | ||
475 | |||
476 | # | ||
477 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
478 | # | ||
479 | # CONFIG_SCSI_MULTI_LUN is not set | ||
480 | # CONFIG_SCSI_CONSTANTS is not set | ||
481 | # CONFIG_SCSI_LOGGING is not set | ||
482 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
483 | CONFIG_SCSI_WAIT_SCAN=m | ||
484 | |||
485 | # | ||
486 | # SCSI Transports | ||
487 | # | ||
488 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
489 | # CONFIG_SCSI_FC_ATTRS is not set | ||
490 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
491 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
492 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
493 | CONFIG_SCSI_LOWLEVEL=y | ||
494 | # CONFIG_ISCSI_TCP is not set | ||
495 | # CONFIG_SCSI_DEBUG is not set | ||
496 | # CONFIG_ATA is not set | 541 | # CONFIG_ATA is not set |
497 | # CONFIG_MD is not set | 542 | # CONFIG_MD is not set |
498 | CONFIG_NETDEVICES=y | 543 | CONFIG_NETDEVICES=y |
@@ -509,6 +554,7 @@ CONFIG_MII=y | |||
509 | # CONFIG_AX88796 is not set | 554 | # CONFIG_AX88796 is not set |
510 | CONFIG_SMC91X=y | 555 | CONFIG_SMC91X=y |
511 | # CONFIG_DM9000 is not set | 556 | # CONFIG_DM9000 is not set |
557 | # CONFIG_ENC28J60 is not set | ||
512 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 558 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
513 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 559 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
514 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 560 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
@@ -523,6 +569,15 @@ CONFIG_NETDEV_10000=y | |||
523 | # | 569 | # |
524 | # CONFIG_WLAN_PRE80211 is not set | 570 | # CONFIG_WLAN_PRE80211 is not set |
525 | # CONFIG_WLAN_80211 is not set | 571 | # CONFIG_WLAN_80211 is not set |
572 | |||
573 | # | ||
574 | # USB Network Adapters | ||
575 | # | ||
576 | # CONFIG_USB_CATC is not set | ||
577 | # CONFIG_USB_KAWETH is not set | ||
578 | # CONFIG_USB_PEGASUS is not set | ||
579 | # CONFIG_USB_RTL8150 is not set | ||
580 | # CONFIG_USB_USBNET is not set | ||
526 | # CONFIG_WAN is not set | 581 | # CONFIG_WAN is not set |
527 | CONFIG_PPP=y | 582 | CONFIG_PPP=y |
528 | # CONFIG_PPP_MULTILINK is not set | 583 | # CONFIG_PPP_MULTILINK is not set |
@@ -612,7 +667,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y | |||
612 | CONFIG_UNIX98_PTYS=y | 667 | CONFIG_UNIX98_PTYS=y |
613 | # CONFIG_LEGACY_PTYS is not set | 668 | # CONFIG_LEGACY_PTYS is not set |
614 | # CONFIG_IPMI_HANDLER is not set | 669 | # CONFIG_IPMI_HANDLER is not set |
615 | # CONFIG_HW_RANDOM is not set | 670 | CONFIG_HW_RANDOM=m |
671 | CONFIG_HW_RANDOM_OMAP=m | ||
616 | # CONFIG_NVRAM is not set | 672 | # CONFIG_NVRAM is not set |
617 | # CONFIG_R3964 is not set | 673 | # CONFIG_R3964 is not set |
618 | # CONFIG_RAW_DRIVER is not set | 674 | # CONFIG_RAW_DRIVER is not set |
@@ -638,6 +694,7 @@ CONFIG_I2C_OMAP=y | |||
638 | # CONFIG_I2C_SIMTEC is not set | 694 | # CONFIG_I2C_SIMTEC is not set |
639 | # CONFIG_I2C_TAOS_EVM is not set | 695 | # CONFIG_I2C_TAOS_EVM is not set |
640 | # CONFIG_I2C_STUB is not set | 696 | # CONFIG_I2C_STUB is not set |
697 | # CONFIG_I2C_TINY_USB is not set | ||
641 | 698 | ||
642 | # | 699 | # |
643 | # Miscellaneous I2C Chip support | 700 | # Miscellaneous I2C Chip support |
@@ -647,8 +704,10 @@ CONFIG_I2C_OMAP=y | |||
647 | # CONFIG_SENSORS_PCF8574 is not set | 704 | # CONFIG_SENSORS_PCF8574 is not set |
648 | # CONFIG_PCF8575 is not set | 705 | # CONFIG_PCF8575 is not set |
649 | # CONFIG_SENSORS_PCF8591 is not set | 706 | # CONFIG_SENSORS_PCF8591 is not set |
650 | # CONFIG_ISP1301_OMAP is not set | 707 | CONFIG_ISP1301_OMAP=y |
651 | CONFIG_TPS65010=y | 708 | CONFIG_TPS65010=y |
709 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
710 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
652 | # CONFIG_SENSORS_MAX6875 is not set | 711 | # CONFIG_SENSORS_MAX6875 is not set |
653 | # CONFIG_SENSORS_TSL2550 is not set | 712 | # CONFIG_SENSORS_TSL2550 is not set |
654 | # CONFIG_I2C_DEBUG_CORE is not set | 713 | # CONFIG_I2C_DEBUG_CORE is not set |
@@ -659,8 +718,26 @@ CONFIG_TPS65010=y | |||
659 | # | 718 | # |
660 | # SPI support | 719 | # SPI support |
661 | # | 720 | # |
662 | # CONFIG_SPI is not set | 721 | CONFIG_SPI=y |
663 | # CONFIG_SPI_MASTER is not set | 722 | # CONFIG_SPI_DEBUG is not set |
723 | CONFIG_SPI_MASTER=y | ||
724 | |||
725 | # | ||
726 | # SPI Master Controller Drivers | ||
727 | # | ||
728 | CONFIG_SPI_BITBANG=y | ||
729 | CONFIG_SPI_OMAP_UWIRE=y | ||
730 | |||
731 | # | ||
732 | # SPI Protocol Masters | ||
733 | # | ||
734 | # CONFIG_SPI_AT25 is not set | ||
735 | CONFIG_SPI_TSC2101=y | ||
736 | # CONFIG_SPI_TSC2102 is not set | ||
737 | # CONFIG_SPI_TSC210X is not set | ||
738 | # CONFIG_SPI_TSC2301 is not set | ||
739 | # CONFIG_SPI_SPIDEV is not set | ||
740 | # CONFIG_SPI_TLE62X0 is not set | ||
664 | # CONFIG_W1 is not set | 741 | # CONFIG_W1 is not set |
665 | # CONFIG_POWER_SUPPLY is not set | 742 | # CONFIG_POWER_SUPPLY is not set |
666 | CONFIG_HWMON=y | 743 | CONFIG_HWMON=y |
@@ -673,7 +750,6 @@ CONFIG_HWMON=y | |||
673 | # CONFIG_SENSORS_ADM1031 is not set | 750 | # CONFIG_SENSORS_ADM1031 is not set |
674 | # CONFIG_SENSORS_ADM9240 is not set | 751 | # CONFIG_SENSORS_ADM9240 is not set |
675 | # CONFIG_SENSORS_ADT7470 is not set | 752 | # CONFIG_SENSORS_ADT7470 is not set |
676 | # CONFIG_SENSORS_ADT7473 is not set | ||
677 | # CONFIG_SENSORS_ATXP1 is not set | 753 | # CONFIG_SENSORS_ATXP1 is not set |
678 | # CONFIG_SENSORS_DS1621 is not set | 754 | # CONFIG_SENSORS_DS1621 is not set |
679 | # CONFIG_SENSORS_F71805F is not set | 755 | # CONFIG_SENSORS_F71805F is not set |
@@ -683,6 +759,7 @@ CONFIG_HWMON=y | |||
683 | # CONFIG_SENSORS_GL520SM is not set | 759 | # CONFIG_SENSORS_GL520SM is not set |
684 | # CONFIG_SENSORS_IT87 is not set | 760 | # CONFIG_SENSORS_IT87 is not set |
685 | # CONFIG_SENSORS_LM63 is not set | 761 | # CONFIG_SENSORS_LM63 is not set |
762 | # CONFIG_SENSORS_LM70 is not set | ||
686 | # CONFIG_SENSORS_LM75 is not set | 763 | # CONFIG_SENSORS_LM75 is not set |
687 | # CONFIG_SENSORS_LM77 is not set | 764 | # CONFIG_SENSORS_LM77 is not set |
688 | # CONFIG_SENSORS_LM78 is not set | 765 | # CONFIG_SENSORS_LM78 is not set |
@@ -712,6 +789,7 @@ CONFIG_HWMON=y | |||
712 | # CONFIG_SENSORS_W83L786NG is not set | 789 | # CONFIG_SENSORS_W83L786NG is not set |
713 | # CONFIG_SENSORS_W83627HF is not set | 790 | # CONFIG_SENSORS_W83627HF is not set |
714 | # CONFIG_SENSORS_W83627EHF is not set | 791 | # CONFIG_SENSORS_W83627EHF is not set |
792 | # CONFIG_SENSORS_TSC210X is not set | ||
715 | # CONFIG_HWMON_DEBUG_CHIP is not set | 793 | # CONFIG_HWMON_DEBUG_CHIP is not set |
716 | CONFIG_WATCHDOG=y | 794 | CONFIG_WATCHDOG=y |
717 | CONFIG_WATCHDOG_NOWAYOUT=y | 795 | CONFIG_WATCHDOG_NOWAYOUT=y |
@@ -723,6 +801,11 @@ CONFIG_WATCHDOG_NOWAYOUT=y | |||
723 | # CONFIG_OMAP_WATCHDOG is not set | 801 | # CONFIG_OMAP_WATCHDOG is not set |
724 | 802 | ||
725 | # | 803 | # |
804 | # USB-based Watchdog Cards | ||
805 | # | ||
806 | # CONFIG_USBPCWATCHDOG is not set | ||
807 | |||
808 | # | ||
726 | # Sonics Silicon Backplane | 809 | # Sonics Silicon Backplane |
727 | # | 810 | # |
728 | CONFIG_SSB_POSSIBLE=y | 811 | CONFIG_SSB_POSSIBLE=y |
@@ -740,6 +823,7 @@ CONFIG_SSB_POSSIBLE=y | |||
740 | # CONFIG_VIDEO_DEV is not set | 823 | # CONFIG_VIDEO_DEV is not set |
741 | # CONFIG_DVB_CORE is not set | 824 | # CONFIG_DVB_CORE is not set |
742 | CONFIG_DAB=y | 825 | CONFIG_DAB=y |
826 | # CONFIG_USB_DABUSB is not set | ||
743 | 827 | ||
744 | # | 828 | # |
745 | # Graphics support | 829 | # Graphics support |
@@ -749,9 +833,9 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
749 | CONFIG_FB=y | 833 | CONFIG_FB=y |
750 | CONFIG_FIRMWARE_EDID=y | 834 | CONFIG_FIRMWARE_EDID=y |
751 | # CONFIG_FB_DDC is not set | 835 | # CONFIG_FB_DDC is not set |
752 | # CONFIG_FB_CFB_FILLRECT is not set | 836 | CONFIG_FB_CFB_FILLRECT=y |
753 | # CONFIG_FB_CFB_COPYAREA is not set | 837 | CONFIG_FB_CFB_COPYAREA=y |
754 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 838 | CONFIG_FB_CFB_IMAGEBLIT=y |
755 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | 839 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
756 | # CONFIG_FB_SYS_FILLRECT is not set | 840 | # CONFIG_FB_SYS_FILLRECT is not set |
757 | # CONFIG_FB_SYS_COPYAREA is not set | 841 | # CONFIG_FB_SYS_COPYAREA is not set |
@@ -769,7 +853,11 @@ CONFIG_FB_MODE_HELPERS=y | |||
769 | # | 853 | # |
770 | # CONFIG_FB_S1D13XXX is not set | 854 | # CONFIG_FB_S1D13XXX is not set |
771 | # CONFIG_FB_VIRTUAL is not set | 855 | # CONFIG_FB_VIRTUAL is not set |
772 | # CONFIG_FB_OMAP is not set | 856 | CONFIG_FB_OMAP=y |
857 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
858 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
859 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
860 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
773 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 861 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
774 | 862 | ||
775 | # | 863 | # |
@@ -785,17 +873,9 @@ CONFIG_DUMMY_CONSOLE=y | |||
785 | CONFIG_FRAMEBUFFER_CONSOLE=y | 873 | CONFIG_FRAMEBUFFER_CONSOLE=y |
786 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | 874 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set |
787 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | 875 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set |
788 | CONFIG_FONTS=y | 876 | # CONFIG_FONTS is not set |
789 | CONFIG_FONT_8x8=y | 877 | CONFIG_FONT_8x8=y |
790 | CONFIG_FONT_8x16=y | 878 | CONFIG_FONT_8x16=y |
791 | # CONFIG_FONT_6x11 is not set | ||
792 | # CONFIG_FONT_7x14 is not set | ||
793 | # CONFIG_FONT_PEARL_8x8 is not set | ||
794 | # CONFIG_FONT_ACORN_8x8 is not set | ||
795 | # CONFIG_FONT_MINI_4x6 is not set | ||
796 | # CONFIG_FONT_SUN8x16 is not set | ||
797 | # CONFIG_FONT_SUN12x22 is not set | ||
798 | # CONFIG_FONT_10x18 is not set | ||
799 | CONFIG_LOGO=y | 879 | CONFIG_LOGO=y |
800 | # CONFIG_LOGO_LINUX_MONO is not set | 880 | # CONFIG_LOGO_LINUX_MONO is not set |
801 | # CONFIG_LOGO_LINUX_VGA16 is not set | 881 | # CONFIG_LOGO_LINUX_VGA16 is not set |
@@ -804,37 +884,204 @@ CONFIG_LOGO_LINUX_CLUT224=y | |||
804 | # | 884 | # |
805 | # Sound | 885 | # Sound |
806 | # | 886 | # |
807 | CONFIG_SOUND=y | 887 | # CONFIG_SOUND is not set |
888 | CONFIG_HID_SUPPORT=y | ||
889 | CONFIG_HID=y | ||
890 | # CONFIG_HID_DEBUG is not set | ||
891 | # CONFIG_HIDRAW is not set | ||
808 | 892 | ||
809 | # | 893 | # |
810 | # Advanced Linux Sound Architecture | 894 | # USB Input Devices |
811 | # | 895 | # |
812 | # CONFIG_SND is not set | 896 | # CONFIG_USB_HID is not set |
813 | 897 | ||
814 | # | 898 | # |
815 | # Open Sound System | 899 | # USB HID Boot Protocol drivers |
816 | # | 900 | # |
817 | CONFIG_SOUND_PRIME=y | 901 | # CONFIG_USB_KBD is not set |
818 | # CONFIG_SOUND_MSNDCLAS is not set | 902 | # CONFIG_USB_MOUSE is not set |
819 | # CONFIG_SOUND_MSNDPIN is not set | ||
820 | CONFIG_HID_SUPPORT=y | ||
821 | CONFIG_HID=y | ||
822 | CONFIG_HID_DEBUG=y | ||
823 | # CONFIG_HIDRAW is not set | ||
824 | CONFIG_USB_SUPPORT=y | 903 | CONFIG_USB_SUPPORT=y |
825 | CONFIG_USB_ARCH_HAS_HCD=y | 904 | CONFIG_USB_ARCH_HAS_HCD=y |
826 | CONFIG_USB_ARCH_HAS_OHCI=y | 905 | CONFIG_USB_ARCH_HAS_OHCI=y |
827 | # CONFIG_USB_ARCH_HAS_EHCI is not set | 906 | # CONFIG_USB_ARCH_HAS_EHCI is not set |
828 | # CONFIG_USB is not set | 907 | CONFIG_USB=y |
908 | # CONFIG_USB_DEBUG is not set | ||
909 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
910 | |||
911 | # | ||
912 | # Miscellaneous USB options | ||
913 | # | ||
914 | CONFIG_USB_DEVICEFS=y | ||
915 | # CONFIG_USB_DEVICE_CLASS is not set | ||
916 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
917 | CONFIG_USB_SUSPEND=y | ||
918 | # CONFIG_USB_PERSIST is not set | ||
919 | CONFIG_USB_OTG=y | ||
920 | CONFIG_USB_OTG_WHITELIST=y | ||
921 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
922 | |||
923 | # | ||
924 | # USB Host Controller Drivers | ||
925 | # | ||
926 | # CONFIG_USB_ISP116X_HCD is not set | ||
927 | CONFIG_USB_OHCI_HCD=y | ||
928 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
929 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
930 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
931 | # CONFIG_USB_SL811_HCD is not set | ||
932 | # CONFIG_USB_R8A66597_HCD is not set | ||
933 | # CONFIG_USB_MUSB_HDRC is not set | ||
934 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
935 | |||
936 | # | ||
937 | # USB Device Class drivers | ||
938 | # | ||
939 | # CONFIG_USB_ACM is not set | ||
940 | # CONFIG_USB_PRINTER is not set | ||
829 | 941 | ||
830 | # | 942 | # |
831 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 943 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
832 | # | 944 | # |
833 | # CONFIG_USB_GADGET is not set | 945 | |
834 | # CONFIG_MMC is not set | 946 | # |
947 | # may also be needed; see USB_STORAGE Help for more information | ||
948 | # | ||
949 | # CONFIG_USB_LIBUSUAL is not set | ||
950 | |||
951 | # | ||
952 | # USB Imaging devices | ||
953 | # | ||
954 | # CONFIG_USB_MDC800 is not set | ||
955 | CONFIG_USB_MON=y | ||
956 | |||
957 | # | ||
958 | # USB port drivers | ||
959 | # | ||
960 | # CONFIG_USB_SERIAL is not set | ||
961 | |||
962 | # | ||
963 | # USB Miscellaneous drivers | ||
964 | # | ||
965 | # CONFIG_USB_EMI62 is not set | ||
966 | # CONFIG_USB_EMI26 is not set | ||
967 | # CONFIG_USB_ADUTUX is not set | ||
968 | # CONFIG_USB_AUERSWALD is not set | ||
969 | # CONFIG_USB_RIO500 is not set | ||
970 | # CONFIG_USB_LEGOTOWER is not set | ||
971 | # CONFIG_USB_LCD is not set | ||
972 | # CONFIG_USB_BERRY_CHARGE is not set | ||
973 | # CONFIG_USB_LED is not set | ||
974 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
975 | # CONFIG_USB_CYTHERM is not set | ||
976 | # CONFIG_USB_PHIDGET is not set | ||
977 | # CONFIG_USB_IDMOUSE is not set | ||
978 | # CONFIG_USB_FTDI_ELAN is not set | ||
979 | # CONFIG_USB_APPLEDISPLAY is not set | ||
980 | # CONFIG_USB_LD is not set | ||
981 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
982 | # CONFIG_USB_IOWARRIOR is not set | ||
983 | CONFIG_USB_TEST=y | ||
984 | CONFIG_USB_GADGET=y | ||
985 | # CONFIG_USB_GADGET_DEBUG is not set | ||
986 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
987 | CONFIG_USB_GADGET_SELECTED=y | ||
988 | # CONFIG_USB_GADGET_AMD5536UDC is not set | ||
989 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | ||
990 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
991 | # CONFIG_USB_GADGET_NET2280 is not set | ||
992 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
993 | # CONFIG_USB_GADGET_M66592 is not set | ||
994 | # CONFIG_USB_GADGET_GOKU is not set | ||
995 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
996 | CONFIG_USB_GADGET_OMAP=y | ||
997 | CONFIG_USB_OMAP=y | ||
998 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
999 | # CONFIG_USB_GADGET_AT91 is not set | ||
1000 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
1001 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
1002 | # CONFIG_USB_ZERO is not set | ||
1003 | CONFIG_USB_ETH=y | ||
1004 | CONFIG_USB_ETH_RNDIS=y | ||
1005 | # CONFIG_USB_GADGETFS is not set | ||
1006 | # CONFIG_USB_FILE_STORAGE is not set | ||
1007 | # CONFIG_USB_G_SERIAL is not set | ||
1008 | # CONFIG_USB_MIDI_GADGET is not set | ||
1009 | # CONFIG_USB_G_PRINTER is not set | ||
1010 | CONFIG_MMC=y | ||
1011 | # CONFIG_MMC_DEBUG is not set | ||
1012 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
1013 | |||
1014 | # | ||
1015 | # MMC/SD Card Drivers | ||
1016 | # | ||
1017 | CONFIG_MMC_BLOCK=y | ||
1018 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
1019 | # CONFIG_SDIO_UART is not set | ||
1020 | |||
1021 | # | ||
1022 | # MMC/SD Host Controller Drivers | ||
1023 | # | ||
1024 | CONFIG_MMC_OMAP=y | ||
1025 | # CONFIG_MMC_SPI is not set | ||
835 | # CONFIG_NEW_LEDS is not set | 1026 | # CONFIG_NEW_LEDS is not set |
836 | CONFIG_RTC_LIB=y | 1027 | CONFIG_RTC_LIB=y |
837 | # CONFIG_RTC_CLASS is not set | 1028 | CONFIG_RTC_CLASS=y |
1029 | CONFIG_RTC_HCTOSYS=y | ||
1030 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
1031 | # CONFIG_RTC_DEBUG is not set | ||
1032 | |||
1033 | # | ||
1034 | # RTC interfaces | ||
1035 | # | ||
1036 | CONFIG_RTC_INTF_SYSFS=y | ||
1037 | CONFIG_RTC_INTF_PROC=y | ||
1038 | CONFIG_RTC_INTF_DEV=y | ||
1039 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
1040 | # CONFIG_RTC_DRV_TEST is not set | ||
1041 | |||
1042 | # | ||
1043 | # I2C RTC drivers | ||
1044 | # | ||
1045 | # CONFIG_RTC_DRV_DS1307 is not set | ||
1046 | # CONFIG_RTC_DRV_DS1374 is not set | ||
1047 | # CONFIG_RTC_DRV_DS1672 is not set | ||
1048 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
1049 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
1050 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
1051 | # CONFIG_RTC_DRV_X1205 is not set | ||
1052 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
1053 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
1054 | # CONFIG_RTC_DRV_M41T80 is not set | ||
1055 | |||
1056 | # | ||
1057 | # SPI RTC drivers | ||
1058 | # | ||
1059 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
1060 | # CONFIG_RTC_DRV_R9701 is not set | ||
1061 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
1062 | |||
1063 | # | ||
1064 | # Platform RTC drivers | ||
1065 | # | ||
1066 | # CONFIG_RTC_DRV_CMOS is not set | ||
1067 | # CONFIG_RTC_DRV_DS1511 is not set | ||
1068 | # CONFIG_RTC_DRV_DS1553 is not set | ||
1069 | # CONFIG_RTC_DRV_DS1742 is not set | ||
1070 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
1071 | # CONFIG_RTC_DRV_M48T86 is not set | ||
1072 | # CONFIG_RTC_DRV_M48T59 is not set | ||
1073 | # CONFIG_RTC_DRV_V3020 is not set | ||
1074 | |||
1075 | # | ||
1076 | # on-CPU RTC drivers | ||
1077 | # | ||
1078 | CONFIG_RTC_DRV_OMAP=y | ||
1079 | |||
1080 | # | ||
1081 | # CBUS support | ||
1082 | # | ||
1083 | # CONFIG_CBUS is not set | ||
1084 | # CONFIG_OMAP_DSP is not set | ||
838 | 1085 | ||
839 | # | 1086 | # |
840 | # File systems | 1087 | # File systems |
@@ -894,6 +1141,17 @@ CONFIG_SYSFS=y | |||
894 | # CONFIG_BEFS_FS is not set | 1141 | # CONFIG_BEFS_FS is not set |
895 | # CONFIG_BFS_FS is not set | 1142 | # CONFIG_BFS_FS is not set |
896 | # CONFIG_EFS_FS is not set | 1143 | # CONFIG_EFS_FS is not set |
1144 | CONFIG_JFFS2_FS=y | ||
1145 | CONFIG_JFFS2_FS_DEBUG=0 | ||
1146 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
1147 | # CONFIG_JFFS2_FS_WBUF_VERIFY is not set | ||
1148 | # CONFIG_JFFS2_SUMMARY is not set | ||
1149 | # CONFIG_JFFS2_FS_XATTR is not set | ||
1150 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
1151 | CONFIG_JFFS2_ZLIB=y | ||
1152 | # CONFIG_JFFS2_LZO is not set | ||
1153 | CONFIG_JFFS2_RTIME=y | ||
1154 | # CONFIG_JFFS2_RUBIN is not set | ||
897 | CONFIG_CRAMFS=y | 1155 | CONFIG_CRAMFS=y |
898 | # CONFIG_VXFS_FS is not set | 1156 | # CONFIG_VXFS_FS is not set |
899 | # CONFIG_MINIX_FS is not set | 1157 | # CONFIG_MINIX_FS is not set |
@@ -904,19 +1162,16 @@ CONFIG_ROMFS_FS=y | |||
904 | # CONFIG_UFS_FS is not set | 1162 | # CONFIG_UFS_FS is not set |
905 | CONFIG_NETWORK_FILESYSTEMS=y | 1163 | CONFIG_NETWORK_FILESYSTEMS=y |
906 | CONFIG_NFS_FS=y | 1164 | CONFIG_NFS_FS=y |
907 | CONFIG_NFS_V3=y | 1165 | # CONFIG_NFS_V3 is not set |
908 | # CONFIG_NFS_V3_ACL is not set | 1166 | # CONFIG_NFS_V4 is not set |
909 | CONFIG_NFS_V4=y | ||
910 | # CONFIG_NFS_DIRECTIO is not set | 1167 | # CONFIG_NFS_DIRECTIO is not set |
911 | # CONFIG_NFSD is not set | 1168 | # CONFIG_NFSD is not set |
912 | CONFIG_ROOT_NFS=y | 1169 | CONFIG_ROOT_NFS=y |
913 | CONFIG_LOCKD=y | 1170 | CONFIG_LOCKD=y |
914 | CONFIG_LOCKD_V4=y | ||
915 | CONFIG_NFS_COMMON=y | 1171 | CONFIG_NFS_COMMON=y |
916 | CONFIG_SUNRPC=y | 1172 | CONFIG_SUNRPC=y |
917 | CONFIG_SUNRPC_GSS=y | ||
918 | # CONFIG_SUNRPC_BIND34 is not set | 1173 | # CONFIG_SUNRPC_BIND34 is not set |
919 | CONFIG_RPCSEC_GSS_KRB5=y | 1174 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
920 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1175 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
921 | # CONFIG_SMB_FS is not set | 1176 | # CONFIG_SMB_FS is not set |
922 | # CONFIG_CIFS is not set | 1177 | # CONFIG_CIFS is not set |
@@ -981,11 +1236,38 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
981 | # CONFIG_UNUSED_SYMBOLS is not set | 1236 | # CONFIG_UNUSED_SYMBOLS is not set |
982 | # CONFIG_DEBUG_FS is not set | 1237 | # CONFIG_DEBUG_FS is not set |
983 | # CONFIG_HEADERS_CHECK is not set | 1238 | # CONFIG_HEADERS_CHECK is not set |
984 | # CONFIG_DEBUG_KERNEL is not set | 1239 | CONFIG_DEBUG_KERNEL=y |
1240 | # CONFIG_DEBUG_SHIRQ is not set | ||
1241 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1242 | CONFIG_SCHED_DEBUG=y | ||
1243 | # CONFIG_SCHEDSTATS is not set | ||
1244 | # CONFIG_TIMER_STATS is not set | ||
1245 | # CONFIG_DEBUG_SLAB is not set | ||
1246 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1247 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1248 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1249 | # CONFIG_DEBUG_MUTEXES is not set | ||
1250 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1251 | # CONFIG_PROVE_LOCKING is not set | ||
1252 | # CONFIG_LOCK_STAT is not set | ||
1253 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1254 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1255 | # CONFIG_DEBUG_KOBJECT is not set | ||
985 | CONFIG_DEBUG_BUGVERBOSE=y | 1256 | CONFIG_DEBUG_BUGVERBOSE=y |
1257 | CONFIG_DEBUG_INFO=y | ||
1258 | # CONFIG_DEBUG_VM is not set | ||
1259 | # CONFIG_DEBUG_LIST is not set | ||
1260 | # CONFIG_DEBUG_SG is not set | ||
986 | CONFIG_FRAME_POINTER=y | 1261 | CONFIG_FRAME_POINTER=y |
1262 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1263 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1264 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1265 | # CONFIG_FAULT_INJECTION is not set | ||
987 | # CONFIG_SAMPLES is not set | 1266 | # CONFIG_SAMPLES is not set |
988 | # CONFIG_DEBUG_USER is not set | 1267 | CONFIG_DEBUG_USER=y |
1268 | CONFIG_DEBUG_ERRORS=y | ||
1269 | # CONFIG_DEBUG_STACK_USAGE is not set | ||
1270 | # CONFIG_DEBUG_LL is not set | ||
989 | 1271 | ||
990 | # | 1272 | # |
991 | # Security options | 1273 | # Security options |
@@ -994,31 +1276,29 @@ CONFIG_FRAME_POINTER=y | |||
994 | # CONFIG_SECURITY is not set | 1276 | # CONFIG_SECURITY is not set |
995 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1277 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
996 | CONFIG_CRYPTO=y | 1278 | CONFIG_CRYPTO=y |
997 | CONFIG_CRYPTO_ALGAPI=y | ||
998 | CONFIG_CRYPTO_BLKCIPHER=y | ||
999 | # CONFIG_CRYPTO_SEQIV is not set | 1279 | # CONFIG_CRYPTO_SEQIV is not set |
1000 | CONFIG_CRYPTO_MANAGER=y | 1280 | # CONFIG_CRYPTO_MANAGER is not set |
1001 | # CONFIG_CRYPTO_HMAC is not set | 1281 | # CONFIG_CRYPTO_HMAC is not set |
1002 | # CONFIG_CRYPTO_XCBC is not set | 1282 | # CONFIG_CRYPTO_XCBC is not set |
1003 | # CONFIG_CRYPTO_NULL is not set | 1283 | # CONFIG_CRYPTO_NULL is not set |
1004 | # CONFIG_CRYPTO_MD4 is not set | 1284 | # CONFIG_CRYPTO_MD4 is not set |
1005 | CONFIG_CRYPTO_MD5=y | 1285 | # CONFIG_CRYPTO_MD5 is not set |
1006 | # CONFIG_CRYPTO_SHA1 is not set | 1286 | # CONFIG_CRYPTO_SHA1 is not set |
1007 | # CONFIG_CRYPTO_SHA256 is not set | 1287 | # CONFIG_CRYPTO_SHA256 is not set |
1008 | # CONFIG_CRYPTO_SHA512 is not set | 1288 | # CONFIG_CRYPTO_SHA512 is not set |
1009 | # CONFIG_CRYPTO_WP512 is not set | 1289 | # CONFIG_CRYPTO_WP512 is not set |
1010 | # CONFIG_CRYPTO_TGR192 is not set | 1290 | # CONFIG_CRYPTO_TGR192 is not set |
1011 | # CONFIG_CRYPTO_GF128MUL is not set | 1291 | # CONFIG_CRYPTO_GF128MUL is not set |
1012 | CONFIG_CRYPTO_ECB=m | 1292 | # CONFIG_CRYPTO_ECB is not set |
1013 | CONFIG_CRYPTO_CBC=y | 1293 | # CONFIG_CRYPTO_CBC is not set |
1014 | CONFIG_CRYPTO_PCBC=m | 1294 | # CONFIG_CRYPTO_PCBC is not set |
1015 | # CONFIG_CRYPTO_LRW is not set | 1295 | # CONFIG_CRYPTO_LRW is not set |
1016 | # CONFIG_CRYPTO_XTS is not set | 1296 | # CONFIG_CRYPTO_XTS is not set |
1017 | # CONFIG_CRYPTO_CTR is not set | 1297 | # CONFIG_CRYPTO_CTR is not set |
1018 | # CONFIG_CRYPTO_GCM is not set | 1298 | # CONFIG_CRYPTO_GCM is not set |
1019 | # CONFIG_CRYPTO_CCM is not set | 1299 | # CONFIG_CRYPTO_CCM is not set |
1020 | # CONFIG_CRYPTO_CRYPTD is not set | 1300 | # CONFIG_CRYPTO_CRYPTD is not set |
1021 | CONFIG_CRYPTO_DES=y | 1301 | # CONFIG_CRYPTO_DES is not set |
1022 | # CONFIG_CRYPTO_FCRYPT is not set | 1302 | # CONFIG_CRYPTO_FCRYPT is not set |
1023 | # CONFIG_CRYPTO_BLOWFISH is not set | 1303 | # CONFIG_CRYPTO_BLOWFISH is not set |
1024 | # CONFIG_CRYPTO_TWOFISH is not set | 1304 | # CONFIG_CRYPTO_TWOFISH is not set |
@@ -1052,6 +1332,7 @@ CONFIG_CRC32=y | |||
1052 | # CONFIG_CRC7 is not set | 1332 | # CONFIG_CRC7 is not set |
1053 | # CONFIG_LIBCRC32C is not set | 1333 | # CONFIG_LIBCRC32C is not set |
1054 | CONFIG_ZLIB_INFLATE=y | 1334 | CONFIG_ZLIB_INFLATE=y |
1335 | CONFIG_ZLIB_DEFLATE=y | ||
1055 | CONFIG_PLIST=y | 1336 | CONFIG_PLIST=y |
1056 | CONFIG_HAS_IOMEM=y | 1337 | CONFIG_HAS_IOMEM=y |
1057 | CONFIG_HAS_IOPORT=y | 1338 | CONFIG_HAS_IOPORT=y |
diff --git a/arch/arm/configs/omap_h4_2420_defconfig b/arch/arm/configs/omap_h4_2420_defconfig new file mode 100644 index 000000000000..5bc89185a64f --- /dev/null +++ b/arch/arm/configs/omap_h4_2420_defconfig | |||
@@ -0,0 +1,1120 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 11:44:58 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
34 | CONFIG_LOCALVERSION="" | ||
35 | CONFIG_LOCALVERSION_AUTO=y | ||
36 | CONFIG_SWAP=y | ||
37 | CONFIG_SYSVIPC=y | ||
38 | CONFIG_SYSVIPC_SYSCTL=y | ||
39 | # CONFIG_POSIX_MQUEUE is not set | ||
40 | CONFIG_BSD_PROCESS_ACCT=y | ||
41 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
42 | # CONFIG_TASKSTATS is not set | ||
43 | # CONFIG_USER_NS is not set | ||
44 | # CONFIG_AUDIT is not set | ||
45 | # CONFIG_IKCONFIG is not set | ||
46 | CONFIG_LOG_BUF_SHIFT=14 | ||
47 | CONFIG_SYSFS_DEPRECATED=y | ||
48 | # CONFIG_RELAY is not set | ||
49 | CONFIG_BLK_DEV_INITRD=y | ||
50 | CONFIG_INITRAMFS_SOURCE="" | ||
51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
52 | CONFIG_SYSCTL=y | ||
53 | CONFIG_EMBEDDED=y | ||
54 | CONFIG_UID16=y | ||
55 | CONFIG_SYSCTL_SYSCALL=y | ||
56 | CONFIG_KALLSYMS=y | ||
57 | # CONFIG_KALLSYMS_ALL is not set | ||
58 | CONFIG_KALLSYMS_EXTRA_PASS=y | ||
59 | CONFIG_HOTPLUG=y | ||
60 | CONFIG_PRINTK=y | ||
61 | CONFIG_BUG=y | ||
62 | CONFIG_ELF_CORE=y | ||
63 | CONFIG_BASE_FULL=y | ||
64 | CONFIG_FUTEX=y | ||
65 | CONFIG_ANON_INODES=y | ||
66 | CONFIG_EPOLL=y | ||
67 | CONFIG_SIGNALFD=y | ||
68 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | ||
70 | CONFIG_SHMEM=y | ||
71 | CONFIG_VM_EVENT_COUNTERS=y | ||
72 | CONFIG_SLAB=y | ||
73 | # CONFIG_SLUB is not set | ||
74 | # CONFIG_SLOB is not set | ||
75 | CONFIG_RT_MUTEXES=y | ||
76 | # CONFIG_TINY_SHMEM is not set | ||
77 | CONFIG_BASE_SMALL=0 | ||
78 | CONFIG_MODULES=y | ||
79 | CONFIG_MODULE_UNLOAD=y | ||
80 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
81 | CONFIG_MODVERSIONS=y | ||
82 | CONFIG_MODULE_SRCVERSION_ALL=y | ||
83 | CONFIG_KMOD=y | ||
84 | CONFIG_BLOCK=y | ||
85 | # CONFIG_LBD is not set | ||
86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
87 | # CONFIG_LSF is not set | ||
88 | # CONFIG_BLK_DEV_BSG is not set | ||
89 | |||
90 | # | ||
91 | # IO Schedulers | ||
92 | # | ||
93 | CONFIG_IOSCHED_NOOP=y | ||
94 | CONFIG_IOSCHED_AS=y | ||
95 | CONFIG_IOSCHED_DEADLINE=y | ||
96 | CONFIG_IOSCHED_CFQ=y | ||
97 | CONFIG_DEFAULT_AS=y | ||
98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
99 | # CONFIG_DEFAULT_CFQ is not set | ||
100 | # CONFIG_DEFAULT_NOOP is not set | ||
101 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
102 | |||
103 | # | ||
104 | # System Type | ||
105 | # | ||
106 | # CONFIG_ARCH_AAEC2000 is not set | ||
107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
108 | # CONFIG_ARCH_REALVIEW is not set | ||
109 | # CONFIG_ARCH_VERSATILE is not set | ||
110 | # CONFIG_ARCH_AT91 is not set | ||
111 | # CONFIG_ARCH_CLPS7500 is not set | ||
112 | # CONFIG_ARCH_CLPS711X is not set | ||
113 | # CONFIG_ARCH_CO285 is not set | ||
114 | # CONFIG_ARCH_EBSA110 is not set | ||
115 | # CONFIG_ARCH_EP93XX is not set | ||
116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
117 | # CONFIG_ARCH_NETX is not set | ||
118 | # CONFIG_ARCH_H720X is not set | ||
119 | # CONFIG_ARCH_IMX is not set | ||
120 | # CONFIG_ARCH_IOP13XX is not set | ||
121 | # CONFIG_ARCH_IOP32X is not set | ||
122 | # CONFIG_ARCH_IOP33X is not set | ||
123 | # CONFIG_ARCH_IXP23XX is not set | ||
124 | # CONFIG_ARCH_IXP2000 is not set | ||
125 | # CONFIG_ARCH_IXP4XX is not set | ||
126 | # CONFIG_ARCH_L7200 is not set | ||
127 | # CONFIG_ARCH_KS8695 is not set | ||
128 | # CONFIG_ARCH_NS9XXX is not set | ||
129 | # CONFIG_ARCH_MXC is not set | ||
130 | # CONFIG_ARCH_PNX4008 is not set | ||
131 | # CONFIG_ARCH_PXA is not set | ||
132 | # CONFIG_ARCH_RPC is not set | ||
133 | # CONFIG_ARCH_SA1100 is not set | ||
134 | # CONFIG_ARCH_S3C2410 is not set | ||
135 | # CONFIG_ARCH_SHARK is not set | ||
136 | # CONFIG_ARCH_LH7A40X is not set | ||
137 | # CONFIG_ARCH_DAVINCI is not set | ||
138 | CONFIG_ARCH_OMAP=y | ||
139 | |||
140 | # | ||
141 | # TI OMAP Implementations | ||
142 | # | ||
143 | CONFIG_ARCH_OMAP_OTG=y | ||
144 | # CONFIG_ARCH_OMAP1 is not set | ||
145 | CONFIG_ARCH_OMAP2=y | ||
146 | # CONFIG_ARCH_OMAP3 is not set | ||
147 | |||
148 | # | ||
149 | # OMAP Feature Selections | ||
150 | # | ||
151 | CONFIG_OMAP_DEBUG_DEVICES=y | ||
152 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
153 | CONFIG_OMAP_BOOT_TAG=y | ||
154 | # CONFIG_OMAP_BOOT_REASON is not set | ||
155 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
156 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
157 | CONFIG_OMAP_MUX=y | ||
158 | CONFIG_OMAP_MUX_DEBUG=y | ||
159 | CONFIG_OMAP_MUX_WARNINGS=y | ||
160 | # CONFIG_OMAP_STI is not set | ||
161 | CONFIG_OMAP_MCBSP=y | ||
162 | # CONFIG_OMAP_MMU_FWK is not set | ||
163 | # CONFIG_OMAP_MBOX_FWK is not set | ||
164 | CONFIG_OMAP_MPU_TIMER=y | ||
165 | # CONFIG_OMAP_32K_TIMER is not set | ||
166 | CONFIG_OMAP_DM_TIMER=y | ||
167 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
168 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
169 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
170 | CONFIG_OMAP_SERIAL_WAKE=y | ||
171 | # CONFIG_OMAP_DSP is not set | ||
172 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
173 | |||
174 | # | ||
175 | # OMAP Core Type | ||
176 | # | ||
177 | CONFIG_ARCH_OMAP24XX=y | ||
178 | CONFIG_ARCH_OMAP2420=y | ||
179 | # CONFIG_ARCH_OMAP2430 is not set | ||
180 | |||
181 | # | ||
182 | # OMAP Board Type | ||
183 | # | ||
184 | # CONFIG_MACH_NOKIA_N800 is not set | ||
185 | CONFIG_MACH_OMAP_H4=y | ||
186 | # CONFIG_MACH_OMAP_H4_TUSB is not set | ||
187 | # CONFIG_MACH_OMAP_H4_OTG is not set | ||
188 | # CONFIG_MACH_OMAP2_H4_USB1 is not set | ||
189 | # CONFIG_MACH_OMAP_APOLLON is not set | ||
190 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
191 | # CONFIG_MACH_OMAP_2430SDP is not set | ||
192 | |||
193 | # | ||
194 | # Boot options | ||
195 | # | ||
196 | |||
197 | # | ||
198 | # Power management | ||
199 | # | ||
200 | |||
201 | # | ||
202 | # Processor Type | ||
203 | # | ||
204 | CONFIG_CPU_32=y | ||
205 | CONFIG_CPU_V6=y | ||
206 | # CONFIG_CPU_32v6K is not set | ||
207 | CONFIG_CPU_32v6=y | ||
208 | CONFIG_CPU_ABRT_EV6=y | ||
209 | CONFIG_CPU_PABRT_NOIFAR=y | ||
210 | CONFIG_CPU_CACHE_V6=y | ||
211 | CONFIG_CPU_CACHE_VIPT=y | ||
212 | CONFIG_CPU_COPY_V6=y | ||
213 | CONFIG_CPU_TLB_V6=y | ||
214 | CONFIG_CPU_HAS_ASID=y | ||
215 | CONFIG_CPU_CP15=y | ||
216 | CONFIG_CPU_CP15_MMU=y | ||
217 | |||
218 | # | ||
219 | # Processor Features | ||
220 | # | ||
221 | CONFIG_ARM_THUMB=y | ||
222 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
223 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
224 | # CONFIG_CPU_BPREDICT_DISABLE is not set | ||
225 | # CONFIG_OUTER_CACHE is not set | ||
226 | |||
227 | # | ||
228 | # Bus support | ||
229 | # | ||
230 | # CONFIG_PCI_SYSCALL is not set | ||
231 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
232 | |||
233 | # | ||
234 | # PCCARD (PCMCIA/CardBus) support | ||
235 | # | ||
236 | # CONFIG_PCCARD is not set | ||
237 | |||
238 | # | ||
239 | # Kernel Features | ||
240 | # | ||
241 | # CONFIG_TICK_ONESHOT is not set | ||
242 | # CONFIG_NO_HZ is not set | ||
243 | # CONFIG_HIGH_RES_TIMERS is not set | ||
244 | # CONFIG_PREEMPT is not set | ||
245 | CONFIG_HZ=100 | ||
246 | CONFIG_AEABI=y | ||
247 | CONFIG_OABI_COMPAT=y | ||
248 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
249 | CONFIG_SELECT_MEMORY_MODEL=y | ||
250 | CONFIG_FLATMEM_MANUAL=y | ||
251 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
252 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
253 | CONFIG_FLATMEM=y | ||
254 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
255 | # CONFIG_SPARSEMEM_STATIC is not set | ||
256 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
257 | # CONFIG_RESOURCES_64BIT is not set | ||
258 | CONFIG_ZONE_DMA_FLAG=1 | ||
259 | CONFIG_BOUNCE=y | ||
260 | CONFIG_VIRT_TO_BUS=y | ||
261 | # CONFIG_LEDS is not set | ||
262 | CONFIG_ALIGNMENT_TRAP=y | ||
263 | |||
264 | # | ||
265 | # Boot options | ||
266 | # | ||
267 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
268 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
269 | CONFIG_CMDLINE="root=/dev/ram0 rw console=ttyS0,115200n8 initrd=0x80600000,8M ramdisk_size=8192" | ||
270 | # CONFIG_XIP_KERNEL is not set | ||
271 | # CONFIG_KEXEC is not set | ||
272 | |||
273 | # | ||
274 | # CPU Frequency scaling | ||
275 | # | ||
276 | # CONFIG_CPU_FREQ is not set | ||
277 | |||
278 | # | ||
279 | # Floating point emulation | ||
280 | # | ||
281 | |||
282 | # | ||
283 | # At least one emulation must be selected | ||
284 | # | ||
285 | CONFIG_FPE_NWFPE=y | ||
286 | # CONFIG_FPE_NWFPE_XP is not set | ||
287 | # CONFIG_FPE_FASTFPE is not set | ||
288 | # CONFIG_VFP is not set | ||
289 | |||
290 | # | ||
291 | # Userspace binary formats | ||
292 | # | ||
293 | CONFIG_BINFMT_ELF=y | ||
294 | # CONFIG_BINFMT_AOUT is not set | ||
295 | CONFIG_BINFMT_MISC=y | ||
296 | |||
297 | # | ||
298 | # Power management options | ||
299 | # | ||
300 | # CONFIG_PM is not set | ||
301 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
302 | |||
303 | # | ||
304 | # Networking | ||
305 | # | ||
306 | CONFIG_NET=y | ||
307 | |||
308 | # | ||
309 | # Networking options | ||
310 | # | ||
311 | CONFIG_PACKET=y | ||
312 | # CONFIG_PACKET_MMAP is not set | ||
313 | CONFIG_UNIX=y | ||
314 | CONFIG_XFRM=y | ||
315 | # CONFIG_XFRM_USER is not set | ||
316 | # CONFIG_XFRM_SUB_POLICY is not set | ||
317 | # CONFIG_XFRM_MIGRATE is not set | ||
318 | CONFIG_NET_KEY=y | ||
319 | # CONFIG_NET_KEY_MIGRATE is not set | ||
320 | CONFIG_INET=y | ||
321 | # CONFIG_IP_MULTICAST is not set | ||
322 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
323 | CONFIG_IP_FIB_HASH=y | ||
324 | CONFIG_IP_PNP=y | ||
325 | CONFIG_IP_PNP_DHCP=y | ||
326 | # CONFIG_IP_PNP_BOOTP is not set | ||
327 | # CONFIG_IP_PNP_RARP is not set | ||
328 | # CONFIG_NET_IPIP is not set | ||
329 | # CONFIG_NET_IPGRE is not set | ||
330 | # CONFIG_ARPD is not set | ||
331 | # CONFIG_SYN_COOKIES is not set | ||
332 | # CONFIG_INET_AH is not set | ||
333 | # CONFIG_INET_ESP is not set | ||
334 | # CONFIG_INET_IPCOMP is not set | ||
335 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
336 | # CONFIG_INET_TUNNEL is not set | ||
337 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
338 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
339 | CONFIG_INET_XFRM_MODE_BEET=y | ||
340 | CONFIG_INET_DIAG=y | ||
341 | CONFIG_INET_TCP_DIAG=y | ||
342 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
343 | CONFIG_TCP_CONG_CUBIC=y | ||
344 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
345 | # CONFIG_TCP_MD5SIG is not set | ||
346 | # CONFIG_IPV6 is not set | ||
347 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
348 | # CONFIG_INET6_TUNNEL is not set | ||
349 | # CONFIG_NETWORK_SECMARK is not set | ||
350 | # CONFIG_NETFILTER is not set | ||
351 | # CONFIG_IP_DCCP is not set | ||
352 | # CONFIG_IP_SCTP is not set | ||
353 | # CONFIG_TIPC is not set | ||
354 | # CONFIG_ATM is not set | ||
355 | # CONFIG_BRIDGE is not set | ||
356 | # CONFIG_VLAN_8021Q is not set | ||
357 | # CONFIG_DECNET is not set | ||
358 | # CONFIG_LLC2 is not set | ||
359 | # CONFIG_IPX is not set | ||
360 | # CONFIG_ATALK is not set | ||
361 | # CONFIG_X25 is not set | ||
362 | # CONFIG_LAPB is not set | ||
363 | # CONFIG_ECONET is not set | ||
364 | # CONFIG_WAN_ROUTER is not set | ||
365 | |||
366 | # | ||
367 | # QoS and/or fair queueing | ||
368 | # | ||
369 | # CONFIG_NET_SCHED is not set | ||
370 | |||
371 | # | ||
372 | # Network testing | ||
373 | # | ||
374 | # CONFIG_NET_PKTGEN is not set | ||
375 | # CONFIG_HAMRADIO is not set | ||
376 | CONFIG_IRDA=y | ||
377 | |||
378 | # | ||
379 | # IrDA protocols | ||
380 | # | ||
381 | CONFIG_IRLAN=y | ||
382 | CONFIG_IRCOMM=y | ||
383 | # CONFIG_IRDA_ULTRA is not set | ||
384 | |||
385 | # | ||
386 | # IrDA options | ||
387 | # | ||
388 | # CONFIG_IRDA_CACHE_LAST_LSAP is not set | ||
389 | # CONFIG_IRDA_FAST_RR is not set | ||
390 | # CONFIG_IRDA_DEBUG is not set | ||
391 | |||
392 | # | ||
393 | # Infrared-port device drivers | ||
394 | # | ||
395 | |||
396 | # | ||
397 | # SIR device drivers | ||
398 | # | ||
399 | # CONFIG_IRTTY_SIR is not set | ||
400 | |||
401 | # | ||
402 | # Dongle support | ||
403 | # | ||
404 | |||
405 | # | ||
406 | # Old SIR device drivers | ||
407 | # | ||
408 | # CONFIG_IRPORT_SIR is not set | ||
409 | |||
410 | # | ||
411 | # Old Serial dongle support | ||
412 | # | ||
413 | |||
414 | # | ||
415 | # FIR device drivers | ||
416 | # | ||
417 | CONFIG_OMAP_IR=y | ||
418 | # CONFIG_BT is not set | ||
419 | # CONFIG_AF_RXRPC is not set | ||
420 | |||
421 | # | ||
422 | # Wireless | ||
423 | # | ||
424 | # CONFIG_CFG80211 is not set | ||
425 | # CONFIG_WIRELESS_EXT is not set | ||
426 | # CONFIG_MAC80211 is not set | ||
427 | # CONFIG_IEEE80211 is not set | ||
428 | # CONFIG_RFKILL is not set | ||
429 | # CONFIG_NET_9P is not set | ||
430 | |||
431 | # | ||
432 | # Device Drivers | ||
433 | # | ||
434 | |||
435 | # | ||
436 | # Generic Driver Options | ||
437 | # | ||
438 | CONFIG_STANDALONE=y | ||
439 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
440 | # CONFIG_FW_LOADER is not set | ||
441 | # CONFIG_DEBUG_DRIVER is not set | ||
442 | # CONFIG_DEBUG_DEVRES is not set | ||
443 | # CONFIG_SYS_HYPERVISOR is not set | ||
444 | # CONFIG_CONNECTOR is not set | ||
445 | CONFIG_MTD=y | ||
446 | # CONFIG_MTD_DEBUG is not set | ||
447 | CONFIG_MTD_CONCAT=y | ||
448 | CONFIG_MTD_PARTITIONS=y | ||
449 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
450 | CONFIG_MTD_CMDLINE_PARTS=y | ||
451 | # CONFIG_MTD_AFS_PARTS is not set | ||
452 | |||
453 | # | ||
454 | # User Modules And Translation Layers | ||
455 | # | ||
456 | CONFIG_MTD_CHAR=y | ||
457 | CONFIG_MTD_BLKDEVS=y | ||
458 | CONFIG_MTD_BLOCK=y | ||
459 | # CONFIG_FTL is not set | ||
460 | # CONFIG_NFTL is not set | ||
461 | # CONFIG_INFTL is not set | ||
462 | # CONFIG_RFD_FTL is not set | ||
463 | # CONFIG_SSFDC is not set | ||
464 | |||
465 | # | ||
466 | # RAM/ROM/Flash chip drivers | ||
467 | # | ||
468 | CONFIG_MTD_CFI=y | ||
469 | # CONFIG_MTD_JEDECPROBE is not set | ||
470 | CONFIG_MTD_GEN_PROBE=y | ||
471 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
472 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
473 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
474 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
475 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
476 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
477 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
478 | CONFIG_MTD_CFI_I1=y | ||
479 | CONFIG_MTD_CFI_I2=y | ||
480 | # CONFIG_MTD_CFI_I4 is not set | ||
481 | # CONFIG_MTD_CFI_I8 is not set | ||
482 | CONFIG_MTD_CFI_INTELEXT=y | ||
483 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
484 | # CONFIG_MTD_CFI_STAA is not set | ||
485 | CONFIG_MTD_CFI_UTIL=y | ||
486 | # CONFIG_MTD_RAM is not set | ||
487 | # CONFIG_MTD_ROM is not set | ||
488 | # CONFIG_MTD_ABSENT is not set | ||
489 | |||
490 | # | ||
491 | # Mapping drivers for chip access | ||
492 | # | ||
493 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
494 | # CONFIG_MTD_PHYSMAP is not set | ||
495 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
496 | CONFIG_MTD_OMAP_NOR=y | ||
497 | # CONFIG_MTD_PLATRAM is not set | ||
498 | |||
499 | # | ||
500 | # Self-contained MTD device drivers | ||
501 | # | ||
502 | # CONFIG_MTD_SLRAM is not set | ||
503 | # CONFIG_MTD_PHRAM is not set | ||
504 | # CONFIG_MTD_MTDRAM is not set | ||
505 | # CONFIG_MTD_BLOCK2MTD is not set | ||
506 | |||
507 | # | ||
508 | # Disk-On-Chip Device Drivers | ||
509 | # | ||
510 | # CONFIG_MTD_DOC2000 is not set | ||
511 | # CONFIG_MTD_DOC2001 is not set | ||
512 | # CONFIG_MTD_DOC2001PLUS is not set | ||
513 | # CONFIG_MTD_NAND is not set | ||
514 | # CONFIG_MTD_ONENAND is not set | ||
515 | |||
516 | # | ||
517 | # UBI - Unsorted block images | ||
518 | # | ||
519 | # CONFIG_MTD_UBI is not set | ||
520 | # CONFIG_PARPORT is not set | ||
521 | CONFIG_BLK_DEV=y | ||
522 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
523 | CONFIG_BLK_DEV_LOOP=y | ||
524 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
525 | # CONFIG_BLK_DEV_NBD is not set | ||
526 | CONFIG_BLK_DEV_RAM=y | ||
527 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
528 | CONFIG_BLK_DEV_RAM_SIZE=16384 | ||
529 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
530 | # CONFIG_CDROM_PKTCDVD is not set | ||
531 | # CONFIG_ATA_OVER_ETH is not set | ||
532 | |||
533 | # | ||
534 | # SCSI device support | ||
535 | # | ||
536 | # CONFIG_RAID_ATTRS is not set | ||
537 | # CONFIG_SCSI is not set | ||
538 | # CONFIG_SCSI_DMA is not set | ||
539 | # CONFIG_SCSI_NETLINK is not set | ||
540 | # CONFIG_ATA is not set | ||
541 | # CONFIG_MD is not set | ||
542 | CONFIG_NETDEVICES=y | ||
543 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
544 | # CONFIG_DUMMY is not set | ||
545 | # CONFIG_BONDING is not set | ||
546 | # CONFIG_MACVLAN is not set | ||
547 | # CONFIG_EQUALIZER is not set | ||
548 | # CONFIG_TUN is not set | ||
549 | # CONFIG_PHYLIB is not set | ||
550 | CONFIG_NET_ETHERNET=y | ||
551 | CONFIG_MII=y | ||
552 | # CONFIG_AX88796 is not set | ||
553 | CONFIG_SMC91X=y | ||
554 | # CONFIG_DM9000 is not set | ||
555 | CONFIG_NETDEV_1000=y | ||
556 | CONFIG_NETDEV_10000=y | ||
557 | |||
558 | # | ||
559 | # Wireless LAN | ||
560 | # | ||
561 | # CONFIG_WLAN_PRE80211 is not set | ||
562 | # CONFIG_WLAN_80211 is not set | ||
563 | # CONFIG_WAN is not set | ||
564 | # CONFIG_PPP is not set | ||
565 | # CONFIG_SLIP is not set | ||
566 | # CONFIG_SHAPER is not set | ||
567 | # CONFIG_NETCONSOLE is not set | ||
568 | # CONFIG_NETPOLL is not set | ||
569 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
570 | # CONFIG_ISDN is not set | ||
571 | |||
572 | # | ||
573 | # Input device support | ||
574 | # | ||
575 | CONFIG_INPUT=y | ||
576 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
577 | # CONFIG_INPUT_POLLDEV is not set | ||
578 | |||
579 | # | ||
580 | # Userland interfaces | ||
581 | # | ||
582 | # CONFIG_INPUT_MOUSEDEV is not set | ||
583 | # CONFIG_INPUT_JOYDEV is not set | ||
584 | # CONFIG_INPUT_TSDEV is not set | ||
585 | CONFIG_INPUT_EVDEV=y | ||
586 | # CONFIG_INPUT_EVBUG is not set | ||
587 | |||
588 | # | ||
589 | # Input Device Drivers | ||
590 | # | ||
591 | CONFIG_INPUT_KEYBOARD=y | ||
592 | # CONFIG_KEYBOARD_ATKBD is not set | ||
593 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
594 | # CONFIG_KEYBOARD_LKKBD is not set | ||
595 | # CONFIG_KEYBOARD_XTKBD is not set | ||
596 | # CONFIG_KEYBOARD_NEWTON is not set | ||
597 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
598 | CONFIG_KEYBOARD_OMAP=y | ||
599 | # CONFIG_KEYBOARD_GPIO is not set | ||
600 | # CONFIG_INPUT_MOUSE is not set | ||
601 | # CONFIG_INPUT_JOYSTICK is not set | ||
602 | # CONFIG_INPUT_TABLET is not set | ||
603 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
604 | # CONFIG_INPUT_MISC is not set | ||
605 | |||
606 | # | ||
607 | # Hardware I/O ports | ||
608 | # | ||
609 | # CONFIG_SERIO is not set | ||
610 | # CONFIG_GAMEPORT is not set | ||
611 | |||
612 | # | ||
613 | # Character devices | ||
614 | # | ||
615 | CONFIG_VT=y | ||
616 | CONFIG_VT_CONSOLE=y | ||
617 | CONFIG_HW_CONSOLE=y | ||
618 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
619 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
620 | |||
621 | # | ||
622 | # Serial drivers | ||
623 | # | ||
624 | CONFIG_SERIAL_8250=y | ||
625 | CONFIG_SERIAL_8250_CONSOLE=y | ||
626 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
627 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
628 | CONFIG_SERIAL_8250_EXTENDED=y | ||
629 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
630 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
631 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
632 | CONFIG_SERIAL_8250_RSA=y | ||
633 | |||
634 | # | ||
635 | # Non-8250 serial port support | ||
636 | # | ||
637 | CONFIG_SERIAL_CORE=y | ||
638 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
639 | CONFIG_UNIX98_PTYS=y | ||
640 | # CONFIG_LEGACY_PTYS is not set | ||
641 | # CONFIG_IPMI_HANDLER is not set | ||
642 | CONFIG_WATCHDOG=y | ||
643 | CONFIG_WATCHDOG_NOWAYOUT=y | ||
644 | |||
645 | # | ||
646 | # Watchdog Device Drivers | ||
647 | # | ||
648 | # CONFIG_SOFT_WATCHDOG is not set | ||
649 | CONFIG_OMAP_WATCHDOG=y | ||
650 | CONFIG_HW_RANDOM=m | ||
651 | CONFIG_HW_RANDOM_OMAP=m | ||
652 | # CONFIG_NVRAM is not set | ||
653 | # CONFIG_R3964 is not set | ||
654 | # CONFIG_RAW_DRIVER is not set | ||
655 | # CONFIG_TCG_TPM is not set | ||
656 | CONFIG_I2C=y | ||
657 | CONFIG_I2C_BOARDINFO=y | ||
658 | # CONFIG_I2C_CHARDEV is not set | ||
659 | |||
660 | # | ||
661 | # I2C Algorithms | ||
662 | # | ||
663 | # CONFIG_I2C_ALGOBIT is not set | ||
664 | # CONFIG_I2C_ALGOPCF is not set | ||
665 | # CONFIG_I2C_ALGOPCA is not set | ||
666 | |||
667 | # | ||
668 | # I2C Hardware Bus support | ||
669 | # | ||
670 | # CONFIG_I2C_GPIO is not set | ||
671 | # CONFIG_I2C_OCORES is not set | ||
672 | CONFIG_I2C_OMAP=y | ||
673 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
674 | # CONFIG_I2C_SIMTEC is not set | ||
675 | # CONFIG_I2C_TAOS_EVM is not set | ||
676 | # CONFIG_I2C_STUB is not set | ||
677 | |||
678 | # | ||
679 | # Miscellaneous I2C Chip support | ||
680 | # | ||
681 | # CONFIG_SENSORS_DS1337 is not set | ||
682 | # CONFIG_SENSORS_DS1374 is not set | ||
683 | # CONFIG_DS1682 is not set | ||
684 | # CONFIG_SENSORS_EEPROM is not set | ||
685 | # CONFIG_SENSORS_PCF8574 is not set | ||
686 | # CONFIG_SENSORS_PCA9539 is not set | ||
687 | # CONFIG_SENSORS_PCF8591 is not set | ||
688 | # CONFIG_ISP1301_OMAP is not set | ||
689 | # CONFIG_TPS65010 is not set | ||
690 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
691 | CONFIG_GPIOEXPANDER_OMAP=y | ||
692 | # CONFIG_TWL4030_CORE is not set | ||
693 | # CONFIG_SENSORS_MAX6875 is not set | ||
694 | # CONFIG_SENSORS_TSL2550 is not set | ||
695 | CONFIG_MENELAUS=y | ||
696 | # CONFIG_I2C_DEBUG_CORE is not set | ||
697 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
698 | # CONFIG_I2C_DEBUG_BUS is not set | ||
699 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
700 | |||
701 | # | ||
702 | # SPI support | ||
703 | # | ||
704 | # CONFIG_SPI is not set | ||
705 | # CONFIG_SPI_MASTER is not set | ||
706 | # CONFIG_W1 is not set | ||
707 | # CONFIG_HWMON is not set | ||
708 | CONFIG_MISC_DEVICES=y | ||
709 | # CONFIG_EEPROM_93CX6 is not set | ||
710 | |||
711 | # | ||
712 | # Multifunction device drivers | ||
713 | # | ||
714 | # CONFIG_MFD_SM501 is not set | ||
715 | # CONFIG_NEW_LEDS is not set | ||
716 | |||
717 | # | ||
718 | # Multimedia devices | ||
719 | # | ||
720 | # CONFIG_VIDEO_DEV is not set | ||
721 | # CONFIG_DVB_CORE is not set | ||
722 | CONFIG_DAB=y | ||
723 | |||
724 | # | ||
725 | # Graphics support | ||
726 | # | ||
727 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
728 | |||
729 | # | ||
730 | # Display device support | ||
731 | # | ||
732 | # CONFIG_DISPLAY_SUPPORT is not set | ||
733 | # CONFIG_VGASTATE is not set | ||
734 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
735 | CONFIG_FB=y | ||
736 | CONFIG_FIRMWARE_EDID=y | ||
737 | # CONFIG_FB_DDC is not set | ||
738 | # CONFIG_FB_CFB_FILLRECT is not set | ||
739 | # CONFIG_FB_CFB_COPYAREA is not set | ||
740 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
741 | # CONFIG_FB_SYS_FILLRECT is not set | ||
742 | # CONFIG_FB_SYS_COPYAREA is not set | ||
743 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
744 | # CONFIG_FB_SYS_FOPS is not set | ||
745 | CONFIG_FB_DEFERRED_IO=y | ||
746 | # CONFIG_FB_SVGALIB is not set | ||
747 | # CONFIG_FB_MACMODES is not set | ||
748 | # CONFIG_FB_BACKLIGHT is not set | ||
749 | # CONFIG_FB_MODE_HELPERS is not set | ||
750 | # CONFIG_FB_TILEBLITTING is not set | ||
751 | |||
752 | # | ||
753 | # Frame buffer hardware drivers | ||
754 | # | ||
755 | # CONFIG_FB_S1D13XXX is not set | ||
756 | CONFIG_FB_OMAP=y | ||
757 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
758 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
759 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
760 | # CONFIG_FB_VIRTUAL is not set | ||
761 | |||
762 | # | ||
763 | # Console display driver support | ||
764 | # | ||
765 | # CONFIG_VGA_CONSOLE is not set | ||
766 | CONFIG_DUMMY_CONSOLE=y | ||
767 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
768 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
769 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
770 | # CONFIG_FONTS is not set | ||
771 | CONFIG_FONT_8x8=y | ||
772 | CONFIG_FONT_8x16=y | ||
773 | CONFIG_LOGO=y | ||
774 | # CONFIG_LOGO_LINUX_MONO is not set | ||
775 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
776 | CONFIG_LOGO_LINUX_CLUT224=y | ||
777 | |||
778 | # | ||
779 | # Sound | ||
780 | # | ||
781 | # CONFIG_SOUND is not set | ||
782 | CONFIG_HID_SUPPORT=y | ||
783 | CONFIG_HID=y | ||
784 | # CONFIG_HID_DEBUG is not set | ||
785 | CONFIG_USB_SUPPORT=y | ||
786 | CONFIG_USB_ARCH_HAS_HCD=y | ||
787 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
788 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
789 | # CONFIG_USB is not set | ||
790 | |||
791 | # | ||
792 | # Enable Host or Gadget support to see Inventra options | ||
793 | # | ||
794 | |||
795 | # | ||
796 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
797 | # | ||
798 | |||
799 | # | ||
800 | # USB Gadget Support | ||
801 | # | ||
802 | # CONFIG_USB_GADGET is not set | ||
803 | CONFIG_MMC=y | ||
804 | # CONFIG_MMC_DEBUG is not set | ||
805 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
806 | |||
807 | # | ||
808 | # MMC/SD Card Drivers | ||
809 | # | ||
810 | CONFIG_MMC_BLOCK=y | ||
811 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
812 | |||
813 | # | ||
814 | # MMC/SD Host Controller Drivers | ||
815 | # | ||
816 | CONFIG_MMC_OMAP=y | ||
817 | CONFIG_RTC_LIB=y | ||
818 | # CONFIG_RTC_CLASS is not set | ||
819 | |||
820 | # | ||
821 | # DMA Engine support | ||
822 | # | ||
823 | # CONFIG_DMA_ENGINE is not set | ||
824 | |||
825 | # | ||
826 | # DMA Clients | ||
827 | # | ||
828 | |||
829 | # | ||
830 | # DMA Devices | ||
831 | # | ||
832 | |||
833 | # | ||
834 | # CBUS support | ||
835 | # | ||
836 | # CONFIG_CBUS is not set | ||
837 | |||
838 | # | ||
839 | # File systems | ||
840 | # | ||
841 | CONFIG_EXT2_FS=y | ||
842 | # CONFIG_EXT2_FS_XATTR is not set | ||
843 | # CONFIG_EXT2_FS_XIP is not set | ||
844 | CONFIG_EXT3_FS=y | ||
845 | # CONFIG_EXT3_FS_XATTR is not set | ||
846 | # CONFIG_EXT4DEV_FS is not set | ||
847 | CONFIG_JBD=y | ||
848 | # CONFIG_JBD_DEBUG is not set | ||
849 | # CONFIG_REISERFS_FS is not set | ||
850 | # CONFIG_JFS_FS is not set | ||
851 | # CONFIG_FS_POSIX_ACL is not set | ||
852 | # CONFIG_XFS_FS is not set | ||
853 | # CONFIG_GFS2_FS is not set | ||
854 | # CONFIG_OCFS2_FS is not set | ||
855 | # CONFIG_MINIX_FS is not set | ||
856 | # CONFIG_ROMFS_FS is not set | ||
857 | CONFIG_INOTIFY=y | ||
858 | CONFIG_INOTIFY_USER=y | ||
859 | CONFIG_QUOTA=y | ||
860 | # CONFIG_QFMT_V1 is not set | ||
861 | CONFIG_QFMT_V2=y | ||
862 | CONFIG_QUOTACTL=y | ||
863 | CONFIG_DNOTIFY=y | ||
864 | # CONFIG_AUTOFS_FS is not set | ||
865 | # CONFIG_AUTOFS4_FS is not set | ||
866 | # CONFIG_FUSE_FS is not set | ||
867 | |||
868 | # | ||
869 | # CD-ROM/DVD Filesystems | ||
870 | # | ||
871 | # CONFIG_ISO9660_FS is not set | ||
872 | # CONFIG_UDF_FS is not set | ||
873 | |||
874 | # | ||
875 | # DOS/FAT/NT Filesystems | ||
876 | # | ||
877 | CONFIG_FAT_FS=y | ||
878 | CONFIG_MSDOS_FS=y | ||
879 | CONFIG_VFAT_FS=y | ||
880 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
881 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
882 | # CONFIG_NTFS_FS is not set | ||
883 | |||
884 | # | ||
885 | # Pseudo filesystems | ||
886 | # | ||
887 | CONFIG_PROC_FS=y | ||
888 | CONFIG_PROC_SYSCTL=y | ||
889 | CONFIG_SYSFS=y | ||
890 | CONFIG_TMPFS=y | ||
891 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
892 | # CONFIG_HUGETLB_PAGE is not set | ||
893 | CONFIG_RAMFS=y | ||
894 | # CONFIG_CONFIGFS_FS is not set | ||
895 | |||
896 | # | ||
897 | # Miscellaneous filesystems | ||
898 | # | ||
899 | # CONFIG_ADFS_FS is not set | ||
900 | # CONFIG_AFFS_FS is not set | ||
901 | # CONFIG_HFS_FS is not set | ||
902 | # CONFIG_HFSPLUS_FS is not set | ||
903 | # CONFIG_BEFS_FS is not set | ||
904 | # CONFIG_BFS_FS is not set | ||
905 | # CONFIG_EFS_FS is not set | ||
906 | CONFIG_JFFS2_FS=y | ||
907 | CONFIG_JFFS2_FS_DEBUG=0 | ||
908 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
909 | # CONFIG_JFFS2_SUMMARY is not set | ||
910 | # CONFIG_JFFS2_FS_XATTR is not set | ||
911 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
912 | CONFIG_JFFS2_ZLIB=y | ||
913 | CONFIG_JFFS2_RTIME=y | ||
914 | # CONFIG_JFFS2_RUBIN is not set | ||
915 | # CONFIG_CRAMFS is not set | ||
916 | # CONFIG_VXFS_FS is not set | ||
917 | # CONFIG_HPFS_FS is not set | ||
918 | # CONFIG_QNX4FS_FS is not set | ||
919 | # CONFIG_SYSV_FS is not set | ||
920 | # CONFIG_UFS_FS is not set | ||
921 | |||
922 | # | ||
923 | # Network File Systems | ||
924 | # | ||
925 | CONFIG_NFS_FS=y | ||
926 | CONFIG_NFS_V3=y | ||
927 | # CONFIG_NFS_V3_ACL is not set | ||
928 | CONFIG_NFS_V4=y | ||
929 | # CONFIG_NFS_DIRECTIO is not set | ||
930 | # CONFIG_NFSD is not set | ||
931 | CONFIG_ROOT_NFS=y | ||
932 | CONFIG_LOCKD=y | ||
933 | CONFIG_LOCKD_V4=y | ||
934 | CONFIG_NFS_COMMON=y | ||
935 | CONFIG_SUNRPC=y | ||
936 | CONFIG_SUNRPC_GSS=y | ||
937 | # CONFIG_SUNRPC_BIND34 is not set | ||
938 | CONFIG_RPCSEC_GSS_KRB5=y | ||
939 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
940 | # CONFIG_SMB_FS is not set | ||
941 | # CONFIG_CIFS is not set | ||
942 | # CONFIG_NCP_FS is not set | ||
943 | # CONFIG_CODA_FS is not set | ||
944 | # CONFIG_AFS_FS is not set | ||
945 | |||
946 | # | ||
947 | # Partition Types | ||
948 | # | ||
949 | CONFIG_PARTITION_ADVANCED=y | ||
950 | # CONFIG_ACORN_PARTITION is not set | ||
951 | # CONFIG_OSF_PARTITION is not set | ||
952 | # CONFIG_AMIGA_PARTITION is not set | ||
953 | # CONFIG_ATARI_PARTITION is not set | ||
954 | # CONFIG_MAC_PARTITION is not set | ||
955 | CONFIG_MSDOS_PARTITION=y | ||
956 | # CONFIG_BSD_DISKLABEL is not set | ||
957 | # CONFIG_MINIX_SUBPARTITION is not set | ||
958 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
959 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
960 | # CONFIG_LDM_PARTITION is not set | ||
961 | # CONFIG_SGI_PARTITION is not set | ||
962 | # CONFIG_ULTRIX_PARTITION is not set | ||
963 | # CONFIG_SUN_PARTITION is not set | ||
964 | # CONFIG_KARMA_PARTITION is not set | ||
965 | # CONFIG_EFI_PARTITION is not set | ||
966 | # CONFIG_SYSV68_PARTITION is not set | ||
967 | |||
968 | # | ||
969 | # Native Language Support | ||
970 | # | ||
971 | CONFIG_NLS=y | ||
972 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
973 | CONFIG_NLS_CODEPAGE_437=y | ||
974 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
975 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
976 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
977 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
978 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
979 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
980 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
981 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
982 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
983 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
984 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
985 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
986 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
987 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
988 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
989 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
990 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
991 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
992 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
993 | # CONFIG_NLS_ISO8859_8 is not set | ||
994 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
995 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
996 | # CONFIG_NLS_ASCII is not set | ||
997 | # CONFIG_NLS_ISO8859_1 is not set | ||
998 | # CONFIG_NLS_ISO8859_2 is not set | ||
999 | # CONFIG_NLS_ISO8859_3 is not set | ||
1000 | # CONFIG_NLS_ISO8859_4 is not set | ||
1001 | # CONFIG_NLS_ISO8859_5 is not set | ||
1002 | # CONFIG_NLS_ISO8859_6 is not set | ||
1003 | # CONFIG_NLS_ISO8859_7 is not set | ||
1004 | # CONFIG_NLS_ISO8859_9 is not set | ||
1005 | # CONFIG_NLS_ISO8859_13 is not set | ||
1006 | # CONFIG_NLS_ISO8859_14 is not set | ||
1007 | # CONFIG_NLS_ISO8859_15 is not set | ||
1008 | # CONFIG_NLS_KOI8_R is not set | ||
1009 | # CONFIG_NLS_KOI8_U is not set | ||
1010 | # CONFIG_NLS_UTF8 is not set | ||
1011 | |||
1012 | # | ||
1013 | # Distributed Lock Manager | ||
1014 | # | ||
1015 | # CONFIG_DLM is not set | ||
1016 | |||
1017 | # | ||
1018 | # Profiling support | ||
1019 | # | ||
1020 | # CONFIG_PROFILING is not set | ||
1021 | |||
1022 | # | ||
1023 | # Kernel hacking | ||
1024 | # | ||
1025 | # CONFIG_PRINTK_TIME is not set | ||
1026 | CONFIG_ENABLE_MUST_CHECK=y | ||
1027 | CONFIG_MAGIC_SYSRQ=y | ||
1028 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1029 | # CONFIG_DEBUG_FS is not set | ||
1030 | # CONFIG_HEADERS_CHECK is not set | ||
1031 | CONFIG_DEBUG_KERNEL=y | ||
1032 | # CONFIG_DEBUG_SHIRQ is not set | ||
1033 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1034 | CONFIG_SCHED_DEBUG=y | ||
1035 | # CONFIG_SCHEDSTATS is not set | ||
1036 | # CONFIG_TIMER_STATS is not set | ||
1037 | # CONFIG_DEBUG_SLAB is not set | ||
1038 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1039 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1040 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1041 | CONFIG_DEBUG_MUTEXES=y | ||
1042 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1043 | # CONFIG_PROVE_LOCKING is not set | ||
1044 | # CONFIG_LOCK_STAT is not set | ||
1045 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1046 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1047 | # CONFIG_DEBUG_KOBJECT is not set | ||
1048 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
1049 | # CONFIG_DEBUG_INFO is not set | ||
1050 | # CONFIG_DEBUG_VM is not set | ||
1051 | # CONFIG_DEBUG_LIST is not set | ||
1052 | CONFIG_FRAME_POINTER=y | ||
1053 | CONFIG_FORCED_INLINING=y | ||
1054 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1055 | # CONFIG_FAULT_INJECTION is not set | ||
1056 | # CONFIG_DEBUG_USER is not set | ||
1057 | # CONFIG_DEBUG_ERRORS is not set | ||
1058 | CONFIG_DEBUG_LL=y | ||
1059 | # CONFIG_DEBUG_ICEDCC is not set | ||
1060 | |||
1061 | # | ||
1062 | # Security options | ||
1063 | # | ||
1064 | # CONFIG_KEYS is not set | ||
1065 | # CONFIG_SECURITY is not set | ||
1066 | CONFIG_CRYPTO=y | ||
1067 | CONFIG_CRYPTO_ALGAPI=y | ||
1068 | CONFIG_CRYPTO_BLKCIPHER=y | ||
1069 | CONFIG_CRYPTO_MANAGER=y | ||
1070 | # CONFIG_CRYPTO_HMAC is not set | ||
1071 | # CONFIG_CRYPTO_XCBC is not set | ||
1072 | # CONFIG_CRYPTO_NULL is not set | ||
1073 | # CONFIG_CRYPTO_MD4 is not set | ||
1074 | CONFIG_CRYPTO_MD5=y | ||
1075 | # CONFIG_CRYPTO_SHA1 is not set | ||
1076 | # CONFIG_CRYPTO_SHA256 is not set | ||
1077 | # CONFIG_CRYPTO_SHA512 is not set | ||
1078 | # CONFIG_CRYPTO_WP512 is not set | ||
1079 | # CONFIG_CRYPTO_TGR192 is not set | ||
1080 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1081 | CONFIG_CRYPTO_ECB=m | ||
1082 | CONFIG_CRYPTO_CBC=y | ||
1083 | CONFIG_CRYPTO_PCBC=m | ||
1084 | # CONFIG_CRYPTO_LRW is not set | ||
1085 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1086 | CONFIG_CRYPTO_DES=y | ||
1087 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1088 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1089 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1090 | # CONFIG_CRYPTO_SERPENT is not set | ||
1091 | # CONFIG_CRYPTO_AES is not set | ||
1092 | # CONFIG_CRYPTO_CAST5 is not set | ||
1093 | # CONFIG_CRYPTO_CAST6 is not set | ||
1094 | # CONFIG_CRYPTO_TEA is not set | ||
1095 | # CONFIG_CRYPTO_ARC4 is not set | ||
1096 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1097 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1098 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1099 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1100 | # CONFIG_CRYPTO_CRC32C is not set | ||
1101 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1102 | # CONFIG_CRYPTO_TEST is not set | ||
1103 | CONFIG_CRYPTO_HW=y | ||
1104 | |||
1105 | # | ||
1106 | # Library routines | ||
1107 | # | ||
1108 | CONFIG_BITREVERSE=y | ||
1109 | CONFIG_CRC_CCITT=y | ||
1110 | # CONFIG_CRC16 is not set | ||
1111 | # CONFIG_CRC_ITU_T is not set | ||
1112 | CONFIG_CRC32=y | ||
1113 | # CONFIG_CRC7 is not set | ||
1114 | CONFIG_LIBCRC32C=y | ||
1115 | CONFIG_ZLIB_INFLATE=y | ||
1116 | CONFIG_ZLIB_DEFLATE=y | ||
1117 | CONFIG_PLIST=y | ||
1118 | CONFIG_HAS_IOMEM=y | ||
1119 | CONFIG_HAS_IOPORT=y | ||
1120 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_innovator_1510_defconfig b/arch/arm/configs/omap_innovator_1510_defconfig new file mode 100644 index 000000000000..55b2611bd90a --- /dev/null +++ b/arch/arm/configs/omap_innovator_1510_defconfig | |||
@@ -0,0 +1,1253 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 11:45:02 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_LOCK_KERNEL=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | CONFIG_LOCALVERSION="" | ||
36 | CONFIG_LOCALVERSION_AUTO=y | ||
37 | CONFIG_SWAP=y | ||
38 | CONFIG_SYSVIPC=y | ||
39 | CONFIG_SYSVIPC_SYSCTL=y | ||
40 | # CONFIG_POSIX_MQUEUE is not set | ||
41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
42 | # CONFIG_TASKSTATS is not set | ||
43 | # CONFIG_USER_NS is not set | ||
44 | # CONFIG_AUDIT is not set | ||
45 | # CONFIG_IKCONFIG is not set | ||
46 | CONFIG_LOG_BUF_SHIFT=14 | ||
47 | CONFIG_SYSFS_DEPRECATED=y | ||
48 | # CONFIG_RELAY is not set | ||
49 | CONFIG_BLK_DEV_INITRD=y | ||
50 | CONFIG_INITRAMFS_SOURCE="" | ||
51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
52 | CONFIG_SYSCTL=y | ||
53 | # CONFIG_EMBEDDED is not set | ||
54 | CONFIG_UID16=y | ||
55 | CONFIG_SYSCTL_SYSCALL=y | ||
56 | CONFIG_KALLSYMS=y | ||
57 | # CONFIG_KALLSYMS_ALL is not set | ||
58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
59 | CONFIG_HOTPLUG=y | ||
60 | CONFIG_PRINTK=y | ||
61 | CONFIG_BUG=y | ||
62 | CONFIG_ELF_CORE=y | ||
63 | CONFIG_BASE_FULL=y | ||
64 | CONFIG_FUTEX=y | ||
65 | CONFIG_ANON_INODES=y | ||
66 | CONFIG_EPOLL=y | ||
67 | CONFIG_SIGNALFD=y | ||
68 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | ||
70 | CONFIG_SHMEM=y | ||
71 | CONFIG_VM_EVENT_COUNTERS=y | ||
72 | CONFIG_SLAB=y | ||
73 | # CONFIG_SLUB is not set | ||
74 | # CONFIG_SLOB is not set | ||
75 | CONFIG_RT_MUTEXES=y | ||
76 | # CONFIG_TINY_SHMEM is not set | ||
77 | CONFIG_BASE_SMALL=0 | ||
78 | CONFIG_MODULES=y | ||
79 | CONFIG_MODULE_UNLOAD=y | ||
80 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
81 | # CONFIG_MODVERSIONS is not set | ||
82 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
83 | CONFIG_KMOD=y | ||
84 | CONFIG_BLOCK=y | ||
85 | # CONFIG_LBD is not set | ||
86 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
87 | # CONFIG_LSF is not set | ||
88 | # CONFIG_BLK_DEV_BSG is not set | ||
89 | |||
90 | # | ||
91 | # IO Schedulers | ||
92 | # | ||
93 | CONFIG_IOSCHED_NOOP=y | ||
94 | CONFIG_IOSCHED_AS=y | ||
95 | CONFIG_IOSCHED_DEADLINE=y | ||
96 | CONFIG_IOSCHED_CFQ=y | ||
97 | # CONFIG_DEFAULT_AS is not set | ||
98 | # CONFIG_DEFAULT_DEADLINE is not set | ||
99 | CONFIG_DEFAULT_CFQ=y | ||
100 | # CONFIG_DEFAULT_NOOP is not set | ||
101 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
102 | |||
103 | # | ||
104 | # System Type | ||
105 | # | ||
106 | # CONFIG_ARCH_AAEC2000 is not set | ||
107 | # CONFIG_ARCH_INTEGRATOR is not set | ||
108 | # CONFIG_ARCH_REALVIEW is not set | ||
109 | # CONFIG_ARCH_VERSATILE is not set | ||
110 | # CONFIG_ARCH_AT91 is not set | ||
111 | # CONFIG_ARCH_CLPS7500 is not set | ||
112 | # CONFIG_ARCH_CLPS711X is not set | ||
113 | # CONFIG_ARCH_CO285 is not set | ||
114 | # CONFIG_ARCH_EBSA110 is not set | ||
115 | # CONFIG_ARCH_EP93XX is not set | ||
116 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
117 | # CONFIG_ARCH_NETX is not set | ||
118 | # CONFIG_ARCH_H720X is not set | ||
119 | # CONFIG_ARCH_IMX is not set | ||
120 | # CONFIG_ARCH_IOP13XX is not set | ||
121 | # CONFIG_ARCH_IOP32X is not set | ||
122 | # CONFIG_ARCH_IOP33X is not set | ||
123 | # CONFIG_ARCH_IXP23XX is not set | ||
124 | # CONFIG_ARCH_IXP2000 is not set | ||
125 | # CONFIG_ARCH_IXP4XX is not set | ||
126 | # CONFIG_ARCH_L7200 is not set | ||
127 | # CONFIG_ARCH_KS8695 is not set | ||
128 | # CONFIG_ARCH_NS9XXX is not set | ||
129 | # CONFIG_ARCH_MXC is not set | ||
130 | # CONFIG_ARCH_PNX4008 is not set | ||
131 | # CONFIG_ARCH_PXA is not set | ||
132 | # CONFIG_ARCH_RPC is not set | ||
133 | # CONFIG_ARCH_SA1100 is not set | ||
134 | # CONFIG_ARCH_S3C2410 is not set | ||
135 | # CONFIG_ARCH_SHARK is not set | ||
136 | # CONFIG_ARCH_LH7A40X is not set | ||
137 | # CONFIG_ARCH_DAVINCI is not set | ||
138 | CONFIG_ARCH_OMAP=y | ||
139 | |||
140 | # | ||
141 | # TI OMAP Implementations | ||
142 | # | ||
143 | CONFIG_ARCH_OMAP1=y | ||
144 | # CONFIG_ARCH_OMAP2 is not set | ||
145 | # CONFIG_ARCH_OMAP3 is not set | ||
146 | |||
147 | # | ||
148 | # OMAP Feature Selections | ||
149 | # | ||
150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
153 | CONFIG_OMAP_MUX=y | ||
154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
156 | CONFIG_OMAP_MCBSP=y | ||
157 | # CONFIG_OMAP_MMU_FWK is not set | ||
158 | # CONFIG_OMAP_MBOX_FWK is not set | ||
159 | CONFIG_OMAP_MPU_TIMER=y | ||
160 | # CONFIG_OMAP_32K_TIMER is not set | ||
161 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
163 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
164 | CONFIG_OMAP_SERIAL_WAKE=y | ||
165 | # CONFIG_OMAP_DSP is not set | ||
166 | |||
167 | # | ||
168 | # OMAP Core Type | ||
169 | # | ||
170 | # CONFIG_ARCH_OMAP730 is not set | ||
171 | CONFIG_ARCH_OMAP15XX=y | ||
172 | # CONFIG_ARCH_OMAP16XX is not set | ||
173 | |||
174 | # | ||
175 | # OMAP Board Type | ||
176 | # | ||
177 | CONFIG_MACH_OMAP_INNOVATOR=y | ||
178 | # CONFIG_MACH_VOICEBLUE is not set | ||
179 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
180 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
181 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
182 | # CONFIG_MACH_SX1 is not set | ||
183 | # CONFIG_MACH_AMS_DELTA is not set | ||
184 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
185 | |||
186 | # | ||
187 | # OMAP CPU Speed | ||
188 | # | ||
189 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
190 | CONFIG_OMAP_ARM_168MHZ=y | ||
191 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
192 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
193 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
194 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
195 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
196 | |||
197 | # | ||
198 | # Boot options | ||
199 | # | ||
200 | |||
201 | # | ||
202 | # Power management | ||
203 | # | ||
204 | |||
205 | # | ||
206 | # Processor Type | ||
207 | # | ||
208 | CONFIG_CPU_32=y | ||
209 | CONFIG_CPU_ARM925T=y | ||
210 | CONFIG_CPU_32v4T=y | ||
211 | CONFIG_CPU_ABRT_EV4T=y | ||
212 | CONFIG_CPU_PABRT_NOIFAR=y | ||
213 | CONFIG_CPU_CACHE_V4WT=y | ||
214 | CONFIG_CPU_CACHE_VIVT=y | ||
215 | CONFIG_CPU_COPY_V4WB=y | ||
216 | CONFIG_CPU_TLB_V4WBI=y | ||
217 | CONFIG_CPU_CP15=y | ||
218 | CONFIG_CPU_CP15_MMU=y | ||
219 | |||
220 | # | ||
221 | # Processor Features | ||
222 | # | ||
223 | CONFIG_ARM_THUMB=y | ||
224 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
225 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
226 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | ||
227 | # CONFIG_OUTER_CACHE is not set | ||
228 | |||
229 | # | ||
230 | # Bus support | ||
231 | # | ||
232 | # CONFIG_PCI_SYSCALL is not set | ||
233 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
234 | |||
235 | # | ||
236 | # PCCARD (PCMCIA/CardBus) support | ||
237 | # | ||
238 | # CONFIG_PCCARD is not set | ||
239 | |||
240 | # | ||
241 | # Kernel Features | ||
242 | # | ||
243 | # CONFIG_TICK_ONESHOT is not set | ||
244 | # CONFIG_NO_HZ is not set | ||
245 | # CONFIG_HIGH_RES_TIMERS is not set | ||
246 | CONFIG_PREEMPT=y | ||
247 | CONFIG_HZ=100 | ||
248 | # CONFIG_AEABI is not set | ||
249 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
250 | CONFIG_SELECT_MEMORY_MODEL=y | ||
251 | CONFIG_FLATMEM_MANUAL=y | ||
252 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
253 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
254 | CONFIG_FLATMEM=y | ||
255 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
256 | # CONFIG_SPARSEMEM_STATIC is not set | ||
257 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
258 | # CONFIG_RESOURCES_64BIT is not set | ||
259 | CONFIG_ZONE_DMA_FLAG=1 | ||
260 | CONFIG_BOUNCE=y | ||
261 | CONFIG_VIRT_TO_BUS=y | ||
262 | CONFIG_LEDS=y | ||
263 | CONFIG_ALIGNMENT_TRAP=y | ||
264 | |||
265 | # | ||
266 | # Boot options | ||
267 | # | ||
268 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
269 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
270 | CONFIG_CMDLINE="console=ttyS0,115200n8 root=/dev/nfs ip=bootp noinitrd" | ||
271 | # CONFIG_XIP_KERNEL is not set | ||
272 | # CONFIG_KEXEC is not set | ||
273 | |||
274 | # | ||
275 | # CPU Frequency scaling | ||
276 | # | ||
277 | # CONFIG_CPU_FREQ is not set | ||
278 | |||
279 | # | ||
280 | # Floating point emulation | ||
281 | # | ||
282 | |||
283 | # | ||
284 | # At least one emulation must be selected | ||
285 | # | ||
286 | CONFIG_FPE_NWFPE=y | ||
287 | # CONFIG_FPE_NWFPE_XP is not set | ||
288 | # CONFIG_FPE_FASTFPE is not set | ||
289 | |||
290 | # | ||
291 | # Userspace binary formats | ||
292 | # | ||
293 | CONFIG_BINFMT_ELF=y | ||
294 | # CONFIG_BINFMT_AOUT is not set | ||
295 | # CONFIG_BINFMT_MISC is not set | ||
296 | # CONFIG_ARTHUR is not set | ||
297 | |||
298 | # | ||
299 | # Power management options | ||
300 | # | ||
301 | CONFIG_PM=y | ||
302 | # CONFIG_PM_LEGACY is not set | ||
303 | # CONFIG_PM_DEBUG is not set | ||
304 | CONFIG_PM_SLEEP=y | ||
305 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
306 | CONFIG_SUSPEND=y | ||
307 | # CONFIG_APM_EMULATION is not set | ||
308 | |||
309 | # | ||
310 | # Networking | ||
311 | # | ||
312 | CONFIG_NET=y | ||
313 | |||
314 | # | ||
315 | # Networking options | ||
316 | # | ||
317 | CONFIG_PACKET=y | ||
318 | # CONFIG_PACKET_MMAP is not set | ||
319 | CONFIG_UNIX=y | ||
320 | CONFIG_XFRM=y | ||
321 | # CONFIG_XFRM_USER is not set | ||
322 | # CONFIG_XFRM_SUB_POLICY is not set | ||
323 | # CONFIG_XFRM_MIGRATE is not set | ||
324 | # CONFIG_NET_KEY is not set | ||
325 | CONFIG_INET=y | ||
326 | CONFIG_IP_MULTICAST=y | ||
327 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
328 | CONFIG_IP_FIB_HASH=y | ||
329 | CONFIG_IP_PNP=y | ||
330 | CONFIG_IP_PNP_DHCP=y | ||
331 | CONFIG_IP_PNP_BOOTP=y | ||
332 | # CONFIG_IP_PNP_RARP is not set | ||
333 | # CONFIG_NET_IPIP is not set | ||
334 | # CONFIG_NET_IPGRE is not set | ||
335 | # CONFIG_IP_MROUTE is not set | ||
336 | # CONFIG_ARPD is not set | ||
337 | # CONFIG_SYN_COOKIES is not set | ||
338 | # CONFIG_INET_AH is not set | ||
339 | # CONFIG_INET_ESP is not set | ||
340 | # CONFIG_INET_IPCOMP is not set | ||
341 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
342 | # CONFIG_INET_TUNNEL is not set | ||
343 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
344 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
345 | CONFIG_INET_XFRM_MODE_BEET=y | ||
346 | CONFIG_INET_DIAG=y | ||
347 | CONFIG_INET_TCP_DIAG=y | ||
348 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
349 | CONFIG_TCP_CONG_CUBIC=y | ||
350 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
351 | # CONFIG_TCP_MD5SIG is not set | ||
352 | # CONFIG_IPV6 is not set | ||
353 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
354 | # CONFIG_INET6_TUNNEL is not set | ||
355 | # CONFIG_NETWORK_SECMARK is not set | ||
356 | # CONFIG_NETFILTER is not set | ||
357 | # CONFIG_IP_DCCP is not set | ||
358 | # CONFIG_IP_SCTP is not set | ||
359 | # CONFIG_TIPC is not set | ||
360 | # CONFIG_ATM is not set | ||
361 | # CONFIG_BRIDGE is not set | ||
362 | # CONFIG_VLAN_8021Q is not set | ||
363 | # CONFIG_DECNET is not set | ||
364 | # CONFIG_LLC2 is not set | ||
365 | # CONFIG_IPX is not set | ||
366 | # CONFIG_ATALK is not set | ||
367 | # CONFIG_X25 is not set | ||
368 | # CONFIG_LAPB is not set | ||
369 | # CONFIG_ECONET is not set | ||
370 | # CONFIG_WAN_ROUTER is not set | ||
371 | |||
372 | # | ||
373 | # QoS and/or fair queueing | ||
374 | # | ||
375 | # CONFIG_NET_SCHED is not set | ||
376 | |||
377 | # | ||
378 | # Network testing | ||
379 | # | ||
380 | # CONFIG_NET_PKTGEN is not set | ||
381 | # CONFIG_HAMRADIO is not set | ||
382 | # CONFIG_IRDA is not set | ||
383 | # CONFIG_BT is not set | ||
384 | # CONFIG_AF_RXRPC is not set | ||
385 | |||
386 | # | ||
387 | # Wireless | ||
388 | # | ||
389 | # CONFIG_CFG80211 is not set | ||
390 | # CONFIG_WIRELESS_EXT is not set | ||
391 | # CONFIG_MAC80211 is not set | ||
392 | # CONFIG_IEEE80211 is not set | ||
393 | # CONFIG_RFKILL is not set | ||
394 | # CONFIG_NET_9P is not set | ||
395 | |||
396 | # | ||
397 | # Device Drivers | ||
398 | # | ||
399 | |||
400 | # | ||
401 | # Generic Driver Options | ||
402 | # | ||
403 | CONFIG_STANDALONE=y | ||
404 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
405 | # CONFIG_FW_LOADER is not set | ||
406 | # CONFIG_DEBUG_DRIVER is not set | ||
407 | # CONFIG_DEBUG_DEVRES is not set | ||
408 | # CONFIG_SYS_HYPERVISOR is not set | ||
409 | # CONFIG_CONNECTOR is not set | ||
410 | # CONFIG_MTD is not set | ||
411 | # CONFIG_PARPORT is not set | ||
412 | CONFIG_BLK_DEV=y | ||
413 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
414 | CONFIG_BLK_DEV_LOOP=y | ||
415 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
416 | # CONFIG_BLK_DEV_NBD is not set | ||
417 | # CONFIG_BLK_DEV_UB is not set | ||
418 | CONFIG_BLK_DEV_RAM=y | ||
419 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
420 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
421 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
422 | # CONFIG_CDROM_PKTCDVD is not set | ||
423 | # CONFIG_ATA_OVER_ETH is not set | ||
424 | |||
425 | # | ||
426 | # SCSI device support | ||
427 | # | ||
428 | # CONFIG_RAID_ATTRS is not set | ||
429 | CONFIG_SCSI=y | ||
430 | CONFIG_SCSI_DMA=y | ||
431 | # CONFIG_SCSI_TGT is not set | ||
432 | # CONFIG_SCSI_NETLINK is not set | ||
433 | CONFIG_SCSI_PROC_FS=y | ||
434 | |||
435 | # | ||
436 | # SCSI support type (disk, tape, CD-ROM) | ||
437 | # | ||
438 | CONFIG_BLK_DEV_SD=y | ||
439 | CONFIG_CHR_DEV_ST=y | ||
440 | # CONFIG_CHR_DEV_OSST is not set | ||
441 | CONFIG_BLK_DEV_SR=y | ||
442 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
443 | CONFIG_CHR_DEV_SG=y | ||
444 | # CONFIG_CHR_DEV_SCH is not set | ||
445 | |||
446 | # | ||
447 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
448 | # | ||
449 | CONFIG_SCSI_MULTI_LUN=y | ||
450 | # CONFIG_SCSI_CONSTANTS is not set | ||
451 | # CONFIG_SCSI_LOGGING is not set | ||
452 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
453 | CONFIG_SCSI_WAIT_SCAN=m | ||
454 | |||
455 | # | ||
456 | # SCSI Transports | ||
457 | # | ||
458 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
459 | # CONFIG_SCSI_FC_ATTRS is not set | ||
460 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
461 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
462 | CONFIG_SCSI_LOWLEVEL=y | ||
463 | # CONFIG_ISCSI_TCP is not set | ||
464 | # CONFIG_SCSI_DEBUG is not set | ||
465 | # CONFIG_ATA is not set | ||
466 | # CONFIG_MD is not set | ||
467 | CONFIG_NETDEVICES=y | ||
468 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
469 | # CONFIG_DUMMY is not set | ||
470 | # CONFIG_BONDING is not set | ||
471 | # CONFIG_MACVLAN is not set | ||
472 | # CONFIG_EQUALIZER is not set | ||
473 | # CONFIG_TUN is not set | ||
474 | # CONFIG_PHYLIB is not set | ||
475 | CONFIG_NET_ETHERNET=y | ||
476 | CONFIG_MII=y | ||
477 | # CONFIG_AX88796 is not set | ||
478 | CONFIG_SMC91X=y | ||
479 | # CONFIG_DM9000 is not set | ||
480 | CONFIG_NETDEV_1000=y | ||
481 | CONFIG_NETDEV_10000=y | ||
482 | |||
483 | # | ||
484 | # Wireless LAN | ||
485 | # | ||
486 | # CONFIG_WLAN_PRE80211 is not set | ||
487 | # CONFIG_WLAN_80211 is not set | ||
488 | |||
489 | # | ||
490 | # USB Network Adapters | ||
491 | # | ||
492 | # CONFIG_USB_CATC is not set | ||
493 | # CONFIG_USB_KAWETH is not set | ||
494 | # CONFIG_USB_PEGASUS is not set | ||
495 | CONFIG_USB_RTL8150=y | ||
496 | CONFIG_USB_USBNET_MII=y | ||
497 | CONFIG_USB_USBNET=y | ||
498 | CONFIG_USB_NET_AX8817X=y | ||
499 | CONFIG_USB_NET_CDCETHER=y | ||
500 | # CONFIG_USB_NET_DM9601 is not set | ||
501 | # CONFIG_USB_NET_GL620A is not set | ||
502 | CONFIG_USB_NET_NET1080=y | ||
503 | # CONFIG_USB_NET_PLUSB is not set | ||
504 | # CONFIG_USB_NET_MCS7830 is not set | ||
505 | # CONFIG_USB_NET_RNDIS_HOST is not set | ||
506 | # CONFIG_USB_NET_CDC_SUBSET is not set | ||
507 | CONFIG_USB_NET_ZAURUS=y | ||
508 | # CONFIG_WAN is not set | ||
509 | CONFIG_PPP=y | ||
510 | CONFIG_PPP_MULTILINK=y | ||
511 | # CONFIG_PPP_FILTER is not set | ||
512 | CONFIG_PPP_ASYNC=y | ||
513 | # CONFIG_PPP_SYNC_TTY is not set | ||
514 | CONFIG_PPP_DEFLATE=y | ||
515 | CONFIG_PPP_BSDCOMP=y | ||
516 | # CONFIG_PPP_MPPE is not set | ||
517 | # CONFIG_PPPOE is not set | ||
518 | # CONFIG_PPPOL2TP is not set | ||
519 | # CONFIG_SLIP is not set | ||
520 | CONFIG_SLHC=y | ||
521 | # CONFIG_SHAPER is not set | ||
522 | # CONFIG_NETCONSOLE is not set | ||
523 | # CONFIG_NETPOLL is not set | ||
524 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
525 | # CONFIG_ISDN is not set | ||
526 | |||
527 | # | ||
528 | # Input device support | ||
529 | # | ||
530 | CONFIG_INPUT=y | ||
531 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
532 | # CONFIG_INPUT_POLLDEV is not set | ||
533 | |||
534 | # | ||
535 | # Userland interfaces | ||
536 | # | ||
537 | CONFIG_INPUT_MOUSEDEV=y | ||
538 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
539 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 | ||
540 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | ||
541 | # CONFIG_INPUT_JOYDEV is not set | ||
542 | # CONFIG_INPUT_TSDEV is not set | ||
543 | # CONFIG_INPUT_EVDEV is not set | ||
544 | # CONFIG_INPUT_EVBUG is not set | ||
545 | |||
546 | # | ||
547 | # Input Device Drivers | ||
548 | # | ||
549 | CONFIG_INPUT_KEYBOARD=y | ||
550 | # CONFIG_KEYBOARD_ATKBD is not set | ||
551 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
552 | # CONFIG_KEYBOARD_LKKBD is not set | ||
553 | # CONFIG_KEYBOARD_XTKBD is not set | ||
554 | # CONFIG_KEYBOARD_NEWTON is not set | ||
555 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
556 | CONFIG_KEYBOARD_OMAP=y | ||
557 | CONFIG_OMAP_PS2=m | ||
558 | # CONFIG_KEYBOARD_GPIO is not set | ||
559 | # CONFIG_INPUT_MOUSE is not set | ||
560 | # CONFIG_INPUT_JOYSTICK is not set | ||
561 | # CONFIG_INPUT_TABLET is not set | ||
562 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
563 | # CONFIG_INPUT_MISC is not set | ||
564 | |||
565 | # | ||
566 | # Hardware I/O ports | ||
567 | # | ||
568 | CONFIG_SERIO=y | ||
569 | CONFIG_SERIO_SERPORT=y | ||
570 | # CONFIG_SERIO_RAW is not set | ||
571 | # CONFIG_GAMEPORT is not set | ||
572 | |||
573 | # | ||
574 | # Character devices | ||
575 | # | ||
576 | CONFIG_VT=y | ||
577 | CONFIG_VT_CONSOLE=y | ||
578 | CONFIG_HW_CONSOLE=y | ||
579 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
580 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
581 | |||
582 | # | ||
583 | # Serial drivers | ||
584 | # | ||
585 | CONFIG_SERIAL_8250=y | ||
586 | CONFIG_SERIAL_8250_CONSOLE=y | ||
587 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
588 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
589 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
590 | |||
591 | # | ||
592 | # Non-8250 serial port support | ||
593 | # | ||
594 | CONFIG_SERIAL_CORE=y | ||
595 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
596 | CONFIG_UNIX98_PTYS=y | ||
597 | # CONFIG_LEGACY_PTYS is not set | ||
598 | # CONFIG_IPMI_HANDLER is not set | ||
599 | # CONFIG_WATCHDOG is not set | ||
600 | CONFIG_HW_RANDOM=m | ||
601 | # CONFIG_NVRAM is not set | ||
602 | # CONFIG_R3964 is not set | ||
603 | # CONFIG_RAW_DRIVER is not set | ||
604 | # CONFIG_TCG_TPM is not set | ||
605 | CONFIG_I2C=y | ||
606 | CONFIG_I2C_BOARDINFO=y | ||
607 | # CONFIG_I2C_CHARDEV is not set | ||
608 | |||
609 | # | ||
610 | # I2C Algorithms | ||
611 | # | ||
612 | # CONFIG_I2C_ALGOBIT is not set | ||
613 | # CONFIG_I2C_ALGOPCF is not set | ||
614 | # CONFIG_I2C_ALGOPCA is not set | ||
615 | |||
616 | # | ||
617 | # I2C Hardware Bus support | ||
618 | # | ||
619 | # CONFIG_I2C_GPIO is not set | ||
620 | # CONFIG_I2C_OCORES is not set | ||
621 | # CONFIG_I2C_OMAP is not set | ||
622 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
623 | # CONFIG_I2C_SIMTEC is not set | ||
624 | # CONFIG_I2C_TAOS_EVM is not set | ||
625 | # CONFIG_I2C_STUB is not set | ||
626 | # CONFIG_I2C_TINY_USB is not set | ||
627 | |||
628 | # | ||
629 | # Miscellaneous I2C Chip support | ||
630 | # | ||
631 | # CONFIG_SENSORS_DS1337 is not set | ||
632 | # CONFIG_SENSORS_DS1374 is not set | ||
633 | # CONFIG_DS1682 is not set | ||
634 | # CONFIG_SENSORS_EEPROM is not set | ||
635 | # CONFIG_SENSORS_PCF8574 is not set | ||
636 | # CONFIG_SENSORS_PCA9539 is not set | ||
637 | # CONFIG_SENSORS_PCF8591 is not set | ||
638 | # CONFIG_TPS65010 is not set | ||
639 | # CONFIG_SENSORS_MAX6875 is not set | ||
640 | # CONFIG_SENSORS_TSL2550 is not set | ||
641 | # CONFIG_I2C_DEBUG_CORE is not set | ||
642 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
643 | # CONFIG_I2C_DEBUG_BUS is not set | ||
644 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
645 | |||
646 | # | ||
647 | # SPI support | ||
648 | # | ||
649 | # CONFIG_SPI is not set | ||
650 | # CONFIG_SPI_MASTER is not set | ||
651 | # CONFIG_W1 is not set | ||
652 | CONFIG_HWMON=y | ||
653 | # CONFIG_HWMON_VID is not set | ||
654 | # CONFIG_SENSORS_ABITUGURU is not set | ||
655 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
656 | # CONFIG_SENSORS_AD7418 is not set | ||
657 | # CONFIG_SENSORS_ADM1021 is not set | ||
658 | # CONFIG_SENSORS_ADM1025 is not set | ||
659 | # CONFIG_SENSORS_ADM1026 is not set | ||
660 | # CONFIG_SENSORS_ADM1029 is not set | ||
661 | # CONFIG_SENSORS_ADM1031 is not set | ||
662 | # CONFIG_SENSORS_ADM9240 is not set | ||
663 | # CONFIG_SENSORS_ASB100 is not set | ||
664 | # CONFIG_SENSORS_ATXP1 is not set | ||
665 | # CONFIG_SENSORS_DS1621 is not set | ||
666 | # CONFIG_SENSORS_F71805F is not set | ||
667 | # CONFIG_SENSORS_FSCHER is not set | ||
668 | # CONFIG_SENSORS_FSCPOS is not set | ||
669 | # CONFIG_SENSORS_GL518SM is not set | ||
670 | # CONFIG_SENSORS_GL520SM is not set | ||
671 | # CONFIG_SENSORS_IT87 is not set | ||
672 | # CONFIG_SENSORS_LM63 is not set | ||
673 | # CONFIG_SENSORS_LM75 is not set | ||
674 | # CONFIG_SENSORS_LM77 is not set | ||
675 | # CONFIG_SENSORS_LM78 is not set | ||
676 | # CONFIG_SENSORS_LM80 is not set | ||
677 | # CONFIG_SENSORS_LM83 is not set | ||
678 | # CONFIG_SENSORS_LM85 is not set | ||
679 | # CONFIG_SENSORS_LM87 is not set | ||
680 | # CONFIG_SENSORS_LM90 is not set | ||
681 | # CONFIG_SENSORS_LM92 is not set | ||
682 | # CONFIG_SENSORS_LM93 is not set | ||
683 | # CONFIG_SENSORS_MAX1619 is not set | ||
684 | # CONFIG_SENSORS_MAX6650 is not set | ||
685 | # CONFIG_SENSORS_PC87360 is not set | ||
686 | # CONFIG_SENSORS_PC87427 is not set | ||
687 | # CONFIG_SENSORS_DME1737 is not set | ||
688 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
689 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
690 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
691 | # CONFIG_SENSORS_THMC50 is not set | ||
692 | # CONFIG_SENSORS_VT1211 is not set | ||
693 | # CONFIG_SENSORS_W83781D is not set | ||
694 | # CONFIG_SENSORS_W83791D is not set | ||
695 | # CONFIG_SENSORS_W83792D is not set | ||
696 | # CONFIG_SENSORS_W83793 is not set | ||
697 | # CONFIG_SENSORS_W83L785TS is not set | ||
698 | # CONFIG_SENSORS_W83627HF is not set | ||
699 | # CONFIG_SENSORS_W83627EHF is not set | ||
700 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
701 | CONFIG_MISC_DEVICES=y | ||
702 | # CONFIG_EEPROM_93CX6 is not set | ||
703 | |||
704 | # | ||
705 | # Multifunction device drivers | ||
706 | # | ||
707 | # CONFIG_MFD_SM501 is not set | ||
708 | # CONFIG_NEW_LEDS is not set | ||
709 | |||
710 | # | ||
711 | # Multimedia devices | ||
712 | # | ||
713 | # CONFIG_VIDEO_DEV is not set | ||
714 | # CONFIG_DVB_CORE is not set | ||
715 | CONFIG_DAB=y | ||
716 | # CONFIG_USB_DABUSB is not set | ||
717 | |||
718 | # | ||
719 | # Graphics support | ||
720 | # | ||
721 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
722 | |||
723 | # | ||
724 | # Display device support | ||
725 | # | ||
726 | # CONFIG_DISPLAY_SUPPORT is not set | ||
727 | # CONFIG_VGASTATE is not set | ||
728 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
729 | CONFIG_FB=y | ||
730 | # CONFIG_FIRMWARE_EDID is not set | ||
731 | # CONFIG_FB_DDC is not set | ||
732 | # CONFIG_FB_CFB_FILLRECT is not set | ||
733 | # CONFIG_FB_CFB_COPYAREA is not set | ||
734 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
735 | # CONFIG_FB_SYS_FILLRECT is not set | ||
736 | # CONFIG_FB_SYS_COPYAREA is not set | ||
737 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
738 | # CONFIG_FB_SYS_FOPS is not set | ||
739 | CONFIG_FB_DEFERRED_IO=y | ||
740 | # CONFIG_FB_SVGALIB is not set | ||
741 | # CONFIG_FB_MACMODES is not set | ||
742 | # CONFIG_FB_BACKLIGHT is not set | ||
743 | # CONFIG_FB_MODE_HELPERS is not set | ||
744 | # CONFIG_FB_TILEBLITTING is not set | ||
745 | |||
746 | # | ||
747 | # Frame buffer hardware drivers | ||
748 | # | ||
749 | # CONFIG_FB_S1D13XXX is not set | ||
750 | CONFIG_FB_OMAP=y | ||
751 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
752 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
753 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
754 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
755 | # CONFIG_FB_VIRTUAL is not set | ||
756 | |||
757 | # | ||
758 | # Console display driver support | ||
759 | # | ||
760 | # CONFIG_VGA_CONSOLE is not set | ||
761 | CONFIG_DUMMY_CONSOLE=y | ||
762 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
763 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
764 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
765 | CONFIG_FONTS=y | ||
766 | CONFIG_FONT_8x8=y | ||
767 | CONFIG_FONT_8x16=y | ||
768 | # CONFIG_FONT_6x11 is not set | ||
769 | # CONFIG_FONT_7x14 is not set | ||
770 | # CONFIG_FONT_PEARL_8x8 is not set | ||
771 | # CONFIG_FONT_ACORN_8x8 is not set | ||
772 | # CONFIG_FONT_MINI_4x6 is not set | ||
773 | # CONFIG_FONT_SUN8x16 is not set | ||
774 | # CONFIG_FONT_SUN12x22 is not set | ||
775 | # CONFIG_FONT_10x18 is not set | ||
776 | CONFIG_LOGO=y | ||
777 | CONFIG_LOGO_LINUX_MONO=y | ||
778 | CONFIG_LOGO_LINUX_VGA16=y | ||
779 | CONFIG_LOGO_LINUX_CLUT224=y | ||
780 | |||
781 | # | ||
782 | # Sound | ||
783 | # | ||
784 | # CONFIG_SOUND is not set | ||
785 | CONFIG_HID_SUPPORT=y | ||
786 | CONFIG_HID=y | ||
787 | # CONFIG_HID_DEBUG is not set | ||
788 | |||
789 | # | ||
790 | # USB Input Devices | ||
791 | # | ||
792 | CONFIG_USB_HID=y | ||
793 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | ||
794 | # CONFIG_HID_FF is not set | ||
795 | # CONFIG_USB_HIDDEV is not set | ||
796 | CONFIG_USB_SUPPORT=y | ||
797 | CONFIG_USB_ARCH_HAS_HCD=y | ||
798 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
799 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
800 | CONFIG_USB=y | ||
801 | CONFIG_USB_DEBUG=y | ||
802 | |||
803 | # | ||
804 | # Miscellaneous USB options | ||
805 | # | ||
806 | CONFIG_USB_DEVICEFS=y | ||
807 | # CONFIG_USB_DEVICE_CLASS is not set | ||
808 | # CONFIG_USB_DYNAMIC_MINORS is not set | ||
809 | CONFIG_USB_SUSPEND=y | ||
810 | # CONFIG_USB_PERSIST is not set | ||
811 | # CONFIG_USB_OTG is not set | ||
812 | |||
813 | # | ||
814 | # USB Host Controller Drivers | ||
815 | # | ||
816 | # CONFIG_USB_ISP116X_HCD is not set | ||
817 | CONFIG_USB_OHCI_HCD=y | ||
818 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | ||
819 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | ||
820 | CONFIG_USB_OHCI_LITTLE_ENDIAN=y | ||
821 | # CONFIG_USB_SL811_HCD is not set | ||
822 | # CONFIG_USB_R8A66597_HCD is not set | ||
823 | # CONFIG_USB_MUSB_HDRC is not set | ||
824 | |||
825 | # | ||
826 | # USB Device Class drivers | ||
827 | # | ||
828 | # CONFIG_USB_ACM is not set | ||
829 | # CONFIG_USB_PRINTER is not set | ||
830 | |||
831 | # | ||
832 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
833 | # | ||
834 | |||
835 | # | ||
836 | # may also be needed; see USB_STORAGE Help for more information | ||
837 | # | ||
838 | CONFIG_USB_STORAGE=y | ||
839 | # CONFIG_USB_STORAGE_DEBUG is not set | ||
840 | CONFIG_USB_STORAGE_DATAFAB=y | ||
841 | CONFIG_USB_STORAGE_FREECOM=y | ||
842 | CONFIG_USB_STORAGE_DPCM=y | ||
843 | # CONFIG_USB_STORAGE_USBAT is not set | ||
844 | CONFIG_USB_STORAGE_SDDR09=y | ||
845 | CONFIG_USB_STORAGE_SDDR55=y | ||
846 | CONFIG_USB_STORAGE_JUMPSHOT=y | ||
847 | # CONFIG_USB_STORAGE_ALAUDA is not set | ||
848 | # CONFIG_USB_STORAGE_KARMA is not set | ||
849 | # CONFIG_USB_LIBUSUAL is not set | ||
850 | |||
851 | # | ||
852 | # USB Imaging devices | ||
853 | # | ||
854 | # CONFIG_USB_MDC800 is not set | ||
855 | # CONFIG_USB_MICROTEK is not set | ||
856 | CONFIG_USB_MON=y | ||
857 | |||
858 | # | ||
859 | # USB port drivers | ||
860 | # | ||
861 | |||
862 | # | ||
863 | # USB Serial Converter support | ||
864 | # | ||
865 | # CONFIG_USB_SERIAL is not set | ||
866 | |||
867 | # | ||
868 | # USB Miscellaneous drivers | ||
869 | # | ||
870 | # CONFIG_USB_EMI62 is not set | ||
871 | # CONFIG_USB_EMI26 is not set | ||
872 | # CONFIG_USB_ADUTUX is not set | ||
873 | # CONFIG_USB_AUERSWALD is not set | ||
874 | # CONFIG_USB_RIO500 is not set | ||
875 | # CONFIG_USB_LEGOTOWER is not set | ||
876 | # CONFIG_USB_LCD is not set | ||
877 | # CONFIG_USB_BERRY_CHARGE is not set | ||
878 | # CONFIG_USB_LED is not set | ||
879 | # CONFIG_USB_CYPRESS_CY7C63 is not set | ||
880 | # CONFIG_USB_CYTHERM is not set | ||
881 | # CONFIG_USB_PHIDGET is not set | ||
882 | # CONFIG_USB_IDMOUSE is not set | ||
883 | # CONFIG_USB_FTDI_ELAN is not set | ||
884 | # CONFIG_USB_APPLEDISPLAY is not set | ||
885 | # CONFIG_USB_LD is not set | ||
886 | # CONFIG_USB_TRANCEVIBRATOR is not set | ||
887 | # CONFIG_USB_IOWARRIOR is not set | ||
888 | # CONFIG_USB_TEST is not set | ||
889 | |||
890 | # | ||
891 | # USB DSL modem support | ||
892 | # | ||
893 | |||
894 | # | ||
895 | # USB Gadget Support | ||
896 | # | ||
897 | # CONFIG_USB_GADGET is not set | ||
898 | CONFIG_MMC=y | ||
899 | # CONFIG_MMC_DEBUG is not set | ||
900 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
901 | |||
902 | # | ||
903 | # MMC/SD Card Drivers | ||
904 | # | ||
905 | CONFIG_MMC_BLOCK=y | ||
906 | CONFIG_MMC_BLOCK_BOUNCE=y | ||
907 | |||
908 | # | ||
909 | # MMC/SD Host Controller Drivers | ||
910 | # | ||
911 | CONFIG_MMC_OMAP=y | ||
912 | CONFIG_RTC_LIB=y | ||
913 | CONFIG_RTC_CLASS=y | ||
914 | CONFIG_RTC_HCTOSYS=y | ||
915 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
916 | # CONFIG_RTC_DEBUG is not set | ||
917 | |||
918 | # | ||
919 | # RTC interfaces | ||
920 | # | ||
921 | CONFIG_RTC_INTF_SYSFS=y | ||
922 | CONFIG_RTC_INTF_PROC=y | ||
923 | CONFIG_RTC_INTF_DEV=y | ||
924 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
925 | # CONFIG_RTC_DRV_TEST is not set | ||
926 | |||
927 | # | ||
928 | # I2C RTC drivers | ||
929 | # | ||
930 | # CONFIG_RTC_DRV_DS1307 is not set | ||
931 | # CONFIG_RTC_DRV_DS1672 is not set | ||
932 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
933 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
934 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
935 | # CONFIG_RTC_DRV_X1205 is not set | ||
936 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
937 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
938 | # CONFIG_RTC_DRV_M41T80 is not set | ||
939 | |||
940 | # | ||
941 | # SPI RTC drivers | ||
942 | # | ||
943 | |||
944 | # | ||
945 | # Platform RTC drivers | ||
946 | # | ||
947 | # CONFIG_RTC_DRV_CMOS is not set | ||
948 | # CONFIG_RTC_DRV_DS1553 is not set | ||
949 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
950 | # CONFIG_RTC_DRV_DS1742 is not set | ||
951 | # CONFIG_RTC_DRV_M48T86 is not set | ||
952 | # CONFIG_RTC_DRV_M48T59 is not set | ||
953 | # CONFIG_RTC_DRV_V3020 is not set | ||
954 | |||
955 | # | ||
956 | # on-CPU RTC drivers | ||
957 | # | ||
958 | CONFIG_RTC_DRV_OMAP=y | ||
959 | |||
960 | # | ||
961 | # DMA Engine support | ||
962 | # | ||
963 | # CONFIG_DMA_ENGINE is not set | ||
964 | |||
965 | # | ||
966 | # DMA Clients | ||
967 | # | ||
968 | |||
969 | # | ||
970 | # DMA Devices | ||
971 | # | ||
972 | |||
973 | # | ||
974 | # CBUS support | ||
975 | # | ||
976 | # CONFIG_CBUS is not set | ||
977 | |||
978 | # | ||
979 | # File systems | ||
980 | # | ||
981 | CONFIG_EXT2_FS=y | ||
982 | # CONFIG_EXT2_FS_XATTR is not set | ||
983 | # CONFIG_EXT2_FS_XIP is not set | ||
984 | CONFIG_EXT3_FS=y | ||
985 | CONFIG_EXT3_FS_XATTR=y | ||
986 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
987 | # CONFIG_EXT3_FS_SECURITY is not set | ||
988 | # CONFIG_EXT4DEV_FS is not set | ||
989 | CONFIG_JBD=y | ||
990 | # CONFIG_JBD_DEBUG is not set | ||
991 | CONFIG_FS_MBCACHE=y | ||
992 | # CONFIG_REISERFS_FS is not set | ||
993 | # CONFIG_JFS_FS is not set | ||
994 | # CONFIG_FS_POSIX_ACL is not set | ||
995 | # CONFIG_XFS_FS is not set | ||
996 | # CONFIG_GFS2_FS is not set | ||
997 | # CONFIG_OCFS2_FS is not set | ||
998 | # CONFIG_MINIX_FS is not set | ||
999 | # CONFIG_ROMFS_FS is not set | ||
1000 | CONFIG_INOTIFY=y | ||
1001 | CONFIG_INOTIFY_USER=y | ||
1002 | # CONFIG_QUOTA is not set | ||
1003 | CONFIG_DNOTIFY=y | ||
1004 | CONFIG_AUTOFS_FS=y | ||
1005 | CONFIG_AUTOFS4_FS=y | ||
1006 | # CONFIG_FUSE_FS is not set | ||
1007 | |||
1008 | # | ||
1009 | # CD-ROM/DVD Filesystems | ||
1010 | # | ||
1011 | CONFIG_ISO9660_FS=y | ||
1012 | CONFIG_JOLIET=y | ||
1013 | # CONFIG_ZISOFS is not set | ||
1014 | # CONFIG_UDF_FS is not set | ||
1015 | |||
1016 | # | ||
1017 | # DOS/FAT/NT Filesystems | ||
1018 | # | ||
1019 | CONFIG_FAT_FS=m | ||
1020 | CONFIG_MSDOS_FS=m | ||
1021 | CONFIG_VFAT_FS=m | ||
1022 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1023 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1024 | # CONFIG_NTFS_FS is not set | ||
1025 | |||
1026 | # | ||
1027 | # Pseudo filesystems | ||
1028 | # | ||
1029 | CONFIG_PROC_FS=y | ||
1030 | CONFIG_PROC_SYSCTL=y | ||
1031 | CONFIG_SYSFS=y | ||
1032 | CONFIG_TMPFS=y | ||
1033 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
1034 | # CONFIG_HUGETLB_PAGE is not set | ||
1035 | CONFIG_RAMFS=y | ||
1036 | # CONFIG_CONFIGFS_FS is not set | ||
1037 | |||
1038 | # | ||
1039 | # Miscellaneous filesystems | ||
1040 | # | ||
1041 | # CONFIG_ADFS_FS is not set | ||
1042 | # CONFIG_AFFS_FS is not set | ||
1043 | # CONFIG_HFS_FS is not set | ||
1044 | # CONFIG_HFSPLUS_FS is not set | ||
1045 | # CONFIG_BEFS_FS is not set | ||
1046 | # CONFIG_BFS_FS is not set | ||
1047 | # CONFIG_EFS_FS is not set | ||
1048 | # CONFIG_CRAMFS is not set | ||
1049 | # CONFIG_VXFS_FS is not set | ||
1050 | # CONFIG_HPFS_FS is not set | ||
1051 | # CONFIG_QNX4FS_FS is not set | ||
1052 | # CONFIG_SYSV_FS is not set | ||
1053 | # CONFIG_UFS_FS is not set | ||
1054 | |||
1055 | # | ||
1056 | # Network File Systems | ||
1057 | # | ||
1058 | CONFIG_NFS_FS=y | ||
1059 | CONFIG_NFS_V3=y | ||
1060 | # CONFIG_NFS_V3_ACL is not set | ||
1061 | CONFIG_NFS_V4=y | ||
1062 | # CONFIG_NFS_DIRECTIO is not set | ||
1063 | # CONFIG_NFSD is not set | ||
1064 | CONFIG_ROOT_NFS=y | ||
1065 | CONFIG_LOCKD=y | ||
1066 | CONFIG_LOCKD_V4=y | ||
1067 | CONFIG_NFS_COMMON=y | ||
1068 | CONFIG_SUNRPC=y | ||
1069 | CONFIG_SUNRPC_GSS=y | ||
1070 | # CONFIG_SUNRPC_BIND34 is not set | ||
1071 | CONFIG_RPCSEC_GSS_KRB5=y | ||
1072 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1073 | # CONFIG_SMB_FS is not set | ||
1074 | # CONFIG_CIFS is not set | ||
1075 | # CONFIG_NCP_FS is not set | ||
1076 | # CONFIG_CODA_FS is not set | ||
1077 | # CONFIG_AFS_FS is not set | ||
1078 | |||
1079 | # | ||
1080 | # Partition Types | ||
1081 | # | ||
1082 | CONFIG_PARTITION_ADVANCED=y | ||
1083 | # CONFIG_ACORN_PARTITION is not set | ||
1084 | # CONFIG_OSF_PARTITION is not set | ||
1085 | # CONFIG_AMIGA_PARTITION is not set | ||
1086 | # CONFIG_ATARI_PARTITION is not set | ||
1087 | # CONFIG_MAC_PARTITION is not set | ||
1088 | CONFIG_MSDOS_PARTITION=y | ||
1089 | # CONFIG_BSD_DISKLABEL is not set | ||
1090 | # CONFIG_MINIX_SUBPARTITION is not set | ||
1091 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
1092 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
1093 | # CONFIG_LDM_PARTITION is not set | ||
1094 | # CONFIG_SGI_PARTITION is not set | ||
1095 | # CONFIG_ULTRIX_PARTITION is not set | ||
1096 | # CONFIG_SUN_PARTITION is not set | ||
1097 | # CONFIG_KARMA_PARTITION is not set | ||
1098 | # CONFIG_EFI_PARTITION is not set | ||
1099 | # CONFIG_SYSV68_PARTITION is not set | ||
1100 | |||
1101 | # | ||
1102 | # Native Language Support | ||
1103 | # | ||
1104 | CONFIG_NLS=y | ||
1105 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1106 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
1107 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1108 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1109 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1110 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1111 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1112 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1113 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1114 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1115 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1116 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1117 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1118 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1119 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
1120 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1121 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1122 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1123 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1124 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1125 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1126 | # CONFIG_NLS_ISO8859_8 is not set | ||
1127 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1128 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
1129 | # CONFIG_NLS_ASCII is not set | ||
1130 | # CONFIG_NLS_ISO8859_1 is not set | ||
1131 | # CONFIG_NLS_ISO8859_2 is not set | ||
1132 | # CONFIG_NLS_ISO8859_3 is not set | ||
1133 | # CONFIG_NLS_ISO8859_4 is not set | ||
1134 | # CONFIG_NLS_ISO8859_5 is not set | ||
1135 | # CONFIG_NLS_ISO8859_6 is not set | ||
1136 | # CONFIG_NLS_ISO8859_7 is not set | ||
1137 | # CONFIG_NLS_ISO8859_9 is not set | ||
1138 | # CONFIG_NLS_ISO8859_13 is not set | ||
1139 | # CONFIG_NLS_ISO8859_14 is not set | ||
1140 | # CONFIG_NLS_ISO8859_15 is not set | ||
1141 | # CONFIG_NLS_KOI8_R is not set | ||
1142 | # CONFIG_NLS_KOI8_U is not set | ||
1143 | # CONFIG_NLS_UTF8 is not set | ||
1144 | |||
1145 | # | ||
1146 | # Distributed Lock Manager | ||
1147 | # | ||
1148 | # CONFIG_DLM is not set | ||
1149 | |||
1150 | # | ||
1151 | # Profiling support | ||
1152 | # | ||
1153 | # CONFIG_PROFILING is not set | ||
1154 | |||
1155 | # | ||
1156 | # Kernel hacking | ||
1157 | # | ||
1158 | # CONFIG_PRINTK_TIME is not set | ||
1159 | CONFIG_ENABLE_MUST_CHECK=y | ||
1160 | CONFIG_MAGIC_SYSRQ=y | ||
1161 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1162 | # CONFIG_DEBUG_FS is not set | ||
1163 | # CONFIG_HEADERS_CHECK is not set | ||
1164 | CONFIG_DEBUG_KERNEL=y | ||
1165 | # CONFIG_DEBUG_SHIRQ is not set | ||
1166 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1167 | CONFIG_SCHED_DEBUG=y | ||
1168 | # CONFIG_SCHEDSTATS is not set | ||
1169 | # CONFIG_TIMER_STATS is not set | ||
1170 | # CONFIG_DEBUG_SLAB is not set | ||
1171 | CONFIG_DEBUG_PREEMPT=y | ||
1172 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1173 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1174 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1175 | # CONFIG_DEBUG_MUTEXES is not set | ||
1176 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1177 | # CONFIG_PROVE_LOCKING is not set | ||
1178 | # CONFIG_LOCK_STAT is not set | ||
1179 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1180 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1181 | # CONFIG_DEBUG_KOBJECT is not set | ||
1182 | CONFIG_DEBUG_BUGVERBOSE=y | ||
1183 | # CONFIG_DEBUG_INFO is not set | ||
1184 | # CONFIG_DEBUG_VM is not set | ||
1185 | # CONFIG_DEBUG_LIST is not set | ||
1186 | CONFIG_FRAME_POINTER=y | ||
1187 | CONFIG_FORCED_INLINING=y | ||
1188 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1189 | # CONFIG_FAULT_INJECTION is not set | ||
1190 | # CONFIG_DEBUG_USER is not set | ||
1191 | # CONFIG_DEBUG_ERRORS is not set | ||
1192 | # CONFIG_DEBUG_LL is not set | ||
1193 | |||
1194 | # | ||
1195 | # Security options | ||
1196 | # | ||
1197 | # CONFIG_KEYS is not set | ||
1198 | # CONFIG_SECURITY is not set | ||
1199 | CONFIG_CRYPTO=y | ||
1200 | CONFIG_CRYPTO_ALGAPI=y | ||
1201 | CONFIG_CRYPTO_BLKCIPHER=y | ||
1202 | CONFIG_CRYPTO_MANAGER=y | ||
1203 | # CONFIG_CRYPTO_HMAC is not set | ||
1204 | # CONFIG_CRYPTO_XCBC is not set | ||
1205 | # CONFIG_CRYPTO_NULL is not set | ||
1206 | # CONFIG_CRYPTO_MD4 is not set | ||
1207 | CONFIG_CRYPTO_MD5=y | ||
1208 | # CONFIG_CRYPTO_SHA1 is not set | ||
1209 | # CONFIG_CRYPTO_SHA256 is not set | ||
1210 | # CONFIG_CRYPTO_SHA512 is not set | ||
1211 | # CONFIG_CRYPTO_WP512 is not set | ||
1212 | # CONFIG_CRYPTO_TGR192 is not set | ||
1213 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1214 | CONFIG_CRYPTO_ECB=m | ||
1215 | CONFIG_CRYPTO_CBC=y | ||
1216 | CONFIG_CRYPTO_PCBC=m | ||
1217 | # CONFIG_CRYPTO_LRW is not set | ||
1218 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1219 | CONFIG_CRYPTO_DES=y | ||
1220 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1221 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1222 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1223 | # CONFIG_CRYPTO_SERPENT is not set | ||
1224 | # CONFIG_CRYPTO_AES is not set | ||
1225 | # CONFIG_CRYPTO_CAST5 is not set | ||
1226 | # CONFIG_CRYPTO_CAST6 is not set | ||
1227 | # CONFIG_CRYPTO_TEA is not set | ||
1228 | # CONFIG_CRYPTO_ARC4 is not set | ||
1229 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1230 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1231 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1232 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1233 | # CONFIG_CRYPTO_CRC32C is not set | ||
1234 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1235 | # CONFIG_CRYPTO_TEST is not set | ||
1236 | CONFIG_CRYPTO_HW=y | ||
1237 | |||
1238 | # | ||
1239 | # Library routines | ||
1240 | # | ||
1241 | CONFIG_BITREVERSE=y | ||
1242 | CONFIG_CRC_CCITT=y | ||
1243 | # CONFIG_CRC16 is not set | ||
1244 | # CONFIG_CRC_ITU_T is not set | ||
1245 | CONFIG_CRC32=y | ||
1246 | # CONFIG_CRC7 is not set | ||
1247 | # CONFIG_LIBCRC32C is not set | ||
1248 | CONFIG_ZLIB_INFLATE=y | ||
1249 | CONFIG_ZLIB_DEFLATE=y | ||
1250 | CONFIG_PLIST=y | ||
1251 | CONFIG_HAS_IOMEM=y | ||
1252 | CONFIG_HAS_IOPORT=y | ||
1253 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_innovator_1610_defconfig b/arch/arm/configs/omap_innovator_1610_defconfig new file mode 100644 index 000000000000..95d9f2be53e0 --- /dev/null +++ b/arch/arm/configs/omap_innovator_1610_defconfig | |||
@@ -0,0 +1,839 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 11:45:05 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
34 | CONFIG_LOCALVERSION="" | ||
35 | CONFIG_LOCALVERSION_AUTO=y | ||
36 | CONFIG_SWAP=y | ||
37 | CONFIG_SYSVIPC=y | ||
38 | CONFIG_SYSVIPC_SYSCTL=y | ||
39 | # CONFIG_POSIX_MQUEUE is not set | ||
40 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
41 | # CONFIG_TASKSTATS is not set | ||
42 | # CONFIG_USER_NS is not set | ||
43 | # CONFIG_AUDIT is not set | ||
44 | # CONFIG_IKCONFIG is not set | ||
45 | CONFIG_LOG_BUF_SHIFT=14 | ||
46 | CONFIG_SYSFS_DEPRECATED=y | ||
47 | # CONFIG_RELAY is not set | ||
48 | CONFIG_BLK_DEV_INITRD=y | ||
49 | CONFIG_INITRAMFS_SOURCE="" | ||
50 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
51 | CONFIG_SYSCTL=y | ||
52 | # CONFIG_EMBEDDED is not set | ||
53 | CONFIG_UID16=y | ||
54 | CONFIG_SYSCTL_SYSCALL=y | ||
55 | CONFIG_KALLSYMS=y | ||
56 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
57 | CONFIG_HOTPLUG=y | ||
58 | CONFIG_PRINTK=y | ||
59 | CONFIG_BUG=y | ||
60 | CONFIG_ELF_CORE=y | ||
61 | CONFIG_BASE_FULL=y | ||
62 | CONFIG_FUTEX=y | ||
63 | CONFIG_ANON_INODES=y | ||
64 | CONFIG_EPOLL=y | ||
65 | CONFIG_SIGNALFD=y | ||
66 | CONFIG_TIMERFD=y | ||
67 | CONFIG_EVENTFD=y | ||
68 | CONFIG_SHMEM=y | ||
69 | CONFIG_VM_EVENT_COUNTERS=y | ||
70 | CONFIG_SLUB_DEBUG=y | ||
71 | # CONFIG_SLAB is not set | ||
72 | CONFIG_SLUB=y | ||
73 | # CONFIG_SLOB is not set | ||
74 | CONFIG_RT_MUTEXES=y | ||
75 | # CONFIG_TINY_SHMEM is not set | ||
76 | CONFIG_BASE_SMALL=0 | ||
77 | CONFIG_MODULES=y | ||
78 | CONFIG_MODULE_UNLOAD=y | ||
79 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
80 | # CONFIG_MODVERSIONS is not set | ||
81 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
82 | CONFIG_KMOD=y | ||
83 | CONFIG_BLOCK=y | ||
84 | # CONFIG_LBD is not set | ||
85 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
86 | # CONFIG_LSF is not set | ||
87 | # CONFIG_BLK_DEV_BSG is not set | ||
88 | |||
89 | # | ||
90 | # IO Schedulers | ||
91 | # | ||
92 | CONFIG_IOSCHED_NOOP=y | ||
93 | CONFIG_IOSCHED_AS=y | ||
94 | CONFIG_IOSCHED_DEADLINE=y | ||
95 | CONFIG_IOSCHED_CFQ=y | ||
96 | # CONFIG_DEFAULT_AS is not set | ||
97 | # CONFIG_DEFAULT_DEADLINE is not set | ||
98 | CONFIG_DEFAULT_CFQ=y | ||
99 | # CONFIG_DEFAULT_NOOP is not set | ||
100 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
101 | |||
102 | # | ||
103 | # System Type | ||
104 | # | ||
105 | # CONFIG_ARCH_AAEC2000 is not set | ||
106 | # CONFIG_ARCH_INTEGRATOR is not set | ||
107 | # CONFIG_ARCH_REALVIEW is not set | ||
108 | # CONFIG_ARCH_VERSATILE is not set | ||
109 | # CONFIG_ARCH_AT91 is not set | ||
110 | # CONFIG_ARCH_CLPS7500 is not set | ||
111 | # CONFIG_ARCH_CLPS711X is not set | ||
112 | # CONFIG_ARCH_CO285 is not set | ||
113 | # CONFIG_ARCH_EBSA110 is not set | ||
114 | # CONFIG_ARCH_EP93XX is not set | ||
115 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
116 | # CONFIG_ARCH_NETX is not set | ||
117 | # CONFIG_ARCH_H720X is not set | ||
118 | # CONFIG_ARCH_IMX is not set | ||
119 | # CONFIG_ARCH_IOP13XX is not set | ||
120 | # CONFIG_ARCH_IOP32X is not set | ||
121 | # CONFIG_ARCH_IOP33X is not set | ||
122 | # CONFIG_ARCH_IXP23XX is not set | ||
123 | # CONFIG_ARCH_IXP2000 is not set | ||
124 | # CONFIG_ARCH_IXP4XX is not set | ||
125 | # CONFIG_ARCH_L7200 is not set | ||
126 | # CONFIG_ARCH_KS8695 is not set | ||
127 | # CONFIG_ARCH_NS9XXX is not set | ||
128 | # CONFIG_ARCH_MXC is not set | ||
129 | # CONFIG_ARCH_PNX4008 is not set | ||
130 | # CONFIG_ARCH_PXA is not set | ||
131 | # CONFIG_ARCH_RPC is not set | ||
132 | # CONFIG_ARCH_SA1100 is not set | ||
133 | # CONFIG_ARCH_S3C2410 is not set | ||
134 | # CONFIG_ARCH_SHARK is not set | ||
135 | # CONFIG_ARCH_LH7A40X is not set | ||
136 | # CONFIG_ARCH_DAVINCI is not set | ||
137 | CONFIG_ARCH_OMAP=y | ||
138 | |||
139 | # | ||
140 | # TI OMAP Implementations | ||
141 | # | ||
142 | CONFIG_ARCH_OMAP_OTG=y | ||
143 | CONFIG_ARCH_OMAP1=y | ||
144 | # CONFIG_ARCH_OMAP2 is not set | ||
145 | # CONFIG_ARCH_OMAP3 is not set | ||
146 | |||
147 | # | ||
148 | # OMAP Feature Selections | ||
149 | # | ||
150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
153 | CONFIG_OMAP_MUX=y | ||
154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
156 | # CONFIG_OMAP_STI is not set | ||
157 | CONFIG_OMAP_MCBSP=y | ||
158 | # CONFIG_OMAP_MMU_FWK is not set | ||
159 | # CONFIG_OMAP_MBOX_FWK is not set | ||
160 | CONFIG_OMAP_MPU_TIMER=y | ||
161 | # CONFIG_OMAP_32K_TIMER is not set | ||
162 | # CONFIG_OMAP_DM_TIMER is not set | ||
163 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
164 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
165 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
166 | CONFIG_OMAP_SERIAL_WAKE=y | ||
167 | # CONFIG_OMAP_DSP is not set | ||
168 | |||
169 | # | ||
170 | # OMAP Core Type | ||
171 | # | ||
172 | # CONFIG_ARCH_OMAP730 is not set | ||
173 | # CONFIG_ARCH_OMAP15XX is not set | ||
174 | CONFIG_ARCH_OMAP16XX=y | ||
175 | |||
176 | # | ||
177 | # OMAP Board Type | ||
178 | # | ||
179 | CONFIG_MACH_OMAP_INNOVATOR=y | ||
180 | # CONFIG_MACH_OMAP_H2 is not set | ||
181 | # CONFIG_MACH_OMAP_H3 is not set | ||
182 | # CONFIG_MACH_OMAP_OSK is not set | ||
183 | # CONFIG_MACH_NOKIA770 is not set | ||
184 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
185 | |||
186 | # | ||
187 | # OMAP CPU Speed | ||
188 | # | ||
189 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
190 | # CONFIG_OMAP_ARM_216MHZ is not set | ||
191 | CONFIG_OMAP_ARM_192MHZ=y | ||
192 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
193 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
194 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
195 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
196 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
197 | |||
198 | # | ||
199 | # Boot options | ||
200 | # | ||
201 | |||
202 | # | ||
203 | # Power management | ||
204 | # | ||
205 | |||
206 | # | ||
207 | # Processor Type | ||
208 | # | ||
209 | CONFIG_CPU_32=y | ||
210 | CONFIG_CPU_ARM926T=y | ||
211 | CONFIG_CPU_32v5=y | ||
212 | CONFIG_CPU_ABRT_EV5TJ=y | ||
213 | CONFIG_CPU_PABRT_NOIFAR=y | ||
214 | CONFIG_CPU_CACHE_VIVT=y | ||
215 | CONFIG_CPU_COPY_V4WB=y | ||
216 | CONFIG_CPU_TLB_V4WBI=y | ||
217 | CONFIG_CPU_CP15=y | ||
218 | CONFIG_CPU_CP15_MMU=y | ||
219 | |||
220 | # | ||
221 | # Processor Features | ||
222 | # | ||
223 | # CONFIG_ARM_THUMB is not set | ||
224 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
225 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
226 | CONFIG_CPU_DCACHE_WRITETHROUGH=y | ||
227 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
228 | # CONFIG_OUTER_CACHE is not set | ||
229 | |||
230 | # | ||
231 | # Bus support | ||
232 | # | ||
233 | # CONFIG_PCI_SYSCALL is not set | ||
234 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
235 | |||
236 | # | ||
237 | # PCCARD (PCMCIA/CardBus) support | ||
238 | # | ||
239 | # CONFIG_PCCARD is not set | ||
240 | |||
241 | # | ||
242 | # Kernel Features | ||
243 | # | ||
244 | # CONFIG_TICK_ONESHOT is not set | ||
245 | # CONFIG_NO_HZ is not set | ||
246 | # CONFIG_HIGH_RES_TIMERS is not set | ||
247 | # CONFIG_PREEMPT is not set | ||
248 | CONFIG_HZ=100 | ||
249 | # CONFIG_AEABI is not set | ||
250 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
251 | CONFIG_SELECT_MEMORY_MODEL=y | ||
252 | CONFIG_FLATMEM_MANUAL=y | ||
253 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
254 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
255 | CONFIG_FLATMEM=y | ||
256 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
257 | # CONFIG_SPARSEMEM_STATIC is not set | ||
258 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
259 | # CONFIG_RESOURCES_64BIT is not set | ||
260 | CONFIG_ZONE_DMA_FLAG=1 | ||
261 | CONFIG_BOUNCE=y | ||
262 | CONFIG_VIRT_TO_BUS=y | ||
263 | # CONFIG_LEDS is not set | ||
264 | CONFIG_ALIGNMENT_TRAP=y | ||
265 | |||
266 | # | ||
267 | # Boot options | ||
268 | # | ||
269 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
270 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
271 | CONFIG_CMDLINE="mem=32M console=tty0 console=ttyS0,115200 initrd=0x10200000,8M root=/dev/ram0 rw" | ||
272 | # CONFIG_XIP_KERNEL is not set | ||
273 | # CONFIG_KEXEC is not set | ||
274 | |||
275 | # | ||
276 | # CPU Frequency scaling | ||
277 | # | ||
278 | # CONFIG_CPU_FREQ is not set | ||
279 | |||
280 | # | ||
281 | # Floating point emulation | ||
282 | # | ||
283 | |||
284 | # | ||
285 | # At least one emulation must be selected | ||
286 | # | ||
287 | CONFIG_FPE_NWFPE=y | ||
288 | # CONFIG_FPE_NWFPE_XP is not set | ||
289 | # CONFIG_FPE_FASTFPE is not set | ||
290 | # CONFIG_VFP is not set | ||
291 | |||
292 | # | ||
293 | # Userspace binary formats | ||
294 | # | ||
295 | CONFIG_BINFMT_ELF=y | ||
296 | # CONFIG_BINFMT_AOUT is not set | ||
297 | # CONFIG_BINFMT_MISC is not set | ||
298 | # CONFIG_ARTHUR is not set | ||
299 | |||
300 | # | ||
301 | # Power management options | ||
302 | # | ||
303 | # CONFIG_PM is not set | ||
304 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
305 | |||
306 | # | ||
307 | # Networking | ||
308 | # | ||
309 | CONFIG_NET=y | ||
310 | |||
311 | # | ||
312 | # Networking options | ||
313 | # | ||
314 | CONFIG_PACKET=m | ||
315 | # CONFIG_PACKET_MMAP is not set | ||
316 | CONFIG_UNIX=y | ||
317 | CONFIG_XFRM=y | ||
318 | # CONFIG_XFRM_USER is not set | ||
319 | # CONFIG_XFRM_SUB_POLICY is not set | ||
320 | # CONFIG_XFRM_MIGRATE is not set | ||
321 | # CONFIG_NET_KEY is not set | ||
322 | CONFIG_INET=y | ||
323 | CONFIG_IP_MULTICAST=y | ||
324 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
325 | CONFIG_IP_FIB_HASH=y | ||
326 | CONFIG_IP_PNP=y | ||
327 | CONFIG_IP_PNP_DHCP=y | ||
328 | CONFIG_IP_PNP_BOOTP=y | ||
329 | # CONFIG_IP_PNP_RARP is not set | ||
330 | # CONFIG_NET_IPIP is not set | ||
331 | # CONFIG_NET_IPGRE is not set | ||
332 | # CONFIG_IP_MROUTE is not set | ||
333 | # CONFIG_ARPD is not set | ||
334 | # CONFIG_SYN_COOKIES is not set | ||
335 | # CONFIG_INET_AH is not set | ||
336 | # CONFIG_INET_ESP is not set | ||
337 | # CONFIG_INET_IPCOMP is not set | ||
338 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
339 | # CONFIG_INET_TUNNEL is not set | ||
340 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
341 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
342 | CONFIG_INET_XFRM_MODE_BEET=y | ||
343 | CONFIG_INET_DIAG=y | ||
344 | CONFIG_INET_TCP_DIAG=y | ||
345 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
346 | CONFIG_TCP_CONG_CUBIC=y | ||
347 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
348 | # CONFIG_TCP_MD5SIG is not set | ||
349 | # CONFIG_IPV6 is not set | ||
350 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
351 | # CONFIG_INET6_TUNNEL is not set | ||
352 | # CONFIG_NETWORK_SECMARK is not set | ||
353 | # CONFIG_NETFILTER is not set | ||
354 | # CONFIG_IP_DCCP is not set | ||
355 | # CONFIG_IP_SCTP is not set | ||
356 | # CONFIG_TIPC is not set | ||
357 | # CONFIG_ATM is not set | ||
358 | # CONFIG_BRIDGE is not set | ||
359 | # CONFIG_VLAN_8021Q is not set | ||
360 | # CONFIG_DECNET is not set | ||
361 | # CONFIG_LLC2 is not set | ||
362 | # CONFIG_IPX is not set | ||
363 | # CONFIG_ATALK is not set | ||
364 | # CONFIG_X25 is not set | ||
365 | # CONFIG_LAPB is not set | ||
366 | # CONFIG_ECONET is not set | ||
367 | # CONFIG_WAN_ROUTER is not set | ||
368 | |||
369 | # | ||
370 | # QoS and/or fair queueing | ||
371 | # | ||
372 | # CONFIG_NET_SCHED is not set | ||
373 | |||
374 | # | ||
375 | # Network testing | ||
376 | # | ||
377 | # CONFIG_NET_PKTGEN is not set | ||
378 | # CONFIG_HAMRADIO is not set | ||
379 | # CONFIG_IRDA is not set | ||
380 | # CONFIG_BT is not set | ||
381 | # CONFIG_AF_RXRPC is not set | ||
382 | |||
383 | # | ||
384 | # Wireless | ||
385 | # | ||
386 | # CONFIG_CFG80211 is not set | ||
387 | # CONFIG_WIRELESS_EXT is not set | ||
388 | # CONFIG_MAC80211 is not set | ||
389 | # CONFIG_IEEE80211 is not set | ||
390 | # CONFIG_RFKILL is not set | ||
391 | # CONFIG_NET_9P is not set | ||
392 | |||
393 | # | ||
394 | # Device Drivers | ||
395 | # | ||
396 | |||
397 | # | ||
398 | # Generic Driver Options | ||
399 | # | ||
400 | CONFIG_STANDALONE=y | ||
401 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
402 | # CONFIG_FW_LOADER is not set | ||
403 | # CONFIG_SYS_HYPERVISOR is not set | ||
404 | # CONFIG_CONNECTOR is not set | ||
405 | # CONFIG_MTD is not set | ||
406 | # CONFIG_PARPORT is not set | ||
407 | CONFIG_BLK_DEV=y | ||
408 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
409 | CONFIG_BLK_DEV_LOOP=y | ||
410 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
411 | # CONFIG_BLK_DEV_NBD is not set | ||
412 | CONFIG_BLK_DEV_RAM=y | ||
413 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
414 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
415 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
416 | # CONFIG_CDROM_PKTCDVD is not set | ||
417 | # CONFIG_ATA_OVER_ETH is not set | ||
418 | |||
419 | # | ||
420 | # SCSI device support | ||
421 | # | ||
422 | # CONFIG_RAID_ATTRS is not set | ||
423 | # CONFIG_SCSI is not set | ||
424 | # CONFIG_SCSI_DMA is not set | ||
425 | # CONFIG_SCSI_NETLINK is not set | ||
426 | # CONFIG_ATA is not set | ||
427 | # CONFIG_MD is not set | ||
428 | CONFIG_NETDEVICES=y | ||
429 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
430 | # CONFIG_DUMMY is not set | ||
431 | # CONFIG_BONDING is not set | ||
432 | # CONFIG_MACVLAN is not set | ||
433 | # CONFIG_EQUALIZER is not set | ||
434 | # CONFIG_TUN is not set | ||
435 | # CONFIG_PHYLIB is not set | ||
436 | CONFIG_NET_ETHERNET=y | ||
437 | CONFIG_MII=y | ||
438 | # CONFIG_AX88796 is not set | ||
439 | CONFIG_SMC91X=y | ||
440 | # CONFIG_DM9000 is not set | ||
441 | CONFIG_NETDEV_1000=y | ||
442 | CONFIG_NETDEV_10000=y | ||
443 | |||
444 | # | ||
445 | # Wireless LAN | ||
446 | # | ||
447 | # CONFIG_WLAN_PRE80211 is not set | ||
448 | # CONFIG_WLAN_80211 is not set | ||
449 | # CONFIG_WAN is not set | ||
450 | CONFIG_PPP=y | ||
451 | CONFIG_PPP_MULTILINK=y | ||
452 | # CONFIG_PPP_FILTER is not set | ||
453 | # CONFIG_PPP_ASYNC is not set | ||
454 | # CONFIG_PPP_SYNC_TTY is not set | ||
455 | # CONFIG_PPP_DEFLATE is not set | ||
456 | # CONFIG_PPP_BSDCOMP is not set | ||
457 | # CONFIG_PPP_MPPE is not set | ||
458 | # CONFIG_PPPOE is not set | ||
459 | # CONFIG_PPPOL2TP is not set | ||
460 | # CONFIG_SLIP is not set | ||
461 | CONFIG_SLHC=y | ||
462 | # CONFIG_SHAPER is not set | ||
463 | # CONFIG_NETCONSOLE is not set | ||
464 | # CONFIG_NETPOLL is not set | ||
465 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
466 | # CONFIG_ISDN is not set | ||
467 | |||
468 | # | ||
469 | # Input device support | ||
470 | # | ||
471 | CONFIG_INPUT=y | ||
472 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
473 | # CONFIG_INPUT_POLLDEV is not set | ||
474 | |||
475 | # | ||
476 | # Userland interfaces | ||
477 | # | ||
478 | CONFIG_INPUT_MOUSEDEV=y | ||
479 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
480 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
481 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
482 | # CONFIG_INPUT_JOYDEV is not set | ||
483 | # CONFIG_INPUT_TSDEV is not set | ||
484 | # CONFIG_INPUT_EVDEV is not set | ||
485 | # CONFIG_INPUT_EVBUG is not set | ||
486 | |||
487 | # | ||
488 | # Input Device Drivers | ||
489 | # | ||
490 | CONFIG_INPUT_KEYBOARD=y | ||
491 | # CONFIG_KEYBOARD_ATKBD is not set | ||
492 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
493 | # CONFIG_KEYBOARD_LKKBD is not set | ||
494 | # CONFIG_KEYBOARD_XTKBD is not set | ||
495 | # CONFIG_KEYBOARD_NEWTON is not set | ||
496 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
497 | CONFIG_KEYBOARD_OMAP=y | ||
498 | # CONFIG_KEYBOARD_GPIO is not set | ||
499 | # CONFIG_INPUT_MOUSE is not set | ||
500 | # CONFIG_INPUT_JOYSTICK is not set | ||
501 | # CONFIG_INPUT_TABLET is not set | ||
502 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
503 | # CONFIG_INPUT_MISC is not set | ||
504 | |||
505 | # | ||
506 | # Hardware I/O ports | ||
507 | # | ||
508 | CONFIG_SERIO=y | ||
509 | CONFIG_SERIO_SERPORT=y | ||
510 | # CONFIG_SERIO_RAW is not set | ||
511 | # CONFIG_GAMEPORT is not set | ||
512 | |||
513 | # | ||
514 | # Character devices | ||
515 | # | ||
516 | CONFIG_VT=y | ||
517 | CONFIG_VT_CONSOLE=y | ||
518 | CONFIG_HW_CONSOLE=y | ||
519 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
520 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
521 | |||
522 | # | ||
523 | # Serial drivers | ||
524 | # | ||
525 | CONFIG_SERIAL_8250=y | ||
526 | CONFIG_SERIAL_8250_CONSOLE=y | ||
527 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
528 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
529 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
530 | |||
531 | # | ||
532 | # Non-8250 serial port support | ||
533 | # | ||
534 | CONFIG_SERIAL_CORE=y | ||
535 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
536 | CONFIG_UNIX98_PTYS=y | ||
537 | CONFIG_LEGACY_PTYS=y | ||
538 | CONFIG_LEGACY_PTY_COUNT=256 | ||
539 | # CONFIG_IPMI_HANDLER is not set | ||
540 | # CONFIG_WATCHDOG is not set | ||
541 | CONFIG_HW_RANDOM=m | ||
542 | CONFIG_HW_RANDOM_OMAP=m | ||
543 | # CONFIG_NVRAM is not set | ||
544 | # CONFIG_R3964 is not set | ||
545 | # CONFIG_RAW_DRIVER is not set | ||
546 | # CONFIG_TCG_TPM is not set | ||
547 | # CONFIG_I2C is not set | ||
548 | |||
549 | # | ||
550 | # SPI support | ||
551 | # | ||
552 | # CONFIG_SPI is not set | ||
553 | # CONFIG_SPI_MASTER is not set | ||
554 | # CONFIG_W1 is not set | ||
555 | CONFIG_HWMON=y | ||
556 | # CONFIG_HWMON_VID is not set | ||
557 | # CONFIG_SENSORS_ABITUGURU is not set | ||
558 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
559 | # CONFIG_SENSORS_F71805F is not set | ||
560 | # CONFIG_SENSORS_IT87 is not set | ||
561 | # CONFIG_SENSORS_PC87360 is not set | ||
562 | # CONFIG_SENSORS_PC87427 is not set | ||
563 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
564 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
565 | # CONFIG_SENSORS_VT1211 is not set | ||
566 | # CONFIG_SENSORS_W83627HF is not set | ||
567 | # CONFIG_SENSORS_W83627EHF is not set | ||
568 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
569 | CONFIG_MISC_DEVICES=y | ||
570 | # CONFIG_EEPROM_93CX6 is not set | ||
571 | |||
572 | # | ||
573 | # Multifunction device drivers | ||
574 | # | ||
575 | # CONFIG_MFD_SM501 is not set | ||
576 | # CONFIG_NEW_LEDS is not set | ||
577 | |||
578 | # | ||
579 | # Multimedia devices | ||
580 | # | ||
581 | # CONFIG_VIDEO_DEV is not set | ||
582 | # CONFIG_DVB_CORE is not set | ||
583 | CONFIG_DAB=y | ||
584 | |||
585 | # | ||
586 | # Graphics support | ||
587 | # | ||
588 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
589 | |||
590 | # | ||
591 | # Display device support | ||
592 | # | ||
593 | # CONFIG_DISPLAY_SUPPORT is not set | ||
594 | # CONFIG_VGASTATE is not set | ||
595 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
596 | CONFIG_FB=y | ||
597 | # CONFIG_FIRMWARE_EDID is not set | ||
598 | # CONFIG_FB_DDC is not set | ||
599 | # CONFIG_FB_CFB_FILLRECT is not set | ||
600 | # CONFIG_FB_CFB_COPYAREA is not set | ||
601 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
602 | # CONFIG_FB_SYS_FILLRECT is not set | ||
603 | # CONFIG_FB_SYS_COPYAREA is not set | ||
604 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
605 | # CONFIG_FB_SYS_FOPS is not set | ||
606 | CONFIG_FB_DEFERRED_IO=y | ||
607 | # CONFIG_FB_SVGALIB is not set | ||
608 | # CONFIG_FB_MACMODES is not set | ||
609 | # CONFIG_FB_BACKLIGHT is not set | ||
610 | CONFIG_FB_MODE_HELPERS=y | ||
611 | # CONFIG_FB_TILEBLITTING is not set | ||
612 | |||
613 | # | ||
614 | # Frame buffer hardware drivers | ||
615 | # | ||
616 | # CONFIG_FB_S1D13XXX is not set | ||
617 | CONFIG_FB_OMAP=y | ||
618 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
619 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
620 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
621 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
622 | # CONFIG_FB_VIRTUAL is not set | ||
623 | |||
624 | # | ||
625 | # Console display driver support | ||
626 | # | ||
627 | # CONFIG_VGA_CONSOLE is not set | ||
628 | CONFIG_DUMMY_CONSOLE=y | ||
629 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
630 | # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set | ||
631 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
632 | CONFIG_FONTS=y | ||
633 | CONFIG_FONT_8x8=y | ||
634 | CONFIG_FONT_8x16=y | ||
635 | # CONFIG_FONT_6x11 is not set | ||
636 | # CONFIG_FONT_7x14 is not set | ||
637 | # CONFIG_FONT_PEARL_8x8 is not set | ||
638 | # CONFIG_FONT_ACORN_8x8 is not set | ||
639 | # CONFIG_FONT_MINI_4x6 is not set | ||
640 | # CONFIG_FONT_SUN8x16 is not set | ||
641 | # CONFIG_FONT_SUN12x22 is not set | ||
642 | # CONFIG_FONT_10x18 is not set | ||
643 | CONFIG_LOGO=y | ||
644 | CONFIG_LOGO_LINUX_MONO=y | ||
645 | CONFIG_LOGO_LINUX_VGA16=y | ||
646 | CONFIG_LOGO_LINUX_CLUT224=y | ||
647 | |||
648 | # | ||
649 | # Sound | ||
650 | # | ||
651 | # CONFIG_SOUND is not set | ||
652 | CONFIG_HID_SUPPORT=y | ||
653 | CONFIG_HID=y | ||
654 | CONFIG_HID_DEBUG=y | ||
655 | CONFIG_USB_SUPPORT=y | ||
656 | CONFIG_USB_ARCH_HAS_HCD=y | ||
657 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
658 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
659 | # CONFIG_USB is not set | ||
660 | |||
661 | # | ||
662 | # Enable Host or Gadget support to see Inventra options | ||
663 | # | ||
664 | |||
665 | # | ||
666 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
667 | # | ||
668 | |||
669 | # | ||
670 | # USB Gadget Support | ||
671 | # | ||
672 | # CONFIG_USB_GADGET is not set | ||
673 | # CONFIG_MMC is not set | ||
674 | CONFIG_RTC_LIB=y | ||
675 | # CONFIG_RTC_CLASS is not set | ||
676 | |||
677 | # | ||
678 | # DMA Engine support | ||
679 | # | ||
680 | # CONFIG_DMA_ENGINE is not set | ||
681 | |||
682 | # | ||
683 | # DMA Clients | ||
684 | # | ||
685 | |||
686 | # | ||
687 | # DMA Devices | ||
688 | # | ||
689 | |||
690 | # | ||
691 | # CBUS support | ||
692 | # | ||
693 | # CONFIG_CBUS is not set | ||
694 | |||
695 | # | ||
696 | # File systems | ||
697 | # | ||
698 | CONFIG_EXT2_FS=y | ||
699 | # CONFIG_EXT2_FS_XATTR is not set | ||
700 | # CONFIG_EXT2_FS_XIP is not set | ||
701 | # CONFIG_EXT3_FS is not set | ||
702 | # CONFIG_EXT4DEV_FS is not set | ||
703 | # CONFIG_REISERFS_FS is not set | ||
704 | # CONFIG_JFS_FS is not set | ||
705 | # CONFIG_FS_POSIX_ACL is not set | ||
706 | # CONFIG_XFS_FS is not set | ||
707 | # CONFIG_GFS2_FS is not set | ||
708 | # CONFIG_OCFS2_FS is not set | ||
709 | # CONFIG_MINIX_FS is not set | ||
710 | # CONFIG_ROMFS_FS is not set | ||
711 | CONFIG_INOTIFY=y | ||
712 | CONFIG_INOTIFY_USER=y | ||
713 | # CONFIG_QUOTA is not set | ||
714 | CONFIG_DNOTIFY=y | ||
715 | CONFIG_AUTOFS_FS=y | ||
716 | CONFIG_AUTOFS4_FS=y | ||
717 | # CONFIG_FUSE_FS is not set | ||
718 | |||
719 | # | ||
720 | # CD-ROM/DVD Filesystems | ||
721 | # | ||
722 | # CONFIG_ISO9660_FS is not set | ||
723 | # CONFIG_UDF_FS is not set | ||
724 | |||
725 | # | ||
726 | # DOS/FAT/NT Filesystems | ||
727 | # | ||
728 | # CONFIG_MSDOS_FS is not set | ||
729 | # CONFIG_VFAT_FS is not set | ||
730 | # CONFIG_NTFS_FS is not set | ||
731 | |||
732 | # | ||
733 | # Pseudo filesystems | ||
734 | # | ||
735 | CONFIG_PROC_FS=y | ||
736 | CONFIG_PROC_SYSCTL=y | ||
737 | CONFIG_SYSFS=y | ||
738 | # CONFIG_TMPFS is not set | ||
739 | # CONFIG_HUGETLB_PAGE is not set | ||
740 | CONFIG_RAMFS=y | ||
741 | # CONFIG_CONFIGFS_FS is not set | ||
742 | |||
743 | # | ||
744 | # Miscellaneous filesystems | ||
745 | # | ||
746 | # CONFIG_ADFS_FS is not set | ||
747 | # CONFIG_AFFS_FS is not set | ||
748 | # CONFIG_HFS_FS is not set | ||
749 | # CONFIG_HFSPLUS_FS is not set | ||
750 | # CONFIG_BEFS_FS is not set | ||
751 | # CONFIG_BFS_FS is not set | ||
752 | # CONFIG_EFS_FS is not set | ||
753 | # CONFIG_CRAMFS is not set | ||
754 | # CONFIG_VXFS_FS is not set | ||
755 | # CONFIG_HPFS_FS is not set | ||
756 | # CONFIG_QNX4FS_FS is not set | ||
757 | # CONFIG_SYSV_FS is not set | ||
758 | # CONFIG_UFS_FS is not set | ||
759 | |||
760 | # | ||
761 | # Network File Systems | ||
762 | # | ||
763 | CONFIG_NFS_FS=y | ||
764 | CONFIG_NFS_V3=y | ||
765 | # CONFIG_NFS_V3_ACL is not set | ||
766 | # CONFIG_NFS_V4 is not set | ||
767 | # CONFIG_NFS_DIRECTIO is not set | ||
768 | # CONFIG_NFSD is not set | ||
769 | # CONFIG_ROOT_NFS is not set | ||
770 | CONFIG_LOCKD=y | ||
771 | CONFIG_LOCKD_V4=y | ||
772 | CONFIG_NFS_COMMON=y | ||
773 | CONFIG_SUNRPC=y | ||
774 | # CONFIG_SUNRPC_BIND34 is not set | ||
775 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
776 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
777 | # CONFIG_SMB_FS is not set | ||
778 | # CONFIG_CIFS is not set | ||
779 | # CONFIG_NCP_FS is not set | ||
780 | # CONFIG_CODA_FS is not set | ||
781 | # CONFIG_AFS_FS is not set | ||
782 | |||
783 | # | ||
784 | # Partition Types | ||
785 | # | ||
786 | # CONFIG_PARTITION_ADVANCED is not set | ||
787 | CONFIG_MSDOS_PARTITION=y | ||
788 | |||
789 | # | ||
790 | # Native Language Support | ||
791 | # | ||
792 | # CONFIG_NLS is not set | ||
793 | |||
794 | # | ||
795 | # Distributed Lock Manager | ||
796 | # | ||
797 | # CONFIG_DLM is not set | ||
798 | |||
799 | # | ||
800 | # Profiling support | ||
801 | # | ||
802 | # CONFIG_PROFILING is not set | ||
803 | |||
804 | # | ||
805 | # Kernel hacking | ||
806 | # | ||
807 | # CONFIG_PRINTK_TIME is not set | ||
808 | CONFIG_ENABLE_MUST_CHECK=y | ||
809 | # CONFIG_MAGIC_SYSRQ is not set | ||
810 | # CONFIG_UNUSED_SYMBOLS is not set | ||
811 | # CONFIG_DEBUG_FS is not set | ||
812 | # CONFIG_HEADERS_CHECK is not set | ||
813 | # CONFIG_DEBUG_KERNEL is not set | ||
814 | # CONFIG_SLUB_DEBUG_ON is not set | ||
815 | CONFIG_DEBUG_BUGVERBOSE=y | ||
816 | CONFIG_FRAME_POINTER=y | ||
817 | # CONFIG_DEBUG_USER is not set | ||
818 | |||
819 | # | ||
820 | # Security options | ||
821 | # | ||
822 | # CONFIG_KEYS is not set | ||
823 | # CONFIG_SECURITY is not set | ||
824 | # CONFIG_CRYPTO is not set | ||
825 | |||
826 | # | ||
827 | # Library routines | ||
828 | # | ||
829 | CONFIG_BITREVERSE=y | ||
830 | # CONFIG_CRC_CCITT is not set | ||
831 | # CONFIG_CRC16 is not set | ||
832 | # CONFIG_CRC_ITU_T is not set | ||
833 | CONFIG_CRC32=y | ||
834 | # CONFIG_CRC7 is not set | ||
835 | # CONFIG_LIBCRC32C is not set | ||
836 | CONFIG_PLIST=y | ||
837 | CONFIG_HAS_IOMEM=y | ||
838 | CONFIG_HAS_IOPORT=y | ||
839 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/omap_osk_5912_defconfig b/arch/arm/configs/omap_osk_5912_defconfig index d4ca5e6e4ffa..b68e0144cab5 100644 --- a/arch/arm/configs/omap_osk_5912_defconfig +++ b/arch/arm/configs/omap_osk_5912_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc3 | 3 | # Linux kernel version: 2.6.24-rc3-omap1 |
4 | # Mon Mar 3 03:35:17 2008 | 4 | # Fri Nov 23 12:24:12 2007 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
@@ -21,7 +21,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
22 | CONFIG_GENERIC_HWEIGHT=y | 22 | CONFIG_GENERIC_HWEIGHT=y |
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 23 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
24 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
25 | CONFIG_ZONE_DMA=y | 24 | CONFIG_ZONE_DMA=y |
26 | CONFIG_VECTORS_BASE=0xffff0000 | 25 | CONFIG_VECTORS_BASE=0xffff0000 |
27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -40,22 +39,17 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
40 | # CONFIG_POSIX_MQUEUE is not set | 39 | # CONFIG_POSIX_MQUEUE is not set |
41 | # CONFIG_BSD_PROCESS_ACCT is not set | 40 | # CONFIG_BSD_PROCESS_ACCT is not set |
42 | # CONFIG_TASKSTATS is not set | 41 | # CONFIG_TASKSTATS is not set |
42 | # CONFIG_USER_NS is not set | ||
43 | # CONFIG_PID_NS is not set | ||
43 | # CONFIG_AUDIT is not set | 44 | # CONFIG_AUDIT is not set |
44 | # CONFIG_IKCONFIG is not set | 45 | # CONFIG_IKCONFIG is not set |
45 | CONFIG_LOG_BUF_SHIFT=14 | 46 | CONFIG_LOG_BUF_SHIFT=14 |
46 | # CONFIG_CGROUPS is not set | 47 | # CONFIG_CGROUPS is not set |
47 | CONFIG_GROUP_SCHED=y | ||
48 | CONFIG_FAIR_GROUP_SCHED=y | 48 | CONFIG_FAIR_GROUP_SCHED=y |
49 | # CONFIG_RT_GROUP_SCHED is not set | 49 | CONFIG_FAIR_USER_SCHED=y |
50 | CONFIG_USER_SCHED=y | 50 | # CONFIG_FAIR_CGROUP_SCHED is not set |
51 | # CONFIG_CGROUP_SCHED is not set | 51 | CONFIG_SYSFS_DEPRECATED=y |
52 | # CONFIG_SYSFS_DEPRECATED is not set | ||
53 | # CONFIG_RELAY is not set | 52 | # CONFIG_RELAY is not set |
54 | CONFIG_NAMESPACES=y | ||
55 | # CONFIG_UTS_NS is not set | ||
56 | # CONFIG_IPC_NS is not set | ||
57 | # CONFIG_USER_NS is not set | ||
58 | # CONFIG_PID_NS is not set | ||
59 | CONFIG_BLK_DEV_INITRD=y | 53 | CONFIG_BLK_DEV_INITRD=y |
60 | CONFIG_INITRAMFS_SOURCE="" | 54 | CONFIG_INITRAMFS_SOURCE="" |
61 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -69,26 +63,18 @@ CONFIG_HOTPLUG=y | |||
69 | CONFIG_PRINTK=y | 63 | CONFIG_PRINTK=y |
70 | CONFIG_BUG=y | 64 | CONFIG_BUG=y |
71 | CONFIG_ELF_CORE=y | 65 | CONFIG_ELF_CORE=y |
72 | CONFIG_COMPAT_BRK=y | ||
73 | CONFIG_BASE_FULL=y | 66 | CONFIG_BASE_FULL=y |
74 | CONFIG_FUTEX=y | 67 | CONFIG_FUTEX=y |
75 | CONFIG_ANON_INODES=y | 68 | CONFIG_ANON_INODES=y |
76 | CONFIG_EPOLL=y | 69 | CONFIG_EPOLL=y |
77 | CONFIG_SIGNALFD=y | 70 | CONFIG_SIGNALFD=y |
78 | CONFIG_TIMERFD=y | ||
79 | CONFIG_EVENTFD=y | 71 | CONFIG_EVENTFD=y |
80 | CONFIG_SHMEM=y | 72 | CONFIG_SHMEM=y |
81 | CONFIG_VM_EVENT_COUNTERS=y | 73 | CONFIG_VM_EVENT_COUNTERS=y |
82 | CONFIG_SLAB=y | 74 | CONFIG_SLUB_DEBUG=y |
83 | # CONFIG_SLUB is not set | 75 | # CONFIG_SLAB is not set |
76 | CONFIG_SLUB=y | ||
84 | # CONFIG_SLOB is not set | 77 | # CONFIG_SLOB is not set |
85 | # CONFIG_PROFILING is not set | ||
86 | # CONFIG_MARKERS is not set | ||
87 | CONFIG_HAVE_OPROFILE=y | ||
88 | # CONFIG_KPROBES is not set | ||
89 | CONFIG_HAVE_KPROBES=y | ||
90 | CONFIG_PROC_PAGE_MONITOR=y | ||
91 | CONFIG_SLABINFO=y | ||
92 | CONFIG_RT_MUTEXES=y | 78 | CONFIG_RT_MUTEXES=y |
93 | # CONFIG_TINY_SHMEM is not set | 79 | # CONFIG_TINY_SHMEM is not set |
94 | CONFIG_BASE_SMALL=0 | 80 | CONFIG_BASE_SMALL=0 |
@@ -116,8 +102,6 @@ CONFIG_IOSCHED_CFQ=y | |||
116 | CONFIG_DEFAULT_CFQ=y | 102 | CONFIG_DEFAULT_CFQ=y |
117 | # CONFIG_DEFAULT_NOOP is not set | 103 | # CONFIG_DEFAULT_NOOP is not set |
118 | CONFIG_DEFAULT_IOSCHED="cfq" | 104 | CONFIG_DEFAULT_IOSCHED="cfq" |
119 | CONFIG_CLASSIC_RCU=y | ||
120 | # CONFIG_PREEMPT_RCU is not set | ||
121 | 105 | ||
122 | # | 106 | # |
123 | # System Type | 107 | # System Type |
@@ -146,7 +130,6 @@ CONFIG_CLASSIC_RCU=y | |||
146 | # CONFIG_ARCH_KS8695 is not set | 130 | # CONFIG_ARCH_KS8695 is not set |
147 | # CONFIG_ARCH_NS9XXX is not set | 131 | # CONFIG_ARCH_NS9XXX is not set |
148 | # CONFIG_ARCH_MXC is not set | 132 | # CONFIG_ARCH_MXC is not set |
149 | # CONFIG_ARCH_ORION is not set | ||
150 | # CONFIG_ARCH_PNX4008 is not set | 133 | # CONFIG_ARCH_PNX4008 is not set |
151 | # CONFIG_ARCH_PXA is not set | 134 | # CONFIG_ARCH_PXA is not set |
152 | # CONFIG_ARCH_RPC is not set | 135 | # CONFIG_ARCH_RPC is not set |
@@ -156,7 +139,6 @@ CONFIG_CLASSIC_RCU=y | |||
156 | # CONFIG_ARCH_LH7A40X is not set | 139 | # CONFIG_ARCH_LH7A40X is not set |
157 | # CONFIG_ARCH_DAVINCI is not set | 140 | # CONFIG_ARCH_DAVINCI is not set |
158 | CONFIG_ARCH_OMAP=y | 141 | CONFIG_ARCH_OMAP=y |
159 | # CONFIG_ARCH_MSM7X00A is not set | ||
160 | 142 | ||
161 | # | 143 | # |
162 | # TI OMAP Implementations | 144 | # TI OMAP Implementations |
@@ -164,16 +146,22 @@ CONFIG_ARCH_OMAP=y | |||
164 | CONFIG_ARCH_OMAP_OTG=y | 146 | CONFIG_ARCH_OMAP_OTG=y |
165 | CONFIG_ARCH_OMAP1=y | 147 | CONFIG_ARCH_OMAP1=y |
166 | # CONFIG_ARCH_OMAP2 is not set | 148 | # CONFIG_ARCH_OMAP2 is not set |
149 | # CONFIG_ARCH_OMAP3 is not set | ||
167 | 150 | ||
168 | # | 151 | # |
169 | # OMAP Feature Selections | 152 | # OMAP Feature Selections |
170 | # | 153 | # |
154 | CONFIG_OMAP_DEBUG_SRAM_PATCH=y | ||
171 | CONFIG_OMAP_RESET_CLOCKS=y | 155 | CONFIG_OMAP_RESET_CLOCKS=y |
156 | # CONFIG_OMAP_BOOT_TAG is not set | ||
157 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
172 | CONFIG_OMAP_MUX=y | 158 | CONFIG_OMAP_MUX=y |
173 | # CONFIG_OMAP_MUX_DEBUG is not set | 159 | # CONFIG_OMAP_MUX_DEBUG is not set |
174 | CONFIG_OMAP_MUX_WARNINGS=y | 160 | CONFIG_OMAP_MUX_WARNINGS=y |
161 | # CONFIG_OMAP_STI is not set | ||
175 | CONFIG_OMAP_MCBSP=y | 162 | CONFIG_OMAP_MCBSP=y |
176 | # CONFIG_OMAP_MMU_FWK is not set | 163 | # CONFIG_OMAP_MMU_FWK is not set |
164 | # CONFIG_OMAP_MBOX_FWK is not set | ||
177 | # CONFIG_OMAP_MPU_TIMER is not set | 165 | # CONFIG_OMAP_MPU_TIMER is not set |
178 | CONFIG_OMAP_32K_TIMER=y | 166 | CONFIG_OMAP_32K_TIMER=y |
179 | CONFIG_OMAP_32K_TIMER_HZ=128 | 167 | CONFIG_OMAP_32K_TIMER_HZ=128 |
@@ -182,6 +170,7 @@ CONFIG_OMAP_LL_DEBUG_UART1=y | |||
182 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | 170 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set |
183 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | 171 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set |
184 | CONFIG_OMAP_SERIAL_WAKE=y | 172 | CONFIG_OMAP_SERIAL_WAKE=y |
173 | # CONFIG_OMAP_DSP is not set | ||
185 | 174 | ||
186 | # | 175 | # |
187 | # OMAP Core Type | 176 | # OMAP Core Type |
@@ -193,13 +182,13 @@ CONFIG_ARCH_OMAP16XX=y | |||
193 | # | 182 | # |
194 | # OMAP Board Type | 183 | # OMAP Board Type |
195 | # | 184 | # |
196 | CONFIG_MACH_OMAP_INNOVATOR=y | 185 | # CONFIG_MACH_OMAP_INNOVATOR is not set |
197 | CONFIG_MACH_OMAP_H2=y | 186 | # CONFIG_MACH_OMAP_H2 is not set |
198 | CONFIG_MACH_OMAP_H3=y | 187 | # CONFIG_MACH_OMAP_H3 is not set |
199 | CONFIG_MACH_OMAP_OSK=y | 188 | CONFIG_MACH_OMAP_OSK=y |
200 | # CONFIG_OMAP_OSK_MISTRAL is not set | 189 | # CONFIG_OMAP_OSK_MISTRAL is not set |
201 | CONFIG_MACH_NOKIA770=y | 190 | # CONFIG_MACH_NOKIA770 is not set |
202 | CONFIG_MACH_OMAP_GENERIC=y | 191 | # CONFIG_MACH_OMAP_GENERIC is not set |
203 | 192 | ||
204 | # | 193 | # |
205 | # OMAP CPU Speed | 194 | # OMAP CPU Speed |
@@ -227,6 +216,7 @@ CONFIG_CPU_32=y | |||
227 | CONFIG_CPU_ARM926T=y | 216 | CONFIG_CPU_ARM926T=y |
228 | CONFIG_CPU_32v5=y | 217 | CONFIG_CPU_32v5=y |
229 | CONFIG_CPU_ABRT_EV5TJ=y | 218 | CONFIG_CPU_ABRT_EV5TJ=y |
219 | CONFIG_CPU_PABRT_NOIFAR=y | ||
230 | CONFIG_CPU_CACHE_VIVT=y | 220 | CONFIG_CPU_CACHE_VIVT=y |
231 | CONFIG_CPU_COPY_V4WB=y | 221 | CONFIG_CPU_COPY_V4WB=y |
232 | CONFIG_CPU_TLB_V4WBI=y | 222 | CONFIG_CPU_TLB_V4WBI=y |
@@ -264,12 +254,11 @@ CONFIG_OMAP_CF=y | |||
264 | # | 254 | # |
265 | CONFIG_TICK_ONESHOT=y | 255 | CONFIG_TICK_ONESHOT=y |
266 | CONFIG_NO_HZ=y | 256 | CONFIG_NO_HZ=y |
267 | CONFIG_HIGH_RES_TIMERS=y | 257 | # CONFIG_HIGH_RES_TIMERS is not set |
268 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 258 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
269 | # CONFIG_PREEMPT is not set | 259 | # CONFIG_PREEMPT is not set |
270 | CONFIG_HZ=128 | 260 | CONFIG_HZ=128 |
271 | CONFIG_AEABI=y | 261 | # CONFIG_AEABI is not set |
272 | CONFIG_OABI_COMPAT=y | ||
273 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | 262 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set |
274 | CONFIG_SELECT_MEMORY_MODEL=y | 263 | CONFIG_SELECT_MEMORY_MODEL=y |
275 | CONFIG_FLATMEM_MANUAL=y | 264 | CONFIG_FLATMEM_MANUAL=y |
@@ -295,7 +284,6 @@ CONFIG_ZBOOT_ROM_BSS=0x0 | |||
295 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" | 284 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 initrd=0x10400000,8M root=/dev/ram0 rw" |
296 | # CONFIG_XIP_KERNEL is not set | 285 | # CONFIG_XIP_KERNEL is not set |
297 | # CONFIG_KEXEC is not set | 286 | # CONFIG_KEXEC is not set |
298 | # CONFIG_ATAGS_PROC is not set | ||
299 | 287 | ||
300 | # | 288 | # |
301 | # CPU Frequency scaling | 289 | # CPU Frequency scaling |
@@ -320,6 +308,7 @@ CONFIG_FPE_NWFPE=y | |||
320 | CONFIG_BINFMT_ELF=y | 308 | CONFIG_BINFMT_ELF=y |
321 | # CONFIG_BINFMT_AOUT is not set | 309 | # CONFIG_BINFMT_AOUT is not set |
322 | # CONFIG_BINFMT_MISC is not set | 310 | # CONFIG_BINFMT_MISC is not set |
311 | # CONFIG_ARTHUR is not set | ||
323 | 312 | ||
324 | # | 313 | # |
325 | # Power management options | 314 | # Power management options |
@@ -328,10 +317,9 @@ CONFIG_PM=y | |||
328 | # CONFIG_PM_LEGACY is not set | 317 | # CONFIG_PM_LEGACY is not set |
329 | # CONFIG_PM_DEBUG is not set | 318 | # CONFIG_PM_DEBUG is not set |
330 | CONFIG_PM_SLEEP=y | 319 | CONFIG_PM_SLEEP=y |
320 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
331 | CONFIG_SUSPEND=y | 321 | CONFIG_SUSPEND=y |
332 | CONFIG_SUSPEND_FREEZER=y | ||
333 | # CONFIG_APM_EMULATION is not set | 322 | # CONFIG_APM_EMULATION is not set |
334 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
335 | 323 | ||
336 | # | 324 | # |
337 | # Networking | 325 | # Networking |
@@ -348,7 +336,6 @@ CONFIG_XFRM=y | |||
348 | # CONFIG_XFRM_USER is not set | 336 | # CONFIG_XFRM_USER is not set |
349 | # CONFIG_XFRM_SUB_POLICY is not set | 337 | # CONFIG_XFRM_SUB_POLICY is not set |
350 | # CONFIG_XFRM_MIGRATE is not set | 338 | # CONFIG_XFRM_MIGRATE is not set |
351 | # CONFIG_XFRM_STATISTICS is not set | ||
352 | # CONFIG_NET_KEY is not set | 339 | # CONFIG_NET_KEY is not set |
353 | CONFIG_INET=y | 340 | CONFIG_INET=y |
354 | CONFIG_IP_MULTICAST=y | 341 | CONFIG_IP_MULTICAST=y |
@@ -404,7 +391,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
404 | # | 391 | # |
405 | # CONFIG_NET_PKTGEN is not set | 392 | # CONFIG_NET_PKTGEN is not set |
406 | # CONFIG_HAMRADIO is not set | 393 | # CONFIG_HAMRADIO is not set |
407 | # CONFIG_CAN is not set | ||
408 | # CONFIG_IRDA is not set | 394 | # CONFIG_IRDA is not set |
409 | # CONFIG_BT is not set | 395 | # CONFIG_BT is not set |
410 | # CONFIG_AF_RXRPC is not set | 396 | # CONFIG_AF_RXRPC is not set |
@@ -517,13 +503,11 @@ CONFIG_BLK_DEV_LOOP=y | |||
517 | CONFIG_BLK_DEV_RAM=y | 503 | CONFIG_BLK_DEV_RAM=y |
518 | CONFIG_BLK_DEV_RAM_COUNT=16 | 504 | CONFIG_BLK_DEV_RAM_COUNT=16 |
519 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 505 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
520 | # CONFIG_BLK_DEV_XIP is not set | 506 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
521 | # CONFIG_CDROM_PKTCDVD is not set | 507 | # CONFIG_CDROM_PKTCDVD is not set |
522 | # CONFIG_ATA_OVER_ETH is not set | 508 | # CONFIG_ATA_OVER_ETH is not set |
523 | CONFIG_MISC_DEVICES=y | 509 | CONFIG_MISC_DEVICES=y |
524 | # CONFIG_EEPROM_93CX6 is not set | 510 | # CONFIG_EEPROM_93CX6 is not set |
525 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
526 | CONFIG_HAVE_IDE=y | ||
527 | CONFIG_IDE=m | 511 | CONFIG_IDE=m |
528 | CONFIG_BLK_DEV_IDE=m | 512 | CONFIG_BLK_DEV_IDE=m |
529 | 513 | ||
@@ -545,6 +529,7 @@ CONFIG_IDE_PROC_FS=y | |||
545 | # | 529 | # |
546 | # CONFIG_IDE_GENERIC is not set | 530 | # CONFIG_IDE_GENERIC is not set |
547 | # CONFIG_BLK_DEV_PLATFORM is not set | 531 | # CONFIG_BLK_DEV_PLATFORM is not set |
532 | # CONFIG_IDE_ARM is not set | ||
548 | # CONFIG_BLK_DEV_IDEDMA is not set | 533 | # CONFIG_BLK_DEV_IDEDMA is not set |
549 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | 534 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y |
550 | # CONFIG_BLK_DEV_HD is not set | 535 | # CONFIG_BLK_DEV_HD is not set |
@@ -578,7 +563,6 @@ CONFIG_SMC91X=y | |||
578 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 563 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
579 | # CONFIG_B44 is not set | 564 | # CONFIG_B44 is not set |
580 | CONFIG_NETDEV_1000=y | 565 | CONFIG_NETDEV_1000=y |
581 | # CONFIG_E1000E_ENABLED is not set | ||
582 | CONFIG_NETDEV_10000=y | 566 | CONFIG_NETDEV_10000=y |
583 | 567 | ||
584 | # | 568 | # |
@@ -600,6 +584,7 @@ CONFIG_PPP_MULTILINK=y | |||
600 | # CONFIG_PPPOL2TP is not set | 584 | # CONFIG_PPPOL2TP is not set |
601 | # CONFIG_SLIP is not set | 585 | # CONFIG_SLIP is not set |
602 | CONFIG_SLHC=y | 586 | CONFIG_SLHC=y |
587 | # CONFIG_SHAPER is not set | ||
603 | # CONFIG_NETCONSOLE is not set | 588 | # CONFIG_NETCONSOLE is not set |
604 | # CONFIG_NETPOLL is not set | 589 | # CONFIG_NETPOLL is not set |
605 | # CONFIG_NET_POLL_CONTROLLER is not set | 590 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -696,7 +681,6 @@ CONFIG_HW_RANDOM_OMAP=m | |||
696 | # CONFIG_SYNCLINK_CS is not set | 681 | # CONFIG_SYNCLINK_CS is not set |
697 | # CONFIG_CARDMAN_4000 is not set | 682 | # CONFIG_CARDMAN_4000 is not set |
698 | # CONFIG_CARDMAN_4040 is not set | 683 | # CONFIG_CARDMAN_4040 is not set |
699 | # CONFIG_IPWIRELESS is not set | ||
700 | # CONFIG_RAW_DRIVER is not set | 684 | # CONFIG_RAW_DRIVER is not set |
701 | # CONFIG_TCG_TPM is not set | 685 | # CONFIG_TCG_TPM is not set |
702 | CONFIG_I2C=y | 686 | CONFIG_I2C=y |
@@ -724,13 +708,17 @@ CONFIG_I2C_OMAP=y | |||
724 | # | 708 | # |
725 | # Miscellaneous I2C Chip support | 709 | # Miscellaneous I2C Chip support |
726 | # | 710 | # |
711 | # CONFIG_SENSORS_DS1337 is not set | ||
712 | # CONFIG_SENSORS_DS1374 is not set | ||
727 | # CONFIG_DS1682 is not set | 713 | # CONFIG_DS1682 is not set |
728 | # CONFIG_SENSORS_EEPROM is not set | 714 | # CONFIG_SENSORS_EEPROM is not set |
729 | # CONFIG_SENSORS_PCF8574 is not set | 715 | # CONFIG_SENSORS_PCF8574 is not set |
730 | # CONFIG_PCF8575 is not set | 716 | # CONFIG_SENSORS_PCA9539 is not set |
731 | # CONFIG_SENSORS_PCF8591 is not set | 717 | # CONFIG_SENSORS_PCF8591 is not set |
732 | # CONFIG_ISP1301_OMAP is not set | 718 | # CONFIG_ISP1301_OMAP is not set |
733 | CONFIG_TPS65010=y | 719 | CONFIG_TPS65010=y |
720 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
721 | # CONFIG_GPIOEXPANDER_OMAP is not set | ||
734 | # CONFIG_SENSORS_MAX6875 is not set | 722 | # CONFIG_SENSORS_MAX6875 is not set |
735 | # CONFIG_SENSORS_TSL2550 is not set | 723 | # CONFIG_SENSORS_TSL2550 is not set |
736 | # CONFIG_I2C_DEBUG_CORE is not set | 724 | # CONFIG_I2C_DEBUG_CORE is not set |
@@ -755,7 +743,6 @@ CONFIG_HWMON=y | |||
755 | # CONFIG_SENSORS_ADM1031 is not set | 743 | # CONFIG_SENSORS_ADM1031 is not set |
756 | # CONFIG_SENSORS_ADM9240 is not set | 744 | # CONFIG_SENSORS_ADM9240 is not set |
757 | # CONFIG_SENSORS_ADT7470 is not set | 745 | # CONFIG_SENSORS_ADT7470 is not set |
758 | # CONFIG_SENSORS_ADT7473 is not set | ||
759 | # CONFIG_SENSORS_ATXP1 is not set | 746 | # CONFIG_SENSORS_ATXP1 is not set |
760 | # CONFIG_SENSORS_DS1621 is not set | 747 | # CONFIG_SENSORS_DS1621 is not set |
761 | # CONFIG_SENSORS_F71805F is not set | 748 | # CONFIG_SENSORS_F71805F is not set |
@@ -783,7 +770,6 @@ CONFIG_HWMON=y | |||
783 | # CONFIG_SENSORS_SMSC47M1 is not set | 770 | # CONFIG_SENSORS_SMSC47M1 is not set |
784 | # CONFIG_SENSORS_SMSC47M192 is not set | 771 | # CONFIG_SENSORS_SMSC47M192 is not set |
785 | # CONFIG_SENSORS_SMSC47B397 is not set | 772 | # CONFIG_SENSORS_SMSC47B397 is not set |
786 | # CONFIG_SENSORS_ADS7828 is not set | ||
787 | # CONFIG_SENSORS_THMC50 is not set | 773 | # CONFIG_SENSORS_THMC50 is not set |
788 | # CONFIG_SENSORS_VT1211 is not set | 774 | # CONFIG_SENSORS_VT1211 is not set |
789 | # CONFIG_SENSORS_W83781D is not set | 775 | # CONFIG_SENSORS_W83781D is not set |
@@ -791,7 +777,6 @@ CONFIG_HWMON=y | |||
791 | # CONFIG_SENSORS_W83792D is not set | 777 | # CONFIG_SENSORS_W83792D is not set |
792 | # CONFIG_SENSORS_W83793 is not set | 778 | # CONFIG_SENSORS_W83793 is not set |
793 | # CONFIG_SENSORS_W83L785TS is not set | 779 | # CONFIG_SENSORS_W83L785TS is not set |
794 | # CONFIG_SENSORS_W83L786NG is not set | ||
795 | # CONFIG_SENSORS_W83627HF is not set | 780 | # CONFIG_SENSORS_W83627HF is not set |
796 | # CONFIG_SENSORS_W83627EHF is not set | 781 | # CONFIG_SENSORS_W83627EHF is not set |
797 | # CONFIG_HWMON_DEBUG_CHIP is not set | 782 | # CONFIG_HWMON_DEBUG_CHIP is not set |
@@ -807,7 +792,6 @@ CONFIG_SSB_POSSIBLE=y | |||
807 | # Multifunction device drivers | 792 | # Multifunction device drivers |
808 | # | 793 | # |
809 | # CONFIG_MFD_SM501 is not set | 794 | # CONFIG_MFD_SM501 is not set |
810 | # CONFIG_MFD_ASIC3 is not set | ||
811 | 795 | ||
812 | # | 796 | # |
813 | # Multimedia devices | 797 | # Multimedia devices |
@@ -822,11 +806,11 @@ CONFIG_DAB=y | |||
822 | # CONFIG_VGASTATE is not set | 806 | # CONFIG_VGASTATE is not set |
823 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 807 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
824 | CONFIG_FB=y | 808 | CONFIG_FB=y |
825 | CONFIG_FIRMWARE_EDID=y | 809 | # CONFIG_FIRMWARE_EDID is not set |
826 | # CONFIG_FB_DDC is not set | 810 | # CONFIG_FB_DDC is not set |
827 | # CONFIG_FB_CFB_FILLRECT is not set | 811 | CONFIG_FB_CFB_FILLRECT=y |
828 | # CONFIG_FB_CFB_COPYAREA is not set | 812 | CONFIG_FB_CFB_COPYAREA=y |
829 | # CONFIG_FB_CFB_IMAGEBLIT is not set | 813 | CONFIG_FB_CFB_IMAGEBLIT=y |
830 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | 814 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set |
831 | # CONFIG_FB_SYS_FILLRECT is not set | 815 | # CONFIG_FB_SYS_FILLRECT is not set |
832 | # CONFIG_FB_SYS_COPYAREA is not set | 816 | # CONFIG_FB_SYS_COPYAREA is not set |
@@ -844,7 +828,11 @@ CONFIG_FB_MODE_HELPERS=y | |||
844 | # | 828 | # |
845 | # CONFIG_FB_S1D13XXX is not set | 829 | # CONFIG_FB_S1D13XXX is not set |
846 | # CONFIG_FB_VIRTUAL is not set | 830 | # CONFIG_FB_VIRTUAL is not set |
847 | # CONFIG_FB_OMAP is not set | 831 | CONFIG_FB_OMAP=y |
832 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
833 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
834 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
835 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
848 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 836 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
849 | 837 | ||
850 | # | 838 | # |
@@ -891,8 +879,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
891 | # CONFIG_USB is not set | 879 | # CONFIG_USB is not set |
892 | 880 | ||
893 | # | 881 | # |
882 | # Enable Host or Gadget support to see Inventra options | ||
883 | # | ||
884 | |||
885 | # | ||
894 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
895 | # | 887 | # |
888 | |||
889 | # | ||
890 | # USB Gadget Support | ||
891 | # | ||
896 | # CONFIG_USB_GADGET is not set | 892 | # CONFIG_USB_GADGET is not set |
897 | # CONFIG_MMC is not set | 893 | # CONFIG_MMC is not set |
898 | # CONFIG_NEW_LEDS is not set | 894 | # CONFIG_NEW_LEDS is not set |
@@ -900,6 +896,11 @@ CONFIG_RTC_LIB=y | |||
900 | # CONFIG_RTC_CLASS is not set | 896 | # CONFIG_RTC_CLASS is not set |
901 | 897 | ||
902 | # | 898 | # |
899 | # CBUS support | ||
900 | # | ||
901 | # CONFIG_CBUS is not set | ||
902 | |||
903 | # | ||
903 | # File systems | 904 | # File systems |
904 | # | 905 | # |
905 | CONFIG_EXT2_FS=y | 906 | CONFIG_EXT2_FS=y |
@@ -913,10 +914,12 @@ CONFIG_EXT2_FS=y | |||
913 | # CONFIG_XFS_FS is not set | 914 | # CONFIG_XFS_FS is not set |
914 | # CONFIG_GFS2_FS is not set | 915 | # CONFIG_GFS2_FS is not set |
915 | # CONFIG_OCFS2_FS is not set | 916 | # CONFIG_OCFS2_FS is not set |
916 | CONFIG_DNOTIFY=y | 917 | # CONFIG_MINIX_FS is not set |
918 | # CONFIG_ROMFS_FS is not set | ||
917 | CONFIG_INOTIFY=y | 919 | CONFIG_INOTIFY=y |
918 | CONFIG_INOTIFY_USER=y | 920 | CONFIG_INOTIFY_USER=y |
919 | # CONFIG_QUOTA is not set | 921 | # CONFIG_QUOTA is not set |
922 | CONFIG_DNOTIFY=y | ||
920 | CONFIG_AUTOFS_FS=y | 923 | CONFIG_AUTOFS_FS=y |
921 | CONFIG_AUTOFS4_FS=y | 924 | CONFIG_AUTOFS4_FS=y |
922 | # CONFIG_FUSE_FS is not set | 925 | # CONFIG_FUSE_FS is not set |
@@ -970,10 +973,8 @@ CONFIG_JFFS2_RTIME=y | |||
970 | # CONFIG_JFFS2_RUBIN is not set | 973 | # CONFIG_JFFS2_RUBIN is not set |
971 | # CONFIG_CRAMFS is not set | 974 | # CONFIG_CRAMFS is not set |
972 | # CONFIG_VXFS_FS is not set | 975 | # CONFIG_VXFS_FS is not set |
973 | # CONFIG_MINIX_FS is not set | ||
974 | # CONFIG_HPFS_FS is not set | 976 | # CONFIG_HPFS_FS is not set |
975 | # CONFIG_QNX4FS_FS is not set | 977 | # CONFIG_QNX4FS_FS is not set |
976 | # CONFIG_ROMFS_FS is not set | ||
977 | # CONFIG_SYSV_FS is not set | 978 | # CONFIG_SYSV_FS is not set |
978 | # CONFIG_UFS_FS is not set | 979 | # CONFIG_UFS_FS is not set |
979 | CONFIG_NETWORK_FILESYSTEMS=y | 980 | CONFIG_NETWORK_FILESYSTEMS=y |
@@ -1043,6 +1044,9 @@ CONFIG_NLS_ISO8859_1=m | |||
1043 | # CONFIG_NLS_KOI8_U is not set | 1044 | # CONFIG_NLS_KOI8_U is not set |
1044 | # CONFIG_NLS_UTF8 is not set | 1045 | # CONFIG_NLS_UTF8 is not set |
1045 | # CONFIG_DLM is not set | 1046 | # CONFIG_DLM is not set |
1047 | CONFIG_INSTRUMENTATION=y | ||
1048 | # CONFIG_PROFILING is not set | ||
1049 | # CONFIG_MARKERS is not set | ||
1046 | 1050 | ||
1047 | # | 1051 | # |
1048 | # Kernel hacking | 1052 | # Kernel hacking |
@@ -1055,6 +1059,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1055 | # CONFIG_DEBUG_FS is not set | 1059 | # CONFIG_DEBUG_FS is not set |
1056 | # CONFIG_HEADERS_CHECK is not set | 1060 | # CONFIG_HEADERS_CHECK is not set |
1057 | # CONFIG_DEBUG_KERNEL is not set | 1061 | # CONFIG_DEBUG_KERNEL is not set |
1062 | # CONFIG_SLUB_DEBUG_ON is not set | ||
1058 | CONFIG_DEBUG_BUGVERBOSE=y | 1063 | CONFIG_DEBUG_BUGVERBOSE=y |
1059 | CONFIG_FRAME_POINTER=y | 1064 | CONFIG_FRAME_POINTER=y |
1060 | # CONFIG_SAMPLES is not set | 1065 | # CONFIG_SAMPLES is not set |
@@ -1066,51 +1071,7 @@ CONFIG_FRAME_POINTER=y | |||
1066 | # CONFIG_KEYS is not set | 1071 | # CONFIG_KEYS is not set |
1067 | # CONFIG_SECURITY is not set | 1072 | # CONFIG_SECURITY is not set |
1068 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1073 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1069 | CONFIG_CRYPTO=y | 1074 | # CONFIG_CRYPTO is not set |
1070 | # CONFIG_CRYPTO_SEQIV is not set | ||
1071 | # CONFIG_CRYPTO_MANAGER is not set | ||
1072 | # CONFIG_CRYPTO_HMAC is not set | ||
1073 | # CONFIG_CRYPTO_XCBC is not set | ||
1074 | # CONFIG_CRYPTO_NULL is not set | ||
1075 | # CONFIG_CRYPTO_MD4 is not set | ||
1076 | # CONFIG_CRYPTO_MD5 is not set | ||
1077 | # CONFIG_CRYPTO_SHA1 is not set | ||
1078 | # CONFIG_CRYPTO_SHA256 is not set | ||
1079 | # CONFIG_CRYPTO_SHA512 is not set | ||
1080 | # CONFIG_CRYPTO_WP512 is not set | ||
1081 | # CONFIG_CRYPTO_TGR192 is not set | ||
1082 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1083 | # CONFIG_CRYPTO_ECB is not set | ||
1084 | # CONFIG_CRYPTO_CBC is not set | ||
1085 | # CONFIG_CRYPTO_PCBC is not set | ||
1086 | # CONFIG_CRYPTO_LRW is not set | ||
1087 | # CONFIG_CRYPTO_XTS is not set | ||
1088 | # CONFIG_CRYPTO_CTR is not set | ||
1089 | # CONFIG_CRYPTO_GCM is not set | ||
1090 | # CONFIG_CRYPTO_CCM is not set | ||
1091 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1092 | # CONFIG_CRYPTO_DES is not set | ||
1093 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1094 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1095 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1096 | # CONFIG_CRYPTO_SERPENT is not set | ||
1097 | # CONFIG_CRYPTO_AES is not set | ||
1098 | # CONFIG_CRYPTO_CAST5 is not set | ||
1099 | # CONFIG_CRYPTO_CAST6 is not set | ||
1100 | # CONFIG_CRYPTO_TEA is not set | ||
1101 | # CONFIG_CRYPTO_ARC4 is not set | ||
1102 | # CONFIG_CRYPTO_KHAZAD is not set | ||
1103 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1104 | # CONFIG_CRYPTO_SEED is not set | ||
1105 | # CONFIG_CRYPTO_SALSA20 is not set | ||
1106 | # CONFIG_CRYPTO_DEFLATE is not set | ||
1107 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1108 | # CONFIG_CRYPTO_CRC32C is not set | ||
1109 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1110 | # CONFIG_CRYPTO_TEST is not set | ||
1111 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1112 | # CONFIG_CRYPTO_LZO is not set | ||
1113 | CONFIG_CRYPTO_HW=y | ||
1114 | 1075 | ||
1115 | # | 1076 | # |
1116 | # Library routines | 1077 | # Library routines |
diff --git a/arch/arm/configs/omap_perseus2_730_defconfig b/arch/arm/configs/omap_perseus2_730_defconfig new file mode 100644 index 000000000000..b94800c0e000 --- /dev/null +++ b/arch/arm/configs/omap_perseus2_730_defconfig | |||
@@ -0,0 +1,928 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.23-rc6-omap1 | ||
4 | # Tue Sep 18 11:45:12 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # General setup | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_LOCK_KERNEL=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | CONFIG_LOCALVERSION="" | ||
36 | CONFIG_LOCALVERSION_AUTO=y | ||
37 | CONFIG_SWAP=y | ||
38 | CONFIG_SYSVIPC=y | ||
39 | CONFIG_SYSVIPC_SYSCTL=y | ||
40 | # CONFIG_POSIX_MQUEUE is not set | ||
41 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
42 | # CONFIG_TASKSTATS is not set | ||
43 | # CONFIG_USER_NS is not set | ||
44 | # CONFIG_AUDIT is not set | ||
45 | # CONFIG_IKCONFIG is not set | ||
46 | CONFIG_LOG_BUF_SHIFT=14 | ||
47 | CONFIG_SYSFS_DEPRECATED=y | ||
48 | # CONFIG_RELAY is not set | ||
49 | CONFIG_BLK_DEV_INITRD=y | ||
50 | CONFIG_INITRAMFS_SOURCE="" | ||
51 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
52 | CONFIG_SYSCTL=y | ||
53 | # CONFIG_EMBEDDED is not set | ||
54 | CONFIG_UID16=y | ||
55 | CONFIG_SYSCTL_SYSCALL=y | ||
56 | CONFIG_KALLSYMS=y | ||
57 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
58 | CONFIG_HOTPLUG=y | ||
59 | CONFIG_PRINTK=y | ||
60 | CONFIG_BUG=y | ||
61 | CONFIG_ELF_CORE=y | ||
62 | CONFIG_BASE_FULL=y | ||
63 | CONFIG_FUTEX=y | ||
64 | CONFIG_ANON_INODES=y | ||
65 | CONFIG_EPOLL=y | ||
66 | CONFIG_SIGNALFD=y | ||
67 | CONFIG_TIMERFD=y | ||
68 | CONFIG_EVENTFD=y | ||
69 | CONFIG_SHMEM=y | ||
70 | CONFIG_VM_EVENT_COUNTERS=y | ||
71 | CONFIG_SLAB=y | ||
72 | # CONFIG_SLUB is not set | ||
73 | # CONFIG_SLOB is not set | ||
74 | CONFIG_RT_MUTEXES=y | ||
75 | # CONFIG_TINY_SHMEM is not set | ||
76 | CONFIG_BASE_SMALL=0 | ||
77 | CONFIG_MODULES=y | ||
78 | CONFIG_MODULE_UNLOAD=y | ||
79 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
80 | # CONFIG_MODVERSIONS is not set | ||
81 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
82 | CONFIG_KMOD=y | ||
83 | CONFIG_BLOCK=y | ||
84 | # CONFIG_LBD is not set | ||
85 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
86 | # CONFIG_LSF is not set | ||
87 | # CONFIG_BLK_DEV_BSG is not set | ||
88 | |||
89 | # | ||
90 | # IO Schedulers | ||
91 | # | ||
92 | CONFIG_IOSCHED_NOOP=y | ||
93 | CONFIG_IOSCHED_AS=y | ||
94 | CONFIG_IOSCHED_DEADLINE=y | ||
95 | CONFIG_IOSCHED_CFQ=y | ||
96 | # CONFIG_DEFAULT_AS is not set | ||
97 | # CONFIG_DEFAULT_DEADLINE is not set | ||
98 | CONFIG_DEFAULT_CFQ=y | ||
99 | # CONFIG_DEFAULT_NOOP is not set | ||
100 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
101 | |||
102 | # | ||
103 | # System Type | ||
104 | # | ||
105 | # CONFIG_ARCH_AAEC2000 is not set | ||
106 | # CONFIG_ARCH_INTEGRATOR is not set | ||
107 | # CONFIG_ARCH_REALVIEW is not set | ||
108 | # CONFIG_ARCH_VERSATILE is not set | ||
109 | # CONFIG_ARCH_AT91 is not set | ||
110 | # CONFIG_ARCH_CLPS7500 is not set | ||
111 | # CONFIG_ARCH_CLPS711X is not set | ||
112 | # CONFIG_ARCH_CO285 is not set | ||
113 | # CONFIG_ARCH_EBSA110 is not set | ||
114 | # CONFIG_ARCH_EP93XX is not set | ||
115 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
116 | # CONFIG_ARCH_NETX is not set | ||
117 | # CONFIG_ARCH_H720X is not set | ||
118 | # CONFIG_ARCH_IMX is not set | ||
119 | # CONFIG_ARCH_IOP13XX is not set | ||
120 | # CONFIG_ARCH_IOP32X is not set | ||
121 | # CONFIG_ARCH_IOP33X is not set | ||
122 | # CONFIG_ARCH_IXP23XX is not set | ||
123 | # CONFIG_ARCH_IXP2000 is not set | ||
124 | # CONFIG_ARCH_IXP4XX is not set | ||
125 | # CONFIG_ARCH_L7200 is not set | ||
126 | # CONFIG_ARCH_KS8695 is not set | ||
127 | # CONFIG_ARCH_NS9XXX is not set | ||
128 | # CONFIG_ARCH_MXC is not set | ||
129 | # CONFIG_ARCH_PNX4008 is not set | ||
130 | # CONFIG_ARCH_PXA is not set | ||
131 | # CONFIG_ARCH_RPC is not set | ||
132 | # CONFIG_ARCH_SA1100 is not set | ||
133 | # CONFIG_ARCH_S3C2410 is not set | ||
134 | # CONFIG_ARCH_SHARK is not set | ||
135 | # CONFIG_ARCH_LH7A40X is not set | ||
136 | # CONFIG_ARCH_DAVINCI is not set | ||
137 | CONFIG_ARCH_OMAP=y | ||
138 | |||
139 | # | ||
140 | # TI OMAP Implementations | ||
141 | # | ||
142 | CONFIG_ARCH_OMAP_OTG=y | ||
143 | CONFIG_ARCH_OMAP1=y | ||
144 | # CONFIG_ARCH_OMAP2 is not set | ||
145 | # CONFIG_ARCH_OMAP3 is not set | ||
146 | |||
147 | # | ||
148 | # OMAP Feature Selections | ||
149 | # | ||
150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
152 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
153 | CONFIG_OMAP_MUX=y | ||
154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
156 | CONFIG_OMAP_MCBSP=y | ||
157 | # CONFIG_OMAP_MMU_FWK is not set | ||
158 | # CONFIG_OMAP_MBOX_FWK is not set | ||
159 | CONFIG_OMAP_MPU_TIMER=y | ||
160 | # CONFIG_OMAP_32K_TIMER is not set | ||
161 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
163 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
164 | CONFIG_OMAP_SERIAL_WAKE=y | ||
165 | |||
166 | # | ||
167 | # OMAP Core Type | ||
168 | # | ||
169 | CONFIG_ARCH_OMAP730=y | ||
170 | # CONFIG_ARCH_OMAP15XX is not set | ||
171 | # CONFIG_ARCH_OMAP16XX is not set | ||
172 | |||
173 | # | ||
174 | # OMAP Board Type | ||
175 | # | ||
176 | CONFIG_MACH_OMAP_PERSEUS2=y | ||
177 | # CONFIG_MACH_OMAP_FSAMPLE is not set | ||
178 | |||
179 | # | ||
180 | # OMAP CPU Speed | ||
181 | # | ||
182 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
183 | # CONFIG_OMAP_ARM_195MHZ is not set | ||
184 | CONFIG_OMAP_ARM_182MHZ=y | ||
185 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
186 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
187 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
188 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
189 | # CONFIG_MACH_OMAP_APOLLON_PLUS is not set | ||
190 | |||
191 | # | ||
192 | # Boot options | ||
193 | # | ||
194 | |||
195 | # | ||
196 | # Power management | ||
197 | # | ||
198 | |||
199 | # | ||
200 | # Processor Type | ||
201 | # | ||
202 | CONFIG_CPU_32=y | ||
203 | CONFIG_CPU_ARM926T=y | ||
204 | CONFIG_CPU_32v5=y | ||
205 | CONFIG_CPU_ABRT_EV5TJ=y | ||
206 | CONFIG_CPU_PABRT_NOIFAR=y | ||
207 | CONFIG_CPU_CACHE_VIVT=y | ||
208 | CONFIG_CPU_COPY_V4WB=y | ||
209 | CONFIG_CPU_TLB_V4WBI=y | ||
210 | CONFIG_CPU_CP15=y | ||
211 | CONFIG_CPU_CP15_MMU=y | ||
212 | |||
213 | # | ||
214 | # Processor Features | ||
215 | # | ||
216 | # CONFIG_ARM_THUMB is not set | ||
217 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
218 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
219 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
220 | # CONFIG_CPU_CACHE_ROUND_ROBIN is not set | ||
221 | # CONFIG_OUTER_CACHE is not set | ||
222 | |||
223 | # | ||
224 | # Bus support | ||
225 | # | ||
226 | # CONFIG_PCI_SYSCALL is not set | ||
227 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
228 | |||
229 | # | ||
230 | # PCCARD (PCMCIA/CardBus) support | ||
231 | # | ||
232 | # CONFIG_PCCARD is not set | ||
233 | |||
234 | # | ||
235 | # Kernel Features | ||
236 | # | ||
237 | # CONFIG_TICK_ONESHOT is not set | ||
238 | # CONFIG_NO_HZ is not set | ||
239 | # CONFIG_HIGH_RES_TIMERS is not set | ||
240 | CONFIG_PREEMPT=y | ||
241 | CONFIG_HZ=100 | ||
242 | # CONFIG_AEABI is not set | ||
243 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
244 | CONFIG_SELECT_MEMORY_MODEL=y | ||
245 | CONFIG_FLATMEM_MANUAL=y | ||
246 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
247 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
248 | CONFIG_FLATMEM=y | ||
249 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
250 | # CONFIG_SPARSEMEM_STATIC is not set | ||
251 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
252 | # CONFIG_RESOURCES_64BIT is not set | ||
253 | CONFIG_ZONE_DMA_FLAG=1 | ||
254 | CONFIG_BOUNCE=y | ||
255 | CONFIG_VIRT_TO_BUS=y | ||
256 | CONFIG_LEDS=y | ||
257 | CONFIG_LEDS_CPU=y | ||
258 | CONFIG_ALIGNMENT_TRAP=y | ||
259 | |||
260 | # | ||
261 | # Boot options | ||
262 | # | ||
263 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
264 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
265 | CONFIG_CMDLINE="mem=32M console=ttyS0,115200 ip=dhcp" | ||
266 | # CONFIG_XIP_KERNEL is not set | ||
267 | # CONFIG_KEXEC is not set | ||
268 | |||
269 | # | ||
270 | # CPU Frequency scaling | ||
271 | # | ||
272 | # CONFIG_CPU_FREQ is not set | ||
273 | |||
274 | # | ||
275 | # Floating point emulation | ||
276 | # | ||
277 | |||
278 | # | ||
279 | # At least one emulation must be selected | ||
280 | # | ||
281 | CONFIG_FPE_NWFPE=y | ||
282 | # CONFIG_FPE_NWFPE_XP is not set | ||
283 | # CONFIG_FPE_FASTFPE is not set | ||
284 | # CONFIG_VFP is not set | ||
285 | |||
286 | # | ||
287 | # Userspace binary formats | ||
288 | # | ||
289 | CONFIG_BINFMT_ELF=y | ||
290 | # CONFIG_BINFMT_AOUT is not set | ||
291 | # CONFIG_BINFMT_MISC is not set | ||
292 | # CONFIG_ARTHUR is not set | ||
293 | |||
294 | # | ||
295 | # Power management options | ||
296 | # | ||
297 | CONFIG_PM=y | ||
298 | # CONFIG_PM_LEGACY is not set | ||
299 | # CONFIG_PM_DEBUG is not set | ||
300 | CONFIG_PM_SLEEP=y | ||
301 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
302 | CONFIG_SUSPEND=y | ||
303 | # CONFIG_APM_EMULATION is not set | ||
304 | |||
305 | # | ||
306 | # Networking | ||
307 | # | ||
308 | CONFIG_NET=y | ||
309 | |||
310 | # | ||
311 | # Networking options | ||
312 | # | ||
313 | CONFIG_PACKET=y | ||
314 | # CONFIG_PACKET_MMAP is not set | ||
315 | CONFIG_UNIX=y | ||
316 | CONFIG_XFRM=y | ||
317 | # CONFIG_XFRM_USER is not set | ||
318 | # CONFIG_XFRM_SUB_POLICY is not set | ||
319 | # CONFIG_XFRM_MIGRATE is not set | ||
320 | # CONFIG_NET_KEY is not set | ||
321 | CONFIG_INET=y | ||
322 | CONFIG_IP_MULTICAST=y | ||
323 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
324 | CONFIG_IP_FIB_HASH=y | ||
325 | CONFIG_IP_PNP=y | ||
326 | CONFIG_IP_PNP_DHCP=y | ||
327 | CONFIG_IP_PNP_BOOTP=y | ||
328 | # CONFIG_IP_PNP_RARP is not set | ||
329 | # CONFIG_NET_IPIP is not set | ||
330 | # CONFIG_NET_IPGRE is not set | ||
331 | # CONFIG_IP_MROUTE is not set | ||
332 | # CONFIG_ARPD is not set | ||
333 | # CONFIG_SYN_COOKIES is not set | ||
334 | # CONFIG_INET_AH is not set | ||
335 | # CONFIG_INET_ESP is not set | ||
336 | # CONFIG_INET_IPCOMP is not set | ||
337 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
338 | # CONFIG_INET_TUNNEL is not set | ||
339 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
340 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
341 | CONFIG_INET_XFRM_MODE_BEET=y | ||
342 | CONFIG_INET_DIAG=y | ||
343 | CONFIG_INET_TCP_DIAG=y | ||
344 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
345 | CONFIG_TCP_CONG_CUBIC=y | ||
346 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
347 | # CONFIG_TCP_MD5SIG is not set | ||
348 | # CONFIG_IPV6 is not set | ||
349 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
350 | # CONFIG_INET6_TUNNEL is not set | ||
351 | # CONFIG_NETWORK_SECMARK is not set | ||
352 | # CONFIG_NETFILTER is not set | ||
353 | # CONFIG_IP_DCCP is not set | ||
354 | # CONFIG_IP_SCTP is not set | ||
355 | # CONFIG_TIPC is not set | ||
356 | # CONFIG_ATM is not set | ||
357 | # CONFIG_BRIDGE is not set | ||
358 | # CONFIG_VLAN_8021Q is not set | ||
359 | # CONFIG_DECNET is not set | ||
360 | # CONFIG_LLC2 is not set | ||
361 | # CONFIG_IPX is not set | ||
362 | # CONFIG_ATALK is not set | ||
363 | # CONFIG_X25 is not set | ||
364 | # CONFIG_LAPB is not set | ||
365 | # CONFIG_ECONET is not set | ||
366 | # CONFIG_WAN_ROUTER is not set | ||
367 | |||
368 | # | ||
369 | # QoS and/or fair queueing | ||
370 | # | ||
371 | # CONFIG_NET_SCHED is not set | ||
372 | |||
373 | # | ||
374 | # Network testing | ||
375 | # | ||
376 | # CONFIG_NET_PKTGEN is not set | ||
377 | # CONFIG_HAMRADIO is not set | ||
378 | # CONFIG_IRDA is not set | ||
379 | # CONFIG_BT is not set | ||
380 | # CONFIG_AF_RXRPC is not set | ||
381 | |||
382 | # | ||
383 | # Wireless | ||
384 | # | ||
385 | # CONFIG_CFG80211 is not set | ||
386 | # CONFIG_WIRELESS_EXT is not set | ||
387 | # CONFIG_MAC80211 is not set | ||
388 | # CONFIG_IEEE80211 is not set | ||
389 | # CONFIG_RFKILL is not set | ||
390 | # CONFIG_NET_9P is not set | ||
391 | |||
392 | # | ||
393 | # Device Drivers | ||
394 | # | ||
395 | |||
396 | # | ||
397 | # Generic Driver Options | ||
398 | # | ||
399 | CONFIG_STANDALONE=y | ||
400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
401 | # CONFIG_FW_LOADER is not set | ||
402 | # CONFIG_SYS_HYPERVISOR is not set | ||
403 | # CONFIG_CONNECTOR is not set | ||
404 | CONFIG_MTD=y | ||
405 | # CONFIG_MTD_DEBUG is not set | ||
406 | # CONFIG_MTD_CONCAT is not set | ||
407 | CONFIG_MTD_PARTITIONS=y | ||
408 | # CONFIG_MTD_REDBOOT_PARTS is not set | ||
409 | CONFIG_MTD_CMDLINE_PARTS=y | ||
410 | # CONFIG_MTD_AFS_PARTS is not set | ||
411 | |||
412 | # | ||
413 | # User Modules And Translation Layers | ||
414 | # | ||
415 | CONFIG_MTD_CHAR=y | ||
416 | CONFIG_MTD_BLKDEVS=y | ||
417 | CONFIG_MTD_BLOCK=y | ||
418 | # CONFIG_FTL is not set | ||
419 | # CONFIG_NFTL is not set | ||
420 | # CONFIG_INFTL is not set | ||
421 | # CONFIG_RFD_FTL is not set | ||
422 | # CONFIG_SSFDC is not set | ||
423 | |||
424 | # | ||
425 | # RAM/ROM/Flash chip drivers | ||
426 | # | ||
427 | CONFIG_MTD_CFI=y | ||
428 | # CONFIG_MTD_JEDECPROBE is not set | ||
429 | CONFIG_MTD_GEN_PROBE=y | ||
430 | # CONFIG_MTD_CFI_ADV_OPTIONS is not set | ||
431 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
432 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
433 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
434 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
435 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
436 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
437 | CONFIG_MTD_CFI_I1=y | ||
438 | CONFIG_MTD_CFI_I2=y | ||
439 | # CONFIG_MTD_CFI_I4 is not set | ||
440 | # CONFIG_MTD_CFI_I8 is not set | ||
441 | CONFIG_MTD_CFI_INTELEXT=y | ||
442 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
443 | # CONFIG_MTD_CFI_STAA is not set | ||
444 | CONFIG_MTD_CFI_UTIL=y | ||
445 | # CONFIG_MTD_RAM is not set | ||
446 | # CONFIG_MTD_ROM is not set | ||
447 | # CONFIG_MTD_ABSENT is not set | ||
448 | |||
449 | # | ||
450 | # Mapping drivers for chip access | ||
451 | # | ||
452 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
453 | # CONFIG_MTD_PHYSMAP is not set | ||
454 | # CONFIG_MTD_ARM_INTEGRATOR is not set | ||
455 | CONFIG_MTD_OMAP_NOR=y | ||
456 | # CONFIG_MTD_PLATRAM is not set | ||
457 | |||
458 | # | ||
459 | # Self-contained MTD device drivers | ||
460 | # | ||
461 | # CONFIG_MTD_SLRAM is not set | ||
462 | # CONFIG_MTD_PHRAM is not set | ||
463 | # CONFIG_MTD_MTDRAM is not set | ||
464 | # CONFIG_MTD_BLOCK2MTD is not set | ||
465 | |||
466 | # | ||
467 | # Disk-On-Chip Device Drivers | ||
468 | # | ||
469 | # CONFIG_MTD_DOC2000 is not set | ||
470 | # CONFIG_MTD_DOC2001 is not set | ||
471 | # CONFIG_MTD_DOC2001PLUS is not set | ||
472 | CONFIG_MTD_NAND=y | ||
473 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | ||
474 | # CONFIG_MTD_NAND_ECC_SMC is not set | ||
475 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | ||
476 | CONFIG_MTD_NAND_OMAP=y | ||
477 | CONFIG_MTD_NAND_IDS=y | ||
478 | # CONFIG_MTD_NAND_DISKONCHIP is not set | ||
479 | # CONFIG_MTD_NAND_NANDSIM is not set | ||
480 | # CONFIG_MTD_NAND_PLATFORM is not set | ||
481 | # CONFIG_MTD_ONENAND is not set | ||
482 | |||
483 | # | ||
484 | # UBI - Unsorted block images | ||
485 | # | ||
486 | # CONFIG_MTD_UBI is not set | ||
487 | # CONFIG_PARPORT is not set | ||
488 | CONFIG_BLK_DEV=y | ||
489 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
490 | CONFIG_BLK_DEV_LOOP=y | ||
491 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
492 | # CONFIG_BLK_DEV_NBD is not set | ||
493 | CONFIG_BLK_DEV_RAM=y | ||
494 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
495 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
496 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
497 | # CONFIG_CDROM_PKTCDVD is not set | ||
498 | # CONFIG_ATA_OVER_ETH is not set | ||
499 | |||
500 | # | ||
501 | # SCSI device support | ||
502 | # | ||
503 | # CONFIG_RAID_ATTRS is not set | ||
504 | # CONFIG_SCSI is not set | ||
505 | # CONFIG_SCSI_DMA is not set | ||
506 | # CONFIG_SCSI_NETLINK is not set | ||
507 | # CONFIG_ATA is not set | ||
508 | # CONFIG_MD is not set | ||
509 | CONFIG_NETDEVICES=y | ||
510 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
511 | # CONFIG_DUMMY is not set | ||
512 | # CONFIG_BONDING is not set | ||
513 | # CONFIG_MACVLAN is not set | ||
514 | # CONFIG_EQUALIZER is not set | ||
515 | # CONFIG_TUN is not set | ||
516 | # CONFIG_PHYLIB is not set | ||
517 | CONFIG_NET_ETHERNET=y | ||
518 | CONFIG_MII=y | ||
519 | # CONFIG_AX88796 is not set | ||
520 | CONFIG_SMC91X=y | ||
521 | # CONFIG_DM9000 is not set | ||
522 | CONFIG_NETDEV_1000=y | ||
523 | CONFIG_NETDEV_10000=y | ||
524 | |||
525 | # | ||
526 | # Wireless LAN | ||
527 | # | ||
528 | # CONFIG_WLAN_PRE80211 is not set | ||
529 | # CONFIG_WLAN_80211 is not set | ||
530 | # CONFIG_WAN is not set | ||
531 | # CONFIG_PPP is not set | ||
532 | # CONFIG_SLIP is not set | ||
533 | # CONFIG_SHAPER is not set | ||
534 | # CONFIG_NETCONSOLE is not set | ||
535 | # CONFIG_NETPOLL is not set | ||
536 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
537 | # CONFIG_ISDN is not set | ||
538 | |||
539 | # | ||
540 | # Input device support | ||
541 | # | ||
542 | CONFIG_INPUT=y | ||
543 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
544 | # CONFIG_INPUT_POLLDEV is not set | ||
545 | |||
546 | # | ||
547 | # Userland interfaces | ||
548 | # | ||
549 | CONFIG_INPUT_MOUSEDEV=y | ||
550 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
551 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
552 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
553 | # CONFIG_INPUT_JOYDEV is not set | ||
554 | # CONFIG_INPUT_TSDEV is not set | ||
555 | # CONFIG_INPUT_EVDEV is not set | ||
556 | # CONFIG_INPUT_EVBUG is not set | ||
557 | |||
558 | # | ||
559 | # Input Device Drivers | ||
560 | # | ||
561 | CONFIG_INPUT_KEYBOARD=y | ||
562 | # CONFIG_KEYBOARD_ATKBD is not set | ||
563 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
564 | # CONFIG_KEYBOARD_LKKBD is not set | ||
565 | # CONFIG_KEYBOARD_XTKBD is not set | ||
566 | # CONFIG_KEYBOARD_NEWTON is not set | ||
567 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
568 | CONFIG_KEYBOARD_OMAP=y | ||
569 | # CONFIG_KEYBOARD_GPIO is not set | ||
570 | # CONFIG_INPUT_MOUSE is not set | ||
571 | # CONFIG_INPUT_JOYSTICK is not set | ||
572 | # CONFIG_INPUT_TABLET is not set | ||
573 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
574 | # CONFIG_INPUT_MISC is not set | ||
575 | |||
576 | # | ||
577 | # Hardware I/O ports | ||
578 | # | ||
579 | CONFIG_SERIO=y | ||
580 | CONFIG_SERIO_SERPORT=y | ||
581 | # CONFIG_SERIO_RAW is not set | ||
582 | # CONFIG_GAMEPORT is not set | ||
583 | |||
584 | # | ||
585 | # Character devices | ||
586 | # | ||
587 | CONFIG_VT=y | ||
588 | CONFIG_VT_CONSOLE=y | ||
589 | CONFIG_HW_CONSOLE=y | ||
590 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
591 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
592 | |||
593 | # | ||
594 | # Serial drivers | ||
595 | # | ||
596 | CONFIG_SERIAL_8250=y | ||
597 | CONFIG_SERIAL_8250_CONSOLE=y | ||
598 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
599 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
600 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
601 | |||
602 | # | ||
603 | # Non-8250 serial port support | ||
604 | # | ||
605 | CONFIG_SERIAL_CORE=y | ||
606 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
607 | CONFIG_UNIX98_PTYS=y | ||
608 | # CONFIG_LEGACY_PTYS is not set | ||
609 | # CONFIG_IPMI_HANDLER is not set | ||
610 | # CONFIG_WATCHDOG is not set | ||
611 | CONFIG_HW_RANDOM=m | ||
612 | # CONFIG_NVRAM is not set | ||
613 | # CONFIG_R3964 is not set | ||
614 | # CONFIG_RAW_DRIVER is not set | ||
615 | # CONFIG_TCG_TPM is not set | ||
616 | # CONFIG_I2C is not set | ||
617 | |||
618 | # | ||
619 | # SPI support | ||
620 | # | ||
621 | # CONFIG_SPI is not set | ||
622 | # CONFIG_SPI_MASTER is not set | ||
623 | # CONFIG_W1 is not set | ||
624 | CONFIG_HWMON=y | ||
625 | # CONFIG_HWMON_VID is not set | ||
626 | # CONFIG_SENSORS_ABITUGURU is not set | ||
627 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
628 | # CONFIG_SENSORS_F71805F is not set | ||
629 | # CONFIG_SENSORS_IT87 is not set | ||
630 | # CONFIG_SENSORS_PC87360 is not set | ||
631 | # CONFIG_SENSORS_PC87427 is not set | ||
632 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
633 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
634 | # CONFIG_SENSORS_VT1211 is not set | ||
635 | # CONFIG_SENSORS_W83627HF is not set | ||
636 | # CONFIG_SENSORS_W83627EHF is not set | ||
637 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
638 | CONFIG_MISC_DEVICES=y | ||
639 | # CONFIG_EEPROM_93CX6 is not set | ||
640 | |||
641 | # | ||
642 | # Multifunction device drivers | ||
643 | # | ||
644 | # CONFIG_MFD_SM501 is not set | ||
645 | # CONFIG_NEW_LEDS is not set | ||
646 | |||
647 | # | ||
648 | # Multimedia devices | ||
649 | # | ||
650 | # CONFIG_VIDEO_DEV is not set | ||
651 | # CONFIG_DVB_CORE is not set | ||
652 | CONFIG_DAB=y | ||
653 | |||
654 | # | ||
655 | # Graphics support | ||
656 | # | ||
657 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
658 | |||
659 | # | ||
660 | # Display device support | ||
661 | # | ||
662 | # CONFIG_DISPLAY_SUPPORT is not set | ||
663 | # CONFIG_VGASTATE is not set | ||
664 | CONFIG_VIDEO_OUTPUT_CONTROL=m | ||
665 | CONFIG_FB=y | ||
666 | # CONFIG_FIRMWARE_EDID is not set | ||
667 | # CONFIG_FB_DDC is not set | ||
668 | # CONFIG_FB_CFB_FILLRECT is not set | ||
669 | # CONFIG_FB_CFB_COPYAREA is not set | ||
670 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
671 | CONFIG_FB_SYS_FILLRECT=y | ||
672 | CONFIG_FB_SYS_COPYAREA=y | ||
673 | CONFIG_FB_SYS_IMAGEBLIT=y | ||
674 | CONFIG_FB_SYS_FOPS=y | ||
675 | CONFIG_FB_DEFERRED_IO=y | ||
676 | # CONFIG_FB_SVGALIB is not set | ||
677 | # CONFIG_FB_MACMODES is not set | ||
678 | # CONFIG_FB_BACKLIGHT is not set | ||
679 | CONFIG_FB_MODE_HELPERS=y | ||
680 | # CONFIG_FB_TILEBLITTING is not set | ||
681 | |||
682 | # | ||
683 | # Frame buffer hardware drivers | ||
684 | # | ||
685 | # CONFIG_FB_S1D13XXX is not set | ||
686 | # CONFIG_FB_OMAP is not set | ||
687 | CONFIG_FB_VIRTUAL=y | ||
688 | |||
689 | # | ||
690 | # Console display driver support | ||
691 | # | ||
692 | # CONFIG_VGA_CONSOLE is not set | ||
693 | CONFIG_DUMMY_CONSOLE=y | ||
694 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
695 | # CONFIG_LOGO is not set | ||
696 | |||
697 | # | ||
698 | # Sound | ||
699 | # | ||
700 | # CONFIG_SOUND is not set | ||
701 | CONFIG_HID_SUPPORT=y | ||
702 | CONFIG_HID=y | ||
703 | # CONFIG_HID_DEBUG is not set | ||
704 | CONFIG_USB_SUPPORT=y | ||
705 | CONFIG_USB_ARCH_HAS_HCD=y | ||
706 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
707 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
708 | # CONFIG_USB is not set | ||
709 | |||
710 | # | ||
711 | # Enable Host or Gadget support to see Inventra options | ||
712 | # | ||
713 | |||
714 | # | ||
715 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
716 | # | ||
717 | |||
718 | # | ||
719 | # USB Gadget Support | ||
720 | # | ||
721 | # CONFIG_USB_GADGET is not set | ||
722 | # CONFIG_MMC is not set | ||
723 | CONFIG_RTC_LIB=y | ||
724 | CONFIG_RTC_CLASS=y | ||
725 | CONFIG_RTC_HCTOSYS=y | ||
726 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
727 | # CONFIG_RTC_DEBUG is not set | ||
728 | |||
729 | # | ||
730 | # RTC interfaces | ||
731 | # | ||
732 | CONFIG_RTC_INTF_SYSFS=y | ||
733 | CONFIG_RTC_INTF_PROC=y | ||
734 | CONFIG_RTC_INTF_DEV=y | ||
735 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
736 | # CONFIG_RTC_DRV_TEST is not set | ||
737 | |||
738 | # | ||
739 | # SPI RTC drivers | ||
740 | # | ||
741 | |||
742 | # | ||
743 | # Platform RTC drivers | ||
744 | # | ||
745 | # CONFIG_RTC_DRV_CMOS is not set | ||
746 | # CONFIG_RTC_DRV_DS1553 is not set | ||
747 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
748 | # CONFIG_RTC_DRV_DS1742 is not set | ||
749 | # CONFIG_RTC_DRV_M48T86 is not set | ||
750 | # CONFIG_RTC_DRV_M48T59 is not set | ||
751 | # CONFIG_RTC_DRV_V3020 is not set | ||
752 | |||
753 | # | ||
754 | # on-CPU RTC drivers | ||
755 | # | ||
756 | CONFIG_RTC_DRV_OMAP=y | ||
757 | |||
758 | # | ||
759 | # DMA Engine support | ||
760 | # | ||
761 | # CONFIG_DMA_ENGINE is not set | ||
762 | |||
763 | # | ||
764 | # DMA Clients | ||
765 | # | ||
766 | |||
767 | # | ||
768 | # DMA Devices | ||
769 | # | ||
770 | |||
771 | # | ||
772 | # CBUS support | ||
773 | # | ||
774 | # CONFIG_CBUS is not set | ||
775 | |||
776 | # | ||
777 | # File systems | ||
778 | # | ||
779 | CONFIG_EXT2_FS=y | ||
780 | # CONFIG_EXT2_FS_XATTR is not set | ||
781 | # CONFIG_EXT2_FS_XIP is not set | ||
782 | # CONFIG_EXT3_FS is not set | ||
783 | # CONFIG_EXT4DEV_FS is not set | ||
784 | # CONFIG_REISERFS_FS is not set | ||
785 | # CONFIG_JFS_FS is not set | ||
786 | # CONFIG_FS_POSIX_ACL is not set | ||
787 | # CONFIG_XFS_FS is not set | ||
788 | # CONFIG_GFS2_FS is not set | ||
789 | # CONFIG_OCFS2_FS is not set | ||
790 | # CONFIG_MINIX_FS is not set | ||
791 | # CONFIG_ROMFS_FS is not set | ||
792 | CONFIG_INOTIFY=y | ||
793 | CONFIG_INOTIFY_USER=y | ||
794 | # CONFIG_QUOTA is not set | ||
795 | CONFIG_DNOTIFY=y | ||
796 | # CONFIG_AUTOFS_FS is not set | ||
797 | # CONFIG_AUTOFS4_FS is not set | ||
798 | # CONFIG_FUSE_FS is not set | ||
799 | |||
800 | # | ||
801 | # CD-ROM/DVD Filesystems | ||
802 | # | ||
803 | # CONFIG_ISO9660_FS is not set | ||
804 | # CONFIG_UDF_FS is not set | ||
805 | |||
806 | # | ||
807 | # DOS/FAT/NT Filesystems | ||
808 | # | ||
809 | # CONFIG_MSDOS_FS is not set | ||
810 | # CONFIG_VFAT_FS is not set | ||
811 | # CONFIG_NTFS_FS is not set | ||
812 | |||
813 | # | ||
814 | # Pseudo filesystems | ||
815 | # | ||
816 | CONFIG_PROC_FS=y | ||
817 | CONFIG_PROC_SYSCTL=y | ||
818 | CONFIG_SYSFS=y | ||
819 | # CONFIG_TMPFS is not set | ||
820 | # CONFIG_HUGETLB_PAGE is not set | ||
821 | CONFIG_RAMFS=y | ||
822 | # CONFIG_CONFIGFS_FS is not set | ||
823 | |||
824 | # | ||
825 | # Miscellaneous filesystems | ||
826 | # | ||
827 | # CONFIG_ADFS_FS is not set | ||
828 | # CONFIG_AFFS_FS is not set | ||
829 | # CONFIG_HFS_FS is not set | ||
830 | # CONFIG_HFSPLUS_FS is not set | ||
831 | # CONFIG_BEFS_FS is not set | ||
832 | # CONFIG_BFS_FS is not set | ||
833 | # CONFIG_EFS_FS is not set | ||
834 | CONFIG_JFFS2_FS=y | ||
835 | CONFIG_JFFS2_FS_DEBUG=0 | ||
836 | CONFIG_JFFS2_FS_WRITEBUFFER=y | ||
837 | # CONFIG_JFFS2_SUMMARY is not set | ||
838 | # CONFIG_JFFS2_FS_XATTR is not set | ||
839 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
840 | CONFIG_JFFS2_ZLIB=y | ||
841 | CONFIG_JFFS2_RTIME=y | ||
842 | # CONFIG_JFFS2_RUBIN is not set | ||
843 | # CONFIG_CRAMFS is not set | ||
844 | # CONFIG_VXFS_FS is not set | ||
845 | # CONFIG_HPFS_FS is not set | ||
846 | # CONFIG_QNX4FS_FS is not set | ||
847 | # CONFIG_SYSV_FS is not set | ||
848 | # CONFIG_UFS_FS is not set | ||
849 | |||
850 | # | ||
851 | # Network File Systems | ||
852 | # | ||
853 | CONFIG_NFS_FS=y | ||
854 | # CONFIG_NFS_V3 is not set | ||
855 | # CONFIG_NFS_V4 is not set | ||
856 | # CONFIG_NFS_DIRECTIO is not set | ||
857 | # CONFIG_NFSD is not set | ||
858 | CONFIG_ROOT_NFS=y | ||
859 | CONFIG_LOCKD=y | ||
860 | CONFIG_NFS_COMMON=y | ||
861 | CONFIG_SUNRPC=y | ||
862 | # CONFIG_SUNRPC_BIND34 is not set | ||
863 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
864 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
865 | # CONFIG_SMB_FS is not set | ||
866 | # CONFIG_CIFS is not set | ||
867 | # CONFIG_NCP_FS is not set | ||
868 | # CONFIG_CODA_FS is not set | ||
869 | # CONFIG_AFS_FS is not set | ||
870 | |||
871 | # | ||
872 | # Partition Types | ||
873 | # | ||
874 | # CONFIG_PARTITION_ADVANCED is not set | ||
875 | CONFIG_MSDOS_PARTITION=y | ||
876 | |||
877 | # | ||
878 | # Native Language Support | ||
879 | # | ||
880 | # CONFIG_NLS is not set | ||
881 | |||
882 | # | ||
883 | # Distributed Lock Manager | ||
884 | # | ||
885 | # CONFIG_DLM is not set | ||
886 | |||
887 | # | ||
888 | # Profiling support | ||
889 | # | ||
890 | # CONFIG_PROFILING is not set | ||
891 | |||
892 | # | ||
893 | # Kernel hacking | ||
894 | # | ||
895 | # CONFIG_PRINTK_TIME is not set | ||
896 | CONFIG_ENABLE_MUST_CHECK=y | ||
897 | # CONFIG_MAGIC_SYSRQ is not set | ||
898 | # CONFIG_UNUSED_SYMBOLS is not set | ||
899 | # CONFIG_DEBUG_FS is not set | ||
900 | # CONFIG_HEADERS_CHECK is not set | ||
901 | # CONFIG_DEBUG_KERNEL is not set | ||
902 | CONFIG_DEBUG_BUGVERBOSE=y | ||
903 | CONFIG_FRAME_POINTER=y | ||
904 | # CONFIG_DEBUG_USER is not set | ||
905 | |||
906 | # | ||
907 | # Security options | ||
908 | # | ||
909 | # CONFIG_KEYS is not set | ||
910 | # CONFIG_SECURITY is not set | ||
911 | # CONFIG_CRYPTO is not set | ||
912 | |||
913 | # | ||
914 | # Library routines | ||
915 | # | ||
916 | CONFIG_BITREVERSE=y | ||
917 | # CONFIG_CRC_CCITT is not set | ||
918 | # CONFIG_CRC16 is not set | ||
919 | # CONFIG_CRC_ITU_T is not set | ||
920 | CONFIG_CRC32=y | ||
921 | # CONFIG_CRC7 is not set | ||
922 | # CONFIG_LIBCRC32C is not set | ||
923 | CONFIG_ZLIB_INFLATE=y | ||
924 | CONFIG_ZLIB_DEFLATE=y | ||
925 | CONFIG_PLIST=y | ||
926 | CONFIG_HAS_IOMEM=y | ||
927 | CONFIG_HAS_IOPORT=y | ||
928 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 1464ffe71717..4017d83c9d2d 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc4 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 2 23:54:48 2008 | 4 | # Fri Aug 22 12:38:51 2008 |
5 | # | 5 | # |
6 | CONFIG_ARM=y | 6 | CONFIG_ARM=y |
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | 7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y |
@@ -12,6 +12,7 @@ CONFIG_MMU=y | |||
12 | # CONFIG_NO_IOPORT is not set | 12 | # CONFIG_NO_IOPORT is not set |
13 | CONFIG_GENERIC_HARDIRQS=y | 13 | CONFIG_GENERIC_HARDIRQS=y |
14 | CONFIG_STACKTRACE_SUPPORT=y | 14 | CONFIG_STACKTRACE_SUPPORT=y |
15 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | 16 | CONFIG_LOCKDEP_SUPPORT=y |
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 17 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
17 | CONFIG_HARDIRQS_SW_RESEND=y | 18 | CONFIG_HARDIRQS_SW_RESEND=y |
@@ -23,6 +24,7 @@ CONFIG_GENERIC_HWEIGHT=y | |||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 24 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
24 | CONFIG_ARCH_SUPPORTS_AOUT=y | 25 | CONFIG_ARCH_SUPPORTS_AOUT=y |
25 | CONFIG_ZONE_DMA=y | 26 | CONFIG_ZONE_DMA=y |
27 | CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y | ||
26 | CONFIG_VECTORS_BASE=0xffff0000 | 28 | CONFIG_VECTORS_BASE=0xffff0000 |
27 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 29 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
28 | 30 | ||
@@ -56,7 +58,6 @@ CONFIG_SYSCTL=y | |||
56 | CONFIG_EMBEDDED=y | 58 | CONFIG_EMBEDDED=y |
57 | CONFIG_UID16=y | 59 | CONFIG_UID16=y |
58 | CONFIG_SYSCTL_SYSCALL=y | 60 | CONFIG_SYSCTL_SYSCALL=y |
59 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
60 | CONFIG_KALLSYMS=y | 61 | CONFIG_KALLSYMS=y |
61 | CONFIG_KALLSYMS_ALL=y | 62 | CONFIG_KALLSYMS_ALL=y |
62 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 63 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -83,11 +84,17 @@ CONFIG_PROFILING=y | |||
83 | CONFIG_OPROFILE=y | 84 | CONFIG_OPROFILE=y |
84 | CONFIG_HAVE_OPROFILE=y | 85 | CONFIG_HAVE_OPROFILE=y |
85 | CONFIG_KPROBES=y | 86 | CONFIG_KPROBES=y |
87 | # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set | ||
86 | CONFIG_KRETPROBES=y | 88 | CONFIG_KRETPROBES=y |
89 | # CONFIG_HAVE_IOREMAP_PROT is not set | ||
87 | CONFIG_HAVE_KPROBES=y | 90 | CONFIG_HAVE_KPROBES=y |
88 | CONFIG_HAVE_KRETPROBES=y | 91 | CONFIG_HAVE_KRETPROBES=y |
92 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
89 | # CONFIG_HAVE_DMA_ATTRS is not set | 93 | # CONFIG_HAVE_DMA_ATTRS is not set |
94 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
95 | # CONFIG_HAVE_CLK is not set | ||
90 | CONFIG_PROC_PAGE_MONITOR=y | 96 | CONFIG_PROC_PAGE_MONITOR=y |
97 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
91 | CONFIG_RT_MUTEXES=y | 98 | CONFIG_RT_MUTEXES=y |
92 | # CONFIG_TINY_SHMEM is not set | 99 | # CONFIG_TINY_SHMEM is not set |
93 | CONFIG_BASE_SMALL=0 | 100 | CONFIG_BASE_SMALL=0 |
@@ -97,12 +104,13 @@ CONFIG_MODULE_UNLOAD=y | |||
97 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 104 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
98 | # CONFIG_MODVERSIONS is not set | 105 | # CONFIG_MODVERSIONS is not set |
99 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 106 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
100 | # CONFIG_KMOD is not set | 107 | CONFIG_KMOD=y |
101 | CONFIG_BLOCK=y | 108 | CONFIG_BLOCK=y |
102 | # CONFIG_LBD is not set | 109 | # CONFIG_LBD is not set |
103 | # CONFIG_BLK_DEV_IO_TRACE is not set | 110 | # CONFIG_BLK_DEV_IO_TRACE is not set |
104 | # CONFIG_LSF is not set | 111 | # CONFIG_LSF is not set |
105 | # CONFIG_BLK_DEV_BSG is not set | 112 | # CONFIG_BLK_DEV_BSG is not set |
113 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
106 | 114 | ||
107 | # | 115 | # |
108 | # IO Schedulers | 116 | # IO Schedulers |
@@ -128,7 +136,6 @@ CONFIG_CLASSIC_RCU=y | |||
128 | # CONFIG_ARCH_AT91 is not set | 136 | # CONFIG_ARCH_AT91 is not set |
129 | # CONFIG_ARCH_CLPS7500 is not set | 137 | # CONFIG_ARCH_CLPS7500 is not set |
130 | # CONFIG_ARCH_CLPS711X is not set | 138 | # CONFIG_ARCH_CLPS711X is not set |
131 | # CONFIG_ARCH_CO285 is not set | ||
132 | # CONFIG_ARCH_EBSA110 is not set | 139 | # CONFIG_ARCH_EBSA110 is not set |
133 | # CONFIG_ARCH_EP93XX is not set | 140 | # CONFIG_ARCH_EP93XX is not set |
134 | # CONFIG_ARCH_FOOTBRIDGE is not set | 141 | # CONFIG_ARCH_FOOTBRIDGE is not set |
@@ -142,8 +149,11 @@ CONFIG_CLASSIC_RCU=y | |||
142 | # CONFIG_ARCH_IXP2000 is not set | 149 | # CONFIG_ARCH_IXP2000 is not set |
143 | # CONFIG_ARCH_IXP4XX is not set | 150 | # CONFIG_ARCH_IXP4XX is not set |
144 | # CONFIG_ARCH_L7200 is not set | 151 | # CONFIG_ARCH_L7200 is not set |
152 | # CONFIG_ARCH_KIRKWOOD is not set | ||
145 | # CONFIG_ARCH_KS8695 is not set | 153 | # CONFIG_ARCH_KS8695 is not set |
146 | # CONFIG_ARCH_NS9XXX is not set | 154 | # CONFIG_ARCH_NS9XXX is not set |
155 | # CONFIG_ARCH_LOKI is not set | ||
156 | # CONFIG_ARCH_MV78XX0 is not set | ||
147 | # CONFIG_ARCH_MXC is not set | 157 | # CONFIG_ARCH_MXC is not set |
148 | CONFIG_ARCH_ORION5X=y | 158 | CONFIG_ARCH_ORION5X=y |
149 | # CONFIG_ARCH_PNX4008 is not set | 159 | # CONFIG_ARCH_PNX4008 is not set |
@@ -195,7 +205,7 @@ CONFIG_CPU_ABRT_EV5T=y | |||
195 | CONFIG_CPU_PABRT_NOIFAR=y | 205 | CONFIG_CPU_PABRT_NOIFAR=y |
196 | CONFIG_CPU_CACHE_VIVT=y | 206 | CONFIG_CPU_CACHE_VIVT=y |
197 | CONFIG_CPU_COPY_FEROCEON=y | 207 | CONFIG_CPU_COPY_FEROCEON=y |
198 | CONFIG_CPU_TLB_V4WBI=y | 208 | CONFIG_CPU_TLB_FEROCEON=y |
199 | CONFIG_CPU_CP15=y | 209 | CONFIG_CPU_CP15=y |
200 | CONFIG_CPU_CP15_MMU=y | 210 | CONFIG_CPU_CP15_MMU=y |
201 | 211 | ||
@@ -280,10 +290,6 @@ CONFIG_BINFMT_ELF=y | |||
280 | # | 290 | # |
281 | # CONFIG_PM is not set | 291 | # CONFIG_PM is not set |
282 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 292 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
283 | |||
284 | # | ||
285 | # Networking | ||
286 | # | ||
287 | CONFIG_NET=y | 293 | CONFIG_NET=y |
288 | 294 | ||
289 | # | 295 | # |
@@ -361,6 +367,7 @@ CONFIG_NET_PKTGEN=m | |||
361 | # | 367 | # |
362 | # CONFIG_CFG80211 is not set | 368 | # CONFIG_CFG80211 is not set |
363 | CONFIG_WIRELESS_EXT=y | 369 | CONFIG_WIRELESS_EXT=y |
370 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
364 | # CONFIG_MAC80211 is not set | 371 | # CONFIG_MAC80211 is not set |
365 | # CONFIG_IEEE80211 is not set | 372 | # CONFIG_IEEE80211 is not set |
366 | # CONFIG_RFKILL is not set | 373 | # CONFIG_RFKILL is not set |
@@ -377,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
377 | CONFIG_STANDALONE=y | 384 | CONFIG_STANDALONE=y |
378 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 385 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
379 | CONFIG_FW_LOADER=y | 386 | CONFIG_FW_LOADER=y |
387 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
388 | CONFIG_EXTRA_FIRMWARE="" | ||
380 | # CONFIG_DEBUG_DRIVER is not set | 389 | # CONFIG_DEBUG_DRIVER is not set |
381 | # CONFIG_DEBUG_DEVRES is not set | 390 | # CONFIG_DEBUG_DEVRES is not set |
382 | # CONFIG_SYS_HYPERVISOR is not set | 391 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -499,6 +508,7 @@ CONFIG_MISC_DEVICES=y | |||
499 | # CONFIG_SGI_IOC4 is not set | 508 | # CONFIG_SGI_IOC4 is not set |
500 | # CONFIG_TIFM_CORE is not set | 509 | # CONFIG_TIFM_CORE is not set |
501 | # CONFIG_ENCLOSURE_SERVICES is not set | 510 | # CONFIG_ENCLOSURE_SERVICES is not set |
511 | # CONFIG_HP_ILO is not set | ||
502 | CONFIG_HAVE_IDE=y | 512 | CONFIG_HAVE_IDE=y |
503 | # CONFIG_IDE is not set | 513 | # CONFIG_IDE is not set |
504 | 514 | ||
@@ -575,6 +585,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
575 | # CONFIG_SCSI_NSP32 is not set | 585 | # CONFIG_SCSI_NSP32 is not set |
576 | # CONFIG_SCSI_DEBUG is not set | 586 | # CONFIG_SCSI_DEBUG is not set |
577 | # CONFIG_SCSI_SRP is not set | 587 | # CONFIG_SCSI_SRP is not set |
588 | # CONFIG_SCSI_DH is not set | ||
578 | CONFIG_ATA=y | 589 | CONFIG_ATA=y |
579 | # CONFIG_ATA_NONSTANDARD is not set | 590 | # CONFIG_ATA_NONSTANDARD is not set |
580 | CONFIG_SATA_PMP=y | 591 | CONFIG_SATA_PMP=y |
@@ -641,11 +652,14 @@ CONFIG_SATA_MV=y | |||
641 | # | 652 | # |
642 | # IEEE 1394 (FireWire) support | 653 | # IEEE 1394 (FireWire) support |
643 | # | 654 | # |
655 | |||
656 | # | ||
657 | # Enable only one of the two stacks, unless you know what you are doing | ||
658 | # | ||
644 | # CONFIG_FIREWIRE is not set | 659 | # CONFIG_FIREWIRE is not set |
645 | # CONFIG_IEEE1394 is not set | 660 | # CONFIG_IEEE1394 is not set |
646 | # CONFIG_I2O is not set | 661 | # CONFIG_I2O is not set |
647 | CONFIG_NETDEVICES=y | 662 | CONFIG_NETDEVICES=y |
648 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
649 | # CONFIG_DUMMY is not set | 663 | # CONFIG_DUMMY is not set |
650 | # CONFIG_BONDING is not set | 664 | # CONFIG_BONDING is not set |
651 | # CONFIG_MACVLAN is not set | 665 | # CONFIG_MACVLAN is not set |
@@ -694,7 +708,6 @@ CONFIG_NETDEV_1000=y | |||
694 | # CONFIG_DL2K is not set | 708 | # CONFIG_DL2K is not set |
695 | # CONFIG_E1000 is not set | 709 | # CONFIG_E1000 is not set |
696 | # CONFIG_E1000E is not set | 710 | # CONFIG_E1000E is not set |
697 | # CONFIG_E1000E_ENABLED is not set | ||
698 | # CONFIG_IP1000 is not set | 711 | # CONFIG_IP1000 is not set |
699 | # CONFIG_IGB is not set | 712 | # CONFIG_IGB is not set |
700 | # CONFIG_NS83820 is not set | 713 | # CONFIG_NS83820 is not set |
@@ -710,6 +723,7 @@ CONFIG_NETDEV_1000=y | |||
710 | CONFIG_MV643XX_ETH=y | 723 | CONFIG_MV643XX_ETH=y |
711 | # CONFIG_QLA3XXX is not set | 724 | # CONFIG_QLA3XXX is not set |
712 | # CONFIG_ATL1 is not set | 725 | # CONFIG_ATL1 is not set |
726 | # CONFIG_ATL1E is not set | ||
713 | # CONFIG_NETDEV_10000 is not set | 727 | # CONFIG_NETDEV_10000 is not set |
714 | # CONFIG_TR is not set | 728 | # CONFIG_TR is not set |
715 | 729 | ||
@@ -815,44 +829,65 @@ CONFIG_DEVPORT=y | |||
815 | CONFIG_I2C=y | 829 | CONFIG_I2C=y |
816 | CONFIG_I2C_BOARDINFO=y | 830 | CONFIG_I2C_BOARDINFO=y |
817 | CONFIG_I2C_CHARDEV=y | 831 | CONFIG_I2C_CHARDEV=y |
832 | CONFIG_I2C_HELPER_AUTO=y | ||
818 | 833 | ||
819 | # | 834 | # |
820 | # I2C Hardware Bus support | 835 | # I2C Hardware Bus support |
821 | # | 836 | # |
837 | |||
838 | # | ||
839 | # PC SMBus host controller drivers | ||
840 | # | ||
822 | # CONFIG_I2C_ALI1535 is not set | 841 | # CONFIG_I2C_ALI1535 is not set |
823 | # CONFIG_I2C_ALI1563 is not set | 842 | # CONFIG_I2C_ALI1563 is not set |
824 | # CONFIG_I2C_ALI15X3 is not set | 843 | # CONFIG_I2C_ALI15X3 is not set |
825 | # CONFIG_I2C_AMD756 is not set | 844 | # CONFIG_I2C_AMD756 is not set |
826 | # CONFIG_I2C_AMD8111 is not set | 845 | # CONFIG_I2C_AMD8111 is not set |
827 | # CONFIG_I2C_GPIO is not set | ||
828 | # CONFIG_I2C_I801 is not set | 846 | # CONFIG_I2C_I801 is not set |
829 | # CONFIG_I2C_I810 is not set | 847 | # CONFIG_I2C_ISCH is not set |
830 | # CONFIG_I2C_PIIX4 is not set | 848 | # CONFIG_I2C_PIIX4 is not set |
831 | # CONFIG_I2C_NFORCE2 is not set | 849 | # CONFIG_I2C_NFORCE2 is not set |
832 | # CONFIG_I2C_OCORES is not set | ||
833 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
834 | # CONFIG_I2C_PROSAVAGE is not set | ||
835 | # CONFIG_I2C_SAVAGE4 is not set | ||
836 | # CONFIG_I2C_SIMTEC is not set | ||
837 | # CONFIG_I2C_SIS5595 is not set | 850 | # CONFIG_I2C_SIS5595 is not set |
838 | # CONFIG_I2C_SIS630 is not set | 851 | # CONFIG_I2C_SIS630 is not set |
839 | # CONFIG_I2C_SIS96X is not set | 852 | # CONFIG_I2C_SIS96X is not set |
840 | # CONFIG_I2C_TAOS_EVM is not set | ||
841 | # CONFIG_I2C_STUB is not set | ||
842 | # CONFIG_I2C_TINY_USB is not set | ||
843 | # CONFIG_I2C_VIA is not set | 853 | # CONFIG_I2C_VIA is not set |
844 | # CONFIG_I2C_VIAPRO is not set | 854 | # CONFIG_I2C_VIAPRO is not set |
855 | |||
856 | # | ||
857 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
858 | # | ||
859 | # CONFIG_I2C_GPIO is not set | ||
860 | CONFIG_I2C_MV64XXX=y | ||
861 | # CONFIG_I2C_OCORES is not set | ||
862 | # CONFIG_I2C_SIMTEC is not set | ||
863 | |||
864 | # | ||
865 | # External I2C/SMBus adapter drivers | ||
866 | # | ||
867 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
868 | # CONFIG_I2C_TAOS_EVM is not set | ||
869 | # CONFIG_I2C_TINY_USB is not set | ||
870 | |||
871 | # | ||
872 | # Graphics adapter I2C/DDC channel drivers | ||
873 | # | ||
845 | # CONFIG_I2C_VOODOO3 is not set | 874 | # CONFIG_I2C_VOODOO3 is not set |
875 | |||
876 | # | ||
877 | # Other I2C/SMBus bus drivers | ||
878 | # | ||
846 | # CONFIG_I2C_PCA_PLATFORM is not set | 879 | # CONFIG_I2C_PCA_PLATFORM is not set |
847 | CONFIG_I2C_MV64XXX=y | 880 | # CONFIG_I2C_STUB is not set |
848 | 881 | ||
849 | # | 882 | # |
850 | # Miscellaneous I2C Chip support | 883 | # Miscellaneous I2C Chip support |
851 | # | 884 | # |
852 | # CONFIG_DS1682 is not set | 885 | # CONFIG_DS1682 is not set |
886 | # CONFIG_AT24 is not set | ||
853 | # CONFIG_SENSORS_EEPROM is not set | 887 | # CONFIG_SENSORS_EEPROM is not set |
854 | # CONFIG_SENSORS_PCF8574 is not set | 888 | # CONFIG_SENSORS_PCF8574 is not set |
855 | # CONFIG_PCF8575 is not set | 889 | # CONFIG_PCF8575 is not set |
890 | # CONFIG_SENSORS_PCA9539 is not set | ||
856 | # CONFIG_SENSORS_PCF8591 is not set | 891 | # CONFIG_SENSORS_PCF8591 is not set |
857 | # CONFIG_SENSORS_MAX6875 is not set | 892 | # CONFIG_SENSORS_MAX6875 is not set |
858 | # CONFIG_SENSORS_TSL2550 is not set | 893 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -865,6 +900,7 @@ CONFIG_I2C_MV64XXX=y | |||
865 | # CONFIG_POWER_SUPPLY is not set | 900 | # CONFIG_POWER_SUPPLY is not set |
866 | CONFIG_HWMON=y | 901 | CONFIG_HWMON=y |
867 | # CONFIG_HWMON_VID is not set | 902 | # CONFIG_HWMON_VID is not set |
903 | # CONFIG_SENSORS_AD7414 is not set | ||
868 | # CONFIG_SENSORS_AD7418 is not set | 904 | # CONFIG_SENSORS_AD7418 is not set |
869 | # CONFIG_SENSORS_ADM1021 is not set | 905 | # CONFIG_SENSORS_ADM1021 is not set |
870 | # CONFIG_SENSORS_ADM1025 is not set | 906 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -884,7 +920,7 @@ CONFIG_HWMON=y | |||
884 | # CONFIG_SENSORS_GL520SM is not set | 920 | # CONFIG_SENSORS_GL520SM is not set |
885 | # CONFIG_SENSORS_IT87 is not set | 921 | # CONFIG_SENSORS_IT87 is not set |
886 | # CONFIG_SENSORS_LM63 is not set | 922 | # CONFIG_SENSORS_LM63 is not set |
887 | # CONFIG_SENSORS_LM75 is not set | 923 | CONFIG_SENSORS_LM75=y |
888 | # CONFIG_SENSORS_LM77 is not set | 924 | # CONFIG_SENSORS_LM77 is not set |
889 | # CONFIG_SENSORS_LM78 is not set | 925 | # CONFIG_SENSORS_LM78 is not set |
890 | # CONFIG_SENSORS_LM80 is not set | 926 | # CONFIG_SENSORS_LM80 is not set |
@@ -928,9 +964,12 @@ CONFIG_SSB_POSSIBLE=y | |||
928 | # | 964 | # |
929 | # Multifunction device drivers | 965 | # Multifunction device drivers |
930 | # | 966 | # |
967 | # CONFIG_MFD_CORE is not set | ||
931 | # CONFIG_MFD_SM501 is not set | 968 | # CONFIG_MFD_SM501 is not set |
932 | # CONFIG_MFD_ASIC3 is not set | ||
933 | # CONFIG_HTC_PASIC3 is not set | 969 | # CONFIG_HTC_PASIC3 is not set |
970 | # CONFIG_MFD_TMIO is not set | ||
971 | # CONFIG_MFD_T7L66XB is not set | ||
972 | # CONFIG_MFD_TC6387XB is not set | ||
934 | 973 | ||
935 | # | 974 | # |
936 | # Multimedia devices | 975 | # Multimedia devices |
@@ -961,10 +1000,6 @@ CONFIG_SSB_POSSIBLE=y | |||
961 | # Display device support | 1000 | # Display device support |
962 | # | 1001 | # |
963 | # CONFIG_DISPLAY_SUPPORT is not set | 1002 | # CONFIG_DISPLAY_SUPPORT is not set |
964 | |||
965 | # | ||
966 | # Sound | ||
967 | # | ||
968 | # CONFIG_SOUND is not set | 1003 | # CONFIG_SOUND is not set |
969 | CONFIG_HID_SUPPORT=y | 1004 | CONFIG_HID_SUPPORT=y |
970 | CONFIG_HID=y | 1005 | CONFIG_HID=y |
@@ -995,6 +1030,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
995 | # CONFIG_USB_OTG is not set | 1030 | # CONFIG_USB_OTG is not set |
996 | # CONFIG_USB_OTG_WHITELIST is not set | 1031 | # CONFIG_USB_OTG_WHITELIST is not set |
997 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1032 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1033 | # CONFIG_USB_MON is not set | ||
998 | 1034 | ||
999 | # | 1035 | # |
1000 | # USB Host Controller Drivers | 1036 | # USB Host Controller Drivers |
@@ -1037,6 +1073,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1037 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1073 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1038 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1074 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1039 | # CONFIG_USB_STORAGE_KARMA is not set | 1075 | # CONFIG_USB_STORAGE_KARMA is not set |
1076 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1040 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1077 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1041 | # CONFIG_USB_LIBUSUAL is not set | 1078 | # CONFIG_USB_LIBUSUAL is not set |
1042 | 1079 | ||
@@ -1045,7 +1082,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1045 | # | 1082 | # |
1046 | # CONFIG_USB_MDC800 is not set | 1083 | # CONFIG_USB_MDC800 is not set |
1047 | # CONFIG_USB_MICROTEK is not set | 1084 | # CONFIG_USB_MICROTEK is not set |
1048 | # CONFIG_USB_MON is not set | ||
1049 | 1085 | ||
1050 | # | 1086 | # |
1051 | # USB port drivers | 1087 | # USB port drivers |
@@ -1058,7 +1094,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1058 | # CONFIG_USB_EMI62 is not set | 1094 | # CONFIG_USB_EMI62 is not set |
1059 | # CONFIG_USB_EMI26 is not set | 1095 | # CONFIG_USB_EMI26 is not set |
1060 | # CONFIG_USB_ADUTUX is not set | 1096 | # CONFIG_USB_ADUTUX is not set |
1061 | # CONFIG_USB_AUERSWALD is not set | ||
1062 | # CONFIG_USB_RIO500 is not set | 1097 | # CONFIG_USB_RIO500 is not set |
1063 | # CONFIG_USB_LEGOTOWER is not set | 1098 | # CONFIG_USB_LEGOTOWER is not set |
1064 | # CONFIG_USB_LCD is not set | 1099 | # CONFIG_USB_LCD is not set |
@@ -1084,7 +1119,9 @@ CONFIG_LEDS_CLASS=y | |||
1084 | # | 1119 | # |
1085 | # LED drivers | 1120 | # LED drivers |
1086 | # | 1121 | # |
1122 | # CONFIG_LEDS_PCA9532 is not set | ||
1087 | CONFIG_LEDS_GPIO=y | 1123 | CONFIG_LEDS_GPIO=y |
1124 | # CONFIG_LEDS_PCA955X is not set | ||
1088 | 1125 | ||
1089 | # | 1126 | # |
1090 | # LED Triggers | 1127 | # LED Triggers |
@@ -1123,6 +1160,7 @@ CONFIG_RTC_DRV_PCF8563=y | |||
1123 | CONFIG_RTC_DRV_M41T80=y | 1160 | CONFIG_RTC_DRV_M41T80=y |
1124 | # CONFIG_RTC_DRV_M41T80_WDT is not set | 1161 | # CONFIG_RTC_DRV_M41T80_WDT is not set |
1125 | CONFIG_RTC_DRV_S35390A=y | 1162 | CONFIG_RTC_DRV_S35390A=y |
1163 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1126 | 1164 | ||
1127 | # | 1165 | # |
1128 | # SPI RTC drivers | 1166 | # SPI RTC drivers |
@@ -1143,6 +1181,27 @@ CONFIG_RTC_DRV_S35390A=y | |||
1143 | # | 1181 | # |
1144 | # on-CPU RTC drivers | 1182 | # on-CPU RTC drivers |
1145 | # | 1183 | # |
1184 | CONFIG_DMADEVICES=y | ||
1185 | |||
1186 | # | ||
1187 | # DMA Devices | ||
1188 | # | ||
1189 | CONFIG_MV_XOR=y | ||
1190 | CONFIG_DMA_ENGINE=y | ||
1191 | |||
1192 | # | ||
1193 | # DMA Clients | ||
1194 | # | ||
1195 | # CONFIG_NET_DMA is not set | ||
1196 | # CONFIG_DMATEST is not set | ||
1197 | |||
1198 | # | ||
1199 | # Voltage and Current regulators | ||
1200 | # | ||
1201 | # CONFIG_REGULATOR is not set | ||
1202 | # CONFIG_REGULATOR_FIXED_VOLTAGE is not set | ||
1203 | # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set | ||
1204 | # CONFIG_REGULATOR_BQ24022 is not set | ||
1146 | # CONFIG_UIO is not set | 1205 | # CONFIG_UIO is not set |
1147 | 1206 | ||
1148 | # | 1207 | # |
@@ -1222,6 +1281,7 @@ CONFIG_JFFS2_RTIME=y | |||
1222 | CONFIG_CRAMFS=y | 1281 | CONFIG_CRAMFS=y |
1223 | # CONFIG_VXFS_FS is not set | 1282 | # CONFIG_VXFS_FS is not set |
1224 | # CONFIG_MINIX_FS is not set | 1283 | # CONFIG_MINIX_FS is not set |
1284 | # CONFIG_OMFS_FS is not set | ||
1225 | # CONFIG_HPFS_FS is not set | 1285 | # CONFIG_HPFS_FS is not set |
1226 | # CONFIG_QNX4FS_FS is not set | 1286 | # CONFIG_QNX4FS_FS is not set |
1227 | # CONFIG_ROMFS_FS is not set | 1287 | # CONFIG_ROMFS_FS is not set |
@@ -1232,13 +1292,12 @@ CONFIG_NFS_FS=y | |||
1232 | CONFIG_NFS_V3=y | 1292 | CONFIG_NFS_V3=y |
1233 | # CONFIG_NFS_V3_ACL is not set | 1293 | # CONFIG_NFS_V3_ACL is not set |
1234 | # CONFIG_NFS_V4 is not set | 1294 | # CONFIG_NFS_V4 is not set |
1235 | # CONFIG_NFSD is not set | ||
1236 | CONFIG_ROOT_NFS=y | 1295 | CONFIG_ROOT_NFS=y |
1296 | # CONFIG_NFSD is not set | ||
1237 | CONFIG_LOCKD=y | 1297 | CONFIG_LOCKD=y |
1238 | CONFIG_LOCKD_V4=y | 1298 | CONFIG_LOCKD_V4=y |
1239 | CONFIG_NFS_COMMON=y | 1299 | CONFIG_NFS_COMMON=y |
1240 | CONFIG_SUNRPC=y | 1300 | CONFIG_SUNRPC=y |
1241 | # CONFIG_SUNRPC_BIND34 is not set | ||
1242 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1301 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1243 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1302 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1244 | # CONFIG_SMB_FS is not set | 1303 | # CONFIG_SMB_FS is not set |
@@ -1324,6 +1383,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1324 | CONFIG_DEBUG_KERNEL=y | 1383 | CONFIG_DEBUG_KERNEL=y |
1325 | # CONFIG_DEBUG_SHIRQ is not set | 1384 | # CONFIG_DEBUG_SHIRQ is not set |
1326 | CONFIG_DETECT_SOFTLOCKUP=y | 1385 | CONFIG_DETECT_SOFTLOCKUP=y |
1386 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1387 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1327 | CONFIG_SCHED_DEBUG=y | 1388 | CONFIG_SCHED_DEBUG=y |
1328 | CONFIG_SCHEDSTATS=y | 1389 | CONFIG_SCHEDSTATS=y |
1329 | # CONFIG_TIMER_STATS is not set | 1390 | # CONFIG_TIMER_STATS is not set |
@@ -1338,11 +1399,13 @@ CONFIG_DEBUG_PREEMPT=y | |||
1338 | # CONFIG_LOCK_STAT is not set | 1399 | # CONFIG_LOCK_STAT is not set |
1339 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1400 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1340 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1401 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1402 | CONFIG_STACKTRACE=y | ||
1341 | # CONFIG_DEBUG_KOBJECT is not set | 1403 | # CONFIG_DEBUG_KOBJECT is not set |
1342 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1404 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1343 | CONFIG_DEBUG_INFO=y | 1405 | CONFIG_DEBUG_INFO=y |
1344 | # CONFIG_DEBUG_VM is not set | 1406 | # CONFIG_DEBUG_VM is not set |
1345 | # CONFIG_DEBUG_WRITECOUNT is not set | 1407 | # CONFIG_DEBUG_WRITECOUNT is not set |
1408 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1346 | # CONFIG_DEBUG_LIST is not set | 1409 | # CONFIG_DEBUG_LIST is not set |
1347 | # CONFIG_DEBUG_SG is not set | 1410 | # CONFIG_DEBUG_SG is not set |
1348 | CONFIG_FRAME_POINTER=y | 1411 | CONFIG_FRAME_POINTER=y |
@@ -1352,7 +1415,18 @@ CONFIG_FRAME_POINTER=y | |||
1352 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1415 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1353 | # CONFIG_LKDTM is not set | 1416 | # CONFIG_LKDTM is not set |
1354 | # CONFIG_FAULT_INJECTION is not set | 1417 | # CONFIG_FAULT_INJECTION is not set |
1418 | CONFIG_LATENCYTOP=y | ||
1419 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1420 | CONFIG_HAVE_FTRACE=y | ||
1421 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1422 | # CONFIG_FTRACE is not set | ||
1423 | # CONFIG_IRQSOFF_TRACER is not set | ||
1424 | # CONFIG_PREEMPT_TRACER is not set | ||
1425 | # CONFIG_SCHED_TRACER is not set | ||
1426 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1355 | # CONFIG_SAMPLES is not set | 1427 | # CONFIG_SAMPLES is not set |
1428 | CONFIG_HAVE_ARCH_KGDB=y | ||
1429 | # CONFIG_KGDB is not set | ||
1356 | CONFIG_DEBUG_USER=y | 1430 | CONFIG_DEBUG_USER=y |
1357 | CONFIG_DEBUG_ERRORS=y | 1431 | CONFIG_DEBUG_ERRORS=y |
1358 | # CONFIG_DEBUG_STACK_USAGE is not set | 1432 | # CONFIG_DEBUG_STACK_USAGE is not set |
@@ -1365,6 +1439,7 @@ CONFIG_DEBUG_LL=y | |||
1365 | # CONFIG_KEYS is not set | 1439 | # CONFIG_KEYS is not set |
1366 | # CONFIG_SECURITY is not set | 1440 | # CONFIG_SECURITY is not set |
1367 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1441 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1442 | CONFIG_ASYNC_CORE=y | ||
1368 | CONFIG_CRYPTO=y | 1443 | CONFIG_CRYPTO=y |
1369 | 1444 | ||
1370 | # | 1445 | # |
@@ -1410,6 +1485,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1410 | # CONFIG_CRYPTO_MD4 is not set | 1485 | # CONFIG_CRYPTO_MD4 is not set |
1411 | # CONFIG_CRYPTO_MD5 is not set | 1486 | # CONFIG_CRYPTO_MD5 is not set |
1412 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1487 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1488 | # CONFIG_CRYPTO_RMD128 is not set | ||
1489 | # CONFIG_CRYPTO_RMD160 is not set | ||
1490 | # CONFIG_CRYPTO_RMD256 is not set | ||
1491 | # CONFIG_CRYPTO_RMD320 is not set | ||
1413 | # CONFIG_CRYPTO_SHA1 is not set | 1492 | # CONFIG_CRYPTO_SHA1 is not set |
1414 | # CONFIG_CRYPTO_SHA256 is not set | 1493 | # CONFIG_CRYPTO_SHA256 is not set |
1415 | # CONFIG_CRYPTO_SHA512 is not set | 1494 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1451,6 +1530,7 @@ CONFIG_BITREVERSE=y | |||
1451 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set | 1530 | # CONFIG_GENERIC_FIND_NEXT_BIT is not set |
1452 | # CONFIG_CRC_CCITT is not set | 1531 | # CONFIG_CRC_CCITT is not set |
1453 | # CONFIG_CRC16 is not set | 1532 | # CONFIG_CRC16 is not set |
1533 | CONFIG_CRC_T10DIF=y | ||
1454 | CONFIG_CRC_ITU_T=m | 1534 | CONFIG_CRC_ITU_T=m |
1455 | CONFIG_CRC32=y | 1535 | CONFIG_CRC32=y |
1456 | # CONFIG_CRC7 is not set | 1536 | # CONFIG_CRC7 is not set |
diff --git a/arch/arm/configs/palmte_defconfig b/arch/arm/configs/palmte_defconfig new file mode 100644 index 000000000000..40fc6a778e00 --- /dev/null +++ b/arch/arm/configs/palmte_defconfig | |||
@@ -0,0 +1,761 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.22-rc1-omap1 | ||
4 | # Sat May 19 11:04:27 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # Code maturity level options | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
34 | |||
35 | # | ||
36 | # General setup | ||
37 | # | ||
38 | CONFIG_LOCALVERSION="" | ||
39 | CONFIG_LOCALVERSION_AUTO=y | ||
40 | # CONFIG_SWAP is not set | ||
41 | CONFIG_SYSVIPC=y | ||
42 | # CONFIG_IPC_NS is not set | ||
43 | CONFIG_SYSVIPC_SYSCTL=y | ||
44 | CONFIG_BSD_PROCESS_ACCT=y | ||
45 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
46 | # CONFIG_UTS_NS is not set | ||
47 | # CONFIG_IKCONFIG is not set | ||
48 | CONFIG_LOG_BUF_SHIFT=14 | ||
49 | CONFIG_SYSFS_DEPRECATED=y | ||
50 | # CONFIG_RELAY is not set | ||
51 | # CONFIG_BLK_DEV_INITRD is not set | ||
52 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
53 | CONFIG_SYSCTL=y | ||
54 | # CONFIG_EMBEDDED is not set | ||
55 | CONFIG_UID16=y | ||
56 | CONFIG_SYSCTL_SYSCALL=y | ||
57 | CONFIG_KALLSYMS=y | ||
58 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
59 | CONFIG_HOTPLUG=y | ||
60 | CONFIG_PRINTK=y | ||
61 | CONFIG_BUG=y | ||
62 | CONFIG_ELF_CORE=y | ||
63 | CONFIG_BASE_FULL=y | ||
64 | CONFIG_FUTEX=y | ||
65 | CONFIG_ANON_INODES=y | ||
66 | CONFIG_EPOLL=y | ||
67 | CONFIG_SIGNALFD=y | ||
68 | CONFIG_TIMERFD=y | ||
69 | CONFIG_EVENTFD=y | ||
70 | CONFIG_SHMEM=y | ||
71 | CONFIG_VM_EVENT_COUNTERS=y | ||
72 | CONFIG_SLAB=y | ||
73 | # CONFIG_SLUB is not set | ||
74 | # CONFIG_SLOB is not set | ||
75 | CONFIG_RT_MUTEXES=y | ||
76 | # CONFIG_TINY_SHMEM is not set | ||
77 | CONFIG_BASE_SMALL=0 | ||
78 | |||
79 | # | ||
80 | # Loadable module support | ||
81 | # | ||
82 | # CONFIG_MODULES is not set | ||
83 | |||
84 | # | ||
85 | # Block layer | ||
86 | # | ||
87 | CONFIG_BLOCK=y | ||
88 | # CONFIG_LBD is not set | ||
89 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
90 | # CONFIG_LSF is not set | ||
91 | |||
92 | # | ||
93 | # IO Schedulers | ||
94 | # | ||
95 | CONFIG_IOSCHED_NOOP=y | ||
96 | CONFIG_IOSCHED_AS=y | ||
97 | # CONFIG_IOSCHED_DEADLINE is not set | ||
98 | # CONFIG_IOSCHED_CFQ is not set | ||
99 | CONFIG_DEFAULT_AS=y | ||
100 | # CONFIG_DEFAULT_DEADLINE is not set | ||
101 | # CONFIG_DEFAULT_CFQ is not set | ||
102 | # CONFIG_DEFAULT_NOOP is not set | ||
103 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
104 | |||
105 | # | ||
106 | # System Type | ||
107 | # | ||
108 | # CONFIG_ARCH_AAEC2000 is not set | ||
109 | # CONFIG_ARCH_INTEGRATOR is not set | ||
110 | # CONFIG_ARCH_REALVIEW is not set | ||
111 | # CONFIG_ARCH_VERSATILE is not set | ||
112 | # CONFIG_ARCH_AT91 is not set | ||
113 | # CONFIG_ARCH_CLPS7500 is not set | ||
114 | # CONFIG_ARCH_CLPS711X is not set | ||
115 | # CONFIG_ARCH_CO285 is not set | ||
116 | # CONFIG_ARCH_EBSA110 is not set | ||
117 | # CONFIG_ARCH_EP93XX is not set | ||
118 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
119 | # CONFIG_ARCH_NETX is not set | ||
120 | # CONFIG_ARCH_H720X is not set | ||
121 | # CONFIG_ARCH_IMX is not set | ||
122 | # CONFIG_ARCH_IOP13XX is not set | ||
123 | # CONFIG_ARCH_IOP32X is not set | ||
124 | # CONFIG_ARCH_IOP33X is not set | ||
125 | # CONFIG_ARCH_IXP23XX is not set | ||
126 | # CONFIG_ARCH_IXP2000 is not set | ||
127 | # CONFIG_ARCH_IXP4XX is not set | ||
128 | # CONFIG_ARCH_L7200 is not set | ||
129 | # CONFIG_ARCH_KS8695 is not set | ||
130 | # CONFIG_ARCH_NS9XXX is not set | ||
131 | # CONFIG_ARCH_PNX4008 is not set | ||
132 | # CONFIG_ARCH_PXA is not set | ||
133 | # CONFIG_ARCH_RPC is not set | ||
134 | # CONFIG_ARCH_SA1100 is not set | ||
135 | # CONFIG_ARCH_S3C2410 is not set | ||
136 | # CONFIG_ARCH_SHARK is not set | ||
137 | # CONFIG_ARCH_LH7A40X is not set | ||
138 | # CONFIG_ARCH_DAVINCI is not set | ||
139 | CONFIG_ARCH_OMAP=y | ||
140 | |||
141 | # | ||
142 | # TI OMAP Implementations | ||
143 | # | ||
144 | CONFIG_ARCH_OMAP1=y | ||
145 | # CONFIG_ARCH_OMAP2 is not set | ||
146 | |||
147 | # | ||
148 | # OMAP Feature Selections | ||
149 | # | ||
150 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
151 | # CONFIG_OMAP_BOOT_TAG is not set | ||
152 | CONFIG_OMAP_GPIO_SWITCH=y | ||
153 | CONFIG_OMAP_MUX=y | ||
154 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
155 | CONFIG_OMAP_MUX_WARNINGS=y | ||
156 | CONFIG_OMAP_MCBSP=y | ||
157 | # CONFIG_OMAP_MMU_FWK is not set | ||
158 | # CONFIG_OMAP_MBOX_FWK is not set | ||
159 | CONFIG_OMAP_MPU_TIMER=y | ||
160 | # CONFIG_OMAP_32K_TIMER is not set | ||
161 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
162 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
163 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
164 | CONFIG_OMAP_SERIAL_WAKE=y | ||
165 | # CONFIG_OMAP_DSP is not set | ||
166 | |||
167 | # | ||
168 | # OMAP Core Type | ||
169 | # | ||
170 | # CONFIG_ARCH_OMAP730 is not set | ||
171 | CONFIG_ARCH_OMAP15XX=y | ||
172 | # CONFIG_ARCH_OMAP16XX is not set | ||
173 | |||
174 | # | ||
175 | # OMAP Board Type | ||
176 | # | ||
177 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
178 | # CONFIG_MACH_VOICEBLUE is not set | ||
179 | CONFIG_MACH_OMAP_PALMTE=y | ||
180 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
181 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
182 | # CONFIG_MACH_SX1 is not set | ||
183 | # CONFIG_MACH_AMS_DELTA is not set | ||
184 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
185 | |||
186 | # | ||
187 | # OMAP CPU Speed | ||
188 | # | ||
189 | CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | ||
190 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
191 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
192 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
193 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
194 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
195 | |||
196 | # | ||
197 | # Processor Type | ||
198 | # | ||
199 | CONFIG_CPU_32=y | ||
200 | CONFIG_CPU_ARM925T=y | ||
201 | CONFIG_CPU_32v4T=y | ||
202 | CONFIG_CPU_ABRT_EV4T=y | ||
203 | CONFIG_CPU_CACHE_V4WT=y | ||
204 | CONFIG_CPU_CACHE_VIVT=y | ||
205 | CONFIG_CPU_COPY_V4WB=y | ||
206 | CONFIG_CPU_TLB_V4WBI=y | ||
207 | CONFIG_CPU_CP15=y | ||
208 | CONFIG_CPU_CP15_MMU=y | ||
209 | |||
210 | # | ||
211 | # Processor Features | ||
212 | # | ||
213 | # CONFIG_ARM_THUMB is not set | ||
214 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
215 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
216 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
217 | # CONFIG_OUTER_CACHE is not set | ||
218 | |||
219 | # | ||
220 | # Bus support | ||
221 | # | ||
222 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
223 | |||
224 | # | ||
225 | # PCCARD (PCMCIA/CardBus) support | ||
226 | # | ||
227 | # CONFIG_PCCARD is not set | ||
228 | |||
229 | # | ||
230 | # Kernel Features | ||
231 | # | ||
232 | # CONFIG_TICK_ONESHOT is not set | ||
233 | # CONFIG_NO_HZ is not set | ||
234 | # CONFIG_HIGH_RES_TIMERS is not set | ||
235 | # CONFIG_PREEMPT is not set | ||
236 | CONFIG_HZ=100 | ||
237 | # CONFIG_AEABI is not set | ||
238 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
239 | CONFIG_SELECT_MEMORY_MODEL=y | ||
240 | CONFIG_FLATMEM_MANUAL=y | ||
241 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
242 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
243 | CONFIG_FLATMEM=y | ||
244 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
245 | # CONFIG_SPARSEMEM_STATIC is not set | ||
246 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
247 | # CONFIG_RESOURCES_64BIT is not set | ||
248 | CONFIG_ZONE_DMA_FLAG=1 | ||
249 | # CONFIG_LEDS is not set | ||
250 | CONFIG_ALIGNMENT_TRAP=y | ||
251 | |||
252 | # | ||
253 | # Boot options | ||
254 | # | ||
255 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
256 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
257 | CONFIG_CMDLINE="" | ||
258 | # CONFIG_XIP_KERNEL is not set | ||
259 | # CONFIG_KEXEC is not set | ||
260 | |||
261 | # | ||
262 | # CPU Frequency scaling | ||
263 | # | ||
264 | # CONFIG_CPU_FREQ is not set | ||
265 | |||
266 | # | ||
267 | # Floating point emulation | ||
268 | # | ||
269 | |||
270 | # | ||
271 | # At least one emulation must be selected | ||
272 | # | ||
273 | CONFIG_FPE_NWFPE=y | ||
274 | # CONFIG_FPE_NWFPE_XP is not set | ||
275 | # CONFIG_FPE_FASTFPE is not set | ||
276 | |||
277 | # | ||
278 | # Userspace binary formats | ||
279 | # | ||
280 | CONFIG_BINFMT_ELF=y | ||
281 | # CONFIG_BINFMT_AOUT is not set | ||
282 | # CONFIG_BINFMT_MISC is not set | ||
283 | # CONFIG_ARTHUR is not set | ||
284 | |||
285 | # | ||
286 | # Power management options | ||
287 | # | ||
288 | # CONFIG_PM is not set | ||
289 | |||
290 | # | ||
291 | # Networking | ||
292 | # | ||
293 | # CONFIG_NET is not set | ||
294 | |||
295 | # | ||
296 | # Device Drivers | ||
297 | # | ||
298 | |||
299 | # | ||
300 | # Generic Driver Options | ||
301 | # | ||
302 | # CONFIG_STANDALONE is not set | ||
303 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
304 | # CONFIG_FW_LOADER is not set | ||
305 | # CONFIG_SYS_HYPERVISOR is not set | ||
306 | |||
307 | # | ||
308 | # Connector - unified userspace <-> kernelspace linker | ||
309 | # | ||
310 | # CONFIG_MTD is not set | ||
311 | |||
312 | # | ||
313 | # Parallel port support | ||
314 | # | ||
315 | # CONFIG_PARPORT is not set | ||
316 | |||
317 | # | ||
318 | # Plug and Play support | ||
319 | # | ||
320 | # CONFIG_PNPACPI is not set | ||
321 | |||
322 | # | ||
323 | # Block devices | ||
324 | # | ||
325 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
326 | # CONFIG_BLK_DEV_LOOP is not set | ||
327 | # CONFIG_BLK_DEV_RAM is not set | ||
328 | # CONFIG_CDROM_PKTCDVD is not set | ||
329 | |||
330 | # | ||
331 | # SCSI device support | ||
332 | # | ||
333 | # CONFIG_RAID_ATTRS is not set | ||
334 | # CONFIG_SCSI is not set | ||
335 | # CONFIG_SCSI_NETLINK is not set | ||
336 | # CONFIG_ATA is not set | ||
337 | |||
338 | # | ||
339 | # Multi-device support (RAID and LVM) | ||
340 | # | ||
341 | # CONFIG_MD is not set | ||
342 | |||
343 | # | ||
344 | # ISDN subsystem | ||
345 | # | ||
346 | |||
347 | # | ||
348 | # Input device support | ||
349 | # | ||
350 | CONFIG_INPUT=y | ||
351 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
352 | |||
353 | # | ||
354 | # Userland interfaces | ||
355 | # | ||
356 | CONFIG_INPUT_MOUSEDEV=y | ||
357 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
358 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 | ||
359 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | ||
360 | # CONFIG_INPUT_JOYDEV is not set | ||
361 | # CONFIG_INPUT_TSDEV is not set | ||
362 | # CONFIG_INPUT_EVDEV is not set | ||
363 | # CONFIG_INPUT_EVBUG is not set | ||
364 | |||
365 | # | ||
366 | # Input Device Drivers | ||
367 | # | ||
368 | # CONFIG_INPUT_KEYBOARD is not set | ||
369 | # CONFIG_INPUT_MOUSE is not set | ||
370 | # CONFIG_INPUT_JOYSTICK is not set | ||
371 | # CONFIG_INPUT_TABLET is not set | ||
372 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
373 | # CONFIG_INPUT_MISC is not set | ||
374 | |||
375 | # | ||
376 | # Hardware I/O ports | ||
377 | # | ||
378 | # CONFIG_SERIO is not set | ||
379 | # CONFIG_GAMEPORT is not set | ||
380 | |||
381 | # | ||
382 | # Character devices | ||
383 | # | ||
384 | CONFIG_VT=y | ||
385 | CONFIG_VT_CONSOLE=y | ||
386 | CONFIG_HW_CONSOLE=y | ||
387 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
388 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
389 | |||
390 | # | ||
391 | # Serial drivers | ||
392 | # | ||
393 | # CONFIG_SERIAL_8250 is not set | ||
394 | |||
395 | # | ||
396 | # Non-8250 serial port support | ||
397 | # | ||
398 | CONFIG_UNIX98_PTYS=y | ||
399 | # CONFIG_LEGACY_PTYS is not set | ||
400 | |||
401 | # | ||
402 | # IPMI | ||
403 | # | ||
404 | # CONFIG_IPMI_HANDLER is not set | ||
405 | # CONFIG_WATCHDOG is not set | ||
406 | CONFIG_HW_RANDOM=y | ||
407 | # CONFIG_NVRAM is not set | ||
408 | CONFIG_OMAP_RTC=y | ||
409 | # CONFIG_R3964 is not set | ||
410 | # CONFIG_RAW_DRIVER is not set | ||
411 | |||
412 | # | ||
413 | # TPM devices | ||
414 | # | ||
415 | # CONFIG_TCG_TPM is not set | ||
416 | # CONFIG_I2C is not set | ||
417 | |||
418 | # | ||
419 | # SPI support | ||
420 | # | ||
421 | # CONFIG_SPI is not set | ||
422 | # CONFIG_SPI_MASTER is not set | ||
423 | |||
424 | # | ||
425 | # Dallas's 1-wire bus | ||
426 | # | ||
427 | # CONFIG_W1 is not set | ||
428 | # CONFIG_HWMON is not set | ||
429 | |||
430 | # | ||
431 | # Misc devices | ||
432 | # | ||
433 | # CONFIG_BLINK is not set | ||
434 | |||
435 | # | ||
436 | # Multifunction device drivers | ||
437 | # | ||
438 | # CONFIG_MFD_SM501 is not set | ||
439 | |||
440 | # | ||
441 | # LED devices | ||
442 | # | ||
443 | # CONFIG_NEW_LEDS is not set | ||
444 | |||
445 | # | ||
446 | # LED drivers | ||
447 | # | ||
448 | |||
449 | # | ||
450 | # LED Triggers | ||
451 | # | ||
452 | |||
453 | # | ||
454 | # Multimedia devices | ||
455 | # | ||
456 | # CONFIG_VIDEO_DEV is not set | ||
457 | CONFIG_DAB=y | ||
458 | |||
459 | # | ||
460 | # Graphics support | ||
461 | # | ||
462 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
463 | |||
464 | # | ||
465 | # Display device support | ||
466 | # | ||
467 | # CONFIG_DISPLAY_SUPPORT is not set | ||
468 | # CONFIG_VGASTATE is not set | ||
469 | CONFIG_FB=y | ||
470 | # CONFIG_FIRMWARE_EDID is not set | ||
471 | # CONFIG_FB_DDC is not set | ||
472 | # CONFIG_FB_CFB_FILLRECT is not set | ||
473 | # CONFIG_FB_CFB_COPYAREA is not set | ||
474 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
475 | # CONFIG_FB_SYS_FILLRECT is not set | ||
476 | # CONFIG_FB_SYS_COPYAREA is not set | ||
477 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
478 | # CONFIG_FB_SYS_FOPS is not set | ||
479 | CONFIG_FB_DEFERRED_IO=y | ||
480 | # CONFIG_FB_SVGALIB is not set | ||
481 | # CONFIG_FB_MACMODES is not set | ||
482 | # CONFIG_FB_BACKLIGHT is not set | ||
483 | # CONFIG_FB_MODE_HELPERS is not set | ||
484 | # CONFIG_FB_TILEBLITTING is not set | ||
485 | |||
486 | # | ||
487 | # Frame buffer hardware drivers | ||
488 | # | ||
489 | # CONFIG_FB_S1D13XXX is not set | ||
490 | CONFIG_FB_OMAP=y | ||
491 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
492 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
493 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
494 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
495 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
496 | # CONFIG_FB_VIRTUAL is not set | ||
497 | |||
498 | # | ||
499 | # Console display driver support | ||
500 | # | ||
501 | # CONFIG_VGA_CONSOLE is not set | ||
502 | CONFIG_DUMMY_CONSOLE=y | ||
503 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
504 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
505 | # CONFIG_FONTS is not set | ||
506 | CONFIG_FONT_8x8=y | ||
507 | CONFIG_FONT_8x16=y | ||
508 | CONFIG_LOGO=y | ||
509 | # CONFIG_LOGO_LINUX_MONO is not set | ||
510 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
511 | CONFIG_LOGO_LINUX_CLUT224=y | ||
512 | |||
513 | # | ||
514 | # Sound | ||
515 | # | ||
516 | # CONFIG_SOUND is not set | ||
517 | |||
518 | # | ||
519 | # HID Devices | ||
520 | # | ||
521 | CONFIG_HID=y | ||
522 | # CONFIG_HID_DEBUG is not set | ||
523 | |||
524 | # | ||
525 | # USB support | ||
526 | # | ||
527 | CONFIG_USB_ARCH_HAS_HCD=y | ||
528 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
529 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
530 | # CONFIG_USB is not set | ||
531 | # CONFIG_USB_MUSB_HDRC is not set | ||
532 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
533 | |||
534 | # | ||
535 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
536 | # | ||
537 | |||
538 | # | ||
539 | # USB Gadget Support | ||
540 | # | ||
541 | CONFIG_USB_GADGET=y | ||
542 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
543 | CONFIG_USB_GADGET_SELECTED=y | ||
544 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
545 | # CONFIG_USB_GADGET_NET2280 is not set | ||
546 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
547 | # CONFIG_USB_GADGET_GOKU is not set | ||
548 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
549 | CONFIG_USB_GADGET_OMAP=y | ||
550 | CONFIG_USB_OMAP=y | ||
551 | # CONFIG_USB_GADGET_AT91 is not set | ||
552 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
553 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
554 | CONFIG_USB_ZERO=y | ||
555 | # CONFIG_USB_ETH is not set | ||
556 | # CONFIG_USB_GADGETFS is not set | ||
557 | # CONFIG_USB_FILE_STORAGE is not set | ||
558 | # CONFIG_USB_G_SERIAL is not set | ||
559 | # CONFIG_USB_MIDI_GADGET is not set | ||
560 | CONFIG_MMC=y | ||
561 | # CONFIG_MMC_DEBUG is not set | ||
562 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
563 | |||
564 | # | ||
565 | # MMC/SD Card Drivers | ||
566 | # | ||
567 | CONFIG_MMC_BLOCK=y | ||
568 | |||
569 | # | ||
570 | # MMC/SD Host Controller Drivers | ||
571 | # | ||
572 | CONFIG_MMC_OMAP=y | ||
573 | |||
574 | # | ||
575 | # Real Time Clock | ||
576 | # | ||
577 | CONFIG_RTC_LIB=y | ||
578 | # CONFIG_RTC_CLASS is not set | ||
579 | |||
580 | # | ||
581 | # CBUS support | ||
582 | # | ||
583 | # CONFIG_CBUS is not set | ||
584 | |||
585 | # | ||
586 | # File systems | ||
587 | # | ||
588 | CONFIG_EXT2_FS=y | ||
589 | # CONFIG_EXT2_FS_XATTR is not set | ||
590 | # CONFIG_EXT2_FS_XIP is not set | ||
591 | # CONFIG_EXT3_FS is not set | ||
592 | # CONFIG_EXT4DEV_FS is not set | ||
593 | # CONFIG_REISERFS_FS is not set | ||
594 | # CONFIG_JFS_FS is not set | ||
595 | # CONFIG_FS_POSIX_ACL is not set | ||
596 | # CONFIG_XFS_FS is not set | ||
597 | # CONFIG_GFS2_FS is not set | ||
598 | # CONFIG_MINIX_FS is not set | ||
599 | # CONFIG_ROMFS_FS is not set | ||
600 | # CONFIG_INOTIFY is not set | ||
601 | # CONFIG_QUOTA is not set | ||
602 | CONFIG_DNOTIFY=y | ||
603 | # CONFIG_AUTOFS_FS is not set | ||
604 | # CONFIG_AUTOFS4_FS is not set | ||
605 | # CONFIG_FUSE_FS is not set | ||
606 | |||
607 | # | ||
608 | # CD-ROM/DVD Filesystems | ||
609 | # | ||
610 | # CONFIG_ISO9660_FS is not set | ||
611 | # CONFIG_UDF_FS is not set | ||
612 | |||
613 | # | ||
614 | # DOS/FAT/NT Filesystems | ||
615 | # | ||
616 | CONFIG_FAT_FS=y | ||
617 | CONFIG_MSDOS_FS=y | ||
618 | CONFIG_VFAT_FS=y | ||
619 | CONFIG_FAT_DEFAULT_CODEPAGE=850 | ||
620 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
621 | # CONFIG_NTFS_FS is not set | ||
622 | |||
623 | # | ||
624 | # Pseudo filesystems | ||
625 | # | ||
626 | CONFIG_PROC_FS=y | ||
627 | CONFIG_PROC_SYSCTL=y | ||
628 | CONFIG_SYSFS=y | ||
629 | CONFIG_TMPFS=y | ||
630 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
631 | # CONFIG_HUGETLB_PAGE is not set | ||
632 | CONFIG_RAMFS=y | ||
633 | # CONFIG_CONFIGFS_FS is not set | ||
634 | |||
635 | # | ||
636 | # Miscellaneous filesystems | ||
637 | # | ||
638 | # CONFIG_ADFS_FS is not set | ||
639 | # CONFIG_AFFS_FS is not set | ||
640 | # CONFIG_HFS_FS is not set | ||
641 | # CONFIG_HFSPLUS_FS is not set | ||
642 | # CONFIG_BEFS_FS is not set | ||
643 | # CONFIG_BFS_FS is not set | ||
644 | # CONFIG_EFS_FS is not set | ||
645 | CONFIG_CRAMFS=y | ||
646 | # CONFIG_VXFS_FS is not set | ||
647 | # CONFIG_HPFS_FS is not set | ||
648 | # CONFIG_QNX4FS_FS is not set | ||
649 | # CONFIG_SYSV_FS is not set | ||
650 | # CONFIG_UFS_FS is not set | ||
651 | |||
652 | # | ||
653 | # Partition Types | ||
654 | # | ||
655 | CONFIG_PARTITION_ADVANCED=y | ||
656 | # CONFIG_ACORN_PARTITION is not set | ||
657 | # CONFIG_OSF_PARTITION is not set | ||
658 | # CONFIG_AMIGA_PARTITION is not set | ||
659 | # CONFIG_ATARI_PARTITION is not set | ||
660 | # CONFIG_MAC_PARTITION is not set | ||
661 | CONFIG_MSDOS_PARTITION=y | ||
662 | # CONFIG_BSD_DISKLABEL is not set | ||
663 | # CONFIG_MINIX_SUBPARTITION is not set | ||
664 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
665 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
666 | # CONFIG_LDM_PARTITION is not set | ||
667 | # CONFIG_SGI_PARTITION is not set | ||
668 | # CONFIG_ULTRIX_PARTITION is not set | ||
669 | # CONFIG_SUN_PARTITION is not set | ||
670 | # CONFIG_KARMA_PARTITION is not set | ||
671 | # CONFIG_EFI_PARTITION is not set | ||
672 | # CONFIG_SYSV68_PARTITION is not set | ||
673 | |||
674 | # | ||
675 | # Native Language Support | ||
676 | # | ||
677 | CONFIG_NLS=y | ||
678 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
679 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
680 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
681 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
682 | CONFIG_NLS_CODEPAGE_850=y | ||
683 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
684 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
685 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
686 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
687 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
688 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
689 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
690 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
691 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
692 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
693 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
694 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
695 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
696 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
697 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
698 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
699 | # CONFIG_NLS_ISO8859_8 is not set | ||
700 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
701 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
702 | # CONFIG_NLS_ASCII is not set | ||
703 | CONFIG_NLS_ISO8859_1=y | ||
704 | # CONFIG_NLS_ISO8859_2 is not set | ||
705 | # CONFIG_NLS_ISO8859_3 is not set | ||
706 | # CONFIG_NLS_ISO8859_4 is not set | ||
707 | # CONFIG_NLS_ISO8859_5 is not set | ||
708 | # CONFIG_NLS_ISO8859_6 is not set | ||
709 | # CONFIG_NLS_ISO8859_7 is not set | ||
710 | # CONFIG_NLS_ISO8859_9 is not set | ||
711 | # CONFIG_NLS_ISO8859_13 is not set | ||
712 | # CONFIG_NLS_ISO8859_14 is not set | ||
713 | # CONFIG_NLS_ISO8859_15 is not set | ||
714 | # CONFIG_NLS_KOI8_R is not set | ||
715 | # CONFIG_NLS_KOI8_U is not set | ||
716 | # CONFIG_NLS_UTF8 is not set | ||
717 | |||
718 | # | ||
719 | # Profiling support | ||
720 | # | ||
721 | # CONFIG_PROFILING is not set | ||
722 | |||
723 | # | ||
724 | # Kernel hacking | ||
725 | # | ||
726 | # CONFIG_PRINTK_TIME is not set | ||
727 | CONFIG_ENABLE_MUST_CHECK=y | ||
728 | # CONFIG_MAGIC_SYSRQ is not set | ||
729 | # CONFIG_UNUSED_SYMBOLS is not set | ||
730 | # CONFIG_DEBUG_FS is not set | ||
731 | # CONFIG_HEADERS_CHECK is not set | ||
732 | # CONFIG_DEBUG_KERNEL is not set | ||
733 | CONFIG_DEBUG_BUGVERBOSE=y | ||
734 | CONFIG_FRAME_POINTER=y | ||
735 | # CONFIG_DEBUG_USER is not set | ||
736 | |||
737 | # | ||
738 | # Security options | ||
739 | # | ||
740 | # CONFIG_KEYS is not set | ||
741 | # CONFIG_SECURITY is not set | ||
742 | |||
743 | # | ||
744 | # Cryptographic options | ||
745 | # | ||
746 | # CONFIG_CRYPTO is not set | ||
747 | |||
748 | # | ||
749 | # Library routines | ||
750 | # | ||
751 | CONFIG_BITREVERSE=y | ||
752 | CONFIG_CRC_CCITT=y | ||
753 | # CONFIG_CRC16 is not set | ||
754 | # CONFIG_CRC_ITU_T is not set | ||
755 | CONFIG_CRC32=y | ||
756 | # CONFIG_LIBCRC32C is not set | ||
757 | CONFIG_ZLIB_INFLATE=y | ||
758 | CONFIG_PLIST=y | ||
759 | CONFIG_HAS_IOMEM=y | ||
760 | CONFIG_HAS_IOPORT=y | ||
761 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/palmtt_defconfig b/arch/arm/configs/palmtt_defconfig new file mode 100644 index 000000000000..e54ced41217e --- /dev/null +++ b/arch/arm/configs/palmtt_defconfig | |||
@@ -0,0 +1,844 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.19-rc3-omap1 | ||
4 | # Sun Oct 29 00:36:12 2006 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | # CONFIG_GENERIC_TIME is not set | ||
8 | CONFIG_MMU=y | ||
9 | CONFIG_GENERIC_HARDIRQS=y | ||
10 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
11 | CONFIG_HARDIRQS_SW_RESEND=y | ||
12 | CONFIG_GENERIC_IRQ_PROBE=y | ||
13 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
14 | CONFIG_GENERIC_HWEIGHT=y | ||
15 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
16 | CONFIG_VECTORS_BASE=0xffff0000 | ||
17 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
18 | |||
19 | # | ||
20 | # Code maturity level options | ||
21 | # | ||
22 | CONFIG_EXPERIMENTAL=y | ||
23 | CONFIG_BROKEN_ON_SMP=y | ||
24 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
25 | |||
26 | # | ||
27 | # General setup | ||
28 | # | ||
29 | CONFIG_LOCALVERSION="" | ||
30 | CONFIG_LOCALVERSION_AUTO=y | ||
31 | CONFIG_SWAP=y | ||
32 | CONFIG_SYSVIPC=y | ||
33 | # CONFIG_IPC_NS is not set | ||
34 | # CONFIG_POSIX_MQUEUE is not set | ||
35 | CONFIG_BSD_PROCESS_ACCT=y | ||
36 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
37 | # CONFIG_TASKSTATS is not set | ||
38 | # CONFIG_UTS_NS is not set | ||
39 | # CONFIG_AUDIT is not set | ||
40 | # CONFIG_IKCONFIG is not set | ||
41 | # CONFIG_RELAY is not set | ||
42 | CONFIG_INITRAMFS_SOURCE="" | ||
43 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
44 | CONFIG_SYSCTL=y | ||
45 | # CONFIG_EMBEDDED is not set | ||
46 | CONFIG_UID16=y | ||
47 | # CONFIG_SYSCTL_SYSCALL is not set | ||
48 | CONFIG_KALLSYMS=y | ||
49 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
50 | CONFIG_HOTPLUG=y | ||
51 | CONFIG_PRINTK=y | ||
52 | CONFIG_BUG=y | ||
53 | CONFIG_ELF_CORE=y | ||
54 | CONFIG_BASE_FULL=y | ||
55 | CONFIG_FUTEX=y | ||
56 | CONFIG_EPOLL=y | ||
57 | CONFIG_SHMEM=y | ||
58 | CONFIG_SLAB=y | ||
59 | CONFIG_VM_EVENT_COUNTERS=y | ||
60 | CONFIG_RT_MUTEXES=y | ||
61 | # CONFIG_TINY_SHMEM is not set | ||
62 | CONFIG_BASE_SMALL=0 | ||
63 | # CONFIG_SLOB is not set | ||
64 | |||
65 | # | ||
66 | # Loadable module support | ||
67 | # | ||
68 | # CONFIG_MODULES is not set | ||
69 | |||
70 | # | ||
71 | # Block layer | ||
72 | # | ||
73 | CONFIG_BLOCK=y | ||
74 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
75 | |||
76 | # | ||
77 | # IO Schedulers | ||
78 | # | ||
79 | CONFIG_IOSCHED_NOOP=y | ||
80 | # CONFIG_IOSCHED_AS is not set | ||
81 | # CONFIG_IOSCHED_DEADLINE is not set | ||
82 | # CONFIG_IOSCHED_CFQ is not set | ||
83 | # CONFIG_DEFAULT_AS is not set | ||
84 | # CONFIG_DEFAULT_DEADLINE is not set | ||
85 | # CONFIG_DEFAULT_CFQ is not set | ||
86 | CONFIG_DEFAULT_NOOP=y | ||
87 | CONFIG_DEFAULT_IOSCHED="noop" | ||
88 | |||
89 | # | ||
90 | # System Type | ||
91 | # | ||
92 | # CONFIG_ARCH_AAEC2000 is not set | ||
93 | # CONFIG_ARCH_INTEGRATOR is not set | ||
94 | # CONFIG_ARCH_REALVIEW is not set | ||
95 | # CONFIG_ARCH_VERSATILE is not set | ||
96 | # CONFIG_ARCH_AT91 is not set | ||
97 | # CONFIG_ARCH_CLPS7500 is not set | ||
98 | # CONFIG_ARCH_CLPS711X is not set | ||
99 | # CONFIG_ARCH_CO285 is not set | ||
100 | # CONFIG_ARCH_EBSA110 is not set | ||
101 | # CONFIG_ARCH_EP93XX is not set | ||
102 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
103 | # CONFIG_ARCH_NETX is not set | ||
104 | # CONFIG_ARCH_H720X is not set | ||
105 | # CONFIG_ARCH_IMX is not set | ||
106 | # CONFIG_ARCH_IOP32X is not set | ||
107 | # CONFIG_ARCH_IOP33X is not set | ||
108 | # CONFIG_ARCH_IXP4XX is not set | ||
109 | # CONFIG_ARCH_IXP2000 is not set | ||
110 | # CONFIG_ARCH_IXP23XX is not set | ||
111 | # CONFIG_ARCH_L7200 is not set | ||
112 | # CONFIG_ARCH_PNX4008 is not set | ||
113 | # CONFIG_ARCH_PXA is not set | ||
114 | # CONFIG_ARCH_RPC is not set | ||
115 | # CONFIG_ARCH_SA1100 is not set | ||
116 | # CONFIG_ARCH_S3C2410 is not set | ||
117 | # CONFIG_ARCH_SHARK is not set | ||
118 | # CONFIG_ARCH_LH7A40X is not set | ||
119 | CONFIG_ARCH_OMAP=y | ||
120 | |||
121 | # | ||
122 | # TI OMAP Implementations | ||
123 | # | ||
124 | CONFIG_ARCH_OMAP1=y | ||
125 | # CONFIG_ARCH_OMAP2 is not set | ||
126 | |||
127 | # | ||
128 | # OMAP Feature Selections | ||
129 | # | ||
130 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
131 | # CONFIG_OMAP_BOOT_TAG is not set | ||
132 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
133 | CONFIG_OMAP_MUX=y | ||
134 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
135 | CONFIG_OMAP_MUX_WARNINGS=y | ||
136 | CONFIG_OMAP_MCBSP=y | ||
137 | CONFIG_OMAP_MPU_TIMER=y | ||
138 | # CONFIG_OMAP_32K_TIMER is not set | ||
139 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
140 | CONFIG_OMAP_LL_DEBUG_UART2=y | ||
141 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
142 | CONFIG_OMAP_SERIAL_WAKE=y | ||
143 | CONFIG_OMAP_DSP=y | ||
144 | # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set | ||
145 | # CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set | ||
146 | CONFIG_OMAP_DSP_FBEXPORT=y | ||
147 | |||
148 | # | ||
149 | # OMAP Core Type | ||
150 | # | ||
151 | # CONFIG_ARCH_OMAP730 is not set | ||
152 | CONFIG_ARCH_OMAP15XX=y | ||
153 | # CONFIG_ARCH_OMAP16XX is not set | ||
154 | |||
155 | # | ||
156 | # OMAP Board Type | ||
157 | # | ||
158 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
159 | # CONFIG_MACH_VOICEBLUE is not set | ||
160 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
161 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
162 | CONFIG_MACH_OMAP_PALMTT=y | ||
163 | # CONFIG_MACH_AMS_DELTA is not set | ||
164 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
165 | |||
166 | # | ||
167 | # OMAP CPU Speed | ||
168 | # | ||
169 | CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | ||
170 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
171 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
172 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
173 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
174 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
175 | |||
176 | # | ||
177 | # Processor Type | ||
178 | # | ||
179 | CONFIG_CPU_32=y | ||
180 | CONFIG_CPU_ARM925T=y | ||
181 | CONFIG_CPU_32v4T=y | ||
182 | CONFIG_CPU_ABRT_EV4T=y | ||
183 | CONFIG_CPU_CACHE_V4WT=y | ||
184 | CONFIG_CPU_CACHE_VIVT=y | ||
185 | CONFIG_CPU_COPY_V4WB=y | ||
186 | CONFIG_CPU_TLB_V4WBI=y | ||
187 | CONFIG_CPU_CP15=y | ||
188 | CONFIG_CPU_CP15_MMU=y | ||
189 | |||
190 | # | ||
191 | # Processor Features | ||
192 | # | ||
193 | CONFIG_ARM_THUMB=y | ||
194 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
195 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
196 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
197 | |||
198 | # | ||
199 | # Bus support | ||
200 | # | ||
201 | |||
202 | # | ||
203 | # PCCARD (PCMCIA/CardBus) support | ||
204 | # | ||
205 | # CONFIG_PCCARD is not set | ||
206 | |||
207 | # | ||
208 | # Kernel Features | ||
209 | # | ||
210 | # CONFIG_PREEMPT is not set | ||
211 | # CONFIG_NO_IDLE_HZ is not set | ||
212 | CONFIG_HZ=100 | ||
213 | # CONFIG_AEABI is not set | ||
214 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
215 | CONFIG_SELECT_MEMORY_MODEL=y | ||
216 | CONFIG_FLATMEM_MANUAL=y | ||
217 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
218 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
219 | CONFIG_FLATMEM=y | ||
220 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
221 | # CONFIG_SPARSEMEM_STATIC is not set | ||
222 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
223 | # CONFIG_RESOURCES_64BIT is not set | ||
224 | # CONFIG_LEDS is not set | ||
225 | CONFIG_ALIGNMENT_TRAP=y | ||
226 | |||
227 | # | ||
228 | # Boot options | ||
229 | # | ||
230 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
231 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
232 | CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw init=/init" | ||
233 | # CONFIG_XIP_KERNEL is not set | ||
234 | |||
235 | # | ||
236 | # CPU Frequency scaling | ||
237 | # | ||
238 | # CONFIG_CPU_FREQ is not set | ||
239 | |||
240 | # | ||
241 | # Floating point emulation | ||
242 | # | ||
243 | |||
244 | # | ||
245 | # At least one emulation must be selected | ||
246 | # | ||
247 | CONFIG_FPE_NWFPE=y | ||
248 | # CONFIG_FPE_NWFPE_XP is not set | ||
249 | # CONFIG_FPE_FASTFPE is not set | ||
250 | |||
251 | # | ||
252 | # Userspace binary formats | ||
253 | # | ||
254 | CONFIG_BINFMT_ELF=y | ||
255 | # CONFIG_BINFMT_AOUT is not set | ||
256 | # CONFIG_BINFMT_MISC is not set | ||
257 | # CONFIG_ARTHUR is not set | ||
258 | |||
259 | # | ||
260 | # Power management options | ||
261 | # | ||
262 | # CONFIG_PM is not set | ||
263 | # CONFIG_APM is not set | ||
264 | |||
265 | # | ||
266 | # Networking | ||
267 | # | ||
268 | CONFIG_NET=y | ||
269 | |||
270 | # | ||
271 | # Networking options | ||
272 | # | ||
273 | # CONFIG_NETDEBUG is not set | ||
274 | CONFIG_PACKET=y | ||
275 | # CONFIG_PACKET_MMAP is not set | ||
276 | CONFIG_UNIX=y | ||
277 | CONFIG_XFRM=y | ||
278 | # CONFIG_XFRM_USER is not set | ||
279 | # CONFIG_XFRM_SUB_POLICY is not set | ||
280 | CONFIG_NET_KEY=y | ||
281 | CONFIG_INET=y | ||
282 | # CONFIG_IP_MULTICAST is not set | ||
283 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
284 | CONFIG_IP_FIB_HASH=y | ||
285 | # CONFIG_IP_PNP is not set | ||
286 | # CONFIG_NET_IPIP is not set | ||
287 | # CONFIG_NET_IPGRE is not set | ||
288 | # CONFIG_ARPD is not set | ||
289 | # CONFIG_SYN_COOKIES is not set | ||
290 | # CONFIG_INET_AH is not set | ||
291 | # CONFIG_INET_ESP is not set | ||
292 | # CONFIG_INET_IPCOMP is not set | ||
293 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
294 | # CONFIG_INET_TUNNEL is not set | ||
295 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
296 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
297 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
298 | # CONFIG_INET_DIAG is not set | ||
299 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
300 | CONFIG_TCP_CONG_CUBIC=y | ||
301 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
302 | # CONFIG_IPV6 is not set | ||
303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
304 | # CONFIG_INET6_TUNNEL is not set | ||
305 | # CONFIG_NETWORK_SECMARK is not set | ||
306 | # CONFIG_NETFILTER is not set | ||
307 | |||
308 | # | ||
309 | # DCCP Configuration (EXPERIMENTAL) | ||
310 | # | ||
311 | # CONFIG_IP_DCCP is not set | ||
312 | |||
313 | # | ||
314 | # SCTP Configuration (EXPERIMENTAL) | ||
315 | # | ||
316 | # CONFIG_IP_SCTP is not set | ||
317 | |||
318 | # | ||
319 | # TIPC Configuration (EXPERIMENTAL) | ||
320 | # | ||
321 | # CONFIG_TIPC is not set | ||
322 | # CONFIG_ATM is not set | ||
323 | # CONFIG_BRIDGE is not set | ||
324 | # CONFIG_VLAN_8021Q is not set | ||
325 | # CONFIG_DECNET is not set | ||
326 | # CONFIG_LLC2 is not set | ||
327 | # CONFIG_IPX is not set | ||
328 | # CONFIG_ATALK is not set | ||
329 | # CONFIG_X25 is not set | ||
330 | # CONFIG_LAPB is not set | ||
331 | # CONFIG_ECONET is not set | ||
332 | # CONFIG_WAN_ROUTER is not set | ||
333 | |||
334 | # | ||
335 | # QoS and/or fair queueing | ||
336 | # | ||
337 | # CONFIG_NET_SCHED is not set | ||
338 | |||
339 | # | ||
340 | # Network testing | ||
341 | # | ||
342 | # CONFIG_NET_PKTGEN is not set | ||
343 | # CONFIG_HAMRADIO is not set | ||
344 | # CONFIG_IRDA is not set | ||
345 | # CONFIG_BT is not set | ||
346 | # CONFIG_IEEE80211 is not set | ||
347 | |||
348 | # | ||
349 | # Device Drivers | ||
350 | # | ||
351 | |||
352 | # | ||
353 | # Generic Driver Options | ||
354 | # | ||
355 | CONFIG_STANDALONE=y | ||
356 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
357 | # CONFIG_FW_LOADER is not set | ||
358 | # CONFIG_SYS_HYPERVISOR is not set | ||
359 | |||
360 | # | ||
361 | # Connector - unified userspace <-> kernelspace linker | ||
362 | # | ||
363 | # CONFIG_CONNECTOR is not set | ||
364 | |||
365 | # | ||
366 | # Memory Technology Devices (MTD) | ||
367 | # | ||
368 | # CONFIG_MTD is not set | ||
369 | |||
370 | # | ||
371 | # Parallel port support | ||
372 | # | ||
373 | # CONFIG_PARPORT is not set | ||
374 | |||
375 | # | ||
376 | # Plug and Play support | ||
377 | # | ||
378 | |||
379 | # | ||
380 | # Block devices | ||
381 | # | ||
382 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
383 | # CONFIG_BLK_DEV_LOOP is not set | ||
384 | # CONFIG_BLK_DEV_NBD is not set | ||
385 | # CONFIG_BLK_DEV_RAM is not set | ||
386 | # CONFIG_BLK_DEV_INITRD is not set | ||
387 | # CONFIG_CDROM_PKTCDVD is not set | ||
388 | # CONFIG_ATA_OVER_ETH is not set | ||
389 | |||
390 | # | ||
391 | # SCSI device support | ||
392 | # | ||
393 | # CONFIG_RAID_ATTRS is not set | ||
394 | # CONFIG_SCSI is not set | ||
395 | # CONFIG_SCSI_NETLINK is not set | ||
396 | |||
397 | # | ||
398 | # Multi-device support (RAID and LVM) | ||
399 | # | ||
400 | # CONFIG_MD is not set | ||
401 | |||
402 | # | ||
403 | # Fusion MPT device support | ||
404 | # | ||
405 | # CONFIG_FUSION is not set | ||
406 | |||
407 | # | ||
408 | # IEEE 1394 (FireWire) support | ||
409 | # | ||
410 | |||
411 | # | ||
412 | # I2O device support | ||
413 | # | ||
414 | |||
415 | # | ||
416 | # Network device support | ||
417 | # | ||
418 | # CONFIG_NETDEVICES is not set | ||
419 | # CONFIG_NETPOLL is not set | ||
420 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
421 | |||
422 | # | ||
423 | # ISDN subsystem | ||
424 | # | ||
425 | # CONFIG_ISDN is not set | ||
426 | |||
427 | # | ||
428 | # Input device support | ||
429 | # | ||
430 | CONFIG_INPUT=y | ||
431 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
432 | |||
433 | # | ||
434 | # Userland interfaces | ||
435 | # | ||
436 | CONFIG_INPUT_MOUSEDEV=y | ||
437 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
438 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 | ||
439 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | ||
440 | # CONFIG_INPUT_JOYDEV is not set | ||
441 | CONFIG_INPUT_TSDEV=y | ||
442 | CONFIG_INPUT_TSDEV_SCREEN_X=320 | ||
443 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 | ||
444 | CONFIG_INPUT_EVDEV=y | ||
445 | # CONFIG_INPUT_EVBUG is not set | ||
446 | |||
447 | # | ||
448 | # Input Device Drivers | ||
449 | # | ||
450 | # CONFIG_INPUT_KEYBOARD is not set | ||
451 | # CONFIG_INPUT_MOUSE is not set | ||
452 | # CONFIG_INPUT_JOYSTICK is not set | ||
453 | CONFIG_INPUT_TOUCHSCREEN=y | ||
454 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
455 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
456 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
457 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
458 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
459 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
460 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
461 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
462 | # CONFIG_TOUCHSCREEN_TSC2102 is not set | ||
463 | # CONFIG_INPUT_MISC is not set | ||
464 | |||
465 | # | ||
466 | # Hardware I/O ports | ||
467 | # | ||
468 | # CONFIG_SERIO is not set | ||
469 | # CONFIG_GAMEPORT is not set | ||
470 | |||
471 | # | ||
472 | # Character devices | ||
473 | # | ||
474 | CONFIG_VT=y | ||
475 | CONFIG_VT_CONSOLE=y | ||
476 | CONFIG_HW_CONSOLE=y | ||
477 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
478 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
479 | |||
480 | # | ||
481 | # Serial drivers | ||
482 | # | ||
483 | # CONFIG_SERIAL_8250 is not set | ||
484 | |||
485 | # | ||
486 | # Non-8250 serial port support | ||
487 | # | ||
488 | CONFIG_UNIX98_PTYS=y | ||
489 | CONFIG_LEGACY_PTYS=y | ||
490 | CONFIG_LEGACY_PTY_COUNT=256 | ||
491 | |||
492 | # | ||
493 | # IPMI | ||
494 | # | ||
495 | # CONFIG_IPMI_HANDLER is not set | ||
496 | |||
497 | # | ||
498 | # Watchdog Cards | ||
499 | # | ||
500 | # CONFIG_WATCHDOG is not set | ||
501 | CONFIG_HW_RANDOM=y | ||
502 | # CONFIG_NVRAM is not set | ||
503 | # CONFIG_OMAP_RTC is not set | ||
504 | # CONFIG_DTLK is not set | ||
505 | # CONFIG_R3964 is not set | ||
506 | |||
507 | # | ||
508 | # Ftape, the floppy tape device driver | ||
509 | # | ||
510 | # CONFIG_RAW_DRIVER is not set | ||
511 | |||
512 | # | ||
513 | # TPM devices | ||
514 | # | ||
515 | # CONFIG_TCG_TPM is not set | ||
516 | |||
517 | # | ||
518 | # I2C support | ||
519 | # | ||
520 | # CONFIG_I2C is not set | ||
521 | |||
522 | # | ||
523 | # SPI support | ||
524 | # | ||
525 | CONFIG_SPI=y | ||
526 | CONFIG_SPI_MASTER=y | ||
527 | |||
528 | # | ||
529 | # SPI Master Controller Drivers | ||
530 | # | ||
531 | CONFIG_SPI_BITBANG=y | ||
532 | CONFIG_SPI_OMAP_UWIRE=y | ||
533 | |||
534 | # | ||
535 | # SPI Protocol Masters | ||
536 | # | ||
537 | # CONFIG_TSC2102 is not set | ||
538 | |||
539 | # | ||
540 | # Dallas's 1-wire bus | ||
541 | # | ||
542 | # CONFIG_W1 is not set | ||
543 | |||
544 | # | ||
545 | # Hardware Monitoring support | ||
546 | # | ||
547 | CONFIG_HWMON=y | ||
548 | # CONFIG_HWMON_VID is not set | ||
549 | # CONFIG_SENSORS_ABITUGURU is not set | ||
550 | # CONFIG_SENSORS_F71805F is not set | ||
551 | # CONFIG_SENSORS_LM70 is not set | ||
552 | # CONFIG_SENSORS_VT1211 is not set | ||
553 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
554 | |||
555 | # | ||
556 | # Misc devices | ||
557 | # | ||
558 | # CONFIG_SGI_IOC4 is not set | ||
559 | # CONFIG_TIFM_CORE is not set | ||
560 | |||
561 | # | ||
562 | # LED devices | ||
563 | # | ||
564 | CONFIG_NEW_LEDS=y | ||
565 | CONFIG_LEDS_CLASS=y | ||
566 | |||
567 | # | ||
568 | # LED drivers | ||
569 | # | ||
570 | CONFIG_LEDS_OMAP=y | ||
571 | |||
572 | # | ||
573 | # LED Triggers | ||
574 | # | ||
575 | CONFIG_LEDS_TRIGGERS=y | ||
576 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
577 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
578 | |||
579 | # | ||
580 | # Multimedia devices | ||
581 | # | ||
582 | # CONFIG_VIDEO_DEV is not set | ||
583 | |||
584 | # | ||
585 | # Digital Video Broadcasting Devices | ||
586 | # | ||
587 | # CONFIG_DVB is not set | ||
588 | |||
589 | # | ||
590 | # Graphics support | ||
591 | # | ||
592 | CONFIG_FIRMWARE_EDID=y | ||
593 | CONFIG_FB=y | ||
594 | # CONFIG_FB_CFB_FILLRECT is not set | ||
595 | # CONFIG_FB_CFB_COPYAREA is not set | ||
596 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
597 | # CONFIG_FB_MACMODES is not set | ||
598 | # CONFIG_FB_BACKLIGHT is not set | ||
599 | # CONFIG_FB_MODE_HELPERS is not set | ||
600 | # CONFIG_FB_TILEBLITTING is not set | ||
601 | # CONFIG_FB_S1D13XXX is not set | ||
602 | # CONFIG_FB_VIRTUAL is not set | ||
603 | CONFIG_FB_OMAP=y | ||
604 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
605 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
606 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
607 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
608 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
609 | |||
610 | # | ||
611 | # Console display driver support | ||
612 | # | ||
613 | # CONFIG_VGA_CONSOLE is not set | ||
614 | CONFIG_DUMMY_CONSOLE=y | ||
615 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
616 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
617 | # CONFIG_FONTS is not set | ||
618 | CONFIG_FONT_8x8=y | ||
619 | CONFIG_FONT_8x16=y | ||
620 | |||
621 | # | ||
622 | # Logo configuration | ||
623 | # | ||
624 | # CONFIG_LOGO is not set | ||
625 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
626 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
627 | CONFIG_BACKLIGHT_DEVICE=y | ||
628 | CONFIG_LCD_CLASS_DEVICE=y | ||
629 | CONFIG_LCD_DEVICE=y | ||
630 | CONFIG_BACKLIGHT_OMAP=y | ||
631 | |||
632 | # | ||
633 | # Sound | ||
634 | # | ||
635 | # CONFIG_SOUND is not set | ||
636 | |||
637 | # | ||
638 | # USB support | ||
639 | # | ||
640 | CONFIG_USB_ARCH_HAS_HCD=y | ||
641 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
642 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
643 | # CONFIG_USB is not set | ||
644 | |||
645 | # | ||
646 | # Enable Host or Gadget support to see Inventra options | ||
647 | # | ||
648 | |||
649 | # | ||
650 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
651 | # | ||
652 | |||
653 | # | ||
654 | # USB Gadget Support | ||
655 | # | ||
656 | # CONFIG_USB_GADGET is not set | ||
657 | |||
658 | # | ||
659 | # MMC/SD Card support | ||
660 | # | ||
661 | # CONFIG_MMC is not set | ||
662 | |||
663 | # | ||
664 | # Real Time Clock | ||
665 | # | ||
666 | CONFIG_RTC_LIB=y | ||
667 | CONFIG_RTC_CLASS=y | ||
668 | CONFIG_RTC_HCTOSYS=y | ||
669 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
670 | # CONFIG_RTC_DEBUG is not set | ||
671 | |||
672 | # | ||
673 | # RTC interfaces | ||
674 | # | ||
675 | CONFIG_RTC_INTF_SYSFS=y | ||
676 | CONFIG_RTC_INTF_PROC=y | ||
677 | CONFIG_RTC_INTF_DEV=y | ||
678 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
679 | |||
680 | # | ||
681 | # RTC drivers | ||
682 | # | ||
683 | # CONFIG_RTC_DRV_DS1553 is not set | ||
684 | # CONFIG_RTC_DRV_DS1742 is not set | ||
685 | CONFIG_RTC_DRV_OMAP=y | ||
686 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
687 | # CONFIG_RTC_DRV_M48T86 is not set | ||
688 | # CONFIG_RTC_DRV_TEST is not set | ||
689 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
690 | # CONFIG_RTC_DRV_V3020 is not set | ||
691 | |||
692 | # | ||
693 | # Synchronous Serial Interfaces (SSI) | ||
694 | # | ||
695 | # CONFIG_OMAP_UWIRE is not set | ||
696 | # CONFIG_OMAP_TSC2101 is not set | ||
697 | |||
698 | # | ||
699 | # CBUS support | ||
700 | # | ||
701 | # CONFIG_CBUS is not set | ||
702 | |||
703 | # | ||
704 | # File systems | ||
705 | # | ||
706 | CONFIG_EXT2_FS=y | ||
707 | # CONFIG_EXT2_FS_XATTR is not set | ||
708 | # CONFIG_EXT2_FS_XIP is not set | ||
709 | # CONFIG_EXT3_FS is not set | ||
710 | # CONFIG_EXT4DEV_FS is not set | ||
711 | # CONFIG_REISERFS_FS is not set | ||
712 | # CONFIG_JFS_FS is not set | ||
713 | # CONFIG_FS_POSIX_ACL is not set | ||
714 | # CONFIG_XFS_FS is not set | ||
715 | # CONFIG_GFS2_FS is not set | ||
716 | # CONFIG_OCFS2_FS is not set | ||
717 | # CONFIG_MINIX_FS is not set | ||
718 | # CONFIG_ROMFS_FS is not set | ||
719 | # CONFIG_INOTIFY is not set | ||
720 | # CONFIG_QUOTA is not set | ||
721 | CONFIG_DNOTIFY=y | ||
722 | # CONFIG_AUTOFS_FS is not set | ||
723 | # CONFIG_AUTOFS4_FS is not set | ||
724 | # CONFIG_FUSE_FS is not set | ||
725 | |||
726 | # | ||
727 | # CD-ROM/DVD Filesystems | ||
728 | # | ||
729 | # CONFIG_ISO9660_FS is not set | ||
730 | # CONFIG_UDF_FS is not set | ||
731 | |||
732 | # | ||
733 | # DOS/FAT/NT Filesystems | ||
734 | # | ||
735 | # CONFIG_MSDOS_FS is not set | ||
736 | # CONFIG_VFAT_FS is not set | ||
737 | # CONFIG_NTFS_FS is not set | ||
738 | |||
739 | # | ||
740 | # Pseudo filesystems | ||
741 | # | ||
742 | CONFIG_PROC_FS=y | ||
743 | CONFIG_PROC_SYSCTL=y | ||
744 | CONFIG_SYSFS=y | ||
745 | # CONFIG_TMPFS is not set | ||
746 | # CONFIG_HUGETLB_PAGE is not set | ||
747 | CONFIG_RAMFS=y | ||
748 | # CONFIG_CONFIGFS_FS is not set | ||
749 | |||
750 | # | ||
751 | # Miscellaneous filesystems | ||
752 | # | ||
753 | # CONFIG_ADFS_FS is not set | ||
754 | # CONFIG_AFFS_FS is not set | ||
755 | # CONFIG_HFS_FS is not set | ||
756 | # CONFIG_HFSPLUS_FS is not set | ||
757 | # CONFIG_BEFS_FS is not set | ||
758 | # CONFIG_BFS_FS is not set | ||
759 | # CONFIG_EFS_FS is not set | ||
760 | # CONFIG_CRAMFS is not set | ||
761 | # CONFIG_VXFS_FS is not set | ||
762 | # CONFIG_HPFS_FS is not set | ||
763 | # CONFIG_QNX4FS_FS is not set | ||
764 | # CONFIG_SYSV_FS is not set | ||
765 | # CONFIG_UFS_FS is not set | ||
766 | |||
767 | # | ||
768 | # Network File Systems | ||
769 | # | ||
770 | # CONFIG_NFS_FS is not set | ||
771 | # CONFIG_NFSD is not set | ||
772 | # CONFIG_SMB_FS is not set | ||
773 | # CONFIG_CIFS is not set | ||
774 | # CONFIG_NCP_FS is not set | ||
775 | # CONFIG_CODA_FS is not set | ||
776 | # CONFIG_AFS_FS is not set | ||
777 | # CONFIG_9P_FS is not set | ||
778 | |||
779 | # | ||
780 | # Partition Types | ||
781 | # | ||
782 | CONFIG_PARTITION_ADVANCED=y | ||
783 | # CONFIG_ACORN_PARTITION is not set | ||
784 | # CONFIG_OSF_PARTITION is not set | ||
785 | # CONFIG_AMIGA_PARTITION is not set | ||
786 | # CONFIG_ATARI_PARTITION is not set | ||
787 | # CONFIG_MAC_PARTITION is not set | ||
788 | CONFIG_MSDOS_PARTITION=y | ||
789 | # CONFIG_BSD_DISKLABEL is not set | ||
790 | # CONFIG_MINIX_SUBPARTITION is not set | ||
791 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
792 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
793 | # CONFIG_LDM_PARTITION is not set | ||
794 | # CONFIG_SGI_PARTITION is not set | ||
795 | # CONFIG_ULTRIX_PARTITION is not set | ||
796 | # CONFIG_SUN_PARTITION is not set | ||
797 | # CONFIG_KARMA_PARTITION is not set | ||
798 | # CONFIG_EFI_PARTITION is not set | ||
799 | |||
800 | # | ||
801 | # Native Language Support | ||
802 | # | ||
803 | # CONFIG_NLS is not set | ||
804 | |||
805 | # | ||
806 | # Profiling support | ||
807 | # | ||
808 | # CONFIG_PROFILING is not set | ||
809 | |||
810 | # | ||
811 | # Kernel hacking | ||
812 | # | ||
813 | # CONFIG_PRINTK_TIME is not set | ||
814 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
815 | # CONFIG_MAGIC_SYSRQ is not set | ||
816 | # CONFIG_UNUSED_SYMBOLS is not set | ||
817 | # CONFIG_DEBUG_KERNEL is not set | ||
818 | CONFIG_LOG_BUF_SHIFT=14 | ||
819 | CONFIG_DEBUG_BUGVERBOSE=y | ||
820 | # CONFIG_DEBUG_FS is not set | ||
821 | CONFIG_FRAME_POINTER=y | ||
822 | # CONFIG_UNWIND_INFO is not set | ||
823 | # CONFIG_HEADERS_CHECK is not set | ||
824 | # CONFIG_DEBUG_USER is not set | ||
825 | |||
826 | # | ||
827 | # Security options | ||
828 | # | ||
829 | # CONFIG_KEYS is not set | ||
830 | # CONFIG_SECURITY is not set | ||
831 | |||
832 | # | ||
833 | # Cryptographic options | ||
834 | # | ||
835 | # CONFIG_CRYPTO is not set | ||
836 | |||
837 | # | ||
838 | # Library routines | ||
839 | # | ||
840 | CONFIG_CRC_CCITT=y | ||
841 | CONFIG_CRC16=y | ||
842 | CONFIG_CRC32=y | ||
843 | CONFIG_LIBCRC32C=y | ||
844 | CONFIG_PLIST=y | ||
diff --git a/arch/arm/configs/palmz71_defconfig b/arch/arm/configs/palmz71_defconfig new file mode 100644 index 000000000000..6361922e71c1 --- /dev/null +++ b/arch/arm/configs/palmz71_defconfig | |||
@@ -0,0 +1,891 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.22-rc1-omap1 | ||
4 | # Thu Jun 7 05:13:00 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # Code maturity level options | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
34 | |||
35 | # | ||
36 | # General setup | ||
37 | # | ||
38 | CONFIG_LOCALVERSION="-z71" | ||
39 | CONFIG_LOCALVERSION_AUTO=y | ||
40 | CONFIG_SWAP=y | ||
41 | CONFIG_SYSVIPC=y | ||
42 | # CONFIG_IPC_NS is not set | ||
43 | CONFIG_SYSVIPC_SYSCTL=y | ||
44 | # CONFIG_POSIX_MQUEUE is not set | ||
45 | CONFIG_BSD_PROCESS_ACCT=y | ||
46 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set | ||
47 | # CONFIG_TASKSTATS is not set | ||
48 | # CONFIG_UTS_NS is not set | ||
49 | # CONFIG_AUDIT is not set | ||
50 | # CONFIG_IKCONFIG is not set | ||
51 | CONFIG_LOG_BUF_SHIFT=14 | ||
52 | CONFIG_SYSFS_DEPRECATED=y | ||
53 | # CONFIG_RELAY is not set | ||
54 | # CONFIG_BLK_DEV_INITRD is not set | ||
55 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
56 | CONFIG_SYSCTL=y | ||
57 | # CONFIG_EMBEDDED is not set | ||
58 | CONFIG_UID16=y | ||
59 | CONFIG_SYSCTL_SYSCALL=y | ||
60 | CONFIG_KALLSYMS=y | ||
61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | ||
62 | CONFIG_HOTPLUG=y | ||
63 | CONFIG_PRINTK=y | ||
64 | CONFIG_BUG=y | ||
65 | CONFIG_ELF_CORE=y | ||
66 | CONFIG_BASE_FULL=y | ||
67 | CONFIG_FUTEX=y | ||
68 | CONFIG_ANON_INODES=y | ||
69 | CONFIG_EPOLL=y | ||
70 | CONFIG_SIGNALFD=y | ||
71 | CONFIG_TIMERFD=y | ||
72 | CONFIG_EVENTFD=y | ||
73 | CONFIG_SHMEM=y | ||
74 | CONFIG_VM_EVENT_COUNTERS=y | ||
75 | CONFIG_SLAB=y | ||
76 | # CONFIG_SLUB is not set | ||
77 | # CONFIG_SLOB is not set | ||
78 | CONFIG_RT_MUTEXES=y | ||
79 | # CONFIG_TINY_SHMEM is not set | ||
80 | CONFIG_BASE_SMALL=0 | ||
81 | |||
82 | # | ||
83 | # Loadable module support | ||
84 | # | ||
85 | # CONFIG_MODULES is not set | ||
86 | |||
87 | # | ||
88 | # Block layer | ||
89 | # | ||
90 | CONFIG_BLOCK=y | ||
91 | # CONFIG_LBD is not set | ||
92 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
93 | # CONFIG_LSF is not set | ||
94 | |||
95 | # | ||
96 | # IO Schedulers | ||
97 | # | ||
98 | CONFIG_IOSCHED_NOOP=y | ||
99 | # CONFIG_IOSCHED_AS is not set | ||
100 | # CONFIG_IOSCHED_DEADLINE is not set | ||
101 | # CONFIG_IOSCHED_CFQ is not set | ||
102 | # CONFIG_DEFAULT_AS is not set | ||
103 | # CONFIG_DEFAULT_DEADLINE is not set | ||
104 | # CONFIG_DEFAULT_CFQ is not set | ||
105 | CONFIG_DEFAULT_NOOP=y | ||
106 | CONFIG_DEFAULT_IOSCHED="noop" | ||
107 | |||
108 | # | ||
109 | # System Type | ||
110 | # | ||
111 | # CONFIG_ARCH_AAEC2000 is not set | ||
112 | # CONFIG_ARCH_INTEGRATOR is not set | ||
113 | # CONFIG_ARCH_REALVIEW is not set | ||
114 | # CONFIG_ARCH_VERSATILE is not set | ||
115 | # CONFIG_ARCH_AT91 is not set | ||
116 | # CONFIG_ARCH_CLPS7500 is not set | ||
117 | # CONFIG_ARCH_CLPS711X is not set | ||
118 | # CONFIG_ARCH_CO285 is not set | ||
119 | # CONFIG_ARCH_EBSA110 is not set | ||
120 | # CONFIG_ARCH_EP93XX is not set | ||
121 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
122 | # CONFIG_ARCH_NETX is not set | ||
123 | # CONFIG_ARCH_H720X is not set | ||
124 | # CONFIG_ARCH_IMX is not set | ||
125 | # CONFIG_ARCH_IOP13XX is not set | ||
126 | # CONFIG_ARCH_IOP32X is not set | ||
127 | # CONFIG_ARCH_IOP33X is not set | ||
128 | # CONFIG_ARCH_IXP23XX is not set | ||
129 | # CONFIG_ARCH_IXP2000 is not set | ||
130 | # CONFIG_ARCH_IXP4XX is not set | ||
131 | # CONFIG_ARCH_L7200 is not set | ||
132 | # CONFIG_ARCH_KS8695 is not set | ||
133 | # CONFIG_ARCH_NS9XXX is not set | ||
134 | # CONFIG_ARCH_PNX4008 is not set | ||
135 | # CONFIG_ARCH_PXA is not set | ||
136 | # CONFIG_ARCH_RPC is not set | ||
137 | # CONFIG_ARCH_SA1100 is not set | ||
138 | # CONFIG_ARCH_S3C2410 is not set | ||
139 | # CONFIG_ARCH_SHARK is not set | ||
140 | # CONFIG_ARCH_LH7A40X is not set | ||
141 | # CONFIG_ARCH_DAVINCI is not set | ||
142 | CONFIG_ARCH_OMAP=y | ||
143 | |||
144 | # | ||
145 | # TI OMAP Implementations | ||
146 | # | ||
147 | CONFIG_ARCH_OMAP1=y | ||
148 | # CONFIG_ARCH_OMAP2 is not set | ||
149 | |||
150 | # | ||
151 | # OMAP Feature Selections | ||
152 | # | ||
153 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
154 | # CONFIG_OMAP_BOOT_TAG is not set | ||
155 | # CONFIG_OMAP_GPIO_SWITCH is not set | ||
156 | CONFIG_OMAP_MUX=y | ||
157 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
158 | CONFIG_OMAP_MUX_WARNINGS=y | ||
159 | CONFIG_OMAP_MCBSP=y | ||
160 | # CONFIG_OMAP_MMU_FWK is not set | ||
161 | # CONFIG_OMAP_MBOX_FWK is not set | ||
162 | CONFIG_OMAP_MPU_TIMER=y | ||
163 | # CONFIG_OMAP_32K_TIMER is not set | ||
164 | CONFIG_OMAP_LL_DEBUG_UART1=y | ||
165 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
166 | # CONFIG_OMAP_LL_DEBUG_UART3 is not set | ||
167 | # CONFIG_OMAP_LL_DEBUG_LCD is not set | ||
168 | CONFIG_OMAP_SERIAL_WAKE=y | ||
169 | # CONFIG_OMAP_DSP is not set | ||
170 | |||
171 | # | ||
172 | # OMAP Core Type | ||
173 | # | ||
174 | # CONFIG_ARCH_OMAP730 is not set | ||
175 | CONFIG_ARCH_OMAP15XX=y | ||
176 | # CONFIG_ARCH_OMAP16XX is not set | ||
177 | |||
178 | # | ||
179 | # OMAP Board Type | ||
180 | # | ||
181 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
182 | # CONFIG_MACH_VOICEBLUE is not set | ||
183 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
184 | CONFIG_MACH_OMAP_PALMZ71=y | ||
185 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
186 | # CONFIG_MACH_SX1 is not set | ||
187 | # CONFIG_MACH_AMS_DELTA is not set | ||
188 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
189 | |||
190 | # | ||
191 | # OMAP CPU Speed | ||
192 | # | ||
193 | CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | ||
194 | # CONFIG_OMAP_ARM_168MHZ is not set | ||
195 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
196 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
197 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
198 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
199 | |||
200 | # | ||
201 | # Processor Type | ||
202 | # | ||
203 | CONFIG_CPU_32=y | ||
204 | CONFIG_CPU_ARM925T=y | ||
205 | CONFIG_CPU_32v4T=y | ||
206 | CONFIG_CPU_ABRT_EV4T=y | ||
207 | CONFIG_CPU_CACHE_V4WT=y | ||
208 | CONFIG_CPU_CACHE_VIVT=y | ||
209 | CONFIG_CPU_COPY_V4WB=y | ||
210 | CONFIG_CPU_TLB_V4WBI=y | ||
211 | CONFIG_CPU_CP15=y | ||
212 | CONFIG_CPU_CP15_MMU=y | ||
213 | |||
214 | # | ||
215 | # Processor Features | ||
216 | # | ||
217 | # CONFIG_ARM_THUMB is not set | ||
218 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
219 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
220 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
221 | # CONFIG_OUTER_CACHE is not set | ||
222 | |||
223 | # | ||
224 | # Bus support | ||
225 | # | ||
226 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
227 | |||
228 | # | ||
229 | # PCCARD (PCMCIA/CardBus) support | ||
230 | # | ||
231 | # CONFIG_PCCARD is not set | ||
232 | |||
233 | # | ||
234 | # Kernel Features | ||
235 | # | ||
236 | # CONFIG_TICK_ONESHOT is not set | ||
237 | # CONFIG_NO_HZ is not set | ||
238 | # CONFIG_HIGH_RES_TIMERS is not set | ||
239 | # CONFIG_PREEMPT is not set | ||
240 | CONFIG_HZ=100 | ||
241 | # CONFIG_AEABI is not set | ||
242 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
243 | CONFIG_SELECT_MEMORY_MODEL=y | ||
244 | CONFIG_FLATMEM_MANUAL=y | ||
245 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
246 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
247 | CONFIG_FLATMEM=y | ||
248 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
249 | # CONFIG_SPARSEMEM_STATIC is not set | ||
250 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
251 | # CONFIG_RESOURCES_64BIT is not set | ||
252 | CONFIG_ZONE_DMA_FLAG=1 | ||
253 | # CONFIG_LEDS is not set | ||
254 | CONFIG_ALIGNMENT_TRAP=y | ||
255 | |||
256 | # | ||
257 | # Boot options | ||
258 | # | ||
259 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
260 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
261 | CONFIG_CMDLINE="" | ||
262 | # CONFIG_XIP_KERNEL is not set | ||
263 | # CONFIG_KEXEC is not set | ||
264 | |||
265 | # | ||
266 | # CPU Frequency scaling | ||
267 | # | ||
268 | # CONFIG_CPU_FREQ is not set | ||
269 | |||
270 | # | ||
271 | # Floating point emulation | ||
272 | # | ||
273 | |||
274 | # | ||
275 | # At least one emulation must be selected | ||
276 | # | ||
277 | CONFIG_FPE_NWFPE=y | ||
278 | # CONFIG_FPE_NWFPE_XP is not set | ||
279 | # CONFIG_FPE_FASTFPE is not set | ||
280 | |||
281 | # | ||
282 | # Userspace binary formats | ||
283 | # | ||
284 | CONFIG_BINFMT_ELF=y | ||
285 | # CONFIG_BINFMT_AOUT is not set | ||
286 | # CONFIG_BINFMT_MISC is not set | ||
287 | # CONFIG_ARTHUR is not set | ||
288 | |||
289 | # | ||
290 | # Power management options | ||
291 | # | ||
292 | # CONFIG_PM is not set | ||
293 | |||
294 | # | ||
295 | # Networking | ||
296 | # | ||
297 | CONFIG_NET=y | ||
298 | |||
299 | # | ||
300 | # Networking options | ||
301 | # | ||
302 | CONFIG_PACKET=y | ||
303 | # CONFIG_PACKET_MMAP is not set | ||
304 | CONFIG_UNIX=y | ||
305 | CONFIG_XFRM=y | ||
306 | # CONFIG_XFRM_USER is not set | ||
307 | # CONFIG_XFRM_SUB_POLICY is not set | ||
308 | # CONFIG_XFRM_MIGRATE is not set | ||
309 | CONFIG_NET_KEY=y | ||
310 | # CONFIG_NET_KEY_MIGRATE is not set | ||
311 | CONFIG_INET=y | ||
312 | # CONFIG_IP_MULTICAST is not set | ||
313 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
314 | CONFIG_IP_FIB_HASH=y | ||
315 | # CONFIG_IP_PNP is not set | ||
316 | # CONFIG_NET_IPIP is not set | ||
317 | # CONFIG_NET_IPGRE is not set | ||
318 | # CONFIG_ARPD is not set | ||
319 | # CONFIG_SYN_COOKIES is not set | ||
320 | # CONFIG_INET_AH is not set | ||
321 | # CONFIG_INET_ESP is not set | ||
322 | # CONFIG_INET_IPCOMP is not set | ||
323 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
324 | # CONFIG_INET_TUNNEL is not set | ||
325 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
326 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
327 | CONFIG_INET_XFRM_MODE_BEET=y | ||
328 | # CONFIG_INET_DIAG is not set | ||
329 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
330 | CONFIG_TCP_CONG_CUBIC=y | ||
331 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
332 | # CONFIG_TCP_MD5SIG is not set | ||
333 | # CONFIG_IPV6 is not set | ||
334 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
335 | # CONFIG_INET6_TUNNEL is not set | ||
336 | # CONFIG_NETWORK_SECMARK is not set | ||
337 | # CONFIG_NETFILTER is not set | ||
338 | |||
339 | # | ||
340 | # DCCP Configuration (EXPERIMENTAL) | ||
341 | # | ||
342 | # CONFIG_IP_DCCP is not set | ||
343 | |||
344 | # | ||
345 | # SCTP Configuration (EXPERIMENTAL) | ||
346 | # | ||
347 | # CONFIG_IP_SCTP is not set | ||
348 | |||
349 | # | ||
350 | # TIPC Configuration (EXPERIMENTAL) | ||
351 | # | ||
352 | # CONFIG_TIPC is not set | ||
353 | # CONFIG_ATM is not set | ||
354 | # CONFIG_BRIDGE is not set | ||
355 | # CONFIG_VLAN_8021Q is not set | ||
356 | # CONFIG_DECNET is not set | ||
357 | # CONFIG_LLC2 is not set | ||
358 | # CONFIG_IPX is not set | ||
359 | # CONFIG_ATALK is not set | ||
360 | # CONFIG_X25 is not set | ||
361 | # CONFIG_LAPB is not set | ||
362 | # CONFIG_ECONET is not set | ||
363 | # CONFIG_WAN_ROUTER is not set | ||
364 | |||
365 | # | ||
366 | # QoS and/or fair queueing | ||
367 | # | ||
368 | # CONFIG_NET_SCHED is not set | ||
369 | |||
370 | # | ||
371 | # Network testing | ||
372 | # | ||
373 | # CONFIG_NET_PKTGEN is not set | ||
374 | # CONFIG_HAMRADIO is not set | ||
375 | # CONFIG_IRDA is not set | ||
376 | # CONFIG_BT is not set | ||
377 | # CONFIG_AF_RXRPC is not set | ||
378 | |||
379 | # | ||
380 | # Wireless | ||
381 | # | ||
382 | # CONFIG_CFG80211 is not set | ||
383 | # CONFIG_WIRELESS_EXT is not set | ||
384 | # CONFIG_MAC80211 is not set | ||
385 | # CONFIG_IEEE80211 is not set | ||
386 | # CONFIG_RFKILL is not set | ||
387 | |||
388 | # | ||
389 | # Device Drivers | ||
390 | # | ||
391 | |||
392 | # | ||
393 | # Generic Driver Options | ||
394 | # | ||
395 | CONFIG_STANDALONE=y | ||
396 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
397 | # CONFIG_FW_LOADER is not set | ||
398 | # CONFIG_SYS_HYPERVISOR is not set | ||
399 | |||
400 | # | ||
401 | # Connector - unified userspace <-> kernelspace linker | ||
402 | # | ||
403 | # CONFIG_CONNECTOR is not set | ||
404 | # CONFIG_MTD is not set | ||
405 | |||
406 | # | ||
407 | # Parallel port support | ||
408 | # | ||
409 | # CONFIG_PARPORT is not set | ||
410 | |||
411 | # | ||
412 | # Plug and Play support | ||
413 | # | ||
414 | # CONFIG_PNPACPI is not set | ||
415 | |||
416 | # | ||
417 | # Block devices | ||
418 | # | ||
419 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
420 | # CONFIG_BLK_DEV_LOOP is not set | ||
421 | # CONFIG_BLK_DEV_NBD is not set | ||
422 | # CONFIG_BLK_DEV_RAM is not set | ||
423 | # CONFIG_CDROM_PKTCDVD is not set | ||
424 | # CONFIG_ATA_OVER_ETH is not set | ||
425 | |||
426 | # | ||
427 | # SCSI device support | ||
428 | # | ||
429 | # CONFIG_RAID_ATTRS is not set | ||
430 | # CONFIG_SCSI is not set | ||
431 | # CONFIG_SCSI_NETLINK is not set | ||
432 | # CONFIG_ATA is not set | ||
433 | |||
434 | # | ||
435 | # Multi-device support (RAID and LVM) | ||
436 | # | ||
437 | # CONFIG_MD is not set | ||
438 | |||
439 | # | ||
440 | # Network device support | ||
441 | # | ||
442 | # CONFIG_NETDEVICES is not set | ||
443 | # CONFIG_NETPOLL is not set | ||
444 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
445 | |||
446 | # | ||
447 | # ISDN subsystem | ||
448 | # | ||
449 | # CONFIG_ISDN is not set | ||
450 | |||
451 | # | ||
452 | # Input device support | ||
453 | # | ||
454 | CONFIG_INPUT=y | ||
455 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
456 | |||
457 | # | ||
458 | # Userland interfaces | ||
459 | # | ||
460 | CONFIG_INPUT_MOUSEDEV=y | ||
461 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
462 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 | ||
463 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | ||
464 | # CONFIG_INPUT_JOYDEV is not set | ||
465 | CONFIG_INPUT_TSDEV=y | ||
466 | CONFIG_INPUT_TSDEV_SCREEN_X=320 | ||
467 | CONFIG_INPUT_TSDEV_SCREEN_Y=320 | ||
468 | # CONFIG_INPUT_EVDEV is not set | ||
469 | # CONFIG_INPUT_EVBUG is not set | ||
470 | |||
471 | # | ||
472 | # Input Device Drivers | ||
473 | # | ||
474 | # CONFIG_INPUT_KEYBOARD is not set | ||
475 | # CONFIG_INPUT_MOUSE is not set | ||
476 | # CONFIG_INPUT_JOYSTICK is not set | ||
477 | # CONFIG_INPUT_TABLET is not set | ||
478 | CONFIG_INPUT_TOUCHSCREEN=y | ||
479 | CONFIG_TOUCHSCREEN_ADS7846=y | ||
480 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
481 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
482 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
483 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
484 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
485 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
486 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
487 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
488 | # CONFIG_TOUCHSCREEN_TSC210X is not set | ||
489 | # CONFIG_TOUCHSCREEN_TSC2046 is not set | ||
490 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
491 | # CONFIG_INPUT_MISC is not set | ||
492 | |||
493 | # | ||
494 | # Hardware I/O ports | ||
495 | # | ||
496 | # CONFIG_SERIO is not set | ||
497 | # CONFIG_GAMEPORT is not set | ||
498 | |||
499 | # | ||
500 | # Character devices | ||
501 | # | ||
502 | CONFIG_VT=y | ||
503 | CONFIG_VT_CONSOLE=y | ||
504 | CONFIG_HW_CONSOLE=y | ||
505 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
506 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
507 | |||
508 | # | ||
509 | # Serial drivers | ||
510 | # | ||
511 | CONFIG_SERIAL_8250=y | ||
512 | CONFIG_SERIAL_8250_CONSOLE=y | ||
513 | CONFIG_SERIAL_8250_NR_UARTS=4 | ||
514 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | ||
515 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
516 | |||
517 | # | ||
518 | # Non-8250 serial port support | ||
519 | # | ||
520 | CONFIG_SERIAL_CORE=y | ||
521 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
522 | CONFIG_UNIX98_PTYS=y | ||
523 | CONFIG_LEGACY_PTYS=y | ||
524 | CONFIG_LEGACY_PTY_COUNT=16 | ||
525 | |||
526 | # | ||
527 | # IPMI | ||
528 | # | ||
529 | # CONFIG_IPMI_HANDLER is not set | ||
530 | # CONFIG_WATCHDOG is not set | ||
531 | CONFIG_HW_RANDOM=y | ||
532 | # CONFIG_NVRAM is not set | ||
533 | # CONFIG_R3964 is not set | ||
534 | # CONFIG_RAW_DRIVER is not set | ||
535 | |||
536 | # | ||
537 | # TPM devices | ||
538 | # | ||
539 | # CONFIG_TCG_TPM is not set | ||
540 | # CONFIG_I2C is not set | ||
541 | |||
542 | # | ||
543 | # SPI support | ||
544 | # | ||
545 | CONFIG_SPI=y | ||
546 | CONFIG_SPI_MASTER=y | ||
547 | |||
548 | # | ||
549 | # SPI Master Controller Drivers | ||
550 | # | ||
551 | CONFIG_SPI_BITBANG=y | ||
552 | CONFIG_SPI_OMAP_UWIRE=y | ||
553 | |||
554 | # | ||
555 | # SPI Protocol Masters | ||
556 | # | ||
557 | # CONFIG_SPI_AT25 is not set | ||
558 | # CONFIG_SPI_TSC2101 is not set | ||
559 | # CONFIG_SPI_TSC2102 is not set | ||
560 | # CONFIG_SPI_TSC210X is not set | ||
561 | # CONFIG_SPI_TSC2301 is not set | ||
562 | # CONFIG_SPI_SPIDEV is not set | ||
563 | |||
564 | # | ||
565 | # Dallas's 1-wire bus | ||
566 | # | ||
567 | # CONFIG_W1 is not set | ||
568 | CONFIG_HWMON=y | ||
569 | # CONFIG_HWMON_VID is not set | ||
570 | # CONFIG_SENSORS_ABITUGURU is not set | ||
571 | # CONFIG_SENSORS_F71805F is not set | ||
572 | # CONFIG_SENSORS_LM70 is not set | ||
573 | # CONFIG_SENSORS_PC87427 is not set | ||
574 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
575 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
576 | # CONFIG_SENSORS_VT1211 is not set | ||
577 | # CONFIG_SENSORS_W83627HF is not set | ||
578 | # CONFIG_SENSORS_TSC210X is not set | ||
579 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
580 | |||
581 | # | ||
582 | # Misc devices | ||
583 | # | ||
584 | # CONFIG_BLINK is not set | ||
585 | |||
586 | # | ||
587 | # Multifunction device drivers | ||
588 | # | ||
589 | # CONFIG_MFD_SM501 is not set | ||
590 | |||
591 | # | ||
592 | # LED devices | ||
593 | # | ||
594 | # CONFIG_NEW_LEDS is not set | ||
595 | |||
596 | # | ||
597 | # LED drivers | ||
598 | # | ||
599 | |||
600 | # | ||
601 | # LED Triggers | ||
602 | # | ||
603 | |||
604 | # | ||
605 | # Multimedia devices | ||
606 | # | ||
607 | # CONFIG_VIDEO_DEV is not set | ||
608 | # CONFIG_DVB_CORE is not set | ||
609 | CONFIG_DAB=y | ||
610 | |||
611 | # | ||
612 | # Graphics support | ||
613 | # | ||
614 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
615 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
616 | CONFIG_LCD_CLASS_DEVICE=y | ||
617 | CONFIG_BACKLIGHT_OMAP=y | ||
618 | |||
619 | # | ||
620 | # Display device support | ||
621 | # | ||
622 | # CONFIG_DISPLAY_SUPPORT is not set | ||
623 | # CONFIG_VGASTATE is not set | ||
624 | CONFIG_FB=y | ||
625 | CONFIG_FIRMWARE_EDID=y | ||
626 | # CONFIG_FB_DDC is not set | ||
627 | # CONFIG_FB_CFB_FILLRECT is not set | ||
628 | # CONFIG_FB_CFB_COPYAREA is not set | ||
629 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
630 | # CONFIG_FB_SYS_FILLRECT is not set | ||
631 | # CONFIG_FB_SYS_COPYAREA is not set | ||
632 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
633 | # CONFIG_FB_SYS_FOPS is not set | ||
634 | CONFIG_FB_DEFERRED_IO=y | ||
635 | # CONFIG_FB_SVGALIB is not set | ||
636 | # CONFIG_FB_MACMODES is not set | ||
637 | # CONFIG_FB_BACKLIGHT is not set | ||
638 | # CONFIG_FB_MODE_HELPERS is not set | ||
639 | # CONFIG_FB_TILEBLITTING is not set | ||
640 | |||
641 | # | ||
642 | # Frame buffer hardware drivers | ||
643 | # | ||
644 | # CONFIG_FB_S1D13XXX is not set | ||
645 | CONFIG_FB_OMAP=y | ||
646 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
647 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
648 | # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set | ||
649 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
650 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
651 | # CONFIG_FB_VIRTUAL is not set | ||
652 | |||
653 | # | ||
654 | # Console display driver support | ||
655 | # | ||
656 | # CONFIG_VGA_CONSOLE is not set | ||
657 | CONFIG_DUMMY_CONSOLE=y | ||
658 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
659 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
660 | # CONFIG_FONTS is not set | ||
661 | CONFIG_FONT_8x8=y | ||
662 | CONFIG_FONT_8x16=y | ||
663 | # CONFIG_LOGO is not set | ||
664 | |||
665 | # | ||
666 | # Sound | ||
667 | # | ||
668 | # CONFIG_SOUND is not set | ||
669 | |||
670 | # | ||
671 | # HID Devices | ||
672 | # | ||
673 | CONFIG_HID=y | ||
674 | # CONFIG_HID_DEBUG is not set | ||
675 | |||
676 | # | ||
677 | # USB support | ||
678 | # | ||
679 | CONFIG_USB_ARCH_HAS_HCD=y | ||
680 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
681 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
682 | # CONFIG_USB is not set | ||
683 | |||
684 | # | ||
685 | # Enable Host or Gadget support to see Inventra options | ||
686 | # | ||
687 | |||
688 | # | ||
689 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
690 | # | ||
691 | |||
692 | # | ||
693 | # USB Gadget Support | ||
694 | # | ||
695 | # CONFIG_USB_GADGET is not set | ||
696 | CONFIG_MMC=y | ||
697 | # CONFIG_MMC_DEBUG is not set | ||
698 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
699 | |||
700 | # | ||
701 | # MMC/SD Card Drivers | ||
702 | # | ||
703 | CONFIG_MMC_BLOCK=y | ||
704 | |||
705 | # | ||
706 | # MMC/SD Host Controller Drivers | ||
707 | # | ||
708 | CONFIG_MMC_OMAP=y | ||
709 | |||
710 | # | ||
711 | # Real Time Clock | ||
712 | # | ||
713 | CONFIG_RTC_LIB=y | ||
714 | CONFIG_RTC_CLASS=y | ||
715 | CONFIG_RTC_HCTOSYS=y | ||
716 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
717 | # CONFIG_RTC_DEBUG is not set | ||
718 | |||
719 | # | ||
720 | # RTC interfaces | ||
721 | # | ||
722 | CONFIG_RTC_INTF_SYSFS=y | ||
723 | CONFIG_RTC_INTF_PROC=y | ||
724 | CONFIG_RTC_INTF_DEV=y | ||
725 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
726 | # CONFIG_RTC_DRV_TEST is not set | ||
727 | |||
728 | # | ||
729 | # I2C RTC drivers | ||
730 | # | ||
731 | |||
732 | # | ||
733 | # SPI RTC drivers | ||
734 | # | ||
735 | # CONFIG_RTC_DRV_RS5C348 is not set | ||
736 | # CONFIG_RTC_DRV_MAX6902 is not set | ||
737 | |||
738 | # | ||
739 | # Platform RTC drivers | ||
740 | # | ||
741 | # CONFIG_RTC_DRV_CMOS is not set | ||
742 | # CONFIG_RTC_DRV_DS1553 is not set | ||
743 | # CONFIG_RTC_DRV_DS1742 is not set | ||
744 | # CONFIG_RTC_DRV_M48T86 is not set | ||
745 | # CONFIG_RTC_DRV_V3020 is not set | ||
746 | |||
747 | # | ||
748 | # on-CPU RTC drivers | ||
749 | # | ||
750 | CONFIG_RTC_DRV_OMAP=y | ||
751 | |||
752 | # | ||
753 | # CBUS support | ||
754 | # | ||
755 | # CONFIG_CBUS is not set | ||
756 | |||
757 | # | ||
758 | # File systems | ||
759 | # | ||
760 | CONFIG_EXT2_FS=y | ||
761 | # CONFIG_EXT2_FS_XATTR is not set | ||
762 | # CONFIG_EXT2_FS_XIP is not set | ||
763 | # CONFIG_EXT3_FS is not set | ||
764 | # CONFIG_EXT4DEV_FS is not set | ||
765 | # CONFIG_REISERFS_FS is not set | ||
766 | # CONFIG_JFS_FS is not set | ||
767 | # CONFIG_FS_POSIX_ACL is not set | ||
768 | # CONFIG_XFS_FS is not set | ||
769 | # CONFIG_GFS2_FS is not set | ||
770 | # CONFIG_OCFS2_FS is not set | ||
771 | # CONFIG_MINIX_FS is not set | ||
772 | # CONFIG_ROMFS_FS is not set | ||
773 | # CONFIG_INOTIFY is not set | ||
774 | # CONFIG_QUOTA is not set | ||
775 | CONFIG_DNOTIFY=y | ||
776 | # CONFIG_AUTOFS_FS is not set | ||
777 | # CONFIG_AUTOFS4_FS is not set | ||
778 | # CONFIG_FUSE_FS is not set | ||
779 | |||
780 | # | ||
781 | # CD-ROM/DVD Filesystems | ||
782 | # | ||
783 | # CONFIG_ISO9660_FS is not set | ||
784 | # CONFIG_UDF_FS is not set | ||
785 | |||
786 | # | ||
787 | # DOS/FAT/NT Filesystems | ||
788 | # | ||
789 | # CONFIG_MSDOS_FS is not set | ||
790 | # CONFIG_VFAT_FS is not set | ||
791 | # CONFIG_NTFS_FS is not set | ||
792 | |||
793 | # | ||
794 | # Pseudo filesystems | ||
795 | # | ||
796 | CONFIG_PROC_FS=y | ||
797 | CONFIG_PROC_SYSCTL=y | ||
798 | CONFIG_SYSFS=y | ||
799 | # CONFIG_TMPFS is not set | ||
800 | # CONFIG_HUGETLB_PAGE is not set | ||
801 | CONFIG_RAMFS=y | ||
802 | # CONFIG_CONFIGFS_FS is not set | ||
803 | |||
804 | # | ||
805 | # Miscellaneous filesystems | ||
806 | # | ||
807 | # CONFIG_ADFS_FS is not set | ||
808 | # CONFIG_AFFS_FS is not set | ||
809 | # CONFIG_HFS_FS is not set | ||
810 | # CONFIG_HFSPLUS_FS is not set | ||
811 | # CONFIG_BEFS_FS is not set | ||
812 | # CONFIG_BFS_FS is not set | ||
813 | # CONFIG_EFS_FS is not set | ||
814 | # CONFIG_CRAMFS is not set | ||
815 | # CONFIG_VXFS_FS is not set | ||
816 | # CONFIG_HPFS_FS is not set | ||
817 | # CONFIG_QNX4FS_FS is not set | ||
818 | # CONFIG_SYSV_FS is not set | ||
819 | # CONFIG_UFS_FS is not set | ||
820 | |||
821 | # | ||
822 | # Network File Systems | ||
823 | # | ||
824 | # CONFIG_NFS_FS is not set | ||
825 | # CONFIG_NFSD is not set | ||
826 | # CONFIG_SMB_FS is not set | ||
827 | # CONFIG_CIFS is not set | ||
828 | # CONFIG_NCP_FS is not set | ||
829 | # CONFIG_CODA_FS is not set | ||
830 | # CONFIG_AFS_FS is not set | ||
831 | # CONFIG_9P_FS is not set | ||
832 | |||
833 | # | ||
834 | # Partition Types | ||
835 | # | ||
836 | # CONFIG_PARTITION_ADVANCED is not set | ||
837 | CONFIG_MSDOS_PARTITION=y | ||
838 | |||
839 | # | ||
840 | # Native Language Support | ||
841 | # | ||
842 | # CONFIG_NLS is not set | ||
843 | |||
844 | # | ||
845 | # Distributed Lock Manager | ||
846 | # | ||
847 | # CONFIG_DLM is not set | ||
848 | |||
849 | # | ||
850 | # Profiling support | ||
851 | # | ||
852 | # CONFIG_PROFILING is not set | ||
853 | |||
854 | # | ||
855 | # Kernel hacking | ||
856 | # | ||
857 | # CONFIG_PRINTK_TIME is not set | ||
858 | CONFIG_ENABLE_MUST_CHECK=y | ||
859 | # CONFIG_MAGIC_SYSRQ is not set | ||
860 | # CONFIG_UNUSED_SYMBOLS is not set | ||
861 | # CONFIG_DEBUG_FS is not set | ||
862 | # CONFIG_HEADERS_CHECK is not set | ||
863 | # CONFIG_DEBUG_KERNEL is not set | ||
864 | CONFIG_DEBUG_BUGVERBOSE=y | ||
865 | CONFIG_FRAME_POINTER=y | ||
866 | # CONFIG_DEBUG_USER is not set | ||
867 | |||
868 | # | ||
869 | # Security options | ||
870 | # | ||
871 | # CONFIG_KEYS is not set | ||
872 | # CONFIG_SECURITY is not set | ||
873 | |||
874 | # | ||
875 | # Cryptographic options | ||
876 | # | ||
877 | # CONFIG_CRYPTO is not set | ||
878 | |||
879 | # | ||
880 | # Library routines | ||
881 | # | ||
882 | CONFIG_BITREVERSE=y | ||
883 | CONFIG_CRC_CCITT=y | ||
884 | CONFIG_CRC16=y | ||
885 | # CONFIG_CRC_ITU_T is not set | ||
886 | CONFIG_CRC32=y | ||
887 | CONFIG_LIBCRC32C=y | ||
888 | CONFIG_PLIST=y | ||
889 | CONFIG_HAS_IOMEM=y | ||
890 | CONFIG_HAS_IOPORT=y | ||
891 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/configs/sx1_defconfig b/arch/arm/configs/sx1_defconfig new file mode 100644 index 000000000000..853dcdd9f2e0 --- /dev/null +++ b/arch/arm/configs/sx1_defconfig | |||
@@ -0,0 +1,1118 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.22-rc1-omap1 | ||
4 | # Thu Jun 7 05:16:10 2007 | ||
5 | # | ||
6 | CONFIG_ARM=y | ||
7 | CONFIG_SYS_SUPPORTS_APM_EMULATION=y | ||
8 | CONFIG_GENERIC_GPIO=y | ||
9 | CONFIG_GENERIC_TIME=y | ||
10 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
11 | CONFIG_MMU=y | ||
12 | # CONFIG_NO_IOPORT is not set | ||
13 | CONFIG_GENERIC_HARDIRQS=y | ||
14 | CONFIG_STACKTRACE_SUPPORT=y | ||
15 | CONFIG_LOCKDEP_SUPPORT=y | ||
16 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
17 | CONFIG_HARDIRQS_SW_RESEND=y | ||
18 | CONFIG_GENERIC_IRQ_PROBE=y | ||
19 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
21 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
22 | CONFIG_GENERIC_HWEIGHT=y | ||
23 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
24 | CONFIG_ZONE_DMA=y | ||
25 | CONFIG_VECTORS_BASE=0xffff0000 | ||
26 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
27 | |||
28 | # | ||
29 | # Code maturity level options | ||
30 | # | ||
31 | CONFIG_EXPERIMENTAL=y | ||
32 | CONFIG_BROKEN_ON_SMP=y | ||
33 | CONFIG_LOCK_KERNEL=y | ||
34 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
35 | |||
36 | # | ||
37 | # General setup | ||
38 | # | ||
39 | CONFIG_LOCALVERSION="" | ||
40 | CONFIG_LOCALVERSION_AUTO=y | ||
41 | CONFIG_SWAP=y | ||
42 | CONFIG_SYSVIPC=y | ||
43 | # CONFIG_IPC_NS is not set | ||
44 | CONFIG_SYSVIPC_SYSCTL=y | ||
45 | CONFIG_POSIX_MQUEUE=y | ||
46 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
47 | # CONFIG_TASKSTATS is not set | ||
48 | # CONFIG_UTS_NS is not set | ||
49 | # CONFIG_AUDIT is not set | ||
50 | CONFIG_IKCONFIG=y | ||
51 | # CONFIG_IKCONFIG_PROC is not set | ||
52 | CONFIG_LOG_BUF_SHIFT=14 | ||
53 | CONFIG_SYSFS_DEPRECATED=y | ||
54 | # CONFIG_RELAY is not set | ||
55 | # CONFIG_BLK_DEV_INITRD is not set | ||
56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
57 | CONFIG_SYSCTL=y | ||
58 | CONFIG_EMBEDDED=y | ||
59 | CONFIG_UID16=y | ||
60 | CONFIG_SYSCTL_SYSCALL=y | ||
61 | # CONFIG_KALLSYMS is not set | ||
62 | CONFIG_HOTPLUG=y | ||
63 | CONFIG_PRINTK=y | ||
64 | CONFIG_BUG=y | ||
65 | # CONFIG_ELF_CORE is not set | ||
66 | # CONFIG_BASE_FULL is not set | ||
67 | CONFIG_FUTEX=y | ||
68 | CONFIG_ANON_INODES=y | ||
69 | CONFIG_EPOLL=y | ||
70 | CONFIG_SIGNALFD=y | ||
71 | CONFIG_TIMERFD=y | ||
72 | CONFIG_EVENTFD=y | ||
73 | # CONFIG_SHMEM is not set | ||
74 | # CONFIG_VM_EVENT_COUNTERS is not set | ||
75 | # CONFIG_SLAB is not set | ||
76 | # CONFIG_SLUB is not set | ||
77 | CONFIG_SLOB=y | ||
78 | CONFIG_RT_MUTEXES=y | ||
79 | CONFIG_TINY_SHMEM=y | ||
80 | CONFIG_BASE_SMALL=1 | ||
81 | |||
82 | # | ||
83 | # Loadable module support | ||
84 | # | ||
85 | CONFIG_MODULES=y | ||
86 | CONFIG_MODULE_UNLOAD=y | ||
87 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
88 | # CONFIG_MODVERSIONS is not set | ||
89 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
90 | CONFIG_KMOD=y | ||
91 | |||
92 | # | ||
93 | # Block layer | ||
94 | # | ||
95 | CONFIG_BLOCK=y | ||
96 | # CONFIG_LBD is not set | ||
97 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
98 | # CONFIG_LSF is not set | ||
99 | |||
100 | # | ||
101 | # IO Schedulers | ||
102 | # | ||
103 | CONFIG_IOSCHED_NOOP=y | ||
104 | # CONFIG_IOSCHED_AS is not set | ||
105 | CONFIG_IOSCHED_DEADLINE=y | ||
106 | # CONFIG_IOSCHED_CFQ is not set | ||
107 | # CONFIG_DEFAULT_AS is not set | ||
108 | CONFIG_DEFAULT_DEADLINE=y | ||
109 | # CONFIG_DEFAULT_CFQ is not set | ||
110 | # CONFIG_DEFAULT_NOOP is not set | ||
111 | CONFIG_DEFAULT_IOSCHED="deadline" | ||
112 | |||
113 | # | ||
114 | # System Type | ||
115 | # | ||
116 | # CONFIG_ARCH_AAEC2000 is not set | ||
117 | # CONFIG_ARCH_INTEGRATOR is not set | ||
118 | # CONFIG_ARCH_REALVIEW is not set | ||
119 | # CONFIG_ARCH_VERSATILE is not set | ||
120 | # CONFIG_ARCH_AT91 is not set | ||
121 | # CONFIG_ARCH_CLPS7500 is not set | ||
122 | # CONFIG_ARCH_CLPS711X is not set | ||
123 | # CONFIG_ARCH_CO285 is not set | ||
124 | # CONFIG_ARCH_EBSA110 is not set | ||
125 | # CONFIG_ARCH_EP93XX is not set | ||
126 | # CONFIG_ARCH_FOOTBRIDGE is not set | ||
127 | # CONFIG_ARCH_NETX is not set | ||
128 | # CONFIG_ARCH_H720X is not set | ||
129 | # CONFIG_ARCH_IMX is not set | ||
130 | # CONFIG_ARCH_IOP13XX is not set | ||
131 | # CONFIG_ARCH_IOP32X is not set | ||
132 | # CONFIG_ARCH_IOP33X is not set | ||
133 | # CONFIG_ARCH_IXP23XX is not set | ||
134 | # CONFIG_ARCH_IXP2000 is not set | ||
135 | # CONFIG_ARCH_IXP4XX is not set | ||
136 | # CONFIG_ARCH_L7200 is not set | ||
137 | # CONFIG_ARCH_KS8695 is not set | ||
138 | # CONFIG_ARCH_NS9XXX is not set | ||
139 | # CONFIG_ARCH_PNX4008 is not set | ||
140 | # CONFIG_ARCH_PXA is not set | ||
141 | # CONFIG_ARCH_RPC is not set | ||
142 | # CONFIG_ARCH_SA1100 is not set | ||
143 | # CONFIG_ARCH_S3C2410 is not set | ||
144 | # CONFIG_ARCH_SHARK is not set | ||
145 | # CONFIG_ARCH_LH7A40X is not set | ||
146 | # CONFIG_ARCH_DAVINCI is not set | ||
147 | CONFIG_ARCH_OMAP=y | ||
148 | |||
149 | # | ||
150 | # TI OMAP Implementations | ||
151 | # | ||
152 | CONFIG_ARCH_OMAP1=y | ||
153 | # CONFIG_ARCH_OMAP2 is not set | ||
154 | |||
155 | # | ||
156 | # OMAP Feature Selections | ||
157 | # | ||
158 | # CONFIG_OMAP_RESET_CLOCKS is not set | ||
159 | CONFIG_OMAP_BOOT_TAG=y | ||
160 | # CONFIG_OMAP_BOOT_REASON is not set | ||
161 | # CONFIG_OMAP_COMPONENT_VERSION is not set | ||
162 | CONFIG_OMAP_GPIO_SWITCH=y | ||
163 | CONFIG_OMAP_MUX=y | ||
164 | # CONFIG_OMAP_MUX_DEBUG is not set | ||
165 | CONFIG_OMAP_MUX_WARNINGS=y | ||
166 | CONFIG_OMAP_MCBSP=y | ||
167 | CONFIG_OMAP_MMU_FWK=y | ||
168 | CONFIG_OMAP_MBOX_FWK=y | ||
169 | CONFIG_OMAP_MPU_TIMER=y | ||
170 | # CONFIG_OMAP_32K_TIMER is not set | ||
171 | # CONFIG_OMAP_LL_DEBUG_UART1 is not set | ||
172 | # CONFIG_OMAP_LL_DEBUG_UART2 is not set | ||
173 | CONFIG_OMAP_LL_DEBUG_UART3=y | ||
174 | # CONFIG_OMAP_LL_DEBUG_LCD is not set | ||
175 | CONFIG_OMAP_SERIAL_WAKE=y | ||
176 | CONFIG_OMAP_DSP=y | ||
177 | # CONFIG_OMAP_DSP_MBCMD_VERBOSE is not set | ||
178 | # CONFIG_OMAP_DSP_TASK_MULTIOPEN is not set | ||
179 | # CONFIG_OMAP_DSP_FBEXPORT is not set | ||
180 | |||
181 | # | ||
182 | # OMAP Core Type | ||
183 | # | ||
184 | # CONFIG_ARCH_OMAP730 is not set | ||
185 | CONFIG_ARCH_OMAP15XX=y | ||
186 | # CONFIG_ARCH_OMAP16XX is not set | ||
187 | |||
188 | # | ||
189 | # OMAP Board Type | ||
190 | # | ||
191 | # CONFIG_MACH_OMAP_INNOVATOR is not set | ||
192 | # CONFIG_MACH_VOICEBLUE is not set | ||
193 | # CONFIG_MACH_OMAP_PALMTE is not set | ||
194 | # CONFIG_MACH_OMAP_PALMZ71 is not set | ||
195 | # CONFIG_MACH_OMAP_PALMTT is not set | ||
196 | CONFIG_MACH_SX1=y | ||
197 | # CONFIG_MACH_AMS_DELTA is not set | ||
198 | # CONFIG_MACH_OMAP_GENERIC is not set | ||
199 | |||
200 | # | ||
201 | # OMAP CPU Speed | ||
202 | # | ||
203 | # CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER is not set | ||
204 | CONFIG_OMAP_ARM_168MHZ=y | ||
205 | # CONFIG_OMAP_ARM_150MHZ is not set | ||
206 | # CONFIG_OMAP_ARM_120MHZ is not set | ||
207 | # CONFIG_OMAP_ARM_60MHZ is not set | ||
208 | # CONFIG_OMAP_ARM_30MHZ is not set | ||
209 | |||
210 | # | ||
211 | # Processor Type | ||
212 | # | ||
213 | CONFIG_CPU_32=y | ||
214 | CONFIG_CPU_ARM925T=y | ||
215 | CONFIG_CPU_32v4T=y | ||
216 | CONFIG_CPU_ABRT_EV4T=y | ||
217 | CONFIG_CPU_CACHE_V4WT=y | ||
218 | CONFIG_CPU_CACHE_VIVT=y | ||
219 | CONFIG_CPU_COPY_V4WB=y | ||
220 | CONFIG_CPU_TLB_V4WBI=y | ||
221 | CONFIG_CPU_CP15=y | ||
222 | CONFIG_CPU_CP15_MMU=y | ||
223 | |||
224 | # | ||
225 | # Processor Features | ||
226 | # | ||
227 | CONFIG_ARM_THUMB=y | ||
228 | # CONFIG_CPU_ICACHE_DISABLE is not set | ||
229 | # CONFIG_CPU_DCACHE_DISABLE is not set | ||
230 | # CONFIG_CPU_DCACHE_WRITETHROUGH is not set | ||
231 | # CONFIG_OUTER_CACHE is not set | ||
232 | |||
233 | # | ||
234 | # Bus support | ||
235 | # | ||
236 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
237 | |||
238 | # | ||
239 | # PCCARD (PCMCIA/CardBus) support | ||
240 | # | ||
241 | # CONFIG_PCCARD is not set | ||
242 | |||
243 | # | ||
244 | # Kernel Features | ||
245 | # | ||
246 | # CONFIG_TICK_ONESHOT is not set | ||
247 | # CONFIG_NO_HZ is not set | ||
248 | # CONFIG_HIGH_RES_TIMERS is not set | ||
249 | CONFIG_PREEMPT=y | ||
250 | CONFIG_HZ=100 | ||
251 | # CONFIG_AEABI is not set | ||
252 | # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set | ||
253 | CONFIG_SELECT_MEMORY_MODEL=y | ||
254 | CONFIG_FLATMEM_MANUAL=y | ||
255 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
256 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
257 | CONFIG_FLATMEM=y | ||
258 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
259 | # CONFIG_SPARSEMEM_STATIC is not set | ||
260 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | ||
261 | # CONFIG_RESOURCES_64BIT is not set | ||
262 | CONFIG_ZONE_DMA_FLAG=1 | ||
263 | # CONFIG_LEDS is not set | ||
264 | CONFIG_ALIGNMENT_TRAP=y | ||
265 | |||
266 | # | ||
267 | # Boot options | ||
268 | # | ||
269 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
270 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
271 | CONFIG_CMDLINE="" | ||
272 | # CONFIG_XIP_KERNEL is not set | ||
273 | # CONFIG_KEXEC is not set | ||
274 | |||
275 | # | ||
276 | # CPU Frequency scaling | ||
277 | # | ||
278 | # CONFIG_CPU_FREQ is not set | ||
279 | |||
280 | # | ||
281 | # Floating point emulation | ||
282 | # | ||
283 | |||
284 | # | ||
285 | # At least one emulation must be selected | ||
286 | # | ||
287 | CONFIG_FPE_NWFPE=y | ||
288 | # CONFIG_FPE_NWFPE_XP is not set | ||
289 | # CONFIG_FPE_FASTFPE is not set | ||
290 | |||
291 | # | ||
292 | # Userspace binary formats | ||
293 | # | ||
294 | CONFIG_BINFMT_ELF=y | ||
295 | # CONFIG_BINFMT_AOUT is not set | ||
296 | CONFIG_BINFMT_MISC=y | ||
297 | # CONFIG_ARTHUR is not set | ||
298 | |||
299 | # | ||
300 | # Power management options | ||
301 | # | ||
302 | # CONFIG_PM is not set | ||
303 | |||
304 | # | ||
305 | # Networking | ||
306 | # | ||
307 | CONFIG_NET=y | ||
308 | |||
309 | # | ||
310 | # Networking options | ||
311 | # | ||
312 | CONFIG_PACKET=y | ||
313 | CONFIG_PACKET_MMAP=y | ||
314 | CONFIG_UNIX=y | ||
315 | # CONFIG_NET_KEY is not set | ||
316 | CONFIG_INET=y | ||
317 | # CONFIG_IP_MULTICAST is not set | ||
318 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
319 | CONFIG_IP_FIB_HASH=y | ||
320 | CONFIG_IP_PNP=y | ||
321 | # CONFIG_IP_PNP_DHCP is not set | ||
322 | # CONFIG_IP_PNP_BOOTP is not set | ||
323 | # CONFIG_IP_PNP_RARP is not set | ||
324 | # CONFIG_NET_IPIP is not set | ||
325 | # CONFIG_NET_IPGRE is not set | ||
326 | # CONFIG_ARPD is not set | ||
327 | # CONFIG_SYN_COOKIES is not set | ||
328 | # CONFIG_INET_AH is not set | ||
329 | # CONFIG_INET_ESP is not set | ||
330 | # CONFIG_INET_IPCOMP is not set | ||
331 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
332 | # CONFIG_INET_TUNNEL is not set | ||
333 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
334 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
335 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
336 | # CONFIG_INET_DIAG is not set | ||
337 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
338 | CONFIG_TCP_CONG_CUBIC=y | ||
339 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
340 | # CONFIG_TCP_MD5SIG is not set | ||
341 | # CONFIG_IPV6 is not set | ||
342 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
343 | # CONFIG_INET6_TUNNEL is not set | ||
344 | # CONFIG_NETWORK_SECMARK is not set | ||
345 | # CONFIG_NETFILTER is not set | ||
346 | |||
347 | # | ||
348 | # DCCP Configuration (EXPERIMENTAL) | ||
349 | # | ||
350 | # CONFIG_IP_DCCP is not set | ||
351 | |||
352 | # | ||
353 | # SCTP Configuration (EXPERIMENTAL) | ||
354 | # | ||
355 | # CONFIG_IP_SCTP is not set | ||
356 | |||
357 | # | ||
358 | # TIPC Configuration (EXPERIMENTAL) | ||
359 | # | ||
360 | # CONFIG_TIPC is not set | ||
361 | # CONFIG_ATM is not set | ||
362 | # CONFIG_BRIDGE is not set | ||
363 | # CONFIG_VLAN_8021Q is not set | ||
364 | # CONFIG_DECNET is not set | ||
365 | # CONFIG_LLC2 is not set | ||
366 | # CONFIG_IPX is not set | ||
367 | # CONFIG_ATALK is not set | ||
368 | # CONFIG_X25 is not set | ||
369 | # CONFIG_LAPB is not set | ||
370 | # CONFIG_ECONET is not set | ||
371 | # CONFIG_WAN_ROUTER is not set | ||
372 | |||
373 | # | ||
374 | # QoS and/or fair queueing | ||
375 | # | ||
376 | # CONFIG_NET_SCHED is not set | ||
377 | |||
378 | # | ||
379 | # Network testing | ||
380 | # | ||
381 | # CONFIG_NET_PKTGEN is not set | ||
382 | # CONFIG_HAMRADIO is not set | ||
383 | # CONFIG_IRDA is not set | ||
384 | # CONFIG_BT is not set | ||
385 | # CONFIG_AF_RXRPC is not set | ||
386 | |||
387 | # | ||
388 | # Wireless | ||
389 | # | ||
390 | # CONFIG_CFG80211 is not set | ||
391 | # CONFIG_WIRELESS_EXT is not set | ||
392 | # CONFIG_MAC80211 is not set | ||
393 | # CONFIG_IEEE80211 is not set | ||
394 | # CONFIG_RFKILL is not set | ||
395 | |||
396 | # | ||
397 | # Device Drivers | ||
398 | # | ||
399 | |||
400 | # | ||
401 | # Generic Driver Options | ||
402 | # | ||
403 | CONFIG_STANDALONE=y | ||
404 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
405 | # CONFIG_FW_LOADER is not set | ||
406 | # CONFIG_DEBUG_DRIVER is not set | ||
407 | # CONFIG_DEBUG_DEVRES is not set | ||
408 | # CONFIG_SYS_HYPERVISOR is not set | ||
409 | |||
410 | # | ||
411 | # Connector - unified userspace <-> kernelspace linker | ||
412 | # | ||
413 | CONFIG_CONNECTOR=y | ||
414 | # CONFIG_PROC_EVENTS is not set | ||
415 | # CONFIG_MTD is not set | ||
416 | |||
417 | # | ||
418 | # Parallel port support | ||
419 | # | ||
420 | # CONFIG_PARPORT is not set | ||
421 | |||
422 | # | ||
423 | # Plug and Play support | ||
424 | # | ||
425 | # CONFIG_PNPACPI is not set | ||
426 | |||
427 | # | ||
428 | # Block devices | ||
429 | # | ||
430 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
431 | CONFIG_BLK_DEV_LOOP=m | ||
432 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
433 | # CONFIG_BLK_DEV_NBD is not set | ||
434 | CONFIG_BLK_DEV_RAM=m | ||
435 | CONFIG_BLK_DEV_RAM_COUNT=2 | ||
436 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
437 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
438 | # CONFIG_CDROM_PKTCDVD is not set | ||
439 | # CONFIG_ATA_OVER_ETH is not set | ||
440 | |||
441 | # | ||
442 | # SCSI device support | ||
443 | # | ||
444 | # CONFIG_RAID_ATTRS is not set | ||
445 | # CONFIG_SCSI is not set | ||
446 | # CONFIG_SCSI_NETLINK is not set | ||
447 | # CONFIG_ATA is not set | ||
448 | |||
449 | # | ||
450 | # Multi-device support (RAID and LVM) | ||
451 | # | ||
452 | # CONFIG_MD is not set | ||
453 | |||
454 | # | ||
455 | # Network device support | ||
456 | # | ||
457 | CONFIG_NETDEVICES=y | ||
458 | # CONFIG_DUMMY is not set | ||
459 | # CONFIG_BONDING is not set | ||
460 | # CONFIG_EQUALIZER is not set | ||
461 | # CONFIG_TUN is not set | ||
462 | CONFIG_PHYLIB=y | ||
463 | |||
464 | # | ||
465 | # MII PHY device drivers | ||
466 | # | ||
467 | # CONFIG_MARVELL_PHY is not set | ||
468 | # CONFIG_DAVICOM_PHY is not set | ||
469 | # CONFIG_QSEMI_PHY is not set | ||
470 | # CONFIG_LXT_PHY is not set | ||
471 | # CONFIG_CICADA_PHY is not set | ||
472 | # CONFIG_VITESSE_PHY is not set | ||
473 | # CONFIG_SMSC_PHY is not set | ||
474 | # CONFIG_BROADCOM_PHY is not set | ||
475 | # CONFIG_FIXED_PHY is not set | ||
476 | |||
477 | # | ||
478 | # Ethernet (10 or 100Mbit) | ||
479 | # | ||
480 | CONFIG_NET_ETHERNET=y | ||
481 | CONFIG_MII=y | ||
482 | # CONFIG_SMC91X is not set | ||
483 | # CONFIG_DM9000 is not set | ||
484 | CONFIG_NETDEV_1000=y | ||
485 | CONFIG_NETDEV_10000=y | ||
486 | |||
487 | # | ||
488 | # Token Ring devices | ||
489 | # | ||
490 | |||
491 | # | ||
492 | # Wireless LAN | ||
493 | # | ||
494 | # CONFIG_WLAN_PRE80211 is not set | ||
495 | # CONFIG_WLAN_80211 is not set | ||
496 | # CONFIG_WAN is not set | ||
497 | # CONFIG_PPP is not set | ||
498 | # CONFIG_SLIP is not set | ||
499 | # CONFIG_SHAPER is not set | ||
500 | # CONFIG_NETCONSOLE is not set | ||
501 | # CONFIG_NETPOLL is not set | ||
502 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
503 | |||
504 | # | ||
505 | # ISDN subsystem | ||
506 | # | ||
507 | # CONFIG_ISDN is not set | ||
508 | |||
509 | # | ||
510 | # Input device support | ||
511 | # | ||
512 | CONFIG_INPUT=y | ||
513 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
514 | |||
515 | # | ||
516 | # Userland interfaces | ||
517 | # | ||
518 | # CONFIG_INPUT_MOUSEDEV is not set | ||
519 | # CONFIG_INPUT_JOYDEV is not set | ||
520 | # CONFIG_INPUT_TSDEV is not set | ||
521 | CONFIG_INPUT_EVDEV=y | ||
522 | # CONFIG_INPUT_EVBUG is not set | ||
523 | |||
524 | # | ||
525 | # Input Device Drivers | ||
526 | # | ||
527 | CONFIG_INPUT_KEYBOARD=y | ||
528 | # CONFIG_KEYBOARD_ATKBD is not set | ||
529 | # CONFIG_KEYBOARD_SUNKBD is not set | ||
530 | # CONFIG_KEYBOARD_LKKBD is not set | ||
531 | # CONFIG_KEYBOARD_XTKBD is not set | ||
532 | # CONFIG_KEYBOARD_NEWTON is not set | ||
533 | # CONFIG_KEYBOARD_STOWAWAY is not set | ||
534 | CONFIG_KEYBOARD_OMAP=y | ||
535 | # CONFIG_KEYBOARD_GPIO is not set | ||
536 | # CONFIG_INPUT_MOUSE is not set | ||
537 | # CONFIG_INPUT_JOYSTICK is not set | ||
538 | # CONFIG_INPUT_TABLET is not set | ||
539 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
540 | # CONFIG_INPUT_MISC is not set | ||
541 | |||
542 | # | ||
543 | # Hardware I/O ports | ||
544 | # | ||
545 | # CONFIG_SERIO is not set | ||
546 | # CONFIG_GAMEPORT is not set | ||
547 | |||
548 | # | ||
549 | # Character devices | ||
550 | # | ||
551 | CONFIG_VT=y | ||
552 | CONFIG_VT_CONSOLE=y | ||
553 | CONFIG_HW_CONSOLE=y | ||
554 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
555 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
556 | |||
557 | # | ||
558 | # Serial drivers | ||
559 | # | ||
560 | CONFIG_SERIAL_8250=y | ||
561 | # CONFIG_SERIAL_8250_CONSOLE is not set | ||
562 | CONFIG_SERIAL_8250_NR_UARTS=3 | ||
563 | CONFIG_SERIAL_8250_RUNTIME_UARTS=3 | ||
564 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
565 | |||
566 | # | ||
567 | # Non-8250 serial port support | ||
568 | # | ||
569 | CONFIG_SERIAL_CORE=y | ||
570 | CONFIG_UNIX98_PTYS=y | ||
571 | # CONFIG_LEGACY_PTYS is not set | ||
572 | |||
573 | # | ||
574 | # IPMI | ||
575 | # | ||
576 | # CONFIG_IPMI_HANDLER is not set | ||
577 | # CONFIG_WATCHDOG is not set | ||
578 | # CONFIG_HW_RANDOM is not set | ||
579 | # CONFIG_NVRAM is not set | ||
580 | # CONFIG_R3964 is not set | ||
581 | # CONFIG_RAW_DRIVER is not set | ||
582 | |||
583 | # | ||
584 | # TPM devices | ||
585 | # | ||
586 | # CONFIG_TCG_TPM is not set | ||
587 | CONFIG_I2C=y | ||
588 | CONFIG_I2C_BOARDINFO=y | ||
589 | CONFIG_I2C_CHARDEV=y | ||
590 | |||
591 | # | ||
592 | # I2C Algorithms | ||
593 | # | ||
594 | # CONFIG_I2C_ALGOBIT is not set | ||
595 | # CONFIG_I2C_ALGOPCF is not set | ||
596 | # CONFIG_I2C_ALGOPCA is not set | ||
597 | |||
598 | # | ||
599 | # I2C Hardware Bus support | ||
600 | # | ||
601 | # CONFIG_I2C_GPIO is not set | ||
602 | # CONFIG_I2C_OCORES is not set | ||
603 | CONFIG_I2C_OMAP=y | ||
604 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
605 | # CONFIG_I2C_SIMTEC is not set | ||
606 | # CONFIG_I2C_STUB is not set | ||
607 | |||
608 | # | ||
609 | # Miscellaneous I2C Chip support | ||
610 | # | ||
611 | # CONFIG_SENSORS_DS1337 is not set | ||
612 | # CONFIG_SENSORS_DS1374 is not set | ||
613 | # CONFIG_SENSORS_EEPROM is not set | ||
614 | # CONFIG_SENSORS_PCF8574 is not set | ||
615 | # CONFIG_SENSORS_PCA9539 is not set | ||
616 | # CONFIG_SENSORS_PCF8591 is not set | ||
617 | # CONFIG_TPS65010 is not set | ||
618 | # CONFIG_SENSORS_TLV320AIC23 is not set | ||
619 | # CONFIG_SENSORS_MAX6875 is not set | ||
620 | # CONFIG_I2C_DEBUG_CORE is not set | ||
621 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
622 | # CONFIG_I2C_DEBUG_BUS is not set | ||
623 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
624 | |||
625 | # | ||
626 | # SPI support | ||
627 | # | ||
628 | # CONFIG_SPI is not set | ||
629 | # CONFIG_SPI_MASTER is not set | ||
630 | |||
631 | # | ||
632 | # Dallas's 1-wire bus | ||
633 | # | ||
634 | # CONFIG_W1 is not set | ||
635 | # CONFIG_HWMON is not set | ||
636 | |||
637 | # | ||
638 | # Misc devices | ||
639 | # | ||
640 | # CONFIG_BLINK is not set | ||
641 | |||
642 | # | ||
643 | # Multifunction device drivers | ||
644 | # | ||
645 | # CONFIG_MFD_SM501 is not set | ||
646 | |||
647 | # | ||
648 | # LED devices | ||
649 | # | ||
650 | # CONFIG_NEW_LEDS is not set | ||
651 | |||
652 | # | ||
653 | # LED drivers | ||
654 | # | ||
655 | |||
656 | # | ||
657 | # LED Triggers | ||
658 | # | ||
659 | |||
660 | # | ||
661 | # Multimedia devices | ||
662 | # | ||
663 | # CONFIG_VIDEO_DEV is not set | ||
664 | # CONFIG_DVB_CORE is not set | ||
665 | CONFIG_DAB=y | ||
666 | |||
667 | # | ||
668 | # Graphics support | ||
669 | # | ||
670 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
671 | |||
672 | # | ||
673 | # Display device support | ||
674 | # | ||
675 | # CONFIG_DISPLAY_SUPPORT is not set | ||
676 | # CONFIG_VGASTATE is not set | ||
677 | CONFIG_FB=y | ||
678 | # CONFIG_FIRMWARE_EDID is not set | ||
679 | # CONFIG_FB_DDC is not set | ||
680 | # CONFIG_FB_CFB_FILLRECT is not set | ||
681 | # CONFIG_FB_CFB_COPYAREA is not set | ||
682 | # CONFIG_FB_CFB_IMAGEBLIT is not set | ||
683 | # CONFIG_FB_SYS_FILLRECT is not set | ||
684 | # CONFIG_FB_SYS_COPYAREA is not set | ||
685 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
686 | # CONFIG_FB_SYS_FOPS is not set | ||
687 | CONFIG_FB_DEFERRED_IO=y | ||
688 | # CONFIG_FB_SVGALIB is not set | ||
689 | # CONFIG_FB_MACMODES is not set | ||
690 | # CONFIG_FB_BACKLIGHT is not set | ||
691 | # CONFIG_FB_MODE_HELPERS is not set | ||
692 | # CONFIG_FB_TILEBLITTING is not set | ||
693 | |||
694 | # | ||
695 | # Frame buffer hardware drivers | ||
696 | # | ||
697 | # CONFIG_FB_S1D13XXX is not set | ||
698 | CONFIG_FB_OMAP=y | ||
699 | # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set | ||
700 | # CONFIG_FB_OMAP_LCD_MIPID is not set | ||
701 | CONFIG_FB_OMAP_BOOTLOADER_INIT=y | ||
702 | CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 | ||
703 | # CONFIG_FB_OMAP_DMA_TUNE is not set | ||
704 | # CONFIG_FB_VIRTUAL is not set | ||
705 | |||
706 | # | ||
707 | # Console display driver support | ||
708 | # | ||
709 | # CONFIG_VGA_CONSOLE is not set | ||
710 | CONFIG_DUMMY_CONSOLE=y | ||
711 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
712 | # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set | ||
713 | CONFIG_FONTS=y | ||
714 | # CONFIG_FONT_8x8 is not set | ||
715 | # CONFIG_FONT_8x16 is not set | ||
716 | # CONFIG_FONT_6x11 is not set | ||
717 | # CONFIG_FONT_7x14 is not set | ||
718 | # CONFIG_FONT_PEARL_8x8 is not set | ||
719 | # CONFIG_FONT_ACORN_8x8 is not set | ||
720 | CONFIG_FONT_MINI_4x6=y | ||
721 | # CONFIG_FONT_CLEAN_4x6 is not set | ||
722 | # CONFIG_FONT_CLEAN_5x8 is not set | ||
723 | # CONFIG_FONT_SUN8x16 is not set | ||
724 | # CONFIG_FONT_SUN12x22 is not set | ||
725 | # CONFIG_FONT_10x18 is not set | ||
726 | CONFIG_LOGO=y | ||
727 | # CONFIG_LOGO_LINUX_MONO is not set | ||
728 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
729 | CONFIG_LOGO_LINUX_CLUT224=y | ||
730 | |||
731 | # | ||
732 | # Sound | ||
733 | # | ||
734 | CONFIG_SOUND=y | ||
735 | |||
736 | # | ||
737 | # Advanced Linux Sound Architecture | ||
738 | # | ||
739 | CONFIG_SND=y | ||
740 | CONFIG_SND_TIMER=y | ||
741 | CONFIG_SND_PCM=y | ||
742 | # CONFIG_SND_SEQUENCER is not set | ||
743 | CONFIG_SND_OSSEMUL=y | ||
744 | CONFIG_SND_MIXER_OSS=y | ||
745 | CONFIG_SND_PCM_OSS=y | ||
746 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
747 | # CONFIG_SND_DYNAMIC_MINORS is not set | ||
748 | # CONFIG_SND_SUPPORT_OLD_API is not set | ||
749 | # CONFIG_SND_VERBOSE_PROCFS is not set | ||
750 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
751 | # CONFIG_SND_DEBUG is not set | ||
752 | |||
753 | # | ||
754 | # Generic devices | ||
755 | # | ||
756 | # CONFIG_SND_DUMMY is not set | ||
757 | # CONFIG_SND_MTPAV is not set | ||
758 | # CONFIG_SND_SERIAL_U16550 is not set | ||
759 | # CONFIG_SND_MPU401 is not set | ||
760 | |||
761 | # | ||
762 | # ALSA ARM devices | ||
763 | # | ||
764 | # CONFIG_SND_OMAP_AIC23 is not set | ||
765 | # CONFIG_SND_OMAP_TSC2101 is not set | ||
766 | CONFIG_SND_SX1=y | ||
767 | # CONFIG_SND_OMAP_TSC2102 is not set | ||
768 | # CONFIG_SND_OMAP24XX_EAC is not set | ||
769 | |||
770 | # | ||
771 | # System on Chip audio support | ||
772 | # | ||
773 | # CONFIG_SND_SOC is not set | ||
774 | |||
775 | # | ||
776 | # Open Sound System | ||
777 | # | ||
778 | # CONFIG_SOUND_PRIME is not set | ||
779 | |||
780 | # | ||
781 | # HID Devices | ||
782 | # | ||
783 | CONFIG_HID=y | ||
784 | # CONFIG_HID_DEBUG is not set | ||
785 | |||
786 | # | ||
787 | # USB support | ||
788 | # | ||
789 | CONFIG_USB_ARCH_HAS_HCD=y | ||
790 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
791 | # CONFIG_USB_ARCH_HAS_EHCI is not set | ||
792 | # CONFIG_USB is not set | ||
793 | # CONFIG_USB_MUSB_HDRC is not set | ||
794 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
795 | |||
796 | # | ||
797 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
798 | # | ||
799 | |||
800 | # | ||
801 | # USB Gadget Support | ||
802 | # | ||
803 | CONFIG_USB_GADGET=y | ||
804 | # CONFIG_USB_GADGET_DEBUG_FILES is not set | ||
805 | CONFIG_USB_GADGET_SELECTED=y | ||
806 | # CONFIG_USB_GADGET_FSL_USB2 is not set | ||
807 | # CONFIG_USB_GADGET_NET2280 is not set | ||
808 | # CONFIG_USB_GADGET_PXA2XX is not set | ||
809 | # CONFIG_USB_GADGET_GOKU is not set | ||
810 | # CONFIG_USB_GADGET_LH7A40X is not set | ||
811 | CONFIG_USB_GADGET_OMAP=y | ||
812 | CONFIG_USB_OMAP=y | ||
813 | # CONFIG_USB_GADGET_AT91 is not set | ||
814 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | ||
815 | # CONFIG_USB_GADGET_DUALSPEED is not set | ||
816 | # CONFIG_USB_ZERO is not set | ||
817 | CONFIG_USB_ETH=y | ||
818 | CONFIG_USB_ETH_RNDIS=y | ||
819 | # CONFIG_USB_GADGETFS is not set | ||
820 | # CONFIG_USB_FILE_STORAGE is not set | ||
821 | # CONFIG_USB_G_SERIAL is not set | ||
822 | # CONFIG_USB_MIDI_GADGET is not set | ||
823 | CONFIG_MMC=y | ||
824 | # CONFIG_MMC_DEBUG is not set | ||
825 | # CONFIG_MMC_UNSAFE_RESUME is not set | ||
826 | |||
827 | # | ||
828 | # MMC/SD Card Drivers | ||
829 | # | ||
830 | CONFIG_MMC_BLOCK=y | ||
831 | |||
832 | # | ||
833 | # MMC/SD Host Controller Drivers | ||
834 | # | ||
835 | CONFIG_MMC_OMAP=y | ||
836 | |||
837 | # | ||
838 | # Real Time Clock | ||
839 | # | ||
840 | CONFIG_RTC_LIB=y | ||
841 | CONFIG_RTC_CLASS=y | ||
842 | CONFIG_RTC_HCTOSYS=y | ||
843 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | ||
844 | # CONFIG_RTC_DEBUG is not set | ||
845 | |||
846 | # | ||
847 | # RTC interfaces | ||
848 | # | ||
849 | CONFIG_RTC_INTF_SYSFS=y | ||
850 | CONFIG_RTC_INTF_PROC=y | ||
851 | CONFIG_RTC_INTF_DEV=y | ||
852 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
853 | # CONFIG_RTC_DRV_TEST is not set | ||
854 | |||
855 | # | ||
856 | # I2C RTC drivers | ||
857 | # | ||
858 | # CONFIG_RTC_DRV_DS1307 is not set | ||
859 | # CONFIG_RTC_DRV_DS1672 is not set | ||
860 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
861 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
862 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
863 | # CONFIG_RTC_DRV_X1205 is not set | ||
864 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
865 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
866 | |||
867 | # | ||
868 | # SPI RTC drivers | ||
869 | # | ||
870 | |||
871 | # | ||
872 | # Platform RTC drivers | ||
873 | # | ||
874 | # CONFIG_RTC_DRV_CMOS is not set | ||
875 | # CONFIG_RTC_DRV_DS1553 is not set | ||
876 | # CONFIG_RTC_DRV_DS1742 is not set | ||
877 | # CONFIG_RTC_DRV_M48T86 is not set | ||
878 | # CONFIG_RTC_DRV_V3020 is not set | ||
879 | |||
880 | # | ||
881 | # on-CPU RTC drivers | ||
882 | # | ||
883 | CONFIG_RTC_DRV_OMAP=y | ||
884 | |||
885 | # | ||
886 | # CBUS support | ||
887 | # | ||
888 | # CONFIG_CBUS is not set | ||
889 | |||
890 | # | ||
891 | # File systems | ||
892 | # | ||
893 | CONFIG_EXT2_FS=y | ||
894 | # CONFIG_EXT2_FS_XATTR is not set | ||
895 | # CONFIG_EXT2_FS_XIP is not set | ||
896 | # CONFIG_EXT3_FS is not set | ||
897 | # CONFIG_EXT4DEV_FS is not set | ||
898 | # CONFIG_REISERFS_FS is not set | ||
899 | # CONFIG_JFS_FS is not set | ||
900 | # CONFIG_FS_POSIX_ACL is not set | ||
901 | # CONFIG_XFS_FS is not set | ||
902 | # CONFIG_GFS2_FS is not set | ||
903 | # CONFIG_OCFS2_FS is not set | ||
904 | # CONFIG_MINIX_FS is not set | ||
905 | # CONFIG_ROMFS_FS is not set | ||
906 | CONFIG_INOTIFY=y | ||
907 | CONFIG_INOTIFY_USER=y | ||
908 | # CONFIG_QUOTA is not set | ||
909 | # CONFIG_DNOTIFY is not set | ||
910 | # CONFIG_AUTOFS_FS is not set | ||
911 | # CONFIG_AUTOFS4_FS is not set | ||
912 | # CONFIG_FUSE_FS is not set | ||
913 | |||
914 | # | ||
915 | # CD-ROM/DVD Filesystems | ||
916 | # | ||
917 | # CONFIG_ISO9660_FS is not set | ||
918 | # CONFIG_UDF_FS is not set | ||
919 | |||
920 | # | ||
921 | # DOS/FAT/NT Filesystems | ||
922 | # | ||
923 | CONFIG_FAT_FS=y | ||
924 | CONFIG_MSDOS_FS=y | ||
925 | CONFIG_VFAT_FS=y | ||
926 | CONFIG_FAT_DEFAULT_CODEPAGE=866 | ||
927 | CONFIG_FAT_DEFAULT_IOCHARSET="koi8-r" | ||
928 | # CONFIG_NTFS_FS is not set | ||
929 | |||
930 | # | ||
931 | # Pseudo filesystems | ||
932 | # | ||
933 | CONFIG_PROC_FS=y | ||
934 | CONFIG_PROC_SYSCTL=y | ||
935 | CONFIG_SYSFS=y | ||
936 | CONFIG_TMPFS=y | ||
937 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
938 | # CONFIG_HUGETLB_PAGE is not set | ||
939 | CONFIG_RAMFS=y | ||
940 | # CONFIG_CONFIGFS_FS is not set | ||
941 | |||
942 | # | ||
943 | # Miscellaneous filesystems | ||
944 | # | ||
945 | # CONFIG_ADFS_FS is not set | ||
946 | # CONFIG_AFFS_FS is not set | ||
947 | # CONFIG_HFS_FS is not set | ||
948 | # CONFIG_HFSPLUS_FS is not set | ||
949 | # CONFIG_BEFS_FS is not set | ||
950 | # CONFIG_BFS_FS is not set | ||
951 | # CONFIG_EFS_FS is not set | ||
952 | CONFIG_CRAMFS=y | ||
953 | # CONFIG_VXFS_FS is not set | ||
954 | # CONFIG_HPFS_FS is not set | ||
955 | # CONFIG_QNX4FS_FS is not set | ||
956 | # CONFIG_SYSV_FS is not set | ||
957 | # CONFIG_UFS_FS is not set | ||
958 | |||
959 | # | ||
960 | # Network File Systems | ||
961 | # | ||
962 | CONFIG_NFS_FS=y | ||
963 | # CONFIG_NFS_V3 is not set | ||
964 | # CONFIG_NFS_V4 is not set | ||
965 | # CONFIG_NFS_DIRECTIO is not set | ||
966 | # CONFIG_NFSD is not set | ||
967 | CONFIG_ROOT_NFS=y | ||
968 | CONFIG_LOCKD=y | ||
969 | CONFIG_NFS_COMMON=y | ||
970 | CONFIG_SUNRPC=y | ||
971 | # CONFIG_SUNRPC_BIND34 is not set | ||
972 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
973 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
974 | # CONFIG_SMB_FS is not set | ||
975 | # CONFIG_CIFS is not set | ||
976 | # CONFIG_NCP_FS is not set | ||
977 | # CONFIG_CODA_FS is not set | ||
978 | # CONFIG_AFS_FS is not set | ||
979 | # CONFIG_9P_FS is not set | ||
980 | |||
981 | # | ||
982 | # Partition Types | ||
983 | # | ||
984 | CONFIG_PARTITION_ADVANCED=y | ||
985 | # CONFIG_ACORN_PARTITION is not set | ||
986 | # CONFIG_OSF_PARTITION is not set | ||
987 | # CONFIG_AMIGA_PARTITION is not set | ||
988 | # CONFIG_ATARI_PARTITION is not set | ||
989 | # CONFIG_MAC_PARTITION is not set | ||
990 | CONFIG_MSDOS_PARTITION=y | ||
991 | # CONFIG_BSD_DISKLABEL is not set | ||
992 | # CONFIG_MINIX_SUBPARTITION is not set | ||
993 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
994 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
995 | # CONFIG_LDM_PARTITION is not set | ||
996 | # CONFIG_SGI_PARTITION is not set | ||
997 | # CONFIG_ULTRIX_PARTITION is not set | ||
998 | # CONFIG_SUN_PARTITION is not set | ||
999 | # CONFIG_KARMA_PARTITION is not set | ||
1000 | # CONFIG_EFI_PARTITION is not set | ||
1001 | # CONFIG_SYSV68_PARTITION is not set | ||
1002 | |||
1003 | # | ||
1004 | # Native Language Support | ||
1005 | # | ||
1006 | CONFIG_NLS=y | ||
1007 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
1008 | CONFIG_NLS_CODEPAGE_437=y | ||
1009 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
1010 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
1011 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
1012 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
1013 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
1014 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
1015 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
1016 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
1017 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
1018 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
1019 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
1020 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
1021 | CONFIG_NLS_CODEPAGE_866=y | ||
1022 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
1023 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
1024 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
1025 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
1026 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
1027 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
1028 | # CONFIG_NLS_ISO8859_8 is not set | ||
1029 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
1030 | CONFIG_NLS_CODEPAGE_1251=y | ||
1031 | # CONFIG_NLS_ASCII is not set | ||
1032 | CONFIG_NLS_ISO8859_1=y | ||
1033 | # CONFIG_NLS_ISO8859_2 is not set | ||
1034 | # CONFIG_NLS_ISO8859_3 is not set | ||
1035 | # CONFIG_NLS_ISO8859_4 is not set | ||
1036 | CONFIG_NLS_ISO8859_5=y | ||
1037 | # CONFIG_NLS_ISO8859_6 is not set | ||
1038 | # CONFIG_NLS_ISO8859_7 is not set | ||
1039 | # CONFIG_NLS_ISO8859_9 is not set | ||
1040 | # CONFIG_NLS_ISO8859_13 is not set | ||
1041 | # CONFIG_NLS_ISO8859_14 is not set | ||
1042 | # CONFIG_NLS_ISO8859_15 is not set | ||
1043 | CONFIG_NLS_KOI8_R=y | ||
1044 | # CONFIG_NLS_KOI8_U is not set | ||
1045 | CONFIG_NLS_UTF8=y | ||
1046 | |||
1047 | # | ||
1048 | # Distributed Lock Manager | ||
1049 | # | ||
1050 | # CONFIG_DLM is not set | ||
1051 | |||
1052 | # | ||
1053 | # Profiling support | ||
1054 | # | ||
1055 | CONFIG_PROFILING=y | ||
1056 | CONFIG_OPROFILE=y | ||
1057 | |||
1058 | # | ||
1059 | # Kernel hacking | ||
1060 | # | ||
1061 | # CONFIG_PRINTK_TIME is not set | ||
1062 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
1063 | # CONFIG_MAGIC_SYSRQ is not set | ||
1064 | # CONFIG_UNUSED_SYMBOLS is not set | ||
1065 | # CONFIG_DEBUG_FS is not set | ||
1066 | # CONFIG_HEADERS_CHECK is not set | ||
1067 | CONFIG_DEBUG_KERNEL=y | ||
1068 | # CONFIG_DEBUG_SHIRQ is not set | ||
1069 | # CONFIG_DETECT_SOFTLOCKUP is not set | ||
1070 | # CONFIG_SCHEDSTATS is not set | ||
1071 | # CONFIG_TIMER_STATS is not set | ||
1072 | CONFIG_DEBUG_PREEMPT=y | ||
1073 | # CONFIG_DEBUG_RT_MUTEXES is not set | ||
1074 | # CONFIG_RT_MUTEX_TESTER is not set | ||
1075 | # CONFIG_DEBUG_SPINLOCK is not set | ||
1076 | # CONFIG_DEBUG_MUTEXES is not set | ||
1077 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1078 | # CONFIG_PROVE_LOCKING is not set | ||
1079 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | ||
1080 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | ||
1081 | # CONFIG_DEBUG_KOBJECT is not set | ||
1082 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
1083 | # CONFIG_DEBUG_INFO is not set | ||
1084 | # CONFIG_DEBUG_VM is not set | ||
1085 | # CONFIG_DEBUG_LIST is not set | ||
1086 | CONFIG_FRAME_POINTER=y | ||
1087 | CONFIG_FORCED_INLINING=y | ||
1088 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1089 | # CONFIG_FAULT_INJECTION is not set | ||
1090 | # CONFIG_DEBUG_USER is not set | ||
1091 | # CONFIG_DEBUG_ERRORS is not set | ||
1092 | # CONFIG_DEBUG_LL is not set | ||
1093 | |||
1094 | # | ||
1095 | # Security options | ||
1096 | # | ||
1097 | # CONFIG_KEYS is not set | ||
1098 | # CONFIG_SECURITY is not set | ||
1099 | |||
1100 | # | ||
1101 | # Cryptographic options | ||
1102 | # | ||
1103 | # CONFIG_CRYPTO is not set | ||
1104 | |||
1105 | # | ||
1106 | # Library routines | ||
1107 | # | ||
1108 | CONFIG_BITREVERSE=y | ||
1109 | CONFIG_CRC_CCITT=y | ||
1110 | CONFIG_CRC16=y | ||
1111 | # CONFIG_CRC_ITU_T is not set | ||
1112 | CONFIG_CRC32=y | ||
1113 | CONFIG_LIBCRC32C=y | ||
1114 | CONFIG_ZLIB_INFLATE=y | ||
1115 | CONFIG_PLIST=y | ||
1116 | CONFIG_HAS_IOMEM=y | ||
1117 | CONFIG_HAS_IOPORT=y | ||
1118 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/arm/include/asm/byteorder.h b/arch/arm/include/asm/byteorder.h index 4fbfb22f65a0..d04a7a2bc2e9 100644 --- a/arch/arm/include/asm/byteorder.h +++ b/arch/arm/include/asm/byteorder.h | |||
@@ -18,7 +18,15 @@ | |||
18 | #include <linux/compiler.h> | 18 | #include <linux/compiler.h> |
19 | #include <asm/types.h> | 19 | #include <asm/types.h> |
20 | 20 | ||
21 | static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) | 21 | #ifdef __ARMEB__ |
22 | # define __BIG_ENDIAN | ||
23 | #else | ||
24 | # define __LITTLE_ENDIAN | ||
25 | #endif | ||
26 | |||
27 | #define __SWAB_64_THRU_32__ | ||
28 | |||
29 | static inline __attribute_const__ __u32 __arch_swab32(__u32 x) | ||
22 | { | 30 | { |
23 | __u32 t; | 31 | __u32 t; |
24 | 32 | ||
@@ -40,19 +48,8 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) | |||
40 | 48 | ||
41 | return x; | 49 | return x; |
42 | } | 50 | } |
51 | #define __arch_swab32 __arch_swab32 | ||
43 | 52 | ||
44 | #define __arch__swab32(x) ___arch__swab32(x) | 53 | #include <linux/byteorder.h> |
45 | |||
46 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | ||
47 | # define __BYTEORDER_HAS_U64__ | ||
48 | # define __SWAB_64_THRU_32__ | ||
49 | #endif | ||
50 | |||
51 | #ifdef __ARMEB__ | ||
52 | #include <linux/byteorder/big_endian.h> | ||
53 | #else | ||
54 | #include <linux/byteorder/little_endian.h> | ||
55 | #endif | ||
56 | 54 | ||
57 | #endif | 55 | #endif |
58 | |||
diff --git a/arch/arm/lib/sha1.S b/arch/arm/lib/sha1.S index ff6ece487ffc..67c2bf4774b7 100644 --- a/arch/arm/lib/sha1.S +++ b/arch/arm/lib/sha1.S | |||
@@ -29,7 +29,7 @@ ENTRY(sha_transform) | |||
29 | stmfd sp!, {r4 - r8, lr} | 29 | stmfd sp!, {r4 - r8, lr} |
30 | 30 | ||
31 | @ for (i = 0; i < 16; i++) | 31 | @ for (i = 0; i < 16; i++) |
32 | @ W[i] = be32_to_cpu(in[i]); */ | 32 | @ W[i] = be32_to_cpu(in[i]); |
33 | 33 | ||
34 | #ifdef __ARMEB__ | 34 | #ifdef __ARMEB__ |
35 | mov r4, r0 | 35 | mov r4, r0 |
diff --git a/arch/arm/mach-footbridge/time.c b/arch/arm/mach-footbridge/time.c index fd9a7c11d62d..004819ea85c8 100644 --- a/arch/arm/mach-footbridge/time.c +++ b/arch/arm/mach-footbridge/time.c | |||
@@ -49,12 +49,12 @@ static unsigned long __init get_isa_cmos_time(void) | |||
49 | } while (sec != CMOS_READ(RTC_SECONDS)); | 49 | } while (sec != CMOS_READ(RTC_SECONDS)); |
50 | 50 | ||
51 | if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { | 51 | if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { |
52 | BCD_TO_BIN(sec); | 52 | sec = bcd2bin(sec); |
53 | BCD_TO_BIN(min); | 53 | min = bcd2bin(min); |
54 | BCD_TO_BIN(hour); | 54 | hour = bcd2bin(hour); |
55 | BCD_TO_BIN(day); | 55 | day = bcd2bin(day); |
56 | BCD_TO_BIN(mon); | 56 | mon = bcd2bin(mon); |
57 | BCD_TO_BIN(year); | 57 | year = bcd2bin(year); |
58 | } | 58 | } |
59 | if ((year += 1900) < 1970) | 59 | if ((year += 1900) < 1970) |
60 | year += 100; | 60 | year += 100; |
@@ -76,7 +76,7 @@ static int set_isa_cmos_time(void) | |||
76 | 76 | ||
77 | cmos_minutes = CMOS_READ(RTC_MINUTES); | 77 | cmos_minutes = CMOS_READ(RTC_MINUTES); |
78 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | 78 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) |
79 | BCD_TO_BIN(cmos_minutes); | 79 | cmos_minutes = bcd2bin(cmos_minutes); |
80 | 80 | ||
81 | /* | 81 | /* |
82 | * since we're only adjusting minutes and seconds, | 82 | * since we're only adjusting minutes and seconds, |
@@ -92,8 +92,8 @@ static int set_isa_cmos_time(void) | |||
92 | 92 | ||
93 | if (abs(real_minutes - cmos_minutes) < 30) { | 93 | if (abs(real_minutes - cmos_minutes) < 30) { |
94 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { | 94 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { |
95 | BIN_TO_BCD(real_seconds); | 95 | real_seconds = bin2bcd(real_seconds); |
96 | BIN_TO_BCD(real_minutes); | 96 | real_minutes = bin2bcd(real_minutes); |
97 | } | 97 | } |
98 | CMOS_WRITE(real_seconds,RTC_SECONDS); | 98 | CMOS_WRITE(real_seconds,RTC_SECONDS); |
99 | CMOS_WRITE(real_minutes,RTC_MINUTES); | 99 | CMOS_WRITE(real_minutes,RTC_MINUTES); |
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 5965cf09f8c4..90ae0ef37d66 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
@@ -201,7 +201,7 @@ static int calc_dsor_exp(struct clk *clk, unsigned long rate) | |||
201 | return -EINVAL; | 201 | return -EINVAL; |
202 | 202 | ||
203 | parent = clk->parent; | 203 | parent = clk->parent; |
204 | if (unlikely(parent == 0)) | 204 | if (unlikely(parent == NULL)) |
205 | return -EIO; | 205 | return -EIO; |
206 | 206 | ||
207 | realrate = parent->rate; | 207 | realrate = parent->rate; |
@@ -499,7 +499,7 @@ static int omap1_clk_enable_generic(struct clk *clk) | |||
499 | if (clk->flags & ALWAYS_ENABLED) | 499 | if (clk->flags & ALWAYS_ENABLED) |
500 | return 0; | 500 | return 0; |
501 | 501 | ||
502 | if (unlikely(clk->enable_reg == 0)) { | 502 | if (unlikely(clk->enable_reg == NULL)) { |
503 | printk(KERN_ERR "clock.c: Enable for %s without enable code\n", | 503 | printk(KERN_ERR "clock.c: Enable for %s without enable code\n", |
504 | clk->name); | 504 | clk->name); |
505 | return -EINVAL; | 505 | return -EINVAL; |
@@ -535,7 +535,7 @@ static void omap1_clk_disable_generic(struct clk *clk) | |||
535 | __u16 regval16; | 535 | __u16 regval16; |
536 | __u32 regval32; | 536 | __u32 regval32; |
537 | 537 | ||
538 | if (clk->enable_reg == 0) | 538 | if (clk->enable_reg == NULL) |
539 | return; | 539 | return; |
540 | 540 | ||
541 | if (clk->flags & ENABLE_REG_32BIT) { | 541 | if (clk->flags & ENABLE_REG_32BIT) { |
@@ -577,7 +577,7 @@ static long omap1_clk_round_rate(struct clk *clk, unsigned long rate) | |||
577 | return clk->parent->rate / (1 << dsor_exp); | 577 | return clk->parent->rate / (1 << dsor_exp); |
578 | } | 578 | } |
579 | 579 | ||
580 | if(clk->round_rate != 0) | 580 | if (clk->round_rate != NULL) |
581 | return clk->round_rate(clk, rate); | 581 | return clk->round_rate(clk, rate); |
582 | 582 | ||
583 | return clk->rate; | 583 | return clk->rate; |
@@ -625,7 +625,7 @@ static void __init omap1_clk_disable_unused(struct clk *clk) | |||
625 | 625 | ||
626 | /* Clocks in the DSP domain need api_ck. Just assume bootloader | 626 | /* Clocks in the DSP domain need api_ck. Just assume bootloader |
627 | * has not enabled any DSP clocks */ | 627 | * has not enabled any DSP clocks */ |
628 | if ((u32)clk->enable_reg == DSP_IDLECT2) { | 628 | if (clk->enable_reg == DSP_IDLECT2) { |
629 | printk(KERN_INFO "Skipping reset check for DSP domain " | 629 | printk(KERN_INFO "Skipping reset check for DSP domain " |
630 | "clock \"%s\"\n", clk->name); | 630 | "clock \"%s\"\n", clk->name); |
631 | return; | 631 | return; |
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index 6eadf72828d8..5635b511ab6f 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h | |||
@@ -324,7 +324,7 @@ static struct clk dspper_ck = { | |||
324 | .parent = &ck_dpll1, | 324 | .parent = &ck_dpll1, |
325 | .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | | 325 | .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | |
326 | RATE_CKCTL | VIRTUAL_IO_ADDRESS, | 326 | RATE_CKCTL | VIRTUAL_IO_ADDRESS, |
327 | .enable_reg = (void __iomem *)DSP_IDLECT2, | 327 | .enable_reg = DSP_IDLECT2, |
328 | .enable_bit = EN_PERCK, | 328 | .enable_bit = EN_PERCK, |
329 | .rate_offset = CKCTL_PERDIV_OFFSET, | 329 | .rate_offset = CKCTL_PERDIV_OFFSET, |
330 | .recalc = &omap1_ckctl_recalc_dsp_domain, | 330 | .recalc = &omap1_ckctl_recalc_dsp_domain, |
@@ -338,7 +338,7 @@ static struct clk dspxor_ck = { | |||
338 | .parent = &ck_ref, | 338 | .parent = &ck_ref, |
339 | .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | | 339 | .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | |
340 | VIRTUAL_IO_ADDRESS, | 340 | VIRTUAL_IO_ADDRESS, |
341 | .enable_reg = (void __iomem *)DSP_IDLECT2, | 341 | .enable_reg = DSP_IDLECT2, |
342 | .enable_bit = EN_XORPCK, | 342 | .enable_bit = EN_XORPCK, |
343 | .recalc = &followparent_recalc, | 343 | .recalc = &followparent_recalc, |
344 | .enable = &omap1_clk_enable_dsp_domain, | 344 | .enable = &omap1_clk_enable_dsp_domain, |
@@ -350,7 +350,7 @@ static struct clk dsptim_ck = { | |||
350 | .parent = &ck_ref, | 350 | .parent = &ck_ref, |
351 | .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | | 351 | .flags = CLOCK_IN_OMAP310 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | |
352 | VIRTUAL_IO_ADDRESS, | 352 | VIRTUAL_IO_ADDRESS, |
353 | .enable_reg = (void __iomem *)DSP_IDLECT2, | 353 | .enable_reg = DSP_IDLECT2, |
354 | .enable_bit = EN_DSPTIMCK, | 354 | .enable_bit = EN_DSPTIMCK, |
355 | .recalc = &followparent_recalc, | 355 | .recalc = &followparent_recalc, |
356 | .enable = &omap1_clk_enable_dsp_domain, | 356 | .enable = &omap1_clk_enable_dsp_domain, |
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index 826010d5d014..afb5789f94f9 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c | |||
@@ -159,7 +159,7 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { | |||
159 | #ifdef CONFIG_ARCH_OMAP730 | 159 | #ifdef CONFIG_ARCH_OMAP730 |
160 | static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { | 160 | static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { |
161 | { | 161 | { |
162 | .virt_base = io_p2v(OMAP730_MCBSP1_BASE), | 162 | .phys_base = OMAP730_MCBSP1_BASE, |
163 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | 163 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, |
164 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | 164 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, |
165 | .rx_irq = INT_730_McBSP1RX, | 165 | .rx_irq = INT_730_McBSP1RX, |
@@ -167,7 +167,7 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { | |||
167 | .ops = &omap1_mcbsp_ops, | 167 | .ops = &omap1_mcbsp_ops, |
168 | }, | 168 | }, |
169 | { | 169 | { |
170 | .virt_base = io_p2v(OMAP730_MCBSP2_BASE), | 170 | .phys_base = OMAP730_MCBSP2_BASE, |
171 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | 171 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, |
172 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | 172 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, |
173 | .rx_irq = INT_730_McBSP2RX, | 173 | .rx_irq = INT_730_McBSP2RX, |
@@ -184,7 +184,7 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { | |||
184 | #ifdef CONFIG_ARCH_OMAP15XX | 184 | #ifdef CONFIG_ARCH_OMAP15XX |
185 | static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { | 185 | static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { |
186 | { | 186 | { |
187 | .virt_base = OMAP1510_MCBSP1_BASE, | 187 | .phys_base = OMAP1510_MCBSP1_BASE, |
188 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | 188 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, |
189 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | 189 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, |
190 | .rx_irq = INT_McBSP1RX, | 190 | .rx_irq = INT_McBSP1RX, |
@@ -193,7 +193,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { | |||
193 | .clk_name = "mcbsp_clk", | 193 | .clk_name = "mcbsp_clk", |
194 | }, | 194 | }, |
195 | { | 195 | { |
196 | .virt_base = io_p2v(OMAP1510_MCBSP2_BASE), | 196 | .phys_base = OMAP1510_MCBSP2_BASE, |
197 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, | 197 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, |
198 | .dma_tx_sync = OMAP_DMA_MCBSP2_TX, | 198 | .dma_tx_sync = OMAP_DMA_MCBSP2_TX, |
199 | .rx_irq = INT_1510_SPI_RX, | 199 | .rx_irq = INT_1510_SPI_RX, |
@@ -201,7 +201,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { | |||
201 | .ops = &omap1_mcbsp_ops, | 201 | .ops = &omap1_mcbsp_ops, |
202 | }, | 202 | }, |
203 | { | 203 | { |
204 | .virt_base = OMAP1510_MCBSP3_BASE, | 204 | .phys_base = OMAP1510_MCBSP3_BASE, |
205 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | 205 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, |
206 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | 206 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, |
207 | .rx_irq = INT_McBSP3RX, | 207 | .rx_irq = INT_McBSP3RX, |
@@ -219,7 +219,7 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { | |||
219 | #ifdef CONFIG_ARCH_OMAP16XX | 219 | #ifdef CONFIG_ARCH_OMAP16XX |
220 | static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { | 220 | static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { |
221 | { | 221 | { |
222 | .virt_base = OMAP1610_MCBSP1_BASE, | 222 | .phys_base = OMAP1610_MCBSP1_BASE, |
223 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, | 223 | .dma_rx_sync = OMAP_DMA_MCBSP1_RX, |
224 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, | 224 | .dma_tx_sync = OMAP_DMA_MCBSP1_TX, |
225 | .rx_irq = INT_McBSP1RX, | 225 | .rx_irq = INT_McBSP1RX, |
@@ -228,7 +228,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { | |||
228 | .clk_name = "mcbsp_clk", | 228 | .clk_name = "mcbsp_clk", |
229 | }, | 229 | }, |
230 | { | 230 | { |
231 | .virt_base = io_p2v(OMAP1610_MCBSP2_BASE), | 231 | .phys_base = OMAP1610_MCBSP2_BASE, |
232 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, | 232 | .dma_rx_sync = OMAP_DMA_MCBSP2_RX, |
233 | .dma_tx_sync = OMAP_DMA_MCBSP2_TX, | 233 | .dma_tx_sync = OMAP_DMA_MCBSP2_TX, |
234 | .rx_irq = INT_1610_McBSP2_RX, | 234 | .rx_irq = INT_1610_McBSP2_RX, |
@@ -236,7 +236,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { | |||
236 | .ops = &omap1_mcbsp_ops, | 236 | .ops = &omap1_mcbsp_ops, |
237 | }, | 237 | }, |
238 | { | 238 | { |
239 | .virt_base = OMAP1610_MCBSP3_BASE, | 239 | .phys_base = OMAP1610_MCBSP3_BASE, |
240 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, | 240 | .dma_rx_sync = OMAP_DMA_MCBSP3_RX, |
241 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, | 241 | .dma_tx_sync = OMAP_DMA_MCBSP3_TX, |
242 | .rx_irq = INT_McBSP3RX, | 242 | .rx_irq = INT_McBSP3RX, |
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 0e25a996bb4c..4965986b4ad5 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c | |||
@@ -67,8 +67,8 @@ static void __init omap_serial_reset(struct plat_serial8250_port *p) | |||
67 | 67 | ||
68 | static struct plat_serial8250_port serial_platform_data[] = { | 68 | static struct plat_serial8250_port serial_platform_data[] = { |
69 | { | 69 | { |
70 | .membase = (char*)IO_ADDRESS(OMAP_UART1_BASE), | 70 | .membase = IO_ADDRESS(OMAP_UART1_BASE), |
71 | .mapbase = (unsigned long)OMAP_UART1_BASE, | 71 | .mapbase = OMAP_UART1_BASE, |
72 | .irq = INT_UART1, | 72 | .irq = INT_UART1, |
73 | .flags = UPF_BOOT_AUTOCONF, | 73 | .flags = UPF_BOOT_AUTOCONF, |
74 | .iotype = UPIO_MEM, | 74 | .iotype = UPIO_MEM, |
@@ -76,8 +76,8 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
76 | .uartclk = OMAP16XX_BASE_BAUD * 16, | 76 | .uartclk = OMAP16XX_BASE_BAUD * 16, |
77 | }, | 77 | }, |
78 | { | 78 | { |
79 | .membase = (char*)IO_ADDRESS(OMAP_UART2_BASE), | 79 | .membase = IO_ADDRESS(OMAP_UART2_BASE), |
80 | .mapbase = (unsigned long)OMAP_UART2_BASE, | 80 | .mapbase = OMAP_UART2_BASE, |
81 | .irq = INT_UART2, | 81 | .irq = INT_UART2, |
82 | .flags = UPF_BOOT_AUTOCONF, | 82 | .flags = UPF_BOOT_AUTOCONF, |
83 | .iotype = UPIO_MEM, | 83 | .iotype = UPIO_MEM, |
@@ -85,8 +85,8 @@ static struct plat_serial8250_port serial_platform_data[] = { | |||
85 | .uartclk = OMAP16XX_BASE_BAUD * 16, | 85 | .uartclk = OMAP16XX_BASE_BAUD * 16, |
86 | }, | 86 | }, |
87 | { | 87 | { |
88 | .membase = (char*)IO_ADDRESS(OMAP_UART3_BASE), | 88 | .membase = IO_ADDRESS(OMAP_UART3_BASE), |
89 | .mapbase = (unsigned long)OMAP_UART3_BASE, | 89 | .mapbase = OMAP_UART3_BASE, |
90 | .irq = INT_UART3, | 90 | .irq = INT_UART3, |
91 | .flags = UPF_BOOT_AUTOCONF, | 91 | .flags = UPF_BOOT_AUTOCONF, |
92 | .iotype = UPIO_MEM, | 92 | .iotype = UPIO_MEM, |
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index d4d6385cad7c..b72ca13b3acb 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
@@ -103,7 +103,7 @@ static struct resource sdp2430_smc91x_resources[] = { | |||
103 | [1] = { | 103 | [1] = { |
104 | .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | 104 | .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), |
105 | .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), | 105 | .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), |
106 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, | 106 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, |
107 | }, | 107 | }, |
108 | }; | 108 | }; |
109 | 109 | ||
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index aa9b37370d44..57c4405cceda 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c | |||
@@ -278,7 +278,7 @@ int _omap2_clk_enable(struct clk *clk) | |||
278 | if (clk->enable) | 278 | if (clk->enable) |
279 | return clk->enable(clk); | 279 | return clk->enable(clk); |
280 | 280 | ||
281 | if (unlikely(clk->enable_reg == 0)) { | 281 | if (unlikely(clk->enable_reg == NULL)) { |
282 | printk(KERN_ERR "clock.c: Enable for %s without enable code\n", | 282 | printk(KERN_ERR "clock.c: Enable for %s without enable code\n", |
283 | clk->name); | 283 | clk->name); |
284 | return 0; /* REVISIT: -EINVAL */ | 284 | return 0; /* REVISIT: -EINVAL */ |
@@ -310,7 +310,7 @@ void _omap2_clk_disable(struct clk *clk) | |||
310 | return; | 310 | return; |
311 | } | 311 | } |
312 | 312 | ||
313 | if (clk->enable_reg == 0) { | 313 | if (clk->enable_reg == NULL) { |
314 | /* | 314 | /* |
315 | * 'Independent' here refers to a clock which is not | 315 | * 'Independent' here refers to a clock which is not |
316 | * controlled by its parent. | 316 | * controlled by its parent. |
@@ -515,7 +515,7 @@ long omap2_clksel_round_rate(struct clk *clk, unsigned long target_rate) | |||
515 | /* Given a clock and a rate apply a clock specific rounding function */ | 515 | /* Given a clock and a rate apply a clock specific rounding function */ |
516 | long omap2_clk_round_rate(struct clk *clk, unsigned long rate) | 516 | long omap2_clk_round_rate(struct clk *clk, unsigned long rate) |
517 | { | 517 | { |
518 | if (clk->round_rate != 0) | 518 | if (clk->round_rate != NULL) |
519 | return clk->round_rate(clk, rate); | 519 | return clk->round_rate(clk, rate); |
520 | 520 | ||
521 | if (clk->flags & RATE_FIXED) | 521 | if (clk->flags & RATE_FIXED) |
@@ -604,7 +604,7 @@ u32 omap2_divisor_to_clksel(struct clk *clk, u32 div) | |||
604 | */ | 604 | */ |
605 | void __iomem *omap2_get_clksel(struct clk *clk, u32 *field_mask) | 605 | void __iomem *omap2_get_clksel(struct clk *clk, u32 *field_mask) |
606 | { | 606 | { |
607 | if (unlikely((clk->clksel_reg == 0) || (clk->clksel_mask == 0))) | 607 | if (unlikely((clk->clksel_reg == NULL) || (clk->clksel_mask == NULL))) |
608 | return NULL; | 608 | return NULL; |
609 | 609 | ||
610 | *field_mask = clk->clksel_mask; | 610 | *field_mask = clk->clksel_mask; |
@@ -624,7 +624,7 @@ u32 omap2_clksel_get_divisor(struct clk *clk) | |||
624 | void __iomem *div_addr; | 624 | void __iomem *div_addr; |
625 | 625 | ||
626 | div_addr = omap2_get_clksel(clk, &field_mask); | 626 | div_addr = omap2_get_clksel(clk, &field_mask); |
627 | if (div_addr == 0) | 627 | if (div_addr == NULL) |
628 | return 0; | 628 | return 0; |
629 | 629 | ||
630 | field_val = __raw_readl(div_addr) & field_mask; | 630 | field_val = __raw_readl(div_addr) & field_mask; |
@@ -643,7 +643,7 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long rate) | |||
643 | return -EINVAL; | 643 | return -EINVAL; |
644 | 644 | ||
645 | div_addr = omap2_get_clksel(clk, &field_mask); | 645 | div_addr = omap2_get_clksel(clk, &field_mask); |
646 | if (div_addr == 0) | 646 | if (div_addr == NULL) |
647 | return -EINVAL; | 647 | return -EINVAL; |
648 | 648 | ||
649 | field_val = omap2_divisor_to_clksel(clk, new_div); | 649 | field_val = omap2_divisor_to_clksel(clk, new_div); |
@@ -681,7 +681,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate) | |||
681 | return -EINVAL; | 681 | return -EINVAL; |
682 | 682 | ||
683 | /* dpll_ck, core_ck, virt_prcm_set; plus all clksel clocks */ | 683 | /* dpll_ck, core_ck, virt_prcm_set; plus all clksel clocks */ |
684 | if (clk->set_rate != 0) | 684 | if (clk->set_rate != NULL) |
685 | ret = clk->set_rate(clk, rate); | 685 | ret = clk->set_rate(clk, rate); |
686 | 686 | ||
687 | if (unlikely(ret == 0 && (clk->flags & RATE_PROPAGATES))) | 687 | if (unlikely(ret == 0 && (clk->flags & RATE_PROPAGATES))) |
@@ -702,7 +702,7 @@ static u32 omap2_clksel_get_src_field(void __iomem **src_addr, | |||
702 | const struct clksel_rate *clkr; | 702 | const struct clksel_rate *clkr; |
703 | 703 | ||
704 | *parent_div = 0; | 704 | *parent_div = 0; |
705 | *src_addr = 0; | 705 | *src_addr = NULL; |
706 | 706 | ||
707 | clks = omap2_get_clksel_by_parent(clk, src_clk); | 707 | clks = omap2_get_clksel_by_parent(clk, src_clk); |
708 | if (clks == NULL) | 708 | if (clks == NULL) |
@@ -743,7 +743,7 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent) | |||
743 | 743 | ||
744 | field_val = omap2_clksel_get_src_field(&src_addr, new_parent, | 744 | field_val = omap2_clksel_get_src_field(&src_addr, new_parent, |
745 | &field_mask, clk, &parent_div); | 745 | &field_mask, clk, &parent_div); |
746 | if (src_addr == 0) | 746 | if (src_addr == NULL) |
747 | return -EINVAL; | 747 | return -EINVAL; |
748 | 748 | ||
749 | if (clk->usecount > 0) | 749 | if (clk->usecount > 0) |
diff --git a/arch/arm/mach-omap2/cm.h b/arch/arm/mach-omap2/cm.h index 87a44c715aa4..65fdf78c91e1 100644 --- a/arch/arm/mach-omap2/cm.h +++ b/arch/arm/mach-omap2/cm.h | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | #ifndef __ASSEMBLER__ | 19 | #ifndef __ASSEMBLER__ |
20 | #define OMAP_CM_REGADDR(module, reg) \ | 20 | #define OMAP_CM_REGADDR(module, reg) \ |
21 | (void __iomem *)IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg)) | 21 | IO_ADDRESS(OMAP2_CM_BASE + (module) + (reg)) |
22 | #else | 22 | #else |
23 | #define OMAP2420_CM_REGADDR(module, reg) \ | 23 | #define OMAP2420_CM_REGADDR(module, reg) \ |
24 | IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg)) | 24 | IO_ADDRESS(OMAP2420_CM_BASE + (module) + (reg)) |
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index f51d69bc457d..9b4e58ee2ca2 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -64,10 +64,8 @@ static struct resource gpmc_cs_mem[GPMC_CS_NUM]; | |||
64 | static DEFINE_SPINLOCK(gpmc_mem_lock); | 64 | static DEFINE_SPINLOCK(gpmc_mem_lock); |
65 | static unsigned gpmc_cs_map; | 65 | static unsigned gpmc_cs_map; |
66 | 66 | ||
67 | static void __iomem *gpmc_base = | 67 | static void __iomem *gpmc_base = IO_ADDRESS(GPMC_BASE); |
68 | (void __iomem *) IO_ADDRESS(GPMC_BASE); | 68 | static void __iomem *gpmc_cs_base = IO_ADDRESS(GPMC_BASE) + GPMC_CS0; |
69 | static void __iomem *gpmc_cs_base = | ||
70 | (void __iomem *) IO_ADDRESS(GPMC_BASE) + GPMC_CS0; | ||
71 | 69 | ||
72 | static struct clk *gpmc_fck; | 70 | static struct clk *gpmc_fck; |
73 | 71 | ||
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index a5d4526ac4d6..e53ebe7d58be 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -21,11 +21,11 @@ | |||
21 | #include <mach/cpu.h> | 21 | #include <mach/cpu.h> |
22 | 22 | ||
23 | #if defined(CONFIG_ARCH_OMAP2420) | 23 | #if defined(CONFIG_ARCH_OMAP2420) |
24 | #define TAP_BASE io_p2v(0x48014000) | 24 | #define TAP_BASE IO_ADDRESS(0x48014000) |
25 | #elif defined(CONFIG_ARCH_OMAP2430) | 25 | #elif defined(CONFIG_ARCH_OMAP2430) |
26 | #define TAP_BASE io_p2v(0x4900A000) | 26 | #define TAP_BASE IO_ADDRESS(0x4900A000) |
27 | #elif defined(CONFIG_ARCH_OMAP34XX) | 27 | #elif defined(CONFIG_ARCH_OMAP34XX) |
28 | #define TAP_BASE io_p2v(0x4830A000) | 28 | #define TAP_BASE IO_ADDRESS(0x4830A000) |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | #define OMAP_TAP_IDCODE 0x0204 | 31 | #define OMAP_TAP_IDCODE 0x0204 |
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 9ef15b31d8fc..742bd0070e63 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
@@ -32,7 +32,7 @@ | |||
32 | * for each bank.. when in doubt, consult the TRM. | 32 | * for each bank.. when in doubt, consult the TRM. |
33 | */ | 33 | */ |
34 | static struct omap_irq_bank { | 34 | static struct omap_irq_bank { |
35 | unsigned long base_reg; | 35 | void __iomem *base_reg; |
36 | unsigned int nr_irqs; | 36 | unsigned int nr_irqs; |
37 | } __attribute__ ((aligned(4))) irq_banks[] = { | 37 | } __attribute__ ((aligned(4))) irq_banks[] = { |
38 | { | 38 | { |
@@ -94,7 +94,7 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) | |||
94 | unsigned long tmp; | 94 | unsigned long tmp; |
95 | 95 | ||
96 | tmp = __raw_readl(bank->base_reg + INTC_REVISION) & 0xff; | 96 | tmp = __raw_readl(bank->base_reg + INTC_REVISION) & 0xff; |
97 | printk(KERN_INFO "IRQ: Found an INTC at 0x%08lx " | 97 | printk(KERN_INFO "IRQ: Found an INTC at 0x%p " |
98 | "(revision %ld.%ld) with %d interrupts\n", | 98 | "(revision %ld.%ld) with %d interrupts\n", |
99 | bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs); | 99 | bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs); |
100 | 100 | ||
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index 27eb6e3ca926..709db03b9999 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c | |||
@@ -134,7 +134,7 @@ static struct omap_mcbsp_ops omap2_mcbsp_ops = { | |||
134 | #ifdef CONFIG_ARCH_OMAP24XX | 134 | #ifdef CONFIG_ARCH_OMAP24XX |
135 | static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { | 135 | static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { |
136 | { | 136 | { |
137 | .virt_base = IO_ADDRESS(OMAP24XX_MCBSP1_BASE), | 137 | .phys_base = OMAP24XX_MCBSP1_BASE, |
138 | .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX, | 138 | .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX, |
139 | .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX, | 139 | .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX, |
140 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, | 140 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, |
@@ -143,7 +143,7 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { | |||
143 | .clk_name = "mcbsp_clk", | 143 | .clk_name = "mcbsp_clk", |
144 | }, | 144 | }, |
145 | { | 145 | { |
146 | .virt_base = IO_ADDRESS(OMAP24XX_MCBSP2_BASE), | 146 | .phys_base = OMAP24XX_MCBSP2_BASE, |
147 | .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX, | 147 | .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX, |
148 | .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX, | 148 | .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX, |
149 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, | 149 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, |
@@ -161,7 +161,7 @@ static struct omap_mcbsp_platform_data omap24xx_mcbsp_pdata[] = { | |||
161 | #ifdef CONFIG_ARCH_OMAP34XX | 161 | #ifdef CONFIG_ARCH_OMAP34XX |
162 | static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | 162 | static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { |
163 | { | 163 | { |
164 | .virt_base = IO_ADDRESS(OMAP34XX_MCBSP1_BASE), | 164 | .phys_base = OMAP34XX_MCBSP1_BASE, |
165 | .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX, | 165 | .dma_rx_sync = OMAP24XX_DMA_MCBSP1_RX, |
166 | .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX, | 166 | .dma_tx_sync = OMAP24XX_DMA_MCBSP1_TX, |
167 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, | 167 | .rx_irq = INT_24XX_MCBSP1_IRQ_RX, |
@@ -170,7 +170,7 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { | |||
170 | .clk_name = "mcbsp_clk", | 170 | .clk_name = "mcbsp_clk", |
171 | }, | 171 | }, |
172 | { | 172 | { |
173 | .virt_base = IO_ADDRESS(OMAP34XX_MCBSP2_BASE), | 173 | .phys_base = OMAP34XX_MCBSP2_BASE, |
174 | .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX, | 174 | .dma_rx_sync = OMAP24XX_DMA_MCBSP2_RX, |
175 | .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX, | 175 | .dma_tx_sync = OMAP24XX_DMA_MCBSP2_TX, |
176 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, | 176 | .rx_irq = INT_24XX_MCBSP2_IRQ_RX, |
diff --git a/arch/arm/mach-omap2/prm.h b/arch/arm/mach-omap2/prm.h index eb9982fb21d5..e4dc4b17881d 100644 --- a/arch/arm/mach-omap2/prm.h +++ b/arch/arm/mach-omap2/prm.h | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | #ifndef __ASSEMBLER__ | 19 | #ifndef __ASSEMBLER__ |
20 | #define OMAP_PRM_REGADDR(module, reg) \ | 20 | #define OMAP_PRM_REGADDR(module, reg) \ |
21 | (void __iomem *)IO_ADDRESS(OMAP2_PRM_BASE + (module) + (reg)) | 21 | IO_ADDRESS(OMAP2_PRM_BASE + (module) + (reg)) |
22 | #else | 22 | #else |
23 | #define OMAP2420_PRM_REGADDR(module, reg) \ | 23 | #define OMAP2420_PRM_REGADDR(module, reg) \ |
24 | IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg)) | 24 | IO_ADDRESS(OMAP2420_PRM_BASE + (module) + (reg)) |
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index adc8a26a8fb0..69651cf08305 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
@@ -32,24 +32,24 @@ static struct clk * uart3_fck = NULL; | |||
32 | 32 | ||
33 | static struct plat_serial8250_port serial_platform_data[] = { | 33 | static struct plat_serial8250_port serial_platform_data[] = { |
34 | { | 34 | { |
35 | .membase = (char *)IO_ADDRESS(OMAP_UART1_BASE), | 35 | .membase = IO_ADDRESS(OMAP_UART1_BASE), |
36 | .mapbase = (unsigned long)OMAP_UART1_BASE, | 36 | .mapbase = OMAP_UART1_BASE, |
37 | .irq = 72, | 37 | .irq = 72, |
38 | .flags = UPF_BOOT_AUTOCONF, | 38 | .flags = UPF_BOOT_AUTOCONF, |
39 | .iotype = UPIO_MEM, | 39 | .iotype = UPIO_MEM, |
40 | .regshift = 2, | 40 | .regshift = 2, |
41 | .uartclk = OMAP16XX_BASE_BAUD * 16, | 41 | .uartclk = OMAP16XX_BASE_BAUD * 16, |
42 | }, { | 42 | }, { |
43 | .membase = (char *)IO_ADDRESS(OMAP_UART2_BASE), | 43 | .membase = IO_ADDRESS(OMAP_UART2_BASE), |
44 | .mapbase = (unsigned long)OMAP_UART2_BASE, | 44 | .mapbase = OMAP_UART2_BASE, |
45 | .irq = 73, | 45 | .irq = 73, |
46 | .flags = UPF_BOOT_AUTOCONF, | 46 | .flags = UPF_BOOT_AUTOCONF, |
47 | .iotype = UPIO_MEM, | 47 | .iotype = UPIO_MEM, |
48 | .regshift = 2, | 48 | .regshift = 2, |
49 | .uartclk = OMAP16XX_BASE_BAUD * 16, | 49 | .uartclk = OMAP16XX_BASE_BAUD * 16, |
50 | }, { | 50 | }, { |
51 | .membase = (char *)IO_ADDRESS(OMAP_UART3_BASE), | 51 | .membase = IO_ADDRESS(OMAP_UART3_BASE), |
52 | .mapbase = (unsigned long)OMAP_UART3_BASE, | 52 | .mapbase = OMAP_UART3_BASE, |
53 | .irq = 74, | 53 | .irq = 74, |
54 | .flags = UPF_BOOT_AUTOCONF, | 54 | .flags = UPF_BOOT_AUTOCONF, |
55 | .iotype = UPIO_MEM, | 55 | .iotype = UPIO_MEM, |
@@ -71,7 +71,7 @@ static inline void serial_write_reg(struct plat_serial8250_port *p, int offset, | |||
71 | int value) | 71 | int value) |
72 | { | 72 | { |
73 | offset <<= p->regshift; | 73 | offset <<= p->regshift; |
74 | __raw_writeb(value, (unsigned long)(p->membase + offset)); | 74 | __raw_writeb(value, p->membase + offset); |
75 | } | 75 | } |
76 | 76 | ||
77 | /* | 77 | /* |
@@ -108,7 +108,7 @@ void __init omap_serial_init() | |||
108 | struct plat_serial8250_port *p = serial_platform_data + i; | 108 | struct plat_serial8250_port *p = serial_platform_data + i; |
109 | 109 | ||
110 | if (!(info->enabled_uarts & (1 << i))) { | 110 | if (!(info->enabled_uarts & (1 << i))) { |
111 | p->membase = 0; | 111 | p->membase = NULL; |
112 | p->mapbase = 0; | 112 | p->mapbase = 0; |
113 | continue; | 113 | continue; |
114 | } | 114 | } |
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index e75bd7004b94..0bd195551a27 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h | |||
@@ -41,6 +41,7 @@ struct pci_bus; | |||
41 | struct pci_sys_data; | 41 | struct pci_sys_data; |
42 | 42 | ||
43 | void orion5x_pcie_id(u32 *dev, u32 *rev); | 43 | void orion5x_pcie_id(u32 *dev, u32 *rev); |
44 | void orion5x_pci_disable(void); | ||
44 | void orion5x_pci_set_cardbus_mode(void); | 45 | void orion5x_pci_set_cardbus_mode(void); |
45 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); | 46 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); |
46 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); | 47 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); |
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index 1a1d84b80a65..b38c65ccfb15 100644 --- a/arch/arm/mach-orion5x/dns323-setup.c +++ b/arch/arm/mach-orion5x/dns323-setup.c | |||
@@ -245,12 +245,8 @@ static struct orion5x_mpp_mode dns323_mpp_modes[] __initdata = { | |||
245 | static struct i2c_board_info __initdata dns323_i2c_devices[] = { | 245 | static struct i2c_board_info __initdata dns323_i2c_devices[] = { |
246 | { | 246 | { |
247 | I2C_BOARD_INFO("g760a", 0x3e), | 247 | I2C_BOARD_INFO("g760a", 0x3e), |
248 | #if 0 | ||
249 | /* this entry requires the new-style driver model lm75 driver, | ||
250 | * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */ | ||
251 | }, { | 248 | }, { |
252 | I2C_BOARD_INFO("g751", 0x48), | 249 | I2C_BOARD_INFO("lm75", 0x48), |
253 | #endif | ||
254 | }, { | 250 | }, { |
255 | I2C_BOARD_INFO("m41t80", 0x68), | 251 | I2C_BOARD_INFO("m41t80", 0x68), |
256 | }, | 252 | }, |
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index cb72f1bb9cb7..e321ec331839 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c | |||
@@ -146,8 +146,10 @@ static struct hw_pci kurobox_pro_pci __initdata = { | |||
146 | 146 | ||
147 | static int __init kurobox_pro_pci_init(void) | 147 | static int __init kurobox_pro_pci_init(void) |
148 | { | 148 | { |
149 | if (machine_is_kurobox_pro()) | 149 | if (machine_is_kurobox_pro()) { |
150 | orion5x_pci_disable(); | ||
150 | pci_common_init(&kurobox_pro_pci); | 151 | pci_common_init(&kurobox_pro_pci); |
152 | } | ||
151 | 153 | ||
152 | return 0; | 154 | return 0; |
153 | } | 155 | } |
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index fbceecc4b7ec..a7b7d77b1b09 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c | |||
@@ -541,6 +541,13 @@ static void __devinit rc_pci_fixup(struct pci_dev *dev) | |||
541 | } | 541 | } |
542 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); | 542 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup); |
543 | 543 | ||
544 | static int orion5x_pci_disabled __initdata; | ||
545 | |||
546 | void __init orion5x_pci_disable(void) | ||
547 | { | ||
548 | orion5x_pci_disabled = 1; | ||
549 | } | ||
550 | |||
544 | void __init orion5x_pci_set_cardbus_mode(void) | 551 | void __init orion5x_pci_set_cardbus_mode(void) |
545 | { | 552 | { |
546 | orion5x_pci_cardbus_mode = 1; | 553 | orion5x_pci_cardbus_mode = 1; |
@@ -553,7 +560,7 @@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys) | |||
553 | if (nr == 0) { | 560 | if (nr == 0) { |
554 | orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr); | 561 | orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr); |
555 | ret = pcie_setup(sys); | 562 | ret = pcie_setup(sys); |
556 | } else if (nr == 1) { | 563 | } else if (nr == 1 && !orion5x_pci_disabled) { |
557 | orion5x_pci_set_bus_nr(sys->busnr); | 564 | orion5x_pci_set_bus_nr(sys->busnr); |
558 | ret = pci_setup(sys); | 565 | ret = pci_setup(sys); |
559 | } | 566 | } |
@@ -567,7 +574,7 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys | |||
567 | 574 | ||
568 | if (nr == 0) { | 575 | if (nr == 0) { |
569 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); | 576 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); |
570 | } else if (nr == 1) { | 577 | } else if (nr == 1 && !orion5x_pci_disabled) { |
571 | bus = pci_scan_bus(sys->busnr, &pci_ops, sys); | 578 | bus = pci_scan_bus(sys->busnr, &pci_ops, sys); |
572 | } else { | 579 | } else { |
573 | bus = NULL; | 580 | bus = NULL; |
@@ -584,7 +591,7 @@ int __init orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
584 | /* | 591 | /* |
585 | * PCIe endpoint? | 592 | * PCIe endpoint? |
586 | */ | 593 | */ |
587 | if (bus < orion5x_pci_local_bus_nr()) | 594 | if (orion5x_pci_disabled || bus < orion5x_pci_local_bus_nr()) |
588 | return IRQ_ORION5X_PCIE0_INT; | 595 | return IRQ_ORION5X_PCIE0_INT; |
589 | 596 | ||
590 | return -1; | 597 | return -1; |
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index dd657163cd8d..9d6890514199 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c | |||
@@ -287,6 +287,10 @@ static void __init qnap_ts209_init(void) | |||
287 | /* | 287 | /* |
288 | * Configure peripherals. | 288 | * Configure peripherals. |
289 | */ | 289 | */ |
290 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, | ||
291 | QNAP_TS209_NOR_BOOT_SIZE); | ||
292 | platform_device_register(&qnap_ts209_nor_flash); | ||
293 | |||
290 | orion5x_ehci0_init(); | 294 | orion5x_ehci0_init(); |
291 | orion5x_ehci1_init(); | 295 | orion5x_ehci1_init(); |
292 | qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + | 296 | qnap_tsx09_find_mac_addr(QNAP_TS209_NOR_BOOT_BASE + |
@@ -296,12 +300,9 @@ static void __init qnap_ts209_init(void) | |||
296 | orion5x_i2c_init(); | 300 | orion5x_i2c_init(); |
297 | orion5x_sata_init(&qnap_ts209_sata_data); | 301 | orion5x_sata_init(&qnap_ts209_sata_data); |
298 | orion5x_uart0_init(); | 302 | orion5x_uart0_init(); |
303 | orion5x_uart1_init(); | ||
299 | orion5x_xor_init(); | 304 | orion5x_xor_init(); |
300 | 305 | ||
301 | orion5x_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, | ||
302 | QNAP_TS209_NOR_BOOT_SIZE); | ||
303 | platform_device_register(&qnap_ts209_nor_flash); | ||
304 | |||
305 | platform_device_register(&qnap_ts209_button_device); | 306 | platform_device_register(&qnap_ts209_button_device); |
306 | 307 | ||
307 | /* Get RTC IRQ and register the chip */ | 308 | /* Get RTC IRQ and register the chip */ |
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c index b27d2b762081..d85588ac7ef8 100644 --- a/arch/arm/mach-orion5x/ts409-setup.c +++ b/arch/arm/mach-orion5x/ts409-setup.c | |||
@@ -278,6 +278,10 @@ static void __init qnap_ts409_init(void) | |||
278 | /* | 278 | /* |
279 | * Configure peripherals. | 279 | * Configure peripherals. |
280 | */ | 280 | */ |
281 | orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE, | ||
282 | QNAP_TS409_NOR_BOOT_SIZE); | ||
283 | platform_device_register(&qnap_ts409_nor_flash); | ||
284 | |||
281 | orion5x_ehci0_init(); | 285 | orion5x_ehci0_init(); |
282 | qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE + | 286 | qnap_tsx09_find_mac_addr(QNAP_TS409_NOR_BOOT_BASE + |
283 | qnap_ts409_partitions[5].offset, | 287 | qnap_ts409_partitions[5].offset, |
@@ -285,10 +289,7 @@ static void __init qnap_ts409_init(void) | |||
285 | orion5x_eth_init(&qnap_tsx09_eth_data); | 289 | orion5x_eth_init(&qnap_tsx09_eth_data); |
286 | orion5x_i2c_init(); | 290 | orion5x_i2c_init(); |
287 | orion5x_uart0_init(); | 291 | orion5x_uart0_init(); |
288 | 292 | orion5x_uart1_init(); | |
289 | orion5x_setup_dev_boot_win(QNAP_TS409_NOR_BOOT_BASE, | ||
290 | QNAP_TS409_NOR_BOOT_SIZE); | ||
291 | platform_device_register(&qnap_ts409_nor_flash); | ||
292 | 293 | ||
293 | platform_device_register(&qnap_ts409_button_device); | 294 | platform_device_register(&qnap_ts409_button_device); |
294 | 295 | ||
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index 123a950db466..e703a8d209e2 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <mach/pxa-regs.h> | 38 | #include <mach/pxa-regs.h> |
39 | #include <mach/pxa2xx-regs.h> | 39 | #include <mach/pxa2xx-regs.h> |
40 | #include <mach/pxa2xx-gpio.h> | 40 | #include <mach/pxa2xx-gpio.h> |
41 | #include <mach/i2c.h> | ||
41 | #include <mach/irda.h> | 42 | #include <mach/irda.h> |
42 | #include <mach/mmc.h> | 43 | #include <mach/mmc.h> |
43 | #include <mach/udc.h> | 44 | #include <mach/udc.h> |
@@ -532,6 +533,7 @@ static void __init corgi_init(void) | |||
532 | pxa_set_udc_info(&udc_info); | 533 | pxa_set_udc_info(&udc_info); |
533 | pxa_set_mci_info(&corgi_mci_platform_data); | 534 | pxa_set_mci_info(&corgi_mci_platform_data); |
534 | pxa_set_ficp_info(&corgi_ficp_platform_data); | 535 | pxa_set_ficp_info(&corgi_ficp_platform_data); |
536 | pxa_set_i2c_info(NULL); | ||
535 | 537 | ||
536 | platform_scoop_config = &corgi_pcmcia_config; | 538 | platform_scoop_config = &corgi_pcmcia_config; |
537 | 539 | ||
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 055ec63d768c..3f5f484549b3 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <mach/pxa2xx-gpio.h> | 36 | #include <mach/pxa2xx-gpio.h> |
37 | #include <mach/mmc.h> | 37 | #include <mach/mmc.h> |
38 | #include <mach/udc.h> | 38 | #include <mach/udc.h> |
39 | #include <mach/i2c.h> | ||
39 | #include <mach/irda.h> | 40 | #include <mach/irda.h> |
40 | #include <mach/poodle.h> | 41 | #include <mach/poodle.h> |
41 | #include <mach/pxafb.h> | 42 | #include <mach/pxafb.h> |
@@ -387,6 +388,7 @@ static void __init poodle_init(void) | |||
387 | pxa_set_udc_info(&udc_info); | 388 | pxa_set_udc_info(&udc_info); |
388 | pxa_set_mci_info(&poodle_mci_platform_data); | 389 | pxa_set_mci_info(&poodle_mci_platform_data); |
389 | pxa_set_ficp_info(&poodle_ficp_platform_data); | 390 | pxa_set_ficp_info(&poodle_ficp_platform_data); |
391 | pxa_set_i2c_info(NULL); | ||
390 | 392 | ||
391 | platform_scoop_config = &poodle_pcmcia_config; | 393 | platform_scoop_config = &poodle_pcmcia_config; |
392 | 394 | ||
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index cd39005c98ff..b569f3b4cf3a 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <mach/pxa2xx-gpio.h> | 40 | #include <mach/pxa2xx-gpio.h> |
41 | #include <mach/pxa27x-udc.h> | 41 | #include <mach/pxa27x-udc.h> |
42 | #include <mach/reset.h> | 42 | #include <mach/reset.h> |
43 | #include <mach/i2c.h> | ||
43 | #include <mach/irda.h> | 44 | #include <mach/irda.h> |
44 | #include <mach/mmc.h> | 45 | #include <mach/mmc.h> |
45 | #include <mach/ohci.h> | 46 | #include <mach/ohci.h> |
@@ -574,6 +575,7 @@ static void __init common_init(void) | |||
574 | pxa_set_ficp_info(&spitz_ficp_platform_data); | 575 | pxa_set_ficp_info(&spitz_ficp_platform_data); |
575 | set_pxa_fb_parent(&spitzssp_device.dev); | 576 | set_pxa_fb_parent(&spitzssp_device.dev); |
576 | set_pxa_fb_info(&spitz_pxafb_info); | 577 | set_pxa_fb_info(&spitz_pxafb_info); |
578 | pxa_set_i2c_info(NULL); | ||
577 | } | 579 | } |
578 | 580 | ||
579 | #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) | 581 | #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) |
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h index 7dd458363a51..6026d091a2fe 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h | |||
@@ -48,11 +48,11 @@ | |||
48 | #define S3C2443_CLKSRC_I2S_EPLLREF3 (3<<14) | 48 | #define S3C2443_CLKSRC_I2S_EPLLREF3 (3<<14) |
49 | #define S3C2443_CLKSRC_I2S_MASK (3<<14) | 49 | #define S3C2443_CLKSRC_I2S_MASK (3<<14) |
50 | 50 | ||
51 | #define S3C2443_CLKSRC_EPLLREF_XTAL (2<<8) | 51 | #define S3C2443_CLKSRC_EPLLREF_XTAL (2<<7) |
52 | #define S3C2443_CLKSRC_EPLLREF_EXTCLK (3<<8) | 52 | #define S3C2443_CLKSRC_EPLLREF_EXTCLK (3<<7) |
53 | #define S3C2443_CLKSRC_EPLLREF_MPLLREF (0<<8) | 53 | #define S3C2443_CLKSRC_EPLLREF_MPLLREF (0<<7) |
54 | #define S3C2443_CLKSRC_EPLLREF_MPLLREF2 (1<<8) | 54 | #define S3C2443_CLKSRC_EPLLREF_MPLLREF2 (1<<7) |
55 | #define S3C2443_CLKSRC_EPLLREF_MASK (3<<8) | 55 | #define S3C2443_CLKSRC_EPLLREF_MASK (3<<7) |
56 | 56 | ||
57 | #define S3C2443_CLKSRC_ESYSCLK_EPLL (1<<6) | 57 | #define S3C2443_CLKSRC_ESYSCLK_EPLL (1<<6) |
58 | #define S3C2443_CLKSRC_MSYSCLK_MPLL (1<<4) | 58 | #define S3C2443_CLKSRC_MSYSCLK_MPLL (1<<4) |
diff --git a/arch/arm/mach-s3c2410/nor-simtec.c b/arch/arm/mach-s3c2410/nor-simtec.c index b2ae237042a5..598d130633dc 100644 --- a/arch/arm/mach-s3c2410/nor-simtec.c +++ b/arch/arm/mach-s3c2410/nor-simtec.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <mach/bast-map.h> | 30 | #include <mach/bast-map.h> |
31 | #include <mach/bast-cpld.h> | 31 | #include <mach/bast-cpld.h> |
32 | 32 | ||
33 | #include "nor-simtec.h" | ||
33 | 34 | ||
34 | static void simtec_nor_vpp(struct map_info *map, int vpp) | 35 | static void simtec_nor_vpp(struct map_info *map, int vpp) |
35 | { | 36 | { |
@@ -50,7 +51,7 @@ static void simtec_nor_vpp(struct map_info *map, int vpp) | |||
50 | local_irq_restore(flags); | 51 | local_irq_restore(flags); |
51 | } | 52 | } |
52 | 53 | ||
53 | struct physmap_flash_data simtec_nor_pdata = { | 54 | static struct physmap_flash_data simtec_nor_pdata = { |
54 | .width = 2, | 55 | .width = 2, |
55 | .set_vpp = simtec_nor_vpp, | 56 | .set_vpp = simtec_nor_vpp, |
56 | .nr_parts = 0, | 57 | .nr_parts = 0, |
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index 4c061d29463c..ad980a1690c2 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
@@ -395,7 +395,7 @@ static void jive_lcd_spi_chipselect(struct s3c2410_spigpio_info *spi, int cs) | |||
395 | } | 395 | } |
396 | 396 | ||
397 | static struct s3c2410_spigpio_info jive_lcd_spi = { | 397 | static struct s3c2410_spigpio_info jive_lcd_spi = { |
398 | .bus_num = 0, | 398 | .bus_num = 1, |
399 | .pin_clk = S3C2410_GPG8, | 399 | .pin_clk = S3C2410_GPG8, |
400 | .pin_mosi = S3C2410_GPB8, | 400 | .pin_mosi = S3C2410_GPB8, |
401 | .chip_select = jive_lcd_spi_chipselect, | 401 | .chip_select = jive_lcd_spi_chipselect, |
diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c index 2f8627218839..0a38f0b396eb 100644 --- a/arch/arm/plat-mxc/clock.c +++ b/arch/arm/plat-mxc/clock.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include <linux/proc_fs.h> | 37 | #include <linux/proc_fs.h> |
38 | #include <linux/semaphore.h> | 38 | #include <linux/semaphore.h> |
39 | #include <linux/string.h> | 39 | #include <linux/string.h> |
40 | #include <linux/version.h> | ||
41 | 40 | ||
42 | #include <mach/clock.h> | 41 | #include <mach/clock.h> |
43 | 42 | ||
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 2c4051cc79a1..deaff58878a2 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | # Common support | 5 | # Common support |
6 | obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \ | 6 | obj-y := common.o sram.o clock.o devices.o dma.o mux.o gpio.o \ |
7 | usb.o fb.o | 7 | usb.o fb.o io.o |
8 | obj-m := | 8 | obj-m := |
9 | obj-n := | 9 | obj-n := |
10 | obj- := | 10 | obj- := |
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index f4dff423ae7c..20e8db5fe32a 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c | |||
@@ -258,12 +258,12 @@ static void __init __omap2_set_globals(void) | |||
258 | #if defined(CONFIG_ARCH_OMAP2420) | 258 | #if defined(CONFIG_ARCH_OMAP2420) |
259 | 259 | ||
260 | static struct omap_globals omap242x_globals = { | 260 | static struct omap_globals omap242x_globals = { |
261 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x48014000), | 261 | .tap = OMAP2_IO_ADDRESS(0x48014000), |
262 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE), | 262 | .sdrc = OMAP2_IO_ADDRESS(OMAP2420_SDRC_BASE), |
263 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE), | 263 | .sms = OMAP2_IO_ADDRESS(OMAP2420_SMS_BASE), |
264 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_CTRL_BASE), | 264 | .ctrl = OMAP2_IO_ADDRESS(OMAP2420_CTRL_BASE), |
265 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE), | 265 | .prm = OMAP2_IO_ADDRESS(OMAP2420_PRM_BASE), |
266 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2420_CM_BASE), | 266 | .cm = OMAP2_IO_ADDRESS(OMAP2420_CM_BASE), |
267 | }; | 267 | }; |
268 | 268 | ||
269 | void __init omap2_set_globals_242x(void) | 269 | void __init omap2_set_globals_242x(void) |
@@ -276,12 +276,12 @@ void __init omap2_set_globals_242x(void) | |||
276 | #if defined(CONFIG_ARCH_OMAP2430) | 276 | #if defined(CONFIG_ARCH_OMAP2430) |
277 | 277 | ||
278 | static struct omap_globals omap243x_globals = { | 278 | static struct omap_globals omap243x_globals = { |
279 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x4900a000), | 279 | .tap = OMAP2_IO_ADDRESS(0x4900a000), |
280 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE), | 280 | .sdrc = OMAP2_IO_ADDRESS(OMAP243X_SDRC_BASE), |
281 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE), | 281 | .sms = OMAP2_IO_ADDRESS(OMAP243X_SMS_BASE), |
282 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE), | 282 | .ctrl = OMAP2_IO_ADDRESS(OMAP243X_CTRL_BASE), |
283 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE), | 283 | .prm = OMAP2_IO_ADDRESS(OMAP2430_PRM_BASE), |
284 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP2430_CM_BASE), | 284 | .cm = OMAP2_IO_ADDRESS(OMAP2430_CM_BASE), |
285 | }; | 285 | }; |
286 | 286 | ||
287 | void __init omap2_set_globals_243x(void) | 287 | void __init omap2_set_globals_243x(void) |
@@ -294,12 +294,12 @@ void __init omap2_set_globals_243x(void) | |||
294 | #if defined(CONFIG_ARCH_OMAP3430) | 294 | #if defined(CONFIG_ARCH_OMAP3430) |
295 | 295 | ||
296 | static struct omap_globals omap343x_globals = { | 296 | static struct omap_globals omap343x_globals = { |
297 | .tap = (__force void __iomem *)OMAP2_IO_ADDRESS(0x4830A000), | 297 | .tap = OMAP2_IO_ADDRESS(0x4830A000), |
298 | .sdrc = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), | 298 | .sdrc = OMAP2_IO_ADDRESS(OMAP343X_SDRC_BASE), |
299 | .sms = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), | 299 | .sms = OMAP2_IO_ADDRESS(OMAP343X_SMS_BASE), |
300 | .ctrl = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), | 300 | .ctrl = OMAP2_IO_ADDRESS(OMAP343X_CTRL_BASE), |
301 | .prm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), | 301 | .prm = OMAP2_IO_ADDRESS(OMAP3430_PRM_BASE), |
302 | .cm = (__force void __iomem *)OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), | 302 | .cm = OMAP2_IO_ADDRESS(OMAP3430_CM_BASE), |
303 | }; | 303 | }; |
304 | 304 | ||
305 | void __init omap2_set_globals_343x(void) | 305 | void __init omap2_set_globals_343x(void) |
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index a63b644ad305..50f8b4ad9a09 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -1233,7 +1233,7 @@ int omap_request_dma_chain(int dev_id, const char *dev_name, | |||
1233 | /* request and reserve DMA channels for the chain */ | 1233 | /* request and reserve DMA channels for the chain */ |
1234 | for (i = 0; i < no_of_chans; i++) { | 1234 | for (i = 0; i < no_of_chans; i++) { |
1235 | err = omap_request_dma(dev_id, dev_name, | 1235 | err = omap_request_dma(dev_id, dev_name, |
1236 | callback, 0, &channels[i]); | 1236 | callback, NULL, &channels[i]); |
1237 | if (err < 0) { | 1237 | if (err < 0) { |
1238 | int j; | 1238 | int j; |
1239 | for (j = 0; j < i; j++) | 1239 | for (j = 0; j < i; j++) |
@@ -2297,13 +2297,13 @@ static int __init omap_init_dma(void) | |||
2297 | int ch, r; | 2297 | int ch, r; |
2298 | 2298 | ||
2299 | if (cpu_class_is_omap1()) { | 2299 | if (cpu_class_is_omap1()) { |
2300 | omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP1_DMA_BASE); | 2300 | omap_dma_base = IO_ADDRESS(OMAP1_DMA_BASE); |
2301 | dma_lch_count = OMAP1_LOGICAL_DMA_CH_COUNT; | 2301 | dma_lch_count = OMAP1_LOGICAL_DMA_CH_COUNT; |
2302 | } else if (cpu_is_omap24xx()) { | 2302 | } else if (cpu_is_omap24xx()) { |
2303 | omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP24XX_DMA4_BASE); | 2303 | omap_dma_base = IO_ADDRESS(OMAP24XX_DMA4_BASE); |
2304 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; | 2304 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; |
2305 | } else if (cpu_is_omap34xx()) { | 2305 | } else if (cpu_is_omap34xx()) { |
2306 | omap_dma_base = (void __iomem *)IO_ADDRESS(OMAP34XX_DMA4_BASE); | 2306 | omap_dma_base = IO_ADDRESS(OMAP34XX_DMA4_BASE); |
2307 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; | 2307 | dma_lch_count = OMAP_DMA4_LOGICAL_DMA_CH_COUNT; |
2308 | } else { | 2308 | } else { |
2309 | pr_err("DMA init failed for unsupported omap\n"); | 2309 | pr_err("DMA init failed for unsupported omap\n"); |
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 743a4abcd85d..df61ad247dc2 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
@@ -693,7 +693,7 @@ int __init omap_dm_timer_init(void) | |||
693 | 693 | ||
694 | for (i = 0; i < dm_timer_count; i++) { | 694 | for (i = 0; i < dm_timer_count; i++) { |
695 | timer = &dm_timers[i]; | 695 | timer = &dm_timers[i]; |
696 | timer->io_base = (void __iomem *)io_p2v(timer->phys_base); | 696 | timer->io_base = IO_ADDRESS(timer->phys_base); |
697 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 697 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
698 | if (cpu_class_is_omap2()) { | 698 | if (cpu_class_is_omap2()) { |
699 | char clk_name[16]; | 699 | char clk_name[16]; |
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 3e76ee2bc731..5de70d650922 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
@@ -29,7 +29,7 @@ | |||
29 | /* | 29 | /* |
30 | * OMAP1510 GPIO registers | 30 | * OMAP1510 GPIO registers |
31 | */ | 31 | */ |
32 | #define OMAP1510_GPIO_BASE (void __iomem *)0xfffce000 | 32 | #define OMAP1510_GPIO_BASE IO_ADDRESS(0xfffce000) |
33 | #define OMAP1510_GPIO_DATA_INPUT 0x00 | 33 | #define OMAP1510_GPIO_DATA_INPUT 0x00 |
34 | #define OMAP1510_GPIO_DATA_OUTPUT 0x04 | 34 | #define OMAP1510_GPIO_DATA_OUTPUT 0x04 |
35 | #define OMAP1510_GPIO_DIR_CONTROL 0x08 | 35 | #define OMAP1510_GPIO_DIR_CONTROL 0x08 |
@@ -43,10 +43,10 @@ | |||
43 | /* | 43 | /* |
44 | * OMAP1610 specific GPIO registers | 44 | * OMAP1610 specific GPIO registers |
45 | */ | 45 | */ |
46 | #define OMAP1610_GPIO1_BASE (void __iomem *)0xfffbe400 | 46 | #define OMAP1610_GPIO1_BASE IO_ADDRESS(0xfffbe400) |
47 | #define OMAP1610_GPIO2_BASE (void __iomem *)0xfffbec00 | 47 | #define OMAP1610_GPIO2_BASE IO_ADDRESS(0xfffbec00) |
48 | #define OMAP1610_GPIO3_BASE (void __iomem *)0xfffbb400 | 48 | #define OMAP1610_GPIO3_BASE IO_ADDRESS(0xfffbb400) |
49 | #define OMAP1610_GPIO4_BASE (void __iomem *)0xfffbbc00 | 49 | #define OMAP1610_GPIO4_BASE IO_ADDRESS(0xfffbbc00) |
50 | #define OMAP1610_GPIO_REVISION 0x0000 | 50 | #define OMAP1610_GPIO_REVISION 0x0000 |
51 | #define OMAP1610_GPIO_SYSCONFIG 0x0010 | 51 | #define OMAP1610_GPIO_SYSCONFIG 0x0010 |
52 | #define OMAP1610_GPIO_SYSSTATUS 0x0014 | 52 | #define OMAP1610_GPIO_SYSSTATUS 0x0014 |
@@ -68,12 +68,12 @@ | |||
68 | /* | 68 | /* |
69 | * OMAP730 specific GPIO registers | 69 | * OMAP730 specific GPIO registers |
70 | */ | 70 | */ |
71 | #define OMAP730_GPIO1_BASE (void __iomem *)0xfffbc000 | 71 | #define OMAP730_GPIO1_BASE IO_ADDRESS(0xfffbc000) |
72 | #define OMAP730_GPIO2_BASE (void __iomem *)0xfffbc800 | 72 | #define OMAP730_GPIO2_BASE IO_ADDRESS(0xfffbc800) |
73 | #define OMAP730_GPIO3_BASE (void __iomem *)0xfffbd000 | 73 | #define OMAP730_GPIO3_BASE IO_ADDRESS(0xfffbd000) |
74 | #define OMAP730_GPIO4_BASE (void __iomem *)0xfffbd800 | 74 | #define OMAP730_GPIO4_BASE IO_ADDRESS(0xfffbd800) |
75 | #define OMAP730_GPIO5_BASE (void __iomem *)0xfffbe000 | 75 | #define OMAP730_GPIO5_BASE IO_ADDRESS(0xfffbe000) |
76 | #define OMAP730_GPIO6_BASE (void __iomem *)0xfffbe800 | 76 | #define OMAP730_GPIO6_BASE IO_ADDRESS(0xfffbe800) |
77 | #define OMAP730_GPIO_DATA_INPUT 0x00 | 77 | #define OMAP730_GPIO_DATA_INPUT 0x00 |
78 | #define OMAP730_GPIO_DATA_OUTPUT 0x04 | 78 | #define OMAP730_GPIO_DATA_OUTPUT 0x04 |
79 | #define OMAP730_GPIO_DIR_CONTROL 0x08 | 79 | #define OMAP730_GPIO_DIR_CONTROL 0x08 |
@@ -84,16 +84,16 @@ | |||
84 | /* | 84 | /* |
85 | * omap24xx specific GPIO registers | 85 | * omap24xx specific GPIO registers |
86 | */ | 86 | */ |
87 | #define OMAP242X_GPIO1_BASE (void __iomem *)0x48018000 | 87 | #define OMAP242X_GPIO1_BASE IO_ADDRESS(0x48018000) |
88 | #define OMAP242X_GPIO2_BASE (void __iomem *)0x4801a000 | 88 | #define OMAP242X_GPIO2_BASE IO_ADDRESS(0x4801a000) |
89 | #define OMAP242X_GPIO3_BASE (void __iomem *)0x4801c000 | 89 | #define OMAP242X_GPIO3_BASE IO_ADDRESS(0x4801c000) |
90 | #define OMAP242X_GPIO4_BASE (void __iomem *)0x4801e000 | 90 | #define OMAP242X_GPIO4_BASE IO_ADDRESS(0x4801e000) |
91 | 91 | ||
92 | #define OMAP243X_GPIO1_BASE (void __iomem *)0x4900C000 | 92 | #define OMAP243X_GPIO1_BASE IO_ADDRESS(0x4900C000) |
93 | #define OMAP243X_GPIO2_BASE (void __iomem *)0x4900E000 | 93 | #define OMAP243X_GPIO2_BASE IO_ADDRESS(0x4900E000) |
94 | #define OMAP243X_GPIO3_BASE (void __iomem *)0x49010000 | 94 | #define OMAP243X_GPIO3_BASE IO_ADDRESS(0x49010000) |
95 | #define OMAP243X_GPIO4_BASE (void __iomem *)0x49012000 | 95 | #define OMAP243X_GPIO4_BASE IO_ADDRESS(0x49012000) |
96 | #define OMAP243X_GPIO5_BASE (void __iomem *)0x480B6000 | 96 | #define OMAP243X_GPIO5_BASE IO_ADDRESS(0x480B6000) |
97 | 97 | ||
98 | #define OMAP24XX_GPIO_REVISION 0x0000 | 98 | #define OMAP24XX_GPIO_REVISION 0x0000 |
99 | #define OMAP24XX_GPIO_SYSCONFIG 0x0010 | 99 | #define OMAP24XX_GPIO_SYSCONFIG 0x0010 |
@@ -123,13 +123,14 @@ | |||
123 | * omap34xx specific GPIO registers | 123 | * omap34xx specific GPIO registers |
124 | */ | 124 | */ |
125 | 125 | ||
126 | #define OMAP34XX_GPIO1_BASE (void __iomem *)0x48310000 | 126 | #define OMAP34XX_GPIO1_BASE IO_ADDRESS(0x48310000) |
127 | #define OMAP34XX_GPIO2_BASE (void __iomem *)0x49050000 | 127 | #define OMAP34XX_GPIO2_BASE IO_ADDRESS(0x49050000) |
128 | #define OMAP34XX_GPIO3_BASE (void __iomem *)0x49052000 | 128 | #define OMAP34XX_GPIO3_BASE IO_ADDRESS(0x49052000) |
129 | #define OMAP34XX_GPIO4_BASE (void __iomem *)0x49054000 | 129 | #define OMAP34XX_GPIO4_BASE IO_ADDRESS(0x49054000) |
130 | #define OMAP34XX_GPIO5_BASE (void __iomem *)0x49056000 | 130 | #define OMAP34XX_GPIO5_BASE IO_ADDRESS(0x49056000) |
131 | #define OMAP34XX_GPIO6_BASE (void __iomem *)0x49058000 | 131 | #define OMAP34XX_GPIO6_BASE IO_ADDRESS(0x49058000) |
132 | 132 | ||
133 | #define OMAP_MPUIO_VBASE IO_ADDRESS(OMAP_MPUIO_BASE) | ||
133 | 134 | ||
134 | struct gpio_bank { | 135 | struct gpio_bank { |
135 | void __iomem *base; | 136 | void __iomem *base; |
@@ -161,7 +162,7 @@ struct gpio_bank { | |||
161 | 162 | ||
162 | #ifdef CONFIG_ARCH_OMAP16XX | 163 | #ifdef CONFIG_ARCH_OMAP16XX |
163 | static struct gpio_bank gpio_bank_1610[5] = { | 164 | static struct gpio_bank gpio_bank_1610[5] = { |
164 | { OMAP_MPUIO_BASE, INT_MPUIO, IH_MPUIO_BASE, METHOD_MPUIO}, | 165 | { OMAP_MPUIO_VBASE, INT_MPUIO, IH_MPUIO_BASE, METHOD_MPUIO}, |
165 | { OMAP1610_GPIO1_BASE, INT_GPIO_BANK1, IH_GPIO_BASE, METHOD_GPIO_1610 }, | 166 | { OMAP1610_GPIO1_BASE, INT_GPIO_BANK1, IH_GPIO_BASE, METHOD_GPIO_1610 }, |
166 | { OMAP1610_GPIO2_BASE, INT_1610_GPIO_BANK2, IH_GPIO_BASE + 16, METHOD_GPIO_1610 }, | 167 | { OMAP1610_GPIO2_BASE, INT_1610_GPIO_BANK2, IH_GPIO_BASE + 16, METHOD_GPIO_1610 }, |
167 | { OMAP1610_GPIO3_BASE, INT_1610_GPIO_BANK3, IH_GPIO_BASE + 32, METHOD_GPIO_1610 }, | 168 | { OMAP1610_GPIO3_BASE, INT_1610_GPIO_BANK3, IH_GPIO_BASE + 32, METHOD_GPIO_1610 }, |
@@ -171,14 +172,14 @@ static struct gpio_bank gpio_bank_1610[5] = { | |||
171 | 172 | ||
172 | #ifdef CONFIG_ARCH_OMAP15XX | 173 | #ifdef CONFIG_ARCH_OMAP15XX |
173 | static struct gpio_bank gpio_bank_1510[2] = { | 174 | static struct gpio_bank gpio_bank_1510[2] = { |
174 | { OMAP_MPUIO_BASE, INT_MPUIO, IH_MPUIO_BASE, METHOD_MPUIO }, | 175 | { OMAP_MPUIO_VBASE, INT_MPUIO, IH_MPUIO_BASE, METHOD_MPUIO }, |
175 | { OMAP1510_GPIO_BASE, INT_GPIO_BANK1, IH_GPIO_BASE, METHOD_GPIO_1510 } | 176 | { OMAP1510_GPIO_BASE, INT_GPIO_BANK1, IH_GPIO_BASE, METHOD_GPIO_1510 } |
176 | }; | 177 | }; |
177 | #endif | 178 | #endif |
178 | 179 | ||
179 | #ifdef CONFIG_ARCH_OMAP730 | 180 | #ifdef CONFIG_ARCH_OMAP730 |
180 | static struct gpio_bank gpio_bank_730[7] = { | 181 | static struct gpio_bank gpio_bank_730[7] = { |
181 | { OMAP_MPUIO_BASE, INT_730_MPUIO, IH_MPUIO_BASE, METHOD_MPUIO }, | 182 | { OMAP_MPUIO_VBASE, INT_730_MPUIO, IH_MPUIO_BASE, METHOD_MPUIO }, |
182 | { OMAP730_GPIO1_BASE, INT_730_GPIO_BANK1, IH_GPIO_BASE, METHOD_GPIO_730 }, | 183 | { OMAP730_GPIO1_BASE, INT_730_GPIO_BANK1, IH_GPIO_BASE, METHOD_GPIO_730 }, |
183 | { OMAP730_GPIO2_BASE, INT_730_GPIO_BANK2, IH_GPIO_BASE + 32, METHOD_GPIO_730 }, | 184 | { OMAP730_GPIO2_BASE, INT_730_GPIO_BANK2, IH_GPIO_BASE + 32, METHOD_GPIO_730 }, |
184 | { OMAP730_GPIO3_BASE, INT_730_GPIO_BANK3, IH_GPIO_BASE + 64, METHOD_GPIO_730 }, | 185 | { OMAP730_GPIO3_BASE, INT_730_GPIO_BANK3, IH_GPIO_BASE + 64, METHOD_GPIO_730 }, |
@@ -1393,7 +1394,7 @@ static int __init _omap_gpio_init(void) | |||
1393 | 1394 | ||
1394 | gpio_bank_count = 5; | 1395 | gpio_bank_count = 5; |
1395 | gpio_bank = gpio_bank_1610; | 1396 | gpio_bank = gpio_bank_1610; |
1396 | rev = omap_readw(gpio_bank[1].base + OMAP1610_GPIO_REVISION); | 1397 | rev = __raw_readw(gpio_bank[1].base + OMAP1610_GPIO_REVISION); |
1397 | printk(KERN_INFO "OMAP GPIO hardware version %d.%d\n", | 1398 | printk(KERN_INFO "OMAP GPIO hardware version %d.%d\n", |
1398 | (rev >> 4) & 0x0f, rev & 0x0f); | 1399 | (rev >> 4) & 0x0f, rev & 0x0f); |
1399 | } | 1400 | } |
@@ -1412,7 +1413,7 @@ static int __init _omap_gpio_init(void) | |||
1412 | 1413 | ||
1413 | gpio_bank_count = 4; | 1414 | gpio_bank_count = 4; |
1414 | gpio_bank = gpio_bank_242x; | 1415 | gpio_bank = gpio_bank_242x; |
1415 | rev = omap_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION); | 1416 | rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION); |
1416 | printk(KERN_INFO "OMAP242x GPIO hardware version %d.%d\n", | 1417 | printk(KERN_INFO "OMAP242x GPIO hardware version %d.%d\n", |
1417 | (rev >> 4) & 0x0f, rev & 0x0f); | 1418 | (rev >> 4) & 0x0f, rev & 0x0f); |
1418 | } | 1419 | } |
@@ -1421,7 +1422,7 @@ static int __init _omap_gpio_init(void) | |||
1421 | 1422 | ||
1422 | gpio_bank_count = 5; | 1423 | gpio_bank_count = 5; |
1423 | gpio_bank = gpio_bank_243x; | 1424 | gpio_bank = gpio_bank_243x; |
1424 | rev = omap_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION); | 1425 | rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION); |
1425 | printk(KERN_INFO "OMAP243x GPIO hardware version %d.%d\n", | 1426 | printk(KERN_INFO "OMAP243x GPIO hardware version %d.%d\n", |
1426 | (rev >> 4) & 0x0f, rev & 0x0f); | 1427 | (rev >> 4) & 0x0f, rev & 0x0f); |
1427 | } | 1428 | } |
@@ -1432,7 +1433,7 @@ static int __init _omap_gpio_init(void) | |||
1432 | 1433 | ||
1433 | gpio_bank_count = OMAP34XX_NR_GPIOS; | 1434 | gpio_bank_count = OMAP34XX_NR_GPIOS; |
1434 | gpio_bank = gpio_bank_34xx; | 1435 | gpio_bank = gpio_bank_34xx; |
1435 | rev = omap_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION); | 1436 | rev = __raw_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION); |
1436 | printk(KERN_INFO "OMAP34xx GPIO hardware version %d.%d\n", | 1437 | printk(KERN_INFO "OMAP34xx GPIO hardware version %d.%d\n", |
1437 | (rev >> 4) & 0x0f, rev & 0x0f); | 1438 | (rev >> 4) & 0x0f, rev & 0x0f); |
1438 | } | 1439 | } |
@@ -1441,10 +1442,9 @@ static int __init _omap_gpio_init(void) | |||
1441 | int j, gpio_count = 16; | 1442 | int j, gpio_count = 16; |
1442 | 1443 | ||
1443 | bank = &gpio_bank[i]; | 1444 | bank = &gpio_bank[i]; |
1444 | bank->base = IO_ADDRESS(bank->base); | ||
1445 | spin_lock_init(&bank->lock); | 1445 | spin_lock_init(&bank->lock); |
1446 | if (bank_is_mpuio(bank)) | 1446 | if (bank_is_mpuio(bank)) |
1447 | omap_writew(0xFFFF, OMAP_MPUIO_BASE + OMAP_MPUIO_GPIO_MASKIT); | 1447 | __raw_writew(0xffff, bank->base + OMAP_MPUIO_GPIO_MASKIT); |
1448 | if (cpu_is_omap15xx() && bank->method == METHOD_GPIO_1510) { | 1448 | if (cpu_is_omap15xx() && bank->method == METHOD_GPIO_1510) { |
1449 | __raw_writew(0xffff, bank->base + OMAP1510_GPIO_INT_MASK); | 1449 | __raw_writew(0xffff, bank->base + OMAP1510_GPIO_INT_MASK); |
1450 | __raw_writew(0x0000, bank->base + OMAP1510_GPIO_INT_STATUS); | 1450 | __raw_writew(0x0000, bank->base + OMAP1510_GPIO_INT_STATUS); |
@@ -1488,7 +1488,7 @@ static int __init _omap_gpio_init(void) | |||
1488 | bank->chip.set = gpio_set; | 1488 | bank->chip.set = gpio_set; |
1489 | if (bank_is_mpuio(bank)) { | 1489 | if (bank_is_mpuio(bank)) { |
1490 | bank->chip.label = "mpuio"; | 1490 | bank->chip.label = "mpuio"; |
1491 | #ifdef CONFIG_ARCH_OMAP1 | 1491 | #ifdef CONFIG_ARCH_OMAP16XX |
1492 | bank->chip.dev = &omap_mpuio_device.dev; | 1492 | bank->chip.dev = &omap_mpuio_device.dev; |
1493 | #endif | 1493 | #endif |
1494 | bank->chip.base = OMAP_MPUIO(0); | 1494 | bank->chip.base = OMAP_MPUIO(0); |
diff --git a/arch/arm/plat-omap/include/mach/control.h b/arch/arm/plat-omap/include/mach/control.h index e3fd62d9a995..ee378d254cbd 100644 --- a/arch/arm/plat-omap/include/mach/control.h +++ b/arch/arm/plat-omap/include/mach/control.h | |||
@@ -19,11 +19,11 @@ | |||
19 | #include <mach/io.h> | 19 | #include <mach/io.h> |
20 | 20 | ||
21 | #define OMAP242X_CTRL_REGADDR(reg) \ | 21 | #define OMAP242X_CTRL_REGADDR(reg) \ |
22 | (void __iomem *)IO_ADDRESS(OMAP242X_CTRL_BASE + (reg)) | 22 | IO_ADDRESS(OMAP242X_CTRL_BASE + (reg)) |
23 | #define OMAP243X_CTRL_REGADDR(reg) \ | 23 | #define OMAP243X_CTRL_REGADDR(reg) \ |
24 | (void __iomem *)IO_ADDRESS(OMAP243X_CTRL_BASE + (reg)) | 24 | IO_ADDRESS(OMAP243X_CTRL_BASE + (reg)) |
25 | #define OMAP343X_CTRL_REGADDR(reg) \ | 25 | #define OMAP343X_CTRL_REGADDR(reg) \ |
26 | (void __iomem *)IO_ADDRESS(OMAP343X_CTRL_BASE + (reg)) | 26 | IO_ADDRESS(OMAP343X_CTRL_BASE + (reg)) |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * As elsewhere, the "OMAP2_" prefix indicates that the macro is valid for | 29 | * As elsewhere, the "OMAP2_" prefix indicates that the macro is valid for |
diff --git a/arch/arm/plat-omap/include/mach/fpga.h b/arch/arm/plat-omap/include/mach/fpga.h index c92e4b42b289..f1864a652f7a 100644 --- a/arch/arm/plat-omap/include/mach/fpga.h +++ b/arch/arm/plat-omap/include/mach/fpga.h | |||
@@ -34,9 +34,9 @@ extern void omap1510_fpga_init_irq(void); | |||
34 | * --------------------------------------------------------------------------- | 34 | * --------------------------------------------------------------------------- |
35 | */ | 35 | */ |
36 | /* maps in the FPGA registers and the ETHR registers */ | 36 | /* maps in the FPGA registers and the ETHR registers */ |
37 | #define H2P2_DBG_FPGA_BASE 0xE8000000 /* VA */ | 37 | #define H2P2_DBG_FPGA_BASE IOMEM(0xE8000000) /* VA */ |
38 | #define H2P2_DBG_FPGA_SIZE SZ_4K /* SIZE */ | 38 | #define H2P2_DBG_FPGA_SIZE SZ_4K /* SIZE */ |
39 | #define H2P2_DBG_FPGA_START 0x04000000 /* PA */ | 39 | #define H2P2_DBG_FPGA_START 0x04000000 /* PA */ |
40 | 40 | ||
41 | #define H2P2_DBG_FPGA_ETHR_START (H2P2_DBG_FPGA_START + 0x300) | 41 | #define H2P2_DBG_FPGA_ETHR_START (H2P2_DBG_FPGA_START + 0x300) |
42 | #define H2P2_DBG_FPGA_FPGA_REV (H2P2_DBG_FPGA_BASE + 0x10) /* FPGA Revision */ | 42 | #define H2P2_DBG_FPGA_FPGA_REV (H2P2_DBG_FPGA_BASE + 0x10) /* FPGA Revision */ |
@@ -85,9 +85,9 @@ struct h2p2_dbg_fpga { | |||
85 | * OMAP-1510 FPGA | 85 | * OMAP-1510 FPGA |
86 | * --------------------------------------------------------------------------- | 86 | * --------------------------------------------------------------------------- |
87 | */ | 87 | */ |
88 | #define OMAP1510_FPGA_BASE 0xE8000000 /* Virtual */ | 88 | #define OMAP1510_FPGA_BASE IOMEM(0xE8000000) /* VA */ |
89 | #define OMAP1510_FPGA_SIZE SZ_4K | 89 | #define OMAP1510_FPGA_SIZE SZ_4K |
90 | #define OMAP1510_FPGA_START 0x08000000 /* Physical */ | 90 | #define OMAP1510_FPGA_START 0x08000000 /* PA */ |
91 | 91 | ||
92 | /* Revision */ | 92 | /* Revision */ |
93 | #define OMAP1510_FPGA_REV_LOW (OMAP1510_FPGA_BASE + 0x0) | 93 | #define OMAP1510_FPGA_REV_LOW (OMAP1510_FPGA_BASE + 0x0) |
diff --git a/arch/arm/plat-omap/include/mach/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h index 94ce2780e8ee..4cb818da672c 100644 --- a/arch/arm/plat-omap/include/mach/gpio.h +++ b/arch/arm/plat-omap/include/mach/gpio.h | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <mach/irqs.h> | 29 | #include <mach/irqs.h> |
30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
31 | 31 | ||
32 | #define OMAP_MPUIO_BASE (void __iomem *)0xfffb5000 | 32 | #define OMAP_MPUIO_BASE 0xfffb5000 |
33 | 33 | ||
34 | #ifdef CONFIG_ARCH_OMAP730 | 34 | #ifdef CONFIG_ARCH_OMAP730 |
35 | #define OMAP_MPUIO_INPUT_LATCH 0x00 | 35 | #define OMAP_MPUIO_INPUT_LATCH 0x00 |
diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h index 07f5d7f21528..abb01e471c4c 100644 --- a/arch/arm/plat-omap/include/mach/hardware.h +++ b/arch/arm/plat-omap/include/mach/hardware.h | |||
@@ -89,7 +89,7 @@ | |||
89 | #define DPLL_CTL (0xfffecf00) | 89 | #define DPLL_CTL (0xfffecf00) |
90 | 90 | ||
91 | /* DSP clock control. Must use __raw_readw() and __raw_writew() with these */ | 91 | /* DSP clock control. Must use __raw_readw() and __raw_writew() with these */ |
92 | #define DSP_CONFIG_REG_BASE (0xe1008000) | 92 | #define DSP_CONFIG_REG_BASE IOMEM(0xe1008000) |
93 | #define DSP_CKCTL (DSP_CONFIG_REG_BASE + 0x0) | 93 | #define DSP_CKCTL (DSP_CONFIG_REG_BASE + 0x0) |
94 | #define DSP_IDLECT1 (DSP_CONFIG_REG_BASE + 0x4) | 94 | #define DSP_IDLECT1 (DSP_CONFIG_REG_BASE + 0x4) |
95 | #define DSP_IDLECT2 (DSP_CONFIG_REG_BASE + 0x8) | 95 | #define DSP_IDLECT2 (DSP_CONFIG_REG_BASE + 0x8) |
diff --git a/arch/arm/plat-omap/include/mach/io.h b/arch/arm/plat-omap/include/mach/io.h index 2a30b7d88cde..dd0cf069431d 100644 --- a/arch/arm/plat-omap/include/mach/io.h +++ b/arch/arm/plat-omap/include/mach/io.h | |||
@@ -55,14 +55,13 @@ | |||
55 | 55 | ||
56 | #if defined(CONFIG_ARCH_OMAP1) | 56 | #if defined(CONFIG_ARCH_OMAP1) |
57 | 57 | ||
58 | #define IO_PHYS 0xFFFB0000 | 58 | #define IO_PHYS 0xFFFB0000 |
59 | #define IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */ | 59 | #define IO_OFFSET 0x01000000 /* Virtual IO = 0xfefb0000 */ |
60 | #define IO_SIZE 0x40000 | 60 | #define IO_SIZE 0x40000 |
61 | #define IO_VIRT (IO_PHYS - IO_OFFSET) | 61 | #define IO_VIRT (IO_PHYS - IO_OFFSET) |
62 | #define IO_ADDRESS(pa) ((pa) - IO_OFFSET) | 62 | #define __IO_ADDRESS(pa) ((pa) - IO_OFFSET) |
63 | #define OMAP1_IO_ADDRESS(pa) ((pa) - IO_OFFSET) | 63 | #define __OMAP1_IO_ADDRESS(pa) ((pa) - IO_OFFSET) |
64 | #define io_p2v(pa) ((pa) - IO_OFFSET) | 64 | #define io_v2p(va) ((va) + IO_OFFSET) |
65 | #define io_v2p(va) ((va) + IO_OFFSET) | ||
66 | 65 | ||
67 | #elif defined(CONFIG_ARCH_OMAP2) | 66 | #elif defined(CONFIG_ARCH_OMAP2) |
68 | 67 | ||
@@ -90,11 +89,10 @@ | |||
90 | 89 | ||
91 | #endif | 90 | #endif |
92 | 91 | ||
93 | #define IO_OFFSET 0x90000000 | 92 | #define IO_OFFSET 0x90000000 |
94 | #define IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ | 93 | #define __IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ |
95 | #define OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ | 94 | #define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ |
96 | #define io_p2v(pa) ((pa) + IO_OFFSET) /* Works for L3 and L4 */ | 95 | #define io_v2p(va) ((va) - IO_OFFSET) /* Works for L3 and L4 */ |
97 | #define io_v2p(va) ((va) - IO_OFFSET) /* Works for L3 and L4 */ | ||
98 | 96 | ||
99 | /* DSP */ | 97 | /* DSP */ |
100 | #define DSP_MEM_24XX_PHYS OMAP2420_DSP_MEM_BASE /* 0x58000000 */ | 98 | #define DSP_MEM_24XX_PHYS OMAP2420_DSP_MEM_BASE /* 0x58000000 */ |
@@ -149,9 +147,8 @@ | |||
149 | 147 | ||
150 | 148 | ||
151 | #define IO_OFFSET 0x90000000 | 149 | #define IO_OFFSET 0x90000000 |
152 | #define IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ | 150 | #define __IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ |
153 | #define OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ | 151 | #define __OMAP2_IO_ADDRESS(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ |
154 | #define io_p2v(pa) ((pa) + IO_OFFSET)/* Works for L3 and L4 */ | ||
155 | #define io_v2p(va) ((va) - IO_OFFSET)/* Works for L3 and L4 */ | 152 | #define io_v2p(va) ((va) - IO_OFFSET)/* Works for L3 and L4 */ |
156 | 153 | ||
157 | /* DSP */ | 154 | /* DSP */ |
@@ -167,7 +164,14 @@ | |||
167 | 164 | ||
168 | #endif | 165 | #endif |
169 | 166 | ||
170 | #ifndef __ASSEMBLER__ | 167 | #define IO_ADDRESS(pa) IOMEM(__IO_ADDRESS(pa)) |
168 | #define OMAP1_IO_ADDRESS(pa) IOMEM(__OMAP1_IO_ADDRESS(pa)) | ||
169 | #define OMAP2_IO_ADDRESS(pa) IOMEM(__OMAP2_IO_ADDRESS(pa)) | ||
170 | |||
171 | #ifdef __ASSEMBLER__ | ||
172 | #define IOMEM(x) x | ||
173 | #else | ||
174 | #define IOMEM(x) ((void __force __iomem *)(x)) | ||
171 | 175 | ||
172 | /* | 176 | /* |
173 | * Functions to access the OMAP IO region | 177 | * Functions to access the OMAP IO region |
@@ -178,13 +182,13 @@ | |||
178 | * - DO NOT use hardcoded virtual addresses to allow changing the | 182 | * - DO NOT use hardcoded virtual addresses to allow changing the |
179 | * IO address space again if needed | 183 | * IO address space again if needed |
180 | */ | 184 | */ |
181 | #define omap_readb(a) (*(volatile unsigned char *)IO_ADDRESS(a)) | 185 | #define omap_readb(a) __raw_readb(IO_ADDRESS(a)) |
182 | #define omap_readw(a) (*(volatile unsigned short *)IO_ADDRESS(a)) | 186 | #define omap_readw(a) __raw_readw(IO_ADDRESS(a)) |
183 | #define omap_readl(a) (*(volatile unsigned int *)IO_ADDRESS(a)) | 187 | #define omap_readl(a) __raw_readl(IO_ADDRESS(a)) |
184 | 188 | ||
185 | #define omap_writeb(v,a) (*(volatile unsigned char *)IO_ADDRESS(a) = (v)) | 189 | #define omap_writeb(v,a) __raw_writeb(v, IO_ADDRESS(a)) |
186 | #define omap_writew(v,a) (*(volatile unsigned short *)IO_ADDRESS(a) = (v)) | 190 | #define omap_writew(v,a) __raw_writew(v, IO_ADDRESS(a)) |
187 | #define omap_writel(v,a) (*(volatile unsigned int *)IO_ADDRESS(a) = (v)) | 191 | #define omap_writel(v,a) __raw_writel(v, IO_ADDRESS(a)) |
188 | 192 | ||
189 | extern void omap1_map_common_io(void); | 193 | extern void omap1_map_common_io(void); |
190 | extern void omap1_init_common_hw(void); | 194 | extern void omap1_init_common_hw(void); |
@@ -192,6 +196,12 @@ extern void omap1_init_common_hw(void); | |||
192 | extern void omap2_map_common_io(void); | 196 | extern void omap2_map_common_io(void); |
193 | extern void omap2_init_common_hw(void); | 197 | extern void omap2_init_common_hw(void); |
194 | 198 | ||
199 | #define __arch_ioremap(p,s,t) omap_ioremap(p,s,t) | ||
200 | #define __arch_iounmap(v) omap_iounmap(v) | ||
201 | |||
202 | void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type); | ||
203 | void omap_iounmap(volatile void __iomem *addr); | ||
204 | |||
195 | #endif | 205 | #endif |
196 | 206 | ||
197 | #endif | 207 | #endif |
diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index 6eb44a92871d..a3074f2fb7ce 100644 --- a/arch/arm/plat-omap/include/mach/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h | |||
@@ -315,7 +315,7 @@ struct omap_mcbsp_ops { | |||
315 | }; | 315 | }; |
316 | 316 | ||
317 | struct omap_mcbsp_platform_data { | 317 | struct omap_mcbsp_platform_data { |
318 | u32 virt_base; | 318 | unsigned long phys_base; |
319 | u8 dma_rx_sync, dma_tx_sync; | 319 | u8 dma_rx_sync, dma_tx_sync; |
320 | u16 rx_irq, tx_irq; | 320 | u16 rx_irq, tx_irq; |
321 | struct omap_mcbsp_ops *ops; | 321 | struct omap_mcbsp_ops *ops; |
@@ -324,7 +324,8 @@ struct omap_mcbsp_platform_data { | |||
324 | 324 | ||
325 | struct omap_mcbsp { | 325 | struct omap_mcbsp { |
326 | struct device *dev; | 326 | struct device *dev; |
327 | u32 io_base; | 327 | unsigned long phys_base; |
328 | void __iomem *io_base; | ||
328 | u8 id; | 329 | u8 id; |
329 | u8 free; | 330 | u8 free; |
330 | omap_mcbsp_word_length rx_word_length; | 331 | omap_mcbsp_word_length rx_word_length; |
diff --git a/arch/arm/plat-omap/include/mach/pm.h b/arch/arm/plat-omap/include/mach/pm.h index bfa09325a5ff..6063e9681de2 100644 --- a/arch/arm/plat-omap/include/mach/pm.h +++ b/arch/arm/plat-omap/include/mach/pm.h | |||
@@ -39,11 +39,11 @@ | |||
39 | * Register and offset definitions to be used in PM assembler code | 39 | * Register and offset definitions to be used in PM assembler code |
40 | * ---------------------------------------------------------------------------- | 40 | * ---------------------------------------------------------------------------- |
41 | */ | 41 | */ |
42 | #define CLKGEN_REG_ASM_BASE io_p2v(0xfffece00) | 42 | #define CLKGEN_REG_ASM_BASE IO_ADDRESS(0xfffece00) |
43 | #define ARM_IDLECT1_ASM_OFFSET 0x04 | 43 | #define ARM_IDLECT1_ASM_OFFSET 0x04 |
44 | #define ARM_IDLECT2_ASM_OFFSET 0x08 | 44 | #define ARM_IDLECT2_ASM_OFFSET 0x08 |
45 | 45 | ||
46 | #define TCMIF_ASM_BASE io_p2v(0xfffecc00) | 46 | #define TCMIF_ASM_BASE IO_ADDRESS(0xfffecc00) |
47 | #define EMIFS_CONFIG_ASM_OFFSET 0x0c | 47 | #define EMIFS_CONFIG_ASM_OFFSET 0x0c |
48 | #define EMIFF_SDRAM_CONFIG_ASM_OFFSET 0x20 | 48 | #define EMIFF_SDRAM_CONFIG_ASM_OFFSET 0x20 |
49 | 49 | ||
diff --git a/arch/arm/plat-omap/include/mach/sdrc.h b/arch/arm/plat-omap/include/mach/sdrc.h index 787b7acec546..d908eb527c8d 100644 --- a/arch/arm/plat-omap/include/mach/sdrc.h +++ b/arch/arm/plat-omap/include/mach/sdrc.h | |||
@@ -63,9 +63,9 @@ | |||
63 | */ | 63 | */ |
64 | 64 | ||
65 | 65 | ||
66 | #define OMAP242X_SMS_REGADDR(reg) (void __iomem *)IO_ADDRESS(OMAP2420_SMS_BASE + reg) | 66 | #define OMAP242X_SMS_REGADDR(reg) IO_ADDRESS(OMAP2420_SMS_BASE + reg) |
67 | #define OMAP243X_SMS_REGADDR(reg) (void __iomem *)IO_ADDRESS(OMAP243X_SMS_BASE + reg) | 67 | #define OMAP243X_SMS_REGADDR(reg) IO_ADDRESS(OMAP243X_SMS_BASE + reg) |
68 | #define OMAP343X_SMS_REGADDR(reg) (void __iomem *)IO_ADDRESS(OMAP343X_SMS_BASE + reg) | 68 | #define OMAP343X_SMS_REGADDR(reg) IO_ADDRESS(OMAP343X_SMS_BASE + reg) |
69 | 69 | ||
70 | /* SMS register offsets - read/write with sms_{read,write}_reg() */ | 70 | /* SMS register offsets - read/write with sms_{read,write}_reg() */ |
71 | 71 | ||
diff --git a/arch/arm/plat-omap/include/mach/serial.h b/arch/arm/plat-omap/include/mach/serial.h index cc6bfa51ccb5..515b89bee966 100644 --- a/arch/arm/plat-omap/include/mach/serial.h +++ b/arch/arm/plat-omap/include/mach/serial.h | |||
@@ -26,12 +26,12 @@ | |||
26 | #define OMAP1510_BASE_BAUD (12000000/16) | 26 | #define OMAP1510_BASE_BAUD (12000000/16) |
27 | #define OMAP16XX_BASE_BAUD (48000000/16) | 27 | #define OMAP16XX_BASE_BAUD (48000000/16) |
28 | 28 | ||
29 | #define is_omap_port(p) ({int __ret = 0; \ | 29 | #define is_omap_port(pt) ({int __ret = 0; \ |
30 | if (p == IO_ADDRESS(OMAP_UART1_BASE) || \ | 30 | if ((pt)->port.mapbase == OMAP_UART1_BASE || \ |
31 | p == IO_ADDRESS(OMAP_UART2_BASE) || \ | 31 | (pt)->port.mapbase == OMAP_UART2_BASE || \ |
32 | p == IO_ADDRESS(OMAP_UART3_BASE)) \ | 32 | (pt)->port.mapbase == OMAP_UART3_BASE) \ |
33 | __ret = 1; \ | 33 | __ret = 1; \ |
34 | __ret; \ | 34 | __ret; \ |
35 | }) | 35 | }) |
36 | 36 | ||
37 | #endif | 37 | #endif |
diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c new file mode 100644 index 000000000000..0253c456ed5b --- /dev/null +++ b/arch/arm/plat-omap/io.c | |||
@@ -0,0 +1,83 @@ | |||
1 | #include <linux/module.h> | ||
2 | #include <linux/io.h> | ||
3 | #include <linux/mm.h> | ||
4 | |||
5 | #include <mach/omap730.h> | ||
6 | #include <mach/omap1510.h> | ||
7 | #include <mach/omap16xx.h> | ||
8 | #include <mach/omap24xx.h> | ||
9 | #include <mach/omap34xx.h> | ||
10 | |||
11 | #define BETWEEN(p,st,sz) ((p) >= (st) && (p) < ((st) + (sz))) | ||
12 | #define XLATE(p,pst,vst) ((void __iomem *)((p) - (pst) + (vst))) | ||
13 | |||
14 | /* | ||
15 | * Intercept ioremap() requests for addresses in our fixed mapping regions. | ||
16 | */ | ||
17 | void __iomem *omap_ioremap(unsigned long p, size_t size, unsigned int type) | ||
18 | { | ||
19 | #ifdef CONFIG_ARCH_OMAP1 | ||
20 | if (cpu_class_is_omap1()) { | ||
21 | if (BETWEEN(p, IO_PHYS, IO_SIZE)) | ||
22 | return XLATE(p, IO_PHYS, IO_VIRT); | ||
23 | } | ||
24 | if (cpu_is_omap730()) { | ||
25 | if (BETWEEN(p, OMAP730_DSP_BASE, OMAP730_DSP_SIZE)) | ||
26 | return XLATE(p, OMAP730_DSP_BASE, OMAP730_DSP_START); | ||
27 | |||
28 | if (BETWEEN(p, OMAP730_DSPREG_BASE, OMAP730_DSPREG_SIZE)) | ||
29 | return XLATE(p, OMAP730_DSPREG_BASE, | ||
30 | OMAP730_DSPREG_START); | ||
31 | } | ||
32 | if (cpu_is_omap15xx()) { | ||
33 | if (BETWEEN(p, OMAP1510_DSP_BASE, OMAP1510_DSP_SIZE)) | ||
34 | return XLATE(p, OMAP1510_DSP_BASE, OMAP1510_DSP_START); | ||
35 | |||
36 | if (BETWEEN(p, OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_SIZE)) | ||
37 | return XLATE(p, OMAP1510_DSPREG_BASE, | ||
38 | OMAP1510_DSPREG_START); | ||
39 | } | ||
40 | if (cpu_is_omap16xx()) { | ||
41 | if (BETWEEN(p, OMAP16XX_DSP_BASE, OMAP16XX_DSP_SIZE)) | ||
42 | return XLATE(p, OMAP16XX_DSP_BASE, OMAP16XX_DSP_START); | ||
43 | |||
44 | if (BETWEEN(p, OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_SIZE)) | ||
45 | return XLATE(p, OMAP16XX_DSPREG_BASE, | ||
46 | OMAP16XX_DSPREG_START); | ||
47 | } | ||
48 | #endif | ||
49 | #ifdef CONFIG_ARCH_OMAP2 | ||
50 | if (cpu_class_is_omap2()) { | ||
51 | if (BETWEEN(p, L3_24XX_PHYS, L3_24XX_SIZE)) | ||
52 | return XLATE(p, L3_24XX_PHYS, L3_24XX_VIRT); | ||
53 | if (BETWEEN(p, L4_24XX_PHYS, L4_24XX_SIZE)) | ||
54 | return XLATE(p, L4_24XX_PHYS, L4_24XX_VIRT); | ||
55 | if (BETWEEN(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_SIZE)) | ||
56 | return XLATE(p, DSP_MEM_24XX_PHYS, DSP_MEM_24XX_VIRT); | ||
57 | if (BETWEEN(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE)) | ||
58 | return XLATE(p, DSP_IPI_24XX_PHYS, DSP_IPI_24XX_SIZE); | ||
59 | if (BETWEEN(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_SIZE)) | ||
60 | return XLATE(p, DSP_MMU_24XX_PHYS, DSP_MMU_24XX_VIRT); | ||
61 | } | ||
62 | #ifdef CONFIG_ARCH_OMAP2430 | ||
63 | if (cpu_is_omap2430()) { | ||
64 | if (BETWEEN(p, L4_WK_243X_PHYS, L4_WK_243X_SIZE)) | ||
65 | return XLATE(L4_WK_243X_PHYS, L4_WK_243X_VIRT); | ||
66 | if (BETWEEN(p, OMAP243X_GPMC_PHYS, OMAP243X_GPMC_SIZE)) | ||
67 | return XLATE(OMAP243X_GPMC_PHYS, OMAP243X_GPMC_VIRT); | ||
68 | } | ||
69 | #endif | ||
70 | #endif | ||
71 | |||
72 | return __arm_ioremap(p, size, type); | ||
73 | } | ||
74 | EXPORT_SYMBOL(omap_ioremap); | ||
75 | |||
76 | void omap_iounmap(volatile void __iomem *addr) | ||
77 | { | ||
78 | unsigned long virt = (unsigned long)addr; | ||
79 | |||
80 | if (virt >= VMALLOC_START && virt < VMALLOC_END) | ||
81 | __iounmap(addr); | ||
82 | } | ||
83 | EXPORT_SYMBOL(omap_iounmap); | ||
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index d0844050f2d2..e63990fd923f 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
@@ -126,7 +126,7 @@ static void omap_mcbsp_rx_dma_callback(int lch, u16 ch_status, void *data) | |||
126 | */ | 126 | */ |
127 | void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) | 127 | void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) |
128 | { | 128 | { |
129 | u32 io_base; | 129 | void __iomem *io_base; |
130 | 130 | ||
131 | if (!omap_mcbsp_check_valid_id(id)) { | 131 | if (!omap_mcbsp_check_valid_id(id)) { |
132 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | 132 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
@@ -134,8 +134,8 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) | |||
134 | } | 134 | } |
135 | 135 | ||
136 | io_base = mcbsp[id].io_base; | 136 | io_base = mcbsp[id].io_base; |
137 | dev_dbg(mcbsp[id].dev, "Configuring McBSP%d io_base: 0x%8x\n", | 137 | dev_dbg(mcbsp[id].dev, "Configuring McBSP%d phys_base: 0x%08lx\n", |
138 | mcbsp[id].id, io_base); | 138 | mcbsp[id].id, mcbsp[id].phys_base); |
139 | 139 | ||
140 | /* We write the given config */ | 140 | /* We write the given config */ |
141 | OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); | 141 | OMAP_MCBSP_WRITE(io_base, SPCR2, config->spcr2); |
@@ -273,7 +273,7 @@ EXPORT_SYMBOL(omap_mcbsp_free); | |||
273 | */ | 273 | */ |
274 | void omap_mcbsp_start(unsigned int id) | 274 | void omap_mcbsp_start(unsigned int id) |
275 | { | 275 | { |
276 | u32 io_base; | 276 | void __iomem *io_base; |
277 | u16 w; | 277 | u16 w; |
278 | 278 | ||
279 | if (!omap_mcbsp_check_valid_id(id)) { | 279 | if (!omap_mcbsp_check_valid_id(id)) { |
@@ -310,7 +310,7 @@ EXPORT_SYMBOL(omap_mcbsp_start); | |||
310 | 310 | ||
311 | void omap_mcbsp_stop(unsigned int id) | 311 | void omap_mcbsp_stop(unsigned int id) |
312 | { | 312 | { |
313 | u32 io_base; | 313 | void __iomem *io_base; |
314 | u16 w; | 314 | u16 w; |
315 | 315 | ||
316 | if (!omap_mcbsp_check_valid_id(id)) { | 316 | if (!omap_mcbsp_check_valid_id(id)) { |
@@ -337,7 +337,7 @@ EXPORT_SYMBOL(omap_mcbsp_stop); | |||
337 | /* polled mcbsp i/o operations */ | 337 | /* polled mcbsp i/o operations */ |
338 | int omap_mcbsp_pollwrite(unsigned int id, u16 buf) | 338 | int omap_mcbsp_pollwrite(unsigned int id, u16 buf) |
339 | { | 339 | { |
340 | u32 base; | 340 | void __iomem *base; |
341 | 341 | ||
342 | if (!omap_mcbsp_check_valid_id(id)) { | 342 | if (!omap_mcbsp_check_valid_id(id)) { |
343 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | 343 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
@@ -379,7 +379,7 @@ EXPORT_SYMBOL(omap_mcbsp_pollwrite); | |||
379 | 379 | ||
380 | int omap_mcbsp_pollread(unsigned int id, u16 *buf) | 380 | int omap_mcbsp_pollread(unsigned int id, u16 *buf) |
381 | { | 381 | { |
382 | u32 base; | 382 | void __iomem *base; |
383 | 383 | ||
384 | if (!omap_mcbsp_check_valid_id(id)) { | 384 | if (!omap_mcbsp_check_valid_id(id)) { |
385 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); | 385 | printk(KERN_ERR "%s: Invalid id (%d)\n", __func__, id + 1); |
@@ -424,7 +424,7 @@ EXPORT_SYMBOL(omap_mcbsp_pollread); | |||
424 | */ | 424 | */ |
425 | void omap_mcbsp_xmit_word(unsigned int id, u32 word) | 425 | void omap_mcbsp_xmit_word(unsigned int id, u32 word) |
426 | { | 426 | { |
427 | u32 io_base; | 427 | void __iomem *io_base; |
428 | omap_mcbsp_word_length word_length; | 428 | omap_mcbsp_word_length word_length; |
429 | 429 | ||
430 | if (!omap_mcbsp_check_valid_id(id)) { | 430 | if (!omap_mcbsp_check_valid_id(id)) { |
@@ -445,7 +445,7 @@ EXPORT_SYMBOL(omap_mcbsp_xmit_word); | |||
445 | 445 | ||
446 | u32 omap_mcbsp_recv_word(unsigned int id) | 446 | u32 omap_mcbsp_recv_word(unsigned int id) |
447 | { | 447 | { |
448 | u32 io_base; | 448 | void __iomem *io_base; |
449 | u16 word_lsb, word_msb = 0; | 449 | u16 word_lsb, word_msb = 0; |
450 | omap_mcbsp_word_length word_length; | 450 | omap_mcbsp_word_length word_length; |
451 | 451 | ||
@@ -469,7 +469,7 @@ EXPORT_SYMBOL(omap_mcbsp_recv_word); | |||
469 | 469 | ||
470 | int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) | 470 | int omap_mcbsp_spi_master_xmit_word_poll(unsigned int id, u32 word) |
471 | { | 471 | { |
472 | u32 io_base; | 472 | void __iomem *io_base; |
473 | omap_mcbsp_word_length tx_word_length; | 473 | omap_mcbsp_word_length tx_word_length; |
474 | omap_mcbsp_word_length rx_word_length; | 474 | omap_mcbsp_word_length rx_word_length; |
475 | u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; | 475 | u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; |
@@ -534,7 +534,8 @@ EXPORT_SYMBOL(omap_mcbsp_spi_master_xmit_word_poll); | |||
534 | 534 | ||
535 | int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) | 535 | int omap_mcbsp_spi_master_recv_word_poll(unsigned int id, u32 *word) |
536 | { | 536 | { |
537 | u32 io_base, clock_word = 0; | 537 | u32 clock_word = 0; |
538 | void __iomem *io_base; | ||
538 | omap_mcbsp_word_length tx_word_length; | 539 | omap_mcbsp_word_length tx_word_length; |
539 | omap_mcbsp_word_length rx_word_length; | 540 | omap_mcbsp_word_length rx_word_length; |
540 | u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; | 541 | u16 spcr2, spcr1, attempts = 0, word_lsb, word_msb = 0; |
@@ -651,7 +652,7 @@ int omap_mcbsp_xmit_buffer(unsigned int id, dma_addr_t buffer, | |||
651 | omap_set_dma_dest_params(mcbsp[id].dma_tx_lch, | 652 | omap_set_dma_dest_params(mcbsp[id].dma_tx_lch, |
652 | src_port, | 653 | src_port, |
653 | OMAP_DMA_AMODE_CONSTANT, | 654 | OMAP_DMA_AMODE_CONSTANT, |
654 | mcbsp[id].io_base + OMAP_MCBSP_REG_DXR1, | 655 | mcbsp[id].phys_base + OMAP_MCBSP_REG_DXR1, |
655 | 0, 0); | 656 | 0, 0); |
656 | 657 | ||
657 | omap_set_dma_src_params(mcbsp[id].dma_tx_lch, | 658 | omap_set_dma_src_params(mcbsp[id].dma_tx_lch, |
@@ -712,7 +713,7 @@ int omap_mcbsp_recv_buffer(unsigned int id, dma_addr_t buffer, | |||
712 | omap_set_dma_src_params(mcbsp[id].dma_rx_lch, | 713 | omap_set_dma_src_params(mcbsp[id].dma_rx_lch, |
713 | src_port, | 714 | src_port, |
714 | OMAP_DMA_AMODE_CONSTANT, | 715 | OMAP_DMA_AMODE_CONSTANT, |
715 | mcbsp[id].io_base + OMAP_MCBSP_REG_DRR1, | 716 | mcbsp[id].phys_base + OMAP_MCBSP_REG_DRR1, |
716 | 0, 0); | 717 | 0, 0); |
717 | 718 | ||
718 | omap_set_dma_dest_params(mcbsp[id].dma_rx_lch, | 719 | omap_set_dma_dest_params(mcbsp[id].dma_rx_lch, |
@@ -830,7 +831,13 @@ static int __init omap_mcbsp_probe(struct platform_device *pdev) | |||
830 | mcbsp[id].dma_tx_lch = -1; | 831 | mcbsp[id].dma_tx_lch = -1; |
831 | mcbsp[id].dma_rx_lch = -1; | 832 | mcbsp[id].dma_rx_lch = -1; |
832 | 833 | ||
833 | mcbsp[id].io_base = pdata->virt_base; | 834 | mcbsp[id].phys_base = pdata->phys_base; |
835 | mcbsp[id].io_base = ioremap(pdata->phys_base, SZ_4K); | ||
836 | if (!mcbsp[id].io_base) { | ||
837 | ret = -ENOMEM; | ||
838 | goto err_ioremap; | ||
839 | } | ||
840 | |||
834 | /* Default I/O is IRQ based */ | 841 | /* Default I/O is IRQ based */ |
835 | mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO; | 842 | mcbsp[id].io_type = OMAP_MCBSP_IRQ_IO; |
836 | mcbsp[id].tx_irq = pdata->tx_irq; | 843 | mcbsp[id].tx_irq = pdata->tx_irq; |
@@ -841,18 +848,22 @@ static int __init omap_mcbsp_probe(struct platform_device *pdev) | |||
841 | if (pdata->clk_name) | 848 | if (pdata->clk_name) |
842 | mcbsp[id].clk = clk_get(&pdev->dev, pdata->clk_name); | 849 | mcbsp[id].clk = clk_get(&pdev->dev, pdata->clk_name); |
843 | if (IS_ERR(mcbsp[id].clk)) { | 850 | if (IS_ERR(mcbsp[id].clk)) { |
844 | mcbsp[id].free = 0; | ||
845 | dev_err(&pdev->dev, | 851 | dev_err(&pdev->dev, |
846 | "Invalid clock configuration for McBSP%d.\n", | 852 | "Invalid clock configuration for McBSP%d.\n", |
847 | mcbsp[id].id); | 853 | mcbsp[id].id); |
848 | ret = -EINVAL; | 854 | ret = PTR_ERR(mcbsp[id].clk); |
849 | goto exit; | 855 | goto err_clk; |
850 | } | 856 | } |
851 | 857 | ||
852 | mcbsp[id].pdata = pdata; | 858 | mcbsp[id].pdata = pdata; |
853 | mcbsp[id].dev = &pdev->dev; | 859 | mcbsp[id].dev = &pdev->dev; |
854 | platform_set_drvdata(pdev, &mcbsp[id]); | 860 | platform_set_drvdata(pdev, &mcbsp[id]); |
861 | return 0; | ||
855 | 862 | ||
863 | err_clk: | ||
864 | iounmap(mcbsp[id].io_base); | ||
865 | err_ioremap: | ||
866 | mcbsp[id].free = 0; | ||
856 | exit: | 867 | exit: |
857 | return ret; | 868 | return ret; |
858 | } | 869 | } |
@@ -871,6 +882,8 @@ static int omap_mcbsp_remove(struct platform_device *pdev) | |||
871 | clk_disable(mcbsp->clk); | 882 | clk_disable(mcbsp->clk); |
872 | clk_put(mcbsp->clk); | 883 | clk_put(mcbsp->clk); |
873 | 884 | ||
885 | iounmap(mcbsp->io_base); | ||
886 | |||
874 | mcbsp->clk = NULL; | 887 | mcbsp->clk = NULL; |
875 | mcbsp->free = 0; | 888 | mcbsp->free = 0; |
876 | mcbsp->dev = NULL; | 889 | mcbsp->dev = NULL; |
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c index 849f8469714a..3caec6bad3eb 100644 --- a/arch/arm/plat-s3c24xx/gpiolib.c +++ b/arch/arm/plat-s3c24xx/gpiolib.c | |||
@@ -39,7 +39,7 @@ static inline struct s3c24xx_gpio_chip *to_s3c_chip(struct gpio_chip *gpc) | |||
39 | * drivers themsevles. | 39 | * drivers themsevles. |
40 | */ | 40 | */ |
41 | 41 | ||
42 | int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) | 42 | static int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) |
43 | { | 43 | { |
44 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 44 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
45 | void __iomem *base = ourchip->base; | 45 | void __iomem *base = ourchip->base; |
@@ -58,7 +58,7 @@ int s3c24xx_gpiolib_input(struct gpio_chip *chip, unsigned offset) | |||
58 | return 0; | 58 | return 0; |
59 | } | 59 | } |
60 | 60 | ||
61 | int s3c24xx_gpiolib_output(struct gpio_chip *chip, | 61 | static int s3c24xx_gpiolib_output(struct gpio_chip *chip, |
62 | unsigned offset, int value) | 62 | unsigned offset, int value) |
63 | { | 63 | { |
64 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 64 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
@@ -86,7 +86,8 @@ int s3c24xx_gpiolib_output(struct gpio_chip *chip, | |||
86 | return 0; | 86 | return 0; |
87 | } | 87 | } |
88 | 88 | ||
89 | void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value) | 89 | static void s3c24xx_gpiolib_set(struct gpio_chip *chip, |
90 | unsigned offset, int value) | ||
90 | { | 91 | { |
91 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 92 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
92 | void __iomem *base = ourchip->base; | 93 | void __iomem *base = ourchip->base; |
@@ -104,7 +105,7 @@ void s3c24xx_gpiolib_set(struct gpio_chip *chip, unsigned offset, int value) | |||
104 | local_irq_restore(flags); | 105 | local_irq_restore(flags); |
105 | } | 106 | } |
106 | 107 | ||
107 | int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset) | 108 | static int s3c24xx_gpiolib_get(struct gpio_chip *chip, unsigned offset) |
108 | { | 109 | { |
109 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); | 110 | struct s3c24xx_gpio_chip *ourchip = to_s3c_chip(chip); |
110 | unsigned long val; | 111 | unsigned long val; |
@@ -150,8 +151,7 @@ static int s3c24xx_gpiolib_banka_output(struct gpio_chip *chip, | |||
150 | return 0; | 151 | return 0; |
151 | } | 152 | } |
152 | 153 | ||
153 | 154 | static struct s3c24xx_gpio_chip gpios[] = { | |
154 | struct s3c24xx_gpio_chip gpios[] = { | ||
155 | [0] = { | 155 | [0] = { |
156 | .base = S3C24XX_GPIO_BASE(S3C2410_GPA0), | 156 | .base = S3C24XX_GPIO_BASE(S3C2410_GPA0), |
157 | .chip = { | 157 | .chip = { |
diff --git a/arch/arm/plat-s3c24xx/pwm-clock.c b/arch/arm/plat-s3c24xx/pwm-clock.c index ccfdc9d7ae4b..306cc9c6f9ef 100644 --- a/arch/arm/plat-s3c24xx/pwm-clock.c +++ b/arch/arm/plat-s3c24xx/pwm-clock.c | |||
@@ -89,7 +89,7 @@ static unsigned long clk_pwm_scaler_getrate(struct clk *clk) | |||
89 | 89 | ||
90 | /* TODO - add set rate calls. */ | 90 | /* TODO - add set rate calls. */ |
91 | 91 | ||
92 | struct clk clk_timer_scaler[] = { | 92 | static struct clk clk_timer_scaler[] = { |
93 | [0] = { | 93 | [0] = { |
94 | .name = "pwm-scaler0", | 94 | .name = "pwm-scaler0", |
95 | .id = -1, | 95 | .id = -1, |
@@ -102,7 +102,7 @@ struct clk clk_timer_scaler[] = { | |||
102 | }, | 102 | }, |
103 | }; | 103 | }; |
104 | 104 | ||
105 | struct clk clk_timer_tclk[] = { | 105 | static struct clk clk_timer_tclk[] = { |
106 | [0] = { | 106 | [0] = { |
107 | .name = "pwm-tclk0", | 107 | .name = "pwm-tclk0", |
108 | .id = -1, | 108 | .id = -1, |
@@ -232,7 +232,7 @@ static int clk_pwm_tdiv_set_rate(struct clk *clk, unsigned long rate) | |||
232 | return 0; | 232 | return 0; |
233 | } | 233 | } |
234 | 234 | ||
235 | struct pwm_tdiv_clk clk_timer_tdiv[] = { | 235 | static struct pwm_tdiv_clk clk_timer_tdiv[] = { |
236 | [0] = { | 236 | [0] = { |
237 | .clk = { | 237 | .clk = { |
238 | .name = "pwm-tdiv", | 238 | .name = "pwm-tdiv", |
diff --git a/arch/arm/plat-s3c24xx/pwm.c b/arch/arm/plat-s3c24xx/pwm.c index 18c4bdc49a05..7a92c938542a 100644 --- a/arch/arm/plat-s3c24xx/pwm.c +++ b/arch/arm/plat-s3c24xx/pwm.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
20 | #include <linux/pwm.h> | 20 | #include <linux/pwm.h> |
21 | 21 | ||
22 | #include <asm/plat-s3c24xx/devs.h> | ||
22 | #include <asm/plat-s3c/regs-timer.h> | 23 | #include <asm/plat-s3c/regs-timer.h> |
23 | 24 | ||
24 | struct pwm_device { | 25 | struct pwm_device { |
@@ -38,7 +39,7 @@ struct pwm_device { | |||
38 | unsigned char pwm_id; | 39 | unsigned char pwm_id; |
39 | }; | 40 | }; |
40 | 41 | ||
41 | #define pwm_dbg(_pwm, msg...) dev_info(&(_pwm)->pdev->dev, msg) | 42 | #define pwm_dbg(_pwm, msg...) dev_dbg(&(_pwm)->pdev->dev, msg) |
42 | 43 | ||
43 | static struct clk *clk_scaler[2]; | 44 | static struct clk *clk_scaler[2]; |
44 | 45 | ||
@@ -168,7 +169,7 @@ void pwm_disable(struct pwm_device *pwm) | |||
168 | 169 | ||
169 | EXPORT_SYMBOL(pwm_disable); | 170 | EXPORT_SYMBOL(pwm_disable); |
170 | 171 | ||
171 | unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq) | 172 | static unsigned long pwm_calc_tin(struct pwm_device *pwm, unsigned long freq) |
172 | { | 173 | { |
173 | unsigned long tin_parent_rate; | 174 | unsigned long tin_parent_rate; |
174 | unsigned int div; | 175 | unsigned int div; |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index f64d25973a37..4154ff1101fa 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -855,6 +855,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" | |||
855 | 855 | ||
856 | config PCI | 856 | config PCI |
857 | bool "PCI support" | 857 | bool "PCI support" |
858 | depends on BROKEN | ||
858 | help | 859 | help |
859 | Support for PCI bus. | 860 | Support for PCI bus. |
860 | 861 | ||
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 9564731ad3a8..eac0533d6e4f 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile | |||
@@ -98,36 +98,20 @@ libs-y += arch/$(ARCH)/lib/ | |||
98 | 98 | ||
99 | drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/ | 99 | drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/ |
100 | 100 | ||
101 | machdirs := $(patsubst %,arch/blackfin/mach-%/, $(machine-y)) | ||
101 | 102 | ||
103 | KBUILD_CFLAGS += -Iarch/$(ARCH)/include/ | ||
104 | KBUILD_CFLAGS += -Iarch/$(ARCH)/mach-$(MACHINE)/include | ||
102 | 105 | ||
103 | # Update machine arch symlinks if something which affects | 106 | KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs)) |
104 | # them changed. We use .mach to indicate when they were updated | ||
105 | # last, otherwise make uses the target directory mtime. | ||
106 | |||
107 | show_mach_symlink = : | ||
108 | quiet_show_mach_symlink = echo ' SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -> include/asm-$(ARCH)/mach' | ||
109 | silent_show_mach_symlink = : | ||
110 | include/asm-blackfin/.mach: $(wildcard include/config/arch/*.h) include/config/auto.conf | ||
111 | @$($(quiet)show_mach_symlink) | ||
112 | ifneq ($(KBUILD_SRC),) | ||
113 | $(Q)mkdir -p include/asm-$(ARCH) | ||
114 | $(Q)ln -fsn $(srctree)/include/asm-$(ARCH)/mach-$(MACHINE) include/asm-$(ARCH)/mach | ||
115 | else | ||
116 | $(Q)ln -fsn mach-$(MACHINE) include/asm-$(ARCH)/mach | ||
117 | endif | ||
118 | @touch $@ | ||
119 | 107 | ||
120 | CLEAN_FILES += \ | 108 | CLEAN_FILES += \ |
121 | include/asm-$(ARCH)/asm-offsets.h \ | 109 | arch/$(ARCH)/include/asm/asm-offsets.h \ |
122 | arch/$(ARCH)/kernel/asm-offsets.s \ | 110 | arch/$(ARCH)/kernel/asm-offsets.s \ |
123 | include/asm-$(ARCH)/mach \ | ||
124 | include/asm-$(ARCH)/.mach | ||
125 | 111 | ||
126 | archprepare: include/asm-blackfin/.mach | ||
127 | archclean: | 112 | archclean: |
128 | $(Q)$(MAKE) $(clean)=$(boot) | 113 | $(Q)$(MAKE) $(clean)=$(boot) |
129 | 114 | ||
130 | |||
131 | INSTALL_PATH ?= /tftpboot | 115 | INSTALL_PATH ?= /tftpboot |
132 | boot := arch/$(ARCH)/boot | 116 | boot := arch/$(ARCH)/boot |
133 | BOOT_TARGETS = vmImage | 117 | BOOT_TARGETS = vmImage |
diff --git a/include/asm-blackfin/.gitignore b/arch/blackfin/include/asm/.gitignore index 7858564a4466..7858564a4466 100644 --- a/include/asm-blackfin/.gitignore +++ b/arch/blackfin/include/asm/.gitignore | |||
diff --git a/include/asm-blackfin/Kbuild b/arch/blackfin/include/asm/Kbuild index 606ecfdcc962..606ecfdcc962 100644 --- a/include/asm-blackfin/Kbuild +++ b/arch/blackfin/include/asm/Kbuild | |||
diff --git a/include/asm-blackfin/a.out.h b/arch/blackfin/include/asm/a.out.h index 6c3d652ebd33..6c3d652ebd33 100644 --- a/include/asm-blackfin/a.out.h +++ b/arch/blackfin/include/asm/a.out.h | |||
diff --git a/include/asm-blackfin/atomic.h b/arch/blackfin/include/asm/atomic.h index 7cf508718605..7cf508718605 100644 --- a/include/asm-blackfin/atomic.h +++ b/arch/blackfin/include/asm/atomic.h | |||
diff --git a/include/asm-blackfin/auxvec.h b/arch/blackfin/include/asm/auxvec.h index 215506cd87b7..215506cd87b7 100644 --- a/include/asm-blackfin/auxvec.h +++ b/arch/blackfin/include/asm/auxvec.h | |||
diff --git a/include/asm-blackfin/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h index 7ba70de66f2b..7ba70de66f2b 100644 --- a/include/asm-blackfin/bfin-global.h +++ b/arch/blackfin/include/asm/bfin-global.h | |||
diff --git a/include/asm-blackfin/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h index 9fa19158e38d..9fa19158e38d 100644 --- a/include/asm-blackfin/bfin5xx_spi.h +++ b/arch/blackfin/include/asm/bfin5xx_spi.h | |||
diff --git a/include/asm-blackfin/bfin_simple_timer.h b/arch/blackfin/include/asm/bfin_simple_timer.h index fccbb595464a..fccbb595464a 100644 --- a/include/asm-blackfin/bfin_simple_timer.h +++ b/arch/blackfin/include/asm/bfin_simple_timer.h | |||
diff --git a/include/asm-blackfin/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h index c76ed8def302..c76ed8def302 100644 --- a/include/asm-blackfin/bfin_sport.h +++ b/arch/blackfin/include/asm/bfin_sport.h | |||
diff --git a/include/asm-blackfin/bitops.h b/arch/blackfin/include/asm/bitops.h index b39a175c79c1..b39a175c79c1 100644 --- a/include/asm-blackfin/bitops.h +++ b/arch/blackfin/include/asm/bitops.h | |||
diff --git a/include/asm-blackfin/blackfin.h b/arch/blackfin/include/asm/blackfin.h index 984b74f0a2ec..8749b0e321ab 100644 --- a/include/asm-blackfin/blackfin.h +++ b/arch/blackfin/include/asm/blackfin.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #define HI(con32) (((con32) >> 16) & 0xFFFF) | 11 | #define HI(con32) (((con32) >> 16) & 0xFFFF) |
12 | #define hi(con32) (((con32) >> 16) & 0xFFFF) | 12 | #define hi(con32) (((con32) >> 16) & 0xFFFF) |
13 | 13 | ||
14 | #include <asm/mach/anomaly.h> | 14 | #include <mach/anomaly.h> |
15 | 15 | ||
16 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
17 | 17 | ||
@@ -86,7 +86,7 @@ static inline void CSYNC(void) | |||
86 | 86 | ||
87 | #endif /* __ASSEMBLY__ */ | 87 | #endif /* __ASSEMBLY__ */ |
88 | 88 | ||
89 | #include <asm/mach/blackfin.h> | 89 | #include <mach/blackfin.h> |
90 | #include <asm/bfin-global.h> | 90 | #include <asm/bfin-global.h> |
91 | 91 | ||
92 | #endif /* _BLACKFIN_H_ */ | 92 | #endif /* _BLACKFIN_H_ */ |
diff --git a/include/asm-blackfin/bug.h b/arch/blackfin/include/asm/bug.h index 6d3e11b1fc57..6d3e11b1fc57 100644 --- a/include/asm-blackfin/bug.h +++ b/arch/blackfin/include/asm/bug.h | |||
diff --git a/include/asm-blackfin/bugs.h b/arch/blackfin/include/asm/bugs.h index 9093c9c1fb81..9093c9c1fb81 100644 --- a/include/asm-blackfin/bugs.h +++ b/arch/blackfin/include/asm/bugs.h | |||
diff --git a/include/asm-blackfin/byteorder.h b/arch/blackfin/include/asm/byteorder.h index 6a673d42da18..6a673d42da18 100644 --- a/include/asm-blackfin/byteorder.h +++ b/arch/blackfin/include/asm/byteorder.h | |||
diff --git a/include/asm-blackfin/cache.h b/arch/blackfin/include/asm/cache.h index 023d72133b5a..023d72133b5a 100644 --- a/include/asm-blackfin/cache.h +++ b/arch/blackfin/include/asm/cache.h | |||
diff --git a/include/asm-blackfin/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h index d81a77545a04..d81a77545a04 100644 --- a/include/asm-blackfin/cacheflush.h +++ b/arch/blackfin/include/asm/cacheflush.h | |||
diff --git a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h b/arch/blackfin/include/asm/cdef_LPBlackfin.h index d39c396f850d..35f841bce57d 100644 --- a/include/asm-blackfin/mach-common/cdef_LPBlackfin.h +++ b/arch/blackfin/include/asm/cdef_LPBlackfin.h | |||
@@ -33,7 +33,7 @@ | |||
33 | #warning cdef_LPBlackfin.h should only be included for 532 compatible chips. | 33 | #warning cdef_LPBlackfin.h should only be included for 532 compatible chips. |
34 | #endif | 34 | #endif |
35 | */ | 35 | */ |
36 | #include <asm/mach-common/def_LPBlackfin.h> | 36 | #include <asm/def_LPBlackfin.h> |
37 | 37 | ||
38 | /*Cache & SRAM Memory*/ | 38 | /*Cache & SRAM Memory*/ |
39 | #define bfin_read_SRAM_BASE_ADDRESS() bfin_read32(SRAM_BASE_ADDRESS) | 39 | #define bfin_read_SRAM_BASE_ADDRESS() bfin_read32(SRAM_BASE_ADDRESS) |
diff --git a/include/asm-blackfin/checksum.h b/arch/blackfin/include/asm/checksum.h index 6f6af2b8e9e0..6f6af2b8e9e0 100644 --- a/include/asm-blackfin/checksum.h +++ b/arch/blackfin/include/asm/checksum.h | |||
diff --git a/include/asm-blackfin/mach-common/clocks.h b/arch/blackfin/include/asm/clocks.h index 033bba92d61c..033bba92d61c 100644 --- a/include/asm-blackfin/mach-common/clocks.h +++ b/arch/blackfin/include/asm/clocks.h | |||
diff --git a/include/asm-blackfin/mach-common/context.S b/arch/blackfin/include/asm/context.S index c0e630edfb9a..c0e630edfb9a 100644 --- a/include/asm-blackfin/mach-common/context.S +++ b/arch/blackfin/include/asm/context.S | |||
diff --git a/include/asm-blackfin/cplb-mpu.h b/arch/blackfin/include/asm/cplb-mpu.h index 75c67b99d607..75c67b99d607 100644 --- a/include/asm-blackfin/cplb-mpu.h +++ b/arch/blackfin/include/asm/cplb-mpu.h | |||
diff --git a/include/asm-blackfin/cplb.h b/arch/blackfin/include/asm/cplb.h index 5b0da9a69b67..05d6f05fb748 100644 --- a/include/asm-blackfin/cplb.h +++ b/arch/blackfin/include/asm/cplb.h | |||
@@ -31,7 +31,7 @@ | |||
31 | #define _CPLB_H | 31 | #define _CPLB_H |
32 | 32 | ||
33 | #include <asm/blackfin.h> | 33 | #include <asm/blackfin.h> |
34 | #include <asm/mach/anomaly.h> | 34 | #include <mach/anomaly.h> |
35 | 35 | ||
36 | #define SDRAM_IGENERIC (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_PORTPRIO) | 36 | #define SDRAM_IGENERIC (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_PORTPRIO) |
37 | #define SDRAM_IKERNEL (SDRAM_IGENERIC | CPLB_LOCK) | 37 | #define SDRAM_IKERNEL (SDRAM_IGENERIC | CPLB_LOCK) |
diff --git a/include/asm-blackfin/cplbinit.h b/arch/blackfin/include/asm/cplbinit.h index 0eb1c1b685a7..0eb1c1b685a7 100644 --- a/include/asm-blackfin/cplbinit.h +++ b/arch/blackfin/include/asm/cplbinit.h | |||
diff --git a/include/asm-blackfin/cpumask.h b/arch/blackfin/include/asm/cpumask.h index b20a8e9012cb..b20a8e9012cb 100644 --- a/include/asm-blackfin/cpumask.h +++ b/arch/blackfin/include/asm/cpumask.h | |||
diff --git a/include/asm-blackfin/cputime.h b/arch/blackfin/include/asm/cputime.h index 2b19705f9885..2b19705f9885 100644 --- a/include/asm-blackfin/cputime.h +++ b/arch/blackfin/include/asm/cputime.h | |||
diff --git a/include/asm-blackfin/current.h b/arch/blackfin/include/asm/current.h index 31918d29122c..31918d29122c 100644 --- a/include/asm-blackfin/current.h +++ b/arch/blackfin/include/asm/current.h | |||
diff --git a/include/asm-blackfin/mach-common/def_LPBlackfin.h b/arch/blackfin/include/asm/def_LPBlackfin.h index e8967f6124f7..6341eebff3dc 100644 --- a/include/asm-blackfin/mach-common/def_LPBlackfin.h +++ b/arch/blackfin/include/asm/def_LPBlackfin.h | |||
@@ -31,7 +31,7 @@ | |||
31 | #ifndef _DEF_LPBLACKFIN_H | 31 | #ifndef _DEF_LPBLACKFIN_H |
32 | #define _DEF_LPBLACKFIN_H | 32 | #define _DEF_LPBLACKFIN_H |
33 | 33 | ||
34 | #include <asm/mach/anomaly.h> | 34 | #include <mach/anomaly.h> |
35 | 35 | ||
36 | #define MK_BMSK_(x) (1<<x) | 36 | #define MK_BMSK_(x) (1<<x) |
37 | 37 | ||
diff --git a/include/asm-blackfin/delay.h b/arch/blackfin/include/asm/delay.h index 473a8113277f..0889c3abb593 100644 --- a/include/asm-blackfin/delay.h +++ b/arch/blackfin/include/asm/delay.h | |||
@@ -9,7 +9,7 @@ | |||
9 | #ifndef __ASM_DELAY_H__ | 9 | #ifndef __ASM_DELAY_H__ |
10 | #define __ASM_DELAY_H__ | 10 | #define __ASM_DELAY_H__ |
11 | 11 | ||
12 | #include <asm/mach/anomaly.h> | 12 | #include <mach/anomaly.h> |
13 | 13 | ||
14 | static inline void __delay(unsigned long loops) | 14 | static inline void __delay(unsigned long loops) |
15 | { | 15 | { |
diff --git a/include/asm-blackfin/device.h b/arch/blackfin/include/asm/device.h index d8f9872b0e2d..d8f9872b0e2d 100644 --- a/include/asm-blackfin/device.h +++ b/arch/blackfin/include/asm/device.h | |||
diff --git a/include/asm-blackfin/div64.h b/arch/blackfin/include/asm/div64.h index 6cd978cefb28..6cd978cefb28 100644 --- a/include/asm-blackfin/div64.h +++ b/arch/blackfin/include/asm/div64.h | |||
diff --git a/include/asm-blackfin/dma-mapping.h b/arch/blackfin/include/asm/dma-mapping.h index 1a13c2fc3667..1a13c2fc3667 100644 --- a/include/asm-blackfin/dma-mapping.h +++ b/arch/blackfin/include/asm/dma-mapping.h | |||
diff --git a/include/asm-blackfin/dma.h b/arch/blackfin/include/asm/dma.h index 3cd4b522aa3f..6509733bb0f6 100644 --- a/include/asm-blackfin/dma.h +++ b/arch/blackfin/include/asm/dma.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <asm/signal.h> | 35 | #include <asm/signal.h> |
36 | 36 | ||
37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
38 | #include <asm/mach/dma.h> | 38 | #include <mach/dma.h> |
39 | #include <linux/mm.h> | 39 | #include <linux/mm.h> |
40 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
41 | #include <asm/blackfin.h> | 41 | #include <asm/blackfin.h> |
diff --git a/include/asm-blackfin/dpmc.h b/arch/blackfin/include/asm/dpmc.h index 96e8208f929a..96e8208f929a 100644 --- a/include/asm-blackfin/dpmc.h +++ b/arch/blackfin/include/asm/dpmc.h | |||
diff --git a/include/asm-blackfin/early_printk.h b/arch/blackfin/include/asm/early_printk.h index 110f1c1f845c..110f1c1f845c 100644 --- a/include/asm-blackfin/early_printk.h +++ b/arch/blackfin/include/asm/early_printk.h | |||
diff --git a/include/asm-blackfin/elf.h b/arch/blackfin/include/asm/elf.h index 67a03a8a353e..67a03a8a353e 100644 --- a/include/asm-blackfin/elf.h +++ b/arch/blackfin/include/asm/elf.h | |||
diff --git a/include/asm-blackfin/emergency-restart.h b/arch/blackfin/include/asm/emergency-restart.h index 27f6c785d103..27f6c785d103 100644 --- a/include/asm-blackfin/emergency-restart.h +++ b/arch/blackfin/include/asm/emergency-restart.h | |||
diff --git a/include/asm-blackfin/entry.h b/arch/blackfin/include/asm/entry.h index c4f721e0d00d..c4f721e0d00d 100644 --- a/include/asm-blackfin/entry.h +++ b/arch/blackfin/include/asm/entry.h | |||
diff --git a/include/asm-blackfin/errno.h b/arch/blackfin/include/asm/errno.h index 164e4f39bb57..164e4f39bb57 100644 --- a/include/asm-blackfin/errno.h +++ b/arch/blackfin/include/asm/errno.h | |||
diff --git a/include/asm-blackfin/fb.h b/arch/blackfin/include/asm/fb.h index c7df38030992..c7df38030992 100644 --- a/include/asm-blackfin/fb.h +++ b/arch/blackfin/include/asm/fb.h | |||
diff --git a/include/asm-blackfin/fcntl.h b/arch/blackfin/include/asm/fcntl.h index 9c4037127857..9c4037127857 100644 --- a/include/asm-blackfin/fcntl.h +++ b/arch/blackfin/include/asm/fcntl.h | |||
diff --git a/include/asm-blackfin/fixed_code.h b/arch/blackfin/include/asm/fixed_code.h index 32c4d495d847..32c4d495d847 100644 --- a/include/asm-blackfin/fixed_code.h +++ b/arch/blackfin/include/asm/fixed_code.h | |||
diff --git a/include/asm-blackfin/flat.h b/arch/blackfin/include/asm/flat.h index e70074e05f4e..e70074e05f4e 100644 --- a/include/asm-blackfin/flat.h +++ b/arch/blackfin/include/asm/flat.h | |||
diff --git a/include/asm-blackfin/futex.h b/arch/blackfin/include/asm/futex.h index 6a332a9f099c..6a332a9f099c 100644 --- a/include/asm-blackfin/futex.h +++ b/arch/blackfin/include/asm/futex.h | |||
diff --git a/include/asm-blackfin/gpio.h b/arch/blackfin/include/asm/gpio.h index 168f1251eb4d..ad33ac271fd9 100644 --- a/include/asm-blackfin/gpio.h +++ b/arch/blackfin/include/asm/gpio.h | |||
@@ -224,7 +224,7 @@ | |||
224 | #endif | 224 | #endif |
225 | 225 | ||
226 | #ifdef BF548_FAMILY | 226 | #ifdef BF548_FAMILY |
227 | #include <asm-blackfin/mach-bf548/gpio.h> | 227 | #include <mach/gpio.h> |
228 | #endif | 228 | #endif |
229 | 229 | ||
230 | #ifdef BF561_FAMILY | 230 | #ifdef BF561_FAMILY |
diff --git a/include/asm-blackfin/gptimers.h b/arch/blackfin/include/asm/gptimers.h index 0520d2aac8f3..0520d2aac8f3 100644 --- a/include/asm-blackfin/gptimers.h +++ b/arch/blackfin/include/asm/gptimers.h | |||
diff --git a/include/asm-blackfin/hardirq.h b/arch/blackfin/include/asm/hardirq.h index b6b19f1b9dab..b6b19f1b9dab 100644 --- a/include/asm-blackfin/hardirq.h +++ b/arch/blackfin/include/asm/hardirq.h | |||
diff --git a/include/asm-blackfin/hw_irq.h b/arch/blackfin/include/asm/hw_irq.h index 5b51eaec012c..5b51eaec012c 100644 --- a/include/asm-blackfin/hw_irq.h +++ b/arch/blackfin/include/asm/hw_irq.h | |||
diff --git a/include/asm-blackfin/io.h b/arch/blackfin/include/asm/io.h index cbbf7ffdbbff..cbbf7ffdbbff 100644 --- a/include/asm-blackfin/io.h +++ b/arch/blackfin/include/asm/io.h | |||
diff --git a/include/asm-blackfin/ioctl.h b/arch/blackfin/include/asm/ioctl.h index b279fe06dfe5..b279fe06dfe5 100644 --- a/include/asm-blackfin/ioctl.h +++ b/arch/blackfin/include/asm/ioctl.h | |||
diff --git a/include/asm-blackfin/ioctls.h b/arch/blackfin/include/asm/ioctls.h index 895e3173165d..895e3173165d 100644 --- a/include/asm-blackfin/ioctls.h +++ b/arch/blackfin/include/asm/ioctls.h | |||
diff --git a/include/asm-blackfin/ipcbuf.h b/arch/blackfin/include/asm/ipcbuf.h index 8f0899cdf4d2..8f0899cdf4d2 100644 --- a/include/asm-blackfin/ipcbuf.h +++ b/arch/blackfin/include/asm/ipcbuf.h | |||
diff --git a/include/asm-blackfin/irq.h b/arch/blackfin/include/asm/irq.h index 86b67834354d..89f59e18af93 100644 --- a/include/asm-blackfin/irq.h +++ b/arch/blackfin/include/asm/irq.h | |||
@@ -17,7 +17,7 @@ | |||
17 | #ifndef _BFIN_IRQ_H_ | 17 | #ifndef _BFIN_IRQ_H_ |
18 | #define _BFIN_IRQ_H_ | 18 | #define _BFIN_IRQ_H_ |
19 | 19 | ||
20 | #include <asm/mach/irq.h> | 20 | #include <mach/irq.h> |
21 | #include <asm/ptrace.h> | 21 | #include <asm/ptrace.h> |
22 | 22 | ||
23 | /******************************************************************************* | 23 | /******************************************************************************* |
@@ -34,7 +34,7 @@ | |||
34 | * interrupts apart (just the TX/RX for the various devices) | 34 | * interrupts apart (just the TX/RX for the various devices) |
35 | *******************************************************************************/ | 35 | *******************************************************************************/ |
36 | 36 | ||
37 | /* SYS_IRQS and NR_IRQS are defined in <asm/mach-bf5xx/irq.h>*/ | 37 | /* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h>*/ |
38 | 38 | ||
39 | /* | 39 | /* |
40 | * Machine specific interrupt sources. | 40 | * Machine specific interrupt sources. |
diff --git a/include/asm-blackfin/irq_handler.h b/arch/blackfin/include/asm/irq_handler.h index 139b5208f9d8..139b5208f9d8 100644 --- a/include/asm-blackfin/irq_handler.h +++ b/arch/blackfin/include/asm/irq_handler.h | |||
diff --git a/include/asm-blackfin/irq_regs.h b/arch/blackfin/include/asm/irq_regs.h index 3dd9c0b70270..3dd9c0b70270 100644 --- a/include/asm-blackfin/irq_regs.h +++ b/arch/blackfin/include/asm/irq_regs.h | |||
diff --git a/include/asm-blackfin/kdebug.h b/arch/blackfin/include/asm/kdebug.h index 6ece1b037665..6ece1b037665 100644 --- a/include/asm-blackfin/kdebug.h +++ b/arch/blackfin/include/asm/kdebug.h | |||
diff --git a/include/asm-blackfin/kgdb.h b/arch/blackfin/include/asm/kgdb.h index 0f73847fd6bc..0f73847fd6bc 100644 --- a/include/asm-blackfin/kgdb.h +++ b/arch/blackfin/include/asm/kgdb.h | |||
diff --git a/include/asm-blackfin/kmap_types.h b/arch/blackfin/include/asm/kmap_types.h index e215f7104974..e215f7104974 100644 --- a/include/asm-blackfin/kmap_types.h +++ b/arch/blackfin/include/asm/kmap_types.h | |||
diff --git a/include/asm-blackfin/l1layout.h b/arch/blackfin/include/asm/l1layout.h index c13ded777828..c13ded777828 100644 --- a/include/asm-blackfin/l1layout.h +++ b/arch/blackfin/include/asm/l1layout.h | |||
diff --git a/include/asm-blackfin/linkage.h b/arch/blackfin/include/asm/linkage.h index 5a822bb790f7..5a822bb790f7 100644 --- a/include/asm-blackfin/linkage.h +++ b/arch/blackfin/include/asm/linkage.h | |||
diff --git a/include/asm-blackfin/local.h b/arch/blackfin/include/asm/local.h index 75afffbc6421..75afffbc6421 100644 --- a/include/asm-blackfin/local.h +++ b/arch/blackfin/include/asm/local.h | |||
diff --git a/include/asm-blackfin/mem_map.h b/arch/blackfin/include/asm/mem_map.h index 42d1f37f6d9c..88d04a707708 100644 --- a/include/asm-blackfin/mem_map.h +++ b/arch/blackfin/include/asm/mem_map.h | |||
@@ -7,6 +7,6 @@ | |||
7 | #ifndef _MEM_MAP_H_ | 7 | #ifndef _MEM_MAP_H_ |
8 | #define _MEM_MAP_H_ | 8 | #define _MEM_MAP_H_ |
9 | 9 | ||
10 | #include <asm/mach/mem_map.h> | 10 | #include <mach/mem_map.h> |
11 | 11 | ||
12 | #endif /* _MEM_MAP_H_ */ | 12 | #endif /* _MEM_MAP_H_ */ |
diff --git a/include/asm-blackfin/mman.h b/arch/blackfin/include/asm/mman.h index b58f5ad3f024..b58f5ad3f024 100644 --- a/include/asm-blackfin/mman.h +++ b/arch/blackfin/include/asm/mman.h | |||
diff --git a/include/asm-blackfin/mmu.h b/arch/blackfin/include/asm/mmu.h index 757e43906ed4..757e43906ed4 100644 --- a/include/asm-blackfin/mmu.h +++ b/arch/blackfin/include/asm/mmu.h | |||
diff --git a/include/asm-blackfin/mmu_context.h b/arch/blackfin/include/asm/mmu_context.h index f55ec3c23a92..8529552a981f 100644 --- a/include/asm-blackfin/mmu_context.h +++ b/arch/blackfin/include/asm/mmu_context.h | |||
@@ -173,8 +173,10 @@ static inline void protect_page(struct mm_struct *mm, unsigned long addr, | |||
173 | 173 | ||
174 | static inline void update_protections(struct mm_struct *mm) | 174 | static inline void update_protections(struct mm_struct *mm) |
175 | { | 175 | { |
176 | flush_switched_cplbs(); | 176 | if (mm->context.page_rwx_mask == current_rwx_mask) { |
177 | set_mask_dcplbs(mm->context.page_rwx_mask); | 177 | flush_switched_cplbs(); |
178 | set_mask_dcplbs(mm->context.page_rwx_mask); | ||
179 | } | ||
178 | } | 180 | } |
179 | #endif | 181 | #endif |
180 | 182 | ||
diff --git a/include/asm-blackfin/module.h b/arch/blackfin/include/asm/module.h index e3128df139d6..e3128df139d6 100644 --- a/include/asm-blackfin/module.h +++ b/arch/blackfin/include/asm/module.h | |||
diff --git a/include/asm-blackfin/msgbuf.h b/arch/blackfin/include/asm/msgbuf.h index 6fcbe8cd801d..6fcbe8cd801d 100644 --- a/include/asm-blackfin/msgbuf.h +++ b/arch/blackfin/include/asm/msgbuf.h | |||
diff --git a/include/asm-blackfin/mutex.h b/arch/blackfin/include/asm/mutex.h index 458c1f7fbc18..458c1f7fbc18 100644 --- a/include/asm-blackfin/mutex.h +++ b/arch/blackfin/include/asm/mutex.h | |||
diff --git a/include/asm-blackfin/nand.h b/arch/blackfin/include/asm/nand.h index afbaafa793f1..afbaafa793f1 100644 --- a/include/asm-blackfin/nand.h +++ b/arch/blackfin/include/asm/nand.h | |||
diff --git a/include/asm-blackfin/page.h b/arch/blackfin/include/asm/page.h index 344f6a8c1f22..344f6a8c1f22 100644 --- a/include/asm-blackfin/page.h +++ b/arch/blackfin/include/asm/page.h | |||
diff --git a/include/asm-blackfin/page_offset.h b/arch/blackfin/include/asm/page_offset.h index cbaff24b4b25..cbaff24b4b25 100644 --- a/include/asm-blackfin/page_offset.h +++ b/arch/blackfin/include/asm/page_offset.h | |||
diff --git a/include/asm-blackfin/param.h b/arch/blackfin/include/asm/param.h index 41564a6347f8..41564a6347f8 100644 --- a/include/asm-blackfin/param.h +++ b/arch/blackfin/include/asm/param.h | |||
diff --git a/include/asm-blackfin/pci.h b/arch/blackfin/include/asm/pci.h index 61277358c865..61277358c865 100644 --- a/include/asm-blackfin/pci.h +++ b/arch/blackfin/include/asm/pci.h | |||
diff --git a/include/asm-blackfin/percpu.h b/arch/blackfin/include/asm/percpu.h index 78dd61f6b39f..78dd61f6b39f 100644 --- a/include/asm-blackfin/percpu.h +++ b/arch/blackfin/include/asm/percpu.h | |||
diff --git a/include/asm-blackfin/pgalloc.h b/arch/blackfin/include/asm/pgalloc.h index c686e0542fd0..c686e0542fd0 100644 --- a/include/asm-blackfin/pgalloc.h +++ b/arch/blackfin/include/asm/pgalloc.h | |||
diff --git a/include/asm-blackfin/pgtable.h b/arch/blackfin/include/asm/pgtable.h index b11b114689c0..f11684e4ade7 100644 --- a/include/asm-blackfin/pgtable.h +++ b/arch/blackfin/include/asm/pgtable.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <asm-generic/4level-fixup.h> | 4 | #include <asm-generic/4level-fixup.h> |
5 | 5 | ||
6 | #include <asm/page.h> | 6 | #include <asm/page.h> |
7 | #include <asm/mach-common/def_LPBlackfin.h> | 7 | #include <asm/def_LPBlackfin.h> |
8 | 8 | ||
9 | typedef pte_t *pte_addr_t; | 9 | typedef pte_t *pte_addr_t; |
10 | /* | 10 | /* |
diff --git a/include/asm-blackfin/poll.h b/arch/blackfin/include/asm/poll.h index 94cc2636e0e2..94cc2636e0e2 100644 --- a/include/asm-blackfin/poll.h +++ b/arch/blackfin/include/asm/poll.h | |||
diff --git a/include/asm-blackfin/portmux.h b/arch/blackfin/include/asm/portmux.h index 0807b286cd9e..88eb5c07cc24 100644 --- a/include/asm-blackfin/portmux.h +++ b/arch/blackfin/include/asm/portmux.h | |||
@@ -21,7 +21,7 @@ int peripheral_request_list(const unsigned short per[], const char *label); | |||
21 | void peripheral_free_list(const unsigned short per[]); | 21 | void peripheral_free_list(const unsigned short per[]); |
22 | 22 | ||
23 | #include <asm/gpio.h> | 23 | #include <asm/gpio.h> |
24 | #include <asm/mach/portmux.h> | 24 | #include <mach/portmux.h> |
25 | 25 | ||
26 | #ifndef P_SPORT2_TFS | 26 | #ifndef P_SPORT2_TFS |
27 | #define P_SPORT2_TFS P_UNDEF | 27 | #define P_SPORT2_TFS P_UNDEF |
diff --git a/include/asm-blackfin/posix_types.h b/arch/blackfin/include/asm/posix_types.h index 23aa1f8c1bd1..23aa1f8c1bd1 100644 --- a/include/asm-blackfin/posix_types.h +++ b/arch/blackfin/include/asm/posix_types.h | |||
diff --git a/include/asm-blackfin/processor.h b/arch/blackfin/include/asm/processor.h index 6f3995b119d8..6f3995b119d8 100644 --- a/include/asm-blackfin/processor.h +++ b/arch/blackfin/include/asm/processor.h | |||
diff --git a/include/asm-blackfin/ptrace.h b/arch/blackfin/include/asm/ptrace.h index a45a80e54adc..a45a80e54adc 100644 --- a/include/asm-blackfin/ptrace.h +++ b/arch/blackfin/include/asm/ptrace.h | |||
diff --git a/include/asm-blackfin/reboot.h b/arch/blackfin/include/asm/reboot.h index 6d448b5f5985..6d448b5f5985 100644 --- a/include/asm-blackfin/reboot.h +++ b/arch/blackfin/include/asm/reboot.h | |||
diff --git a/include/asm-blackfin/resource.h b/arch/blackfin/include/asm/resource.h index 091355ab3495..091355ab3495 100644 --- a/include/asm-blackfin/resource.h +++ b/arch/blackfin/include/asm/resource.h | |||
diff --git a/include/asm-blackfin/scatterlist.h b/arch/blackfin/include/asm/scatterlist.h index 04f448711cd0..04f448711cd0 100644 --- a/include/asm-blackfin/scatterlist.h +++ b/arch/blackfin/include/asm/scatterlist.h | |||
diff --git a/include/asm-blackfin/sections.h b/arch/blackfin/include/asm/sections.h index 1443c3353a8c..1443c3353a8c 100644 --- a/include/asm-blackfin/sections.h +++ b/arch/blackfin/include/asm/sections.h | |||
diff --git a/include/asm-blackfin/segment.h b/arch/blackfin/include/asm/segment.h index 02cfd09b5a99..02cfd09b5a99 100644 --- a/include/asm-blackfin/segment.h +++ b/arch/blackfin/include/asm/segment.h | |||
diff --git a/include/asm-blackfin/sembuf.h b/arch/blackfin/include/asm/sembuf.h index 18deb5c7fa5d..18deb5c7fa5d 100644 --- a/include/asm-blackfin/sembuf.h +++ b/arch/blackfin/include/asm/sembuf.h | |||
diff --git a/include/asm-blackfin/serial.h b/arch/blackfin/include/asm/serial.h index 994dd869558c..994dd869558c 100644 --- a/include/asm-blackfin/serial.h +++ b/arch/blackfin/include/asm/serial.h | |||
diff --git a/include/asm-blackfin/setup.h b/arch/blackfin/include/asm/setup.h index 01c8c6cbe6fc..01c8c6cbe6fc 100644 --- a/include/asm-blackfin/setup.h +++ b/arch/blackfin/include/asm/setup.h | |||
diff --git a/include/asm-blackfin/shmbuf.h b/arch/blackfin/include/asm/shmbuf.h index 612436303e89..612436303e89 100644 --- a/include/asm-blackfin/shmbuf.h +++ b/arch/blackfin/include/asm/shmbuf.h | |||
diff --git a/include/asm-blackfin/shmparam.h b/arch/blackfin/include/asm/shmparam.h index 3c03906b7664..3c03906b7664 100644 --- a/include/asm-blackfin/shmparam.h +++ b/arch/blackfin/include/asm/shmparam.h | |||
diff --git a/include/asm-blackfin/sigcontext.h b/arch/blackfin/include/asm/sigcontext.h index ce00b03c2775..ce00b03c2775 100644 --- a/include/asm-blackfin/sigcontext.h +++ b/arch/blackfin/include/asm/sigcontext.h | |||
diff --git a/include/asm-blackfin/siginfo.h b/arch/blackfin/include/asm/siginfo.h index eca4565cea37..eca4565cea37 100644 --- a/include/asm-blackfin/siginfo.h +++ b/arch/blackfin/include/asm/siginfo.h | |||
diff --git a/include/asm-blackfin/signal.h b/arch/blackfin/include/asm/signal.h index 87951d251458..87951d251458 100644 --- a/include/asm-blackfin/signal.h +++ b/arch/blackfin/include/asm/signal.h | |||
diff --git a/include/asm-blackfin/socket.h b/arch/blackfin/include/asm/socket.h index 2ca702e44d47..2ca702e44d47 100644 --- a/include/asm-blackfin/socket.h +++ b/arch/blackfin/include/asm/socket.h | |||
diff --git a/include/asm-blackfin/sockios.h b/arch/blackfin/include/asm/sockios.h index 426b89bfaa8b..426b89bfaa8b 100644 --- a/include/asm-blackfin/sockios.h +++ b/arch/blackfin/include/asm/sockios.h | |||
diff --git a/include/asm-blackfin/spinlock.h b/arch/blackfin/include/asm/spinlock.h index 64e908a50646..64e908a50646 100644 --- a/include/asm-blackfin/spinlock.h +++ b/arch/blackfin/include/asm/spinlock.h | |||
diff --git a/include/asm-blackfin/stat.h b/arch/blackfin/include/asm/stat.h index d2b6f11ec231..d2b6f11ec231 100644 --- a/include/asm-blackfin/stat.h +++ b/arch/blackfin/include/asm/stat.h | |||
diff --git a/include/asm-blackfin/statfs.h b/arch/blackfin/include/asm/statfs.h index 350672091ba3..350672091ba3 100644 --- a/include/asm-blackfin/statfs.h +++ b/arch/blackfin/include/asm/statfs.h | |||
diff --git a/include/asm-blackfin/string.h b/arch/blackfin/include/asm/string.h index 321f4d96e4ae..321f4d96e4ae 100644 --- a/include/asm-blackfin/string.h +++ b/arch/blackfin/include/asm/string.h | |||
diff --git a/include/asm-blackfin/system.h b/arch/blackfin/include/asm/system.h index 51494ef5bb41..8f1627d8bf09 100644 --- a/include/asm-blackfin/system.h +++ b/arch/blackfin/include/asm/system.h | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | #include <linux/linkage.h> | 37 | #include <linux/linkage.h> |
38 | #include <linux/compiler.h> | 38 | #include <linux/compiler.h> |
39 | #include <asm/mach/anomaly.h> | 39 | #include <mach/anomaly.h> |
40 | 40 | ||
41 | /* | 41 | /* |
42 | * Interrupt configuring macros. | 42 | * Interrupt configuring macros. |
diff --git a/include/asm-blackfin/termbits.h b/arch/blackfin/include/asm/termbits.h index f37feb7cf895..f37feb7cf895 100644 --- a/include/asm-blackfin/termbits.h +++ b/arch/blackfin/include/asm/termbits.h | |||
diff --git a/include/asm-blackfin/termios.h b/arch/blackfin/include/asm/termios.h index d50d063c605a..d50d063c605a 100644 --- a/include/asm-blackfin/termios.h +++ b/arch/blackfin/include/asm/termios.h | |||
diff --git a/include/asm-blackfin/thread_info.h b/arch/blackfin/include/asm/thread_info.h index 642769329d12..642769329d12 100644 --- a/include/asm-blackfin/thread_info.h +++ b/arch/blackfin/include/asm/thread_info.h | |||
diff --git a/include/asm-blackfin/time.h b/arch/blackfin/include/asm/time.h index ddc43ce38533..ddc43ce38533 100644 --- a/include/asm-blackfin/time.h +++ b/arch/blackfin/include/asm/time.h | |||
diff --git a/include/asm-blackfin/timex.h b/arch/blackfin/include/asm/timex.h index 22b0806161bb..22b0806161bb 100644 --- a/include/asm-blackfin/timex.h +++ b/arch/blackfin/include/asm/timex.h | |||
diff --git a/include/asm-blackfin/tlb.h b/arch/blackfin/include/asm/tlb.h index 89a12ee916d8..89a12ee916d8 100644 --- a/include/asm-blackfin/tlb.h +++ b/arch/blackfin/include/asm/tlb.h | |||
diff --git a/include/asm-blackfin/tlbflush.h b/arch/blackfin/include/asm/tlbflush.h index 277b400924b8..277b400924b8 100644 --- a/include/asm-blackfin/tlbflush.h +++ b/arch/blackfin/include/asm/tlbflush.h | |||
diff --git a/include/asm-blackfin/topology.h b/arch/blackfin/include/asm/topology.h index acee23987897..acee23987897 100644 --- a/include/asm-blackfin/topology.h +++ b/arch/blackfin/include/asm/topology.h | |||
diff --git a/include/asm-blackfin/trace.h b/arch/blackfin/include/asm/trace.h index 312b596b9731..312b596b9731 100644 --- a/include/asm-blackfin/trace.h +++ b/arch/blackfin/include/asm/trace.h | |||
diff --git a/include/asm-blackfin/traps.h b/arch/blackfin/include/asm/traps.h index f0e5f940d9ca..f0e5f940d9ca 100644 --- a/include/asm-blackfin/traps.h +++ b/arch/blackfin/include/asm/traps.h | |||
diff --git a/include/asm-blackfin/types.h b/arch/blackfin/include/asm/types.h index 8441cbc2bf9e..8441cbc2bf9e 100644 --- a/include/asm-blackfin/types.h +++ b/arch/blackfin/include/asm/types.h | |||
diff --git a/include/asm-blackfin/uaccess.h b/arch/blackfin/include/asm/uaccess.h index d928b8099056..d928b8099056 100644 --- a/include/asm-blackfin/uaccess.h +++ b/arch/blackfin/include/asm/uaccess.h | |||
diff --git a/include/asm-blackfin/ucontext.h b/arch/blackfin/include/asm/ucontext.h index 4a4e3856beba..4a4e3856beba 100644 --- a/include/asm-blackfin/ucontext.h +++ b/arch/blackfin/include/asm/ucontext.h | |||
diff --git a/include/asm-blackfin/unaligned.h b/arch/blackfin/include/asm/unaligned.h index fd8a1d634945..fd8a1d634945 100644 --- a/include/asm-blackfin/unaligned.h +++ b/arch/blackfin/include/asm/unaligned.h | |||
diff --git a/include/asm-blackfin/unistd.h b/arch/blackfin/include/asm/unistd.h index 1e57b636e0bc..1e57b636e0bc 100644 --- a/include/asm-blackfin/unistd.h +++ b/arch/blackfin/include/asm/unistd.h | |||
diff --git a/include/asm-blackfin/user.h b/arch/blackfin/include/asm/user.h index afe6a0e1f7ce..afe6a0e1f7ce 100644 --- a/include/asm-blackfin/user.h +++ b/arch/blackfin/include/asm/user.h | |||
diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S index 31bd9bf3efae..faea88ebb2ef 100644 --- a/arch/blackfin/kernel/entry.S +++ b/arch/blackfin/kernel/entry.S | |||
@@ -32,7 +32,7 @@ | |||
32 | #include <asm/errno.h> | 32 | #include <asm/errno.h> |
33 | #include <asm/asm-offsets.h> | 33 | #include <asm/asm-offsets.h> |
34 | 34 | ||
35 | #include <asm/mach-common/context.S> | 35 | #include <asm/context.S> |
36 | 36 | ||
37 | #ifdef CONFIG_EXCPT_IRQ_SYSC_L1 | 37 | #ifdef CONFIG_EXCPT_IRQ_SYSC_L1 |
38 | .section .l1.text | 38 | .section .l1.text |
diff --git a/arch/blackfin/mach-bf527/head.S b/arch/blackfin/mach-bf527/head.S index c3334cc5bcb7..28c486191209 100644 --- a/arch/blackfin/mach-bf527/head.S +++ b/arch/blackfin/mach-bf527/head.S | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
34 | #include <asm/mach-common/clocks.h> | 34 | #include <asm/clocks.h> |
35 | #include <asm/mach/mem_init.h> | 35 | #include <mach/mem_init.h> |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | .section .l1.text | 38 | .section .l1.text |
diff --git a/include/asm-blackfin/mach-bf527/anomaly.h b/arch/blackfin/mach-bf527/include/mach/anomaly.h index b7b166f4f064..b7b166f4f064 100644 --- a/include/asm-blackfin/mach-bf527/anomaly.h +++ b/arch/blackfin/mach-bf527/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf527/bf527.h b/arch/blackfin/mach-bf527/include/mach/bf527.h index 056eb4b9cd25..056eb4b9cd25 100644 --- a/include/asm-blackfin/mach-bf527/bf527.h +++ b/arch/blackfin/mach-bf527/include/mach/bf527.h | |||
diff --git a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h index 2526b6ed6faa..2526b6ed6faa 100644 --- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf527/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf527/bfin_sir.h b/arch/blackfin/mach-bf527/include/mach/bfin_sir.h index cfd8ad4f1f2c..cfd8ad4f1f2c 100644 --- a/include/asm-blackfin/mach-bf527/bfin_sir.h +++ b/arch/blackfin/mach-bf527/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf527/blackfin.h b/arch/blackfin/mach-bf527/include/mach/blackfin.h index 297821e2d79a..297821e2d79a 100644 --- a/include/asm-blackfin/mach-bf527/blackfin.h +++ b/arch/blackfin/mach-bf527/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf527/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h index 52c06494b886..663c2bbdfd91 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "defBF522.h" | 36 | #include "defBF522.h" |
37 | 37 | ||
38 | /* include core specific register pointer definitions */ | 38 | /* include core specific register pointer definitions */ |
39 | #include <asm/mach-common/cdef_LPBlackfin.h> | 39 | #include <asm/cdef_LPBlackfin.h> |
40 | 40 | ||
41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ | 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ |
42 | 42 | ||
diff --git a/include/asm-blackfin/mach-bf527/cdefBF525.h b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h index 2cc67e4b4d86..00377eb59b75 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "defBF525.h" | 36 | #include "defBF525.h" |
37 | 37 | ||
38 | /* include core specific register pointer definitions */ | 38 | /* include core specific register pointer definitions */ |
39 | #include <asm/mach-common/cdef_LPBlackfin.h> | 39 | #include <asm/cdef_LPBlackfin.h> |
40 | 40 | ||
41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ | 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ |
42 | 42 | ||
diff --git a/include/asm-blackfin/mach-bf527/cdefBF527.h b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h index 5bd1a8601743..fca8db708119 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF527.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF527.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #include "defBF527.h" | 36 | #include "defBF527.h" |
37 | 37 | ||
38 | /* include core specific register pointer definitions */ | 38 | /* include core specific register pointer definitions */ |
39 | #include <asm/mach-common/cdef_LPBlackfin.h> | 39 | #include <asm/cdef_LPBlackfin.h> |
40 | 40 | ||
41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ | 41 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ |
42 | 42 | ||
diff --git a/include/asm-blackfin/mach-bf527/cdefBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h index 9dbdbec8ea1b..9a814b9a12b9 100644 --- a/include/asm-blackfin/mach-bf527/cdefBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "defBF52x_base.h" | 37 | #include "defBF52x_base.h" |
38 | 38 | ||
39 | /* Include core specific register pointer definitions */ | 39 | /* Include core specific register pointer definitions */ |
40 | #include <asm/mach-common/cdef_LPBlackfin.h> | 40 | #include <asm/cdef_LPBlackfin.h> |
41 | 41 | ||
42 | /* ==== begin from cdefBF534.h ==== */ | 42 | /* ==== begin from cdefBF534.h ==== */ |
43 | 43 | ||
diff --git a/include/asm-blackfin/mach-bf527/defBF522.h b/arch/blackfin/mach-bf527/include/mach/defBF522.h index 9671d8f2c5ef..0a8cdcdf0b49 100644 --- a/include/asm-blackfin/mach-bf527/defBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF522.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF522_H | 32 | #define _DEF_BF522_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF522 */ |
38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf527/defBF525.h b/arch/blackfin/mach-bf527/include/mach/defBF525.h index 6a375a084acc..5cd7576fef76 100644 --- a/include/asm-blackfin/mach-bf527/defBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF525.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF525_H | 32 | #define _DEF_BF525_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ |
38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf527/defBF527.h b/arch/blackfin/mach-bf527/include/mach/defBF527.h index f1a70db70cb8..f040f364afa3 100644 --- a/include/asm-blackfin/mach-bf527/defBF527.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF527.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF527_H | 32 | #define _DEF_BF527_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF527 */ |
38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf527/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h index fc69cf93f149..6ac2ed7026eb 100644 --- a/include/asm-blackfin/mach-bf527/defBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h | |||
@@ -151,7 +151,7 @@ | |||
151 | #define TIMER7_CONFIG 0xFFC00670 /* Timer 7 Configuration Register */ | 151 | #define TIMER7_CONFIG 0xFFC00670 /* Timer 7 Configuration Register */ |
152 | #define TIMER7_COUNTER 0xFFC00674 /* Timer 7 Counter Register */ | 152 | #define TIMER7_COUNTER 0xFFC00674 /* Timer 7 Counter Register */ |
153 | #define TIMER7_PERIOD 0xFFC00678 /* Timer 7 Period Register */ | 153 | #define TIMER7_PERIOD 0xFFC00678 /* Timer 7 Period Register */ |
154 | #define TIMER7_WIDTH 0xFFC0067C /* Timer 7 Width Register */ | 154 | #define TIMER7_WIDTH 0xFFC0067C /* Timer 7 Width Register */ |
155 | 155 | ||
156 | #define TIMER_ENABLE 0xFFC00680 /* Timer Enable Register */ | 156 | #define TIMER_ENABLE 0xFFC00680 /* Timer Enable Register */ |
157 | #define TIMER_DISABLE 0xFFC00684 /* Timer Disable Register */ | 157 | #define TIMER_DISABLE 0xFFC00684 /* Timer Disable Register */ |
@@ -634,18 +634,9 @@ | |||
634 | /* PLL_DIV Macros */ | 634 | /* PLL_DIV Macros */ |
635 | #define SET_SSEL(x) ((x)&0xF) /* Set SSEL = 0-15 --> SCLK = VCO/SSEL */ | 635 | #define SET_SSEL(x) ((x)&0xF) /* Set SSEL = 0-15 --> SCLK = VCO/SSEL */ |
636 | 636 | ||
637 | /* VR_CTL Masks */ | 637 | /* VR_CTL Masks */ |
638 | #define FREQ 0x0003 /* Switching Oscillator Frequency For Regulator */ | 638 | #define FREQ 0x3000 /* Switching Oscillator Frequency For Regulator */ |
639 | #define HIBERNATE 0x0000 /* Powerdown/Bypass On-Board Regulation */ | 639 | #define HIBERNATE 0x0000 /* Powerdown/Bypass On-Board Regulation */ |
640 | #define FREQ_333 0x0001 /* Switching Frequency Is 333 kHz */ | ||
641 | #define FREQ_667 0x0002 /* Switching Frequency Is 667 kHz */ | ||
642 | #define FREQ_1000 0x0003 /* Switching Frequency Is 1 MHz */ | ||
643 | |||
644 | #define GAIN 0x000C /* Voltage Level Gain */ | ||
645 | #define GAIN_5 0x0000 /* GAIN = 5 */ | ||
646 | #define GAIN_10 0x0004 /* GAIN = 10 */ | ||
647 | #define GAIN_20 0x0008 /* GAIN = 20 */ | ||
648 | #define GAIN_50 0x000C /* GAIN = 50 */ | ||
649 | 640 | ||
650 | #define VLEV 0x00F0 /* Internal Voltage Level */ | 641 | #define VLEV 0x00F0 /* Internal Voltage Level */ |
651 | #define VLEV_085 0x0060 /* VLEV = 0.85 V (-5% - +10% Accuracy) */ | 642 | #define VLEV_085 0x0060 /* VLEV = 0.85 V (-5% - +10% Accuracy) */ |
@@ -660,7 +651,7 @@ | |||
660 | #define VLEV_130 0x00F0 /* VLEV = 1.30 V (-5% - +10% Accuracy) */ | 651 | #define VLEV_130 0x00F0 /* VLEV = 1.30 V (-5% - +10% Accuracy) */ |
661 | 652 | ||
662 | #define WAKE 0x0100 /* Enable RTC/Reset Wakeup From Hibernate */ | 653 | #define WAKE 0x0100 /* Enable RTC/Reset Wakeup From Hibernate */ |
663 | #define CANWE 0x0200 /* Enable CAN Wakeup From Hibernate */ | 654 | #define USBWE 0x0200 /* Enable USB Wakeup From Hibernate */ |
664 | #define PHYWE 0x0400 /* Enable PHY Wakeup From Hibernate */ | 655 | #define PHYWE 0x0400 /* Enable PHY Wakeup From Hibernate */ |
665 | #define CLKBUFOE 0x4000 /* CLKIN Buffer Output Enable */ | 656 | #define CLKBUFOE 0x4000 /* CLKIN Buffer Output Enable */ |
666 | #define PHYCLKOE CLKBUFOE /* Alternative legacy name for the above */ | 657 | #define PHYCLKOE CLKBUFOE /* Alternative legacy name for the above */ |
@@ -697,16 +688,16 @@ | |||
697 | 688 | ||
698 | #define IRQ_ERROR1 0x00000002 /* Error Interrupt (DMA, DMARx Block, DMARx Overflow) */ | 689 | #define IRQ_ERROR1 0x00000002 /* Error Interrupt (DMA, DMARx Block, DMARx Overflow) */ |
699 | #define IRQ_ERROR2 0x00000004 /* Error Interrupt (CAN, Ethernet, SPORTx, PPI, SPI, UARTx) */ | 690 | #define IRQ_ERROR2 0x00000004 /* Error Interrupt (CAN, Ethernet, SPORTx, PPI, SPI, UARTx) */ |
700 | #define IRQ_RTC 0x00000008 /* Real Time Clock Interrupt */ | 691 | #define IRQ_RTC 0x00000008 /* Real Time Clock Interrupt */ |
701 | #define IRQ_DMA0 0x00000010 /* DMA Channel 0 (PPI) Interrupt */ | 692 | #define IRQ_DMA0 0x00000010 /* DMA Channel 0 (PPI) Interrupt */ |
702 | #define IRQ_DMA3 0x00000020 /* DMA Channel 3 (SPORT0 RX) Interrupt */ | 693 | #define IRQ_DMA3 0x00000020 /* DMA Channel 3 (SPORT0 RX) Interrupt */ |
703 | #define IRQ_DMA4 0x00000040 /* DMA Channel 4 (SPORT0 TX) Interrupt */ | 694 | #define IRQ_DMA4 0x00000040 /* DMA Channel 4 (SPORT0 TX) Interrupt */ |
704 | #define IRQ_DMA5 0x00000080 /* DMA Channel 5 (SPORT1 RX) Interrupt */ | 695 | #define IRQ_DMA5 0x00000080 /* DMA Channel 5 (SPORT1 RX) Interrupt */ |
705 | 696 | ||
706 | #define IRQ_DMA6 0x00000100 /* DMA Channel 6 (SPORT1 TX) Interrupt */ | 697 | #define IRQ_DMA6 0x00000100 /* DMA Channel 6 (SPORT1 TX) Interrupt */ |
707 | #define IRQ_TWI 0x00000200 /* TWI Interrupt */ | 698 | #define IRQ_TWI 0x00000200 /* TWI Interrupt */ |
708 | #define IRQ_DMA7 0x00000400 /* DMA Channel 7 (SPI) Interrupt */ | 699 | #define IRQ_DMA7 0x00000400 /* DMA Channel 7 (SPI) Interrupt */ |
709 | #define IRQ_DMA8 0x00000800 /* DMA Channel 8 (UART0 RX) Interrupt */ | 700 | #define IRQ_DMA8 0x00000800 /* DMA Channel 8 (UART0 RX) Interrupt */ |
710 | #define IRQ_DMA9 0x00001000 /* DMA Channel 9 (UART0 TX) Interrupt */ | 701 | #define IRQ_DMA9 0x00001000 /* DMA Channel 9 (UART0 TX) Interrupt */ |
711 | #define IRQ_DMA10 0x00002000 /* DMA Channel 10 (UART1 RX) Interrupt */ | 702 | #define IRQ_DMA10 0x00002000 /* DMA Channel 10 (UART1 RX) Interrupt */ |
712 | #define IRQ_DMA11 0x00004000 /* DMA Channel 11 (UART1 TX) Interrupt */ | 703 | #define IRQ_DMA11 0x00004000 /* DMA Channel 11 (UART1 TX) Interrupt */ |
@@ -801,7 +792,7 @@ | |||
801 | #define WDEV_NONE 0x0006 /* no event on roll over */ | 792 | #define WDEV_NONE 0x0006 /* no event on roll over */ |
802 | #define WDEN 0x0FF0 /* enable watchdog */ | 793 | #define WDEN 0x0FF0 /* enable watchdog */ |
803 | #define WDDIS 0x0AD0 /* disable watchdog */ | 794 | #define WDDIS 0x0AD0 /* disable watchdog */ |
804 | #define WDRO 0x8000 /* watchdog rolled over latch */ | 795 | #define WDRO 0x8000 /* watchdog rolled over latch */ |
805 | 796 | ||
806 | /* depreciated WDOG_CTL Register Masks for legacy code */ | 797 | /* depreciated WDOG_CTL Register Masks for legacy code */ |
807 | 798 | ||
@@ -882,7 +873,7 @@ | |||
882 | #define NINT 0x01 /* Pending Interrupt */ | 873 | #define NINT 0x01 /* Pending Interrupt */ |
883 | #define IIR_TX_READY 0x02 /* UART_THR empty */ | 874 | #define IIR_TX_READY 0x02 /* UART_THR empty */ |
884 | #define IIR_RX_READY 0x04 /* Receive data ready */ | 875 | #define IIR_RX_READY 0x04 /* Receive data ready */ |
885 | #define IIR_LINE_CHANGE 0x06 /* Receive line status */ | 876 | #define IIR_LINE_CHANGE 0x06 /* Receive line status */ |
886 | #define IIR_STATUS 0x06 /* Highest Priority Pending Interrupt */ | 877 | #define IIR_STATUS 0x06 /* Highest Priority Pending Interrupt */ |
887 | 878 | ||
888 | /* UARTx_GCTL Masks */ | 879 | /* UARTx_GCTL Masks */ |
@@ -1638,12 +1629,12 @@ | |||
1638 | 1629 | ||
1639 | /* entry addresses of the user-callable Boot ROM functions */ | 1630 | /* entry addresses of the user-callable Boot ROM functions */ |
1640 | 1631 | ||
1641 | #define _BOOTROM_RESET 0xEF000000 | 1632 | #define _BOOTROM_RESET 0xEF000000 |
1642 | #define _BOOTROM_FINAL_INIT 0xEF000002 | 1633 | #define _BOOTROM_FINAL_INIT 0xEF000002 |
1643 | #define _BOOTROM_DO_MEMORY_DMA 0xEF000006 | 1634 | #define _BOOTROM_DO_MEMORY_DMA 0xEF000006 |
1644 | #define _BOOTROM_BOOT_DXE_FLASH 0xEF000008 | 1635 | #define _BOOTROM_BOOT_DXE_FLASH 0xEF000008 |
1645 | #define _BOOTROM_BOOT_DXE_SPI 0xEF00000A | 1636 | #define _BOOTROM_BOOT_DXE_SPI 0xEF00000A |
1646 | #define _BOOTROM_BOOT_DXE_TWI 0xEF00000C | 1637 | #define _BOOTROM_BOOT_DXE_TWI 0xEF00000C |
1647 | #define _BOOTROM_GET_DXE_ADDRESS_FLASH 0xEF000010 | 1638 | #define _BOOTROM_GET_DXE_ADDRESS_FLASH 0xEF000010 |
1648 | #define _BOOTROM_GET_DXE_ADDRESS_SPI 0xEF000012 | 1639 | #define _BOOTROM_GET_DXE_ADDRESS_SPI 0xEF000012 |
1649 | #define _BOOTROM_GET_DXE_ADDRESS_TWI 0xEF000014 | 1640 | #define _BOOTROM_GET_DXE_ADDRESS_TWI 0xEF000014 |
@@ -1771,71 +1762,71 @@ | |||
1771 | /* Bit masks for CNT_CONFIG */ | 1762 | /* Bit masks for CNT_CONFIG */ |
1772 | 1763 | ||
1773 | #define CNTE 0x1 /* Counter Enable */ | 1764 | #define CNTE 0x1 /* Counter Enable */ |
1774 | #define nCNTE 0x0 | 1765 | #define nCNTE 0x0 |
1775 | #define DEBE 0x2 /* Debounce Enable */ | 1766 | #define DEBE 0x2 /* Debounce Enable */ |
1776 | #define nDEBE 0x0 | 1767 | #define nDEBE 0x0 |
1777 | #define CDGINV 0x10 /* CDG Pin Polarity Invert */ | 1768 | #define CDGINV 0x10 /* CDG Pin Polarity Invert */ |
1778 | #define nCDGINV 0x0 | 1769 | #define nCDGINV 0x0 |
1779 | #define CUDINV 0x20 /* CUD Pin Polarity Invert */ | 1770 | #define CUDINV 0x20 /* CUD Pin Polarity Invert */ |
1780 | #define nCUDINV 0x0 | 1771 | #define nCUDINV 0x0 |
1781 | #define CZMINV 0x40 /* CZM Pin Polarity Invert */ | 1772 | #define CZMINV 0x40 /* CZM Pin Polarity Invert */ |
1782 | #define nCZMINV 0x0 | 1773 | #define nCZMINV 0x0 |
1783 | #define CNTMODE 0x700 /* Counter Operating Mode */ | 1774 | #define CNTMODE 0x700 /* Counter Operating Mode */ |
1784 | #define ZMZC 0x800 /* CZM Zeroes Counter Enable */ | 1775 | #define ZMZC 0x800 /* CZM Zeroes Counter Enable */ |
1785 | #define nZMZC 0x0 | 1776 | #define nZMZC 0x0 |
1786 | #define BNDMODE 0x3000 /* Boundary register Mode */ | 1777 | #define BNDMODE 0x3000 /* Boundary register Mode */ |
1787 | #define INPDIS 0x8000 /* CUG and CDG Input Disable */ | 1778 | #define INPDIS 0x8000 /* CUG and CDG Input Disable */ |
1788 | #define nINPDIS 0x0 | 1779 | #define nINPDIS 0x0 |
1789 | 1780 | ||
1790 | /* Bit masks for CNT_IMASK */ | 1781 | /* Bit masks for CNT_IMASK */ |
1791 | 1782 | ||
1792 | #define ICIE 0x1 /* Illegal Gray/Binary Code Interrupt Enable */ | 1783 | #define ICIE 0x1 /* Illegal Gray/Binary Code Interrupt Enable */ |
1793 | #define nICIE 0x0 | 1784 | #define nICIE 0x0 |
1794 | #define UCIE 0x2 /* Up count Interrupt Enable */ | 1785 | #define UCIE 0x2 /* Up count Interrupt Enable */ |
1795 | #define nUCIE 0x0 | 1786 | #define nUCIE 0x0 |
1796 | #define DCIE 0x4 /* Down count Interrupt Enable */ | 1787 | #define DCIE 0x4 /* Down count Interrupt Enable */ |
1797 | #define nDCIE 0x0 | 1788 | #define nDCIE 0x0 |
1798 | #define MINCIE 0x8 /* Min Count Interrupt Enable */ | 1789 | #define MINCIE 0x8 /* Min Count Interrupt Enable */ |
1799 | #define nMINCIE 0x0 | 1790 | #define nMINCIE 0x0 |
1800 | #define MAXCIE 0x10 /* Max Count Interrupt Enable */ | 1791 | #define MAXCIE 0x10 /* Max Count Interrupt Enable */ |
1801 | #define nMAXCIE 0x0 | 1792 | #define nMAXCIE 0x0 |
1802 | #define COV31IE 0x20 /* Bit 31 Overflow Interrupt Enable */ | 1793 | #define COV31IE 0x20 /* Bit 31 Overflow Interrupt Enable */ |
1803 | #define nCOV31IE 0x0 | 1794 | #define nCOV31IE 0x0 |
1804 | #define COV15IE 0x40 /* Bit 15 Overflow Interrupt Enable */ | 1795 | #define COV15IE 0x40 /* Bit 15 Overflow Interrupt Enable */ |
1805 | #define nCOV15IE 0x0 | 1796 | #define nCOV15IE 0x0 |
1806 | #define CZEROIE 0x80 /* Count to Zero Interrupt Enable */ | 1797 | #define CZEROIE 0x80 /* Count to Zero Interrupt Enable */ |
1807 | #define nCZEROIE 0x0 | 1798 | #define nCZEROIE 0x0 |
1808 | #define CZMIE 0x100 /* CZM Pin Interrupt Enable */ | 1799 | #define CZMIE 0x100 /* CZM Pin Interrupt Enable */ |
1809 | #define nCZMIE 0x0 | 1800 | #define nCZMIE 0x0 |
1810 | #define CZMEIE 0x200 /* CZM Error Interrupt Enable */ | 1801 | #define CZMEIE 0x200 /* CZM Error Interrupt Enable */ |
1811 | #define nCZMEIE 0x0 | 1802 | #define nCZMEIE 0x0 |
1812 | #define CZMZIE 0x400 /* CZM Zeroes Counter Interrupt Enable */ | 1803 | #define CZMZIE 0x400 /* CZM Zeroes Counter Interrupt Enable */ |
1813 | #define nCZMZIE 0x0 | 1804 | #define nCZMZIE 0x0 |
1814 | 1805 | ||
1815 | /* Bit masks for CNT_STATUS */ | 1806 | /* Bit masks for CNT_STATUS */ |
1816 | 1807 | ||
1817 | #define ICII 0x1 /* Illegal Gray/Binary Code Interrupt Identifier */ | 1808 | #define ICII 0x1 /* Illegal Gray/Binary Code Interrupt Identifier */ |
1818 | #define nICII 0x0 | 1809 | #define nICII 0x0 |
1819 | #define UCII 0x2 /* Up count Interrupt Identifier */ | 1810 | #define UCII 0x2 /* Up count Interrupt Identifier */ |
1820 | #define nUCII 0x0 | 1811 | #define nUCII 0x0 |
1821 | #define DCII 0x4 /* Down count Interrupt Identifier */ | 1812 | #define DCII 0x4 /* Down count Interrupt Identifier */ |
1822 | #define nDCII 0x0 | 1813 | #define nDCII 0x0 |
1823 | #define MINCII 0x8 /* Min Count Interrupt Identifier */ | 1814 | #define MINCII 0x8 /* Min Count Interrupt Identifier */ |
1824 | #define nMINCII 0x0 | 1815 | #define nMINCII 0x0 |
1825 | #define MAXCII 0x10 /* Max Count Interrupt Identifier */ | 1816 | #define MAXCII 0x10 /* Max Count Interrupt Identifier */ |
1826 | #define nMAXCII 0x0 | 1817 | #define nMAXCII 0x0 |
1827 | #define COV31II 0x20 /* Bit 31 Overflow Interrupt Identifier */ | 1818 | #define COV31II 0x20 /* Bit 31 Overflow Interrupt Identifier */ |
1828 | #define nCOV31II 0x0 | 1819 | #define nCOV31II 0x0 |
1829 | #define COV15II 0x40 /* Bit 15 Overflow Interrupt Identifier */ | 1820 | #define COV15II 0x40 /* Bit 15 Overflow Interrupt Identifier */ |
1830 | #define nCOV15II 0x0 | 1821 | #define nCOV15II 0x0 |
1831 | #define CZEROII 0x80 /* Count to Zero Interrupt Identifier */ | 1822 | #define CZEROII 0x80 /* Count to Zero Interrupt Identifier */ |
1832 | #define nCZEROII 0x0 | 1823 | #define nCZEROII 0x0 |
1833 | #define CZMII 0x100 /* CZM Pin Interrupt Identifier */ | 1824 | #define CZMII 0x100 /* CZM Pin Interrupt Identifier */ |
1834 | #define nCZMII 0x0 | 1825 | #define nCZMII 0x0 |
1835 | #define CZMEII 0x200 /* CZM Error Interrupt Identifier */ | 1826 | #define CZMEII 0x200 /* CZM Error Interrupt Identifier */ |
1836 | #define nCZMEII 0x0 | 1827 | #define nCZMEII 0x0 |
1837 | #define CZMZII 0x400 /* CZM Zeroes Counter Interrupt Identifier */ | 1828 | #define CZMZII 0x400 /* CZM Zeroes Counter Interrupt Identifier */ |
1838 | #define nCZMZII 0x0 | 1829 | #define nCZMZII 0x0 |
1839 | 1830 | ||
1840 | /* Bit masks for CNT_COMMAND */ | 1831 | /* Bit masks for CNT_COMMAND */ |
1841 | 1832 | ||
@@ -1843,7 +1834,7 @@ | |||
1843 | #define W1LMIN 0xf0 /* Load Min Register */ | 1834 | #define W1LMIN 0xf0 /* Load Min Register */ |
1844 | #define W1LMAX 0xf00 /* Load Max Register */ | 1835 | #define W1LMAX 0xf00 /* Load Max Register */ |
1845 | #define W1ZMONCE 0x1000 /* Enable CZM Clear Counter Once */ | 1836 | #define W1ZMONCE 0x1000 /* Enable CZM Clear Counter Once */ |
1846 | #define nW1ZMONCE 0x0 | 1837 | #define nW1ZMONCE 0x0 |
1847 | 1838 | ||
1848 | /* Bit masks for CNT_DEBOUNCE */ | 1839 | /* Bit masks for CNT_DEBOUNCE */ |
1849 | 1840 | ||
@@ -1853,15 +1844,15 @@ | |||
1853 | 1844 | ||
1854 | #define FUSE_FADDR 0x1ff /* OTP/Fuse Address */ | 1845 | #define FUSE_FADDR 0x1ff /* OTP/Fuse Address */ |
1855 | #define FIEN 0x800 /* OTP/Fuse Interrupt Enable */ | 1846 | #define FIEN 0x800 /* OTP/Fuse Interrupt Enable */ |
1856 | #define nFIEN 0x0 | 1847 | #define nFIEN 0x0 |
1857 | #define FTESTDEC 0x1000 /* OTP/Fuse Test Decoder */ | 1848 | #define FTESTDEC 0x1000 /* OTP/Fuse Test Decoder */ |
1858 | #define nFTESTDEC 0x0 | 1849 | #define nFTESTDEC 0x0 |
1859 | #define FWRTEST 0x2000 /* OTP/Fuse Write Test */ | 1850 | #define FWRTEST 0x2000 /* OTP/Fuse Write Test */ |
1860 | #define nFWRTEST 0x0 | 1851 | #define nFWRTEST 0x0 |
1861 | #define FRDEN 0x4000 /* OTP/Fuse Read Enable */ | 1852 | #define FRDEN 0x4000 /* OTP/Fuse Read Enable */ |
1862 | #define nFRDEN 0x0 | 1853 | #define nFRDEN 0x0 |
1863 | #define FWREN 0x8000 /* OTP/Fuse Write Enable */ | 1854 | #define FWREN 0x8000 /* OTP/Fuse Write Enable */ |
1864 | #define nFWREN 0x0 | 1855 | #define nFWREN 0x0 |
1865 | 1856 | ||
1866 | /* Bit masks for OTP_BEN */ | 1857 | /* Bit masks for OTP_BEN */ |
1867 | 1858 | ||
@@ -1870,15 +1861,15 @@ | |||
1870 | /* Bit masks for OTP_STATUS */ | 1861 | /* Bit masks for OTP_STATUS */ |
1871 | 1862 | ||
1872 | #define FCOMP 0x1 /* OTP/Fuse Access Complete */ | 1863 | #define FCOMP 0x1 /* OTP/Fuse Access Complete */ |
1873 | #define nFCOMP 0x0 | 1864 | #define nFCOMP 0x0 |
1874 | #define FERROR 0x2 /* OTP/Fuse Access Error */ | 1865 | #define FERROR 0x2 /* OTP/Fuse Access Error */ |
1875 | #define nFERROR 0x0 | 1866 | #define nFERROR 0x0 |
1876 | #define MMRGLOAD 0x10 /* Memory Mapped Register Gasket Load */ | 1867 | #define MMRGLOAD 0x10 /* Memory Mapped Register Gasket Load */ |
1877 | #define nMMRGLOAD 0x0 | 1868 | #define nMMRGLOAD 0x0 |
1878 | #define MMRGLOCK 0x20 /* Memory Mapped Register Gasket Lock */ | 1869 | #define MMRGLOCK 0x20 /* Memory Mapped Register Gasket Lock */ |
1879 | #define nMMRGLOCK 0x0 | 1870 | #define nMMRGLOCK 0x0 |
1880 | #define FPGMEN 0x40 /* OTP/Fuse Program Enable */ | 1871 | #define FPGMEN 0x40 /* OTP/Fuse Program Enable */ |
1881 | #define nFPGMEN 0x0 | 1872 | #define nFPGMEN 0x0 |
1882 | 1873 | ||
1883 | /* Bit masks for OTP_TIMING */ | 1874 | /* Bit masks for OTP_TIMING */ |
1884 | 1875 | ||
@@ -1892,42 +1883,42 @@ | |||
1892 | /* Bit masks for SECURE_SYSSWT */ | 1883 | /* Bit masks for SECURE_SYSSWT */ |
1893 | 1884 | ||
1894 | #define EMUDABL 0x1 /* Emulation Disable. */ | 1885 | #define EMUDABL 0x1 /* Emulation Disable. */ |
1895 | #define nEMUDABL 0x0 | 1886 | #define nEMUDABL 0x0 |
1896 | #define RSTDABL 0x2 /* Reset Disable */ | 1887 | #define RSTDABL 0x2 /* Reset Disable */ |
1897 | #define nRSTDABL 0x0 | 1888 | #define nRSTDABL 0x0 |
1898 | #define L1IDABL 0x1c /* L1 Instruction Memory Disable. */ | 1889 | #define L1IDABL 0x1c /* L1 Instruction Memory Disable. */ |
1899 | #define L1DADABL 0xe0 /* L1 Data Bank A Memory Disable. */ | 1890 | #define L1DADABL 0xe0 /* L1 Data Bank A Memory Disable. */ |
1900 | #define L1DBDABL 0x700 /* L1 Data Bank B Memory Disable. */ | 1891 | #define L1DBDABL 0x700 /* L1 Data Bank B Memory Disable. */ |
1901 | #define DMA0OVR 0x800 /* DMA0 Memory Access Override */ | 1892 | #define DMA0OVR 0x800 /* DMA0 Memory Access Override */ |
1902 | #define nDMA0OVR 0x0 | 1893 | #define nDMA0OVR 0x0 |
1903 | #define DMA1OVR 0x1000 /* DMA1 Memory Access Override */ | 1894 | #define DMA1OVR 0x1000 /* DMA1 Memory Access Override */ |
1904 | #define nDMA1OVR 0x0 | 1895 | #define nDMA1OVR 0x0 |
1905 | #define EMUOVR 0x4000 /* Emulation Override */ | 1896 | #define EMUOVR 0x4000 /* Emulation Override */ |
1906 | #define nEMUOVR 0x0 | 1897 | #define nEMUOVR 0x0 |
1907 | #define OTPSEN 0x8000 /* OTP Secrets Enable. */ | 1898 | #define OTPSEN 0x8000 /* OTP Secrets Enable. */ |
1908 | #define nOTPSEN 0x0 | 1899 | #define nOTPSEN 0x0 |
1909 | #define L2DABL 0x70000 /* L2 Memory Disable. */ | 1900 | #define L2DABL 0x70000 /* L2 Memory Disable. */ |
1910 | 1901 | ||
1911 | /* Bit masks for SECURE_CONTROL */ | 1902 | /* Bit masks for SECURE_CONTROL */ |
1912 | 1903 | ||
1913 | #define SECURE0 0x1 /* SECURE 0 */ | 1904 | #define SECURE0 0x1 /* SECURE 0 */ |
1914 | #define nSECURE0 0x0 | 1905 | #define nSECURE0 0x0 |
1915 | #define SECURE1 0x2 /* SECURE 1 */ | 1906 | #define SECURE1 0x2 /* SECURE 1 */ |
1916 | #define nSECURE1 0x0 | 1907 | #define nSECURE1 0x0 |
1917 | #define SECURE2 0x4 /* SECURE 2 */ | 1908 | #define SECURE2 0x4 /* SECURE 2 */ |
1918 | #define nSECURE2 0x0 | 1909 | #define nSECURE2 0x0 |
1919 | #define SECURE3 0x8 /* SECURE 3 */ | 1910 | #define SECURE3 0x8 /* SECURE 3 */ |
1920 | #define nSECURE3 0x0 | 1911 | #define nSECURE3 0x0 |
1921 | 1912 | ||
1922 | /* Bit masks for SECURE_STATUS */ | 1913 | /* Bit masks for SECURE_STATUS */ |
1923 | 1914 | ||
1924 | #define SECMODE 0x3 /* Secured Mode Control State */ | 1915 | #define SECMODE 0x3 /* Secured Mode Control State */ |
1925 | #define NMI 0x4 /* Non Maskable Interrupt */ | 1916 | #define NMI 0x4 /* Non Maskable Interrupt */ |
1926 | #define nNMI 0x0 | 1917 | #define nNMI 0x0 |
1927 | #define AFVALID 0x8 /* Authentication Firmware Valid */ | 1918 | #define AFVALID 0x8 /* Authentication Firmware Valid */ |
1928 | #define nAFVALID 0x0 | 1919 | #define nAFVALID 0x0 |
1929 | #define AFEXIT 0x10 /* Authentication Firmware Exit */ | 1920 | #define AFEXIT 0x10 /* Authentication Firmware Exit */ |
1930 | #define nAFEXIT 0x0 | 1921 | #define nAFEXIT 0x0 |
1931 | #define SECSTAT 0xe0 /* Secure Status */ | 1922 | #define SECSTAT 0xe0 /* Secure Status */ |
1932 | 1923 | ||
1933 | /* Bit masks for NFC_CTL */ | 1924 | /* Bit masks for NFC_CTL */ |
@@ -1935,60 +1926,60 @@ | |||
1935 | #define WR_DLY 0xf /* Write Strobe Delay */ | 1926 | #define WR_DLY 0xf /* Write Strobe Delay */ |
1936 | #define RD_DLY 0xf0 /* Read Strobe Delay */ | 1927 | #define RD_DLY 0xf0 /* Read Strobe Delay */ |
1937 | #define NWIDTH 0x100 /* NAND Data Width */ | 1928 | #define NWIDTH 0x100 /* NAND Data Width */ |
1938 | #define nNWIDTH 0x0 | 1929 | #define nNWIDTH 0x0 |
1939 | #define PG_SIZE 0x200 /* Page Size */ | 1930 | #define PG_SIZE 0x200 /* Page Size */ |
1940 | #define nPG_SIZE 0x0 | 1931 | #define nPG_SIZE 0x0 |
1941 | 1932 | ||
1942 | /* Bit masks for NFC_STAT */ | 1933 | /* Bit masks for NFC_STAT */ |
1943 | 1934 | ||
1944 | #define NBUSY 0x1 /* Not Busy */ | 1935 | #define NBUSY 0x1 /* Not Busy */ |
1945 | #define nNBUSY 0x0 | 1936 | #define nNBUSY 0x0 |
1946 | #define WB_FULL 0x2 /* Write Buffer Full */ | 1937 | #define WB_FULL 0x2 /* Write Buffer Full */ |
1947 | #define nWB_FULL 0x0 | 1938 | #define nWB_FULL 0x0 |
1948 | #define PG_WR_STAT 0x4 /* Page Write Pending */ | 1939 | #define PG_WR_STAT 0x4 /* Page Write Pending */ |
1949 | #define nPG_WR_STAT 0x0 | 1940 | #define nPG_WR_STAT 0x0 |
1950 | #define PG_RD_STAT 0x8 /* Page Read Pending */ | 1941 | #define PG_RD_STAT 0x8 /* Page Read Pending */ |
1951 | #define nPG_RD_STAT 0x0 | 1942 | #define nPG_RD_STAT 0x0 |
1952 | #define WB_EMPTY 0x10 /* Write Buffer Empty */ | 1943 | #define WB_EMPTY 0x10 /* Write Buffer Empty */ |
1953 | #define nWB_EMPTY 0x0 | 1944 | #define nWB_EMPTY 0x0 |
1954 | 1945 | ||
1955 | /* Bit masks for NFC_IRQSTAT */ | 1946 | /* Bit masks for NFC_IRQSTAT */ |
1956 | 1947 | ||
1957 | #define NBUSYIRQ 0x1 /* Not Busy IRQ */ | 1948 | #define NBUSYIRQ 0x1 /* Not Busy IRQ */ |
1958 | #define nNBUSYIRQ 0x0 | 1949 | #define nNBUSYIRQ 0x0 |
1959 | #define WB_OVF 0x2 /* Write Buffer Overflow */ | 1950 | #define WB_OVF 0x2 /* Write Buffer Overflow */ |
1960 | #define nWB_OVF 0x0 | 1951 | #define nWB_OVF 0x0 |
1961 | #define WB_EDGE 0x4 /* Write Buffer Edge Detect */ | 1952 | #define WB_EDGE 0x4 /* Write Buffer Edge Detect */ |
1962 | #define nWB_EDGE 0x0 | 1953 | #define nWB_EDGE 0x0 |
1963 | #define RD_RDY 0x8 /* Read Data Ready */ | 1954 | #define RD_RDY 0x8 /* Read Data Ready */ |
1964 | #define nRD_RDY 0x0 | 1955 | #define nRD_RDY 0x0 |
1965 | #define WR_DONE 0x10 /* Page Write Done */ | 1956 | #define WR_DONE 0x10 /* Page Write Done */ |
1966 | #define nWR_DONE 0x0 | 1957 | #define nWR_DONE 0x0 |
1967 | 1958 | ||
1968 | /* Bit masks for NFC_IRQMASK */ | 1959 | /* Bit masks for NFC_IRQMASK */ |
1969 | 1960 | ||
1970 | #define MASK_BUSYIRQ 0x1 /* Mask Not Busy IRQ */ | 1961 | #define MASK_BUSYIRQ 0x1 /* Mask Not Busy IRQ */ |
1971 | #define nMASK_BUSYIRQ 0x0 | 1962 | #define nMASK_BUSYIRQ 0x0 |
1972 | #define MASK_WBOVF 0x2 /* Mask Write Buffer Overflow */ | 1963 | #define MASK_WBOVF 0x2 /* Mask Write Buffer Overflow */ |
1973 | #define nMASK_WBOVF 0x0 | 1964 | #define nMASK_WBOVF 0x0 |
1974 | #define MASK_WBEMPTY 0x4 /* Mask Write Buffer Empty */ | 1965 | #define MASK_WBEMPTY 0x4 /* Mask Write Buffer Empty */ |
1975 | #define nMASK_WBEMPTY 0x0 | 1966 | #define nMASK_WBEMPTY 0x0 |
1976 | #define MASK_RDRDY 0x8 /* Mask Read Data Ready */ | 1967 | #define MASK_RDRDY 0x8 /* Mask Read Data Ready */ |
1977 | #define nMASK_RDRDY 0x0 | 1968 | #define nMASK_RDRDY 0x0 |
1978 | #define MASK_WRDONE 0x10 /* Mask Write Done */ | 1969 | #define MASK_WRDONE 0x10 /* Mask Write Done */ |
1979 | #define nMASK_WRDONE 0x0 | 1970 | #define nMASK_WRDONE 0x0 |
1980 | 1971 | ||
1981 | /* Bit masks for NFC_RST */ | 1972 | /* Bit masks for NFC_RST */ |
1982 | 1973 | ||
1983 | #define ECC_RST 0x1 /* ECC (and NFC counters) Reset */ | 1974 | #define ECC_RST 0x1 /* ECC (and NFC counters) Reset */ |
1984 | #define nECC_RST 0x0 | 1975 | #define nECC_RST 0x0 |
1985 | 1976 | ||
1986 | /* Bit masks for NFC_PGCTL */ | 1977 | /* Bit masks for NFC_PGCTL */ |
1987 | 1978 | ||
1988 | #define PG_RD_START 0x1 /* Page Read Start */ | 1979 | #define PG_RD_START 0x1 /* Page Read Start */ |
1989 | #define nPG_RD_START 0x0 | 1980 | #define nPG_RD_START 0x0 |
1990 | #define PG_WR_START 0x2 /* Page Write Start */ | 1981 | #define PG_WR_START 0x2 /* Page Write Start */ |
1991 | #define nPG_WR_START 0x0 | 1982 | #define nPG_WR_START 0x0 |
1992 | 1983 | ||
1993 | /* Bit masks for NFC_ECC0 */ | 1984 | /* Bit masks for NFC_ECC0 */ |
1994 | 1985 | ||
diff --git a/include/asm-blackfin/mach-bf527/dma.h b/arch/blackfin/mach-bf527/include/mach/dma.h index 49dd693223e8..49dd693223e8 100644 --- a/include/asm-blackfin/mach-bf527/dma.h +++ b/arch/blackfin/mach-bf527/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf527/irq.h b/arch/blackfin/mach-bf527/include/mach/irq.h index 4e2b3f2020e5..4e2b3f2020e5 100644 --- a/include/asm-blackfin/mach-bf527/irq.h +++ b/arch/blackfin/mach-bf527/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf527/mem_init.h b/arch/blackfin/mach-bf527/include/mach/mem_init.h index cbe03f4a5698..cbe03f4a5698 100644 --- a/include/asm-blackfin/mach-bf527/mem_init.h +++ b/arch/blackfin/mach-bf527/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf527/mem_map.h b/arch/blackfin/mach-bf527/include/mach/mem_map.h index ef46dc991cd4..ef46dc991cd4 100644 --- a/include/asm-blackfin/mach-bf527/mem_map.h +++ b/arch/blackfin/mach-bf527/include/mach/mem_map.h | |||
diff --git a/include/asm-blackfin/mach-bf527/portmux.h b/arch/blackfin/mach-bf527/include/mach/portmux.h index ae4d205bfcf5..ae4d205bfcf5 100644 --- a/include/asm-blackfin/mach-bf527/portmux.h +++ b/arch/blackfin/mach-bf527/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S index d59db86195b6..01b2b7ead5ab 100644 --- a/arch/blackfin/mach-bf533/head.S +++ b/arch/blackfin/mach-bf533/head.S | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
34 | #include <asm/mach-common/clocks.h> | 34 | #include <asm/clocks.h> |
35 | #include <asm/mach/mem_init.h> | 35 | #include <mach/mem_init.h> |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | .section .l1.text | 38 | .section .l1.text |
diff --git a/include/asm-blackfin/mach-bf533/anomaly.h b/arch/blackfin/mach-bf533/include/mach/anomaly.h index 8f7ea112fd3a..8f7ea112fd3a 100644 --- a/include/asm-blackfin/mach-bf533/anomaly.h +++ b/arch/blackfin/mach-bf533/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf533/bf533.h b/arch/blackfin/mach-bf533/include/mach/bf533.h index 12a416931991..12a416931991 100644 --- a/include/asm-blackfin/mach-bf533/bf533.h +++ b/arch/blackfin/mach-bf533/include/mach/bf533.h | |||
diff --git a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h index ebf592b59aab..ebf592b59aab 100644 --- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf533/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf533/bfin_sir.h b/arch/blackfin/mach-bf533/include/mach/bfin_sir.h index 9bb87e9e2e9b..9bb87e9e2e9b 100644 --- a/include/asm-blackfin/mach-bf533/bfin_sir.h +++ b/arch/blackfin/mach-bf533/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf533/blackfin.h b/arch/blackfin/mach-bf533/include/mach/blackfin.h index d80971b4e3aa..d80971b4e3aa 100644 --- a/include/asm-blackfin/mach-bf533/blackfin.h +++ b/arch/blackfin/mach-bf533/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf533/cdefBF532.h b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h index 154655452d4c..3d8978a52c17 100644 --- a/include/asm-blackfin/mach-bf533/cdefBF532.h +++ b/arch/blackfin/mach-bf533/include/mach/cdefBF532.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "defBF532.h" | 37 | #include "defBF532.h" |
38 | 38 | ||
39 | /*include core specific register pointer definitions*/ | 39 | /*include core specific register pointer definitions*/ |
40 | #include <asm/mach-common/cdef_LPBlackfin.h> | 40 | #include <asm/cdef_LPBlackfin.h> |
41 | 41 | ||
42 | #include <asm/system.h> | 42 | #include <asm/system.h> |
43 | 43 | ||
diff --git a/include/asm-blackfin/mach-bf533/defBF532.h b/arch/blackfin/mach-bf533/include/mach/defBF532.h index 0ab4dd7494cf..7f4633223e6d 100644 --- a/include/asm-blackfin/mach-bf533/defBF532.h +++ b/arch/blackfin/mach-bf533/include/mach/defBF532.h | |||
@@ -48,7 +48,7 @@ | |||
48 | #define _DEF_BF532_H | 48 | #define _DEF_BF532_H |
49 | 49 | ||
50 | /* include all Core registers and bit definitions */ | 50 | /* include all Core registers and bit definitions */ |
51 | #include <asm/mach-common/def_LPBlackfin.h> | 51 | #include <asm/def_LPBlackfin.h> |
52 | 52 | ||
53 | /*********************************************************************************** */ | 53 | /*********************************************************************************** */ |
54 | /* System MMR Register Map */ | 54 | /* System MMR Register Map */ |
diff --git a/include/asm-blackfin/mach-bf533/dma.h b/arch/blackfin/mach-bf533/include/mach/dma.h index bd9d5e94307d..bd9d5e94307d 100644 --- a/include/asm-blackfin/mach-bf533/dma.h +++ b/arch/blackfin/mach-bf533/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf533/irq.h b/arch/blackfin/mach-bf533/include/mach/irq.h index 5aa38e5da6b7..5aa38e5da6b7 100644 --- a/include/asm-blackfin/mach-bf533/irq.h +++ b/arch/blackfin/mach-bf533/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf533/mem_init.h b/arch/blackfin/mach-bf533/include/mach/mem_init.h index ed2034bf10ec..ed2034bf10ec 100644 --- a/include/asm-blackfin/mach-bf533/mem_init.h +++ b/arch/blackfin/mach-bf533/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf533/mem_map.h b/arch/blackfin/mach-bf533/include/mach/mem_map.h index 581fc6eea789..581fc6eea789 100644 --- a/include/asm-blackfin/mach-bf533/mem_map.h +++ b/arch/blackfin/mach-bf533/include/mach/mem_map.h | |||
diff --git a/include/asm-blackfin/mach-bf533/portmux.h b/arch/blackfin/mach-bf533/include/mach/portmux.h index 685a2651dcda..685a2651dcda 100644 --- a/include/asm-blackfin/mach-bf533/portmux.h +++ b/arch/blackfin/mach-bf533/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index e93964fdb432..8482d22321f3 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -584,6 +584,30 @@ static struct bfin5xx_spi_chip spidev_chip_info = { | |||
584 | 584 | ||
585 | #if defined(CONFIG_MTD_DATAFLASH) \ | 585 | #if defined(CONFIG_MTD_DATAFLASH) \ |
586 | || defined(CONFIG_MTD_DATAFLASH_MODULE) | 586 | || defined(CONFIG_MTD_DATAFLASH_MODULE) |
587 | |||
588 | static struct mtd_partition bfin_spi_dataflash_partitions[] = { | ||
589 | { | ||
590 | .name = "bootloader(spi)", | ||
591 | .size = 0x00040000, | ||
592 | .offset = 0, | ||
593 | .mask_flags = MTD_CAP_ROM | ||
594 | }, { | ||
595 | .name = "linux kernel(spi)", | ||
596 | .size = 0xe0000, | ||
597 | .offset = MTDPART_OFS_APPEND, | ||
598 | }, { | ||
599 | .name = "file system(spi)", | ||
600 | .size = MTDPART_SIZ_FULL, | ||
601 | .offset = MTDPART_OFS_APPEND, | ||
602 | } | ||
603 | }; | ||
604 | |||
605 | static struct flash_platform_data bfin_spi_dataflash_data = { | ||
606 | .name = "SPI Dataflash", | ||
607 | .parts = bfin_spi_dataflash_partitions, | ||
608 | .nr_parts = ARRAY_SIZE(bfin_spi_dataflash_partitions), | ||
609 | }; | ||
610 | |||
587 | /* DataFlash chip */ | 611 | /* DataFlash chip */ |
588 | static struct bfin5xx_spi_chip data_flash_chip_info = { | 612 | static struct bfin5xx_spi_chip data_flash_chip_info = { |
589 | .enable_dma = 0, /* use dma transfer with this chip*/ | 613 | .enable_dma = 0, /* use dma transfer with this chip*/ |
@@ -609,9 +633,10 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = { | |||
609 | || defined(CONFIG_MTD_DATAFLASH_MODULE) | 633 | || defined(CONFIG_MTD_DATAFLASH_MODULE) |
610 | { /* DataFlash chip */ | 634 | { /* DataFlash chip */ |
611 | .modalias = "mtd_dataflash", | 635 | .modalias = "mtd_dataflash", |
612 | .max_speed_hz = 25000000, /* max spi clock (SCK) speed in HZ */ | 636 | .max_speed_hz = 33250000, /* max spi clock (SCK) speed in HZ */ |
613 | .bus_num = 0, /* Framework bus number */ | 637 | .bus_num = 0, /* Framework bus number */ |
614 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ | 638 | .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/ |
639 | .platform_data = &bfin_spi_dataflash_data, | ||
615 | .controller_data = &data_flash_chip_info, | 640 | .controller_data = &data_flash_chip_info, |
616 | .mode = SPI_MODE_3, | 641 | .mode = SPI_MODE_3, |
617 | }, | 642 | }, |
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S index 64e0287ab266..12eb5cc571d0 100644 --- a/arch/blackfin/mach-bf537/head.S +++ b/arch/blackfin/mach-bf537/head.S | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
34 | #include <asm/mach-common/clocks.h> | 34 | #include <asm/clocks.h> |
35 | #include <asm/mach/mem_init.h> | 35 | #include <mach/mem_init.h> |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | .section .l1.text | 38 | .section .l1.text |
diff --git a/include/asm-blackfin/mach-bf537/anomaly.h b/arch/blackfin/mach-bf537/include/mach/anomaly.h index 8460ab9c324f..8460ab9c324f 100644 --- a/include/asm-blackfin/mach-bf537/anomaly.h +++ b/arch/blackfin/mach-bf537/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf537/bf537.h b/arch/blackfin/mach-bf537/include/mach/bf537.h index cfe2a221112e..cfe2a221112e 100644 --- a/include/asm-blackfin/mach-bf537/bf537.h +++ b/arch/blackfin/mach-bf537/include/mach/bf537.h | |||
diff --git a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h index 1bf56ffa22f9..1bf56ffa22f9 100644 --- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf537/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf537/bfin_sir.h b/arch/blackfin/mach-bf537/include/mach/bfin_sir.h index cfd8ad4f1f2c..cfd8ad4f1f2c 100644 --- a/include/asm-blackfin/mach-bf537/bfin_sir.h +++ b/arch/blackfin/mach-bf537/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf537/blackfin.h b/arch/blackfin/mach-bf537/include/mach/blackfin.h index cffc786b2a2b..cffc786b2a2b 100644 --- a/include/asm-blackfin/mach-bf537/blackfin.h +++ b/arch/blackfin/mach-bf537/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf537/cdefBF534.h b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h index 82de526f8097..88d491cd9f36 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/cdefBF534.h | |||
@@ -38,7 +38,7 @@ | |||
38 | #include "defBF534.h" | 38 | #include "defBF534.h" |
39 | 39 | ||
40 | /* Include core specific register pointer definitions */ | 40 | /* Include core specific register pointer definitions */ |
41 | #include <asm/mach-common/cdef_LPBlackfin.h> | 41 | #include <asm/cdef_LPBlackfin.h> |
42 | 42 | ||
43 | #include <asm/system.h> | 43 | #include <asm/system.h> |
44 | 44 | ||
diff --git a/include/asm-blackfin/mach-bf537/cdefBF537.h b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h index b8fc949a991f..b8fc949a991f 100644 --- a/include/asm-blackfin/mach-bf537/cdefBF537.h +++ b/arch/blackfin/mach-bf537/include/mach/cdefBF537.h | |||
diff --git a/include/asm-blackfin/mach-bf537/defBF534.h b/arch/blackfin/mach-bf537/include/mach/defBF534.h index d0d80d3152ba..a3227f9003ff 100644 --- a/include/asm-blackfin/mach-bf537/defBF534.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF534.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF534_H | 32 | #define _DEF_BF534_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | /************************************************************************************ | 37 | /************************************************************************************ |
38 | ** System MMR Register Map | 38 | ** System MMR Register Map |
diff --git a/include/asm-blackfin/mach-bf537/defBF537.h b/arch/blackfin/mach-bf537/include/mach/defBF537.h index abde24c6d3b1..3d6c83e31b1e 100644 --- a/include/asm-blackfin/mach-bf537/defBF537.h +++ b/arch/blackfin/mach-bf537/include/mach/defBF537.h | |||
@@ -33,7 +33,7 @@ | |||
33 | #define _DEF_BF537_H | 33 | #define _DEF_BF537_H |
34 | 34 | ||
35 | /* Include all Core registers and bit definitions*/ | 35 | /* Include all Core registers and bit definitions*/ |
36 | #include <asm/mach-common/cdef_LPBlackfin.h> | 36 | #include <asm/cdef_LPBlackfin.h> |
37 | 37 | ||
38 | /* Include all MMR and bit defines common to BF534 */ | 38 | /* Include all MMR and bit defines common to BF534 */ |
39 | #include "defBF534.h" | 39 | #include "defBF534.h" |
diff --git a/include/asm-blackfin/mach-bf537/dma.h b/arch/blackfin/mach-bf537/include/mach/dma.h index 7a964040870a..7a964040870a 100644 --- a/include/asm-blackfin/mach-bf537/dma.h +++ b/arch/blackfin/mach-bf537/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf537/irq.h b/arch/blackfin/mach-bf537/include/mach/irq.h index 2e68a8a1e730..2e68a8a1e730 100644 --- a/include/asm-blackfin/mach-bf537/irq.h +++ b/arch/blackfin/mach-bf537/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf537/mem_init.h b/arch/blackfin/mach-bf537/include/mach/mem_init.h index f67698f670ca..f67698f670ca 100644 --- a/include/asm-blackfin/mach-bf537/mem_init.h +++ b/arch/blackfin/mach-bf537/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf537/mem_map.h b/arch/blackfin/mach-bf537/include/mach/mem_map.h index 5078b669431f..5078b669431f 100644 --- a/include/asm-blackfin/mach-bf537/mem_map.h +++ b/arch/blackfin/mach-bf537/include/mach/mem_map.h | |||
diff --git a/include/asm-blackfin/mach-bf537/portmux.h b/arch/blackfin/mach-bf537/include/mach/portmux.h index 78fee6e0f237..78fee6e0f237 100644 --- a/include/asm-blackfin/mach-bf537/portmux.h +++ b/arch/blackfin/mach-bf537/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index 58abbed0a225..ce934ee174e0 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <asm/gpio.h> | 45 | #include <asm/gpio.h> |
46 | #include <asm/nand.h> | 46 | #include <asm/nand.h> |
47 | #include <asm/portmux.h> | 47 | #include <asm/portmux.h> |
48 | #include <asm/mach/bf54x_keys.h> | 48 | #include <mach/bf54x_keys.h> |
49 | #include <asm/dpmc.h> | 49 | #include <asm/dpmc.h> |
50 | #include <linux/input.h> | 50 | #include <linux/input.h> |
51 | #include <linux/spi/ad7877.h> | 51 | #include <linux/spi/ad7877.h> |
@@ -61,7 +61,7 @@ const char bfin_board_name[] = "Bluetechnix CM-BF548"; | |||
61 | 61 | ||
62 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) | 62 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) |
63 | 63 | ||
64 | #include <asm/mach/bf54x-lq043.h> | 64 | #include <mach/bf54x-lq043.h> |
65 | 65 | ||
66 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { | 66 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { |
67 | .width = 480, | 67 | .width = 480, |
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c index 0d6333ada1d9..39357693046d 100644 --- a/arch/blackfin/mach-bf548/boards/ezkit.c +++ b/arch/blackfin/mach-bf548/boards/ezkit.c | |||
@@ -48,7 +48,7 @@ | |||
48 | #include <asm/nand.h> | 48 | #include <asm/nand.h> |
49 | #include <asm/dpmc.h> | 49 | #include <asm/dpmc.h> |
50 | #include <asm/portmux.h> | 50 | #include <asm/portmux.h> |
51 | #include <asm/mach/bf54x_keys.h> | 51 | #include <mach/bf54x_keys.h> |
52 | #include <linux/input.h> | 52 | #include <linux/input.h> |
53 | #include <linux/spi/ad7877.h> | 53 | #include <linux/spi/ad7877.h> |
54 | 54 | ||
@@ -106,7 +106,7 @@ arch_initcall(bfin_isp1761_init); | |||
106 | 106 | ||
107 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) | 107 | #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE) |
108 | 108 | ||
109 | #include <asm/mach/bf54x-lq043.h> | 109 | #include <mach/bf54x-lq043.h> |
110 | 110 | ||
111 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { | 111 | static struct bfin_bf54xfb_mach_info bf54x_lq043_data = { |
112 | .width = 480, | 112 | .width = 480, |
diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S index e3000f70a26e..4d5cfeacb123 100644 --- a/arch/blackfin/mach-bf548/head.S +++ b/arch/blackfin/mach-bf548/head.S | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
34 | #include <asm/mach-common/clocks.h> | 34 | #include <asm/clocks.h> |
35 | #include <asm/mach/mem_init.h> | 35 | #include <mach/mem_init.h> |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | .section .l1.text | 38 | .section .l1.text |
diff --git a/include/asm-blackfin/mach-bf548/anomaly.h b/arch/blackfin/mach-bf548/include/mach/anomaly.h index 3ad59655881a..3ad59655881a 100644 --- a/include/asm-blackfin/mach-bf548/anomaly.h +++ b/arch/blackfin/mach-bf548/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h index e748588e8930..e748588e8930 100644 --- a/include/asm-blackfin/mach-bf548/bf548.h +++ b/arch/blackfin/mach-bf548/include/mach/bf548.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bf54x-lq043.h b/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h index 9c7ca62a45eb..9c7ca62a45eb 100644 --- a/include/asm-blackfin/mach-bf548/bf54x-lq043.h +++ b/arch/blackfin/mach-bf548/include/mach/bf54x-lq043.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bf54x_keys.h b/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h index 1fb4ec77cc25..1fb4ec77cc25 100644 --- a/include/asm-blackfin/mach-bf548/bf54x_keys.h +++ b/arch/blackfin/mach-bf548/include/mach/bf54x_keys.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h index 5e29446a8e03..5e29446a8e03 100644 --- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf548/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf548/bfin_sir.h b/arch/blackfin/mach-bf548/include/mach/bfin_sir.h index c41f9cf00268..c41f9cf00268 100644 --- a/include/asm-blackfin/mach-bf548/bfin_sir.h +++ b/arch/blackfin/mach-bf548/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf548/blackfin.h b/arch/blackfin/mach-bf548/include/mach/blackfin.h index d6ee74ac0460..d6ee74ac0460 100644 --- a/include/asm-blackfin/mach-bf548/blackfin.h +++ b/arch/blackfin/mach-bf548/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF542.h b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h index 60b9f77576f1..07aefb9ed79b 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF542.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "defBF542.h" | 35 | #include "defBF542.h" |
36 | 36 | ||
37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
39 | 39 | ||
40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ |
41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF544.h b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h index ea9b4ab496f3..431a69278991 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF544.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "defBF544.h" | 35 | #include "defBF544.h" |
36 | 36 | ||
37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
39 | 39 | ||
40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ |
41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF547.h b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h index ba716277c00d..93376e90dfc5 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF547.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "defBF548.h" | 35 | #include "defBF548.h" |
36 | 36 | ||
37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
39 | 39 | ||
40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ |
41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF548.h b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h index ae971ebff6a0..9cd74384136f 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF548.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "defBF548.h" | 35 | #include "defBF548.h" |
36 | 36 | ||
37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
39 | 39 | ||
40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ |
41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF549.h b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h index 92d07d961999..ead360b69dea 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF549.h | |||
@@ -35,7 +35,7 @@ | |||
35 | #include "defBF549.h" | 35 | #include "defBF549.h" |
36 | 36 | ||
37 | /* include core sbfin_read_()ecific register pointer definitions */ | 37 | /* include core sbfin_read_()ecific register pointer definitions */ |
38 | #include <asm/mach-common/cdef_LPBlackfin.h> | 38 | #include <asm/cdef_LPBlackfin.h> |
39 | 39 | ||
40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ | 40 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ |
41 | 41 | ||
diff --git a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h index 57ac8cb9b1f6..57ac8cb9b1f6 100644 --- a/include/asm-blackfin/mach-bf548/cdefBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/cdefBF54x_base.h | |||
diff --git a/include/asm-blackfin/mach-bf548/defBF542.h b/arch/blackfin/mach-bf548/include/mach/defBF542.h index a7c809f29ede..b1316541b8d6 100644 --- a/include/asm-blackfin/mach-bf548/defBF542.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF542.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF542_H | 32 | #define _DEF_BF542_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF542 */ |
38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf548/defBF544.h b/arch/blackfin/mach-bf548/include/mach/defBF544.h index b8b9870e2697..c2c785bdc5fc 100644 --- a/include/asm-blackfin/mach-bf548/defBF544.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF544.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF544_H | 32 | #define _DEF_BF544_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF544 */ |
38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf548/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h index 3a3a18ebb10e..661f0d877bd1 100644 --- a/include/asm-blackfin/mach-bf548/defBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF548_H | 32 | #define _DEF_BF548_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ |
38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf548/defBF548.h b/arch/blackfin/mach-bf548/include/mach/defBF548.h index 1d7c96edb038..85d4bade911d 100644 --- a/include/asm-blackfin/mach-bf548/defBF548.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF548.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF548_H | 32 | #define _DEF_BF548_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ | 37 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */ |
38 | 38 | ||
diff --git a/include/asm-blackfin/mach-bf548/defBF549.h b/arch/blackfin/mach-bf548/include/mach/defBF549.h index fcb72b41e007..096734541644 100644 --- a/include/asm-blackfin/mach-bf548/defBF549.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF549.h | |||
@@ -32,7 +32,7 @@ | |||
32 | #define _DEF_BF549_H | 32 | #define _DEF_BF549_H |
33 | 33 | ||
34 | /* Include all Core registers and bit definitions */ | 34 | /* Include all Core registers and bit definitions */ |
35 | #include <asm/mach-common/def_LPBlackfin.h> | 35 | #include <asm/def_LPBlackfin.h> |
36 | 36 | ||
37 | 37 | ||
38 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ | 38 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF549 */ |
diff --git a/include/asm-blackfin/mach-bf548/defBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h index e022e896cb18..e022e896cb18 100644 --- a/include/asm-blackfin/mach-bf548/defBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h | |||
diff --git a/include/asm-blackfin/mach-bf548/dma.h b/arch/blackfin/mach-bf548/include/mach/dma.h index 36a2ef7e7849..36a2ef7e7849 100644 --- a/include/asm-blackfin/mach-bf548/dma.h +++ b/arch/blackfin/mach-bf548/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf548/gpio.h b/arch/blackfin/mach-bf548/include/mach/gpio.h index bba82dc75f16..bba82dc75f16 100644 --- a/include/asm-blackfin/mach-bf548/gpio.h +++ b/arch/blackfin/mach-bf548/include/mach/gpio.h | |||
diff --git a/include/asm-blackfin/mach-bf548/irq.h b/arch/blackfin/mach-bf548/include/mach/irq.h index ad380d1f5872..ad380d1f5872 100644 --- a/include/asm-blackfin/mach-bf548/irq.h +++ b/arch/blackfin/mach-bf548/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf548/mem_init.h b/arch/blackfin/mach-bf548/include/mach/mem_init.h index ab0b863eee66..ab0b863eee66 100644 --- a/include/asm-blackfin/mach-bf548/mem_init.h +++ b/arch/blackfin/mach-bf548/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf548/mem_map.h b/arch/blackfin/mach-bf548/include/mach/mem_map.h index f99f47bc3a07..f99f47bc3a07 100644 --- a/include/asm-blackfin/mach-bf548/mem_map.h +++ b/arch/blackfin/mach-bf548/include/mach/mem_map.h | |||
diff --git a/include/asm-blackfin/mach-bf548/portmux.h b/arch/blackfin/mach-bf548/include/mach/portmux.h index 8177a567dcdb..8177a567dcdb 100644 --- a/include/asm-blackfin/mach-bf548/portmux.h +++ b/arch/blackfin/mach-bf548/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S index c7a81e34703d..75ea6a905829 100644 --- a/arch/blackfin/mach-bf561/head.S +++ b/arch/blackfin/mach-bf561/head.S | |||
@@ -31,8 +31,8 @@ | |||
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <asm/blackfin.h> | 32 | #include <asm/blackfin.h> |
33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 33 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
34 | #include <asm/mach-common/clocks.h> | 34 | #include <asm/clocks.h> |
35 | #include <asm/mach/mem_init.h> | 35 | #include <mach/mem_init.h> |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | .section .l1.text | 38 | .section .l1.text |
diff --git a/include/asm-blackfin/mach-bf561/anomaly.h b/arch/blackfin/mach-bf561/include/mach/anomaly.h index 5c5d7d7d695f..5c5d7d7d695f 100644 --- a/include/asm-blackfin/mach-bf561/anomaly.h +++ b/arch/blackfin/mach-bf561/include/mach/anomaly.h | |||
diff --git a/include/asm-blackfin/mach-bf561/bf561.h b/arch/blackfin/mach-bf561/include/mach/bf561.h index 3ef9e5f36136..3ef9e5f36136 100644 --- a/include/asm-blackfin/mach-bf561/bf561.h +++ b/arch/blackfin/mach-bf561/include/mach/bf561.h | |||
diff --git a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h index 8aa02780e642..8aa02780e642 100644 --- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h +++ b/arch/blackfin/mach-bf561/include/mach/bfin_serial_5xx.h | |||
diff --git a/include/asm-blackfin/mach-bf561/bfin_sir.h b/arch/blackfin/mach-bf561/include/mach/bfin_sir.h index 9bb87e9e2e9b..9bb87e9e2e9b 100644 --- a/include/asm-blackfin/mach-bf561/bfin_sir.h +++ b/arch/blackfin/mach-bf561/include/mach/bfin_sir.h | |||
diff --git a/include/asm-blackfin/mach-bf561/blackfin.h b/arch/blackfin/mach-bf561/include/mach/blackfin.h index 0ea8666e6764..0ea8666e6764 100644 --- a/include/asm-blackfin/mach-bf561/blackfin.h +++ b/arch/blackfin/mach-bf561/include/mach/blackfin.h | |||
diff --git a/include/asm-blackfin/mach-bf561/cdefBF561.h b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h index b07ffccd66dd..c14d63402e70 100644 --- a/include/asm-blackfin/mach-bf561/cdefBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/cdefBF561.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "defBF561.h" | 37 | #include "defBF561.h" |
38 | 38 | ||
39 | /*include core specific register pointer definitions*/ | 39 | /*include core specific register pointer definitions*/ |
40 | #include <asm/mach-common/cdef_LPBlackfin.h> | 40 | #include <asm/cdef_LPBlackfin.h> |
41 | 41 | ||
42 | #include <asm/system.h> | 42 | #include <asm/system.h> |
43 | 43 | ||
diff --git a/include/asm-blackfin/mach-bf561/defBF561.h b/arch/blackfin/mach-bf561/include/mach/defBF561.h index 1ab50e906fe7..4eca2026bb92 100644 --- a/include/asm-blackfin/mach-bf561/defBF561.h +++ b/arch/blackfin/mach-bf561/include/mach/defBF561.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #endif | 37 | #endif |
38 | */ | 38 | */ |
39 | /* include all Core registers and bit definitions */ | 39 | /* include all Core registers and bit definitions */ |
40 | #include <asm/mach-common/def_LPBlackfin.h> | 40 | #include <asm/def_LPBlackfin.h> |
41 | 41 | ||
42 | /*********************************************************************************** */ | 42 | /*********************************************************************************** */ |
43 | /* System MMR Register Map */ | 43 | /* System MMR Register Map */ |
diff --git a/include/asm-blackfin/mach-bf561/dma.h b/arch/blackfin/mach-bf561/include/mach/dma.h index 8bc46cd89a02..8bc46cd89a02 100644 --- a/include/asm-blackfin/mach-bf561/dma.h +++ b/arch/blackfin/mach-bf561/include/mach/dma.h | |||
diff --git a/include/asm-blackfin/mach-bf561/irq.h b/arch/blackfin/mach-bf561/include/mach/irq.h index 6698389c5564..6698389c5564 100644 --- a/include/asm-blackfin/mach-bf561/irq.h +++ b/arch/blackfin/mach-bf561/include/mach/irq.h | |||
diff --git a/include/asm-blackfin/mach-bf561/mem_init.h b/arch/blackfin/mach-bf561/include/mach/mem_init.h index e163260bca18..e163260bca18 100644 --- a/include/asm-blackfin/mach-bf561/mem_init.h +++ b/arch/blackfin/mach-bf561/include/mach/mem_init.h | |||
diff --git a/include/asm-blackfin/mach-bf561/mem_map.h b/arch/blackfin/mach-bf561/include/mach/mem_map.h index c26d8486cc4b..c26d8486cc4b 100644 --- a/include/asm-blackfin/mach-bf561/mem_map.h +++ b/arch/blackfin/mach-bf561/include/mach/mem_map.h | |||
diff --git a/include/asm-blackfin/mach-bf561/portmux.h b/arch/blackfin/mach-bf561/include/mach/portmux.h index a6ee8206efb6..a6ee8206efb6 100644 --- a/include/asm-blackfin/mach-bf561/portmux.h +++ b/arch/blackfin/mach-bf561/include/mach/portmux.h | |||
diff --git a/arch/blackfin/mach-common/arch_checks.c b/arch/blackfin/mach-common/arch_checks.c index 5986758b2752..98133b968f7b 100644 --- a/arch/blackfin/mach-common/arch_checks.c +++ b/arch/blackfin/mach-common/arch_checks.c | |||
@@ -28,8 +28,8 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <asm/fixed_code.h> | 30 | #include <asm/fixed_code.h> |
31 | #include <asm/mach/anomaly.h> | 31 | #include <mach/anomaly.h> |
32 | #include <asm/mach-common/clocks.h> | 32 | #include <asm/clocks.h> |
33 | 33 | ||
34 | #ifdef CONFIG_BFIN_KERNEL_CLOCK | 34 | #ifdef CONFIG_BFIN_KERNEL_CLOCK |
35 | 35 | ||
diff --git a/arch/blackfin/mach-common/dpmc_modes.S b/arch/blackfin/mach-common/dpmc_modes.S index 838b0b2ce9a5..ad5431e2cd05 100644 --- a/arch/blackfin/mach-common/dpmc_modes.S +++ b/arch/blackfin/mach-common/dpmc_modes.S | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | #include <linux/linkage.h> | 7 | #include <linux/linkage.h> |
8 | #include <asm/blackfin.h> | 8 | #include <asm/blackfin.h> |
9 | #include <asm/mach/irq.h> | 9 | #include <mach/irq.h> |
10 | #include <asm/dpmc.h> | 10 | #include <asm/dpmc.h> |
11 | 11 | ||
12 | .section .l1.text | 12 | .section .l1.text |
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index 117c01c2c6b0..847c172a99eb 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <asm/asm-offsets.h> | 43 | #include <asm/asm-offsets.h> |
44 | #include <asm/trace.h> | 44 | #include <asm/trace.h> |
45 | 45 | ||
46 | #include <asm/mach-common/context.S> | 46 | #include <asm/context.S> |
47 | 47 | ||
48 | #if defined(CONFIG_BFIN_SCRATCH_REG_RETN) | 48 | #if defined(CONFIG_BFIN_SCRATCH_REG_RETN) |
49 | # define EX_SCRATCH_REG RETN | 49 | # define EX_SCRATCH_REG RETN |
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S index 7f752c87fe46..b27e59d32401 100644 --- a/arch/blackfin/mach-common/interrupt.S +++ b/arch/blackfin/mach-common/interrupt.S | |||
@@ -29,7 +29,7 @@ | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <asm/blackfin.h> | 31 | #include <asm/blackfin.h> |
32 | #include <asm/mach/irq.h> | 32 | #include <mach/irq.h> |
33 | #include <linux/linkage.h> | 33 | #include <linux/linkage.h> |
34 | #include <asm/entry.h> | 34 | #include <asm/entry.h> |
35 | #include <asm/asm-offsets.h> | 35 | #include <asm/asm-offsets.h> |
@@ -37,7 +37,7 @@ | |||
37 | #include <asm/traps.h> | 37 | #include <asm/traps.h> |
38 | #include <asm/thread_info.h> | 38 | #include <asm/thread_info.h> |
39 | 39 | ||
40 | #include <asm/mach-common/context.S> | 40 | #include <asm/context.S> |
41 | 41 | ||
42 | .extern _ret_from_exception | 42 | .extern _ret_from_exception |
43 | 43 | ||
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c index 62f8883a5c27..5fa536727c61 100644 --- a/arch/blackfin/mach-common/ints-priority.c +++ b/arch/blackfin/mach-common/ints-priority.c | |||
@@ -216,7 +216,7 @@ int bfin_internal_set_wake(unsigned int irq, unsigned int state) | |||
216 | wakeup |= KPADWE; | 216 | wakeup |= KPADWE; |
217 | break; | 217 | break; |
218 | #endif | 218 | #endif |
219 | #ifdef IRQ_CNT | 219 | #ifdef CONFIG_BF54x |
220 | case IRQ_CNT: | 220 | case IRQ_CNT: |
221 | wakeup |= ROTWE; | 221 | wakeup |= ROTWE; |
222 | break; | 222 | break; |
@@ -983,7 +983,7 @@ int __init init_arch_irq(void) | |||
983 | 983 | ||
984 | local_irq_disable(); | 984 | local_irq_disable(); |
985 | 985 | ||
986 | #if defined(CONFIG_BF527) || defined(CONFIG_BF536) || defined(CONFIG_BF537) | 986 | #if (defined(CONFIG_BF537) || defined(CONFIG_BF536)) |
987 | /* Clear EMAC Interrupt Status bits so we can demux it later */ | 987 | /* Clear EMAC Interrupt Status bits so we can demux it later */ |
988 | bfin_write_EMAC_SYSTAT(-1); | 988 | bfin_write_EMAC_SYSTAT(-1); |
989 | #endif | 989 | #endif |
diff --git a/arch/blackfin/mm/blackfin_sram.c b/arch/blackfin/mm/blackfin_sram.c index 9d2be43ac3da..4f5e887a0d96 100644 --- a/arch/blackfin/mm/blackfin_sram.c +++ b/arch/blackfin/mm/blackfin_sram.c | |||
@@ -335,7 +335,7 @@ static int _sram_free(const void *addr, | |||
335 | plast->size += pavail->size; | 335 | plast->size += pavail->size; |
336 | kmem_cache_free(sram_piece_cache, pavail); | 336 | kmem_cache_free(sram_piece_cache, pavail); |
337 | } else { | 337 | } else { |
338 | pavail->next = plast; | 338 | pavail->next = plast->next; |
339 | plast->next = pavail; | 339 | plast->next = pavail; |
340 | plast = pavail; | 340 | plast = pavail; |
341 | } | 341 | } |
@@ -379,7 +379,7 @@ EXPORT_SYMBOL(sram_free); | |||
379 | 379 | ||
380 | void *l1_data_A_sram_alloc(size_t size) | 380 | void *l1_data_A_sram_alloc(size_t size) |
381 | { | 381 | { |
382 | unsigned flags; | 382 | unsigned long flags; |
383 | void *addr = NULL; | 383 | void *addr = NULL; |
384 | 384 | ||
385 | /* add mutex operation */ | 385 | /* add mutex operation */ |
@@ -402,7 +402,7 @@ EXPORT_SYMBOL(l1_data_A_sram_alloc); | |||
402 | 402 | ||
403 | int l1_data_A_sram_free(const void *addr) | 403 | int l1_data_A_sram_free(const void *addr) |
404 | { | 404 | { |
405 | unsigned flags; | 405 | unsigned long flags; |
406 | int ret; | 406 | int ret; |
407 | 407 | ||
408 | /* add mutex operation */ | 408 | /* add mutex operation */ |
@@ -425,7 +425,7 @@ EXPORT_SYMBOL(l1_data_A_sram_free); | |||
425 | void *l1_data_B_sram_alloc(size_t size) | 425 | void *l1_data_B_sram_alloc(size_t size) |
426 | { | 426 | { |
427 | #if L1_DATA_B_LENGTH != 0 | 427 | #if L1_DATA_B_LENGTH != 0 |
428 | unsigned flags; | 428 | unsigned long flags; |
429 | void *addr; | 429 | void *addr; |
430 | 430 | ||
431 | /* add mutex operation */ | 431 | /* add mutex operation */ |
@@ -450,7 +450,7 @@ EXPORT_SYMBOL(l1_data_B_sram_alloc); | |||
450 | int l1_data_B_sram_free(const void *addr) | 450 | int l1_data_B_sram_free(const void *addr) |
451 | { | 451 | { |
452 | #if L1_DATA_B_LENGTH != 0 | 452 | #if L1_DATA_B_LENGTH != 0 |
453 | unsigned flags; | 453 | unsigned long flags; |
454 | int ret; | 454 | int ret; |
455 | 455 | ||
456 | /* add mutex operation */ | 456 | /* add mutex operation */ |
@@ -504,7 +504,7 @@ EXPORT_SYMBOL(l1_data_sram_free); | |||
504 | void *l1_inst_sram_alloc(size_t size) | 504 | void *l1_inst_sram_alloc(size_t size) |
505 | { | 505 | { |
506 | #if L1_CODE_LENGTH != 0 | 506 | #if L1_CODE_LENGTH != 0 |
507 | unsigned flags; | 507 | unsigned long flags; |
508 | void *addr; | 508 | void *addr; |
509 | 509 | ||
510 | /* add mutex operation */ | 510 | /* add mutex operation */ |
@@ -529,7 +529,7 @@ EXPORT_SYMBOL(l1_inst_sram_alloc); | |||
529 | int l1_inst_sram_free(const void *addr) | 529 | int l1_inst_sram_free(const void *addr) |
530 | { | 530 | { |
531 | #if L1_CODE_LENGTH != 0 | 531 | #if L1_CODE_LENGTH != 0 |
532 | unsigned flags; | 532 | unsigned long flags; |
533 | int ret; | 533 | int ret; |
534 | 534 | ||
535 | /* add mutex operation */ | 535 | /* add mutex operation */ |
@@ -551,7 +551,7 @@ EXPORT_SYMBOL(l1_inst_sram_free); | |||
551 | /* L1 Scratchpad memory allocate function */ | 551 | /* L1 Scratchpad memory allocate function */ |
552 | void *l1sram_alloc(size_t size) | 552 | void *l1sram_alloc(size_t size) |
553 | { | 553 | { |
554 | unsigned flags; | 554 | unsigned long flags; |
555 | void *addr; | 555 | void *addr; |
556 | 556 | ||
557 | /* add mutex operation */ | 557 | /* add mutex operation */ |
@@ -569,7 +569,7 @@ void *l1sram_alloc(size_t size) | |||
569 | /* L1 Scratchpad memory allocate function */ | 569 | /* L1 Scratchpad memory allocate function */ |
570 | void *l1sram_alloc_max(size_t *psize) | 570 | void *l1sram_alloc_max(size_t *psize) |
571 | { | 571 | { |
572 | unsigned flags; | 572 | unsigned long flags; |
573 | void *addr; | 573 | void *addr; |
574 | 574 | ||
575 | /* add mutex operation */ | 575 | /* add mutex operation */ |
@@ -587,7 +587,7 @@ void *l1sram_alloc_max(size_t *psize) | |||
587 | /* L1 Scratchpad memory free function */ | 587 | /* L1 Scratchpad memory free function */ |
588 | int l1sram_free(const void *addr) | 588 | int l1sram_free(const void *addr) |
589 | { | 589 | { |
590 | unsigned flags; | 590 | unsigned long flags; |
591 | int ret; | 591 | int ret; |
592 | 592 | ||
593 | /* add mutex operation */ | 593 | /* add mutex operation */ |
@@ -605,7 +605,7 @@ int l1sram_free(const void *addr) | |||
605 | void *l2_sram_alloc(size_t size) | 605 | void *l2_sram_alloc(size_t size) |
606 | { | 606 | { |
607 | #if L2_LENGTH != 0 | 607 | #if L2_LENGTH != 0 |
608 | unsigned flags; | 608 | unsigned long flags; |
609 | void *addr; | 609 | void *addr; |
610 | 610 | ||
611 | /* add mutex operation */ | 611 | /* add mutex operation */ |
@@ -641,7 +641,7 @@ EXPORT_SYMBOL(l2_sram_zalloc); | |||
641 | int l2_sram_free(const void *addr) | 641 | int l2_sram_free(const void *addr) |
642 | { | 642 | { |
643 | #if L2_LENGTH != 0 | 643 | #if L2_LENGTH != 0 |
644 | unsigned flags; | 644 | unsigned long flags; |
645 | int ret; | 645 | int ret; |
646 | 646 | ||
647 | /* add mutex operation */ | 647 | /* add mutex operation */ |
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h index 260a85ac9d6a..7f257507cd86 100644 --- a/arch/ia64/include/asm/io.h +++ b/arch/ia64/include/asm/io.h | |||
@@ -19,6 +19,8 @@ | |||
19 | * Copyright (C) 1999 Don Dugger <don.dugger@intel.com> | 19 | * Copyright (C) 1999 Don Dugger <don.dugger@intel.com> |
20 | */ | 20 | */ |
21 | 21 | ||
22 | #include <asm/unaligned.h> | ||
23 | |||
22 | /* We don't use IO slowdowns on the ia64, but.. */ | 24 | /* We don't use IO slowdowns on the ia64, but.. */ |
23 | #define __SLOW_DOWN_IO do { } while (0) | 25 | #define __SLOW_DOWN_IO do { } while (0) |
24 | #define SLOW_DOWN_IO do { } while (0) | 26 | #define SLOW_DOWN_IO do { } while (0) |
@@ -241,7 +243,7 @@ __insw (unsigned long port, void *dst, unsigned long count) | |||
241 | unsigned short *dp = dst; | 243 | unsigned short *dp = dst; |
242 | 244 | ||
243 | while (count--) | 245 | while (count--) |
244 | *dp++ = platform_inw(port); | 246 | put_unaligned(platform_inw(port), dp++); |
245 | } | 247 | } |
246 | 248 | ||
247 | static inline void | 249 | static inline void |
@@ -250,7 +252,7 @@ __insl (unsigned long port, void *dst, unsigned long count) | |||
250 | unsigned int *dp = dst; | 252 | unsigned int *dp = dst; |
251 | 253 | ||
252 | while (count--) | 254 | while (count--) |
253 | *dp++ = platform_inl(port); | 255 | put_unaligned(platform_inl(port), dp++); |
254 | } | 256 | } |
255 | 257 | ||
256 | static inline void | 258 | static inline void |
@@ -268,7 +270,7 @@ __outsw (unsigned long port, const void *src, unsigned long count) | |||
268 | const unsigned short *sp = src; | 270 | const unsigned short *sp = src; |
269 | 271 | ||
270 | while (count--) | 272 | while (count--) |
271 | platform_outw(*sp++, port); | 273 | platform_outw(get_unaligned(sp++), port); |
272 | } | 274 | } |
273 | 275 | ||
274 | static inline void | 276 | static inline void |
@@ -277,7 +279,7 @@ __outsl (unsigned long port, const void *src, unsigned long count) | |||
277 | const unsigned int *sp = src; | 279 | const unsigned int *sp = src; |
278 | 280 | ||
279 | while (count--) | 281 | while (count--) |
280 | platform_outl(*sp++, port); | 282 | platform_outl(get_unaligned(sp++), port); |
281 | } | 283 | } |
282 | 284 | ||
283 | /* | 285 | /* |
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c index b39853a292d5..bcea81e432fd 100644 --- a/arch/ia64/kernel/smpboot.c +++ b/arch/ia64/kernel/smpboot.c | |||
@@ -138,6 +138,7 @@ cpumask_t cpu_possible_map = CPU_MASK_NONE; | |||
138 | EXPORT_SYMBOL(cpu_possible_map); | 138 | EXPORT_SYMBOL(cpu_possible_map); |
139 | 139 | ||
140 | cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned; | 140 | cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned; |
141 | EXPORT_SYMBOL(cpu_core_map); | ||
141 | DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); | 142 | DEFINE_PER_CPU_SHARED_ALIGNED(cpumask_t, cpu_sibling_map); |
142 | EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); | 143 | EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); |
143 | 144 | ||
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index 8a2a53b33616..bb959fbab2dc 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c | |||
@@ -580,13 +580,15 @@ int atari_keyb_init(void) | |||
580 | do { | 580 | do { |
581 | /* reset IKBD ACIA */ | 581 | /* reset IKBD ACIA */ |
582 | acia.key_ctrl = ACIA_RESET | | 582 | acia.key_ctrl = ACIA_RESET | |
583 | (atari_switches & ATARI_SWITCH_IKBD) ? ACIA_RHTID : 0; | 583 | ((atari_switches & ATARI_SWITCH_IKBD) ? |
584 | ACIA_RHTID : 0); | ||
584 | (void)acia.key_ctrl; | 585 | (void)acia.key_ctrl; |
585 | (void)acia.key_data; | 586 | (void)acia.key_data; |
586 | 587 | ||
587 | /* reset MIDI ACIA */ | 588 | /* reset MIDI ACIA */ |
588 | acia.mid_ctrl = ACIA_RESET | | 589 | acia.mid_ctrl = ACIA_RESET | |
589 | (atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0; | 590 | ((atari_switches & ATARI_SWITCH_MIDI) ? |
591 | ACIA_RHTID : 0); | ||
590 | (void)acia.mid_ctrl; | 592 | (void)acia.mid_ctrl; |
591 | (void)acia.mid_data; | 593 | (void)acia.mid_data; |
592 | 594 | ||
@@ -599,7 +601,8 @@ int atari_keyb_init(void) | |||
599 | ACIA_RHTID : ACIA_RLTID); | 601 | ACIA_RHTID : ACIA_RLTID); |
600 | 602 | ||
601 | acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S | | 603 | acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S | |
602 | (atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0; | 604 | ((atari_switches & ATARI_SWITCH_MIDI) ? |
605 | ACIA_RHTID : 0); | ||
603 | 606 | ||
604 | /* make sure the interrupt line is up */ | 607 | /* make sure the interrupt line is up */ |
605 | } while ((mfp.par_dt_reg & 0x10) == 0); | 608 | } while ((mfp.par_dt_reg & 0x10) == 0); |
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c index 822a20e21fa4..b6a23ad539f8 100644 --- a/arch/mips/emma2rh/markeins/setup.c +++ b/arch/mips/emma2rh/markeins/setup.c | |||
@@ -25,23 +25,9 @@ | |||
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
28 | #include <linux/initrd.h> | 28 | |
29 | #include <linux/irq.h> | ||
30 | #include <linux/ioport.h> | ||
31 | #include <linux/param.h> /* for HZ */ | ||
32 | #include <linux/root_dev.h> | ||
33 | #include <linux/serial.h> | ||
34 | #include <linux/serial_core.h> | ||
35 | |||
36 | #include <asm/cpu.h> | ||
37 | #include <asm/bootinfo.h> | ||
38 | #include <asm/addrspace.h> | ||
39 | #include <asm/time.h> | 29 | #include <asm/time.h> |
40 | #include <asm/bcache.h> | ||
41 | #include <asm/irq.h> | ||
42 | #include <asm/reboot.h> | 30 | #include <asm/reboot.h> |
43 | #include <asm/traps.h> | ||
44 | #include <asm/debug.h> | ||
45 | 31 | ||
46 | #include <asm/emma2rh/emma2rh.h> | 32 | #include <asm/emma2rh/emma2rh.h> |
47 | 33 | ||
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index b59ba6b93cdd..7043f6b9ff3c 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
@@ -5,33 +5,22 @@ | |||
5 | * License. See the file "COPYING" in the main directory of this archive | 5 | * License. See the file "COPYING" in the main directory of this archive |
6 | * for more details. | 6 | * for more details. |
7 | * | 7 | * |
8 | * Copyright (C) 1996, 1997, 1998, 2001, 07 by Ralf Baechle | 8 | * Copyright (C) 1996, 1997, 1998, 2001, 07, 08 by Ralf Baechle |
9 | * Copyright (C) 2001 MIPS Technologies, Inc. | 9 | * Copyright (C) 2001 MIPS Technologies, Inc. |
10 | * Copyright (C) 2007 by Thomas Bogendoerfer | 10 | * Copyright (C) 2007 by Thomas Bogendoerfer |
11 | */ | 11 | */ |
12 | #include <linux/eisa.h> | 12 | #include <linux/eisa.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
15 | #include <linux/sched.h> | ||
16 | #include <linux/interrupt.h> | ||
17 | #include <linux/mm.h> | ||
18 | #include <linux/console.h> | 15 | #include <linux/console.h> |
19 | #include <linux/fb.h> | ||
20 | #include <linux/pm.h> | ||
21 | #include <linux/screen_info.h> | 16 | #include <linux/screen_info.h> |
22 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
23 | #include <linux/serial_8250.h> | 18 | #include <linux/serial_8250.h> |
24 | 19 | ||
25 | #include <asm/bootinfo.h> | ||
26 | #include <asm/irq.h> | ||
27 | #include <asm/jazz.h> | 20 | #include <asm/jazz.h> |
28 | #include <asm/jazzdma.h> | 21 | #include <asm/jazzdma.h> |
29 | #include <asm/reboot.h> | 22 | #include <asm/reboot.h> |
30 | #include <asm/io.h> | ||
31 | #include <asm/pgtable.h> | 23 | #include <asm/pgtable.h> |
32 | #include <asm/time.h> | ||
33 | #include <asm/traps.h> | ||
34 | #include <asm/mc146818-time.h> | ||
35 | 24 | ||
36 | extern asmlinkage void jazz_handle_int(void); | 25 | extern asmlinkage void jazz_handle_int(void); |
37 | 26 | ||
diff --git a/arch/mips/kernel/.gitignore b/arch/mips/kernel/.gitignore new file mode 100644 index 000000000000..c5f676c3c224 --- /dev/null +++ b/arch/mips/kernel/.gitignore | |||
@@ -0,0 +1 @@ | |||
vmlinux.lds | |||
diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c index c5a8b2d21ca4..8f6d58ede33c 100644 --- a/arch/mips/kernel/kgdb.c +++ b/arch/mips/kernel/kgdb.c | |||
@@ -62,13 +62,13 @@ void arch_kgdb_breakpoint(void) | |||
62 | 62 | ||
63 | static void kgdb_call_nmi_hook(void *ignored) | 63 | static void kgdb_call_nmi_hook(void *ignored) |
64 | { | 64 | { |
65 | kgdb_nmicallback(raw_smp_processor_id(), (void *)0); | 65 | kgdb_nmicallback(raw_smp_processor_id(), NULL); |
66 | } | 66 | } |
67 | 67 | ||
68 | void kgdb_roundup_cpus(unsigned long flags) | 68 | void kgdb_roundup_cpus(unsigned long flags) |
69 | { | 69 | { |
70 | local_irq_enable(); | 70 | local_irq_enable(); |
71 | smp_call_function(kgdb_call_nmi_hook, NULL, NULL); | 71 | smp_call_function(kgdb_call_nmi_hook, NULL, 0); |
72 | local_irq_disable(); | 72 | local_irq_disable(); |
73 | } | 73 | } |
74 | 74 | ||
@@ -190,9 +190,6 @@ static int kgdb_mips_notify(struct notifier_block *self, unsigned long cmd, | |||
190 | struct pt_regs *regs = args->regs; | 190 | struct pt_regs *regs = args->regs; |
191 | int trap = (regs->cp0_cause & 0x7c) >> 2; | 191 | int trap = (regs->cp0_cause & 0x7c) >> 2; |
192 | 192 | ||
193 | if (fixup_exception(regs)) | ||
194 | return NOTIFY_DONE; | ||
195 | |||
196 | /* Userpace events, ignore. */ | 193 | /* Userpace events, ignore. */ |
197 | if (user_mode(regs)) | 194 | if (user_mode(regs)) |
198 | return NOTIFY_DONE; | 195 | return NOTIFY_DONE; |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index fc4fd4d705e2..5e75a316f6b1 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
@@ -647,6 +647,12 @@ einval: li v0, -EINVAL | |||
647 | sys sys_timerfd_create 2 | 647 | sys sys_timerfd_create 2 |
648 | sys sys_timerfd_gettime 2 | 648 | sys sys_timerfd_gettime 2 |
649 | sys sys_timerfd_settime 4 | 649 | sys sys_timerfd_settime 4 |
650 | sys sys_signalfd4 4 | ||
651 | sys sys_eventfd2 2 /* 4325 */ | ||
652 | sys sys_epoll_create1 1 | ||
653 | sys sys_dup3 3 | ||
654 | sys sys_pipe2 2 | ||
655 | sys sys_inotify_init1 1 | ||
650 | .endm | 656 | .endm |
651 | 657 | ||
652 | /* We pre-compute the number of _instruction_ bytes needed to | 658 | /* We pre-compute the number of _instruction_ bytes needed to |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 2b73fd1e4528..3d58204c9d44 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
@@ -481,4 +481,10 @@ sys_call_table: | |||
481 | PTR sys_timerfd_create /* 5280 */ | 481 | PTR sys_timerfd_create /* 5280 */ |
482 | PTR sys_timerfd_gettime | 482 | PTR sys_timerfd_gettime |
483 | PTR sys_timerfd_settime | 483 | PTR sys_timerfd_settime |
484 | PTR sys_signalfd4 | ||
485 | PTR sys_eventfd2 | ||
486 | PTR sys_epoll_create1 /* 5285 */ | ||
487 | PTR sys_dup3 | ||
488 | PTR sys_pipe2 | ||
489 | PTR sys_inotify_init1 | ||
484 | .size sys_call_table,.-sys_call_table | 490 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 2654e75d2fef..da7f1b6ea0fb 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
@@ -407,4 +407,10 @@ EXPORT(sysn32_call_table) | |||
407 | PTR sys_timerfd_create | 407 | PTR sys_timerfd_create |
408 | PTR sys_timerfd_gettime /* 5285 */ | 408 | PTR sys_timerfd_gettime /* 5285 */ |
409 | PTR sys_timerfd_settime | 409 | PTR sys_timerfd_settime |
410 | PTR sys_signalfd4 | ||
411 | PTR sys_eventfd2 | ||
412 | PTR sys_epoll_create1 | ||
413 | PTR sys_dup3 /* 5290 */ | ||
414 | PTR sys_pipe2 | ||
415 | PTR sys_inotify_init1 | ||
410 | .size sysn32_call_table,.-sysn32_call_table | 416 | .size sysn32_call_table,.-sysn32_call_table |
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 76167bea5a70..d7cd1aac9ada 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -529,4 +529,10 @@ sys_call_table: | |||
529 | PTR sys_timerfd_create | 529 | PTR sys_timerfd_create |
530 | PTR sys_timerfd_gettime | 530 | PTR sys_timerfd_gettime |
531 | PTR sys_timerfd_settime | 531 | PTR sys_timerfd_settime |
532 | PTR compat_sys_signalfd4 | ||
533 | PTR sys_eventfd2 /* 4325 */ | ||
534 | PTR sys_epoll_create1 | ||
535 | PTR sys_dup3 | ||
536 | PTR sys_pipe2 | ||
537 | PTR sys_inotify_init1 | ||
532 | .size sys_call_table,.-sys_call_table | 538 | .size sys_call_table,.-sys_call_table |
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 8af84867e74d..2aae76bce293 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
@@ -78,7 +78,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) | |||
78 | 78 | ||
79 | /* Sanity check */ | 79 | /* Sanity check */ |
80 | if (start + size < start) { | 80 | if (start + size < start) { |
81 | printk("Trying to add an invalid memory region, skipped\n"); | 81 | pr_warning("Trying to add an invalid memory region, skipped\n"); |
82 | return; | 82 | return; |
83 | } | 83 | } |
84 | 84 | ||
@@ -92,7 +92,7 @@ void __init add_memory_region(phys_t start, phys_t size, long type) | |||
92 | } | 92 | } |
93 | 93 | ||
94 | if (x == BOOT_MEM_MAP_MAX) { | 94 | if (x == BOOT_MEM_MAP_MAX) { |
95 | printk("Ooops! Too many entries in the memory map!\n"); | 95 | pr_err("Ooops! Too many entries in the memory map!\n"); |
96 | return; | 96 | return; |
97 | } | 97 | } |
98 | 98 | ||
@@ -108,22 +108,22 @@ static void __init print_memory_map(void) | |||
108 | const int field = 2 * sizeof(unsigned long); | 108 | const int field = 2 * sizeof(unsigned long); |
109 | 109 | ||
110 | for (i = 0; i < boot_mem_map.nr_map; i++) { | 110 | for (i = 0; i < boot_mem_map.nr_map; i++) { |
111 | printk(" memory: %0*Lx @ %0*Lx ", | 111 | printk(KERN_INFO " memory: %0*Lx @ %0*Lx ", |
112 | field, (unsigned long long) boot_mem_map.map[i].size, | 112 | field, (unsigned long long) boot_mem_map.map[i].size, |
113 | field, (unsigned long long) boot_mem_map.map[i].addr); | 113 | field, (unsigned long long) boot_mem_map.map[i].addr); |
114 | 114 | ||
115 | switch (boot_mem_map.map[i].type) { | 115 | switch (boot_mem_map.map[i].type) { |
116 | case BOOT_MEM_RAM: | 116 | case BOOT_MEM_RAM: |
117 | printk("(usable)\n"); | 117 | printk(KERN_CONT "(usable)\n"); |
118 | break; | 118 | break; |
119 | case BOOT_MEM_ROM_DATA: | 119 | case BOOT_MEM_ROM_DATA: |
120 | printk("(ROM data)\n"); | 120 | printk(KERN_CONT "(ROM data)\n"); |
121 | break; | 121 | break; |
122 | case BOOT_MEM_RESERVED: | 122 | case BOOT_MEM_RESERVED: |
123 | printk("(reserved)\n"); | 123 | printk(KERN_CONT "(reserved)\n"); |
124 | break; | 124 | break; |
125 | default: | 125 | default: |
126 | printk("type %lu\n", boot_mem_map.map[i].type); | 126 | printk(KERN_CONT "type %lu\n", boot_mem_map.map[i].type); |
127 | break; | 127 | break; |
128 | } | 128 | } |
129 | } | 129 | } |
@@ -185,11 +185,11 @@ static unsigned long __init init_initrd(void) | |||
185 | 185 | ||
186 | sanitize: | 186 | sanitize: |
187 | if (initrd_start & ~PAGE_MASK) { | 187 | if (initrd_start & ~PAGE_MASK) { |
188 | printk(KERN_ERR "initrd start must be page aligned\n"); | 188 | pr_err("initrd start must be page aligned\n"); |
189 | goto disable; | 189 | goto disable; |
190 | } | 190 | } |
191 | if (initrd_start < PAGE_OFFSET) { | 191 | if (initrd_start < PAGE_OFFSET) { |
192 | printk(KERN_ERR "initrd start < PAGE_OFFSET\n"); | 192 | pr_err("initrd start < PAGE_OFFSET\n"); |
193 | goto disable; | 193 | goto disable; |
194 | } | 194 | } |
195 | 195 | ||
@@ -221,18 +221,18 @@ static void __init finalize_initrd(void) | |||
221 | goto disable; | 221 | goto disable; |
222 | } | 222 | } |
223 | if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { | 223 | if (__pa(initrd_end) > PFN_PHYS(max_low_pfn)) { |
224 | printk("Initrd extends beyond end of memory"); | 224 | printk(KERN_ERR "Initrd extends beyond end of memory"); |
225 | goto disable; | 225 | goto disable; |
226 | } | 226 | } |
227 | 227 | ||
228 | reserve_bootmem(__pa(initrd_start), size, BOOTMEM_DEFAULT); | 228 | reserve_bootmem(__pa(initrd_start), size, BOOTMEM_DEFAULT); |
229 | initrd_below_start_ok = 1; | 229 | initrd_below_start_ok = 1; |
230 | 230 | ||
231 | printk(KERN_INFO "Initial ramdisk at: 0x%lx (%lu bytes)\n", | 231 | pr_info("Initial ramdisk at: 0x%lx (%lu bytes)\n", |
232 | initrd_start, size); | 232 | initrd_start, size); |
233 | return; | 233 | return; |
234 | disable: | 234 | disable: |
235 | printk(" - disabling initrd\n"); | 235 | printk(KERN_CONT " - disabling initrd\n"); |
236 | initrd_start = 0; | 236 | initrd_start = 0; |
237 | initrd_end = 0; | 237 | initrd_end = 0; |
238 | } | 238 | } |
@@ -310,14 +310,12 @@ static void __init bootmem_init(void) | |||
310 | if (min_low_pfn >= max_low_pfn) | 310 | if (min_low_pfn >= max_low_pfn) |
311 | panic("Incorrect memory mapping !!!"); | 311 | panic("Incorrect memory mapping !!!"); |
312 | if (min_low_pfn > ARCH_PFN_OFFSET) { | 312 | if (min_low_pfn > ARCH_PFN_OFFSET) { |
313 | printk(KERN_INFO | 313 | pr_info("Wasting %lu bytes for tracking %lu unused pages\n", |
314 | "Wasting %lu bytes for tracking %lu unused pages\n", | 314 | (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page), |
315 | (min_low_pfn - ARCH_PFN_OFFSET) * sizeof(struct page), | 315 | min_low_pfn - ARCH_PFN_OFFSET); |
316 | min_low_pfn - ARCH_PFN_OFFSET); | ||
317 | } else if (min_low_pfn < ARCH_PFN_OFFSET) { | 316 | } else if (min_low_pfn < ARCH_PFN_OFFSET) { |
318 | printk(KERN_INFO | 317 | pr_info("%lu free pages won't be used\n", |
319 | "%lu free pages won't be used\n", | 318 | ARCH_PFN_OFFSET - min_low_pfn); |
320 | ARCH_PFN_OFFSET - min_low_pfn); | ||
321 | } | 319 | } |
322 | min_low_pfn = ARCH_PFN_OFFSET; | 320 | min_low_pfn = ARCH_PFN_OFFSET; |
323 | 321 | ||
@@ -471,7 +469,7 @@ static void __init arch_mem_init(char **cmdline_p) | |||
471 | /* call board setup routine */ | 469 | /* call board setup routine */ |
472 | plat_mem_setup(); | 470 | plat_mem_setup(); |
473 | 471 | ||
474 | printk("Determined physical RAM map:\n"); | 472 | pr_info("Determined physical RAM map:\n"); |
475 | print_memory_map(); | 473 | print_memory_map(); |
476 | 474 | ||
477 | strlcpy(command_line, arcs_cmdline, sizeof(command_line)); | 475 | strlcpy(command_line, arcs_cmdline, sizeof(command_line)); |
@@ -482,7 +480,7 @@ static void __init arch_mem_init(char **cmdline_p) | |||
482 | parse_early_param(); | 480 | parse_early_param(); |
483 | 481 | ||
484 | if (usermem) { | 482 | if (usermem) { |
485 | printk("User-defined physical RAM map:\n"); | 483 | pr_info("User-defined physical RAM map:\n"); |
486 | print_memory_map(); | 484 | print_memory_map(); |
487 | } | 485 | } |
488 | 486 | ||
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index ce92f82b16d2..bd78368c82bf 100644 --- a/arch/mips/pci/pci-ip27.c +++ b/arch/mips/pci/pci-ip27.c | |||
@@ -205,6 +205,7 @@ int pcibus_to_node(struct pci_bus *bus) | |||
205 | 205 | ||
206 | return bc->nasid; | 206 | return bc->nasid; |
207 | } | 207 | } |
208 | EXPORT_SYMBOL(pcibus_to_node); | ||
208 | 209 | ||
209 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, | 210 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, |
210 | pci_fixup_ioc3); | 211 | pci_fixup_ioc3); |
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index 44fb0a62877f..82ab395efa33 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c | |||
@@ -49,8 +49,6 @@ | |||
49 | #define GPIO_ALE (1 << 0x0a) | 49 | #define GPIO_ALE (1 << 0x0a) |
50 | #define GPIO_CLE (1 << 0x0b) | 50 | #define GPIO_CLE (1 << 0x0b) |
51 | 51 | ||
52 | extern char *board_type; | ||
53 | |||
54 | static struct resource korina_dev0_res[] = { | 52 | static struct resource korina_dev0_res[] = { |
55 | { | 53 | { |
56 | .name = "korina_regs", | 54 | .name = "korina_regs", |
@@ -265,14 +263,6 @@ static void __init parse_mac_addr(char *macstr) | |||
265 | } | 263 | } |
266 | 264 | ||
267 | 265 | ||
268 | /* DEVICE CONTROLLER 1 */ | ||
269 | #define CFG_DC_DEV1 ((void *)0xb8010010) | ||
270 | #define CFG_DC_DEV2 ((void *)0xb8010020) | ||
271 | #define CFG_DC_DEVBASE 0x0 | ||
272 | #define CFG_DC_DEVMASK 0x4 | ||
273 | #define CFG_DC_DEVC 0x8 | ||
274 | #define CFG_DC_DEVTC 0xC | ||
275 | |||
276 | /* NAND definitions */ | 266 | /* NAND definitions */ |
277 | #define NAND_CHIP_DELAY 25 | 267 | #define NAND_CHIP_DELAY 25 |
278 | 268 | ||
@@ -301,16 +291,16 @@ static void __init rb532_nand_setup(void) | |||
301 | static int __init plat_setup_devices(void) | 291 | static int __init plat_setup_devices(void) |
302 | { | 292 | { |
303 | /* Look for the CF card reader */ | 293 | /* Look for the CF card reader */ |
304 | if (!readl(CFG_DC_DEV1 + CFG_DC_DEVMASK)) | 294 | if (!readl(IDT434_REG_BASE + DEV1MASK)) |
305 | rb532_devs[1] = NULL; | 295 | rb532_devs[1] = NULL; |
306 | else { | 296 | else { |
307 | cf_slot0_res[0].start = | 297 | cf_slot0_res[0].start = |
308 | readl(CFG_DC_DEV1 + CFG_DC_DEVBASE); | 298 | readl(IDT434_REG_BASE + DEV1BASE); |
309 | cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000; | 299 | cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000; |
310 | } | 300 | } |
311 | 301 | ||
312 | /* Read the NAND resources from the device controller */ | 302 | /* Read the NAND resources from the device controller */ |
313 | nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE); | 303 | nand_slot0_res[0].start = readl(IDT434_REG_BASE + DEV2BASE); |
314 | nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; | 304 | nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; |
315 | 305 | ||
316 | /* Initialise the NAND device */ | 306 | /* Initialise the NAND device */ |
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 1bc57d0f4c5c..0afe94c48fb6 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c | |||
@@ -328,6 +328,9 @@ void __init arch_init_irq(void) | |||
328 | 328 | ||
329 | void __init plat_time_init(void) | 329 | void __init plat_time_init(void) |
330 | { | 330 | { |
331 | #ifdef CONFIG_CPU_TX49XX | ||
332 | mips_hpt_frequency = txx9_cpu_clock / 2; | ||
333 | #endif | ||
331 | txx9_board_vec->time_init(); | 334 | txx9_board_vec->time_init(); |
332 | } | 335 | } |
333 | 336 | ||
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c index 1263f00dc35d..12c04c5e558b 100644 --- a/arch/parisc/hpux/fs.c +++ b/arch/parisc/hpux/fs.c | |||
@@ -84,22 +84,28 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, | |||
84 | if (reclen > buf->count) | 84 | if (reclen > buf->count) |
85 | return -EINVAL; | 85 | return -EINVAL; |
86 | d_ino = ino; | 86 | d_ino = ino; |
87 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 87 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
88 | buf->error = -EOVERFLOW; | ||
88 | return -EOVERFLOW; | 89 | return -EOVERFLOW; |
90 | } | ||
89 | dirent = buf->previous; | 91 | dirent = buf->previous; |
90 | if (dirent) | 92 | if (dirent) |
91 | put_user(offset, &dirent->d_off); | 93 | if (put_user(offset, &dirent->d_off)) |
94 | goto Efault; | ||
92 | dirent = buf->current_dir; | 95 | dirent = buf->current_dir; |
96 | if (put_user(d_ino, &dirent->d_ino) || | ||
97 | put_user(reclen, &dirent->d_reclen) || | ||
98 | put_user(namlen, &dirent->d_namlen) || | ||
99 | copy_to_user(dirent->d_name, name, namlen) || | ||
100 | put_user(0, dirent->d_name + namlen)) | ||
101 | goto Efault; | ||
93 | buf->previous = dirent; | 102 | buf->previous = dirent; |
94 | put_user(d_ino, &dirent->d_ino); | 103 | buf->current_dir = (void __user *)dirent + reclen; |
95 | put_user(reclen, &dirent->d_reclen); | ||
96 | put_user(namlen, &dirent->d_namlen); | ||
97 | copy_to_user(dirent->d_name, name, namlen); | ||
98 | put_user(0, dirent->d_name + namlen); | ||
99 | dirent = (void __user *)dirent + reclen; | ||
100 | buf->current_dir = dirent; | ||
101 | buf->count -= reclen; | 104 | buf->count -= reclen; |
102 | return 0; | 105 | return 0; |
106 | Efault: | ||
107 | buf->error = -EFAULT; | ||
108 | return -EFAULT; | ||
103 | } | 109 | } |
104 | 110 | ||
105 | #undef NAME_OFFSET | 111 | #undef NAME_OFFSET |
@@ -126,8 +132,10 @@ int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned i | |||
126 | error = buf.error; | 132 | error = buf.error; |
127 | lastdirent = buf.previous; | 133 | lastdirent = buf.previous; |
128 | if (lastdirent) { | 134 | if (lastdirent) { |
129 | put_user(file->f_pos, &lastdirent->d_off); | 135 | if (put_user(file->f_pos, &lastdirent->d_off)) |
130 | error = count - buf.count; | 136 | error = -EFAULT; |
137 | else | ||
138 | error = count - buf.count; | ||
131 | } | 139 | } |
132 | 140 | ||
133 | out_putf: | 141 | out_putf: |
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts index ae08761ffff1..d665e767822a 100644 --- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts +++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts | |||
@@ -411,7 +411,7 @@ | |||
411 | 0xe000 0 0 1 &i8259 12 2 | 411 | 0xe000 0 0 1 &i8259 12 2 |
412 | 0xe100 0 0 2 &i8259 9 2 | 412 | 0xe100 0 0 2 &i8259 9 2 |
413 | 0xe200 0 0 3 &i8259 10 2 | 413 | 0xe200 0 0 3 &i8259 10 2 |
414 | 0xe300 0 0 4 &i8259 112 | 414 | 0xe300 0 0 4 &i8259 11 2 |
415 | 415 | ||
416 | // IDSEL 0x1d Audio | 416 | // IDSEL 0x1d Audio |
417 | 0xe800 0 0 1 &i8259 6 2 | 417 | 0xe800 0 0 1 &i8259 6 2 |
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts index 64d2d5bbcdf1..4199e89b4e50 100644 --- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts +++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts | |||
@@ -50,13 +50,14 @@ | |||
50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot | 50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot |
51 | }; | 51 | }; |
52 | 52 | ||
53 | soc8548@a0000000 { | 53 | soc@a0000000 { |
54 | #address-cells = <1>; | 54 | #address-cells = <1>; |
55 | #size-cells = <1>; | 55 | #size-cells = <1>; |
56 | device_type = "soc"; | 56 | device_type = "soc"; |
57 | ranges = <0x0 0xa0000000 0x100000>; | 57 | ranges = <0x0 0xa0000000 0x100000>; |
58 | reg = <0xa0000000 0x1000>; // CCSRBAR | 58 | reg = <0xa0000000 0x1000>; // CCSRBAR |
59 | bus-frequency = <0>; | 59 | bus-frequency = <0>; |
60 | compatible = "fsl,mpc8548-immr", "simple-bus"; | ||
60 | 61 | ||
61 | memory-controller@2000 { | 62 | memory-controller@2000 { |
62 | compatible = "fsl,mpc8548-memory-controller"; | 63 | compatible = "fsl,mpc8548-memory-controller"; |
@@ -83,6 +84,11 @@ | |||
83 | interrupts = <43 2>; | 84 | interrupts = <43 2>; |
84 | interrupt-parent = <&mpic>; | 85 | interrupt-parent = <&mpic>; |
85 | dfsrr; | 86 | dfsrr; |
87 | |||
88 | rtc@68 { | ||
89 | compatible = "dallas,ds1337"; | ||
90 | reg = <0x68>; | ||
91 | }; | ||
86 | }; | 92 | }; |
87 | 93 | ||
88 | i2c@3100 { | 94 | i2c@3100 { |
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts index 2563112cabd3..58ee4185454b 100644 --- a/arch/powerpc/boot/dts/tqm8548.dts +++ b/arch/powerpc/boot/dts/tqm8548.dts | |||
@@ -50,13 +50,14 @@ | |||
50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot | 50 | reg = <0x00000000 0x00000000>; // Filled in by U-Boot |
51 | }; | 51 | }; |
52 | 52 | ||
53 | soc8548@e0000000 { | 53 | soc@e0000000 { |
54 | #address-cells = <1>; | 54 | #address-cells = <1>; |
55 | #size-cells = <1>; | 55 | #size-cells = <1>; |
56 | device_type = "soc"; | 56 | device_type = "soc"; |
57 | ranges = <0x0 0xe0000000 0x100000>; | 57 | ranges = <0x0 0xe0000000 0x100000>; |
58 | reg = <0xe0000000 0x1000>; // CCSRBAR | 58 | reg = <0xe0000000 0x1000>; // CCSRBAR |
59 | bus-frequency = <0>; | 59 | bus-frequency = <0>; |
60 | compatible = "fsl,mpc8548-immr", "simple-bus"; | ||
60 | 61 | ||
61 | memory-controller@2000 { | 62 | memory-controller@2000 { |
62 | compatible = "fsl,mpc8548-memory-controller"; | 63 | compatible = "fsl,mpc8548-memory-controller"; |
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 644bf9d4ea00..965c237c122d 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper | |||
@@ -165,7 +165,7 @@ cuboot*) | |||
165 | binary=y | 165 | binary=y |
166 | gzip= | 166 | gzip= |
167 | case "$platform" in | 167 | case "$platform" in |
168 | *-mpc885ads|*-adder875*|*-ep88xc) | 168 | *-mpc866ads|*-mpc885ads|*-adder875*|*-ep88xc) |
169 | platformo=$object/cuboot-8xx.o | 169 | platformo=$object/cuboot-8xx.o |
170 | ;; | 170 | ;; |
171 | *5200*|*-motionpro) | 171 | *5200*|*-motionpro) |
diff --git a/arch/powerpc/configs/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig index 60bb4d106c87..5e6780a088ce 100644 --- a/arch/powerpc/configs/asp8347_defconfig +++ b/arch/powerpc/configs/83xx/asp8347_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.25-rc6 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Tue May 6 02:21:00 2008 | 4 | # Thu Aug 21 00:52:01 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | CONFIG_FSL_EMB_PERFMON=y | 18 | CONFIG_FSL_EMB_PERFMON=y |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -31,6 +32,9 @@ CONFIG_GENERIC_CLOCKEVENTS=y | |||
31 | CONFIG_GENERIC_HARDIRQS=y | 32 | CONFIG_GENERIC_HARDIRQS=y |
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | ||
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | ||
34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
35 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
36 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
@@ -50,6 +54,9 @@ CONFIG_AUDIT_ARCH=y | |||
50 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
51 | # CONFIG_DEFAULT_UIMAGE is not set | 55 | # CONFIG_DEFAULT_UIMAGE is not set |
52 | CONFIG_REDBOOT=y | 56 | CONFIG_REDBOOT=y |
57 | CONFIG_HIBERNATE_32=y | ||
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
59 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
53 | # CONFIG_PPC_DCR_NATIVE is not set | 60 | # CONFIG_PPC_DCR_NATIVE is not set |
54 | # CONFIG_PPC_DCR_MMIO is not set | 61 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -92,6 +99,7 @@ CONFIG_HOTPLUG=y | |||
92 | CONFIG_PRINTK=y | 99 | CONFIG_PRINTK=y |
93 | CONFIG_BUG=y | 100 | CONFIG_BUG=y |
94 | CONFIG_ELF_CORE=y | 101 | CONFIG_ELF_CORE=y |
102 | CONFIG_PCSPKR_PLATFORM=y | ||
95 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
96 | CONFIG_BASE_FULL=y | 104 | CONFIG_BASE_FULL=y |
97 | CONFIG_FUTEX=y | 105 | CONFIG_FUTEX=y |
@@ -109,24 +117,33 @@ CONFIG_SLUB=y | |||
109 | # CONFIG_PROFILING is not set | 117 | # CONFIG_PROFILING is not set |
110 | # CONFIG_MARKERS is not set | 118 | # CONFIG_MARKERS is not set |
111 | CONFIG_HAVE_OPROFILE=y | 119 | CONFIG_HAVE_OPROFILE=y |
120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
112 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
125 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
127 | # CONFIG_HAVE_CLK is not set | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
115 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
116 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
117 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
118 | CONFIG_BASE_SMALL=0 | 133 | CONFIG_BASE_SMALL=0 |
119 | CONFIG_MODULES=y | 134 | CONFIG_MODULES=y |
135 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
120 | CONFIG_MODULE_UNLOAD=y | 136 | CONFIG_MODULE_UNLOAD=y |
121 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 137 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
122 | # CONFIG_MODVERSIONS is not set | 138 | # CONFIG_MODVERSIONS is not set |
123 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 139 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
124 | # CONFIG_KMOD is not set | 140 | CONFIG_KMOD=y |
125 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
126 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
127 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
128 | # CONFIG_LSF is not set | 144 | # CONFIG_LSF is not set |
129 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
130 | 147 | ||
131 | # | 148 | # |
132 | # IO Schedulers | 149 | # IO Schedulers |
@@ -145,38 +162,49 @@ CONFIG_CLASSIC_RCU=y | |||
145 | # | 162 | # |
146 | # Platform support | 163 | # Platform support |
147 | # | 164 | # |
148 | # CONFIG_PPC_MULTIPLATFORM is not set | 165 | CONFIG_PPC_MULTIPLATFORM=y |
149 | # CONFIG_PPC_82xx is not set | 166 | CONFIG_CLASSIC32=y |
150 | CONFIG_PPC_83xx=y | 167 | CONFIG_PPC_CHRP=y |
151 | # CONFIG_PPC_86xx is not set | 168 | # CONFIG_MPC5121_ADS is not set |
152 | # CONFIG_PPC_MPC512x is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
153 | # CONFIG_PPC_MPC5121 is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | ||
154 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
155 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | ||
156 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
157 | CONFIG_MPC83xx=y | 176 | CONFIG_PPC_83xx=y |
158 | # CONFIG_MPC831x_RDB is not set | 177 | # CONFIG_MPC831x_RDB is not set |
159 | # CONFIG_MPC832x_MDS is not set | 178 | # CONFIG_MPC832x_MDS is not set |
160 | # CONFIG_MPC832x_RDB is not set | 179 | # CONFIG_MPC832x_RDB is not set |
161 | # CONFIG_MPC834x_MDS is not set | 180 | # CONFIG_MPC834x_MDS is not set |
162 | # CONFIG_MPC834x_ITX is not set | 181 | # CONFIG_MPC834x_ITX is not set |
163 | # CONFIG_MPC836x_MDS is not set | 182 | # CONFIG_MPC836x_MDS is not set |
183 | # CONFIG_MPC836x_RDK is not set | ||
164 | # CONFIG_MPC837x_MDS is not set | 184 | # CONFIG_MPC837x_MDS is not set |
165 | # CONFIG_MPC837x_RDB is not set | 185 | # CONFIG_MPC837x_RDB is not set |
166 | # CONFIG_SBC834x is not set | 186 | # CONFIG_SBC834x is not set |
167 | CONFIG_ASP834x=y | 187 | CONFIG_ASP834x=y |
168 | CONFIG_PPC_MPC834x=y | 188 | CONFIG_PPC_MPC834x=y |
189 | # CONFIG_PPC_86xx is not set | ||
190 | # CONFIG_EMBEDDED6xx is not set | ||
191 | CONFIG_PPC_NATIVE=y | ||
192 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
169 | CONFIG_IPIC=y | 193 | CONFIG_IPIC=y |
170 | # CONFIG_MPIC is not set | 194 | CONFIG_MPIC=y |
171 | # CONFIG_MPIC_WEIRD is not set | 195 | # CONFIG_MPIC_WEIRD is not set |
172 | # CONFIG_PPC_I8259 is not set | 196 | CONFIG_PPC_I8259=y |
173 | # CONFIG_PPC_RTAS is not set | 197 | CONFIG_PPC_RTAS=y |
198 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
199 | CONFIG_RTAS_PROC=y | ||
174 | # CONFIG_MMIO_NVRAM is not set | 200 | # CONFIG_MMIO_NVRAM is not set |
175 | # CONFIG_PPC_MPC106 is not set | 201 | CONFIG_PPC_MPC106=y |
176 | # CONFIG_PPC_970_NAP is not set | 202 | # CONFIG_PPC_970_NAP is not set |
177 | # CONFIG_PPC_INDIRECT_IO is not set | 203 | # CONFIG_PPC_INDIRECT_IO is not set |
178 | # CONFIG_GENERIC_IOMAP is not set | 204 | # CONFIG_GENERIC_IOMAP is not set |
179 | # CONFIG_CPU_FREQ is not set | 205 | # CONFIG_CPU_FREQ is not set |
206 | # CONFIG_PPC601_SYNC_FIX is not set | ||
207 | # CONFIG_TAU is not set | ||
180 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
181 | 209 | ||
182 | # | 210 | # |
@@ -192,7 +220,7 @@ CONFIG_HZ_250=y | |||
192 | # CONFIG_HZ_300 is not set | 220 | # CONFIG_HZ_300 is not set |
193 | # CONFIG_HZ_1000 is not set | 221 | # CONFIG_HZ_1000 is not set |
194 | CONFIG_HZ=250 | 222 | CONFIG_HZ=250 |
195 | # CONFIG_SCHED_HRTICK is not set | 223 | CONFIG_SCHED_HRTICK=y |
196 | CONFIG_PREEMPT_NONE=y | 224 | CONFIG_PREEMPT_NONE=y |
197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 225 | # CONFIG_PREEMPT_VOLUNTARY is not set |
198 | # CONFIG_PREEMPT is not set | 226 | # CONFIG_PREEMPT is not set |
@@ -202,6 +230,7 @@ CONFIG_BINFMT_ELF=y | |||
202 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
203 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 231 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
204 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
233 | # CONFIG_KEXEC is not set | ||
205 | CONFIG_ARCH_FLATMEM_ENABLE=y | 234 | CONFIG_ARCH_FLATMEM_ENABLE=y |
206 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 235 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
207 | CONFIG_SELECT_MEMORY_MODEL=y | 236 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -212,13 +241,17 @@ CONFIG_FLATMEM=y | |||
212 | CONFIG_FLAT_NODE_MEM_MAP=y | 241 | CONFIG_FLAT_NODE_MEM_MAP=y |
213 | # CONFIG_SPARSEMEM_STATIC is not set | 242 | # CONFIG_SPARSEMEM_STATIC is not set |
214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 243 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
244 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
246 | CONFIG_MIGRATION=y | ||
216 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
217 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
218 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
219 | CONFIG_VIRT_TO_BUS=y | 250 | CONFIG_VIRT_TO_BUS=y |
251 | CONFIG_FORCE_MAX_ZONEORDER=11 | ||
220 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
221 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
254 | CONFIG_EXTRA_TARGETS="" | ||
222 | # CONFIG_PM is not set | 255 | # CONFIG_PM is not set |
223 | CONFIG_SECCOMP=y | 256 | CONFIG_SECCOMP=y |
224 | CONFIG_ISA_DMA_API=y | 257 | CONFIG_ISA_DMA_API=y |
@@ -226,10 +259,13 @@ CONFIG_ISA_DMA_API=y | |||
226 | # | 259 | # |
227 | # Bus options | 260 | # Bus options |
228 | # | 261 | # |
262 | # CONFIG_ISA is not set | ||
229 | CONFIG_ZONE_DMA=y | 263 | CONFIG_ZONE_DMA=y |
230 | CONFIG_GENERIC_ISA_DMA=y | 264 | CONFIG_GENERIC_ISA_DMA=y |
231 | CONFIG_PPC_INDIRECT_PCI=y | 265 | CONFIG_PPC_INDIRECT_PCI=y |
232 | CONFIG_FSL_SOC=y | 266 | CONFIG_FSL_SOC=y |
267 | CONFIG_FSL_PCI=y | ||
268 | CONFIG_PPC_PCI_CHOICE=y | ||
233 | CONFIG_PCI=y | 269 | CONFIG_PCI=y |
234 | CONFIG_PCI_DOMAINS=y | 270 | CONFIG_PCI_DOMAINS=y |
235 | CONFIG_PCI_SYSCALL=y | 271 | CONFIG_PCI_SYSCALL=y |
@@ -239,6 +275,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
239 | CONFIG_PCI_LEGACY=y | 275 | CONFIG_PCI_LEGACY=y |
240 | # CONFIG_PCCARD is not set | 276 | # CONFIG_PCCARD is not set |
241 | # CONFIG_HOTPLUG_PCI is not set | 277 | # CONFIG_HOTPLUG_PCI is not set |
278 | # CONFIG_HAS_RAPIDIO is not set | ||
242 | 279 | ||
243 | # | 280 | # |
244 | # Advanced setup | 281 | # Advanced setup |
@@ -248,15 +285,11 @@ CONFIG_PCI_LEGACY=y | |||
248 | # | 285 | # |
249 | # Default settings for advanced configuration options are used | 286 | # Default settings for advanced configuration options are used |
250 | # | 287 | # |
251 | CONFIG_HIGHMEM_START=0xfe000000 | ||
252 | CONFIG_LOWMEM_SIZE=0x30000000 | 288 | CONFIG_LOWMEM_SIZE=0x30000000 |
289 | CONFIG_PAGE_OFFSET=0xc0000000 | ||
253 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
291 | CONFIG_PHYSICAL_START=0x00000000 | ||
254 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
255 | CONFIG_BOOT_LOAD=0x00800000 | ||
256 | |||
257 | # | ||
258 | # Networking | ||
259 | # | ||
260 | CONFIG_NET=y | 293 | CONFIG_NET=y |
261 | 294 | ||
262 | # | 295 | # |
@@ -300,8 +333,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
300 | CONFIG_DEFAULT_TCP_CONG="cubic" | 333 | CONFIG_DEFAULT_TCP_CONG="cubic" |
301 | # CONFIG_TCP_MD5SIG is not set | 334 | # CONFIG_TCP_MD5SIG is not set |
302 | # CONFIG_IPV6 is not set | 335 | # CONFIG_IPV6 is not set |
303 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
304 | # CONFIG_INET6_TUNNEL is not set | ||
305 | # CONFIG_NETWORK_SECMARK is not set | 336 | # CONFIG_NETWORK_SECMARK is not set |
306 | # CONFIG_NETFILTER is not set | 337 | # CONFIG_NETFILTER is not set |
307 | # CONFIG_IP_DCCP is not set | 338 | # CONFIG_IP_DCCP is not set |
@@ -363,6 +394,7 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y | |||
363 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | 394 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set |
364 | # CONFIG_MTD_CMDLINE_PARTS is not set | 395 | # CONFIG_MTD_CMDLINE_PARTS is not set |
365 | CONFIG_MTD_OF_PARTS=y | 396 | CONFIG_MTD_OF_PARTS=y |
397 | # CONFIG_MTD_AR7_PARTS is not set | ||
366 | 398 | ||
367 | # | 399 | # |
368 | # User Modules And Translation Layers | 400 | # User Modules And Translation Layers |
@@ -434,9 +466,11 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
434 | # | 466 | # |
435 | # CONFIG_MTD_UBI is not set | 467 | # CONFIG_MTD_UBI is not set |
436 | CONFIG_OF_DEVICE=y | 468 | CONFIG_OF_DEVICE=y |
469 | CONFIG_OF_I2C=y | ||
437 | # CONFIG_PARPORT is not set | 470 | # CONFIG_PARPORT is not set |
438 | CONFIG_BLK_DEV=y | 471 | CONFIG_BLK_DEV=y |
439 | # CONFIG_BLK_DEV_FD is not set | 472 | # CONFIG_BLK_DEV_FD is not set |
473 | # CONFIG_MAC_FLOPPY is not set | ||
440 | # CONFIG_BLK_CPQ_DA is not set | 474 | # CONFIG_BLK_CPQ_DA is not set |
441 | # CONFIG_BLK_CPQ_CISS_DA is not set | 475 | # CONFIG_BLK_CPQ_CISS_DA is not set |
442 | # CONFIG_BLK_DEV_DAC960 is not set | 476 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -453,12 +487,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
453 | # CONFIG_BLK_DEV_XIP is not set | 487 | # CONFIG_BLK_DEV_XIP is not set |
454 | # CONFIG_CDROM_PKTCDVD is not set | 488 | # CONFIG_CDROM_PKTCDVD is not set |
455 | # CONFIG_ATA_OVER_ETH is not set | 489 | # CONFIG_ATA_OVER_ETH is not set |
490 | # CONFIG_BLK_DEV_HD is not set | ||
456 | CONFIG_MISC_DEVICES=y | 491 | CONFIG_MISC_DEVICES=y |
457 | # CONFIG_PHANTOM is not set | 492 | # CONFIG_PHANTOM is not set |
458 | # CONFIG_EEPROM_93CX6 is not set | 493 | # CONFIG_EEPROM_93CX6 is not set |
459 | # CONFIG_SGI_IOC4 is not set | 494 | # CONFIG_SGI_IOC4 is not set |
460 | # CONFIG_TIFM_CORE is not set | 495 | # CONFIG_TIFM_CORE is not set |
461 | # CONFIG_ENCLOSURE_SERVICES is not set | 496 | # CONFIG_ENCLOSURE_SERVICES is not set |
497 | # CONFIG_HP_ILO is not set | ||
462 | CONFIG_HAVE_IDE=y | 498 | CONFIG_HAVE_IDE=y |
463 | # CONFIG_IDE is not set | 499 | # CONFIG_IDE is not set |
464 | 500 | ||
@@ -476,12 +512,15 @@ CONFIG_HAVE_IDE=y | |||
476 | # | 512 | # |
477 | # IEEE 1394 (FireWire) support | 513 | # IEEE 1394 (FireWire) support |
478 | # | 514 | # |
515 | |||
516 | # | ||
517 | # Enable only one of the two stacks, unless you know what you are doing | ||
518 | # | ||
479 | # CONFIG_FIREWIRE is not set | 519 | # CONFIG_FIREWIRE is not set |
480 | # CONFIG_IEEE1394 is not set | 520 | # CONFIG_IEEE1394 is not set |
481 | # CONFIG_I2O is not set | 521 | # CONFIG_I2O is not set |
482 | # CONFIG_MACINTOSH_DRIVERS is not set | 522 | # CONFIG_MACINTOSH_DRIVERS is not set |
483 | CONFIG_NETDEVICES=y | 523 | CONFIG_NETDEVICES=y |
484 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
485 | # CONFIG_DUMMY is not set | 524 | # CONFIG_DUMMY is not set |
486 | # CONFIG_BONDING is not set | 525 | # CONFIG_BONDING is not set |
487 | # CONFIG_MACVLAN is not set | 526 | # CONFIG_MACVLAN is not set |
@@ -508,6 +547,8 @@ CONFIG_PHYLIB=y | |||
508 | # CONFIG_MDIO_BITBANG is not set | 547 | # CONFIG_MDIO_BITBANG is not set |
509 | CONFIG_NET_ETHERNET=y | 548 | CONFIG_NET_ETHERNET=y |
510 | CONFIG_MII=y | 549 | CONFIG_MII=y |
550 | # CONFIG_MACE is not set | ||
551 | # CONFIG_BMAC is not set | ||
511 | # CONFIG_HAPPYMEAL is not set | 552 | # CONFIG_HAPPYMEAL is not set |
512 | # CONFIG_SUNGEM is not set | 553 | # CONFIG_SUNGEM is not set |
513 | # CONFIG_CASSINI is not set | 554 | # CONFIG_CASSINI is not set |
@@ -525,7 +566,6 @@ CONFIG_NETDEV_1000=y | |||
525 | # CONFIG_DL2K is not set | 566 | # CONFIG_DL2K is not set |
526 | # CONFIG_E1000 is not set | 567 | # CONFIG_E1000 is not set |
527 | # CONFIG_E1000E is not set | 568 | # CONFIG_E1000E is not set |
528 | # CONFIG_E1000E_ENABLED is not set | ||
529 | # CONFIG_IP1000 is not set | 569 | # CONFIG_IP1000 is not set |
530 | # CONFIG_IGB is not set | 570 | # CONFIG_IGB is not set |
531 | # CONFIG_NS83820 is not set | 571 | # CONFIG_NS83820 is not set |
@@ -535,14 +575,14 @@ CONFIG_NETDEV_1000=y | |||
535 | # CONFIG_SIS190 is not set | 575 | # CONFIG_SIS190 is not set |
536 | # CONFIG_SKGE is not set | 576 | # CONFIG_SKGE is not set |
537 | # CONFIG_SKY2 is not set | 577 | # CONFIG_SKY2 is not set |
538 | # CONFIG_SK98LIN is not set | ||
539 | # CONFIG_VIA_VELOCITY is not set | 578 | # CONFIG_VIA_VELOCITY is not set |
540 | # CONFIG_TIGON3 is not set | 579 | # CONFIG_TIGON3 is not set |
541 | # CONFIG_BNX2 is not set | 580 | # CONFIG_BNX2 is not set |
542 | CONFIG_GIANFAR=y | 581 | CONFIG_GIANFAR=y |
543 | # CONFIG_GFAR_NAPI is not set | 582 | # CONFIG_MV643XX_ETH is not set |
544 | # CONFIG_QLA3XXX is not set | 583 | # CONFIG_QLA3XXX is not set |
545 | # CONFIG_ATL1 is not set | 584 | # CONFIG_ATL1 is not set |
585 | # CONFIG_ATL1E is not set | ||
546 | # CONFIG_NETDEV_10000 is not set | 586 | # CONFIG_NETDEV_10000 is not set |
547 | # CONFIG_TR is not set | 587 | # CONFIG_TR is not set |
548 | 588 | ||
@@ -551,6 +591,7 @@ CONFIG_GIANFAR=y | |||
551 | # | 591 | # |
552 | # CONFIG_WLAN_PRE80211 is not set | 592 | # CONFIG_WLAN_PRE80211 is not set |
553 | # CONFIG_WLAN_80211 is not set | 593 | # CONFIG_WLAN_80211 is not set |
594 | # CONFIG_IWLWIFI_LEDS is not set | ||
554 | 595 | ||
555 | # | 596 | # |
556 | # USB Network Adapters | 597 | # USB Network Adapters |
@@ -606,6 +647,7 @@ CONFIG_INPUT=y | |||
606 | # Character devices | 647 | # Character devices |
607 | # | 648 | # |
608 | # CONFIG_VT is not set | 649 | # CONFIG_VT is not set |
650 | CONFIG_DEVKMEM=y | ||
609 | # CONFIG_SERIAL_NONSTANDARD is not set | 651 | # CONFIG_SERIAL_NONSTANDARD is not set |
610 | # CONFIG_NOZOMI is not set | 652 | # CONFIG_NOZOMI is not set |
611 | 653 | ||
@@ -625,16 +667,17 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
625 | # CONFIG_SERIAL_UARTLITE is not set | 667 | # CONFIG_SERIAL_UARTLITE is not set |
626 | CONFIG_SERIAL_CORE=y | 668 | CONFIG_SERIAL_CORE=y |
627 | CONFIG_SERIAL_CORE_CONSOLE=y | 669 | CONFIG_SERIAL_CORE_CONSOLE=y |
670 | # CONFIG_SERIAL_PMACZILOG is not set | ||
628 | # CONFIG_SERIAL_JSM is not set | 671 | # CONFIG_SERIAL_JSM is not set |
629 | # CONFIG_SERIAL_OF_PLATFORM is not set | 672 | # CONFIG_SERIAL_OF_PLATFORM is not set |
630 | CONFIG_UNIX98_PTYS=y | 673 | CONFIG_UNIX98_PTYS=y |
631 | CONFIG_LEGACY_PTYS=y | 674 | CONFIG_LEGACY_PTYS=y |
632 | CONFIG_LEGACY_PTY_COUNT=256 | 675 | CONFIG_LEGACY_PTY_COUNT=256 |
676 | # CONFIG_BRIQ_PANEL is not set | ||
677 | # CONFIG_HVC_RTAS is not set | ||
633 | # CONFIG_IPMI_HANDLER is not set | 678 | # CONFIG_IPMI_HANDLER is not set |
634 | # CONFIG_HW_RANDOM is not set | 679 | # CONFIG_HW_RANDOM is not set |
635 | # CONFIG_NVRAM is not set | 680 | # CONFIG_NVRAM is not set |
636 | CONFIG_GEN_RTC=y | ||
637 | # CONFIG_GEN_RTC_X is not set | ||
638 | # CONFIG_R3964 is not set | 681 | # CONFIG_R3964 is not set |
639 | # CONFIG_APPLICOM is not set | 682 | # CONFIG_APPLICOM is not set |
640 | # CONFIG_RAW_DRIVER is not set | 683 | # CONFIG_RAW_DRIVER is not set |
@@ -643,16 +686,14 @@ CONFIG_DEVPORT=y | |||
643 | CONFIG_I2C=y | 686 | CONFIG_I2C=y |
644 | CONFIG_I2C_BOARDINFO=y | 687 | CONFIG_I2C_BOARDINFO=y |
645 | CONFIG_I2C_CHARDEV=y | 688 | CONFIG_I2C_CHARDEV=y |
689 | CONFIG_I2C_HELPER_AUTO=y | ||
646 | 690 | ||
647 | # | 691 | # |
648 | # I2C Algorithms | 692 | # I2C Hardware Bus support |
649 | # | 693 | # |
650 | # CONFIG_I2C_ALGOBIT is not set | ||
651 | # CONFIG_I2C_ALGOPCF is not set | ||
652 | # CONFIG_I2C_ALGOPCA is not set | ||
653 | 694 | ||
654 | # | 695 | # |
655 | # I2C Hardware Bus support | 696 | # PC SMBus host controller drivers |
656 | # | 697 | # |
657 | # CONFIG_I2C_ALI1535 is not set | 698 | # CONFIG_I2C_ALI1535 is not set |
658 | # CONFIG_I2C_ALI1563 is not set | 699 | # CONFIG_I2C_ALI1563 is not set |
@@ -660,50 +701,70 @@ CONFIG_I2C_CHARDEV=y | |||
660 | # CONFIG_I2C_AMD756 is not set | 701 | # CONFIG_I2C_AMD756 is not set |
661 | # CONFIG_I2C_AMD8111 is not set | 702 | # CONFIG_I2C_AMD8111 is not set |
662 | # CONFIG_I2C_I801 is not set | 703 | # CONFIG_I2C_I801 is not set |
663 | # CONFIG_I2C_I810 is not set | 704 | # CONFIG_I2C_ISCH is not set |
664 | # CONFIG_I2C_PIIX4 is not set | 705 | # CONFIG_I2C_PIIX4 is not set |
665 | CONFIG_I2C_MPC=y | ||
666 | # CONFIG_I2C_NFORCE2 is not set | 706 | # CONFIG_I2C_NFORCE2 is not set |
667 | # CONFIG_I2C_OCORES is not set | ||
668 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
669 | # CONFIG_I2C_PROSAVAGE is not set | ||
670 | # CONFIG_I2C_SAVAGE4 is not set | ||
671 | # CONFIG_I2C_SIMTEC is not set | ||
672 | # CONFIG_I2C_SIS5595 is not set | 707 | # CONFIG_I2C_SIS5595 is not set |
673 | # CONFIG_I2C_SIS630 is not set | 708 | # CONFIG_I2C_SIS630 is not set |
674 | # CONFIG_I2C_SIS96X is not set | 709 | # CONFIG_I2C_SIS96X is not set |
675 | # CONFIG_I2C_TAOS_EVM is not set | ||
676 | # CONFIG_I2C_STUB is not set | ||
677 | # CONFIG_I2C_TINY_USB is not set | ||
678 | # CONFIG_I2C_VIA is not set | 710 | # CONFIG_I2C_VIA is not set |
679 | # CONFIG_I2C_VIAPRO is not set | 711 | # CONFIG_I2C_VIAPRO is not set |
712 | |||
713 | # | ||
714 | # Mac SMBus host controller drivers | ||
715 | # | ||
716 | # CONFIG_I2C_HYDRA is not set | ||
717 | CONFIG_I2C_POWERMAC=y | ||
718 | |||
719 | # | ||
720 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
721 | # | ||
722 | CONFIG_I2C_MPC=y | ||
723 | # CONFIG_I2C_OCORES is not set | ||
724 | # CONFIG_I2C_SIMTEC is not set | ||
725 | |||
726 | # | ||
727 | # External I2C/SMBus adapter drivers | ||
728 | # | ||
729 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
730 | # CONFIG_I2C_TAOS_EVM is not set | ||
731 | # CONFIG_I2C_TINY_USB is not set | ||
732 | |||
733 | # | ||
734 | # Graphics adapter I2C/DDC channel drivers | ||
735 | # | ||
680 | # CONFIG_I2C_VOODOO3 is not set | 736 | # CONFIG_I2C_VOODOO3 is not set |
681 | 737 | ||
682 | # | 738 | # |
739 | # Other I2C/SMBus bus drivers | ||
740 | # | ||
741 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
742 | # CONFIG_I2C_STUB is not set | ||
743 | |||
744 | # | ||
683 | # Miscellaneous I2C Chip support | 745 | # Miscellaneous I2C Chip support |
684 | # | 746 | # |
685 | # CONFIG_DS1682 is not set | 747 | # CONFIG_DS1682 is not set |
748 | # CONFIG_AT24 is not set | ||
686 | # CONFIG_SENSORS_EEPROM is not set | 749 | # CONFIG_SENSORS_EEPROM is not set |
687 | # CONFIG_SENSORS_PCF8574 is not set | 750 | # CONFIG_SENSORS_PCF8574 is not set |
688 | # CONFIG_PCF8575 is not set | 751 | # CONFIG_PCF8575 is not set |
752 | # CONFIG_SENSORS_PCA9539 is not set | ||
689 | # CONFIG_SENSORS_PCF8591 is not set | 753 | # CONFIG_SENSORS_PCF8591 is not set |
690 | # CONFIG_TPS65010 is not set | ||
691 | # CONFIG_SENSORS_MAX6875 is not set | 754 | # CONFIG_SENSORS_MAX6875 is not set |
692 | # CONFIG_SENSORS_TSL2550 is not set | 755 | # CONFIG_SENSORS_TSL2550 is not set |
693 | # CONFIG_I2C_DEBUG_CORE is not set | 756 | # CONFIG_I2C_DEBUG_CORE is not set |
694 | # CONFIG_I2C_DEBUG_ALGO is not set | 757 | # CONFIG_I2C_DEBUG_ALGO is not set |
695 | # CONFIG_I2C_DEBUG_BUS is not set | 758 | # CONFIG_I2C_DEBUG_BUS is not set |
696 | # CONFIG_I2C_DEBUG_CHIP is not set | 759 | # CONFIG_I2C_DEBUG_CHIP is not set |
697 | |||
698 | # | ||
699 | # SPI support | ||
700 | # | ||
701 | # CONFIG_SPI is not set | 760 | # CONFIG_SPI is not set |
702 | # CONFIG_SPI_MASTER is not set | 761 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
762 | # CONFIG_GPIOLIB is not set | ||
703 | # CONFIG_W1 is not set | 763 | # CONFIG_W1 is not set |
704 | # CONFIG_POWER_SUPPLY is not set | 764 | # CONFIG_POWER_SUPPLY is not set |
705 | CONFIG_HWMON=y | 765 | CONFIG_HWMON=y |
706 | # CONFIG_HWMON_VID is not set | 766 | # CONFIG_HWMON_VID is not set |
767 | # CONFIG_SENSORS_AD7414 is not set | ||
707 | # CONFIG_SENSORS_AD7418 is not set | 768 | # CONFIG_SENSORS_AD7418 is not set |
708 | # CONFIG_SENSORS_ADM1021 is not set | 769 | # CONFIG_SENSORS_ADM1021 is not set |
709 | # CONFIG_SENSORS_ADM1025 is not set | 770 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -713,6 +774,7 @@ CONFIG_HWMON=y | |||
713 | # CONFIG_SENSORS_ADM9240 is not set | 774 | # CONFIG_SENSORS_ADM9240 is not set |
714 | # CONFIG_SENSORS_ADT7470 is not set | 775 | # CONFIG_SENSORS_ADT7470 is not set |
715 | # CONFIG_SENSORS_ADT7473 is not set | 776 | # CONFIG_SENSORS_ADT7473 is not set |
777 | # CONFIG_SENSORS_AMS is not set | ||
716 | # CONFIG_SENSORS_ATXP1 is not set | 778 | # CONFIG_SENSORS_ATXP1 is not set |
717 | # CONFIG_SENSORS_DS1621 is not set | 779 | # CONFIG_SENSORS_DS1621 is not set |
718 | # CONFIG_SENSORS_I5K_AMB is not set | 780 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -757,6 +819,7 @@ CONFIG_HWMON=y | |||
757 | # CONFIG_SENSORS_W83627EHF is not set | 819 | # CONFIG_SENSORS_W83627EHF is not set |
758 | # CONFIG_HWMON_DEBUG_CHIP is not set | 820 | # CONFIG_HWMON_DEBUG_CHIP is not set |
759 | CONFIG_THERMAL=y | 821 | CONFIG_THERMAL=y |
822 | # CONFIG_THERMAL_HWMON is not set | ||
760 | CONFIG_WATCHDOG=y | 823 | CONFIG_WATCHDOG=y |
761 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 824 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
762 | 825 | ||
@@ -764,7 +827,9 @@ CONFIG_WATCHDOG=y | |||
764 | # Watchdog Device Drivers | 827 | # Watchdog Device Drivers |
765 | # | 828 | # |
766 | # CONFIG_SOFT_WATCHDOG is not set | 829 | # CONFIG_SOFT_WATCHDOG is not set |
767 | CONFIG_83xx_WDT=y | 830 | # CONFIG_ALIM7101_WDT is not set |
831 | # CONFIG_8xxx_WDT is not set | ||
832 | # CONFIG_WATCHDOG_RTAS is not set | ||
768 | 833 | ||
769 | # | 834 | # |
770 | # PCI-based Watchdog Cards | 835 | # PCI-based Watchdog Cards |
@@ -786,13 +851,25 @@ CONFIG_SSB_POSSIBLE=y | |||
786 | # | 851 | # |
787 | # Multifunction device drivers | 852 | # Multifunction device drivers |
788 | # | 853 | # |
854 | # CONFIG_MFD_CORE is not set | ||
789 | # CONFIG_MFD_SM501 is not set | 855 | # CONFIG_MFD_SM501 is not set |
856 | # CONFIG_HTC_PASIC3 is not set | ||
857 | # CONFIG_MFD_TMIO is not set | ||
790 | 858 | ||
791 | # | 859 | # |
792 | # Multimedia devices | 860 | # Multimedia devices |
793 | # | 861 | # |
862 | |||
863 | # | ||
864 | # Multimedia core support | ||
865 | # | ||
794 | # CONFIG_VIDEO_DEV is not set | 866 | # CONFIG_VIDEO_DEV is not set |
795 | # CONFIG_DVB_CORE is not set | 867 | # CONFIG_DVB_CORE is not set |
868 | # CONFIG_VIDEO_MEDIA is not set | ||
869 | |||
870 | # | ||
871 | # Multimedia drivers | ||
872 | # | ||
796 | CONFIG_DAB=y | 873 | CONFIG_DAB=y |
797 | # CONFIG_USB_DABUSB is not set | 874 | # CONFIG_USB_DABUSB is not set |
798 | 875 | ||
@@ -810,10 +887,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
810 | # Display device support | 887 | # Display device support |
811 | # | 888 | # |
812 | # CONFIG_DISPLAY_SUPPORT is not set | 889 | # CONFIG_DISPLAY_SUPPORT is not set |
813 | |||
814 | # | ||
815 | # Sound | ||
816 | # | ||
817 | # CONFIG_SOUND is not set | 890 | # CONFIG_SOUND is not set |
818 | # CONFIG_HID_SUPPORT is not set | 891 | # CONFIG_HID_SUPPORT is not set |
819 | CONFIG_USB_SUPPORT=y | 892 | CONFIG_USB_SUPPORT=y |
@@ -831,16 +904,21 @@ CONFIG_USB=y | |||
831 | CONFIG_USB_DEVICE_CLASS=y | 904 | CONFIG_USB_DEVICE_CLASS=y |
832 | # CONFIG_USB_DYNAMIC_MINORS is not set | 905 | # CONFIG_USB_DYNAMIC_MINORS is not set |
833 | # CONFIG_USB_OTG is not set | 906 | # CONFIG_USB_OTG is not set |
907 | # CONFIG_USB_OTG_WHITELIST is not set | ||
908 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | ||
909 | CONFIG_USB_MON=y | ||
834 | 910 | ||
835 | # | 911 | # |
836 | # USB Host Controller Drivers | 912 | # USB Host Controller Drivers |
837 | # | 913 | # |
914 | # CONFIG_USB_C67X00_HCD is not set | ||
838 | CONFIG_USB_EHCI_HCD=y | 915 | CONFIG_USB_EHCI_HCD=y |
839 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 916 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
840 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 917 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
841 | CONFIG_USB_EHCI_FSL=y | 918 | CONFIG_USB_EHCI_FSL=y |
842 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 919 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
843 | # CONFIG_USB_ISP116X_HCD is not set | 920 | # CONFIG_USB_ISP116X_HCD is not set |
921 | # CONFIG_USB_ISP1760_HCD is not set | ||
844 | # CONFIG_USB_OHCI_HCD is not set | 922 | # CONFIG_USB_OHCI_HCD is not set |
845 | # CONFIG_USB_UHCI_HCD is not set | 923 | # CONFIG_USB_UHCI_HCD is not set |
846 | # CONFIG_USB_SL811_HCD is not set | 924 | # CONFIG_USB_SL811_HCD is not set |
@@ -851,6 +929,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
851 | # | 929 | # |
852 | # CONFIG_USB_ACM is not set | 930 | # CONFIG_USB_ACM is not set |
853 | # CONFIG_USB_PRINTER is not set | 931 | # CONFIG_USB_PRINTER is not set |
932 | # CONFIG_USB_WDM is not set | ||
854 | 933 | ||
855 | # | 934 | # |
856 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 935 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -865,7 +944,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
865 | # USB Imaging devices | 944 | # USB Imaging devices |
866 | # | 945 | # |
867 | # CONFIG_USB_MDC800 is not set | 946 | # CONFIG_USB_MDC800 is not set |
868 | CONFIG_USB_MON=y | ||
869 | 947 | ||
870 | # | 948 | # |
871 | # USB port drivers | 949 | # USB port drivers |
@@ -878,7 +956,6 @@ CONFIG_USB_MON=y | |||
878 | # CONFIG_USB_EMI62 is not set | 956 | # CONFIG_USB_EMI62 is not set |
879 | # CONFIG_USB_EMI26 is not set | 957 | # CONFIG_USB_EMI26 is not set |
880 | # CONFIG_USB_ADUTUX is not set | 958 | # CONFIG_USB_ADUTUX is not set |
881 | # CONFIG_USB_AUERSWALD is not set | ||
882 | # CONFIG_USB_RIO500 is not set | 959 | # CONFIG_USB_RIO500 is not set |
883 | # CONFIG_USB_LEGOTOWER is not set | 960 | # CONFIG_USB_LEGOTOWER is not set |
884 | # CONFIG_USB_LCD is not set | 961 | # CONFIG_USB_LCD is not set |
@@ -894,18 +971,16 @@ CONFIG_USB_MON=y | |||
894 | # CONFIG_USB_LD is not set | 971 | # CONFIG_USB_LD is not set |
895 | # CONFIG_USB_TRANCEVIBRATOR is not set | 972 | # CONFIG_USB_TRANCEVIBRATOR is not set |
896 | # CONFIG_USB_IOWARRIOR is not set | 973 | # CONFIG_USB_IOWARRIOR is not set |
974 | # CONFIG_USB_ISIGHTFW is not set | ||
897 | # CONFIG_USB_GADGET is not set | 975 | # CONFIG_USB_GADGET is not set |
898 | # CONFIG_MMC is not set | 976 | # CONFIG_MMC is not set |
899 | # CONFIG_MEMSTICK is not set | 977 | # CONFIG_MEMSTICK is not set |
900 | # CONFIG_NEW_LEDS is not set | 978 | # CONFIG_NEW_LEDS is not set |
979 | # CONFIG_ACCESSIBILITY is not set | ||
901 | # CONFIG_INFINIBAND is not set | 980 | # CONFIG_INFINIBAND is not set |
902 | # CONFIG_EDAC is not set | 981 | # CONFIG_EDAC is not set |
903 | CONFIG_RTC_LIB=y | 982 | CONFIG_RTC_LIB=y |
904 | CONFIG_RTC_CLASS=y | 983 | CONFIG_RTC_CLASS=y |
905 | |||
906 | # | ||
907 | # Conflicting RTC option has been selected, check GEN_RTC and RTC | ||
908 | # | ||
909 | CONFIG_RTC_HCTOSYS=y | 984 | CONFIG_RTC_HCTOSYS=y |
910 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" | 985 | CONFIG_RTC_HCTOSYS_DEVICE="rtc0" |
911 | # CONFIG_RTC_DEBUG is not set | 986 | # CONFIG_RTC_DEBUG is not set |
@@ -933,6 +1008,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
933 | # CONFIG_RTC_DRV_PCF8583 is not set | 1008 | # CONFIG_RTC_DRV_PCF8583 is not set |
934 | # CONFIG_RTC_DRV_M41T80 is not set | 1009 | # CONFIG_RTC_DRV_M41T80 is not set |
935 | # CONFIG_RTC_DRV_S35390A is not set | 1010 | # CONFIG_RTC_DRV_S35390A is not set |
1011 | # CONFIG_RTC_DRV_FM3130 is not set | ||
936 | 1012 | ||
937 | # | 1013 | # |
938 | # SPI RTC drivers | 1014 | # SPI RTC drivers |
@@ -953,11 +1029,8 @@ CONFIG_RTC_DRV_DS1374=y | |||
953 | # | 1029 | # |
954 | # on-CPU RTC drivers | 1030 | # on-CPU RTC drivers |
955 | # | 1031 | # |
1032 | # CONFIG_RTC_DRV_PPC is not set | ||
956 | # CONFIG_DMADEVICES is not set | 1033 | # CONFIG_DMADEVICES is not set |
957 | |||
958 | # | ||
959 | # Userspace I/O | ||
960 | # | ||
961 | # CONFIG_UIO is not set | 1034 | # CONFIG_UIO is not set |
962 | 1035 | ||
963 | # | 1036 | # |
@@ -977,7 +1050,6 @@ CONFIG_FS_MBCACHE=y | |||
977 | # CONFIG_JFS_FS is not set | 1050 | # CONFIG_JFS_FS is not set |
978 | # CONFIG_FS_POSIX_ACL is not set | 1051 | # CONFIG_FS_POSIX_ACL is not set |
979 | # CONFIG_XFS_FS is not set | 1052 | # CONFIG_XFS_FS is not set |
980 | # CONFIG_GFS2_FS is not set | ||
981 | # CONFIG_OCFS2_FS is not set | 1053 | # CONFIG_OCFS2_FS is not set |
982 | CONFIG_DNOTIFY=y | 1054 | CONFIG_DNOTIFY=y |
983 | CONFIG_INOTIFY=y | 1055 | CONFIG_INOTIFY=y |
@@ -1036,6 +1108,7 @@ CONFIG_JFFS2_RTIME=y | |||
1036 | # CONFIG_CRAMFS is not set | 1108 | # CONFIG_CRAMFS is not set |
1037 | # CONFIG_VXFS_FS is not set | 1109 | # CONFIG_VXFS_FS is not set |
1038 | # CONFIG_MINIX_FS is not set | 1110 | # CONFIG_MINIX_FS is not set |
1111 | # CONFIG_OMFS_FS is not set | ||
1039 | # CONFIG_HPFS_FS is not set | 1112 | # CONFIG_HPFS_FS is not set |
1040 | # CONFIG_QNX4FS_FS is not set | 1113 | # CONFIG_QNX4FS_FS is not set |
1041 | # CONFIG_ROMFS_FS is not set | 1114 | # CONFIG_ROMFS_FS is not set |
@@ -1046,15 +1119,13 @@ CONFIG_NFS_FS=y | |||
1046 | CONFIG_NFS_V3=y | 1119 | CONFIG_NFS_V3=y |
1047 | # CONFIG_NFS_V3_ACL is not set | 1120 | # CONFIG_NFS_V3_ACL is not set |
1048 | CONFIG_NFS_V4=y | 1121 | CONFIG_NFS_V4=y |
1049 | # CONFIG_NFS_DIRECTIO is not set | ||
1050 | # CONFIG_NFSD is not set | ||
1051 | CONFIG_ROOT_NFS=y | 1122 | CONFIG_ROOT_NFS=y |
1123 | # CONFIG_NFSD is not set | ||
1052 | CONFIG_LOCKD=y | 1124 | CONFIG_LOCKD=y |
1053 | CONFIG_LOCKD_V4=y | 1125 | CONFIG_LOCKD_V4=y |
1054 | CONFIG_NFS_COMMON=y | 1126 | CONFIG_NFS_COMMON=y |
1055 | CONFIG_SUNRPC=y | 1127 | CONFIG_SUNRPC=y |
1056 | CONFIG_SUNRPC_GSS=y | 1128 | CONFIG_SUNRPC_GSS=y |
1057 | # CONFIG_SUNRPC_BIND34 is not set | ||
1058 | CONFIG_RPCSEC_GSS_KRB5=y | 1129 | CONFIG_RPCSEC_GSS_KRB5=y |
1059 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1130 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1060 | # CONFIG_SMB_FS is not set | 1131 | # CONFIG_SMB_FS is not set |
@@ -1126,8 +1197,10 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1126 | # Library routines | 1197 | # Library routines |
1127 | # | 1198 | # |
1128 | CONFIG_BITREVERSE=y | 1199 | CONFIG_BITREVERSE=y |
1200 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1129 | # CONFIG_CRC_CCITT is not set | 1201 | # CONFIG_CRC_CCITT is not set |
1130 | # CONFIG_CRC16 is not set | 1202 | # CONFIG_CRC16 is not set |
1203 | # CONFIG_CRC_T10DIF is not set | ||
1131 | # CONFIG_CRC_ITU_T is not set | 1204 | # CONFIG_CRC_ITU_T is not set |
1132 | CONFIG_CRC32=y | 1205 | CONFIG_CRC32=y |
1133 | # CONFIG_CRC7 is not set | 1206 | # CONFIG_CRC7 is not set |
@@ -1146,6 +1219,7 @@ CONFIG_HAVE_LMB=y | |||
1146 | # CONFIG_PRINTK_TIME is not set | 1219 | # CONFIG_PRINTK_TIME is not set |
1147 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1220 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1148 | CONFIG_ENABLE_MUST_CHECK=y | 1221 | CONFIG_ENABLE_MUST_CHECK=y |
1222 | CONFIG_FRAME_WARN=1024 | ||
1149 | # CONFIG_MAGIC_SYSRQ is not set | 1223 | # CONFIG_MAGIC_SYSRQ is not set |
1150 | # CONFIG_UNUSED_SYMBOLS is not set | 1224 | # CONFIG_UNUSED_SYMBOLS is not set |
1151 | # CONFIG_DEBUG_FS is not set | 1225 | # CONFIG_DEBUG_FS is not set |
@@ -1154,7 +1228,18 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1154 | # CONFIG_SLUB_DEBUG_ON is not set | 1228 | # CONFIG_SLUB_DEBUG_ON is not set |
1155 | # CONFIG_SLUB_STATS is not set | 1229 | # CONFIG_SLUB_STATS is not set |
1156 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1230 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1231 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1232 | # CONFIG_LATENCYTOP is not set | ||
1233 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
1234 | CONFIG_HAVE_FTRACE=y | ||
1235 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1236 | # CONFIG_FTRACE is not set | ||
1237 | # CONFIG_SCHED_TRACER is not set | ||
1238 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1157 | # CONFIG_SAMPLES is not set | 1239 | # CONFIG_SAMPLES is not set |
1240 | CONFIG_HAVE_ARCH_KGDB=y | ||
1241 | # CONFIG_IRQSTACKS is not set | ||
1242 | # CONFIG_BOOTX_TEXT is not set | ||
1158 | # CONFIG_PPC_EARLY_DEBUG is not set | 1243 | # CONFIG_PPC_EARLY_DEBUG is not set |
1159 | 1244 | ||
1160 | # | 1245 | # |
@@ -1164,51 +1249,86 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1164 | # CONFIG_SECURITY is not set | 1249 | # CONFIG_SECURITY is not set |
1165 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1250 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1166 | CONFIG_CRYPTO=y | 1251 | CONFIG_CRYPTO=y |
1252 | |||
1253 | # | ||
1254 | # Crypto core or helper | ||
1255 | # | ||
1167 | CONFIG_CRYPTO_ALGAPI=y | 1256 | CONFIG_CRYPTO_ALGAPI=y |
1168 | CONFIG_CRYPTO_BLKCIPHER=y | 1257 | CONFIG_CRYPTO_BLKCIPHER=y |
1169 | # CONFIG_CRYPTO_SEQIV is not set | ||
1170 | CONFIG_CRYPTO_MANAGER=y | 1258 | CONFIG_CRYPTO_MANAGER=y |
1259 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1260 | # CONFIG_CRYPTO_NULL is not set | ||
1261 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1262 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1263 | # CONFIG_CRYPTO_TEST is not set | ||
1264 | |||
1265 | # | ||
1266 | # Authenticated Encryption with Associated Data | ||
1267 | # | ||
1268 | # CONFIG_CRYPTO_CCM is not set | ||
1269 | # CONFIG_CRYPTO_GCM is not set | ||
1270 | # CONFIG_CRYPTO_SEQIV is not set | ||
1271 | |||
1272 | # | ||
1273 | # Block modes | ||
1274 | # | ||
1275 | CONFIG_CRYPTO_CBC=y | ||
1276 | # CONFIG_CRYPTO_CTR is not set | ||
1277 | # CONFIG_CRYPTO_CTS is not set | ||
1278 | CONFIG_CRYPTO_ECB=m | ||
1279 | # CONFIG_CRYPTO_LRW is not set | ||
1280 | CONFIG_CRYPTO_PCBC=m | ||
1281 | # CONFIG_CRYPTO_XTS is not set | ||
1282 | |||
1283 | # | ||
1284 | # Hash modes | ||
1285 | # | ||
1171 | # CONFIG_CRYPTO_HMAC is not set | 1286 | # CONFIG_CRYPTO_HMAC is not set |
1172 | # CONFIG_CRYPTO_XCBC is not set | 1287 | # CONFIG_CRYPTO_XCBC is not set |
1173 | # CONFIG_CRYPTO_NULL is not set | 1288 | |
1289 | # | ||
1290 | # Digest | ||
1291 | # | ||
1292 | # CONFIG_CRYPTO_CRC32C is not set | ||
1174 | # CONFIG_CRYPTO_MD4 is not set | 1293 | # CONFIG_CRYPTO_MD4 is not set |
1175 | CONFIG_CRYPTO_MD5=y | 1294 | CONFIG_CRYPTO_MD5=y |
1295 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1296 | # CONFIG_CRYPTO_RMD128 is not set | ||
1297 | # CONFIG_CRYPTO_RMD160 is not set | ||
1298 | # CONFIG_CRYPTO_RMD256 is not set | ||
1299 | # CONFIG_CRYPTO_RMD320 is not set | ||
1176 | # CONFIG_CRYPTO_SHA1 is not set | 1300 | # CONFIG_CRYPTO_SHA1 is not set |
1177 | # CONFIG_CRYPTO_SHA256 is not set | 1301 | # CONFIG_CRYPTO_SHA256 is not set |
1178 | # CONFIG_CRYPTO_SHA512 is not set | 1302 | # CONFIG_CRYPTO_SHA512 is not set |
1179 | # CONFIG_CRYPTO_WP512 is not set | ||
1180 | # CONFIG_CRYPTO_TGR192 is not set | 1303 | # CONFIG_CRYPTO_TGR192 is not set |
1181 | # CONFIG_CRYPTO_GF128MUL is not set | 1304 | # CONFIG_CRYPTO_WP512 is not set |
1182 | CONFIG_CRYPTO_ECB=m | 1305 | |
1183 | CONFIG_CRYPTO_CBC=y | 1306 | # |
1184 | CONFIG_CRYPTO_PCBC=m | 1307 | # Ciphers |
1185 | # CONFIG_CRYPTO_LRW is not set | 1308 | # |
1186 | # CONFIG_CRYPTO_XTS is not set | ||
1187 | # CONFIG_CRYPTO_CTR is not set | ||
1188 | # CONFIG_CRYPTO_GCM is not set | ||
1189 | # CONFIG_CRYPTO_CCM is not set | ||
1190 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1191 | CONFIG_CRYPTO_DES=y | ||
1192 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1193 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1194 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1195 | # CONFIG_CRYPTO_SERPENT is not set | ||
1196 | # CONFIG_CRYPTO_AES is not set | 1309 | # CONFIG_CRYPTO_AES is not set |
1310 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1311 | # CONFIG_CRYPTO_ARC4 is not set | ||
1312 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1313 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1197 | # CONFIG_CRYPTO_CAST5 is not set | 1314 | # CONFIG_CRYPTO_CAST5 is not set |
1198 | # CONFIG_CRYPTO_CAST6 is not set | 1315 | # CONFIG_CRYPTO_CAST6 is not set |
1199 | # CONFIG_CRYPTO_TEA is not set | 1316 | CONFIG_CRYPTO_DES=y |
1200 | # CONFIG_CRYPTO_ARC4 is not set | 1317 | # CONFIG_CRYPTO_FCRYPT is not set |
1201 | # CONFIG_CRYPTO_KHAZAD is not set | 1318 | # CONFIG_CRYPTO_KHAZAD is not set |
1202 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1203 | # CONFIG_CRYPTO_SEED is not set | ||
1204 | # CONFIG_CRYPTO_SALSA20 is not set | 1319 | # CONFIG_CRYPTO_SALSA20 is not set |
1320 | # CONFIG_CRYPTO_SEED is not set | ||
1321 | # CONFIG_CRYPTO_SERPENT is not set | ||
1322 | # CONFIG_CRYPTO_TEA is not set | ||
1323 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1324 | |||
1325 | # | ||
1326 | # Compression | ||
1327 | # | ||
1205 | # CONFIG_CRYPTO_DEFLATE is not set | 1328 | # CONFIG_CRYPTO_DEFLATE is not set |
1206 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1207 | # CONFIG_CRYPTO_CRC32C is not set | ||
1208 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1209 | # CONFIG_CRYPTO_TEST is not set | ||
1210 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1211 | # CONFIG_CRYPTO_LZO is not set | 1329 | # CONFIG_CRYPTO_LZO is not set |
1212 | CONFIG_CRYPTO_HW=y | 1330 | CONFIG_CRYPTO_HW=y |
1213 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1331 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1332 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1214 | # CONFIG_PPC_CLOCK is not set | 1333 | # CONFIG_PPC_CLOCK is not set |
1334 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig index 5428f9f5ed85..2028337868b4 100644 --- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:21 2008 | 4 | # Thu Aug 21 00:52:17 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
134 | 146 | ||
135 | # | 147 | # |
136 | # IO Schedulers | 148 | # IO Schedulers |
@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # | 161 | # |
150 | # Platform support | 162 | # Platform support |
151 | # | 163 | # |
152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
162 | CONFIG_MPC831x_RDB=y | 176 | CONFIG_MPC831x_RDB=y |
163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
182 | # CONFIG_MPC836x_RDK is not set | ||
168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
186 | # CONFIG_ASP834x is not set | ||
171 | CONFIG_PPC_MPC831x=y | 187 | CONFIG_PPC_MPC831x=y |
188 | # CONFIG_PPC_86xx is not set | ||
189 | # CONFIG_EMBEDDED6xx is not set | ||
190 | CONFIG_PPC_NATIVE=y | ||
191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
198 | CONFIG_RTAS_PROC=y | ||
177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
206 | # CONFIG_TAU is not set | ||
183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
184 | 208 | ||
185 | # | 209 | # |
@@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
232 | # CONFIG_KEXEC is not set | ||
208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
245 | CONFIG_MIGRATION=y | ||
220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
253 | CONFIG_EXTRA_TARGETS="" | ||
227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
231 | # | 258 | # |
232 | # Bus options | 259 | # Bus options |
233 | # | 260 | # |
261 | # CONFIG_ISA is not set | ||
234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
266 | CONFIG_FSL_PCI=y | ||
267 | CONFIG_PPC_PCI_CHOICE=y | ||
238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
@@ -260,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
260 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
261 | CONFIG_PHYSICAL_START=0x00000000 | 291 | CONFIG_PHYSICAL_START=0x00000000 |
262 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
263 | |||
264 | # | ||
265 | # Networking | ||
266 | # | ||
267 | CONFIG_NET=y | 293 | CONFIG_NET=y |
268 | 294 | ||
269 | # | 295 | # |
@@ -452,9 +478,11 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
452 | # CONFIG_MTD_UBI is not set | 478 | # CONFIG_MTD_UBI is not set |
453 | CONFIG_OF_DEVICE=y | 479 | CONFIG_OF_DEVICE=y |
454 | CONFIG_OF_I2C=y | 480 | CONFIG_OF_I2C=y |
481 | CONFIG_OF_SPI=y | ||
455 | # CONFIG_PARPORT is not set | 482 | # CONFIG_PARPORT is not set |
456 | CONFIG_BLK_DEV=y | 483 | CONFIG_BLK_DEV=y |
457 | # CONFIG_BLK_DEV_FD is not set | 484 | # CONFIG_BLK_DEV_FD is not set |
485 | # CONFIG_MAC_FLOPPY is not set | ||
458 | # CONFIG_BLK_CPQ_DA is not set | 486 | # CONFIG_BLK_CPQ_DA is not set |
459 | # CONFIG_BLK_CPQ_CISS_DA is not set | 487 | # CONFIG_BLK_CPQ_CISS_DA is not set |
460 | # CONFIG_BLK_DEV_DAC960 is not set | 488 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -471,12 +499,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
471 | # CONFIG_BLK_DEV_XIP is not set | 499 | # CONFIG_BLK_DEV_XIP is not set |
472 | # CONFIG_CDROM_PKTCDVD is not set | 500 | # CONFIG_CDROM_PKTCDVD is not set |
473 | # CONFIG_ATA_OVER_ETH is not set | 501 | # CONFIG_ATA_OVER_ETH is not set |
502 | # CONFIG_BLK_DEV_HD is not set | ||
474 | CONFIG_MISC_DEVICES=y | 503 | CONFIG_MISC_DEVICES=y |
475 | # CONFIG_PHANTOM is not set | 504 | # CONFIG_PHANTOM is not set |
476 | # CONFIG_EEPROM_93CX6 is not set | 505 | # CONFIG_EEPROM_93CX6 is not set |
477 | # CONFIG_SGI_IOC4 is not set | 506 | # CONFIG_SGI_IOC4 is not set |
478 | # CONFIG_TIFM_CORE is not set | 507 | # CONFIG_TIFM_CORE is not set |
479 | # CONFIG_ENCLOSURE_SERVICES is not set | 508 | # CONFIG_ENCLOSURE_SERVICES is not set |
509 | # CONFIG_HP_ILO is not set | ||
480 | CONFIG_HAVE_IDE=y | 510 | CONFIG_HAVE_IDE=y |
481 | # CONFIG_IDE is not set | 511 | # CONFIG_IDE is not set |
482 | 512 | ||
@@ -553,7 +583,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
553 | # CONFIG_SCSI_DC390T is not set | 583 | # CONFIG_SCSI_DC390T is not set |
554 | # CONFIG_SCSI_NSP32 is not set | 584 | # CONFIG_SCSI_NSP32 is not set |
555 | # CONFIG_SCSI_DEBUG is not set | 585 | # CONFIG_SCSI_DEBUG is not set |
586 | # CONFIG_SCSI_MESH is not set | ||
587 | # CONFIG_SCSI_MAC53C94 is not set | ||
556 | # CONFIG_SCSI_SRP is not set | 588 | # CONFIG_SCSI_SRP is not set |
589 | # CONFIG_SCSI_DH is not set | ||
557 | # CONFIG_ATA is not set | 590 | # CONFIG_ATA is not set |
558 | CONFIG_MD=y | 591 | CONFIG_MD=y |
559 | CONFIG_BLK_DEV_MD=y | 592 | CONFIG_BLK_DEV_MD=y |
@@ -570,12 +603,15 @@ CONFIG_MD_RAID1=y | |||
570 | # | 603 | # |
571 | # IEEE 1394 (FireWire) support | 604 | # IEEE 1394 (FireWire) support |
572 | # | 605 | # |
606 | |||
607 | # | ||
608 | # Enable only one of the two stacks, unless you know what you are doing | ||
609 | # | ||
573 | # CONFIG_FIREWIRE is not set | 610 | # CONFIG_FIREWIRE is not set |
574 | # CONFIG_IEEE1394 is not set | 611 | # CONFIG_IEEE1394 is not set |
575 | # CONFIG_I2O is not set | 612 | # CONFIG_I2O is not set |
576 | # CONFIG_MACINTOSH_DRIVERS is not set | 613 | # CONFIG_MACINTOSH_DRIVERS is not set |
577 | CONFIG_NETDEVICES=y | 614 | CONFIG_NETDEVICES=y |
578 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
579 | # CONFIG_DUMMY is not set | 615 | # CONFIG_DUMMY is not set |
580 | # CONFIG_BONDING is not set | 616 | # CONFIG_BONDING is not set |
581 | # CONFIG_MACVLAN is not set | 617 | # CONFIG_MACVLAN is not set |
@@ -602,6 +638,8 @@ CONFIG_CICADA_PHY=y | |||
602 | # CONFIG_MDIO_BITBANG is not set | 638 | # CONFIG_MDIO_BITBANG is not set |
603 | CONFIG_NET_ETHERNET=y | 639 | CONFIG_NET_ETHERNET=y |
604 | CONFIG_MII=y | 640 | CONFIG_MII=y |
641 | # CONFIG_MACE is not set | ||
642 | # CONFIG_BMAC is not set | ||
605 | # CONFIG_HAPPYMEAL is not set | 643 | # CONFIG_HAPPYMEAL is not set |
606 | # CONFIG_SUNGEM is not set | 644 | # CONFIG_SUNGEM is not set |
607 | # CONFIG_CASSINI is not set | 645 | # CONFIG_CASSINI is not set |
@@ -638,7 +676,6 @@ CONFIG_NETDEV_1000=y | |||
638 | # CONFIG_DL2K is not set | 676 | # CONFIG_DL2K is not set |
639 | # CONFIG_E1000 is not set | 677 | # CONFIG_E1000 is not set |
640 | # CONFIG_E1000E is not set | 678 | # CONFIG_E1000E is not set |
641 | # CONFIG_E1000E_ENABLED is not set | ||
642 | # CONFIG_IP1000 is not set | 679 | # CONFIG_IP1000 is not set |
643 | # CONFIG_IGB is not set | 680 | # CONFIG_IGB is not set |
644 | # CONFIG_NS83820 is not set | 681 | # CONFIG_NS83820 is not set |
@@ -652,9 +689,10 @@ CONFIG_NETDEV_1000=y | |||
652 | # CONFIG_TIGON3 is not set | 689 | # CONFIG_TIGON3 is not set |
653 | # CONFIG_BNX2 is not set | 690 | # CONFIG_BNX2 is not set |
654 | CONFIG_GIANFAR=y | 691 | CONFIG_GIANFAR=y |
655 | CONFIG_GFAR_NAPI=y | 692 | # CONFIG_MV643XX_ETH is not set |
656 | # CONFIG_QLA3XXX is not set | 693 | # CONFIG_QLA3XXX is not set |
657 | # CONFIG_ATL1 is not set | 694 | # CONFIG_ATL1 is not set |
695 | # CONFIG_ATL1E is not set | ||
658 | CONFIG_NETDEV_10000=y | 696 | CONFIG_NETDEV_10000=y |
659 | # CONFIG_CHELSIO_T1 is not set | 697 | # CONFIG_CHELSIO_T1 is not set |
660 | # CONFIG_CHELSIO_T3 is not set | 698 | # CONFIG_CHELSIO_T3 is not set |
@@ -752,11 +790,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
752 | # CONFIG_SERIAL_UARTLITE is not set | 790 | # CONFIG_SERIAL_UARTLITE is not set |
753 | CONFIG_SERIAL_CORE=y | 791 | CONFIG_SERIAL_CORE=y |
754 | CONFIG_SERIAL_CORE_CONSOLE=y | 792 | CONFIG_SERIAL_CORE_CONSOLE=y |
793 | # CONFIG_SERIAL_PMACZILOG is not set | ||
755 | # CONFIG_SERIAL_JSM is not set | 794 | # CONFIG_SERIAL_JSM is not set |
756 | # CONFIG_SERIAL_OF_PLATFORM is not set | 795 | # CONFIG_SERIAL_OF_PLATFORM is not set |
757 | CONFIG_UNIX98_PTYS=y | 796 | CONFIG_UNIX98_PTYS=y |
758 | CONFIG_LEGACY_PTYS=y | 797 | CONFIG_LEGACY_PTYS=y |
759 | CONFIG_LEGACY_PTY_COUNT=256 | 798 | CONFIG_LEGACY_PTY_COUNT=256 |
799 | # CONFIG_BRIQ_PANEL is not set | ||
800 | # CONFIG_HVC_RTAS is not set | ||
760 | # CONFIG_IPMI_HANDLER is not set | 801 | # CONFIG_IPMI_HANDLER is not set |
761 | CONFIG_HW_RANDOM=y | 802 | CONFIG_HW_RANDOM=y |
762 | # CONFIG_NVRAM is not set | 803 | # CONFIG_NVRAM is not set |
@@ -768,43 +809,70 @@ CONFIG_DEVPORT=y | |||
768 | CONFIG_I2C=y | 809 | CONFIG_I2C=y |
769 | CONFIG_I2C_BOARDINFO=y | 810 | CONFIG_I2C_BOARDINFO=y |
770 | CONFIG_I2C_CHARDEV=y | 811 | CONFIG_I2C_CHARDEV=y |
812 | CONFIG_I2C_HELPER_AUTO=y | ||
771 | 813 | ||
772 | # | 814 | # |
773 | # I2C Hardware Bus support | 815 | # I2C Hardware Bus support |
774 | # | 816 | # |
817 | |||
818 | # | ||
819 | # PC SMBus host controller drivers | ||
820 | # | ||
775 | # CONFIG_I2C_ALI1535 is not set | 821 | # CONFIG_I2C_ALI1535 is not set |
776 | # CONFIG_I2C_ALI1563 is not set | 822 | # CONFIG_I2C_ALI1563 is not set |
777 | # CONFIG_I2C_ALI15X3 is not set | 823 | # CONFIG_I2C_ALI15X3 is not set |
778 | # CONFIG_I2C_AMD756 is not set | 824 | # CONFIG_I2C_AMD756 is not set |
779 | # CONFIG_I2C_AMD8111 is not set | 825 | # CONFIG_I2C_AMD8111 is not set |
780 | # CONFIG_I2C_I801 is not set | 826 | # CONFIG_I2C_I801 is not set |
781 | # CONFIG_I2C_I810 is not set | 827 | # CONFIG_I2C_ISCH is not set |
782 | # CONFIG_I2C_PIIX4 is not set | 828 | # CONFIG_I2C_PIIX4 is not set |
783 | CONFIG_I2C_MPC=y | ||
784 | # CONFIG_I2C_NFORCE2 is not set | 829 | # CONFIG_I2C_NFORCE2 is not set |
785 | # CONFIG_I2C_OCORES is not set | ||
786 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
787 | # CONFIG_I2C_PROSAVAGE is not set | ||
788 | # CONFIG_I2C_SAVAGE4 is not set | ||
789 | # CONFIG_I2C_SIMTEC is not set | ||
790 | # CONFIG_I2C_SIS5595 is not set | 830 | # CONFIG_I2C_SIS5595 is not set |
791 | # CONFIG_I2C_SIS630 is not set | 831 | # CONFIG_I2C_SIS630 is not set |
792 | # CONFIG_I2C_SIS96X is not set | 832 | # CONFIG_I2C_SIS96X is not set |
793 | # CONFIG_I2C_TAOS_EVM is not set | ||
794 | # CONFIG_I2C_STUB is not set | ||
795 | # CONFIG_I2C_TINY_USB is not set | ||
796 | # CONFIG_I2C_VIA is not set | 833 | # CONFIG_I2C_VIA is not set |
797 | # CONFIG_I2C_VIAPRO is not set | 834 | # CONFIG_I2C_VIAPRO is not set |
835 | |||
836 | # | ||
837 | # Mac SMBus host controller drivers | ||
838 | # | ||
839 | # CONFIG_I2C_HYDRA is not set | ||
840 | CONFIG_I2C_POWERMAC=y | ||
841 | |||
842 | # | ||
843 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
844 | # | ||
845 | CONFIG_I2C_MPC=y | ||
846 | # CONFIG_I2C_OCORES is not set | ||
847 | # CONFIG_I2C_SIMTEC is not set | ||
848 | |||
849 | # | ||
850 | # External I2C/SMBus adapter drivers | ||
851 | # | ||
852 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
853 | # CONFIG_I2C_TAOS_EVM is not set | ||
854 | # CONFIG_I2C_TINY_USB is not set | ||
855 | |||
856 | # | ||
857 | # Graphics adapter I2C/DDC channel drivers | ||
858 | # | ||
798 | # CONFIG_I2C_VOODOO3 is not set | 859 | # CONFIG_I2C_VOODOO3 is not set |
860 | |||
861 | # | ||
862 | # Other I2C/SMBus bus drivers | ||
863 | # | ||
799 | # CONFIG_I2C_PCA_PLATFORM is not set | 864 | # CONFIG_I2C_PCA_PLATFORM is not set |
865 | # CONFIG_I2C_STUB is not set | ||
800 | 866 | ||
801 | # | 867 | # |
802 | # Miscellaneous I2C Chip support | 868 | # Miscellaneous I2C Chip support |
803 | # | 869 | # |
804 | # CONFIG_DS1682 is not set | 870 | # CONFIG_DS1682 is not set |
871 | # CONFIG_AT24 is not set | ||
805 | # CONFIG_SENSORS_EEPROM is not set | 872 | # CONFIG_SENSORS_EEPROM is not set |
806 | # CONFIG_SENSORS_PCF8574 is not set | 873 | # CONFIG_SENSORS_PCF8574 is not set |
807 | # CONFIG_PCF8575 is not set | 874 | # CONFIG_PCF8575 is not set |
875 | # CONFIG_SENSORS_PCA9539 is not set | ||
808 | # CONFIG_SENSORS_PCF8591 is not set | 876 | # CONFIG_SENSORS_PCF8591 is not set |
809 | # CONFIG_SENSORS_MAX6875 is not set | 877 | # CONFIG_SENSORS_MAX6875 is not set |
810 | # CONFIG_SENSORS_TSL2550 is not set | 878 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -828,11 +896,15 @@ CONFIG_SPI_MPC83xx=y | |||
828 | # CONFIG_SPI_AT25 is not set | 896 | # CONFIG_SPI_AT25 is not set |
829 | # CONFIG_SPI_SPIDEV is not set | 897 | # CONFIG_SPI_SPIDEV is not set |
830 | # CONFIG_SPI_TLE62X0 is not set | 898 | # CONFIG_SPI_TLE62X0 is not set |
899 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
900 | # CONFIG_GPIOLIB is not set | ||
831 | # CONFIG_W1 is not set | 901 | # CONFIG_W1 is not set |
832 | # CONFIG_POWER_SUPPLY is not set | 902 | # CONFIG_POWER_SUPPLY is not set |
833 | CONFIG_HWMON=y | 903 | CONFIG_HWMON=y |
834 | # CONFIG_HWMON_VID is not set | 904 | # CONFIG_HWMON_VID is not set |
905 | # CONFIG_SENSORS_AD7414 is not set | ||
835 | # CONFIG_SENSORS_AD7418 is not set | 906 | # CONFIG_SENSORS_AD7418 is not set |
907 | # CONFIG_SENSORS_ADCXX is not set | ||
836 | # CONFIG_SENSORS_ADM1021 is not set | 908 | # CONFIG_SENSORS_ADM1021 is not set |
837 | # CONFIG_SENSORS_ADM1025 is not set | 909 | # CONFIG_SENSORS_ADM1025 is not set |
838 | # CONFIG_SENSORS_ADM1026 is not set | 910 | # CONFIG_SENSORS_ADM1026 is not set |
@@ -841,6 +913,7 @@ CONFIG_HWMON=y | |||
841 | # CONFIG_SENSORS_ADM9240 is not set | 913 | # CONFIG_SENSORS_ADM9240 is not set |
842 | # CONFIG_SENSORS_ADT7470 is not set | 914 | # CONFIG_SENSORS_ADT7470 is not set |
843 | # CONFIG_SENSORS_ADT7473 is not set | 915 | # CONFIG_SENSORS_ADT7473 is not set |
916 | # CONFIG_SENSORS_AMS is not set | ||
844 | # CONFIG_SENSORS_ATXP1 is not set | 917 | # CONFIG_SENSORS_ATXP1 is not set |
845 | # CONFIG_SENSORS_DS1621 is not set | 918 | # CONFIG_SENSORS_DS1621 is not set |
846 | # CONFIG_SENSORS_I5K_AMB is not set | 919 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -886,6 +959,7 @@ CONFIG_HWMON=y | |||
886 | # CONFIG_SENSORS_W83627EHF is not set | 959 | # CONFIG_SENSORS_W83627EHF is not set |
887 | # CONFIG_HWMON_DEBUG_CHIP is not set | 960 | # CONFIG_HWMON_DEBUG_CHIP is not set |
888 | # CONFIG_THERMAL is not set | 961 | # CONFIG_THERMAL is not set |
962 | # CONFIG_THERMAL_HWMON is not set | ||
889 | CONFIG_WATCHDOG=y | 963 | CONFIG_WATCHDOG=y |
890 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 964 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
891 | 965 | ||
@@ -893,7 +967,9 @@ CONFIG_WATCHDOG=y | |||
893 | # Watchdog Device Drivers | 967 | # Watchdog Device Drivers |
894 | # | 968 | # |
895 | # CONFIG_SOFT_WATCHDOG is not set | 969 | # CONFIG_SOFT_WATCHDOG is not set |
896 | CONFIG_83xx_WDT=y | 970 | # CONFIG_ALIM7101_WDT is not set |
971 | # CONFIG_8xxx_WDT is not set | ||
972 | # CONFIG_WATCHDOG_RTAS is not set | ||
897 | 973 | ||
898 | # | 974 | # |
899 | # PCI-based Watchdog Cards | 975 | # PCI-based Watchdog Cards |
@@ -915,8 +991,10 @@ CONFIG_SSB_POSSIBLE=y | |||
915 | # | 991 | # |
916 | # Multifunction device drivers | 992 | # Multifunction device drivers |
917 | # | 993 | # |
994 | # CONFIG_MFD_CORE is not set | ||
918 | # CONFIG_MFD_SM501 is not set | 995 | # CONFIG_MFD_SM501 is not set |
919 | # CONFIG_HTC_PASIC3 is not set | 996 | # CONFIG_HTC_PASIC3 is not set |
997 | # CONFIG_MFD_TMIO is not set | ||
920 | 998 | ||
921 | # | 999 | # |
922 | # Multimedia devices | 1000 | # Multimedia devices |
@@ -949,10 +1027,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
949 | # Display device support | 1027 | # Display device support |
950 | # | 1028 | # |
951 | # CONFIG_DISPLAY_SUPPORT is not set | 1029 | # CONFIG_DISPLAY_SUPPORT is not set |
952 | |||
953 | # | ||
954 | # Sound | ||
955 | # | ||
956 | # CONFIG_SOUND is not set | 1030 | # CONFIG_SOUND is not set |
957 | CONFIG_HID_SUPPORT=y | 1031 | CONFIG_HID_SUPPORT=y |
958 | CONFIG_HID=y | 1032 | CONFIG_HID=y |
@@ -986,6 +1060,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
986 | # CONFIG_USB_OTG is not set | 1060 | # CONFIG_USB_OTG is not set |
987 | # CONFIG_USB_OTG_WHITELIST is not set | 1061 | # CONFIG_USB_OTG_WHITELIST is not set |
988 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1062 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1063 | CONFIG_USB_MON=y | ||
989 | 1064 | ||
990 | # | 1065 | # |
991 | # USB Host Controller Drivers | 1066 | # USB Host Controller Drivers |
@@ -1009,6 +1084,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1009 | CONFIG_USB_UHCI_HCD=y | 1084 | CONFIG_USB_UHCI_HCD=y |
1010 | # CONFIG_USB_SL811_HCD is not set | 1085 | # CONFIG_USB_SL811_HCD is not set |
1011 | # CONFIG_USB_R8A66597_HCD is not set | 1086 | # CONFIG_USB_R8A66597_HCD is not set |
1087 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
1012 | 1088 | ||
1013 | # | 1089 | # |
1014 | # USB Device Class drivers | 1090 | # USB Device Class drivers |
@@ -1037,6 +1113,7 @@ CONFIG_USB_STORAGE=y | |||
1037 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1113 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1038 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1114 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1039 | # CONFIG_USB_STORAGE_KARMA is not set | 1115 | # CONFIG_USB_STORAGE_KARMA is not set |
1116 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1040 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1117 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1041 | # CONFIG_USB_LIBUSUAL is not set | 1118 | # CONFIG_USB_LIBUSUAL is not set |
1042 | 1119 | ||
@@ -1045,7 +1122,6 @@ CONFIG_USB_STORAGE=y | |||
1045 | # | 1122 | # |
1046 | # CONFIG_USB_MDC800 is not set | 1123 | # CONFIG_USB_MDC800 is not set |
1047 | # CONFIG_USB_MICROTEK is not set | 1124 | # CONFIG_USB_MICROTEK is not set |
1048 | CONFIG_USB_MON=y | ||
1049 | 1125 | ||
1050 | # | 1126 | # |
1051 | # USB port drivers | 1127 | # USB port drivers |
@@ -1058,7 +1134,6 @@ CONFIG_USB_MON=y | |||
1058 | # CONFIG_USB_EMI62 is not set | 1134 | # CONFIG_USB_EMI62 is not set |
1059 | # CONFIG_USB_EMI26 is not set | 1135 | # CONFIG_USB_EMI26 is not set |
1060 | # CONFIG_USB_ADUTUX is not set | 1136 | # CONFIG_USB_ADUTUX is not set |
1061 | # CONFIG_USB_AUERSWALD is not set | ||
1062 | # CONFIG_USB_RIO500 is not set | 1137 | # CONFIG_USB_RIO500 is not set |
1063 | # CONFIG_USB_LEGOTOWER is not set | 1138 | # CONFIG_USB_LEGOTOWER is not set |
1064 | # CONFIG_USB_LCD is not set | 1139 | # CONFIG_USB_LCD is not set |
@@ -1085,7 +1160,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
1085 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 1160 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
1086 | CONFIG_USB_GADGET_NET2280=y | 1161 | CONFIG_USB_GADGET_NET2280=y |
1087 | CONFIG_USB_NET2280=y | 1162 | CONFIG_USB_NET2280=y |
1088 | # CONFIG_USB_GADGET_PXA2XX is not set | 1163 | # CONFIG_USB_GADGET_PXA25X is not set |
1089 | # CONFIG_USB_GADGET_M66592 is not set | 1164 | # CONFIG_USB_GADGET_M66592 is not set |
1090 | # CONFIG_USB_GADGET_PXA27X is not set | 1165 | # CONFIG_USB_GADGET_PXA27X is not set |
1091 | # CONFIG_USB_GADGET_GOKU is not set | 1166 | # CONFIG_USB_GADGET_GOKU is not set |
@@ -1103,6 +1178,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
1103 | # CONFIG_USB_G_SERIAL is not set | 1178 | # CONFIG_USB_G_SERIAL is not set |
1104 | # CONFIG_USB_MIDI_GADGET is not set | 1179 | # CONFIG_USB_MIDI_GADGET is not set |
1105 | # CONFIG_USB_G_PRINTER is not set | 1180 | # CONFIG_USB_G_PRINTER is not set |
1181 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
1106 | # CONFIG_MMC is not set | 1182 | # CONFIG_MMC is not set |
1107 | # CONFIG_MEMSTICK is not set | 1183 | # CONFIG_MEMSTICK is not set |
1108 | # CONFIG_NEW_LEDS is not set | 1184 | # CONFIG_NEW_LEDS is not set |
@@ -1138,10 +1214,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
1138 | # CONFIG_RTC_DRV_PCF8583 is not set | 1214 | # CONFIG_RTC_DRV_PCF8583 is not set |
1139 | # CONFIG_RTC_DRV_M41T80 is not set | 1215 | # CONFIG_RTC_DRV_M41T80 is not set |
1140 | # CONFIG_RTC_DRV_S35390A is not set | 1216 | # CONFIG_RTC_DRV_S35390A is not set |
1217 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1141 | 1218 | ||
1142 | # | 1219 | # |
1143 | # SPI RTC drivers | 1220 | # SPI RTC drivers |
1144 | # | 1221 | # |
1222 | # CONFIG_RTC_DRV_M41T94 is not set | ||
1223 | # CONFIG_RTC_DRV_DS1305 is not set | ||
1145 | # CONFIG_RTC_DRV_MAX6902 is not set | 1224 | # CONFIG_RTC_DRV_MAX6902 is not set |
1146 | # CONFIG_RTC_DRV_R9701 is not set | 1225 | # CONFIG_RTC_DRV_R9701 is not set |
1147 | # CONFIG_RTC_DRV_RS5C348 is not set | 1226 | # CONFIG_RTC_DRV_RS5C348 is not set |
@@ -1240,6 +1319,7 @@ CONFIG_JFFS2_RTIME=y | |||
1240 | # CONFIG_CRAMFS is not set | 1319 | # CONFIG_CRAMFS is not set |
1241 | # CONFIG_VXFS_FS is not set | 1320 | # CONFIG_VXFS_FS is not set |
1242 | # CONFIG_MINIX_FS is not set | 1321 | # CONFIG_MINIX_FS is not set |
1322 | # CONFIG_OMFS_FS is not set | ||
1243 | # CONFIG_HPFS_FS is not set | 1323 | # CONFIG_HPFS_FS is not set |
1244 | # CONFIG_QNX4FS_FS is not set | 1324 | # CONFIG_QNX4FS_FS is not set |
1245 | # CONFIG_ROMFS_FS is not set | 1325 | # CONFIG_ROMFS_FS is not set |
@@ -1250,14 +1330,13 @@ CONFIG_NFS_FS=y | |||
1250 | CONFIG_NFS_V3=y | 1330 | CONFIG_NFS_V3=y |
1251 | # CONFIG_NFS_V3_ACL is not set | 1331 | # CONFIG_NFS_V3_ACL is not set |
1252 | CONFIG_NFS_V4=y | 1332 | CONFIG_NFS_V4=y |
1253 | # CONFIG_NFSD is not set | ||
1254 | CONFIG_ROOT_NFS=y | 1333 | CONFIG_ROOT_NFS=y |
1334 | # CONFIG_NFSD is not set | ||
1255 | CONFIG_LOCKD=y | 1335 | CONFIG_LOCKD=y |
1256 | CONFIG_LOCKD_V4=y | 1336 | CONFIG_LOCKD_V4=y |
1257 | CONFIG_NFS_COMMON=y | 1337 | CONFIG_NFS_COMMON=y |
1258 | CONFIG_SUNRPC=y | 1338 | CONFIG_SUNRPC=y |
1259 | CONFIG_SUNRPC_GSS=y | 1339 | CONFIG_SUNRPC_GSS=y |
1260 | # CONFIG_SUNRPC_BIND34 is not set | ||
1261 | CONFIG_RPCSEC_GSS_KRB5=y | 1340 | CONFIG_RPCSEC_GSS_KRB5=y |
1262 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1341 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1263 | # CONFIG_SMB_FS is not set | 1342 | # CONFIG_SMB_FS is not set |
@@ -1297,6 +1376,7 @@ CONFIG_BITREVERSE=y | |||
1297 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1376 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1298 | # CONFIG_CRC_CCITT is not set | 1377 | # CONFIG_CRC_CCITT is not set |
1299 | # CONFIG_CRC16 is not set | 1378 | # CONFIG_CRC16 is not set |
1379 | # CONFIG_CRC_T10DIF is not set | ||
1300 | # CONFIG_CRC_ITU_T is not set | 1380 | # CONFIG_CRC_ITU_T is not set |
1301 | CONFIG_CRC32=y | 1381 | CONFIG_CRC32=y |
1302 | # CONFIG_CRC7 is not set | 1382 | # CONFIG_CRC7 is not set |
@@ -1323,6 +1403,8 @@ CONFIG_FRAME_WARN=1024 | |||
1323 | CONFIG_DEBUG_KERNEL=y | 1403 | CONFIG_DEBUG_KERNEL=y |
1324 | # CONFIG_DEBUG_SHIRQ is not set | 1404 | # CONFIG_DEBUG_SHIRQ is not set |
1325 | CONFIG_DETECT_SOFTLOCKUP=y | 1405 | CONFIG_DETECT_SOFTLOCKUP=y |
1406 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1407 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1326 | CONFIG_SCHED_DEBUG=y | 1408 | CONFIG_SCHED_DEBUG=y |
1327 | # CONFIG_SCHEDSTATS is not set | 1409 | # CONFIG_SCHEDSTATS is not set |
1328 | # CONFIG_TIMER_STATS is not set | 1410 | # CONFIG_TIMER_STATS is not set |
@@ -1340,19 +1422,32 @@ CONFIG_SCHED_DEBUG=y | |||
1340 | # CONFIG_DEBUG_INFO is not set | 1422 | # CONFIG_DEBUG_INFO is not set |
1341 | # CONFIG_DEBUG_VM is not set | 1423 | # CONFIG_DEBUG_VM is not set |
1342 | # CONFIG_DEBUG_WRITECOUNT is not set | 1424 | # CONFIG_DEBUG_WRITECOUNT is not set |
1425 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1343 | # CONFIG_DEBUG_LIST is not set | 1426 | # CONFIG_DEBUG_LIST is not set |
1344 | # CONFIG_DEBUG_SG is not set | 1427 | # CONFIG_DEBUG_SG is not set |
1345 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1428 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1346 | # CONFIG_RCU_TORTURE_TEST is not set | 1429 | # CONFIG_RCU_TORTURE_TEST is not set |
1347 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1430 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1348 | # CONFIG_FAULT_INJECTION is not set | 1431 | # CONFIG_FAULT_INJECTION is not set |
1432 | # CONFIG_LATENCYTOP is not set | ||
1433 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1434 | CONFIG_HAVE_FTRACE=y | ||
1435 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1436 | # CONFIG_FTRACE is not set | ||
1437 | # CONFIG_SCHED_TRACER is not set | ||
1438 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1349 | # CONFIG_SAMPLES is not set | 1439 | # CONFIG_SAMPLES is not set |
1440 | CONFIG_HAVE_ARCH_KGDB=y | ||
1441 | # CONFIG_KGDB is not set | ||
1350 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1442 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1351 | # CONFIG_DEBUG_STACK_USAGE is not set | 1443 | # CONFIG_DEBUG_STACK_USAGE is not set |
1352 | # CONFIG_DEBUG_PAGEALLOC is not set | 1444 | # CONFIG_DEBUG_PAGEALLOC is not set |
1353 | # CONFIG_DEBUGGER is not set | 1445 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1446 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1447 | # CONFIG_XMON is not set | ||
1354 | # CONFIG_IRQSTACKS is not set | 1448 | # CONFIG_IRQSTACKS is not set |
1355 | # CONFIG_BDI_SWITCH is not set | 1449 | # CONFIG_BDI_SWITCH is not set |
1450 | # CONFIG_BOOTX_TEXT is not set | ||
1356 | # CONFIG_PPC_EARLY_DEBUG is not set | 1451 | # CONFIG_PPC_EARLY_DEBUG is not set |
1357 | 1452 | ||
1358 | # | 1453 | # |
@@ -1406,6 +1501,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1406 | # CONFIG_CRYPTO_MD4 is not set | 1501 | # CONFIG_CRYPTO_MD4 is not set |
1407 | CONFIG_CRYPTO_MD5=y | 1502 | CONFIG_CRYPTO_MD5=y |
1408 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1503 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1504 | # CONFIG_CRYPTO_RMD128 is not set | ||
1505 | # CONFIG_CRYPTO_RMD160 is not set | ||
1506 | # CONFIG_CRYPTO_RMD256 is not set | ||
1507 | # CONFIG_CRYPTO_RMD320 is not set | ||
1409 | # CONFIG_CRYPTO_SHA1 is not set | 1508 | # CONFIG_CRYPTO_SHA1 is not set |
1410 | # CONFIG_CRYPTO_SHA256 is not set | 1509 | # CONFIG_CRYPTO_SHA256 is not set |
1411 | # CONFIG_CRYPTO_SHA512 is not set | 1510 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1438,5 +1537,6 @@ CONFIG_CRYPTO_DES=y | |||
1438 | # CONFIG_CRYPTO_LZO is not set | 1537 | # CONFIG_CRYPTO_LZO is not set |
1439 | CONFIG_CRYPTO_HW=y | 1538 | CONFIG_CRYPTO_HW=y |
1440 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1539 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1540 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1441 | # CONFIG_PPC_CLOCK is not set | 1541 | # CONFIG_PPC_CLOCK is not set |
1442 | # CONFIG_VIRTUALIZATION is not set | 1542 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig index 9bc3a03ae264..dd80eb0a87a1 100644 --- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:21 2008 | 4 | # Thu Aug 21 00:52:18 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
134 | 146 | ||
135 | # | 147 | # |
136 | # IO Schedulers | 148 | # IO Schedulers |
@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # | 161 | # |
150 | # Platform support | 162 | # Platform support |
151 | # | 163 | # |
152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
162 | CONFIG_MPC831x_RDB=y | 176 | CONFIG_MPC831x_RDB=y |
163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
182 | # CONFIG_MPC836x_RDK is not set | ||
168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
186 | # CONFIG_ASP834x is not set | ||
171 | CONFIG_PPC_MPC831x=y | 187 | CONFIG_PPC_MPC831x=y |
188 | # CONFIG_PPC_86xx is not set | ||
189 | # CONFIG_EMBEDDED6xx is not set | ||
190 | CONFIG_PPC_NATIVE=y | ||
191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
198 | CONFIG_RTAS_PROC=y | ||
177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
206 | # CONFIG_TAU is not set | ||
183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
184 | 208 | ||
185 | # | 209 | # |
@@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
232 | # CONFIG_KEXEC is not set | ||
208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
245 | CONFIG_MIGRATION=y | ||
220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
253 | CONFIG_EXTRA_TARGETS="" | ||
227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
231 | # | 258 | # |
232 | # Bus options | 259 | # Bus options |
233 | # | 260 | # |
261 | # CONFIG_ISA is not set | ||
234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
266 | CONFIG_FSL_PCI=y | ||
267 | CONFIG_PPC_PCI_CHOICE=y | ||
238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
@@ -260,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
260 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
261 | CONFIG_PHYSICAL_START=0x00000000 | 291 | CONFIG_PHYSICAL_START=0x00000000 |
262 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
263 | |||
264 | # | ||
265 | # Networking | ||
266 | # | ||
267 | CONFIG_NET=y | 293 | CONFIG_NET=y |
268 | 294 | ||
269 | # | 295 | # |
@@ -452,9 +478,11 @@ CONFIG_MTD_NAND_IDS=y | |||
452 | # CONFIG_MTD_UBI is not set | 478 | # CONFIG_MTD_UBI is not set |
453 | CONFIG_OF_DEVICE=y | 479 | CONFIG_OF_DEVICE=y |
454 | CONFIG_OF_I2C=y | 480 | CONFIG_OF_I2C=y |
481 | CONFIG_OF_SPI=y | ||
455 | # CONFIG_PARPORT is not set | 482 | # CONFIG_PARPORT is not set |
456 | CONFIG_BLK_DEV=y | 483 | CONFIG_BLK_DEV=y |
457 | # CONFIG_BLK_DEV_FD is not set | 484 | # CONFIG_BLK_DEV_FD is not set |
485 | # CONFIG_MAC_FLOPPY is not set | ||
458 | # CONFIG_BLK_CPQ_DA is not set | 486 | # CONFIG_BLK_CPQ_DA is not set |
459 | # CONFIG_BLK_CPQ_CISS_DA is not set | 487 | # CONFIG_BLK_CPQ_CISS_DA is not set |
460 | # CONFIG_BLK_DEV_DAC960 is not set | 488 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -471,12 +499,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
471 | # CONFIG_BLK_DEV_XIP is not set | 499 | # CONFIG_BLK_DEV_XIP is not set |
472 | # CONFIG_CDROM_PKTCDVD is not set | 500 | # CONFIG_CDROM_PKTCDVD is not set |
473 | # CONFIG_ATA_OVER_ETH is not set | 501 | # CONFIG_ATA_OVER_ETH is not set |
502 | # CONFIG_BLK_DEV_HD is not set | ||
474 | CONFIG_MISC_DEVICES=y | 503 | CONFIG_MISC_DEVICES=y |
475 | # CONFIG_PHANTOM is not set | 504 | # CONFIG_PHANTOM is not set |
476 | # CONFIG_EEPROM_93CX6 is not set | 505 | # CONFIG_EEPROM_93CX6 is not set |
477 | # CONFIG_SGI_IOC4 is not set | 506 | # CONFIG_SGI_IOC4 is not set |
478 | # CONFIG_TIFM_CORE is not set | 507 | # CONFIG_TIFM_CORE is not set |
479 | # CONFIG_ENCLOSURE_SERVICES is not set | 508 | # CONFIG_ENCLOSURE_SERVICES is not set |
509 | # CONFIG_HP_ILO is not set | ||
480 | CONFIG_HAVE_IDE=y | 510 | CONFIG_HAVE_IDE=y |
481 | # CONFIG_IDE is not set | 511 | # CONFIG_IDE is not set |
482 | 512 | ||
@@ -554,7 +584,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
554 | # CONFIG_SCSI_DC390T is not set | 584 | # CONFIG_SCSI_DC390T is not set |
555 | # CONFIG_SCSI_NSP32 is not set | 585 | # CONFIG_SCSI_NSP32 is not set |
556 | # CONFIG_SCSI_DEBUG is not set | 586 | # CONFIG_SCSI_DEBUG is not set |
587 | # CONFIG_SCSI_MESH is not set | ||
588 | # CONFIG_SCSI_MAC53C94 is not set | ||
557 | # CONFIG_SCSI_SRP is not set | 589 | # CONFIG_SCSI_SRP is not set |
590 | # CONFIG_SCSI_DH is not set | ||
558 | CONFIG_ATA=y | 591 | CONFIG_ATA=y |
559 | # CONFIG_ATA_NONSTANDARD is not set | 592 | # CONFIG_ATA_NONSTANDARD is not set |
560 | CONFIG_SATA_PMP=y | 593 | CONFIG_SATA_PMP=y |
@@ -631,12 +664,15 @@ CONFIG_MD_RAID1=y | |||
631 | # | 664 | # |
632 | # IEEE 1394 (FireWire) support | 665 | # IEEE 1394 (FireWire) support |
633 | # | 666 | # |
667 | |||
668 | # | ||
669 | # Enable only one of the two stacks, unless you know what you are doing | ||
670 | # | ||
634 | # CONFIG_FIREWIRE is not set | 671 | # CONFIG_FIREWIRE is not set |
635 | # CONFIG_IEEE1394 is not set | 672 | # CONFIG_IEEE1394 is not set |
636 | # CONFIG_I2O is not set | 673 | # CONFIG_I2O is not set |
637 | # CONFIG_MACINTOSH_DRIVERS is not set | 674 | # CONFIG_MACINTOSH_DRIVERS is not set |
638 | CONFIG_NETDEVICES=y | 675 | CONFIG_NETDEVICES=y |
639 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
640 | # CONFIG_DUMMY is not set | 676 | # CONFIG_DUMMY is not set |
641 | # CONFIG_BONDING is not set | 677 | # CONFIG_BONDING is not set |
642 | # CONFIG_MACVLAN is not set | 678 | # CONFIG_MACVLAN is not set |
@@ -663,6 +699,8 @@ CONFIG_PHYLIB=y | |||
663 | # CONFIG_MDIO_BITBANG is not set | 699 | # CONFIG_MDIO_BITBANG is not set |
664 | CONFIG_NET_ETHERNET=y | 700 | CONFIG_NET_ETHERNET=y |
665 | CONFIG_MII=y | 701 | CONFIG_MII=y |
702 | # CONFIG_MACE is not set | ||
703 | # CONFIG_BMAC is not set | ||
666 | # CONFIG_HAPPYMEAL is not set | 704 | # CONFIG_HAPPYMEAL is not set |
667 | # CONFIG_SUNGEM is not set | 705 | # CONFIG_SUNGEM is not set |
668 | # CONFIG_CASSINI is not set | 706 | # CONFIG_CASSINI is not set |
@@ -699,7 +737,6 @@ CONFIG_NETDEV_1000=y | |||
699 | # CONFIG_DL2K is not set | 737 | # CONFIG_DL2K is not set |
700 | # CONFIG_E1000 is not set | 738 | # CONFIG_E1000 is not set |
701 | # CONFIG_E1000E is not set | 739 | # CONFIG_E1000E is not set |
702 | # CONFIG_E1000E_ENABLED is not set | ||
703 | # CONFIG_IP1000 is not set | 740 | # CONFIG_IP1000 is not set |
704 | # CONFIG_IGB is not set | 741 | # CONFIG_IGB is not set |
705 | # CONFIG_NS83820 is not set | 742 | # CONFIG_NS83820 is not set |
@@ -713,9 +750,10 @@ CONFIG_NETDEV_1000=y | |||
713 | # CONFIG_TIGON3 is not set | 750 | # CONFIG_TIGON3 is not set |
714 | # CONFIG_BNX2 is not set | 751 | # CONFIG_BNX2 is not set |
715 | CONFIG_GIANFAR=y | 752 | CONFIG_GIANFAR=y |
716 | CONFIG_GFAR_NAPI=y | 753 | # CONFIG_MV643XX_ETH is not set |
717 | # CONFIG_QLA3XXX is not set | 754 | # CONFIG_QLA3XXX is not set |
718 | # CONFIG_ATL1 is not set | 755 | # CONFIG_ATL1 is not set |
756 | # CONFIG_ATL1E is not set | ||
719 | CONFIG_NETDEV_10000=y | 757 | CONFIG_NETDEV_10000=y |
720 | # CONFIG_CHELSIO_T1 is not set | 758 | # CONFIG_CHELSIO_T1 is not set |
721 | # CONFIG_CHELSIO_T3 is not set | 759 | # CONFIG_CHELSIO_T3 is not set |
@@ -813,11 +851,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
813 | # CONFIG_SERIAL_UARTLITE is not set | 851 | # CONFIG_SERIAL_UARTLITE is not set |
814 | CONFIG_SERIAL_CORE=y | 852 | CONFIG_SERIAL_CORE=y |
815 | CONFIG_SERIAL_CORE_CONSOLE=y | 853 | CONFIG_SERIAL_CORE_CONSOLE=y |
854 | # CONFIG_SERIAL_PMACZILOG is not set | ||
816 | # CONFIG_SERIAL_JSM is not set | 855 | # CONFIG_SERIAL_JSM is not set |
817 | # CONFIG_SERIAL_OF_PLATFORM is not set | 856 | # CONFIG_SERIAL_OF_PLATFORM is not set |
818 | CONFIG_UNIX98_PTYS=y | 857 | CONFIG_UNIX98_PTYS=y |
819 | CONFIG_LEGACY_PTYS=y | 858 | CONFIG_LEGACY_PTYS=y |
820 | CONFIG_LEGACY_PTY_COUNT=256 | 859 | CONFIG_LEGACY_PTY_COUNT=256 |
860 | # CONFIG_BRIQ_PANEL is not set | ||
861 | # CONFIG_HVC_RTAS is not set | ||
821 | # CONFIG_IPMI_HANDLER is not set | 862 | # CONFIG_IPMI_HANDLER is not set |
822 | CONFIG_HW_RANDOM=y | 863 | CONFIG_HW_RANDOM=y |
823 | # CONFIG_NVRAM is not set | 864 | # CONFIG_NVRAM is not set |
@@ -829,43 +870,70 @@ CONFIG_DEVPORT=y | |||
829 | CONFIG_I2C=y | 870 | CONFIG_I2C=y |
830 | CONFIG_I2C_BOARDINFO=y | 871 | CONFIG_I2C_BOARDINFO=y |
831 | CONFIG_I2C_CHARDEV=y | 872 | CONFIG_I2C_CHARDEV=y |
873 | CONFIG_I2C_HELPER_AUTO=y | ||
832 | 874 | ||
833 | # | 875 | # |
834 | # I2C Hardware Bus support | 876 | # I2C Hardware Bus support |
835 | # | 877 | # |
878 | |||
879 | # | ||
880 | # PC SMBus host controller drivers | ||
881 | # | ||
836 | # CONFIG_I2C_ALI1535 is not set | 882 | # CONFIG_I2C_ALI1535 is not set |
837 | # CONFIG_I2C_ALI1563 is not set | 883 | # CONFIG_I2C_ALI1563 is not set |
838 | # CONFIG_I2C_ALI15X3 is not set | 884 | # CONFIG_I2C_ALI15X3 is not set |
839 | # CONFIG_I2C_AMD756 is not set | 885 | # CONFIG_I2C_AMD756 is not set |
840 | # CONFIG_I2C_AMD8111 is not set | 886 | # CONFIG_I2C_AMD8111 is not set |
841 | # CONFIG_I2C_I801 is not set | 887 | # CONFIG_I2C_I801 is not set |
842 | # CONFIG_I2C_I810 is not set | 888 | # CONFIG_I2C_ISCH is not set |
843 | # CONFIG_I2C_PIIX4 is not set | 889 | # CONFIG_I2C_PIIX4 is not set |
844 | CONFIG_I2C_MPC=y | ||
845 | # CONFIG_I2C_NFORCE2 is not set | 890 | # CONFIG_I2C_NFORCE2 is not set |
846 | # CONFIG_I2C_OCORES is not set | ||
847 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
848 | # CONFIG_I2C_PROSAVAGE is not set | ||
849 | # CONFIG_I2C_SAVAGE4 is not set | ||
850 | # CONFIG_I2C_SIMTEC is not set | ||
851 | # CONFIG_I2C_SIS5595 is not set | 891 | # CONFIG_I2C_SIS5595 is not set |
852 | # CONFIG_I2C_SIS630 is not set | 892 | # CONFIG_I2C_SIS630 is not set |
853 | # CONFIG_I2C_SIS96X is not set | 893 | # CONFIG_I2C_SIS96X is not set |
854 | # CONFIG_I2C_TAOS_EVM is not set | ||
855 | # CONFIG_I2C_STUB is not set | ||
856 | # CONFIG_I2C_TINY_USB is not set | ||
857 | # CONFIG_I2C_VIA is not set | 894 | # CONFIG_I2C_VIA is not set |
858 | # CONFIG_I2C_VIAPRO is not set | 895 | # CONFIG_I2C_VIAPRO is not set |
896 | |||
897 | # | ||
898 | # Mac SMBus host controller drivers | ||
899 | # | ||
900 | # CONFIG_I2C_HYDRA is not set | ||
901 | CONFIG_I2C_POWERMAC=y | ||
902 | |||
903 | # | ||
904 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
905 | # | ||
906 | CONFIG_I2C_MPC=y | ||
907 | # CONFIG_I2C_OCORES is not set | ||
908 | # CONFIG_I2C_SIMTEC is not set | ||
909 | |||
910 | # | ||
911 | # External I2C/SMBus adapter drivers | ||
912 | # | ||
913 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
914 | # CONFIG_I2C_TAOS_EVM is not set | ||
915 | # CONFIG_I2C_TINY_USB is not set | ||
916 | |||
917 | # | ||
918 | # Graphics adapter I2C/DDC channel drivers | ||
919 | # | ||
859 | # CONFIG_I2C_VOODOO3 is not set | 920 | # CONFIG_I2C_VOODOO3 is not set |
921 | |||
922 | # | ||
923 | # Other I2C/SMBus bus drivers | ||
924 | # | ||
860 | # CONFIG_I2C_PCA_PLATFORM is not set | 925 | # CONFIG_I2C_PCA_PLATFORM is not set |
926 | # CONFIG_I2C_STUB is not set | ||
861 | 927 | ||
862 | # | 928 | # |
863 | # Miscellaneous I2C Chip support | 929 | # Miscellaneous I2C Chip support |
864 | # | 930 | # |
865 | # CONFIG_DS1682 is not set | 931 | # CONFIG_DS1682 is not set |
932 | # CONFIG_AT24 is not set | ||
866 | # CONFIG_SENSORS_EEPROM is not set | 933 | # CONFIG_SENSORS_EEPROM is not set |
867 | # CONFIG_SENSORS_PCF8574 is not set | 934 | # CONFIG_SENSORS_PCF8574 is not set |
868 | # CONFIG_PCF8575 is not set | 935 | # CONFIG_PCF8575 is not set |
936 | # CONFIG_SENSORS_PCA9539 is not set | ||
869 | # CONFIG_SENSORS_PCF8591 is not set | 937 | # CONFIG_SENSORS_PCF8591 is not set |
870 | # CONFIG_SENSORS_MAX6875 is not set | 938 | # CONFIG_SENSORS_MAX6875 is not set |
871 | # CONFIG_SENSORS_TSL2550 is not set | 939 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -889,11 +957,15 @@ CONFIG_SPI_MPC83xx=y | |||
889 | # CONFIG_SPI_AT25 is not set | 957 | # CONFIG_SPI_AT25 is not set |
890 | # CONFIG_SPI_SPIDEV is not set | 958 | # CONFIG_SPI_SPIDEV is not set |
891 | # CONFIG_SPI_TLE62X0 is not set | 959 | # CONFIG_SPI_TLE62X0 is not set |
960 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
961 | # CONFIG_GPIOLIB is not set | ||
892 | # CONFIG_W1 is not set | 962 | # CONFIG_W1 is not set |
893 | # CONFIG_POWER_SUPPLY is not set | 963 | # CONFIG_POWER_SUPPLY is not set |
894 | CONFIG_HWMON=y | 964 | CONFIG_HWMON=y |
895 | # CONFIG_HWMON_VID is not set | 965 | # CONFIG_HWMON_VID is not set |
966 | # CONFIG_SENSORS_AD7414 is not set | ||
896 | # CONFIG_SENSORS_AD7418 is not set | 967 | # CONFIG_SENSORS_AD7418 is not set |
968 | # CONFIG_SENSORS_ADCXX is not set | ||
897 | # CONFIG_SENSORS_ADM1021 is not set | 969 | # CONFIG_SENSORS_ADM1021 is not set |
898 | # CONFIG_SENSORS_ADM1025 is not set | 970 | # CONFIG_SENSORS_ADM1025 is not set |
899 | # CONFIG_SENSORS_ADM1026 is not set | 971 | # CONFIG_SENSORS_ADM1026 is not set |
@@ -902,6 +974,7 @@ CONFIG_HWMON=y | |||
902 | # CONFIG_SENSORS_ADM9240 is not set | 974 | # CONFIG_SENSORS_ADM9240 is not set |
903 | # CONFIG_SENSORS_ADT7470 is not set | 975 | # CONFIG_SENSORS_ADT7470 is not set |
904 | # CONFIG_SENSORS_ADT7473 is not set | 976 | # CONFIG_SENSORS_ADT7473 is not set |
977 | # CONFIG_SENSORS_AMS is not set | ||
905 | # CONFIG_SENSORS_ATXP1 is not set | 978 | # CONFIG_SENSORS_ATXP1 is not set |
906 | # CONFIG_SENSORS_DS1621 is not set | 979 | # CONFIG_SENSORS_DS1621 is not set |
907 | # CONFIG_SENSORS_I5K_AMB is not set | 980 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -947,6 +1020,7 @@ CONFIG_HWMON=y | |||
947 | # CONFIG_SENSORS_W83627EHF is not set | 1020 | # CONFIG_SENSORS_W83627EHF is not set |
948 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1021 | # CONFIG_HWMON_DEBUG_CHIP is not set |
949 | # CONFIG_THERMAL is not set | 1022 | # CONFIG_THERMAL is not set |
1023 | # CONFIG_THERMAL_HWMON is not set | ||
950 | CONFIG_WATCHDOG=y | 1024 | CONFIG_WATCHDOG=y |
951 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1025 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
952 | 1026 | ||
@@ -954,7 +1028,9 @@ CONFIG_WATCHDOG=y | |||
954 | # Watchdog Device Drivers | 1028 | # Watchdog Device Drivers |
955 | # | 1029 | # |
956 | # CONFIG_SOFT_WATCHDOG is not set | 1030 | # CONFIG_SOFT_WATCHDOG is not set |
957 | CONFIG_83xx_WDT=y | 1031 | # CONFIG_ALIM7101_WDT is not set |
1032 | # CONFIG_8xxx_WDT is not set | ||
1033 | # CONFIG_WATCHDOG_RTAS is not set | ||
958 | 1034 | ||
959 | # | 1035 | # |
960 | # PCI-based Watchdog Cards | 1036 | # PCI-based Watchdog Cards |
@@ -976,8 +1052,10 @@ CONFIG_SSB_POSSIBLE=y | |||
976 | # | 1052 | # |
977 | # Multifunction device drivers | 1053 | # Multifunction device drivers |
978 | # | 1054 | # |
1055 | # CONFIG_MFD_CORE is not set | ||
979 | # CONFIG_MFD_SM501 is not set | 1056 | # CONFIG_MFD_SM501 is not set |
980 | # CONFIG_HTC_PASIC3 is not set | 1057 | # CONFIG_HTC_PASIC3 is not set |
1058 | # CONFIG_MFD_TMIO is not set | ||
981 | 1059 | ||
982 | # | 1060 | # |
983 | # Multimedia devices | 1061 | # Multimedia devices |
@@ -1010,10 +1088,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
1010 | # Display device support | 1088 | # Display device support |
1011 | # | 1089 | # |
1012 | # CONFIG_DISPLAY_SUPPORT is not set | 1090 | # CONFIG_DISPLAY_SUPPORT is not set |
1013 | |||
1014 | # | ||
1015 | # Sound | ||
1016 | # | ||
1017 | # CONFIG_SOUND is not set | 1091 | # CONFIG_SOUND is not set |
1018 | CONFIG_HID_SUPPORT=y | 1092 | CONFIG_HID_SUPPORT=y |
1019 | CONFIG_HID=y | 1093 | CONFIG_HID=y |
@@ -1047,6 +1121,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1047 | # CONFIG_USB_OTG is not set | 1121 | # CONFIG_USB_OTG is not set |
1048 | # CONFIG_USB_OTG_WHITELIST is not set | 1122 | # CONFIG_USB_OTG_WHITELIST is not set |
1049 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1123 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1124 | CONFIG_USB_MON=y | ||
1050 | 1125 | ||
1051 | # | 1126 | # |
1052 | # USB Host Controller Drivers | 1127 | # USB Host Controller Drivers |
@@ -1070,6 +1145,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1070 | CONFIG_USB_UHCI_HCD=y | 1145 | CONFIG_USB_UHCI_HCD=y |
1071 | # CONFIG_USB_SL811_HCD is not set | 1146 | # CONFIG_USB_SL811_HCD is not set |
1072 | # CONFIG_USB_R8A66597_HCD is not set | 1147 | # CONFIG_USB_R8A66597_HCD is not set |
1148 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
1073 | 1149 | ||
1074 | # | 1150 | # |
1075 | # USB Device Class drivers | 1151 | # USB Device Class drivers |
@@ -1098,6 +1174,7 @@ CONFIG_USB_STORAGE=y | |||
1098 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1174 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1099 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1175 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1100 | # CONFIG_USB_STORAGE_KARMA is not set | 1176 | # CONFIG_USB_STORAGE_KARMA is not set |
1177 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1101 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1178 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1102 | # CONFIG_USB_LIBUSUAL is not set | 1179 | # CONFIG_USB_LIBUSUAL is not set |
1103 | 1180 | ||
@@ -1106,7 +1183,6 @@ CONFIG_USB_STORAGE=y | |||
1106 | # | 1183 | # |
1107 | # CONFIG_USB_MDC800 is not set | 1184 | # CONFIG_USB_MDC800 is not set |
1108 | # CONFIG_USB_MICROTEK is not set | 1185 | # CONFIG_USB_MICROTEK is not set |
1109 | CONFIG_USB_MON=y | ||
1110 | 1186 | ||
1111 | # | 1187 | # |
1112 | # USB port drivers | 1188 | # USB port drivers |
@@ -1119,7 +1195,6 @@ CONFIG_USB_MON=y | |||
1119 | # CONFIG_USB_EMI62 is not set | 1195 | # CONFIG_USB_EMI62 is not set |
1120 | # CONFIG_USB_EMI26 is not set | 1196 | # CONFIG_USB_EMI26 is not set |
1121 | # CONFIG_USB_ADUTUX is not set | 1197 | # CONFIG_USB_ADUTUX is not set |
1122 | # CONFIG_USB_AUERSWALD is not set | ||
1123 | # CONFIG_USB_RIO500 is not set | 1198 | # CONFIG_USB_RIO500 is not set |
1124 | # CONFIG_USB_LEGOTOWER is not set | 1199 | # CONFIG_USB_LEGOTOWER is not set |
1125 | # CONFIG_USB_LCD is not set | 1200 | # CONFIG_USB_LCD is not set |
@@ -1146,7 +1221,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
1146 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 1221 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
1147 | CONFIG_USB_GADGET_NET2280=y | 1222 | CONFIG_USB_GADGET_NET2280=y |
1148 | CONFIG_USB_NET2280=y | 1223 | CONFIG_USB_NET2280=y |
1149 | # CONFIG_USB_GADGET_PXA2XX is not set | 1224 | # CONFIG_USB_GADGET_PXA25X is not set |
1150 | # CONFIG_USB_GADGET_M66592 is not set | 1225 | # CONFIG_USB_GADGET_M66592 is not set |
1151 | # CONFIG_USB_GADGET_PXA27X is not set | 1226 | # CONFIG_USB_GADGET_PXA27X is not set |
1152 | # CONFIG_USB_GADGET_GOKU is not set | 1227 | # CONFIG_USB_GADGET_GOKU is not set |
@@ -1164,6 +1239,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
1164 | # CONFIG_USB_G_SERIAL is not set | 1239 | # CONFIG_USB_G_SERIAL is not set |
1165 | # CONFIG_USB_MIDI_GADGET is not set | 1240 | # CONFIG_USB_MIDI_GADGET is not set |
1166 | # CONFIG_USB_G_PRINTER is not set | 1241 | # CONFIG_USB_G_PRINTER is not set |
1242 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
1167 | # CONFIG_MMC is not set | 1243 | # CONFIG_MMC is not set |
1168 | # CONFIG_MEMSTICK is not set | 1244 | # CONFIG_MEMSTICK is not set |
1169 | # CONFIG_NEW_LEDS is not set | 1245 | # CONFIG_NEW_LEDS is not set |
@@ -1199,10 +1275,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
1199 | # CONFIG_RTC_DRV_PCF8583 is not set | 1275 | # CONFIG_RTC_DRV_PCF8583 is not set |
1200 | # CONFIG_RTC_DRV_M41T80 is not set | 1276 | # CONFIG_RTC_DRV_M41T80 is not set |
1201 | # CONFIG_RTC_DRV_S35390A is not set | 1277 | # CONFIG_RTC_DRV_S35390A is not set |
1278 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1202 | 1279 | ||
1203 | # | 1280 | # |
1204 | # SPI RTC drivers | 1281 | # SPI RTC drivers |
1205 | # | 1282 | # |
1283 | # CONFIG_RTC_DRV_M41T94 is not set | ||
1284 | # CONFIG_RTC_DRV_DS1305 is not set | ||
1206 | # CONFIG_RTC_DRV_MAX6902 is not set | 1285 | # CONFIG_RTC_DRV_MAX6902 is not set |
1207 | # CONFIG_RTC_DRV_R9701 is not set | 1286 | # CONFIG_RTC_DRV_R9701 is not set |
1208 | # CONFIG_RTC_DRV_RS5C348 is not set | 1287 | # CONFIG_RTC_DRV_RS5C348 is not set |
@@ -1301,6 +1380,7 @@ CONFIG_JFFS2_RTIME=y | |||
1301 | # CONFIG_CRAMFS is not set | 1380 | # CONFIG_CRAMFS is not set |
1302 | # CONFIG_VXFS_FS is not set | 1381 | # CONFIG_VXFS_FS is not set |
1303 | # CONFIG_MINIX_FS is not set | 1382 | # CONFIG_MINIX_FS is not set |
1383 | # CONFIG_OMFS_FS is not set | ||
1304 | # CONFIG_HPFS_FS is not set | 1384 | # CONFIG_HPFS_FS is not set |
1305 | # CONFIG_QNX4FS_FS is not set | 1385 | # CONFIG_QNX4FS_FS is not set |
1306 | # CONFIG_ROMFS_FS is not set | 1386 | # CONFIG_ROMFS_FS is not set |
@@ -1311,14 +1391,13 @@ CONFIG_NFS_FS=y | |||
1311 | CONFIG_NFS_V3=y | 1391 | CONFIG_NFS_V3=y |
1312 | # CONFIG_NFS_V3_ACL is not set | 1392 | # CONFIG_NFS_V3_ACL is not set |
1313 | CONFIG_NFS_V4=y | 1393 | CONFIG_NFS_V4=y |
1314 | # CONFIG_NFSD is not set | ||
1315 | CONFIG_ROOT_NFS=y | 1394 | CONFIG_ROOT_NFS=y |
1395 | # CONFIG_NFSD is not set | ||
1316 | CONFIG_LOCKD=y | 1396 | CONFIG_LOCKD=y |
1317 | CONFIG_LOCKD_V4=y | 1397 | CONFIG_LOCKD_V4=y |
1318 | CONFIG_NFS_COMMON=y | 1398 | CONFIG_NFS_COMMON=y |
1319 | CONFIG_SUNRPC=y | 1399 | CONFIG_SUNRPC=y |
1320 | CONFIG_SUNRPC_GSS=y | 1400 | CONFIG_SUNRPC_GSS=y |
1321 | # CONFIG_SUNRPC_BIND34 is not set | ||
1322 | CONFIG_RPCSEC_GSS_KRB5=y | 1401 | CONFIG_RPCSEC_GSS_KRB5=y |
1323 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1402 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1324 | # CONFIG_SMB_FS is not set | 1403 | # CONFIG_SMB_FS is not set |
@@ -1358,6 +1437,7 @@ CONFIG_BITREVERSE=y | |||
1358 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1437 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1359 | # CONFIG_CRC_CCITT is not set | 1438 | # CONFIG_CRC_CCITT is not set |
1360 | # CONFIG_CRC16 is not set | 1439 | # CONFIG_CRC16 is not set |
1440 | # CONFIG_CRC_T10DIF is not set | ||
1361 | # CONFIG_CRC_ITU_T is not set | 1441 | # CONFIG_CRC_ITU_T is not set |
1362 | CONFIG_CRC32=y | 1442 | CONFIG_CRC32=y |
1363 | # CONFIG_CRC7 is not set | 1443 | # CONFIG_CRC7 is not set |
@@ -1384,6 +1464,8 @@ CONFIG_FRAME_WARN=1024 | |||
1384 | CONFIG_DEBUG_KERNEL=y | 1464 | CONFIG_DEBUG_KERNEL=y |
1385 | # CONFIG_DEBUG_SHIRQ is not set | 1465 | # CONFIG_DEBUG_SHIRQ is not set |
1386 | CONFIG_DETECT_SOFTLOCKUP=y | 1466 | CONFIG_DETECT_SOFTLOCKUP=y |
1467 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1468 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1387 | CONFIG_SCHED_DEBUG=y | 1469 | CONFIG_SCHED_DEBUG=y |
1388 | # CONFIG_SCHEDSTATS is not set | 1470 | # CONFIG_SCHEDSTATS is not set |
1389 | # CONFIG_TIMER_STATS is not set | 1471 | # CONFIG_TIMER_STATS is not set |
@@ -1401,19 +1483,32 @@ CONFIG_SCHED_DEBUG=y | |||
1401 | # CONFIG_DEBUG_INFO is not set | 1483 | # CONFIG_DEBUG_INFO is not set |
1402 | # CONFIG_DEBUG_VM is not set | 1484 | # CONFIG_DEBUG_VM is not set |
1403 | # CONFIG_DEBUG_WRITECOUNT is not set | 1485 | # CONFIG_DEBUG_WRITECOUNT is not set |
1486 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1404 | # CONFIG_DEBUG_LIST is not set | 1487 | # CONFIG_DEBUG_LIST is not set |
1405 | # CONFIG_DEBUG_SG is not set | 1488 | # CONFIG_DEBUG_SG is not set |
1406 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1489 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1407 | # CONFIG_RCU_TORTURE_TEST is not set | 1490 | # CONFIG_RCU_TORTURE_TEST is not set |
1408 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1491 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1409 | # CONFIG_FAULT_INJECTION is not set | 1492 | # CONFIG_FAULT_INJECTION is not set |
1493 | # CONFIG_LATENCYTOP is not set | ||
1494 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1495 | CONFIG_HAVE_FTRACE=y | ||
1496 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1497 | # CONFIG_FTRACE is not set | ||
1498 | # CONFIG_SCHED_TRACER is not set | ||
1499 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1410 | # CONFIG_SAMPLES is not set | 1500 | # CONFIG_SAMPLES is not set |
1501 | CONFIG_HAVE_ARCH_KGDB=y | ||
1502 | # CONFIG_KGDB is not set | ||
1411 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1503 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1412 | # CONFIG_DEBUG_STACK_USAGE is not set | 1504 | # CONFIG_DEBUG_STACK_USAGE is not set |
1413 | # CONFIG_DEBUG_PAGEALLOC is not set | 1505 | # CONFIG_DEBUG_PAGEALLOC is not set |
1414 | # CONFIG_DEBUGGER is not set | 1506 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1507 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1508 | # CONFIG_XMON is not set | ||
1415 | # CONFIG_IRQSTACKS is not set | 1509 | # CONFIG_IRQSTACKS is not set |
1416 | # CONFIG_BDI_SWITCH is not set | 1510 | # CONFIG_BDI_SWITCH is not set |
1511 | # CONFIG_BOOTX_TEXT is not set | ||
1417 | # CONFIG_PPC_EARLY_DEBUG is not set | 1512 | # CONFIG_PPC_EARLY_DEBUG is not set |
1418 | 1513 | ||
1419 | # | 1514 | # |
@@ -1467,6 +1562,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1467 | # CONFIG_CRYPTO_MD4 is not set | 1562 | # CONFIG_CRYPTO_MD4 is not set |
1468 | CONFIG_CRYPTO_MD5=y | 1563 | CONFIG_CRYPTO_MD5=y |
1469 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1564 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1565 | # CONFIG_CRYPTO_RMD128 is not set | ||
1566 | # CONFIG_CRYPTO_RMD160 is not set | ||
1567 | # CONFIG_CRYPTO_RMD256 is not set | ||
1568 | # CONFIG_CRYPTO_RMD320 is not set | ||
1470 | # CONFIG_CRYPTO_SHA1 is not set | 1569 | # CONFIG_CRYPTO_SHA1 is not set |
1471 | # CONFIG_CRYPTO_SHA256 is not set | 1570 | # CONFIG_CRYPTO_SHA256 is not set |
1472 | # CONFIG_CRYPTO_SHA512 is not set | 1571 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1499,5 +1598,6 @@ CONFIG_CRYPTO_DES=y | |||
1499 | # CONFIG_CRYPTO_LZO is not set | 1598 | # CONFIG_CRYPTO_LZO is not set |
1500 | CONFIG_CRYPTO_HW=y | 1599 | CONFIG_CRYPTO_HW=y |
1501 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1600 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1601 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1502 | # CONFIG_PPC_CLOCK is not set | 1602 | # CONFIG_PPC_CLOCK is not set |
1503 | # CONFIG_VIRTUALIZATION is not set | 1603 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig index 1eca26f3659a..bdf50c8a17e6 100644 --- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:22 2008 | 4 | # Thu Aug 21 00:52:18 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
134 | 146 | ||
135 | # | 147 | # |
136 | # IO Schedulers | 148 | # IO Schedulers |
@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # | 161 | # |
150 | # Platform support | 162 | # Platform support |
151 | # | 163 | # |
152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
163 | CONFIG_MPC832x_MDS=y | 177 | CONFIG_MPC832x_MDS=y |
164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
182 | # CONFIG_MPC836x_RDK is not set | ||
168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
186 | # CONFIG_ASP834x is not set | ||
171 | CONFIG_PPC_MPC832x=y | 187 | CONFIG_PPC_MPC832x=y |
188 | # CONFIG_PPC_86xx is not set | ||
189 | # CONFIG_EMBEDDED6xx is not set | ||
190 | CONFIG_PPC_NATIVE=y | ||
191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
198 | CONFIG_RTAS_PROC=y | ||
177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
206 | # CONFIG_TAU is not set | ||
183 | CONFIG_QUICC_ENGINE=y | 207 | CONFIG_QUICC_ENGINE=y |
184 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
185 | 209 | ||
@@ -196,7 +220,7 @@ CONFIG_HZ_250=y | |||
196 | # CONFIG_HZ_300 is not set | 220 | # CONFIG_HZ_300 is not set |
197 | # CONFIG_HZ_1000 is not set | 221 | # CONFIG_HZ_1000 is not set |
198 | CONFIG_HZ=250 | 222 | CONFIG_HZ=250 |
199 | # CONFIG_SCHED_HRTICK is not set | 223 | CONFIG_SCHED_HRTICK=y |
200 | CONFIG_PREEMPT_NONE=y | 224 | CONFIG_PREEMPT_NONE=y |
201 | # CONFIG_PREEMPT_VOLUNTARY is not set | 225 | # CONFIG_PREEMPT_VOLUNTARY is not set |
202 | # CONFIG_PREEMPT is not set | 226 | # CONFIG_PREEMPT is not set |
@@ -207,6 +231,7 @@ CONFIG_MATH_EMULATION=y | |||
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
208 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 232 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
209 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 233 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
234 | # CONFIG_KEXEC is not set | ||
210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 235 | CONFIG_ARCH_FLATMEM_ENABLE=y |
211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 236 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
212 | CONFIG_SELECT_MEMORY_MODEL=y | 237 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -219,6 +244,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | 245 | CONFIG_PAGEFLAGS_EXTENDED=y |
221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 246 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
247 | CONFIG_MIGRATION=y | ||
222 | # CONFIG_RESOURCES_64BIT is not set | 248 | # CONFIG_RESOURCES_64BIT is not set |
223 | CONFIG_ZONE_DMA_FLAG=1 | 249 | CONFIG_ZONE_DMA_FLAG=1 |
224 | CONFIG_BOUNCE=y | 250 | CONFIG_BOUNCE=y |
@@ -226,6 +252,7 @@ CONFIG_VIRT_TO_BUS=y | |||
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 252 | CONFIG_FORCE_MAX_ZONEORDER=11 |
227 | CONFIG_PROC_DEVICETREE=y | 253 | CONFIG_PROC_DEVICETREE=y |
228 | # CONFIG_CMDLINE_BOOL is not set | 254 | # CONFIG_CMDLINE_BOOL is not set |
255 | CONFIG_EXTRA_TARGETS="" | ||
229 | # CONFIG_PM is not set | 256 | # CONFIG_PM is not set |
230 | CONFIG_SECCOMP=y | 257 | CONFIG_SECCOMP=y |
231 | CONFIG_ISA_DMA_API=y | 258 | CONFIG_ISA_DMA_API=y |
@@ -233,10 +260,13 @@ CONFIG_ISA_DMA_API=y | |||
233 | # | 260 | # |
234 | # Bus options | 261 | # Bus options |
235 | # | 262 | # |
263 | # CONFIG_ISA is not set | ||
236 | CONFIG_ZONE_DMA=y | 264 | CONFIG_ZONE_DMA=y |
237 | CONFIG_GENERIC_ISA_DMA=y | 265 | CONFIG_GENERIC_ISA_DMA=y |
238 | CONFIG_PPC_INDIRECT_PCI=y | 266 | CONFIG_PPC_INDIRECT_PCI=y |
239 | CONFIG_FSL_SOC=y | 267 | CONFIG_FSL_SOC=y |
268 | CONFIG_FSL_PCI=y | ||
269 | CONFIG_PPC_PCI_CHOICE=y | ||
240 | CONFIG_PCI=y | 270 | CONFIG_PCI=y |
241 | CONFIG_PCI_DOMAINS=y | 271 | CONFIG_PCI_DOMAINS=y |
242 | CONFIG_PCI_SYSCALL=y | 272 | CONFIG_PCI_SYSCALL=y |
@@ -261,10 +291,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
261 | CONFIG_KERNEL_START=0xc0000000 | 291 | CONFIG_KERNEL_START=0xc0000000 |
262 | CONFIG_PHYSICAL_START=0x00000000 | 292 | CONFIG_PHYSICAL_START=0x00000000 |
263 | CONFIG_TASK_SIZE=0xc0000000 | 293 | CONFIG_TASK_SIZE=0xc0000000 |
264 | |||
265 | # | ||
266 | # Networking | ||
267 | # | ||
268 | CONFIG_NET=y | 294 | CONFIG_NET=y |
269 | 295 | ||
270 | # | 296 | # |
@@ -365,6 +391,7 @@ CONFIG_OF_I2C=y | |||
365 | # CONFIG_PARPORT is not set | 391 | # CONFIG_PARPORT is not set |
366 | CONFIG_BLK_DEV=y | 392 | CONFIG_BLK_DEV=y |
367 | # CONFIG_BLK_DEV_FD is not set | 393 | # CONFIG_BLK_DEV_FD is not set |
394 | # CONFIG_MAC_FLOPPY is not set | ||
368 | # CONFIG_BLK_CPQ_DA is not set | 395 | # CONFIG_BLK_CPQ_DA is not set |
369 | # CONFIG_BLK_CPQ_CISS_DA is not set | 396 | # CONFIG_BLK_CPQ_CISS_DA is not set |
370 | # CONFIG_BLK_DEV_DAC960 is not set | 397 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -380,12 +407,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
380 | # CONFIG_BLK_DEV_XIP is not set | 407 | # CONFIG_BLK_DEV_XIP is not set |
381 | # CONFIG_CDROM_PKTCDVD is not set | 408 | # CONFIG_CDROM_PKTCDVD is not set |
382 | # CONFIG_ATA_OVER_ETH is not set | 409 | # CONFIG_ATA_OVER_ETH is not set |
410 | # CONFIG_BLK_DEV_HD is not set | ||
383 | CONFIG_MISC_DEVICES=y | 411 | CONFIG_MISC_DEVICES=y |
384 | # CONFIG_PHANTOM is not set | 412 | # CONFIG_PHANTOM is not set |
385 | # CONFIG_EEPROM_93CX6 is not set | 413 | # CONFIG_EEPROM_93CX6 is not set |
386 | # CONFIG_SGI_IOC4 is not set | 414 | # CONFIG_SGI_IOC4 is not set |
387 | # CONFIG_TIFM_CORE is not set | 415 | # CONFIG_TIFM_CORE is not set |
388 | # CONFIG_ENCLOSURE_SERVICES is not set | 416 | # CONFIG_ENCLOSURE_SERVICES is not set |
417 | # CONFIG_HP_ILO is not set | ||
389 | CONFIG_HAVE_IDE=y | 418 | CONFIG_HAVE_IDE=y |
390 | # CONFIG_IDE is not set | 419 | # CONFIG_IDE is not set |
391 | 420 | ||
@@ -462,7 +491,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
462 | # CONFIG_SCSI_DC390T is not set | 491 | # CONFIG_SCSI_DC390T is not set |
463 | # CONFIG_SCSI_NSP32 is not set | 492 | # CONFIG_SCSI_NSP32 is not set |
464 | # CONFIG_SCSI_DEBUG is not set | 493 | # CONFIG_SCSI_DEBUG is not set |
494 | # CONFIG_SCSI_MESH is not set | ||
495 | # CONFIG_SCSI_MAC53C94 is not set | ||
465 | # CONFIG_SCSI_SRP is not set | 496 | # CONFIG_SCSI_SRP is not set |
497 | # CONFIG_SCSI_DH is not set | ||
466 | # CONFIG_ATA is not set | 498 | # CONFIG_ATA is not set |
467 | # CONFIG_MD is not set | 499 | # CONFIG_MD is not set |
468 | # CONFIG_FUSION is not set | 500 | # CONFIG_FUSION is not set |
@@ -470,12 +502,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
470 | # | 502 | # |
471 | # IEEE 1394 (FireWire) support | 503 | # IEEE 1394 (FireWire) support |
472 | # | 504 | # |
505 | |||
506 | # | ||
507 | # Enable only one of the two stacks, unless you know what you are doing | ||
508 | # | ||
473 | # CONFIG_FIREWIRE is not set | 509 | # CONFIG_FIREWIRE is not set |
474 | # CONFIG_IEEE1394 is not set | 510 | # CONFIG_IEEE1394 is not set |
475 | # CONFIG_I2O is not set | 511 | # CONFIG_I2O is not set |
476 | # CONFIG_MACINTOSH_DRIVERS is not set | 512 | # CONFIG_MACINTOSH_DRIVERS is not set |
477 | CONFIG_NETDEVICES=y | 513 | CONFIG_NETDEVICES=y |
478 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
479 | # CONFIG_DUMMY is not set | 514 | # CONFIG_DUMMY is not set |
480 | # CONFIG_BONDING is not set | 515 | # CONFIG_BONDING is not set |
481 | # CONFIG_MACVLAN is not set | 516 | # CONFIG_MACVLAN is not set |
@@ -502,6 +537,8 @@ CONFIG_DAVICOM_PHY=y | |||
502 | # CONFIG_MDIO_BITBANG is not set | 537 | # CONFIG_MDIO_BITBANG is not set |
503 | CONFIG_NET_ETHERNET=y | 538 | CONFIG_NET_ETHERNET=y |
504 | CONFIG_MII=y | 539 | CONFIG_MII=y |
540 | # CONFIG_MACE is not set | ||
541 | # CONFIG_BMAC is not set | ||
505 | # CONFIG_HAPPYMEAL is not set | 542 | # CONFIG_HAPPYMEAL is not set |
506 | # CONFIG_SUNGEM is not set | 543 | # CONFIG_SUNGEM is not set |
507 | # CONFIG_CASSINI is not set | 544 | # CONFIG_CASSINI is not set |
@@ -519,7 +556,6 @@ CONFIG_NETDEV_1000=y | |||
519 | # CONFIG_DL2K is not set | 556 | # CONFIG_DL2K is not set |
520 | # CONFIG_E1000 is not set | 557 | # CONFIG_E1000 is not set |
521 | # CONFIG_E1000E is not set | 558 | # CONFIG_E1000E is not set |
522 | # CONFIG_E1000E_ENABLED is not set | ||
523 | # CONFIG_IP1000 is not set | 559 | # CONFIG_IP1000 is not set |
524 | # CONFIG_IGB is not set | 560 | # CONFIG_IGB is not set |
525 | # CONFIG_NS83820 is not set | 561 | # CONFIG_NS83820 is not set |
@@ -534,12 +570,13 @@ CONFIG_NETDEV_1000=y | |||
534 | # CONFIG_BNX2 is not set | 570 | # CONFIG_BNX2 is not set |
535 | # CONFIG_GIANFAR is not set | 571 | # CONFIG_GIANFAR is not set |
536 | CONFIG_UCC_GETH=y | 572 | CONFIG_UCC_GETH=y |
537 | # CONFIG_UGETH_NAPI is not set | ||
538 | # CONFIG_UGETH_MAGIC_PACKET is not set | 573 | # CONFIG_UGETH_MAGIC_PACKET is not set |
539 | # CONFIG_UGETH_FILTERING is not set | 574 | # CONFIG_UGETH_FILTERING is not set |
540 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 575 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
576 | # CONFIG_MV643XX_ETH is not set | ||
541 | # CONFIG_QLA3XXX is not set | 577 | # CONFIG_QLA3XXX is not set |
542 | # CONFIG_ATL1 is not set | 578 | # CONFIG_ATL1 is not set |
579 | # CONFIG_ATL1E is not set | ||
543 | CONFIG_NETDEV_10000=y | 580 | CONFIG_NETDEV_10000=y |
544 | # CONFIG_CHELSIO_T1 is not set | 581 | # CONFIG_CHELSIO_T1 is not set |
545 | # CONFIG_CHELSIO_T3 is not set | 582 | # CONFIG_CHELSIO_T3 is not set |
@@ -628,12 +665,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
628 | # CONFIG_SERIAL_UARTLITE is not set | 665 | # CONFIG_SERIAL_UARTLITE is not set |
629 | CONFIG_SERIAL_CORE=y | 666 | CONFIG_SERIAL_CORE=y |
630 | CONFIG_SERIAL_CORE_CONSOLE=y | 667 | CONFIG_SERIAL_CORE_CONSOLE=y |
668 | # CONFIG_SERIAL_PMACZILOG is not set | ||
631 | # CONFIG_SERIAL_JSM is not set | 669 | # CONFIG_SERIAL_JSM is not set |
632 | # CONFIG_SERIAL_OF_PLATFORM is not set | 670 | # CONFIG_SERIAL_OF_PLATFORM is not set |
633 | # CONFIG_SERIAL_QE is not set | 671 | # CONFIG_SERIAL_QE is not set |
634 | CONFIG_UNIX98_PTYS=y | 672 | CONFIG_UNIX98_PTYS=y |
635 | CONFIG_LEGACY_PTYS=y | 673 | CONFIG_LEGACY_PTYS=y |
636 | CONFIG_LEGACY_PTY_COUNT=256 | 674 | CONFIG_LEGACY_PTY_COUNT=256 |
675 | # CONFIG_BRIQ_PANEL is not set | ||
676 | # CONFIG_HVC_RTAS is not set | ||
637 | # CONFIG_IPMI_HANDLER is not set | 677 | # CONFIG_IPMI_HANDLER is not set |
638 | CONFIG_HW_RANDOM=y | 678 | CONFIG_HW_RANDOM=y |
639 | # CONFIG_NVRAM is not set | 679 | # CONFIG_NVRAM is not set |
@@ -645,42 +685,69 @@ CONFIG_DEVPORT=y | |||
645 | CONFIG_I2C=y | 685 | CONFIG_I2C=y |
646 | CONFIG_I2C_BOARDINFO=y | 686 | CONFIG_I2C_BOARDINFO=y |
647 | CONFIG_I2C_CHARDEV=y | 687 | CONFIG_I2C_CHARDEV=y |
688 | CONFIG_I2C_HELPER_AUTO=y | ||
648 | 689 | ||
649 | # | 690 | # |
650 | # I2C Hardware Bus support | 691 | # I2C Hardware Bus support |
651 | # | 692 | # |
693 | |||
694 | # | ||
695 | # PC SMBus host controller drivers | ||
696 | # | ||
652 | # CONFIG_I2C_ALI1535 is not set | 697 | # CONFIG_I2C_ALI1535 is not set |
653 | # CONFIG_I2C_ALI1563 is not set | 698 | # CONFIG_I2C_ALI1563 is not set |
654 | # CONFIG_I2C_ALI15X3 is not set | 699 | # CONFIG_I2C_ALI15X3 is not set |
655 | # CONFIG_I2C_AMD756 is not set | 700 | # CONFIG_I2C_AMD756 is not set |
656 | # CONFIG_I2C_AMD8111 is not set | 701 | # CONFIG_I2C_AMD8111 is not set |
657 | # CONFIG_I2C_I801 is not set | 702 | # CONFIG_I2C_I801 is not set |
658 | # CONFIG_I2C_I810 is not set | 703 | # CONFIG_I2C_ISCH is not set |
659 | # CONFIG_I2C_PIIX4 is not set | 704 | # CONFIG_I2C_PIIX4 is not set |
660 | CONFIG_I2C_MPC=y | ||
661 | # CONFIG_I2C_NFORCE2 is not set | 705 | # CONFIG_I2C_NFORCE2 is not set |
662 | # CONFIG_I2C_OCORES is not set | ||
663 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
664 | # CONFIG_I2C_PROSAVAGE is not set | ||
665 | # CONFIG_I2C_SAVAGE4 is not set | ||
666 | # CONFIG_I2C_SIMTEC is not set | ||
667 | # CONFIG_I2C_SIS5595 is not set | 706 | # CONFIG_I2C_SIS5595 is not set |
668 | # CONFIG_I2C_SIS630 is not set | 707 | # CONFIG_I2C_SIS630 is not set |
669 | # CONFIG_I2C_SIS96X is not set | 708 | # CONFIG_I2C_SIS96X is not set |
670 | # CONFIG_I2C_TAOS_EVM is not set | ||
671 | # CONFIG_I2C_STUB is not set | ||
672 | # CONFIG_I2C_VIA is not set | 709 | # CONFIG_I2C_VIA is not set |
673 | # CONFIG_I2C_VIAPRO is not set | 710 | # CONFIG_I2C_VIAPRO is not set |
711 | |||
712 | # | ||
713 | # Mac SMBus host controller drivers | ||
714 | # | ||
715 | # CONFIG_I2C_HYDRA is not set | ||
716 | CONFIG_I2C_POWERMAC=y | ||
717 | |||
718 | # | ||
719 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
720 | # | ||
721 | CONFIG_I2C_MPC=y | ||
722 | # CONFIG_I2C_OCORES is not set | ||
723 | # CONFIG_I2C_SIMTEC is not set | ||
724 | |||
725 | # | ||
726 | # External I2C/SMBus adapter drivers | ||
727 | # | ||
728 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
729 | # CONFIG_I2C_TAOS_EVM is not set | ||
730 | |||
731 | # | ||
732 | # Graphics adapter I2C/DDC channel drivers | ||
733 | # | ||
674 | # CONFIG_I2C_VOODOO3 is not set | 734 | # CONFIG_I2C_VOODOO3 is not set |
735 | |||
736 | # | ||
737 | # Other I2C/SMBus bus drivers | ||
738 | # | ||
675 | # CONFIG_I2C_PCA_PLATFORM is not set | 739 | # CONFIG_I2C_PCA_PLATFORM is not set |
740 | # CONFIG_I2C_STUB is not set | ||
676 | 741 | ||
677 | # | 742 | # |
678 | # Miscellaneous I2C Chip support | 743 | # Miscellaneous I2C Chip support |
679 | # | 744 | # |
680 | # CONFIG_DS1682 is not set | 745 | # CONFIG_DS1682 is not set |
746 | # CONFIG_AT24 is not set | ||
681 | # CONFIG_SENSORS_EEPROM is not set | 747 | # CONFIG_SENSORS_EEPROM is not set |
682 | # CONFIG_SENSORS_PCF8574 is not set | 748 | # CONFIG_SENSORS_PCF8574 is not set |
683 | # CONFIG_PCF8575 is not set | 749 | # CONFIG_PCF8575 is not set |
750 | # CONFIG_SENSORS_PCA9539 is not set | ||
684 | # CONFIG_SENSORS_PCF8591 is not set | 751 | # CONFIG_SENSORS_PCF8591 is not set |
685 | # CONFIG_SENSORS_MAX6875 is not set | 752 | # CONFIG_SENSORS_MAX6875 is not set |
686 | # CONFIG_SENSORS_TSL2550 is not set | 753 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -689,10 +756,13 @@ CONFIG_I2C_MPC=y | |||
689 | # CONFIG_I2C_DEBUG_BUS is not set | 756 | # CONFIG_I2C_DEBUG_BUS is not set |
690 | # CONFIG_I2C_DEBUG_CHIP is not set | 757 | # CONFIG_I2C_DEBUG_CHIP is not set |
691 | # CONFIG_SPI is not set | 758 | # CONFIG_SPI is not set |
759 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
760 | # CONFIG_GPIOLIB is not set | ||
692 | # CONFIG_W1 is not set | 761 | # CONFIG_W1 is not set |
693 | # CONFIG_POWER_SUPPLY is not set | 762 | # CONFIG_POWER_SUPPLY is not set |
694 | CONFIG_HWMON=y | 763 | CONFIG_HWMON=y |
695 | # CONFIG_HWMON_VID is not set | 764 | # CONFIG_HWMON_VID is not set |
765 | # CONFIG_SENSORS_AD7414 is not set | ||
696 | # CONFIG_SENSORS_AD7418 is not set | 766 | # CONFIG_SENSORS_AD7418 is not set |
697 | # CONFIG_SENSORS_ADM1021 is not set | 767 | # CONFIG_SENSORS_ADM1021 is not set |
698 | # CONFIG_SENSORS_ADM1025 is not set | 768 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -702,6 +772,7 @@ CONFIG_HWMON=y | |||
702 | # CONFIG_SENSORS_ADM9240 is not set | 772 | # CONFIG_SENSORS_ADM9240 is not set |
703 | # CONFIG_SENSORS_ADT7470 is not set | 773 | # CONFIG_SENSORS_ADT7470 is not set |
704 | # CONFIG_SENSORS_ADT7473 is not set | 774 | # CONFIG_SENSORS_ADT7473 is not set |
775 | # CONFIG_SENSORS_AMS is not set | ||
705 | # CONFIG_SENSORS_ATXP1 is not set | 776 | # CONFIG_SENSORS_ATXP1 is not set |
706 | # CONFIG_SENSORS_DS1621 is not set | 777 | # CONFIG_SENSORS_DS1621 is not set |
707 | # CONFIG_SENSORS_I5K_AMB is not set | 778 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -746,6 +817,7 @@ CONFIG_HWMON=y | |||
746 | # CONFIG_SENSORS_W83627EHF is not set | 817 | # CONFIG_SENSORS_W83627EHF is not set |
747 | # CONFIG_HWMON_DEBUG_CHIP is not set | 818 | # CONFIG_HWMON_DEBUG_CHIP is not set |
748 | # CONFIG_THERMAL is not set | 819 | # CONFIG_THERMAL is not set |
820 | # CONFIG_THERMAL_HWMON is not set | ||
749 | CONFIG_WATCHDOG=y | 821 | CONFIG_WATCHDOG=y |
750 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 822 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
751 | 823 | ||
@@ -753,7 +825,9 @@ CONFIG_WATCHDOG=y | |||
753 | # Watchdog Device Drivers | 825 | # Watchdog Device Drivers |
754 | # | 826 | # |
755 | # CONFIG_SOFT_WATCHDOG is not set | 827 | # CONFIG_SOFT_WATCHDOG is not set |
756 | CONFIG_83xx_WDT=y | 828 | # CONFIG_ALIM7101_WDT is not set |
829 | # CONFIG_8xxx_WDT is not set | ||
830 | # CONFIG_WATCHDOG_RTAS is not set | ||
757 | 831 | ||
758 | # | 832 | # |
759 | # PCI-based Watchdog Cards | 833 | # PCI-based Watchdog Cards |
@@ -770,8 +844,10 @@ CONFIG_SSB_POSSIBLE=y | |||
770 | # | 844 | # |
771 | # Multifunction device drivers | 845 | # Multifunction device drivers |
772 | # | 846 | # |
847 | # CONFIG_MFD_CORE is not set | ||
773 | # CONFIG_MFD_SM501 is not set | 848 | # CONFIG_MFD_SM501 is not set |
774 | # CONFIG_HTC_PASIC3 is not set | 849 | # CONFIG_HTC_PASIC3 is not set |
850 | # CONFIG_MFD_TMIO is not set | ||
775 | 851 | ||
776 | # | 852 | # |
777 | # Multimedia devices | 853 | # Multimedia devices |
@@ -803,10 +879,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
803 | # Display device support | 879 | # Display device support |
804 | # | 880 | # |
805 | # CONFIG_DISPLAY_SUPPORT is not set | 881 | # CONFIG_DISPLAY_SUPPORT is not set |
806 | |||
807 | # | ||
808 | # Sound | ||
809 | # | ||
810 | # CONFIG_SOUND is not set | 882 | # CONFIG_SOUND is not set |
811 | CONFIG_HID_SUPPORT=y | 883 | CONFIG_HID_SUPPORT=y |
812 | CONFIG_HID=y | 884 | CONFIG_HID=y |
@@ -821,6 +893,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
821 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 893 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
822 | 894 | ||
823 | # | 895 | # |
896 | # Enable Host or Gadget support to see Inventra options | ||
897 | # | ||
898 | |||
899 | # | ||
824 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 900 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
825 | # | 901 | # |
826 | # CONFIG_USB_GADGET is not set | 902 | # CONFIG_USB_GADGET is not set |
@@ -859,6 +935,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
859 | # CONFIG_RTC_DRV_PCF8583 is not set | 935 | # CONFIG_RTC_DRV_PCF8583 is not set |
860 | # CONFIG_RTC_DRV_M41T80 is not set | 936 | # CONFIG_RTC_DRV_M41T80 is not set |
861 | # CONFIG_RTC_DRV_S35390A is not set | 937 | # CONFIG_RTC_DRV_S35390A is not set |
938 | # CONFIG_RTC_DRV_FM3130 is not set | ||
862 | 939 | ||
863 | # | 940 | # |
864 | # SPI RTC drivers | 941 | # SPI RTC drivers |
@@ -947,6 +1024,7 @@ CONFIG_TMPFS=y | |||
947 | # CONFIG_CRAMFS is not set | 1024 | # CONFIG_CRAMFS is not set |
948 | # CONFIG_VXFS_FS is not set | 1025 | # CONFIG_VXFS_FS is not set |
949 | # CONFIG_MINIX_FS is not set | 1026 | # CONFIG_MINIX_FS is not set |
1027 | # CONFIG_OMFS_FS is not set | ||
950 | # CONFIG_HPFS_FS is not set | 1028 | # CONFIG_HPFS_FS is not set |
951 | # CONFIG_QNX4FS_FS is not set | 1029 | # CONFIG_QNX4FS_FS is not set |
952 | # CONFIG_ROMFS_FS is not set | 1030 | # CONFIG_ROMFS_FS is not set |
@@ -957,14 +1035,13 @@ CONFIG_NFS_FS=y | |||
957 | CONFIG_NFS_V3=y | 1035 | CONFIG_NFS_V3=y |
958 | # CONFIG_NFS_V3_ACL is not set | 1036 | # CONFIG_NFS_V3_ACL is not set |
959 | CONFIG_NFS_V4=y | 1037 | CONFIG_NFS_V4=y |
960 | # CONFIG_NFSD is not set | ||
961 | CONFIG_ROOT_NFS=y | 1038 | CONFIG_ROOT_NFS=y |
1039 | # CONFIG_NFSD is not set | ||
962 | CONFIG_LOCKD=y | 1040 | CONFIG_LOCKD=y |
963 | CONFIG_LOCKD_V4=y | 1041 | CONFIG_LOCKD_V4=y |
964 | CONFIG_NFS_COMMON=y | 1042 | CONFIG_NFS_COMMON=y |
965 | CONFIG_SUNRPC=y | 1043 | CONFIG_SUNRPC=y |
966 | CONFIG_SUNRPC_GSS=y | 1044 | CONFIG_SUNRPC_GSS=y |
967 | # CONFIG_SUNRPC_BIND34 is not set | ||
968 | CONFIG_RPCSEC_GSS_KRB5=y | 1045 | CONFIG_RPCSEC_GSS_KRB5=y |
969 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1046 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
970 | # CONFIG_SMB_FS is not set | 1047 | # CONFIG_SMB_FS is not set |
@@ -994,6 +1071,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
994 | # CONFIG_DLM is not set | 1071 | # CONFIG_DLM is not set |
995 | CONFIG_UCC_FAST=y | 1072 | CONFIG_UCC_FAST=y |
996 | CONFIG_UCC=y | 1073 | CONFIG_UCC=y |
1074 | # CONFIG_QE_GPIO is not set | ||
997 | 1075 | ||
998 | # | 1076 | # |
999 | # Library routines | 1077 | # Library routines |
@@ -1002,6 +1080,7 @@ CONFIG_BITREVERSE=y | |||
1002 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1080 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1003 | # CONFIG_CRC_CCITT is not set | 1081 | # CONFIG_CRC_CCITT is not set |
1004 | # CONFIG_CRC16 is not set | 1082 | # CONFIG_CRC16 is not set |
1083 | # CONFIG_CRC_T10DIF is not set | ||
1005 | # CONFIG_CRC_ITU_T is not set | 1084 | # CONFIG_CRC_ITU_T is not set |
1006 | CONFIG_CRC32=y | 1085 | CONFIG_CRC32=y |
1007 | # CONFIG_CRC7 is not set | 1086 | # CONFIG_CRC7 is not set |
@@ -1027,8 +1106,18 @@ CONFIG_FRAME_WARN=1024 | |||
1027 | # CONFIG_SLUB_DEBUG_ON is not set | 1106 | # CONFIG_SLUB_DEBUG_ON is not set |
1028 | # CONFIG_SLUB_STATS is not set | 1107 | # CONFIG_SLUB_STATS is not set |
1029 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1108 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1109 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1110 | # CONFIG_LATENCYTOP is not set | ||
1111 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1112 | CONFIG_HAVE_FTRACE=y | ||
1113 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1114 | # CONFIG_FTRACE is not set | ||
1115 | # CONFIG_SCHED_TRACER is not set | ||
1116 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1030 | # CONFIG_SAMPLES is not set | 1117 | # CONFIG_SAMPLES is not set |
1118 | CONFIG_HAVE_ARCH_KGDB=y | ||
1031 | # CONFIG_IRQSTACKS is not set | 1119 | # CONFIG_IRQSTACKS is not set |
1120 | # CONFIG_BOOTX_TEXT is not set | ||
1032 | # CONFIG_PPC_EARLY_DEBUG is not set | 1121 | # CONFIG_PPC_EARLY_DEBUG is not set |
1033 | 1122 | ||
1034 | # | 1123 | # |
@@ -1082,6 +1171,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1082 | # CONFIG_CRYPTO_MD4 is not set | 1171 | # CONFIG_CRYPTO_MD4 is not set |
1083 | CONFIG_CRYPTO_MD5=y | 1172 | CONFIG_CRYPTO_MD5=y |
1084 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1173 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1174 | # CONFIG_CRYPTO_RMD128 is not set | ||
1175 | # CONFIG_CRYPTO_RMD160 is not set | ||
1176 | # CONFIG_CRYPTO_RMD256 is not set | ||
1177 | # CONFIG_CRYPTO_RMD320 is not set | ||
1085 | # CONFIG_CRYPTO_SHA1 is not set | 1178 | # CONFIG_CRYPTO_SHA1 is not set |
1086 | # CONFIG_CRYPTO_SHA256 is not set | 1179 | # CONFIG_CRYPTO_SHA256 is not set |
1087 | # CONFIG_CRYPTO_SHA512 is not set | 1180 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1114,6 +1207,7 @@ CONFIG_CRYPTO_DES=y | |||
1114 | # CONFIG_CRYPTO_LZO is not set | 1207 | # CONFIG_CRYPTO_LZO is not set |
1115 | CONFIG_CRYPTO_HW=y | 1208 | CONFIG_CRYPTO_HW=y |
1116 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1209 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1210 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1117 | # CONFIG_PPC_CLOCK is not set | 1211 | # CONFIG_PPC_CLOCK is not set |
1118 | CONFIG_PPC_LIB_RHEAP=y | 1212 | CONFIG_PPC_LIB_RHEAP=y |
1119 | # CONFIG_VIRTUALIZATION is not set | 1213 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig index de95d327463c..4eef8c95480e 100644 --- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:24 2008 | 4 | # Thu Aug 21 00:52:19 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
134 | 146 | ||
135 | # | 147 | # |
136 | # IO Schedulers | 148 | # IO Schedulers |
@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # | 161 | # |
150 | # Platform support | 162 | # Platform support |
151 | # | 163 | # |
152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
164 | CONFIG_MPC832x_RDB=y | 178 | CONFIG_MPC832x_RDB=y |
165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
182 | # CONFIG_MPC836x_RDK is not set | ||
168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
186 | # CONFIG_ASP834x is not set | ||
171 | CONFIG_PPC_MPC832x=y | 187 | CONFIG_PPC_MPC832x=y |
188 | # CONFIG_PPC_86xx is not set | ||
189 | # CONFIG_EMBEDDED6xx is not set | ||
190 | CONFIG_PPC_NATIVE=y | ||
191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
198 | CONFIG_RTAS_PROC=y | ||
177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
206 | # CONFIG_TAU is not set | ||
183 | CONFIG_QUICC_ENGINE=y | 207 | CONFIG_QUICC_ENGINE=y |
184 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
185 | 209 | ||
@@ -196,7 +220,7 @@ CONFIG_HZ_250=y | |||
196 | # CONFIG_HZ_300 is not set | 220 | # CONFIG_HZ_300 is not set |
197 | # CONFIG_HZ_1000 is not set | 221 | # CONFIG_HZ_1000 is not set |
198 | CONFIG_HZ=250 | 222 | CONFIG_HZ=250 |
199 | # CONFIG_SCHED_HRTICK is not set | 223 | CONFIG_SCHED_HRTICK=y |
200 | CONFIG_PREEMPT_NONE=y | 224 | CONFIG_PREEMPT_NONE=y |
201 | # CONFIG_PREEMPT_VOLUNTARY is not set | 225 | # CONFIG_PREEMPT_VOLUNTARY is not set |
202 | # CONFIG_PREEMPT is not set | 226 | # CONFIG_PREEMPT is not set |
@@ -207,6 +231,7 @@ CONFIG_MATH_EMULATION=y | |||
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
208 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 232 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
209 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 233 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
234 | # CONFIG_KEXEC is not set | ||
210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 235 | CONFIG_ARCH_FLATMEM_ENABLE=y |
211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 236 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
212 | CONFIG_SELECT_MEMORY_MODEL=y | 237 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -219,6 +244,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | 245 | CONFIG_PAGEFLAGS_EXTENDED=y |
221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 246 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
247 | CONFIG_MIGRATION=y | ||
222 | # CONFIG_RESOURCES_64BIT is not set | 248 | # CONFIG_RESOURCES_64BIT is not set |
223 | CONFIG_ZONE_DMA_FLAG=1 | 249 | CONFIG_ZONE_DMA_FLAG=1 |
224 | CONFIG_BOUNCE=y | 250 | CONFIG_BOUNCE=y |
@@ -226,6 +252,7 @@ CONFIG_VIRT_TO_BUS=y | |||
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 252 | CONFIG_FORCE_MAX_ZONEORDER=11 |
227 | CONFIG_PROC_DEVICETREE=y | 253 | CONFIG_PROC_DEVICETREE=y |
228 | # CONFIG_CMDLINE_BOOL is not set | 254 | # CONFIG_CMDLINE_BOOL is not set |
255 | CONFIG_EXTRA_TARGETS="" | ||
229 | # CONFIG_PM is not set | 256 | # CONFIG_PM is not set |
230 | CONFIG_SECCOMP=y | 257 | CONFIG_SECCOMP=y |
231 | CONFIG_ISA_DMA_API=y | 258 | CONFIG_ISA_DMA_API=y |
@@ -233,10 +260,13 @@ CONFIG_ISA_DMA_API=y | |||
233 | # | 260 | # |
234 | # Bus options | 261 | # Bus options |
235 | # | 262 | # |
263 | # CONFIG_ISA is not set | ||
236 | CONFIG_ZONE_DMA=y | 264 | CONFIG_ZONE_DMA=y |
237 | CONFIG_GENERIC_ISA_DMA=y | 265 | CONFIG_GENERIC_ISA_DMA=y |
238 | CONFIG_PPC_INDIRECT_PCI=y | 266 | CONFIG_PPC_INDIRECT_PCI=y |
239 | CONFIG_FSL_SOC=y | 267 | CONFIG_FSL_SOC=y |
268 | CONFIG_FSL_PCI=y | ||
269 | CONFIG_PPC_PCI_CHOICE=y | ||
240 | CONFIG_PCI=y | 270 | CONFIG_PCI=y |
241 | CONFIG_PCI_DOMAINS=y | 271 | CONFIG_PCI_DOMAINS=y |
242 | CONFIG_PCI_SYSCALL=y | 272 | CONFIG_PCI_SYSCALL=y |
@@ -261,10 +291,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
261 | CONFIG_KERNEL_START=0xc0000000 | 291 | CONFIG_KERNEL_START=0xc0000000 |
262 | CONFIG_PHYSICAL_START=0x00000000 | 292 | CONFIG_PHYSICAL_START=0x00000000 |
263 | CONFIG_TASK_SIZE=0xc0000000 | 293 | CONFIG_TASK_SIZE=0xc0000000 |
264 | |||
265 | # | ||
266 | # Networking | ||
267 | # | ||
268 | CONFIG_NET=y | 294 | CONFIG_NET=y |
269 | 295 | ||
270 | # | 296 | # |
@@ -362,9 +388,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
362 | # CONFIG_MTD is not set | 388 | # CONFIG_MTD is not set |
363 | CONFIG_OF_DEVICE=y | 389 | CONFIG_OF_DEVICE=y |
364 | CONFIG_OF_I2C=y | 390 | CONFIG_OF_I2C=y |
391 | CONFIG_OF_SPI=y | ||
365 | # CONFIG_PARPORT is not set | 392 | # CONFIG_PARPORT is not set |
366 | CONFIG_BLK_DEV=y | 393 | CONFIG_BLK_DEV=y |
367 | # CONFIG_BLK_DEV_FD is not set | 394 | # CONFIG_BLK_DEV_FD is not set |
395 | # CONFIG_MAC_FLOPPY is not set | ||
368 | # CONFIG_BLK_CPQ_DA is not set | 396 | # CONFIG_BLK_CPQ_DA is not set |
369 | # CONFIG_BLK_CPQ_CISS_DA is not set | 397 | # CONFIG_BLK_CPQ_CISS_DA is not set |
370 | # CONFIG_BLK_DEV_DAC960 is not set | 398 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -381,12 +409,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
381 | # CONFIG_BLK_DEV_XIP is not set | 409 | # CONFIG_BLK_DEV_XIP is not set |
382 | # CONFIG_CDROM_PKTCDVD is not set | 410 | # CONFIG_CDROM_PKTCDVD is not set |
383 | # CONFIG_ATA_OVER_ETH is not set | 411 | # CONFIG_ATA_OVER_ETH is not set |
412 | # CONFIG_BLK_DEV_HD is not set | ||
384 | CONFIG_MISC_DEVICES=y | 413 | CONFIG_MISC_DEVICES=y |
385 | # CONFIG_PHANTOM is not set | 414 | # CONFIG_PHANTOM is not set |
386 | # CONFIG_EEPROM_93CX6 is not set | 415 | # CONFIG_EEPROM_93CX6 is not set |
387 | # CONFIG_SGI_IOC4 is not set | 416 | # CONFIG_SGI_IOC4 is not set |
388 | # CONFIG_TIFM_CORE is not set | 417 | # CONFIG_TIFM_CORE is not set |
389 | # CONFIG_ENCLOSURE_SERVICES is not set | 418 | # CONFIG_ENCLOSURE_SERVICES is not set |
419 | # CONFIG_HP_ILO is not set | ||
390 | CONFIG_HAVE_IDE=y | 420 | CONFIG_HAVE_IDE=y |
391 | # CONFIG_IDE is not set | 421 | # CONFIG_IDE is not set |
392 | 422 | ||
@@ -463,7 +493,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
463 | # CONFIG_SCSI_DC390T is not set | 493 | # CONFIG_SCSI_DC390T is not set |
464 | # CONFIG_SCSI_NSP32 is not set | 494 | # CONFIG_SCSI_NSP32 is not set |
465 | # CONFIG_SCSI_DEBUG is not set | 495 | # CONFIG_SCSI_DEBUG is not set |
496 | # CONFIG_SCSI_MESH is not set | ||
497 | # CONFIG_SCSI_MAC53C94 is not set | ||
466 | # CONFIG_SCSI_SRP is not set | 498 | # CONFIG_SCSI_SRP is not set |
499 | # CONFIG_SCSI_DH is not set | ||
467 | # CONFIG_ATA is not set | 500 | # CONFIG_ATA is not set |
468 | # CONFIG_MD is not set | 501 | # CONFIG_MD is not set |
469 | # CONFIG_FUSION is not set | 502 | # CONFIG_FUSION is not set |
@@ -471,12 +504,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
471 | # | 504 | # |
472 | # IEEE 1394 (FireWire) support | 505 | # IEEE 1394 (FireWire) support |
473 | # | 506 | # |
507 | |||
508 | # | ||
509 | # Enable only one of the two stacks, unless you know what you are doing | ||
510 | # | ||
474 | # CONFIG_FIREWIRE is not set | 511 | # CONFIG_FIREWIRE is not set |
475 | # CONFIG_IEEE1394 is not set | 512 | # CONFIG_IEEE1394 is not set |
476 | # CONFIG_I2O is not set | 513 | # CONFIG_I2O is not set |
477 | # CONFIG_MACINTOSH_DRIVERS is not set | 514 | # CONFIG_MACINTOSH_DRIVERS is not set |
478 | CONFIG_NETDEVICES=y | 515 | CONFIG_NETDEVICES=y |
479 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
480 | # CONFIG_DUMMY is not set | 516 | # CONFIG_DUMMY is not set |
481 | # CONFIG_BONDING is not set | 517 | # CONFIG_BONDING is not set |
482 | # CONFIG_MACVLAN is not set | 518 | # CONFIG_MACVLAN is not set |
@@ -503,6 +539,8 @@ CONFIG_ICPLUS_PHY=y | |||
503 | # CONFIG_MDIO_BITBANG is not set | 539 | # CONFIG_MDIO_BITBANG is not set |
504 | CONFIG_NET_ETHERNET=y | 540 | CONFIG_NET_ETHERNET=y |
505 | CONFIG_MII=y | 541 | CONFIG_MII=y |
542 | # CONFIG_MACE is not set | ||
543 | # CONFIG_BMAC is not set | ||
506 | # CONFIG_HAPPYMEAL is not set | 544 | # CONFIG_HAPPYMEAL is not set |
507 | # CONFIG_SUNGEM is not set | 545 | # CONFIG_SUNGEM is not set |
508 | # CONFIG_CASSINI is not set | 546 | # CONFIG_CASSINI is not set |
@@ -520,10 +558,8 @@ CONFIG_NETDEV_1000=y | |||
520 | # CONFIG_ACENIC is not set | 558 | # CONFIG_ACENIC is not set |
521 | # CONFIG_DL2K is not set | 559 | # CONFIG_DL2K is not set |
522 | CONFIG_E1000=y | 560 | CONFIG_E1000=y |
523 | # CONFIG_E1000_NAPI is not set | ||
524 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 561 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
525 | # CONFIG_E1000E is not set | 562 | # CONFIG_E1000E is not set |
526 | # CONFIG_E1000E_ENABLED is not set | ||
527 | # CONFIG_IP1000 is not set | 563 | # CONFIG_IP1000 is not set |
528 | # CONFIG_IGB is not set | 564 | # CONFIG_IGB is not set |
529 | # CONFIG_NS83820 is not set | 565 | # CONFIG_NS83820 is not set |
@@ -538,12 +574,13 @@ CONFIG_E1000=y | |||
538 | # CONFIG_BNX2 is not set | 574 | # CONFIG_BNX2 is not set |
539 | # CONFIG_GIANFAR is not set | 575 | # CONFIG_GIANFAR is not set |
540 | CONFIG_UCC_GETH=y | 576 | CONFIG_UCC_GETH=y |
541 | CONFIG_UGETH_NAPI=y | ||
542 | # CONFIG_UGETH_MAGIC_PACKET is not set | 577 | # CONFIG_UGETH_MAGIC_PACKET is not set |
543 | # CONFIG_UGETH_FILTERING is not set | 578 | # CONFIG_UGETH_FILTERING is not set |
544 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 579 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
580 | # CONFIG_MV643XX_ETH is not set | ||
545 | # CONFIG_QLA3XXX is not set | 581 | # CONFIG_QLA3XXX is not set |
546 | # CONFIG_ATL1 is not set | 582 | # CONFIG_ATL1 is not set |
583 | # CONFIG_ATL1E is not set | ||
547 | CONFIG_NETDEV_10000=y | 584 | CONFIG_NETDEV_10000=y |
548 | # CONFIG_CHELSIO_T1 is not set | 585 | # CONFIG_CHELSIO_T1 is not set |
549 | # CONFIG_CHELSIO_T3 is not set | 586 | # CONFIG_CHELSIO_T3 is not set |
@@ -641,12 +678,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
641 | # CONFIG_SERIAL_UARTLITE is not set | 678 | # CONFIG_SERIAL_UARTLITE is not set |
642 | CONFIG_SERIAL_CORE=y | 679 | CONFIG_SERIAL_CORE=y |
643 | CONFIG_SERIAL_CORE_CONSOLE=y | 680 | CONFIG_SERIAL_CORE_CONSOLE=y |
681 | # CONFIG_SERIAL_PMACZILOG is not set | ||
644 | # CONFIG_SERIAL_JSM is not set | 682 | # CONFIG_SERIAL_JSM is not set |
645 | # CONFIG_SERIAL_OF_PLATFORM is not set | 683 | # CONFIG_SERIAL_OF_PLATFORM is not set |
646 | # CONFIG_SERIAL_QE is not set | 684 | # CONFIG_SERIAL_QE is not set |
647 | CONFIG_UNIX98_PTYS=y | 685 | CONFIG_UNIX98_PTYS=y |
648 | CONFIG_LEGACY_PTYS=y | 686 | CONFIG_LEGACY_PTYS=y |
649 | CONFIG_LEGACY_PTY_COUNT=256 | 687 | CONFIG_LEGACY_PTY_COUNT=256 |
688 | # CONFIG_BRIQ_PANEL is not set | ||
689 | # CONFIG_HVC_RTAS is not set | ||
650 | # CONFIG_IPMI_HANDLER is not set | 690 | # CONFIG_IPMI_HANDLER is not set |
651 | CONFIG_HW_RANDOM=y | 691 | CONFIG_HW_RANDOM=y |
652 | # CONFIG_NVRAM is not set | 692 | # CONFIG_NVRAM is not set |
@@ -660,43 +700,70 @@ CONFIG_DEVPORT=y | |||
660 | CONFIG_I2C=y | 700 | CONFIG_I2C=y |
661 | CONFIG_I2C_BOARDINFO=y | 701 | CONFIG_I2C_BOARDINFO=y |
662 | CONFIG_I2C_CHARDEV=y | 702 | CONFIG_I2C_CHARDEV=y |
703 | CONFIG_I2C_HELPER_AUTO=y | ||
663 | 704 | ||
664 | # | 705 | # |
665 | # I2C Hardware Bus support | 706 | # I2C Hardware Bus support |
666 | # | 707 | # |
708 | |||
709 | # | ||
710 | # PC SMBus host controller drivers | ||
711 | # | ||
667 | # CONFIG_I2C_ALI1535 is not set | 712 | # CONFIG_I2C_ALI1535 is not set |
668 | # CONFIG_I2C_ALI1563 is not set | 713 | # CONFIG_I2C_ALI1563 is not set |
669 | # CONFIG_I2C_ALI15X3 is not set | 714 | # CONFIG_I2C_ALI15X3 is not set |
670 | # CONFIG_I2C_AMD756 is not set | 715 | # CONFIG_I2C_AMD756 is not set |
671 | # CONFIG_I2C_AMD8111 is not set | 716 | # CONFIG_I2C_AMD8111 is not set |
672 | # CONFIG_I2C_I801 is not set | 717 | # CONFIG_I2C_I801 is not set |
673 | # CONFIG_I2C_I810 is not set | 718 | # CONFIG_I2C_ISCH is not set |
674 | # CONFIG_I2C_PIIX4 is not set | 719 | # CONFIG_I2C_PIIX4 is not set |
675 | CONFIG_I2C_MPC=y | ||
676 | # CONFIG_I2C_NFORCE2 is not set | 720 | # CONFIG_I2C_NFORCE2 is not set |
677 | # CONFIG_I2C_OCORES is not set | ||
678 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
679 | # CONFIG_I2C_PROSAVAGE is not set | ||
680 | # CONFIG_I2C_SAVAGE4 is not set | ||
681 | # CONFIG_I2C_SIMTEC is not set | ||
682 | # CONFIG_I2C_SIS5595 is not set | 721 | # CONFIG_I2C_SIS5595 is not set |
683 | # CONFIG_I2C_SIS630 is not set | 722 | # CONFIG_I2C_SIS630 is not set |
684 | # CONFIG_I2C_SIS96X is not set | 723 | # CONFIG_I2C_SIS96X is not set |
685 | # CONFIG_I2C_TAOS_EVM is not set | ||
686 | # CONFIG_I2C_STUB is not set | ||
687 | # CONFIG_I2C_TINY_USB is not set | ||
688 | # CONFIG_I2C_VIA is not set | 724 | # CONFIG_I2C_VIA is not set |
689 | # CONFIG_I2C_VIAPRO is not set | 725 | # CONFIG_I2C_VIAPRO is not set |
726 | |||
727 | # | ||
728 | # Mac SMBus host controller drivers | ||
729 | # | ||
730 | # CONFIG_I2C_HYDRA is not set | ||
731 | CONFIG_I2C_POWERMAC=y | ||
732 | |||
733 | # | ||
734 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
735 | # | ||
736 | CONFIG_I2C_MPC=y | ||
737 | # CONFIG_I2C_OCORES is not set | ||
738 | # CONFIG_I2C_SIMTEC is not set | ||
739 | |||
740 | # | ||
741 | # External I2C/SMBus adapter drivers | ||
742 | # | ||
743 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
744 | # CONFIG_I2C_TAOS_EVM is not set | ||
745 | # CONFIG_I2C_TINY_USB is not set | ||
746 | |||
747 | # | ||
748 | # Graphics adapter I2C/DDC channel drivers | ||
749 | # | ||
690 | # CONFIG_I2C_VOODOO3 is not set | 750 | # CONFIG_I2C_VOODOO3 is not set |
751 | |||
752 | # | ||
753 | # Other I2C/SMBus bus drivers | ||
754 | # | ||
691 | # CONFIG_I2C_PCA_PLATFORM is not set | 755 | # CONFIG_I2C_PCA_PLATFORM is not set |
756 | # CONFIG_I2C_STUB is not set | ||
692 | 757 | ||
693 | # | 758 | # |
694 | # Miscellaneous I2C Chip support | 759 | # Miscellaneous I2C Chip support |
695 | # | 760 | # |
696 | # CONFIG_DS1682 is not set | 761 | # CONFIG_DS1682 is not set |
762 | # CONFIG_AT24 is not set | ||
697 | # CONFIG_SENSORS_EEPROM is not set | 763 | # CONFIG_SENSORS_EEPROM is not set |
698 | # CONFIG_SENSORS_PCF8574 is not set | 764 | # CONFIG_SENSORS_PCF8574 is not set |
699 | # CONFIG_PCF8575 is not set | 765 | # CONFIG_PCF8575 is not set |
766 | # CONFIG_SENSORS_PCA9539 is not set | ||
700 | # CONFIG_SENSORS_PCF8591 is not set | 767 | # CONFIG_SENSORS_PCF8591 is not set |
701 | # CONFIG_SENSORS_MAX6875 is not set | 768 | # CONFIG_SENSORS_MAX6875 is not set |
702 | # CONFIG_SENSORS_TSL2550 is not set | 769 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -719,11 +786,15 @@ CONFIG_SPI_MPC83xx=y | |||
719 | # CONFIG_SPI_AT25 is not set | 786 | # CONFIG_SPI_AT25 is not set |
720 | # CONFIG_SPI_SPIDEV is not set | 787 | # CONFIG_SPI_SPIDEV is not set |
721 | # CONFIG_SPI_TLE62X0 is not set | 788 | # CONFIG_SPI_TLE62X0 is not set |
789 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
790 | # CONFIG_GPIOLIB is not set | ||
722 | # CONFIG_W1 is not set | 791 | # CONFIG_W1 is not set |
723 | # CONFIG_POWER_SUPPLY is not set | 792 | # CONFIG_POWER_SUPPLY is not set |
724 | CONFIG_HWMON=y | 793 | CONFIG_HWMON=y |
725 | # CONFIG_HWMON_VID is not set | 794 | # CONFIG_HWMON_VID is not set |
795 | # CONFIG_SENSORS_AD7414 is not set | ||
726 | # CONFIG_SENSORS_AD7418 is not set | 796 | # CONFIG_SENSORS_AD7418 is not set |
797 | # CONFIG_SENSORS_ADCXX is not set | ||
727 | # CONFIG_SENSORS_ADM1021 is not set | 798 | # CONFIG_SENSORS_ADM1021 is not set |
728 | # CONFIG_SENSORS_ADM1025 is not set | 799 | # CONFIG_SENSORS_ADM1025 is not set |
729 | # CONFIG_SENSORS_ADM1026 is not set | 800 | # CONFIG_SENSORS_ADM1026 is not set |
@@ -732,6 +803,7 @@ CONFIG_HWMON=y | |||
732 | # CONFIG_SENSORS_ADM9240 is not set | 803 | # CONFIG_SENSORS_ADM9240 is not set |
733 | # CONFIG_SENSORS_ADT7470 is not set | 804 | # CONFIG_SENSORS_ADT7470 is not set |
734 | # CONFIG_SENSORS_ADT7473 is not set | 805 | # CONFIG_SENSORS_ADT7473 is not set |
806 | # CONFIG_SENSORS_AMS is not set | ||
735 | # CONFIG_SENSORS_ATXP1 is not set | 807 | # CONFIG_SENSORS_ATXP1 is not set |
736 | # CONFIG_SENSORS_DS1621 is not set | 808 | # CONFIG_SENSORS_DS1621 is not set |
737 | # CONFIG_SENSORS_I5K_AMB is not set | 809 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -777,6 +849,7 @@ CONFIG_HWMON=y | |||
777 | # CONFIG_SENSORS_W83627EHF is not set | 849 | # CONFIG_SENSORS_W83627EHF is not set |
778 | # CONFIG_HWMON_DEBUG_CHIP is not set | 850 | # CONFIG_HWMON_DEBUG_CHIP is not set |
779 | # CONFIG_THERMAL is not set | 851 | # CONFIG_THERMAL is not set |
852 | # CONFIG_THERMAL_HWMON is not set | ||
780 | CONFIG_WATCHDOG=y | 853 | CONFIG_WATCHDOG=y |
781 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 854 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
782 | 855 | ||
@@ -784,7 +857,9 @@ CONFIG_WATCHDOG=y | |||
784 | # Watchdog Device Drivers | 857 | # Watchdog Device Drivers |
785 | # | 858 | # |
786 | # CONFIG_SOFT_WATCHDOG is not set | 859 | # CONFIG_SOFT_WATCHDOG is not set |
787 | CONFIG_83xx_WDT=y | 860 | # CONFIG_ALIM7101_WDT is not set |
861 | # CONFIG_8xxx_WDT is not set | ||
862 | # CONFIG_WATCHDOG_RTAS is not set | ||
788 | 863 | ||
789 | # | 864 | # |
790 | # PCI-based Watchdog Cards | 865 | # PCI-based Watchdog Cards |
@@ -806,8 +881,10 @@ CONFIG_SSB_POSSIBLE=y | |||
806 | # | 881 | # |
807 | # Multifunction device drivers | 882 | # Multifunction device drivers |
808 | # | 883 | # |
884 | # CONFIG_MFD_CORE is not set | ||
809 | # CONFIG_MFD_SM501 is not set | 885 | # CONFIG_MFD_SM501 is not set |
810 | # CONFIG_HTC_PASIC3 is not set | 886 | # CONFIG_HTC_PASIC3 is not set |
887 | # CONFIG_MFD_TMIO is not set | ||
811 | 888 | ||
812 | # | 889 | # |
813 | # Multimedia devices | 890 | # Multimedia devices |
@@ -840,10 +917,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
840 | # Display device support | 917 | # Display device support |
841 | # | 918 | # |
842 | # CONFIG_DISPLAY_SUPPORT is not set | 919 | # CONFIG_DISPLAY_SUPPORT is not set |
843 | |||
844 | # | ||
845 | # Sound | ||
846 | # | ||
847 | # CONFIG_SOUND is not set | 920 | # CONFIG_SOUND is not set |
848 | CONFIG_HID_SUPPORT=y | 921 | CONFIG_HID_SUPPORT=y |
849 | CONFIG_HID=y | 922 | CONFIG_HID=y |
@@ -877,6 +950,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
877 | # CONFIG_USB_OTG is not set | 950 | # CONFIG_USB_OTG is not set |
878 | # CONFIG_USB_OTG_WHITELIST is not set | 951 | # CONFIG_USB_OTG_WHITELIST is not set |
879 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 952 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
953 | CONFIG_USB_MON=y | ||
880 | 954 | ||
881 | # | 955 | # |
882 | # USB Host Controller Drivers | 956 | # USB Host Controller Drivers |
@@ -928,6 +1002,7 @@ CONFIG_USB_STORAGE=y | |||
928 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1002 | # CONFIG_USB_STORAGE_ALAUDA is not set |
929 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1003 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
930 | # CONFIG_USB_STORAGE_KARMA is not set | 1004 | # CONFIG_USB_STORAGE_KARMA is not set |
1005 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
931 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1006 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
932 | # CONFIG_USB_LIBUSUAL is not set | 1007 | # CONFIG_USB_LIBUSUAL is not set |
933 | 1008 | ||
@@ -936,7 +1011,6 @@ CONFIG_USB_STORAGE=y | |||
936 | # | 1011 | # |
937 | # CONFIG_USB_MDC800 is not set | 1012 | # CONFIG_USB_MDC800 is not set |
938 | # CONFIG_USB_MICROTEK is not set | 1013 | # CONFIG_USB_MICROTEK is not set |
939 | CONFIG_USB_MON=y | ||
940 | 1014 | ||
941 | # | 1015 | # |
942 | # USB port drivers | 1016 | # USB port drivers |
@@ -949,7 +1023,6 @@ CONFIG_USB_MON=y | |||
949 | # CONFIG_USB_EMI62 is not set | 1023 | # CONFIG_USB_EMI62 is not set |
950 | # CONFIG_USB_EMI26 is not set | 1024 | # CONFIG_USB_EMI26 is not set |
951 | # CONFIG_USB_ADUTUX is not set | 1025 | # CONFIG_USB_ADUTUX is not set |
952 | # CONFIG_USB_AUERSWALD is not set | ||
953 | # CONFIG_USB_RIO500 is not set | 1026 | # CONFIG_USB_RIO500 is not set |
954 | # CONFIG_USB_LEGOTOWER is not set | 1027 | # CONFIG_USB_LEGOTOWER is not set |
955 | # CONFIG_USB_LCD is not set | 1028 | # CONFIG_USB_LCD is not set |
@@ -1063,6 +1136,7 @@ CONFIG_TMPFS=y | |||
1063 | # CONFIG_CRAMFS is not set | 1136 | # CONFIG_CRAMFS is not set |
1064 | # CONFIG_VXFS_FS is not set | 1137 | # CONFIG_VXFS_FS is not set |
1065 | # CONFIG_MINIX_FS is not set | 1138 | # CONFIG_MINIX_FS is not set |
1139 | # CONFIG_OMFS_FS is not set | ||
1066 | # CONFIG_HPFS_FS is not set | 1140 | # CONFIG_HPFS_FS is not set |
1067 | # CONFIG_QNX4FS_FS is not set | 1141 | # CONFIG_QNX4FS_FS is not set |
1068 | # CONFIG_ROMFS_FS is not set | 1142 | # CONFIG_ROMFS_FS is not set |
@@ -1073,14 +1147,13 @@ CONFIG_NFS_FS=y | |||
1073 | CONFIG_NFS_V3=y | 1147 | CONFIG_NFS_V3=y |
1074 | # CONFIG_NFS_V3_ACL is not set | 1148 | # CONFIG_NFS_V3_ACL is not set |
1075 | CONFIG_NFS_V4=y | 1149 | CONFIG_NFS_V4=y |
1076 | # CONFIG_NFSD is not set | ||
1077 | CONFIG_ROOT_NFS=y | 1150 | CONFIG_ROOT_NFS=y |
1151 | # CONFIG_NFSD is not set | ||
1078 | CONFIG_LOCKD=y | 1152 | CONFIG_LOCKD=y |
1079 | CONFIG_LOCKD_V4=y | 1153 | CONFIG_LOCKD_V4=y |
1080 | CONFIG_NFS_COMMON=y | 1154 | CONFIG_NFS_COMMON=y |
1081 | CONFIG_SUNRPC=y | 1155 | CONFIG_SUNRPC=y |
1082 | CONFIG_SUNRPC_GSS=y | 1156 | CONFIG_SUNRPC_GSS=y |
1083 | # CONFIG_SUNRPC_BIND34 is not set | ||
1084 | CONFIG_RPCSEC_GSS_KRB5=y | 1157 | CONFIG_RPCSEC_GSS_KRB5=y |
1085 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1158 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1086 | # CONFIG_SMB_FS is not set | 1159 | # CONFIG_SMB_FS is not set |
@@ -1154,6 +1227,7 @@ CONFIG_NLS_ISO8859_1=y | |||
1154 | # CONFIG_DLM is not set | 1227 | # CONFIG_DLM is not set |
1155 | CONFIG_UCC_FAST=y | 1228 | CONFIG_UCC_FAST=y |
1156 | CONFIG_UCC=y | 1229 | CONFIG_UCC=y |
1230 | # CONFIG_QE_GPIO is not set | ||
1157 | 1231 | ||
1158 | # | 1232 | # |
1159 | # Library routines | 1233 | # Library routines |
@@ -1162,6 +1236,7 @@ CONFIG_BITREVERSE=y | |||
1162 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1236 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1163 | # CONFIG_CRC_CCITT is not set | 1237 | # CONFIG_CRC_CCITT is not set |
1164 | # CONFIG_CRC16 is not set | 1238 | # CONFIG_CRC16 is not set |
1239 | CONFIG_CRC_T10DIF=y | ||
1165 | CONFIG_CRC_ITU_T=y | 1240 | CONFIG_CRC_ITU_T=y |
1166 | CONFIG_CRC32=y | 1241 | CONFIG_CRC32=y |
1167 | CONFIG_CRC7=y | 1242 | CONFIG_CRC7=y |
@@ -1187,8 +1262,18 @@ CONFIG_FRAME_WARN=1024 | |||
1187 | # CONFIG_SLUB_DEBUG_ON is not set | 1262 | # CONFIG_SLUB_DEBUG_ON is not set |
1188 | # CONFIG_SLUB_STATS is not set | 1263 | # CONFIG_SLUB_STATS is not set |
1189 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1264 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1265 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1266 | # CONFIG_LATENCYTOP is not set | ||
1267 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1268 | CONFIG_HAVE_FTRACE=y | ||
1269 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1270 | # CONFIG_FTRACE is not set | ||
1271 | # CONFIG_SCHED_TRACER is not set | ||
1272 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1190 | # CONFIG_SAMPLES is not set | 1273 | # CONFIG_SAMPLES is not set |
1274 | CONFIG_HAVE_ARCH_KGDB=y | ||
1191 | # CONFIG_IRQSTACKS is not set | 1275 | # CONFIG_IRQSTACKS is not set |
1276 | # CONFIG_BOOTX_TEXT is not set | ||
1192 | # CONFIG_PPC_EARLY_DEBUG is not set | 1277 | # CONFIG_PPC_EARLY_DEBUG is not set |
1193 | 1278 | ||
1194 | # | 1279 | # |
@@ -1242,6 +1327,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1242 | # CONFIG_CRYPTO_MD4 is not set | 1327 | # CONFIG_CRYPTO_MD4 is not set |
1243 | CONFIG_CRYPTO_MD5=y | 1328 | CONFIG_CRYPTO_MD5=y |
1244 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1329 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1330 | # CONFIG_CRYPTO_RMD128 is not set | ||
1331 | # CONFIG_CRYPTO_RMD160 is not set | ||
1332 | # CONFIG_CRYPTO_RMD256 is not set | ||
1333 | # CONFIG_CRYPTO_RMD320 is not set | ||
1245 | # CONFIG_CRYPTO_SHA1 is not set | 1334 | # CONFIG_CRYPTO_SHA1 is not set |
1246 | # CONFIG_CRYPTO_SHA256 is not set | 1335 | # CONFIG_CRYPTO_SHA256 is not set |
1247 | # CONFIG_CRYPTO_SHA512 is not set | 1336 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1274,6 +1363,7 @@ CONFIG_CRYPTO_DES=y | |||
1274 | # CONFIG_CRYPTO_LZO is not set | 1363 | # CONFIG_CRYPTO_LZO is not set |
1275 | CONFIG_CRYPTO_HW=y | 1364 | CONFIG_CRYPTO_HW=y |
1276 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1365 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1366 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1277 | # CONFIG_PPC_CLOCK is not set | 1367 | # CONFIG_PPC_CLOCK is not set |
1278 | CONFIG_PPC_LIB_RHEAP=y | 1368 | CONFIG_PPC_LIB_RHEAP=y |
1279 | # CONFIG_VIRTUALIZATION is not set | 1369 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig index b47fc9185708..8d6513931850 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:25 2008 | 4 | # Thu Aug 21 00:52:20 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
134 | 146 | ||
135 | # | 147 | # |
136 | # IO Schedulers | 148 | # IO Schedulers |
@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # | 161 | # |
150 | # Platform support | 162 | # Platform support |
151 | # | 163 | # |
152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
166 | CONFIG_MPC834x_ITX=y | 180 | CONFIG_MPC834x_ITX=y |
167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
182 | # CONFIG_MPC836x_RDK is not set | ||
168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
186 | # CONFIG_ASP834x is not set | ||
171 | CONFIG_PPC_MPC834x=y | 187 | CONFIG_PPC_MPC834x=y |
188 | # CONFIG_PPC_86xx is not set | ||
189 | # CONFIG_EMBEDDED6xx is not set | ||
190 | CONFIG_PPC_NATIVE=y | ||
191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
198 | CONFIG_RTAS_PROC=y | ||
177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
206 | # CONFIG_TAU is not set | ||
183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
184 | 208 | ||
185 | # | 209 | # |
@@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
232 | # CONFIG_KEXEC is not set | ||
208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
245 | CONFIG_MIGRATION=y | ||
220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
253 | CONFIG_EXTRA_TARGETS="" | ||
227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
231 | # | 258 | # |
232 | # Bus options | 259 | # Bus options |
233 | # | 260 | # |
261 | # CONFIG_ISA is not set | ||
234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
266 | CONFIG_FSL_PCI=y | ||
267 | CONFIG_PPC_PCI_CHOICE=y | ||
238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
@@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
259 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
261 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
262 | |||
263 | # | ||
264 | # Networking | ||
265 | # | ||
266 | CONFIG_NET=y | 292 | CONFIG_NET=y |
267 | 293 | ||
268 | # | 294 | # |
@@ -439,9 +465,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
439 | # CONFIG_MTD_UBI is not set | 465 | # CONFIG_MTD_UBI is not set |
440 | CONFIG_OF_DEVICE=y | 466 | CONFIG_OF_DEVICE=y |
441 | CONFIG_OF_I2C=y | 467 | CONFIG_OF_I2C=y |
468 | CONFIG_OF_SPI=y | ||
442 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
443 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
444 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
472 | # CONFIG_MAC_FLOPPY is not set | ||
445 | # CONFIG_BLK_CPQ_DA is not set | 473 | # CONFIG_BLK_CPQ_DA is not set |
446 | # CONFIG_BLK_CPQ_CISS_DA is not set | 474 | # CONFIG_BLK_CPQ_CISS_DA is not set |
447 | # CONFIG_BLK_DEV_DAC960 is not set | 475 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -458,18 +486,17 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
458 | # CONFIG_BLK_DEV_XIP is not set | 486 | # CONFIG_BLK_DEV_XIP is not set |
459 | # CONFIG_CDROM_PKTCDVD is not set | 487 | # CONFIG_CDROM_PKTCDVD is not set |
460 | # CONFIG_ATA_OVER_ETH is not set | 488 | # CONFIG_ATA_OVER_ETH is not set |
489 | # CONFIG_BLK_DEV_HD is not set | ||
461 | CONFIG_MISC_DEVICES=y | 490 | CONFIG_MISC_DEVICES=y |
462 | # CONFIG_PHANTOM is not set | 491 | # CONFIG_PHANTOM is not set |
463 | # CONFIG_EEPROM_93CX6 is not set | 492 | # CONFIG_EEPROM_93CX6 is not set |
464 | # CONFIG_SGI_IOC4 is not set | 493 | # CONFIG_SGI_IOC4 is not set |
465 | # CONFIG_TIFM_CORE is not set | 494 | # CONFIG_TIFM_CORE is not set |
466 | # CONFIG_ENCLOSURE_SERVICES is not set | 495 | # CONFIG_ENCLOSURE_SERVICES is not set |
496 | # CONFIG_HP_ILO is not set | ||
467 | CONFIG_HAVE_IDE=y | 497 | CONFIG_HAVE_IDE=y |
468 | CONFIG_IDE=y | 498 | CONFIG_IDE=y |
469 | CONFIG_IDE_MAX_HWIFS=4 | ||
470 | # CONFIG_BLK_DEV_IDE is not set | 499 | # CONFIG_BLK_DEV_IDE is not set |
471 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
472 | # CONFIG_BLK_DEV_HD is not set | ||
473 | 500 | ||
474 | # | 501 | # |
475 | # SCSI device support | 502 | # SCSI device support |
@@ -545,7 +572,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
545 | # CONFIG_SCSI_DC390T is not set | 572 | # CONFIG_SCSI_DC390T is not set |
546 | # CONFIG_SCSI_NSP32 is not set | 573 | # CONFIG_SCSI_NSP32 is not set |
547 | # CONFIG_SCSI_DEBUG is not set | 574 | # CONFIG_SCSI_DEBUG is not set |
575 | # CONFIG_SCSI_MESH is not set | ||
576 | # CONFIG_SCSI_MAC53C94 is not set | ||
548 | # CONFIG_SCSI_SRP is not set | 577 | # CONFIG_SCSI_SRP is not set |
578 | # CONFIG_SCSI_DH is not set | ||
549 | CONFIG_ATA=y | 579 | CONFIG_ATA=y |
550 | # CONFIG_ATA_NONSTANDARD is not set | 580 | # CONFIG_ATA_NONSTANDARD is not set |
551 | CONFIG_SATA_PMP=y | 581 | CONFIG_SATA_PMP=y |
@@ -623,12 +653,15 @@ CONFIG_MD_RAID1=y | |||
623 | # | 653 | # |
624 | # IEEE 1394 (FireWire) support | 654 | # IEEE 1394 (FireWire) support |
625 | # | 655 | # |
656 | |||
657 | # | ||
658 | # Enable only one of the two stacks, unless you know what you are doing | ||
659 | # | ||
626 | # CONFIG_FIREWIRE is not set | 660 | # CONFIG_FIREWIRE is not set |
627 | # CONFIG_IEEE1394 is not set | 661 | # CONFIG_IEEE1394 is not set |
628 | # CONFIG_I2O is not set | 662 | # CONFIG_I2O is not set |
629 | # CONFIG_MACINTOSH_DRIVERS is not set | 663 | # CONFIG_MACINTOSH_DRIVERS is not set |
630 | CONFIG_NETDEVICES=y | 664 | CONFIG_NETDEVICES=y |
631 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
632 | # CONFIG_DUMMY is not set | 665 | # CONFIG_DUMMY is not set |
633 | # CONFIG_BONDING is not set | 666 | # CONFIG_BONDING is not set |
634 | # CONFIG_MACVLAN is not set | 667 | # CONFIG_MACVLAN is not set |
@@ -659,7 +692,6 @@ CONFIG_NETDEV_1000=y | |||
659 | # CONFIG_DL2K is not set | 692 | # CONFIG_DL2K is not set |
660 | # CONFIG_E1000 is not set | 693 | # CONFIG_E1000 is not set |
661 | # CONFIG_E1000E is not set | 694 | # CONFIG_E1000E is not set |
662 | # CONFIG_E1000E_ENABLED is not set | ||
663 | # CONFIG_IP1000 is not set | 695 | # CONFIG_IP1000 is not set |
664 | # CONFIG_IGB is not set | 696 | # CONFIG_IGB is not set |
665 | # CONFIG_NS83820 is not set | 697 | # CONFIG_NS83820 is not set |
@@ -673,9 +705,10 @@ CONFIG_NETDEV_1000=y | |||
673 | # CONFIG_TIGON3 is not set | 705 | # CONFIG_TIGON3 is not set |
674 | # CONFIG_BNX2 is not set | 706 | # CONFIG_BNX2 is not set |
675 | CONFIG_GIANFAR=y | 707 | CONFIG_GIANFAR=y |
676 | CONFIG_GFAR_NAPI=y | 708 | # CONFIG_MV643XX_ETH is not set |
677 | # CONFIG_QLA3XXX is not set | 709 | # CONFIG_QLA3XXX is not set |
678 | # CONFIG_ATL1 is not set | 710 | # CONFIG_ATL1 is not set |
711 | # CONFIG_ATL1E is not set | ||
679 | CONFIG_NETDEV_10000=y | 712 | CONFIG_NETDEV_10000=y |
680 | # CONFIG_CHELSIO_T1 is not set | 713 | # CONFIG_CHELSIO_T1 is not set |
681 | # CONFIG_CHELSIO_T3 is not set | 714 | # CONFIG_CHELSIO_T3 is not set |
@@ -753,11 +786,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
753 | # CONFIG_SERIAL_UARTLITE is not set | 786 | # CONFIG_SERIAL_UARTLITE is not set |
754 | CONFIG_SERIAL_CORE=y | 787 | CONFIG_SERIAL_CORE=y |
755 | CONFIG_SERIAL_CORE_CONSOLE=y | 788 | CONFIG_SERIAL_CORE_CONSOLE=y |
789 | # CONFIG_SERIAL_PMACZILOG is not set | ||
756 | # CONFIG_SERIAL_JSM is not set | 790 | # CONFIG_SERIAL_JSM is not set |
757 | # CONFIG_SERIAL_OF_PLATFORM is not set | 791 | # CONFIG_SERIAL_OF_PLATFORM is not set |
758 | CONFIG_UNIX98_PTYS=y | 792 | CONFIG_UNIX98_PTYS=y |
759 | CONFIG_LEGACY_PTYS=y | 793 | CONFIG_LEGACY_PTYS=y |
760 | CONFIG_LEGACY_PTY_COUNT=256 | 794 | CONFIG_LEGACY_PTY_COUNT=256 |
795 | # CONFIG_BRIQ_PANEL is not set | ||
796 | # CONFIG_HVC_RTAS is not set | ||
761 | # CONFIG_IPMI_HANDLER is not set | 797 | # CONFIG_IPMI_HANDLER is not set |
762 | CONFIG_HW_RANDOM=y | 798 | CONFIG_HW_RANDOM=y |
763 | # CONFIG_NVRAM is not set | 799 | # CONFIG_NVRAM is not set |
@@ -769,43 +805,70 @@ CONFIG_DEVPORT=y | |||
769 | CONFIG_I2C=y | 805 | CONFIG_I2C=y |
770 | CONFIG_I2C_BOARDINFO=y | 806 | CONFIG_I2C_BOARDINFO=y |
771 | CONFIG_I2C_CHARDEV=y | 807 | CONFIG_I2C_CHARDEV=y |
808 | CONFIG_I2C_HELPER_AUTO=y | ||
772 | 809 | ||
773 | # | 810 | # |
774 | # I2C Hardware Bus support | 811 | # I2C Hardware Bus support |
775 | # | 812 | # |
813 | |||
814 | # | ||
815 | # PC SMBus host controller drivers | ||
816 | # | ||
776 | # CONFIG_I2C_ALI1535 is not set | 817 | # CONFIG_I2C_ALI1535 is not set |
777 | # CONFIG_I2C_ALI1563 is not set | 818 | # CONFIG_I2C_ALI1563 is not set |
778 | # CONFIG_I2C_ALI15X3 is not set | 819 | # CONFIG_I2C_ALI15X3 is not set |
779 | # CONFIG_I2C_AMD756 is not set | 820 | # CONFIG_I2C_AMD756 is not set |
780 | # CONFIG_I2C_AMD8111 is not set | 821 | # CONFIG_I2C_AMD8111 is not set |
781 | # CONFIG_I2C_I801 is not set | 822 | # CONFIG_I2C_I801 is not set |
782 | # CONFIG_I2C_I810 is not set | 823 | # CONFIG_I2C_ISCH is not set |
783 | # CONFIG_I2C_PIIX4 is not set | 824 | # CONFIG_I2C_PIIX4 is not set |
784 | CONFIG_I2C_MPC=y | ||
785 | # CONFIG_I2C_NFORCE2 is not set | 825 | # CONFIG_I2C_NFORCE2 is not set |
786 | # CONFIG_I2C_OCORES is not set | ||
787 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
788 | # CONFIG_I2C_PROSAVAGE is not set | ||
789 | # CONFIG_I2C_SAVAGE4 is not set | ||
790 | # CONFIG_I2C_SIMTEC is not set | ||
791 | # CONFIG_I2C_SIS5595 is not set | 826 | # CONFIG_I2C_SIS5595 is not set |
792 | # CONFIG_I2C_SIS630 is not set | 827 | # CONFIG_I2C_SIS630 is not set |
793 | # CONFIG_I2C_SIS96X is not set | 828 | # CONFIG_I2C_SIS96X is not set |
794 | # CONFIG_I2C_TAOS_EVM is not set | ||
795 | # CONFIG_I2C_STUB is not set | ||
796 | # CONFIG_I2C_TINY_USB is not set | ||
797 | # CONFIG_I2C_VIA is not set | 829 | # CONFIG_I2C_VIA is not set |
798 | # CONFIG_I2C_VIAPRO is not set | 830 | # CONFIG_I2C_VIAPRO is not set |
831 | |||
832 | # | ||
833 | # Mac SMBus host controller drivers | ||
834 | # | ||
835 | # CONFIG_I2C_HYDRA is not set | ||
836 | CONFIG_I2C_POWERMAC=y | ||
837 | |||
838 | # | ||
839 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
840 | # | ||
841 | CONFIG_I2C_MPC=y | ||
842 | # CONFIG_I2C_OCORES is not set | ||
843 | # CONFIG_I2C_SIMTEC is not set | ||
844 | |||
845 | # | ||
846 | # External I2C/SMBus adapter drivers | ||
847 | # | ||
848 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
849 | # CONFIG_I2C_TAOS_EVM is not set | ||
850 | # CONFIG_I2C_TINY_USB is not set | ||
851 | |||
852 | # | ||
853 | # Graphics adapter I2C/DDC channel drivers | ||
854 | # | ||
799 | # CONFIG_I2C_VOODOO3 is not set | 855 | # CONFIG_I2C_VOODOO3 is not set |
856 | |||
857 | # | ||
858 | # Other I2C/SMBus bus drivers | ||
859 | # | ||
800 | # CONFIG_I2C_PCA_PLATFORM is not set | 860 | # CONFIG_I2C_PCA_PLATFORM is not set |
861 | # CONFIG_I2C_STUB is not set | ||
801 | 862 | ||
802 | # | 863 | # |
803 | # Miscellaneous I2C Chip support | 864 | # Miscellaneous I2C Chip support |
804 | # | 865 | # |
805 | # CONFIG_DS1682 is not set | 866 | # CONFIG_DS1682 is not set |
867 | # CONFIG_AT24 is not set | ||
806 | # CONFIG_SENSORS_EEPROM is not set | 868 | # CONFIG_SENSORS_EEPROM is not set |
807 | CONFIG_SENSORS_PCF8574=y | 869 | CONFIG_SENSORS_PCF8574=y |
808 | # CONFIG_PCF8575 is not set | 870 | # CONFIG_PCF8575 is not set |
871 | # CONFIG_SENSORS_PCA9539 is not set | ||
809 | # CONFIG_SENSORS_PCF8591 is not set | 872 | # CONFIG_SENSORS_PCF8591 is not set |
810 | # CONFIG_SENSORS_MAX6875 is not set | 873 | # CONFIG_SENSORS_MAX6875 is not set |
811 | # CONFIG_SENSORS_TSL2550 is not set | 874 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -828,10 +891,13 @@ CONFIG_SPI_MPC83xx=y | |||
828 | # CONFIG_SPI_AT25 is not set | 891 | # CONFIG_SPI_AT25 is not set |
829 | # CONFIG_SPI_SPIDEV is not set | 892 | # CONFIG_SPI_SPIDEV is not set |
830 | # CONFIG_SPI_TLE62X0 is not set | 893 | # CONFIG_SPI_TLE62X0 is not set |
894 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
895 | # CONFIG_GPIOLIB is not set | ||
831 | # CONFIG_W1 is not set | 896 | # CONFIG_W1 is not set |
832 | # CONFIG_POWER_SUPPLY is not set | 897 | # CONFIG_POWER_SUPPLY is not set |
833 | # CONFIG_HWMON is not set | 898 | # CONFIG_HWMON is not set |
834 | # CONFIG_THERMAL is not set | 899 | # CONFIG_THERMAL is not set |
900 | # CONFIG_THERMAL_HWMON is not set | ||
835 | CONFIG_WATCHDOG=y | 901 | CONFIG_WATCHDOG=y |
836 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 902 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
837 | 903 | ||
@@ -839,7 +905,9 @@ CONFIG_WATCHDOG=y | |||
839 | # Watchdog Device Drivers | 905 | # Watchdog Device Drivers |
840 | # | 906 | # |
841 | # CONFIG_SOFT_WATCHDOG is not set | 907 | # CONFIG_SOFT_WATCHDOG is not set |
842 | CONFIG_83xx_WDT=y | 908 | # CONFIG_ALIM7101_WDT is not set |
909 | # CONFIG_8xxx_WDT is not set | ||
910 | # CONFIG_WATCHDOG_RTAS is not set | ||
843 | 911 | ||
844 | # | 912 | # |
845 | # PCI-based Watchdog Cards | 913 | # PCI-based Watchdog Cards |
@@ -861,8 +929,10 @@ CONFIG_SSB_POSSIBLE=y | |||
861 | # | 929 | # |
862 | # Multifunction device drivers | 930 | # Multifunction device drivers |
863 | # | 931 | # |
932 | # CONFIG_MFD_CORE is not set | ||
864 | # CONFIG_MFD_SM501 is not set | 933 | # CONFIG_MFD_SM501 is not set |
865 | # CONFIG_HTC_PASIC3 is not set | 934 | # CONFIG_HTC_PASIC3 is not set |
935 | # CONFIG_MFD_TMIO is not set | ||
866 | 936 | ||
867 | # | 937 | # |
868 | # Multimedia devices | 938 | # Multimedia devices |
@@ -895,10 +965,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
895 | # Display device support | 965 | # Display device support |
896 | # | 966 | # |
897 | # CONFIG_DISPLAY_SUPPORT is not set | 967 | # CONFIG_DISPLAY_SUPPORT is not set |
898 | |||
899 | # | ||
900 | # Sound | ||
901 | # | ||
902 | # CONFIG_SOUND is not set | 968 | # CONFIG_SOUND is not set |
903 | CONFIG_USB_SUPPORT=y | 969 | CONFIG_USB_SUPPORT=y |
904 | CONFIG_USB_ARCH_HAS_HCD=y | 970 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -917,6 +983,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
917 | # CONFIG_USB_OTG is not set | 983 | # CONFIG_USB_OTG is not set |
918 | # CONFIG_USB_OTG_WHITELIST is not set | 984 | # CONFIG_USB_OTG_WHITELIST is not set |
919 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 985 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
986 | CONFIG_USB_MON=y | ||
920 | 987 | ||
921 | # | 988 | # |
922 | # USB Host Controller Drivers | 989 | # USB Host Controller Drivers |
@@ -960,6 +1027,7 @@ CONFIG_USB_STORAGE=y | |||
960 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1027 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
961 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1028 | # CONFIG_USB_STORAGE_ALAUDA is not set |
962 | # CONFIG_USB_STORAGE_KARMA is not set | 1029 | # CONFIG_USB_STORAGE_KARMA is not set |
1030 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
963 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1031 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
964 | # CONFIG_USB_LIBUSUAL is not set | 1032 | # CONFIG_USB_LIBUSUAL is not set |
965 | 1033 | ||
@@ -968,7 +1036,6 @@ CONFIG_USB_STORAGE=y | |||
968 | # | 1036 | # |
969 | # CONFIG_USB_MDC800 is not set | 1037 | # CONFIG_USB_MDC800 is not set |
970 | # CONFIG_USB_MICROTEK is not set | 1038 | # CONFIG_USB_MICROTEK is not set |
971 | CONFIG_USB_MON=y | ||
972 | 1039 | ||
973 | # | 1040 | # |
974 | # USB port drivers | 1041 | # USB port drivers |
@@ -981,7 +1048,6 @@ CONFIG_USB_MON=y | |||
981 | # CONFIG_USB_EMI62 is not set | 1048 | # CONFIG_USB_EMI62 is not set |
982 | # CONFIG_USB_EMI26 is not set | 1049 | # CONFIG_USB_EMI26 is not set |
983 | # CONFIG_USB_ADUTUX is not set | 1050 | # CONFIG_USB_ADUTUX is not set |
984 | # CONFIG_USB_AUERSWALD is not set | ||
985 | # CONFIG_USB_RIO500 is not set | 1051 | # CONFIG_USB_RIO500 is not set |
986 | # CONFIG_USB_LEGOTOWER is not set | 1052 | # CONFIG_USB_LEGOTOWER is not set |
987 | # CONFIG_USB_LCD is not set | 1053 | # CONFIG_USB_LCD is not set |
@@ -1035,10 +1101,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
1035 | # CONFIG_RTC_DRV_PCF8583 is not set | 1101 | # CONFIG_RTC_DRV_PCF8583 is not set |
1036 | # CONFIG_RTC_DRV_M41T80 is not set | 1102 | # CONFIG_RTC_DRV_M41T80 is not set |
1037 | # CONFIG_RTC_DRV_S35390A is not set | 1103 | # CONFIG_RTC_DRV_S35390A is not set |
1104 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1038 | 1105 | ||
1039 | # | 1106 | # |
1040 | # SPI RTC drivers | 1107 | # SPI RTC drivers |
1041 | # | 1108 | # |
1109 | # CONFIG_RTC_DRV_M41T94 is not set | ||
1110 | # CONFIG_RTC_DRV_DS1305 is not set | ||
1042 | # CONFIG_RTC_DRV_MAX6902 is not set | 1111 | # CONFIG_RTC_DRV_MAX6902 is not set |
1043 | # CONFIG_RTC_DRV_R9701 is not set | 1112 | # CONFIG_RTC_DRV_R9701 is not set |
1044 | # CONFIG_RTC_DRV_RS5C348 is not set | 1113 | # CONFIG_RTC_DRV_RS5C348 is not set |
@@ -1130,6 +1199,7 @@ CONFIG_TMPFS=y | |||
1130 | # CONFIG_CRAMFS is not set | 1199 | # CONFIG_CRAMFS is not set |
1131 | # CONFIG_VXFS_FS is not set | 1200 | # CONFIG_VXFS_FS is not set |
1132 | # CONFIG_MINIX_FS is not set | 1201 | # CONFIG_MINIX_FS is not set |
1202 | # CONFIG_OMFS_FS is not set | ||
1133 | # CONFIG_HPFS_FS is not set | 1203 | # CONFIG_HPFS_FS is not set |
1134 | # CONFIG_QNX4FS_FS is not set | 1204 | # CONFIG_QNX4FS_FS is not set |
1135 | # CONFIG_ROMFS_FS is not set | 1205 | # CONFIG_ROMFS_FS is not set |
@@ -1140,14 +1210,13 @@ CONFIG_NFS_FS=y | |||
1140 | CONFIG_NFS_V3=y | 1210 | CONFIG_NFS_V3=y |
1141 | # CONFIG_NFS_V3_ACL is not set | 1211 | # CONFIG_NFS_V3_ACL is not set |
1142 | CONFIG_NFS_V4=y | 1212 | CONFIG_NFS_V4=y |
1143 | # CONFIG_NFSD is not set | ||
1144 | CONFIG_ROOT_NFS=y | 1213 | CONFIG_ROOT_NFS=y |
1214 | # CONFIG_NFSD is not set | ||
1145 | CONFIG_LOCKD=y | 1215 | CONFIG_LOCKD=y |
1146 | CONFIG_LOCKD_V4=y | 1216 | CONFIG_LOCKD_V4=y |
1147 | CONFIG_NFS_COMMON=y | 1217 | CONFIG_NFS_COMMON=y |
1148 | CONFIG_SUNRPC=y | 1218 | CONFIG_SUNRPC=y |
1149 | CONFIG_SUNRPC_GSS=y | 1219 | CONFIG_SUNRPC_GSS=y |
1150 | # CONFIG_SUNRPC_BIND34 is not set | ||
1151 | CONFIG_RPCSEC_GSS_KRB5=y | 1220 | CONFIG_RPCSEC_GSS_KRB5=y |
1152 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1221 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1153 | # CONFIG_SMB_FS is not set | 1222 | # CONFIG_SMB_FS is not set |
@@ -1226,6 +1295,7 @@ CONFIG_BITREVERSE=y | |||
1226 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1295 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1227 | # CONFIG_CRC_CCITT is not set | 1296 | # CONFIG_CRC_CCITT is not set |
1228 | # CONFIG_CRC16 is not set | 1297 | # CONFIG_CRC16 is not set |
1298 | CONFIG_CRC_T10DIF=y | ||
1229 | # CONFIG_CRC_ITU_T is not set | 1299 | # CONFIG_CRC_ITU_T is not set |
1230 | CONFIG_CRC32=y | 1300 | CONFIG_CRC32=y |
1231 | # CONFIG_CRC7 is not set | 1301 | # CONFIG_CRC7 is not set |
@@ -1251,8 +1321,18 @@ CONFIG_FRAME_WARN=1024 | |||
1251 | # CONFIG_SLUB_DEBUG_ON is not set | 1321 | # CONFIG_SLUB_DEBUG_ON is not set |
1252 | # CONFIG_SLUB_STATS is not set | 1322 | # CONFIG_SLUB_STATS is not set |
1253 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1323 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1324 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1325 | # CONFIG_LATENCYTOP is not set | ||
1326 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1327 | CONFIG_HAVE_FTRACE=y | ||
1328 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1329 | # CONFIG_FTRACE is not set | ||
1330 | # CONFIG_SCHED_TRACER is not set | ||
1331 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1254 | # CONFIG_SAMPLES is not set | 1332 | # CONFIG_SAMPLES is not set |
1333 | CONFIG_HAVE_ARCH_KGDB=y | ||
1255 | # CONFIG_IRQSTACKS is not set | 1334 | # CONFIG_IRQSTACKS is not set |
1335 | # CONFIG_BOOTX_TEXT is not set | ||
1256 | # CONFIG_PPC_EARLY_DEBUG is not set | 1336 | # CONFIG_PPC_EARLY_DEBUG is not set |
1257 | 1337 | ||
1258 | # | 1338 | # |
@@ -1306,6 +1386,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1306 | # CONFIG_CRYPTO_MD4 is not set | 1386 | # CONFIG_CRYPTO_MD4 is not set |
1307 | CONFIG_CRYPTO_MD5=y | 1387 | CONFIG_CRYPTO_MD5=y |
1308 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1388 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1389 | # CONFIG_CRYPTO_RMD128 is not set | ||
1390 | # CONFIG_CRYPTO_RMD160 is not set | ||
1391 | # CONFIG_CRYPTO_RMD256 is not set | ||
1392 | # CONFIG_CRYPTO_RMD320 is not set | ||
1309 | # CONFIG_CRYPTO_SHA1 is not set | 1393 | # CONFIG_CRYPTO_SHA1 is not set |
1310 | # CONFIG_CRYPTO_SHA256 is not set | 1394 | # CONFIG_CRYPTO_SHA256 is not set |
1311 | # CONFIG_CRYPTO_SHA512 is not set | 1395 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1338,5 +1422,6 @@ CONFIG_CRYPTO_DES=y | |||
1338 | # CONFIG_CRYPTO_LZO is not set | 1422 | # CONFIG_CRYPTO_LZO is not set |
1339 | CONFIG_CRYPTO_HW=y | 1423 | CONFIG_CRYPTO_HW=y |
1340 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1424 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1425 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1341 | # CONFIG_PPC_CLOCK is not set | 1426 | # CONFIG_PPC_CLOCK is not set |
1342 | # CONFIG_VIRTUALIZATION is not set | 1427 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig index fdac4845bad9..a8afa39d6f76 100644 --- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:26 2008 | 4 | # Thu Aug 21 00:52:21 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
134 | 146 | ||
135 | # | 147 | # |
136 | # IO Schedulers | 148 | # IO Schedulers |
@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # | 161 | # |
150 | # Platform support | 162 | # Platform support |
151 | # | 163 | # |
152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
166 | CONFIG_MPC834x_ITX=y | 180 | CONFIG_MPC834x_ITX=y |
167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
182 | # CONFIG_MPC836x_RDK is not set | ||
168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
186 | # CONFIG_ASP834x is not set | ||
171 | CONFIG_PPC_MPC834x=y | 187 | CONFIG_PPC_MPC834x=y |
188 | # CONFIG_PPC_86xx is not set | ||
189 | # CONFIG_EMBEDDED6xx is not set | ||
190 | CONFIG_PPC_NATIVE=y | ||
191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
198 | CONFIG_RTAS_PROC=y | ||
177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
206 | # CONFIG_TAU is not set | ||
183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
184 | 208 | ||
185 | # | 209 | # |
@@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
232 | # CONFIG_KEXEC is not set | ||
208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
245 | CONFIG_MIGRATION=y | ||
220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
253 | CONFIG_EXTRA_TARGETS="" | ||
227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
231 | # | 258 | # |
232 | # Bus options | 259 | # Bus options |
233 | # | 260 | # |
261 | # CONFIG_ISA is not set | ||
234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
266 | CONFIG_FSL_PCI=y | ||
267 | CONFIG_PPC_PCI_CHOICE=y | ||
238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
@@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
259 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
261 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
262 | |||
263 | # | ||
264 | # Networking | ||
265 | # | ||
266 | CONFIG_NET=y | 292 | CONFIG_NET=y |
267 | 293 | ||
268 | # | 294 | # |
@@ -439,9 +465,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
439 | # CONFIG_MTD_UBI is not set | 465 | # CONFIG_MTD_UBI is not set |
440 | CONFIG_OF_DEVICE=y | 466 | CONFIG_OF_DEVICE=y |
441 | CONFIG_OF_I2C=y | 467 | CONFIG_OF_I2C=y |
468 | CONFIG_OF_SPI=y | ||
442 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
443 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
444 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
472 | # CONFIG_MAC_FLOPPY is not set | ||
445 | # CONFIG_BLK_CPQ_DA is not set | 473 | # CONFIG_BLK_CPQ_DA is not set |
446 | # CONFIG_BLK_CPQ_CISS_DA is not set | 474 | # CONFIG_BLK_CPQ_CISS_DA is not set |
447 | # CONFIG_BLK_DEV_DAC960 is not set | 475 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -458,12 +486,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
458 | # CONFIG_BLK_DEV_XIP is not set | 486 | # CONFIG_BLK_DEV_XIP is not set |
459 | # CONFIG_CDROM_PKTCDVD is not set | 487 | # CONFIG_CDROM_PKTCDVD is not set |
460 | # CONFIG_ATA_OVER_ETH is not set | 488 | # CONFIG_ATA_OVER_ETH is not set |
489 | # CONFIG_BLK_DEV_HD is not set | ||
461 | CONFIG_MISC_DEVICES=y | 490 | CONFIG_MISC_DEVICES=y |
462 | # CONFIG_PHANTOM is not set | 491 | # CONFIG_PHANTOM is not set |
463 | # CONFIG_EEPROM_93CX6 is not set | 492 | # CONFIG_EEPROM_93CX6 is not set |
464 | # CONFIG_SGI_IOC4 is not set | 493 | # CONFIG_SGI_IOC4 is not set |
465 | # CONFIG_TIFM_CORE is not set | 494 | # CONFIG_TIFM_CORE is not set |
466 | # CONFIG_ENCLOSURE_SERVICES is not set | 495 | # CONFIG_ENCLOSURE_SERVICES is not set |
496 | # CONFIG_HP_ILO is not set | ||
467 | CONFIG_HAVE_IDE=y | 497 | CONFIG_HAVE_IDE=y |
468 | # CONFIG_IDE is not set | 498 | # CONFIG_IDE is not set |
469 | 499 | ||
@@ -540,7 +570,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
540 | # CONFIG_SCSI_DC390T is not set | 570 | # CONFIG_SCSI_DC390T is not set |
541 | # CONFIG_SCSI_NSP32 is not set | 571 | # CONFIG_SCSI_NSP32 is not set |
542 | # CONFIG_SCSI_DEBUG is not set | 572 | # CONFIG_SCSI_DEBUG is not set |
573 | # CONFIG_SCSI_MESH is not set | ||
574 | # CONFIG_SCSI_MAC53C94 is not set | ||
543 | # CONFIG_SCSI_SRP is not set | 575 | # CONFIG_SCSI_SRP is not set |
576 | # CONFIG_SCSI_DH is not set | ||
544 | # CONFIG_ATA is not set | 577 | # CONFIG_ATA is not set |
545 | # CONFIG_MD is not set | 578 | # CONFIG_MD is not set |
546 | # CONFIG_FUSION is not set | 579 | # CONFIG_FUSION is not set |
@@ -548,12 +581,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
548 | # | 581 | # |
549 | # IEEE 1394 (FireWire) support | 582 | # IEEE 1394 (FireWire) support |
550 | # | 583 | # |
584 | |||
585 | # | ||
586 | # Enable only one of the two stacks, unless you know what you are doing | ||
587 | # | ||
551 | # CONFIG_FIREWIRE is not set | 588 | # CONFIG_FIREWIRE is not set |
552 | # CONFIG_IEEE1394 is not set | 589 | # CONFIG_IEEE1394 is not set |
553 | # CONFIG_I2O is not set | 590 | # CONFIG_I2O is not set |
554 | # CONFIG_MACINTOSH_DRIVERS is not set | 591 | # CONFIG_MACINTOSH_DRIVERS is not set |
555 | CONFIG_NETDEVICES=y | 592 | CONFIG_NETDEVICES=y |
556 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
557 | # CONFIG_DUMMY is not set | 593 | # CONFIG_DUMMY is not set |
558 | # CONFIG_BONDING is not set | 594 | # CONFIG_BONDING is not set |
559 | # CONFIG_MACVLAN is not set | 595 | # CONFIG_MACVLAN is not set |
@@ -584,7 +620,6 @@ CONFIG_NETDEV_1000=y | |||
584 | # CONFIG_DL2K is not set | 620 | # CONFIG_DL2K is not set |
585 | # CONFIG_E1000 is not set | 621 | # CONFIG_E1000 is not set |
586 | # CONFIG_E1000E is not set | 622 | # CONFIG_E1000E is not set |
587 | # CONFIG_E1000E_ENABLED is not set | ||
588 | # CONFIG_IP1000 is not set | 623 | # CONFIG_IP1000 is not set |
589 | # CONFIG_IGB is not set | 624 | # CONFIG_IGB is not set |
590 | # CONFIG_NS83820 is not set | 625 | # CONFIG_NS83820 is not set |
@@ -598,9 +633,10 @@ CONFIG_NETDEV_1000=y | |||
598 | # CONFIG_TIGON3 is not set | 633 | # CONFIG_TIGON3 is not set |
599 | # CONFIG_BNX2 is not set | 634 | # CONFIG_BNX2 is not set |
600 | CONFIG_GIANFAR=y | 635 | CONFIG_GIANFAR=y |
601 | CONFIG_GFAR_NAPI=y | 636 | # CONFIG_MV643XX_ETH is not set |
602 | # CONFIG_QLA3XXX is not set | 637 | # CONFIG_QLA3XXX is not set |
603 | # CONFIG_ATL1 is not set | 638 | # CONFIG_ATL1 is not set |
639 | # CONFIG_ATL1E is not set | ||
604 | CONFIG_NETDEV_10000=y | 640 | CONFIG_NETDEV_10000=y |
605 | # CONFIG_CHELSIO_T1 is not set | 641 | # CONFIG_CHELSIO_T1 is not set |
606 | # CONFIG_CHELSIO_T3 is not set | 642 | # CONFIG_CHELSIO_T3 is not set |
@@ -678,11 +714,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
678 | # CONFIG_SERIAL_UARTLITE is not set | 714 | # CONFIG_SERIAL_UARTLITE is not set |
679 | CONFIG_SERIAL_CORE=y | 715 | CONFIG_SERIAL_CORE=y |
680 | CONFIG_SERIAL_CORE_CONSOLE=y | 716 | CONFIG_SERIAL_CORE_CONSOLE=y |
717 | # CONFIG_SERIAL_PMACZILOG is not set | ||
681 | # CONFIG_SERIAL_JSM is not set | 718 | # CONFIG_SERIAL_JSM is not set |
682 | # CONFIG_SERIAL_OF_PLATFORM is not set | 719 | # CONFIG_SERIAL_OF_PLATFORM is not set |
683 | CONFIG_UNIX98_PTYS=y | 720 | CONFIG_UNIX98_PTYS=y |
684 | CONFIG_LEGACY_PTYS=y | 721 | CONFIG_LEGACY_PTYS=y |
685 | CONFIG_LEGACY_PTY_COUNT=256 | 722 | CONFIG_LEGACY_PTY_COUNT=256 |
723 | # CONFIG_BRIQ_PANEL is not set | ||
724 | # CONFIG_HVC_RTAS is not set | ||
686 | # CONFIG_IPMI_HANDLER is not set | 725 | # CONFIG_IPMI_HANDLER is not set |
687 | CONFIG_HW_RANDOM=y | 726 | CONFIG_HW_RANDOM=y |
688 | # CONFIG_NVRAM is not set | 727 | # CONFIG_NVRAM is not set |
@@ -694,43 +733,70 @@ CONFIG_DEVPORT=y | |||
694 | CONFIG_I2C=y | 733 | CONFIG_I2C=y |
695 | CONFIG_I2C_BOARDINFO=y | 734 | CONFIG_I2C_BOARDINFO=y |
696 | CONFIG_I2C_CHARDEV=y | 735 | CONFIG_I2C_CHARDEV=y |
736 | CONFIG_I2C_HELPER_AUTO=y | ||
697 | 737 | ||
698 | # | 738 | # |
699 | # I2C Hardware Bus support | 739 | # I2C Hardware Bus support |
700 | # | 740 | # |
741 | |||
742 | # | ||
743 | # PC SMBus host controller drivers | ||
744 | # | ||
701 | # CONFIG_I2C_ALI1535 is not set | 745 | # CONFIG_I2C_ALI1535 is not set |
702 | # CONFIG_I2C_ALI1563 is not set | 746 | # CONFIG_I2C_ALI1563 is not set |
703 | # CONFIG_I2C_ALI15X3 is not set | 747 | # CONFIG_I2C_ALI15X3 is not set |
704 | # CONFIG_I2C_AMD756 is not set | 748 | # CONFIG_I2C_AMD756 is not set |
705 | # CONFIG_I2C_AMD8111 is not set | 749 | # CONFIG_I2C_AMD8111 is not set |
706 | # CONFIG_I2C_I801 is not set | 750 | # CONFIG_I2C_I801 is not set |
707 | # CONFIG_I2C_I810 is not set | 751 | # CONFIG_I2C_ISCH is not set |
708 | # CONFIG_I2C_PIIX4 is not set | 752 | # CONFIG_I2C_PIIX4 is not set |
709 | CONFIG_I2C_MPC=y | ||
710 | # CONFIG_I2C_NFORCE2 is not set | 753 | # CONFIG_I2C_NFORCE2 is not set |
711 | # CONFIG_I2C_OCORES is not set | ||
712 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
713 | # CONFIG_I2C_PROSAVAGE is not set | ||
714 | # CONFIG_I2C_SAVAGE4 is not set | ||
715 | # CONFIG_I2C_SIMTEC is not set | ||
716 | # CONFIG_I2C_SIS5595 is not set | 754 | # CONFIG_I2C_SIS5595 is not set |
717 | # CONFIG_I2C_SIS630 is not set | 755 | # CONFIG_I2C_SIS630 is not set |
718 | # CONFIG_I2C_SIS96X is not set | 756 | # CONFIG_I2C_SIS96X is not set |
719 | # CONFIG_I2C_TAOS_EVM is not set | ||
720 | # CONFIG_I2C_STUB is not set | ||
721 | # CONFIG_I2C_TINY_USB is not set | ||
722 | # CONFIG_I2C_VIA is not set | 757 | # CONFIG_I2C_VIA is not set |
723 | # CONFIG_I2C_VIAPRO is not set | 758 | # CONFIG_I2C_VIAPRO is not set |
759 | |||
760 | # | ||
761 | # Mac SMBus host controller drivers | ||
762 | # | ||
763 | # CONFIG_I2C_HYDRA is not set | ||
764 | CONFIG_I2C_POWERMAC=y | ||
765 | |||
766 | # | ||
767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
768 | # | ||
769 | CONFIG_I2C_MPC=y | ||
770 | # CONFIG_I2C_OCORES is not set | ||
771 | # CONFIG_I2C_SIMTEC is not set | ||
772 | |||
773 | # | ||
774 | # External I2C/SMBus adapter drivers | ||
775 | # | ||
776 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
777 | # CONFIG_I2C_TAOS_EVM is not set | ||
778 | # CONFIG_I2C_TINY_USB is not set | ||
779 | |||
780 | # | ||
781 | # Graphics adapter I2C/DDC channel drivers | ||
782 | # | ||
724 | # CONFIG_I2C_VOODOO3 is not set | 783 | # CONFIG_I2C_VOODOO3 is not set |
784 | |||
785 | # | ||
786 | # Other I2C/SMBus bus drivers | ||
787 | # | ||
725 | # CONFIG_I2C_PCA_PLATFORM is not set | 788 | # CONFIG_I2C_PCA_PLATFORM is not set |
789 | # CONFIG_I2C_STUB is not set | ||
726 | 790 | ||
727 | # | 791 | # |
728 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
729 | # | 793 | # |
730 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
795 | # CONFIG_AT24 is not set | ||
731 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
732 | CONFIG_SENSORS_PCF8574=y | 797 | CONFIG_SENSORS_PCF8574=y |
733 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
799 | # CONFIG_SENSORS_PCA9539 is not set | ||
734 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
735 | # CONFIG_SENSORS_MAX6875 is not set | 801 | # CONFIG_SENSORS_MAX6875 is not set |
736 | # CONFIG_SENSORS_TSL2550 is not set | 802 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -753,10 +819,13 @@ CONFIG_SPI_MPC83xx=y | |||
753 | # CONFIG_SPI_AT25 is not set | 819 | # CONFIG_SPI_AT25 is not set |
754 | # CONFIG_SPI_SPIDEV is not set | 820 | # CONFIG_SPI_SPIDEV is not set |
755 | # CONFIG_SPI_TLE62X0 is not set | 821 | # CONFIG_SPI_TLE62X0 is not set |
822 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
823 | # CONFIG_GPIOLIB is not set | ||
756 | # CONFIG_W1 is not set | 824 | # CONFIG_W1 is not set |
757 | # CONFIG_POWER_SUPPLY is not set | 825 | # CONFIG_POWER_SUPPLY is not set |
758 | # CONFIG_HWMON is not set | 826 | # CONFIG_HWMON is not set |
759 | # CONFIG_THERMAL is not set | 827 | # CONFIG_THERMAL is not set |
828 | # CONFIG_THERMAL_HWMON is not set | ||
760 | CONFIG_WATCHDOG=y | 829 | CONFIG_WATCHDOG=y |
761 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 830 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
762 | 831 | ||
@@ -764,7 +833,9 @@ CONFIG_WATCHDOG=y | |||
764 | # Watchdog Device Drivers | 833 | # Watchdog Device Drivers |
765 | # | 834 | # |
766 | # CONFIG_SOFT_WATCHDOG is not set | 835 | # CONFIG_SOFT_WATCHDOG is not set |
767 | CONFIG_83xx_WDT=y | 836 | # CONFIG_ALIM7101_WDT is not set |
837 | # CONFIG_8xxx_WDT is not set | ||
838 | # CONFIG_WATCHDOG_RTAS is not set | ||
768 | 839 | ||
769 | # | 840 | # |
770 | # PCI-based Watchdog Cards | 841 | # PCI-based Watchdog Cards |
@@ -786,8 +857,10 @@ CONFIG_SSB_POSSIBLE=y | |||
786 | # | 857 | # |
787 | # Multifunction device drivers | 858 | # Multifunction device drivers |
788 | # | 859 | # |
860 | # CONFIG_MFD_CORE is not set | ||
789 | # CONFIG_MFD_SM501 is not set | 861 | # CONFIG_MFD_SM501 is not set |
790 | # CONFIG_HTC_PASIC3 is not set | 862 | # CONFIG_HTC_PASIC3 is not set |
863 | # CONFIG_MFD_TMIO is not set | ||
791 | 864 | ||
792 | # | 865 | # |
793 | # Multimedia devices | 866 | # Multimedia devices |
@@ -820,10 +893,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
820 | # Display device support | 893 | # Display device support |
821 | # | 894 | # |
822 | # CONFIG_DISPLAY_SUPPORT is not set | 895 | # CONFIG_DISPLAY_SUPPORT is not set |
823 | |||
824 | # | ||
825 | # Sound | ||
826 | # | ||
827 | # CONFIG_SOUND is not set | 896 | # CONFIG_SOUND is not set |
828 | CONFIG_USB_SUPPORT=y | 897 | CONFIG_USB_SUPPORT=y |
829 | CONFIG_USB_ARCH_HAS_HCD=y | 898 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -842,6 +911,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
842 | # CONFIG_USB_OTG is not set | 911 | # CONFIG_USB_OTG is not set |
843 | # CONFIG_USB_OTG_WHITELIST is not set | 912 | # CONFIG_USB_OTG_WHITELIST is not set |
844 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 913 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
914 | CONFIG_USB_MON=y | ||
845 | 915 | ||
846 | # | 916 | # |
847 | # USB Host Controller Drivers | 917 | # USB Host Controller Drivers |
@@ -885,6 +955,7 @@ CONFIG_USB_STORAGE=y | |||
885 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 955 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
886 | # CONFIG_USB_STORAGE_ALAUDA is not set | 956 | # CONFIG_USB_STORAGE_ALAUDA is not set |
887 | # CONFIG_USB_STORAGE_KARMA is not set | 957 | # CONFIG_USB_STORAGE_KARMA is not set |
958 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
888 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 959 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
889 | # CONFIG_USB_LIBUSUAL is not set | 960 | # CONFIG_USB_LIBUSUAL is not set |
890 | 961 | ||
@@ -893,7 +964,6 @@ CONFIG_USB_STORAGE=y | |||
893 | # | 964 | # |
894 | # CONFIG_USB_MDC800 is not set | 965 | # CONFIG_USB_MDC800 is not set |
895 | # CONFIG_USB_MICROTEK is not set | 966 | # CONFIG_USB_MICROTEK is not set |
896 | CONFIG_USB_MON=y | ||
897 | 967 | ||
898 | # | 968 | # |
899 | # USB port drivers | 969 | # USB port drivers |
@@ -906,7 +976,6 @@ CONFIG_USB_MON=y | |||
906 | # CONFIG_USB_EMI62 is not set | 976 | # CONFIG_USB_EMI62 is not set |
907 | # CONFIG_USB_EMI26 is not set | 977 | # CONFIG_USB_EMI26 is not set |
908 | # CONFIG_USB_ADUTUX is not set | 978 | # CONFIG_USB_ADUTUX is not set |
909 | # CONFIG_USB_AUERSWALD is not set | ||
910 | # CONFIG_USB_RIO500 is not set | 979 | # CONFIG_USB_RIO500 is not set |
911 | # CONFIG_USB_LEGOTOWER is not set | 980 | # CONFIG_USB_LEGOTOWER is not set |
912 | # CONFIG_USB_LCD is not set | 981 | # CONFIG_USB_LCD is not set |
@@ -959,10 +1028,13 @@ CONFIG_RTC_DRV_DS1307=y | |||
959 | # CONFIG_RTC_DRV_PCF8583 is not set | 1028 | # CONFIG_RTC_DRV_PCF8583 is not set |
960 | # CONFIG_RTC_DRV_M41T80 is not set | 1029 | # CONFIG_RTC_DRV_M41T80 is not set |
961 | # CONFIG_RTC_DRV_S35390A is not set | 1030 | # CONFIG_RTC_DRV_S35390A is not set |
1031 | # CONFIG_RTC_DRV_FM3130 is not set | ||
962 | 1032 | ||
963 | # | 1033 | # |
964 | # SPI RTC drivers | 1034 | # SPI RTC drivers |
965 | # | 1035 | # |
1036 | # CONFIG_RTC_DRV_M41T94 is not set | ||
1037 | # CONFIG_RTC_DRV_DS1305 is not set | ||
966 | # CONFIG_RTC_DRV_MAX6902 is not set | 1038 | # CONFIG_RTC_DRV_MAX6902 is not set |
967 | # CONFIG_RTC_DRV_R9701 is not set | 1039 | # CONFIG_RTC_DRV_R9701 is not set |
968 | # CONFIG_RTC_DRV_RS5C348 is not set | 1040 | # CONFIG_RTC_DRV_RS5C348 is not set |
@@ -1054,6 +1126,7 @@ CONFIG_TMPFS=y | |||
1054 | # CONFIG_CRAMFS is not set | 1126 | # CONFIG_CRAMFS is not set |
1055 | # CONFIG_VXFS_FS is not set | 1127 | # CONFIG_VXFS_FS is not set |
1056 | # CONFIG_MINIX_FS is not set | 1128 | # CONFIG_MINIX_FS is not set |
1129 | # CONFIG_OMFS_FS is not set | ||
1057 | # CONFIG_HPFS_FS is not set | 1130 | # CONFIG_HPFS_FS is not set |
1058 | # CONFIG_QNX4FS_FS is not set | 1131 | # CONFIG_QNX4FS_FS is not set |
1059 | # CONFIG_ROMFS_FS is not set | 1132 | # CONFIG_ROMFS_FS is not set |
@@ -1064,14 +1137,13 @@ CONFIG_NFS_FS=y | |||
1064 | CONFIG_NFS_V3=y | 1137 | CONFIG_NFS_V3=y |
1065 | # CONFIG_NFS_V3_ACL is not set | 1138 | # CONFIG_NFS_V3_ACL is not set |
1066 | CONFIG_NFS_V4=y | 1139 | CONFIG_NFS_V4=y |
1067 | # CONFIG_NFSD is not set | ||
1068 | CONFIG_ROOT_NFS=y | 1140 | CONFIG_ROOT_NFS=y |
1141 | # CONFIG_NFSD is not set | ||
1069 | CONFIG_LOCKD=y | 1142 | CONFIG_LOCKD=y |
1070 | CONFIG_LOCKD_V4=y | 1143 | CONFIG_LOCKD_V4=y |
1071 | CONFIG_NFS_COMMON=y | 1144 | CONFIG_NFS_COMMON=y |
1072 | CONFIG_SUNRPC=y | 1145 | CONFIG_SUNRPC=y |
1073 | CONFIG_SUNRPC_GSS=y | 1146 | CONFIG_SUNRPC_GSS=y |
1074 | # CONFIG_SUNRPC_BIND34 is not set | ||
1075 | CONFIG_RPCSEC_GSS_KRB5=y | 1147 | CONFIG_RPCSEC_GSS_KRB5=y |
1076 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1148 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1077 | # CONFIG_SMB_FS is not set | 1149 | # CONFIG_SMB_FS is not set |
@@ -1150,6 +1222,7 @@ CONFIG_BITREVERSE=y | |||
1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1222 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1151 | # CONFIG_CRC_CCITT is not set | 1223 | # CONFIG_CRC_CCITT is not set |
1152 | # CONFIG_CRC16 is not set | 1224 | # CONFIG_CRC16 is not set |
1225 | CONFIG_CRC_T10DIF=y | ||
1153 | # CONFIG_CRC_ITU_T is not set | 1226 | # CONFIG_CRC_ITU_T is not set |
1154 | CONFIG_CRC32=y | 1227 | CONFIG_CRC32=y |
1155 | # CONFIG_CRC7 is not set | 1228 | # CONFIG_CRC7 is not set |
@@ -1175,8 +1248,18 @@ CONFIG_FRAME_WARN=1024 | |||
1175 | # CONFIG_SLUB_DEBUG_ON is not set | 1248 | # CONFIG_SLUB_DEBUG_ON is not set |
1176 | # CONFIG_SLUB_STATS is not set | 1249 | # CONFIG_SLUB_STATS is not set |
1177 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1250 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1251 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1252 | # CONFIG_LATENCYTOP is not set | ||
1253 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1254 | CONFIG_HAVE_FTRACE=y | ||
1255 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1256 | # CONFIG_FTRACE is not set | ||
1257 | # CONFIG_SCHED_TRACER is not set | ||
1258 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1178 | # CONFIG_SAMPLES is not set | 1259 | # CONFIG_SAMPLES is not set |
1260 | CONFIG_HAVE_ARCH_KGDB=y | ||
1179 | # CONFIG_IRQSTACKS is not set | 1261 | # CONFIG_IRQSTACKS is not set |
1262 | # CONFIG_BOOTX_TEXT is not set | ||
1180 | # CONFIG_PPC_EARLY_DEBUG is not set | 1263 | # CONFIG_PPC_EARLY_DEBUG is not set |
1181 | 1264 | ||
1182 | # | 1265 | # |
@@ -1230,6 +1313,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1230 | # CONFIG_CRYPTO_MD4 is not set | 1313 | # CONFIG_CRYPTO_MD4 is not set |
1231 | CONFIG_CRYPTO_MD5=y | 1314 | CONFIG_CRYPTO_MD5=y |
1232 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1315 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1316 | # CONFIG_CRYPTO_RMD128 is not set | ||
1317 | # CONFIG_CRYPTO_RMD160 is not set | ||
1318 | # CONFIG_CRYPTO_RMD256 is not set | ||
1319 | # CONFIG_CRYPTO_RMD320 is not set | ||
1233 | # CONFIG_CRYPTO_SHA1 is not set | 1320 | # CONFIG_CRYPTO_SHA1 is not set |
1234 | # CONFIG_CRYPTO_SHA256 is not set | 1321 | # CONFIG_CRYPTO_SHA256 is not set |
1235 | # CONFIG_CRYPTO_SHA512 is not set | 1322 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1262,5 +1349,6 @@ CONFIG_CRYPTO_DES=y | |||
1262 | # CONFIG_CRYPTO_LZO is not set | 1349 | # CONFIG_CRYPTO_LZO is not set |
1263 | CONFIG_CRYPTO_HW=y | 1350 | CONFIG_CRYPTO_HW=y |
1264 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1351 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1352 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1265 | # CONFIG_PPC_CLOCK is not set | 1353 | # CONFIG_PPC_CLOCK is not set |
1266 | # CONFIG_VIRTUALIZATION is not set | 1354 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig index c82e96e984fc..24c320a36670 100644 --- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:26 2008 | 4 | # Thu Aug 21 00:52:21 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
134 | 146 | ||
135 | # | 147 | # |
136 | # IO Schedulers | 148 | # IO Schedulers |
@@ -149,37 +161,49 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # | 161 | # |
150 | # Platform support | 162 | # Platform support |
151 | # | 163 | # |
152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
165 | CONFIG_MPC834x_MDS=y | 179 | CONFIG_MPC834x_MDS=y |
166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
167 | # CONFIG_MPC836x_MDS is not set | 181 | # CONFIG_MPC836x_MDS is not set |
182 | # CONFIG_MPC836x_RDK is not set | ||
168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
186 | # CONFIG_ASP834x is not set | ||
171 | CONFIG_PPC_MPC834x=y | 187 | CONFIG_PPC_MPC834x=y |
188 | # CONFIG_PPC_86xx is not set | ||
189 | # CONFIG_EMBEDDED6xx is not set | ||
190 | CONFIG_PPC_NATIVE=y | ||
191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
172 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
173 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
174 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
175 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
176 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
198 | CONFIG_RTAS_PROC=y | ||
177 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
178 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
179 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
180 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
181 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
182 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
206 | # CONFIG_TAU is not set | ||
183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
184 | 208 | ||
185 | # | 209 | # |
@@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
232 | # CONFIG_KEXEC is not set | ||
208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
245 | CONFIG_MIGRATION=y | ||
220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
253 | CONFIG_EXTRA_TARGETS="" | ||
227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
231 | # | 258 | # |
232 | # Bus options | 259 | # Bus options |
233 | # | 260 | # |
261 | # CONFIG_ISA is not set | ||
234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
266 | CONFIG_FSL_PCI=y | ||
267 | CONFIG_PPC_PCI_CHOICE=y | ||
238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
@@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
259 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
261 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
262 | |||
263 | # | ||
264 | # Networking | ||
265 | # | ||
266 | CONFIG_NET=y | 292 | CONFIG_NET=y |
267 | 293 | ||
268 | # | 294 | # |
@@ -363,6 +389,7 @@ CONFIG_OF_I2C=y | |||
363 | # CONFIG_PARPORT is not set | 389 | # CONFIG_PARPORT is not set |
364 | CONFIG_BLK_DEV=y | 390 | CONFIG_BLK_DEV=y |
365 | # CONFIG_BLK_DEV_FD is not set | 391 | # CONFIG_BLK_DEV_FD is not set |
392 | # CONFIG_MAC_FLOPPY is not set | ||
366 | # CONFIG_BLK_CPQ_DA is not set | 393 | # CONFIG_BLK_CPQ_DA is not set |
367 | # CONFIG_BLK_CPQ_CISS_DA is not set | 394 | # CONFIG_BLK_CPQ_CISS_DA is not set |
368 | # CONFIG_BLK_DEV_DAC960 is not set | 395 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -378,12 +405,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
378 | # CONFIG_BLK_DEV_XIP is not set | 405 | # CONFIG_BLK_DEV_XIP is not set |
379 | # CONFIG_CDROM_PKTCDVD is not set | 406 | # CONFIG_CDROM_PKTCDVD is not set |
380 | # CONFIG_ATA_OVER_ETH is not set | 407 | # CONFIG_ATA_OVER_ETH is not set |
408 | # CONFIG_BLK_DEV_HD is not set | ||
381 | CONFIG_MISC_DEVICES=y | 409 | CONFIG_MISC_DEVICES=y |
382 | # CONFIG_PHANTOM is not set | 410 | # CONFIG_PHANTOM is not set |
383 | # CONFIG_EEPROM_93CX6 is not set | 411 | # CONFIG_EEPROM_93CX6 is not set |
384 | # CONFIG_SGI_IOC4 is not set | 412 | # CONFIG_SGI_IOC4 is not set |
385 | # CONFIG_TIFM_CORE is not set | 413 | # CONFIG_TIFM_CORE is not set |
386 | # CONFIG_ENCLOSURE_SERVICES is not set | 414 | # CONFIG_ENCLOSURE_SERVICES is not set |
415 | # CONFIG_HP_ILO is not set | ||
387 | CONFIG_HAVE_IDE=y | 416 | CONFIG_HAVE_IDE=y |
388 | # CONFIG_IDE is not set | 417 | # CONFIG_IDE is not set |
389 | 418 | ||
@@ -401,12 +430,15 @@ CONFIG_HAVE_IDE=y | |||
401 | # | 430 | # |
402 | # IEEE 1394 (FireWire) support | 431 | # IEEE 1394 (FireWire) support |
403 | # | 432 | # |
433 | |||
434 | # | ||
435 | # Enable only one of the two stacks, unless you know what you are doing | ||
436 | # | ||
404 | # CONFIG_FIREWIRE is not set | 437 | # CONFIG_FIREWIRE is not set |
405 | # CONFIG_IEEE1394 is not set | 438 | # CONFIG_IEEE1394 is not set |
406 | # CONFIG_I2O is not set | 439 | # CONFIG_I2O is not set |
407 | # CONFIG_MACINTOSH_DRIVERS is not set | 440 | # CONFIG_MACINTOSH_DRIVERS is not set |
408 | CONFIG_NETDEVICES=y | 441 | CONFIG_NETDEVICES=y |
409 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
410 | # CONFIG_DUMMY is not set | 442 | # CONFIG_DUMMY is not set |
411 | # CONFIG_BONDING is not set | 443 | # CONFIG_BONDING is not set |
412 | # CONFIG_MACVLAN is not set | 444 | # CONFIG_MACVLAN is not set |
@@ -433,6 +465,8 @@ CONFIG_MARVELL_PHY=y | |||
433 | # CONFIG_MDIO_BITBANG is not set | 465 | # CONFIG_MDIO_BITBANG is not set |
434 | CONFIG_NET_ETHERNET=y | 466 | CONFIG_NET_ETHERNET=y |
435 | CONFIG_MII=y | 467 | CONFIG_MII=y |
468 | # CONFIG_MACE is not set | ||
469 | # CONFIG_BMAC is not set | ||
436 | # CONFIG_HAPPYMEAL is not set | 470 | # CONFIG_HAPPYMEAL is not set |
437 | # CONFIG_SUNGEM is not set | 471 | # CONFIG_SUNGEM is not set |
438 | # CONFIG_CASSINI is not set | 472 | # CONFIG_CASSINI is not set |
@@ -468,7 +502,6 @@ CONFIG_NETDEV_1000=y | |||
468 | # CONFIG_DL2K is not set | 502 | # CONFIG_DL2K is not set |
469 | # CONFIG_E1000 is not set | 503 | # CONFIG_E1000 is not set |
470 | # CONFIG_E1000E is not set | 504 | # CONFIG_E1000E is not set |
471 | # CONFIG_E1000E_ENABLED is not set | ||
472 | # CONFIG_IP1000 is not set | 505 | # CONFIG_IP1000 is not set |
473 | # CONFIG_IGB is not set | 506 | # CONFIG_IGB is not set |
474 | # CONFIG_NS83820 is not set | 507 | # CONFIG_NS83820 is not set |
@@ -482,9 +515,10 @@ CONFIG_NETDEV_1000=y | |||
482 | # CONFIG_TIGON3 is not set | 515 | # CONFIG_TIGON3 is not set |
483 | # CONFIG_BNX2 is not set | 516 | # CONFIG_BNX2 is not set |
484 | CONFIG_GIANFAR=y | 517 | CONFIG_GIANFAR=y |
485 | # CONFIG_GFAR_NAPI is not set | 518 | # CONFIG_MV643XX_ETH is not set |
486 | # CONFIG_QLA3XXX is not set | 519 | # CONFIG_QLA3XXX is not set |
487 | # CONFIG_ATL1 is not set | 520 | # CONFIG_ATL1 is not set |
521 | # CONFIG_ATL1E is not set | ||
488 | CONFIG_NETDEV_10000=y | 522 | CONFIG_NETDEV_10000=y |
489 | # CONFIG_CHELSIO_T1 is not set | 523 | # CONFIG_CHELSIO_T1 is not set |
490 | # CONFIG_CHELSIO_T3 is not set | 524 | # CONFIG_CHELSIO_T3 is not set |
@@ -572,11 +606,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
572 | # CONFIG_SERIAL_UARTLITE is not set | 606 | # CONFIG_SERIAL_UARTLITE is not set |
573 | CONFIG_SERIAL_CORE=y | 607 | CONFIG_SERIAL_CORE=y |
574 | CONFIG_SERIAL_CORE_CONSOLE=y | 608 | CONFIG_SERIAL_CORE_CONSOLE=y |
609 | # CONFIG_SERIAL_PMACZILOG is not set | ||
575 | # CONFIG_SERIAL_JSM is not set | 610 | # CONFIG_SERIAL_JSM is not set |
576 | # CONFIG_SERIAL_OF_PLATFORM is not set | 611 | # CONFIG_SERIAL_OF_PLATFORM is not set |
577 | CONFIG_UNIX98_PTYS=y | 612 | CONFIG_UNIX98_PTYS=y |
578 | CONFIG_LEGACY_PTYS=y | 613 | CONFIG_LEGACY_PTYS=y |
579 | CONFIG_LEGACY_PTY_COUNT=256 | 614 | CONFIG_LEGACY_PTY_COUNT=256 |
615 | # CONFIG_BRIQ_PANEL is not set | ||
616 | # CONFIG_HVC_RTAS is not set | ||
580 | # CONFIG_IPMI_HANDLER is not set | 617 | # CONFIG_IPMI_HANDLER is not set |
581 | # CONFIG_HW_RANDOM is not set | 618 | # CONFIG_HW_RANDOM is not set |
582 | # CONFIG_NVRAM is not set | 619 | # CONFIG_NVRAM is not set |
@@ -588,42 +625,69 @@ CONFIG_DEVPORT=y | |||
588 | CONFIG_I2C=y | 625 | CONFIG_I2C=y |
589 | CONFIG_I2C_BOARDINFO=y | 626 | CONFIG_I2C_BOARDINFO=y |
590 | CONFIG_I2C_CHARDEV=y | 627 | CONFIG_I2C_CHARDEV=y |
628 | CONFIG_I2C_HELPER_AUTO=y | ||
591 | 629 | ||
592 | # | 630 | # |
593 | # I2C Hardware Bus support | 631 | # I2C Hardware Bus support |
594 | # | 632 | # |
633 | |||
634 | # | ||
635 | # PC SMBus host controller drivers | ||
636 | # | ||
595 | # CONFIG_I2C_ALI1535 is not set | 637 | # CONFIG_I2C_ALI1535 is not set |
596 | # CONFIG_I2C_ALI1563 is not set | 638 | # CONFIG_I2C_ALI1563 is not set |
597 | # CONFIG_I2C_ALI15X3 is not set | 639 | # CONFIG_I2C_ALI15X3 is not set |
598 | # CONFIG_I2C_AMD756 is not set | 640 | # CONFIG_I2C_AMD756 is not set |
599 | # CONFIG_I2C_AMD8111 is not set | 641 | # CONFIG_I2C_AMD8111 is not set |
600 | # CONFIG_I2C_I801 is not set | 642 | # CONFIG_I2C_I801 is not set |
601 | # CONFIG_I2C_I810 is not set | 643 | # CONFIG_I2C_ISCH is not set |
602 | # CONFIG_I2C_PIIX4 is not set | 644 | # CONFIG_I2C_PIIX4 is not set |
603 | CONFIG_I2C_MPC=y | ||
604 | # CONFIG_I2C_NFORCE2 is not set | 645 | # CONFIG_I2C_NFORCE2 is not set |
605 | # CONFIG_I2C_OCORES is not set | ||
606 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
607 | # CONFIG_I2C_PROSAVAGE is not set | ||
608 | # CONFIG_I2C_SAVAGE4 is not set | ||
609 | # CONFIG_I2C_SIMTEC is not set | ||
610 | # CONFIG_I2C_SIS5595 is not set | 646 | # CONFIG_I2C_SIS5595 is not set |
611 | # CONFIG_I2C_SIS630 is not set | 647 | # CONFIG_I2C_SIS630 is not set |
612 | # CONFIG_I2C_SIS96X is not set | 648 | # CONFIG_I2C_SIS96X is not set |
613 | # CONFIG_I2C_TAOS_EVM is not set | ||
614 | # CONFIG_I2C_STUB is not set | ||
615 | # CONFIG_I2C_VIA is not set | 649 | # CONFIG_I2C_VIA is not set |
616 | # CONFIG_I2C_VIAPRO is not set | 650 | # CONFIG_I2C_VIAPRO is not set |
651 | |||
652 | # | ||
653 | # Mac SMBus host controller drivers | ||
654 | # | ||
655 | # CONFIG_I2C_HYDRA is not set | ||
656 | CONFIG_I2C_POWERMAC=y | ||
657 | |||
658 | # | ||
659 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
660 | # | ||
661 | CONFIG_I2C_MPC=y | ||
662 | # CONFIG_I2C_OCORES is not set | ||
663 | # CONFIG_I2C_SIMTEC is not set | ||
664 | |||
665 | # | ||
666 | # External I2C/SMBus adapter drivers | ||
667 | # | ||
668 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
669 | # CONFIG_I2C_TAOS_EVM is not set | ||
670 | |||
671 | # | ||
672 | # Graphics adapter I2C/DDC channel drivers | ||
673 | # | ||
617 | # CONFIG_I2C_VOODOO3 is not set | 674 | # CONFIG_I2C_VOODOO3 is not set |
675 | |||
676 | # | ||
677 | # Other I2C/SMBus bus drivers | ||
678 | # | ||
618 | # CONFIG_I2C_PCA_PLATFORM is not set | 679 | # CONFIG_I2C_PCA_PLATFORM is not set |
680 | # CONFIG_I2C_STUB is not set | ||
619 | 681 | ||
620 | # | 682 | # |
621 | # Miscellaneous I2C Chip support | 683 | # Miscellaneous I2C Chip support |
622 | # | 684 | # |
623 | # CONFIG_DS1682 is not set | 685 | # CONFIG_DS1682 is not set |
686 | # CONFIG_AT24 is not set | ||
624 | # CONFIG_SENSORS_EEPROM is not set | 687 | # CONFIG_SENSORS_EEPROM is not set |
625 | # CONFIG_SENSORS_PCF8574 is not set | 688 | # CONFIG_SENSORS_PCF8574 is not set |
626 | # CONFIG_PCF8575 is not set | 689 | # CONFIG_PCF8575 is not set |
690 | # CONFIG_SENSORS_PCA9539 is not set | ||
627 | # CONFIG_SENSORS_PCF8591 is not set | 691 | # CONFIG_SENSORS_PCF8591 is not set |
628 | # CONFIG_SENSORS_MAX6875 is not set | 692 | # CONFIG_SENSORS_MAX6875 is not set |
629 | # CONFIG_SENSORS_TSL2550 is not set | 693 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -632,10 +696,13 @@ CONFIG_I2C_MPC=y | |||
632 | # CONFIG_I2C_DEBUG_BUS is not set | 696 | # CONFIG_I2C_DEBUG_BUS is not set |
633 | # CONFIG_I2C_DEBUG_CHIP is not set | 697 | # CONFIG_I2C_DEBUG_CHIP is not set |
634 | # CONFIG_SPI is not set | 698 | # CONFIG_SPI is not set |
699 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
700 | # CONFIG_GPIOLIB is not set | ||
635 | # CONFIG_W1 is not set | 701 | # CONFIG_W1 is not set |
636 | # CONFIG_POWER_SUPPLY is not set | 702 | # CONFIG_POWER_SUPPLY is not set |
637 | CONFIG_HWMON=y | 703 | CONFIG_HWMON=y |
638 | # CONFIG_HWMON_VID is not set | 704 | # CONFIG_HWMON_VID is not set |
705 | # CONFIG_SENSORS_AD7414 is not set | ||
639 | # CONFIG_SENSORS_AD7418 is not set | 706 | # CONFIG_SENSORS_AD7418 is not set |
640 | # CONFIG_SENSORS_ADM1021 is not set | 707 | # CONFIG_SENSORS_ADM1021 is not set |
641 | # CONFIG_SENSORS_ADM1025 is not set | 708 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -645,6 +712,7 @@ CONFIG_HWMON=y | |||
645 | # CONFIG_SENSORS_ADM9240 is not set | 712 | # CONFIG_SENSORS_ADM9240 is not set |
646 | # CONFIG_SENSORS_ADT7470 is not set | 713 | # CONFIG_SENSORS_ADT7470 is not set |
647 | # CONFIG_SENSORS_ADT7473 is not set | 714 | # CONFIG_SENSORS_ADT7473 is not set |
715 | # CONFIG_SENSORS_AMS is not set | ||
648 | # CONFIG_SENSORS_ATXP1 is not set | 716 | # CONFIG_SENSORS_ATXP1 is not set |
649 | # CONFIG_SENSORS_DS1621 is not set | 717 | # CONFIG_SENSORS_DS1621 is not set |
650 | # CONFIG_SENSORS_I5K_AMB is not set | 718 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -689,6 +757,7 @@ CONFIG_HWMON=y | |||
689 | # CONFIG_SENSORS_W83627EHF is not set | 757 | # CONFIG_SENSORS_W83627EHF is not set |
690 | # CONFIG_HWMON_DEBUG_CHIP is not set | 758 | # CONFIG_HWMON_DEBUG_CHIP is not set |
691 | # CONFIG_THERMAL is not set | 759 | # CONFIG_THERMAL is not set |
760 | # CONFIG_THERMAL_HWMON is not set | ||
692 | CONFIG_WATCHDOG=y | 761 | CONFIG_WATCHDOG=y |
693 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 762 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
694 | 763 | ||
@@ -696,7 +765,9 @@ CONFIG_WATCHDOG=y | |||
696 | # Watchdog Device Drivers | 765 | # Watchdog Device Drivers |
697 | # | 766 | # |
698 | # CONFIG_SOFT_WATCHDOG is not set | 767 | # CONFIG_SOFT_WATCHDOG is not set |
699 | CONFIG_83xx_WDT=y | 768 | # CONFIG_ALIM7101_WDT is not set |
769 | # CONFIG_8xxx_WDT is not set | ||
770 | # CONFIG_WATCHDOG_RTAS is not set | ||
700 | 771 | ||
701 | # | 772 | # |
702 | # PCI-based Watchdog Cards | 773 | # PCI-based Watchdog Cards |
@@ -713,8 +784,10 @@ CONFIG_SSB_POSSIBLE=y | |||
713 | # | 784 | # |
714 | # Multifunction device drivers | 785 | # Multifunction device drivers |
715 | # | 786 | # |
787 | # CONFIG_MFD_CORE is not set | ||
716 | # CONFIG_MFD_SM501 is not set | 788 | # CONFIG_MFD_SM501 is not set |
717 | # CONFIG_HTC_PASIC3 is not set | 789 | # CONFIG_HTC_PASIC3 is not set |
790 | # CONFIG_MFD_TMIO is not set | ||
718 | 791 | ||
719 | # | 792 | # |
720 | # Multimedia devices | 793 | # Multimedia devices |
@@ -746,10 +819,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
746 | # Display device support | 819 | # Display device support |
747 | # | 820 | # |
748 | # CONFIG_DISPLAY_SUPPORT is not set | 821 | # CONFIG_DISPLAY_SUPPORT is not set |
749 | |||
750 | # | ||
751 | # Sound | ||
752 | # | ||
753 | # CONFIG_SOUND is not set | 822 | # CONFIG_SOUND is not set |
754 | CONFIG_HID_SUPPORT=y | 823 | CONFIG_HID_SUPPORT=y |
755 | CONFIG_HID=y | 824 | CONFIG_HID=y |
@@ -764,6 +833,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
764 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 833 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
765 | 834 | ||
766 | # | 835 | # |
836 | # Enable Host or Gadget support to see Inventra options | ||
837 | # | ||
838 | |||
839 | # | ||
767 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 840 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
768 | # | 841 | # |
769 | # CONFIG_USB_GADGET is not set | 842 | # CONFIG_USB_GADGET is not set |
@@ -802,6 +875,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
802 | # CONFIG_RTC_DRV_PCF8583 is not set | 875 | # CONFIG_RTC_DRV_PCF8583 is not set |
803 | # CONFIG_RTC_DRV_M41T80 is not set | 876 | # CONFIG_RTC_DRV_M41T80 is not set |
804 | # CONFIG_RTC_DRV_S35390A is not set | 877 | # CONFIG_RTC_DRV_S35390A is not set |
878 | # CONFIG_RTC_DRV_FM3130 is not set | ||
805 | 879 | ||
806 | # | 880 | # |
807 | # SPI RTC drivers | 881 | # SPI RTC drivers |
@@ -890,6 +964,7 @@ CONFIG_TMPFS=y | |||
890 | # CONFIG_CRAMFS is not set | 964 | # CONFIG_CRAMFS is not set |
891 | # CONFIG_VXFS_FS is not set | 965 | # CONFIG_VXFS_FS is not set |
892 | # CONFIG_MINIX_FS is not set | 966 | # CONFIG_MINIX_FS is not set |
967 | # CONFIG_OMFS_FS is not set | ||
893 | # CONFIG_HPFS_FS is not set | 968 | # CONFIG_HPFS_FS is not set |
894 | # CONFIG_QNX4FS_FS is not set | 969 | # CONFIG_QNX4FS_FS is not set |
895 | # CONFIG_ROMFS_FS is not set | 970 | # CONFIG_ROMFS_FS is not set |
@@ -900,14 +975,13 @@ CONFIG_NFS_FS=y | |||
900 | CONFIG_NFS_V3=y | 975 | CONFIG_NFS_V3=y |
901 | # CONFIG_NFS_V3_ACL is not set | 976 | # CONFIG_NFS_V3_ACL is not set |
902 | CONFIG_NFS_V4=y | 977 | CONFIG_NFS_V4=y |
903 | # CONFIG_NFSD is not set | ||
904 | CONFIG_ROOT_NFS=y | 978 | CONFIG_ROOT_NFS=y |
979 | # CONFIG_NFSD is not set | ||
905 | CONFIG_LOCKD=y | 980 | CONFIG_LOCKD=y |
906 | CONFIG_LOCKD_V4=y | 981 | CONFIG_LOCKD_V4=y |
907 | CONFIG_NFS_COMMON=y | 982 | CONFIG_NFS_COMMON=y |
908 | CONFIG_SUNRPC=y | 983 | CONFIG_SUNRPC=y |
909 | CONFIG_SUNRPC_GSS=y | 984 | CONFIG_SUNRPC_GSS=y |
910 | # CONFIG_SUNRPC_BIND34 is not set | ||
911 | CONFIG_RPCSEC_GSS_KRB5=y | 985 | CONFIG_RPCSEC_GSS_KRB5=y |
912 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 986 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
913 | # CONFIG_SMB_FS is not set | 987 | # CONFIG_SMB_FS is not set |
@@ -943,6 +1017,7 @@ CONFIG_BITREVERSE=y | |||
943 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1017 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
944 | # CONFIG_CRC_CCITT is not set | 1018 | # CONFIG_CRC_CCITT is not set |
945 | # CONFIG_CRC16 is not set | 1019 | # CONFIG_CRC16 is not set |
1020 | # CONFIG_CRC_T10DIF is not set | ||
946 | # CONFIG_CRC_ITU_T is not set | 1021 | # CONFIG_CRC_ITU_T is not set |
947 | CONFIG_CRC32=y | 1022 | CONFIG_CRC32=y |
948 | # CONFIG_CRC7 is not set | 1023 | # CONFIG_CRC7 is not set |
@@ -968,8 +1043,18 @@ CONFIG_FRAME_WARN=1024 | |||
968 | # CONFIG_SLUB_DEBUG_ON is not set | 1043 | # CONFIG_SLUB_DEBUG_ON is not set |
969 | # CONFIG_SLUB_STATS is not set | 1044 | # CONFIG_SLUB_STATS is not set |
970 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1045 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1046 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1047 | # CONFIG_LATENCYTOP is not set | ||
1048 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1049 | CONFIG_HAVE_FTRACE=y | ||
1050 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1051 | # CONFIG_FTRACE is not set | ||
1052 | # CONFIG_SCHED_TRACER is not set | ||
1053 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
971 | # CONFIG_SAMPLES is not set | 1054 | # CONFIG_SAMPLES is not set |
1055 | CONFIG_HAVE_ARCH_KGDB=y | ||
972 | # CONFIG_IRQSTACKS is not set | 1056 | # CONFIG_IRQSTACKS is not set |
1057 | # CONFIG_BOOTX_TEXT is not set | ||
973 | # CONFIG_PPC_EARLY_DEBUG is not set | 1058 | # CONFIG_PPC_EARLY_DEBUG is not set |
974 | 1059 | ||
975 | # | 1060 | # |
@@ -1023,6 +1108,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1023 | # CONFIG_CRYPTO_MD4 is not set | 1108 | # CONFIG_CRYPTO_MD4 is not set |
1024 | CONFIG_CRYPTO_MD5=y | 1109 | CONFIG_CRYPTO_MD5=y |
1025 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1110 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1111 | # CONFIG_CRYPTO_RMD128 is not set | ||
1112 | # CONFIG_CRYPTO_RMD160 is not set | ||
1113 | # CONFIG_CRYPTO_RMD256 is not set | ||
1114 | # CONFIG_CRYPTO_RMD320 is not set | ||
1026 | # CONFIG_CRYPTO_SHA1 is not set | 1115 | # CONFIG_CRYPTO_SHA1 is not set |
1027 | # CONFIG_CRYPTO_SHA256 is not set | 1116 | # CONFIG_CRYPTO_SHA256 is not set |
1028 | # CONFIG_CRYPTO_SHA512 is not set | 1117 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1055,5 +1144,6 @@ CONFIG_CRYPTO_DES=y | |||
1055 | # CONFIG_CRYPTO_LZO is not set | 1144 | # CONFIG_CRYPTO_LZO is not set |
1056 | CONFIG_CRYPTO_HW=y | 1145 | CONFIG_CRYPTO_HW=y |
1057 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1147 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1058 | # CONFIG_PPC_CLOCK is not set | 1148 | # CONFIG_PPC_CLOCK is not set |
1059 | # CONFIG_VIRTUALIZATION is not set | 1149 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig index 20fd9f58cf42..e029e9e14622 100644 --- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:27 2008 | 4 | # Thu Aug 21 00:52:22 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -111,10 +116,16 @@ CONFIG_SLUB=y | |||
111 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
114 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
115 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
116 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
117 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
118 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
119 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
120 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -125,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
125 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
126 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
127 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
128 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
129 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
130 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
131 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
132 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
134 | 146 | ||
135 | # | 147 | # |
136 | # IO Schedulers | 148 | # IO Schedulers |
@@ -149,36 +161,48 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # | 161 | # |
150 | # Platform support | 162 | # Platform support |
151 | # | 163 | # |
152 | # CONFIG_PPC_MULTIPLATFORM is not set | 164 | CONFIG_PPC_MULTIPLATFORM=y |
153 | # CONFIG_PPC_82xx is not set | 165 | CONFIG_CLASSIC32=y |
154 | CONFIG_PPC_83xx=y | 166 | CONFIG_PPC_CHRP=y |
155 | # CONFIG_PPC_86xx is not set | 167 | # CONFIG_MPC5121_ADS is not set |
156 | # CONFIG_PPC_MPC512x is not set | 168 | # CONFIG_MPC5121_GENERIC is not set |
157 | # CONFIG_PPC_MPC5121 is not set | 169 | # CONFIG_PPC_MPC52xx is not set |
170 | CONFIG_PPC_PMAC=y | ||
158 | # CONFIG_PPC_CELL is not set | 171 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 172 | # CONFIG_PPC_CELL_NATIVE is not set |
173 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 174 | # CONFIG_PQ2ADS is not set |
161 | CONFIG_MPC83xx=y | 175 | CONFIG_PPC_83xx=y |
162 | # CONFIG_MPC831x_RDB is not set | 176 | # CONFIG_MPC831x_RDB is not set |
163 | # CONFIG_MPC832x_MDS is not set | 177 | # CONFIG_MPC832x_MDS is not set |
164 | # CONFIG_MPC832x_RDB is not set | 178 | # CONFIG_MPC832x_RDB is not set |
165 | # CONFIG_MPC834x_MDS is not set | 179 | # CONFIG_MPC834x_MDS is not set |
166 | # CONFIG_MPC834x_ITX is not set | 180 | # CONFIG_MPC834x_ITX is not set |
167 | CONFIG_MPC836x_MDS=y | 181 | CONFIG_MPC836x_MDS=y |
182 | # CONFIG_MPC836x_RDK is not set | ||
168 | # CONFIG_MPC837x_MDS is not set | 183 | # CONFIG_MPC837x_MDS is not set |
169 | # CONFIG_MPC837x_RDB is not set | 184 | # CONFIG_MPC837x_RDB is not set |
170 | # CONFIG_SBC834x is not set | 185 | # CONFIG_SBC834x is not set |
186 | # CONFIG_ASP834x is not set | ||
187 | # CONFIG_PPC_86xx is not set | ||
188 | # CONFIG_EMBEDDED6xx is not set | ||
189 | CONFIG_PPC_NATIVE=y | ||
190 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
171 | CONFIG_IPIC=y | 191 | CONFIG_IPIC=y |
172 | # CONFIG_MPIC is not set | 192 | CONFIG_MPIC=y |
173 | # CONFIG_MPIC_WEIRD is not set | 193 | # CONFIG_MPIC_WEIRD is not set |
174 | # CONFIG_PPC_I8259 is not set | 194 | CONFIG_PPC_I8259=y |
175 | # CONFIG_PPC_RTAS is not set | 195 | CONFIG_PPC_RTAS=y |
196 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
197 | CONFIG_RTAS_PROC=y | ||
176 | # CONFIG_MMIO_NVRAM is not set | 198 | # CONFIG_MMIO_NVRAM is not set |
177 | # CONFIG_PPC_MPC106 is not set | 199 | CONFIG_PPC_MPC106=y |
178 | # CONFIG_PPC_970_NAP is not set | 200 | # CONFIG_PPC_970_NAP is not set |
179 | # CONFIG_PPC_INDIRECT_IO is not set | 201 | # CONFIG_PPC_INDIRECT_IO is not set |
180 | # CONFIG_GENERIC_IOMAP is not set | 202 | # CONFIG_GENERIC_IOMAP is not set |
181 | # CONFIG_CPU_FREQ is not set | 203 | # CONFIG_CPU_FREQ is not set |
204 | # CONFIG_PPC601_SYNC_FIX is not set | ||
205 | # CONFIG_TAU is not set | ||
182 | CONFIG_QUICC_ENGINE=y | 206 | CONFIG_QUICC_ENGINE=y |
183 | # CONFIG_FSL_ULI1575 is not set | 207 | # CONFIG_FSL_ULI1575 is not set |
184 | 208 | ||
@@ -195,7 +219,7 @@ CONFIG_HZ_250=y | |||
195 | # CONFIG_HZ_300 is not set | 219 | # CONFIG_HZ_300 is not set |
196 | # CONFIG_HZ_1000 is not set | 220 | # CONFIG_HZ_1000 is not set |
197 | CONFIG_HZ=250 | 221 | CONFIG_HZ=250 |
198 | # CONFIG_SCHED_HRTICK is not set | 222 | CONFIG_SCHED_HRTICK=y |
199 | CONFIG_PREEMPT_NONE=y | 223 | CONFIG_PREEMPT_NONE=y |
200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 224 | # CONFIG_PREEMPT_VOLUNTARY is not set |
201 | # CONFIG_PREEMPT is not set | 225 | # CONFIG_PREEMPT is not set |
@@ -205,6 +229,7 @@ CONFIG_BINFMT_ELF=y | |||
205 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 229 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
206 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 230 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 231 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
232 | # CONFIG_KEXEC is not set | ||
208 | CONFIG_ARCH_FLATMEM_ENABLE=y | 233 | CONFIG_ARCH_FLATMEM_ENABLE=y |
209 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 234 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
210 | CONFIG_SELECT_MEMORY_MODEL=y | 235 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -217,6 +242,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 242 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | 243 | CONFIG_PAGEFLAGS_EXTENDED=y |
219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 244 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
245 | CONFIG_MIGRATION=y | ||
220 | # CONFIG_RESOURCES_64BIT is not set | 246 | # CONFIG_RESOURCES_64BIT is not set |
221 | CONFIG_ZONE_DMA_FLAG=1 | 247 | CONFIG_ZONE_DMA_FLAG=1 |
222 | CONFIG_BOUNCE=y | 248 | CONFIG_BOUNCE=y |
@@ -224,6 +250,7 @@ CONFIG_VIRT_TO_BUS=y | |||
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 250 | CONFIG_FORCE_MAX_ZONEORDER=11 |
225 | CONFIG_PROC_DEVICETREE=y | 251 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 252 | # CONFIG_CMDLINE_BOOL is not set |
253 | CONFIG_EXTRA_TARGETS="" | ||
227 | # CONFIG_PM is not set | 254 | # CONFIG_PM is not set |
228 | CONFIG_SECCOMP=y | 255 | CONFIG_SECCOMP=y |
229 | CONFIG_ISA_DMA_API=y | 256 | CONFIG_ISA_DMA_API=y |
@@ -231,10 +258,13 @@ CONFIG_ISA_DMA_API=y | |||
231 | # | 258 | # |
232 | # Bus options | 259 | # Bus options |
233 | # | 260 | # |
261 | # CONFIG_ISA is not set | ||
234 | CONFIG_ZONE_DMA=y | 262 | CONFIG_ZONE_DMA=y |
235 | CONFIG_GENERIC_ISA_DMA=y | 263 | CONFIG_GENERIC_ISA_DMA=y |
236 | CONFIG_PPC_INDIRECT_PCI=y | 264 | CONFIG_PPC_INDIRECT_PCI=y |
237 | CONFIG_FSL_SOC=y | 265 | CONFIG_FSL_SOC=y |
266 | CONFIG_FSL_PCI=y | ||
267 | CONFIG_PPC_PCI_CHOICE=y | ||
238 | CONFIG_PCI=y | 268 | CONFIG_PCI=y |
239 | CONFIG_PCI_DOMAINS=y | 269 | CONFIG_PCI_DOMAINS=y |
240 | CONFIG_PCI_SYSCALL=y | 270 | CONFIG_PCI_SYSCALL=y |
@@ -259,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
259 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
260 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
261 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
262 | |||
263 | # | ||
264 | # Networking | ||
265 | # | ||
266 | CONFIG_NET=y | 292 | CONFIG_NET=y |
267 | 293 | ||
268 | # | 294 | # |
@@ -363,6 +389,7 @@ CONFIG_OF_I2C=y | |||
363 | # CONFIG_PARPORT is not set | 389 | # CONFIG_PARPORT is not set |
364 | CONFIG_BLK_DEV=y | 390 | CONFIG_BLK_DEV=y |
365 | # CONFIG_BLK_DEV_FD is not set | 391 | # CONFIG_BLK_DEV_FD is not set |
392 | # CONFIG_MAC_FLOPPY is not set | ||
366 | # CONFIG_BLK_CPQ_DA is not set | 393 | # CONFIG_BLK_CPQ_DA is not set |
367 | # CONFIG_BLK_CPQ_CISS_DA is not set | 394 | # CONFIG_BLK_CPQ_CISS_DA is not set |
368 | # CONFIG_BLK_DEV_DAC960 is not set | 395 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -378,12 +405,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
378 | # CONFIG_BLK_DEV_XIP is not set | 405 | # CONFIG_BLK_DEV_XIP is not set |
379 | # CONFIG_CDROM_PKTCDVD is not set | 406 | # CONFIG_CDROM_PKTCDVD is not set |
380 | # CONFIG_ATA_OVER_ETH is not set | 407 | # CONFIG_ATA_OVER_ETH is not set |
408 | # CONFIG_BLK_DEV_HD is not set | ||
381 | CONFIG_MISC_DEVICES=y | 409 | CONFIG_MISC_DEVICES=y |
382 | # CONFIG_PHANTOM is not set | 410 | # CONFIG_PHANTOM is not set |
383 | # CONFIG_EEPROM_93CX6 is not set | 411 | # CONFIG_EEPROM_93CX6 is not set |
384 | # CONFIG_SGI_IOC4 is not set | 412 | # CONFIG_SGI_IOC4 is not set |
385 | # CONFIG_TIFM_CORE is not set | 413 | # CONFIG_TIFM_CORE is not set |
386 | # CONFIG_ENCLOSURE_SERVICES is not set | 414 | # CONFIG_ENCLOSURE_SERVICES is not set |
415 | # CONFIG_HP_ILO is not set | ||
387 | CONFIG_HAVE_IDE=y | 416 | CONFIG_HAVE_IDE=y |
388 | # CONFIG_IDE is not set | 417 | # CONFIG_IDE is not set |
389 | 418 | ||
@@ -460,7 +489,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
460 | # CONFIG_SCSI_DC390T is not set | 489 | # CONFIG_SCSI_DC390T is not set |
461 | # CONFIG_SCSI_NSP32 is not set | 490 | # CONFIG_SCSI_NSP32 is not set |
462 | # CONFIG_SCSI_DEBUG is not set | 491 | # CONFIG_SCSI_DEBUG is not set |
492 | # CONFIG_SCSI_MESH is not set | ||
493 | # CONFIG_SCSI_MAC53C94 is not set | ||
463 | # CONFIG_SCSI_SRP is not set | 494 | # CONFIG_SCSI_SRP is not set |
495 | # CONFIG_SCSI_DH is not set | ||
464 | # CONFIG_ATA is not set | 496 | # CONFIG_ATA is not set |
465 | # CONFIG_MD is not set | 497 | # CONFIG_MD is not set |
466 | # CONFIG_FUSION is not set | 498 | # CONFIG_FUSION is not set |
@@ -468,12 +500,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
468 | # | 500 | # |
469 | # IEEE 1394 (FireWire) support | 501 | # IEEE 1394 (FireWire) support |
470 | # | 502 | # |
503 | |||
504 | # | ||
505 | # Enable only one of the two stacks, unless you know what you are doing | ||
506 | # | ||
471 | # CONFIG_FIREWIRE is not set | 507 | # CONFIG_FIREWIRE is not set |
472 | # CONFIG_IEEE1394 is not set | 508 | # CONFIG_IEEE1394 is not set |
473 | # CONFIG_I2O is not set | 509 | # CONFIG_I2O is not set |
474 | # CONFIG_MACINTOSH_DRIVERS is not set | 510 | # CONFIG_MACINTOSH_DRIVERS is not set |
475 | CONFIG_NETDEVICES=y | 511 | CONFIG_NETDEVICES=y |
476 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
477 | # CONFIG_DUMMY is not set | 512 | # CONFIG_DUMMY is not set |
478 | # CONFIG_BONDING is not set | 513 | # CONFIG_BONDING is not set |
479 | # CONFIG_MACVLAN is not set | 514 | # CONFIG_MACVLAN is not set |
@@ -500,6 +535,8 @@ CONFIG_MARVELL_PHY=y | |||
500 | # CONFIG_MDIO_BITBANG is not set | 535 | # CONFIG_MDIO_BITBANG is not set |
501 | CONFIG_NET_ETHERNET=y | 536 | CONFIG_NET_ETHERNET=y |
502 | CONFIG_MII=y | 537 | CONFIG_MII=y |
538 | # CONFIG_MACE is not set | ||
539 | # CONFIG_BMAC is not set | ||
503 | # CONFIG_HAPPYMEAL is not set | 540 | # CONFIG_HAPPYMEAL is not set |
504 | # CONFIG_SUNGEM is not set | 541 | # CONFIG_SUNGEM is not set |
505 | # CONFIG_CASSINI is not set | 542 | # CONFIG_CASSINI is not set |
@@ -517,7 +554,6 @@ CONFIG_NETDEV_1000=y | |||
517 | # CONFIG_DL2K is not set | 554 | # CONFIG_DL2K is not set |
518 | # CONFIG_E1000 is not set | 555 | # CONFIG_E1000 is not set |
519 | # CONFIG_E1000E is not set | 556 | # CONFIG_E1000E is not set |
520 | # CONFIG_E1000E_ENABLED is not set | ||
521 | # CONFIG_IP1000 is not set | 557 | # CONFIG_IP1000 is not set |
522 | # CONFIG_IGB is not set | 558 | # CONFIG_IGB is not set |
523 | # CONFIG_NS83820 is not set | 559 | # CONFIG_NS83820 is not set |
@@ -532,12 +568,13 @@ CONFIG_NETDEV_1000=y | |||
532 | # CONFIG_BNX2 is not set | 568 | # CONFIG_BNX2 is not set |
533 | # CONFIG_GIANFAR is not set | 569 | # CONFIG_GIANFAR is not set |
534 | CONFIG_UCC_GETH=y | 570 | CONFIG_UCC_GETH=y |
535 | # CONFIG_UGETH_NAPI is not set | ||
536 | # CONFIG_UGETH_MAGIC_PACKET is not set | 571 | # CONFIG_UGETH_MAGIC_PACKET is not set |
537 | # CONFIG_UGETH_FILTERING is not set | 572 | # CONFIG_UGETH_FILTERING is not set |
538 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 573 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
574 | # CONFIG_MV643XX_ETH is not set | ||
539 | # CONFIG_QLA3XXX is not set | 575 | # CONFIG_QLA3XXX is not set |
540 | # CONFIG_ATL1 is not set | 576 | # CONFIG_ATL1 is not set |
577 | # CONFIG_ATL1E is not set | ||
541 | CONFIG_NETDEV_10000=y | 578 | CONFIG_NETDEV_10000=y |
542 | # CONFIG_CHELSIO_T1 is not set | 579 | # CONFIG_CHELSIO_T1 is not set |
543 | # CONFIG_CHELSIO_T3 is not set | 580 | # CONFIG_CHELSIO_T3 is not set |
@@ -626,12 +663,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
626 | # CONFIG_SERIAL_UARTLITE is not set | 663 | # CONFIG_SERIAL_UARTLITE is not set |
627 | CONFIG_SERIAL_CORE=y | 664 | CONFIG_SERIAL_CORE=y |
628 | CONFIG_SERIAL_CORE_CONSOLE=y | 665 | CONFIG_SERIAL_CORE_CONSOLE=y |
666 | # CONFIG_SERIAL_PMACZILOG is not set | ||
629 | # CONFIG_SERIAL_JSM is not set | 667 | # CONFIG_SERIAL_JSM is not set |
630 | # CONFIG_SERIAL_OF_PLATFORM is not set | 668 | # CONFIG_SERIAL_OF_PLATFORM is not set |
631 | # CONFIG_SERIAL_QE is not set | 669 | # CONFIG_SERIAL_QE is not set |
632 | CONFIG_UNIX98_PTYS=y | 670 | CONFIG_UNIX98_PTYS=y |
633 | CONFIG_LEGACY_PTYS=y | 671 | CONFIG_LEGACY_PTYS=y |
634 | CONFIG_LEGACY_PTY_COUNT=256 | 672 | CONFIG_LEGACY_PTY_COUNT=256 |
673 | # CONFIG_BRIQ_PANEL is not set | ||
674 | # CONFIG_HVC_RTAS is not set | ||
635 | # CONFIG_IPMI_HANDLER is not set | 675 | # CONFIG_IPMI_HANDLER is not set |
636 | CONFIG_HW_RANDOM=y | 676 | CONFIG_HW_RANDOM=y |
637 | # CONFIG_NVRAM is not set | 677 | # CONFIG_NVRAM is not set |
@@ -643,42 +683,69 @@ CONFIG_DEVPORT=y | |||
643 | CONFIG_I2C=y | 683 | CONFIG_I2C=y |
644 | CONFIG_I2C_BOARDINFO=y | 684 | CONFIG_I2C_BOARDINFO=y |
645 | CONFIG_I2C_CHARDEV=y | 685 | CONFIG_I2C_CHARDEV=y |
686 | CONFIG_I2C_HELPER_AUTO=y | ||
646 | 687 | ||
647 | # | 688 | # |
648 | # I2C Hardware Bus support | 689 | # I2C Hardware Bus support |
649 | # | 690 | # |
691 | |||
692 | # | ||
693 | # PC SMBus host controller drivers | ||
694 | # | ||
650 | # CONFIG_I2C_ALI1535 is not set | 695 | # CONFIG_I2C_ALI1535 is not set |
651 | # CONFIG_I2C_ALI1563 is not set | 696 | # CONFIG_I2C_ALI1563 is not set |
652 | # CONFIG_I2C_ALI15X3 is not set | 697 | # CONFIG_I2C_ALI15X3 is not set |
653 | # CONFIG_I2C_AMD756 is not set | 698 | # CONFIG_I2C_AMD756 is not set |
654 | # CONFIG_I2C_AMD8111 is not set | 699 | # CONFIG_I2C_AMD8111 is not set |
655 | # CONFIG_I2C_I801 is not set | 700 | # CONFIG_I2C_I801 is not set |
656 | # CONFIG_I2C_I810 is not set | 701 | # CONFIG_I2C_ISCH is not set |
657 | # CONFIG_I2C_PIIX4 is not set | 702 | # CONFIG_I2C_PIIX4 is not set |
658 | CONFIG_I2C_MPC=y | ||
659 | # CONFIG_I2C_NFORCE2 is not set | 703 | # CONFIG_I2C_NFORCE2 is not set |
660 | # CONFIG_I2C_OCORES is not set | ||
661 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
662 | # CONFIG_I2C_PROSAVAGE is not set | ||
663 | # CONFIG_I2C_SAVAGE4 is not set | ||
664 | # CONFIG_I2C_SIMTEC is not set | ||
665 | # CONFIG_I2C_SIS5595 is not set | 704 | # CONFIG_I2C_SIS5595 is not set |
666 | # CONFIG_I2C_SIS630 is not set | 705 | # CONFIG_I2C_SIS630 is not set |
667 | # CONFIG_I2C_SIS96X is not set | 706 | # CONFIG_I2C_SIS96X is not set |
668 | # CONFIG_I2C_TAOS_EVM is not set | ||
669 | # CONFIG_I2C_STUB is not set | ||
670 | # CONFIG_I2C_VIA is not set | 707 | # CONFIG_I2C_VIA is not set |
671 | # CONFIG_I2C_VIAPRO is not set | 708 | # CONFIG_I2C_VIAPRO is not set |
709 | |||
710 | # | ||
711 | # Mac SMBus host controller drivers | ||
712 | # | ||
713 | # CONFIG_I2C_HYDRA is not set | ||
714 | CONFIG_I2C_POWERMAC=y | ||
715 | |||
716 | # | ||
717 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
718 | # | ||
719 | CONFIG_I2C_MPC=y | ||
720 | # CONFIG_I2C_OCORES is not set | ||
721 | # CONFIG_I2C_SIMTEC is not set | ||
722 | |||
723 | # | ||
724 | # External I2C/SMBus adapter drivers | ||
725 | # | ||
726 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
727 | # CONFIG_I2C_TAOS_EVM is not set | ||
728 | |||
729 | # | ||
730 | # Graphics adapter I2C/DDC channel drivers | ||
731 | # | ||
672 | # CONFIG_I2C_VOODOO3 is not set | 732 | # CONFIG_I2C_VOODOO3 is not set |
733 | |||
734 | # | ||
735 | # Other I2C/SMBus bus drivers | ||
736 | # | ||
673 | # CONFIG_I2C_PCA_PLATFORM is not set | 737 | # CONFIG_I2C_PCA_PLATFORM is not set |
738 | # CONFIG_I2C_STUB is not set | ||
674 | 739 | ||
675 | # | 740 | # |
676 | # Miscellaneous I2C Chip support | 741 | # Miscellaneous I2C Chip support |
677 | # | 742 | # |
678 | # CONFIG_DS1682 is not set | 743 | # CONFIG_DS1682 is not set |
744 | # CONFIG_AT24 is not set | ||
679 | # CONFIG_SENSORS_EEPROM is not set | 745 | # CONFIG_SENSORS_EEPROM is not set |
680 | # CONFIG_SENSORS_PCF8574 is not set | 746 | # CONFIG_SENSORS_PCF8574 is not set |
681 | # CONFIG_PCF8575 is not set | 747 | # CONFIG_PCF8575 is not set |
748 | # CONFIG_SENSORS_PCA9539 is not set | ||
682 | # CONFIG_SENSORS_PCF8591 is not set | 749 | # CONFIG_SENSORS_PCF8591 is not set |
683 | # CONFIG_SENSORS_MAX6875 is not set | 750 | # CONFIG_SENSORS_MAX6875 is not set |
684 | # CONFIG_SENSORS_TSL2550 is not set | 751 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -687,10 +754,13 @@ CONFIG_I2C_MPC=y | |||
687 | # CONFIG_I2C_DEBUG_BUS is not set | 754 | # CONFIG_I2C_DEBUG_BUS is not set |
688 | # CONFIG_I2C_DEBUG_CHIP is not set | 755 | # CONFIG_I2C_DEBUG_CHIP is not set |
689 | # CONFIG_SPI is not set | 756 | # CONFIG_SPI is not set |
757 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
758 | # CONFIG_GPIOLIB is not set | ||
690 | # CONFIG_W1 is not set | 759 | # CONFIG_W1 is not set |
691 | # CONFIG_POWER_SUPPLY is not set | 760 | # CONFIG_POWER_SUPPLY is not set |
692 | CONFIG_HWMON=y | 761 | CONFIG_HWMON=y |
693 | # CONFIG_HWMON_VID is not set | 762 | # CONFIG_HWMON_VID is not set |
763 | # CONFIG_SENSORS_AD7414 is not set | ||
694 | # CONFIG_SENSORS_AD7418 is not set | 764 | # CONFIG_SENSORS_AD7418 is not set |
695 | # CONFIG_SENSORS_ADM1021 is not set | 765 | # CONFIG_SENSORS_ADM1021 is not set |
696 | # CONFIG_SENSORS_ADM1025 is not set | 766 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -700,6 +770,7 @@ CONFIG_HWMON=y | |||
700 | # CONFIG_SENSORS_ADM9240 is not set | 770 | # CONFIG_SENSORS_ADM9240 is not set |
701 | # CONFIG_SENSORS_ADT7470 is not set | 771 | # CONFIG_SENSORS_ADT7470 is not set |
702 | # CONFIG_SENSORS_ADT7473 is not set | 772 | # CONFIG_SENSORS_ADT7473 is not set |
773 | # CONFIG_SENSORS_AMS is not set | ||
703 | # CONFIG_SENSORS_ATXP1 is not set | 774 | # CONFIG_SENSORS_ATXP1 is not set |
704 | # CONFIG_SENSORS_DS1621 is not set | 775 | # CONFIG_SENSORS_DS1621 is not set |
705 | # CONFIG_SENSORS_I5K_AMB is not set | 776 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -744,6 +815,7 @@ CONFIG_HWMON=y | |||
744 | # CONFIG_SENSORS_W83627EHF is not set | 815 | # CONFIG_SENSORS_W83627EHF is not set |
745 | # CONFIG_HWMON_DEBUG_CHIP is not set | 816 | # CONFIG_HWMON_DEBUG_CHIP is not set |
746 | # CONFIG_THERMAL is not set | 817 | # CONFIG_THERMAL is not set |
818 | # CONFIG_THERMAL_HWMON is not set | ||
747 | CONFIG_WATCHDOG=y | 819 | CONFIG_WATCHDOG=y |
748 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 820 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
749 | 821 | ||
@@ -751,7 +823,9 @@ CONFIG_WATCHDOG=y | |||
751 | # Watchdog Device Drivers | 823 | # Watchdog Device Drivers |
752 | # | 824 | # |
753 | # CONFIG_SOFT_WATCHDOG is not set | 825 | # CONFIG_SOFT_WATCHDOG is not set |
754 | CONFIG_83xx_WDT=y | 826 | # CONFIG_ALIM7101_WDT is not set |
827 | # CONFIG_8xxx_WDT is not set | ||
828 | # CONFIG_WATCHDOG_RTAS is not set | ||
755 | 829 | ||
756 | # | 830 | # |
757 | # PCI-based Watchdog Cards | 831 | # PCI-based Watchdog Cards |
@@ -768,8 +842,10 @@ CONFIG_SSB_POSSIBLE=y | |||
768 | # | 842 | # |
769 | # Multifunction device drivers | 843 | # Multifunction device drivers |
770 | # | 844 | # |
845 | # CONFIG_MFD_CORE is not set | ||
771 | # CONFIG_MFD_SM501 is not set | 846 | # CONFIG_MFD_SM501 is not set |
772 | # CONFIG_HTC_PASIC3 is not set | 847 | # CONFIG_HTC_PASIC3 is not set |
848 | # CONFIG_MFD_TMIO is not set | ||
773 | 849 | ||
774 | # | 850 | # |
775 | # Multimedia devices | 851 | # Multimedia devices |
@@ -801,10 +877,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
801 | # Display device support | 877 | # Display device support |
802 | # | 878 | # |
803 | # CONFIG_DISPLAY_SUPPORT is not set | 879 | # CONFIG_DISPLAY_SUPPORT is not set |
804 | |||
805 | # | ||
806 | # Sound | ||
807 | # | ||
808 | # CONFIG_SOUND is not set | 880 | # CONFIG_SOUND is not set |
809 | CONFIG_HID_SUPPORT=y | 881 | CONFIG_HID_SUPPORT=y |
810 | CONFIG_HID=y | 882 | CONFIG_HID=y |
@@ -819,6 +891,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
819 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 891 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
820 | 892 | ||
821 | # | 893 | # |
894 | # Enable Host or Gadget support to see Inventra options | ||
895 | # | ||
896 | |||
897 | # | ||
822 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 898 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
823 | # | 899 | # |
824 | # CONFIG_USB_GADGET is not set | 900 | # CONFIG_USB_GADGET is not set |
@@ -857,6 +933,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
857 | # CONFIG_RTC_DRV_PCF8583 is not set | 933 | # CONFIG_RTC_DRV_PCF8583 is not set |
858 | # CONFIG_RTC_DRV_M41T80 is not set | 934 | # CONFIG_RTC_DRV_M41T80 is not set |
859 | # CONFIG_RTC_DRV_S35390A is not set | 935 | # CONFIG_RTC_DRV_S35390A is not set |
936 | # CONFIG_RTC_DRV_FM3130 is not set | ||
860 | 937 | ||
861 | # | 938 | # |
862 | # SPI RTC drivers | 939 | # SPI RTC drivers |
@@ -945,6 +1022,7 @@ CONFIG_TMPFS=y | |||
945 | # CONFIG_CRAMFS is not set | 1022 | # CONFIG_CRAMFS is not set |
946 | # CONFIG_VXFS_FS is not set | 1023 | # CONFIG_VXFS_FS is not set |
947 | # CONFIG_MINIX_FS is not set | 1024 | # CONFIG_MINIX_FS is not set |
1025 | # CONFIG_OMFS_FS is not set | ||
948 | # CONFIG_HPFS_FS is not set | 1026 | # CONFIG_HPFS_FS is not set |
949 | # CONFIG_QNX4FS_FS is not set | 1027 | # CONFIG_QNX4FS_FS is not set |
950 | # CONFIG_ROMFS_FS is not set | 1028 | # CONFIG_ROMFS_FS is not set |
@@ -955,14 +1033,13 @@ CONFIG_NFS_FS=y | |||
955 | CONFIG_NFS_V3=y | 1033 | CONFIG_NFS_V3=y |
956 | # CONFIG_NFS_V3_ACL is not set | 1034 | # CONFIG_NFS_V3_ACL is not set |
957 | CONFIG_NFS_V4=y | 1035 | CONFIG_NFS_V4=y |
958 | # CONFIG_NFSD is not set | ||
959 | CONFIG_ROOT_NFS=y | 1036 | CONFIG_ROOT_NFS=y |
1037 | # CONFIG_NFSD is not set | ||
960 | CONFIG_LOCKD=y | 1038 | CONFIG_LOCKD=y |
961 | CONFIG_LOCKD_V4=y | 1039 | CONFIG_LOCKD_V4=y |
962 | CONFIG_NFS_COMMON=y | 1040 | CONFIG_NFS_COMMON=y |
963 | CONFIG_SUNRPC=y | 1041 | CONFIG_SUNRPC=y |
964 | CONFIG_SUNRPC_GSS=y | 1042 | CONFIG_SUNRPC_GSS=y |
965 | # CONFIG_SUNRPC_BIND34 is not set | ||
966 | CONFIG_RPCSEC_GSS_KRB5=y | 1043 | CONFIG_RPCSEC_GSS_KRB5=y |
967 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1044 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
968 | # CONFIG_SMB_FS is not set | 1045 | # CONFIG_SMB_FS is not set |
@@ -992,6 +1069,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
992 | # CONFIG_DLM is not set | 1069 | # CONFIG_DLM is not set |
993 | CONFIG_UCC_FAST=y | 1070 | CONFIG_UCC_FAST=y |
994 | CONFIG_UCC=y | 1071 | CONFIG_UCC=y |
1072 | # CONFIG_QE_GPIO is not set | ||
995 | 1073 | ||
996 | # | 1074 | # |
997 | # Library routines | 1075 | # Library routines |
@@ -1000,6 +1078,7 @@ CONFIG_BITREVERSE=y | |||
1000 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1078 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1001 | # CONFIG_CRC_CCITT is not set | 1079 | # CONFIG_CRC_CCITT is not set |
1002 | # CONFIG_CRC16 is not set | 1080 | # CONFIG_CRC16 is not set |
1081 | # CONFIG_CRC_T10DIF is not set | ||
1003 | # CONFIG_CRC_ITU_T is not set | 1082 | # CONFIG_CRC_ITU_T is not set |
1004 | CONFIG_CRC32=y | 1083 | CONFIG_CRC32=y |
1005 | # CONFIG_CRC7 is not set | 1084 | # CONFIG_CRC7 is not set |
@@ -1025,8 +1104,18 @@ CONFIG_FRAME_WARN=1024 | |||
1025 | # CONFIG_SLUB_DEBUG_ON is not set | 1104 | # CONFIG_SLUB_DEBUG_ON is not set |
1026 | # CONFIG_SLUB_STATS is not set | 1105 | # CONFIG_SLUB_STATS is not set |
1027 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1106 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1107 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1108 | # CONFIG_LATENCYTOP is not set | ||
1109 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1110 | CONFIG_HAVE_FTRACE=y | ||
1111 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1112 | # CONFIG_FTRACE is not set | ||
1113 | # CONFIG_SCHED_TRACER is not set | ||
1114 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1028 | # CONFIG_SAMPLES is not set | 1115 | # CONFIG_SAMPLES is not set |
1116 | CONFIG_HAVE_ARCH_KGDB=y | ||
1029 | # CONFIG_IRQSTACKS is not set | 1117 | # CONFIG_IRQSTACKS is not set |
1118 | # CONFIG_BOOTX_TEXT is not set | ||
1030 | # CONFIG_PPC_EARLY_DEBUG is not set | 1119 | # CONFIG_PPC_EARLY_DEBUG is not set |
1031 | 1120 | ||
1032 | # | 1121 | # |
@@ -1080,6 +1169,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1080 | # CONFIG_CRYPTO_MD4 is not set | 1169 | # CONFIG_CRYPTO_MD4 is not set |
1081 | CONFIG_CRYPTO_MD5=y | 1170 | CONFIG_CRYPTO_MD5=y |
1082 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1171 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1172 | # CONFIG_CRYPTO_RMD128 is not set | ||
1173 | # CONFIG_CRYPTO_RMD160 is not set | ||
1174 | # CONFIG_CRYPTO_RMD256 is not set | ||
1175 | # CONFIG_CRYPTO_RMD320 is not set | ||
1083 | # CONFIG_CRYPTO_SHA1 is not set | 1176 | # CONFIG_CRYPTO_SHA1 is not set |
1084 | # CONFIG_CRYPTO_SHA256 is not set | 1177 | # CONFIG_CRYPTO_SHA256 is not set |
1085 | # CONFIG_CRYPTO_SHA512 is not set | 1178 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1112,6 +1205,7 @@ CONFIG_CRYPTO_DES=y | |||
1112 | # CONFIG_CRYPTO_LZO is not set | 1205 | # CONFIG_CRYPTO_LZO is not set |
1113 | CONFIG_CRYPTO_HW=y | 1206 | CONFIG_CRYPTO_HW=y |
1114 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1207 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1208 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1115 | # CONFIG_PPC_CLOCK is not set | 1209 | # CONFIG_PPC_CLOCK is not set |
1116 | CONFIG_PPC_LIB_RHEAP=y | 1210 | CONFIG_PPC_LIB_RHEAP=y |
1117 | # CONFIG_VIRTUALIZATION is not set | 1211 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig index d2c435f0da42..7d674be702fe 100644 --- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig +++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc2 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon May 19 21:12:32 2008 | 4 | # Thu Aug 21 00:52:24 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -52,6 +54,9 @@ CONFIG_PPC_UDBG_16550=y | |||
52 | CONFIG_AUDIT_ARCH=y | 54 | CONFIG_AUDIT_ARCH=y |
53 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
54 | CONFIG_DEFAULT_UIMAGE=y | 56 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_HIBERNATE_32=y | ||
58 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
59 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
55 | # CONFIG_PPC_DCR_NATIVE is not set | 60 | # CONFIG_PPC_DCR_NATIVE is not set |
56 | # CONFIG_PPC_DCR_MMIO is not set | 61 | # CONFIG_PPC_DCR_MMIO is not set |
57 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 62 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -89,12 +94,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 95 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | # CONFIG_KALLSYMS is not set | 97 | # CONFIG_KALLSYMS is not set |
94 | CONFIG_HOTPLUG=y | 98 | CONFIG_HOTPLUG=y |
95 | CONFIG_PRINTK=y | 99 | CONFIG_PRINTK=y |
96 | CONFIG_BUG=y | 100 | CONFIG_BUG=y |
97 | CONFIG_ELF_CORE=y | 101 | CONFIG_ELF_CORE=y |
102 | CONFIG_PCSPKR_PLATFORM=y | ||
98 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
99 | CONFIG_BASE_FULL=y | 104 | CONFIG_BASE_FULL=y |
100 | CONFIG_FUTEX=y | 105 | CONFIG_FUTEX=y |
@@ -112,10 +117,16 @@ CONFIG_SLUB=y | |||
112 | # CONFIG_PROFILING is not set | 117 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | 118 | # CONFIG_MARKERS is not set |
114 | CONFIG_HAVE_OPROFILE=y | 119 | CONFIG_HAVE_OPROFILE=y |
120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
127 | # CONFIG_HAVE_CLK is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
@@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y | |||
126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 137 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
127 | # CONFIG_MODVERSIONS is not set | 138 | # CONFIG_MODVERSIONS is not set |
128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 139 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
129 | # CONFIG_KMOD is not set | 140 | CONFIG_KMOD=y |
130 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
131 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
133 | # CONFIG_LSF is not set | 144 | # CONFIG_LSF is not set |
134 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
135 | 147 | ||
136 | # | 148 | # |
137 | # IO Schedulers | 149 | # IO Schedulers |
@@ -150,16 +162,18 @@ CONFIG_CLASSIC_RCU=y | |||
150 | # | 162 | # |
151 | # Platform support | 163 | # Platform support |
152 | # | 164 | # |
153 | # CONFIG_PPC_MULTIPLATFORM is not set | 165 | CONFIG_PPC_MULTIPLATFORM=y |
154 | # CONFIG_PPC_82xx is not set | 166 | CONFIG_CLASSIC32=y |
155 | CONFIG_PPC_83xx=y | 167 | CONFIG_PPC_CHRP=y |
156 | # CONFIG_PPC_86xx is not set | 168 | # CONFIG_MPC5121_ADS is not set |
157 | # CONFIG_PPC_MPC512x is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
158 | # CONFIG_PPC_MPC5121 is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | ||
159 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
160 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | ||
161 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
162 | CONFIG_MPC83xx=y | 176 | CONFIG_PPC_83xx=y |
163 | # CONFIG_MPC831x_RDB is not set | 177 | # CONFIG_MPC831x_RDB is not set |
164 | # CONFIG_MPC832x_MDS is not set | 178 | # CONFIG_MPC832x_MDS is not set |
165 | # CONFIG_MPC832x_RDB is not set | 179 | # CONFIG_MPC832x_RDB is not set |
@@ -170,17 +184,26 @@ CONFIG_MPC836x_RDK=y | |||
170 | # CONFIG_MPC837x_MDS is not set | 184 | # CONFIG_MPC837x_MDS is not set |
171 | # CONFIG_MPC837x_RDB is not set | 185 | # CONFIG_MPC837x_RDB is not set |
172 | # CONFIG_SBC834x is not set | 186 | # CONFIG_SBC834x is not set |
187 | # CONFIG_ASP834x is not set | ||
188 | # CONFIG_PPC_86xx is not set | ||
189 | # CONFIG_EMBEDDED6xx is not set | ||
190 | CONFIG_PPC_NATIVE=y | ||
191 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
173 | CONFIG_IPIC=y | 192 | CONFIG_IPIC=y |
174 | # CONFIG_MPIC is not set | 193 | CONFIG_MPIC=y |
175 | # CONFIG_MPIC_WEIRD is not set | 194 | # CONFIG_MPIC_WEIRD is not set |
176 | # CONFIG_PPC_I8259 is not set | 195 | CONFIG_PPC_I8259=y |
177 | # CONFIG_PPC_RTAS is not set | 196 | CONFIG_PPC_RTAS=y |
197 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
198 | CONFIG_RTAS_PROC=y | ||
178 | # CONFIG_MMIO_NVRAM is not set | 199 | # CONFIG_MMIO_NVRAM is not set |
179 | # CONFIG_PPC_MPC106 is not set | 200 | CONFIG_PPC_MPC106=y |
180 | # CONFIG_PPC_970_NAP is not set | 201 | # CONFIG_PPC_970_NAP is not set |
181 | # CONFIG_PPC_INDIRECT_IO is not set | 202 | # CONFIG_PPC_INDIRECT_IO is not set |
182 | # CONFIG_GENERIC_IOMAP is not set | 203 | # CONFIG_GENERIC_IOMAP is not set |
183 | # CONFIG_CPU_FREQ is not set | 204 | # CONFIG_CPU_FREQ is not set |
205 | # CONFIG_PPC601_SYNC_FIX is not set | ||
206 | # CONFIG_TAU is not set | ||
184 | CONFIG_QUICC_ENGINE=y | 207 | CONFIG_QUICC_ENGINE=y |
185 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
186 | 209 | ||
@@ -207,6 +230,7 @@ CONFIG_BINFMT_ELF=y | |||
207 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
208 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 231 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
209 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
233 | # CONFIG_KEXEC is not set | ||
210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 234 | CONFIG_ARCH_FLATMEM_ENABLE=y |
211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 235 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
212 | CONFIG_SELECT_MEMORY_MODEL=y | 236 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -219,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 243 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | 244 | CONFIG_PAGEFLAGS_EXTENDED=y |
221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
246 | CONFIG_MIGRATION=y | ||
222 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
223 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
224 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
@@ -226,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y | |||
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 251 | CONFIG_FORCE_MAX_ZONEORDER=11 |
227 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
228 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
254 | CONFIG_EXTRA_TARGETS="" | ||
229 | # CONFIG_PM is not set | 255 | # CONFIG_PM is not set |
230 | CONFIG_SECCOMP=y | 256 | CONFIG_SECCOMP=y |
231 | CONFIG_ISA_DMA_API=y | 257 | CONFIG_ISA_DMA_API=y |
@@ -233,12 +259,15 @@ CONFIG_ISA_DMA_API=y | |||
233 | # | 259 | # |
234 | # Bus options | 260 | # Bus options |
235 | # | 261 | # |
262 | # CONFIG_ISA is not set | ||
236 | CONFIG_ZONE_DMA=y | 263 | CONFIG_ZONE_DMA=y |
237 | CONFIG_GENERIC_ISA_DMA=y | 264 | CONFIG_GENERIC_ISA_DMA=y |
238 | CONFIG_PPC_INDIRECT_PCI=y | 265 | CONFIG_PPC_INDIRECT_PCI=y |
239 | CONFIG_FSL_SOC=y | 266 | CONFIG_FSL_SOC=y |
267 | CONFIG_FSL_PCI=y | ||
240 | CONFIG_FSL_LBC=y | 268 | CONFIG_FSL_LBC=y |
241 | CONFIG_FSL_GTM=y | 269 | CONFIG_FSL_GTM=y |
270 | CONFIG_PPC_PCI_CHOICE=y | ||
242 | CONFIG_PCI=y | 271 | CONFIG_PCI=y |
243 | CONFIG_PCI_DOMAINS=y | 272 | CONFIG_PCI_DOMAINS=y |
244 | CONFIG_PCI_SYSCALL=y | 273 | CONFIG_PCI_SYSCALL=y |
@@ -263,10 +292,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
263 | CONFIG_KERNEL_START=0xc0000000 | 292 | CONFIG_KERNEL_START=0xc0000000 |
264 | CONFIG_PHYSICAL_START=0x00000000 | 293 | CONFIG_PHYSICAL_START=0x00000000 |
265 | CONFIG_TASK_SIZE=0xc0000000 | 294 | CONFIG_TASK_SIZE=0xc0000000 |
266 | |||
267 | # | ||
268 | # Networking | ||
269 | # | ||
270 | CONFIG_NET=y | 295 | CONFIG_NET=y |
271 | 296 | ||
272 | # | 297 | # |
@@ -359,6 +384,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
359 | CONFIG_STANDALONE=y | 384 | CONFIG_STANDALONE=y |
360 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 385 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
361 | CONFIG_FW_LOADER=y | 386 | CONFIG_FW_LOADER=y |
387 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
388 | CONFIG_EXTRA_FIRMWARE="" | ||
362 | # CONFIG_SYS_HYPERVISOR is not set | 389 | # CONFIG_SYS_HYPERVISOR is not set |
363 | # CONFIG_CONNECTOR is not set | 390 | # CONFIG_CONNECTOR is not set |
364 | CONFIG_MTD=y | 391 | CONFIG_MTD=y |
@@ -449,9 +476,11 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
449 | CONFIG_OF_DEVICE=y | 476 | CONFIG_OF_DEVICE=y |
450 | CONFIG_OF_GPIO=y | 477 | CONFIG_OF_GPIO=y |
451 | CONFIG_OF_I2C=y | 478 | CONFIG_OF_I2C=y |
479 | CONFIG_OF_SPI=y | ||
452 | # CONFIG_PARPORT is not set | 480 | # CONFIG_PARPORT is not set |
453 | CONFIG_BLK_DEV=y | 481 | CONFIG_BLK_DEV=y |
454 | # CONFIG_BLK_DEV_FD is not set | 482 | # CONFIG_BLK_DEV_FD is not set |
483 | # CONFIG_MAC_FLOPPY is not set | ||
455 | # CONFIG_BLK_CPQ_DA is not set | 484 | # CONFIG_BLK_CPQ_DA is not set |
456 | # CONFIG_BLK_CPQ_CISS_DA is not set | 485 | # CONFIG_BLK_CPQ_CISS_DA is not set |
457 | # CONFIG_BLK_DEV_DAC960 is not set | 486 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -467,12 +496,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
467 | # CONFIG_BLK_DEV_XIP is not set | 496 | # CONFIG_BLK_DEV_XIP is not set |
468 | # CONFIG_CDROM_PKTCDVD is not set | 497 | # CONFIG_CDROM_PKTCDVD is not set |
469 | # CONFIG_ATA_OVER_ETH is not set | 498 | # CONFIG_ATA_OVER_ETH is not set |
499 | # CONFIG_BLK_DEV_HD is not set | ||
470 | CONFIG_MISC_DEVICES=y | 500 | CONFIG_MISC_DEVICES=y |
471 | # CONFIG_PHANTOM is not set | 501 | # CONFIG_PHANTOM is not set |
472 | # CONFIG_EEPROM_93CX6 is not set | 502 | # CONFIG_EEPROM_93CX6 is not set |
473 | # CONFIG_SGI_IOC4 is not set | 503 | # CONFIG_SGI_IOC4 is not set |
474 | # CONFIG_TIFM_CORE is not set | 504 | # CONFIG_TIFM_CORE is not set |
475 | # CONFIG_ENCLOSURE_SERVICES is not set | 505 | # CONFIG_ENCLOSURE_SERVICES is not set |
506 | # CONFIG_HP_ILO is not set | ||
476 | CONFIG_HAVE_IDE=y | 507 | CONFIG_HAVE_IDE=y |
477 | # CONFIG_IDE is not set | 508 | # CONFIG_IDE is not set |
478 | 509 | ||
@@ -490,12 +521,15 @@ CONFIG_HAVE_IDE=y | |||
490 | # | 521 | # |
491 | # IEEE 1394 (FireWire) support | 522 | # IEEE 1394 (FireWire) support |
492 | # | 523 | # |
524 | |||
525 | # | ||
526 | # Enable only one of the two stacks, unless you know what you are doing | ||
527 | # | ||
493 | # CONFIG_FIREWIRE is not set | 528 | # CONFIG_FIREWIRE is not set |
494 | # CONFIG_IEEE1394 is not set | 529 | # CONFIG_IEEE1394 is not set |
495 | # CONFIG_I2O is not set | 530 | # CONFIG_I2O is not set |
496 | # CONFIG_MACINTOSH_DRIVERS is not set | 531 | # CONFIG_MACINTOSH_DRIVERS is not set |
497 | CONFIG_NETDEVICES=y | 532 | CONFIG_NETDEVICES=y |
498 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
499 | # CONFIG_DUMMY is not set | 533 | # CONFIG_DUMMY is not set |
500 | # CONFIG_BONDING is not set | 534 | # CONFIG_BONDING is not set |
501 | # CONFIG_MACVLAN is not set | 535 | # CONFIG_MACVLAN is not set |
@@ -526,7 +560,6 @@ CONFIG_NETDEV_1000=y | |||
526 | # CONFIG_DL2K is not set | 560 | # CONFIG_DL2K is not set |
527 | # CONFIG_E1000 is not set | 561 | # CONFIG_E1000 is not set |
528 | # CONFIG_E1000E is not set | 562 | # CONFIG_E1000E is not set |
529 | # CONFIG_E1000E_ENABLED is not set | ||
530 | # CONFIG_IP1000 is not set | 563 | # CONFIG_IP1000 is not set |
531 | # CONFIG_IGB is not set | 564 | # CONFIG_IGB is not set |
532 | # CONFIG_NS83820 is not set | 565 | # CONFIG_NS83820 is not set |
@@ -541,12 +574,13 @@ CONFIG_NETDEV_1000=y | |||
541 | # CONFIG_BNX2 is not set | 574 | # CONFIG_BNX2 is not set |
542 | # CONFIG_GIANFAR is not set | 575 | # CONFIG_GIANFAR is not set |
543 | CONFIG_UCC_GETH=y | 576 | CONFIG_UCC_GETH=y |
544 | CONFIG_UGETH_NAPI=y | ||
545 | # CONFIG_UGETH_MAGIC_PACKET is not set | 577 | # CONFIG_UGETH_MAGIC_PACKET is not set |
546 | # CONFIG_UGETH_FILTERING is not set | 578 | # CONFIG_UGETH_FILTERING is not set |
547 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 579 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
580 | # CONFIG_MV643XX_ETH is not set | ||
548 | # CONFIG_QLA3XXX is not set | 581 | # CONFIG_QLA3XXX is not set |
549 | # CONFIG_ATL1 is not set | 582 | # CONFIG_ATL1 is not set |
583 | # CONFIG_ATL1E is not set | ||
550 | # CONFIG_NETDEV_10000 is not set | 584 | # CONFIG_NETDEV_10000 is not set |
551 | # CONFIG_TR is not set | 585 | # CONFIG_TR is not set |
552 | 586 | ||
@@ -602,6 +636,7 @@ CONFIG_INPUT=y | |||
602 | # Character devices | 636 | # Character devices |
603 | # | 637 | # |
604 | CONFIG_VT=y | 638 | CONFIG_VT=y |
639 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
605 | CONFIG_VT_CONSOLE=y | 640 | CONFIG_VT_CONSOLE=y |
606 | CONFIG_HW_CONSOLE=y | 641 | CONFIG_HW_CONSOLE=y |
607 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 642 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -625,12 +660,15 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
625 | # CONFIG_SERIAL_UARTLITE is not set | 660 | # CONFIG_SERIAL_UARTLITE is not set |
626 | CONFIG_SERIAL_CORE=y | 661 | CONFIG_SERIAL_CORE=y |
627 | CONFIG_SERIAL_CORE_CONSOLE=y | 662 | CONFIG_SERIAL_CORE_CONSOLE=y |
663 | # CONFIG_SERIAL_PMACZILOG is not set | ||
628 | # CONFIG_SERIAL_JSM is not set | 664 | # CONFIG_SERIAL_JSM is not set |
629 | # CONFIG_SERIAL_OF_PLATFORM is not set | 665 | # CONFIG_SERIAL_OF_PLATFORM is not set |
630 | CONFIG_SERIAL_QE=y | 666 | CONFIG_SERIAL_QE=y |
631 | CONFIG_UNIX98_PTYS=y | 667 | CONFIG_UNIX98_PTYS=y |
632 | CONFIG_LEGACY_PTYS=y | 668 | CONFIG_LEGACY_PTYS=y |
633 | CONFIG_LEGACY_PTY_COUNT=256 | 669 | CONFIG_LEGACY_PTY_COUNT=256 |
670 | # CONFIG_BRIQ_PANEL is not set | ||
671 | # CONFIG_HVC_RTAS is not set | ||
634 | # CONFIG_IPMI_HANDLER is not set | 672 | # CONFIG_IPMI_HANDLER is not set |
635 | CONFIG_HW_RANDOM=y | 673 | CONFIG_HW_RANDOM=y |
636 | # CONFIG_NVRAM is not set | 674 | # CONFIG_NVRAM is not set |
@@ -643,43 +681,70 @@ CONFIG_DEVPORT=y | |||
643 | CONFIG_I2C=y | 681 | CONFIG_I2C=y |
644 | CONFIG_I2C_BOARDINFO=y | 682 | CONFIG_I2C_BOARDINFO=y |
645 | CONFIG_I2C_CHARDEV=y | 683 | CONFIG_I2C_CHARDEV=y |
684 | CONFIG_I2C_HELPER_AUTO=y | ||
646 | 685 | ||
647 | # | 686 | # |
648 | # I2C Hardware Bus support | 687 | # I2C Hardware Bus support |
649 | # | 688 | # |
689 | |||
690 | # | ||
691 | # PC SMBus host controller drivers | ||
692 | # | ||
650 | # CONFIG_I2C_ALI1535 is not set | 693 | # CONFIG_I2C_ALI1535 is not set |
651 | # CONFIG_I2C_ALI1563 is not set | 694 | # CONFIG_I2C_ALI1563 is not set |
652 | # CONFIG_I2C_ALI15X3 is not set | 695 | # CONFIG_I2C_ALI15X3 is not set |
653 | # CONFIG_I2C_AMD756 is not set | 696 | # CONFIG_I2C_AMD756 is not set |
654 | # CONFIG_I2C_AMD8111 is not set | 697 | # CONFIG_I2C_AMD8111 is not set |
655 | # CONFIG_I2C_GPIO is not set | ||
656 | # CONFIG_I2C_I801 is not set | 698 | # CONFIG_I2C_I801 is not set |
657 | # CONFIG_I2C_I810 is not set | 699 | # CONFIG_I2C_ISCH is not set |
658 | # CONFIG_I2C_PIIX4 is not set | 700 | # CONFIG_I2C_PIIX4 is not set |
659 | CONFIG_I2C_MPC=y | ||
660 | # CONFIG_I2C_NFORCE2 is not set | 701 | # CONFIG_I2C_NFORCE2 is not set |
661 | # CONFIG_I2C_OCORES is not set | ||
662 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
663 | # CONFIG_I2C_PROSAVAGE is not set | ||
664 | # CONFIG_I2C_SAVAGE4 is not set | ||
665 | # CONFIG_I2C_SIMTEC is not set | ||
666 | # CONFIG_I2C_SIS5595 is not set | 702 | # CONFIG_I2C_SIS5595 is not set |
667 | # CONFIG_I2C_SIS630 is not set | 703 | # CONFIG_I2C_SIS630 is not set |
668 | # CONFIG_I2C_SIS96X is not set | 704 | # CONFIG_I2C_SIS96X is not set |
669 | # CONFIG_I2C_TAOS_EVM is not set | ||
670 | # CONFIG_I2C_STUB is not set | ||
671 | # CONFIG_I2C_VIA is not set | 705 | # CONFIG_I2C_VIA is not set |
672 | # CONFIG_I2C_VIAPRO is not set | 706 | # CONFIG_I2C_VIAPRO is not set |
707 | |||
708 | # | ||
709 | # Mac SMBus host controller drivers | ||
710 | # | ||
711 | # CONFIG_I2C_HYDRA is not set | ||
712 | CONFIG_I2C_POWERMAC=y | ||
713 | |||
714 | # | ||
715 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
716 | # | ||
717 | # CONFIG_I2C_GPIO is not set | ||
718 | CONFIG_I2C_MPC=y | ||
719 | # CONFIG_I2C_OCORES is not set | ||
720 | # CONFIG_I2C_SIMTEC is not set | ||
721 | |||
722 | # | ||
723 | # External I2C/SMBus adapter drivers | ||
724 | # | ||
725 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
726 | # CONFIG_I2C_TAOS_EVM is not set | ||
727 | |||
728 | # | ||
729 | # Graphics adapter I2C/DDC channel drivers | ||
730 | # | ||
673 | # CONFIG_I2C_VOODOO3 is not set | 731 | # CONFIG_I2C_VOODOO3 is not set |
732 | |||
733 | # | ||
734 | # Other I2C/SMBus bus drivers | ||
735 | # | ||
674 | # CONFIG_I2C_PCA_PLATFORM is not set | 736 | # CONFIG_I2C_PCA_PLATFORM is not set |
737 | # CONFIG_I2C_STUB is not set | ||
675 | 738 | ||
676 | # | 739 | # |
677 | # Miscellaneous I2C Chip support | 740 | # Miscellaneous I2C Chip support |
678 | # | 741 | # |
679 | # CONFIG_DS1682 is not set | 742 | # CONFIG_DS1682 is not set |
743 | # CONFIG_AT24 is not set | ||
680 | # CONFIG_SENSORS_EEPROM is not set | 744 | # CONFIG_SENSORS_EEPROM is not set |
681 | # CONFIG_SENSORS_PCF8574 is not set | 745 | # CONFIG_SENSORS_PCF8574 is not set |
682 | # CONFIG_PCF8575 is not set | 746 | # CONFIG_PCF8575 is not set |
747 | # CONFIG_SENSORS_PCA9539 is not set | ||
683 | # CONFIG_SENSORS_PCF8591 is not set | 748 | # CONFIG_SENSORS_PCF8591 is not set |
684 | # CONFIG_TPS65010 is not set | 749 | # CONFIG_TPS65010 is not set |
685 | # CONFIG_SENSORS_MAX6875 is not set | 750 | # CONFIG_SENSORS_MAX6875 is not set |
@@ -703,26 +768,33 @@ CONFIG_SPI_MPC83xx=y | |||
703 | # CONFIG_SPI_AT25 is not set | 768 | # CONFIG_SPI_AT25 is not set |
704 | CONFIG_SPI_SPIDEV=y | 769 | CONFIG_SPI_SPIDEV=y |
705 | # CONFIG_SPI_TLE62X0 is not set | 770 | # CONFIG_SPI_TLE62X0 is not set |
706 | CONFIG_HAVE_GPIO_LIB=y | 771 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
707 | 772 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | |
708 | # | 773 | CONFIG_GPIOLIB=y |
709 | # GPIO Support | 774 | # CONFIG_GPIO_SYSFS is not set |
710 | # | ||
711 | 775 | ||
712 | # | 776 | # |
713 | # I2C GPIO expanders: | 777 | # I2C GPIO expanders: |
714 | # | 778 | # |
779 | # CONFIG_GPIO_MAX732X is not set | ||
715 | # CONFIG_GPIO_PCA953X is not set | 780 | # CONFIG_GPIO_PCA953X is not set |
716 | # CONFIG_GPIO_PCF857X is not set | 781 | # CONFIG_GPIO_PCF857X is not set |
717 | 782 | ||
718 | # | 783 | # |
784 | # PCI GPIO expanders: | ||
785 | # | ||
786 | # CONFIG_GPIO_BT8XX is not set | ||
787 | |||
788 | # | ||
719 | # SPI GPIO expanders: | 789 | # SPI GPIO expanders: |
720 | # | 790 | # |
791 | # CONFIG_GPIO_MAX7301 is not set | ||
721 | # CONFIG_GPIO_MCP23S08 is not set | 792 | # CONFIG_GPIO_MCP23S08 is not set |
722 | # CONFIG_W1 is not set | 793 | # CONFIG_W1 is not set |
723 | # CONFIG_POWER_SUPPLY is not set | 794 | # CONFIG_POWER_SUPPLY is not set |
724 | # CONFIG_HWMON is not set | 795 | # CONFIG_HWMON is not set |
725 | # CONFIG_THERMAL is not set | 796 | # CONFIG_THERMAL is not set |
797 | # CONFIG_THERMAL_HWMON is not set | ||
726 | CONFIG_WATCHDOG=y | 798 | CONFIG_WATCHDOG=y |
727 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 799 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
728 | 800 | ||
@@ -730,7 +802,9 @@ CONFIG_WATCHDOG=y | |||
730 | # Watchdog Device Drivers | 802 | # Watchdog Device Drivers |
731 | # | 803 | # |
732 | # CONFIG_SOFT_WATCHDOG is not set | 804 | # CONFIG_SOFT_WATCHDOG is not set |
733 | CONFIG_83xx_WDT=y | 805 | # CONFIG_ALIM7101_WDT is not set |
806 | # CONFIG_8xxx_WDT is not set | ||
807 | # CONFIG_WATCHDOG_RTAS is not set | ||
734 | 808 | ||
735 | # | 809 | # |
736 | # PCI-based Watchdog Cards | 810 | # PCI-based Watchdog Cards |
@@ -747,9 +821,10 @@ CONFIG_SSB_POSSIBLE=y | |||
747 | # | 821 | # |
748 | # Multifunction device drivers | 822 | # Multifunction device drivers |
749 | # | 823 | # |
824 | # CONFIG_MFD_CORE is not set | ||
750 | # CONFIG_MFD_SM501 is not set | 825 | # CONFIG_MFD_SM501 is not set |
751 | # CONFIG_HTC_EGPIO is not set | ||
752 | # CONFIG_HTC_PASIC3 is not set | 826 | # CONFIG_HTC_PASIC3 is not set |
827 | # CONFIG_MFD_TMIO is not set | ||
753 | 828 | ||
754 | # | 829 | # |
755 | # Multimedia devices | 830 | # Multimedia devices |
@@ -799,6 +874,9 @@ CONFIG_FB_MACMODES=y | |||
799 | # CONFIG_FB_PM2 is not set | 874 | # CONFIG_FB_PM2 is not set |
800 | # CONFIG_FB_CYBER2000 is not set | 875 | # CONFIG_FB_CYBER2000 is not set |
801 | CONFIG_FB_OF=y | 876 | CONFIG_FB_OF=y |
877 | # CONFIG_FB_CONTROL is not set | ||
878 | # CONFIG_FB_PLATINUM is not set | ||
879 | # CONFIG_FB_VALKYRIE is not set | ||
802 | # CONFIG_FB_CT65550 is not set | 880 | # CONFIG_FB_CT65550 is not set |
803 | # CONFIG_FB_ASILIANT is not set | 881 | # CONFIG_FB_ASILIANT is not set |
804 | # CONFIG_FB_IMSTT is not set | 882 | # CONFIG_FB_IMSTT is not set |
@@ -821,6 +899,7 @@ CONFIG_FB_OF=y | |||
821 | # CONFIG_FB_TRIDENT is not set | 899 | # CONFIG_FB_TRIDENT is not set |
822 | # CONFIG_FB_ARK is not set | 900 | # CONFIG_FB_ARK is not set |
823 | # CONFIG_FB_PM3 is not set | 901 | # CONFIG_FB_PM3 is not set |
902 | # CONFIG_FB_CARMINE is not set | ||
824 | # CONFIG_FB_FSL_DIU is not set | 903 | # CONFIG_FB_FSL_DIU is not set |
825 | # CONFIG_FB_IBM_GXT4500 is not set | 904 | # CONFIG_FB_IBM_GXT4500 is not set |
826 | # CONFIG_FB_VIRTUAL is not set | 905 | # CONFIG_FB_VIRTUAL is not set |
@@ -846,10 +925,6 @@ CONFIG_LOGO=y | |||
846 | # CONFIG_LOGO_LINUX_MONO is not set | 925 | # CONFIG_LOGO_LINUX_MONO is not set |
847 | CONFIG_LOGO_LINUX_VGA16=y | 926 | CONFIG_LOGO_LINUX_VGA16=y |
848 | CONFIG_LOGO_LINUX_CLUT224=y | 927 | CONFIG_LOGO_LINUX_CLUT224=y |
849 | |||
850 | # | ||
851 | # Sound | ||
852 | # | ||
853 | # CONFIG_SOUND is not set | 928 | # CONFIG_SOUND is not set |
854 | CONFIG_HID_SUPPORT=y | 929 | CONFIG_HID_SUPPORT=y |
855 | CONFIG_HID=y | 930 | CONFIG_HID=y |
@@ -941,6 +1016,7 @@ CONFIG_JFFS2_RTIME=y | |||
941 | # CONFIG_CRAMFS is not set | 1016 | # CONFIG_CRAMFS is not set |
942 | # CONFIG_VXFS_FS is not set | 1017 | # CONFIG_VXFS_FS is not set |
943 | # CONFIG_MINIX_FS is not set | 1018 | # CONFIG_MINIX_FS is not set |
1019 | # CONFIG_OMFS_FS is not set | ||
944 | # CONFIG_HPFS_FS is not set | 1020 | # CONFIG_HPFS_FS is not set |
945 | # CONFIG_QNX4FS_FS is not set | 1021 | # CONFIG_QNX4FS_FS is not set |
946 | # CONFIG_ROMFS_FS is not set | 1022 | # CONFIG_ROMFS_FS is not set |
@@ -951,14 +1027,13 @@ CONFIG_NFS_FS=y | |||
951 | CONFIG_NFS_V3=y | 1027 | CONFIG_NFS_V3=y |
952 | # CONFIG_NFS_V3_ACL is not set | 1028 | # CONFIG_NFS_V3_ACL is not set |
953 | CONFIG_NFS_V4=y | 1029 | CONFIG_NFS_V4=y |
954 | # CONFIG_NFSD is not set | ||
955 | CONFIG_ROOT_NFS=y | 1030 | CONFIG_ROOT_NFS=y |
1031 | # CONFIG_NFSD is not set | ||
956 | CONFIG_LOCKD=y | 1032 | CONFIG_LOCKD=y |
957 | CONFIG_LOCKD_V4=y | 1033 | CONFIG_LOCKD_V4=y |
958 | CONFIG_NFS_COMMON=y | 1034 | CONFIG_NFS_COMMON=y |
959 | CONFIG_SUNRPC=y | 1035 | CONFIG_SUNRPC=y |
960 | CONFIG_SUNRPC_GSS=y | 1036 | CONFIG_SUNRPC_GSS=y |
961 | # CONFIG_SUNRPC_BIND34 is not set | ||
962 | CONFIG_RPCSEC_GSS_KRB5=y | 1037 | CONFIG_RPCSEC_GSS_KRB5=y |
963 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1038 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
964 | # CONFIG_SMB_FS is not set | 1039 | # CONFIG_SMB_FS is not set |
@@ -998,6 +1073,7 @@ CONFIG_BITREVERSE=y | |||
998 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1073 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
999 | # CONFIG_CRC_CCITT is not set | 1074 | # CONFIG_CRC_CCITT is not set |
1000 | # CONFIG_CRC16 is not set | 1075 | # CONFIG_CRC16 is not set |
1076 | # CONFIG_CRC_T10DIF is not set | ||
1001 | # CONFIG_CRC_ITU_T is not set | 1077 | # CONFIG_CRC_ITU_T is not set |
1002 | CONFIG_CRC32=y | 1078 | CONFIG_CRC32=y |
1003 | # CONFIG_CRC7 is not set | 1079 | # CONFIG_CRC7 is not set |
@@ -1025,12 +1101,22 @@ CONFIG_FRAME_WARN=1024 | |||
1025 | # CONFIG_SLUB_DEBUG_ON is not set | 1101 | # CONFIG_SLUB_DEBUG_ON is not set |
1026 | # CONFIG_SLUB_STATS is not set | 1102 | # CONFIG_SLUB_STATS is not set |
1027 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1103 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1104 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1105 | # CONFIG_LATENCYTOP is not set | ||
1106 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1107 | CONFIG_HAVE_FTRACE=y | ||
1108 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1109 | # CONFIG_FTRACE is not set | ||
1110 | # CONFIG_SCHED_TRACER is not set | ||
1111 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1028 | # CONFIG_SAMPLES is not set | 1112 | # CONFIG_SAMPLES is not set |
1113 | CONFIG_HAVE_ARCH_KGDB=y | ||
1029 | # CONFIG_IRQSTACKS is not set | 1114 | # CONFIG_IRQSTACKS is not set |
1115 | # CONFIG_BOOTX_TEXT is not set | ||
1030 | CONFIG_PPC_EARLY_DEBUG=y | 1116 | CONFIG_PPC_EARLY_DEBUG=y |
1031 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set | 1117 | # CONFIG_PPC_EARLY_DEBUG_LPAR is not set |
1032 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set | 1118 | # CONFIG_PPC_EARLY_DEBUG_G5 is not set |
1033 | # CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set | 1119 | CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL=y |
1034 | # CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set | 1120 | # CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set |
1035 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set | 1121 | # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set |
1036 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set | 1122 | # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set |
@@ -1091,6 +1177,10 @@ CONFIG_CRYPTO_CBC=y | |||
1091 | # CONFIG_CRYPTO_MD4 is not set | 1177 | # CONFIG_CRYPTO_MD4 is not set |
1092 | CONFIG_CRYPTO_MD5=y | 1178 | CONFIG_CRYPTO_MD5=y |
1093 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1179 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1180 | # CONFIG_CRYPTO_RMD128 is not set | ||
1181 | # CONFIG_CRYPTO_RMD160 is not set | ||
1182 | # CONFIG_CRYPTO_RMD256 is not set | ||
1183 | # CONFIG_CRYPTO_RMD320 is not set | ||
1094 | # CONFIG_CRYPTO_SHA1 is not set | 1184 | # CONFIG_CRYPTO_SHA1 is not set |
1095 | # CONFIG_CRYPTO_SHA256 is not set | 1185 | # CONFIG_CRYPTO_SHA256 is not set |
1096 | # CONFIG_CRYPTO_SHA512 is not set | 1186 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1123,6 +1213,7 @@ CONFIG_CRYPTO_DES=y | |||
1123 | # CONFIG_CRYPTO_LZO is not set | 1213 | # CONFIG_CRYPTO_LZO is not set |
1124 | CONFIG_CRYPTO_HW=y | 1214 | CONFIG_CRYPTO_HW=y |
1125 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1215 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1216 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1126 | # CONFIG_PPC_CLOCK is not set | 1217 | # CONFIG_PPC_CLOCK is not set |
1127 | CONFIG_PPC_LIB_RHEAP=y | 1218 | CONFIG_PPC_LIB_RHEAP=y |
1128 | # CONFIG_VIRTUALIZATION is not set | 1219 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig index 0f94d9f56beb..de472022aa81 100644 --- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:28 2008 | 4 | # Thu Aug 21 00:52:23 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,13 +93,13 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 97 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
94 | CONFIG_HOTPLUG=y | 98 | CONFIG_HOTPLUG=y |
95 | CONFIG_PRINTK=y | 99 | CONFIG_PRINTK=y |
96 | CONFIG_BUG=y | 100 | CONFIG_BUG=y |
97 | CONFIG_ELF_CORE=y | 101 | CONFIG_ELF_CORE=y |
102 | CONFIG_PCSPKR_PLATFORM=y | ||
98 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
99 | CONFIG_BASE_FULL=y | 104 | CONFIG_BASE_FULL=y |
100 | CONFIG_FUTEX=y | 105 | CONFIG_FUTEX=y |
@@ -112,10 +117,16 @@ CONFIG_SLAB=y | |||
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
114 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
127 | # CONFIG_HAVE_CLK is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
@@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y | |||
126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 137 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
127 | # CONFIG_MODVERSIONS is not set | 138 | # CONFIG_MODVERSIONS is not set |
128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 139 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
129 | # CONFIG_KMOD is not set | 140 | CONFIG_KMOD=y |
130 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
131 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
133 | # CONFIG_LSF is not set | 144 | # CONFIG_LSF is not set |
134 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
135 | 147 | ||
136 | # | 148 | # |
137 | # IO Schedulers | 149 | # IO Schedulers |
@@ -150,37 +162,49 @@ CONFIG_CLASSIC_RCU=y | |||
150 | # | 162 | # |
151 | # Platform support | 163 | # Platform support |
152 | # | 164 | # |
153 | # CONFIG_PPC_MULTIPLATFORM is not set | 165 | CONFIG_PPC_MULTIPLATFORM=y |
154 | # CONFIG_PPC_82xx is not set | 166 | CONFIG_CLASSIC32=y |
155 | CONFIG_PPC_83xx=y | 167 | CONFIG_PPC_CHRP=y |
156 | # CONFIG_PPC_86xx is not set | 168 | # CONFIG_MPC5121_ADS is not set |
157 | # CONFIG_PPC_MPC512x is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
158 | # CONFIG_PPC_MPC5121 is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | ||
159 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
160 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | ||
161 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
162 | CONFIG_MPC83xx=y | 176 | CONFIG_PPC_83xx=y |
163 | # CONFIG_MPC831x_RDB is not set | 177 | # CONFIG_MPC831x_RDB is not set |
164 | # CONFIG_MPC832x_MDS is not set | 178 | # CONFIG_MPC832x_MDS is not set |
165 | # CONFIG_MPC832x_RDB is not set | 179 | # CONFIG_MPC832x_RDB is not set |
166 | # CONFIG_MPC834x_MDS is not set | 180 | # CONFIG_MPC834x_MDS is not set |
167 | # CONFIG_MPC834x_ITX is not set | 181 | # CONFIG_MPC834x_ITX is not set |
168 | # CONFIG_MPC836x_MDS is not set | 182 | # CONFIG_MPC836x_MDS is not set |
183 | # CONFIG_MPC836x_RDK is not set | ||
169 | CONFIG_MPC837x_MDS=y | 184 | CONFIG_MPC837x_MDS=y |
170 | # CONFIG_MPC837x_RDB is not set | 185 | # CONFIG_MPC837x_RDB is not set |
171 | # CONFIG_SBC834x is not set | 186 | # CONFIG_SBC834x is not set |
187 | # CONFIG_ASP834x is not set | ||
172 | CONFIG_PPC_MPC837x=y | 188 | CONFIG_PPC_MPC837x=y |
189 | # CONFIG_PPC_86xx is not set | ||
190 | # CONFIG_EMBEDDED6xx is not set | ||
191 | CONFIG_PPC_NATIVE=y | ||
192 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
173 | CONFIG_IPIC=y | 193 | CONFIG_IPIC=y |
174 | # CONFIG_MPIC is not set | 194 | CONFIG_MPIC=y |
175 | # CONFIG_MPIC_WEIRD is not set | 195 | # CONFIG_MPIC_WEIRD is not set |
176 | # CONFIG_PPC_I8259 is not set | 196 | CONFIG_PPC_I8259=y |
177 | # CONFIG_PPC_RTAS is not set | 197 | CONFIG_PPC_RTAS=y |
198 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
199 | CONFIG_RTAS_PROC=y | ||
178 | # CONFIG_MMIO_NVRAM is not set | 200 | # CONFIG_MMIO_NVRAM is not set |
179 | # CONFIG_PPC_MPC106 is not set | 201 | CONFIG_PPC_MPC106=y |
180 | # CONFIG_PPC_970_NAP is not set | 202 | # CONFIG_PPC_970_NAP is not set |
181 | # CONFIG_PPC_INDIRECT_IO is not set | 203 | # CONFIG_PPC_INDIRECT_IO is not set |
182 | # CONFIG_GENERIC_IOMAP is not set | 204 | # CONFIG_GENERIC_IOMAP is not set |
183 | # CONFIG_CPU_FREQ is not set | 205 | # CONFIG_CPU_FREQ is not set |
206 | # CONFIG_PPC601_SYNC_FIX is not set | ||
207 | # CONFIG_TAU is not set | ||
184 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
185 | 209 | ||
186 | # | 210 | # |
@@ -206,6 +230,7 @@ CONFIG_BINFMT_ELF=y | |||
206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
207 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 231 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
208 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
233 | # CONFIG_KEXEC is not set | ||
209 | CONFIG_ARCH_FLATMEM_ENABLE=y | 234 | CONFIG_ARCH_FLATMEM_ENABLE=y |
210 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 235 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
211 | CONFIG_SELECT_MEMORY_MODEL=y | 236 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -218,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 243 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
219 | CONFIG_PAGEFLAGS_EXTENDED=y | 244 | CONFIG_PAGEFLAGS_EXTENDED=y |
220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
246 | CONFIG_MIGRATION=y | ||
221 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
222 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
223 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
@@ -225,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y | |||
225 | CONFIG_FORCE_MAX_ZONEORDER=11 | 251 | CONFIG_FORCE_MAX_ZONEORDER=11 |
226 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
227 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
254 | CONFIG_EXTRA_TARGETS="" | ||
228 | # CONFIG_PM is not set | 255 | # CONFIG_PM is not set |
229 | CONFIG_SECCOMP=y | 256 | CONFIG_SECCOMP=y |
230 | CONFIG_ISA_DMA_API=y | 257 | CONFIG_ISA_DMA_API=y |
@@ -232,15 +259,22 @@ CONFIG_ISA_DMA_API=y | |||
232 | # | 259 | # |
233 | # Bus options | 260 | # Bus options |
234 | # | 261 | # |
262 | # CONFIG_ISA is not set | ||
235 | CONFIG_ZONE_DMA=y | 263 | CONFIG_ZONE_DMA=y |
236 | CONFIG_GENERIC_ISA_DMA=y | 264 | CONFIG_GENERIC_ISA_DMA=y |
237 | CONFIG_PPC_INDIRECT_PCI=y | 265 | CONFIG_PPC_INDIRECT_PCI=y |
238 | CONFIG_FSL_SOC=y | 266 | CONFIG_FSL_SOC=y |
239 | # CONFIG_PCI is not set | 267 | CONFIG_FSL_PCI=y |
240 | # CONFIG_PCI_DOMAINS is not set | 268 | CONFIG_PPC_PCI_CHOICE=y |
241 | # CONFIG_PCI_SYSCALL is not set | 269 | CONFIG_PCI=y |
242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 270 | CONFIG_PCI_DOMAINS=y |
271 | CONFIG_PCI_SYSCALL=y | ||
272 | # CONFIG_PCIEPORTBUS is not set | ||
273 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
274 | # CONFIG_PCI_MSI is not set | ||
275 | CONFIG_PCI_LEGACY=y | ||
243 | # CONFIG_PCCARD is not set | 276 | # CONFIG_PCCARD is not set |
277 | # CONFIG_HOTPLUG_PCI is not set | ||
244 | # CONFIG_HAS_RAPIDIO is not set | 278 | # CONFIG_HAS_RAPIDIO is not set |
245 | 279 | ||
246 | # | 280 | # |
@@ -256,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
256 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | 291 | CONFIG_PHYSICAL_START=0x00000000 |
258 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
259 | |||
260 | # | ||
261 | # Networking | ||
262 | # | ||
263 | CONFIG_NET=y | 293 | CONFIG_NET=y |
264 | 294 | ||
265 | # | 295 | # |
@@ -360,19 +390,30 @@ CONFIG_OF_I2C=y | |||
360 | # CONFIG_PARPORT is not set | 390 | # CONFIG_PARPORT is not set |
361 | CONFIG_BLK_DEV=y | 391 | CONFIG_BLK_DEV=y |
362 | # CONFIG_BLK_DEV_FD is not set | 392 | # CONFIG_BLK_DEV_FD is not set |
393 | # CONFIG_MAC_FLOPPY is not set | ||
394 | # CONFIG_BLK_CPQ_DA is not set | ||
395 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
396 | # CONFIG_BLK_DEV_DAC960 is not set | ||
397 | # CONFIG_BLK_DEV_UMEM is not set | ||
363 | # CONFIG_BLK_DEV_COW_COMMON is not set | 398 | # CONFIG_BLK_DEV_COW_COMMON is not set |
364 | CONFIG_BLK_DEV_LOOP=y | 399 | CONFIG_BLK_DEV_LOOP=y |
365 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 400 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
366 | # CONFIG_BLK_DEV_NBD is not set | 401 | # CONFIG_BLK_DEV_NBD is not set |
402 | # CONFIG_BLK_DEV_SX8 is not set | ||
367 | CONFIG_BLK_DEV_RAM=y | 403 | CONFIG_BLK_DEV_RAM=y |
368 | CONFIG_BLK_DEV_RAM_COUNT=16 | 404 | CONFIG_BLK_DEV_RAM_COUNT=16 |
369 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 405 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
370 | # CONFIG_BLK_DEV_XIP is not set | 406 | # CONFIG_BLK_DEV_XIP is not set |
371 | # CONFIG_CDROM_PKTCDVD is not set | 407 | # CONFIG_CDROM_PKTCDVD is not set |
372 | # CONFIG_ATA_OVER_ETH is not set | 408 | # CONFIG_ATA_OVER_ETH is not set |
409 | # CONFIG_BLK_DEV_HD is not set | ||
373 | CONFIG_MISC_DEVICES=y | 410 | CONFIG_MISC_DEVICES=y |
411 | # CONFIG_PHANTOM is not set | ||
374 | # CONFIG_EEPROM_93CX6 is not set | 412 | # CONFIG_EEPROM_93CX6 is not set |
413 | # CONFIG_SGI_IOC4 is not set | ||
414 | # CONFIG_TIFM_CORE is not set | ||
375 | # CONFIG_ENCLOSURE_SERVICES is not set | 415 | # CONFIG_ENCLOSURE_SERVICES is not set |
416 | # CONFIG_HP_ILO is not set | ||
376 | CONFIG_HAVE_IDE=y | 417 | CONFIG_HAVE_IDE=y |
377 | # CONFIG_IDE is not set | 418 | # CONFIG_IDE is not set |
378 | 419 | ||
@@ -415,24 +456,128 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
415 | # CONFIG_SCSI_SRP_ATTRS is not set | 456 | # CONFIG_SCSI_SRP_ATTRS is not set |
416 | CONFIG_SCSI_LOWLEVEL=y | 457 | CONFIG_SCSI_LOWLEVEL=y |
417 | # CONFIG_ISCSI_TCP is not set | 458 | # CONFIG_ISCSI_TCP is not set |
459 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
460 | # CONFIG_SCSI_3W_9XXX is not set | ||
461 | # CONFIG_SCSI_ACARD is not set | ||
462 | # CONFIG_SCSI_AACRAID is not set | ||
463 | # CONFIG_SCSI_AIC7XXX is not set | ||
464 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
465 | # CONFIG_SCSI_AIC79XX is not set | ||
466 | # CONFIG_SCSI_AIC94XX is not set | ||
467 | # CONFIG_SCSI_DPT_I2O is not set | ||
468 | # CONFIG_SCSI_ADVANSYS is not set | ||
469 | # CONFIG_SCSI_ARCMSR is not set | ||
470 | # CONFIG_MEGARAID_NEWGEN is not set | ||
471 | # CONFIG_MEGARAID_LEGACY is not set | ||
472 | # CONFIG_MEGARAID_SAS is not set | ||
473 | # CONFIG_SCSI_HPTIOP is not set | ||
474 | # CONFIG_SCSI_BUSLOGIC is not set | ||
475 | # CONFIG_SCSI_DMX3191D is not set | ||
476 | # CONFIG_SCSI_EATA is not set | ||
477 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
478 | # CONFIG_SCSI_GDTH is not set | ||
479 | # CONFIG_SCSI_IPS is not set | ||
480 | # CONFIG_SCSI_INITIO is not set | ||
481 | # CONFIG_SCSI_INIA100 is not set | ||
482 | # CONFIG_SCSI_MVSAS is not set | ||
483 | # CONFIG_SCSI_STEX is not set | ||
484 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
485 | # CONFIG_SCSI_IPR is not set | ||
486 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
487 | # CONFIG_SCSI_QLA_FC is not set | ||
488 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
489 | # CONFIG_SCSI_LPFC is not set | ||
490 | # CONFIG_SCSI_DC395x is not set | ||
491 | # CONFIG_SCSI_DC390T is not set | ||
492 | # CONFIG_SCSI_NSP32 is not set | ||
418 | # CONFIG_SCSI_DEBUG is not set | 493 | # CONFIG_SCSI_DEBUG is not set |
494 | # CONFIG_SCSI_MESH is not set | ||
495 | # CONFIG_SCSI_MAC53C94 is not set | ||
496 | # CONFIG_SCSI_SRP is not set | ||
497 | # CONFIG_SCSI_DH is not set | ||
419 | CONFIG_ATA=y | 498 | CONFIG_ATA=y |
420 | # CONFIG_ATA_NONSTANDARD is not set | 499 | # CONFIG_ATA_NONSTANDARD is not set |
421 | CONFIG_SATA_PMP=y | 500 | CONFIG_SATA_PMP=y |
501 | # CONFIG_SATA_AHCI is not set | ||
502 | # CONFIG_SATA_SIL24 is not set | ||
422 | CONFIG_SATA_FSL=y | 503 | CONFIG_SATA_FSL=y |
423 | CONFIG_ATA_SFF=y | 504 | CONFIG_ATA_SFF=y |
505 | # CONFIG_SATA_SVW is not set | ||
506 | # CONFIG_ATA_PIIX is not set | ||
424 | # CONFIG_SATA_MV is not set | 507 | # CONFIG_SATA_MV is not set |
508 | # CONFIG_SATA_NV is not set | ||
509 | # CONFIG_PDC_ADMA is not set | ||
510 | # CONFIG_SATA_QSTOR is not set | ||
511 | # CONFIG_SATA_PROMISE is not set | ||
512 | # CONFIG_SATA_SX4 is not set | ||
513 | # CONFIG_SATA_SIL is not set | ||
514 | # CONFIG_SATA_SIS is not set | ||
515 | # CONFIG_SATA_ULI is not set | ||
516 | # CONFIG_SATA_VIA is not set | ||
517 | # CONFIG_SATA_VITESSE is not set | ||
518 | # CONFIG_SATA_INIC162X is not set | ||
519 | # CONFIG_PATA_ALI is not set | ||
520 | # CONFIG_PATA_AMD is not set | ||
521 | # CONFIG_PATA_ARTOP is not set | ||
522 | # CONFIG_PATA_ATIIXP is not set | ||
523 | # CONFIG_PATA_CMD640_PCI is not set | ||
524 | # CONFIG_PATA_CMD64X is not set | ||
525 | # CONFIG_PATA_CS5520 is not set | ||
526 | # CONFIG_PATA_CS5530 is not set | ||
527 | # CONFIG_PATA_CYPRESS is not set | ||
528 | # CONFIG_PATA_EFAR is not set | ||
529 | # CONFIG_ATA_GENERIC is not set | ||
530 | # CONFIG_PATA_HPT366 is not set | ||
531 | # CONFIG_PATA_HPT37X is not set | ||
532 | # CONFIG_PATA_HPT3X2N is not set | ||
533 | # CONFIG_PATA_HPT3X3 is not set | ||
534 | # CONFIG_PATA_IT821X is not set | ||
535 | # CONFIG_PATA_IT8213 is not set | ||
536 | # CONFIG_PATA_JMICRON is not set | ||
537 | # CONFIG_PATA_TRIFLEX is not set | ||
538 | # CONFIG_PATA_MARVELL is not set | ||
539 | # CONFIG_PATA_MPIIX is not set | ||
540 | # CONFIG_PATA_OLDPIIX is not set | ||
541 | # CONFIG_PATA_NETCELL is not set | ||
542 | # CONFIG_PATA_NINJA32 is not set | ||
543 | # CONFIG_PATA_NS87410 is not set | ||
544 | # CONFIG_PATA_NS87415 is not set | ||
545 | # CONFIG_PATA_OPTI is not set | ||
546 | # CONFIG_PATA_OPTIDMA is not set | ||
547 | # CONFIG_PATA_PDC_OLD is not set | ||
548 | # CONFIG_PATA_RADISYS is not set | ||
549 | # CONFIG_PATA_RZ1000 is not set | ||
550 | # CONFIG_PATA_SC1200 is not set | ||
551 | # CONFIG_PATA_SERVERWORKS is not set | ||
552 | # CONFIG_PATA_PDC2027X is not set | ||
553 | # CONFIG_PATA_SIL680 is not set | ||
554 | # CONFIG_PATA_SIS is not set | ||
555 | # CONFIG_PATA_VIA is not set | ||
556 | # CONFIG_PATA_WINBOND is not set | ||
425 | # CONFIG_PATA_PLATFORM is not set | 557 | # CONFIG_PATA_PLATFORM is not set |
558 | # CONFIG_PATA_SCH is not set | ||
426 | # CONFIG_MD is not set | 559 | # CONFIG_MD is not set |
560 | # CONFIG_FUSION is not set | ||
561 | |||
562 | # | ||
563 | # IEEE 1394 (FireWire) support | ||
564 | # | ||
565 | |||
566 | # | ||
567 | # Enable only one of the two stacks, unless you know what you are doing | ||
568 | # | ||
569 | # CONFIG_FIREWIRE is not set | ||
570 | # CONFIG_IEEE1394 is not set | ||
571 | # CONFIG_I2O is not set | ||
427 | # CONFIG_MACINTOSH_DRIVERS is not set | 572 | # CONFIG_MACINTOSH_DRIVERS is not set |
428 | CONFIG_NETDEVICES=y | 573 | CONFIG_NETDEVICES=y |
429 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
430 | # CONFIG_DUMMY is not set | 574 | # CONFIG_DUMMY is not set |
431 | # CONFIG_BONDING is not set | 575 | # CONFIG_BONDING is not set |
432 | # CONFIG_MACVLAN is not set | 576 | # CONFIG_MACVLAN is not set |
433 | # CONFIG_EQUALIZER is not set | 577 | # CONFIG_EQUALIZER is not set |
434 | # CONFIG_TUN is not set | 578 | # CONFIG_TUN is not set |
435 | # CONFIG_VETH is not set | 579 | # CONFIG_VETH is not set |
580 | # CONFIG_ARCNET is not set | ||
436 | CONFIG_PHYLIB=y | 581 | CONFIG_PHYLIB=y |
437 | 582 | ||
438 | # | 583 | # |
@@ -452,16 +597,56 @@ CONFIG_MARVELL_PHY=y | |||
452 | # CONFIG_MDIO_BITBANG is not set | 597 | # CONFIG_MDIO_BITBANG is not set |
453 | CONFIG_NET_ETHERNET=y | 598 | CONFIG_NET_ETHERNET=y |
454 | CONFIG_MII=y | 599 | CONFIG_MII=y |
600 | # CONFIG_MACE is not set | ||
601 | # CONFIG_BMAC is not set | ||
602 | # CONFIG_HAPPYMEAL is not set | ||
603 | # CONFIG_SUNGEM is not set | ||
604 | # CONFIG_CASSINI is not set | ||
605 | # CONFIG_NET_VENDOR_3COM is not set | ||
606 | # CONFIG_NET_TULIP is not set | ||
607 | # CONFIG_HP100 is not set | ||
455 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 608 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
456 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 609 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
457 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 610 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
458 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 611 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
612 | # CONFIG_NET_PCI is not set | ||
459 | # CONFIG_B44 is not set | 613 | # CONFIG_B44 is not set |
460 | CONFIG_NETDEV_1000=y | 614 | CONFIG_NETDEV_1000=y |
461 | # CONFIG_E1000E_ENABLED is not set | 615 | # CONFIG_ACENIC is not set |
616 | # CONFIG_DL2K is not set | ||
617 | # CONFIG_E1000 is not set | ||
618 | # CONFIG_E1000E is not set | ||
619 | # CONFIG_IP1000 is not set | ||
620 | # CONFIG_IGB is not set | ||
621 | # CONFIG_NS83820 is not set | ||
622 | # CONFIG_HAMACHI is not set | ||
623 | # CONFIG_YELLOWFIN is not set | ||
624 | # CONFIG_R8169 is not set | ||
625 | # CONFIG_SIS190 is not set | ||
626 | # CONFIG_SKGE is not set | ||
627 | # CONFIG_SKY2 is not set | ||
628 | # CONFIG_VIA_VELOCITY is not set | ||
629 | # CONFIG_TIGON3 is not set | ||
630 | # CONFIG_BNX2 is not set | ||
462 | CONFIG_GIANFAR=y | 631 | CONFIG_GIANFAR=y |
463 | # CONFIG_GFAR_NAPI is not set | 632 | # CONFIG_MV643XX_ETH is not set |
633 | # CONFIG_QLA3XXX is not set | ||
634 | # CONFIG_ATL1 is not set | ||
635 | # CONFIG_ATL1E is not set | ||
464 | CONFIG_NETDEV_10000=y | 636 | CONFIG_NETDEV_10000=y |
637 | # CONFIG_CHELSIO_T1 is not set | ||
638 | # CONFIG_CHELSIO_T3 is not set | ||
639 | # CONFIG_IXGBE is not set | ||
640 | # CONFIG_IXGB is not set | ||
641 | # CONFIG_S2IO is not set | ||
642 | # CONFIG_MYRI10GE is not set | ||
643 | # CONFIG_NETXEN_NIC is not set | ||
644 | # CONFIG_NIU is not set | ||
645 | # CONFIG_MLX4_CORE is not set | ||
646 | # CONFIG_TEHUTI is not set | ||
647 | # CONFIG_BNX2X is not set | ||
648 | # CONFIG_SFC is not set | ||
649 | # CONFIG_TR is not set | ||
465 | 650 | ||
466 | # | 651 | # |
467 | # Wireless LAN | 652 | # Wireless LAN |
@@ -470,8 +655,11 @@ CONFIG_NETDEV_10000=y | |||
470 | # CONFIG_WLAN_80211 is not set | 655 | # CONFIG_WLAN_80211 is not set |
471 | # CONFIG_IWLWIFI_LEDS is not set | 656 | # CONFIG_IWLWIFI_LEDS is not set |
472 | # CONFIG_WAN is not set | 657 | # CONFIG_WAN is not set |
658 | # CONFIG_FDDI is not set | ||
659 | # CONFIG_HIPPI is not set | ||
473 | # CONFIG_PPP is not set | 660 | # CONFIG_PPP is not set |
474 | # CONFIG_SLIP is not set | 661 | # CONFIG_SLIP is not set |
662 | # CONFIG_NET_FC is not set | ||
475 | # CONFIG_NETCONSOLE is not set | 663 | # CONFIG_NETCONSOLE is not set |
476 | # CONFIG_NETPOLL is not set | 664 | # CONFIG_NETPOLL is not set |
477 | # CONFIG_NET_POLL_CONTROLLER is not set | 665 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -515,12 +703,14 @@ CONFIG_INPUT=y | |||
515 | # CONFIG_VT is not set | 703 | # CONFIG_VT is not set |
516 | CONFIG_DEVKMEM=y | 704 | CONFIG_DEVKMEM=y |
517 | # CONFIG_SERIAL_NONSTANDARD is not set | 705 | # CONFIG_SERIAL_NONSTANDARD is not set |
706 | # CONFIG_NOZOMI is not set | ||
518 | 707 | ||
519 | # | 708 | # |
520 | # Serial drivers | 709 | # Serial drivers |
521 | # | 710 | # |
522 | CONFIG_SERIAL_8250=y | 711 | CONFIG_SERIAL_8250=y |
523 | CONFIG_SERIAL_8250_CONSOLE=y | 712 | CONFIG_SERIAL_8250_CONSOLE=y |
713 | CONFIG_SERIAL_8250_PCI=y | ||
524 | CONFIG_SERIAL_8250_NR_UARTS=4 | 714 | CONFIG_SERIAL_8250_NR_UARTS=4 |
525 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 715 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
526 | # CONFIG_SERIAL_8250_EXTENDED is not set | 716 | # CONFIG_SERIAL_8250_EXTENDED is not set |
@@ -531,40 +721,90 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
531 | # CONFIG_SERIAL_UARTLITE is not set | 721 | # CONFIG_SERIAL_UARTLITE is not set |
532 | CONFIG_SERIAL_CORE=y | 722 | CONFIG_SERIAL_CORE=y |
533 | CONFIG_SERIAL_CORE_CONSOLE=y | 723 | CONFIG_SERIAL_CORE_CONSOLE=y |
724 | # CONFIG_SERIAL_PMACZILOG is not set | ||
725 | # CONFIG_SERIAL_JSM is not set | ||
534 | # CONFIG_SERIAL_OF_PLATFORM is not set | 726 | # CONFIG_SERIAL_OF_PLATFORM is not set |
535 | CONFIG_UNIX98_PTYS=y | 727 | CONFIG_UNIX98_PTYS=y |
536 | CONFIG_LEGACY_PTYS=y | 728 | CONFIG_LEGACY_PTYS=y |
537 | CONFIG_LEGACY_PTY_COUNT=256 | 729 | CONFIG_LEGACY_PTY_COUNT=256 |
730 | # CONFIG_BRIQ_PANEL is not set | ||
731 | # CONFIG_HVC_RTAS is not set | ||
538 | # CONFIG_IPMI_HANDLER is not set | 732 | # CONFIG_IPMI_HANDLER is not set |
539 | # CONFIG_HW_RANDOM is not set | 733 | # CONFIG_HW_RANDOM is not set |
540 | # CONFIG_NVRAM is not set | 734 | # CONFIG_NVRAM is not set |
541 | CONFIG_GEN_RTC=y | 735 | CONFIG_GEN_RTC=y |
542 | # CONFIG_GEN_RTC_X is not set | 736 | # CONFIG_GEN_RTC_X is not set |
543 | # CONFIG_R3964 is not set | 737 | # CONFIG_R3964 is not set |
738 | # CONFIG_APPLICOM is not set | ||
544 | # CONFIG_RAW_DRIVER is not set | 739 | # CONFIG_RAW_DRIVER is not set |
545 | # CONFIG_TCG_TPM is not set | 740 | # CONFIG_TCG_TPM is not set |
741 | CONFIG_DEVPORT=y | ||
546 | CONFIG_I2C=y | 742 | CONFIG_I2C=y |
547 | CONFIG_I2C_BOARDINFO=y | 743 | CONFIG_I2C_BOARDINFO=y |
548 | CONFIG_I2C_CHARDEV=y | 744 | CONFIG_I2C_CHARDEV=y |
745 | CONFIG_I2C_HELPER_AUTO=y | ||
549 | 746 | ||
550 | # | 747 | # |
551 | # I2C Hardware Bus support | 748 | # I2C Hardware Bus support |
552 | # | 749 | # |
750 | |||
751 | # | ||
752 | # PC SMBus host controller drivers | ||
753 | # | ||
754 | # CONFIG_I2C_ALI1535 is not set | ||
755 | # CONFIG_I2C_ALI1563 is not set | ||
756 | # CONFIG_I2C_ALI15X3 is not set | ||
757 | # CONFIG_I2C_AMD756 is not set | ||
758 | # CONFIG_I2C_AMD8111 is not set | ||
759 | # CONFIG_I2C_I801 is not set | ||
760 | # CONFIG_I2C_ISCH is not set | ||
761 | # CONFIG_I2C_PIIX4 is not set | ||
762 | # CONFIG_I2C_NFORCE2 is not set | ||
763 | # CONFIG_I2C_SIS5595 is not set | ||
764 | # CONFIG_I2C_SIS630 is not set | ||
765 | # CONFIG_I2C_SIS96X is not set | ||
766 | # CONFIG_I2C_VIA is not set | ||
767 | # CONFIG_I2C_VIAPRO is not set | ||
768 | |||
769 | # | ||
770 | # Mac SMBus host controller drivers | ||
771 | # | ||
772 | # CONFIG_I2C_HYDRA is not set | ||
773 | CONFIG_I2C_POWERMAC=y | ||
774 | |||
775 | # | ||
776 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
777 | # | ||
553 | CONFIG_I2C_MPC=y | 778 | CONFIG_I2C_MPC=y |
554 | # CONFIG_I2C_OCORES is not set | 779 | # CONFIG_I2C_OCORES is not set |
555 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
556 | # CONFIG_I2C_SIMTEC is not set | 780 | # CONFIG_I2C_SIMTEC is not set |
781 | |||
782 | # | ||
783 | # External I2C/SMBus adapter drivers | ||
784 | # | ||
785 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
557 | # CONFIG_I2C_TAOS_EVM is not set | 786 | # CONFIG_I2C_TAOS_EVM is not set |
558 | # CONFIG_I2C_STUB is not set | 787 | |
788 | # | ||
789 | # Graphics adapter I2C/DDC channel drivers | ||
790 | # | ||
791 | # CONFIG_I2C_VOODOO3 is not set | ||
792 | |||
793 | # | ||
794 | # Other I2C/SMBus bus drivers | ||
795 | # | ||
559 | # CONFIG_I2C_PCA_PLATFORM is not set | 796 | # CONFIG_I2C_PCA_PLATFORM is not set |
797 | # CONFIG_I2C_STUB is not set | ||
560 | 798 | ||
561 | # | 799 | # |
562 | # Miscellaneous I2C Chip support | 800 | # Miscellaneous I2C Chip support |
563 | # | 801 | # |
564 | # CONFIG_DS1682 is not set | 802 | # CONFIG_DS1682 is not set |
803 | # CONFIG_AT24 is not set | ||
565 | # CONFIG_SENSORS_EEPROM is not set | 804 | # CONFIG_SENSORS_EEPROM is not set |
566 | # CONFIG_SENSORS_PCF8574 is not set | 805 | # CONFIG_SENSORS_PCF8574 is not set |
567 | # CONFIG_PCF8575 is not set | 806 | # CONFIG_PCF8575 is not set |
807 | # CONFIG_SENSORS_PCA9539 is not set | ||
568 | # CONFIG_SENSORS_PCF8591 is not set | 808 | # CONFIG_SENSORS_PCF8591 is not set |
569 | # CONFIG_SENSORS_MAX6875 is not set | 809 | # CONFIG_SENSORS_MAX6875 is not set |
570 | # CONFIG_SENSORS_TSL2550 is not set | 810 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -573,10 +813,13 @@ CONFIG_I2C_MPC=y | |||
573 | # CONFIG_I2C_DEBUG_BUS is not set | 813 | # CONFIG_I2C_DEBUG_BUS is not set |
574 | # CONFIG_I2C_DEBUG_CHIP is not set | 814 | # CONFIG_I2C_DEBUG_CHIP is not set |
575 | # CONFIG_SPI is not set | 815 | # CONFIG_SPI is not set |
816 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
817 | # CONFIG_GPIOLIB is not set | ||
576 | # CONFIG_W1 is not set | 818 | # CONFIG_W1 is not set |
577 | # CONFIG_POWER_SUPPLY is not set | 819 | # CONFIG_POWER_SUPPLY is not set |
578 | CONFIG_HWMON=y | 820 | CONFIG_HWMON=y |
579 | # CONFIG_HWMON_VID is not set | 821 | # CONFIG_HWMON_VID is not set |
822 | # CONFIG_SENSORS_AD7414 is not set | ||
580 | # CONFIG_SENSORS_AD7418 is not set | 823 | # CONFIG_SENSORS_AD7418 is not set |
581 | # CONFIG_SENSORS_ADM1021 is not set | 824 | # CONFIG_SENSORS_ADM1021 is not set |
582 | # CONFIG_SENSORS_ADM1025 is not set | 825 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -586,8 +829,10 @@ CONFIG_HWMON=y | |||
586 | # CONFIG_SENSORS_ADM9240 is not set | 829 | # CONFIG_SENSORS_ADM9240 is not set |
587 | # CONFIG_SENSORS_ADT7470 is not set | 830 | # CONFIG_SENSORS_ADT7470 is not set |
588 | # CONFIG_SENSORS_ADT7473 is not set | 831 | # CONFIG_SENSORS_ADT7473 is not set |
832 | # CONFIG_SENSORS_AMS is not set | ||
589 | # CONFIG_SENSORS_ATXP1 is not set | 833 | # CONFIG_SENSORS_ATXP1 is not set |
590 | # CONFIG_SENSORS_DS1621 is not set | 834 | # CONFIG_SENSORS_DS1621 is not set |
835 | # CONFIG_SENSORS_I5K_AMB is not set | ||
591 | # CONFIG_SENSORS_F71805F is not set | 836 | # CONFIG_SENSORS_F71805F is not set |
592 | # CONFIG_SENSORS_F71882FG is not set | 837 | # CONFIG_SENSORS_F71882FG is not set |
593 | # CONFIG_SENSORS_F75375S is not set | 838 | # CONFIG_SENSORS_F75375S is not set |
@@ -609,13 +854,16 @@ CONFIG_HWMON=y | |||
609 | # CONFIG_SENSORS_MAX6650 is not set | 854 | # CONFIG_SENSORS_MAX6650 is not set |
610 | # CONFIG_SENSORS_PC87360 is not set | 855 | # CONFIG_SENSORS_PC87360 is not set |
611 | # CONFIG_SENSORS_PC87427 is not set | 856 | # CONFIG_SENSORS_PC87427 is not set |
857 | # CONFIG_SENSORS_SIS5595 is not set | ||
612 | # CONFIG_SENSORS_DME1737 is not set | 858 | # CONFIG_SENSORS_DME1737 is not set |
613 | # CONFIG_SENSORS_SMSC47M1 is not set | 859 | # CONFIG_SENSORS_SMSC47M1 is not set |
614 | # CONFIG_SENSORS_SMSC47M192 is not set | 860 | # CONFIG_SENSORS_SMSC47M192 is not set |
615 | # CONFIG_SENSORS_SMSC47B397 is not set | 861 | # CONFIG_SENSORS_SMSC47B397 is not set |
616 | # CONFIG_SENSORS_ADS7828 is not set | 862 | # CONFIG_SENSORS_ADS7828 is not set |
617 | # CONFIG_SENSORS_THMC50 is not set | 863 | # CONFIG_SENSORS_THMC50 is not set |
864 | # CONFIG_SENSORS_VIA686A is not set | ||
618 | # CONFIG_SENSORS_VT1211 is not set | 865 | # CONFIG_SENSORS_VT1211 is not set |
866 | # CONFIG_SENSORS_VT8231 is not set | ||
619 | # CONFIG_SENSORS_W83781D is not set | 867 | # CONFIG_SENSORS_W83781D is not set |
620 | # CONFIG_SENSORS_W83791D is not set | 868 | # CONFIG_SENSORS_W83791D is not set |
621 | # CONFIG_SENSORS_W83792D is not set | 869 | # CONFIG_SENSORS_W83792D is not set |
@@ -626,6 +874,7 @@ CONFIG_HWMON=y | |||
626 | # CONFIG_SENSORS_W83627EHF is not set | 874 | # CONFIG_SENSORS_W83627EHF is not set |
627 | # CONFIG_HWMON_DEBUG_CHIP is not set | 875 | # CONFIG_HWMON_DEBUG_CHIP is not set |
628 | # CONFIG_THERMAL is not set | 876 | # CONFIG_THERMAL is not set |
877 | # CONFIG_THERMAL_HWMON is not set | ||
629 | CONFIG_WATCHDOG=y | 878 | CONFIG_WATCHDOG=y |
630 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 879 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
631 | 880 | ||
@@ -633,7 +882,15 @@ CONFIG_WATCHDOG=y | |||
633 | # Watchdog Device Drivers | 882 | # Watchdog Device Drivers |
634 | # | 883 | # |
635 | # CONFIG_SOFT_WATCHDOG is not set | 884 | # CONFIG_SOFT_WATCHDOG is not set |
636 | CONFIG_83xx_WDT=y | 885 | # CONFIG_ALIM7101_WDT is not set |
886 | # CONFIG_8xxx_WDT is not set | ||
887 | # CONFIG_WATCHDOG_RTAS is not set | ||
888 | |||
889 | # | ||
890 | # PCI-based Watchdog Cards | ||
891 | # | ||
892 | # CONFIG_PCIPCWATCHDOG is not set | ||
893 | # CONFIG_WDTPCI is not set | ||
637 | 894 | ||
638 | # | 895 | # |
639 | # Sonics Silicon Backplane | 896 | # Sonics Silicon Backplane |
@@ -644,8 +901,10 @@ CONFIG_SSB_POSSIBLE=y | |||
644 | # | 901 | # |
645 | # Multifunction device drivers | 902 | # Multifunction device drivers |
646 | # | 903 | # |
904 | # CONFIG_MFD_CORE is not set | ||
647 | # CONFIG_MFD_SM501 is not set | 905 | # CONFIG_MFD_SM501 is not set |
648 | # CONFIG_HTC_PASIC3 is not set | 906 | # CONFIG_HTC_PASIC3 is not set |
907 | # CONFIG_MFD_TMIO is not set | ||
649 | 908 | ||
650 | # | 909 | # |
651 | # Multimedia devices | 910 | # Multimedia devices |
@@ -666,6 +925,8 @@ CONFIG_DAB=y | |||
666 | # | 925 | # |
667 | # Graphics support | 926 | # Graphics support |
668 | # | 927 | # |
928 | # CONFIG_AGP is not set | ||
929 | # CONFIG_DRM is not set | ||
669 | # CONFIG_VGASTATE is not set | 930 | # CONFIG_VGASTATE is not set |
670 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 931 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
671 | # CONFIG_FB is not set | 932 | # CONFIG_FB is not set |
@@ -675,10 +936,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
675 | # Display device support | 936 | # Display device support |
676 | # | 937 | # |
677 | # CONFIG_DISPLAY_SUPPORT is not set | 938 | # CONFIG_DISPLAY_SUPPORT is not set |
678 | |||
679 | # | ||
680 | # Sound | ||
681 | # | ||
682 | # CONFIG_SOUND is not set | 939 | # CONFIG_SOUND is not set |
683 | CONFIG_HID_SUPPORT=y | 940 | CONFIG_HID_SUPPORT=y |
684 | CONFIG_HID=y | 941 | CONFIG_HID=y |
@@ -686,13 +943,17 @@ CONFIG_HID=y | |||
686 | # CONFIG_HIDRAW is not set | 943 | # CONFIG_HIDRAW is not set |
687 | CONFIG_USB_SUPPORT=y | 944 | CONFIG_USB_SUPPORT=y |
688 | CONFIG_USB_ARCH_HAS_HCD=y | 945 | CONFIG_USB_ARCH_HAS_HCD=y |
689 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 946 | CONFIG_USB_ARCH_HAS_OHCI=y |
690 | CONFIG_USB_ARCH_HAS_EHCI=y | 947 | CONFIG_USB_ARCH_HAS_EHCI=y |
691 | # CONFIG_USB is not set | 948 | # CONFIG_USB is not set |
692 | # CONFIG_USB_OTG_WHITELIST is not set | 949 | # CONFIG_USB_OTG_WHITELIST is not set |
693 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 950 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
694 | 951 | ||
695 | # | 952 | # |
953 | # Enable Host or Gadget support to see Inventra options | ||
954 | # | ||
955 | |||
956 | # | ||
696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 957 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
697 | # | 958 | # |
698 | # CONFIG_USB_GADGET is not set | 959 | # CONFIG_USB_GADGET is not set |
@@ -700,6 +961,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
700 | # CONFIG_MEMSTICK is not set | 961 | # CONFIG_MEMSTICK is not set |
701 | # CONFIG_NEW_LEDS is not set | 962 | # CONFIG_NEW_LEDS is not set |
702 | # CONFIG_ACCESSIBILITY is not set | 963 | # CONFIG_ACCESSIBILITY is not set |
964 | # CONFIG_INFINIBAND is not set | ||
703 | # CONFIG_EDAC is not set | 965 | # CONFIG_EDAC is not set |
704 | # CONFIG_RTC_CLASS is not set | 966 | # CONFIG_RTC_CLASS is not set |
705 | # CONFIG_DMADEVICES is not set | 967 | # CONFIG_DMADEVICES is not set |
@@ -769,6 +1031,7 @@ CONFIG_TMPFS=y | |||
769 | # CONFIG_CRAMFS is not set | 1031 | # CONFIG_CRAMFS is not set |
770 | # CONFIG_VXFS_FS is not set | 1032 | # CONFIG_VXFS_FS is not set |
771 | # CONFIG_MINIX_FS is not set | 1033 | # CONFIG_MINIX_FS is not set |
1034 | # CONFIG_OMFS_FS is not set | ||
772 | # CONFIG_HPFS_FS is not set | 1035 | # CONFIG_HPFS_FS is not set |
773 | # CONFIG_QNX4FS_FS is not set | 1036 | # CONFIG_QNX4FS_FS is not set |
774 | # CONFIG_ROMFS_FS is not set | 1037 | # CONFIG_ROMFS_FS is not set |
@@ -779,14 +1042,13 @@ CONFIG_NFS_FS=y | |||
779 | CONFIG_NFS_V3=y | 1042 | CONFIG_NFS_V3=y |
780 | # CONFIG_NFS_V3_ACL is not set | 1043 | # CONFIG_NFS_V3_ACL is not set |
781 | CONFIG_NFS_V4=y | 1044 | CONFIG_NFS_V4=y |
782 | # CONFIG_NFSD is not set | ||
783 | CONFIG_ROOT_NFS=y | 1045 | CONFIG_ROOT_NFS=y |
1046 | # CONFIG_NFSD is not set | ||
784 | CONFIG_LOCKD=y | 1047 | CONFIG_LOCKD=y |
785 | CONFIG_LOCKD_V4=y | 1048 | CONFIG_LOCKD_V4=y |
786 | CONFIG_NFS_COMMON=y | 1049 | CONFIG_NFS_COMMON=y |
787 | CONFIG_SUNRPC=y | 1050 | CONFIG_SUNRPC=y |
788 | CONFIG_SUNRPC_GSS=y | 1051 | CONFIG_SUNRPC_GSS=y |
789 | # CONFIG_SUNRPC_BIND34 is not set | ||
790 | CONFIG_RPCSEC_GSS_KRB5=y | 1052 | CONFIG_RPCSEC_GSS_KRB5=y |
791 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1053 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
792 | # CONFIG_SMB_FS is not set | 1054 | # CONFIG_SMB_FS is not set |
@@ -826,6 +1088,7 @@ CONFIG_BITREVERSE=y | |||
826 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1088 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
827 | # CONFIG_CRC_CCITT is not set | 1089 | # CONFIG_CRC_CCITT is not set |
828 | # CONFIG_CRC16 is not set | 1090 | # CONFIG_CRC16 is not set |
1091 | CONFIG_CRC_T10DIF=y | ||
829 | # CONFIG_CRC_ITU_T is not set | 1092 | # CONFIG_CRC_ITU_T is not set |
830 | CONFIG_CRC32=y | 1093 | CONFIG_CRC32=y |
831 | # CONFIG_CRC7 is not set | 1094 | # CONFIG_CRC7 is not set |
@@ -849,8 +1112,18 @@ CONFIG_FRAME_WARN=1024 | |||
849 | # CONFIG_HEADERS_CHECK is not set | 1112 | # CONFIG_HEADERS_CHECK is not set |
850 | # CONFIG_DEBUG_KERNEL is not set | 1113 | # CONFIG_DEBUG_KERNEL is not set |
851 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1114 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1115 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1116 | # CONFIG_LATENCYTOP is not set | ||
1117 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1118 | CONFIG_HAVE_FTRACE=y | ||
1119 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1120 | # CONFIG_FTRACE is not set | ||
1121 | # CONFIG_SCHED_TRACER is not set | ||
1122 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
852 | # CONFIG_SAMPLES is not set | 1123 | # CONFIG_SAMPLES is not set |
1124 | CONFIG_HAVE_ARCH_KGDB=y | ||
853 | # CONFIG_IRQSTACKS is not set | 1125 | # CONFIG_IRQSTACKS is not set |
1126 | # CONFIG_BOOTX_TEXT is not set | ||
854 | # CONFIG_PPC_EARLY_DEBUG is not set | 1127 | # CONFIG_PPC_EARLY_DEBUG is not set |
855 | 1128 | ||
856 | # | 1129 | # |
@@ -904,6 +1177,10 @@ CONFIG_CRYPTO_PCBC=m | |||
904 | # CONFIG_CRYPTO_MD4 is not set | 1177 | # CONFIG_CRYPTO_MD4 is not set |
905 | CONFIG_CRYPTO_MD5=y | 1178 | CONFIG_CRYPTO_MD5=y |
906 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1179 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1180 | # CONFIG_CRYPTO_RMD128 is not set | ||
1181 | # CONFIG_CRYPTO_RMD160 is not set | ||
1182 | # CONFIG_CRYPTO_RMD256 is not set | ||
1183 | # CONFIG_CRYPTO_RMD320 is not set | ||
907 | # CONFIG_CRYPTO_SHA1 is not set | 1184 | # CONFIG_CRYPTO_SHA1 is not set |
908 | # CONFIG_CRYPTO_SHA256 is not set | 1185 | # CONFIG_CRYPTO_SHA256 is not set |
909 | # CONFIG_CRYPTO_SHA512 is not set | 1186 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -935,5 +1212,7 @@ CONFIG_CRYPTO_DES=y | |||
935 | # CONFIG_CRYPTO_DEFLATE is not set | 1212 | # CONFIG_CRYPTO_DEFLATE is not set |
936 | # CONFIG_CRYPTO_LZO is not set | 1213 | # CONFIG_CRYPTO_LZO is not set |
937 | CONFIG_CRYPTO_HW=y | 1214 | CONFIG_CRYPTO_HW=y |
1215 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1216 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
938 | # CONFIG_PPC_CLOCK is not set | 1217 | # CONFIG_PPC_CLOCK is not set |
939 | # CONFIG_VIRTUALIZATION is not set | 1218 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig index 0d448556f53a..e8d2d691d26c 100644 --- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig +++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Tue Jun 10 09:17:12 2008 | 4 | # Thu Aug 21 00:52:25 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,13 +93,13 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 97 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
94 | CONFIG_HOTPLUG=y | 98 | CONFIG_HOTPLUG=y |
95 | CONFIG_PRINTK=y | 99 | CONFIG_PRINTK=y |
96 | CONFIG_BUG=y | 100 | CONFIG_BUG=y |
97 | CONFIG_ELF_CORE=y | 101 | CONFIG_ELF_CORE=y |
102 | CONFIG_PCSPKR_PLATFORM=y | ||
98 | CONFIG_COMPAT_BRK=y | 103 | CONFIG_COMPAT_BRK=y |
99 | CONFIG_BASE_FULL=y | 104 | CONFIG_BASE_FULL=y |
100 | CONFIG_FUTEX=y | 105 | CONFIG_FUTEX=y |
@@ -112,10 +117,16 @@ CONFIG_SLAB=y | |||
112 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
114 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
127 | # CONFIG_HAVE_CLK is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
@@ -126,12 +137,13 @@ CONFIG_MODULE_UNLOAD=y | |||
126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 137 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
127 | # CONFIG_MODVERSIONS is not set | 138 | # CONFIG_MODVERSIONS is not set |
128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 139 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
129 | # CONFIG_KMOD is not set | 140 | CONFIG_KMOD=y |
130 | CONFIG_BLOCK=y | 141 | CONFIG_BLOCK=y |
131 | # CONFIG_LBD is not set | 142 | # CONFIG_LBD is not set |
132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 143 | # CONFIG_BLK_DEV_IO_TRACE is not set |
133 | # CONFIG_LSF is not set | 144 | # CONFIG_LSF is not set |
134 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
135 | 147 | ||
136 | # | 148 | # |
137 | # IO Schedulers | 149 | # IO Schedulers |
@@ -150,37 +162,49 @@ CONFIG_CLASSIC_RCU=y | |||
150 | # | 162 | # |
151 | # Platform support | 163 | # Platform support |
152 | # | 164 | # |
153 | # CONFIG_PPC_MULTIPLATFORM is not set | 165 | CONFIG_PPC_MULTIPLATFORM=y |
154 | # CONFIG_PPC_82xx is not set | 166 | CONFIG_CLASSIC32=y |
155 | CONFIG_PPC_83xx=y | 167 | CONFIG_PPC_CHRP=y |
156 | # CONFIG_PPC_86xx is not set | 168 | # CONFIG_MPC5121_ADS is not set |
157 | # CONFIG_PPC_MPC512x is not set | 169 | # CONFIG_MPC5121_GENERIC is not set |
158 | # CONFIG_PPC_MPC5121 is not set | 170 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | ||
159 | # CONFIG_PPC_CELL is not set | 172 | # CONFIG_PPC_CELL is not set |
160 | # CONFIG_PPC_CELL_NATIVE is not set | 173 | # CONFIG_PPC_CELL_NATIVE is not set |
174 | # CONFIG_PPC_82xx is not set | ||
161 | # CONFIG_PQ2ADS is not set | 175 | # CONFIG_PQ2ADS is not set |
162 | CONFIG_MPC83xx=y | 176 | CONFIG_PPC_83xx=y |
163 | # CONFIG_MPC831x_RDB is not set | 177 | # CONFIG_MPC831x_RDB is not set |
164 | # CONFIG_MPC832x_MDS is not set | 178 | # CONFIG_MPC832x_MDS is not set |
165 | # CONFIG_MPC832x_RDB is not set | 179 | # CONFIG_MPC832x_RDB is not set |
166 | # CONFIG_MPC834x_MDS is not set | 180 | # CONFIG_MPC834x_MDS is not set |
167 | # CONFIG_MPC834x_ITX is not set | 181 | # CONFIG_MPC834x_ITX is not set |
168 | # CONFIG_MPC836x_MDS is not set | 182 | # CONFIG_MPC836x_MDS is not set |
183 | # CONFIG_MPC836x_RDK is not set | ||
169 | # CONFIG_MPC837x_MDS is not set | 184 | # CONFIG_MPC837x_MDS is not set |
170 | CONFIG_MPC837x_RDB=y | 185 | CONFIG_MPC837x_RDB=y |
171 | # CONFIG_SBC834x is not set | 186 | # CONFIG_SBC834x is not set |
187 | # CONFIG_ASP834x is not set | ||
172 | CONFIG_PPC_MPC837x=y | 188 | CONFIG_PPC_MPC837x=y |
189 | # CONFIG_PPC_86xx is not set | ||
190 | # CONFIG_EMBEDDED6xx is not set | ||
191 | CONFIG_PPC_NATIVE=y | ||
192 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
173 | CONFIG_IPIC=y | 193 | CONFIG_IPIC=y |
174 | # CONFIG_MPIC is not set | 194 | CONFIG_MPIC=y |
175 | # CONFIG_MPIC_WEIRD is not set | 195 | # CONFIG_MPIC_WEIRD is not set |
176 | # CONFIG_PPC_I8259 is not set | 196 | CONFIG_PPC_I8259=y |
177 | # CONFIG_PPC_RTAS is not set | 197 | CONFIG_PPC_RTAS=y |
198 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
199 | CONFIG_RTAS_PROC=y | ||
178 | # CONFIG_MMIO_NVRAM is not set | 200 | # CONFIG_MMIO_NVRAM is not set |
179 | # CONFIG_PPC_MPC106 is not set | 201 | CONFIG_PPC_MPC106=y |
180 | # CONFIG_PPC_970_NAP is not set | 202 | # CONFIG_PPC_970_NAP is not set |
181 | # CONFIG_PPC_INDIRECT_IO is not set | 203 | # CONFIG_PPC_INDIRECT_IO is not set |
182 | # CONFIG_GENERIC_IOMAP is not set | 204 | # CONFIG_GENERIC_IOMAP is not set |
183 | # CONFIG_CPU_FREQ is not set | 205 | # CONFIG_CPU_FREQ is not set |
206 | # CONFIG_PPC601_SYNC_FIX is not set | ||
207 | # CONFIG_TAU is not set | ||
184 | # CONFIG_FSL_ULI1575 is not set | 208 | # CONFIG_FSL_ULI1575 is not set |
185 | 209 | ||
186 | # | 210 | # |
@@ -206,6 +230,7 @@ CONFIG_BINFMT_ELF=y | |||
206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
207 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 231 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
208 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 232 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
233 | # CONFIG_KEXEC is not set | ||
209 | CONFIG_ARCH_FLATMEM_ENABLE=y | 234 | CONFIG_ARCH_FLATMEM_ENABLE=y |
210 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 235 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
211 | CONFIG_SELECT_MEMORY_MODEL=y | 236 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -218,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 243 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
219 | CONFIG_PAGEFLAGS_EXTENDED=y | 244 | CONFIG_PAGEFLAGS_EXTENDED=y |
220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
246 | CONFIG_MIGRATION=y | ||
221 | # CONFIG_RESOURCES_64BIT is not set | 247 | # CONFIG_RESOURCES_64BIT is not set |
222 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
223 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
@@ -225,6 +251,7 @@ CONFIG_VIRT_TO_BUS=y | |||
225 | CONFIG_FORCE_MAX_ZONEORDER=11 | 251 | CONFIG_FORCE_MAX_ZONEORDER=11 |
226 | CONFIG_PROC_DEVICETREE=y | 252 | CONFIG_PROC_DEVICETREE=y |
227 | # CONFIG_CMDLINE_BOOL is not set | 253 | # CONFIG_CMDLINE_BOOL is not set |
254 | CONFIG_EXTRA_TARGETS="" | ||
228 | # CONFIG_PM is not set | 255 | # CONFIG_PM is not set |
229 | CONFIG_SECCOMP=y | 256 | CONFIG_SECCOMP=y |
230 | CONFIG_ISA_DMA_API=y | 257 | CONFIG_ISA_DMA_API=y |
@@ -232,15 +259,22 @@ CONFIG_ISA_DMA_API=y | |||
232 | # | 259 | # |
233 | # Bus options | 260 | # Bus options |
234 | # | 261 | # |
262 | # CONFIG_ISA is not set | ||
235 | CONFIG_ZONE_DMA=y | 263 | CONFIG_ZONE_DMA=y |
236 | CONFIG_GENERIC_ISA_DMA=y | 264 | CONFIG_GENERIC_ISA_DMA=y |
237 | CONFIG_PPC_INDIRECT_PCI=y | 265 | CONFIG_PPC_INDIRECT_PCI=y |
238 | CONFIG_FSL_SOC=y | 266 | CONFIG_FSL_SOC=y |
239 | # CONFIG_PCI is not set | 267 | CONFIG_FSL_PCI=y |
240 | # CONFIG_PCI_DOMAINS is not set | 268 | CONFIG_PPC_PCI_CHOICE=y |
241 | # CONFIG_PCI_SYSCALL is not set | 269 | CONFIG_PCI=y |
242 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 270 | CONFIG_PCI_DOMAINS=y |
271 | CONFIG_PCI_SYSCALL=y | ||
272 | # CONFIG_PCIEPORTBUS is not set | ||
273 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
274 | # CONFIG_PCI_MSI is not set | ||
275 | CONFIG_PCI_LEGACY=y | ||
243 | # CONFIG_PCCARD is not set | 276 | # CONFIG_PCCARD is not set |
277 | # CONFIG_HOTPLUG_PCI is not set | ||
244 | # CONFIG_HAS_RAPIDIO is not set | 278 | # CONFIG_HAS_RAPIDIO is not set |
245 | 279 | ||
246 | # | 280 | # |
@@ -256,10 +290,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
256 | CONFIG_KERNEL_START=0xc0000000 | 290 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | 291 | CONFIG_PHYSICAL_START=0x00000000 |
258 | CONFIG_TASK_SIZE=0xc0000000 | 292 | CONFIG_TASK_SIZE=0xc0000000 |
259 | |||
260 | # | ||
261 | # Networking | ||
262 | # | ||
263 | CONFIG_NET=y | 293 | CONFIG_NET=y |
264 | 294 | ||
265 | # | 295 | # |
@@ -355,10 +385,16 @@ CONFIG_OF_I2C=y | |||
355 | # CONFIG_PARPORT is not set | 385 | # CONFIG_PARPORT is not set |
356 | CONFIG_BLK_DEV=y | 386 | CONFIG_BLK_DEV=y |
357 | # CONFIG_BLK_DEV_FD is not set | 387 | # CONFIG_BLK_DEV_FD is not set |
388 | # CONFIG_MAC_FLOPPY is not set | ||
389 | # CONFIG_BLK_CPQ_DA is not set | ||
390 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
391 | # CONFIG_BLK_DEV_DAC960 is not set | ||
392 | # CONFIG_BLK_DEV_UMEM is not set | ||
358 | # CONFIG_BLK_DEV_COW_COMMON is not set | 393 | # CONFIG_BLK_DEV_COW_COMMON is not set |
359 | CONFIG_BLK_DEV_LOOP=y | 394 | CONFIG_BLK_DEV_LOOP=y |
360 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 395 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
361 | # CONFIG_BLK_DEV_NBD is not set | 396 | # CONFIG_BLK_DEV_NBD is not set |
397 | # CONFIG_BLK_DEV_SX8 is not set | ||
362 | # CONFIG_BLK_DEV_UB is not set | 398 | # CONFIG_BLK_DEV_UB is not set |
363 | CONFIG_BLK_DEV_RAM=y | 399 | CONFIG_BLK_DEV_RAM=y |
364 | CONFIG_BLK_DEV_RAM_COUNT=16 | 400 | CONFIG_BLK_DEV_RAM_COUNT=16 |
@@ -366,9 +402,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
366 | # CONFIG_BLK_DEV_XIP is not set | 402 | # CONFIG_BLK_DEV_XIP is not set |
367 | # CONFIG_CDROM_PKTCDVD is not set | 403 | # CONFIG_CDROM_PKTCDVD is not set |
368 | # CONFIG_ATA_OVER_ETH is not set | 404 | # CONFIG_ATA_OVER_ETH is not set |
405 | # CONFIG_BLK_DEV_HD is not set | ||
369 | CONFIG_MISC_DEVICES=y | 406 | CONFIG_MISC_DEVICES=y |
407 | # CONFIG_PHANTOM is not set | ||
370 | # CONFIG_EEPROM_93CX6 is not set | 408 | # CONFIG_EEPROM_93CX6 is not set |
409 | # CONFIG_SGI_IOC4 is not set | ||
410 | # CONFIG_TIFM_CORE is not set | ||
371 | # CONFIG_ENCLOSURE_SERVICES is not set | 411 | # CONFIG_ENCLOSURE_SERVICES is not set |
412 | # CONFIG_HP_ILO is not set | ||
372 | CONFIG_HAVE_IDE=y | 413 | CONFIG_HAVE_IDE=y |
373 | # CONFIG_IDE is not set | 414 | # CONFIG_IDE is not set |
374 | 415 | ||
@@ -411,14 +452,106 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
411 | # CONFIG_SCSI_SRP_ATTRS is not set | 452 | # CONFIG_SCSI_SRP_ATTRS is not set |
412 | CONFIG_SCSI_LOWLEVEL=y | 453 | CONFIG_SCSI_LOWLEVEL=y |
413 | # CONFIG_ISCSI_TCP is not set | 454 | # CONFIG_ISCSI_TCP is not set |
455 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
456 | # CONFIG_SCSI_3W_9XXX is not set | ||
457 | # CONFIG_SCSI_ACARD is not set | ||
458 | # CONFIG_SCSI_AACRAID is not set | ||
459 | # CONFIG_SCSI_AIC7XXX is not set | ||
460 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
461 | # CONFIG_SCSI_AIC79XX is not set | ||
462 | # CONFIG_SCSI_AIC94XX is not set | ||
463 | # CONFIG_SCSI_DPT_I2O is not set | ||
464 | # CONFIG_SCSI_ADVANSYS is not set | ||
465 | # CONFIG_SCSI_ARCMSR is not set | ||
466 | # CONFIG_MEGARAID_NEWGEN is not set | ||
467 | # CONFIG_MEGARAID_LEGACY is not set | ||
468 | # CONFIG_MEGARAID_SAS is not set | ||
469 | # CONFIG_SCSI_HPTIOP is not set | ||
470 | # CONFIG_SCSI_BUSLOGIC is not set | ||
471 | # CONFIG_SCSI_DMX3191D is not set | ||
472 | # CONFIG_SCSI_EATA is not set | ||
473 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
474 | # CONFIG_SCSI_GDTH is not set | ||
475 | # CONFIG_SCSI_IPS is not set | ||
476 | # CONFIG_SCSI_INITIO is not set | ||
477 | # CONFIG_SCSI_INIA100 is not set | ||
478 | # CONFIG_SCSI_MVSAS is not set | ||
479 | # CONFIG_SCSI_STEX is not set | ||
480 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
481 | # CONFIG_SCSI_IPR is not set | ||
482 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
483 | # CONFIG_SCSI_QLA_FC is not set | ||
484 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
485 | # CONFIG_SCSI_LPFC is not set | ||
486 | # CONFIG_SCSI_DC395x is not set | ||
487 | # CONFIG_SCSI_DC390T is not set | ||
488 | # CONFIG_SCSI_NSP32 is not set | ||
414 | # CONFIG_SCSI_DEBUG is not set | 489 | # CONFIG_SCSI_DEBUG is not set |
490 | # CONFIG_SCSI_MESH is not set | ||
491 | # CONFIG_SCSI_MAC53C94 is not set | ||
492 | # CONFIG_SCSI_SRP is not set | ||
493 | # CONFIG_SCSI_DH is not set | ||
415 | CONFIG_ATA=y | 494 | CONFIG_ATA=y |
416 | # CONFIG_ATA_NONSTANDARD is not set | 495 | # CONFIG_ATA_NONSTANDARD is not set |
417 | CONFIG_SATA_PMP=y | 496 | CONFIG_SATA_PMP=y |
497 | # CONFIG_SATA_AHCI is not set | ||
498 | # CONFIG_SATA_SIL24 is not set | ||
418 | CONFIG_SATA_FSL=y | 499 | CONFIG_SATA_FSL=y |
419 | CONFIG_ATA_SFF=y | 500 | CONFIG_ATA_SFF=y |
501 | # CONFIG_SATA_SVW is not set | ||
502 | # CONFIG_ATA_PIIX is not set | ||
420 | # CONFIG_SATA_MV is not set | 503 | # CONFIG_SATA_MV is not set |
504 | # CONFIG_SATA_NV is not set | ||
505 | # CONFIG_PDC_ADMA is not set | ||
506 | # CONFIG_SATA_QSTOR is not set | ||
507 | # CONFIG_SATA_PROMISE is not set | ||
508 | # CONFIG_SATA_SX4 is not set | ||
509 | # CONFIG_SATA_SIL is not set | ||
510 | # CONFIG_SATA_SIS is not set | ||
511 | # CONFIG_SATA_ULI is not set | ||
512 | # CONFIG_SATA_VIA is not set | ||
513 | # CONFIG_SATA_VITESSE is not set | ||
514 | # CONFIG_SATA_INIC162X is not set | ||
515 | # CONFIG_PATA_ALI is not set | ||
516 | # CONFIG_PATA_AMD is not set | ||
517 | # CONFIG_PATA_ARTOP is not set | ||
518 | # CONFIG_PATA_ATIIXP is not set | ||
519 | # CONFIG_PATA_CMD640_PCI is not set | ||
520 | # CONFIG_PATA_CMD64X is not set | ||
521 | # CONFIG_PATA_CS5520 is not set | ||
522 | # CONFIG_PATA_CS5530 is not set | ||
523 | # CONFIG_PATA_CYPRESS is not set | ||
524 | # CONFIG_PATA_EFAR is not set | ||
525 | # CONFIG_ATA_GENERIC is not set | ||
526 | # CONFIG_PATA_HPT366 is not set | ||
527 | # CONFIG_PATA_HPT37X is not set | ||
528 | # CONFIG_PATA_HPT3X2N is not set | ||
529 | # CONFIG_PATA_HPT3X3 is not set | ||
530 | # CONFIG_PATA_IT821X is not set | ||
531 | # CONFIG_PATA_IT8213 is not set | ||
532 | # CONFIG_PATA_JMICRON is not set | ||
533 | # CONFIG_PATA_TRIFLEX is not set | ||
534 | # CONFIG_PATA_MARVELL is not set | ||
535 | # CONFIG_PATA_MPIIX is not set | ||
536 | # CONFIG_PATA_OLDPIIX is not set | ||
537 | # CONFIG_PATA_NETCELL is not set | ||
538 | # CONFIG_PATA_NINJA32 is not set | ||
539 | # CONFIG_PATA_NS87410 is not set | ||
540 | # CONFIG_PATA_NS87415 is not set | ||
541 | # CONFIG_PATA_OPTI is not set | ||
542 | # CONFIG_PATA_OPTIDMA is not set | ||
543 | # CONFIG_PATA_PDC_OLD is not set | ||
544 | # CONFIG_PATA_RADISYS is not set | ||
545 | # CONFIG_PATA_RZ1000 is not set | ||
546 | # CONFIG_PATA_SC1200 is not set | ||
547 | # CONFIG_PATA_SERVERWORKS is not set | ||
548 | # CONFIG_PATA_PDC2027X is not set | ||
549 | # CONFIG_PATA_SIL680 is not set | ||
550 | # CONFIG_PATA_SIS is not set | ||
551 | # CONFIG_PATA_VIA is not set | ||
552 | # CONFIG_PATA_WINBOND is not set | ||
421 | # CONFIG_PATA_PLATFORM is not set | 553 | # CONFIG_PATA_PLATFORM is not set |
554 | # CONFIG_PATA_SCH is not set | ||
422 | CONFIG_MD=y | 555 | CONFIG_MD=y |
423 | CONFIG_BLK_DEV_MD=y | 556 | CONFIG_BLK_DEV_MD=y |
424 | # CONFIG_MD_LINEAR is not set | 557 | # CONFIG_MD_LINEAR is not set |
@@ -430,15 +563,27 @@ CONFIG_MD_RAID5_RESHAPE=y | |||
430 | # CONFIG_MD_MULTIPATH is not set | 563 | # CONFIG_MD_MULTIPATH is not set |
431 | # CONFIG_MD_FAULTY is not set | 564 | # CONFIG_MD_FAULTY is not set |
432 | # CONFIG_BLK_DEV_DM is not set | 565 | # CONFIG_BLK_DEV_DM is not set |
566 | # CONFIG_FUSION is not set | ||
567 | |||
568 | # | ||
569 | # IEEE 1394 (FireWire) support | ||
570 | # | ||
571 | |||
572 | # | ||
573 | # Enable only one of the two stacks, unless you know what you are doing | ||
574 | # | ||
575 | # CONFIG_FIREWIRE is not set | ||
576 | # CONFIG_IEEE1394 is not set | ||
577 | # CONFIG_I2O is not set | ||
433 | # CONFIG_MACINTOSH_DRIVERS is not set | 578 | # CONFIG_MACINTOSH_DRIVERS is not set |
434 | CONFIG_NETDEVICES=y | 579 | CONFIG_NETDEVICES=y |
435 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
436 | # CONFIG_DUMMY is not set | 580 | # CONFIG_DUMMY is not set |
437 | # CONFIG_BONDING is not set | 581 | # CONFIG_BONDING is not set |
438 | # CONFIG_MACVLAN is not set | 582 | # CONFIG_MACVLAN is not set |
439 | # CONFIG_EQUALIZER is not set | 583 | # CONFIG_EQUALIZER is not set |
440 | # CONFIG_TUN is not set | 584 | # CONFIG_TUN is not set |
441 | # CONFIG_VETH is not set | 585 | # CONFIG_VETH is not set |
586 | # CONFIG_ARCNET is not set | ||
442 | CONFIG_PHYLIB=y | 587 | CONFIG_PHYLIB=y |
443 | 588 | ||
444 | # | 589 | # |
@@ -458,16 +603,44 @@ CONFIG_FIXED_PHY=y | |||
458 | # CONFIG_MDIO_BITBANG is not set | 603 | # CONFIG_MDIO_BITBANG is not set |
459 | CONFIG_NET_ETHERNET=y | 604 | CONFIG_NET_ETHERNET=y |
460 | CONFIG_MII=y | 605 | CONFIG_MII=y |
606 | # CONFIG_MACE is not set | ||
607 | # CONFIG_BMAC is not set | ||
608 | # CONFIG_HAPPYMEAL is not set | ||
609 | # CONFIG_SUNGEM is not set | ||
610 | # CONFIG_CASSINI is not set | ||
611 | # CONFIG_NET_VENDOR_3COM is not set | ||
612 | # CONFIG_NET_TULIP is not set | ||
613 | # CONFIG_HP100 is not set | ||
461 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 614 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
462 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 615 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
463 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 616 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
464 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 617 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
618 | # CONFIG_NET_PCI is not set | ||
465 | # CONFIG_B44 is not set | 619 | # CONFIG_B44 is not set |
466 | CONFIG_NETDEV_1000=y | 620 | CONFIG_NETDEV_1000=y |
467 | # CONFIG_E1000E_ENABLED is not set | 621 | # CONFIG_ACENIC is not set |
622 | # CONFIG_DL2K is not set | ||
623 | # CONFIG_E1000 is not set | ||
624 | # CONFIG_E1000E is not set | ||
625 | # CONFIG_IP1000 is not set | ||
626 | # CONFIG_IGB is not set | ||
627 | # CONFIG_NS83820 is not set | ||
628 | # CONFIG_HAMACHI is not set | ||
629 | # CONFIG_YELLOWFIN is not set | ||
630 | # CONFIG_R8169 is not set | ||
631 | # CONFIG_SIS190 is not set | ||
632 | # CONFIG_SKGE is not set | ||
633 | # CONFIG_SKY2 is not set | ||
634 | # CONFIG_VIA_VELOCITY is not set | ||
635 | # CONFIG_TIGON3 is not set | ||
636 | # CONFIG_BNX2 is not set | ||
468 | CONFIG_GIANFAR=y | 637 | CONFIG_GIANFAR=y |
469 | CONFIG_GFAR_NAPI=y | 638 | # CONFIG_MV643XX_ETH is not set |
639 | # CONFIG_QLA3XXX is not set | ||
640 | # CONFIG_ATL1 is not set | ||
641 | # CONFIG_ATL1E is not set | ||
470 | # CONFIG_NETDEV_10000 is not set | 642 | # CONFIG_NETDEV_10000 is not set |
643 | # CONFIG_TR is not set | ||
471 | 644 | ||
472 | # | 645 | # |
473 | # Wireless LAN | 646 | # Wireless LAN |
@@ -485,8 +658,11 @@ CONFIG_GFAR_NAPI=y | |||
485 | # CONFIG_USB_RTL8150 is not set | 658 | # CONFIG_USB_RTL8150 is not set |
486 | # CONFIG_USB_USBNET is not set | 659 | # CONFIG_USB_USBNET is not set |
487 | # CONFIG_WAN is not set | 660 | # CONFIG_WAN is not set |
661 | # CONFIG_FDDI is not set | ||
662 | # CONFIG_HIPPI is not set | ||
488 | # CONFIG_PPP is not set | 663 | # CONFIG_PPP is not set |
489 | # CONFIG_SLIP is not set | 664 | # CONFIG_SLIP is not set |
665 | # CONFIG_NET_FC is not set | ||
490 | # CONFIG_NETCONSOLE is not set | 666 | # CONFIG_NETCONSOLE is not set |
491 | # CONFIG_NETPOLL is not set | 667 | # CONFIG_NETPOLL is not set |
492 | # CONFIG_NET_POLL_CONTROLLER is not set | 668 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -530,12 +706,14 @@ CONFIG_INPUT=y | |||
530 | # CONFIG_VT is not set | 706 | # CONFIG_VT is not set |
531 | CONFIG_DEVKMEM=y | 707 | CONFIG_DEVKMEM=y |
532 | # CONFIG_SERIAL_NONSTANDARD is not set | 708 | # CONFIG_SERIAL_NONSTANDARD is not set |
709 | # CONFIG_NOZOMI is not set | ||
533 | 710 | ||
534 | # | 711 | # |
535 | # Serial drivers | 712 | # Serial drivers |
536 | # | 713 | # |
537 | CONFIG_SERIAL_8250=y | 714 | CONFIG_SERIAL_8250=y |
538 | CONFIG_SERIAL_8250_CONSOLE=y | 715 | CONFIG_SERIAL_8250_CONSOLE=y |
716 | CONFIG_SERIAL_8250_PCI=y | ||
539 | CONFIG_SERIAL_8250_NR_UARTS=4 | 717 | CONFIG_SERIAL_8250_NR_UARTS=4 |
540 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 718 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
541 | # CONFIG_SERIAL_8250_EXTENDED is not set | 719 | # CONFIG_SERIAL_8250_EXTENDED is not set |
@@ -546,41 +724,91 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
546 | # CONFIG_SERIAL_UARTLITE is not set | 724 | # CONFIG_SERIAL_UARTLITE is not set |
547 | CONFIG_SERIAL_CORE=y | 725 | CONFIG_SERIAL_CORE=y |
548 | CONFIG_SERIAL_CORE_CONSOLE=y | 726 | CONFIG_SERIAL_CORE_CONSOLE=y |
727 | # CONFIG_SERIAL_PMACZILOG is not set | ||
728 | # CONFIG_SERIAL_JSM is not set | ||
549 | # CONFIG_SERIAL_OF_PLATFORM is not set | 729 | # CONFIG_SERIAL_OF_PLATFORM is not set |
550 | CONFIG_UNIX98_PTYS=y | 730 | CONFIG_UNIX98_PTYS=y |
551 | CONFIG_LEGACY_PTYS=y | 731 | CONFIG_LEGACY_PTYS=y |
552 | CONFIG_LEGACY_PTY_COUNT=256 | 732 | CONFIG_LEGACY_PTY_COUNT=256 |
733 | # CONFIG_BRIQ_PANEL is not set | ||
734 | # CONFIG_HVC_RTAS is not set | ||
553 | # CONFIG_IPMI_HANDLER is not set | 735 | # CONFIG_IPMI_HANDLER is not set |
554 | # CONFIG_HW_RANDOM is not set | 736 | # CONFIG_HW_RANDOM is not set |
555 | # CONFIG_NVRAM is not set | 737 | # CONFIG_NVRAM is not set |
556 | CONFIG_GEN_RTC=y | 738 | CONFIG_GEN_RTC=y |
557 | # CONFIG_GEN_RTC_X is not set | 739 | # CONFIG_GEN_RTC_X is not set |
558 | # CONFIG_R3964 is not set | 740 | # CONFIG_R3964 is not set |
741 | # CONFIG_APPLICOM is not set | ||
559 | # CONFIG_RAW_DRIVER is not set | 742 | # CONFIG_RAW_DRIVER is not set |
560 | # CONFIG_TCG_TPM is not set | 743 | # CONFIG_TCG_TPM is not set |
744 | CONFIG_DEVPORT=y | ||
561 | CONFIG_I2C=y | 745 | CONFIG_I2C=y |
562 | CONFIG_I2C_BOARDINFO=y | 746 | CONFIG_I2C_BOARDINFO=y |
563 | CONFIG_I2C_CHARDEV=y | 747 | CONFIG_I2C_CHARDEV=y |
748 | CONFIG_I2C_HELPER_AUTO=y | ||
564 | 749 | ||
565 | # | 750 | # |
566 | # I2C Hardware Bus support | 751 | # I2C Hardware Bus support |
567 | # | 752 | # |
753 | |||
754 | # | ||
755 | # PC SMBus host controller drivers | ||
756 | # | ||
757 | # CONFIG_I2C_ALI1535 is not set | ||
758 | # CONFIG_I2C_ALI1563 is not set | ||
759 | # CONFIG_I2C_ALI15X3 is not set | ||
760 | # CONFIG_I2C_AMD756 is not set | ||
761 | # CONFIG_I2C_AMD8111 is not set | ||
762 | # CONFIG_I2C_I801 is not set | ||
763 | # CONFIG_I2C_ISCH is not set | ||
764 | # CONFIG_I2C_PIIX4 is not set | ||
765 | # CONFIG_I2C_NFORCE2 is not set | ||
766 | # CONFIG_I2C_SIS5595 is not set | ||
767 | # CONFIG_I2C_SIS630 is not set | ||
768 | # CONFIG_I2C_SIS96X is not set | ||
769 | # CONFIG_I2C_VIA is not set | ||
770 | # CONFIG_I2C_VIAPRO is not set | ||
771 | |||
772 | # | ||
773 | # Mac SMBus host controller drivers | ||
774 | # | ||
775 | # CONFIG_I2C_HYDRA is not set | ||
776 | CONFIG_I2C_POWERMAC=y | ||
777 | |||
778 | # | ||
779 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
780 | # | ||
568 | CONFIG_I2C_MPC=y | 781 | CONFIG_I2C_MPC=y |
569 | # CONFIG_I2C_OCORES is not set | 782 | # CONFIG_I2C_OCORES is not set |
570 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
571 | # CONFIG_I2C_SIMTEC is not set | 783 | # CONFIG_I2C_SIMTEC is not set |
784 | |||
785 | # | ||
786 | # External I2C/SMBus adapter drivers | ||
787 | # | ||
788 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
572 | # CONFIG_I2C_TAOS_EVM is not set | 789 | # CONFIG_I2C_TAOS_EVM is not set |
573 | # CONFIG_I2C_STUB is not set | ||
574 | # CONFIG_I2C_TINY_USB is not set | 790 | # CONFIG_I2C_TINY_USB is not set |
791 | |||
792 | # | ||
793 | # Graphics adapter I2C/DDC channel drivers | ||
794 | # | ||
795 | # CONFIG_I2C_VOODOO3 is not set | ||
796 | |||
797 | # | ||
798 | # Other I2C/SMBus bus drivers | ||
799 | # | ||
575 | # CONFIG_I2C_PCA_PLATFORM is not set | 800 | # CONFIG_I2C_PCA_PLATFORM is not set |
801 | # CONFIG_I2C_STUB is not set | ||
576 | 802 | ||
577 | # | 803 | # |
578 | # Miscellaneous I2C Chip support | 804 | # Miscellaneous I2C Chip support |
579 | # | 805 | # |
580 | # CONFIG_DS1682 is not set | 806 | # CONFIG_DS1682 is not set |
807 | # CONFIG_AT24 is not set | ||
581 | # CONFIG_SENSORS_EEPROM is not set | 808 | # CONFIG_SENSORS_EEPROM is not set |
582 | # CONFIG_SENSORS_PCF8574 is not set | 809 | # CONFIG_SENSORS_PCF8574 is not set |
583 | # CONFIG_PCF8575 is not set | 810 | # CONFIG_PCF8575 is not set |
811 | # CONFIG_SENSORS_PCA9539 is not set | ||
584 | # CONFIG_SENSORS_PCF8591 is not set | 812 | # CONFIG_SENSORS_PCF8591 is not set |
585 | # CONFIG_SENSORS_MAX6875 is not set | 813 | # CONFIG_SENSORS_MAX6875 is not set |
586 | # CONFIG_SENSORS_TSL2550 is not set | 814 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -589,10 +817,13 @@ CONFIG_I2C_MPC=y | |||
589 | # CONFIG_I2C_DEBUG_BUS is not set | 817 | # CONFIG_I2C_DEBUG_BUS is not set |
590 | # CONFIG_I2C_DEBUG_CHIP is not set | 818 | # CONFIG_I2C_DEBUG_CHIP is not set |
591 | # CONFIG_SPI is not set | 819 | # CONFIG_SPI is not set |
820 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
821 | # CONFIG_GPIOLIB is not set | ||
592 | # CONFIG_W1 is not set | 822 | # CONFIG_W1 is not set |
593 | # CONFIG_POWER_SUPPLY is not set | 823 | # CONFIG_POWER_SUPPLY is not set |
594 | CONFIG_HWMON=y | 824 | CONFIG_HWMON=y |
595 | # CONFIG_HWMON_VID is not set | 825 | # CONFIG_HWMON_VID is not set |
826 | # CONFIG_SENSORS_AD7414 is not set | ||
596 | # CONFIG_SENSORS_AD7418 is not set | 827 | # CONFIG_SENSORS_AD7418 is not set |
597 | # CONFIG_SENSORS_ADM1021 is not set | 828 | # CONFIG_SENSORS_ADM1021 is not set |
598 | # CONFIG_SENSORS_ADM1025 is not set | 829 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -602,8 +833,10 @@ CONFIG_HWMON=y | |||
602 | # CONFIG_SENSORS_ADM9240 is not set | 833 | # CONFIG_SENSORS_ADM9240 is not set |
603 | # CONFIG_SENSORS_ADT7470 is not set | 834 | # CONFIG_SENSORS_ADT7470 is not set |
604 | # CONFIG_SENSORS_ADT7473 is not set | 835 | # CONFIG_SENSORS_ADT7473 is not set |
836 | # CONFIG_SENSORS_AMS is not set | ||
605 | # CONFIG_SENSORS_ATXP1 is not set | 837 | # CONFIG_SENSORS_ATXP1 is not set |
606 | # CONFIG_SENSORS_DS1621 is not set | 838 | # CONFIG_SENSORS_DS1621 is not set |
839 | # CONFIG_SENSORS_I5K_AMB is not set | ||
607 | # CONFIG_SENSORS_F71805F is not set | 840 | # CONFIG_SENSORS_F71805F is not set |
608 | # CONFIG_SENSORS_F71882FG is not set | 841 | # CONFIG_SENSORS_F71882FG is not set |
609 | # CONFIG_SENSORS_F75375S is not set | 842 | # CONFIG_SENSORS_F75375S is not set |
@@ -625,13 +858,16 @@ CONFIG_HWMON=y | |||
625 | # CONFIG_SENSORS_MAX6650 is not set | 858 | # CONFIG_SENSORS_MAX6650 is not set |
626 | # CONFIG_SENSORS_PC87360 is not set | 859 | # CONFIG_SENSORS_PC87360 is not set |
627 | # CONFIG_SENSORS_PC87427 is not set | 860 | # CONFIG_SENSORS_PC87427 is not set |
861 | # CONFIG_SENSORS_SIS5595 is not set | ||
628 | # CONFIG_SENSORS_DME1737 is not set | 862 | # CONFIG_SENSORS_DME1737 is not set |
629 | # CONFIG_SENSORS_SMSC47M1 is not set | 863 | # CONFIG_SENSORS_SMSC47M1 is not set |
630 | # CONFIG_SENSORS_SMSC47M192 is not set | 864 | # CONFIG_SENSORS_SMSC47M192 is not set |
631 | # CONFIG_SENSORS_SMSC47B397 is not set | 865 | # CONFIG_SENSORS_SMSC47B397 is not set |
632 | # CONFIG_SENSORS_ADS7828 is not set | 866 | # CONFIG_SENSORS_ADS7828 is not set |
633 | # CONFIG_SENSORS_THMC50 is not set | 867 | # CONFIG_SENSORS_THMC50 is not set |
868 | # CONFIG_SENSORS_VIA686A is not set | ||
634 | # CONFIG_SENSORS_VT1211 is not set | 869 | # CONFIG_SENSORS_VT1211 is not set |
870 | # CONFIG_SENSORS_VT8231 is not set | ||
635 | # CONFIG_SENSORS_W83781D is not set | 871 | # CONFIG_SENSORS_W83781D is not set |
636 | # CONFIG_SENSORS_W83791D is not set | 872 | # CONFIG_SENSORS_W83791D is not set |
637 | # CONFIG_SENSORS_W83792D is not set | 873 | # CONFIG_SENSORS_W83792D is not set |
@@ -642,6 +878,7 @@ CONFIG_HWMON=y | |||
642 | # CONFIG_SENSORS_W83627EHF is not set | 878 | # CONFIG_SENSORS_W83627EHF is not set |
643 | # CONFIG_HWMON_DEBUG_CHIP is not set | 879 | # CONFIG_HWMON_DEBUG_CHIP is not set |
644 | # CONFIG_THERMAL is not set | 880 | # CONFIG_THERMAL is not set |
881 | # CONFIG_THERMAL_HWMON is not set | ||
645 | CONFIG_WATCHDOG=y | 882 | CONFIG_WATCHDOG=y |
646 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 883 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
647 | 884 | ||
@@ -649,7 +886,15 @@ CONFIG_WATCHDOG=y | |||
649 | # Watchdog Device Drivers | 886 | # Watchdog Device Drivers |
650 | # | 887 | # |
651 | # CONFIG_SOFT_WATCHDOG is not set | 888 | # CONFIG_SOFT_WATCHDOG is not set |
652 | CONFIG_83xx_WDT=y | 889 | # CONFIG_ALIM7101_WDT is not set |
890 | # CONFIG_8xxx_WDT is not set | ||
891 | # CONFIG_WATCHDOG_RTAS is not set | ||
892 | |||
893 | # | ||
894 | # PCI-based Watchdog Cards | ||
895 | # | ||
896 | # CONFIG_PCIPCWATCHDOG is not set | ||
897 | # CONFIG_WDTPCI is not set | ||
653 | 898 | ||
654 | # | 899 | # |
655 | # USB-based Watchdog Cards | 900 | # USB-based Watchdog Cards |
@@ -665,8 +910,10 @@ CONFIG_SSB_POSSIBLE=y | |||
665 | # | 910 | # |
666 | # Multifunction device drivers | 911 | # Multifunction device drivers |
667 | # | 912 | # |
913 | # CONFIG_MFD_CORE is not set | ||
668 | # CONFIG_MFD_SM501 is not set | 914 | # CONFIG_MFD_SM501 is not set |
669 | # CONFIG_HTC_PASIC3 is not set | 915 | # CONFIG_HTC_PASIC3 is not set |
916 | # CONFIG_MFD_TMIO is not set | ||
670 | 917 | ||
671 | # | 918 | # |
672 | # Multimedia devices | 919 | # Multimedia devices |
@@ -688,6 +935,8 @@ CONFIG_DAB=y | |||
688 | # | 935 | # |
689 | # Graphics support | 936 | # Graphics support |
690 | # | 937 | # |
938 | # CONFIG_AGP is not set | ||
939 | # CONFIG_DRM is not set | ||
691 | # CONFIG_VGASTATE is not set | 940 | # CONFIG_VGASTATE is not set |
692 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 941 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
693 | # CONFIG_FB is not set | 942 | # CONFIG_FB is not set |
@@ -697,10 +946,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
697 | # Display device support | 946 | # Display device support |
698 | # | 947 | # |
699 | # CONFIG_DISPLAY_SUPPORT is not set | 948 | # CONFIG_DISPLAY_SUPPORT is not set |
700 | |||
701 | # | ||
702 | # Sound | ||
703 | # | ||
704 | # CONFIG_SOUND is not set | 949 | # CONFIG_SOUND is not set |
705 | CONFIG_HID_SUPPORT=y | 950 | CONFIG_HID_SUPPORT=y |
706 | CONFIG_HID=y | 951 | CONFIG_HID=y |
@@ -716,7 +961,7 @@ CONFIG_USB_HID=y | |||
716 | # CONFIG_USB_HIDDEV is not set | 961 | # CONFIG_USB_HIDDEV is not set |
717 | CONFIG_USB_SUPPORT=y | 962 | CONFIG_USB_SUPPORT=y |
718 | CONFIG_USB_ARCH_HAS_HCD=y | 963 | CONFIG_USB_ARCH_HAS_HCD=y |
719 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 964 | CONFIG_USB_ARCH_HAS_OHCI=y |
720 | CONFIG_USB_ARCH_HAS_EHCI=y | 965 | CONFIG_USB_ARCH_HAS_EHCI=y |
721 | CONFIG_USB=y | 966 | CONFIG_USB=y |
722 | # CONFIG_USB_DEBUG is not set | 967 | # CONFIG_USB_DEBUG is not set |
@@ -731,6 +976,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
731 | # CONFIG_USB_OTG is not set | 976 | # CONFIG_USB_OTG is not set |
732 | # CONFIG_USB_OTG_WHITELIST is not set | 977 | # CONFIG_USB_OTG_WHITELIST is not set |
733 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 978 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
979 | CONFIG_USB_MON=y | ||
734 | 980 | ||
735 | # | 981 | # |
736 | # USB Host Controller Drivers | 982 | # USB Host Controller Drivers |
@@ -743,6 +989,8 @@ CONFIG_USB_EHCI_FSL=y | |||
743 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 989 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
744 | # CONFIG_USB_ISP116X_HCD is not set | 990 | # CONFIG_USB_ISP116X_HCD is not set |
745 | # CONFIG_USB_ISP1760_HCD is not set | 991 | # CONFIG_USB_ISP1760_HCD is not set |
992 | # CONFIG_USB_OHCI_HCD is not set | ||
993 | # CONFIG_USB_UHCI_HCD is not set | ||
746 | # CONFIG_USB_SL811_HCD is not set | 994 | # CONFIG_USB_SL811_HCD is not set |
747 | # CONFIG_USB_R8A66597_HCD is not set | 995 | # CONFIG_USB_R8A66597_HCD is not set |
748 | 996 | ||
@@ -768,7 +1016,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
768 | # | 1016 | # |
769 | # CONFIG_USB_MDC800 is not set | 1017 | # CONFIG_USB_MDC800 is not set |
770 | # CONFIG_USB_MICROTEK is not set | 1018 | # CONFIG_USB_MICROTEK is not set |
771 | CONFIG_USB_MON=y | ||
772 | 1019 | ||
773 | # | 1020 | # |
774 | # USB port drivers | 1021 | # USB port drivers |
@@ -781,7 +1028,6 @@ CONFIG_USB_MON=y | |||
781 | # CONFIG_USB_EMI62 is not set | 1028 | # CONFIG_USB_EMI62 is not set |
782 | # CONFIG_USB_EMI26 is not set | 1029 | # CONFIG_USB_EMI26 is not set |
783 | # CONFIG_USB_ADUTUX is not set | 1030 | # CONFIG_USB_ADUTUX is not set |
784 | # CONFIG_USB_AUERSWALD is not set | ||
785 | # CONFIG_USB_RIO500 is not set | 1031 | # CONFIG_USB_RIO500 is not set |
786 | # CONFIG_USB_LEGOTOWER is not set | 1032 | # CONFIG_USB_LEGOTOWER is not set |
787 | # CONFIG_USB_LCD is not set | 1033 | # CONFIG_USB_LCD is not set |
@@ -803,6 +1049,7 @@ CONFIG_USB_MON=y | |||
803 | # CONFIG_MEMSTICK is not set | 1049 | # CONFIG_MEMSTICK is not set |
804 | # CONFIG_NEW_LEDS is not set | 1050 | # CONFIG_NEW_LEDS is not set |
805 | # CONFIG_ACCESSIBILITY is not set | 1051 | # CONFIG_ACCESSIBILITY is not set |
1052 | # CONFIG_INFINIBAND is not set | ||
806 | # CONFIG_EDAC is not set | 1053 | # CONFIG_EDAC is not set |
807 | # CONFIG_RTC_CLASS is not set | 1054 | # CONFIG_RTC_CLASS is not set |
808 | # CONFIG_DMADEVICES is not set | 1055 | # CONFIG_DMADEVICES is not set |
@@ -872,6 +1119,7 @@ CONFIG_TMPFS=y | |||
872 | # CONFIG_CRAMFS is not set | 1119 | # CONFIG_CRAMFS is not set |
873 | # CONFIG_VXFS_FS is not set | 1120 | # CONFIG_VXFS_FS is not set |
874 | # CONFIG_MINIX_FS is not set | 1121 | # CONFIG_MINIX_FS is not set |
1122 | # CONFIG_OMFS_FS is not set | ||
875 | # CONFIG_HPFS_FS is not set | 1123 | # CONFIG_HPFS_FS is not set |
876 | # CONFIG_QNX4FS_FS is not set | 1124 | # CONFIG_QNX4FS_FS is not set |
877 | # CONFIG_ROMFS_FS is not set | 1125 | # CONFIG_ROMFS_FS is not set |
@@ -882,14 +1130,13 @@ CONFIG_NFS_FS=y | |||
882 | CONFIG_NFS_V3=y | 1130 | CONFIG_NFS_V3=y |
883 | # CONFIG_NFS_V3_ACL is not set | 1131 | # CONFIG_NFS_V3_ACL is not set |
884 | CONFIG_NFS_V4=y | 1132 | CONFIG_NFS_V4=y |
885 | # CONFIG_NFSD is not set | ||
886 | CONFIG_ROOT_NFS=y | 1133 | CONFIG_ROOT_NFS=y |
1134 | # CONFIG_NFSD is not set | ||
887 | CONFIG_LOCKD=y | 1135 | CONFIG_LOCKD=y |
888 | CONFIG_LOCKD_V4=y | 1136 | CONFIG_LOCKD_V4=y |
889 | CONFIG_NFS_COMMON=y | 1137 | CONFIG_NFS_COMMON=y |
890 | CONFIG_SUNRPC=y | 1138 | CONFIG_SUNRPC=y |
891 | CONFIG_SUNRPC_GSS=y | 1139 | CONFIG_SUNRPC_GSS=y |
892 | # CONFIG_SUNRPC_BIND34 is not set | ||
893 | CONFIG_RPCSEC_GSS_KRB5=y | 1140 | CONFIG_RPCSEC_GSS_KRB5=y |
894 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1141 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
895 | # CONFIG_SMB_FS is not set | 1142 | # CONFIG_SMB_FS is not set |
@@ -929,6 +1176,7 @@ CONFIG_BITREVERSE=y | |||
929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1176 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
930 | # CONFIG_CRC_CCITT is not set | 1177 | # CONFIG_CRC_CCITT is not set |
931 | # CONFIG_CRC16 is not set | 1178 | # CONFIG_CRC16 is not set |
1179 | CONFIG_CRC_T10DIF=y | ||
932 | # CONFIG_CRC_ITU_T is not set | 1180 | # CONFIG_CRC_ITU_T is not set |
933 | CONFIG_CRC32=y | 1181 | CONFIG_CRC32=y |
934 | # CONFIG_CRC7 is not set | 1182 | # CONFIG_CRC7 is not set |
@@ -952,8 +1200,18 @@ CONFIG_FRAME_WARN=1024 | |||
952 | # CONFIG_HEADERS_CHECK is not set | 1200 | # CONFIG_HEADERS_CHECK is not set |
953 | # CONFIG_DEBUG_KERNEL is not set | 1201 | # CONFIG_DEBUG_KERNEL is not set |
954 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1202 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1203 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1204 | # CONFIG_LATENCYTOP is not set | ||
1205 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1206 | CONFIG_HAVE_FTRACE=y | ||
1207 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1208 | # CONFIG_FTRACE is not set | ||
1209 | # CONFIG_SCHED_TRACER is not set | ||
1210 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
955 | # CONFIG_SAMPLES is not set | 1211 | # CONFIG_SAMPLES is not set |
1212 | CONFIG_HAVE_ARCH_KGDB=y | ||
956 | # CONFIG_IRQSTACKS is not set | 1213 | # CONFIG_IRQSTACKS is not set |
1214 | # CONFIG_BOOTX_TEXT is not set | ||
957 | # CONFIG_PPC_EARLY_DEBUG is not set | 1215 | # CONFIG_PPC_EARLY_DEBUG is not set |
958 | 1216 | ||
959 | # | 1217 | # |
@@ -1011,6 +1269,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1011 | # CONFIG_CRYPTO_MD4 is not set | 1269 | # CONFIG_CRYPTO_MD4 is not set |
1012 | CONFIG_CRYPTO_MD5=y | 1270 | CONFIG_CRYPTO_MD5=y |
1013 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1271 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1272 | # CONFIG_CRYPTO_RMD128 is not set | ||
1273 | # CONFIG_CRYPTO_RMD160 is not set | ||
1274 | # CONFIG_CRYPTO_RMD256 is not set | ||
1275 | # CONFIG_CRYPTO_RMD320 is not set | ||
1014 | # CONFIG_CRYPTO_SHA1 is not set | 1276 | # CONFIG_CRYPTO_SHA1 is not set |
1015 | # CONFIG_CRYPTO_SHA256 is not set | 1277 | # CONFIG_CRYPTO_SHA256 is not set |
1016 | # CONFIG_CRYPTO_SHA512 is not set | 1278 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1042,5 +1304,7 @@ CONFIG_CRYPTO_DES=y | |||
1042 | # CONFIG_CRYPTO_DEFLATE is not set | 1304 | # CONFIG_CRYPTO_DEFLATE is not set |
1043 | # CONFIG_CRYPTO_LZO is not set | 1305 | # CONFIG_CRYPTO_LZO is not set |
1044 | CONFIG_CRYPTO_HW=y | 1306 | CONFIG_CRYPTO_HW=y |
1307 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1308 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1045 | # CONFIG_PPC_CLOCK is not set | 1309 | # CONFIG_PPC_CLOCK is not set |
1046 | # CONFIG_VIRTUALIZATION is not set | 1310 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig index 1752918be2c1..9245a67da200 100644 --- a/arch/powerpc/configs/83xx/sbc834x_defconfig +++ b/arch/powerpc/configs/83xx/sbc834x_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:30 2008 | 4 | # Thu Aug 21 00:52:27 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -51,6 +53,9 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
58 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 59 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 60 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 61 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,12 +93,12 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | # CONFIG_KALLSYMS is not set | 96 | # CONFIG_KALLSYMS is not set |
93 | CONFIG_HOTPLUG=y | 97 | CONFIG_HOTPLUG=y |
94 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
95 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
96 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | CONFIG_PCSPKR_PLATFORM=y | ||
97 | CONFIG_COMPAT_BRK=y | 102 | CONFIG_COMPAT_BRK=y |
98 | CONFIG_BASE_FULL=y | 103 | CONFIG_BASE_FULL=y |
99 | CONFIG_FUTEX=y | 104 | CONFIG_FUTEX=y |
@@ -110,10 +115,16 @@ CONFIG_SLAB=y | |||
110 | # CONFIG_PROFILING is not set | 115 | # CONFIG_PROFILING is not set |
111 | # CONFIG_MARKERS is not set | 116 | # CONFIG_MARKERS is not set |
112 | CONFIG_HAVE_OPROFILE=y | 117 | CONFIG_HAVE_OPROFILE=y |
118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
113 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
115 | # CONFIG_HAVE_DMA_ATTRS is not set | 123 | # CONFIG_HAVE_DMA_ATTRS is not set |
124 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
125 | # CONFIG_HAVE_CLK is not set | ||
116 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
117 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
118 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
119 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
@@ -124,12 +135,13 @@ CONFIG_MODULE_UNLOAD=y | |||
124 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 135 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
125 | # CONFIG_MODVERSIONS is not set | 136 | # CONFIG_MODVERSIONS is not set |
126 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 137 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
127 | # CONFIG_KMOD is not set | 138 | CONFIG_KMOD=y |
128 | CONFIG_BLOCK=y | 139 | CONFIG_BLOCK=y |
129 | # CONFIG_LBD is not set | 140 | # CONFIG_LBD is not set |
130 | # CONFIG_BLK_DEV_IO_TRACE is not set | 141 | # CONFIG_BLK_DEV_IO_TRACE is not set |
131 | # CONFIG_LSF is not set | 142 | # CONFIG_LSF is not set |
132 | # CONFIG_BLK_DEV_BSG is not set | 143 | # CONFIG_BLK_DEV_BSG is not set |
144 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
133 | 145 | ||
134 | # | 146 | # |
135 | # IO Schedulers | 147 | # IO Schedulers |
@@ -148,37 +160,49 @@ CONFIG_CLASSIC_RCU=y | |||
148 | # | 160 | # |
149 | # Platform support | 161 | # Platform support |
150 | # | 162 | # |
151 | # CONFIG_PPC_MULTIPLATFORM is not set | 163 | CONFIG_PPC_MULTIPLATFORM=y |
152 | # CONFIG_PPC_82xx is not set | 164 | CONFIG_CLASSIC32=y |
153 | CONFIG_PPC_83xx=y | 165 | CONFIG_PPC_CHRP=y |
154 | # CONFIG_PPC_86xx is not set | 166 | # CONFIG_MPC5121_ADS is not set |
155 | # CONFIG_PPC_MPC512x is not set | 167 | # CONFIG_MPC5121_GENERIC is not set |
156 | # CONFIG_PPC_MPC5121 is not set | 168 | # CONFIG_PPC_MPC52xx is not set |
169 | CONFIG_PPC_PMAC=y | ||
157 | # CONFIG_PPC_CELL is not set | 170 | # CONFIG_PPC_CELL is not set |
158 | # CONFIG_PPC_CELL_NATIVE is not set | 171 | # CONFIG_PPC_CELL_NATIVE is not set |
172 | # CONFIG_PPC_82xx is not set | ||
159 | # CONFIG_PQ2ADS is not set | 173 | # CONFIG_PQ2ADS is not set |
160 | CONFIG_MPC83xx=y | 174 | CONFIG_PPC_83xx=y |
161 | # CONFIG_MPC831x_RDB is not set | 175 | # CONFIG_MPC831x_RDB is not set |
162 | # CONFIG_MPC832x_MDS is not set | 176 | # CONFIG_MPC832x_MDS is not set |
163 | # CONFIG_MPC832x_RDB is not set | 177 | # CONFIG_MPC832x_RDB is not set |
164 | # CONFIG_MPC834x_MDS is not set | 178 | # CONFIG_MPC834x_MDS is not set |
165 | # CONFIG_MPC834x_ITX is not set | 179 | # CONFIG_MPC834x_ITX is not set |
166 | # CONFIG_MPC836x_MDS is not set | 180 | # CONFIG_MPC836x_MDS is not set |
181 | # CONFIG_MPC836x_RDK is not set | ||
167 | # CONFIG_MPC837x_MDS is not set | 182 | # CONFIG_MPC837x_MDS is not set |
168 | # CONFIG_MPC837x_RDB is not set | 183 | # CONFIG_MPC837x_RDB is not set |
169 | CONFIG_SBC834x=y | 184 | CONFIG_SBC834x=y |
185 | # CONFIG_ASP834x is not set | ||
170 | CONFIG_PPC_MPC834x=y | 186 | CONFIG_PPC_MPC834x=y |
187 | # CONFIG_PPC_86xx is not set | ||
188 | # CONFIG_EMBEDDED6xx is not set | ||
189 | CONFIG_PPC_NATIVE=y | ||
190 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
171 | CONFIG_IPIC=y | 191 | CONFIG_IPIC=y |
172 | # CONFIG_MPIC is not set | 192 | CONFIG_MPIC=y |
173 | # CONFIG_MPIC_WEIRD is not set | 193 | # CONFIG_MPIC_WEIRD is not set |
174 | # CONFIG_PPC_I8259 is not set | 194 | CONFIG_PPC_I8259=y |
175 | # CONFIG_PPC_RTAS is not set | 195 | CONFIG_PPC_RTAS=y |
196 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
197 | CONFIG_RTAS_PROC=y | ||
176 | # CONFIG_MMIO_NVRAM is not set | 198 | # CONFIG_MMIO_NVRAM is not set |
177 | # CONFIG_PPC_MPC106 is not set | 199 | CONFIG_PPC_MPC106=y |
178 | # CONFIG_PPC_970_NAP is not set | 200 | # CONFIG_PPC_970_NAP is not set |
179 | # CONFIG_PPC_INDIRECT_IO is not set | 201 | # CONFIG_PPC_INDIRECT_IO is not set |
180 | # CONFIG_GENERIC_IOMAP is not set | 202 | # CONFIG_GENERIC_IOMAP is not set |
181 | # CONFIG_CPU_FREQ is not set | 203 | # CONFIG_CPU_FREQ is not set |
204 | # CONFIG_PPC601_SYNC_FIX is not set | ||
205 | # CONFIG_TAU is not set | ||
182 | # CONFIG_FSL_ULI1575 is not set | 206 | # CONFIG_FSL_ULI1575 is not set |
183 | 207 | ||
184 | # | 208 | # |
@@ -204,6 +228,7 @@ CONFIG_BINFMT_ELF=y | |||
204 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 228 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
205 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 229 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
206 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 230 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
231 | # CONFIG_KEXEC is not set | ||
207 | CONFIG_ARCH_FLATMEM_ENABLE=y | 232 | CONFIG_ARCH_FLATMEM_ENABLE=y |
208 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 233 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
209 | CONFIG_SELECT_MEMORY_MODEL=y | 234 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -216,6 +241,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 241 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
217 | CONFIG_PAGEFLAGS_EXTENDED=y | 242 | CONFIG_PAGEFLAGS_EXTENDED=y |
218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 243 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
244 | CONFIG_MIGRATION=y | ||
219 | # CONFIG_RESOURCES_64BIT is not set | 245 | # CONFIG_RESOURCES_64BIT is not set |
220 | CONFIG_ZONE_DMA_FLAG=1 | 246 | CONFIG_ZONE_DMA_FLAG=1 |
221 | CONFIG_BOUNCE=y | 247 | CONFIG_BOUNCE=y |
@@ -223,6 +249,7 @@ CONFIG_VIRT_TO_BUS=y | |||
223 | CONFIG_FORCE_MAX_ZONEORDER=11 | 249 | CONFIG_FORCE_MAX_ZONEORDER=11 |
224 | CONFIG_PROC_DEVICETREE=y | 250 | CONFIG_PROC_DEVICETREE=y |
225 | # CONFIG_CMDLINE_BOOL is not set | 251 | # CONFIG_CMDLINE_BOOL is not set |
252 | CONFIG_EXTRA_TARGETS="" | ||
226 | # CONFIG_PM is not set | 253 | # CONFIG_PM is not set |
227 | CONFIG_SECCOMP=y | 254 | CONFIG_SECCOMP=y |
228 | CONFIG_ISA_DMA_API=y | 255 | CONFIG_ISA_DMA_API=y |
@@ -230,15 +257,22 @@ CONFIG_ISA_DMA_API=y | |||
230 | # | 257 | # |
231 | # Bus options | 258 | # Bus options |
232 | # | 259 | # |
260 | # CONFIG_ISA is not set | ||
233 | CONFIG_ZONE_DMA=y | 261 | CONFIG_ZONE_DMA=y |
234 | CONFIG_GENERIC_ISA_DMA=y | 262 | CONFIG_GENERIC_ISA_DMA=y |
235 | CONFIG_PPC_INDIRECT_PCI=y | 263 | CONFIG_PPC_INDIRECT_PCI=y |
236 | CONFIG_FSL_SOC=y | 264 | CONFIG_FSL_SOC=y |
237 | # CONFIG_PCI is not set | 265 | CONFIG_FSL_PCI=y |
238 | # CONFIG_PCI_DOMAINS is not set | 266 | CONFIG_PPC_PCI_CHOICE=y |
239 | # CONFIG_PCI_SYSCALL is not set | 267 | CONFIG_PCI=y |
240 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 268 | CONFIG_PCI_DOMAINS=y |
269 | CONFIG_PCI_SYSCALL=y | ||
270 | # CONFIG_PCIEPORTBUS is not set | ||
271 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
272 | # CONFIG_PCI_MSI is not set | ||
273 | CONFIG_PCI_LEGACY=y | ||
241 | # CONFIG_PCCARD is not set | 274 | # CONFIG_PCCARD is not set |
275 | # CONFIG_HOTPLUG_PCI is not set | ||
242 | # CONFIG_HAS_RAPIDIO is not set | 276 | # CONFIG_HAS_RAPIDIO is not set |
243 | 277 | ||
244 | # | 278 | # |
@@ -254,10 +288,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
254 | CONFIG_KERNEL_START=0xc0000000 | 288 | CONFIG_KERNEL_START=0xc0000000 |
255 | CONFIG_PHYSICAL_START=0x00000000 | 289 | CONFIG_PHYSICAL_START=0x00000000 |
256 | CONFIG_TASK_SIZE=0xc0000000 | 290 | CONFIG_TASK_SIZE=0xc0000000 |
257 | |||
258 | # | ||
259 | # Networking | ||
260 | # | ||
261 | CONFIG_NET=y | 291 | CONFIG_NET=y |
262 | 292 | ||
263 | # | 293 | # |
@@ -358,19 +388,30 @@ CONFIG_OF_I2C=y | |||
358 | # CONFIG_PARPORT is not set | 388 | # CONFIG_PARPORT is not set |
359 | CONFIG_BLK_DEV=y | 389 | CONFIG_BLK_DEV=y |
360 | # CONFIG_BLK_DEV_FD is not set | 390 | # CONFIG_BLK_DEV_FD is not set |
391 | # CONFIG_MAC_FLOPPY is not set | ||
392 | # CONFIG_BLK_CPQ_DA is not set | ||
393 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
394 | # CONFIG_BLK_DEV_DAC960 is not set | ||
395 | # CONFIG_BLK_DEV_UMEM is not set | ||
361 | # CONFIG_BLK_DEV_COW_COMMON is not set | 396 | # CONFIG_BLK_DEV_COW_COMMON is not set |
362 | CONFIG_BLK_DEV_LOOP=y | 397 | CONFIG_BLK_DEV_LOOP=y |
363 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 398 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
364 | # CONFIG_BLK_DEV_NBD is not set | 399 | # CONFIG_BLK_DEV_NBD is not set |
400 | # CONFIG_BLK_DEV_SX8 is not set | ||
365 | CONFIG_BLK_DEV_RAM=y | 401 | CONFIG_BLK_DEV_RAM=y |
366 | CONFIG_BLK_DEV_RAM_COUNT=16 | 402 | CONFIG_BLK_DEV_RAM_COUNT=16 |
367 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 403 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
368 | # CONFIG_BLK_DEV_XIP is not set | 404 | # CONFIG_BLK_DEV_XIP is not set |
369 | # CONFIG_CDROM_PKTCDVD is not set | 405 | # CONFIG_CDROM_PKTCDVD is not set |
370 | # CONFIG_ATA_OVER_ETH is not set | 406 | # CONFIG_ATA_OVER_ETH is not set |
407 | # CONFIG_BLK_DEV_HD is not set | ||
371 | CONFIG_MISC_DEVICES=y | 408 | CONFIG_MISC_DEVICES=y |
409 | # CONFIG_PHANTOM is not set | ||
372 | # CONFIG_EEPROM_93CX6 is not set | 410 | # CONFIG_EEPROM_93CX6 is not set |
411 | # CONFIG_SGI_IOC4 is not set | ||
412 | # CONFIG_TIFM_CORE is not set | ||
373 | # CONFIG_ENCLOSURE_SERVICES is not set | 413 | # CONFIG_ENCLOSURE_SERVICES is not set |
414 | # CONFIG_HP_ILO is not set | ||
374 | CONFIG_HAVE_IDE=y | 415 | CONFIG_HAVE_IDE=y |
375 | # CONFIG_IDE is not set | 416 | # CONFIG_IDE is not set |
376 | 417 | ||
@@ -383,15 +424,27 @@ CONFIG_HAVE_IDE=y | |||
383 | # CONFIG_SCSI_NETLINK is not set | 424 | # CONFIG_SCSI_NETLINK is not set |
384 | # CONFIG_ATA is not set | 425 | # CONFIG_ATA is not set |
385 | # CONFIG_MD is not set | 426 | # CONFIG_MD is not set |
427 | # CONFIG_FUSION is not set | ||
428 | |||
429 | # | ||
430 | # IEEE 1394 (FireWire) support | ||
431 | # | ||
432 | |||
433 | # | ||
434 | # Enable only one of the two stacks, unless you know what you are doing | ||
435 | # | ||
436 | # CONFIG_FIREWIRE is not set | ||
437 | # CONFIG_IEEE1394 is not set | ||
438 | # CONFIG_I2O is not set | ||
386 | # CONFIG_MACINTOSH_DRIVERS is not set | 439 | # CONFIG_MACINTOSH_DRIVERS is not set |
387 | CONFIG_NETDEVICES=y | 440 | CONFIG_NETDEVICES=y |
388 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
389 | # CONFIG_DUMMY is not set | 441 | # CONFIG_DUMMY is not set |
390 | # CONFIG_BONDING is not set | 442 | # CONFIG_BONDING is not set |
391 | # CONFIG_MACVLAN is not set | 443 | # CONFIG_MACVLAN is not set |
392 | # CONFIG_EQUALIZER is not set | 444 | # CONFIG_EQUALIZER is not set |
393 | # CONFIG_TUN is not set | 445 | # CONFIG_TUN is not set |
394 | # CONFIG_VETH is not set | 446 | # CONFIG_VETH is not set |
447 | # CONFIG_ARCNET is not set | ||
395 | CONFIG_PHYLIB=y | 448 | CONFIG_PHYLIB=y |
396 | 449 | ||
397 | # | 450 | # |
@@ -411,16 +464,44 @@ CONFIG_BROADCOM_PHY=y | |||
411 | # CONFIG_MDIO_BITBANG is not set | 464 | # CONFIG_MDIO_BITBANG is not set |
412 | CONFIG_NET_ETHERNET=y | 465 | CONFIG_NET_ETHERNET=y |
413 | CONFIG_MII=y | 466 | CONFIG_MII=y |
467 | # CONFIG_MACE is not set | ||
468 | # CONFIG_BMAC is not set | ||
469 | # CONFIG_HAPPYMEAL is not set | ||
470 | # CONFIG_SUNGEM is not set | ||
471 | # CONFIG_CASSINI is not set | ||
472 | # CONFIG_NET_VENDOR_3COM is not set | ||
473 | # CONFIG_NET_TULIP is not set | ||
474 | # CONFIG_HP100 is not set | ||
414 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 475 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
415 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 476 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
416 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 477 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
417 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 478 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
479 | # CONFIG_NET_PCI is not set | ||
418 | # CONFIG_B44 is not set | 480 | # CONFIG_B44 is not set |
419 | CONFIG_NETDEV_1000=y | 481 | CONFIG_NETDEV_1000=y |
420 | # CONFIG_E1000E_ENABLED is not set | 482 | # CONFIG_ACENIC is not set |
483 | # CONFIG_DL2K is not set | ||
484 | # CONFIG_E1000 is not set | ||
485 | # CONFIG_E1000E is not set | ||
486 | # CONFIG_IP1000 is not set | ||
487 | # CONFIG_IGB is not set | ||
488 | # CONFIG_NS83820 is not set | ||
489 | # CONFIG_HAMACHI is not set | ||
490 | # CONFIG_YELLOWFIN is not set | ||
491 | # CONFIG_R8169 is not set | ||
492 | # CONFIG_SIS190 is not set | ||
493 | # CONFIG_SKGE is not set | ||
494 | # CONFIG_SKY2 is not set | ||
495 | # CONFIG_VIA_VELOCITY is not set | ||
496 | # CONFIG_TIGON3 is not set | ||
497 | # CONFIG_BNX2 is not set | ||
421 | CONFIG_GIANFAR=y | 498 | CONFIG_GIANFAR=y |
422 | # CONFIG_GFAR_NAPI is not set | 499 | # CONFIG_MV643XX_ETH is not set |
500 | # CONFIG_QLA3XXX is not set | ||
501 | # CONFIG_ATL1 is not set | ||
502 | # CONFIG_ATL1E is not set | ||
423 | # CONFIG_NETDEV_10000 is not set | 503 | # CONFIG_NETDEV_10000 is not set |
504 | # CONFIG_TR is not set | ||
424 | 505 | ||
425 | # | 506 | # |
426 | # Wireless LAN | 507 | # Wireless LAN |
@@ -429,6 +510,8 @@ CONFIG_GIANFAR=y | |||
429 | # CONFIG_WLAN_80211 is not set | 510 | # CONFIG_WLAN_80211 is not set |
430 | # CONFIG_IWLWIFI_LEDS is not set | 511 | # CONFIG_IWLWIFI_LEDS is not set |
431 | # CONFIG_WAN is not set | 512 | # CONFIG_WAN is not set |
513 | # CONFIG_FDDI is not set | ||
514 | # CONFIG_HIPPI is not set | ||
432 | # CONFIG_PPP is not set | 515 | # CONFIG_PPP is not set |
433 | # CONFIG_SLIP is not set | 516 | # CONFIG_SLIP is not set |
434 | # CONFIG_NETCONSOLE is not set | 517 | # CONFIG_NETCONSOLE is not set |
@@ -474,12 +557,14 @@ CONFIG_INPUT=y | |||
474 | # CONFIG_VT is not set | 557 | # CONFIG_VT is not set |
475 | CONFIG_DEVKMEM=y | 558 | CONFIG_DEVKMEM=y |
476 | # CONFIG_SERIAL_NONSTANDARD is not set | 559 | # CONFIG_SERIAL_NONSTANDARD is not set |
560 | # CONFIG_NOZOMI is not set | ||
477 | 561 | ||
478 | # | 562 | # |
479 | # Serial drivers | 563 | # Serial drivers |
480 | # | 564 | # |
481 | CONFIG_SERIAL_8250=y | 565 | CONFIG_SERIAL_8250=y |
482 | CONFIG_SERIAL_8250_CONSOLE=y | 566 | CONFIG_SERIAL_8250_CONSOLE=y |
567 | CONFIG_SERIAL_8250_PCI=y | ||
483 | CONFIG_SERIAL_8250_NR_UARTS=4 | 568 | CONFIG_SERIAL_8250_NR_UARTS=4 |
484 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 569 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
485 | # CONFIG_SERIAL_8250_EXTENDED is not set | 570 | # CONFIG_SERIAL_8250_EXTENDED is not set |
@@ -490,40 +575,90 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
490 | # CONFIG_SERIAL_UARTLITE is not set | 575 | # CONFIG_SERIAL_UARTLITE is not set |
491 | CONFIG_SERIAL_CORE=y | 576 | CONFIG_SERIAL_CORE=y |
492 | CONFIG_SERIAL_CORE_CONSOLE=y | 577 | CONFIG_SERIAL_CORE_CONSOLE=y |
578 | # CONFIG_SERIAL_PMACZILOG is not set | ||
579 | # CONFIG_SERIAL_JSM is not set | ||
493 | # CONFIG_SERIAL_OF_PLATFORM is not set | 580 | # CONFIG_SERIAL_OF_PLATFORM is not set |
494 | CONFIG_UNIX98_PTYS=y | 581 | CONFIG_UNIX98_PTYS=y |
495 | CONFIG_LEGACY_PTYS=y | 582 | CONFIG_LEGACY_PTYS=y |
496 | CONFIG_LEGACY_PTY_COUNT=256 | 583 | CONFIG_LEGACY_PTY_COUNT=256 |
584 | # CONFIG_BRIQ_PANEL is not set | ||
585 | # CONFIG_HVC_RTAS is not set | ||
497 | # CONFIG_IPMI_HANDLER is not set | 586 | # CONFIG_IPMI_HANDLER is not set |
498 | # CONFIG_HW_RANDOM is not set | 587 | # CONFIG_HW_RANDOM is not set |
499 | # CONFIG_NVRAM is not set | 588 | # CONFIG_NVRAM is not set |
500 | CONFIG_GEN_RTC=y | 589 | CONFIG_GEN_RTC=y |
501 | # CONFIG_GEN_RTC_X is not set | 590 | # CONFIG_GEN_RTC_X is not set |
502 | # CONFIG_R3964 is not set | 591 | # CONFIG_R3964 is not set |
592 | # CONFIG_APPLICOM is not set | ||
503 | # CONFIG_RAW_DRIVER is not set | 593 | # CONFIG_RAW_DRIVER is not set |
504 | # CONFIG_TCG_TPM is not set | 594 | # CONFIG_TCG_TPM is not set |
595 | CONFIG_DEVPORT=y | ||
505 | CONFIG_I2C=y | 596 | CONFIG_I2C=y |
506 | CONFIG_I2C_BOARDINFO=y | 597 | CONFIG_I2C_BOARDINFO=y |
507 | CONFIG_I2C_CHARDEV=y | 598 | CONFIG_I2C_CHARDEV=y |
599 | CONFIG_I2C_HELPER_AUTO=y | ||
508 | 600 | ||
509 | # | 601 | # |
510 | # I2C Hardware Bus support | 602 | # I2C Hardware Bus support |
511 | # | 603 | # |
604 | |||
605 | # | ||
606 | # PC SMBus host controller drivers | ||
607 | # | ||
608 | # CONFIG_I2C_ALI1535 is not set | ||
609 | # CONFIG_I2C_ALI1563 is not set | ||
610 | # CONFIG_I2C_ALI15X3 is not set | ||
611 | # CONFIG_I2C_AMD756 is not set | ||
612 | # CONFIG_I2C_AMD8111 is not set | ||
613 | # CONFIG_I2C_I801 is not set | ||
614 | # CONFIG_I2C_ISCH is not set | ||
615 | # CONFIG_I2C_PIIX4 is not set | ||
616 | # CONFIG_I2C_NFORCE2 is not set | ||
617 | # CONFIG_I2C_SIS5595 is not set | ||
618 | # CONFIG_I2C_SIS630 is not set | ||
619 | # CONFIG_I2C_SIS96X is not set | ||
620 | # CONFIG_I2C_VIA is not set | ||
621 | # CONFIG_I2C_VIAPRO is not set | ||
622 | |||
623 | # | ||
624 | # Mac SMBus host controller drivers | ||
625 | # | ||
626 | # CONFIG_I2C_HYDRA is not set | ||
627 | CONFIG_I2C_POWERMAC=y | ||
628 | |||
629 | # | ||
630 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
631 | # | ||
512 | CONFIG_I2C_MPC=y | 632 | CONFIG_I2C_MPC=y |
513 | # CONFIG_I2C_OCORES is not set | 633 | # CONFIG_I2C_OCORES is not set |
514 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
515 | # CONFIG_I2C_SIMTEC is not set | 634 | # CONFIG_I2C_SIMTEC is not set |
635 | |||
636 | # | ||
637 | # External I2C/SMBus adapter drivers | ||
638 | # | ||
639 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
516 | # CONFIG_I2C_TAOS_EVM is not set | 640 | # CONFIG_I2C_TAOS_EVM is not set |
517 | # CONFIG_I2C_STUB is not set | 641 | |
642 | # | ||
643 | # Graphics adapter I2C/DDC channel drivers | ||
644 | # | ||
645 | # CONFIG_I2C_VOODOO3 is not set | ||
646 | |||
647 | # | ||
648 | # Other I2C/SMBus bus drivers | ||
649 | # | ||
518 | # CONFIG_I2C_PCA_PLATFORM is not set | 650 | # CONFIG_I2C_PCA_PLATFORM is not set |
651 | # CONFIG_I2C_STUB is not set | ||
519 | 652 | ||
520 | # | 653 | # |
521 | # Miscellaneous I2C Chip support | 654 | # Miscellaneous I2C Chip support |
522 | # | 655 | # |
523 | # CONFIG_DS1682 is not set | 656 | # CONFIG_DS1682 is not set |
657 | # CONFIG_AT24 is not set | ||
524 | # CONFIG_SENSORS_EEPROM is not set | 658 | # CONFIG_SENSORS_EEPROM is not set |
525 | # CONFIG_SENSORS_PCF8574 is not set | 659 | # CONFIG_SENSORS_PCF8574 is not set |
526 | # CONFIG_PCF8575 is not set | 660 | # CONFIG_PCF8575 is not set |
661 | # CONFIG_SENSORS_PCA9539 is not set | ||
527 | # CONFIG_SENSORS_PCF8591 is not set | 662 | # CONFIG_SENSORS_PCF8591 is not set |
528 | # CONFIG_SENSORS_MAX6875 is not set | 663 | # CONFIG_SENSORS_MAX6875 is not set |
529 | # CONFIG_SENSORS_TSL2550 is not set | 664 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -532,10 +667,13 @@ CONFIG_I2C_MPC=y | |||
532 | # CONFIG_I2C_DEBUG_BUS is not set | 667 | # CONFIG_I2C_DEBUG_BUS is not set |
533 | # CONFIG_I2C_DEBUG_CHIP is not set | 668 | # CONFIG_I2C_DEBUG_CHIP is not set |
534 | # CONFIG_SPI is not set | 669 | # CONFIG_SPI is not set |
670 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
671 | # CONFIG_GPIOLIB is not set | ||
535 | # CONFIG_W1 is not set | 672 | # CONFIG_W1 is not set |
536 | # CONFIG_POWER_SUPPLY is not set | 673 | # CONFIG_POWER_SUPPLY is not set |
537 | CONFIG_HWMON=y | 674 | CONFIG_HWMON=y |
538 | # CONFIG_HWMON_VID is not set | 675 | # CONFIG_HWMON_VID is not set |
676 | # CONFIG_SENSORS_AD7414 is not set | ||
539 | # CONFIG_SENSORS_AD7418 is not set | 677 | # CONFIG_SENSORS_AD7418 is not set |
540 | # CONFIG_SENSORS_ADM1021 is not set | 678 | # CONFIG_SENSORS_ADM1021 is not set |
541 | # CONFIG_SENSORS_ADM1025 is not set | 679 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -545,8 +683,10 @@ CONFIG_HWMON=y | |||
545 | # CONFIG_SENSORS_ADM9240 is not set | 683 | # CONFIG_SENSORS_ADM9240 is not set |
546 | # CONFIG_SENSORS_ADT7470 is not set | 684 | # CONFIG_SENSORS_ADT7470 is not set |
547 | # CONFIG_SENSORS_ADT7473 is not set | 685 | # CONFIG_SENSORS_ADT7473 is not set |
686 | # CONFIG_SENSORS_AMS is not set | ||
548 | # CONFIG_SENSORS_ATXP1 is not set | 687 | # CONFIG_SENSORS_ATXP1 is not set |
549 | # CONFIG_SENSORS_DS1621 is not set | 688 | # CONFIG_SENSORS_DS1621 is not set |
689 | # CONFIG_SENSORS_I5K_AMB is not set | ||
550 | # CONFIG_SENSORS_F71805F is not set | 690 | # CONFIG_SENSORS_F71805F is not set |
551 | # CONFIG_SENSORS_F71882FG is not set | 691 | # CONFIG_SENSORS_F71882FG is not set |
552 | # CONFIG_SENSORS_F75375S is not set | 692 | # CONFIG_SENSORS_F75375S is not set |
@@ -568,13 +708,16 @@ CONFIG_HWMON=y | |||
568 | # CONFIG_SENSORS_MAX6650 is not set | 708 | # CONFIG_SENSORS_MAX6650 is not set |
569 | # CONFIG_SENSORS_PC87360 is not set | 709 | # CONFIG_SENSORS_PC87360 is not set |
570 | # CONFIG_SENSORS_PC87427 is not set | 710 | # CONFIG_SENSORS_PC87427 is not set |
711 | # CONFIG_SENSORS_SIS5595 is not set | ||
571 | # CONFIG_SENSORS_DME1737 is not set | 712 | # CONFIG_SENSORS_DME1737 is not set |
572 | # CONFIG_SENSORS_SMSC47M1 is not set | 713 | # CONFIG_SENSORS_SMSC47M1 is not set |
573 | # CONFIG_SENSORS_SMSC47M192 is not set | 714 | # CONFIG_SENSORS_SMSC47M192 is not set |
574 | # CONFIG_SENSORS_SMSC47B397 is not set | 715 | # CONFIG_SENSORS_SMSC47B397 is not set |
575 | # CONFIG_SENSORS_ADS7828 is not set | 716 | # CONFIG_SENSORS_ADS7828 is not set |
576 | # CONFIG_SENSORS_THMC50 is not set | 717 | # CONFIG_SENSORS_THMC50 is not set |
718 | # CONFIG_SENSORS_VIA686A is not set | ||
577 | # CONFIG_SENSORS_VT1211 is not set | 719 | # CONFIG_SENSORS_VT1211 is not set |
720 | # CONFIG_SENSORS_VT8231 is not set | ||
578 | # CONFIG_SENSORS_W83781D is not set | 721 | # CONFIG_SENSORS_W83781D is not set |
579 | # CONFIG_SENSORS_W83791D is not set | 722 | # CONFIG_SENSORS_W83791D is not set |
580 | # CONFIG_SENSORS_W83792D is not set | 723 | # CONFIG_SENSORS_W83792D is not set |
@@ -585,6 +728,7 @@ CONFIG_HWMON=y | |||
585 | # CONFIG_SENSORS_W83627EHF is not set | 728 | # CONFIG_SENSORS_W83627EHF is not set |
586 | # CONFIG_HWMON_DEBUG_CHIP is not set | 729 | # CONFIG_HWMON_DEBUG_CHIP is not set |
587 | # CONFIG_THERMAL is not set | 730 | # CONFIG_THERMAL is not set |
731 | # CONFIG_THERMAL_HWMON is not set | ||
588 | CONFIG_WATCHDOG=y | 732 | CONFIG_WATCHDOG=y |
589 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 733 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
590 | 734 | ||
@@ -592,7 +736,15 @@ CONFIG_WATCHDOG=y | |||
592 | # Watchdog Device Drivers | 736 | # Watchdog Device Drivers |
593 | # | 737 | # |
594 | # CONFIG_SOFT_WATCHDOG is not set | 738 | # CONFIG_SOFT_WATCHDOG is not set |
595 | CONFIG_83xx_WDT=y | 739 | # CONFIG_ALIM7101_WDT is not set |
740 | # CONFIG_8xxx_WDT is not set | ||
741 | # CONFIG_WATCHDOG_RTAS is not set | ||
742 | |||
743 | # | ||
744 | # PCI-based Watchdog Cards | ||
745 | # | ||
746 | # CONFIG_PCIPCWATCHDOG is not set | ||
747 | # CONFIG_WDTPCI is not set | ||
596 | 748 | ||
597 | # | 749 | # |
598 | # Sonics Silicon Backplane | 750 | # Sonics Silicon Backplane |
@@ -603,8 +755,10 @@ CONFIG_SSB_POSSIBLE=y | |||
603 | # | 755 | # |
604 | # Multifunction device drivers | 756 | # Multifunction device drivers |
605 | # | 757 | # |
758 | # CONFIG_MFD_CORE is not set | ||
606 | # CONFIG_MFD_SM501 is not set | 759 | # CONFIG_MFD_SM501 is not set |
607 | # CONFIG_HTC_PASIC3 is not set | 760 | # CONFIG_HTC_PASIC3 is not set |
761 | # CONFIG_MFD_TMIO is not set | ||
608 | 762 | ||
609 | # | 763 | # |
610 | # Multimedia devices | 764 | # Multimedia devices |
@@ -625,6 +779,8 @@ CONFIG_SSB_POSSIBLE=y | |||
625 | # | 779 | # |
626 | # Graphics support | 780 | # Graphics support |
627 | # | 781 | # |
782 | # CONFIG_AGP is not set | ||
783 | # CONFIG_DRM is not set | ||
628 | # CONFIG_VGASTATE is not set | 784 | # CONFIG_VGASTATE is not set |
629 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 785 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
630 | # CONFIG_FB is not set | 786 | # CONFIG_FB is not set |
@@ -634,10 +790,6 @@ CONFIG_SSB_POSSIBLE=y | |||
634 | # Display device support | 790 | # Display device support |
635 | # | 791 | # |
636 | # CONFIG_DISPLAY_SUPPORT is not set | 792 | # CONFIG_DISPLAY_SUPPORT is not set |
637 | |||
638 | # | ||
639 | # Sound | ||
640 | # | ||
641 | # CONFIG_SOUND is not set | 793 | # CONFIG_SOUND is not set |
642 | CONFIG_HID_SUPPORT=y | 794 | CONFIG_HID_SUPPORT=y |
643 | CONFIG_HID=y | 795 | CONFIG_HID=y |
@@ -648,6 +800,7 @@ CONFIG_HID=y | |||
648 | # CONFIG_MEMSTICK is not set | 800 | # CONFIG_MEMSTICK is not set |
649 | # CONFIG_NEW_LEDS is not set | 801 | # CONFIG_NEW_LEDS is not set |
650 | # CONFIG_ACCESSIBILITY is not set | 802 | # CONFIG_ACCESSIBILITY is not set |
803 | # CONFIG_INFINIBAND is not set | ||
651 | # CONFIG_EDAC is not set | 804 | # CONFIG_EDAC is not set |
652 | # CONFIG_RTC_CLASS is not set | 805 | # CONFIG_RTC_CLASS is not set |
653 | # CONFIG_DMADEVICES is not set | 806 | # CONFIG_DMADEVICES is not set |
@@ -710,6 +863,7 @@ CONFIG_TMPFS=y | |||
710 | # CONFIG_CRAMFS is not set | 863 | # CONFIG_CRAMFS is not set |
711 | # CONFIG_VXFS_FS is not set | 864 | # CONFIG_VXFS_FS is not set |
712 | # CONFIG_MINIX_FS is not set | 865 | # CONFIG_MINIX_FS is not set |
866 | # CONFIG_OMFS_FS is not set | ||
713 | # CONFIG_HPFS_FS is not set | 867 | # CONFIG_HPFS_FS is not set |
714 | # CONFIG_QNX4FS_FS is not set | 868 | # CONFIG_QNX4FS_FS is not set |
715 | # CONFIG_ROMFS_FS is not set | 869 | # CONFIG_ROMFS_FS is not set |
@@ -720,14 +874,13 @@ CONFIG_NFS_FS=y | |||
720 | CONFIG_NFS_V3=y | 874 | CONFIG_NFS_V3=y |
721 | # CONFIG_NFS_V3_ACL is not set | 875 | # CONFIG_NFS_V3_ACL is not set |
722 | CONFIG_NFS_V4=y | 876 | CONFIG_NFS_V4=y |
723 | # CONFIG_NFSD is not set | ||
724 | CONFIG_ROOT_NFS=y | 877 | CONFIG_ROOT_NFS=y |
878 | # CONFIG_NFSD is not set | ||
725 | CONFIG_LOCKD=y | 879 | CONFIG_LOCKD=y |
726 | CONFIG_LOCKD_V4=y | 880 | CONFIG_LOCKD_V4=y |
727 | CONFIG_NFS_COMMON=y | 881 | CONFIG_NFS_COMMON=y |
728 | CONFIG_SUNRPC=y | 882 | CONFIG_SUNRPC=y |
729 | CONFIG_SUNRPC_GSS=y | 883 | CONFIG_SUNRPC_GSS=y |
730 | # CONFIG_SUNRPC_BIND34 is not set | ||
731 | CONFIG_RPCSEC_GSS_KRB5=y | 884 | CONFIG_RPCSEC_GSS_KRB5=y |
732 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 885 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
733 | # CONFIG_SMB_FS is not set | 886 | # CONFIG_SMB_FS is not set |
@@ -740,6 +893,7 @@ CONFIG_RPCSEC_GSS_KRB5=y | |||
740 | # Partition Types | 893 | # Partition Types |
741 | # | 894 | # |
742 | # CONFIG_PARTITION_ADVANCED is not set | 895 | # CONFIG_PARTITION_ADVANCED is not set |
896 | CONFIG_MAC_PARTITION=y | ||
743 | CONFIG_MSDOS_PARTITION=y | 897 | CONFIG_MSDOS_PARTITION=y |
744 | # CONFIG_NLS is not set | 898 | # CONFIG_NLS is not set |
745 | # CONFIG_DLM is not set | 899 | # CONFIG_DLM is not set |
@@ -751,6 +905,7 @@ CONFIG_BITREVERSE=y | |||
751 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 905 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
752 | # CONFIG_CRC_CCITT is not set | 906 | # CONFIG_CRC_CCITT is not set |
753 | # CONFIG_CRC16 is not set | 907 | # CONFIG_CRC16 is not set |
908 | # CONFIG_CRC_T10DIF is not set | ||
754 | # CONFIG_CRC_ITU_T is not set | 909 | # CONFIG_CRC_ITU_T is not set |
755 | CONFIG_CRC32=y | 910 | CONFIG_CRC32=y |
756 | # CONFIG_CRC7 is not set | 911 | # CONFIG_CRC7 is not set |
@@ -774,8 +929,18 @@ CONFIG_FRAME_WARN=1024 | |||
774 | # CONFIG_HEADERS_CHECK is not set | 929 | # CONFIG_HEADERS_CHECK is not set |
775 | # CONFIG_DEBUG_KERNEL is not set | 930 | # CONFIG_DEBUG_KERNEL is not set |
776 | # CONFIG_DEBUG_BUGVERBOSE is not set | 931 | # CONFIG_DEBUG_BUGVERBOSE is not set |
932 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
933 | # CONFIG_LATENCYTOP is not set | ||
934 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
935 | CONFIG_HAVE_FTRACE=y | ||
936 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
937 | # CONFIG_FTRACE is not set | ||
938 | # CONFIG_SCHED_TRACER is not set | ||
939 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
777 | # CONFIG_SAMPLES is not set | 940 | # CONFIG_SAMPLES is not set |
941 | CONFIG_HAVE_ARCH_KGDB=y | ||
778 | # CONFIG_IRQSTACKS is not set | 942 | # CONFIG_IRQSTACKS is not set |
943 | # CONFIG_BOOTX_TEXT is not set | ||
779 | # CONFIG_PPC_EARLY_DEBUG is not set | 944 | # CONFIG_PPC_EARLY_DEBUG is not set |
780 | 945 | ||
781 | # | 946 | # |
@@ -829,6 +994,10 @@ CONFIG_CRYPTO_PCBC=m | |||
829 | # CONFIG_CRYPTO_MD4 is not set | 994 | # CONFIG_CRYPTO_MD4 is not set |
830 | CONFIG_CRYPTO_MD5=y | 995 | CONFIG_CRYPTO_MD5=y |
831 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 996 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
997 | # CONFIG_CRYPTO_RMD128 is not set | ||
998 | # CONFIG_CRYPTO_RMD160 is not set | ||
999 | # CONFIG_CRYPTO_RMD256 is not set | ||
1000 | # CONFIG_CRYPTO_RMD320 is not set | ||
832 | # CONFIG_CRYPTO_SHA1 is not set | 1001 | # CONFIG_CRYPTO_SHA1 is not set |
833 | # CONFIG_CRYPTO_SHA256 is not set | 1002 | # CONFIG_CRYPTO_SHA256 is not set |
834 | # CONFIG_CRYPTO_SHA512 is not set | 1003 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/powerpc/configs/85xx/ksi8560_defconfig b/arch/powerpc/configs/85xx/ksi8560_defconfig index b82bb042308a..8bb89f26a20d 100644 --- a/arch/powerpc/configs/85xx/ksi8560_defconfig +++ b/arch/powerpc/configs/85xx/ksi8560_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:30 2008 | 4 | # Thu Aug 21 00:52:28 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | ||
42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
@@ -85,7 +88,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
85 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
86 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
87 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
88 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
89 | CONFIG_KALLSYMS=y | 91 | CONFIG_KALLSYMS=y |
90 | # CONFIG_KALLSYMS_ALL is not set | 92 | # CONFIG_KALLSYMS_ALL is not set |
91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -110,10 +112,16 @@ CONFIG_SLUB=y | |||
110 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
111 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
112 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
113 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
119 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
115 | # CONFIG_HAVE_DMA_ATTRS is not set | 120 | # CONFIG_HAVE_DMA_ATTRS is not set |
121 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
122 | CONFIG_HAVE_CLK=y | ||
116 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
117 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
118 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
119 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
@@ -124,6 +132,7 @@ CONFIG_BLOCK=y | |||
124 | # CONFIG_BLK_DEV_IO_TRACE is not set | 132 | # CONFIG_BLK_DEV_IO_TRACE is not set |
125 | # CONFIG_LSF is not set | 133 | # CONFIG_LSF is not set |
126 | # CONFIG_BLK_DEV_BSG is not set | 134 | # CONFIG_BLK_DEV_BSG is not set |
135 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
127 | 136 | ||
128 | # | 137 | # |
129 | # IO Schedulers | 138 | # IO Schedulers |
@@ -142,8 +151,6 @@ CONFIG_CLASSIC_RCU=y | |||
142 | # | 151 | # |
143 | # Platform support | 152 | # Platform support |
144 | # | 153 | # |
145 | # CONFIG_PPC_MPC512x is not set | ||
146 | # CONFIG_PPC_MPC5121 is not set | ||
147 | # CONFIG_PPC_CELL is not set | 154 | # CONFIG_PPC_CELL is not set |
148 | # CONFIG_PPC_CELL_NATIVE is not set | 155 | # CONFIG_PPC_CELL_NATIVE is not set |
149 | # CONFIG_PQ2ADS is not set | 156 | # CONFIG_PQ2ADS is not set |
@@ -152,11 +159,13 @@ CONFIG_MPC85xx=y | |||
152 | # CONFIG_MPC8560_ADS is not set | 159 | # CONFIG_MPC8560_ADS is not set |
153 | # CONFIG_MPC85xx_CDS is not set | 160 | # CONFIG_MPC85xx_CDS is not set |
154 | # CONFIG_MPC85xx_MDS is not set | 161 | # CONFIG_MPC85xx_MDS is not set |
162 | # CONFIG_MPC8536_DS is not set | ||
155 | # CONFIG_MPC85xx_DS is not set | 163 | # CONFIG_MPC85xx_DS is not set |
156 | CONFIG_KSI8560=y | 164 | CONFIG_KSI8560=y |
157 | # CONFIG_STX_GP3 is not set | 165 | # CONFIG_STX_GP3 is not set |
158 | # CONFIG_TQM8540 is not set | 166 | # CONFIG_TQM8540 is not set |
159 | # CONFIG_TQM8541 is not set | 167 | # CONFIG_TQM8541 is not set |
168 | # CONFIG_TQM8548 is not set | ||
160 | # CONFIG_TQM8555 is not set | 169 | # CONFIG_TQM8555 is not set |
161 | # CONFIG_TQM8560 is not set | 170 | # CONFIG_TQM8560 is not set |
162 | # CONFIG_SBC8548 is not set | 171 | # CONFIG_SBC8548 is not set |
@@ -173,7 +182,6 @@ CONFIG_MPIC=y | |||
173 | # CONFIG_GENERIC_IOMAP is not set | 182 | # CONFIG_GENERIC_IOMAP is not set |
174 | # CONFIG_CPU_FREQ is not set | 183 | # CONFIG_CPU_FREQ is not set |
175 | CONFIG_CPM2=y | 184 | CONFIG_CPM2=y |
176 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
177 | # CONFIG_FSL_ULI1575 is not set | 185 | # CONFIG_FSL_ULI1575 is not set |
178 | CONFIG_CPM=y | 186 | CONFIG_CPM=y |
179 | 187 | ||
@@ -213,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
214 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | ||
216 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
217 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
218 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
@@ -220,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
220 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
221 | # CONFIG_PROC_DEVICETREE is not set | 230 | # CONFIG_PROC_DEVICETREE is not set |
222 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
232 | CONFIG_EXTRA_TARGETS="" | ||
223 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
224 | # CONFIG_SECCOMP is not set | 234 | # CONFIG_SECCOMP is not set |
225 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
@@ -229,6 +239,7 @@ CONFIG_ISA_DMA_API=y | |||
229 | # | 239 | # |
230 | CONFIG_ZONE_DMA=y | 240 | CONFIG_ZONE_DMA=y |
231 | CONFIG_FSL_SOC=y | 241 | CONFIG_FSL_SOC=y |
242 | CONFIG_PPC_PCI_CHOICE=y | ||
232 | # CONFIG_PCI is not set | 243 | # CONFIG_PCI is not set |
233 | # CONFIG_PCI_DOMAINS is not set | 244 | # CONFIG_PCI_DOMAINS is not set |
234 | # CONFIG_PCI_SYSCALL is not set | 245 | # CONFIG_PCI_SYSCALL is not set |
@@ -250,10 +261,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
250 | CONFIG_PHYSICAL_START=0x00000000 | 261 | CONFIG_PHYSICAL_START=0x00000000 |
251 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 262 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
252 | CONFIG_TASK_SIZE=0xc0000000 | 263 | CONFIG_TASK_SIZE=0xc0000000 |
253 | |||
254 | # | ||
255 | # Networking | ||
256 | # | ||
257 | CONFIG_NET=y | 264 | CONFIG_NET=y |
258 | 265 | ||
259 | # | 266 | # |
@@ -427,6 +434,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
427 | # | 434 | # |
428 | # CONFIG_MTD_UBI is not set | 435 | # CONFIG_MTD_UBI is not set |
429 | CONFIG_OF_DEVICE=y | 436 | CONFIG_OF_DEVICE=y |
437 | CONFIG_OF_GPIO=y | ||
430 | # CONFIG_PARPORT is not set | 438 | # CONFIG_PARPORT is not set |
431 | CONFIG_BLK_DEV=y | 439 | CONFIG_BLK_DEV=y |
432 | # CONFIG_BLK_DEV_FD is not set | 440 | # CONFIG_BLK_DEV_FD is not set |
@@ -440,12 +448,12 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
440 | # CONFIG_BLK_DEV_XIP is not set | 448 | # CONFIG_BLK_DEV_XIP is not set |
441 | # CONFIG_CDROM_PKTCDVD is not set | 449 | # CONFIG_CDROM_PKTCDVD is not set |
442 | # CONFIG_ATA_OVER_ETH is not set | 450 | # CONFIG_ATA_OVER_ETH is not set |
451 | # CONFIG_BLK_DEV_HD is not set | ||
443 | CONFIG_MISC_DEVICES=y | 452 | CONFIG_MISC_DEVICES=y |
444 | # CONFIG_EEPROM_93CX6 is not set | 453 | # CONFIG_EEPROM_93CX6 is not set |
445 | # CONFIG_ENCLOSURE_SERVICES is not set | 454 | # CONFIG_ENCLOSURE_SERVICES is not set |
446 | CONFIG_HAVE_IDE=y | 455 | CONFIG_HAVE_IDE=y |
447 | CONFIG_IDE=y | 456 | CONFIG_IDE=y |
448 | CONFIG_IDE_MAX_HWIFS=4 | ||
449 | CONFIG_BLK_DEV_IDE=y | 457 | CONFIG_BLK_DEV_IDE=y |
450 | 458 | ||
451 | # | 459 | # |
@@ -463,11 +471,8 @@ CONFIG_IDE_PROC_FS=y | |||
463 | # | 471 | # |
464 | # IDE chipset support/bugfixes | 472 | # IDE chipset support/bugfixes |
465 | # | 473 | # |
466 | CONFIG_IDE_GENERIC=y | ||
467 | # CONFIG_BLK_DEV_PLATFORM is not set | 474 | # CONFIG_BLK_DEV_PLATFORM is not set |
468 | # CONFIG_BLK_DEV_IDEDMA is not set | 475 | # CONFIG_BLK_DEV_IDEDMA is not set |
469 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
470 | # CONFIG_BLK_DEV_HD is not set | ||
471 | 476 | ||
472 | # | 477 | # |
473 | # SCSI device support | 478 | # SCSI device support |
@@ -480,7 +485,6 @@ CONFIG_IDE_GENERIC=y | |||
480 | # CONFIG_MD is not set | 485 | # CONFIG_MD is not set |
481 | # CONFIG_MACINTOSH_DRIVERS is not set | 486 | # CONFIG_MACINTOSH_DRIVERS is not set |
482 | CONFIG_NETDEVICES=y | 487 | CONFIG_NETDEVICES=y |
483 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
484 | # CONFIG_DUMMY is not set | 488 | # CONFIG_DUMMY is not set |
485 | # CONFIG_BONDING is not set | 489 | # CONFIG_BONDING is not set |
486 | # CONFIG_MACVLAN is not set | 490 | # CONFIG_MACVLAN is not set |
@@ -504,6 +508,7 @@ CONFIG_MARVELL_PHY=y | |||
504 | # CONFIG_REALTEK_PHY is not set | 508 | # CONFIG_REALTEK_PHY is not set |
505 | # CONFIG_FIXED_PHY is not set | 509 | # CONFIG_FIXED_PHY is not set |
506 | CONFIG_MDIO_BITBANG=y | 510 | CONFIG_MDIO_BITBANG=y |
511 | # CONFIG_MDIO_OF_GPIO is not set | ||
507 | CONFIG_NET_ETHERNET=y | 512 | CONFIG_NET_ETHERNET=y |
508 | CONFIG_MII=y | 513 | CONFIG_MII=y |
509 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 514 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
@@ -516,9 +521,7 @@ CONFIG_FS_ENET=y | |||
516 | CONFIG_FS_ENET_HAS_FCC=y | 521 | CONFIG_FS_ENET_HAS_FCC=y |
517 | CONFIG_FS_ENET_MDIO_FCC=y | 522 | CONFIG_FS_ENET_MDIO_FCC=y |
518 | CONFIG_NETDEV_1000=y | 523 | CONFIG_NETDEV_1000=y |
519 | # CONFIG_E1000E_ENABLED is not set | ||
520 | CONFIG_GIANFAR=y | 524 | CONFIG_GIANFAR=y |
521 | CONFIG_GFAR_NAPI=y | ||
522 | CONFIG_NETDEV_10000=y | 525 | CONFIG_NETDEV_10000=y |
523 | 526 | ||
524 | # | 527 | # |
@@ -606,6 +609,23 @@ CONFIG_GEN_RTC=y | |||
606 | # CONFIG_TCG_TPM is not set | 609 | # CONFIG_TCG_TPM is not set |
607 | # CONFIG_I2C is not set | 610 | # CONFIG_I2C is not set |
608 | # CONFIG_SPI is not set | 611 | # CONFIG_SPI is not set |
612 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
613 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
614 | CONFIG_GPIOLIB=y | ||
615 | # CONFIG_DEBUG_GPIO is not set | ||
616 | # CONFIG_GPIO_SYSFS is not set | ||
617 | |||
618 | # | ||
619 | # I2C GPIO expanders: | ||
620 | # | ||
621 | |||
622 | # | ||
623 | # PCI GPIO expanders: | ||
624 | # | ||
625 | |||
626 | # | ||
627 | # SPI GPIO expanders: | ||
628 | # | ||
609 | # CONFIG_W1 is not set | 629 | # CONFIG_W1 is not set |
610 | # CONFIG_POWER_SUPPLY is not set | 630 | # CONFIG_POWER_SUPPLY is not set |
611 | CONFIG_HWMON=y | 631 | CONFIG_HWMON=y |
@@ -622,6 +642,7 @@ CONFIG_HWMON=y | |||
622 | # CONFIG_SENSORS_W83627EHF is not set | 642 | # CONFIG_SENSORS_W83627EHF is not set |
623 | # CONFIG_HWMON_DEBUG_CHIP is not set | 643 | # CONFIG_HWMON_DEBUG_CHIP is not set |
624 | # CONFIG_THERMAL is not set | 644 | # CONFIG_THERMAL is not set |
645 | # CONFIG_THERMAL_HWMON is not set | ||
625 | # CONFIG_WATCHDOG is not set | 646 | # CONFIG_WATCHDOG is not set |
626 | 647 | ||
627 | # | 648 | # |
@@ -633,8 +654,10 @@ CONFIG_SSB_POSSIBLE=y | |||
633 | # | 654 | # |
634 | # Multifunction device drivers | 655 | # Multifunction device drivers |
635 | # | 656 | # |
657 | # CONFIG_MFD_CORE is not set | ||
636 | # CONFIG_MFD_SM501 is not set | 658 | # CONFIG_MFD_SM501 is not set |
637 | # CONFIG_HTC_PASIC3 is not set | 659 | # CONFIG_HTC_PASIC3 is not set |
660 | # CONFIG_MFD_TMIO is not set | ||
638 | 661 | ||
639 | # | 662 | # |
640 | # Multimedia devices | 663 | # Multimedia devices |
@@ -664,10 +687,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
664 | # Display device support | 687 | # Display device support |
665 | # | 688 | # |
666 | # CONFIG_DISPLAY_SUPPORT is not set | 689 | # CONFIG_DISPLAY_SUPPORT is not set |
667 | |||
668 | # | ||
669 | # Sound | ||
670 | # | ||
671 | # CONFIG_SOUND is not set | 690 | # CONFIG_SOUND is not set |
672 | CONFIG_HID_SUPPORT=y | 691 | CONFIG_HID_SUPPORT=y |
673 | CONFIG_HID=y | 692 | CONFIG_HID=y |
@@ -681,6 +700,10 @@ CONFIG_USB_SUPPORT=y | |||
681 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 700 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
682 | 701 | ||
683 | # | 702 | # |
703 | # Enable Host or Gadget support to see Inventra options | ||
704 | # | ||
705 | |||
706 | # | ||
684 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 707 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
685 | # | 708 | # |
686 | # CONFIG_USB_GADGET is not set | 709 | # CONFIG_USB_GADGET is not set |
@@ -759,6 +782,7 @@ CONFIG_TMPFS=y | |||
759 | # CONFIG_CRAMFS is not set | 782 | # CONFIG_CRAMFS is not set |
760 | # CONFIG_VXFS_FS is not set | 783 | # CONFIG_VXFS_FS is not set |
761 | # CONFIG_MINIX_FS is not set | 784 | # CONFIG_MINIX_FS is not set |
785 | # CONFIG_OMFS_FS is not set | ||
762 | # CONFIG_HPFS_FS is not set | 786 | # CONFIG_HPFS_FS is not set |
763 | # CONFIG_QNX4FS_FS is not set | 787 | # CONFIG_QNX4FS_FS is not set |
764 | # CONFIG_ROMFS_FS is not set | 788 | # CONFIG_ROMFS_FS is not set |
@@ -768,12 +792,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
768 | CONFIG_NFS_FS=y | 792 | CONFIG_NFS_FS=y |
769 | # CONFIG_NFS_V3 is not set | 793 | # CONFIG_NFS_V3 is not set |
770 | # CONFIG_NFS_V4 is not set | 794 | # CONFIG_NFS_V4 is not set |
771 | # CONFIG_NFSD is not set | ||
772 | CONFIG_ROOT_NFS=y | 795 | CONFIG_ROOT_NFS=y |
796 | # CONFIG_NFSD is not set | ||
773 | CONFIG_LOCKD=y | 797 | CONFIG_LOCKD=y |
774 | CONFIG_NFS_COMMON=y | 798 | CONFIG_NFS_COMMON=y |
775 | CONFIG_SUNRPC=y | 799 | CONFIG_SUNRPC=y |
776 | # CONFIG_SUNRPC_BIND34 is not set | ||
777 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 800 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
778 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 801 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
779 | # CONFIG_SMB_FS is not set | 802 | # CONFIG_SMB_FS is not set |
@@ -809,6 +832,7 @@ CONFIG_BITREVERSE=y | |||
809 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 832 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
810 | # CONFIG_CRC_CCITT is not set | 833 | # CONFIG_CRC_CCITT is not set |
811 | # CONFIG_CRC16 is not set | 834 | # CONFIG_CRC16 is not set |
835 | # CONFIG_CRC_T10DIF is not set | ||
812 | # CONFIG_CRC_ITU_T is not set | 836 | # CONFIG_CRC_ITU_T is not set |
813 | CONFIG_CRC32=y | 837 | CONFIG_CRC32=y |
814 | # CONFIG_CRC7 is not set | 838 | # CONFIG_CRC7 is not set |
@@ -833,6 +857,8 @@ CONFIG_DEBUG_FS=y | |||
833 | CONFIG_DEBUG_KERNEL=y | 857 | CONFIG_DEBUG_KERNEL=y |
834 | # CONFIG_DEBUG_SHIRQ is not set | 858 | # CONFIG_DEBUG_SHIRQ is not set |
835 | CONFIG_DETECT_SOFTLOCKUP=y | 859 | CONFIG_DETECT_SOFTLOCKUP=y |
860 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
861 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
836 | CONFIG_SCHED_DEBUG=y | 862 | CONFIG_SCHED_DEBUG=y |
837 | # CONFIG_SCHEDSTATS is not set | 863 | # CONFIG_SCHEDSTATS is not set |
838 | # CONFIG_TIMER_STATS is not set | 864 | # CONFIG_TIMER_STATS is not set |
@@ -851,17 +877,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
851 | # CONFIG_DEBUG_INFO is not set | 877 | # CONFIG_DEBUG_INFO is not set |
852 | # CONFIG_DEBUG_VM is not set | 878 | # CONFIG_DEBUG_VM is not set |
853 | # CONFIG_DEBUG_WRITECOUNT is not set | 879 | # CONFIG_DEBUG_WRITECOUNT is not set |
880 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
854 | # CONFIG_DEBUG_LIST is not set | 881 | # CONFIG_DEBUG_LIST is not set |
855 | # CONFIG_DEBUG_SG is not set | 882 | # CONFIG_DEBUG_SG is not set |
856 | # CONFIG_BOOT_PRINTK_DELAY is not set | 883 | # CONFIG_BOOT_PRINTK_DELAY is not set |
884 | # CONFIG_RCU_TORTURE_TEST is not set | ||
857 | # CONFIG_BACKTRACE_SELF_TEST is not set | 885 | # CONFIG_BACKTRACE_SELF_TEST is not set |
858 | # CONFIG_FAULT_INJECTION is not set | 886 | # CONFIG_FAULT_INJECTION is not set |
887 | # CONFIG_LATENCYTOP is not set | ||
888 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
889 | CONFIG_HAVE_FTRACE=y | ||
890 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
891 | # CONFIG_FTRACE is not set | ||
892 | # CONFIG_SCHED_TRACER is not set | ||
893 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
859 | # CONFIG_SAMPLES is not set | 894 | # CONFIG_SAMPLES is not set |
895 | CONFIG_HAVE_ARCH_KGDB=y | ||
896 | # CONFIG_KGDB is not set | ||
860 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 897 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
861 | # CONFIG_DEBUG_STACK_USAGE is not set | 898 | # CONFIG_DEBUG_STACK_USAGE is not set |
862 | # CONFIG_DEBUG_PAGEALLOC is not set | 899 | # CONFIG_DEBUG_PAGEALLOC is not set |
863 | # CONFIG_DEBUGGER is not set | 900 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
864 | # CONFIG_KGDB_CONSOLE is not set | 901 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
902 | # CONFIG_XMON is not set | ||
865 | # CONFIG_IRQSTACKS is not set | 903 | # CONFIG_IRQSTACKS is not set |
866 | # CONFIG_VIRQ_DEBUG is not set | 904 | # CONFIG_VIRQ_DEBUG is not set |
867 | # CONFIG_BDI_SWITCH is not set | 905 | # CONFIG_BDI_SWITCH is not set |
@@ -915,6 +953,10 @@ CONFIG_CRYPTO=y | |||
915 | # CONFIG_CRYPTO_MD4 is not set | 953 | # CONFIG_CRYPTO_MD4 is not set |
916 | # CONFIG_CRYPTO_MD5 is not set | 954 | # CONFIG_CRYPTO_MD5 is not set |
917 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 955 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
956 | # CONFIG_CRYPTO_RMD128 is not set | ||
957 | # CONFIG_CRYPTO_RMD160 is not set | ||
958 | # CONFIG_CRYPTO_RMD256 is not set | ||
959 | # CONFIG_CRYPTO_RMD320 is not set | ||
918 | # CONFIG_CRYPTO_SHA1 is not set | 960 | # CONFIG_CRYPTO_SHA1 is not set |
919 | # CONFIG_CRYPTO_SHA256 is not set | 961 | # CONFIG_CRYPTO_SHA256 is not set |
920 | # CONFIG_CRYPTO_SHA512 is not set | 962 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -946,6 +988,7 @@ CONFIG_CRYPTO=y | |||
946 | # CONFIG_CRYPTO_DEFLATE is not set | 988 | # CONFIG_CRYPTO_DEFLATE is not set |
947 | # CONFIG_CRYPTO_LZO is not set | 989 | # CONFIG_CRYPTO_LZO is not set |
948 | CONFIG_CRYPTO_HW=y | 990 | CONFIG_CRYPTO_HW=y |
949 | # CONFIG_PPC_CLOCK is not set | 991 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
992 | CONFIG_PPC_CLOCK=y | ||
950 | CONFIG_PPC_LIB_RHEAP=y | 993 | CONFIG_PPC_LIB_RHEAP=y |
951 | # CONFIG_VIRTUALIZATION is not set | 994 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc8536_ds_defconfig b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig index f1e2931de5da..6b516bea6e75 100644 --- a/arch/powerpc/configs/mpc8536_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8536_ds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc8 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Wed Jul 2 01:34:26 2008 | 4 | # Thu Aug 21 07:18:18 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -93,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
93 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
94 | CONFIG_EMBEDDED=y | 95 | CONFIG_EMBEDDED=y |
95 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
97 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
98 | CONFIG_KALLSYMS_ALL=y | 98 | CONFIG_KALLSYMS_ALL=y |
99 | CONFIG_KALLSYMS_EXTRA_PASS=y | 99 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -119,10 +119,16 @@ CONFIG_SLUB=y | |||
119 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
120 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
121 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
122 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
123 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
124 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
129 | # CONFIG_HAVE_CLK is not set | ||
125 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
126 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
127 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
128 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
@@ -139,6 +145,7 @@ CONFIG_LBD=y | |||
139 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
140 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
141 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
142 | 149 | ||
143 | # | 150 | # |
144 | # IO Schedulers | 151 | # IO Schedulers |
@@ -157,8 +164,6 @@ CONFIG_CLASSIC_RCU=y | |||
157 | # | 164 | # |
158 | # Platform support | 165 | # Platform support |
159 | # | 166 | # |
160 | # CONFIG_PPC_MPC512x is not set | ||
161 | # CONFIG_PPC_MPC5121 is not set | ||
162 | # CONFIG_PPC_CELL is not set | 167 | # CONFIG_PPC_CELL is not set |
163 | # CONFIG_PPC_CELL_NATIVE is not set | 168 | # CONFIG_PPC_CELL_NATIVE is not set |
164 | # CONFIG_PQ2ADS is not set | 169 | # CONFIG_PQ2ADS is not set |
@@ -205,7 +210,7 @@ CONFIG_HZ_250=y | |||
205 | # CONFIG_HZ_300 is not set | 210 | # CONFIG_HZ_300 is not set |
206 | # CONFIG_HZ_1000 is not set | 211 | # CONFIG_HZ_1000 is not set |
207 | CONFIG_HZ=250 | 212 | CONFIG_HZ=250 |
208 | # CONFIG_SCHED_HRTICK is not set | 213 | CONFIG_SCHED_HRTICK=y |
209 | CONFIG_PREEMPT_NONE=y | 214 | CONFIG_PREEMPT_NONE=y |
210 | # CONFIG_PREEMPT_VOLUNTARY is not set | 215 | # CONFIG_PREEMPT_VOLUNTARY is not set |
211 | # CONFIG_PREEMPT is not set | 216 | # CONFIG_PREEMPT is not set |
@@ -228,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 233 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
229 | CONFIG_PAGEFLAGS_EXTENDED=y | 234 | CONFIG_PAGEFLAGS_EXTENDED=y |
230 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 235 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
236 | CONFIG_MIGRATION=y | ||
231 | # CONFIG_RESOURCES_64BIT is not set | 237 | # CONFIG_RESOURCES_64BIT is not set |
232 | CONFIG_ZONE_DMA_FLAG=1 | 238 | CONFIG_ZONE_DMA_FLAG=1 |
233 | CONFIG_BOUNCE=y | 239 | CONFIG_BOUNCE=y |
@@ -235,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y | |||
235 | CONFIG_FORCE_MAX_ZONEORDER=11 | 241 | CONFIG_FORCE_MAX_ZONEORDER=11 |
236 | CONFIG_PROC_DEVICETREE=y | 242 | CONFIG_PROC_DEVICETREE=y |
237 | # CONFIG_CMDLINE_BOOL is not set | 243 | # CONFIG_CMDLINE_BOOL is not set |
244 | CONFIG_EXTRA_TARGETS="" | ||
238 | # CONFIG_PM is not set | 245 | # CONFIG_PM is not set |
239 | CONFIG_SECCOMP=y | 246 | CONFIG_SECCOMP=y |
240 | CONFIG_ISA_DMA_API=y | 247 | CONFIG_ISA_DMA_API=y |
@@ -246,6 +253,7 @@ CONFIG_ZONE_DMA=y | |||
246 | CONFIG_PPC_INDIRECT_PCI=y | 253 | CONFIG_PPC_INDIRECT_PCI=y |
247 | CONFIG_FSL_SOC=y | 254 | CONFIG_FSL_SOC=y |
248 | CONFIG_FSL_PCI=y | 255 | CONFIG_FSL_PCI=y |
256 | CONFIG_PPC_PCI_CHOICE=y | ||
249 | CONFIG_PCI=y | 257 | CONFIG_PCI=y |
250 | CONFIG_PCI_DOMAINS=y | 258 | CONFIG_PCI_DOMAINS=y |
251 | CONFIG_PCI_SYSCALL=y | 259 | CONFIG_PCI_SYSCALL=y |
@@ -272,10 +280,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
272 | CONFIG_PHYSICAL_START=0x00000000 | 280 | CONFIG_PHYSICAL_START=0x00000000 |
273 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 281 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
274 | CONFIG_TASK_SIZE=0xc0000000 | 282 | CONFIG_TASK_SIZE=0xc0000000 |
275 | |||
276 | # | ||
277 | # Networking | ||
278 | # | ||
279 | CONFIG_NET=y | 283 | CONFIG_NET=y |
280 | 284 | ||
281 | # | 285 | # |
@@ -401,6 +405,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
401 | CONFIG_STANDALONE=y | 405 | CONFIG_STANDALONE=y |
402 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 406 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
403 | CONFIG_FW_LOADER=y | 407 | CONFIG_FW_LOADER=y |
408 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
409 | CONFIG_EXTRA_FIRMWARE="" | ||
404 | # CONFIG_DEBUG_DRIVER is not set | 410 | # CONFIG_DEBUG_DRIVER is not set |
405 | # CONFIG_DEBUG_DEVRES is not set | 411 | # CONFIG_DEBUG_DEVRES is not set |
406 | # CONFIG_SYS_HYPERVISOR is not set | 412 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -427,12 +433,14 @@ CONFIG_BLK_DEV_RAM_SIZE=524288 | |||
427 | # CONFIG_BLK_DEV_XIP is not set | 433 | # CONFIG_BLK_DEV_XIP is not set |
428 | # CONFIG_CDROM_PKTCDVD is not set | 434 | # CONFIG_CDROM_PKTCDVD is not set |
429 | # CONFIG_ATA_OVER_ETH is not set | 435 | # CONFIG_ATA_OVER_ETH is not set |
436 | # CONFIG_BLK_DEV_HD is not set | ||
430 | CONFIG_MISC_DEVICES=y | 437 | CONFIG_MISC_DEVICES=y |
431 | # CONFIG_PHANTOM is not set | 438 | # CONFIG_PHANTOM is not set |
432 | # CONFIG_EEPROM_93CX6 is not set | 439 | # CONFIG_EEPROM_93CX6 is not set |
433 | # CONFIG_SGI_IOC4 is not set | 440 | # CONFIG_SGI_IOC4 is not set |
434 | # CONFIG_TIFM_CORE is not set | 441 | # CONFIG_TIFM_CORE is not set |
435 | # CONFIG_ENCLOSURE_SERVICES is not set | 442 | # CONFIG_ENCLOSURE_SERVICES is not set |
443 | # CONFIG_HP_ILO is not set | ||
436 | CONFIG_HAVE_IDE=y | 444 | CONFIG_HAVE_IDE=y |
437 | # CONFIG_IDE is not set | 445 | # CONFIG_IDE is not set |
438 | 446 | ||
@@ -512,6 +520,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
512 | # CONFIG_SCSI_NSP32 is not set | 520 | # CONFIG_SCSI_NSP32 is not set |
513 | # CONFIG_SCSI_DEBUG is not set | 521 | # CONFIG_SCSI_DEBUG is not set |
514 | # CONFIG_SCSI_SRP is not set | 522 | # CONFIG_SCSI_SRP is not set |
523 | # CONFIG_SCSI_DH is not set | ||
515 | CONFIG_ATA=y | 524 | CONFIG_ATA=y |
516 | # CONFIG_ATA_NONSTANDARD is not set | 525 | # CONFIG_ATA_NONSTANDARD is not set |
517 | CONFIG_SATA_PMP=y | 526 | CONFIG_SATA_PMP=y |
@@ -588,7 +597,6 @@ CONFIG_SATA_SIL=y | |||
588 | # CONFIG_I2O is not set | 597 | # CONFIG_I2O is not set |
589 | # CONFIG_MACINTOSH_DRIVERS is not set | 598 | # CONFIG_MACINTOSH_DRIVERS is not set |
590 | CONFIG_NETDEVICES=y | 599 | CONFIG_NETDEVICES=y |
591 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
592 | CONFIG_DUMMY=y | 600 | CONFIG_DUMMY=y |
593 | # CONFIG_BONDING is not set | 601 | # CONFIG_BONDING is not set |
594 | # CONFIG_MACVLAN is not set | 602 | # CONFIG_MACVLAN is not set |
@@ -632,7 +640,6 @@ CONFIG_NETDEV_1000=y | |||
632 | # CONFIG_DL2K is not set | 640 | # CONFIG_DL2K is not set |
633 | # CONFIG_E1000 is not set | 641 | # CONFIG_E1000 is not set |
634 | # CONFIG_E1000E is not set | 642 | # CONFIG_E1000E is not set |
635 | # CONFIG_E1000E_ENABLED is not set | ||
636 | # CONFIG_IP1000 is not set | 643 | # CONFIG_IP1000 is not set |
637 | # CONFIG_IGB is not set | 644 | # CONFIG_IGB is not set |
638 | # CONFIG_NS83820 is not set | 645 | # CONFIG_NS83820 is not set |
@@ -648,9 +655,9 @@ CONFIG_SKY2=y | |||
648 | # CONFIG_TIGON3 is not set | 655 | # CONFIG_TIGON3 is not set |
649 | # CONFIG_BNX2 is not set | 656 | # CONFIG_BNX2 is not set |
650 | CONFIG_GIANFAR=y | 657 | CONFIG_GIANFAR=y |
651 | CONFIG_GFAR_NAPI=y | ||
652 | # CONFIG_QLA3XXX is not set | 658 | # CONFIG_QLA3XXX is not set |
653 | # CONFIG_ATL1 is not set | 659 | # CONFIG_ATL1 is not set |
660 | # CONFIG_ATL1E is not set | ||
654 | CONFIG_NETDEV_10000=y | 661 | CONFIG_NETDEV_10000=y |
655 | # CONFIG_CHELSIO_T1 is not set | 662 | # CONFIG_CHELSIO_T1 is not set |
656 | # CONFIG_CHELSIO_T3 is not set | 663 | # CONFIG_CHELSIO_T3 is not set |
@@ -727,12 +734,14 @@ CONFIG_SERIO_SERPORT=y | |||
727 | # CONFIG_SERIO_PCIPS2 is not set | 734 | # CONFIG_SERIO_PCIPS2 is not set |
728 | CONFIG_SERIO_LIBPS2=y | 735 | CONFIG_SERIO_LIBPS2=y |
729 | # CONFIG_SERIO_RAW is not set | 736 | # CONFIG_SERIO_RAW is not set |
737 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
730 | # CONFIG_GAMEPORT is not set | 738 | # CONFIG_GAMEPORT is not set |
731 | 739 | ||
732 | # | 740 | # |
733 | # Character devices | 741 | # Character devices |
734 | # | 742 | # |
735 | CONFIG_VT=y | 743 | CONFIG_VT=y |
744 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
736 | CONFIG_VT_CONSOLE=y | 745 | CONFIG_VT_CONSOLE=y |
737 | CONFIG_HW_CONSOLE=y | 746 | CONFIG_HW_CONSOLE=y |
738 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 747 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -766,7 +775,7 @@ CONFIG_UNIX98_PTYS=y | |||
766 | CONFIG_LEGACY_PTYS=y | 775 | CONFIG_LEGACY_PTYS=y |
767 | CONFIG_LEGACY_PTY_COUNT=256 | 776 | CONFIG_LEGACY_PTY_COUNT=256 |
768 | # CONFIG_IPMI_HANDLER is not set | 777 | # CONFIG_IPMI_HANDLER is not set |
769 | # CONFIG_HW_RANDOM is not set | 778 | CONFIG_HW_RANDOM=y |
770 | # CONFIG_NVRAM is not set | 779 | # CONFIG_NVRAM is not set |
771 | # CONFIG_R3964 is not set | 780 | # CONFIG_R3964 is not set |
772 | # CONFIG_APPLICOM is not set | 781 | # CONFIG_APPLICOM is not set |
@@ -776,43 +785,64 @@ CONFIG_DEVPORT=y | |||
776 | CONFIG_I2C=y | 785 | CONFIG_I2C=y |
777 | CONFIG_I2C_BOARDINFO=y | 786 | CONFIG_I2C_BOARDINFO=y |
778 | # CONFIG_I2C_CHARDEV is not set | 787 | # CONFIG_I2C_CHARDEV is not set |
788 | CONFIG_I2C_HELPER_AUTO=y | ||
779 | 789 | ||
780 | # | 790 | # |
781 | # I2C Hardware Bus support | 791 | # I2C Hardware Bus support |
782 | # | 792 | # |
793 | |||
794 | # | ||
795 | # PC SMBus host controller drivers | ||
796 | # | ||
783 | # CONFIG_I2C_ALI1535 is not set | 797 | # CONFIG_I2C_ALI1535 is not set |
784 | # CONFIG_I2C_ALI1563 is not set | 798 | # CONFIG_I2C_ALI1563 is not set |
785 | # CONFIG_I2C_ALI15X3 is not set | 799 | # CONFIG_I2C_ALI15X3 is not set |
786 | # CONFIG_I2C_AMD756 is not set | 800 | # CONFIG_I2C_AMD756 is not set |
787 | # CONFIG_I2C_AMD8111 is not set | 801 | # CONFIG_I2C_AMD8111 is not set |
788 | # CONFIG_I2C_I801 is not set | 802 | # CONFIG_I2C_I801 is not set |
789 | # CONFIG_I2C_I810 is not set | 803 | # CONFIG_I2C_ISCH is not set |
790 | # CONFIG_I2C_PIIX4 is not set | 804 | # CONFIG_I2C_PIIX4 is not set |
791 | CONFIG_I2C_MPC=y | ||
792 | # CONFIG_I2C_NFORCE2 is not set | 805 | # CONFIG_I2C_NFORCE2 is not set |
793 | # CONFIG_I2C_OCORES is not set | ||
794 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
795 | # CONFIG_I2C_PROSAVAGE is not set | ||
796 | # CONFIG_I2C_SAVAGE4 is not set | ||
797 | # CONFIG_I2C_SIMTEC is not set | ||
798 | # CONFIG_I2C_SIS5595 is not set | 806 | # CONFIG_I2C_SIS5595 is not set |
799 | # CONFIG_I2C_SIS630 is not set | 807 | # CONFIG_I2C_SIS630 is not set |
800 | # CONFIG_I2C_SIS96X is not set | 808 | # CONFIG_I2C_SIS96X is not set |
801 | # CONFIG_I2C_TAOS_EVM is not set | ||
802 | # CONFIG_I2C_STUB is not set | ||
803 | # CONFIG_I2C_TINY_USB is not set | ||
804 | # CONFIG_I2C_VIA is not set | 809 | # CONFIG_I2C_VIA is not set |
805 | # CONFIG_I2C_VIAPRO is not set | 810 | # CONFIG_I2C_VIAPRO is not set |
811 | |||
812 | # | ||
813 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
814 | # | ||
815 | CONFIG_I2C_MPC=y | ||
816 | # CONFIG_I2C_OCORES is not set | ||
817 | # CONFIG_I2C_SIMTEC is not set | ||
818 | |||
819 | # | ||
820 | # External I2C/SMBus adapter drivers | ||
821 | # | ||
822 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
823 | # CONFIG_I2C_TAOS_EVM is not set | ||
824 | # CONFIG_I2C_TINY_USB is not set | ||
825 | |||
826 | # | ||
827 | # Graphics adapter I2C/DDC channel drivers | ||
828 | # | ||
806 | # CONFIG_I2C_VOODOO3 is not set | 829 | # CONFIG_I2C_VOODOO3 is not set |
830 | |||
831 | # | ||
832 | # Other I2C/SMBus bus drivers | ||
833 | # | ||
807 | # CONFIG_I2C_PCA_PLATFORM is not set | 834 | # CONFIG_I2C_PCA_PLATFORM is not set |
835 | # CONFIG_I2C_STUB is not set | ||
808 | 836 | ||
809 | # | 837 | # |
810 | # Miscellaneous I2C Chip support | 838 | # Miscellaneous I2C Chip support |
811 | # | 839 | # |
812 | # CONFIG_DS1682 is not set | 840 | # CONFIG_DS1682 is not set |
841 | # CONFIG_AT24 is not set | ||
813 | CONFIG_SENSORS_EEPROM=y | 842 | CONFIG_SENSORS_EEPROM=y |
814 | # CONFIG_SENSORS_PCF8574 is not set | 843 | # CONFIG_SENSORS_PCF8574 is not set |
815 | # CONFIG_PCF8575 is not set | 844 | # CONFIG_PCF8575 is not set |
845 | # CONFIG_SENSORS_PCA9539 is not set | ||
816 | # CONFIG_SENSORS_PCF8591 is not set | 846 | # CONFIG_SENSORS_PCF8591 is not set |
817 | # CONFIG_SENSORS_MAX6875 is not set | 847 | # CONFIG_SENSORS_MAX6875 is not set |
818 | # CONFIG_SENSORS_TSL2550 is not set | 848 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -821,6 +851,8 @@ CONFIG_SENSORS_EEPROM=y | |||
821 | # CONFIG_I2C_DEBUG_BUS is not set | 851 | # CONFIG_I2C_DEBUG_BUS is not set |
822 | # CONFIG_I2C_DEBUG_CHIP is not set | 852 | # CONFIG_I2C_DEBUG_CHIP is not set |
823 | # CONFIG_SPI is not set | 853 | # CONFIG_SPI is not set |
854 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
855 | # CONFIG_GPIOLIB is not set | ||
824 | # CONFIG_W1 is not set | 856 | # CONFIG_W1 is not set |
825 | # CONFIG_POWER_SUPPLY is not set | 857 | # CONFIG_POWER_SUPPLY is not set |
826 | # CONFIG_HWMON is not set | 858 | # CONFIG_HWMON is not set |
@@ -836,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y | |||
836 | # | 868 | # |
837 | # Multifunction device drivers | 869 | # Multifunction device drivers |
838 | # | 870 | # |
871 | # CONFIG_MFD_CORE is not set | ||
839 | # CONFIG_MFD_SM501 is not set | 872 | # CONFIG_MFD_SM501 is not set |
840 | # CONFIG_HTC_PASIC3 is not set | 873 | # CONFIG_HTC_PASIC3 is not set |
874 | # CONFIG_MFD_TMIO is not set | ||
841 | 875 | ||
842 | # | 876 | # |
843 | # Multimedia devices | 877 | # Multimedia devices |
@@ -879,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
879 | # CONFIG_DVB_TTUSB_BUDGET is not set | 913 | # CONFIG_DVB_TTUSB_BUDGET is not set |
880 | # CONFIG_DVB_TTUSB_DEC is not set | 914 | # CONFIG_DVB_TTUSB_DEC is not set |
881 | # CONFIG_DVB_CINERGYT2 is not set | 915 | # CONFIG_DVB_CINERGYT2 is not set |
916 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
882 | 917 | ||
883 | # | 918 | # |
884 | # Supported FlexCopII (B2C2) Adapters | 919 | # Supported FlexCopII (B2C2) Adapters |
@@ -925,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
925 | # CONFIG_DVB_SP887X is not set | 960 | # CONFIG_DVB_SP887X is not set |
926 | # CONFIG_DVB_CX22700 is not set | 961 | # CONFIG_DVB_CX22700 is not set |
927 | # CONFIG_DVB_CX22702 is not set | 962 | # CONFIG_DVB_CX22702 is not set |
963 | # CONFIG_DVB_DRX397XD is not set | ||
928 | # CONFIG_DVB_L64781 is not set | 964 | # CONFIG_DVB_L64781 is not set |
929 | # CONFIG_DVB_TDA1004X is not set | 965 | # CONFIG_DVB_TDA1004X is not set |
930 | # CONFIG_DVB_NXT6000 is not set | 966 | # CONFIG_DVB_NXT6000 is not set |
@@ -992,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
992 | CONFIG_VGA_CONSOLE=y | 1028 | CONFIG_VGA_CONSOLE=y |
993 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1029 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
994 | CONFIG_DUMMY_CONSOLE=y | 1030 | CONFIG_DUMMY_CONSOLE=y |
995 | |||
996 | # | ||
997 | # Sound | ||
998 | # | ||
999 | CONFIG_SOUND=y | 1031 | CONFIG_SOUND=y |
1000 | |||
1001 | # | ||
1002 | # Advanced Linux Sound Architecture | ||
1003 | # | ||
1004 | CONFIG_SND=y | 1032 | CONFIG_SND=y |
1005 | CONFIG_SND_TIMER=y | 1033 | CONFIG_SND_TIMER=y |
1006 | CONFIG_SND_PCM=y | 1034 | CONFIG_SND_PCM=y |
@@ -1012,19 +1040,15 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
1012 | CONFIG_SND_VERBOSE_PROCFS=y | 1040 | CONFIG_SND_VERBOSE_PROCFS=y |
1013 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1041 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1014 | # CONFIG_SND_DEBUG is not set | 1042 | # CONFIG_SND_DEBUG is not set |
1015 | 1043 | CONFIG_SND_VMASTER=y | |
1016 | # | ||
1017 | # Generic devices | ||
1018 | # | ||
1019 | CONFIG_SND_AC97_CODEC=y | 1044 | CONFIG_SND_AC97_CODEC=y |
1045 | CONFIG_SND_DRIVERS=y | ||
1020 | # CONFIG_SND_DUMMY is not set | 1046 | # CONFIG_SND_DUMMY is not set |
1021 | # CONFIG_SND_MTPAV is not set | 1047 | # CONFIG_SND_MTPAV is not set |
1022 | # CONFIG_SND_SERIAL_U16550 is not set | 1048 | # CONFIG_SND_SERIAL_U16550 is not set |
1023 | # CONFIG_SND_MPU401 is not set | 1049 | # CONFIG_SND_MPU401 is not set |
1024 | 1050 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
1025 | # | 1051 | CONFIG_SND_PCI=y |
1026 | # PCI devices | ||
1027 | # | ||
1028 | # CONFIG_SND_AD1889 is not set | 1052 | # CONFIG_SND_AD1889 is not set |
1029 | # CONFIG_SND_ALS300 is not set | 1053 | # CONFIG_SND_ALS300 is not set |
1030 | # CONFIG_SND_ALS4000 is not set | 1054 | # CONFIG_SND_ALS4000 is not set |
@@ -1086,39 +1110,12 @@ CONFIG_SND_INTEL8X0=y | |||
1086 | # CONFIG_SND_VIRTUOSO is not set | 1110 | # CONFIG_SND_VIRTUOSO is not set |
1087 | # CONFIG_SND_VX222 is not set | 1111 | # CONFIG_SND_VX222 is not set |
1088 | # CONFIG_SND_YMFPCI is not set | 1112 | # CONFIG_SND_YMFPCI is not set |
1089 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1113 | CONFIG_SND_PPC=y |
1090 | 1114 | CONFIG_SND_USB=y | |
1091 | # | ||
1092 | # ALSA PowerMac devices | ||
1093 | # | ||
1094 | |||
1095 | # | ||
1096 | # ALSA PowerPC devices | ||
1097 | # | ||
1098 | |||
1099 | # | ||
1100 | # USB devices | ||
1101 | # | ||
1102 | # CONFIG_SND_USB_AUDIO is not set | 1115 | # CONFIG_SND_USB_AUDIO is not set |
1103 | # CONFIG_SND_USB_USX2Y is not set | 1116 | # CONFIG_SND_USB_USX2Y is not set |
1104 | # CONFIG_SND_USB_CAIAQ is not set | 1117 | # CONFIG_SND_USB_CAIAQ is not set |
1105 | |||
1106 | # | ||
1107 | # System on Chip audio support | ||
1108 | # | ||
1109 | # CONFIG_SND_SOC is not set | 1118 | # CONFIG_SND_SOC is not set |
1110 | |||
1111 | # | ||
1112 | # ALSA SoC audio for Freescale SOCs | ||
1113 | # | ||
1114 | |||
1115 | # | ||
1116 | # SoC Audio for the Texas Instruments OMAP | ||
1117 | # | ||
1118 | |||
1119 | # | ||
1120 | # Open Sound System | ||
1121 | # | ||
1122 | # CONFIG_SOUND_PRIME is not set | 1119 | # CONFIG_SOUND_PRIME is not set |
1123 | CONFIG_AC97_BUS=y | 1120 | CONFIG_AC97_BUS=y |
1124 | CONFIG_HID_SUPPORT=y | 1121 | CONFIG_HID_SUPPORT=y |
@@ -1150,6 +1147,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1150 | # CONFIG_USB_OTG is not set | 1147 | # CONFIG_USB_OTG is not set |
1151 | # CONFIG_USB_OTG_WHITELIST is not set | 1148 | # CONFIG_USB_OTG_WHITELIST is not set |
1152 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1149 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1150 | CONFIG_USB_MON=y | ||
1153 | 1151 | ||
1154 | # | 1152 | # |
1155 | # USB Host Controller Drivers | 1153 | # USB Host Controller Drivers |
@@ -1201,6 +1199,7 @@ CONFIG_USB_STORAGE=y | |||
1201 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1199 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1200 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1203 | # CONFIG_USB_STORAGE_KARMA is not set | 1201 | # CONFIG_USB_STORAGE_KARMA is not set |
1202 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1204 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1203 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1205 | # CONFIG_USB_LIBUSUAL is not set | 1204 | # CONFIG_USB_LIBUSUAL is not set |
1206 | 1205 | ||
@@ -1209,7 +1208,6 @@ CONFIG_USB_STORAGE=y | |||
1209 | # | 1208 | # |
1210 | # CONFIG_USB_MDC800 is not set | 1209 | # CONFIG_USB_MDC800 is not set |
1211 | # CONFIG_USB_MICROTEK is not set | 1210 | # CONFIG_USB_MICROTEK is not set |
1212 | CONFIG_USB_MON=y | ||
1213 | 1211 | ||
1214 | # | 1212 | # |
1215 | # USB port drivers | 1213 | # USB port drivers |
@@ -1222,7 +1220,6 @@ CONFIG_USB_MON=y | |||
1222 | # CONFIG_USB_EMI62 is not set | 1220 | # CONFIG_USB_EMI62 is not set |
1223 | # CONFIG_USB_EMI26 is not set | 1221 | # CONFIG_USB_EMI26 is not set |
1224 | # CONFIG_USB_ADUTUX is not set | 1222 | # CONFIG_USB_ADUTUX is not set |
1225 | # CONFIG_USB_AUERSWALD is not set | ||
1226 | # CONFIG_USB_RIO500 is not set | 1223 | # CONFIG_USB_RIO500 is not set |
1227 | # CONFIG_USB_LEGOTOWER is not set | 1224 | # CONFIG_USB_LEGOTOWER is not set |
1228 | # CONFIG_USB_LCD is not set | 1225 | # CONFIG_USB_LCD is not set |
@@ -1310,6 +1307,7 @@ CONFIG_DMA_ENGINE=y | |||
1310 | # DMA Clients | 1307 | # DMA Clients |
1311 | # | 1308 | # |
1312 | # CONFIG_NET_DMA is not set | 1309 | # CONFIG_NET_DMA is not set |
1310 | # CONFIG_DMATEST is not set | ||
1313 | # CONFIG_UIO is not set | 1311 | # CONFIG_UIO is not set |
1314 | 1312 | ||
1315 | # | 1313 | # |
@@ -1387,6 +1385,7 @@ CONFIG_EFS_FS=m | |||
1387 | CONFIG_CRAMFS=y | 1385 | CONFIG_CRAMFS=y |
1388 | CONFIG_VXFS_FS=m | 1386 | CONFIG_VXFS_FS=m |
1389 | # CONFIG_MINIX_FS is not set | 1387 | # CONFIG_MINIX_FS is not set |
1388 | # CONFIG_OMFS_FS is not set | ||
1390 | CONFIG_HPFS_FS=m | 1389 | CONFIG_HPFS_FS=m |
1391 | CONFIG_QNX4FS_FS=m | 1390 | CONFIG_QNX4FS_FS=m |
1392 | # CONFIG_ROMFS_FS is not set | 1391 | # CONFIG_ROMFS_FS is not set |
@@ -1399,17 +1398,16 @@ CONFIG_NFS_FS=y | |||
1399 | CONFIG_NFS_V3=y | 1398 | CONFIG_NFS_V3=y |
1400 | # CONFIG_NFS_V3_ACL is not set | 1399 | # CONFIG_NFS_V3_ACL is not set |
1401 | CONFIG_NFS_V4=y | 1400 | CONFIG_NFS_V4=y |
1401 | CONFIG_ROOT_NFS=y | ||
1402 | CONFIG_NFSD=y | 1402 | CONFIG_NFSD=y |
1403 | # CONFIG_NFSD_V3 is not set | 1403 | # CONFIG_NFSD_V3 is not set |
1404 | # CONFIG_NFSD_V4 is not set | 1404 | # CONFIG_NFSD_V4 is not set |
1405 | CONFIG_ROOT_NFS=y | ||
1406 | CONFIG_LOCKD=y | 1405 | CONFIG_LOCKD=y |
1407 | CONFIG_LOCKD_V4=y | 1406 | CONFIG_LOCKD_V4=y |
1408 | CONFIG_EXPORTFS=y | 1407 | CONFIG_EXPORTFS=y |
1409 | CONFIG_NFS_COMMON=y | 1408 | CONFIG_NFS_COMMON=y |
1410 | CONFIG_SUNRPC=y | 1409 | CONFIG_SUNRPC=y |
1411 | CONFIG_SUNRPC_GSS=y | 1410 | CONFIG_SUNRPC_GSS=y |
1412 | # CONFIG_SUNRPC_BIND34 is not set | ||
1413 | CONFIG_RPCSEC_GSS_KRB5=y | 1411 | CONFIG_RPCSEC_GSS_KRB5=y |
1414 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1412 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1415 | # CONFIG_SMB_FS is not set | 1413 | # CONFIG_SMB_FS is not set |
@@ -1488,6 +1486,7 @@ CONFIG_BITREVERSE=y | |||
1488 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1486 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1489 | # CONFIG_CRC_CCITT is not set | 1487 | # CONFIG_CRC_CCITT is not set |
1490 | # CONFIG_CRC16 is not set | 1488 | # CONFIG_CRC16 is not set |
1489 | CONFIG_CRC_T10DIF=y | ||
1491 | CONFIG_CRC_ITU_T=m | 1490 | CONFIG_CRC_ITU_T=m |
1492 | CONFIG_CRC32=y | 1491 | CONFIG_CRC32=y |
1493 | # CONFIG_CRC7 is not set | 1492 | # CONFIG_CRC7 is not set |
@@ -1513,6 +1512,8 @@ CONFIG_DEBUG_FS=y | |||
1513 | CONFIG_DEBUG_KERNEL=y | 1512 | CONFIG_DEBUG_KERNEL=y |
1514 | # CONFIG_DEBUG_SHIRQ is not set | 1513 | # CONFIG_DEBUG_SHIRQ is not set |
1515 | CONFIG_DETECT_SOFTLOCKUP=y | 1514 | CONFIG_DETECT_SOFTLOCKUP=y |
1515 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1516 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1516 | CONFIG_SCHED_DEBUG=y | 1517 | CONFIG_SCHED_DEBUG=y |
1517 | # CONFIG_SCHEDSTATS is not set | 1518 | # CONFIG_SCHEDSTATS is not set |
1518 | # CONFIG_TIMER_STATS is not set | 1519 | # CONFIG_TIMER_STATS is not set |
@@ -1531,19 +1532,29 @@ CONFIG_SCHED_DEBUG=y | |||
1531 | CONFIG_DEBUG_INFO=y | 1532 | CONFIG_DEBUG_INFO=y |
1532 | # CONFIG_DEBUG_VM is not set | 1533 | # CONFIG_DEBUG_VM is not set |
1533 | # CONFIG_DEBUG_WRITECOUNT is not set | 1534 | # CONFIG_DEBUG_WRITECOUNT is not set |
1535 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1534 | # CONFIG_DEBUG_LIST is not set | 1536 | # CONFIG_DEBUG_LIST is not set |
1535 | # CONFIG_DEBUG_SG is not set | 1537 | # CONFIG_DEBUG_SG is not set |
1536 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1538 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1537 | # CONFIG_RCU_TORTURE_TEST is not set | 1539 | # CONFIG_RCU_TORTURE_TEST is not set |
1538 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1540 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1539 | # CONFIG_FAULT_INJECTION is not set | 1541 | # CONFIG_FAULT_INJECTION is not set |
1542 | # CONFIG_LATENCYTOP is not set | ||
1543 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1544 | CONFIG_HAVE_FTRACE=y | ||
1545 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1546 | # CONFIG_FTRACE is not set | ||
1547 | # CONFIG_SCHED_TRACER is not set | ||
1548 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1540 | # CONFIG_SAMPLES is not set | 1549 | # CONFIG_SAMPLES is not set |
1550 | CONFIG_HAVE_ARCH_KGDB=y | ||
1551 | # CONFIG_KGDB is not set | ||
1541 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1552 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1542 | # CONFIG_DEBUG_STACK_USAGE is not set | 1553 | # CONFIG_DEBUG_STACK_USAGE is not set |
1543 | # CONFIG_DEBUG_PAGEALLOC is not set | 1554 | # CONFIG_DEBUG_PAGEALLOC is not set |
1544 | # CONFIG_DEBUGGER is not set | ||
1545 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1555 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1546 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1556 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1557 | # CONFIG_XMON is not set | ||
1547 | # CONFIG_IRQSTACKS is not set | 1558 | # CONFIG_IRQSTACKS is not set |
1548 | # CONFIG_VIRQ_DEBUG is not set | 1559 | # CONFIG_VIRQ_DEBUG is not set |
1549 | # CONFIG_BDI_SWITCH is not set | 1560 | # CONFIG_BDI_SWITCH is not set |
@@ -1561,13 +1572,14 @@ CONFIG_CRYPTO=y | |||
1561 | # Crypto core or helper | 1572 | # Crypto core or helper |
1562 | # | 1573 | # |
1563 | CONFIG_CRYPTO_ALGAPI=y | 1574 | CONFIG_CRYPTO_ALGAPI=y |
1575 | CONFIG_CRYPTO_AEAD=y | ||
1564 | CONFIG_CRYPTO_BLKCIPHER=y | 1576 | CONFIG_CRYPTO_BLKCIPHER=y |
1565 | CONFIG_CRYPTO_HASH=y | 1577 | CONFIG_CRYPTO_HASH=y |
1566 | CONFIG_CRYPTO_MANAGER=y | 1578 | CONFIG_CRYPTO_MANAGER=y |
1567 | # CONFIG_CRYPTO_GF128MUL is not set | 1579 | # CONFIG_CRYPTO_GF128MUL is not set |
1568 | # CONFIG_CRYPTO_NULL is not set | 1580 | # CONFIG_CRYPTO_NULL is not set |
1569 | # CONFIG_CRYPTO_CRYPTD is not set | 1581 | # CONFIG_CRYPTO_CRYPTD is not set |
1570 | # CONFIG_CRYPTO_AUTHENC is not set | 1582 | CONFIG_CRYPTO_AUTHENC=y |
1571 | # CONFIG_CRYPTO_TEST is not set | 1583 | # CONFIG_CRYPTO_TEST is not set |
1572 | 1584 | ||
1573 | # | 1585 | # |
@@ -1601,6 +1613,10 @@ CONFIG_CRYPTO_HMAC=y | |||
1601 | # CONFIG_CRYPTO_MD4 is not set | 1613 | # CONFIG_CRYPTO_MD4 is not set |
1602 | CONFIG_CRYPTO_MD5=y | 1614 | CONFIG_CRYPTO_MD5=y |
1603 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1615 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1616 | # CONFIG_CRYPTO_RMD128 is not set | ||
1617 | # CONFIG_CRYPTO_RMD160 is not set | ||
1618 | # CONFIG_CRYPTO_RMD256 is not set | ||
1619 | # CONFIG_CRYPTO_RMD320 is not set | ||
1604 | CONFIG_CRYPTO_SHA1=m | 1620 | CONFIG_CRYPTO_SHA1=m |
1605 | # CONFIG_CRYPTO_SHA256 is not set | 1621 | # CONFIG_CRYPTO_SHA256 is not set |
1606 | # CONFIG_CRYPTO_SHA512 is not set | 1622 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1633,5 +1649,6 @@ CONFIG_CRYPTO_DES=y | |||
1633 | # CONFIG_CRYPTO_LZO is not set | 1649 | # CONFIG_CRYPTO_LZO is not set |
1634 | CONFIG_CRYPTO_HW=y | 1650 | CONFIG_CRYPTO_HW=y |
1635 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1651 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1652 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
1636 | # CONFIG_PPC_CLOCK is not set | 1653 | # CONFIG_PPC_CLOCK is not set |
1637 | # CONFIG_VIRTUALIZATION is not set | 1654 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig index f33fd516fd54..1ea181f826f1 100644 --- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:31 2008 | 4 | # Thu Aug 21 00:52:30 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
94 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -114,10 +115,16 @@ CONFIG_SLUB=y | |||
114 | # CONFIG_PROFILING is not set | 115 | # CONFIG_PROFILING is not set |
115 | # CONFIG_MARKERS is not set | 116 | # CONFIG_MARKERS is not set |
116 | CONFIG_HAVE_OPROFILE=y | 117 | CONFIG_HAVE_OPROFILE=y |
118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
117 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
118 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
119 | # CONFIG_HAVE_DMA_ATTRS is not set | 123 | # CONFIG_HAVE_DMA_ATTRS is not set |
124 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
125 | # CONFIG_HAVE_CLK is not set | ||
120 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
121 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
122 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
123 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
@@ -128,6 +135,7 @@ CONFIG_BLOCK=y | |||
128 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
129 | # CONFIG_LSF is not set | 136 | # CONFIG_LSF is not set |
130 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
138 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
131 | 139 | ||
132 | # | 140 | # |
133 | # IO Schedulers | 141 | # IO Schedulers |
@@ -146,8 +154,6 @@ CONFIG_CLASSIC_RCU=y | |||
146 | # | 154 | # |
147 | # Platform support | 155 | # Platform support |
148 | # | 156 | # |
149 | # CONFIG_PPC_MPC512x is not set | ||
150 | # CONFIG_PPC_MPC5121 is not set | ||
151 | # CONFIG_PPC_CELL is not set | 157 | # CONFIG_PPC_CELL is not set |
152 | # CONFIG_PPC_CELL_NATIVE is not set | 158 | # CONFIG_PPC_CELL_NATIVE is not set |
153 | # CONFIG_PQ2ADS is not set | 159 | # CONFIG_PQ2ADS is not set |
@@ -156,11 +162,13 @@ CONFIG_MPC8540_ADS=y | |||
156 | # CONFIG_MPC8560_ADS is not set | 162 | # CONFIG_MPC8560_ADS is not set |
157 | # CONFIG_MPC85xx_CDS is not set | 163 | # CONFIG_MPC85xx_CDS is not set |
158 | # CONFIG_MPC85xx_MDS is not set | 164 | # CONFIG_MPC85xx_MDS is not set |
165 | # CONFIG_MPC8536_DS is not set | ||
159 | # CONFIG_MPC85xx_DS is not set | 166 | # CONFIG_MPC85xx_DS is not set |
160 | # CONFIG_KSI8560 is not set | 167 | # CONFIG_KSI8560 is not set |
161 | # CONFIG_STX_GP3 is not set | 168 | # CONFIG_STX_GP3 is not set |
162 | # CONFIG_TQM8540 is not set | 169 | # CONFIG_TQM8540 is not set |
163 | # CONFIG_TQM8541 is not set | 170 | # CONFIG_TQM8541 is not set |
171 | # CONFIG_TQM8548 is not set | ||
164 | # CONFIG_TQM8555 is not set | 172 | # CONFIG_TQM8555 is not set |
165 | # CONFIG_TQM8560 is not set | 173 | # CONFIG_TQM8560 is not set |
166 | # CONFIG_SBC8548 is not set | 174 | # CONFIG_SBC8548 is not set |
@@ -192,7 +200,7 @@ CONFIG_HZ_250=y | |||
192 | # CONFIG_HZ_300 is not set | 200 | # CONFIG_HZ_300 is not set |
193 | # CONFIG_HZ_1000 is not set | 201 | # CONFIG_HZ_1000 is not set |
194 | CONFIG_HZ=250 | 202 | CONFIG_HZ=250 |
195 | # CONFIG_SCHED_HRTICK is not set | 203 | CONFIG_SCHED_HRTICK=y |
196 | CONFIG_PREEMPT_NONE=y | 204 | CONFIG_PREEMPT_NONE=y |
197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 205 | # CONFIG_PREEMPT_VOLUNTARY is not set |
198 | # CONFIG_PREEMPT is not set | 206 | # CONFIG_PREEMPT is not set |
@@ -215,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
216 | CONFIG_PAGEFLAGS_EXTENDED=y | 224 | CONFIG_PAGEFLAGS_EXTENDED=y |
217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
226 | CONFIG_MIGRATION=y | ||
218 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
219 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
220 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
@@ -222,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y | |||
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
223 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
224 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
234 | CONFIG_EXTRA_TARGETS="" | ||
225 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
226 | # CONFIG_SECCOMP is not set | 236 | # CONFIG_SECCOMP is not set |
227 | CONFIG_ISA_DMA_API=y | 237 | CONFIG_ISA_DMA_API=y |
@@ -231,6 +241,7 @@ CONFIG_ISA_DMA_API=y | |||
231 | # | 241 | # |
232 | CONFIG_ZONE_DMA=y | 242 | CONFIG_ZONE_DMA=y |
233 | CONFIG_FSL_SOC=y | 243 | CONFIG_FSL_SOC=y |
244 | CONFIG_PPC_PCI_CHOICE=y | ||
234 | # CONFIG_PCI is not set | 245 | # CONFIG_PCI is not set |
235 | # CONFIG_PCI_DOMAINS is not set | 246 | # CONFIG_PCI_DOMAINS is not set |
236 | # CONFIG_PCI_SYSCALL is not set | 247 | # CONFIG_PCI_SYSCALL is not set |
@@ -252,10 +263,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
252 | CONFIG_PHYSICAL_START=0x00000000 | 263 | CONFIG_PHYSICAL_START=0x00000000 |
253 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 264 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
254 | CONFIG_TASK_SIZE=0xc0000000 | 265 | CONFIG_TASK_SIZE=0xc0000000 |
255 | |||
256 | # | ||
257 | # Networking | ||
258 | # | ||
259 | CONFIG_NET=y | 266 | CONFIG_NET=y |
260 | 267 | ||
261 | # | 268 | # |
@@ -367,6 +374,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
367 | # CONFIG_BLK_DEV_XIP is not set | 374 | # CONFIG_BLK_DEV_XIP is not set |
368 | # CONFIG_CDROM_PKTCDVD is not set | 375 | # CONFIG_CDROM_PKTCDVD is not set |
369 | # CONFIG_ATA_OVER_ETH is not set | 376 | # CONFIG_ATA_OVER_ETH is not set |
377 | # CONFIG_BLK_DEV_HD is not set | ||
370 | CONFIG_MISC_DEVICES=y | 378 | CONFIG_MISC_DEVICES=y |
371 | # CONFIG_EEPROM_93CX6 is not set | 379 | # CONFIG_EEPROM_93CX6 is not set |
372 | # CONFIG_ENCLOSURE_SERVICES is not set | 380 | # CONFIG_ENCLOSURE_SERVICES is not set |
@@ -384,7 +392,6 @@ CONFIG_HAVE_IDE=y | |||
384 | # CONFIG_MD is not set | 392 | # CONFIG_MD is not set |
385 | # CONFIG_MACINTOSH_DRIVERS is not set | 393 | # CONFIG_MACINTOSH_DRIVERS is not set |
386 | CONFIG_NETDEVICES=y | 394 | CONFIG_NETDEVICES=y |
387 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
388 | # CONFIG_DUMMY is not set | 395 | # CONFIG_DUMMY is not set |
389 | # CONFIG_BONDING is not set | 396 | # CONFIG_BONDING is not set |
390 | # CONFIG_MACVLAN is not set | 397 | # CONFIG_MACVLAN is not set |
@@ -416,9 +423,7 @@ CONFIG_MII=y | |||
416 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 423 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
417 | # CONFIG_B44 is not set | 424 | # CONFIG_B44 is not set |
418 | CONFIG_NETDEV_1000=y | 425 | CONFIG_NETDEV_1000=y |
419 | # CONFIG_E1000E_ENABLED is not set | ||
420 | CONFIG_GIANFAR=y | 426 | CONFIG_GIANFAR=y |
421 | CONFIG_GFAR_NAPI=y | ||
422 | CONFIG_NETDEV_10000=y | 427 | CONFIG_NETDEV_10000=y |
423 | 428 | ||
424 | # | 429 | # |
@@ -504,6 +509,8 @@ CONFIG_GEN_RTC=y | |||
504 | # CONFIG_TCG_TPM is not set | 509 | # CONFIG_TCG_TPM is not set |
505 | # CONFIG_I2C is not set | 510 | # CONFIG_I2C is not set |
506 | # CONFIG_SPI is not set | 511 | # CONFIG_SPI is not set |
512 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
513 | # CONFIG_GPIOLIB is not set | ||
507 | # CONFIG_W1 is not set | 514 | # CONFIG_W1 is not set |
508 | # CONFIG_POWER_SUPPLY is not set | 515 | # CONFIG_POWER_SUPPLY is not set |
509 | CONFIG_HWMON=y | 516 | CONFIG_HWMON=y |
@@ -520,6 +527,7 @@ CONFIG_HWMON=y | |||
520 | # CONFIG_SENSORS_W83627EHF is not set | 527 | # CONFIG_SENSORS_W83627EHF is not set |
521 | # CONFIG_HWMON_DEBUG_CHIP is not set | 528 | # CONFIG_HWMON_DEBUG_CHIP is not set |
522 | # CONFIG_THERMAL is not set | 529 | # CONFIG_THERMAL is not set |
530 | # CONFIG_THERMAL_HWMON is not set | ||
523 | # CONFIG_WATCHDOG is not set | 531 | # CONFIG_WATCHDOG is not set |
524 | 532 | ||
525 | # | 533 | # |
@@ -531,8 +539,10 @@ CONFIG_SSB_POSSIBLE=y | |||
531 | # | 539 | # |
532 | # Multifunction device drivers | 540 | # Multifunction device drivers |
533 | # | 541 | # |
542 | # CONFIG_MFD_CORE is not set | ||
534 | # CONFIG_MFD_SM501 is not set | 543 | # CONFIG_MFD_SM501 is not set |
535 | # CONFIG_HTC_PASIC3 is not set | 544 | # CONFIG_HTC_PASIC3 is not set |
545 | # CONFIG_MFD_TMIO is not set | ||
536 | 546 | ||
537 | # | 547 | # |
538 | # Multimedia devices | 548 | # Multimedia devices |
@@ -562,10 +572,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
562 | # Display device support | 572 | # Display device support |
563 | # | 573 | # |
564 | # CONFIG_DISPLAY_SUPPORT is not set | 574 | # CONFIG_DISPLAY_SUPPORT is not set |
565 | |||
566 | # | ||
567 | # Sound | ||
568 | # | ||
569 | # CONFIG_SOUND is not set | 575 | # CONFIG_SOUND is not set |
570 | CONFIG_HID_SUPPORT=y | 576 | CONFIG_HID_SUPPORT=y |
571 | CONFIG_HID=y | 577 | CONFIG_HID=y |
@@ -579,6 +585,10 @@ CONFIG_USB_SUPPORT=y | |||
579 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 585 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
580 | 586 | ||
581 | # | 587 | # |
588 | # Enable Host or Gadget support to see Inventra options | ||
589 | # | ||
590 | |||
591 | # | ||
582 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 592 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
583 | # | 593 | # |
584 | # CONFIG_USB_GADGET is not set | 594 | # CONFIG_USB_GADGET is not set |
@@ -655,6 +665,7 @@ CONFIG_TMPFS=y | |||
655 | # CONFIG_CRAMFS is not set | 665 | # CONFIG_CRAMFS is not set |
656 | # CONFIG_VXFS_FS is not set | 666 | # CONFIG_VXFS_FS is not set |
657 | # CONFIG_MINIX_FS is not set | 667 | # CONFIG_MINIX_FS is not set |
668 | # CONFIG_OMFS_FS is not set | ||
658 | # CONFIG_HPFS_FS is not set | 669 | # CONFIG_HPFS_FS is not set |
659 | # CONFIG_QNX4FS_FS is not set | 670 | # CONFIG_QNX4FS_FS is not set |
660 | # CONFIG_ROMFS_FS is not set | 671 | # CONFIG_ROMFS_FS is not set |
@@ -664,12 +675,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
664 | CONFIG_NFS_FS=y | 675 | CONFIG_NFS_FS=y |
665 | # CONFIG_NFS_V3 is not set | 676 | # CONFIG_NFS_V3 is not set |
666 | # CONFIG_NFS_V4 is not set | 677 | # CONFIG_NFS_V4 is not set |
667 | # CONFIG_NFSD is not set | ||
668 | CONFIG_ROOT_NFS=y | 678 | CONFIG_ROOT_NFS=y |
679 | # CONFIG_NFSD is not set | ||
669 | CONFIG_LOCKD=y | 680 | CONFIG_LOCKD=y |
670 | CONFIG_NFS_COMMON=y | 681 | CONFIG_NFS_COMMON=y |
671 | CONFIG_SUNRPC=y | 682 | CONFIG_SUNRPC=y |
672 | # CONFIG_SUNRPC_BIND34 is not set | ||
673 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 683 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
674 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 684 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
675 | # CONFIG_SMB_FS is not set | 685 | # CONFIG_SMB_FS is not set |
@@ -705,6 +715,7 @@ CONFIG_BITREVERSE=y | |||
705 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 715 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
706 | # CONFIG_CRC_CCITT is not set | 716 | # CONFIG_CRC_CCITT is not set |
707 | # CONFIG_CRC16 is not set | 717 | # CONFIG_CRC16 is not set |
718 | # CONFIG_CRC_T10DIF is not set | ||
708 | # CONFIG_CRC_ITU_T is not set | 719 | # CONFIG_CRC_ITU_T is not set |
709 | CONFIG_CRC32=y | 720 | CONFIG_CRC32=y |
710 | # CONFIG_CRC7 is not set | 721 | # CONFIG_CRC7 is not set |
@@ -729,6 +740,8 @@ CONFIG_FRAME_WARN=1024 | |||
729 | CONFIG_DEBUG_KERNEL=y | 740 | CONFIG_DEBUG_KERNEL=y |
730 | # CONFIG_DEBUG_SHIRQ is not set | 741 | # CONFIG_DEBUG_SHIRQ is not set |
731 | CONFIG_DETECT_SOFTLOCKUP=y | 742 | CONFIG_DETECT_SOFTLOCKUP=y |
743 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
744 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
732 | CONFIG_SCHED_DEBUG=y | 745 | CONFIG_SCHED_DEBUG=y |
733 | # CONFIG_SCHEDSTATS is not set | 746 | # CONFIG_SCHEDSTATS is not set |
734 | # CONFIG_TIMER_STATS is not set | 747 | # CONFIG_TIMER_STATS is not set |
@@ -746,16 +759,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
746 | # CONFIG_DEBUG_INFO is not set | 759 | # CONFIG_DEBUG_INFO is not set |
747 | # CONFIG_DEBUG_VM is not set | 760 | # CONFIG_DEBUG_VM is not set |
748 | # CONFIG_DEBUG_WRITECOUNT is not set | 761 | # CONFIG_DEBUG_WRITECOUNT is not set |
762 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
749 | # CONFIG_DEBUG_LIST is not set | 763 | # CONFIG_DEBUG_LIST is not set |
750 | # CONFIG_DEBUG_SG is not set | 764 | # CONFIG_DEBUG_SG is not set |
751 | # CONFIG_BOOT_PRINTK_DELAY is not set | 765 | # CONFIG_BOOT_PRINTK_DELAY is not set |
766 | # CONFIG_RCU_TORTURE_TEST is not set | ||
752 | # CONFIG_BACKTRACE_SELF_TEST is not set | 767 | # CONFIG_BACKTRACE_SELF_TEST is not set |
753 | # CONFIG_FAULT_INJECTION is not set | 768 | # CONFIG_FAULT_INJECTION is not set |
769 | # CONFIG_LATENCYTOP is not set | ||
770 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
771 | CONFIG_HAVE_FTRACE=y | ||
772 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
773 | # CONFIG_FTRACE is not set | ||
774 | # CONFIG_SCHED_TRACER is not set | ||
775 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
754 | # CONFIG_SAMPLES is not set | 776 | # CONFIG_SAMPLES is not set |
777 | CONFIG_HAVE_ARCH_KGDB=y | ||
778 | # CONFIG_KGDB is not set | ||
755 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 779 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
756 | # CONFIG_DEBUG_STACK_USAGE is not set | 780 | # CONFIG_DEBUG_STACK_USAGE is not set |
757 | # CONFIG_DEBUG_PAGEALLOC is not set | 781 | # CONFIG_DEBUG_PAGEALLOC is not set |
758 | # CONFIG_DEBUGGER is not set | 782 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
783 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
784 | # CONFIG_XMON is not set | ||
759 | # CONFIG_IRQSTACKS is not set | 785 | # CONFIG_IRQSTACKS is not set |
760 | # CONFIG_BDI_SWITCH is not set | 786 | # CONFIG_BDI_SWITCH is not set |
761 | # CONFIG_PPC_EARLY_DEBUG is not set | 787 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -808,6 +834,10 @@ CONFIG_CRYPTO=y | |||
808 | # CONFIG_CRYPTO_MD4 is not set | 834 | # CONFIG_CRYPTO_MD4 is not set |
809 | # CONFIG_CRYPTO_MD5 is not set | 835 | # CONFIG_CRYPTO_MD5 is not set |
810 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 836 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
837 | # CONFIG_CRYPTO_RMD128 is not set | ||
838 | # CONFIG_CRYPTO_RMD160 is not set | ||
839 | # CONFIG_CRYPTO_RMD256 is not set | ||
840 | # CONFIG_CRYPTO_RMD320 is not set | ||
811 | # CONFIG_CRYPTO_SHA1 is not set | 841 | # CONFIG_CRYPTO_SHA1 is not set |
812 | # CONFIG_CRYPTO_SHA256 is not set | 842 | # CONFIG_CRYPTO_SHA256 is not set |
813 | # CONFIG_CRYPTO_SHA512 is not set | 843 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -839,5 +869,6 @@ CONFIG_CRYPTO=y | |||
839 | # CONFIG_CRYPTO_DEFLATE is not set | 869 | # CONFIG_CRYPTO_DEFLATE is not set |
840 | # CONFIG_CRYPTO_LZO is not set | 870 | # CONFIG_CRYPTO_LZO is not set |
841 | CONFIG_CRYPTO_HW=y | 871 | CONFIG_CRYPTO_HW=y |
872 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
842 | # CONFIG_PPC_CLOCK is not set | 873 | # CONFIG_PPC_CLOCK is not set |
843 | # CONFIG_VIRTUALIZATION is not set | 874 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig index a0583e5119f5..1aecdeab9841 100644 --- a/arch/powerpc/configs/85xx/mpc8544_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8544_ds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:32 2008 | 4 | # Thu Aug 21 07:20:43 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -92,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
92 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
93 | CONFIG_EMBEDDED=y | 95 | CONFIG_EMBEDDED=y |
94 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
96 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
97 | CONFIG_KALLSYMS_ALL=y | 98 | CONFIG_KALLSYMS_ALL=y |
98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 99 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -118,10 +119,16 @@ CONFIG_SLUB=y | |||
118 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
119 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
120 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
121 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
122 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
123 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
129 | # CONFIG_HAVE_CLK is not set | ||
124 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
125 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
126 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
127 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
@@ -138,6 +145,7 @@ CONFIG_LBD=y | |||
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
139 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
140 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
141 | 149 | ||
142 | # | 150 | # |
143 | # IO Schedulers | 151 | # IO Schedulers |
@@ -156,8 +164,6 @@ CONFIG_CLASSIC_RCU=y | |||
156 | # | 164 | # |
157 | # Platform support | 165 | # Platform support |
158 | # | 166 | # |
159 | # CONFIG_PPC_MPC512x is not set | ||
160 | # CONFIG_PPC_MPC5121 is not set | ||
161 | # CONFIG_PPC_CELL is not set | 167 | # CONFIG_PPC_CELL is not set |
162 | # CONFIG_PPC_CELL_NATIVE is not set | 168 | # CONFIG_PPC_CELL_NATIVE is not set |
163 | # CONFIG_PQ2ADS is not set | 169 | # CONFIG_PQ2ADS is not set |
@@ -166,11 +172,13 @@ CONFIG_MPC85xx=y | |||
166 | # CONFIG_MPC8560_ADS is not set | 172 | # CONFIG_MPC8560_ADS is not set |
167 | # CONFIG_MPC85xx_CDS is not set | 173 | # CONFIG_MPC85xx_CDS is not set |
168 | # CONFIG_MPC85xx_MDS is not set | 174 | # CONFIG_MPC85xx_MDS is not set |
175 | # CONFIG_MPC8536_DS is not set | ||
169 | CONFIG_MPC85xx_DS=y | 176 | CONFIG_MPC85xx_DS=y |
170 | # CONFIG_KSI8560 is not set | 177 | # CONFIG_KSI8560 is not set |
171 | # CONFIG_STX_GP3 is not set | 178 | # CONFIG_STX_GP3 is not set |
172 | # CONFIG_TQM8540 is not set | 179 | # CONFIG_TQM8540 is not set |
173 | # CONFIG_TQM8541 is not set | 180 | # CONFIG_TQM8541 is not set |
181 | # CONFIG_TQM8548 is not set | ||
174 | # CONFIG_TQM8555 is not set | 182 | # CONFIG_TQM8555 is not set |
175 | # CONFIG_TQM8560 is not set | 183 | # CONFIG_TQM8560 is not set |
176 | # CONFIG_SBC8548 is not set | 184 | # CONFIG_SBC8548 is not set |
@@ -202,7 +210,7 @@ CONFIG_HZ_250=y | |||
202 | # CONFIG_HZ_300 is not set | 210 | # CONFIG_HZ_300 is not set |
203 | # CONFIG_HZ_1000 is not set | 211 | # CONFIG_HZ_1000 is not set |
204 | CONFIG_HZ=250 | 212 | CONFIG_HZ=250 |
205 | # CONFIG_SCHED_HRTICK is not set | 213 | CONFIG_SCHED_HRTICK=y |
206 | CONFIG_PREEMPT_NONE=y | 214 | CONFIG_PREEMPT_NONE=y |
207 | # CONFIG_PREEMPT_VOLUNTARY is not set | 215 | # CONFIG_PREEMPT_VOLUNTARY is not set |
208 | # CONFIG_PREEMPT is not set | 216 | # CONFIG_PREEMPT is not set |
@@ -225,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 233 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
226 | CONFIG_PAGEFLAGS_EXTENDED=y | 234 | CONFIG_PAGEFLAGS_EXTENDED=y |
227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 235 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
236 | CONFIG_MIGRATION=y | ||
228 | # CONFIG_RESOURCES_64BIT is not set | 237 | # CONFIG_RESOURCES_64BIT is not set |
229 | CONFIG_ZONE_DMA_FLAG=1 | 238 | CONFIG_ZONE_DMA_FLAG=1 |
230 | CONFIG_BOUNCE=y | 239 | CONFIG_BOUNCE=y |
@@ -232,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y | |||
232 | CONFIG_FORCE_MAX_ZONEORDER=11 | 241 | CONFIG_FORCE_MAX_ZONEORDER=11 |
233 | CONFIG_PROC_DEVICETREE=y | 242 | CONFIG_PROC_DEVICETREE=y |
234 | # CONFIG_CMDLINE_BOOL is not set | 243 | # CONFIG_CMDLINE_BOOL is not set |
244 | CONFIG_EXTRA_TARGETS="" | ||
235 | # CONFIG_PM is not set | 245 | # CONFIG_PM is not set |
236 | CONFIG_SECCOMP=y | 246 | CONFIG_SECCOMP=y |
237 | CONFIG_ISA_DMA_API=y | 247 | CONFIG_ISA_DMA_API=y |
@@ -244,6 +254,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
244 | CONFIG_PPC_INDIRECT_PCI=y | 254 | CONFIG_PPC_INDIRECT_PCI=y |
245 | CONFIG_FSL_SOC=y | 255 | CONFIG_FSL_SOC=y |
246 | CONFIG_FSL_PCI=y | 256 | CONFIG_FSL_PCI=y |
257 | CONFIG_PPC_PCI_CHOICE=y | ||
247 | CONFIG_PCI=y | 258 | CONFIG_PCI=y |
248 | CONFIG_PCI_DOMAINS=y | 259 | CONFIG_PCI_DOMAINS=y |
249 | CONFIG_PCI_SYSCALL=y | 260 | CONFIG_PCI_SYSCALL=y |
@@ -270,10 +281,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
270 | CONFIG_PHYSICAL_START=0x00000000 | 281 | CONFIG_PHYSICAL_START=0x00000000 |
271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 282 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
272 | CONFIG_TASK_SIZE=0xc0000000 | 283 | CONFIG_TASK_SIZE=0xc0000000 |
273 | |||
274 | # | ||
275 | # Networking | ||
276 | # | ||
277 | CONFIG_NET=y | 284 | CONFIG_NET=y |
278 | 285 | ||
279 | # | 286 | # |
@@ -399,6 +406,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
399 | CONFIG_STANDALONE=y | 406 | CONFIG_STANDALONE=y |
400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 407 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
401 | CONFIG_FW_LOADER=y | 408 | CONFIG_FW_LOADER=y |
409 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
410 | CONFIG_EXTRA_FIRMWARE="" | ||
402 | # CONFIG_DEBUG_DRIVER is not set | 411 | # CONFIG_DEBUG_DRIVER is not set |
403 | # CONFIG_DEBUG_DEVRES is not set | 412 | # CONFIG_DEBUG_DEVRES is not set |
404 | # CONFIG_SYS_HYPERVISOR is not set | 413 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -425,12 +434,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
425 | # CONFIG_BLK_DEV_XIP is not set | 434 | # CONFIG_BLK_DEV_XIP is not set |
426 | # CONFIG_CDROM_PKTCDVD is not set | 435 | # CONFIG_CDROM_PKTCDVD is not set |
427 | # CONFIG_ATA_OVER_ETH is not set | 436 | # CONFIG_ATA_OVER_ETH is not set |
437 | # CONFIG_BLK_DEV_HD is not set | ||
428 | CONFIG_MISC_DEVICES=y | 438 | CONFIG_MISC_DEVICES=y |
429 | # CONFIG_PHANTOM is not set | 439 | # CONFIG_PHANTOM is not set |
430 | # CONFIG_EEPROM_93CX6 is not set | 440 | # CONFIG_EEPROM_93CX6 is not set |
431 | # CONFIG_SGI_IOC4 is not set | 441 | # CONFIG_SGI_IOC4 is not set |
432 | # CONFIG_TIFM_CORE is not set | 442 | # CONFIG_TIFM_CORE is not set |
433 | # CONFIG_ENCLOSURE_SERVICES is not set | 443 | # CONFIG_ENCLOSURE_SERVICES is not set |
444 | # CONFIG_HP_ILO is not set | ||
434 | CONFIG_HAVE_IDE=y | 445 | CONFIG_HAVE_IDE=y |
435 | # CONFIG_IDE is not set | 446 | # CONFIG_IDE is not set |
436 | 447 | ||
@@ -510,6 +521,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
510 | # CONFIG_SCSI_NSP32 is not set | 521 | # CONFIG_SCSI_NSP32 is not set |
511 | # CONFIG_SCSI_DEBUG is not set | 522 | # CONFIG_SCSI_DEBUG is not set |
512 | # CONFIG_SCSI_SRP is not set | 523 | # CONFIG_SCSI_SRP is not set |
524 | # CONFIG_SCSI_DH is not set | ||
513 | CONFIG_ATA=y | 525 | CONFIG_ATA=y |
514 | # CONFIG_ATA_NONSTANDARD is not set | 526 | # CONFIG_ATA_NONSTANDARD is not set |
515 | CONFIG_SATA_PMP=y | 527 | CONFIG_SATA_PMP=y |
@@ -577,12 +589,15 @@ CONFIG_PATA_ALI=y | |||
577 | # | 589 | # |
578 | # IEEE 1394 (FireWire) support | 590 | # IEEE 1394 (FireWire) support |
579 | # | 591 | # |
592 | |||
593 | # | ||
594 | # Enable only one of the two stacks, unless you know what you are doing | ||
595 | # | ||
580 | # CONFIG_FIREWIRE is not set | 596 | # CONFIG_FIREWIRE is not set |
581 | # CONFIG_IEEE1394 is not set | 597 | # CONFIG_IEEE1394 is not set |
582 | # CONFIG_I2O is not set | 598 | # CONFIG_I2O is not set |
583 | # CONFIG_MACINTOSH_DRIVERS is not set | 599 | # CONFIG_MACINTOSH_DRIVERS is not set |
584 | CONFIG_NETDEVICES=y | 600 | CONFIG_NETDEVICES=y |
585 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
586 | CONFIG_DUMMY=y | 601 | CONFIG_DUMMY=y |
587 | # CONFIG_BONDING is not set | 602 | # CONFIG_BONDING is not set |
588 | # CONFIG_MACVLAN is not set | 603 | # CONFIG_MACVLAN is not set |
@@ -626,7 +641,6 @@ CONFIG_NETDEV_1000=y | |||
626 | # CONFIG_DL2K is not set | 641 | # CONFIG_DL2K is not set |
627 | # CONFIG_E1000 is not set | 642 | # CONFIG_E1000 is not set |
628 | # CONFIG_E1000E is not set | 643 | # CONFIG_E1000E is not set |
629 | # CONFIG_E1000E_ENABLED is not set | ||
630 | # CONFIG_IP1000 is not set | 644 | # CONFIG_IP1000 is not set |
631 | # CONFIG_IGB is not set | 645 | # CONFIG_IGB is not set |
632 | # CONFIG_NS83820 is not set | 646 | # CONFIG_NS83820 is not set |
@@ -640,9 +654,9 @@ CONFIG_NETDEV_1000=y | |||
640 | # CONFIG_TIGON3 is not set | 654 | # CONFIG_TIGON3 is not set |
641 | # CONFIG_BNX2 is not set | 655 | # CONFIG_BNX2 is not set |
642 | CONFIG_GIANFAR=y | 656 | CONFIG_GIANFAR=y |
643 | CONFIG_GFAR_NAPI=y | ||
644 | # CONFIG_QLA3XXX is not set | 657 | # CONFIG_QLA3XXX is not set |
645 | # CONFIG_ATL1 is not set | 658 | # CONFIG_ATL1 is not set |
659 | # CONFIG_ATL1E is not set | ||
646 | CONFIG_NETDEV_10000=y | 660 | CONFIG_NETDEV_10000=y |
647 | # CONFIG_CHELSIO_T1 is not set | 661 | # CONFIG_CHELSIO_T1 is not set |
648 | # CONFIG_CHELSIO_T3 is not set | 662 | # CONFIG_CHELSIO_T3 is not set |
@@ -719,12 +733,14 @@ CONFIG_SERIO_SERPORT=y | |||
719 | # CONFIG_SERIO_PCIPS2 is not set | 733 | # CONFIG_SERIO_PCIPS2 is not set |
720 | CONFIG_SERIO_LIBPS2=y | 734 | CONFIG_SERIO_LIBPS2=y |
721 | # CONFIG_SERIO_RAW is not set | 735 | # CONFIG_SERIO_RAW is not set |
736 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
722 | # CONFIG_GAMEPORT is not set | 737 | # CONFIG_GAMEPORT is not set |
723 | 738 | ||
724 | # | 739 | # |
725 | # Character devices | 740 | # Character devices |
726 | # | 741 | # |
727 | CONFIG_VT=y | 742 | CONFIG_VT=y |
743 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
728 | CONFIG_VT_CONSOLE=y | 744 | CONFIG_VT_CONSOLE=y |
729 | CONFIG_HW_CONSOLE=y | 745 | CONFIG_HW_CONSOLE=y |
730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 746 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -758,7 +774,7 @@ CONFIG_UNIX98_PTYS=y | |||
758 | CONFIG_LEGACY_PTYS=y | 774 | CONFIG_LEGACY_PTYS=y |
759 | CONFIG_LEGACY_PTY_COUNT=256 | 775 | CONFIG_LEGACY_PTY_COUNT=256 |
760 | # CONFIG_IPMI_HANDLER is not set | 776 | # CONFIG_IPMI_HANDLER is not set |
761 | # CONFIG_HW_RANDOM is not set | 777 | CONFIG_HW_RANDOM=y |
762 | CONFIG_NVRAM=y | 778 | CONFIG_NVRAM=y |
763 | # CONFIG_R3964 is not set | 779 | # CONFIG_R3964 is not set |
764 | # CONFIG_APPLICOM is not set | 780 | # CONFIG_APPLICOM is not set |
@@ -768,43 +784,64 @@ CONFIG_DEVPORT=y | |||
768 | CONFIG_I2C=y | 784 | CONFIG_I2C=y |
769 | CONFIG_I2C_BOARDINFO=y | 785 | CONFIG_I2C_BOARDINFO=y |
770 | # CONFIG_I2C_CHARDEV is not set | 786 | # CONFIG_I2C_CHARDEV is not set |
787 | CONFIG_I2C_HELPER_AUTO=y | ||
771 | 788 | ||
772 | # | 789 | # |
773 | # I2C Hardware Bus support | 790 | # I2C Hardware Bus support |
774 | # | 791 | # |
792 | |||
793 | # | ||
794 | # PC SMBus host controller drivers | ||
795 | # | ||
775 | # CONFIG_I2C_ALI1535 is not set | 796 | # CONFIG_I2C_ALI1535 is not set |
776 | # CONFIG_I2C_ALI1563 is not set | 797 | # CONFIG_I2C_ALI1563 is not set |
777 | # CONFIG_I2C_ALI15X3 is not set | 798 | # CONFIG_I2C_ALI15X3 is not set |
778 | # CONFIG_I2C_AMD756 is not set | 799 | # CONFIG_I2C_AMD756 is not set |
779 | # CONFIG_I2C_AMD8111 is not set | 800 | # CONFIG_I2C_AMD8111 is not set |
780 | # CONFIG_I2C_I801 is not set | 801 | # CONFIG_I2C_I801 is not set |
781 | # CONFIG_I2C_I810 is not set | 802 | # CONFIG_I2C_ISCH is not set |
782 | # CONFIG_I2C_PIIX4 is not set | 803 | # CONFIG_I2C_PIIX4 is not set |
783 | CONFIG_I2C_MPC=y | ||
784 | # CONFIG_I2C_NFORCE2 is not set | 804 | # CONFIG_I2C_NFORCE2 is not set |
785 | # CONFIG_I2C_OCORES is not set | ||
786 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
787 | # CONFIG_I2C_PROSAVAGE is not set | ||
788 | # CONFIG_I2C_SAVAGE4 is not set | ||
789 | # CONFIG_I2C_SIMTEC is not set | ||
790 | # CONFIG_I2C_SIS5595 is not set | 805 | # CONFIG_I2C_SIS5595 is not set |
791 | # CONFIG_I2C_SIS630 is not set | 806 | # CONFIG_I2C_SIS630 is not set |
792 | # CONFIG_I2C_SIS96X is not set | 807 | # CONFIG_I2C_SIS96X is not set |
793 | # CONFIG_I2C_TAOS_EVM is not set | ||
794 | # CONFIG_I2C_STUB is not set | ||
795 | # CONFIG_I2C_TINY_USB is not set | ||
796 | # CONFIG_I2C_VIA is not set | 808 | # CONFIG_I2C_VIA is not set |
797 | # CONFIG_I2C_VIAPRO is not set | 809 | # CONFIG_I2C_VIAPRO is not set |
810 | |||
811 | # | ||
812 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
813 | # | ||
814 | CONFIG_I2C_MPC=y | ||
815 | # CONFIG_I2C_OCORES is not set | ||
816 | # CONFIG_I2C_SIMTEC is not set | ||
817 | |||
818 | # | ||
819 | # External I2C/SMBus adapter drivers | ||
820 | # | ||
821 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
822 | # CONFIG_I2C_TAOS_EVM is not set | ||
823 | # CONFIG_I2C_TINY_USB is not set | ||
824 | |||
825 | # | ||
826 | # Graphics adapter I2C/DDC channel drivers | ||
827 | # | ||
798 | # CONFIG_I2C_VOODOO3 is not set | 828 | # CONFIG_I2C_VOODOO3 is not set |
829 | |||
830 | # | ||
831 | # Other I2C/SMBus bus drivers | ||
832 | # | ||
799 | # CONFIG_I2C_PCA_PLATFORM is not set | 833 | # CONFIG_I2C_PCA_PLATFORM is not set |
834 | # CONFIG_I2C_STUB is not set | ||
800 | 835 | ||
801 | # | 836 | # |
802 | # Miscellaneous I2C Chip support | 837 | # Miscellaneous I2C Chip support |
803 | # | 838 | # |
804 | # CONFIG_DS1682 is not set | 839 | # CONFIG_DS1682 is not set |
840 | # CONFIG_AT24 is not set | ||
805 | CONFIG_SENSORS_EEPROM=y | 841 | CONFIG_SENSORS_EEPROM=y |
806 | # CONFIG_SENSORS_PCF8574 is not set | 842 | # CONFIG_SENSORS_PCF8574 is not set |
807 | # CONFIG_PCF8575 is not set | 843 | # CONFIG_PCF8575 is not set |
844 | # CONFIG_SENSORS_PCA9539 is not set | ||
808 | # CONFIG_SENSORS_PCF8591 is not set | 845 | # CONFIG_SENSORS_PCF8591 is not set |
809 | # CONFIG_SENSORS_MAX6875 is not set | 846 | # CONFIG_SENSORS_MAX6875 is not set |
810 | # CONFIG_SENSORS_TSL2550 is not set | 847 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -813,10 +850,13 @@ CONFIG_SENSORS_EEPROM=y | |||
813 | # CONFIG_I2C_DEBUG_BUS is not set | 850 | # CONFIG_I2C_DEBUG_BUS is not set |
814 | # CONFIG_I2C_DEBUG_CHIP is not set | 851 | # CONFIG_I2C_DEBUG_CHIP is not set |
815 | # CONFIG_SPI is not set | 852 | # CONFIG_SPI is not set |
853 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
854 | # CONFIG_GPIOLIB is not set | ||
816 | # CONFIG_W1 is not set | 855 | # CONFIG_W1 is not set |
817 | # CONFIG_POWER_SUPPLY is not set | 856 | # CONFIG_POWER_SUPPLY is not set |
818 | # CONFIG_HWMON is not set | 857 | # CONFIG_HWMON is not set |
819 | # CONFIG_THERMAL is not set | 858 | # CONFIG_THERMAL is not set |
859 | # CONFIG_THERMAL_HWMON is not set | ||
820 | # CONFIG_WATCHDOG is not set | 860 | # CONFIG_WATCHDOG is not set |
821 | 861 | ||
822 | # | 862 | # |
@@ -828,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y | |||
828 | # | 868 | # |
829 | # Multifunction device drivers | 869 | # Multifunction device drivers |
830 | # | 870 | # |
871 | # CONFIG_MFD_CORE is not set | ||
831 | # CONFIG_MFD_SM501 is not set | 872 | # CONFIG_MFD_SM501 is not set |
832 | # CONFIG_HTC_PASIC3 is not set | 873 | # CONFIG_HTC_PASIC3 is not set |
874 | # CONFIG_MFD_TMIO is not set | ||
833 | 875 | ||
834 | # | 876 | # |
835 | # Multimedia devices | 877 | # Multimedia devices |
@@ -871,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
871 | # CONFIG_DVB_TTUSB_BUDGET is not set | 913 | # CONFIG_DVB_TTUSB_BUDGET is not set |
872 | # CONFIG_DVB_TTUSB_DEC is not set | 914 | # CONFIG_DVB_TTUSB_DEC is not set |
873 | # CONFIG_DVB_CINERGYT2 is not set | 915 | # CONFIG_DVB_CINERGYT2 is not set |
916 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
874 | 917 | ||
875 | # | 918 | # |
876 | # Supported FlexCopII (B2C2) Adapters | 919 | # Supported FlexCopII (B2C2) Adapters |
@@ -917,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
917 | # CONFIG_DVB_SP887X is not set | 960 | # CONFIG_DVB_SP887X is not set |
918 | # CONFIG_DVB_CX22700 is not set | 961 | # CONFIG_DVB_CX22700 is not set |
919 | # CONFIG_DVB_CX22702 is not set | 962 | # CONFIG_DVB_CX22702 is not set |
963 | # CONFIG_DVB_DRX397XD is not set | ||
920 | # CONFIG_DVB_L64781 is not set | 964 | # CONFIG_DVB_L64781 is not set |
921 | # CONFIG_DVB_TDA1004X is not set | 965 | # CONFIG_DVB_TDA1004X is not set |
922 | # CONFIG_DVB_NXT6000 is not set | 966 | # CONFIG_DVB_NXT6000 is not set |
@@ -984,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
984 | CONFIG_VGA_CONSOLE=y | 1028 | CONFIG_VGA_CONSOLE=y |
985 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1029 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
986 | CONFIG_DUMMY_CONSOLE=y | 1030 | CONFIG_DUMMY_CONSOLE=y |
987 | |||
988 | # | ||
989 | # Sound | ||
990 | # | ||
991 | CONFIG_SOUND=y | 1031 | CONFIG_SOUND=y |
992 | |||
993 | # | ||
994 | # Advanced Linux Sound Architecture | ||
995 | # | ||
996 | CONFIG_SND=y | 1032 | CONFIG_SND=y |
997 | CONFIG_SND_TIMER=y | 1033 | CONFIG_SND_TIMER=y |
998 | CONFIG_SND_PCM=y | 1034 | CONFIG_SND_PCM=y |
@@ -1006,19 +1042,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
1006 | CONFIG_SND_VERBOSE_PROCFS=y | 1042 | CONFIG_SND_VERBOSE_PROCFS=y |
1007 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1043 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1008 | # CONFIG_SND_DEBUG is not set | 1044 | # CONFIG_SND_DEBUG is not set |
1009 | 1045 | CONFIG_SND_VMASTER=y | |
1010 | # | ||
1011 | # Generic devices | ||
1012 | # | ||
1013 | CONFIG_SND_AC97_CODEC=y | 1046 | CONFIG_SND_AC97_CODEC=y |
1047 | CONFIG_SND_DRIVERS=y | ||
1014 | # CONFIG_SND_DUMMY is not set | 1048 | # CONFIG_SND_DUMMY is not set |
1015 | # CONFIG_SND_MTPAV is not set | 1049 | # CONFIG_SND_MTPAV is not set |
1016 | # CONFIG_SND_SERIAL_U16550 is not set | 1050 | # CONFIG_SND_SERIAL_U16550 is not set |
1017 | # CONFIG_SND_MPU401 is not set | 1051 | # CONFIG_SND_MPU401 is not set |
1018 | 1052 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
1019 | # | 1053 | CONFIG_SND_PCI=y |
1020 | # PCI devices | ||
1021 | # | ||
1022 | # CONFIG_SND_AD1889 is not set | 1054 | # CONFIG_SND_AD1889 is not set |
1023 | # CONFIG_SND_ALS300 is not set | 1055 | # CONFIG_SND_ALS300 is not set |
1024 | # CONFIG_SND_ALS4000 is not set | 1056 | # CONFIG_SND_ALS4000 is not set |
@@ -1080,39 +1112,12 @@ CONFIG_SND_INTEL8X0=y | |||
1080 | # CONFIG_SND_VIRTUOSO is not set | 1112 | # CONFIG_SND_VIRTUOSO is not set |
1081 | # CONFIG_SND_VX222 is not set | 1113 | # CONFIG_SND_VX222 is not set |
1082 | # CONFIG_SND_YMFPCI is not set | 1114 | # CONFIG_SND_YMFPCI is not set |
1083 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1115 | CONFIG_SND_PPC=y |
1084 | 1116 | CONFIG_SND_USB=y | |
1085 | # | ||
1086 | # ALSA PowerMac devices | ||
1087 | # | ||
1088 | |||
1089 | # | ||
1090 | # ALSA PowerPC devices | ||
1091 | # | ||
1092 | |||
1093 | # | ||
1094 | # USB devices | ||
1095 | # | ||
1096 | # CONFIG_SND_USB_AUDIO is not set | 1117 | # CONFIG_SND_USB_AUDIO is not set |
1097 | # CONFIG_SND_USB_USX2Y is not set | 1118 | # CONFIG_SND_USB_USX2Y is not set |
1098 | # CONFIG_SND_USB_CAIAQ is not set | 1119 | # CONFIG_SND_USB_CAIAQ is not set |
1099 | |||
1100 | # | ||
1101 | # System on Chip audio support | ||
1102 | # | ||
1103 | # CONFIG_SND_SOC is not set | 1120 | # CONFIG_SND_SOC is not set |
1104 | |||
1105 | # | ||
1106 | # ALSA SoC audio for Freescale SOCs | ||
1107 | # | ||
1108 | |||
1109 | # | ||
1110 | # SoC Audio for the Texas Instruments OMAP | ||
1111 | # | ||
1112 | |||
1113 | # | ||
1114 | # Open Sound System | ||
1115 | # | ||
1116 | # CONFIG_SOUND_PRIME is not set | 1121 | # CONFIG_SOUND_PRIME is not set |
1117 | CONFIG_AC97_BUS=y | 1122 | CONFIG_AC97_BUS=y |
1118 | CONFIG_HID_SUPPORT=y | 1123 | CONFIG_HID_SUPPORT=y |
@@ -1144,6 +1149,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1144 | # CONFIG_USB_OTG is not set | 1149 | # CONFIG_USB_OTG is not set |
1145 | # CONFIG_USB_OTG_WHITELIST is not set | 1150 | # CONFIG_USB_OTG_WHITELIST is not set |
1146 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1151 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1152 | CONFIG_USB_MON=y | ||
1147 | 1153 | ||
1148 | # | 1154 | # |
1149 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
@@ -1195,6 +1201,7 @@ CONFIG_USB_STORAGE=y | |||
1195 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1196 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1197 | # CONFIG_USB_STORAGE_KARMA is not set | 1203 | # CONFIG_USB_STORAGE_KARMA is not set |
1204 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1198 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1205 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1199 | # CONFIG_USB_LIBUSUAL is not set | 1206 | # CONFIG_USB_LIBUSUAL is not set |
1200 | 1207 | ||
@@ -1203,7 +1210,6 @@ CONFIG_USB_STORAGE=y | |||
1203 | # | 1210 | # |
1204 | # CONFIG_USB_MDC800 is not set | 1211 | # CONFIG_USB_MDC800 is not set |
1205 | # CONFIG_USB_MICROTEK is not set | 1212 | # CONFIG_USB_MICROTEK is not set |
1206 | CONFIG_USB_MON=y | ||
1207 | 1213 | ||
1208 | # | 1214 | # |
1209 | # USB port drivers | 1215 | # USB port drivers |
@@ -1216,7 +1222,6 @@ CONFIG_USB_MON=y | |||
1216 | # CONFIG_USB_EMI62 is not set | 1222 | # CONFIG_USB_EMI62 is not set |
1217 | # CONFIG_USB_EMI26 is not set | 1223 | # CONFIG_USB_EMI26 is not set |
1218 | # CONFIG_USB_ADUTUX is not set | 1224 | # CONFIG_USB_ADUTUX is not set |
1219 | # CONFIG_USB_AUERSWALD is not set | ||
1220 | # CONFIG_USB_RIO500 is not set | 1225 | # CONFIG_USB_RIO500 is not set |
1221 | # CONFIG_USB_LEGOTOWER is not set | 1226 | # CONFIG_USB_LEGOTOWER is not set |
1222 | # CONFIG_USB_LCD is not set | 1227 | # CONFIG_USB_LCD is not set |
@@ -1270,6 +1275,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1270 | # CONFIG_RTC_DRV_PCF8583 is not set | 1275 | # CONFIG_RTC_DRV_PCF8583 is not set |
1271 | # CONFIG_RTC_DRV_M41T80 is not set | 1276 | # CONFIG_RTC_DRV_M41T80 is not set |
1272 | # CONFIG_RTC_DRV_S35390A is not set | 1277 | # CONFIG_RTC_DRV_S35390A is not set |
1278 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1273 | 1279 | ||
1274 | # | 1280 | # |
1275 | # SPI RTC drivers | 1281 | # SPI RTC drivers |
@@ -1303,6 +1309,7 @@ CONFIG_DMA_ENGINE=y | |||
1303 | # DMA Clients | 1309 | # DMA Clients |
1304 | # | 1310 | # |
1305 | # CONFIG_NET_DMA is not set | 1311 | # CONFIG_NET_DMA is not set |
1312 | # CONFIG_DMATEST is not set | ||
1306 | # CONFIG_UIO is not set | 1313 | # CONFIG_UIO is not set |
1307 | 1314 | ||
1308 | # | 1315 | # |
@@ -1379,6 +1386,7 @@ CONFIG_EFS_FS=m | |||
1379 | CONFIG_CRAMFS=y | 1386 | CONFIG_CRAMFS=y |
1380 | CONFIG_VXFS_FS=m | 1387 | CONFIG_VXFS_FS=m |
1381 | # CONFIG_MINIX_FS is not set | 1388 | # CONFIG_MINIX_FS is not set |
1389 | # CONFIG_OMFS_FS is not set | ||
1382 | CONFIG_HPFS_FS=m | 1390 | CONFIG_HPFS_FS=m |
1383 | CONFIG_QNX4FS_FS=m | 1391 | CONFIG_QNX4FS_FS=m |
1384 | # CONFIG_ROMFS_FS is not set | 1392 | # CONFIG_ROMFS_FS is not set |
@@ -1391,17 +1399,16 @@ CONFIG_NFS_FS=y | |||
1391 | CONFIG_NFS_V3=y | 1399 | CONFIG_NFS_V3=y |
1392 | # CONFIG_NFS_V3_ACL is not set | 1400 | # CONFIG_NFS_V3_ACL is not set |
1393 | CONFIG_NFS_V4=y | 1401 | CONFIG_NFS_V4=y |
1402 | CONFIG_ROOT_NFS=y | ||
1394 | CONFIG_NFSD=y | 1403 | CONFIG_NFSD=y |
1395 | # CONFIG_NFSD_V3 is not set | 1404 | # CONFIG_NFSD_V3 is not set |
1396 | # CONFIG_NFSD_V4 is not set | 1405 | # CONFIG_NFSD_V4 is not set |
1397 | CONFIG_ROOT_NFS=y | ||
1398 | CONFIG_LOCKD=y | 1406 | CONFIG_LOCKD=y |
1399 | CONFIG_LOCKD_V4=y | 1407 | CONFIG_LOCKD_V4=y |
1400 | CONFIG_EXPORTFS=y | 1408 | CONFIG_EXPORTFS=y |
1401 | CONFIG_NFS_COMMON=y | 1409 | CONFIG_NFS_COMMON=y |
1402 | CONFIG_SUNRPC=y | 1410 | CONFIG_SUNRPC=y |
1403 | CONFIG_SUNRPC_GSS=y | 1411 | CONFIG_SUNRPC_GSS=y |
1404 | # CONFIG_SUNRPC_BIND34 is not set | ||
1405 | CONFIG_RPCSEC_GSS_KRB5=y | 1412 | CONFIG_RPCSEC_GSS_KRB5=y |
1406 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1413 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1407 | # CONFIG_SMB_FS is not set | 1414 | # CONFIG_SMB_FS is not set |
@@ -1480,6 +1487,7 @@ CONFIG_BITREVERSE=y | |||
1480 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1487 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1481 | # CONFIG_CRC_CCITT is not set | 1488 | # CONFIG_CRC_CCITT is not set |
1482 | # CONFIG_CRC16 is not set | 1489 | # CONFIG_CRC16 is not set |
1490 | CONFIG_CRC_T10DIF=y | ||
1483 | CONFIG_CRC_ITU_T=m | 1491 | CONFIG_CRC_ITU_T=m |
1484 | CONFIG_CRC32=y | 1492 | CONFIG_CRC32=y |
1485 | # CONFIG_CRC7 is not set | 1493 | # CONFIG_CRC7 is not set |
@@ -1505,6 +1513,8 @@ CONFIG_FRAME_WARN=1024 | |||
1505 | CONFIG_DEBUG_KERNEL=y | 1513 | CONFIG_DEBUG_KERNEL=y |
1506 | # CONFIG_DEBUG_SHIRQ is not set | 1514 | # CONFIG_DEBUG_SHIRQ is not set |
1507 | CONFIG_DETECT_SOFTLOCKUP=y | 1515 | CONFIG_DETECT_SOFTLOCKUP=y |
1516 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1517 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1508 | CONFIG_SCHED_DEBUG=y | 1518 | CONFIG_SCHED_DEBUG=y |
1509 | # CONFIG_SCHEDSTATS is not set | 1519 | # CONFIG_SCHEDSTATS is not set |
1510 | # CONFIG_TIMER_STATS is not set | 1520 | # CONFIG_TIMER_STATS is not set |
@@ -1523,17 +1533,29 @@ CONFIG_SCHED_DEBUG=y | |||
1523 | CONFIG_DEBUG_INFO=y | 1533 | CONFIG_DEBUG_INFO=y |
1524 | # CONFIG_DEBUG_VM is not set | 1534 | # CONFIG_DEBUG_VM is not set |
1525 | # CONFIG_DEBUG_WRITECOUNT is not set | 1535 | # CONFIG_DEBUG_WRITECOUNT is not set |
1536 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1526 | # CONFIG_DEBUG_LIST is not set | 1537 | # CONFIG_DEBUG_LIST is not set |
1527 | # CONFIG_DEBUG_SG is not set | 1538 | # CONFIG_DEBUG_SG is not set |
1528 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1539 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1529 | # CONFIG_RCU_TORTURE_TEST is not set | 1540 | # CONFIG_RCU_TORTURE_TEST is not set |
1530 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1541 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1531 | # CONFIG_FAULT_INJECTION is not set | 1542 | # CONFIG_FAULT_INJECTION is not set |
1543 | # CONFIG_LATENCYTOP is not set | ||
1544 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1545 | CONFIG_HAVE_FTRACE=y | ||
1546 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1547 | # CONFIG_FTRACE is not set | ||
1548 | # CONFIG_SCHED_TRACER is not set | ||
1549 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1532 | # CONFIG_SAMPLES is not set | 1550 | # CONFIG_SAMPLES is not set |
1551 | CONFIG_HAVE_ARCH_KGDB=y | ||
1552 | # CONFIG_KGDB is not set | ||
1533 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1553 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1534 | # CONFIG_DEBUG_STACK_USAGE is not set | 1554 | # CONFIG_DEBUG_STACK_USAGE is not set |
1535 | # CONFIG_DEBUG_PAGEALLOC is not set | 1555 | # CONFIG_DEBUG_PAGEALLOC is not set |
1536 | # CONFIG_DEBUGGER is not set | 1556 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1557 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1558 | # CONFIG_XMON is not set | ||
1537 | # CONFIG_IRQSTACKS is not set | 1559 | # CONFIG_IRQSTACKS is not set |
1538 | # CONFIG_BDI_SWITCH is not set | 1560 | # CONFIG_BDI_SWITCH is not set |
1539 | # CONFIG_PPC_EARLY_DEBUG is not set | 1561 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1550,13 +1572,14 @@ CONFIG_CRYPTO=y | |||
1550 | # Crypto core or helper | 1572 | # Crypto core or helper |
1551 | # | 1573 | # |
1552 | CONFIG_CRYPTO_ALGAPI=y | 1574 | CONFIG_CRYPTO_ALGAPI=y |
1575 | CONFIG_CRYPTO_AEAD=y | ||
1553 | CONFIG_CRYPTO_BLKCIPHER=y | 1576 | CONFIG_CRYPTO_BLKCIPHER=y |
1554 | CONFIG_CRYPTO_HASH=y | 1577 | CONFIG_CRYPTO_HASH=y |
1555 | CONFIG_CRYPTO_MANAGER=y | 1578 | CONFIG_CRYPTO_MANAGER=y |
1556 | # CONFIG_CRYPTO_GF128MUL is not set | 1579 | # CONFIG_CRYPTO_GF128MUL is not set |
1557 | # CONFIG_CRYPTO_NULL is not set | 1580 | # CONFIG_CRYPTO_NULL is not set |
1558 | # CONFIG_CRYPTO_CRYPTD is not set | 1581 | # CONFIG_CRYPTO_CRYPTD is not set |
1559 | # CONFIG_CRYPTO_AUTHENC is not set | 1582 | CONFIG_CRYPTO_AUTHENC=y |
1560 | # CONFIG_CRYPTO_TEST is not set | 1583 | # CONFIG_CRYPTO_TEST is not set |
1561 | 1584 | ||
1562 | # | 1585 | # |
@@ -1590,6 +1613,10 @@ CONFIG_CRYPTO_HMAC=y | |||
1590 | # CONFIG_CRYPTO_MD4 is not set | 1613 | # CONFIG_CRYPTO_MD4 is not set |
1591 | CONFIG_CRYPTO_MD5=y | 1614 | CONFIG_CRYPTO_MD5=y |
1592 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1615 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1616 | # CONFIG_CRYPTO_RMD128 is not set | ||
1617 | # CONFIG_CRYPTO_RMD160 is not set | ||
1618 | # CONFIG_CRYPTO_RMD256 is not set | ||
1619 | # CONFIG_CRYPTO_RMD320 is not set | ||
1593 | CONFIG_CRYPTO_SHA1=m | 1620 | CONFIG_CRYPTO_SHA1=m |
1594 | # CONFIG_CRYPTO_SHA256 is not set | 1621 | # CONFIG_CRYPTO_SHA256 is not set |
1595 | # CONFIG_CRYPTO_SHA512 is not set | 1622 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1622,5 +1649,6 @@ CONFIG_CRYPTO_DES=y | |||
1622 | # CONFIG_CRYPTO_LZO is not set | 1649 | # CONFIG_CRYPTO_LZO is not set |
1623 | CONFIG_CRYPTO_HW=y | 1650 | CONFIG_CRYPTO_HW=y |
1624 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1651 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1652 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
1625 | # CONFIG_PPC_CLOCK is not set | 1653 | # CONFIG_PPC_CLOCK is not set |
1626 | # CONFIG_VIRTUALIZATION is not set | 1654 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig index e19592b42043..06e26d906f65 100644 --- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig +++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:33 2008 | 4 | # Thu Aug 21 00:52:32 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | ||
42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
94 | # CONFIG_KALLSYMS_ALL is not set | 96 | # CONFIG_KALLSYMS_ALL is not set |
95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 97 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -114,10 +116,16 @@ CONFIG_SLUB=y | |||
114 | # CONFIG_PROFILING is not set | 116 | # CONFIG_PROFILING is not set |
115 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
116 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
117 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
118 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
119 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | CONFIG_HAVE_CLK=y | ||
120 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
121 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
122 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
123 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -128,6 +136,7 @@ CONFIG_BLOCK=y | |||
128 | # CONFIG_BLK_DEV_IO_TRACE is not set | 136 | # CONFIG_BLK_DEV_IO_TRACE is not set |
129 | # CONFIG_LSF is not set | 137 | # CONFIG_LSF is not set |
130 | # CONFIG_BLK_DEV_BSG is not set | 138 | # CONFIG_BLK_DEV_BSG is not set |
139 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
131 | 140 | ||
132 | # | 141 | # |
133 | # IO Schedulers | 142 | # IO Schedulers |
@@ -146,8 +155,6 @@ CONFIG_CLASSIC_RCU=y | |||
146 | # | 155 | # |
147 | # Platform support | 156 | # Platform support |
148 | # | 157 | # |
149 | # CONFIG_PPC_MPC512x is not set | ||
150 | # CONFIG_PPC_MPC5121 is not set | ||
151 | # CONFIG_PPC_CELL is not set | 158 | # CONFIG_PPC_CELL is not set |
152 | # CONFIG_PPC_CELL_NATIVE is not set | 159 | # CONFIG_PPC_CELL_NATIVE is not set |
153 | # CONFIG_PQ2ADS is not set | 160 | # CONFIG_PQ2ADS is not set |
@@ -156,11 +163,13 @@ CONFIG_MPC85xx=y | |||
156 | CONFIG_MPC8560_ADS=y | 163 | CONFIG_MPC8560_ADS=y |
157 | # CONFIG_MPC85xx_CDS is not set | 164 | # CONFIG_MPC85xx_CDS is not set |
158 | # CONFIG_MPC85xx_MDS is not set | 165 | # CONFIG_MPC85xx_MDS is not set |
166 | # CONFIG_MPC8536_DS is not set | ||
159 | # CONFIG_MPC85xx_DS is not set | 167 | # CONFIG_MPC85xx_DS is not set |
160 | # CONFIG_KSI8560 is not set | 168 | # CONFIG_KSI8560 is not set |
161 | # CONFIG_STX_GP3 is not set | 169 | # CONFIG_STX_GP3 is not set |
162 | # CONFIG_TQM8540 is not set | 170 | # CONFIG_TQM8540 is not set |
163 | # CONFIG_TQM8541 is not set | 171 | # CONFIG_TQM8541 is not set |
172 | # CONFIG_TQM8548 is not set | ||
164 | # CONFIG_TQM8555 is not set | 173 | # CONFIG_TQM8555 is not set |
165 | # CONFIG_TQM8560 is not set | 174 | # CONFIG_TQM8560 is not set |
166 | # CONFIG_SBC8548 is not set | 175 | # CONFIG_SBC8548 is not set |
@@ -177,7 +186,6 @@ CONFIG_MPIC=y | |||
177 | # CONFIG_GENERIC_IOMAP is not set | 186 | # CONFIG_GENERIC_IOMAP is not set |
178 | # CONFIG_CPU_FREQ is not set | 187 | # CONFIG_CPU_FREQ is not set |
179 | CONFIG_CPM2=y | 188 | CONFIG_CPM2=y |
180 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
181 | # CONFIG_FSL_ULI1575 is not set | 189 | # CONFIG_FSL_ULI1575 is not set |
182 | CONFIG_CPM=y | 190 | CONFIG_CPM=y |
183 | 191 | ||
@@ -217,6 +225,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | 226 | CONFIG_PAGEFLAGS_EXTENDED=y |
219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 227 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
228 | CONFIG_MIGRATION=y | ||
220 | # CONFIG_RESOURCES_64BIT is not set | 229 | # CONFIG_RESOURCES_64BIT is not set |
221 | CONFIG_ZONE_DMA_FLAG=1 | 230 | CONFIG_ZONE_DMA_FLAG=1 |
222 | CONFIG_BOUNCE=y | 231 | CONFIG_BOUNCE=y |
@@ -224,6 +233,7 @@ CONFIG_VIRT_TO_BUS=y | |||
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 233 | CONFIG_FORCE_MAX_ZONEORDER=11 |
225 | # CONFIG_PROC_DEVICETREE is not set | 234 | # CONFIG_PROC_DEVICETREE is not set |
226 | # CONFIG_CMDLINE_BOOL is not set | 235 | # CONFIG_CMDLINE_BOOL is not set |
236 | CONFIG_EXTRA_TARGETS="" | ||
227 | # CONFIG_PM is not set | 237 | # CONFIG_PM is not set |
228 | # CONFIG_SECCOMP is not set | 238 | # CONFIG_SECCOMP is not set |
229 | CONFIG_ISA_DMA_API=y | 239 | CONFIG_ISA_DMA_API=y |
@@ -235,6 +245,7 @@ CONFIG_ZONE_DMA=y | |||
235 | CONFIG_PPC_INDIRECT_PCI=y | 245 | CONFIG_PPC_INDIRECT_PCI=y |
236 | CONFIG_FSL_SOC=y | 246 | CONFIG_FSL_SOC=y |
237 | CONFIG_FSL_PCI=y | 247 | CONFIG_FSL_PCI=y |
248 | CONFIG_PPC_PCI_CHOICE=y | ||
238 | CONFIG_PCI=y | 249 | CONFIG_PCI=y |
239 | CONFIG_PCI_DOMAINS=y | 250 | CONFIG_PCI_DOMAINS=y |
240 | CONFIG_PCI_SYSCALL=y | 251 | CONFIG_PCI_SYSCALL=y |
@@ -261,10 +272,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
261 | CONFIG_PHYSICAL_START=0x00000000 | 272 | CONFIG_PHYSICAL_START=0x00000000 |
262 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 273 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
263 | CONFIG_TASK_SIZE=0xc0000000 | 274 | CONFIG_TASK_SIZE=0xc0000000 |
264 | |||
265 | # | ||
266 | # Networking | ||
267 | # | ||
268 | CONFIG_NET=y | 275 | CONFIG_NET=y |
269 | 276 | ||
270 | # | 277 | # |
@@ -363,6 +370,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
363 | # CONFIG_CONNECTOR is not set | 370 | # CONFIG_CONNECTOR is not set |
364 | # CONFIG_MTD is not set | 371 | # CONFIG_MTD is not set |
365 | CONFIG_OF_DEVICE=y | 372 | CONFIG_OF_DEVICE=y |
373 | CONFIG_OF_GPIO=y | ||
366 | # CONFIG_PARPORT is not set | 374 | # CONFIG_PARPORT is not set |
367 | CONFIG_BLK_DEV=y | 375 | CONFIG_BLK_DEV=y |
368 | # CONFIG_BLK_DEV_FD is not set | 376 | # CONFIG_BLK_DEV_FD is not set |
@@ -381,12 +389,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
381 | # CONFIG_BLK_DEV_XIP is not set | 389 | # CONFIG_BLK_DEV_XIP is not set |
382 | # CONFIG_CDROM_PKTCDVD is not set | 390 | # CONFIG_CDROM_PKTCDVD is not set |
383 | # CONFIG_ATA_OVER_ETH is not set | 391 | # CONFIG_ATA_OVER_ETH is not set |
392 | # CONFIG_BLK_DEV_HD is not set | ||
384 | CONFIG_MISC_DEVICES=y | 393 | CONFIG_MISC_DEVICES=y |
385 | # CONFIG_PHANTOM is not set | 394 | # CONFIG_PHANTOM is not set |
386 | # CONFIG_EEPROM_93CX6 is not set | 395 | # CONFIG_EEPROM_93CX6 is not set |
387 | # CONFIG_SGI_IOC4 is not set | 396 | # CONFIG_SGI_IOC4 is not set |
388 | # CONFIG_TIFM_CORE is not set | 397 | # CONFIG_TIFM_CORE is not set |
389 | # CONFIG_ENCLOSURE_SERVICES is not set | 398 | # CONFIG_ENCLOSURE_SERVICES is not set |
399 | # CONFIG_HP_ILO is not set | ||
390 | CONFIG_HAVE_IDE=y | 400 | CONFIG_HAVE_IDE=y |
391 | # CONFIG_IDE is not set | 401 | # CONFIG_IDE is not set |
392 | 402 | ||
@@ -404,12 +414,15 @@ CONFIG_HAVE_IDE=y | |||
404 | # | 414 | # |
405 | # IEEE 1394 (FireWire) support | 415 | # IEEE 1394 (FireWire) support |
406 | # | 416 | # |
417 | |||
418 | # | ||
419 | # Enable only one of the two stacks, unless you know what you are doing | ||
420 | # | ||
407 | # CONFIG_FIREWIRE is not set | 421 | # CONFIG_FIREWIRE is not set |
408 | # CONFIG_IEEE1394 is not set | 422 | # CONFIG_IEEE1394 is not set |
409 | # CONFIG_I2O is not set | 423 | # CONFIG_I2O is not set |
410 | # CONFIG_MACINTOSH_DRIVERS is not set | 424 | # CONFIG_MACINTOSH_DRIVERS is not set |
411 | CONFIG_NETDEVICES=y | 425 | CONFIG_NETDEVICES=y |
412 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
413 | # CONFIG_DUMMY is not set | 426 | # CONFIG_DUMMY is not set |
414 | # CONFIG_BONDING is not set | 427 | # CONFIG_BONDING is not set |
415 | # CONFIG_MACVLAN is not set | 428 | # CONFIG_MACVLAN is not set |
@@ -456,10 +469,8 @@ CONFIG_NETDEV_1000=y | |||
456 | # CONFIG_ACENIC is not set | 469 | # CONFIG_ACENIC is not set |
457 | # CONFIG_DL2K is not set | 470 | # CONFIG_DL2K is not set |
458 | CONFIG_E1000=y | 471 | CONFIG_E1000=y |
459 | CONFIG_E1000_NAPI=y | ||
460 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 472 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
461 | # CONFIG_E1000E is not set | 473 | # CONFIG_E1000E is not set |
462 | # CONFIG_E1000E_ENABLED is not set | ||
463 | # CONFIG_IP1000 is not set | 474 | # CONFIG_IP1000 is not set |
464 | # CONFIG_IGB is not set | 475 | # CONFIG_IGB is not set |
465 | # CONFIG_NS83820 is not set | 476 | # CONFIG_NS83820 is not set |
@@ -473,9 +484,9 @@ CONFIG_E1000_NAPI=y | |||
473 | # CONFIG_TIGON3 is not set | 484 | # CONFIG_TIGON3 is not set |
474 | # CONFIG_BNX2 is not set | 485 | # CONFIG_BNX2 is not set |
475 | CONFIG_GIANFAR=y | 486 | CONFIG_GIANFAR=y |
476 | CONFIG_GFAR_NAPI=y | ||
477 | # CONFIG_QLA3XXX is not set | 487 | # CONFIG_QLA3XXX is not set |
478 | # CONFIG_ATL1 is not set | 488 | # CONFIG_ATL1 is not set |
489 | # CONFIG_ATL1E is not set | ||
479 | CONFIG_NETDEV_10000=y | 490 | CONFIG_NETDEV_10000=y |
480 | # CONFIG_CHELSIO_T1 is not set | 491 | # CONFIG_CHELSIO_T1 is not set |
481 | # CONFIG_CHELSIO_T3 is not set | 492 | # CONFIG_CHELSIO_T3 is not set |
@@ -582,6 +593,24 @@ CONFIG_GEN_RTC=y | |||
582 | CONFIG_DEVPORT=y | 593 | CONFIG_DEVPORT=y |
583 | # CONFIG_I2C is not set | 594 | # CONFIG_I2C is not set |
584 | # CONFIG_SPI is not set | 595 | # CONFIG_SPI is not set |
596 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
597 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
598 | CONFIG_GPIOLIB=y | ||
599 | # CONFIG_DEBUG_GPIO is not set | ||
600 | # CONFIG_GPIO_SYSFS is not set | ||
601 | |||
602 | # | ||
603 | # I2C GPIO expanders: | ||
604 | # | ||
605 | |||
606 | # | ||
607 | # PCI GPIO expanders: | ||
608 | # | ||
609 | # CONFIG_GPIO_BT8XX is not set | ||
610 | |||
611 | # | ||
612 | # SPI GPIO expanders: | ||
613 | # | ||
585 | # CONFIG_W1 is not set | 614 | # CONFIG_W1 is not set |
586 | # CONFIG_POWER_SUPPLY is not set | 615 | # CONFIG_POWER_SUPPLY is not set |
587 | CONFIG_HWMON=y | 616 | CONFIG_HWMON=y |
@@ -602,6 +631,7 @@ CONFIG_HWMON=y | |||
602 | # CONFIG_SENSORS_W83627EHF is not set | 631 | # CONFIG_SENSORS_W83627EHF is not set |
603 | # CONFIG_HWMON_DEBUG_CHIP is not set | 632 | # CONFIG_HWMON_DEBUG_CHIP is not set |
604 | # CONFIG_THERMAL is not set | 633 | # CONFIG_THERMAL is not set |
634 | # CONFIG_THERMAL_HWMON is not set | ||
605 | # CONFIG_WATCHDOG is not set | 635 | # CONFIG_WATCHDOG is not set |
606 | 636 | ||
607 | # | 637 | # |
@@ -613,8 +643,10 @@ CONFIG_SSB_POSSIBLE=y | |||
613 | # | 643 | # |
614 | # Multifunction device drivers | 644 | # Multifunction device drivers |
615 | # | 645 | # |
646 | # CONFIG_MFD_CORE is not set | ||
616 | # CONFIG_MFD_SM501 is not set | 647 | # CONFIG_MFD_SM501 is not set |
617 | # CONFIG_HTC_PASIC3 is not set | 648 | # CONFIG_HTC_PASIC3 is not set |
649 | # CONFIG_MFD_TMIO is not set | ||
618 | 650 | ||
619 | # | 651 | # |
620 | # Multimedia devices | 652 | # Multimedia devices |
@@ -646,10 +678,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
646 | # Display device support | 678 | # Display device support |
647 | # | 679 | # |
648 | # CONFIG_DISPLAY_SUPPORT is not set | 680 | # CONFIG_DISPLAY_SUPPORT is not set |
649 | |||
650 | # | ||
651 | # Sound | ||
652 | # | ||
653 | # CONFIG_SOUND is not set | 681 | # CONFIG_SOUND is not set |
654 | CONFIG_HID_SUPPORT=y | 682 | CONFIG_HID_SUPPORT=y |
655 | CONFIG_HID=y | 683 | CONFIG_HID=y |
@@ -664,6 +692,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
664 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 692 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
665 | 693 | ||
666 | # | 694 | # |
695 | # Enable Host or Gadget support to see Inventra options | ||
696 | # | ||
697 | |||
698 | # | ||
667 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 699 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
668 | # | 700 | # |
669 | # CONFIG_USB_GADGET is not set | 701 | # CONFIG_USB_GADGET is not set |
@@ -741,6 +773,7 @@ CONFIG_TMPFS=y | |||
741 | # CONFIG_CRAMFS is not set | 773 | # CONFIG_CRAMFS is not set |
742 | # CONFIG_VXFS_FS is not set | 774 | # CONFIG_VXFS_FS is not set |
743 | # CONFIG_MINIX_FS is not set | 775 | # CONFIG_MINIX_FS is not set |
776 | # CONFIG_OMFS_FS is not set | ||
744 | # CONFIG_HPFS_FS is not set | 777 | # CONFIG_HPFS_FS is not set |
745 | # CONFIG_QNX4FS_FS is not set | 778 | # CONFIG_QNX4FS_FS is not set |
746 | # CONFIG_ROMFS_FS is not set | 779 | # CONFIG_ROMFS_FS is not set |
@@ -750,12 +783,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
750 | CONFIG_NFS_FS=y | 783 | CONFIG_NFS_FS=y |
751 | # CONFIG_NFS_V3 is not set | 784 | # CONFIG_NFS_V3 is not set |
752 | # CONFIG_NFS_V4 is not set | 785 | # CONFIG_NFS_V4 is not set |
753 | # CONFIG_NFSD is not set | ||
754 | CONFIG_ROOT_NFS=y | 786 | CONFIG_ROOT_NFS=y |
787 | # CONFIG_NFSD is not set | ||
755 | CONFIG_LOCKD=y | 788 | CONFIG_LOCKD=y |
756 | CONFIG_NFS_COMMON=y | 789 | CONFIG_NFS_COMMON=y |
757 | CONFIG_SUNRPC=y | 790 | CONFIG_SUNRPC=y |
758 | # CONFIG_SUNRPC_BIND34 is not set | ||
759 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 791 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
760 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 792 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
761 | # CONFIG_SMB_FS is not set | 793 | # CONFIG_SMB_FS is not set |
@@ -791,6 +823,7 @@ CONFIG_BITREVERSE=y | |||
791 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 823 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
792 | # CONFIG_CRC_CCITT is not set | 824 | # CONFIG_CRC_CCITT is not set |
793 | # CONFIG_CRC16 is not set | 825 | # CONFIG_CRC16 is not set |
826 | # CONFIG_CRC_T10DIF is not set | ||
794 | # CONFIG_CRC_ITU_T is not set | 827 | # CONFIG_CRC_ITU_T is not set |
795 | CONFIG_CRC32=y | 828 | CONFIG_CRC32=y |
796 | # CONFIG_CRC7 is not set | 829 | # CONFIG_CRC7 is not set |
@@ -815,6 +848,8 @@ CONFIG_FRAME_WARN=1024 | |||
815 | CONFIG_DEBUG_KERNEL=y | 848 | CONFIG_DEBUG_KERNEL=y |
816 | # CONFIG_DEBUG_SHIRQ is not set | 849 | # CONFIG_DEBUG_SHIRQ is not set |
817 | CONFIG_DETECT_SOFTLOCKUP=y | 850 | CONFIG_DETECT_SOFTLOCKUP=y |
851 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
852 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
818 | CONFIG_SCHED_DEBUG=y | 853 | CONFIG_SCHED_DEBUG=y |
819 | # CONFIG_SCHEDSTATS is not set | 854 | # CONFIG_SCHEDSTATS is not set |
820 | # CONFIG_TIMER_STATS is not set | 855 | # CONFIG_TIMER_STATS is not set |
@@ -832,17 +867,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
832 | # CONFIG_DEBUG_INFO is not set | 867 | # CONFIG_DEBUG_INFO is not set |
833 | # CONFIG_DEBUG_VM is not set | 868 | # CONFIG_DEBUG_VM is not set |
834 | # CONFIG_DEBUG_WRITECOUNT is not set | 869 | # CONFIG_DEBUG_WRITECOUNT is not set |
870 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
835 | # CONFIG_DEBUG_LIST is not set | 871 | # CONFIG_DEBUG_LIST is not set |
836 | # CONFIG_DEBUG_SG is not set | 872 | # CONFIG_DEBUG_SG is not set |
837 | # CONFIG_BOOT_PRINTK_DELAY is not set | 873 | # CONFIG_BOOT_PRINTK_DELAY is not set |
874 | # CONFIG_RCU_TORTURE_TEST is not set | ||
838 | # CONFIG_BACKTRACE_SELF_TEST is not set | 875 | # CONFIG_BACKTRACE_SELF_TEST is not set |
839 | # CONFIG_FAULT_INJECTION is not set | 876 | # CONFIG_FAULT_INJECTION is not set |
877 | # CONFIG_LATENCYTOP is not set | ||
878 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
879 | CONFIG_HAVE_FTRACE=y | ||
880 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
881 | # CONFIG_FTRACE is not set | ||
882 | # CONFIG_SCHED_TRACER is not set | ||
883 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
840 | # CONFIG_SAMPLES is not set | 884 | # CONFIG_SAMPLES is not set |
885 | CONFIG_HAVE_ARCH_KGDB=y | ||
886 | # CONFIG_KGDB is not set | ||
841 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 887 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
842 | # CONFIG_DEBUG_STACK_USAGE is not set | 888 | # CONFIG_DEBUG_STACK_USAGE is not set |
843 | # CONFIG_DEBUG_PAGEALLOC is not set | 889 | # CONFIG_DEBUG_PAGEALLOC is not set |
844 | # CONFIG_DEBUGGER is not set | 890 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
845 | # CONFIG_KGDB_CONSOLE is not set | 891 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
892 | # CONFIG_XMON is not set | ||
846 | # CONFIG_IRQSTACKS is not set | 893 | # CONFIG_IRQSTACKS is not set |
847 | # CONFIG_BDI_SWITCH is not set | 894 | # CONFIG_BDI_SWITCH is not set |
848 | # CONFIG_PPC_EARLY_DEBUG is not set | 895 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -895,6 +942,10 @@ CONFIG_CRYPTO=y | |||
895 | # CONFIG_CRYPTO_MD4 is not set | 942 | # CONFIG_CRYPTO_MD4 is not set |
896 | # CONFIG_CRYPTO_MD5 is not set | 943 | # CONFIG_CRYPTO_MD5 is not set |
897 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 944 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
945 | # CONFIG_CRYPTO_RMD128 is not set | ||
946 | # CONFIG_CRYPTO_RMD160 is not set | ||
947 | # CONFIG_CRYPTO_RMD256 is not set | ||
948 | # CONFIG_CRYPTO_RMD320 is not set | ||
898 | # CONFIG_CRYPTO_SHA1 is not set | 949 | # CONFIG_CRYPTO_SHA1 is not set |
899 | # CONFIG_CRYPTO_SHA256 is not set | 950 | # CONFIG_CRYPTO_SHA256 is not set |
900 | # CONFIG_CRYPTO_SHA512 is not set | 951 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -927,6 +978,7 @@ CONFIG_CRYPTO=y | |||
927 | # CONFIG_CRYPTO_LZO is not set | 978 | # CONFIG_CRYPTO_LZO is not set |
928 | CONFIG_CRYPTO_HW=y | 979 | CONFIG_CRYPTO_HW=y |
929 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 980 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
930 | # CONFIG_PPC_CLOCK is not set | 981 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
982 | CONFIG_PPC_CLOCK=y | ||
931 | CONFIG_PPC_LIB_RHEAP=y | 983 | CONFIG_PPC_LIB_RHEAP=y |
932 | # CONFIG_VIRTUALIZATION is not set | 984 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8568mds_defconfig b/arch/powerpc/configs/85xx/mpc8568mds_defconfig index 28004e93aeee..dc27c74955fa 100644 --- a/arch/powerpc/configs/85xx/mpc8568mds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8568mds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:34 2008 | 4 | # Thu Aug 21 00:52:33 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | # CONFIG_KALLSYMS is not set | 94 | # CONFIG_KALLSYMS is not set |
94 | CONFIG_HOTPLUG=y | 95 | CONFIG_HOTPLUG=y |
95 | CONFIG_PRINTK=y | 96 | CONFIG_PRINTK=y |
@@ -112,10 +113,16 @@ CONFIG_SLUB=y | |||
112 | # CONFIG_PROFILING is not set | 113 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | 114 | # CONFIG_MARKERS is not set |
114 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
116 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
117 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 121 | # CONFIG_HAVE_DMA_ATTRS is not set |
122 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
123 | # CONFIG_HAVE_CLK is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
@@ -126,12 +133,13 @@ CONFIG_MODULE_UNLOAD=y | |||
126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 133 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
127 | # CONFIG_MODVERSIONS is not set | 134 | # CONFIG_MODVERSIONS is not set |
128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 135 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
129 | # CONFIG_KMOD is not set | 136 | CONFIG_KMOD=y |
130 | CONFIG_BLOCK=y | 137 | CONFIG_BLOCK=y |
131 | # CONFIG_LBD is not set | 138 | # CONFIG_LBD is not set |
132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 139 | # CONFIG_BLK_DEV_IO_TRACE is not set |
133 | # CONFIG_LSF is not set | 140 | # CONFIG_LSF is not set |
134 | # CONFIG_BLK_DEV_BSG is not set | 141 | # CONFIG_BLK_DEV_BSG is not set |
142 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
135 | 143 | ||
136 | # | 144 | # |
137 | # IO Schedulers | 145 | # IO Schedulers |
@@ -150,8 +158,6 @@ CONFIG_CLASSIC_RCU=y | |||
150 | # | 158 | # |
151 | # Platform support | 159 | # Platform support |
152 | # | 160 | # |
153 | # CONFIG_PPC_MPC512x is not set | ||
154 | # CONFIG_PPC_MPC5121 is not set | ||
155 | # CONFIG_PPC_CELL is not set | 161 | # CONFIG_PPC_CELL is not set |
156 | # CONFIG_PPC_CELL_NATIVE is not set | 162 | # CONFIG_PPC_CELL_NATIVE is not set |
157 | # CONFIG_PQ2ADS is not set | 163 | # CONFIG_PQ2ADS is not set |
@@ -160,11 +166,13 @@ CONFIG_MPC85xx=y | |||
160 | # CONFIG_MPC8560_ADS is not set | 166 | # CONFIG_MPC8560_ADS is not set |
161 | # CONFIG_MPC85xx_CDS is not set | 167 | # CONFIG_MPC85xx_CDS is not set |
162 | CONFIG_MPC85xx_MDS=y | 168 | CONFIG_MPC85xx_MDS=y |
169 | # CONFIG_MPC8536_DS is not set | ||
163 | # CONFIG_MPC85xx_DS is not set | 170 | # CONFIG_MPC85xx_DS is not set |
164 | # CONFIG_KSI8560 is not set | 171 | # CONFIG_KSI8560 is not set |
165 | # CONFIG_STX_GP3 is not set | 172 | # CONFIG_STX_GP3 is not set |
166 | # CONFIG_TQM8540 is not set | 173 | # CONFIG_TQM8540 is not set |
167 | # CONFIG_TQM8541 is not set | 174 | # CONFIG_TQM8541 is not set |
175 | # CONFIG_TQM8548 is not set | ||
168 | # CONFIG_TQM8555 is not set | 176 | # CONFIG_TQM8555 is not set |
169 | # CONFIG_TQM8560 is not set | 177 | # CONFIG_TQM8560 is not set |
170 | # CONFIG_SBC8548 is not set | 178 | # CONFIG_SBC8548 is not set |
@@ -197,7 +205,7 @@ CONFIG_HZ_250=y | |||
197 | # CONFIG_HZ_300 is not set | 205 | # CONFIG_HZ_300 is not set |
198 | # CONFIG_HZ_1000 is not set | 206 | # CONFIG_HZ_1000 is not set |
199 | CONFIG_HZ=250 | 207 | CONFIG_HZ=250 |
200 | # CONFIG_SCHED_HRTICK is not set | 208 | CONFIG_SCHED_HRTICK=y |
201 | CONFIG_PREEMPT_NONE=y | 209 | CONFIG_PREEMPT_NONE=y |
202 | # CONFIG_PREEMPT_VOLUNTARY is not set | 210 | # CONFIG_PREEMPT_VOLUNTARY is not set |
203 | # CONFIG_PREEMPT is not set | 211 | # CONFIG_PREEMPT is not set |
@@ -220,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
220 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
221 | CONFIG_PAGEFLAGS_EXTENDED=y | 229 | CONFIG_PAGEFLAGS_EXTENDED=y |
222 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
231 | CONFIG_MIGRATION=y | ||
223 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
224 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
225 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
@@ -227,6 +236,7 @@ CONFIG_VIRT_TO_BUS=y | |||
227 | CONFIG_FORCE_MAX_ZONEORDER=11 | 236 | CONFIG_FORCE_MAX_ZONEORDER=11 |
228 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
229 | # CONFIG_CMDLINE_BOOL is not set | 238 | # CONFIG_CMDLINE_BOOL is not set |
239 | CONFIG_EXTRA_TARGETS="" | ||
230 | # CONFIG_PM is not set | 240 | # CONFIG_PM is not set |
231 | CONFIG_SECCOMP=y | 241 | CONFIG_SECCOMP=y |
232 | CONFIG_ISA_DMA_API=y | 242 | CONFIG_ISA_DMA_API=y |
@@ -238,6 +248,7 @@ CONFIG_ZONE_DMA=y | |||
238 | CONFIG_PPC_INDIRECT_PCI=y | 248 | CONFIG_PPC_INDIRECT_PCI=y |
239 | CONFIG_FSL_SOC=y | 249 | CONFIG_FSL_SOC=y |
240 | CONFIG_FSL_PCI=y | 250 | CONFIG_FSL_PCI=y |
251 | CONFIG_PPC_PCI_CHOICE=y | ||
241 | CONFIG_PCI=y | 252 | CONFIG_PCI=y |
242 | CONFIG_PCI_DOMAINS=y | 253 | CONFIG_PCI_DOMAINS=y |
243 | CONFIG_PCI_SYSCALL=y | 254 | CONFIG_PCI_SYSCALL=y |
@@ -264,10 +275,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
264 | CONFIG_PHYSICAL_START=0x00000000 | 275 | CONFIG_PHYSICAL_START=0x00000000 |
265 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 276 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
266 | CONFIG_TASK_SIZE=0xc0000000 | 277 | CONFIG_TASK_SIZE=0xc0000000 |
267 | |||
268 | # | ||
269 | # Networking | ||
270 | # | ||
271 | CONFIG_NET=y | 278 | CONFIG_NET=y |
272 | 279 | ||
273 | # | 280 | # |
@@ -385,12 +392,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
385 | # CONFIG_BLK_DEV_XIP is not set | 392 | # CONFIG_BLK_DEV_XIP is not set |
386 | # CONFIG_CDROM_PKTCDVD is not set | 393 | # CONFIG_CDROM_PKTCDVD is not set |
387 | # CONFIG_ATA_OVER_ETH is not set | 394 | # CONFIG_ATA_OVER_ETH is not set |
395 | # CONFIG_BLK_DEV_HD is not set | ||
388 | CONFIG_MISC_DEVICES=y | 396 | CONFIG_MISC_DEVICES=y |
389 | # CONFIG_PHANTOM is not set | 397 | # CONFIG_PHANTOM is not set |
390 | # CONFIG_EEPROM_93CX6 is not set | 398 | # CONFIG_EEPROM_93CX6 is not set |
391 | # CONFIG_SGI_IOC4 is not set | 399 | # CONFIG_SGI_IOC4 is not set |
392 | # CONFIG_TIFM_CORE is not set | 400 | # CONFIG_TIFM_CORE is not set |
393 | # CONFIG_ENCLOSURE_SERVICES is not set | 401 | # CONFIG_ENCLOSURE_SERVICES is not set |
402 | # CONFIG_HP_ILO is not set | ||
394 | CONFIG_HAVE_IDE=y | 403 | CONFIG_HAVE_IDE=y |
395 | # CONFIG_IDE is not set | 404 | # CONFIG_IDE is not set |
396 | 405 | ||
@@ -468,6 +477,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
468 | # CONFIG_SCSI_NSP32 is not set | 477 | # CONFIG_SCSI_NSP32 is not set |
469 | # CONFIG_SCSI_DEBUG is not set | 478 | # CONFIG_SCSI_DEBUG is not set |
470 | # CONFIG_SCSI_SRP is not set | 479 | # CONFIG_SCSI_SRP is not set |
480 | # CONFIG_SCSI_DH is not set | ||
471 | # CONFIG_ATA is not set | 481 | # CONFIG_ATA is not set |
472 | # CONFIG_MD is not set | 482 | # CONFIG_MD is not set |
473 | # CONFIG_FUSION is not set | 483 | # CONFIG_FUSION is not set |
@@ -475,12 +485,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
475 | # | 485 | # |
476 | # IEEE 1394 (FireWire) support | 486 | # IEEE 1394 (FireWire) support |
477 | # | 487 | # |
488 | |||
489 | # | ||
490 | # Enable only one of the two stacks, unless you know what you are doing | ||
491 | # | ||
478 | # CONFIG_FIREWIRE is not set | 492 | # CONFIG_FIREWIRE is not set |
479 | # CONFIG_IEEE1394 is not set | 493 | # CONFIG_IEEE1394 is not set |
480 | # CONFIG_I2O is not set | 494 | # CONFIG_I2O is not set |
481 | # CONFIG_MACINTOSH_DRIVERS is not set | 495 | # CONFIG_MACINTOSH_DRIVERS is not set |
482 | CONFIG_NETDEVICES=y | 496 | CONFIG_NETDEVICES=y |
483 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
484 | # CONFIG_DUMMY is not set | 497 | # CONFIG_DUMMY is not set |
485 | # CONFIG_BONDING is not set | 498 | # CONFIG_BONDING is not set |
486 | # CONFIG_MACVLAN is not set | 499 | # CONFIG_MACVLAN is not set |
@@ -524,7 +537,6 @@ CONFIG_NETDEV_1000=y | |||
524 | # CONFIG_DL2K is not set | 537 | # CONFIG_DL2K is not set |
525 | # CONFIG_E1000 is not set | 538 | # CONFIG_E1000 is not set |
526 | # CONFIG_E1000E is not set | 539 | # CONFIG_E1000E is not set |
527 | # CONFIG_E1000E_ENABLED is not set | ||
528 | # CONFIG_IP1000 is not set | 540 | # CONFIG_IP1000 is not set |
529 | # CONFIG_IGB is not set | 541 | # CONFIG_IGB is not set |
530 | # CONFIG_NS83820 is not set | 542 | # CONFIG_NS83820 is not set |
@@ -538,10 +550,10 @@ CONFIG_NETDEV_1000=y | |||
538 | # CONFIG_TIGON3 is not set | 550 | # CONFIG_TIGON3 is not set |
539 | # CONFIG_BNX2 is not set | 551 | # CONFIG_BNX2 is not set |
540 | CONFIG_GIANFAR=y | 552 | CONFIG_GIANFAR=y |
541 | CONFIG_GFAR_NAPI=y | ||
542 | # CONFIG_UCC_GETH is not set | 553 | # CONFIG_UCC_GETH is not set |
543 | # CONFIG_QLA3XXX is not set | 554 | # CONFIG_QLA3XXX is not set |
544 | # CONFIG_ATL1 is not set | 555 | # CONFIG_ATL1 is not set |
556 | # CONFIG_ATL1E is not set | ||
545 | CONFIG_NETDEV_10000=y | 557 | CONFIG_NETDEV_10000=y |
546 | # CONFIG_CHELSIO_T1 is not set | 558 | # CONFIG_CHELSIO_T1 is not set |
547 | # CONFIG_CHELSIO_T3 is not set | 559 | # CONFIG_CHELSIO_T3 is not set |
@@ -648,42 +660,63 @@ CONFIG_DEVPORT=y | |||
648 | CONFIG_I2C=y | 660 | CONFIG_I2C=y |
649 | CONFIG_I2C_BOARDINFO=y | 661 | CONFIG_I2C_BOARDINFO=y |
650 | CONFIG_I2C_CHARDEV=y | 662 | CONFIG_I2C_CHARDEV=y |
663 | CONFIG_I2C_HELPER_AUTO=y | ||
651 | 664 | ||
652 | # | 665 | # |
653 | # I2C Hardware Bus support | 666 | # I2C Hardware Bus support |
654 | # | 667 | # |
668 | |||
669 | # | ||
670 | # PC SMBus host controller drivers | ||
671 | # | ||
655 | # CONFIG_I2C_ALI1535 is not set | 672 | # CONFIG_I2C_ALI1535 is not set |
656 | # CONFIG_I2C_ALI1563 is not set | 673 | # CONFIG_I2C_ALI1563 is not set |
657 | # CONFIG_I2C_ALI15X3 is not set | 674 | # CONFIG_I2C_ALI15X3 is not set |
658 | # CONFIG_I2C_AMD756 is not set | 675 | # CONFIG_I2C_AMD756 is not set |
659 | # CONFIG_I2C_AMD8111 is not set | 676 | # CONFIG_I2C_AMD8111 is not set |
660 | # CONFIG_I2C_I801 is not set | 677 | # CONFIG_I2C_I801 is not set |
661 | # CONFIG_I2C_I810 is not set | 678 | # CONFIG_I2C_ISCH is not set |
662 | # CONFIG_I2C_PIIX4 is not set | 679 | # CONFIG_I2C_PIIX4 is not set |
663 | CONFIG_I2C_MPC=y | ||
664 | # CONFIG_I2C_NFORCE2 is not set | 680 | # CONFIG_I2C_NFORCE2 is not set |
665 | # CONFIG_I2C_OCORES is not set | ||
666 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
667 | # CONFIG_I2C_PROSAVAGE is not set | ||
668 | # CONFIG_I2C_SAVAGE4 is not set | ||
669 | # CONFIG_I2C_SIMTEC is not set | ||
670 | # CONFIG_I2C_SIS5595 is not set | 681 | # CONFIG_I2C_SIS5595 is not set |
671 | # CONFIG_I2C_SIS630 is not set | 682 | # CONFIG_I2C_SIS630 is not set |
672 | # CONFIG_I2C_SIS96X is not set | 683 | # CONFIG_I2C_SIS96X is not set |
673 | # CONFIG_I2C_TAOS_EVM is not set | ||
674 | # CONFIG_I2C_STUB is not set | ||
675 | # CONFIG_I2C_VIA is not set | 684 | # CONFIG_I2C_VIA is not set |
676 | # CONFIG_I2C_VIAPRO is not set | 685 | # CONFIG_I2C_VIAPRO is not set |
686 | |||
687 | # | ||
688 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
689 | # | ||
690 | CONFIG_I2C_MPC=y | ||
691 | # CONFIG_I2C_OCORES is not set | ||
692 | # CONFIG_I2C_SIMTEC is not set | ||
693 | |||
694 | # | ||
695 | # External I2C/SMBus adapter drivers | ||
696 | # | ||
697 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
698 | # CONFIG_I2C_TAOS_EVM is not set | ||
699 | |||
700 | # | ||
701 | # Graphics adapter I2C/DDC channel drivers | ||
702 | # | ||
677 | # CONFIG_I2C_VOODOO3 is not set | 703 | # CONFIG_I2C_VOODOO3 is not set |
704 | |||
705 | # | ||
706 | # Other I2C/SMBus bus drivers | ||
707 | # | ||
678 | # CONFIG_I2C_PCA_PLATFORM is not set | 708 | # CONFIG_I2C_PCA_PLATFORM is not set |
709 | # CONFIG_I2C_STUB is not set | ||
679 | 710 | ||
680 | # | 711 | # |
681 | # Miscellaneous I2C Chip support | 712 | # Miscellaneous I2C Chip support |
682 | # | 713 | # |
683 | # CONFIG_DS1682 is not set | 714 | # CONFIG_DS1682 is not set |
715 | # CONFIG_AT24 is not set | ||
684 | # CONFIG_SENSORS_EEPROM is not set | 716 | # CONFIG_SENSORS_EEPROM is not set |
685 | # CONFIG_SENSORS_PCF8574 is not set | 717 | # CONFIG_SENSORS_PCF8574 is not set |
686 | # CONFIG_PCF8575 is not set | 718 | # CONFIG_PCF8575 is not set |
719 | # CONFIG_SENSORS_PCA9539 is not set | ||
687 | # CONFIG_SENSORS_PCF8591 is not set | 720 | # CONFIG_SENSORS_PCF8591 is not set |
688 | # CONFIG_SENSORS_MAX6875 is not set | 721 | # CONFIG_SENSORS_MAX6875 is not set |
689 | # CONFIG_SENSORS_TSL2550 is not set | 722 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -692,10 +725,13 @@ CONFIG_I2C_MPC=y | |||
692 | # CONFIG_I2C_DEBUG_BUS is not set | 725 | # CONFIG_I2C_DEBUG_BUS is not set |
693 | # CONFIG_I2C_DEBUG_CHIP is not set | 726 | # CONFIG_I2C_DEBUG_CHIP is not set |
694 | # CONFIG_SPI is not set | 727 | # CONFIG_SPI is not set |
728 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
729 | # CONFIG_GPIOLIB is not set | ||
695 | # CONFIG_W1 is not set | 730 | # CONFIG_W1 is not set |
696 | # CONFIG_POWER_SUPPLY is not set | 731 | # CONFIG_POWER_SUPPLY is not set |
697 | CONFIG_HWMON=y | 732 | CONFIG_HWMON=y |
698 | # CONFIG_HWMON_VID is not set | 733 | # CONFIG_HWMON_VID is not set |
734 | # CONFIG_SENSORS_AD7414 is not set | ||
699 | # CONFIG_SENSORS_AD7418 is not set | 735 | # CONFIG_SENSORS_AD7418 is not set |
700 | # CONFIG_SENSORS_ADM1021 is not set | 736 | # CONFIG_SENSORS_ADM1021 is not set |
701 | # CONFIG_SENSORS_ADM1025 is not set | 737 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -749,6 +785,7 @@ CONFIG_HWMON=y | |||
749 | # CONFIG_SENSORS_W83627EHF is not set | 785 | # CONFIG_SENSORS_W83627EHF is not set |
750 | # CONFIG_HWMON_DEBUG_CHIP is not set | 786 | # CONFIG_HWMON_DEBUG_CHIP is not set |
751 | # CONFIG_THERMAL is not set | 787 | # CONFIG_THERMAL is not set |
788 | # CONFIG_THERMAL_HWMON is not set | ||
752 | CONFIG_WATCHDOG=y | 789 | CONFIG_WATCHDOG=y |
753 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 790 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
754 | 791 | ||
@@ -756,6 +793,7 @@ CONFIG_WATCHDOG=y | |||
756 | # Watchdog Device Drivers | 793 | # Watchdog Device Drivers |
757 | # | 794 | # |
758 | # CONFIG_SOFT_WATCHDOG is not set | 795 | # CONFIG_SOFT_WATCHDOG is not set |
796 | # CONFIG_ALIM7101_WDT is not set | ||
759 | # CONFIG_BOOKE_WDT is not set | 797 | # CONFIG_BOOKE_WDT is not set |
760 | 798 | ||
761 | # | 799 | # |
@@ -773,8 +811,10 @@ CONFIG_SSB_POSSIBLE=y | |||
773 | # | 811 | # |
774 | # Multifunction device drivers | 812 | # Multifunction device drivers |
775 | # | 813 | # |
814 | # CONFIG_MFD_CORE is not set | ||
776 | # CONFIG_MFD_SM501 is not set | 815 | # CONFIG_MFD_SM501 is not set |
777 | # CONFIG_HTC_PASIC3 is not set | 816 | # CONFIG_HTC_PASIC3 is not set |
817 | # CONFIG_MFD_TMIO is not set | ||
778 | 818 | ||
779 | # | 819 | # |
780 | # Multimedia devices | 820 | # Multimedia devices |
@@ -806,10 +846,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
806 | # Display device support | 846 | # Display device support |
807 | # | 847 | # |
808 | # CONFIG_DISPLAY_SUPPORT is not set | 848 | # CONFIG_DISPLAY_SUPPORT is not set |
809 | |||
810 | # | ||
811 | # Sound | ||
812 | # | ||
813 | # CONFIG_SOUND is not set | 849 | # CONFIG_SOUND is not set |
814 | CONFIG_HID_SUPPORT=y | 850 | CONFIG_HID_SUPPORT=y |
815 | CONFIG_HID=y | 851 | CONFIG_HID=y |
@@ -824,6 +860,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
824 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 860 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
825 | 861 | ||
826 | # | 862 | # |
863 | # Enable Host or Gadget support to see Inventra options | ||
864 | # | ||
865 | |||
866 | # | ||
827 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 867 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
828 | # | 868 | # |
829 | # CONFIG_USB_GADGET is not set | 869 | # CONFIG_USB_GADGET is not set |
@@ -862,6 +902,7 @@ CONFIG_RTC_DRV_DS1374=y | |||
862 | # CONFIG_RTC_DRV_PCF8583 is not set | 902 | # CONFIG_RTC_DRV_PCF8583 is not set |
863 | # CONFIG_RTC_DRV_M41T80 is not set | 903 | # CONFIG_RTC_DRV_M41T80 is not set |
864 | # CONFIG_RTC_DRV_S35390A is not set | 904 | # CONFIG_RTC_DRV_S35390A is not set |
905 | # CONFIG_RTC_DRV_FM3130 is not set | ||
865 | 906 | ||
866 | # | 907 | # |
867 | # SPI RTC drivers | 908 | # SPI RTC drivers |
@@ -950,6 +991,7 @@ CONFIG_TMPFS=y | |||
950 | # CONFIG_CRAMFS is not set | 991 | # CONFIG_CRAMFS is not set |
951 | # CONFIG_VXFS_FS is not set | 992 | # CONFIG_VXFS_FS is not set |
952 | # CONFIG_MINIX_FS is not set | 993 | # CONFIG_MINIX_FS is not set |
994 | # CONFIG_OMFS_FS is not set | ||
953 | # CONFIG_HPFS_FS is not set | 995 | # CONFIG_HPFS_FS is not set |
954 | # CONFIG_QNX4FS_FS is not set | 996 | # CONFIG_QNX4FS_FS is not set |
955 | # CONFIG_ROMFS_FS is not set | 997 | # CONFIG_ROMFS_FS is not set |
@@ -960,14 +1002,13 @@ CONFIG_NFS_FS=y | |||
960 | CONFIG_NFS_V3=y | 1002 | CONFIG_NFS_V3=y |
961 | # CONFIG_NFS_V3_ACL is not set | 1003 | # CONFIG_NFS_V3_ACL is not set |
962 | CONFIG_NFS_V4=y | 1004 | CONFIG_NFS_V4=y |
963 | # CONFIG_NFSD is not set | ||
964 | CONFIG_ROOT_NFS=y | 1005 | CONFIG_ROOT_NFS=y |
1006 | # CONFIG_NFSD is not set | ||
965 | CONFIG_LOCKD=y | 1007 | CONFIG_LOCKD=y |
966 | CONFIG_LOCKD_V4=y | 1008 | CONFIG_LOCKD_V4=y |
967 | CONFIG_NFS_COMMON=y | 1009 | CONFIG_NFS_COMMON=y |
968 | CONFIG_SUNRPC=y | 1010 | CONFIG_SUNRPC=y |
969 | CONFIG_SUNRPC_GSS=y | 1011 | CONFIG_SUNRPC_GSS=y |
970 | # CONFIG_SUNRPC_BIND34 is not set | ||
971 | CONFIG_RPCSEC_GSS_KRB5=y | 1012 | CONFIG_RPCSEC_GSS_KRB5=y |
972 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1013 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
973 | # CONFIG_SMB_FS is not set | 1014 | # CONFIG_SMB_FS is not set |
@@ -995,6 +1036,7 @@ CONFIG_PARTITION_ADVANCED=y | |||
995 | # CONFIG_SYSV68_PARTITION is not set | 1036 | # CONFIG_SYSV68_PARTITION is not set |
996 | # CONFIG_NLS is not set | 1037 | # CONFIG_NLS is not set |
997 | # CONFIG_DLM is not set | 1038 | # CONFIG_DLM is not set |
1039 | # CONFIG_QE_GPIO is not set | ||
998 | 1040 | ||
999 | # | 1041 | # |
1000 | # Library routines | 1042 | # Library routines |
@@ -1003,6 +1045,7 @@ CONFIG_BITREVERSE=y | |||
1003 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1045 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1004 | # CONFIG_CRC_CCITT is not set | 1046 | # CONFIG_CRC_CCITT is not set |
1005 | # CONFIG_CRC16 is not set | 1047 | # CONFIG_CRC16 is not set |
1048 | # CONFIG_CRC_T10DIF is not set | ||
1006 | # CONFIG_CRC_ITU_T is not set | 1049 | # CONFIG_CRC_ITU_T is not set |
1007 | CONFIG_CRC32=y | 1050 | CONFIG_CRC32=y |
1008 | # CONFIG_CRC7 is not set | 1051 | # CONFIG_CRC7 is not set |
@@ -1027,6 +1070,8 @@ CONFIG_FRAME_WARN=1024 | |||
1027 | CONFIG_DEBUG_KERNEL=y | 1070 | CONFIG_DEBUG_KERNEL=y |
1028 | # CONFIG_DEBUG_SHIRQ is not set | 1071 | # CONFIG_DEBUG_SHIRQ is not set |
1029 | CONFIG_DETECT_SOFTLOCKUP=y | 1072 | CONFIG_DETECT_SOFTLOCKUP=y |
1073 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1074 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1030 | CONFIG_SCHED_DEBUG=y | 1075 | CONFIG_SCHED_DEBUG=y |
1031 | # CONFIG_SCHEDSTATS is not set | 1076 | # CONFIG_SCHEDSTATS is not set |
1032 | # CONFIG_TIMER_STATS is not set | 1077 | # CONFIG_TIMER_STATS is not set |
@@ -1044,17 +1089,28 @@ CONFIG_SCHED_DEBUG=y | |||
1044 | # CONFIG_DEBUG_INFO is not set | 1089 | # CONFIG_DEBUG_INFO is not set |
1045 | # CONFIG_DEBUG_VM is not set | 1090 | # CONFIG_DEBUG_VM is not set |
1046 | # CONFIG_DEBUG_WRITECOUNT is not set | 1091 | # CONFIG_DEBUG_WRITECOUNT is not set |
1092 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1047 | # CONFIG_DEBUG_LIST is not set | 1093 | # CONFIG_DEBUG_LIST is not set |
1048 | # CONFIG_DEBUG_SG is not set | 1094 | # CONFIG_DEBUG_SG is not set |
1049 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1095 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1050 | # CONFIG_RCU_TORTURE_TEST is not set | 1096 | # CONFIG_RCU_TORTURE_TEST is not set |
1051 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1097 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1052 | # CONFIG_FAULT_INJECTION is not set | 1098 | # CONFIG_FAULT_INJECTION is not set |
1099 | # CONFIG_LATENCYTOP is not set | ||
1100 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1101 | CONFIG_HAVE_FTRACE=y | ||
1102 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1103 | # CONFIG_FTRACE is not set | ||
1104 | # CONFIG_SCHED_TRACER is not set | ||
1105 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1053 | # CONFIG_SAMPLES is not set | 1106 | # CONFIG_SAMPLES is not set |
1107 | CONFIG_HAVE_ARCH_KGDB=y | ||
1108 | # CONFIG_KGDB is not set | ||
1054 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1109 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1055 | # CONFIG_DEBUG_STACK_USAGE is not set | 1110 | # CONFIG_DEBUG_STACK_USAGE is not set |
1056 | # CONFIG_DEBUG_PAGEALLOC is not set | 1111 | # CONFIG_DEBUG_PAGEALLOC is not set |
1057 | CONFIG_DEBUGGER=y | 1112 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1113 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1058 | # CONFIG_XMON is not set | 1114 | # CONFIG_XMON is not set |
1059 | # CONFIG_IRQSTACKS is not set | 1115 | # CONFIG_IRQSTACKS is not set |
1060 | # CONFIG_BDI_SWITCH is not set | 1116 | # CONFIG_BDI_SWITCH is not set |
@@ -1122,6 +1178,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1122 | # CONFIG_CRYPTO_MD4 is not set | 1178 | # CONFIG_CRYPTO_MD4 is not set |
1123 | CONFIG_CRYPTO_MD5=y | 1179 | CONFIG_CRYPTO_MD5=y |
1124 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1180 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1181 | # CONFIG_CRYPTO_RMD128 is not set | ||
1182 | # CONFIG_CRYPTO_RMD160 is not set | ||
1183 | # CONFIG_CRYPTO_RMD256 is not set | ||
1184 | # CONFIG_CRYPTO_RMD320 is not set | ||
1125 | # CONFIG_CRYPTO_SHA1 is not set | 1185 | # CONFIG_CRYPTO_SHA1 is not set |
1126 | # CONFIG_CRYPTO_SHA256 is not set | 1186 | # CONFIG_CRYPTO_SHA256 is not set |
1127 | # CONFIG_CRYPTO_SHA512 is not set | 1187 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1154,6 +1214,7 @@ CONFIG_CRYPTO_DES=y | |||
1154 | # CONFIG_CRYPTO_LZO is not set | 1214 | # CONFIG_CRYPTO_LZO is not set |
1155 | CONFIG_CRYPTO_HW=y | 1215 | CONFIG_CRYPTO_HW=y |
1156 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1216 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1217 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1157 | # CONFIG_PPC_CLOCK is not set | 1218 | # CONFIG_PPC_CLOCK is not set |
1158 | CONFIG_PPC_LIB_RHEAP=y | 1219 | CONFIG_PPC_LIB_RHEAP=y |
1159 | # CONFIG_VIRTUALIZATION is not set | 1220 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig index 164fd9606ee6..eda45bb8a13f 100644 --- a/arch/powerpc/configs/85xx/mpc8572_ds_defconfig +++ b/arch/powerpc/configs/85xx/mpc8572_ds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:35 2008 | 4 | # Thu Aug 21 07:21:42 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -92,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
92 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
93 | CONFIG_EMBEDDED=y | 95 | CONFIG_EMBEDDED=y |
94 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
96 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
97 | CONFIG_KALLSYMS_ALL=y | 98 | CONFIG_KALLSYMS_ALL=y |
98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 99 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -118,10 +119,16 @@ CONFIG_SLUB=y | |||
118 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
119 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
120 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
121 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
122 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
123 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
129 | # CONFIG_HAVE_CLK is not set | ||
124 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
125 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
126 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
127 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
@@ -138,6 +145,7 @@ CONFIG_LBD=y | |||
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
139 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
140 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
141 | 149 | ||
142 | # | 150 | # |
143 | # IO Schedulers | 151 | # IO Schedulers |
@@ -156,8 +164,6 @@ CONFIG_CLASSIC_RCU=y | |||
156 | # | 164 | # |
157 | # Platform support | 165 | # Platform support |
158 | # | 166 | # |
159 | # CONFIG_PPC_MPC512x is not set | ||
160 | # CONFIG_PPC_MPC5121 is not set | ||
161 | # CONFIG_PPC_CELL is not set | 167 | # CONFIG_PPC_CELL is not set |
162 | # CONFIG_PPC_CELL_NATIVE is not set | 168 | # CONFIG_PPC_CELL_NATIVE is not set |
163 | # CONFIG_PQ2ADS is not set | 169 | # CONFIG_PQ2ADS is not set |
@@ -166,11 +172,13 @@ CONFIG_MPC85xx=y | |||
166 | # CONFIG_MPC8560_ADS is not set | 172 | # CONFIG_MPC8560_ADS is not set |
167 | # CONFIG_MPC85xx_CDS is not set | 173 | # CONFIG_MPC85xx_CDS is not set |
168 | # CONFIG_MPC85xx_MDS is not set | 174 | # CONFIG_MPC85xx_MDS is not set |
175 | # CONFIG_MPC8536_DS is not set | ||
169 | CONFIG_MPC85xx_DS=y | 176 | CONFIG_MPC85xx_DS=y |
170 | # CONFIG_KSI8560 is not set | 177 | # CONFIG_KSI8560 is not set |
171 | # CONFIG_STX_GP3 is not set | 178 | # CONFIG_STX_GP3 is not set |
172 | # CONFIG_TQM8540 is not set | 179 | # CONFIG_TQM8540 is not set |
173 | # CONFIG_TQM8541 is not set | 180 | # CONFIG_TQM8541 is not set |
181 | # CONFIG_TQM8548 is not set | ||
174 | # CONFIG_TQM8555 is not set | 182 | # CONFIG_TQM8555 is not set |
175 | # CONFIG_TQM8560 is not set | 183 | # CONFIG_TQM8560 is not set |
176 | # CONFIG_SBC8548 is not set | 184 | # CONFIG_SBC8548 is not set |
@@ -202,7 +210,7 @@ CONFIG_HZ_250=y | |||
202 | # CONFIG_HZ_300 is not set | 210 | # CONFIG_HZ_300 is not set |
203 | # CONFIG_HZ_1000 is not set | 211 | # CONFIG_HZ_1000 is not set |
204 | CONFIG_HZ=250 | 212 | CONFIG_HZ=250 |
205 | # CONFIG_SCHED_HRTICK is not set | 213 | CONFIG_SCHED_HRTICK=y |
206 | CONFIG_PREEMPT_NONE=y | 214 | CONFIG_PREEMPT_NONE=y |
207 | # CONFIG_PREEMPT_VOLUNTARY is not set | 215 | # CONFIG_PREEMPT_VOLUNTARY is not set |
208 | # CONFIG_PREEMPT is not set | 216 | # CONFIG_PREEMPT is not set |
@@ -225,6 +233,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 233 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
226 | CONFIG_PAGEFLAGS_EXTENDED=y | 234 | CONFIG_PAGEFLAGS_EXTENDED=y |
227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 235 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
236 | CONFIG_MIGRATION=y | ||
228 | # CONFIG_RESOURCES_64BIT is not set | 237 | # CONFIG_RESOURCES_64BIT is not set |
229 | CONFIG_ZONE_DMA_FLAG=1 | 238 | CONFIG_ZONE_DMA_FLAG=1 |
230 | CONFIG_BOUNCE=y | 239 | CONFIG_BOUNCE=y |
@@ -232,6 +241,7 @@ CONFIG_VIRT_TO_BUS=y | |||
232 | CONFIG_FORCE_MAX_ZONEORDER=11 | 241 | CONFIG_FORCE_MAX_ZONEORDER=11 |
233 | CONFIG_PROC_DEVICETREE=y | 242 | CONFIG_PROC_DEVICETREE=y |
234 | # CONFIG_CMDLINE_BOOL is not set | 243 | # CONFIG_CMDLINE_BOOL is not set |
244 | CONFIG_EXTRA_TARGETS="" | ||
235 | # CONFIG_PM is not set | 245 | # CONFIG_PM is not set |
236 | CONFIG_SECCOMP=y | 246 | CONFIG_SECCOMP=y |
237 | CONFIG_ISA_DMA_API=y | 247 | CONFIG_ISA_DMA_API=y |
@@ -244,6 +254,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
244 | CONFIG_PPC_INDIRECT_PCI=y | 254 | CONFIG_PPC_INDIRECT_PCI=y |
245 | CONFIG_FSL_SOC=y | 255 | CONFIG_FSL_SOC=y |
246 | CONFIG_FSL_PCI=y | 256 | CONFIG_FSL_PCI=y |
257 | CONFIG_PPC_PCI_CHOICE=y | ||
247 | CONFIG_PCI=y | 258 | CONFIG_PCI=y |
248 | CONFIG_PCI_DOMAINS=y | 259 | CONFIG_PCI_DOMAINS=y |
249 | CONFIG_PCI_SYSCALL=y | 260 | CONFIG_PCI_SYSCALL=y |
@@ -270,10 +281,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
270 | CONFIG_PHYSICAL_START=0x00000000 | 281 | CONFIG_PHYSICAL_START=0x00000000 |
271 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 282 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
272 | CONFIG_TASK_SIZE=0xc0000000 | 283 | CONFIG_TASK_SIZE=0xc0000000 |
273 | |||
274 | # | ||
275 | # Networking | ||
276 | # | ||
277 | CONFIG_NET=y | 284 | CONFIG_NET=y |
278 | 285 | ||
279 | # | 286 | # |
@@ -399,6 +406,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
399 | CONFIG_STANDALONE=y | 406 | CONFIG_STANDALONE=y |
400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 407 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
401 | CONFIG_FW_LOADER=y | 408 | CONFIG_FW_LOADER=y |
409 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
410 | CONFIG_EXTRA_FIRMWARE="" | ||
402 | # CONFIG_DEBUG_DRIVER is not set | 411 | # CONFIG_DEBUG_DRIVER is not set |
403 | # CONFIG_DEBUG_DEVRES is not set | 412 | # CONFIG_DEBUG_DEVRES is not set |
404 | # CONFIG_SYS_HYPERVISOR is not set | 413 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -425,12 +434,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
425 | # CONFIG_BLK_DEV_XIP is not set | 434 | # CONFIG_BLK_DEV_XIP is not set |
426 | # CONFIG_CDROM_PKTCDVD is not set | 435 | # CONFIG_CDROM_PKTCDVD is not set |
427 | # CONFIG_ATA_OVER_ETH is not set | 436 | # CONFIG_ATA_OVER_ETH is not set |
437 | # CONFIG_BLK_DEV_HD is not set | ||
428 | CONFIG_MISC_DEVICES=y | 438 | CONFIG_MISC_DEVICES=y |
429 | # CONFIG_PHANTOM is not set | 439 | # CONFIG_PHANTOM is not set |
430 | # CONFIG_EEPROM_93CX6 is not set | 440 | # CONFIG_EEPROM_93CX6 is not set |
431 | # CONFIG_SGI_IOC4 is not set | 441 | # CONFIG_SGI_IOC4 is not set |
432 | # CONFIG_TIFM_CORE is not set | 442 | # CONFIG_TIFM_CORE is not set |
433 | # CONFIG_ENCLOSURE_SERVICES is not set | 443 | # CONFIG_ENCLOSURE_SERVICES is not set |
444 | # CONFIG_HP_ILO is not set | ||
434 | CONFIG_HAVE_IDE=y | 445 | CONFIG_HAVE_IDE=y |
435 | # CONFIG_IDE is not set | 446 | # CONFIG_IDE is not set |
436 | 447 | ||
@@ -510,6 +521,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
510 | # CONFIG_SCSI_NSP32 is not set | 521 | # CONFIG_SCSI_NSP32 is not set |
511 | # CONFIG_SCSI_DEBUG is not set | 522 | # CONFIG_SCSI_DEBUG is not set |
512 | # CONFIG_SCSI_SRP is not set | 523 | # CONFIG_SCSI_SRP is not set |
524 | # CONFIG_SCSI_DH is not set | ||
513 | CONFIG_ATA=y | 525 | CONFIG_ATA=y |
514 | # CONFIG_ATA_NONSTANDARD is not set | 526 | # CONFIG_ATA_NONSTANDARD is not set |
515 | CONFIG_SATA_PMP=y | 527 | CONFIG_SATA_PMP=y |
@@ -577,12 +589,15 @@ CONFIG_PATA_ALI=y | |||
577 | # | 589 | # |
578 | # IEEE 1394 (FireWire) support | 590 | # IEEE 1394 (FireWire) support |
579 | # | 591 | # |
592 | |||
593 | # | ||
594 | # Enable only one of the two stacks, unless you know what you are doing | ||
595 | # | ||
580 | # CONFIG_FIREWIRE is not set | 596 | # CONFIG_FIREWIRE is not set |
581 | # CONFIG_IEEE1394 is not set | 597 | # CONFIG_IEEE1394 is not set |
582 | # CONFIG_I2O is not set | 598 | # CONFIG_I2O is not set |
583 | # CONFIG_MACINTOSH_DRIVERS is not set | 599 | # CONFIG_MACINTOSH_DRIVERS is not set |
584 | CONFIG_NETDEVICES=y | 600 | CONFIG_NETDEVICES=y |
585 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
586 | CONFIG_DUMMY=y | 601 | CONFIG_DUMMY=y |
587 | # CONFIG_BONDING is not set | 602 | # CONFIG_BONDING is not set |
588 | # CONFIG_MACVLAN is not set | 603 | # CONFIG_MACVLAN is not set |
@@ -626,7 +641,6 @@ CONFIG_NETDEV_1000=y | |||
626 | # CONFIG_DL2K is not set | 641 | # CONFIG_DL2K is not set |
627 | # CONFIG_E1000 is not set | 642 | # CONFIG_E1000 is not set |
628 | # CONFIG_E1000E is not set | 643 | # CONFIG_E1000E is not set |
629 | # CONFIG_E1000E_ENABLED is not set | ||
630 | # CONFIG_IP1000 is not set | 644 | # CONFIG_IP1000 is not set |
631 | # CONFIG_IGB is not set | 645 | # CONFIG_IGB is not set |
632 | # CONFIG_NS83820 is not set | 646 | # CONFIG_NS83820 is not set |
@@ -640,9 +654,9 @@ CONFIG_NETDEV_1000=y | |||
640 | # CONFIG_TIGON3 is not set | 654 | # CONFIG_TIGON3 is not set |
641 | # CONFIG_BNX2 is not set | 655 | # CONFIG_BNX2 is not set |
642 | CONFIG_GIANFAR=y | 656 | CONFIG_GIANFAR=y |
643 | CONFIG_GFAR_NAPI=y | ||
644 | # CONFIG_QLA3XXX is not set | 657 | # CONFIG_QLA3XXX is not set |
645 | # CONFIG_ATL1 is not set | 658 | # CONFIG_ATL1 is not set |
659 | # CONFIG_ATL1E is not set | ||
646 | CONFIG_NETDEV_10000=y | 660 | CONFIG_NETDEV_10000=y |
647 | # CONFIG_CHELSIO_T1 is not set | 661 | # CONFIG_CHELSIO_T1 is not set |
648 | # CONFIG_CHELSIO_T3 is not set | 662 | # CONFIG_CHELSIO_T3 is not set |
@@ -719,12 +733,14 @@ CONFIG_SERIO_SERPORT=y | |||
719 | # CONFIG_SERIO_PCIPS2 is not set | 733 | # CONFIG_SERIO_PCIPS2 is not set |
720 | CONFIG_SERIO_LIBPS2=y | 734 | CONFIG_SERIO_LIBPS2=y |
721 | # CONFIG_SERIO_RAW is not set | 735 | # CONFIG_SERIO_RAW is not set |
736 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
722 | # CONFIG_GAMEPORT is not set | 737 | # CONFIG_GAMEPORT is not set |
723 | 738 | ||
724 | # | 739 | # |
725 | # Character devices | 740 | # Character devices |
726 | # | 741 | # |
727 | CONFIG_VT=y | 742 | CONFIG_VT=y |
743 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
728 | CONFIG_VT_CONSOLE=y | 744 | CONFIG_VT_CONSOLE=y |
729 | CONFIG_HW_CONSOLE=y | 745 | CONFIG_HW_CONSOLE=y |
730 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 746 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -758,7 +774,7 @@ CONFIG_UNIX98_PTYS=y | |||
758 | CONFIG_LEGACY_PTYS=y | 774 | CONFIG_LEGACY_PTYS=y |
759 | CONFIG_LEGACY_PTY_COUNT=256 | 775 | CONFIG_LEGACY_PTY_COUNT=256 |
760 | # CONFIG_IPMI_HANDLER is not set | 776 | # CONFIG_IPMI_HANDLER is not set |
761 | # CONFIG_HW_RANDOM is not set | 777 | CONFIG_HW_RANDOM=y |
762 | CONFIG_NVRAM=y | 778 | CONFIG_NVRAM=y |
763 | # CONFIG_R3964 is not set | 779 | # CONFIG_R3964 is not set |
764 | # CONFIG_APPLICOM is not set | 780 | # CONFIG_APPLICOM is not set |
@@ -768,43 +784,64 @@ CONFIG_DEVPORT=y | |||
768 | CONFIG_I2C=y | 784 | CONFIG_I2C=y |
769 | CONFIG_I2C_BOARDINFO=y | 785 | CONFIG_I2C_BOARDINFO=y |
770 | # CONFIG_I2C_CHARDEV is not set | 786 | # CONFIG_I2C_CHARDEV is not set |
787 | CONFIG_I2C_HELPER_AUTO=y | ||
771 | 788 | ||
772 | # | 789 | # |
773 | # I2C Hardware Bus support | 790 | # I2C Hardware Bus support |
774 | # | 791 | # |
792 | |||
793 | # | ||
794 | # PC SMBus host controller drivers | ||
795 | # | ||
775 | # CONFIG_I2C_ALI1535 is not set | 796 | # CONFIG_I2C_ALI1535 is not set |
776 | # CONFIG_I2C_ALI1563 is not set | 797 | # CONFIG_I2C_ALI1563 is not set |
777 | # CONFIG_I2C_ALI15X3 is not set | 798 | # CONFIG_I2C_ALI15X3 is not set |
778 | # CONFIG_I2C_AMD756 is not set | 799 | # CONFIG_I2C_AMD756 is not set |
779 | # CONFIG_I2C_AMD8111 is not set | 800 | # CONFIG_I2C_AMD8111 is not set |
780 | # CONFIG_I2C_I801 is not set | 801 | # CONFIG_I2C_I801 is not set |
781 | # CONFIG_I2C_I810 is not set | 802 | # CONFIG_I2C_ISCH is not set |
782 | # CONFIG_I2C_PIIX4 is not set | 803 | # CONFIG_I2C_PIIX4 is not set |
783 | CONFIG_I2C_MPC=y | ||
784 | # CONFIG_I2C_NFORCE2 is not set | 804 | # CONFIG_I2C_NFORCE2 is not set |
785 | # CONFIG_I2C_OCORES is not set | ||
786 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
787 | # CONFIG_I2C_PROSAVAGE is not set | ||
788 | # CONFIG_I2C_SAVAGE4 is not set | ||
789 | # CONFIG_I2C_SIMTEC is not set | ||
790 | # CONFIG_I2C_SIS5595 is not set | 805 | # CONFIG_I2C_SIS5595 is not set |
791 | # CONFIG_I2C_SIS630 is not set | 806 | # CONFIG_I2C_SIS630 is not set |
792 | # CONFIG_I2C_SIS96X is not set | 807 | # CONFIG_I2C_SIS96X is not set |
793 | # CONFIG_I2C_TAOS_EVM is not set | ||
794 | # CONFIG_I2C_STUB is not set | ||
795 | # CONFIG_I2C_TINY_USB is not set | ||
796 | # CONFIG_I2C_VIA is not set | 808 | # CONFIG_I2C_VIA is not set |
797 | # CONFIG_I2C_VIAPRO is not set | 809 | # CONFIG_I2C_VIAPRO is not set |
810 | |||
811 | # | ||
812 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
813 | # | ||
814 | CONFIG_I2C_MPC=y | ||
815 | # CONFIG_I2C_OCORES is not set | ||
816 | # CONFIG_I2C_SIMTEC is not set | ||
817 | |||
818 | # | ||
819 | # External I2C/SMBus adapter drivers | ||
820 | # | ||
821 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
822 | # CONFIG_I2C_TAOS_EVM is not set | ||
823 | # CONFIG_I2C_TINY_USB is not set | ||
824 | |||
825 | # | ||
826 | # Graphics adapter I2C/DDC channel drivers | ||
827 | # | ||
798 | # CONFIG_I2C_VOODOO3 is not set | 828 | # CONFIG_I2C_VOODOO3 is not set |
829 | |||
830 | # | ||
831 | # Other I2C/SMBus bus drivers | ||
832 | # | ||
799 | # CONFIG_I2C_PCA_PLATFORM is not set | 833 | # CONFIG_I2C_PCA_PLATFORM is not set |
834 | # CONFIG_I2C_STUB is not set | ||
800 | 835 | ||
801 | # | 836 | # |
802 | # Miscellaneous I2C Chip support | 837 | # Miscellaneous I2C Chip support |
803 | # | 838 | # |
804 | # CONFIG_DS1682 is not set | 839 | # CONFIG_DS1682 is not set |
840 | # CONFIG_AT24 is not set | ||
805 | CONFIG_SENSORS_EEPROM=y | 841 | CONFIG_SENSORS_EEPROM=y |
806 | # CONFIG_SENSORS_PCF8574 is not set | 842 | # CONFIG_SENSORS_PCF8574 is not set |
807 | # CONFIG_PCF8575 is not set | 843 | # CONFIG_PCF8575 is not set |
844 | # CONFIG_SENSORS_PCA9539 is not set | ||
808 | # CONFIG_SENSORS_PCF8591 is not set | 845 | # CONFIG_SENSORS_PCF8591 is not set |
809 | # CONFIG_SENSORS_MAX6875 is not set | 846 | # CONFIG_SENSORS_MAX6875 is not set |
810 | # CONFIG_SENSORS_TSL2550 is not set | 847 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -813,10 +850,13 @@ CONFIG_SENSORS_EEPROM=y | |||
813 | # CONFIG_I2C_DEBUG_BUS is not set | 850 | # CONFIG_I2C_DEBUG_BUS is not set |
814 | # CONFIG_I2C_DEBUG_CHIP is not set | 851 | # CONFIG_I2C_DEBUG_CHIP is not set |
815 | # CONFIG_SPI is not set | 852 | # CONFIG_SPI is not set |
853 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
854 | # CONFIG_GPIOLIB is not set | ||
816 | # CONFIG_W1 is not set | 855 | # CONFIG_W1 is not set |
817 | # CONFIG_POWER_SUPPLY is not set | 856 | # CONFIG_POWER_SUPPLY is not set |
818 | # CONFIG_HWMON is not set | 857 | # CONFIG_HWMON is not set |
819 | # CONFIG_THERMAL is not set | 858 | # CONFIG_THERMAL is not set |
859 | # CONFIG_THERMAL_HWMON is not set | ||
820 | # CONFIG_WATCHDOG is not set | 860 | # CONFIG_WATCHDOG is not set |
821 | 861 | ||
822 | # | 862 | # |
@@ -828,8 +868,10 @@ CONFIG_SSB_POSSIBLE=y | |||
828 | # | 868 | # |
829 | # Multifunction device drivers | 869 | # Multifunction device drivers |
830 | # | 870 | # |
871 | # CONFIG_MFD_CORE is not set | ||
831 | # CONFIG_MFD_SM501 is not set | 872 | # CONFIG_MFD_SM501 is not set |
832 | # CONFIG_HTC_PASIC3 is not set | 873 | # CONFIG_HTC_PASIC3 is not set |
874 | # CONFIG_MFD_TMIO is not set | ||
833 | 875 | ||
834 | # | 876 | # |
835 | # Multimedia devices | 877 | # Multimedia devices |
@@ -871,6 +913,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
871 | # CONFIG_DVB_TTUSB_BUDGET is not set | 913 | # CONFIG_DVB_TTUSB_BUDGET is not set |
872 | # CONFIG_DVB_TTUSB_DEC is not set | 914 | # CONFIG_DVB_TTUSB_DEC is not set |
873 | # CONFIG_DVB_CINERGYT2 is not set | 915 | # CONFIG_DVB_CINERGYT2 is not set |
916 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
874 | 917 | ||
875 | # | 918 | # |
876 | # Supported FlexCopII (B2C2) Adapters | 919 | # Supported FlexCopII (B2C2) Adapters |
@@ -917,6 +960,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
917 | # CONFIG_DVB_SP887X is not set | 960 | # CONFIG_DVB_SP887X is not set |
918 | # CONFIG_DVB_CX22700 is not set | 961 | # CONFIG_DVB_CX22700 is not set |
919 | # CONFIG_DVB_CX22702 is not set | 962 | # CONFIG_DVB_CX22702 is not set |
963 | # CONFIG_DVB_DRX397XD is not set | ||
920 | # CONFIG_DVB_L64781 is not set | 964 | # CONFIG_DVB_L64781 is not set |
921 | # CONFIG_DVB_TDA1004X is not set | 965 | # CONFIG_DVB_TDA1004X is not set |
922 | # CONFIG_DVB_NXT6000 is not set | 966 | # CONFIG_DVB_NXT6000 is not set |
@@ -984,15 +1028,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
984 | CONFIG_VGA_CONSOLE=y | 1028 | CONFIG_VGA_CONSOLE=y |
985 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1029 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
986 | CONFIG_DUMMY_CONSOLE=y | 1030 | CONFIG_DUMMY_CONSOLE=y |
987 | |||
988 | # | ||
989 | # Sound | ||
990 | # | ||
991 | CONFIG_SOUND=y | 1031 | CONFIG_SOUND=y |
992 | |||
993 | # | ||
994 | # Advanced Linux Sound Architecture | ||
995 | # | ||
996 | CONFIG_SND=y | 1032 | CONFIG_SND=y |
997 | CONFIG_SND_TIMER=y | 1033 | CONFIG_SND_TIMER=y |
998 | CONFIG_SND_PCM=y | 1034 | CONFIG_SND_PCM=y |
@@ -1006,19 +1042,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
1006 | CONFIG_SND_VERBOSE_PROCFS=y | 1042 | CONFIG_SND_VERBOSE_PROCFS=y |
1007 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1043 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1008 | # CONFIG_SND_DEBUG is not set | 1044 | # CONFIG_SND_DEBUG is not set |
1009 | 1045 | CONFIG_SND_VMASTER=y | |
1010 | # | ||
1011 | # Generic devices | ||
1012 | # | ||
1013 | CONFIG_SND_AC97_CODEC=y | 1046 | CONFIG_SND_AC97_CODEC=y |
1047 | CONFIG_SND_DRIVERS=y | ||
1014 | # CONFIG_SND_DUMMY is not set | 1048 | # CONFIG_SND_DUMMY is not set |
1015 | # CONFIG_SND_MTPAV is not set | 1049 | # CONFIG_SND_MTPAV is not set |
1016 | # CONFIG_SND_SERIAL_U16550 is not set | 1050 | # CONFIG_SND_SERIAL_U16550 is not set |
1017 | # CONFIG_SND_MPU401 is not set | 1051 | # CONFIG_SND_MPU401 is not set |
1018 | 1052 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
1019 | # | 1053 | CONFIG_SND_PCI=y |
1020 | # PCI devices | ||
1021 | # | ||
1022 | # CONFIG_SND_AD1889 is not set | 1054 | # CONFIG_SND_AD1889 is not set |
1023 | # CONFIG_SND_ALS300 is not set | 1055 | # CONFIG_SND_ALS300 is not set |
1024 | # CONFIG_SND_ALS4000 is not set | 1056 | # CONFIG_SND_ALS4000 is not set |
@@ -1080,39 +1112,12 @@ CONFIG_SND_INTEL8X0=y | |||
1080 | # CONFIG_SND_VIRTUOSO is not set | 1112 | # CONFIG_SND_VIRTUOSO is not set |
1081 | # CONFIG_SND_VX222 is not set | 1113 | # CONFIG_SND_VX222 is not set |
1082 | # CONFIG_SND_YMFPCI is not set | 1114 | # CONFIG_SND_YMFPCI is not set |
1083 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1115 | CONFIG_SND_PPC=y |
1084 | 1116 | CONFIG_SND_USB=y | |
1085 | # | ||
1086 | # ALSA PowerMac devices | ||
1087 | # | ||
1088 | |||
1089 | # | ||
1090 | # ALSA PowerPC devices | ||
1091 | # | ||
1092 | |||
1093 | # | ||
1094 | # USB devices | ||
1095 | # | ||
1096 | # CONFIG_SND_USB_AUDIO is not set | 1117 | # CONFIG_SND_USB_AUDIO is not set |
1097 | # CONFIG_SND_USB_USX2Y is not set | 1118 | # CONFIG_SND_USB_USX2Y is not set |
1098 | # CONFIG_SND_USB_CAIAQ is not set | 1119 | # CONFIG_SND_USB_CAIAQ is not set |
1099 | |||
1100 | # | ||
1101 | # System on Chip audio support | ||
1102 | # | ||
1103 | # CONFIG_SND_SOC is not set | 1120 | # CONFIG_SND_SOC is not set |
1104 | |||
1105 | # | ||
1106 | # ALSA SoC audio for Freescale SOCs | ||
1107 | # | ||
1108 | |||
1109 | # | ||
1110 | # SoC Audio for the Texas Instruments OMAP | ||
1111 | # | ||
1112 | |||
1113 | # | ||
1114 | # Open Sound System | ||
1115 | # | ||
1116 | # CONFIG_SOUND_PRIME is not set | 1121 | # CONFIG_SOUND_PRIME is not set |
1117 | CONFIG_AC97_BUS=y | 1122 | CONFIG_AC97_BUS=y |
1118 | CONFIG_HID_SUPPORT=y | 1123 | CONFIG_HID_SUPPORT=y |
@@ -1144,6 +1149,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1144 | # CONFIG_USB_OTG is not set | 1149 | # CONFIG_USB_OTG is not set |
1145 | # CONFIG_USB_OTG_WHITELIST is not set | 1150 | # CONFIG_USB_OTG_WHITELIST is not set |
1146 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1151 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1152 | CONFIG_USB_MON=y | ||
1147 | 1153 | ||
1148 | # | 1154 | # |
1149 | # USB Host Controller Drivers | 1155 | # USB Host Controller Drivers |
@@ -1195,6 +1201,7 @@ CONFIG_USB_STORAGE=y | |||
1195 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1201 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1196 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1202 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1197 | # CONFIG_USB_STORAGE_KARMA is not set | 1203 | # CONFIG_USB_STORAGE_KARMA is not set |
1204 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1198 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1205 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1199 | # CONFIG_USB_LIBUSUAL is not set | 1206 | # CONFIG_USB_LIBUSUAL is not set |
1200 | 1207 | ||
@@ -1203,7 +1210,6 @@ CONFIG_USB_STORAGE=y | |||
1203 | # | 1210 | # |
1204 | # CONFIG_USB_MDC800 is not set | 1211 | # CONFIG_USB_MDC800 is not set |
1205 | # CONFIG_USB_MICROTEK is not set | 1212 | # CONFIG_USB_MICROTEK is not set |
1206 | CONFIG_USB_MON=y | ||
1207 | 1213 | ||
1208 | # | 1214 | # |
1209 | # USB port drivers | 1215 | # USB port drivers |
@@ -1216,7 +1222,6 @@ CONFIG_USB_MON=y | |||
1216 | # CONFIG_USB_EMI62 is not set | 1222 | # CONFIG_USB_EMI62 is not set |
1217 | # CONFIG_USB_EMI26 is not set | 1223 | # CONFIG_USB_EMI26 is not set |
1218 | # CONFIG_USB_ADUTUX is not set | 1224 | # CONFIG_USB_ADUTUX is not set |
1219 | # CONFIG_USB_AUERSWALD is not set | ||
1220 | # CONFIG_USB_RIO500 is not set | 1225 | # CONFIG_USB_RIO500 is not set |
1221 | # CONFIG_USB_LEGOTOWER is not set | 1226 | # CONFIG_USB_LEGOTOWER is not set |
1222 | # CONFIG_USB_LCD is not set | 1227 | # CONFIG_USB_LCD is not set |
@@ -1270,6 +1275,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1270 | # CONFIG_RTC_DRV_PCF8583 is not set | 1275 | # CONFIG_RTC_DRV_PCF8583 is not set |
1271 | # CONFIG_RTC_DRV_M41T80 is not set | 1276 | # CONFIG_RTC_DRV_M41T80 is not set |
1272 | # CONFIG_RTC_DRV_S35390A is not set | 1277 | # CONFIG_RTC_DRV_S35390A is not set |
1278 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1273 | 1279 | ||
1274 | # | 1280 | # |
1275 | # SPI RTC drivers | 1281 | # SPI RTC drivers |
@@ -1368,6 +1374,7 @@ CONFIG_EFS_FS=m | |||
1368 | CONFIG_CRAMFS=y | 1374 | CONFIG_CRAMFS=y |
1369 | CONFIG_VXFS_FS=m | 1375 | CONFIG_VXFS_FS=m |
1370 | # CONFIG_MINIX_FS is not set | 1376 | # CONFIG_MINIX_FS is not set |
1377 | # CONFIG_OMFS_FS is not set | ||
1371 | CONFIG_HPFS_FS=m | 1378 | CONFIG_HPFS_FS=m |
1372 | CONFIG_QNX4FS_FS=m | 1379 | CONFIG_QNX4FS_FS=m |
1373 | # CONFIG_ROMFS_FS is not set | 1380 | # CONFIG_ROMFS_FS is not set |
@@ -1380,17 +1387,16 @@ CONFIG_NFS_FS=y | |||
1380 | CONFIG_NFS_V3=y | 1387 | CONFIG_NFS_V3=y |
1381 | # CONFIG_NFS_V3_ACL is not set | 1388 | # CONFIG_NFS_V3_ACL is not set |
1382 | CONFIG_NFS_V4=y | 1389 | CONFIG_NFS_V4=y |
1390 | CONFIG_ROOT_NFS=y | ||
1383 | CONFIG_NFSD=y | 1391 | CONFIG_NFSD=y |
1384 | # CONFIG_NFSD_V3 is not set | 1392 | # CONFIG_NFSD_V3 is not set |
1385 | # CONFIG_NFSD_V4 is not set | 1393 | # CONFIG_NFSD_V4 is not set |
1386 | CONFIG_ROOT_NFS=y | ||
1387 | CONFIG_LOCKD=y | 1394 | CONFIG_LOCKD=y |
1388 | CONFIG_LOCKD_V4=y | 1395 | CONFIG_LOCKD_V4=y |
1389 | CONFIG_EXPORTFS=y | 1396 | CONFIG_EXPORTFS=y |
1390 | CONFIG_NFS_COMMON=y | 1397 | CONFIG_NFS_COMMON=y |
1391 | CONFIG_SUNRPC=y | 1398 | CONFIG_SUNRPC=y |
1392 | CONFIG_SUNRPC_GSS=y | 1399 | CONFIG_SUNRPC_GSS=y |
1393 | # CONFIG_SUNRPC_BIND34 is not set | ||
1394 | CONFIG_RPCSEC_GSS_KRB5=y | 1400 | CONFIG_RPCSEC_GSS_KRB5=y |
1395 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1401 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1396 | # CONFIG_SMB_FS is not set | 1402 | # CONFIG_SMB_FS is not set |
@@ -1469,6 +1475,7 @@ CONFIG_BITREVERSE=y | |||
1469 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1475 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1470 | # CONFIG_CRC_CCITT is not set | 1476 | # CONFIG_CRC_CCITT is not set |
1471 | # CONFIG_CRC16 is not set | 1477 | # CONFIG_CRC16 is not set |
1478 | CONFIG_CRC_T10DIF=y | ||
1472 | CONFIG_CRC_ITU_T=m | 1479 | CONFIG_CRC_ITU_T=m |
1473 | CONFIG_CRC32=y | 1480 | CONFIG_CRC32=y |
1474 | # CONFIG_CRC7 is not set | 1481 | # CONFIG_CRC7 is not set |
@@ -1494,6 +1501,8 @@ CONFIG_FRAME_WARN=1024 | |||
1494 | CONFIG_DEBUG_KERNEL=y | 1501 | CONFIG_DEBUG_KERNEL=y |
1495 | # CONFIG_DEBUG_SHIRQ is not set | 1502 | # CONFIG_DEBUG_SHIRQ is not set |
1496 | CONFIG_DETECT_SOFTLOCKUP=y | 1503 | CONFIG_DETECT_SOFTLOCKUP=y |
1504 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1505 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1497 | CONFIG_SCHED_DEBUG=y | 1506 | CONFIG_SCHED_DEBUG=y |
1498 | # CONFIG_SCHEDSTATS is not set | 1507 | # CONFIG_SCHEDSTATS is not set |
1499 | # CONFIG_TIMER_STATS is not set | 1508 | # CONFIG_TIMER_STATS is not set |
@@ -1512,17 +1521,29 @@ CONFIG_SCHED_DEBUG=y | |||
1512 | CONFIG_DEBUG_INFO=y | 1521 | CONFIG_DEBUG_INFO=y |
1513 | # CONFIG_DEBUG_VM is not set | 1522 | # CONFIG_DEBUG_VM is not set |
1514 | # CONFIG_DEBUG_WRITECOUNT is not set | 1523 | # CONFIG_DEBUG_WRITECOUNT is not set |
1524 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1515 | # CONFIG_DEBUG_LIST is not set | 1525 | # CONFIG_DEBUG_LIST is not set |
1516 | # CONFIG_DEBUG_SG is not set | 1526 | # CONFIG_DEBUG_SG is not set |
1517 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1527 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1518 | # CONFIG_RCU_TORTURE_TEST is not set | 1528 | # CONFIG_RCU_TORTURE_TEST is not set |
1519 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1529 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1520 | # CONFIG_FAULT_INJECTION is not set | 1530 | # CONFIG_FAULT_INJECTION is not set |
1531 | # CONFIG_LATENCYTOP is not set | ||
1532 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1533 | CONFIG_HAVE_FTRACE=y | ||
1534 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1535 | # CONFIG_FTRACE is not set | ||
1536 | # CONFIG_SCHED_TRACER is not set | ||
1537 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1521 | # CONFIG_SAMPLES is not set | 1538 | # CONFIG_SAMPLES is not set |
1539 | CONFIG_HAVE_ARCH_KGDB=y | ||
1540 | # CONFIG_KGDB is not set | ||
1522 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1541 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1523 | # CONFIG_DEBUG_STACK_USAGE is not set | 1542 | # CONFIG_DEBUG_STACK_USAGE is not set |
1524 | # CONFIG_DEBUG_PAGEALLOC is not set | 1543 | # CONFIG_DEBUG_PAGEALLOC is not set |
1525 | # CONFIG_DEBUGGER is not set | 1544 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1545 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1546 | # CONFIG_XMON is not set | ||
1526 | # CONFIG_IRQSTACKS is not set | 1547 | # CONFIG_IRQSTACKS is not set |
1527 | # CONFIG_BDI_SWITCH is not set | 1548 | # CONFIG_BDI_SWITCH is not set |
1528 | # CONFIG_PPC_EARLY_DEBUG is not set | 1549 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1539,13 +1560,14 @@ CONFIG_CRYPTO=y | |||
1539 | # Crypto core or helper | 1560 | # Crypto core or helper |
1540 | # | 1561 | # |
1541 | CONFIG_CRYPTO_ALGAPI=y | 1562 | CONFIG_CRYPTO_ALGAPI=y |
1563 | CONFIG_CRYPTO_AEAD=y | ||
1542 | CONFIG_CRYPTO_BLKCIPHER=y | 1564 | CONFIG_CRYPTO_BLKCIPHER=y |
1543 | CONFIG_CRYPTO_HASH=y | 1565 | CONFIG_CRYPTO_HASH=y |
1544 | CONFIG_CRYPTO_MANAGER=y | 1566 | CONFIG_CRYPTO_MANAGER=y |
1545 | # CONFIG_CRYPTO_GF128MUL is not set | 1567 | # CONFIG_CRYPTO_GF128MUL is not set |
1546 | # CONFIG_CRYPTO_NULL is not set | 1568 | # CONFIG_CRYPTO_NULL is not set |
1547 | # CONFIG_CRYPTO_CRYPTD is not set | 1569 | # CONFIG_CRYPTO_CRYPTD is not set |
1548 | # CONFIG_CRYPTO_AUTHENC is not set | 1570 | CONFIG_CRYPTO_AUTHENC=y |
1549 | # CONFIG_CRYPTO_TEST is not set | 1571 | # CONFIG_CRYPTO_TEST is not set |
1550 | 1572 | ||
1551 | # | 1573 | # |
@@ -1579,6 +1601,10 @@ CONFIG_CRYPTO_HMAC=y | |||
1579 | # CONFIG_CRYPTO_MD4 is not set | 1601 | # CONFIG_CRYPTO_MD4 is not set |
1580 | CONFIG_CRYPTO_MD5=y | 1602 | CONFIG_CRYPTO_MD5=y |
1581 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1603 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1604 | # CONFIG_CRYPTO_RMD128 is not set | ||
1605 | # CONFIG_CRYPTO_RMD160 is not set | ||
1606 | # CONFIG_CRYPTO_RMD256 is not set | ||
1607 | # CONFIG_CRYPTO_RMD320 is not set | ||
1582 | CONFIG_CRYPTO_SHA1=m | 1608 | CONFIG_CRYPTO_SHA1=m |
1583 | # CONFIG_CRYPTO_SHA256 is not set | 1609 | # CONFIG_CRYPTO_SHA256 is not set |
1584 | # CONFIG_CRYPTO_SHA512 is not set | 1610 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1611,5 +1637,6 @@ CONFIG_CRYPTO_DES=y | |||
1611 | # CONFIG_CRYPTO_LZO is not set | 1637 | # CONFIG_CRYPTO_LZO is not set |
1612 | CONFIG_CRYPTO_HW=y | 1638 | CONFIG_CRYPTO_HW=y |
1613 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1639 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1640 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
1614 | # CONFIG_PPC_CLOCK is not set | 1641 | # CONFIG_PPC_CLOCK is not set |
1615 | # CONFIG_VIRTUALIZATION is not set | 1642 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig index b09f0032a10b..97f3c4fe440b 100644 --- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig +++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:36 2008 | 4 | # Thu Aug 21 00:52:34 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
94 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -114,10 +115,16 @@ CONFIG_SLUB=y | |||
114 | # CONFIG_PROFILING is not set | 115 | # CONFIG_PROFILING is not set |
115 | # CONFIG_MARKERS is not set | 116 | # CONFIG_MARKERS is not set |
116 | CONFIG_HAVE_OPROFILE=y | 117 | CONFIG_HAVE_OPROFILE=y |
118 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
119 | CONFIG_HAVE_IOREMAP_PROT=y | ||
117 | CONFIG_HAVE_KPROBES=y | 120 | CONFIG_HAVE_KPROBES=y |
118 | CONFIG_HAVE_KRETPROBES=y | 121 | CONFIG_HAVE_KRETPROBES=y |
122 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
119 | # CONFIG_HAVE_DMA_ATTRS is not set | 123 | # CONFIG_HAVE_DMA_ATTRS is not set |
124 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
125 | # CONFIG_HAVE_CLK is not set | ||
120 | CONFIG_PROC_PAGE_MONITOR=y | 126 | CONFIG_PROC_PAGE_MONITOR=y |
127 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
121 | CONFIG_SLABINFO=y | 128 | CONFIG_SLABINFO=y |
122 | CONFIG_RT_MUTEXES=y | 129 | CONFIG_RT_MUTEXES=y |
123 | # CONFIG_TINY_SHMEM is not set | 130 | # CONFIG_TINY_SHMEM is not set |
@@ -128,6 +135,7 @@ CONFIG_BLOCK=y | |||
128 | # CONFIG_BLK_DEV_IO_TRACE is not set | 135 | # CONFIG_BLK_DEV_IO_TRACE is not set |
129 | # CONFIG_LSF is not set | 136 | # CONFIG_LSF is not set |
130 | # CONFIG_BLK_DEV_BSG is not set | 137 | # CONFIG_BLK_DEV_BSG is not set |
138 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
131 | 139 | ||
132 | # | 140 | # |
133 | # IO Schedulers | 141 | # IO Schedulers |
@@ -146,8 +154,6 @@ CONFIG_CLASSIC_RCU=y | |||
146 | # | 154 | # |
147 | # Platform support | 155 | # Platform support |
148 | # | 156 | # |
149 | # CONFIG_PPC_MPC512x is not set | ||
150 | # CONFIG_PPC_MPC5121 is not set | ||
151 | # CONFIG_PPC_CELL is not set | 157 | # CONFIG_PPC_CELL is not set |
152 | # CONFIG_PPC_CELL_NATIVE is not set | 158 | # CONFIG_PPC_CELL_NATIVE is not set |
153 | # CONFIG_PQ2ADS is not set | 159 | # CONFIG_PQ2ADS is not set |
@@ -156,11 +162,13 @@ CONFIG_MPC85xx=y | |||
156 | # CONFIG_MPC8560_ADS is not set | 162 | # CONFIG_MPC8560_ADS is not set |
157 | CONFIG_MPC85xx_CDS=y | 163 | CONFIG_MPC85xx_CDS=y |
158 | # CONFIG_MPC85xx_MDS is not set | 164 | # CONFIG_MPC85xx_MDS is not set |
165 | # CONFIG_MPC8536_DS is not set | ||
159 | # CONFIG_MPC85xx_DS is not set | 166 | # CONFIG_MPC85xx_DS is not set |
160 | # CONFIG_KSI8560 is not set | 167 | # CONFIG_KSI8560 is not set |
161 | # CONFIG_STX_GP3 is not set | 168 | # CONFIG_STX_GP3 is not set |
162 | # CONFIG_TQM8540 is not set | 169 | # CONFIG_TQM8540 is not set |
163 | # CONFIG_TQM8541 is not set | 170 | # CONFIG_TQM8541 is not set |
171 | # CONFIG_TQM8548 is not set | ||
164 | # CONFIG_TQM8555 is not set | 172 | # CONFIG_TQM8555 is not set |
165 | # CONFIG_TQM8560 is not set | 173 | # CONFIG_TQM8560 is not set |
166 | # CONFIG_SBC8548 is not set | 174 | # CONFIG_SBC8548 is not set |
@@ -192,7 +200,7 @@ CONFIG_HZ_250=y | |||
192 | # CONFIG_HZ_300 is not set | 200 | # CONFIG_HZ_300 is not set |
193 | # CONFIG_HZ_1000 is not set | 201 | # CONFIG_HZ_1000 is not set |
194 | CONFIG_HZ=250 | 202 | CONFIG_HZ=250 |
195 | # CONFIG_SCHED_HRTICK is not set | 203 | CONFIG_SCHED_HRTICK=y |
196 | CONFIG_PREEMPT_NONE=y | 204 | CONFIG_PREEMPT_NONE=y |
197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 205 | # CONFIG_PREEMPT_VOLUNTARY is not set |
198 | # CONFIG_PREEMPT is not set | 206 | # CONFIG_PREEMPT is not set |
@@ -215,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
216 | CONFIG_PAGEFLAGS_EXTENDED=y | 224 | CONFIG_PAGEFLAGS_EXTENDED=y |
217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
226 | CONFIG_MIGRATION=y | ||
218 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
219 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
220 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
@@ -222,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y | |||
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
223 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
224 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
234 | CONFIG_EXTRA_TARGETS="" | ||
225 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
226 | # CONFIG_SECCOMP is not set | 236 | # CONFIG_SECCOMP is not set |
227 | CONFIG_ISA_DMA_API=y | 237 | CONFIG_ISA_DMA_API=y |
@@ -233,6 +243,7 @@ CONFIG_ZONE_DMA=y | |||
233 | CONFIG_PPC_INDIRECT_PCI=y | 243 | CONFIG_PPC_INDIRECT_PCI=y |
234 | CONFIG_FSL_SOC=y | 244 | CONFIG_FSL_SOC=y |
235 | CONFIG_FSL_PCI=y | 245 | CONFIG_FSL_PCI=y |
246 | CONFIG_PPC_PCI_CHOICE=y | ||
236 | CONFIG_PCI=y | 247 | CONFIG_PCI=y |
237 | CONFIG_PCI_DOMAINS=y | 248 | CONFIG_PCI_DOMAINS=y |
238 | CONFIG_PCI_SYSCALL=y | 249 | CONFIG_PCI_SYSCALL=y |
@@ -259,10 +270,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
259 | CONFIG_PHYSICAL_START=0x00000000 | 270 | CONFIG_PHYSICAL_START=0x00000000 |
260 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 271 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
261 | CONFIG_TASK_SIZE=0xc0000000 | 272 | CONFIG_TASK_SIZE=0xc0000000 |
262 | |||
263 | # | ||
264 | # Networking | ||
265 | # | ||
266 | CONFIG_NET=y | 273 | CONFIG_NET=y |
267 | 274 | ||
268 | # | 275 | # |
@@ -379,20 +386,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
379 | # CONFIG_BLK_DEV_XIP is not set | 386 | # CONFIG_BLK_DEV_XIP is not set |
380 | # CONFIG_CDROM_PKTCDVD is not set | 387 | # CONFIG_CDROM_PKTCDVD is not set |
381 | # CONFIG_ATA_OVER_ETH is not set | 388 | # CONFIG_ATA_OVER_ETH is not set |
389 | # CONFIG_BLK_DEV_HD is not set | ||
382 | CONFIG_MISC_DEVICES=y | 390 | CONFIG_MISC_DEVICES=y |
383 | # CONFIG_PHANTOM is not set | 391 | # CONFIG_PHANTOM is not set |
384 | # CONFIG_EEPROM_93CX6 is not set | 392 | # CONFIG_EEPROM_93CX6 is not set |
385 | # CONFIG_SGI_IOC4 is not set | 393 | # CONFIG_SGI_IOC4 is not set |
386 | # CONFIG_TIFM_CORE is not set | 394 | # CONFIG_TIFM_CORE is not set |
387 | # CONFIG_ENCLOSURE_SERVICES is not set | 395 | # CONFIG_ENCLOSURE_SERVICES is not set |
396 | # CONFIG_HP_ILO is not set | ||
388 | CONFIG_HAVE_IDE=y | 397 | CONFIG_HAVE_IDE=y |
389 | CONFIG_IDE=y | 398 | CONFIG_IDE=y |
390 | CONFIG_IDE_MAX_HWIFS=4 | ||
391 | CONFIG_BLK_DEV_IDE=y | 399 | CONFIG_BLK_DEV_IDE=y |
392 | 400 | ||
393 | # | 401 | # |
394 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 402 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
395 | # | 403 | # |
404 | CONFIG_IDE_TIMINGS=y | ||
396 | # CONFIG_BLK_DEV_IDE_SATA is not set | 405 | # CONFIG_BLK_DEV_IDE_SATA is not set |
397 | # CONFIG_BLK_DEV_IDEDISK is not set | 406 | # CONFIG_BLK_DEV_IDEDISK is not set |
398 | # CONFIG_IDEDISK_MULTI_MODE is not set | 407 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -405,7 +414,6 @@ CONFIG_IDE_PROC_FS=y | |||
405 | # | 414 | # |
406 | # IDE chipset support/bugfixes | 415 | # IDE chipset support/bugfixes |
407 | # | 416 | # |
408 | CONFIG_IDE_GENERIC=y | ||
409 | # CONFIG_BLK_DEV_PLATFORM is not set | 417 | # CONFIG_BLK_DEV_PLATFORM is not set |
410 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 418 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
411 | 419 | ||
@@ -423,10 +431,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
423 | # CONFIG_BLK_DEV_AMD74XX is not set | 431 | # CONFIG_BLK_DEV_AMD74XX is not set |
424 | # CONFIG_BLK_DEV_CMD64X is not set | 432 | # CONFIG_BLK_DEV_CMD64X is not set |
425 | # CONFIG_BLK_DEV_TRIFLEX is not set | 433 | # CONFIG_BLK_DEV_TRIFLEX is not set |
426 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
427 | # CONFIG_BLK_DEV_CS5520 is not set | 434 | # CONFIG_BLK_DEV_CS5520 is not set |
428 | # CONFIG_BLK_DEV_CS5530 is not set | 435 | # CONFIG_BLK_DEV_CS5530 is not set |
429 | # CONFIG_BLK_DEV_HPT34X is not set | ||
430 | # CONFIG_BLK_DEV_HPT366 is not set | 436 | # CONFIG_BLK_DEV_HPT366 is not set |
431 | # CONFIG_BLK_DEV_JMICRON is not set | 437 | # CONFIG_BLK_DEV_JMICRON is not set |
432 | # CONFIG_BLK_DEV_SC1200 is not set | 438 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -444,8 +450,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
444 | CONFIG_BLK_DEV_VIA82CXXX=y | 450 | CONFIG_BLK_DEV_VIA82CXXX=y |
445 | # CONFIG_BLK_DEV_TC86C001 is not set | 451 | # CONFIG_BLK_DEV_TC86C001 is not set |
446 | CONFIG_BLK_DEV_IDEDMA=y | 452 | CONFIG_BLK_DEV_IDEDMA=y |
447 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
448 | # CONFIG_BLK_DEV_HD is not set | ||
449 | 453 | ||
450 | # | 454 | # |
451 | # SCSI device support | 455 | # SCSI device support |
@@ -461,12 +465,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
461 | # | 465 | # |
462 | # IEEE 1394 (FireWire) support | 466 | # IEEE 1394 (FireWire) support |
463 | # | 467 | # |
468 | |||
469 | # | ||
470 | # Enable only one of the two stacks, unless you know what you are doing | ||
471 | # | ||
464 | # CONFIG_FIREWIRE is not set | 472 | # CONFIG_FIREWIRE is not set |
465 | # CONFIG_IEEE1394 is not set | 473 | # CONFIG_IEEE1394 is not set |
466 | # CONFIG_I2O is not set | 474 | # CONFIG_I2O is not set |
467 | # CONFIG_MACINTOSH_DRIVERS is not set | 475 | # CONFIG_MACINTOSH_DRIVERS is not set |
468 | CONFIG_NETDEVICES=y | 476 | CONFIG_NETDEVICES=y |
469 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
470 | # CONFIG_DUMMY is not set | 477 | # CONFIG_DUMMY is not set |
471 | # CONFIG_BONDING is not set | 478 | # CONFIG_BONDING is not set |
472 | # CONFIG_MACVLAN is not set | 479 | # CONFIG_MACVLAN is not set |
@@ -509,10 +516,8 @@ CONFIG_NETDEV_1000=y | |||
509 | # CONFIG_ACENIC is not set | 516 | # CONFIG_ACENIC is not set |
510 | # CONFIG_DL2K is not set | 517 | # CONFIG_DL2K is not set |
511 | CONFIG_E1000=y | 518 | CONFIG_E1000=y |
512 | CONFIG_E1000_NAPI=y | ||
513 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 519 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
514 | # CONFIG_E1000E is not set | 520 | # CONFIG_E1000E is not set |
515 | # CONFIG_E1000E_ENABLED is not set | ||
516 | # CONFIG_IP1000 is not set | 521 | # CONFIG_IP1000 is not set |
517 | # CONFIG_IGB is not set | 522 | # CONFIG_IGB is not set |
518 | # CONFIG_NS83820 is not set | 523 | # CONFIG_NS83820 is not set |
@@ -526,9 +531,9 @@ CONFIG_E1000_NAPI=y | |||
526 | # CONFIG_TIGON3 is not set | 531 | # CONFIG_TIGON3 is not set |
527 | # CONFIG_BNX2 is not set | 532 | # CONFIG_BNX2 is not set |
528 | CONFIG_GIANFAR=y | 533 | CONFIG_GIANFAR=y |
529 | CONFIG_GFAR_NAPI=y | ||
530 | # CONFIG_QLA3XXX is not set | 534 | # CONFIG_QLA3XXX is not set |
531 | # CONFIG_ATL1 is not set | 535 | # CONFIG_ATL1 is not set |
536 | # CONFIG_ATL1E is not set | ||
532 | CONFIG_NETDEV_10000=y | 537 | CONFIG_NETDEV_10000=y |
533 | # CONFIG_CHELSIO_T1 is not set | 538 | # CONFIG_CHELSIO_T1 is not set |
534 | # CONFIG_CHELSIO_T3 is not set | 539 | # CONFIG_CHELSIO_T3 is not set |
@@ -634,6 +639,8 @@ CONFIG_GEN_RTC=y | |||
634 | CONFIG_DEVPORT=y | 639 | CONFIG_DEVPORT=y |
635 | # CONFIG_I2C is not set | 640 | # CONFIG_I2C is not set |
636 | # CONFIG_SPI is not set | 641 | # CONFIG_SPI is not set |
642 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
643 | # CONFIG_GPIOLIB is not set | ||
637 | # CONFIG_W1 is not set | 644 | # CONFIG_W1 is not set |
638 | # CONFIG_POWER_SUPPLY is not set | 645 | # CONFIG_POWER_SUPPLY is not set |
639 | CONFIG_HWMON=y | 646 | CONFIG_HWMON=y |
@@ -654,6 +661,7 @@ CONFIG_HWMON=y | |||
654 | # CONFIG_SENSORS_W83627EHF is not set | 661 | # CONFIG_SENSORS_W83627EHF is not set |
655 | # CONFIG_HWMON_DEBUG_CHIP is not set | 662 | # CONFIG_HWMON_DEBUG_CHIP is not set |
656 | # CONFIG_THERMAL is not set | 663 | # CONFIG_THERMAL is not set |
664 | # CONFIG_THERMAL_HWMON is not set | ||
657 | # CONFIG_WATCHDOG is not set | 665 | # CONFIG_WATCHDOG is not set |
658 | 666 | ||
659 | # | 667 | # |
@@ -665,8 +673,10 @@ CONFIG_SSB_POSSIBLE=y | |||
665 | # | 673 | # |
666 | # Multifunction device drivers | 674 | # Multifunction device drivers |
667 | # | 675 | # |
676 | # CONFIG_MFD_CORE is not set | ||
668 | # CONFIG_MFD_SM501 is not set | 677 | # CONFIG_MFD_SM501 is not set |
669 | # CONFIG_HTC_PASIC3 is not set | 678 | # CONFIG_HTC_PASIC3 is not set |
679 | # CONFIG_MFD_TMIO is not set | ||
670 | 680 | ||
671 | # | 681 | # |
672 | # Multimedia devices | 682 | # Multimedia devices |
@@ -698,10 +708,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
698 | # Display device support | 708 | # Display device support |
699 | # | 709 | # |
700 | # CONFIG_DISPLAY_SUPPORT is not set | 710 | # CONFIG_DISPLAY_SUPPORT is not set |
701 | |||
702 | # | ||
703 | # Sound | ||
704 | # | ||
705 | # CONFIG_SOUND is not set | 711 | # CONFIG_SOUND is not set |
706 | CONFIG_HID_SUPPORT=y | 712 | CONFIG_HID_SUPPORT=y |
707 | CONFIG_HID=y | 713 | CONFIG_HID=y |
@@ -716,6 +722,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
716 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 722 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
717 | 723 | ||
718 | # | 724 | # |
725 | # Enable Host or Gadget support to see Inventra options | ||
726 | # | ||
727 | |||
728 | # | ||
719 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 729 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
720 | # | 730 | # |
721 | # CONFIG_USB_GADGET is not set | 731 | # CONFIG_USB_GADGET is not set |
@@ -793,6 +803,7 @@ CONFIG_TMPFS=y | |||
793 | # CONFIG_CRAMFS is not set | 803 | # CONFIG_CRAMFS is not set |
794 | # CONFIG_VXFS_FS is not set | 804 | # CONFIG_VXFS_FS is not set |
795 | # CONFIG_MINIX_FS is not set | 805 | # CONFIG_MINIX_FS is not set |
806 | # CONFIG_OMFS_FS is not set | ||
796 | # CONFIG_HPFS_FS is not set | 807 | # CONFIG_HPFS_FS is not set |
797 | # CONFIG_QNX4FS_FS is not set | 808 | # CONFIG_QNX4FS_FS is not set |
798 | # CONFIG_ROMFS_FS is not set | 809 | # CONFIG_ROMFS_FS is not set |
@@ -802,12 +813,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
802 | CONFIG_NFS_FS=y | 813 | CONFIG_NFS_FS=y |
803 | # CONFIG_NFS_V3 is not set | 814 | # CONFIG_NFS_V3 is not set |
804 | # CONFIG_NFS_V4 is not set | 815 | # CONFIG_NFS_V4 is not set |
805 | # CONFIG_NFSD is not set | ||
806 | CONFIG_ROOT_NFS=y | 816 | CONFIG_ROOT_NFS=y |
817 | # CONFIG_NFSD is not set | ||
807 | CONFIG_LOCKD=y | 818 | CONFIG_LOCKD=y |
808 | CONFIG_NFS_COMMON=y | 819 | CONFIG_NFS_COMMON=y |
809 | CONFIG_SUNRPC=y | 820 | CONFIG_SUNRPC=y |
810 | # CONFIG_SUNRPC_BIND34 is not set | ||
811 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 821 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
812 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 822 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
813 | # CONFIG_SMB_FS is not set | 823 | # CONFIG_SMB_FS is not set |
@@ -843,6 +853,7 @@ CONFIG_BITREVERSE=y | |||
843 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 853 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
844 | # CONFIG_CRC_CCITT is not set | 854 | # CONFIG_CRC_CCITT is not set |
845 | # CONFIG_CRC16 is not set | 855 | # CONFIG_CRC16 is not set |
856 | # CONFIG_CRC_T10DIF is not set | ||
846 | # CONFIG_CRC_ITU_T is not set | 857 | # CONFIG_CRC_ITU_T is not set |
847 | CONFIG_CRC32=y | 858 | CONFIG_CRC32=y |
848 | # CONFIG_CRC7 is not set | 859 | # CONFIG_CRC7 is not set |
@@ -867,6 +878,8 @@ CONFIG_FRAME_WARN=1024 | |||
867 | CONFIG_DEBUG_KERNEL=y | 878 | CONFIG_DEBUG_KERNEL=y |
868 | # CONFIG_DEBUG_SHIRQ is not set | 879 | # CONFIG_DEBUG_SHIRQ is not set |
869 | CONFIG_DETECT_SOFTLOCKUP=y | 880 | CONFIG_DETECT_SOFTLOCKUP=y |
881 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
882 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
870 | CONFIG_SCHED_DEBUG=y | 883 | CONFIG_SCHED_DEBUG=y |
871 | # CONFIG_SCHEDSTATS is not set | 884 | # CONFIG_SCHEDSTATS is not set |
872 | # CONFIG_TIMER_STATS is not set | 885 | # CONFIG_TIMER_STATS is not set |
@@ -884,16 +897,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
884 | # CONFIG_DEBUG_INFO is not set | 897 | # CONFIG_DEBUG_INFO is not set |
885 | # CONFIG_DEBUG_VM is not set | 898 | # CONFIG_DEBUG_VM is not set |
886 | # CONFIG_DEBUG_WRITECOUNT is not set | 899 | # CONFIG_DEBUG_WRITECOUNT is not set |
900 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
887 | # CONFIG_DEBUG_LIST is not set | 901 | # CONFIG_DEBUG_LIST is not set |
888 | # CONFIG_DEBUG_SG is not set | 902 | # CONFIG_DEBUG_SG is not set |
889 | # CONFIG_BOOT_PRINTK_DELAY is not set | 903 | # CONFIG_BOOT_PRINTK_DELAY is not set |
904 | # CONFIG_RCU_TORTURE_TEST is not set | ||
890 | # CONFIG_BACKTRACE_SELF_TEST is not set | 905 | # CONFIG_BACKTRACE_SELF_TEST is not set |
891 | # CONFIG_FAULT_INJECTION is not set | 906 | # CONFIG_FAULT_INJECTION is not set |
907 | # CONFIG_LATENCYTOP is not set | ||
908 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
909 | CONFIG_HAVE_FTRACE=y | ||
910 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
911 | # CONFIG_FTRACE is not set | ||
912 | # CONFIG_SCHED_TRACER is not set | ||
913 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
892 | # CONFIG_SAMPLES is not set | 914 | # CONFIG_SAMPLES is not set |
915 | CONFIG_HAVE_ARCH_KGDB=y | ||
916 | # CONFIG_KGDB is not set | ||
893 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 917 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
894 | # CONFIG_DEBUG_STACK_USAGE is not set | 918 | # CONFIG_DEBUG_STACK_USAGE is not set |
895 | # CONFIG_DEBUG_PAGEALLOC is not set | 919 | # CONFIG_DEBUG_PAGEALLOC is not set |
896 | # CONFIG_DEBUGGER is not set | 920 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
921 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
922 | # CONFIG_XMON is not set | ||
897 | # CONFIG_IRQSTACKS is not set | 923 | # CONFIG_IRQSTACKS is not set |
898 | # CONFIG_BDI_SWITCH is not set | 924 | # CONFIG_BDI_SWITCH is not set |
899 | # CONFIG_PPC_EARLY_DEBUG is not set | 925 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -946,6 +972,10 @@ CONFIG_CRYPTO=y | |||
946 | # CONFIG_CRYPTO_MD4 is not set | 972 | # CONFIG_CRYPTO_MD4 is not set |
947 | # CONFIG_CRYPTO_MD5 is not set | 973 | # CONFIG_CRYPTO_MD5 is not set |
948 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 974 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
975 | # CONFIG_CRYPTO_RMD128 is not set | ||
976 | # CONFIG_CRYPTO_RMD160 is not set | ||
977 | # CONFIG_CRYPTO_RMD256 is not set | ||
978 | # CONFIG_CRYPTO_RMD320 is not set | ||
949 | # CONFIG_CRYPTO_SHA1 is not set | 979 | # CONFIG_CRYPTO_SHA1 is not set |
950 | # CONFIG_CRYPTO_SHA256 is not set | 980 | # CONFIG_CRYPTO_SHA256 is not set |
951 | # CONFIG_CRYPTO_SHA512 is not set | 981 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -978,5 +1008,6 @@ CONFIG_CRYPTO=y | |||
978 | # CONFIG_CRYPTO_LZO is not set | 1008 | # CONFIG_CRYPTO_LZO is not set |
979 | CONFIG_CRYPTO_HW=y | 1009 | CONFIG_CRYPTO_HW=y |
980 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1010 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1011 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
981 | # CONFIG_PPC_CLOCK is not set | 1012 | # CONFIG_PPC_CLOCK is not set |
982 | # CONFIG_VIRTUALIZATION is not set | 1013 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/sbc8548_defconfig b/arch/powerpc/configs/85xx/sbc8548_defconfig index 24f7f44b4821..41cedc4b63f6 100644 --- a/arch/powerpc/configs/85xx/sbc8548_defconfig +++ b/arch/powerpc/configs/85xx/sbc8548_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:37 2008 | 4 | # Thu Aug 21 00:52:35 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
94 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
95 | CONFIG_HOTPLUG=y | 96 | CONFIG_HOTPLUG=y |
@@ -112,10 +113,16 @@ CONFIG_SLAB=y | |||
112 | # CONFIG_PROFILING is not set | 113 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | 114 | # CONFIG_MARKERS is not set |
114 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
116 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
117 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 121 | # CONFIG_HAVE_DMA_ATTRS is not set |
122 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
123 | # CONFIG_HAVE_CLK is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
@@ -126,6 +133,7 @@ CONFIG_BLOCK=y | |||
126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 133 | # CONFIG_BLK_DEV_IO_TRACE is not set |
127 | # CONFIG_LSF is not set | 134 | # CONFIG_LSF is not set |
128 | # CONFIG_BLK_DEV_BSG is not set | 135 | # CONFIG_BLK_DEV_BSG is not set |
136 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
129 | 137 | ||
130 | # | 138 | # |
131 | # IO Schedulers | 139 | # IO Schedulers |
@@ -144,8 +152,6 @@ CONFIG_CLASSIC_RCU=y | |||
144 | # | 152 | # |
145 | # Platform support | 153 | # Platform support |
146 | # | 154 | # |
147 | # CONFIG_PPC_MPC512x is not set | ||
148 | # CONFIG_PPC_MPC5121 is not set | ||
149 | # CONFIG_PPC_CELL is not set | 155 | # CONFIG_PPC_CELL is not set |
150 | # CONFIG_PPC_CELL_NATIVE is not set | 156 | # CONFIG_PPC_CELL_NATIVE is not set |
151 | # CONFIG_PQ2ADS is not set | 157 | # CONFIG_PQ2ADS is not set |
@@ -154,11 +160,13 @@ CONFIG_MPC85xx=y | |||
154 | # CONFIG_MPC8560_ADS is not set | 160 | # CONFIG_MPC8560_ADS is not set |
155 | # CONFIG_MPC85xx_CDS is not set | 161 | # CONFIG_MPC85xx_CDS is not set |
156 | # CONFIG_MPC85xx_MDS is not set | 162 | # CONFIG_MPC85xx_MDS is not set |
163 | # CONFIG_MPC8536_DS is not set | ||
157 | # CONFIG_MPC85xx_DS is not set | 164 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | 165 | # CONFIG_KSI8560 is not set |
159 | # CONFIG_STX_GP3 is not set | 166 | # CONFIG_STX_GP3 is not set |
160 | # CONFIG_TQM8540 is not set | 167 | # CONFIG_TQM8540 is not set |
161 | # CONFIG_TQM8541 is not set | 168 | # CONFIG_TQM8541 is not set |
169 | # CONFIG_TQM8548 is not set | ||
162 | # CONFIG_TQM8555 is not set | 170 | # CONFIG_TQM8555 is not set |
163 | # CONFIG_TQM8560 is not set | 171 | # CONFIG_TQM8560 is not set |
164 | CONFIG_SBC8548=y | 172 | CONFIG_SBC8548=y |
@@ -213,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
213 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
214 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
215 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | ||
216 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
217 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
218 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
@@ -220,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
220 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
221 | CONFIG_PROC_DEVICETREE=y | 230 | CONFIG_PROC_DEVICETREE=y |
222 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
232 | CONFIG_EXTRA_TARGETS="" | ||
223 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
224 | # CONFIG_SECCOMP is not set | 234 | # CONFIG_SECCOMP is not set |
225 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
@@ -231,6 +241,7 @@ CONFIG_ZONE_DMA=y | |||
231 | CONFIG_PPC_INDIRECT_PCI=y | 241 | CONFIG_PPC_INDIRECT_PCI=y |
232 | CONFIG_FSL_SOC=y | 242 | CONFIG_FSL_SOC=y |
233 | CONFIG_FSL_PCI=y | 243 | CONFIG_FSL_PCI=y |
244 | CONFIG_PPC_PCI_CHOICE=y | ||
234 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
235 | CONFIG_PCI_DOMAINS=y | 246 | CONFIG_PCI_DOMAINS=y |
236 | CONFIG_PCI_SYSCALL=y | 247 | CONFIG_PCI_SYSCALL=y |
@@ -256,10 +267,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
256 | CONFIG_PHYSICAL_START=0x00000000 | 267 | CONFIG_PHYSICAL_START=0x00000000 |
257 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 268 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
258 | CONFIG_TASK_SIZE=0xc0000000 | 269 | CONFIG_TASK_SIZE=0xc0000000 |
259 | |||
260 | # | ||
261 | # Networking | ||
262 | # | ||
263 | CONFIG_NET=y | 270 | CONFIG_NET=y |
264 | 271 | ||
265 | # | 272 | # |
@@ -374,12 +381,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
374 | # CONFIG_BLK_DEV_XIP is not set | 381 | # CONFIG_BLK_DEV_XIP is not set |
375 | # CONFIG_CDROM_PKTCDVD is not set | 382 | # CONFIG_CDROM_PKTCDVD is not set |
376 | # CONFIG_ATA_OVER_ETH is not set | 383 | # CONFIG_ATA_OVER_ETH is not set |
384 | # CONFIG_BLK_DEV_HD is not set | ||
377 | CONFIG_MISC_DEVICES=y | 385 | CONFIG_MISC_DEVICES=y |
378 | # CONFIG_PHANTOM is not set | 386 | # CONFIG_PHANTOM is not set |
379 | # CONFIG_EEPROM_93CX6 is not set | 387 | # CONFIG_EEPROM_93CX6 is not set |
380 | # CONFIG_SGI_IOC4 is not set | 388 | # CONFIG_SGI_IOC4 is not set |
381 | # CONFIG_TIFM_CORE is not set | 389 | # CONFIG_TIFM_CORE is not set |
382 | # CONFIG_ENCLOSURE_SERVICES is not set | 390 | # CONFIG_ENCLOSURE_SERVICES is not set |
391 | # CONFIG_HP_ILO is not set | ||
383 | CONFIG_HAVE_IDE=y | 392 | CONFIG_HAVE_IDE=y |
384 | # CONFIG_IDE is not set | 393 | # CONFIG_IDE is not set |
385 | 394 | ||
@@ -397,12 +406,15 @@ CONFIG_HAVE_IDE=y | |||
397 | # | 406 | # |
398 | # IEEE 1394 (FireWire) support | 407 | # IEEE 1394 (FireWire) support |
399 | # | 408 | # |
409 | |||
410 | # | ||
411 | # Enable only one of the two stacks, unless you know what you are doing | ||
412 | # | ||
400 | # CONFIG_FIREWIRE is not set | 413 | # CONFIG_FIREWIRE is not set |
401 | # CONFIG_IEEE1394 is not set | 414 | # CONFIG_IEEE1394 is not set |
402 | # CONFIG_I2O is not set | 415 | # CONFIG_I2O is not set |
403 | # CONFIG_MACINTOSH_DRIVERS is not set | 416 | # CONFIG_MACINTOSH_DRIVERS is not set |
404 | CONFIG_NETDEVICES=y | 417 | CONFIG_NETDEVICES=y |
405 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
406 | # CONFIG_DUMMY is not set | 418 | # CONFIG_DUMMY is not set |
407 | # CONFIG_BONDING is not set | 419 | # CONFIG_BONDING is not set |
408 | # CONFIG_MACVLAN is not set | 420 | # CONFIG_MACVLAN is not set |
@@ -446,7 +458,6 @@ CONFIG_NETDEV_1000=y | |||
446 | # CONFIG_DL2K is not set | 458 | # CONFIG_DL2K is not set |
447 | # CONFIG_E1000 is not set | 459 | # CONFIG_E1000 is not set |
448 | # CONFIG_E1000E is not set | 460 | # CONFIG_E1000E is not set |
449 | # CONFIG_E1000E_ENABLED is not set | ||
450 | # CONFIG_IP1000 is not set | 461 | # CONFIG_IP1000 is not set |
451 | # CONFIG_IGB is not set | 462 | # CONFIG_IGB is not set |
452 | # CONFIG_NS83820 is not set | 463 | # CONFIG_NS83820 is not set |
@@ -460,9 +471,9 @@ CONFIG_NETDEV_1000=y | |||
460 | # CONFIG_TIGON3 is not set | 471 | # CONFIG_TIGON3 is not set |
461 | # CONFIG_BNX2 is not set | 472 | # CONFIG_BNX2 is not set |
462 | CONFIG_GIANFAR=y | 473 | CONFIG_GIANFAR=y |
463 | CONFIG_GFAR_NAPI=y | ||
464 | # CONFIG_QLA3XXX is not set | 474 | # CONFIG_QLA3XXX is not set |
465 | # CONFIG_ATL1 is not set | 475 | # CONFIG_ATL1 is not set |
476 | # CONFIG_ATL1E is not set | ||
466 | CONFIG_NETDEV_10000=y | 477 | CONFIG_NETDEV_10000=y |
467 | # CONFIG_CHELSIO_T1 is not set | 478 | # CONFIG_CHELSIO_T1 is not set |
468 | # CONFIG_CHELSIO_T3 is not set | 479 | # CONFIG_CHELSIO_T3 is not set |
@@ -568,6 +579,8 @@ CONFIG_GEN_RTC=y | |||
568 | CONFIG_DEVPORT=y | 579 | CONFIG_DEVPORT=y |
569 | # CONFIG_I2C is not set | 580 | # CONFIG_I2C is not set |
570 | # CONFIG_SPI is not set | 581 | # CONFIG_SPI is not set |
582 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
583 | # CONFIG_GPIOLIB is not set | ||
571 | # CONFIG_W1 is not set | 584 | # CONFIG_W1 is not set |
572 | # CONFIG_POWER_SUPPLY is not set | 585 | # CONFIG_POWER_SUPPLY is not set |
573 | CONFIG_HWMON=y | 586 | CONFIG_HWMON=y |
@@ -588,6 +601,7 @@ CONFIG_HWMON=y | |||
588 | # CONFIG_SENSORS_W83627EHF is not set | 601 | # CONFIG_SENSORS_W83627EHF is not set |
589 | # CONFIG_HWMON_DEBUG_CHIP is not set | 602 | # CONFIG_HWMON_DEBUG_CHIP is not set |
590 | # CONFIG_THERMAL is not set | 603 | # CONFIG_THERMAL is not set |
604 | # CONFIG_THERMAL_HWMON is not set | ||
591 | # CONFIG_WATCHDOG is not set | 605 | # CONFIG_WATCHDOG is not set |
592 | 606 | ||
593 | # | 607 | # |
@@ -599,8 +613,10 @@ CONFIG_SSB_POSSIBLE=y | |||
599 | # | 613 | # |
600 | # Multifunction device drivers | 614 | # Multifunction device drivers |
601 | # | 615 | # |
616 | # CONFIG_MFD_CORE is not set | ||
602 | # CONFIG_MFD_SM501 is not set | 617 | # CONFIG_MFD_SM501 is not set |
603 | # CONFIG_HTC_PASIC3 is not set | 618 | # CONFIG_HTC_PASIC3 is not set |
619 | # CONFIG_MFD_TMIO is not set | ||
604 | 620 | ||
605 | # | 621 | # |
606 | # Multimedia devices | 622 | # Multimedia devices |
@@ -632,10 +648,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
632 | # Display device support | 648 | # Display device support |
633 | # | 649 | # |
634 | # CONFIG_DISPLAY_SUPPORT is not set | 650 | # CONFIG_DISPLAY_SUPPORT is not set |
635 | |||
636 | # | ||
637 | # Sound | ||
638 | # | ||
639 | # CONFIG_SOUND is not set | 651 | # CONFIG_SOUND is not set |
640 | # CONFIG_HID_SUPPORT is not set | 652 | # CONFIG_HID_SUPPORT is not set |
641 | # CONFIG_USB_SUPPORT is not set | 653 | # CONFIG_USB_SUPPORT is not set |
@@ -706,6 +718,7 @@ CONFIG_TMPFS=y | |||
706 | # CONFIG_CRAMFS is not set | 718 | # CONFIG_CRAMFS is not set |
707 | # CONFIG_VXFS_FS is not set | 719 | # CONFIG_VXFS_FS is not set |
708 | # CONFIG_MINIX_FS is not set | 720 | # CONFIG_MINIX_FS is not set |
721 | # CONFIG_OMFS_FS is not set | ||
709 | # CONFIG_HPFS_FS is not set | 722 | # CONFIG_HPFS_FS is not set |
710 | # CONFIG_QNX4FS_FS is not set | 723 | # CONFIG_QNX4FS_FS is not set |
711 | # CONFIG_ROMFS_FS is not set | 724 | # CONFIG_ROMFS_FS is not set |
@@ -715,12 +728,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
715 | CONFIG_NFS_FS=y | 728 | CONFIG_NFS_FS=y |
716 | # CONFIG_NFS_V3 is not set | 729 | # CONFIG_NFS_V3 is not set |
717 | # CONFIG_NFS_V4 is not set | 730 | # CONFIG_NFS_V4 is not set |
718 | # CONFIG_NFSD is not set | ||
719 | CONFIG_ROOT_NFS=y | 731 | CONFIG_ROOT_NFS=y |
732 | # CONFIG_NFSD is not set | ||
720 | CONFIG_LOCKD=y | 733 | CONFIG_LOCKD=y |
721 | CONFIG_NFS_COMMON=y | 734 | CONFIG_NFS_COMMON=y |
722 | CONFIG_SUNRPC=y | 735 | CONFIG_SUNRPC=y |
723 | # CONFIG_SUNRPC_BIND34 is not set | ||
724 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 736 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
725 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 737 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
726 | # CONFIG_SMB_FS is not set | 738 | # CONFIG_SMB_FS is not set |
@@ -744,6 +756,7 @@ CONFIG_BITREVERSE=y | |||
744 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 756 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
745 | # CONFIG_CRC_CCITT is not set | 757 | # CONFIG_CRC_CCITT is not set |
746 | # CONFIG_CRC16 is not set | 758 | # CONFIG_CRC16 is not set |
759 | # CONFIG_CRC_T10DIF is not set | ||
747 | # CONFIG_CRC_ITU_T is not set | 760 | # CONFIG_CRC_ITU_T is not set |
748 | CONFIG_CRC32=y | 761 | CONFIG_CRC32=y |
749 | # CONFIG_CRC7 is not set | 762 | # CONFIG_CRC7 is not set |
@@ -767,7 +780,16 @@ CONFIG_FRAME_WARN=1024 | |||
767 | # CONFIG_HEADERS_CHECK is not set | 780 | # CONFIG_HEADERS_CHECK is not set |
768 | # CONFIG_DEBUG_KERNEL is not set | 781 | # CONFIG_DEBUG_KERNEL is not set |
769 | # CONFIG_DEBUG_BUGVERBOSE is not set | 782 | # CONFIG_DEBUG_BUGVERBOSE is not set |
783 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
784 | # CONFIG_LATENCYTOP is not set | ||
785 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
786 | CONFIG_HAVE_FTRACE=y | ||
787 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
788 | # CONFIG_FTRACE is not set | ||
789 | # CONFIG_SCHED_TRACER is not set | ||
790 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
770 | # CONFIG_SAMPLES is not set | 791 | # CONFIG_SAMPLES is not set |
792 | CONFIG_HAVE_ARCH_KGDB=y | ||
771 | # CONFIG_IRQSTACKS is not set | 793 | # CONFIG_IRQSTACKS is not set |
772 | # CONFIG_PPC_EARLY_DEBUG is not set | 794 | # CONFIG_PPC_EARLY_DEBUG is not set |
773 | 795 | ||
@@ -819,6 +841,10 @@ CONFIG_CRYPTO=y | |||
819 | # CONFIG_CRYPTO_MD4 is not set | 841 | # CONFIG_CRYPTO_MD4 is not set |
820 | # CONFIG_CRYPTO_MD5 is not set | 842 | # CONFIG_CRYPTO_MD5 is not set |
821 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 843 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
844 | # CONFIG_CRYPTO_RMD128 is not set | ||
845 | # CONFIG_CRYPTO_RMD160 is not set | ||
846 | # CONFIG_CRYPTO_RMD256 is not set | ||
847 | # CONFIG_CRYPTO_RMD320 is not set | ||
822 | # CONFIG_CRYPTO_SHA1 is not set | 848 | # CONFIG_CRYPTO_SHA1 is not set |
823 | # CONFIG_CRYPTO_SHA256 is not set | 849 | # CONFIG_CRYPTO_SHA256 is not set |
824 | # CONFIG_CRYPTO_SHA512 is not set | 850 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -851,5 +877,6 @@ CONFIG_CRYPTO=y | |||
851 | # CONFIG_CRYPTO_LZO is not set | 877 | # CONFIG_CRYPTO_LZO is not set |
852 | CONFIG_CRYPTO_HW=y | 878 | CONFIG_CRYPTO_HW=y |
853 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 879 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
880 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
854 | # CONFIG_PPC_CLOCK is not set | 881 | # CONFIG_PPC_CLOCK is not set |
855 | # CONFIG_VIRTUALIZATION is not set | 882 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index 655518dcd73f..daef36f41b42 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:38 2008 | 4 | # Thu Aug 21 00:52:36 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
94 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -113,10 +114,16 @@ CONFIG_SLAB=y | |||
113 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
114 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
115 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
116 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
117 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
118 | # CONFIG_HAVE_DMA_ATTRS is not set | 122 | # CONFIG_HAVE_DMA_ATTRS is not set |
123 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
124 | # CONFIG_HAVE_CLK is not set | ||
119 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
120 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
121 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
122 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
@@ -127,6 +134,7 @@ CONFIG_BLOCK=y | |||
127 | # CONFIG_BLK_DEV_IO_TRACE is not set | 134 | # CONFIG_BLK_DEV_IO_TRACE is not set |
128 | # CONFIG_LSF is not set | 135 | # CONFIG_LSF is not set |
129 | # CONFIG_BLK_DEV_BSG is not set | 136 | # CONFIG_BLK_DEV_BSG is not set |
137 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
130 | 138 | ||
131 | # | 139 | # |
132 | # IO Schedulers | 140 | # IO Schedulers |
@@ -145,8 +153,6 @@ CONFIG_CLASSIC_RCU=y | |||
145 | # | 153 | # |
146 | # Platform support | 154 | # Platform support |
147 | # | 155 | # |
148 | # CONFIG_PPC_MPC512x is not set | ||
149 | # CONFIG_PPC_MPC5121 is not set | ||
150 | # CONFIG_PPC_CELL is not set | 156 | # CONFIG_PPC_CELL is not set |
151 | # CONFIG_PPC_CELL_NATIVE is not set | 157 | # CONFIG_PPC_CELL_NATIVE is not set |
152 | # CONFIG_PQ2ADS is not set | 158 | # CONFIG_PQ2ADS is not set |
@@ -155,11 +161,13 @@ CONFIG_MPC85xx=y | |||
155 | # CONFIG_MPC8560_ADS is not set | 161 | # CONFIG_MPC8560_ADS is not set |
156 | # CONFIG_MPC85xx_CDS is not set | 162 | # CONFIG_MPC85xx_CDS is not set |
157 | # CONFIG_MPC85xx_MDS is not set | 163 | # CONFIG_MPC85xx_MDS is not set |
164 | # CONFIG_MPC8536_DS is not set | ||
158 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
159 | # CONFIG_KSI8560 is not set | 166 | # CONFIG_KSI8560 is not set |
160 | # CONFIG_STX_GP3 is not set | 167 | # CONFIG_STX_GP3 is not set |
161 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
162 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
170 | # CONFIG_TQM8548 is not set | ||
163 | # CONFIG_TQM8555 is not set | 171 | # CONFIG_TQM8555 is not set |
164 | # CONFIG_TQM8560 is not set | 172 | # CONFIG_TQM8560 is not set |
165 | # CONFIG_SBC8548 is not set | 173 | # CONFIG_SBC8548 is not set |
@@ -214,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 222 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
215 | CONFIG_PAGEFLAGS_EXTENDED=y | 223 | CONFIG_PAGEFLAGS_EXTENDED=y |
216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
225 | CONFIG_MIGRATION=y | ||
217 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
218 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
219 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
@@ -221,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y | |||
221 | CONFIG_FORCE_MAX_ZONEORDER=11 | 230 | CONFIG_FORCE_MAX_ZONEORDER=11 |
222 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
223 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
233 | CONFIG_EXTRA_TARGETS="" | ||
224 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
225 | # CONFIG_SECCOMP is not set | 235 | # CONFIG_SECCOMP is not set |
226 | CONFIG_ISA_DMA_API=y | 236 | CONFIG_ISA_DMA_API=y |
@@ -230,6 +240,7 @@ CONFIG_ISA_DMA_API=y | |||
230 | # | 240 | # |
231 | CONFIG_ZONE_DMA=y | 241 | CONFIG_ZONE_DMA=y |
232 | CONFIG_FSL_SOC=y | 242 | CONFIG_FSL_SOC=y |
243 | CONFIG_PPC_PCI_CHOICE=y | ||
233 | # CONFIG_PCI is not set | 244 | # CONFIG_PCI is not set |
234 | # CONFIG_PCI_DOMAINS is not set | 245 | # CONFIG_PCI_DOMAINS is not set |
235 | # CONFIG_PCI_SYSCALL is not set | 246 | # CONFIG_PCI_SYSCALL is not set |
@@ -251,10 +262,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
251 | CONFIG_PHYSICAL_START=0x00000000 | 262 | CONFIG_PHYSICAL_START=0x00000000 |
252 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 263 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
253 | CONFIG_TASK_SIZE=0xc0000000 | 264 | CONFIG_TASK_SIZE=0xc0000000 |
254 | |||
255 | # | ||
256 | # Networking | ||
257 | # | ||
258 | CONFIG_NET=y | 265 | CONFIG_NET=y |
259 | 266 | ||
260 | # | 267 | # |
@@ -366,6 +373,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
366 | # CONFIG_BLK_DEV_XIP is not set | 373 | # CONFIG_BLK_DEV_XIP is not set |
367 | # CONFIG_CDROM_PKTCDVD is not set | 374 | # CONFIG_CDROM_PKTCDVD is not set |
368 | # CONFIG_ATA_OVER_ETH is not set | 375 | # CONFIG_ATA_OVER_ETH is not set |
376 | # CONFIG_BLK_DEV_HD is not set | ||
369 | CONFIG_MISC_DEVICES=y | 377 | CONFIG_MISC_DEVICES=y |
370 | # CONFIG_EEPROM_93CX6 is not set | 378 | # CONFIG_EEPROM_93CX6 is not set |
371 | # CONFIG_ENCLOSURE_SERVICES is not set | 379 | # CONFIG_ENCLOSURE_SERVICES is not set |
@@ -383,7 +391,6 @@ CONFIG_HAVE_IDE=y | |||
383 | # CONFIG_MD is not set | 391 | # CONFIG_MD is not set |
384 | # CONFIG_MACINTOSH_DRIVERS is not set | 392 | # CONFIG_MACINTOSH_DRIVERS is not set |
385 | CONFIG_NETDEVICES=y | 393 | CONFIG_NETDEVICES=y |
386 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
387 | # CONFIG_DUMMY is not set | 394 | # CONFIG_DUMMY is not set |
388 | # CONFIG_BONDING is not set | 395 | # CONFIG_BONDING is not set |
389 | # CONFIG_MACVLAN is not set | 396 | # CONFIG_MACVLAN is not set |
@@ -415,9 +422,7 @@ CONFIG_MII=y | |||
415 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 422 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
416 | # CONFIG_B44 is not set | 423 | # CONFIG_B44 is not set |
417 | CONFIG_NETDEV_1000=y | 424 | CONFIG_NETDEV_1000=y |
418 | # CONFIG_E1000E_ENABLED is not set | ||
419 | CONFIG_GIANFAR=y | 425 | CONFIG_GIANFAR=y |
420 | CONFIG_GFAR_NAPI=y | ||
421 | CONFIG_NETDEV_10000=y | 426 | CONFIG_NETDEV_10000=y |
422 | 427 | ||
423 | # | 428 | # |
@@ -501,6 +506,8 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
501 | # CONFIG_TCG_TPM is not set | 506 | # CONFIG_TCG_TPM is not set |
502 | # CONFIG_I2C is not set | 507 | # CONFIG_I2C is not set |
503 | # CONFIG_SPI is not set | 508 | # CONFIG_SPI is not set |
509 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
510 | # CONFIG_GPIOLIB is not set | ||
504 | # CONFIG_W1 is not set | 511 | # CONFIG_W1 is not set |
505 | # CONFIG_POWER_SUPPLY is not set | 512 | # CONFIG_POWER_SUPPLY is not set |
506 | CONFIG_HWMON=y | 513 | CONFIG_HWMON=y |
@@ -517,6 +524,7 @@ CONFIG_HWMON=y | |||
517 | # CONFIG_SENSORS_W83627EHF is not set | 524 | # CONFIG_SENSORS_W83627EHF is not set |
518 | # CONFIG_HWMON_DEBUG_CHIP is not set | 525 | # CONFIG_HWMON_DEBUG_CHIP is not set |
519 | # CONFIG_THERMAL is not set | 526 | # CONFIG_THERMAL is not set |
527 | # CONFIG_THERMAL_HWMON is not set | ||
520 | # CONFIG_WATCHDOG is not set | 528 | # CONFIG_WATCHDOG is not set |
521 | 529 | ||
522 | # | 530 | # |
@@ -528,8 +536,10 @@ CONFIG_SSB_POSSIBLE=y | |||
528 | # | 536 | # |
529 | # Multifunction device drivers | 537 | # Multifunction device drivers |
530 | # | 538 | # |
539 | # CONFIG_MFD_CORE is not set | ||
531 | # CONFIG_MFD_SM501 is not set | 540 | # CONFIG_MFD_SM501 is not set |
532 | # CONFIG_HTC_PASIC3 is not set | 541 | # CONFIG_HTC_PASIC3 is not set |
542 | # CONFIG_MFD_TMIO is not set | ||
533 | 543 | ||
534 | # | 544 | # |
535 | # Multimedia devices | 545 | # Multimedia devices |
@@ -559,10 +569,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
559 | # Display device support | 569 | # Display device support |
560 | # | 570 | # |
561 | # CONFIG_DISPLAY_SUPPORT is not set | 571 | # CONFIG_DISPLAY_SUPPORT is not set |
562 | |||
563 | # | ||
564 | # Sound | ||
565 | # | ||
566 | # CONFIG_SOUND is not set | 572 | # CONFIG_SOUND is not set |
567 | CONFIG_HID_SUPPORT=y | 573 | CONFIG_HID_SUPPORT=y |
568 | CONFIG_HID=y | 574 | CONFIG_HID=y |
@@ -576,6 +582,10 @@ CONFIG_USB_SUPPORT=y | |||
576 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 582 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
577 | 583 | ||
578 | # | 584 | # |
585 | # Enable Host or Gadget support to see Inventra options | ||
586 | # | ||
587 | |||
588 | # | ||
579 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 589 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
580 | # | 590 | # |
581 | # CONFIG_USB_GADGET is not set | 591 | # CONFIG_USB_GADGET is not set |
@@ -679,6 +689,7 @@ CONFIG_TMPFS=y | |||
679 | # CONFIG_CRAMFS is not set | 689 | # CONFIG_CRAMFS is not set |
680 | # CONFIG_VXFS_FS is not set | 690 | # CONFIG_VXFS_FS is not set |
681 | # CONFIG_MINIX_FS is not set | 691 | # CONFIG_MINIX_FS is not set |
692 | # CONFIG_OMFS_FS is not set | ||
682 | # CONFIG_HPFS_FS is not set | 693 | # CONFIG_HPFS_FS is not set |
683 | # CONFIG_QNX4FS_FS is not set | 694 | # CONFIG_QNX4FS_FS is not set |
684 | # CONFIG_ROMFS_FS is not set | 695 | # CONFIG_ROMFS_FS is not set |
@@ -688,12 +699,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
688 | CONFIG_NFS_FS=y | 699 | CONFIG_NFS_FS=y |
689 | # CONFIG_NFS_V3 is not set | 700 | # CONFIG_NFS_V3 is not set |
690 | # CONFIG_NFS_V4 is not set | 701 | # CONFIG_NFS_V4 is not set |
691 | # CONFIG_NFSD is not set | ||
692 | CONFIG_ROOT_NFS=y | 702 | CONFIG_ROOT_NFS=y |
703 | # CONFIG_NFSD is not set | ||
693 | CONFIG_LOCKD=y | 704 | CONFIG_LOCKD=y |
694 | CONFIG_NFS_COMMON=y | 705 | CONFIG_NFS_COMMON=y |
695 | CONFIG_SUNRPC=y | 706 | CONFIG_SUNRPC=y |
696 | # CONFIG_SUNRPC_BIND34 is not set | ||
697 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 707 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
698 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 708 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
699 | # CONFIG_SMB_FS is not set | 709 | # CONFIG_SMB_FS is not set |
@@ -729,6 +739,7 @@ CONFIG_BITREVERSE=y | |||
729 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 739 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
730 | # CONFIG_CRC_CCITT is not set | 740 | # CONFIG_CRC_CCITT is not set |
731 | # CONFIG_CRC16 is not set | 741 | # CONFIG_CRC16 is not set |
742 | # CONFIG_CRC_T10DIF is not set | ||
732 | # CONFIG_CRC_ITU_T is not set | 743 | # CONFIG_CRC_ITU_T is not set |
733 | CONFIG_CRC32=y | 744 | CONFIG_CRC32=y |
734 | # CONFIG_CRC7 is not set | 745 | # CONFIG_CRC7 is not set |
@@ -753,6 +764,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
753 | CONFIG_DEBUG_KERNEL=y | 764 | CONFIG_DEBUG_KERNEL=y |
754 | # CONFIG_DEBUG_SHIRQ is not set | 765 | # CONFIG_DEBUG_SHIRQ is not set |
755 | CONFIG_DETECT_SOFTLOCKUP=y | 766 | CONFIG_DETECT_SOFTLOCKUP=y |
767 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
768 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
756 | CONFIG_SCHED_DEBUG=y | 769 | CONFIG_SCHED_DEBUG=y |
757 | # CONFIG_SCHEDSTATS is not set | 770 | # CONFIG_SCHEDSTATS is not set |
758 | # CONFIG_TIMER_STATS is not set | 771 | # CONFIG_TIMER_STATS is not set |
@@ -769,16 +782,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
769 | # CONFIG_DEBUG_INFO is not set | 782 | # CONFIG_DEBUG_INFO is not set |
770 | # CONFIG_DEBUG_VM is not set | 783 | # CONFIG_DEBUG_VM is not set |
771 | # CONFIG_DEBUG_WRITECOUNT is not set | 784 | # CONFIG_DEBUG_WRITECOUNT is not set |
785 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
772 | # CONFIG_DEBUG_LIST is not set | 786 | # CONFIG_DEBUG_LIST is not set |
773 | # CONFIG_DEBUG_SG is not set | 787 | # CONFIG_DEBUG_SG is not set |
774 | # CONFIG_BOOT_PRINTK_DELAY is not set | 788 | # CONFIG_BOOT_PRINTK_DELAY is not set |
789 | # CONFIG_RCU_TORTURE_TEST is not set | ||
775 | # CONFIG_BACKTRACE_SELF_TEST is not set | 790 | # CONFIG_BACKTRACE_SELF_TEST is not set |
776 | # CONFIG_FAULT_INJECTION is not set | 791 | # CONFIG_FAULT_INJECTION is not set |
792 | # CONFIG_LATENCYTOP is not set | ||
793 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
794 | CONFIG_HAVE_FTRACE=y | ||
795 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
796 | # CONFIG_FTRACE is not set | ||
797 | # CONFIG_SCHED_TRACER is not set | ||
798 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
777 | # CONFIG_SAMPLES is not set | 799 | # CONFIG_SAMPLES is not set |
800 | CONFIG_HAVE_ARCH_KGDB=y | ||
801 | # CONFIG_KGDB is not set | ||
778 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 802 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
779 | # CONFIG_DEBUG_STACK_USAGE is not set | 803 | # CONFIG_DEBUG_STACK_USAGE is not set |
780 | # CONFIG_DEBUG_PAGEALLOC is not set | 804 | # CONFIG_DEBUG_PAGEALLOC is not set |
781 | # CONFIG_DEBUGGER is not set | 805 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
806 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
807 | # CONFIG_XMON is not set | ||
782 | # CONFIG_IRQSTACKS is not set | 808 | # CONFIG_IRQSTACKS is not set |
783 | # CONFIG_BDI_SWITCH is not set | 809 | # CONFIG_BDI_SWITCH is not set |
784 | CONFIG_PPC_EARLY_DEBUG=y | 810 | CONFIG_PPC_EARLY_DEBUG=y |
@@ -842,6 +868,10 @@ CONFIG_CRYPTO=y | |||
842 | # CONFIG_CRYPTO_MD4 is not set | 868 | # CONFIG_CRYPTO_MD4 is not set |
843 | # CONFIG_CRYPTO_MD5 is not set | 869 | # CONFIG_CRYPTO_MD5 is not set |
844 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 870 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
871 | # CONFIG_CRYPTO_RMD128 is not set | ||
872 | # CONFIG_CRYPTO_RMD160 is not set | ||
873 | # CONFIG_CRYPTO_RMD256 is not set | ||
874 | # CONFIG_CRYPTO_RMD320 is not set | ||
845 | # CONFIG_CRYPTO_SHA1 is not set | 875 | # CONFIG_CRYPTO_SHA1 is not set |
846 | # CONFIG_CRYPTO_SHA256 is not set | 876 | # CONFIG_CRYPTO_SHA256 is not set |
847 | # CONFIG_CRYPTO_SHA512 is not set | 877 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -873,5 +903,6 @@ CONFIG_CRYPTO=y | |||
873 | # CONFIG_CRYPTO_DEFLATE is not set | 903 | # CONFIG_CRYPTO_DEFLATE is not set |
874 | # CONFIG_CRYPTO_LZO is not set | 904 | # CONFIG_CRYPTO_LZO is not set |
875 | CONFIG_CRYPTO_HW=y | 905 | CONFIG_CRYPTO_HW=y |
906 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
876 | # CONFIG_PPC_CLOCK is not set | 907 | # CONFIG_PPC_CLOCK is not set |
877 | # CONFIG_VIRTUALIZATION is not set | 908 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/stx_gp3_defconfig b/arch/powerpc/configs/85xx/stx_gp3_defconfig index 7804ca1ecc94..2b05d43f8f7e 100644 --- a/arch/powerpc/configs/85xx/stx_gp3_defconfig +++ b/arch/powerpc/configs/85xx/stx_gp3_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:38 2008 | 4 | # Thu Aug 21 00:52:37 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | ||
42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
94 | # CONFIG_KALLSYMS_ALL is not set | 96 | # CONFIG_KALLSYMS_ALL is not set |
95 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 97 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -115,10 +117,16 @@ CONFIG_SLUB=y | |||
115 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
116 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
117 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
118 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
119 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
120 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
126 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
127 | CONFIG_HAVE_CLK=y | ||
121 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
122 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
123 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
124 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
@@ -134,6 +142,7 @@ CONFIG_BLOCK=y | |||
134 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
135 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
136 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
137 | 146 | ||
138 | # | 147 | # |
139 | # IO Schedulers | 148 | # IO Schedulers |
@@ -152,8 +161,6 @@ CONFIG_CLASSIC_RCU=y | |||
152 | # | 161 | # |
153 | # Platform support | 162 | # Platform support |
154 | # | 163 | # |
155 | # CONFIG_PPC_MPC512x is not set | ||
156 | # CONFIG_PPC_MPC5121 is not set | ||
157 | # CONFIG_PPC_CELL is not set | 164 | # CONFIG_PPC_CELL is not set |
158 | # CONFIG_PPC_CELL_NATIVE is not set | 165 | # CONFIG_PPC_CELL_NATIVE is not set |
159 | # CONFIG_PQ2ADS is not set | 166 | # CONFIG_PQ2ADS is not set |
@@ -162,11 +169,13 @@ CONFIG_MPC85xx=y | |||
162 | # CONFIG_MPC8560_ADS is not set | 169 | # CONFIG_MPC8560_ADS is not set |
163 | # CONFIG_MPC85xx_CDS is not set | 170 | # CONFIG_MPC85xx_CDS is not set |
164 | # CONFIG_MPC85xx_MDS is not set | 171 | # CONFIG_MPC85xx_MDS is not set |
172 | # CONFIG_MPC8536_DS is not set | ||
165 | # CONFIG_MPC85xx_DS is not set | 173 | # CONFIG_MPC85xx_DS is not set |
166 | # CONFIG_KSI8560 is not set | 174 | # CONFIG_KSI8560 is not set |
167 | CONFIG_STX_GP3=y | 175 | CONFIG_STX_GP3=y |
168 | # CONFIG_TQM8540 is not set | 176 | # CONFIG_TQM8540 is not set |
169 | # CONFIG_TQM8541 is not set | 177 | # CONFIG_TQM8541 is not set |
178 | # CONFIG_TQM8548 is not set | ||
170 | # CONFIG_TQM8555 is not set | 179 | # CONFIG_TQM8555 is not set |
171 | # CONFIG_TQM8560 is not set | 180 | # CONFIG_TQM8560 is not set |
172 | # CONFIG_SBC8548 is not set | 181 | # CONFIG_SBC8548 is not set |
@@ -183,7 +192,6 @@ CONFIG_MPIC=y | |||
183 | # CONFIG_GENERIC_IOMAP is not set | 192 | # CONFIG_GENERIC_IOMAP is not set |
184 | # CONFIG_CPU_FREQ is not set | 193 | # CONFIG_CPU_FREQ is not set |
185 | CONFIG_CPM2=y | 194 | CONFIG_CPM2=y |
186 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
187 | # CONFIG_FSL_ULI1575 is not set | 195 | # CONFIG_FSL_ULI1575 is not set |
188 | CONFIG_CPM=y | 196 | CONFIG_CPM=y |
189 | 197 | ||
@@ -223,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 231 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
224 | CONFIG_PAGEFLAGS_EXTENDED=y | 232 | CONFIG_PAGEFLAGS_EXTENDED=y |
225 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 233 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
234 | CONFIG_MIGRATION=y | ||
226 | # CONFIG_RESOURCES_64BIT is not set | 235 | # CONFIG_RESOURCES_64BIT is not set |
227 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
228 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
@@ -230,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y | |||
230 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
231 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
232 | # CONFIG_CMDLINE_BOOL is not set | 241 | # CONFIG_CMDLINE_BOOL is not set |
242 | CONFIG_EXTRA_TARGETS="" | ||
233 | # CONFIG_PM is not set | 243 | # CONFIG_PM is not set |
234 | CONFIG_SECCOMP=y | 244 | CONFIG_SECCOMP=y |
235 | CONFIG_ISA_DMA_API=y | 245 | CONFIG_ISA_DMA_API=y |
@@ -241,6 +251,7 @@ CONFIG_ZONE_DMA=y | |||
241 | CONFIG_PPC_INDIRECT_PCI=y | 251 | CONFIG_PPC_INDIRECT_PCI=y |
242 | CONFIG_FSL_SOC=y | 252 | CONFIG_FSL_SOC=y |
243 | CONFIG_FSL_PCI=y | 253 | CONFIG_FSL_PCI=y |
254 | CONFIG_PPC_PCI_CHOICE=y | ||
244 | CONFIG_PCI=y | 255 | CONFIG_PCI=y |
245 | CONFIG_PCI_DOMAINS=y | 256 | CONFIG_PCI_DOMAINS=y |
246 | CONFIG_PCI_SYSCALL=y | 257 | CONFIG_PCI_SYSCALL=y |
@@ -267,10 +278,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
267 | CONFIG_PHYSICAL_START=0x00000000 | 278 | CONFIG_PHYSICAL_START=0x00000000 |
268 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 279 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
269 | CONFIG_TASK_SIZE=0xc0000000 | 280 | CONFIG_TASK_SIZE=0xc0000000 |
270 | |||
271 | # | ||
272 | # Networking | ||
273 | # | ||
274 | CONFIG_NET=y | 281 | CONFIG_NET=y |
275 | 282 | ||
276 | # | 283 | # |
@@ -426,6 +433,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
426 | # CONFIG_CONNECTOR is not set | 433 | # CONFIG_CONNECTOR is not set |
427 | # CONFIG_MTD is not set | 434 | # CONFIG_MTD is not set |
428 | CONFIG_OF_DEVICE=y | 435 | CONFIG_OF_DEVICE=y |
436 | CONFIG_OF_GPIO=y | ||
429 | CONFIG_OF_I2C=m | 437 | CONFIG_OF_I2C=m |
430 | CONFIG_PARPORT=m | 438 | CONFIG_PARPORT=m |
431 | CONFIG_PARPORT_PC=m | 439 | CONFIG_PARPORT_PC=m |
@@ -452,15 +460,16 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
452 | # CONFIG_BLK_DEV_XIP is not set | 460 | # CONFIG_BLK_DEV_XIP is not set |
453 | # CONFIG_CDROM_PKTCDVD is not set | 461 | # CONFIG_CDROM_PKTCDVD is not set |
454 | # CONFIG_ATA_OVER_ETH is not set | 462 | # CONFIG_ATA_OVER_ETH is not set |
463 | # CONFIG_BLK_DEV_HD is not set | ||
455 | CONFIG_MISC_DEVICES=y | 464 | CONFIG_MISC_DEVICES=y |
456 | # CONFIG_PHANTOM is not set | 465 | # CONFIG_PHANTOM is not set |
457 | # CONFIG_EEPROM_93CX6 is not set | 466 | # CONFIG_EEPROM_93CX6 is not set |
458 | # CONFIG_SGI_IOC4 is not set | 467 | # CONFIG_SGI_IOC4 is not set |
459 | # CONFIG_TIFM_CORE is not set | 468 | # CONFIG_TIFM_CORE is not set |
460 | # CONFIG_ENCLOSURE_SERVICES is not set | 469 | # CONFIG_ENCLOSURE_SERVICES is not set |
470 | # CONFIG_HP_ILO is not set | ||
461 | CONFIG_HAVE_IDE=y | 471 | CONFIG_HAVE_IDE=y |
462 | CONFIG_IDE=y | 472 | CONFIG_IDE=y |
463 | CONFIG_IDE_MAX_HWIFS=4 | ||
464 | CONFIG_BLK_DEV_IDE=y | 473 | CONFIG_BLK_DEV_IDE=y |
465 | 474 | ||
466 | # | 475 | # |
@@ -480,7 +489,6 @@ CONFIG_IDE_PROC_FS=y | |||
480 | # | 489 | # |
481 | # IDE chipset support/bugfixes | 490 | # IDE chipset support/bugfixes |
482 | # | 491 | # |
483 | CONFIG_IDE_GENERIC=y | ||
484 | # CONFIG_BLK_DEV_PLATFORM is not set | 492 | # CONFIG_BLK_DEV_PLATFORM is not set |
485 | 493 | ||
486 | # | 494 | # |
@@ -493,10 +501,8 @@ CONFIG_IDE_GENERIC=y | |||
493 | # CONFIG_BLK_DEV_AMD74XX is not set | 501 | # CONFIG_BLK_DEV_AMD74XX is not set |
494 | # CONFIG_BLK_DEV_CMD64X is not set | 502 | # CONFIG_BLK_DEV_CMD64X is not set |
495 | # CONFIG_BLK_DEV_TRIFLEX is not set | 503 | # CONFIG_BLK_DEV_TRIFLEX is not set |
496 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
497 | # CONFIG_BLK_DEV_CS5520 is not set | 504 | # CONFIG_BLK_DEV_CS5520 is not set |
498 | # CONFIG_BLK_DEV_CS5530 is not set | 505 | # CONFIG_BLK_DEV_CS5530 is not set |
499 | # CONFIG_BLK_DEV_HPT34X is not set | ||
500 | # CONFIG_BLK_DEV_HPT366 is not set | 506 | # CONFIG_BLK_DEV_HPT366 is not set |
501 | # CONFIG_BLK_DEV_JMICRON is not set | 507 | # CONFIG_BLK_DEV_JMICRON is not set |
502 | # CONFIG_BLK_DEV_SC1200 is not set | 508 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -514,8 +520,6 @@ CONFIG_IDE_GENERIC=y | |||
514 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 520 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
515 | # CONFIG_BLK_DEV_TC86C001 is not set | 521 | # CONFIG_BLK_DEV_TC86C001 is not set |
516 | # CONFIG_BLK_DEV_IDEDMA is not set | 522 | # CONFIG_BLK_DEV_IDEDMA is not set |
517 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
518 | # CONFIG_BLK_DEV_HD is not set | ||
519 | 523 | ||
520 | # | 524 | # |
521 | # SCSI device support | 525 | # SCSI device support |
@@ -594,6 +598,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
594 | # CONFIG_SCSI_NSP32 is not set | 598 | # CONFIG_SCSI_NSP32 is not set |
595 | # CONFIG_SCSI_DEBUG is not set | 599 | # CONFIG_SCSI_DEBUG is not set |
596 | # CONFIG_SCSI_SRP is not set | 600 | # CONFIG_SCSI_SRP is not set |
601 | # CONFIG_SCSI_DH is not set | ||
597 | # CONFIG_ATA is not set | 602 | # CONFIG_ATA is not set |
598 | # CONFIG_MD is not set | 603 | # CONFIG_MD is not set |
599 | # CONFIG_FUSION is not set | 604 | # CONFIG_FUSION is not set |
@@ -601,12 +606,15 @@ CONFIG_SCSI_LOWLEVEL=y | |||
601 | # | 606 | # |
602 | # IEEE 1394 (FireWire) support | 607 | # IEEE 1394 (FireWire) support |
603 | # | 608 | # |
609 | |||
610 | # | ||
611 | # Enable only one of the two stacks, unless you know what you are doing | ||
612 | # | ||
604 | # CONFIG_FIREWIRE is not set | 613 | # CONFIG_FIREWIRE is not set |
605 | # CONFIG_IEEE1394 is not set | 614 | # CONFIG_IEEE1394 is not set |
606 | # CONFIG_I2O is not set | 615 | # CONFIG_I2O is not set |
607 | # CONFIG_MACINTOSH_DRIVERS is not set | 616 | # CONFIG_MACINTOSH_DRIVERS is not set |
608 | CONFIG_NETDEVICES=y | 617 | CONFIG_NETDEVICES=y |
609 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
610 | # CONFIG_DUMMY is not set | 618 | # CONFIG_DUMMY is not set |
611 | # CONFIG_BONDING is not set | 619 | # CONFIG_BONDING is not set |
612 | # CONFIG_MACVLAN is not set | 620 | # CONFIG_MACVLAN is not set |
@@ -652,7 +660,6 @@ CONFIG_NETDEV_1000=y | |||
652 | # CONFIG_DL2K is not set | 660 | # CONFIG_DL2K is not set |
653 | # CONFIG_E1000 is not set | 661 | # CONFIG_E1000 is not set |
654 | # CONFIG_E1000E is not set | 662 | # CONFIG_E1000E is not set |
655 | # CONFIG_E1000E_ENABLED is not set | ||
656 | # CONFIG_IP1000 is not set | 663 | # CONFIG_IP1000 is not set |
657 | # CONFIG_IGB is not set | 664 | # CONFIG_IGB is not set |
658 | # CONFIG_NS83820 is not set | 665 | # CONFIG_NS83820 is not set |
@@ -666,9 +673,9 @@ CONFIG_NETDEV_1000=y | |||
666 | # CONFIG_TIGON3 is not set | 673 | # CONFIG_TIGON3 is not set |
667 | # CONFIG_BNX2 is not set | 674 | # CONFIG_BNX2 is not set |
668 | CONFIG_GIANFAR=y | 675 | CONFIG_GIANFAR=y |
669 | CONFIG_GFAR_NAPI=y | ||
670 | # CONFIG_QLA3XXX is not set | 676 | # CONFIG_QLA3XXX is not set |
671 | # CONFIG_ATL1 is not set | 677 | # CONFIG_ATL1 is not set |
678 | # CONFIG_ATL1E is not set | ||
672 | CONFIG_NETDEV_10000=y | 679 | CONFIG_NETDEV_10000=y |
673 | # CONFIG_CHELSIO_T1 is not set | 680 | # CONFIG_CHELSIO_T1 is not set |
674 | # CONFIG_CHELSIO_T3 is not set | 681 | # CONFIG_CHELSIO_T3 is not set |
@@ -731,6 +738,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
731 | # CONFIG_KEYBOARD_XTKBD is not set | 738 | # CONFIG_KEYBOARD_XTKBD is not set |
732 | # CONFIG_KEYBOARD_NEWTON is not set | 739 | # CONFIG_KEYBOARD_NEWTON is not set |
733 | # CONFIG_KEYBOARD_STOWAWAY is not set | 740 | # CONFIG_KEYBOARD_STOWAWAY is not set |
741 | # CONFIG_KEYBOARD_GPIO is not set | ||
734 | CONFIG_INPUT_MOUSE=y | 742 | CONFIG_INPUT_MOUSE=y |
735 | CONFIG_MOUSE_PS2=y | 743 | CONFIG_MOUSE_PS2=y |
736 | CONFIG_MOUSE_PS2_ALPS=y | 744 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -741,7 +749,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
741 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 749 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
742 | # CONFIG_MOUSE_SERIAL is not set | 750 | # CONFIG_MOUSE_SERIAL is not set |
743 | # CONFIG_MOUSE_APPLETOUCH is not set | 751 | # CONFIG_MOUSE_APPLETOUCH is not set |
752 | # CONFIG_MOUSE_BCM5974 is not set | ||
744 | # CONFIG_MOUSE_VSXXXAA is not set | 753 | # CONFIG_MOUSE_VSXXXAA is not set |
754 | # CONFIG_MOUSE_GPIO is not set | ||
745 | # CONFIG_INPUT_JOYSTICK is not set | 755 | # CONFIG_INPUT_JOYSTICK is not set |
746 | # CONFIG_INPUT_TABLET is not set | 756 | # CONFIG_INPUT_TABLET is not set |
747 | # CONFIG_INPUT_TOUCHSCREEN is not set | 757 | # CONFIG_INPUT_TOUCHSCREEN is not set |
@@ -757,6 +767,7 @@ CONFIG_SERIO_SERPORT=y | |||
757 | # CONFIG_SERIO_PCIPS2 is not set | 767 | # CONFIG_SERIO_PCIPS2 is not set |
758 | CONFIG_SERIO_LIBPS2=y | 768 | CONFIG_SERIO_LIBPS2=y |
759 | # CONFIG_SERIO_RAW is not set | 769 | # CONFIG_SERIO_RAW is not set |
770 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
760 | # CONFIG_GAMEPORT is not set | 771 | # CONFIG_GAMEPORT is not set |
761 | 772 | ||
762 | # | 773 | # |
@@ -805,44 +816,68 @@ CONFIG_DEVPORT=y | |||
805 | CONFIG_I2C=m | 816 | CONFIG_I2C=m |
806 | CONFIG_I2C_BOARDINFO=y | 817 | CONFIG_I2C_BOARDINFO=y |
807 | CONFIG_I2C_CHARDEV=m | 818 | CONFIG_I2C_CHARDEV=m |
819 | CONFIG_I2C_HELPER_AUTO=y | ||
808 | 820 | ||
809 | # | 821 | # |
810 | # I2C Hardware Bus support | 822 | # I2C Hardware Bus support |
811 | # | 823 | # |
824 | |||
825 | # | ||
826 | # PC SMBus host controller drivers | ||
827 | # | ||
812 | # CONFIG_I2C_ALI1535 is not set | 828 | # CONFIG_I2C_ALI1535 is not set |
813 | # CONFIG_I2C_ALI1563 is not set | 829 | # CONFIG_I2C_ALI1563 is not set |
814 | # CONFIG_I2C_ALI15X3 is not set | 830 | # CONFIG_I2C_ALI15X3 is not set |
815 | # CONFIG_I2C_AMD756 is not set | 831 | # CONFIG_I2C_AMD756 is not set |
816 | # CONFIG_I2C_AMD8111 is not set | 832 | # CONFIG_I2C_AMD8111 is not set |
817 | # CONFIG_I2C_I801 is not set | 833 | # CONFIG_I2C_I801 is not set |
818 | # CONFIG_I2C_I810 is not set | 834 | # CONFIG_I2C_ISCH is not set |
819 | # CONFIG_I2C_PIIX4 is not set | 835 | # CONFIG_I2C_PIIX4 is not set |
820 | # CONFIG_I2C_MPC is not set | ||
821 | # CONFIG_I2C_NFORCE2 is not set | 836 | # CONFIG_I2C_NFORCE2 is not set |
822 | # CONFIG_I2C_OCORES is not set | ||
823 | # CONFIG_I2C_PARPORT is not set | ||
824 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
825 | # CONFIG_I2C_PROSAVAGE is not set | ||
826 | # CONFIG_I2C_SAVAGE4 is not set | ||
827 | # CONFIG_I2C_SIMTEC is not set | ||
828 | # CONFIG_I2C_SIS5595 is not set | 837 | # CONFIG_I2C_SIS5595 is not set |
829 | # CONFIG_I2C_SIS630 is not set | 838 | # CONFIG_I2C_SIS630 is not set |
830 | # CONFIG_I2C_SIS96X is not set | 839 | # CONFIG_I2C_SIS96X is not set |
831 | # CONFIG_I2C_TAOS_EVM is not set | ||
832 | # CONFIG_I2C_STUB is not set | ||
833 | # CONFIG_I2C_VIA is not set | 840 | # CONFIG_I2C_VIA is not set |
834 | # CONFIG_I2C_VIAPRO is not set | 841 | # CONFIG_I2C_VIAPRO is not set |
842 | |||
843 | # | ||
844 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
845 | # | ||
846 | # CONFIG_I2C_CPM is not set | ||
847 | # CONFIG_I2C_GPIO is not set | ||
848 | # CONFIG_I2C_MPC is not set | ||
849 | # CONFIG_I2C_OCORES is not set | ||
850 | # CONFIG_I2C_SIMTEC is not set | ||
851 | |||
852 | # | ||
853 | # External I2C/SMBus adapter drivers | ||
854 | # | ||
855 | # CONFIG_I2C_PARPORT is not set | ||
856 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
857 | # CONFIG_I2C_TAOS_EVM is not set | ||
858 | |||
859 | # | ||
860 | # Graphics adapter I2C/DDC channel drivers | ||
861 | # | ||
835 | # CONFIG_I2C_VOODOO3 is not set | 862 | # CONFIG_I2C_VOODOO3 is not set |
863 | |||
864 | # | ||
865 | # Other I2C/SMBus bus drivers | ||
866 | # | ||
836 | # CONFIG_I2C_PCA_PLATFORM is not set | 867 | # CONFIG_I2C_PCA_PLATFORM is not set |
868 | # CONFIG_I2C_STUB is not set | ||
837 | 869 | ||
838 | # | 870 | # |
839 | # Miscellaneous I2C Chip support | 871 | # Miscellaneous I2C Chip support |
840 | # | 872 | # |
841 | # CONFIG_DS1682 is not set | 873 | # CONFIG_DS1682 is not set |
874 | # CONFIG_AT24 is not set | ||
842 | # CONFIG_SENSORS_EEPROM is not set | 875 | # CONFIG_SENSORS_EEPROM is not set |
843 | # CONFIG_SENSORS_PCF8574 is not set | 876 | # CONFIG_SENSORS_PCF8574 is not set |
844 | # CONFIG_PCF8575 is not set | 877 | # CONFIG_PCF8575 is not set |
878 | # CONFIG_SENSORS_PCA9539 is not set | ||
845 | # CONFIG_SENSORS_PCF8591 is not set | 879 | # CONFIG_SENSORS_PCF8591 is not set |
880 | # CONFIG_TPS65010 is not set | ||
846 | # CONFIG_SENSORS_MAX6875 is not set | 881 | # CONFIG_SENSORS_MAX6875 is not set |
847 | # CONFIG_SENSORS_TSL2550 is not set | 882 | # CONFIG_SENSORS_TSL2550 is not set |
848 | # CONFIG_I2C_DEBUG_CORE is not set | 883 | # CONFIG_I2C_DEBUG_CORE is not set |
@@ -850,10 +885,32 @@ CONFIG_I2C_CHARDEV=m | |||
850 | # CONFIG_I2C_DEBUG_BUS is not set | 885 | # CONFIG_I2C_DEBUG_BUS is not set |
851 | # CONFIG_I2C_DEBUG_CHIP is not set | 886 | # CONFIG_I2C_DEBUG_CHIP is not set |
852 | # CONFIG_SPI is not set | 887 | # CONFIG_SPI is not set |
888 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
889 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
890 | CONFIG_GPIOLIB=y | ||
891 | # CONFIG_DEBUG_GPIO is not set | ||
892 | # CONFIG_GPIO_SYSFS is not set | ||
893 | |||
894 | # | ||
895 | # I2C GPIO expanders: | ||
896 | # | ||
897 | # CONFIG_GPIO_MAX732X is not set | ||
898 | # CONFIG_GPIO_PCA953X is not set | ||
899 | # CONFIG_GPIO_PCF857X is not set | ||
900 | |||
901 | # | ||
902 | # PCI GPIO expanders: | ||
903 | # | ||
904 | # CONFIG_GPIO_BT8XX is not set | ||
905 | |||
906 | # | ||
907 | # SPI GPIO expanders: | ||
908 | # | ||
853 | # CONFIG_W1 is not set | 909 | # CONFIG_W1 is not set |
854 | # CONFIG_POWER_SUPPLY is not set | 910 | # CONFIG_POWER_SUPPLY is not set |
855 | CONFIG_HWMON=y | 911 | CONFIG_HWMON=y |
856 | # CONFIG_HWMON_VID is not set | 912 | # CONFIG_HWMON_VID is not set |
913 | # CONFIG_SENSORS_AD7414 is not set | ||
857 | # CONFIG_SENSORS_AD7418 is not set | 914 | # CONFIG_SENSORS_AD7418 is not set |
858 | # CONFIG_SENSORS_ADM1021 is not set | 915 | # CONFIG_SENSORS_ADM1021 is not set |
859 | # CONFIG_SENSORS_ADM1025 is not set | 916 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -907,6 +964,7 @@ CONFIG_HWMON=y | |||
907 | # CONFIG_SENSORS_W83627EHF is not set | 964 | # CONFIG_SENSORS_W83627EHF is not set |
908 | # CONFIG_HWMON_DEBUG_CHIP is not set | 965 | # CONFIG_HWMON_DEBUG_CHIP is not set |
909 | # CONFIG_THERMAL is not set | 966 | # CONFIG_THERMAL is not set |
967 | # CONFIG_THERMAL_HWMON is not set | ||
910 | # CONFIG_WATCHDOG is not set | 968 | # CONFIG_WATCHDOG is not set |
911 | 969 | ||
912 | # | 970 | # |
@@ -918,8 +976,10 @@ CONFIG_SSB_POSSIBLE=y | |||
918 | # | 976 | # |
919 | # Multifunction device drivers | 977 | # Multifunction device drivers |
920 | # | 978 | # |
979 | # CONFIG_MFD_CORE is not set | ||
921 | # CONFIG_MFD_SM501 is not set | 980 | # CONFIG_MFD_SM501 is not set |
922 | # CONFIG_HTC_PASIC3 is not set | 981 | # CONFIG_HTC_PASIC3 is not set |
982 | # CONFIG_MFD_TMIO is not set | ||
923 | 983 | ||
924 | # | 984 | # |
925 | # Multimedia devices | 985 | # Multimedia devices |
@@ -958,20 +1018,8 @@ CONFIG_DRM=m | |||
958 | # Display device support | 1018 | # Display device support |
959 | # | 1019 | # |
960 | # CONFIG_DISPLAY_SUPPORT is not set | 1020 | # CONFIG_DISPLAY_SUPPORT is not set |
961 | |||
962 | # | ||
963 | # Sound | ||
964 | # | ||
965 | CONFIG_SOUND=m | 1021 | CONFIG_SOUND=m |
966 | |||
967 | # | ||
968 | # Advanced Linux Sound Architecture | ||
969 | # | ||
970 | # CONFIG_SND is not set | 1022 | # CONFIG_SND is not set |
971 | |||
972 | # | ||
973 | # Open Sound System | ||
974 | # | ||
975 | # CONFIG_SOUND_PRIME is not set | 1023 | # CONFIG_SOUND_PRIME is not set |
976 | CONFIG_HID_SUPPORT=y | 1024 | CONFIG_HID_SUPPORT=y |
977 | CONFIG_HID=y | 1025 | CONFIG_HID=y |
@@ -986,6 +1034,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
986 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1034 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
987 | 1035 | ||
988 | # | 1036 | # |
1037 | # Enable Host or Gadget support to see Inventra options | ||
1038 | # | ||
1039 | |||
1040 | # | ||
989 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1041 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
990 | # | 1042 | # |
991 | # CONFIG_USB_GADGET is not set | 1043 | # CONFIG_USB_GADGET is not set |
@@ -1070,6 +1122,7 @@ CONFIG_TMPFS=y | |||
1070 | CONFIG_CRAMFS=m | 1122 | CONFIG_CRAMFS=m |
1071 | # CONFIG_VXFS_FS is not set | 1123 | # CONFIG_VXFS_FS is not set |
1072 | # CONFIG_MINIX_FS is not set | 1124 | # CONFIG_MINIX_FS is not set |
1125 | # CONFIG_OMFS_FS is not set | ||
1073 | # CONFIG_HPFS_FS is not set | 1126 | # CONFIG_HPFS_FS is not set |
1074 | # CONFIG_QNX4FS_FS is not set | 1127 | # CONFIG_QNX4FS_FS is not set |
1075 | # CONFIG_ROMFS_FS is not set | 1128 | # CONFIG_ROMFS_FS is not set |
@@ -1080,13 +1133,12 @@ CONFIG_NFS_FS=y | |||
1080 | CONFIG_NFS_V3=y | 1133 | CONFIG_NFS_V3=y |
1081 | # CONFIG_NFS_V3_ACL is not set | 1134 | # CONFIG_NFS_V3_ACL is not set |
1082 | # CONFIG_NFS_V4 is not set | 1135 | # CONFIG_NFS_V4 is not set |
1083 | # CONFIG_NFSD is not set | ||
1084 | CONFIG_ROOT_NFS=y | 1136 | CONFIG_ROOT_NFS=y |
1137 | # CONFIG_NFSD is not set | ||
1085 | CONFIG_LOCKD=y | 1138 | CONFIG_LOCKD=y |
1086 | CONFIG_LOCKD_V4=y | 1139 | CONFIG_LOCKD_V4=y |
1087 | CONFIG_NFS_COMMON=y | 1140 | CONFIG_NFS_COMMON=y |
1088 | CONFIG_SUNRPC=y | 1141 | CONFIG_SUNRPC=y |
1089 | # CONFIG_SUNRPC_BIND34 is not set | ||
1090 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1142 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1091 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1143 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1092 | CONFIG_SMB_FS=m | 1144 | CONFIG_SMB_FS=m |
@@ -1150,6 +1202,7 @@ CONFIG_BITREVERSE=y | |||
1150 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1202 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1151 | CONFIG_CRC_CCITT=y | 1203 | CONFIG_CRC_CCITT=y |
1152 | # CONFIG_CRC16 is not set | 1204 | # CONFIG_CRC16 is not set |
1205 | CONFIG_CRC_T10DIF=m | ||
1153 | CONFIG_CRC_ITU_T=m | 1206 | CONFIG_CRC_ITU_T=m |
1154 | CONFIG_CRC32=y | 1207 | CONFIG_CRC32=y |
1155 | # CONFIG_CRC7 is not set | 1208 | # CONFIG_CRC7 is not set |
@@ -1175,6 +1228,8 @@ CONFIG_FRAME_WARN=1024 | |||
1175 | CONFIG_DEBUG_KERNEL=y | 1228 | CONFIG_DEBUG_KERNEL=y |
1176 | # CONFIG_DEBUG_SHIRQ is not set | 1229 | # CONFIG_DEBUG_SHIRQ is not set |
1177 | CONFIG_DETECT_SOFTLOCKUP=y | 1230 | CONFIG_DETECT_SOFTLOCKUP=y |
1231 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1232 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1178 | CONFIG_SCHED_DEBUG=y | 1233 | CONFIG_SCHED_DEBUG=y |
1179 | # CONFIG_SCHEDSTATS is not set | 1234 | # CONFIG_SCHEDSTATS is not set |
1180 | # CONFIG_TIMER_STATS is not set | 1235 | # CONFIG_TIMER_STATS is not set |
@@ -1193,18 +1248,29 @@ CONFIG_SCHED_DEBUG=y | |||
1193 | # CONFIG_DEBUG_INFO is not set | 1248 | # CONFIG_DEBUG_INFO is not set |
1194 | # CONFIG_DEBUG_VM is not set | 1249 | # CONFIG_DEBUG_VM is not set |
1195 | # CONFIG_DEBUG_WRITECOUNT is not set | 1250 | # CONFIG_DEBUG_WRITECOUNT is not set |
1251 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1196 | # CONFIG_DEBUG_LIST is not set | 1252 | # CONFIG_DEBUG_LIST is not set |
1197 | # CONFIG_DEBUG_SG is not set | 1253 | # CONFIG_DEBUG_SG is not set |
1198 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1254 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1199 | # CONFIG_RCU_TORTURE_TEST is not set | 1255 | # CONFIG_RCU_TORTURE_TEST is not set |
1200 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1256 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1201 | # CONFIG_FAULT_INJECTION is not set | 1257 | # CONFIG_FAULT_INJECTION is not set |
1258 | # CONFIG_LATENCYTOP is not set | ||
1259 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1260 | CONFIG_HAVE_FTRACE=y | ||
1261 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1262 | # CONFIG_FTRACE is not set | ||
1263 | # CONFIG_SCHED_TRACER is not set | ||
1264 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1202 | # CONFIG_SAMPLES is not set | 1265 | # CONFIG_SAMPLES is not set |
1266 | CONFIG_HAVE_ARCH_KGDB=y | ||
1267 | # CONFIG_KGDB is not set | ||
1203 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1268 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1204 | # CONFIG_DEBUG_STACK_USAGE is not set | 1269 | # CONFIG_DEBUG_STACK_USAGE is not set |
1205 | # CONFIG_DEBUG_PAGEALLOC is not set | 1270 | # CONFIG_DEBUG_PAGEALLOC is not set |
1206 | # CONFIG_DEBUGGER is not set | 1271 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1207 | # CONFIG_KGDB_CONSOLE is not set | 1272 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1273 | # CONFIG_XMON is not set | ||
1208 | # CONFIG_IRQSTACKS is not set | 1274 | # CONFIG_IRQSTACKS is not set |
1209 | CONFIG_BDI_SWITCH=y | 1275 | CONFIG_BDI_SWITCH=y |
1210 | # CONFIG_PPC_EARLY_DEBUG is not set | 1276 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1258,6 +1324,10 @@ CONFIG_CRYPTO=y | |||
1258 | # CONFIG_CRYPTO_MD4 is not set | 1324 | # CONFIG_CRYPTO_MD4 is not set |
1259 | # CONFIG_CRYPTO_MD5 is not set | 1325 | # CONFIG_CRYPTO_MD5 is not set |
1260 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1326 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1327 | # CONFIG_CRYPTO_RMD128 is not set | ||
1328 | # CONFIG_CRYPTO_RMD160 is not set | ||
1329 | # CONFIG_CRYPTO_RMD256 is not set | ||
1330 | # CONFIG_CRYPTO_RMD320 is not set | ||
1261 | # CONFIG_CRYPTO_SHA1 is not set | 1331 | # CONFIG_CRYPTO_SHA1 is not set |
1262 | # CONFIG_CRYPTO_SHA256 is not set | 1332 | # CONFIG_CRYPTO_SHA256 is not set |
1263 | # CONFIG_CRYPTO_SHA512 is not set | 1333 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1290,6 +1360,7 @@ CONFIG_CRYPTO=y | |||
1290 | # CONFIG_CRYPTO_LZO is not set | 1360 | # CONFIG_CRYPTO_LZO is not set |
1291 | CONFIG_CRYPTO_HW=y | 1361 | CONFIG_CRYPTO_HW=y |
1292 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1362 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1293 | # CONFIG_PPC_CLOCK is not set | 1363 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
1364 | CONFIG_PPC_CLOCK=y | ||
1294 | CONFIG_PPC_LIB_RHEAP=y | 1365 | CONFIG_PPC_LIB_RHEAP=y |
1295 | # CONFIG_VIRTUALIZATION is not set | 1366 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8540_defconfig b/arch/powerpc/configs/85xx/tqm8540_defconfig index e0b5559e84aa..1b2d5d577915 100644 --- a/arch/powerpc/configs/85xx/tqm8540_defconfig +++ b/arch/powerpc/configs/85xx/tqm8540_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:39 2008 | 4 | # Thu Aug 21 00:52:37 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -89,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | # CONFIG_KALLSYMS is not set | 94 | # CONFIG_KALLSYMS is not set |
94 | # CONFIG_HOTPLUG is not set | 95 | # CONFIG_HOTPLUG is not set |
95 | CONFIG_PRINTK=y | 96 | CONFIG_PRINTK=y |
@@ -112,10 +113,16 @@ CONFIG_SLUB=y | |||
112 | # CONFIG_PROFILING is not set | 113 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | 114 | # CONFIG_MARKERS is not set |
114 | CONFIG_HAVE_OPROFILE=y | 115 | CONFIG_HAVE_OPROFILE=y |
116 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
117 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 118 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 119 | CONFIG_HAVE_KRETPROBES=y |
120 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 121 | # CONFIG_HAVE_DMA_ATTRS is not set |
122 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
123 | # CONFIG_HAVE_CLK is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 124 | CONFIG_PROC_PAGE_MONITOR=y |
125 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 126 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 127 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 128 | # CONFIG_TINY_SHMEM is not set |
@@ -126,6 +133,7 @@ CONFIG_BLOCK=y | |||
126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 133 | # CONFIG_BLK_DEV_IO_TRACE is not set |
127 | # CONFIG_LSF is not set | 134 | # CONFIG_LSF is not set |
128 | # CONFIG_BLK_DEV_BSG is not set | 135 | # CONFIG_BLK_DEV_BSG is not set |
136 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
129 | 137 | ||
130 | # | 138 | # |
131 | # IO Schedulers | 139 | # IO Schedulers |
@@ -144,8 +152,6 @@ CONFIG_CLASSIC_RCU=y | |||
144 | # | 152 | # |
145 | # Platform support | 153 | # Platform support |
146 | # | 154 | # |
147 | # CONFIG_PPC_MPC512x is not set | ||
148 | # CONFIG_PPC_MPC5121 is not set | ||
149 | # CONFIG_PPC_CELL is not set | 155 | # CONFIG_PPC_CELL is not set |
150 | # CONFIG_PPC_CELL_NATIVE is not set | 156 | # CONFIG_PPC_CELL_NATIVE is not set |
151 | # CONFIG_PQ2ADS is not set | 157 | # CONFIG_PQ2ADS is not set |
@@ -154,11 +160,13 @@ CONFIG_MPC85xx=y | |||
154 | # CONFIG_MPC8560_ADS is not set | 160 | # CONFIG_MPC8560_ADS is not set |
155 | # CONFIG_MPC85xx_CDS is not set | 161 | # CONFIG_MPC85xx_CDS is not set |
156 | # CONFIG_MPC85xx_MDS is not set | 162 | # CONFIG_MPC85xx_MDS is not set |
163 | # CONFIG_MPC8536_DS is not set | ||
157 | # CONFIG_MPC85xx_DS is not set | 164 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | 165 | # CONFIG_KSI8560 is not set |
159 | # CONFIG_STX_GP3 is not set | 166 | # CONFIG_STX_GP3 is not set |
160 | CONFIG_TQM8540=y | 167 | CONFIG_TQM8540=y |
161 | # CONFIG_TQM8541 is not set | 168 | # CONFIG_TQM8541 is not set |
169 | # CONFIG_TQM8548 is not set | ||
162 | # CONFIG_TQM8555 is not set | 170 | # CONFIG_TQM8555 is not set |
163 | # CONFIG_TQM8560 is not set | 171 | # CONFIG_TQM8560 is not set |
164 | # CONFIG_SBC8548 is not set | 172 | # CONFIG_SBC8548 is not set |
@@ -214,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
214 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 222 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
215 | CONFIG_PAGEFLAGS_EXTENDED=y | 223 | CONFIG_PAGEFLAGS_EXTENDED=y |
216 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
225 | CONFIG_MIGRATION=y | ||
217 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
218 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
219 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
@@ -221,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y | |||
221 | CONFIG_FORCE_MAX_ZONEORDER=11 | 230 | CONFIG_FORCE_MAX_ZONEORDER=11 |
222 | # CONFIG_PROC_DEVICETREE is not set | 231 | # CONFIG_PROC_DEVICETREE is not set |
223 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
233 | CONFIG_EXTRA_TARGETS="" | ||
224 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
225 | CONFIG_SECCOMP=y | 235 | CONFIG_SECCOMP=y |
226 | CONFIG_ISA_DMA_API=y | 236 | CONFIG_ISA_DMA_API=y |
@@ -232,6 +242,7 @@ CONFIG_ZONE_DMA=y | |||
232 | CONFIG_PPC_INDIRECT_PCI=y | 242 | CONFIG_PPC_INDIRECT_PCI=y |
233 | CONFIG_FSL_SOC=y | 243 | CONFIG_FSL_SOC=y |
234 | CONFIG_FSL_PCI=y | 244 | CONFIG_FSL_PCI=y |
245 | CONFIG_PPC_PCI_CHOICE=y | ||
235 | CONFIG_PCI=y | 246 | CONFIG_PCI=y |
236 | CONFIG_PCI_DOMAINS=y | 247 | CONFIG_PCI_DOMAINS=y |
237 | CONFIG_PCI_SYSCALL=y | 248 | CONFIG_PCI_SYSCALL=y |
@@ -255,10 +266,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
255 | CONFIG_PHYSICAL_START=0x00000000 | 266 | CONFIG_PHYSICAL_START=0x00000000 |
256 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 267 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
257 | CONFIG_TASK_SIZE=0xc0000000 | 268 | CONFIG_TASK_SIZE=0xc0000000 |
258 | |||
259 | # | ||
260 | # Networking | ||
261 | # | ||
262 | CONFIG_NET=y | 269 | CONFIG_NET=y |
263 | 270 | ||
264 | # | 271 | # |
@@ -449,20 +456,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
449 | # CONFIG_BLK_DEV_XIP is not set | 456 | # CONFIG_BLK_DEV_XIP is not set |
450 | # CONFIG_CDROM_PKTCDVD is not set | 457 | # CONFIG_CDROM_PKTCDVD is not set |
451 | # CONFIG_ATA_OVER_ETH is not set | 458 | # CONFIG_ATA_OVER_ETH is not set |
459 | # CONFIG_BLK_DEV_HD is not set | ||
452 | CONFIG_MISC_DEVICES=y | 460 | CONFIG_MISC_DEVICES=y |
453 | # CONFIG_PHANTOM is not set | 461 | # CONFIG_PHANTOM is not set |
454 | # CONFIG_EEPROM_93CX6 is not set | 462 | # CONFIG_EEPROM_93CX6 is not set |
455 | # CONFIG_SGI_IOC4 is not set | 463 | # CONFIG_SGI_IOC4 is not set |
456 | # CONFIG_TIFM_CORE is not set | 464 | # CONFIG_TIFM_CORE is not set |
457 | # CONFIG_ENCLOSURE_SERVICES is not set | 465 | # CONFIG_ENCLOSURE_SERVICES is not set |
466 | # CONFIG_HP_ILO is not set | ||
458 | CONFIG_HAVE_IDE=y | 467 | CONFIG_HAVE_IDE=y |
459 | CONFIG_IDE=y | 468 | CONFIG_IDE=y |
460 | CONFIG_IDE_MAX_HWIFS=4 | ||
461 | CONFIG_BLK_DEV_IDE=y | 469 | CONFIG_BLK_DEV_IDE=y |
462 | 470 | ||
463 | # | 471 | # |
464 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 472 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
465 | # | 473 | # |
474 | CONFIG_IDE_TIMINGS=y | ||
466 | # CONFIG_BLK_DEV_IDE_SATA is not set | 475 | # CONFIG_BLK_DEV_IDE_SATA is not set |
467 | CONFIG_BLK_DEV_IDEDISK=y | 476 | CONFIG_BLK_DEV_IDEDISK=y |
468 | # CONFIG_IDEDISK_MULTI_MODE is not set | 477 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -475,7 +484,6 @@ CONFIG_IDE_PROC_FS=y | |||
475 | # | 484 | # |
476 | # IDE chipset support/bugfixes | 485 | # IDE chipset support/bugfixes |
477 | # | 486 | # |
478 | CONFIG_IDE_GENERIC=y | ||
479 | # CONFIG_BLK_DEV_PLATFORM is not set | 487 | # CONFIG_BLK_DEV_PLATFORM is not set |
480 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 488 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
481 | 489 | ||
@@ -493,10 +501,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
493 | # CONFIG_BLK_DEV_AMD74XX is not set | 501 | # CONFIG_BLK_DEV_AMD74XX is not set |
494 | # CONFIG_BLK_DEV_CMD64X is not set | 502 | # CONFIG_BLK_DEV_CMD64X is not set |
495 | # CONFIG_BLK_DEV_TRIFLEX is not set | 503 | # CONFIG_BLK_DEV_TRIFLEX is not set |
496 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
497 | # CONFIG_BLK_DEV_CS5520 is not set | 504 | # CONFIG_BLK_DEV_CS5520 is not set |
498 | # CONFIG_BLK_DEV_CS5530 is not set | 505 | # CONFIG_BLK_DEV_CS5530 is not set |
499 | # CONFIG_BLK_DEV_HPT34X is not set | ||
500 | # CONFIG_BLK_DEV_HPT366 is not set | 506 | # CONFIG_BLK_DEV_HPT366 is not set |
501 | # CONFIG_BLK_DEV_JMICRON is not set | 507 | # CONFIG_BLK_DEV_JMICRON is not set |
502 | # CONFIG_BLK_DEV_SC1200 is not set | 508 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -514,8 +520,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
514 | CONFIG_BLK_DEV_VIA82CXXX=y | 520 | CONFIG_BLK_DEV_VIA82CXXX=y |
515 | # CONFIG_BLK_DEV_TC86C001 is not set | 521 | # CONFIG_BLK_DEV_TC86C001 is not set |
516 | CONFIG_BLK_DEV_IDEDMA=y | 522 | CONFIG_BLK_DEV_IDEDMA=y |
517 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
518 | # CONFIG_BLK_DEV_HD is not set | ||
519 | 523 | ||
520 | # | 524 | # |
521 | # SCSI device support | 525 | # SCSI device support |
@@ -531,12 +535,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
531 | # | 535 | # |
532 | # IEEE 1394 (FireWire) support | 536 | # IEEE 1394 (FireWire) support |
533 | # | 537 | # |
538 | |||
539 | # | ||
540 | # Enable only one of the two stacks, unless you know what you are doing | ||
541 | # | ||
534 | # CONFIG_FIREWIRE is not set | 542 | # CONFIG_FIREWIRE is not set |
535 | # CONFIG_IEEE1394 is not set | 543 | # CONFIG_IEEE1394 is not set |
536 | # CONFIG_I2O is not set | 544 | # CONFIG_I2O is not set |
537 | # CONFIG_MACINTOSH_DRIVERS is not set | 545 | # CONFIG_MACINTOSH_DRIVERS is not set |
538 | CONFIG_NETDEVICES=y | 546 | CONFIG_NETDEVICES=y |
539 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
540 | # CONFIG_DUMMY is not set | 547 | # CONFIG_DUMMY is not set |
541 | # CONFIG_BONDING is not set | 548 | # CONFIG_BONDING is not set |
542 | # CONFIG_MACVLAN is not set | 549 | # CONFIG_MACVLAN is not set |
@@ -598,7 +605,6 @@ CONFIG_NETDEV_1000=y | |||
598 | # CONFIG_DL2K is not set | 605 | # CONFIG_DL2K is not set |
599 | # CONFIG_E1000 is not set | 606 | # CONFIG_E1000 is not set |
600 | # CONFIG_E1000E is not set | 607 | # CONFIG_E1000E is not set |
601 | # CONFIG_E1000E_ENABLED is not set | ||
602 | # CONFIG_IP1000 is not set | 608 | # CONFIG_IP1000 is not set |
603 | # CONFIG_IGB is not set | 609 | # CONFIG_IGB is not set |
604 | # CONFIG_NS83820 is not set | 610 | # CONFIG_NS83820 is not set |
@@ -612,9 +618,9 @@ CONFIG_NETDEV_1000=y | |||
612 | # CONFIG_TIGON3 is not set | 618 | # CONFIG_TIGON3 is not set |
613 | # CONFIG_BNX2 is not set | 619 | # CONFIG_BNX2 is not set |
614 | CONFIG_GIANFAR=y | 620 | CONFIG_GIANFAR=y |
615 | CONFIG_GFAR_NAPI=y | ||
616 | # CONFIG_QLA3XXX is not set | 621 | # CONFIG_QLA3XXX is not set |
617 | # CONFIG_ATL1 is not set | 622 | # CONFIG_ATL1 is not set |
623 | # CONFIG_ATL1E is not set | ||
618 | CONFIG_NETDEV_10000=y | 624 | CONFIG_NETDEV_10000=y |
619 | # CONFIG_CHELSIO_T1 is not set | 625 | # CONFIG_CHELSIO_T1 is not set |
620 | # CONFIG_CHELSIO_T3 is not set | 626 | # CONFIG_CHELSIO_T3 is not set |
@@ -721,41 +727,62 @@ CONFIG_DEVPORT=y | |||
721 | CONFIG_I2C=y | 727 | CONFIG_I2C=y |
722 | CONFIG_I2C_BOARDINFO=y | 728 | CONFIG_I2C_BOARDINFO=y |
723 | CONFIG_I2C_CHARDEV=y | 729 | CONFIG_I2C_CHARDEV=y |
730 | CONFIG_I2C_HELPER_AUTO=y | ||
724 | 731 | ||
725 | # | 732 | # |
726 | # I2C Hardware Bus support | 733 | # I2C Hardware Bus support |
727 | # | 734 | # |
735 | |||
736 | # | ||
737 | # PC SMBus host controller drivers | ||
738 | # | ||
728 | # CONFIG_I2C_ALI1535 is not set | 739 | # CONFIG_I2C_ALI1535 is not set |
729 | # CONFIG_I2C_ALI1563 is not set | 740 | # CONFIG_I2C_ALI1563 is not set |
730 | # CONFIG_I2C_ALI15X3 is not set | 741 | # CONFIG_I2C_ALI15X3 is not set |
731 | # CONFIG_I2C_AMD756 is not set | 742 | # CONFIG_I2C_AMD756 is not set |
732 | # CONFIG_I2C_AMD8111 is not set | 743 | # CONFIG_I2C_AMD8111 is not set |
733 | # CONFIG_I2C_I801 is not set | 744 | # CONFIG_I2C_I801 is not set |
734 | # CONFIG_I2C_I810 is not set | 745 | # CONFIG_I2C_ISCH is not set |
735 | # CONFIG_I2C_PIIX4 is not set | 746 | # CONFIG_I2C_PIIX4 is not set |
736 | CONFIG_I2C_MPC=y | ||
737 | # CONFIG_I2C_NFORCE2 is not set | 747 | # CONFIG_I2C_NFORCE2 is not set |
738 | # CONFIG_I2C_OCORES is not set | ||
739 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
740 | # CONFIG_I2C_PROSAVAGE is not set | ||
741 | # CONFIG_I2C_SAVAGE4 is not set | ||
742 | # CONFIG_I2C_SIMTEC is not set | ||
743 | # CONFIG_I2C_SIS5595 is not set | 748 | # CONFIG_I2C_SIS5595 is not set |
744 | # CONFIG_I2C_SIS630 is not set | 749 | # CONFIG_I2C_SIS630 is not set |
745 | # CONFIG_I2C_SIS96X is not set | 750 | # CONFIG_I2C_SIS96X is not set |
746 | # CONFIG_I2C_TAOS_EVM is not set | ||
747 | # CONFIG_I2C_VIA is not set | 751 | # CONFIG_I2C_VIA is not set |
748 | # CONFIG_I2C_VIAPRO is not set | 752 | # CONFIG_I2C_VIAPRO is not set |
753 | |||
754 | # | ||
755 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
756 | # | ||
757 | CONFIG_I2C_MPC=y | ||
758 | # CONFIG_I2C_OCORES is not set | ||
759 | # CONFIG_I2C_SIMTEC is not set | ||
760 | |||
761 | # | ||
762 | # External I2C/SMBus adapter drivers | ||
763 | # | ||
764 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
765 | # CONFIG_I2C_TAOS_EVM is not set | ||
766 | |||
767 | # | ||
768 | # Graphics adapter I2C/DDC channel drivers | ||
769 | # | ||
749 | # CONFIG_I2C_VOODOO3 is not set | 770 | # CONFIG_I2C_VOODOO3 is not set |
771 | |||
772 | # | ||
773 | # Other I2C/SMBus bus drivers | ||
774 | # | ||
750 | # CONFIG_I2C_PCA_PLATFORM is not set | 775 | # CONFIG_I2C_PCA_PLATFORM is not set |
751 | 776 | ||
752 | # | 777 | # |
753 | # Miscellaneous I2C Chip support | 778 | # Miscellaneous I2C Chip support |
754 | # | 779 | # |
755 | # CONFIG_DS1682 is not set | 780 | # CONFIG_DS1682 is not set |
781 | # CONFIG_AT24 is not set | ||
756 | # CONFIG_SENSORS_EEPROM is not set | 782 | # CONFIG_SENSORS_EEPROM is not set |
757 | # CONFIG_SENSORS_PCF8574 is not set | 783 | # CONFIG_SENSORS_PCF8574 is not set |
758 | # CONFIG_PCF8575 is not set | 784 | # CONFIG_PCF8575 is not set |
785 | # CONFIG_SENSORS_PCA9539 is not set | ||
759 | # CONFIG_SENSORS_PCF8591 is not set | 786 | # CONFIG_SENSORS_PCF8591 is not set |
760 | # CONFIG_SENSORS_MAX6875 is not set | 787 | # CONFIG_SENSORS_MAX6875 is not set |
761 | # CONFIG_SENSORS_TSL2550 is not set | 788 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -764,10 +791,13 @@ CONFIG_I2C_MPC=y | |||
764 | # CONFIG_I2C_DEBUG_BUS is not set | 791 | # CONFIG_I2C_DEBUG_BUS is not set |
765 | # CONFIG_I2C_DEBUG_CHIP is not set | 792 | # CONFIG_I2C_DEBUG_CHIP is not set |
766 | # CONFIG_SPI is not set | 793 | # CONFIG_SPI is not set |
794 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
795 | # CONFIG_GPIOLIB is not set | ||
767 | # CONFIG_W1 is not set | 796 | # CONFIG_W1 is not set |
768 | # CONFIG_POWER_SUPPLY is not set | 797 | # CONFIG_POWER_SUPPLY is not set |
769 | CONFIG_HWMON=y | 798 | CONFIG_HWMON=y |
770 | # CONFIG_HWMON_VID is not set | 799 | # CONFIG_HWMON_VID is not set |
800 | # CONFIG_SENSORS_AD7414 is not set | ||
771 | # CONFIG_SENSORS_AD7418 is not set | 801 | # CONFIG_SENSORS_AD7418 is not set |
772 | # CONFIG_SENSORS_ADM1021 is not set | 802 | # CONFIG_SENSORS_ADM1021 is not set |
773 | # CONFIG_SENSORS_ADM1025 is not set | 803 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -821,6 +851,7 @@ CONFIG_SENSORS_LM75=y | |||
821 | # CONFIG_SENSORS_W83627EHF is not set | 851 | # CONFIG_SENSORS_W83627EHF is not set |
822 | CONFIG_HWMON_DEBUG_CHIP=y | 852 | CONFIG_HWMON_DEBUG_CHIP=y |
823 | # CONFIG_THERMAL is not set | 853 | # CONFIG_THERMAL is not set |
854 | # CONFIG_THERMAL_HWMON is not set | ||
824 | # CONFIG_WATCHDOG is not set | 855 | # CONFIG_WATCHDOG is not set |
825 | 856 | ||
826 | # | 857 | # |
@@ -832,8 +863,10 @@ CONFIG_SSB_POSSIBLE=y | |||
832 | # | 863 | # |
833 | # Multifunction device drivers | 864 | # Multifunction device drivers |
834 | # | 865 | # |
866 | # CONFIG_MFD_CORE is not set | ||
835 | # CONFIG_MFD_SM501 is not set | 867 | # CONFIG_MFD_SM501 is not set |
836 | # CONFIG_HTC_PASIC3 is not set | 868 | # CONFIG_HTC_PASIC3 is not set |
869 | # CONFIG_MFD_TMIO is not set | ||
837 | 870 | ||
838 | # | 871 | # |
839 | # Multimedia devices | 872 | # Multimedia devices |
@@ -865,10 +898,6 @@ CONFIG_DAB=y | |||
865 | # Display device support | 898 | # Display device support |
866 | # | 899 | # |
867 | # CONFIG_DISPLAY_SUPPORT is not set | 900 | # CONFIG_DISPLAY_SUPPORT is not set |
868 | |||
869 | # | ||
870 | # Sound | ||
871 | # | ||
872 | # CONFIG_SOUND is not set | 901 | # CONFIG_SOUND is not set |
873 | CONFIG_HID_SUPPORT=y | 902 | CONFIG_HID_SUPPORT=y |
874 | CONFIG_HID=y | 903 | CONFIG_HID=y |
@@ -883,6 +912,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
883 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 912 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
884 | 913 | ||
885 | # | 914 | # |
915 | # Enable Host or Gadget support to see Inventra options | ||
916 | # | ||
917 | |||
918 | # | ||
886 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 919 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
887 | # | 920 | # |
888 | # CONFIG_USB_GADGET is not set | 921 | # CONFIG_USB_GADGET is not set |
@@ -971,6 +1004,7 @@ CONFIG_JFFS2_RTIME=y | |||
971 | CONFIG_CRAMFS=y | 1004 | CONFIG_CRAMFS=y |
972 | # CONFIG_VXFS_FS is not set | 1005 | # CONFIG_VXFS_FS is not set |
973 | # CONFIG_MINIX_FS is not set | 1006 | # CONFIG_MINIX_FS is not set |
1007 | # CONFIG_OMFS_FS is not set | ||
974 | # CONFIG_HPFS_FS is not set | 1008 | # CONFIG_HPFS_FS is not set |
975 | # CONFIG_QNX4FS_FS is not set | 1009 | # CONFIG_QNX4FS_FS is not set |
976 | # CONFIG_ROMFS_FS is not set | 1010 | # CONFIG_ROMFS_FS is not set |
@@ -980,12 +1014,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
980 | CONFIG_NFS_FS=y | 1014 | CONFIG_NFS_FS=y |
981 | # CONFIG_NFS_V3 is not set | 1015 | # CONFIG_NFS_V3 is not set |
982 | # CONFIG_NFS_V4 is not set | 1016 | # CONFIG_NFS_V4 is not set |
983 | # CONFIG_NFSD is not set | ||
984 | CONFIG_ROOT_NFS=y | 1017 | CONFIG_ROOT_NFS=y |
1018 | # CONFIG_NFSD is not set | ||
985 | CONFIG_LOCKD=y | 1019 | CONFIG_LOCKD=y |
986 | CONFIG_NFS_COMMON=y | 1020 | CONFIG_NFS_COMMON=y |
987 | CONFIG_SUNRPC=y | 1021 | CONFIG_SUNRPC=y |
988 | # CONFIG_SUNRPC_BIND34 is not set | ||
989 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1022 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
990 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1023 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
991 | # CONFIG_SMB_FS is not set | 1024 | # CONFIG_SMB_FS is not set |
@@ -1021,6 +1054,7 @@ CONFIG_BITREVERSE=y | |||
1021 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1054 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1022 | # CONFIG_CRC_CCITT is not set | 1055 | # CONFIG_CRC_CCITT is not set |
1023 | # CONFIG_CRC16 is not set | 1056 | # CONFIG_CRC16 is not set |
1057 | # CONFIG_CRC_T10DIF is not set | ||
1024 | # CONFIG_CRC_ITU_T is not set | 1058 | # CONFIG_CRC_ITU_T is not set |
1025 | CONFIG_CRC32=y | 1059 | CONFIG_CRC32=y |
1026 | # CONFIG_CRC7 is not set | 1060 | # CONFIG_CRC7 is not set |
@@ -1048,7 +1082,16 @@ CONFIG_FRAME_WARN=1024 | |||
1048 | # CONFIG_SLUB_DEBUG_ON is not set | 1082 | # CONFIG_SLUB_DEBUG_ON is not set |
1049 | # CONFIG_SLUB_STATS is not set | 1083 | # CONFIG_SLUB_STATS is not set |
1050 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1084 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1085 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1086 | # CONFIG_LATENCYTOP is not set | ||
1087 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1088 | CONFIG_HAVE_FTRACE=y | ||
1089 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1090 | # CONFIG_FTRACE is not set | ||
1091 | # CONFIG_SCHED_TRACER is not set | ||
1092 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1051 | # CONFIG_SAMPLES is not set | 1093 | # CONFIG_SAMPLES is not set |
1094 | CONFIG_HAVE_ARCH_KGDB=y | ||
1052 | # CONFIG_IRQSTACKS is not set | 1095 | # CONFIG_IRQSTACKS is not set |
1053 | # CONFIG_PPC_EARLY_DEBUG is not set | 1096 | # CONFIG_PPC_EARLY_DEBUG is not set |
1054 | 1097 | ||
@@ -1100,6 +1143,10 @@ CONFIG_CRYPTO=y | |||
1100 | # CONFIG_CRYPTO_MD4 is not set | 1143 | # CONFIG_CRYPTO_MD4 is not set |
1101 | # CONFIG_CRYPTO_MD5 is not set | 1144 | # CONFIG_CRYPTO_MD5 is not set |
1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1145 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1146 | # CONFIG_CRYPTO_RMD128 is not set | ||
1147 | # CONFIG_CRYPTO_RMD160 is not set | ||
1148 | # CONFIG_CRYPTO_RMD256 is not set | ||
1149 | # CONFIG_CRYPTO_RMD320 is not set | ||
1103 | # CONFIG_CRYPTO_SHA1 is not set | 1150 | # CONFIG_CRYPTO_SHA1 is not set |
1104 | # CONFIG_CRYPTO_SHA256 is not set | 1151 | # CONFIG_CRYPTO_SHA256 is not set |
1105 | # CONFIG_CRYPTO_SHA512 is not set | 1152 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1132,5 +1179,6 @@ CONFIG_CRYPTO=y | |||
1132 | # CONFIG_CRYPTO_LZO is not set | 1179 | # CONFIG_CRYPTO_LZO is not set |
1133 | CONFIG_CRYPTO_HW=y | 1180 | CONFIG_CRYPTO_HW=y |
1134 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1181 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1182 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1135 | # CONFIG_PPC_CLOCK is not set | 1183 | # CONFIG_PPC_CLOCK is not set |
1136 | # CONFIG_VIRTUALIZATION is not set | 1184 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8541_defconfig b/arch/powerpc/configs/85xx/tqm8541_defconfig index 6f9067b49e07..da841a09755c 100644 --- a/arch/powerpc/configs/85xx/tqm8541_defconfig +++ b/arch/powerpc/configs/85xx/tqm8541_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:40 2008 | 4 | # Thu Aug 21 00:52:39 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | ||
42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | # CONFIG_KALLSYMS is not set | 95 | # CONFIG_KALLSYMS is not set |
94 | # CONFIG_HOTPLUG is not set | 96 | # CONFIG_HOTPLUG is not set |
95 | CONFIG_PRINTK=y | 97 | CONFIG_PRINTK=y |
@@ -112,10 +114,16 @@ CONFIG_SLUB=y | |||
112 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
114 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 122 | # CONFIG_HAVE_DMA_ATTRS is not set |
123 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
124 | CONFIG_HAVE_CLK=y | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
@@ -126,6 +134,7 @@ CONFIG_BLOCK=y | |||
126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 134 | # CONFIG_BLK_DEV_IO_TRACE is not set |
127 | # CONFIG_LSF is not set | 135 | # CONFIG_LSF is not set |
128 | # CONFIG_BLK_DEV_BSG is not set | 136 | # CONFIG_BLK_DEV_BSG is not set |
137 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
129 | 138 | ||
130 | # | 139 | # |
131 | # IO Schedulers | 140 | # IO Schedulers |
@@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y | |||
144 | # | 153 | # |
145 | # Platform support | 154 | # Platform support |
146 | # | 155 | # |
147 | # CONFIG_PPC_MPC512x is not set | ||
148 | # CONFIG_PPC_MPC5121 is not set | ||
149 | # CONFIG_PPC_CELL is not set | 156 | # CONFIG_PPC_CELL is not set |
150 | # CONFIG_PPC_CELL_NATIVE is not set | 157 | # CONFIG_PPC_CELL_NATIVE is not set |
151 | # CONFIG_PQ2ADS is not set | 158 | # CONFIG_PQ2ADS is not set |
@@ -154,11 +161,13 @@ CONFIG_MPC85xx=y | |||
154 | # CONFIG_MPC8560_ADS is not set | 161 | # CONFIG_MPC8560_ADS is not set |
155 | # CONFIG_MPC85xx_CDS is not set | 162 | # CONFIG_MPC85xx_CDS is not set |
156 | # CONFIG_MPC85xx_MDS is not set | 163 | # CONFIG_MPC85xx_MDS is not set |
164 | # CONFIG_MPC8536_DS is not set | ||
157 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | 166 | # CONFIG_KSI8560 is not set |
159 | # CONFIG_STX_GP3 is not set | 167 | # CONFIG_STX_GP3 is not set |
160 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
161 | CONFIG_TQM8541=y | 169 | CONFIG_TQM8541=y |
170 | # CONFIG_TQM8548 is not set | ||
162 | # CONFIG_TQM8555 is not set | 171 | # CONFIG_TQM8555 is not set |
163 | # CONFIG_TQM8560 is not set | 172 | # CONFIG_TQM8560 is not set |
164 | # CONFIG_SBC8548 is not set | 173 | # CONFIG_SBC8548 is not set |
@@ -176,7 +185,6 @@ CONFIG_MPIC=y | |||
176 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
177 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
178 | CONFIG_CPM2=y | 187 | CONFIG_CPM2=y |
179 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
180 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
181 | CONFIG_CPM=y | 189 | CONFIG_CPM=y |
182 | 190 | ||
@@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
217 | CONFIG_PAGEFLAGS_EXTENDED=y | 225 | CONFIG_PAGEFLAGS_EXTENDED=y |
218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
227 | CONFIG_MIGRATION=y | ||
219 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
220 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
221 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
@@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y | |||
223 | CONFIG_FORCE_MAX_ZONEORDER=11 | 232 | CONFIG_FORCE_MAX_ZONEORDER=11 |
224 | # CONFIG_PROC_DEVICETREE is not set | 233 | # CONFIG_PROC_DEVICETREE is not set |
225 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
235 | CONFIG_EXTRA_TARGETS="" | ||
226 | # CONFIG_PM is not set | 236 | # CONFIG_PM is not set |
227 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
228 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
@@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y | |||
234 | CONFIG_PPC_INDIRECT_PCI=y | 244 | CONFIG_PPC_INDIRECT_PCI=y |
235 | CONFIG_FSL_SOC=y | 245 | CONFIG_FSL_SOC=y |
236 | CONFIG_FSL_PCI=y | 246 | CONFIG_FSL_PCI=y |
247 | CONFIG_PPC_PCI_CHOICE=y | ||
237 | CONFIG_PCI=y | 248 | CONFIG_PCI=y |
238 | CONFIG_PCI_DOMAINS=y | 249 | CONFIG_PCI_DOMAINS=y |
239 | CONFIG_PCI_SYSCALL=y | 250 | CONFIG_PCI_SYSCALL=y |
@@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
257 | CONFIG_PHYSICAL_START=0x00000000 | 268 | CONFIG_PHYSICAL_START=0x00000000 |
258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 269 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
259 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
260 | |||
261 | # | ||
262 | # Networking | ||
263 | # | ||
264 | CONFIG_NET=y | 271 | CONFIG_NET=y |
265 | 272 | ||
266 | # | 273 | # |
@@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
432 | # | 439 | # |
433 | # CONFIG_MTD_UBI is not set | 440 | # CONFIG_MTD_UBI is not set |
434 | CONFIG_OF_DEVICE=y | 441 | CONFIG_OF_DEVICE=y |
442 | CONFIG_OF_GPIO=y | ||
435 | CONFIG_OF_I2C=y | 443 | CONFIG_OF_I2C=y |
436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
@@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
451 | # CONFIG_BLK_DEV_XIP is not set | 459 | # CONFIG_BLK_DEV_XIP is not set |
452 | # CONFIG_CDROM_PKTCDVD is not set | 460 | # CONFIG_CDROM_PKTCDVD is not set |
453 | # CONFIG_ATA_OVER_ETH is not set | 461 | # CONFIG_ATA_OVER_ETH is not set |
462 | # CONFIG_BLK_DEV_HD is not set | ||
454 | CONFIG_MISC_DEVICES=y | 463 | CONFIG_MISC_DEVICES=y |
455 | # CONFIG_PHANTOM is not set | 464 | # CONFIG_PHANTOM is not set |
456 | # CONFIG_EEPROM_93CX6 is not set | 465 | # CONFIG_EEPROM_93CX6 is not set |
457 | # CONFIG_SGI_IOC4 is not set | 466 | # CONFIG_SGI_IOC4 is not set |
458 | # CONFIG_TIFM_CORE is not set | 467 | # CONFIG_TIFM_CORE is not set |
459 | # CONFIG_ENCLOSURE_SERVICES is not set | 468 | # CONFIG_ENCLOSURE_SERVICES is not set |
469 | # CONFIG_HP_ILO is not set | ||
460 | CONFIG_HAVE_IDE=y | 470 | CONFIG_HAVE_IDE=y |
461 | CONFIG_IDE=y | 471 | CONFIG_IDE=y |
462 | CONFIG_IDE_MAX_HWIFS=4 | ||
463 | CONFIG_BLK_DEV_IDE=y | 472 | CONFIG_BLK_DEV_IDE=y |
464 | 473 | ||
465 | # | 474 | # |
466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 475 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
467 | # | 476 | # |
477 | CONFIG_IDE_TIMINGS=y | ||
468 | # CONFIG_BLK_DEV_IDE_SATA is not set | 478 | # CONFIG_BLK_DEV_IDE_SATA is not set |
469 | CONFIG_BLK_DEV_IDEDISK=y | 479 | CONFIG_BLK_DEV_IDEDISK=y |
470 | # CONFIG_IDEDISK_MULTI_MODE is not set | 480 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y | |||
477 | # | 487 | # |
478 | # IDE chipset support/bugfixes | 488 | # IDE chipset support/bugfixes |
479 | # | 489 | # |
480 | CONFIG_IDE_GENERIC=y | ||
481 | # CONFIG_BLK_DEV_PLATFORM is not set | 490 | # CONFIG_BLK_DEV_PLATFORM is not set |
482 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 491 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
483 | 492 | ||
@@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
495 | # CONFIG_BLK_DEV_AMD74XX is not set | 504 | # CONFIG_BLK_DEV_AMD74XX is not set |
496 | # CONFIG_BLK_DEV_CMD64X is not set | 505 | # CONFIG_BLK_DEV_CMD64X is not set |
497 | # CONFIG_BLK_DEV_TRIFLEX is not set | 506 | # CONFIG_BLK_DEV_TRIFLEX is not set |
498 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
499 | # CONFIG_BLK_DEV_CS5520 is not set | 507 | # CONFIG_BLK_DEV_CS5520 is not set |
500 | # CONFIG_BLK_DEV_CS5530 is not set | 508 | # CONFIG_BLK_DEV_CS5530 is not set |
501 | # CONFIG_BLK_DEV_HPT34X is not set | ||
502 | # CONFIG_BLK_DEV_HPT366 is not set | 509 | # CONFIG_BLK_DEV_HPT366 is not set |
503 | # CONFIG_BLK_DEV_JMICRON is not set | 510 | # CONFIG_BLK_DEV_JMICRON is not set |
504 | # CONFIG_BLK_DEV_SC1200 is not set | 511 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
516 | CONFIG_BLK_DEV_VIA82CXXX=y | 523 | CONFIG_BLK_DEV_VIA82CXXX=y |
517 | # CONFIG_BLK_DEV_TC86C001 is not set | 524 | # CONFIG_BLK_DEV_TC86C001 is not set |
518 | CONFIG_BLK_DEV_IDEDMA=y | 525 | CONFIG_BLK_DEV_IDEDMA=y |
519 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
520 | # CONFIG_BLK_DEV_HD is not set | ||
521 | 526 | ||
522 | # | 527 | # |
523 | # SCSI device support | 528 | # SCSI device support |
@@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
533 | # | 538 | # |
534 | # IEEE 1394 (FireWire) support | 539 | # IEEE 1394 (FireWire) support |
535 | # | 540 | # |
541 | |||
542 | # | ||
543 | # Enable only one of the two stacks, unless you know what you are doing | ||
544 | # | ||
536 | # CONFIG_FIREWIRE is not set | 545 | # CONFIG_FIREWIRE is not set |
537 | # CONFIG_IEEE1394 is not set | 546 | # CONFIG_IEEE1394 is not set |
538 | # CONFIG_I2O is not set | 547 | # CONFIG_I2O is not set |
539 | # CONFIG_MACINTOSH_DRIVERS is not set | 548 | # CONFIG_MACINTOSH_DRIVERS is not set |
540 | CONFIG_NETDEVICES=y | 549 | CONFIG_NETDEVICES=y |
541 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
542 | # CONFIG_DUMMY is not set | 550 | # CONFIG_DUMMY is not set |
543 | # CONFIG_BONDING is not set | 551 | # CONFIG_BONDING is not set |
544 | # CONFIG_MACVLAN is not set | 552 | # CONFIG_MACVLAN is not set |
@@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y | |||
601 | # CONFIG_DL2K is not set | 609 | # CONFIG_DL2K is not set |
602 | # CONFIG_E1000 is not set | 610 | # CONFIG_E1000 is not set |
603 | # CONFIG_E1000E is not set | 611 | # CONFIG_E1000E is not set |
604 | # CONFIG_E1000E_ENABLED is not set | ||
605 | # CONFIG_IP1000 is not set | 612 | # CONFIG_IP1000 is not set |
606 | # CONFIG_IGB is not set | 613 | # CONFIG_IGB is not set |
607 | # CONFIG_NS83820 is not set | 614 | # CONFIG_NS83820 is not set |
@@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y | |||
615 | # CONFIG_TIGON3 is not set | 622 | # CONFIG_TIGON3 is not set |
616 | # CONFIG_BNX2 is not set | 623 | # CONFIG_BNX2 is not set |
617 | CONFIG_GIANFAR=y | 624 | CONFIG_GIANFAR=y |
618 | CONFIG_GFAR_NAPI=y | ||
619 | # CONFIG_QLA3XXX is not set | 625 | # CONFIG_QLA3XXX is not set |
620 | # CONFIG_ATL1 is not set | 626 | # CONFIG_ATL1 is not set |
627 | # CONFIG_ATL1E is not set | ||
621 | CONFIG_NETDEV_10000=y | 628 | CONFIG_NETDEV_10000=y |
622 | # CONFIG_CHELSIO_T1 is not set | 629 | # CONFIG_CHELSIO_T1 is not set |
623 | # CONFIG_CHELSIO_T3 is not set | 630 | # CONFIG_CHELSIO_T3 is not set |
@@ -732,42 +739,66 @@ CONFIG_DEVPORT=y | |||
732 | CONFIG_I2C=y | 739 | CONFIG_I2C=y |
733 | CONFIG_I2C_BOARDINFO=y | 740 | CONFIG_I2C_BOARDINFO=y |
734 | CONFIG_I2C_CHARDEV=y | 741 | CONFIG_I2C_CHARDEV=y |
742 | CONFIG_I2C_HELPER_AUTO=y | ||
735 | 743 | ||
736 | # | 744 | # |
737 | # I2C Hardware Bus support | 745 | # I2C Hardware Bus support |
738 | # | 746 | # |
747 | |||
748 | # | ||
749 | # PC SMBus host controller drivers | ||
750 | # | ||
739 | # CONFIG_I2C_ALI1535 is not set | 751 | # CONFIG_I2C_ALI1535 is not set |
740 | # CONFIG_I2C_ALI1563 is not set | 752 | # CONFIG_I2C_ALI1563 is not set |
741 | # CONFIG_I2C_ALI15X3 is not set | 753 | # CONFIG_I2C_ALI15X3 is not set |
742 | # CONFIG_I2C_AMD756 is not set | 754 | # CONFIG_I2C_AMD756 is not set |
743 | # CONFIG_I2C_AMD8111 is not set | 755 | # CONFIG_I2C_AMD8111 is not set |
744 | # CONFIG_I2C_I801 is not set | 756 | # CONFIG_I2C_I801 is not set |
745 | # CONFIG_I2C_I810 is not set | 757 | # CONFIG_I2C_ISCH is not set |
746 | # CONFIG_I2C_PIIX4 is not set | 758 | # CONFIG_I2C_PIIX4 is not set |
747 | CONFIG_I2C_MPC=y | ||
748 | # CONFIG_I2C_NFORCE2 is not set | 759 | # CONFIG_I2C_NFORCE2 is not set |
749 | # CONFIG_I2C_OCORES is not set | ||
750 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
751 | # CONFIG_I2C_PROSAVAGE is not set | ||
752 | # CONFIG_I2C_SAVAGE4 is not set | ||
753 | # CONFIG_I2C_SIMTEC is not set | ||
754 | # CONFIG_I2C_SIS5595 is not set | 760 | # CONFIG_I2C_SIS5595 is not set |
755 | # CONFIG_I2C_SIS630 is not set | 761 | # CONFIG_I2C_SIS630 is not set |
756 | # CONFIG_I2C_SIS96X is not set | 762 | # CONFIG_I2C_SIS96X is not set |
757 | # CONFIG_I2C_TAOS_EVM is not set | ||
758 | # CONFIG_I2C_VIA is not set | 763 | # CONFIG_I2C_VIA is not set |
759 | # CONFIG_I2C_VIAPRO is not set | 764 | # CONFIG_I2C_VIAPRO is not set |
765 | |||
766 | # | ||
767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
768 | # | ||
769 | # CONFIG_I2C_CPM is not set | ||
770 | # CONFIG_I2C_GPIO is not set | ||
771 | CONFIG_I2C_MPC=y | ||
772 | # CONFIG_I2C_OCORES is not set | ||
773 | # CONFIG_I2C_SIMTEC is not set | ||
774 | |||
775 | # | ||
776 | # External I2C/SMBus adapter drivers | ||
777 | # | ||
778 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
779 | # CONFIG_I2C_TAOS_EVM is not set | ||
780 | |||
781 | # | ||
782 | # Graphics adapter I2C/DDC channel drivers | ||
783 | # | ||
760 | # CONFIG_I2C_VOODOO3 is not set | 784 | # CONFIG_I2C_VOODOO3 is not set |
785 | |||
786 | # | ||
787 | # Other I2C/SMBus bus drivers | ||
788 | # | ||
761 | # CONFIG_I2C_PCA_PLATFORM is not set | 789 | # CONFIG_I2C_PCA_PLATFORM is not set |
762 | 790 | ||
763 | # | 791 | # |
764 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
765 | # | 793 | # |
766 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
795 | # CONFIG_AT24 is not set | ||
767 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
768 | # CONFIG_SENSORS_PCF8574 is not set | 797 | # CONFIG_SENSORS_PCF8574 is not set |
769 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
799 | # CONFIG_SENSORS_PCA9539 is not set | ||
770 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
801 | # CONFIG_TPS65010 is not set | ||
771 | # CONFIG_SENSORS_MAX6875 is not set | 802 | # CONFIG_SENSORS_MAX6875 is not set |
772 | # CONFIG_SENSORS_TSL2550 is not set | 803 | # CONFIG_SENSORS_TSL2550 is not set |
773 | # CONFIG_I2C_DEBUG_CORE is not set | 804 | # CONFIG_I2C_DEBUG_CORE is not set |
@@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y | |||
775 | # CONFIG_I2C_DEBUG_BUS is not set | 806 | # CONFIG_I2C_DEBUG_BUS is not set |
776 | # CONFIG_I2C_DEBUG_CHIP is not set | 807 | # CONFIG_I2C_DEBUG_CHIP is not set |
777 | # CONFIG_SPI is not set | 808 | # CONFIG_SPI is not set |
809 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
810 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
811 | CONFIG_GPIOLIB=y | ||
812 | # CONFIG_GPIO_SYSFS is not set | ||
813 | |||
814 | # | ||
815 | # I2C GPIO expanders: | ||
816 | # | ||
817 | # CONFIG_GPIO_MAX732X is not set | ||
818 | # CONFIG_GPIO_PCA953X is not set | ||
819 | # CONFIG_GPIO_PCF857X is not set | ||
820 | |||
821 | # | ||
822 | # PCI GPIO expanders: | ||
823 | # | ||
824 | # CONFIG_GPIO_BT8XX is not set | ||
825 | |||
826 | # | ||
827 | # SPI GPIO expanders: | ||
828 | # | ||
778 | # CONFIG_W1 is not set | 829 | # CONFIG_W1 is not set |
779 | # CONFIG_POWER_SUPPLY is not set | 830 | # CONFIG_POWER_SUPPLY is not set |
780 | CONFIG_HWMON=y | 831 | CONFIG_HWMON=y |
781 | # CONFIG_HWMON_VID is not set | 832 | # CONFIG_HWMON_VID is not set |
833 | # CONFIG_SENSORS_AD7414 is not set | ||
782 | # CONFIG_SENSORS_AD7418 is not set | 834 | # CONFIG_SENSORS_AD7418 is not set |
783 | # CONFIG_SENSORS_ADM1021 is not set | 835 | # CONFIG_SENSORS_ADM1021 is not set |
784 | # CONFIG_SENSORS_ADM1025 is not set | 836 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y | |||
832 | # CONFIG_SENSORS_W83627EHF is not set | 884 | # CONFIG_SENSORS_W83627EHF is not set |
833 | CONFIG_HWMON_DEBUG_CHIP=y | 885 | CONFIG_HWMON_DEBUG_CHIP=y |
834 | # CONFIG_THERMAL is not set | 886 | # CONFIG_THERMAL is not set |
887 | # CONFIG_THERMAL_HWMON is not set | ||
835 | # CONFIG_WATCHDOG is not set | 888 | # CONFIG_WATCHDOG is not set |
836 | 889 | ||
837 | # | 890 | # |
@@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y | |||
843 | # | 896 | # |
844 | # Multifunction device drivers | 897 | # Multifunction device drivers |
845 | # | 898 | # |
899 | # CONFIG_MFD_CORE is not set | ||
846 | # CONFIG_MFD_SM501 is not set | 900 | # CONFIG_MFD_SM501 is not set |
847 | # CONFIG_HTC_PASIC3 is not set | 901 | # CONFIG_HTC_PASIC3 is not set |
902 | # CONFIG_MFD_TMIO is not set | ||
848 | 903 | ||
849 | # | 904 | # |
850 | # Multimedia devices | 905 | # Multimedia devices |
@@ -876,10 +931,6 @@ CONFIG_DAB=y | |||
876 | # Display device support | 931 | # Display device support |
877 | # | 932 | # |
878 | # CONFIG_DISPLAY_SUPPORT is not set | 933 | # CONFIG_DISPLAY_SUPPORT is not set |
879 | |||
880 | # | ||
881 | # Sound | ||
882 | # | ||
883 | # CONFIG_SOUND is not set | 934 | # CONFIG_SOUND is not set |
884 | CONFIG_HID_SUPPORT=y | 935 | CONFIG_HID_SUPPORT=y |
885 | CONFIG_HID=y | 936 | CONFIG_HID=y |
@@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 945 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
895 | 946 | ||
896 | # | 947 | # |
948 | # Enable Host or Gadget support to see Inventra options | ||
949 | # | ||
950 | |||
951 | # | ||
897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 952 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
898 | # | 953 | # |
899 | # CONFIG_USB_GADGET is not set | 954 | # CONFIG_USB_GADGET is not set |
@@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y | |||
982 | CONFIG_CRAMFS=y | 1037 | CONFIG_CRAMFS=y |
983 | # CONFIG_VXFS_FS is not set | 1038 | # CONFIG_VXFS_FS is not set |
984 | # CONFIG_MINIX_FS is not set | 1039 | # CONFIG_MINIX_FS is not set |
1040 | # CONFIG_OMFS_FS is not set | ||
985 | # CONFIG_HPFS_FS is not set | 1041 | # CONFIG_HPFS_FS is not set |
986 | # CONFIG_QNX4FS_FS is not set | 1042 | # CONFIG_QNX4FS_FS is not set |
987 | # CONFIG_ROMFS_FS is not set | 1043 | # CONFIG_ROMFS_FS is not set |
@@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
991 | CONFIG_NFS_FS=y | 1047 | CONFIG_NFS_FS=y |
992 | # CONFIG_NFS_V3 is not set | 1048 | # CONFIG_NFS_V3 is not set |
993 | # CONFIG_NFS_V4 is not set | 1049 | # CONFIG_NFS_V4 is not set |
994 | # CONFIG_NFSD is not set | ||
995 | CONFIG_ROOT_NFS=y | 1050 | CONFIG_ROOT_NFS=y |
1051 | # CONFIG_NFSD is not set | ||
996 | CONFIG_LOCKD=y | 1052 | CONFIG_LOCKD=y |
997 | CONFIG_NFS_COMMON=y | 1053 | CONFIG_NFS_COMMON=y |
998 | CONFIG_SUNRPC=y | 1054 | CONFIG_SUNRPC=y |
999 | # CONFIG_SUNRPC_BIND34 is not set | ||
1000 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1055 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1001 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1056 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1002 | # CONFIG_SMB_FS is not set | 1057 | # CONFIG_SMB_FS is not set |
@@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y | |||
1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1087 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1033 | # CONFIG_CRC_CCITT is not set | 1088 | # CONFIG_CRC_CCITT is not set |
1034 | # CONFIG_CRC16 is not set | 1089 | # CONFIG_CRC16 is not set |
1090 | # CONFIG_CRC_T10DIF is not set | ||
1035 | # CONFIG_CRC_ITU_T is not set | 1091 | # CONFIG_CRC_ITU_T is not set |
1036 | CONFIG_CRC32=y | 1092 | CONFIG_CRC32=y |
1037 | # CONFIG_CRC7 is not set | 1093 | # CONFIG_CRC7 is not set |
@@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024 | |||
1059 | # CONFIG_SLUB_DEBUG_ON is not set | 1115 | # CONFIG_SLUB_DEBUG_ON is not set |
1060 | # CONFIG_SLUB_STATS is not set | 1116 | # CONFIG_SLUB_STATS is not set |
1061 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1117 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1118 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1119 | # CONFIG_LATENCYTOP is not set | ||
1120 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1121 | CONFIG_HAVE_FTRACE=y | ||
1122 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1123 | # CONFIG_FTRACE is not set | ||
1124 | # CONFIG_SCHED_TRACER is not set | ||
1125 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1062 | # CONFIG_SAMPLES is not set | 1126 | # CONFIG_SAMPLES is not set |
1063 | # CONFIG_KGDB_CONSOLE is not set | 1127 | CONFIG_HAVE_ARCH_KGDB=y |
1064 | # CONFIG_IRQSTACKS is not set | 1128 | # CONFIG_IRQSTACKS is not set |
1065 | # CONFIG_PPC_EARLY_DEBUG is not set | 1129 | # CONFIG_PPC_EARLY_DEBUG is not set |
1066 | 1130 | ||
@@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y | |||
1112 | # CONFIG_CRYPTO_MD4 is not set | 1176 | # CONFIG_CRYPTO_MD4 is not set |
1113 | # CONFIG_CRYPTO_MD5 is not set | 1177 | # CONFIG_CRYPTO_MD5 is not set |
1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1178 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1179 | # CONFIG_CRYPTO_RMD128 is not set | ||
1180 | # CONFIG_CRYPTO_RMD160 is not set | ||
1181 | # CONFIG_CRYPTO_RMD256 is not set | ||
1182 | # CONFIG_CRYPTO_RMD320 is not set | ||
1115 | # CONFIG_CRYPTO_SHA1 is not set | 1183 | # CONFIG_CRYPTO_SHA1 is not set |
1116 | # CONFIG_CRYPTO_SHA256 is not set | 1184 | # CONFIG_CRYPTO_SHA256 is not set |
1117 | # CONFIG_CRYPTO_SHA512 is not set | 1185 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y | |||
1144 | # CONFIG_CRYPTO_LZO is not set | 1212 | # CONFIG_CRYPTO_LZO is not set |
1145 | CONFIG_CRYPTO_HW=y | 1213 | CONFIG_CRYPTO_HW=y |
1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1214 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1147 | # CONFIG_PPC_CLOCK is not set | 1215 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
1216 | CONFIG_PPC_CLOCK=y | ||
1148 | CONFIG_PPC_LIB_RHEAP=y | 1217 | CONFIG_PPC_LIB_RHEAP=y |
1149 | # CONFIG_VIRTUALIZATION is not set | 1218 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig index b3b770be3cc9..ca1234d26855 100644 --- a/arch/powerpc/configs/85xx/tqm8548_defconfig +++ b/arch/powerpc/configs/85xx/tqm8548_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Thu Jun 26 14:40:02 2008 | 4 | # Thu Aug 21 00:52:40 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -90,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
90 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
91 | CONFIG_EMBEDDED=y | 92 | CONFIG_EMBEDDED=y |
92 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -116,10 +116,16 @@ CONFIG_SLUB=y | |||
116 | # CONFIG_MARKERS is not set | 116 | # CONFIG_MARKERS is not set |
117 | CONFIG_HAVE_OPROFILE=y | 117 | CONFIG_HAVE_OPROFILE=y |
118 | # CONFIG_KPROBES is not set | 118 | # CONFIG_KPROBES is not set |
119 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
120 | CONFIG_HAVE_IOREMAP_PROT=y | ||
119 | CONFIG_HAVE_KPROBES=y | 121 | CONFIG_HAVE_KPROBES=y |
120 | CONFIG_HAVE_KRETPROBES=y | 122 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
121 | # CONFIG_HAVE_DMA_ATTRS is not set | 124 | # CONFIG_HAVE_DMA_ATTRS is not set |
125 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
126 | # CONFIG_HAVE_CLK is not set | ||
122 | CONFIG_PROC_PAGE_MONITOR=y | 127 | CONFIG_PROC_PAGE_MONITOR=y |
128 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
123 | CONFIG_SLABINFO=y | 129 | CONFIG_SLABINFO=y |
124 | CONFIG_RT_MUTEXES=y | 130 | CONFIG_RT_MUTEXES=y |
125 | # CONFIG_TINY_SHMEM is not set | 131 | # CONFIG_TINY_SHMEM is not set |
@@ -130,12 +136,13 @@ CONFIG_MODULE_UNLOAD=y | |||
130 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 136 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
131 | # CONFIG_MODVERSIONS is not set | 137 | # CONFIG_MODVERSIONS is not set |
132 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 138 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
133 | # CONFIG_KMOD is not set | 139 | CONFIG_KMOD=y |
134 | CONFIG_BLOCK=y | 140 | CONFIG_BLOCK=y |
135 | # CONFIG_LBD is not set | 141 | # CONFIG_LBD is not set |
136 | # CONFIG_BLK_DEV_IO_TRACE is not set | 142 | # CONFIG_BLK_DEV_IO_TRACE is not set |
137 | # CONFIG_LSF is not set | 143 | # CONFIG_LSF is not set |
138 | # CONFIG_BLK_DEV_BSG is not set | 144 | # CONFIG_BLK_DEV_BSG is not set |
145 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
139 | 146 | ||
140 | # | 147 | # |
141 | # IO Schedulers | 148 | # IO Schedulers |
@@ -154,8 +161,6 @@ CONFIG_CLASSIC_RCU=y | |||
154 | # | 161 | # |
155 | # Platform support | 162 | # Platform support |
156 | # | 163 | # |
157 | # CONFIG_PPC_MPC512x is not set | ||
158 | # CONFIG_PPC_MPC5121 is not set | ||
159 | # CONFIG_PPC_CELL is not set | 164 | # CONFIG_PPC_CELL is not set |
160 | # CONFIG_PPC_CELL_NATIVE is not set | 165 | # CONFIG_PPC_CELL_NATIVE is not set |
161 | # CONFIG_PQ2ADS is not set | 166 | # CONFIG_PQ2ADS is not set |
@@ -164,6 +169,7 @@ CONFIG_MPC85xx=y | |||
164 | # CONFIG_MPC8560_ADS is not set | 169 | # CONFIG_MPC8560_ADS is not set |
165 | # CONFIG_MPC85xx_CDS is not set | 170 | # CONFIG_MPC85xx_CDS is not set |
166 | # CONFIG_MPC85xx_MDS is not set | 171 | # CONFIG_MPC85xx_MDS is not set |
172 | # CONFIG_MPC8536_DS is not set | ||
167 | # CONFIG_MPC85xx_DS is not set | 173 | # CONFIG_MPC85xx_DS is not set |
168 | # CONFIG_KSI8560 is not set | 174 | # CONFIG_KSI8560 is not set |
169 | # CONFIG_STX_GP3 is not set | 175 | # CONFIG_STX_GP3 is not set |
@@ -187,7 +193,6 @@ CONFIG_MPIC=y | |||
187 | # CONFIG_GENERIC_IOMAP is not set | 193 | # CONFIG_GENERIC_IOMAP is not set |
188 | # CONFIG_CPU_FREQ is not set | 194 | # CONFIG_CPU_FREQ is not set |
189 | # CONFIG_CPM2 is not set | 195 | # CONFIG_CPM2 is not set |
190 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
191 | # CONFIG_FSL_ULI1575 is not set | 196 | # CONFIG_FSL_ULI1575 is not set |
192 | 197 | ||
193 | # | 198 | # |
@@ -203,7 +208,7 @@ CONFIG_HZ_250=y | |||
203 | # CONFIG_HZ_300 is not set | 208 | # CONFIG_HZ_300 is not set |
204 | # CONFIG_HZ_1000 is not set | 209 | # CONFIG_HZ_1000 is not set |
205 | CONFIG_HZ=250 | 210 | CONFIG_HZ=250 |
206 | # CONFIG_SCHED_HRTICK is not set | 211 | CONFIG_SCHED_HRTICK=y |
207 | CONFIG_PREEMPT_NONE=y | 212 | CONFIG_PREEMPT_NONE=y |
208 | # CONFIG_PREEMPT_VOLUNTARY is not set | 213 | # CONFIG_PREEMPT_VOLUNTARY is not set |
209 | # CONFIG_PREEMPT is not set | 214 | # CONFIG_PREEMPT is not set |
@@ -226,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
226 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 231 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
227 | CONFIG_PAGEFLAGS_EXTENDED=y | 232 | CONFIG_PAGEFLAGS_EXTENDED=y |
228 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 233 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
234 | CONFIG_MIGRATION=y | ||
229 | # CONFIG_RESOURCES_64BIT is not set | 235 | # CONFIG_RESOURCES_64BIT is not set |
230 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
231 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
@@ -233,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y | |||
233 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
234 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
235 | # CONFIG_CMDLINE_BOOL is not set | 241 | # CONFIG_CMDLINE_BOOL is not set |
242 | CONFIG_EXTRA_TARGETS="" | ||
236 | # CONFIG_PM is not set | 243 | # CONFIG_PM is not set |
237 | # CONFIG_SECCOMP is not set | 244 | # CONFIG_SECCOMP is not set |
238 | CONFIG_ISA_DMA_API=y | 245 | CONFIG_ISA_DMA_API=y |
@@ -244,7 +251,7 @@ CONFIG_ZONE_DMA=y | |||
244 | CONFIG_PPC_INDIRECT_PCI=y | 251 | CONFIG_PPC_INDIRECT_PCI=y |
245 | CONFIG_FSL_SOC=y | 252 | CONFIG_FSL_SOC=y |
246 | CONFIG_FSL_PCI=y | 253 | CONFIG_FSL_PCI=y |
247 | CONFIG_FSL_LBC=y | 254 | CONFIG_PPC_PCI_CHOICE=y |
248 | CONFIG_PCI=y | 255 | CONFIG_PCI=y |
249 | CONFIG_PCI_DOMAINS=y | 256 | CONFIG_PCI_DOMAINS=y |
250 | CONFIG_PCI_SYSCALL=y | 257 | CONFIG_PCI_SYSCALL=y |
@@ -273,10 +280,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
273 | CONFIG_PHYSICAL_START=0x00000000 | 280 | CONFIG_PHYSICAL_START=0x00000000 |
274 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 281 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
275 | CONFIG_TASK_SIZE=0xc0000000 | 282 | CONFIG_TASK_SIZE=0xc0000000 |
276 | |||
277 | # | ||
278 | # Networking | ||
279 | # | ||
280 | CONFIG_NET=y | 283 | CONFIG_NET=y |
281 | 284 | ||
282 | # | 285 | # |
@@ -455,7 +458,6 @@ CONFIG_MTD_NAND_IDS=y | |||
455 | # CONFIG_MTD_NAND_NANDSIM is not set | 458 | # CONFIG_MTD_NAND_NANDSIM is not set |
456 | # CONFIG_MTD_NAND_PLATFORM is not set | 459 | # CONFIG_MTD_NAND_PLATFORM is not set |
457 | # CONFIG_MTD_NAND_FSL_ELBC is not set | 460 | # CONFIG_MTD_NAND_FSL_ELBC is not set |
458 | CONFIG_MTD_NAND_FSL_UPM=y | ||
459 | # CONFIG_MTD_ONENAND is not set | 461 | # CONFIG_MTD_ONENAND is not set |
460 | 462 | ||
461 | # | 463 | # |
@@ -490,20 +492,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
490 | # CONFIG_BLK_DEV_XIP is not set | 492 | # CONFIG_BLK_DEV_XIP is not set |
491 | # CONFIG_CDROM_PKTCDVD is not set | 493 | # CONFIG_CDROM_PKTCDVD is not set |
492 | # CONFIG_ATA_OVER_ETH is not set | 494 | # CONFIG_ATA_OVER_ETH is not set |
495 | # CONFIG_BLK_DEV_HD is not set | ||
493 | CONFIG_MISC_DEVICES=y | 496 | CONFIG_MISC_DEVICES=y |
494 | # CONFIG_PHANTOM is not set | 497 | # CONFIG_PHANTOM is not set |
495 | # CONFIG_EEPROM_93CX6 is not set | 498 | # CONFIG_EEPROM_93CX6 is not set |
496 | # CONFIG_SGI_IOC4 is not set | 499 | # CONFIG_SGI_IOC4 is not set |
497 | # CONFIG_TIFM_CORE is not set | 500 | # CONFIG_TIFM_CORE is not set |
498 | # CONFIG_ENCLOSURE_SERVICES is not set | 501 | # CONFIG_ENCLOSURE_SERVICES is not set |
502 | # CONFIG_HP_ILO is not set | ||
499 | CONFIG_HAVE_IDE=y | 503 | CONFIG_HAVE_IDE=y |
500 | CONFIG_IDE=y | 504 | CONFIG_IDE=y |
501 | CONFIG_IDE_MAX_HWIFS=4 | ||
502 | CONFIG_BLK_DEV_IDE=y | 505 | CONFIG_BLK_DEV_IDE=y |
503 | 506 | ||
504 | # | 507 | # |
505 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 508 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
506 | # | 509 | # |
510 | CONFIG_IDE_TIMINGS=y | ||
507 | # CONFIG_BLK_DEV_IDE_SATA is not set | 511 | # CONFIG_BLK_DEV_IDE_SATA is not set |
508 | # CONFIG_BLK_DEV_IDEDISK is not set | 512 | # CONFIG_BLK_DEV_IDEDISK is not set |
509 | # CONFIG_IDEDISK_MULTI_MODE is not set | 513 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -516,7 +520,6 @@ CONFIG_IDE_PROC_FS=y | |||
516 | # | 520 | # |
517 | # IDE chipset support/bugfixes | 521 | # IDE chipset support/bugfixes |
518 | # | 522 | # |
519 | CONFIG_IDE_GENERIC=y | ||
520 | # CONFIG_BLK_DEV_PLATFORM is not set | 523 | # CONFIG_BLK_DEV_PLATFORM is not set |
521 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 524 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
522 | 525 | ||
@@ -534,10 +537,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
534 | # CONFIG_BLK_DEV_AMD74XX is not set | 537 | # CONFIG_BLK_DEV_AMD74XX is not set |
535 | # CONFIG_BLK_DEV_CMD64X is not set | 538 | # CONFIG_BLK_DEV_CMD64X is not set |
536 | # CONFIG_BLK_DEV_TRIFLEX is not set | 539 | # CONFIG_BLK_DEV_TRIFLEX is not set |
537 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
538 | # CONFIG_BLK_DEV_CS5520 is not set | 540 | # CONFIG_BLK_DEV_CS5520 is not set |
539 | # CONFIG_BLK_DEV_CS5530 is not set | 541 | # CONFIG_BLK_DEV_CS5530 is not set |
540 | # CONFIG_BLK_DEV_HPT34X is not set | ||
541 | # CONFIG_BLK_DEV_HPT366 is not set | 542 | # CONFIG_BLK_DEV_HPT366 is not set |
542 | # CONFIG_BLK_DEV_JMICRON is not set | 543 | # CONFIG_BLK_DEV_JMICRON is not set |
543 | # CONFIG_BLK_DEV_SC1200 is not set | 544 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -555,8 +556,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
555 | CONFIG_BLK_DEV_VIA82CXXX=y | 556 | CONFIG_BLK_DEV_VIA82CXXX=y |
556 | # CONFIG_BLK_DEV_TC86C001 is not set | 557 | # CONFIG_BLK_DEV_TC86C001 is not set |
557 | CONFIG_BLK_DEV_IDEDMA=y | 558 | CONFIG_BLK_DEV_IDEDMA=y |
558 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
559 | # CONFIG_BLK_DEV_HD is not set | ||
560 | 559 | ||
561 | # | 560 | # |
562 | # SCSI device support | 561 | # SCSI device support |
@@ -572,12 +571,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
572 | # | 571 | # |
573 | # IEEE 1394 (FireWire) support | 572 | # IEEE 1394 (FireWire) support |
574 | # | 573 | # |
574 | |||
575 | # | ||
576 | # Enable only one of the two stacks, unless you know what you are doing | ||
577 | # | ||
575 | # CONFIG_FIREWIRE is not set | 578 | # CONFIG_FIREWIRE is not set |
576 | # CONFIG_IEEE1394 is not set | 579 | # CONFIG_IEEE1394 is not set |
577 | # CONFIG_I2O is not set | 580 | # CONFIG_I2O is not set |
578 | # CONFIG_MACINTOSH_DRIVERS is not set | 581 | # CONFIG_MACINTOSH_DRIVERS is not set |
579 | CONFIG_NETDEVICES=y | 582 | CONFIG_NETDEVICES=y |
580 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
581 | # CONFIG_DUMMY is not set | 583 | # CONFIG_DUMMY is not set |
582 | # CONFIG_BONDING is not set | 584 | # CONFIG_BONDING is not set |
583 | # CONFIG_MACVLAN is not set | 585 | # CONFIG_MACVLAN is not set |
@@ -620,10 +622,8 @@ CONFIG_NETDEV_1000=y | |||
620 | # CONFIG_ACENIC is not set | 622 | # CONFIG_ACENIC is not set |
621 | # CONFIG_DL2K is not set | 623 | # CONFIG_DL2K is not set |
622 | CONFIG_E1000=y | 624 | CONFIG_E1000=y |
623 | CONFIG_E1000_NAPI=y | ||
624 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 625 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
625 | # CONFIG_E1000E is not set | 626 | # CONFIG_E1000E is not set |
626 | # CONFIG_E1000E_ENABLED is not set | ||
627 | # CONFIG_IP1000 is not set | 627 | # CONFIG_IP1000 is not set |
628 | # CONFIG_IGB is not set | 628 | # CONFIG_IGB is not set |
629 | # CONFIG_NS83820 is not set | 629 | # CONFIG_NS83820 is not set |
@@ -637,9 +637,9 @@ CONFIG_E1000_NAPI=y | |||
637 | # CONFIG_TIGON3 is not set | 637 | # CONFIG_TIGON3 is not set |
638 | # CONFIG_BNX2 is not set | 638 | # CONFIG_BNX2 is not set |
639 | CONFIG_GIANFAR=y | 639 | CONFIG_GIANFAR=y |
640 | CONFIG_GFAR_NAPI=y | ||
641 | # CONFIG_QLA3XXX is not set | 640 | # CONFIG_QLA3XXX is not set |
642 | # CONFIG_ATL1 is not set | 641 | # CONFIG_ATL1 is not set |
642 | # CONFIG_ATL1E is not set | ||
643 | CONFIG_NETDEV_10000=y | 643 | CONFIG_NETDEV_10000=y |
644 | # CONFIG_CHELSIO_T1 is not set | 644 | # CONFIG_CHELSIO_T1 is not set |
645 | # CONFIG_CHELSIO_T3 is not set | 645 | # CONFIG_CHELSIO_T3 is not set |
@@ -744,42 +744,63 @@ CONFIG_DEVPORT=y | |||
744 | CONFIG_I2C=y | 744 | CONFIG_I2C=y |
745 | CONFIG_I2C_BOARDINFO=y | 745 | CONFIG_I2C_BOARDINFO=y |
746 | CONFIG_I2C_CHARDEV=y | 746 | CONFIG_I2C_CHARDEV=y |
747 | CONFIG_I2C_HELPER_AUTO=y | ||
747 | 748 | ||
748 | # | 749 | # |
749 | # I2C Hardware Bus support | 750 | # I2C Hardware Bus support |
750 | # | 751 | # |
752 | |||
753 | # | ||
754 | # PC SMBus host controller drivers | ||
755 | # | ||
751 | # CONFIG_I2C_ALI1535 is not set | 756 | # CONFIG_I2C_ALI1535 is not set |
752 | # CONFIG_I2C_ALI1563 is not set | 757 | # CONFIG_I2C_ALI1563 is not set |
753 | # CONFIG_I2C_ALI15X3 is not set | 758 | # CONFIG_I2C_ALI15X3 is not set |
754 | # CONFIG_I2C_AMD756 is not set | 759 | # CONFIG_I2C_AMD756 is not set |
755 | # CONFIG_I2C_AMD8111 is not set | 760 | # CONFIG_I2C_AMD8111 is not set |
756 | # CONFIG_I2C_I801 is not set | 761 | # CONFIG_I2C_I801 is not set |
757 | # CONFIG_I2C_I810 is not set | 762 | # CONFIG_I2C_ISCH is not set |
758 | # CONFIG_I2C_PIIX4 is not set | 763 | # CONFIG_I2C_PIIX4 is not set |
759 | CONFIG_I2C_MPC=y | ||
760 | # CONFIG_I2C_NFORCE2 is not set | 764 | # CONFIG_I2C_NFORCE2 is not set |
761 | # CONFIG_I2C_OCORES is not set | ||
762 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
763 | # CONFIG_I2C_PROSAVAGE is not set | ||
764 | # CONFIG_I2C_SAVAGE4 is not set | ||
765 | # CONFIG_I2C_SIMTEC is not set | ||
766 | # CONFIG_I2C_SIS5595 is not set | 765 | # CONFIG_I2C_SIS5595 is not set |
767 | # CONFIG_I2C_SIS630 is not set | 766 | # CONFIG_I2C_SIS630 is not set |
768 | # CONFIG_I2C_SIS96X is not set | 767 | # CONFIG_I2C_SIS96X is not set |
769 | # CONFIG_I2C_TAOS_EVM is not set | ||
770 | # CONFIG_I2C_STUB is not set | ||
771 | # CONFIG_I2C_VIA is not set | 768 | # CONFIG_I2C_VIA is not set |
772 | # CONFIG_I2C_VIAPRO is not set | 769 | # CONFIG_I2C_VIAPRO is not set |
770 | |||
771 | # | ||
772 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
773 | # | ||
774 | CONFIG_I2C_MPC=y | ||
775 | # CONFIG_I2C_OCORES is not set | ||
776 | # CONFIG_I2C_SIMTEC is not set | ||
777 | |||
778 | # | ||
779 | # External I2C/SMBus adapter drivers | ||
780 | # | ||
781 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
782 | # CONFIG_I2C_TAOS_EVM is not set | ||
783 | |||
784 | # | ||
785 | # Graphics adapter I2C/DDC channel drivers | ||
786 | # | ||
773 | # CONFIG_I2C_VOODOO3 is not set | 787 | # CONFIG_I2C_VOODOO3 is not set |
788 | |||
789 | # | ||
790 | # Other I2C/SMBus bus drivers | ||
791 | # | ||
774 | # CONFIG_I2C_PCA_PLATFORM is not set | 792 | # CONFIG_I2C_PCA_PLATFORM is not set |
793 | # CONFIG_I2C_STUB is not set | ||
775 | 794 | ||
776 | # | 795 | # |
777 | # Miscellaneous I2C Chip support | 796 | # Miscellaneous I2C Chip support |
778 | # | 797 | # |
779 | # CONFIG_DS1682 is not set | 798 | # CONFIG_DS1682 is not set |
799 | # CONFIG_AT24 is not set | ||
780 | # CONFIG_SENSORS_EEPROM is not set | 800 | # CONFIG_SENSORS_EEPROM is not set |
781 | # CONFIG_SENSORS_PCF8574 is not set | 801 | # CONFIG_SENSORS_PCF8574 is not set |
782 | # CONFIG_PCF8575 is not set | 802 | # CONFIG_PCF8575 is not set |
803 | # CONFIG_SENSORS_PCA9539 is not set | ||
783 | # CONFIG_SENSORS_PCF8591 is not set | 804 | # CONFIG_SENSORS_PCF8591 is not set |
784 | # CONFIG_SENSORS_MAX6875 is not set | 805 | # CONFIG_SENSORS_MAX6875 is not set |
785 | # CONFIG_SENSORS_TSL2550 is not set | 806 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -788,10 +809,13 @@ CONFIG_I2C_MPC=y | |||
788 | # CONFIG_I2C_DEBUG_BUS is not set | 809 | # CONFIG_I2C_DEBUG_BUS is not set |
789 | # CONFIG_I2C_DEBUG_CHIP is not set | 810 | # CONFIG_I2C_DEBUG_CHIP is not set |
790 | # CONFIG_SPI is not set | 811 | # CONFIG_SPI is not set |
812 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
813 | # CONFIG_GPIOLIB is not set | ||
791 | # CONFIG_W1 is not set | 814 | # CONFIG_W1 is not set |
792 | # CONFIG_POWER_SUPPLY is not set | 815 | # CONFIG_POWER_SUPPLY is not set |
793 | CONFIG_HWMON=y | 816 | CONFIG_HWMON=y |
794 | # CONFIG_HWMON_VID is not set | 817 | # CONFIG_HWMON_VID is not set |
818 | # CONFIG_SENSORS_AD7414 is not set | ||
795 | # CONFIG_SENSORS_AD7418 is not set | 819 | # CONFIG_SENSORS_AD7418 is not set |
796 | # CONFIG_SENSORS_ADM1021 is not set | 820 | # CONFIG_SENSORS_ADM1021 is not set |
797 | # CONFIG_SENSORS_ADM1025 is not set | 821 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -845,6 +869,7 @@ CONFIG_SENSORS_LM75=y | |||
845 | # CONFIG_SENSORS_W83627EHF is not set | 869 | # CONFIG_SENSORS_W83627EHF is not set |
846 | # CONFIG_HWMON_DEBUG_CHIP is not set | 870 | # CONFIG_HWMON_DEBUG_CHIP is not set |
847 | # CONFIG_THERMAL is not set | 871 | # CONFIG_THERMAL is not set |
872 | # CONFIG_THERMAL_HWMON is not set | ||
848 | # CONFIG_WATCHDOG is not set | 873 | # CONFIG_WATCHDOG is not set |
849 | 874 | ||
850 | # | 875 | # |
@@ -856,8 +881,10 @@ CONFIG_SSB_POSSIBLE=y | |||
856 | # | 881 | # |
857 | # Multifunction device drivers | 882 | # Multifunction device drivers |
858 | # | 883 | # |
884 | # CONFIG_MFD_CORE is not set | ||
859 | # CONFIG_MFD_SM501 is not set | 885 | # CONFIG_MFD_SM501 is not set |
860 | # CONFIG_HTC_PASIC3 is not set | 886 | # CONFIG_HTC_PASIC3 is not set |
887 | # CONFIG_MFD_TMIO is not set | ||
861 | 888 | ||
862 | # | 889 | # |
863 | # Multimedia devices | 890 | # Multimedia devices |
@@ -889,10 +916,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
889 | # Display device support | 916 | # Display device support |
890 | # | 917 | # |
891 | # CONFIG_DISPLAY_SUPPORT is not set | 918 | # CONFIG_DISPLAY_SUPPORT is not set |
892 | |||
893 | # | ||
894 | # Sound | ||
895 | # | ||
896 | # CONFIG_SOUND is not set | 919 | # CONFIG_SOUND is not set |
897 | CONFIG_HID_SUPPORT=y | 920 | CONFIG_HID_SUPPORT=y |
898 | CONFIG_HID=y | 921 | CONFIG_HID=y |
@@ -907,6 +930,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
907 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 930 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
908 | 931 | ||
909 | # | 932 | # |
933 | # Enable Host or Gadget support to see Inventra options | ||
934 | # | ||
935 | |||
936 | # | ||
910 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 937 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
911 | # | 938 | # |
912 | # CONFIG_USB_GADGET is not set | 939 | # CONFIG_USB_GADGET is not set |
@@ -945,6 +972,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
945 | # CONFIG_RTC_DRV_PCF8583 is not set | 972 | # CONFIG_RTC_DRV_PCF8583 is not set |
946 | # CONFIG_RTC_DRV_M41T80 is not set | 973 | # CONFIG_RTC_DRV_M41T80 is not set |
947 | # CONFIG_RTC_DRV_S35390A is not set | 974 | # CONFIG_RTC_DRV_S35390A is not set |
975 | # CONFIG_RTC_DRV_FM3130 is not set | ||
948 | 976 | ||
949 | # | 977 | # |
950 | # SPI RTC drivers | 978 | # SPI RTC drivers |
@@ -1031,9 +1059,11 @@ CONFIG_TMPFS=y | |||
1031 | # CONFIG_BFS_FS is not set | 1059 | # CONFIG_BFS_FS is not set |
1032 | # CONFIG_EFS_FS is not set | 1060 | # CONFIG_EFS_FS is not set |
1033 | # CONFIG_JFFS2_FS is not set | 1061 | # CONFIG_JFFS2_FS is not set |
1062 | # CONFIG_UBIFS_FS is not set | ||
1034 | # CONFIG_CRAMFS is not set | 1063 | # CONFIG_CRAMFS is not set |
1035 | # CONFIG_VXFS_FS is not set | 1064 | # CONFIG_VXFS_FS is not set |
1036 | # CONFIG_MINIX_FS is not set | 1065 | # CONFIG_MINIX_FS is not set |
1066 | # CONFIG_OMFS_FS is not set | ||
1037 | # CONFIG_HPFS_FS is not set | 1067 | # CONFIG_HPFS_FS is not set |
1038 | # CONFIG_QNX4FS_FS is not set | 1068 | # CONFIG_QNX4FS_FS is not set |
1039 | # CONFIG_ROMFS_FS is not set | 1069 | # CONFIG_ROMFS_FS is not set |
@@ -1043,12 +1073,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
1043 | CONFIG_NFS_FS=y | 1073 | CONFIG_NFS_FS=y |
1044 | # CONFIG_NFS_V3 is not set | 1074 | # CONFIG_NFS_V3 is not set |
1045 | # CONFIG_NFS_V4 is not set | 1075 | # CONFIG_NFS_V4 is not set |
1046 | # CONFIG_NFSD is not set | ||
1047 | CONFIG_ROOT_NFS=y | 1076 | CONFIG_ROOT_NFS=y |
1077 | # CONFIG_NFSD is not set | ||
1048 | CONFIG_LOCKD=y | 1078 | CONFIG_LOCKD=y |
1049 | CONFIG_NFS_COMMON=y | 1079 | CONFIG_NFS_COMMON=y |
1050 | CONFIG_SUNRPC=y | 1080 | CONFIG_SUNRPC=y |
1051 | # CONFIG_SUNRPC_BIND34 is not set | ||
1052 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1081 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1053 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1082 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1054 | # CONFIG_SMB_FS is not set | 1083 | # CONFIG_SMB_FS is not set |
@@ -1084,6 +1113,7 @@ CONFIG_BITREVERSE=y | |||
1084 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1113 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1085 | # CONFIG_CRC_CCITT is not set | 1114 | # CONFIG_CRC_CCITT is not set |
1086 | # CONFIG_CRC16 is not set | 1115 | # CONFIG_CRC16 is not set |
1116 | # CONFIG_CRC_T10DIF is not set | ||
1087 | # CONFIG_CRC_ITU_T is not set | 1117 | # CONFIG_CRC_ITU_T is not set |
1088 | CONFIG_CRC32=y | 1118 | CONFIG_CRC32=y |
1089 | # CONFIG_CRC7 is not set | 1119 | # CONFIG_CRC7 is not set |
@@ -1108,6 +1138,8 @@ CONFIG_FRAME_WARN=1024 | |||
1108 | CONFIG_DEBUG_KERNEL=y | 1138 | CONFIG_DEBUG_KERNEL=y |
1109 | # CONFIG_DEBUG_SHIRQ is not set | 1139 | # CONFIG_DEBUG_SHIRQ is not set |
1110 | CONFIG_DETECT_SOFTLOCKUP=y | 1140 | CONFIG_DETECT_SOFTLOCKUP=y |
1141 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1142 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1111 | CONFIG_SCHED_DEBUG=y | 1143 | CONFIG_SCHED_DEBUG=y |
1112 | # CONFIG_SCHEDSTATS is not set | 1144 | # CONFIG_SCHEDSTATS is not set |
1113 | # CONFIG_TIMER_STATS is not set | 1145 | # CONFIG_TIMER_STATS is not set |
@@ -1125,17 +1157,29 @@ CONFIG_DEBUG_MUTEXES=y | |||
1125 | # CONFIG_DEBUG_INFO is not set | 1157 | # CONFIG_DEBUG_INFO is not set |
1126 | # CONFIG_DEBUG_VM is not set | 1158 | # CONFIG_DEBUG_VM is not set |
1127 | # CONFIG_DEBUG_WRITECOUNT is not set | 1159 | # CONFIG_DEBUG_WRITECOUNT is not set |
1160 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1128 | # CONFIG_DEBUG_LIST is not set | 1161 | # CONFIG_DEBUG_LIST is not set |
1129 | # CONFIG_DEBUG_SG is not set | 1162 | # CONFIG_DEBUG_SG is not set |
1130 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1163 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1131 | # CONFIG_RCU_TORTURE_TEST is not set | 1164 | # CONFIG_RCU_TORTURE_TEST is not set |
1132 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1165 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1133 | # CONFIG_FAULT_INJECTION is not set | 1166 | # CONFIG_FAULT_INJECTION is not set |
1167 | # CONFIG_LATENCYTOP is not set | ||
1168 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1169 | CONFIG_HAVE_FTRACE=y | ||
1170 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1171 | # CONFIG_FTRACE is not set | ||
1172 | # CONFIG_SCHED_TRACER is not set | ||
1173 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1134 | # CONFIG_SAMPLES is not set | 1174 | # CONFIG_SAMPLES is not set |
1175 | CONFIG_HAVE_ARCH_KGDB=y | ||
1176 | # CONFIG_KGDB is not set | ||
1135 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1177 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1136 | # CONFIG_DEBUG_STACK_USAGE is not set | 1178 | # CONFIG_DEBUG_STACK_USAGE is not set |
1137 | # CONFIG_DEBUG_PAGEALLOC is not set | 1179 | # CONFIG_DEBUG_PAGEALLOC is not set |
1138 | # CONFIG_DEBUGGER is not set | 1180 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1181 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1182 | # CONFIG_XMON is not set | ||
1139 | # CONFIG_IRQSTACKS is not set | 1183 | # CONFIG_IRQSTACKS is not set |
1140 | # CONFIG_BDI_SWITCH is not set | 1184 | # CONFIG_BDI_SWITCH is not set |
1141 | # CONFIG_PPC_EARLY_DEBUG is not set | 1185 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1189,6 +1233,10 @@ CONFIG_CRYPTO=y | |||
1189 | # CONFIG_CRYPTO_MD4 is not set | 1233 | # CONFIG_CRYPTO_MD4 is not set |
1190 | # CONFIG_CRYPTO_MD5 is not set | 1234 | # CONFIG_CRYPTO_MD5 is not set |
1191 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1235 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1236 | # CONFIG_CRYPTO_RMD128 is not set | ||
1237 | # CONFIG_CRYPTO_RMD160 is not set | ||
1238 | # CONFIG_CRYPTO_RMD256 is not set | ||
1239 | # CONFIG_CRYPTO_RMD320 is not set | ||
1192 | # CONFIG_CRYPTO_SHA1 is not set | 1240 | # CONFIG_CRYPTO_SHA1 is not set |
1193 | # CONFIG_CRYPTO_SHA256 is not set | 1241 | # CONFIG_CRYPTO_SHA256 is not set |
1194 | # CONFIG_CRYPTO_SHA512 is not set | 1242 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1221,5 +1269,6 @@ CONFIG_CRYPTO=y | |||
1221 | # CONFIG_CRYPTO_LZO is not set | 1269 | # CONFIG_CRYPTO_LZO is not set |
1222 | CONFIG_CRYPTO_HW=y | 1270 | CONFIG_CRYPTO_HW=y |
1223 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1271 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1272 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1224 | # CONFIG_PPC_CLOCK is not set | 1273 | # CONFIG_PPC_CLOCK is not set |
1225 | # CONFIG_VIRTUALIZATION is not set | 1274 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8555_defconfig b/arch/powerpc/configs/85xx/tqm8555_defconfig index 03120b5b52fa..dcf9cfe28b55 100644 --- a/arch/powerpc/configs/85xx/tqm8555_defconfig +++ b/arch/powerpc/configs/85xx/tqm8555_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:41 2008 | 4 | # Thu Aug 21 00:52:42 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | ||
42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | # CONFIG_KALLSYMS is not set | 95 | # CONFIG_KALLSYMS is not set |
94 | # CONFIG_HOTPLUG is not set | 96 | # CONFIG_HOTPLUG is not set |
95 | CONFIG_PRINTK=y | 97 | CONFIG_PRINTK=y |
@@ -112,10 +114,16 @@ CONFIG_SLUB=y | |||
112 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
114 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 122 | # CONFIG_HAVE_DMA_ATTRS is not set |
123 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
124 | CONFIG_HAVE_CLK=y | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
@@ -126,6 +134,7 @@ CONFIG_BLOCK=y | |||
126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 134 | # CONFIG_BLK_DEV_IO_TRACE is not set |
127 | # CONFIG_LSF is not set | 135 | # CONFIG_LSF is not set |
128 | # CONFIG_BLK_DEV_BSG is not set | 136 | # CONFIG_BLK_DEV_BSG is not set |
137 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
129 | 138 | ||
130 | # | 139 | # |
131 | # IO Schedulers | 140 | # IO Schedulers |
@@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y | |||
144 | # | 153 | # |
145 | # Platform support | 154 | # Platform support |
146 | # | 155 | # |
147 | # CONFIG_PPC_MPC512x is not set | ||
148 | # CONFIG_PPC_MPC5121 is not set | ||
149 | # CONFIG_PPC_CELL is not set | 156 | # CONFIG_PPC_CELL is not set |
150 | # CONFIG_PPC_CELL_NATIVE is not set | 157 | # CONFIG_PPC_CELL_NATIVE is not set |
151 | # CONFIG_PQ2ADS is not set | 158 | # CONFIG_PQ2ADS is not set |
@@ -154,11 +161,13 @@ CONFIG_MPC85xx=y | |||
154 | # CONFIG_MPC8560_ADS is not set | 161 | # CONFIG_MPC8560_ADS is not set |
155 | # CONFIG_MPC85xx_CDS is not set | 162 | # CONFIG_MPC85xx_CDS is not set |
156 | # CONFIG_MPC85xx_MDS is not set | 163 | # CONFIG_MPC85xx_MDS is not set |
164 | # CONFIG_MPC8536_DS is not set | ||
157 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | 166 | # CONFIG_KSI8560 is not set |
159 | # CONFIG_STX_GP3 is not set | 167 | # CONFIG_STX_GP3 is not set |
160 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
161 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
170 | # CONFIG_TQM8548 is not set | ||
162 | CONFIG_TQM8555=y | 171 | CONFIG_TQM8555=y |
163 | # CONFIG_TQM8560 is not set | 172 | # CONFIG_TQM8560 is not set |
164 | # CONFIG_SBC8548 is not set | 173 | # CONFIG_SBC8548 is not set |
@@ -176,7 +185,6 @@ CONFIG_MPIC=y | |||
176 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
177 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
178 | CONFIG_CPM2=y | 187 | CONFIG_CPM2=y |
179 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
180 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
181 | CONFIG_CPM=y | 189 | CONFIG_CPM=y |
182 | 190 | ||
@@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
217 | CONFIG_PAGEFLAGS_EXTENDED=y | 225 | CONFIG_PAGEFLAGS_EXTENDED=y |
218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
227 | CONFIG_MIGRATION=y | ||
219 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
220 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
221 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
@@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y | |||
223 | CONFIG_FORCE_MAX_ZONEORDER=11 | 232 | CONFIG_FORCE_MAX_ZONEORDER=11 |
224 | # CONFIG_PROC_DEVICETREE is not set | 233 | # CONFIG_PROC_DEVICETREE is not set |
225 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
235 | CONFIG_EXTRA_TARGETS="" | ||
226 | # CONFIG_PM is not set | 236 | # CONFIG_PM is not set |
227 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
228 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
@@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y | |||
234 | CONFIG_PPC_INDIRECT_PCI=y | 244 | CONFIG_PPC_INDIRECT_PCI=y |
235 | CONFIG_FSL_SOC=y | 245 | CONFIG_FSL_SOC=y |
236 | CONFIG_FSL_PCI=y | 246 | CONFIG_FSL_PCI=y |
247 | CONFIG_PPC_PCI_CHOICE=y | ||
237 | CONFIG_PCI=y | 248 | CONFIG_PCI=y |
238 | CONFIG_PCI_DOMAINS=y | 249 | CONFIG_PCI_DOMAINS=y |
239 | CONFIG_PCI_SYSCALL=y | 250 | CONFIG_PCI_SYSCALL=y |
@@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
257 | CONFIG_PHYSICAL_START=0x00000000 | 268 | CONFIG_PHYSICAL_START=0x00000000 |
258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 269 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
259 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
260 | |||
261 | # | ||
262 | # Networking | ||
263 | # | ||
264 | CONFIG_NET=y | 271 | CONFIG_NET=y |
265 | 272 | ||
266 | # | 273 | # |
@@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
432 | # | 439 | # |
433 | # CONFIG_MTD_UBI is not set | 440 | # CONFIG_MTD_UBI is not set |
434 | CONFIG_OF_DEVICE=y | 441 | CONFIG_OF_DEVICE=y |
442 | CONFIG_OF_GPIO=y | ||
435 | CONFIG_OF_I2C=y | 443 | CONFIG_OF_I2C=y |
436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
@@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
451 | # CONFIG_BLK_DEV_XIP is not set | 459 | # CONFIG_BLK_DEV_XIP is not set |
452 | # CONFIG_CDROM_PKTCDVD is not set | 460 | # CONFIG_CDROM_PKTCDVD is not set |
453 | # CONFIG_ATA_OVER_ETH is not set | 461 | # CONFIG_ATA_OVER_ETH is not set |
462 | # CONFIG_BLK_DEV_HD is not set | ||
454 | CONFIG_MISC_DEVICES=y | 463 | CONFIG_MISC_DEVICES=y |
455 | # CONFIG_PHANTOM is not set | 464 | # CONFIG_PHANTOM is not set |
456 | # CONFIG_EEPROM_93CX6 is not set | 465 | # CONFIG_EEPROM_93CX6 is not set |
457 | # CONFIG_SGI_IOC4 is not set | 466 | # CONFIG_SGI_IOC4 is not set |
458 | # CONFIG_TIFM_CORE is not set | 467 | # CONFIG_TIFM_CORE is not set |
459 | # CONFIG_ENCLOSURE_SERVICES is not set | 468 | # CONFIG_ENCLOSURE_SERVICES is not set |
469 | # CONFIG_HP_ILO is not set | ||
460 | CONFIG_HAVE_IDE=y | 470 | CONFIG_HAVE_IDE=y |
461 | CONFIG_IDE=y | 471 | CONFIG_IDE=y |
462 | CONFIG_IDE_MAX_HWIFS=4 | ||
463 | CONFIG_BLK_DEV_IDE=y | 472 | CONFIG_BLK_DEV_IDE=y |
464 | 473 | ||
465 | # | 474 | # |
466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 475 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
467 | # | 476 | # |
477 | CONFIG_IDE_TIMINGS=y | ||
468 | # CONFIG_BLK_DEV_IDE_SATA is not set | 478 | # CONFIG_BLK_DEV_IDE_SATA is not set |
469 | CONFIG_BLK_DEV_IDEDISK=y | 479 | CONFIG_BLK_DEV_IDEDISK=y |
470 | # CONFIG_IDEDISK_MULTI_MODE is not set | 480 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y | |||
477 | # | 487 | # |
478 | # IDE chipset support/bugfixes | 488 | # IDE chipset support/bugfixes |
479 | # | 489 | # |
480 | CONFIG_IDE_GENERIC=y | ||
481 | # CONFIG_BLK_DEV_PLATFORM is not set | 490 | # CONFIG_BLK_DEV_PLATFORM is not set |
482 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 491 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
483 | 492 | ||
@@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
495 | # CONFIG_BLK_DEV_AMD74XX is not set | 504 | # CONFIG_BLK_DEV_AMD74XX is not set |
496 | # CONFIG_BLK_DEV_CMD64X is not set | 505 | # CONFIG_BLK_DEV_CMD64X is not set |
497 | # CONFIG_BLK_DEV_TRIFLEX is not set | 506 | # CONFIG_BLK_DEV_TRIFLEX is not set |
498 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
499 | # CONFIG_BLK_DEV_CS5520 is not set | 507 | # CONFIG_BLK_DEV_CS5520 is not set |
500 | # CONFIG_BLK_DEV_CS5530 is not set | 508 | # CONFIG_BLK_DEV_CS5530 is not set |
501 | # CONFIG_BLK_DEV_HPT34X is not set | ||
502 | # CONFIG_BLK_DEV_HPT366 is not set | 509 | # CONFIG_BLK_DEV_HPT366 is not set |
503 | # CONFIG_BLK_DEV_JMICRON is not set | 510 | # CONFIG_BLK_DEV_JMICRON is not set |
504 | # CONFIG_BLK_DEV_SC1200 is not set | 511 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
516 | CONFIG_BLK_DEV_VIA82CXXX=y | 523 | CONFIG_BLK_DEV_VIA82CXXX=y |
517 | # CONFIG_BLK_DEV_TC86C001 is not set | 524 | # CONFIG_BLK_DEV_TC86C001 is not set |
518 | CONFIG_BLK_DEV_IDEDMA=y | 525 | CONFIG_BLK_DEV_IDEDMA=y |
519 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
520 | # CONFIG_BLK_DEV_HD is not set | ||
521 | 526 | ||
522 | # | 527 | # |
523 | # SCSI device support | 528 | # SCSI device support |
@@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
533 | # | 538 | # |
534 | # IEEE 1394 (FireWire) support | 539 | # IEEE 1394 (FireWire) support |
535 | # | 540 | # |
541 | |||
542 | # | ||
543 | # Enable only one of the two stacks, unless you know what you are doing | ||
544 | # | ||
536 | # CONFIG_FIREWIRE is not set | 545 | # CONFIG_FIREWIRE is not set |
537 | # CONFIG_IEEE1394 is not set | 546 | # CONFIG_IEEE1394 is not set |
538 | # CONFIG_I2O is not set | 547 | # CONFIG_I2O is not set |
539 | # CONFIG_MACINTOSH_DRIVERS is not set | 548 | # CONFIG_MACINTOSH_DRIVERS is not set |
540 | CONFIG_NETDEVICES=y | 549 | CONFIG_NETDEVICES=y |
541 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
542 | # CONFIG_DUMMY is not set | 550 | # CONFIG_DUMMY is not set |
543 | # CONFIG_BONDING is not set | 551 | # CONFIG_BONDING is not set |
544 | # CONFIG_MACVLAN is not set | 552 | # CONFIG_MACVLAN is not set |
@@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y | |||
601 | # CONFIG_DL2K is not set | 609 | # CONFIG_DL2K is not set |
602 | # CONFIG_E1000 is not set | 610 | # CONFIG_E1000 is not set |
603 | # CONFIG_E1000E is not set | 611 | # CONFIG_E1000E is not set |
604 | # CONFIG_E1000E_ENABLED is not set | ||
605 | # CONFIG_IP1000 is not set | 612 | # CONFIG_IP1000 is not set |
606 | # CONFIG_IGB is not set | 613 | # CONFIG_IGB is not set |
607 | # CONFIG_NS83820 is not set | 614 | # CONFIG_NS83820 is not set |
@@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y | |||
615 | # CONFIG_TIGON3 is not set | 622 | # CONFIG_TIGON3 is not set |
616 | # CONFIG_BNX2 is not set | 623 | # CONFIG_BNX2 is not set |
617 | CONFIG_GIANFAR=y | 624 | CONFIG_GIANFAR=y |
618 | CONFIG_GFAR_NAPI=y | ||
619 | # CONFIG_QLA3XXX is not set | 625 | # CONFIG_QLA3XXX is not set |
620 | # CONFIG_ATL1 is not set | 626 | # CONFIG_ATL1 is not set |
627 | # CONFIG_ATL1E is not set | ||
621 | CONFIG_NETDEV_10000=y | 628 | CONFIG_NETDEV_10000=y |
622 | # CONFIG_CHELSIO_T1 is not set | 629 | # CONFIG_CHELSIO_T1 is not set |
623 | # CONFIG_CHELSIO_T3 is not set | 630 | # CONFIG_CHELSIO_T3 is not set |
@@ -732,42 +739,66 @@ CONFIG_DEVPORT=y | |||
732 | CONFIG_I2C=y | 739 | CONFIG_I2C=y |
733 | CONFIG_I2C_BOARDINFO=y | 740 | CONFIG_I2C_BOARDINFO=y |
734 | CONFIG_I2C_CHARDEV=y | 741 | CONFIG_I2C_CHARDEV=y |
742 | CONFIG_I2C_HELPER_AUTO=y | ||
735 | 743 | ||
736 | # | 744 | # |
737 | # I2C Hardware Bus support | 745 | # I2C Hardware Bus support |
738 | # | 746 | # |
747 | |||
748 | # | ||
749 | # PC SMBus host controller drivers | ||
750 | # | ||
739 | # CONFIG_I2C_ALI1535 is not set | 751 | # CONFIG_I2C_ALI1535 is not set |
740 | # CONFIG_I2C_ALI1563 is not set | 752 | # CONFIG_I2C_ALI1563 is not set |
741 | # CONFIG_I2C_ALI15X3 is not set | 753 | # CONFIG_I2C_ALI15X3 is not set |
742 | # CONFIG_I2C_AMD756 is not set | 754 | # CONFIG_I2C_AMD756 is not set |
743 | # CONFIG_I2C_AMD8111 is not set | 755 | # CONFIG_I2C_AMD8111 is not set |
744 | # CONFIG_I2C_I801 is not set | 756 | # CONFIG_I2C_I801 is not set |
745 | # CONFIG_I2C_I810 is not set | 757 | # CONFIG_I2C_ISCH is not set |
746 | # CONFIG_I2C_PIIX4 is not set | 758 | # CONFIG_I2C_PIIX4 is not set |
747 | CONFIG_I2C_MPC=y | ||
748 | # CONFIG_I2C_NFORCE2 is not set | 759 | # CONFIG_I2C_NFORCE2 is not set |
749 | # CONFIG_I2C_OCORES is not set | ||
750 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
751 | # CONFIG_I2C_PROSAVAGE is not set | ||
752 | # CONFIG_I2C_SAVAGE4 is not set | ||
753 | # CONFIG_I2C_SIMTEC is not set | ||
754 | # CONFIG_I2C_SIS5595 is not set | 760 | # CONFIG_I2C_SIS5595 is not set |
755 | # CONFIG_I2C_SIS630 is not set | 761 | # CONFIG_I2C_SIS630 is not set |
756 | # CONFIG_I2C_SIS96X is not set | 762 | # CONFIG_I2C_SIS96X is not set |
757 | # CONFIG_I2C_TAOS_EVM is not set | ||
758 | # CONFIG_I2C_VIA is not set | 763 | # CONFIG_I2C_VIA is not set |
759 | # CONFIG_I2C_VIAPRO is not set | 764 | # CONFIG_I2C_VIAPRO is not set |
765 | |||
766 | # | ||
767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
768 | # | ||
769 | # CONFIG_I2C_CPM is not set | ||
770 | # CONFIG_I2C_GPIO is not set | ||
771 | CONFIG_I2C_MPC=y | ||
772 | # CONFIG_I2C_OCORES is not set | ||
773 | # CONFIG_I2C_SIMTEC is not set | ||
774 | |||
775 | # | ||
776 | # External I2C/SMBus adapter drivers | ||
777 | # | ||
778 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
779 | # CONFIG_I2C_TAOS_EVM is not set | ||
780 | |||
781 | # | ||
782 | # Graphics adapter I2C/DDC channel drivers | ||
783 | # | ||
760 | # CONFIG_I2C_VOODOO3 is not set | 784 | # CONFIG_I2C_VOODOO3 is not set |
785 | |||
786 | # | ||
787 | # Other I2C/SMBus bus drivers | ||
788 | # | ||
761 | # CONFIG_I2C_PCA_PLATFORM is not set | 789 | # CONFIG_I2C_PCA_PLATFORM is not set |
762 | 790 | ||
763 | # | 791 | # |
764 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
765 | # | 793 | # |
766 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
795 | # CONFIG_AT24 is not set | ||
767 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
768 | # CONFIG_SENSORS_PCF8574 is not set | 797 | # CONFIG_SENSORS_PCF8574 is not set |
769 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
799 | # CONFIG_SENSORS_PCA9539 is not set | ||
770 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
801 | # CONFIG_TPS65010 is not set | ||
771 | # CONFIG_SENSORS_MAX6875 is not set | 802 | # CONFIG_SENSORS_MAX6875 is not set |
772 | # CONFIG_SENSORS_TSL2550 is not set | 803 | # CONFIG_SENSORS_TSL2550 is not set |
773 | # CONFIG_I2C_DEBUG_CORE is not set | 804 | # CONFIG_I2C_DEBUG_CORE is not set |
@@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y | |||
775 | # CONFIG_I2C_DEBUG_BUS is not set | 806 | # CONFIG_I2C_DEBUG_BUS is not set |
776 | # CONFIG_I2C_DEBUG_CHIP is not set | 807 | # CONFIG_I2C_DEBUG_CHIP is not set |
777 | # CONFIG_SPI is not set | 808 | # CONFIG_SPI is not set |
809 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
810 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
811 | CONFIG_GPIOLIB=y | ||
812 | # CONFIG_GPIO_SYSFS is not set | ||
813 | |||
814 | # | ||
815 | # I2C GPIO expanders: | ||
816 | # | ||
817 | # CONFIG_GPIO_MAX732X is not set | ||
818 | # CONFIG_GPIO_PCA953X is not set | ||
819 | # CONFIG_GPIO_PCF857X is not set | ||
820 | |||
821 | # | ||
822 | # PCI GPIO expanders: | ||
823 | # | ||
824 | # CONFIG_GPIO_BT8XX is not set | ||
825 | |||
826 | # | ||
827 | # SPI GPIO expanders: | ||
828 | # | ||
778 | # CONFIG_W1 is not set | 829 | # CONFIG_W1 is not set |
779 | # CONFIG_POWER_SUPPLY is not set | 830 | # CONFIG_POWER_SUPPLY is not set |
780 | CONFIG_HWMON=y | 831 | CONFIG_HWMON=y |
781 | # CONFIG_HWMON_VID is not set | 832 | # CONFIG_HWMON_VID is not set |
833 | # CONFIG_SENSORS_AD7414 is not set | ||
782 | # CONFIG_SENSORS_AD7418 is not set | 834 | # CONFIG_SENSORS_AD7418 is not set |
783 | # CONFIG_SENSORS_ADM1021 is not set | 835 | # CONFIG_SENSORS_ADM1021 is not set |
784 | # CONFIG_SENSORS_ADM1025 is not set | 836 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y | |||
832 | # CONFIG_SENSORS_W83627EHF is not set | 884 | # CONFIG_SENSORS_W83627EHF is not set |
833 | CONFIG_HWMON_DEBUG_CHIP=y | 885 | CONFIG_HWMON_DEBUG_CHIP=y |
834 | # CONFIG_THERMAL is not set | 886 | # CONFIG_THERMAL is not set |
887 | # CONFIG_THERMAL_HWMON is not set | ||
835 | # CONFIG_WATCHDOG is not set | 888 | # CONFIG_WATCHDOG is not set |
836 | 889 | ||
837 | # | 890 | # |
@@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y | |||
843 | # | 896 | # |
844 | # Multifunction device drivers | 897 | # Multifunction device drivers |
845 | # | 898 | # |
899 | # CONFIG_MFD_CORE is not set | ||
846 | # CONFIG_MFD_SM501 is not set | 900 | # CONFIG_MFD_SM501 is not set |
847 | # CONFIG_HTC_PASIC3 is not set | 901 | # CONFIG_HTC_PASIC3 is not set |
902 | # CONFIG_MFD_TMIO is not set | ||
848 | 903 | ||
849 | # | 904 | # |
850 | # Multimedia devices | 905 | # Multimedia devices |
@@ -876,10 +931,6 @@ CONFIG_DAB=y | |||
876 | # Display device support | 931 | # Display device support |
877 | # | 932 | # |
878 | # CONFIG_DISPLAY_SUPPORT is not set | 933 | # CONFIG_DISPLAY_SUPPORT is not set |
879 | |||
880 | # | ||
881 | # Sound | ||
882 | # | ||
883 | # CONFIG_SOUND is not set | 934 | # CONFIG_SOUND is not set |
884 | CONFIG_HID_SUPPORT=y | 935 | CONFIG_HID_SUPPORT=y |
885 | CONFIG_HID=y | 936 | CONFIG_HID=y |
@@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 945 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
895 | 946 | ||
896 | # | 947 | # |
948 | # Enable Host or Gadget support to see Inventra options | ||
949 | # | ||
950 | |||
951 | # | ||
897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 952 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
898 | # | 953 | # |
899 | # CONFIG_USB_GADGET is not set | 954 | # CONFIG_USB_GADGET is not set |
@@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y | |||
982 | CONFIG_CRAMFS=y | 1037 | CONFIG_CRAMFS=y |
983 | # CONFIG_VXFS_FS is not set | 1038 | # CONFIG_VXFS_FS is not set |
984 | # CONFIG_MINIX_FS is not set | 1039 | # CONFIG_MINIX_FS is not set |
1040 | # CONFIG_OMFS_FS is not set | ||
985 | # CONFIG_HPFS_FS is not set | 1041 | # CONFIG_HPFS_FS is not set |
986 | # CONFIG_QNX4FS_FS is not set | 1042 | # CONFIG_QNX4FS_FS is not set |
987 | # CONFIG_ROMFS_FS is not set | 1043 | # CONFIG_ROMFS_FS is not set |
@@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
991 | CONFIG_NFS_FS=y | 1047 | CONFIG_NFS_FS=y |
992 | # CONFIG_NFS_V3 is not set | 1048 | # CONFIG_NFS_V3 is not set |
993 | # CONFIG_NFS_V4 is not set | 1049 | # CONFIG_NFS_V4 is not set |
994 | # CONFIG_NFSD is not set | ||
995 | CONFIG_ROOT_NFS=y | 1050 | CONFIG_ROOT_NFS=y |
1051 | # CONFIG_NFSD is not set | ||
996 | CONFIG_LOCKD=y | 1052 | CONFIG_LOCKD=y |
997 | CONFIG_NFS_COMMON=y | 1053 | CONFIG_NFS_COMMON=y |
998 | CONFIG_SUNRPC=y | 1054 | CONFIG_SUNRPC=y |
999 | # CONFIG_SUNRPC_BIND34 is not set | ||
1000 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1055 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1001 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1056 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1002 | # CONFIG_SMB_FS is not set | 1057 | # CONFIG_SMB_FS is not set |
@@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y | |||
1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1087 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1033 | # CONFIG_CRC_CCITT is not set | 1088 | # CONFIG_CRC_CCITT is not set |
1034 | # CONFIG_CRC16 is not set | 1089 | # CONFIG_CRC16 is not set |
1090 | # CONFIG_CRC_T10DIF is not set | ||
1035 | # CONFIG_CRC_ITU_T is not set | 1091 | # CONFIG_CRC_ITU_T is not set |
1036 | CONFIG_CRC32=y | 1092 | CONFIG_CRC32=y |
1037 | # CONFIG_CRC7 is not set | 1093 | # CONFIG_CRC7 is not set |
@@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024 | |||
1059 | # CONFIG_SLUB_DEBUG_ON is not set | 1115 | # CONFIG_SLUB_DEBUG_ON is not set |
1060 | # CONFIG_SLUB_STATS is not set | 1116 | # CONFIG_SLUB_STATS is not set |
1061 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1117 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1118 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1119 | # CONFIG_LATENCYTOP is not set | ||
1120 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1121 | CONFIG_HAVE_FTRACE=y | ||
1122 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1123 | # CONFIG_FTRACE is not set | ||
1124 | # CONFIG_SCHED_TRACER is not set | ||
1125 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1062 | # CONFIG_SAMPLES is not set | 1126 | # CONFIG_SAMPLES is not set |
1063 | # CONFIG_KGDB_CONSOLE is not set | 1127 | CONFIG_HAVE_ARCH_KGDB=y |
1064 | # CONFIG_IRQSTACKS is not set | 1128 | # CONFIG_IRQSTACKS is not set |
1065 | # CONFIG_PPC_EARLY_DEBUG is not set | 1129 | # CONFIG_PPC_EARLY_DEBUG is not set |
1066 | 1130 | ||
@@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y | |||
1112 | # CONFIG_CRYPTO_MD4 is not set | 1176 | # CONFIG_CRYPTO_MD4 is not set |
1113 | # CONFIG_CRYPTO_MD5 is not set | 1177 | # CONFIG_CRYPTO_MD5 is not set |
1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1178 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1179 | # CONFIG_CRYPTO_RMD128 is not set | ||
1180 | # CONFIG_CRYPTO_RMD160 is not set | ||
1181 | # CONFIG_CRYPTO_RMD256 is not set | ||
1182 | # CONFIG_CRYPTO_RMD320 is not set | ||
1115 | # CONFIG_CRYPTO_SHA1 is not set | 1183 | # CONFIG_CRYPTO_SHA1 is not set |
1116 | # CONFIG_CRYPTO_SHA256 is not set | 1184 | # CONFIG_CRYPTO_SHA256 is not set |
1117 | # CONFIG_CRYPTO_SHA512 is not set | 1185 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y | |||
1144 | # CONFIG_CRYPTO_LZO is not set | 1212 | # CONFIG_CRYPTO_LZO is not set |
1145 | CONFIG_CRYPTO_HW=y | 1213 | CONFIG_CRYPTO_HW=y |
1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1214 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1147 | # CONFIG_PPC_CLOCK is not set | 1215 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
1216 | CONFIG_PPC_CLOCK=y | ||
1148 | CONFIG_PPC_LIB_RHEAP=y | 1217 | CONFIG_PPC_LIB_RHEAP=y |
1149 | # CONFIG_VIRTUALIZATION is not set | 1218 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/85xx/tqm8560_defconfig b/arch/powerpc/configs/85xx/tqm8560_defconfig index 3113257edf5a..8d676629cdb1 100644 --- a/arch/powerpc/configs/85xx/tqm8560_defconfig +++ b/arch/powerpc/configs/85xx/tqm8560_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:42 2008 | 4 | # Thu Aug 21 00:52:43 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | ||
42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
@@ -89,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
89 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
90 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
91 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
92 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
93 | # CONFIG_KALLSYMS is not set | 95 | # CONFIG_KALLSYMS is not set |
94 | # CONFIG_HOTPLUG is not set | 96 | # CONFIG_HOTPLUG is not set |
95 | CONFIG_PRINTK=y | 97 | CONFIG_PRINTK=y |
@@ -112,10 +114,16 @@ CONFIG_SLUB=y | |||
112 | # CONFIG_PROFILING is not set | 114 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | 115 | # CONFIG_MARKERS is not set |
114 | CONFIG_HAVE_OPROFILE=y | 116 | CONFIG_HAVE_OPROFILE=y |
117 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
118 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 119 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 120 | CONFIG_HAVE_KRETPROBES=y |
121 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 122 | # CONFIG_HAVE_DMA_ATTRS is not set |
123 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
124 | CONFIG_HAVE_CLK=y | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 125 | CONFIG_PROC_PAGE_MONITOR=y |
126 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 127 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 128 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 129 | # CONFIG_TINY_SHMEM is not set |
@@ -126,6 +134,7 @@ CONFIG_BLOCK=y | |||
126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 134 | # CONFIG_BLK_DEV_IO_TRACE is not set |
127 | # CONFIG_LSF is not set | 135 | # CONFIG_LSF is not set |
128 | # CONFIG_BLK_DEV_BSG is not set | 136 | # CONFIG_BLK_DEV_BSG is not set |
137 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
129 | 138 | ||
130 | # | 139 | # |
131 | # IO Schedulers | 140 | # IO Schedulers |
@@ -144,8 +153,6 @@ CONFIG_CLASSIC_RCU=y | |||
144 | # | 153 | # |
145 | # Platform support | 154 | # Platform support |
146 | # | 155 | # |
147 | # CONFIG_PPC_MPC512x is not set | ||
148 | # CONFIG_PPC_MPC5121 is not set | ||
149 | # CONFIG_PPC_CELL is not set | 156 | # CONFIG_PPC_CELL is not set |
150 | # CONFIG_PPC_CELL_NATIVE is not set | 157 | # CONFIG_PPC_CELL_NATIVE is not set |
151 | # CONFIG_PQ2ADS is not set | 158 | # CONFIG_PQ2ADS is not set |
@@ -154,11 +161,13 @@ CONFIG_MPC85xx=y | |||
154 | # CONFIG_MPC8560_ADS is not set | 161 | # CONFIG_MPC8560_ADS is not set |
155 | # CONFIG_MPC85xx_CDS is not set | 162 | # CONFIG_MPC85xx_CDS is not set |
156 | # CONFIG_MPC85xx_MDS is not set | 163 | # CONFIG_MPC85xx_MDS is not set |
164 | # CONFIG_MPC8536_DS is not set | ||
157 | # CONFIG_MPC85xx_DS is not set | 165 | # CONFIG_MPC85xx_DS is not set |
158 | # CONFIG_KSI8560 is not set | 166 | # CONFIG_KSI8560 is not set |
159 | # CONFIG_STX_GP3 is not set | 167 | # CONFIG_STX_GP3 is not set |
160 | # CONFIG_TQM8540 is not set | 168 | # CONFIG_TQM8540 is not set |
161 | # CONFIG_TQM8541 is not set | 169 | # CONFIG_TQM8541 is not set |
170 | # CONFIG_TQM8548 is not set | ||
162 | # CONFIG_TQM8555 is not set | 171 | # CONFIG_TQM8555 is not set |
163 | CONFIG_TQM8560=y | 172 | CONFIG_TQM8560=y |
164 | # CONFIG_SBC8548 is not set | 173 | # CONFIG_SBC8548 is not set |
@@ -176,7 +185,6 @@ CONFIG_MPIC=y | |||
176 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
177 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
178 | CONFIG_CPM2=y | 187 | CONFIG_CPM2=y |
179 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
180 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
181 | CONFIG_CPM=y | 189 | CONFIG_CPM=y |
182 | 190 | ||
@@ -216,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
216 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
217 | CONFIG_PAGEFLAGS_EXTENDED=y | 225 | CONFIG_PAGEFLAGS_EXTENDED=y |
218 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
227 | CONFIG_MIGRATION=y | ||
219 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
220 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
221 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
@@ -223,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y | |||
223 | CONFIG_FORCE_MAX_ZONEORDER=11 | 232 | CONFIG_FORCE_MAX_ZONEORDER=11 |
224 | # CONFIG_PROC_DEVICETREE is not set | 233 | # CONFIG_PROC_DEVICETREE is not set |
225 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
235 | CONFIG_EXTRA_TARGETS="" | ||
226 | # CONFIG_PM is not set | 236 | # CONFIG_PM is not set |
227 | CONFIG_SECCOMP=y | 237 | CONFIG_SECCOMP=y |
228 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
@@ -234,6 +244,7 @@ CONFIG_ZONE_DMA=y | |||
234 | CONFIG_PPC_INDIRECT_PCI=y | 244 | CONFIG_PPC_INDIRECT_PCI=y |
235 | CONFIG_FSL_SOC=y | 245 | CONFIG_FSL_SOC=y |
236 | CONFIG_FSL_PCI=y | 246 | CONFIG_FSL_PCI=y |
247 | CONFIG_PPC_PCI_CHOICE=y | ||
237 | CONFIG_PCI=y | 248 | CONFIG_PCI=y |
238 | CONFIG_PCI_DOMAINS=y | 249 | CONFIG_PCI_DOMAINS=y |
239 | CONFIG_PCI_SYSCALL=y | 250 | CONFIG_PCI_SYSCALL=y |
@@ -257,10 +268,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
257 | CONFIG_PHYSICAL_START=0x00000000 | 268 | CONFIG_PHYSICAL_START=0x00000000 |
258 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 269 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
259 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
260 | |||
261 | # | ||
262 | # Networking | ||
263 | # | ||
264 | CONFIG_NET=y | 271 | CONFIG_NET=y |
265 | 272 | ||
266 | # | 273 | # |
@@ -432,6 +439,7 @@ CONFIG_MTD_CFI_UTIL=y | |||
432 | # | 439 | # |
433 | # CONFIG_MTD_UBI is not set | 440 | # CONFIG_MTD_UBI is not set |
434 | CONFIG_OF_DEVICE=y | 441 | CONFIG_OF_DEVICE=y |
442 | CONFIG_OF_GPIO=y | ||
435 | CONFIG_OF_I2C=y | 443 | CONFIG_OF_I2C=y |
436 | # CONFIG_PARPORT is not set | 444 | # CONFIG_PARPORT is not set |
437 | CONFIG_BLK_DEV=y | 445 | CONFIG_BLK_DEV=y |
@@ -451,20 +459,22 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
451 | # CONFIG_BLK_DEV_XIP is not set | 459 | # CONFIG_BLK_DEV_XIP is not set |
452 | # CONFIG_CDROM_PKTCDVD is not set | 460 | # CONFIG_CDROM_PKTCDVD is not set |
453 | # CONFIG_ATA_OVER_ETH is not set | 461 | # CONFIG_ATA_OVER_ETH is not set |
462 | # CONFIG_BLK_DEV_HD is not set | ||
454 | CONFIG_MISC_DEVICES=y | 463 | CONFIG_MISC_DEVICES=y |
455 | # CONFIG_PHANTOM is not set | 464 | # CONFIG_PHANTOM is not set |
456 | # CONFIG_EEPROM_93CX6 is not set | 465 | # CONFIG_EEPROM_93CX6 is not set |
457 | # CONFIG_SGI_IOC4 is not set | 466 | # CONFIG_SGI_IOC4 is not set |
458 | # CONFIG_TIFM_CORE is not set | 467 | # CONFIG_TIFM_CORE is not set |
459 | # CONFIG_ENCLOSURE_SERVICES is not set | 468 | # CONFIG_ENCLOSURE_SERVICES is not set |
469 | # CONFIG_HP_ILO is not set | ||
460 | CONFIG_HAVE_IDE=y | 470 | CONFIG_HAVE_IDE=y |
461 | CONFIG_IDE=y | 471 | CONFIG_IDE=y |
462 | CONFIG_IDE_MAX_HWIFS=4 | ||
463 | CONFIG_BLK_DEV_IDE=y | 472 | CONFIG_BLK_DEV_IDE=y |
464 | 473 | ||
465 | # | 474 | # |
466 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 475 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
467 | # | 476 | # |
477 | CONFIG_IDE_TIMINGS=y | ||
468 | # CONFIG_BLK_DEV_IDE_SATA is not set | 478 | # CONFIG_BLK_DEV_IDE_SATA is not set |
469 | CONFIG_BLK_DEV_IDEDISK=y | 479 | CONFIG_BLK_DEV_IDEDISK=y |
470 | # CONFIG_IDEDISK_MULTI_MODE is not set | 480 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -477,7 +487,6 @@ CONFIG_IDE_PROC_FS=y | |||
477 | # | 487 | # |
478 | # IDE chipset support/bugfixes | 488 | # IDE chipset support/bugfixes |
479 | # | 489 | # |
480 | CONFIG_IDE_GENERIC=y | ||
481 | # CONFIG_BLK_DEV_PLATFORM is not set | 490 | # CONFIG_BLK_DEV_PLATFORM is not set |
482 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 491 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
483 | 492 | ||
@@ -495,10 +504,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
495 | # CONFIG_BLK_DEV_AMD74XX is not set | 504 | # CONFIG_BLK_DEV_AMD74XX is not set |
496 | # CONFIG_BLK_DEV_CMD64X is not set | 505 | # CONFIG_BLK_DEV_CMD64X is not set |
497 | # CONFIG_BLK_DEV_TRIFLEX is not set | 506 | # CONFIG_BLK_DEV_TRIFLEX is not set |
498 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
499 | # CONFIG_BLK_DEV_CS5520 is not set | 507 | # CONFIG_BLK_DEV_CS5520 is not set |
500 | # CONFIG_BLK_DEV_CS5530 is not set | 508 | # CONFIG_BLK_DEV_CS5530 is not set |
501 | # CONFIG_BLK_DEV_HPT34X is not set | ||
502 | # CONFIG_BLK_DEV_HPT366 is not set | 509 | # CONFIG_BLK_DEV_HPT366 is not set |
503 | # CONFIG_BLK_DEV_JMICRON is not set | 510 | # CONFIG_BLK_DEV_JMICRON is not set |
504 | # CONFIG_BLK_DEV_SC1200 is not set | 511 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -516,8 +523,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
516 | CONFIG_BLK_DEV_VIA82CXXX=y | 523 | CONFIG_BLK_DEV_VIA82CXXX=y |
517 | # CONFIG_BLK_DEV_TC86C001 is not set | 524 | # CONFIG_BLK_DEV_TC86C001 is not set |
518 | CONFIG_BLK_DEV_IDEDMA=y | 525 | CONFIG_BLK_DEV_IDEDMA=y |
519 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
520 | # CONFIG_BLK_DEV_HD is not set | ||
521 | 526 | ||
522 | # | 527 | # |
523 | # SCSI device support | 528 | # SCSI device support |
@@ -533,12 +538,15 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
533 | # | 538 | # |
534 | # IEEE 1394 (FireWire) support | 539 | # IEEE 1394 (FireWire) support |
535 | # | 540 | # |
541 | |||
542 | # | ||
543 | # Enable only one of the two stacks, unless you know what you are doing | ||
544 | # | ||
536 | # CONFIG_FIREWIRE is not set | 545 | # CONFIG_FIREWIRE is not set |
537 | # CONFIG_IEEE1394 is not set | 546 | # CONFIG_IEEE1394 is not set |
538 | # CONFIG_I2O is not set | 547 | # CONFIG_I2O is not set |
539 | # CONFIG_MACINTOSH_DRIVERS is not set | 548 | # CONFIG_MACINTOSH_DRIVERS is not set |
540 | CONFIG_NETDEVICES=y | 549 | CONFIG_NETDEVICES=y |
541 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
542 | # CONFIG_DUMMY is not set | 550 | # CONFIG_DUMMY is not set |
543 | # CONFIG_BONDING is not set | 551 | # CONFIG_BONDING is not set |
544 | # CONFIG_MACVLAN is not set | 552 | # CONFIG_MACVLAN is not set |
@@ -601,7 +609,6 @@ CONFIG_NETDEV_1000=y | |||
601 | # CONFIG_DL2K is not set | 609 | # CONFIG_DL2K is not set |
602 | # CONFIG_E1000 is not set | 610 | # CONFIG_E1000 is not set |
603 | # CONFIG_E1000E is not set | 611 | # CONFIG_E1000E is not set |
604 | # CONFIG_E1000E_ENABLED is not set | ||
605 | # CONFIG_IP1000 is not set | 612 | # CONFIG_IP1000 is not set |
606 | # CONFIG_IGB is not set | 613 | # CONFIG_IGB is not set |
607 | # CONFIG_NS83820 is not set | 614 | # CONFIG_NS83820 is not set |
@@ -615,9 +622,9 @@ CONFIG_NETDEV_1000=y | |||
615 | # CONFIG_TIGON3 is not set | 622 | # CONFIG_TIGON3 is not set |
616 | # CONFIG_BNX2 is not set | 623 | # CONFIG_BNX2 is not set |
617 | CONFIG_GIANFAR=y | 624 | CONFIG_GIANFAR=y |
618 | CONFIG_GFAR_NAPI=y | ||
619 | # CONFIG_QLA3XXX is not set | 625 | # CONFIG_QLA3XXX is not set |
620 | # CONFIG_ATL1 is not set | 626 | # CONFIG_ATL1 is not set |
627 | # CONFIG_ATL1E is not set | ||
621 | CONFIG_NETDEV_10000=y | 628 | CONFIG_NETDEV_10000=y |
622 | # CONFIG_CHELSIO_T1 is not set | 629 | # CONFIG_CHELSIO_T1 is not set |
623 | # CONFIG_CHELSIO_T3 is not set | 630 | # CONFIG_CHELSIO_T3 is not set |
@@ -732,42 +739,66 @@ CONFIG_DEVPORT=y | |||
732 | CONFIG_I2C=y | 739 | CONFIG_I2C=y |
733 | CONFIG_I2C_BOARDINFO=y | 740 | CONFIG_I2C_BOARDINFO=y |
734 | CONFIG_I2C_CHARDEV=y | 741 | CONFIG_I2C_CHARDEV=y |
742 | CONFIG_I2C_HELPER_AUTO=y | ||
735 | 743 | ||
736 | # | 744 | # |
737 | # I2C Hardware Bus support | 745 | # I2C Hardware Bus support |
738 | # | 746 | # |
747 | |||
748 | # | ||
749 | # PC SMBus host controller drivers | ||
750 | # | ||
739 | # CONFIG_I2C_ALI1535 is not set | 751 | # CONFIG_I2C_ALI1535 is not set |
740 | # CONFIG_I2C_ALI1563 is not set | 752 | # CONFIG_I2C_ALI1563 is not set |
741 | # CONFIG_I2C_ALI15X3 is not set | 753 | # CONFIG_I2C_ALI15X3 is not set |
742 | # CONFIG_I2C_AMD756 is not set | 754 | # CONFIG_I2C_AMD756 is not set |
743 | # CONFIG_I2C_AMD8111 is not set | 755 | # CONFIG_I2C_AMD8111 is not set |
744 | # CONFIG_I2C_I801 is not set | 756 | # CONFIG_I2C_I801 is not set |
745 | # CONFIG_I2C_I810 is not set | 757 | # CONFIG_I2C_ISCH is not set |
746 | # CONFIG_I2C_PIIX4 is not set | 758 | # CONFIG_I2C_PIIX4 is not set |
747 | CONFIG_I2C_MPC=y | ||
748 | # CONFIG_I2C_NFORCE2 is not set | 759 | # CONFIG_I2C_NFORCE2 is not set |
749 | # CONFIG_I2C_OCORES is not set | ||
750 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
751 | # CONFIG_I2C_PROSAVAGE is not set | ||
752 | # CONFIG_I2C_SAVAGE4 is not set | ||
753 | # CONFIG_I2C_SIMTEC is not set | ||
754 | # CONFIG_I2C_SIS5595 is not set | 760 | # CONFIG_I2C_SIS5595 is not set |
755 | # CONFIG_I2C_SIS630 is not set | 761 | # CONFIG_I2C_SIS630 is not set |
756 | # CONFIG_I2C_SIS96X is not set | 762 | # CONFIG_I2C_SIS96X is not set |
757 | # CONFIG_I2C_TAOS_EVM is not set | ||
758 | # CONFIG_I2C_VIA is not set | 763 | # CONFIG_I2C_VIA is not set |
759 | # CONFIG_I2C_VIAPRO is not set | 764 | # CONFIG_I2C_VIAPRO is not set |
765 | |||
766 | # | ||
767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
768 | # | ||
769 | # CONFIG_I2C_CPM is not set | ||
770 | # CONFIG_I2C_GPIO is not set | ||
771 | CONFIG_I2C_MPC=y | ||
772 | # CONFIG_I2C_OCORES is not set | ||
773 | # CONFIG_I2C_SIMTEC is not set | ||
774 | |||
775 | # | ||
776 | # External I2C/SMBus adapter drivers | ||
777 | # | ||
778 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
779 | # CONFIG_I2C_TAOS_EVM is not set | ||
780 | |||
781 | # | ||
782 | # Graphics adapter I2C/DDC channel drivers | ||
783 | # | ||
760 | # CONFIG_I2C_VOODOO3 is not set | 784 | # CONFIG_I2C_VOODOO3 is not set |
785 | |||
786 | # | ||
787 | # Other I2C/SMBus bus drivers | ||
788 | # | ||
761 | # CONFIG_I2C_PCA_PLATFORM is not set | 789 | # CONFIG_I2C_PCA_PLATFORM is not set |
762 | 790 | ||
763 | # | 791 | # |
764 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
765 | # | 793 | # |
766 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
795 | # CONFIG_AT24 is not set | ||
767 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
768 | # CONFIG_SENSORS_PCF8574 is not set | 797 | # CONFIG_SENSORS_PCF8574 is not set |
769 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
799 | # CONFIG_SENSORS_PCA9539 is not set | ||
770 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
801 | # CONFIG_TPS65010 is not set | ||
771 | # CONFIG_SENSORS_MAX6875 is not set | 802 | # CONFIG_SENSORS_MAX6875 is not set |
772 | # CONFIG_SENSORS_TSL2550 is not set | 803 | # CONFIG_SENSORS_TSL2550 is not set |
773 | # CONFIG_I2C_DEBUG_CORE is not set | 804 | # CONFIG_I2C_DEBUG_CORE is not set |
@@ -775,10 +806,31 @@ CONFIG_I2C_MPC=y | |||
775 | # CONFIG_I2C_DEBUG_BUS is not set | 806 | # CONFIG_I2C_DEBUG_BUS is not set |
776 | # CONFIG_I2C_DEBUG_CHIP is not set | 807 | # CONFIG_I2C_DEBUG_CHIP is not set |
777 | # CONFIG_SPI is not set | 808 | # CONFIG_SPI is not set |
809 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
810 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
811 | CONFIG_GPIOLIB=y | ||
812 | # CONFIG_GPIO_SYSFS is not set | ||
813 | |||
814 | # | ||
815 | # I2C GPIO expanders: | ||
816 | # | ||
817 | # CONFIG_GPIO_MAX732X is not set | ||
818 | # CONFIG_GPIO_PCA953X is not set | ||
819 | # CONFIG_GPIO_PCF857X is not set | ||
820 | |||
821 | # | ||
822 | # PCI GPIO expanders: | ||
823 | # | ||
824 | # CONFIG_GPIO_BT8XX is not set | ||
825 | |||
826 | # | ||
827 | # SPI GPIO expanders: | ||
828 | # | ||
778 | # CONFIG_W1 is not set | 829 | # CONFIG_W1 is not set |
779 | # CONFIG_POWER_SUPPLY is not set | 830 | # CONFIG_POWER_SUPPLY is not set |
780 | CONFIG_HWMON=y | 831 | CONFIG_HWMON=y |
781 | # CONFIG_HWMON_VID is not set | 832 | # CONFIG_HWMON_VID is not set |
833 | # CONFIG_SENSORS_AD7414 is not set | ||
782 | # CONFIG_SENSORS_AD7418 is not set | 834 | # CONFIG_SENSORS_AD7418 is not set |
783 | # CONFIG_SENSORS_ADM1021 is not set | 835 | # CONFIG_SENSORS_ADM1021 is not set |
784 | # CONFIG_SENSORS_ADM1025 is not set | 836 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -832,6 +884,7 @@ CONFIG_SENSORS_LM75=y | |||
832 | # CONFIG_SENSORS_W83627EHF is not set | 884 | # CONFIG_SENSORS_W83627EHF is not set |
833 | CONFIG_HWMON_DEBUG_CHIP=y | 885 | CONFIG_HWMON_DEBUG_CHIP=y |
834 | # CONFIG_THERMAL is not set | 886 | # CONFIG_THERMAL is not set |
887 | # CONFIG_THERMAL_HWMON is not set | ||
835 | # CONFIG_WATCHDOG is not set | 888 | # CONFIG_WATCHDOG is not set |
836 | 889 | ||
837 | # | 890 | # |
@@ -843,8 +896,10 @@ CONFIG_SSB_POSSIBLE=y | |||
843 | # | 896 | # |
844 | # Multifunction device drivers | 897 | # Multifunction device drivers |
845 | # | 898 | # |
899 | # CONFIG_MFD_CORE is not set | ||
846 | # CONFIG_MFD_SM501 is not set | 900 | # CONFIG_MFD_SM501 is not set |
847 | # CONFIG_HTC_PASIC3 is not set | 901 | # CONFIG_HTC_PASIC3 is not set |
902 | # CONFIG_MFD_TMIO is not set | ||
848 | 903 | ||
849 | # | 904 | # |
850 | # Multimedia devices | 905 | # Multimedia devices |
@@ -876,10 +931,6 @@ CONFIG_DAB=y | |||
876 | # Display device support | 931 | # Display device support |
877 | # | 932 | # |
878 | # CONFIG_DISPLAY_SUPPORT is not set | 933 | # CONFIG_DISPLAY_SUPPORT is not set |
879 | |||
880 | # | ||
881 | # Sound | ||
882 | # | ||
883 | # CONFIG_SOUND is not set | 934 | # CONFIG_SOUND is not set |
884 | CONFIG_HID_SUPPORT=y | 935 | CONFIG_HID_SUPPORT=y |
885 | CONFIG_HID=y | 936 | CONFIG_HID=y |
@@ -894,6 +945,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
894 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 945 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
895 | 946 | ||
896 | # | 947 | # |
948 | # Enable Host or Gadget support to see Inventra options | ||
949 | # | ||
950 | |||
951 | # | ||
897 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 952 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
898 | # | 953 | # |
899 | # CONFIG_USB_GADGET is not set | 954 | # CONFIG_USB_GADGET is not set |
@@ -982,6 +1037,7 @@ CONFIG_JFFS2_RTIME=y | |||
982 | CONFIG_CRAMFS=y | 1037 | CONFIG_CRAMFS=y |
983 | # CONFIG_VXFS_FS is not set | 1038 | # CONFIG_VXFS_FS is not set |
984 | # CONFIG_MINIX_FS is not set | 1039 | # CONFIG_MINIX_FS is not set |
1040 | # CONFIG_OMFS_FS is not set | ||
985 | # CONFIG_HPFS_FS is not set | 1041 | # CONFIG_HPFS_FS is not set |
986 | # CONFIG_QNX4FS_FS is not set | 1042 | # CONFIG_QNX4FS_FS is not set |
987 | # CONFIG_ROMFS_FS is not set | 1043 | # CONFIG_ROMFS_FS is not set |
@@ -991,12 +1047,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
991 | CONFIG_NFS_FS=y | 1047 | CONFIG_NFS_FS=y |
992 | # CONFIG_NFS_V3 is not set | 1048 | # CONFIG_NFS_V3 is not set |
993 | # CONFIG_NFS_V4 is not set | 1049 | # CONFIG_NFS_V4 is not set |
994 | # CONFIG_NFSD is not set | ||
995 | CONFIG_ROOT_NFS=y | 1050 | CONFIG_ROOT_NFS=y |
1051 | # CONFIG_NFSD is not set | ||
996 | CONFIG_LOCKD=y | 1052 | CONFIG_LOCKD=y |
997 | CONFIG_NFS_COMMON=y | 1053 | CONFIG_NFS_COMMON=y |
998 | CONFIG_SUNRPC=y | 1054 | CONFIG_SUNRPC=y |
999 | # CONFIG_SUNRPC_BIND34 is not set | ||
1000 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1055 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1001 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1056 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1002 | # CONFIG_SMB_FS is not set | 1057 | # CONFIG_SMB_FS is not set |
@@ -1032,6 +1087,7 @@ CONFIG_BITREVERSE=y | |||
1032 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1087 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1033 | # CONFIG_CRC_CCITT is not set | 1088 | # CONFIG_CRC_CCITT is not set |
1034 | # CONFIG_CRC16 is not set | 1089 | # CONFIG_CRC16 is not set |
1090 | # CONFIG_CRC_T10DIF is not set | ||
1035 | # CONFIG_CRC_ITU_T is not set | 1091 | # CONFIG_CRC_ITU_T is not set |
1036 | CONFIG_CRC32=y | 1092 | CONFIG_CRC32=y |
1037 | # CONFIG_CRC7 is not set | 1093 | # CONFIG_CRC7 is not set |
@@ -1059,8 +1115,16 @@ CONFIG_FRAME_WARN=1024 | |||
1059 | # CONFIG_SLUB_DEBUG_ON is not set | 1115 | # CONFIG_SLUB_DEBUG_ON is not set |
1060 | # CONFIG_SLUB_STATS is not set | 1116 | # CONFIG_SLUB_STATS is not set |
1061 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1117 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1118 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1119 | # CONFIG_LATENCYTOP is not set | ||
1120 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1121 | CONFIG_HAVE_FTRACE=y | ||
1122 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1123 | # CONFIG_FTRACE is not set | ||
1124 | # CONFIG_SCHED_TRACER is not set | ||
1125 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1062 | # CONFIG_SAMPLES is not set | 1126 | # CONFIG_SAMPLES is not set |
1063 | # CONFIG_KGDB_CONSOLE is not set | 1127 | CONFIG_HAVE_ARCH_KGDB=y |
1064 | # CONFIG_IRQSTACKS is not set | 1128 | # CONFIG_IRQSTACKS is not set |
1065 | # CONFIG_PPC_EARLY_DEBUG is not set | 1129 | # CONFIG_PPC_EARLY_DEBUG is not set |
1066 | 1130 | ||
@@ -1112,6 +1176,10 @@ CONFIG_CRYPTO=y | |||
1112 | # CONFIG_CRYPTO_MD4 is not set | 1176 | # CONFIG_CRYPTO_MD4 is not set |
1113 | # CONFIG_CRYPTO_MD5 is not set | 1177 | # CONFIG_CRYPTO_MD5 is not set |
1114 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1178 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1179 | # CONFIG_CRYPTO_RMD128 is not set | ||
1180 | # CONFIG_CRYPTO_RMD160 is not set | ||
1181 | # CONFIG_CRYPTO_RMD256 is not set | ||
1182 | # CONFIG_CRYPTO_RMD320 is not set | ||
1115 | # CONFIG_CRYPTO_SHA1 is not set | 1183 | # CONFIG_CRYPTO_SHA1 is not set |
1116 | # CONFIG_CRYPTO_SHA256 is not set | 1184 | # CONFIG_CRYPTO_SHA256 is not set |
1117 | # CONFIG_CRYPTO_SHA512 is not set | 1185 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1144,6 +1212,7 @@ CONFIG_CRYPTO=y | |||
1144 | # CONFIG_CRYPTO_LZO is not set | 1212 | # CONFIG_CRYPTO_LZO is not set |
1145 | CONFIG_CRYPTO_HW=y | 1213 | CONFIG_CRYPTO_HW=y |
1146 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1214 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1147 | # CONFIG_PPC_CLOCK is not set | 1215 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
1216 | CONFIG_PPC_CLOCK=y | ||
1148 | CONFIG_PPC_LIB_RHEAP=y | 1217 | CONFIG_PPC_LIB_RHEAP=y |
1149 | # CONFIG_VIRTUALIZATION is not set | 1218 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/adder875_defconfig b/arch/powerpc/configs/adder875_defconfig index 6740f2a3aa3d..63cd51fbb4b9 100644 --- a/arch/powerpc/configs/adder875_defconfig +++ b/arch/powerpc/configs/adder875_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:08 2008 | 4 | # Thu Aug 21 00:52:00 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -109,10 +110,16 @@ CONFIG_SLUB=y | |||
109 | # CONFIG_PROFILING is not set | 110 | # CONFIG_PROFILING is not set |
110 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
111 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
114 | CONFIG_HAVE_IOREMAP_PROT=y | ||
112 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
113 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
114 | # CONFIG_HAVE_DMA_ATTRS is not set | 118 | # CONFIG_HAVE_DMA_ATTRS is not set |
119 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
120 | CONFIG_HAVE_CLK=y | ||
115 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
116 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
117 | # CONFIG_TINY_SHMEM is not set | 124 | # CONFIG_TINY_SHMEM is not set |
118 | CONFIG_BASE_SMALL=1 | 125 | CONFIG_BASE_SMALL=1 |
@@ -122,6 +129,7 @@ CONFIG_BLOCK=y | |||
122 | # CONFIG_BLK_DEV_IO_TRACE is not set | 129 | # CONFIG_BLK_DEV_IO_TRACE is not set |
123 | # CONFIG_LSF is not set | 130 | # CONFIG_LSF is not set |
124 | # CONFIG_BLK_DEV_BSG is not set | 131 | # CONFIG_BLK_DEV_BSG is not set |
132 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
125 | 133 | ||
126 | # | 134 | # |
127 | # IO Schedulers | 135 | # IO Schedulers |
@@ -140,8 +148,6 @@ CONFIG_CLASSIC_RCU=y | |||
140 | # | 148 | # |
141 | # Platform support | 149 | # Platform support |
142 | # | 150 | # |
143 | # CONFIG_PPC_MPC512x is not set | ||
144 | # CONFIG_PPC_MPC5121 is not set | ||
145 | # CONFIG_PPC_CELL is not set | 151 | # CONFIG_PPC_CELL is not set |
146 | # CONFIG_PPC_CELL_NATIVE is not set | 152 | # CONFIG_PPC_CELL_NATIVE is not set |
147 | CONFIG_CPM1=y | 153 | CONFIG_CPM1=y |
@@ -159,6 +165,7 @@ CONFIG_PPC_ADDER875=y | |||
159 | # Generic MPC8xx Options | 165 | # Generic MPC8xx Options |
160 | # | 166 | # |
161 | CONFIG_8xx_COPYBACK=y | 167 | CONFIG_8xx_COPYBACK=y |
168 | # CONFIG_8xx_GPIO is not set | ||
162 | # CONFIG_8xx_CPU6 is not set | 169 | # CONFIG_8xx_CPU6 is not set |
163 | CONFIG_8xx_CPU15=y | 170 | CONFIG_8xx_CPU15=y |
164 | CONFIG_NO_UCODE_PATCH=y | 171 | CONFIG_NO_UCODE_PATCH=y |
@@ -177,7 +184,6 @@ CONFIG_NO_UCODE_PATCH=y | |||
177 | # CONFIG_PPC_INDIRECT_IO is not set | 184 | # CONFIG_PPC_INDIRECT_IO is not set |
178 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
179 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
180 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
181 | # CONFIG_FSL_ULI1575 is not set | 187 | # CONFIG_FSL_ULI1575 is not set |
182 | CONFIG_CPM=y | 188 | CONFIG_CPM=y |
183 | 189 | ||
@@ -218,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
218 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
219 | CONFIG_PAGEFLAGS_EXTENDED=y | 225 | CONFIG_PAGEFLAGS_EXTENDED=y |
220 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 226 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
227 | CONFIG_MIGRATION=y | ||
221 | # CONFIG_RESOURCES_64BIT is not set | 228 | # CONFIG_RESOURCES_64BIT is not set |
222 | CONFIG_ZONE_DMA_FLAG=1 | 229 | CONFIG_ZONE_DMA_FLAG=1 |
223 | CONFIG_BOUNCE=y | 230 | CONFIG_BOUNCE=y |
@@ -225,6 +232,7 @@ CONFIG_VIRT_TO_BUS=y | |||
225 | CONFIG_FORCE_MAX_ZONEORDER=11 | 232 | CONFIG_FORCE_MAX_ZONEORDER=11 |
226 | # CONFIG_PROC_DEVICETREE is not set | 233 | # CONFIG_PROC_DEVICETREE is not set |
227 | # CONFIG_CMDLINE_BOOL is not set | 234 | # CONFIG_CMDLINE_BOOL is not set |
235 | CONFIG_EXTRA_TARGETS="" | ||
228 | # CONFIG_PM is not set | 236 | # CONFIG_PM is not set |
229 | # CONFIG_SECCOMP is not set | 237 | # CONFIG_SECCOMP is not set |
230 | CONFIG_ISA_DMA_API=y | 238 | CONFIG_ISA_DMA_API=y |
@@ -257,10 +265,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
257 | CONFIG_TASK_SIZE=0x80000000 | 265 | CONFIG_TASK_SIZE=0x80000000 |
258 | CONFIG_CONSISTENT_START=0xfd000000 | 266 | CONFIG_CONSISTENT_START=0xfd000000 |
259 | CONFIG_CONSISTENT_SIZE=0x00200000 | 267 | CONFIG_CONSISTENT_SIZE=0x00200000 |
260 | |||
261 | # | ||
262 | # Networking | ||
263 | # | ||
264 | CONFIG_NET=y | 268 | CONFIG_NET=y |
265 | 269 | ||
266 | # | 270 | # |
@@ -443,7 +447,6 @@ CONFIG_HAVE_IDE=y | |||
443 | # CONFIG_MD is not set | 447 | # CONFIG_MD is not set |
444 | # CONFIG_MACINTOSH_DRIVERS is not set | 448 | # CONFIG_MACINTOSH_DRIVERS is not set |
445 | CONFIG_NETDEVICES=y | 449 | CONFIG_NETDEVICES=y |
446 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
447 | # CONFIG_DUMMY is not set | 450 | # CONFIG_DUMMY is not set |
448 | # CONFIG_BONDING is not set | 451 | # CONFIG_BONDING is not set |
449 | # CONFIG_MACVLAN is not set | 452 | # CONFIG_MACVLAN is not set |
@@ -547,6 +550,7 @@ CONFIG_SERIO_I8042=y | |||
547 | CONFIG_SERIO_SERPORT=y | 550 | CONFIG_SERIO_SERPORT=y |
548 | CONFIG_SERIO_LIBPS2=y | 551 | CONFIG_SERIO_LIBPS2=y |
549 | # CONFIG_SERIO_RAW is not set | 552 | # CONFIG_SERIO_RAW is not set |
553 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
550 | # CONFIG_GAMEPORT is not set | 554 | # CONFIG_GAMEPORT is not set |
551 | 555 | ||
552 | # | 556 | # |
@@ -587,6 +591,8 @@ CONFIG_GEN_RTC=y | |||
587 | # CONFIG_TCG_TPM is not set | 591 | # CONFIG_TCG_TPM is not set |
588 | # CONFIG_I2C is not set | 592 | # CONFIG_I2C is not set |
589 | # CONFIG_SPI is not set | 593 | # CONFIG_SPI is not set |
594 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
595 | # CONFIG_GPIOLIB is not set | ||
590 | # CONFIG_W1 is not set | 596 | # CONFIG_W1 is not set |
591 | # CONFIG_POWER_SUPPLY is not set | 597 | # CONFIG_POWER_SUPPLY is not set |
592 | # CONFIG_HWMON is not set | 598 | # CONFIG_HWMON is not set |
@@ -602,8 +608,10 @@ CONFIG_SSB_POSSIBLE=y | |||
602 | # | 608 | # |
603 | # Multifunction device drivers | 609 | # Multifunction device drivers |
604 | # | 610 | # |
611 | # CONFIG_MFD_CORE is not set | ||
605 | # CONFIG_MFD_SM501 is not set | 612 | # CONFIG_MFD_SM501 is not set |
606 | # CONFIG_HTC_PASIC3 is not set | 613 | # CONFIG_HTC_PASIC3 is not set |
614 | # CONFIG_MFD_TMIO is not set | ||
607 | 615 | ||
608 | # | 616 | # |
609 | # Multimedia devices | 617 | # Multimedia devices |
@@ -633,10 +641,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
633 | # Display device support | 641 | # Display device support |
634 | # | 642 | # |
635 | # CONFIG_DISPLAY_SUPPORT is not set | 643 | # CONFIG_DISPLAY_SUPPORT is not set |
636 | |||
637 | # | ||
638 | # Sound | ||
639 | # | ||
640 | # CONFIG_SOUND is not set | 644 | # CONFIG_SOUND is not set |
641 | # CONFIG_HID_SUPPORT is not set | 645 | # CONFIG_HID_SUPPORT is not set |
642 | # CONFIG_USB_SUPPORT is not set | 646 | # CONFIG_USB_SUPPORT is not set |
@@ -706,6 +710,7 @@ CONFIG_TMPFS=y | |||
706 | CONFIG_CRAMFS=y | 710 | CONFIG_CRAMFS=y |
707 | # CONFIG_VXFS_FS is not set | 711 | # CONFIG_VXFS_FS is not set |
708 | # CONFIG_MINIX_FS is not set | 712 | # CONFIG_MINIX_FS is not set |
713 | # CONFIG_OMFS_FS is not set | ||
709 | # CONFIG_HPFS_FS is not set | 714 | # CONFIG_HPFS_FS is not set |
710 | # CONFIG_QNX4FS_FS is not set | 715 | # CONFIG_QNX4FS_FS is not set |
711 | # CONFIG_ROMFS_FS is not set | 716 | # CONFIG_ROMFS_FS is not set |
@@ -716,13 +721,12 @@ CONFIG_NFS_FS=y | |||
716 | CONFIG_NFS_V3=y | 721 | CONFIG_NFS_V3=y |
717 | # CONFIG_NFS_V3_ACL is not set | 722 | # CONFIG_NFS_V3_ACL is not set |
718 | # CONFIG_NFS_V4 is not set | 723 | # CONFIG_NFS_V4 is not set |
719 | # CONFIG_NFSD is not set | ||
720 | CONFIG_ROOT_NFS=y | 724 | CONFIG_ROOT_NFS=y |
725 | # CONFIG_NFSD is not set | ||
721 | CONFIG_LOCKD=y | 726 | CONFIG_LOCKD=y |
722 | CONFIG_LOCKD_V4=y | 727 | CONFIG_LOCKD_V4=y |
723 | CONFIG_NFS_COMMON=y | 728 | CONFIG_NFS_COMMON=y |
724 | CONFIG_SUNRPC=y | 729 | CONFIG_SUNRPC=y |
725 | # CONFIG_SUNRPC_BIND34 is not set | ||
726 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 730 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
727 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 731 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
728 | # CONFIG_SMB_FS is not set | 732 | # CONFIG_SMB_FS is not set |
@@ -761,6 +765,7 @@ CONFIG_MSDOS_PARTITION=y | |||
761 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 765 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
762 | # CONFIG_CRC_CCITT is not set | 766 | # CONFIG_CRC_CCITT is not set |
763 | # CONFIG_CRC16 is not set | 767 | # CONFIG_CRC16 is not set |
768 | # CONFIG_CRC_T10DIF is not set | ||
764 | # CONFIG_CRC_ITU_T is not set | 769 | # CONFIG_CRC_ITU_T is not set |
765 | # CONFIG_CRC32 is not set | 770 | # CONFIG_CRC32 is not set |
766 | # CONFIG_CRC7 is not set | 771 | # CONFIG_CRC7 is not set |
@@ -785,6 +790,8 @@ CONFIG_DEBUG_FS=y | |||
785 | CONFIG_DEBUG_KERNEL=y | 790 | CONFIG_DEBUG_KERNEL=y |
786 | # CONFIG_DEBUG_SHIRQ is not set | 791 | # CONFIG_DEBUG_SHIRQ is not set |
787 | CONFIG_DETECT_SOFTLOCKUP=y | 792 | CONFIG_DETECT_SOFTLOCKUP=y |
793 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
794 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
788 | CONFIG_SCHED_DEBUG=y | 795 | CONFIG_SCHED_DEBUG=y |
789 | # CONFIG_SCHEDSTATS is not set | 796 | # CONFIG_SCHEDSTATS is not set |
790 | # CONFIG_TIMER_STATS is not set | 797 | # CONFIG_TIMER_STATS is not set |
@@ -800,16 +807,28 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
800 | CONFIG_DEBUG_INFO=y | 807 | CONFIG_DEBUG_INFO=y |
801 | # CONFIG_DEBUG_VM is not set | 808 | # CONFIG_DEBUG_VM is not set |
802 | # CONFIG_DEBUG_WRITECOUNT is not set | 809 | # CONFIG_DEBUG_WRITECOUNT is not set |
810 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
803 | # CONFIG_DEBUG_LIST is not set | 811 | # CONFIG_DEBUG_LIST is not set |
804 | # CONFIG_DEBUG_SG is not set | 812 | # CONFIG_DEBUG_SG is not set |
805 | # CONFIG_BOOT_PRINTK_DELAY is not set | 813 | # CONFIG_BOOT_PRINTK_DELAY is not set |
814 | # CONFIG_RCU_TORTURE_TEST is not set | ||
806 | # CONFIG_BACKTRACE_SELF_TEST is not set | 815 | # CONFIG_BACKTRACE_SELF_TEST is not set |
807 | # CONFIG_FAULT_INJECTION is not set | 816 | # CONFIG_FAULT_INJECTION is not set |
817 | # CONFIG_LATENCYTOP is not set | ||
818 | CONFIG_HAVE_FTRACE=y | ||
819 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
820 | # CONFIG_FTRACE is not set | ||
821 | # CONFIG_SCHED_TRACER is not set | ||
822 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
808 | # CONFIG_SAMPLES is not set | 823 | # CONFIG_SAMPLES is not set |
824 | CONFIG_HAVE_ARCH_KGDB=y | ||
825 | # CONFIG_KGDB is not set | ||
809 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 826 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
810 | # CONFIG_DEBUG_STACK_USAGE is not set | 827 | # CONFIG_DEBUG_STACK_USAGE is not set |
811 | # CONFIG_DEBUG_PAGEALLOC is not set | 828 | # CONFIG_DEBUG_PAGEALLOC is not set |
812 | # CONFIG_DEBUGGER is not set | 829 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
830 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
831 | # CONFIG_XMON is not set | ||
813 | # CONFIG_IRQSTACKS is not set | 832 | # CONFIG_IRQSTACKS is not set |
814 | # CONFIG_VIRQ_DEBUG is not set | 833 | # CONFIG_VIRQ_DEBUG is not set |
815 | # CONFIG_BDI_SWITCH is not set | 834 | # CONFIG_BDI_SWITCH is not set |
@@ -822,6 +841,6 @@ CONFIG_DEBUG_INFO=y | |||
822 | # CONFIG_SECURITY is not set | 841 | # CONFIG_SECURITY is not set |
823 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 842 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
824 | # CONFIG_CRYPTO is not set | 843 | # CONFIG_CRYPTO is not set |
825 | # CONFIG_PPC_CLOCK is not set | 844 | CONFIG_PPC_CLOCK=y |
826 | CONFIG_PPC_LIB_RHEAP=y | 845 | CONFIG_PPC_LIB_RHEAP=y |
827 | # CONFIG_VIRTUALIZATION is not set | 846 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig index dc599c7e97d5..c16521ffb477 100644 --- a/arch/powerpc/configs/c2k_defconfig +++ b/arch/powerpc/configs/c2k_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc2 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Thu May 15 11:00:14 2008 | 4 | # Thu Aug 21 00:52:02 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -97,7 +98,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
97 | CONFIG_SYSCTL=y | 98 | CONFIG_SYSCTL=y |
98 | # CONFIG_EMBEDDED is not set | 99 | # CONFIG_EMBEDDED is not set |
99 | CONFIG_SYSCTL_SYSCALL=y | 100 | CONFIG_SYSCTL_SYSCALL=y |
100 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
101 | CONFIG_KALLSYMS=y | 101 | CONFIG_KALLSYMS=y |
102 | # CONFIG_KALLSYMS_ALL is not set | 102 | # CONFIG_KALLSYMS_ALL is not set |
103 | CONFIG_KALLSYMS_EXTRA_PASS=y | 103 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -124,11 +124,17 @@ CONFIG_PROFILING=y | |||
124 | CONFIG_OPROFILE=m | 124 | CONFIG_OPROFILE=m |
125 | CONFIG_HAVE_OPROFILE=y | 125 | CONFIG_HAVE_OPROFILE=y |
126 | CONFIG_KPROBES=y | 126 | CONFIG_KPROBES=y |
127 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
127 | CONFIG_KRETPROBES=y | 128 | CONFIG_KRETPROBES=y |
129 | CONFIG_HAVE_IOREMAP_PROT=y | ||
128 | CONFIG_HAVE_KPROBES=y | 130 | CONFIG_HAVE_KPROBES=y |
129 | CONFIG_HAVE_KRETPROBES=y | 131 | CONFIG_HAVE_KRETPROBES=y |
132 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
130 | # CONFIG_HAVE_DMA_ATTRS is not set | 133 | # CONFIG_HAVE_DMA_ATTRS is not set |
134 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
135 | # CONFIG_HAVE_CLK is not set | ||
131 | CONFIG_PROC_PAGE_MONITOR=y | 136 | CONFIG_PROC_PAGE_MONITOR=y |
137 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
132 | CONFIG_SLABINFO=y | 138 | CONFIG_SLABINFO=y |
133 | CONFIG_RT_MUTEXES=y | 139 | CONFIG_RT_MUTEXES=y |
134 | # CONFIG_TINY_SHMEM is not set | 140 | # CONFIG_TINY_SHMEM is not set |
@@ -145,6 +151,7 @@ CONFIG_LBD=y | |||
145 | # CONFIG_BLK_DEV_IO_TRACE is not set | 151 | # CONFIG_BLK_DEV_IO_TRACE is not set |
146 | # CONFIG_LSF is not set | 152 | # CONFIG_LSF is not set |
147 | # CONFIG_BLK_DEV_BSG is not set | 153 | # CONFIG_BLK_DEV_BSG is not set |
154 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
148 | 155 | ||
149 | # | 156 | # |
150 | # IO Schedulers | 157 | # IO Schedulers |
@@ -164,19 +171,18 @@ CONFIG_CLASSIC_RCU=y | |||
164 | # Platform support | 171 | # Platform support |
165 | # | 172 | # |
166 | CONFIG_PPC_MULTIPLATFORM=y | 173 | CONFIG_PPC_MULTIPLATFORM=y |
167 | # CONFIG_PPC_82xx is not set | ||
168 | # CONFIG_PPC_83xx is not set | ||
169 | # CONFIG_PPC_86xx is not set | ||
170 | CONFIG_CLASSIC32=y | 174 | CONFIG_CLASSIC32=y |
171 | # CONFIG_PPC_CHRP is not set | 175 | # CONFIG_PPC_CHRP is not set |
172 | # CONFIG_PPC_MPC512x is not set | ||
173 | # CONFIG_PPC_MPC5121 is not set | ||
174 | # CONFIG_MPC5121_ADS is not set | 176 | # CONFIG_MPC5121_ADS is not set |
177 | # CONFIG_MPC5121_GENERIC is not set | ||
175 | # CONFIG_PPC_MPC52xx is not set | 178 | # CONFIG_PPC_MPC52xx is not set |
176 | # CONFIG_PPC_PMAC is not set | 179 | # CONFIG_PPC_PMAC is not set |
177 | # CONFIG_PPC_CELL is not set | 180 | # CONFIG_PPC_CELL is not set |
178 | # CONFIG_PPC_CELL_NATIVE is not set | 181 | # CONFIG_PPC_CELL_NATIVE is not set |
182 | # CONFIG_PPC_82xx is not set | ||
179 | # CONFIG_PQ2ADS is not set | 183 | # CONFIG_PQ2ADS is not set |
184 | # CONFIG_PPC_83xx is not set | ||
185 | # CONFIG_PPC_86xx is not set | ||
180 | CONFIG_EMBEDDED6xx=y | 186 | CONFIG_EMBEDDED6xx=y |
181 | # CONFIG_LINKSTATION is not set | 187 | # CONFIG_LINKSTATION is not set |
182 | # CONFIG_STORCENTER is not set | 188 | # CONFIG_STORCENTER is not set |
@@ -253,6 +259,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
253 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 259 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
254 | CONFIG_PAGEFLAGS_EXTENDED=y | 260 | CONFIG_PAGEFLAGS_EXTENDED=y |
255 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 261 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
262 | CONFIG_MIGRATION=y | ||
256 | # CONFIG_RESOURCES_64BIT is not set | 263 | # CONFIG_RESOURCES_64BIT is not set |
257 | CONFIG_ZONE_DMA_FLAG=1 | 264 | CONFIG_ZONE_DMA_FLAG=1 |
258 | CONFIG_BOUNCE=y | 265 | CONFIG_BOUNCE=y |
@@ -260,6 +267,7 @@ CONFIG_VIRT_TO_BUS=y | |||
260 | CONFIG_FORCE_MAX_ZONEORDER=11 | 267 | CONFIG_FORCE_MAX_ZONEORDER=11 |
261 | # CONFIG_PROC_DEVICETREE is not set | 268 | # CONFIG_PROC_DEVICETREE is not set |
262 | # CONFIG_CMDLINE_BOOL is not set | 269 | # CONFIG_CMDLINE_BOOL is not set |
270 | CONFIG_EXTRA_TARGETS="" | ||
263 | CONFIG_PM=y | 271 | CONFIG_PM=y |
264 | # CONFIG_PM_DEBUG is not set | 272 | # CONFIG_PM_DEBUG is not set |
265 | CONFIG_SECCOMP=y | 273 | CONFIG_SECCOMP=y |
@@ -301,10 +309,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
301 | CONFIG_TASK_SIZE=0xc0000000 | 309 | CONFIG_TASK_SIZE=0xc0000000 |
302 | CONFIG_CONSISTENT_START=0xff100000 | 310 | CONFIG_CONSISTENT_START=0xff100000 |
303 | CONFIG_CONSISTENT_SIZE=0x00200000 | 311 | CONFIG_CONSISTENT_SIZE=0x00200000 |
304 | |||
305 | # | ||
306 | # Networking | ||
307 | # | ||
308 | CONFIG_NET=y | 312 | CONFIG_NET=y |
309 | 313 | ||
310 | # | 314 | # |
@@ -318,6 +322,7 @@ CONFIG_XFRM_USER=y | |||
318 | # CONFIG_XFRM_SUB_POLICY is not set | 322 | # CONFIG_XFRM_SUB_POLICY is not set |
319 | # CONFIG_XFRM_MIGRATE is not set | 323 | # CONFIG_XFRM_MIGRATE is not set |
320 | # CONFIG_XFRM_STATISTICS is not set | 324 | # CONFIG_XFRM_STATISTICS is not set |
325 | CONFIG_XFRM_IPCOMP=m | ||
321 | CONFIG_NET_KEY=m | 326 | CONFIG_NET_KEY=m |
322 | # CONFIG_NET_KEY_MIGRATE is not set | 327 | # CONFIG_NET_KEY_MIGRATE is not set |
323 | CONFIG_INET=y | 328 | CONFIG_INET=y |
@@ -349,7 +354,7 @@ CONFIG_INET_TUNNEL=m | |||
349 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 354 | CONFIG_INET_XFRM_MODE_TRANSPORT=y |
350 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 355 | CONFIG_INET_XFRM_MODE_TUNNEL=y |
351 | CONFIG_INET_XFRM_MODE_BEET=y | 356 | CONFIG_INET_XFRM_MODE_BEET=y |
352 | # CONFIG_INET_LRO is not set | 357 | CONFIG_INET_LRO=m |
353 | CONFIG_INET_DIAG=y | 358 | CONFIG_INET_DIAG=y |
354 | CONFIG_INET_TCP_DIAG=y | 359 | CONFIG_INET_TCP_DIAG=y |
355 | # CONFIG_TCP_CONG_ADVANCED is not set | 360 | # CONFIG_TCP_CONG_ADVANCED is not set |
@@ -472,6 +477,7 @@ CONFIG_IP_NF_MANGLE=m | |||
472 | CONFIG_IP_NF_TARGET_ECN=m | 477 | CONFIG_IP_NF_TARGET_ECN=m |
473 | # CONFIG_IP_NF_TARGET_TTL is not set | 478 | # CONFIG_IP_NF_TARGET_TTL is not set |
474 | CONFIG_IP_NF_RAW=m | 479 | CONFIG_IP_NF_RAW=m |
480 | # CONFIG_IP_NF_SECURITY is not set | ||
475 | CONFIG_IP_NF_ARPTABLES=m | 481 | CONFIG_IP_NF_ARPTABLES=m |
476 | CONFIG_IP_NF_ARPFILTER=m | 482 | CONFIG_IP_NF_ARPFILTER=m |
477 | CONFIG_IP_NF_ARP_MANGLE=m | 483 | CONFIG_IP_NF_ARP_MANGLE=m |
@@ -495,6 +501,7 @@ CONFIG_IP6_NF_TARGET_LOG=m | |||
495 | CONFIG_IP6_NF_MANGLE=m | 501 | CONFIG_IP6_NF_MANGLE=m |
496 | # CONFIG_IP6_NF_TARGET_HL is not set | 502 | # CONFIG_IP6_NF_TARGET_HL is not set |
497 | CONFIG_IP6_NF_RAW=m | 503 | CONFIG_IP6_NF_RAW=m |
504 | # CONFIG_IP6_NF_SECURITY is not set | ||
498 | 505 | ||
499 | # | 506 | # |
500 | # Bridge: Netfilter Configuration | 507 | # Bridge: Netfilter Configuration |
@@ -507,6 +514,7 @@ CONFIG_BRIDGE_EBT_802_3=m | |||
507 | CONFIG_BRIDGE_EBT_AMONG=m | 514 | CONFIG_BRIDGE_EBT_AMONG=m |
508 | CONFIG_BRIDGE_EBT_ARP=m | 515 | CONFIG_BRIDGE_EBT_ARP=m |
509 | CONFIG_BRIDGE_EBT_IP=m | 516 | CONFIG_BRIDGE_EBT_IP=m |
517 | # CONFIG_BRIDGE_EBT_IP6 is not set | ||
510 | CONFIG_BRIDGE_EBT_LIMIT=m | 518 | CONFIG_BRIDGE_EBT_LIMIT=m |
511 | CONFIG_BRIDGE_EBT_MARK=m | 519 | CONFIG_BRIDGE_EBT_MARK=m |
512 | CONFIG_BRIDGE_EBT_PKTTYPE=m | 520 | CONFIG_BRIDGE_EBT_PKTTYPE=m |
@@ -535,8 +543,10 @@ CONFIG_ATM_LANE=m | |||
535 | # CONFIG_ATM_MPOA is not set | 543 | # CONFIG_ATM_MPOA is not set |
536 | CONFIG_ATM_BR2684=m | 544 | CONFIG_ATM_BR2684=m |
537 | # CONFIG_ATM_BR2684_IPFILTER is not set | 545 | # CONFIG_ATM_BR2684_IPFILTER is not set |
546 | CONFIG_STP=m | ||
538 | CONFIG_BRIDGE=m | 547 | CONFIG_BRIDGE=m |
539 | CONFIG_VLAN_8021Q=m | 548 | CONFIG_VLAN_8021Q=m |
549 | # CONFIG_VLAN_8021Q_GVRP is not set | ||
540 | # CONFIG_DECNET is not set | 550 | # CONFIG_DECNET is not set |
541 | CONFIG_LLC=m | 551 | CONFIG_LLC=m |
542 | # CONFIG_LLC2 is not set | 552 | # CONFIG_LLC2 is not set |
@@ -556,7 +566,6 @@ CONFIG_NET_SCH_HTB=m | |||
556 | CONFIG_NET_SCH_HFSC=m | 566 | CONFIG_NET_SCH_HFSC=m |
557 | CONFIG_NET_SCH_ATM=m | 567 | CONFIG_NET_SCH_ATM=m |
558 | CONFIG_NET_SCH_PRIO=m | 568 | CONFIG_NET_SCH_PRIO=m |
559 | # CONFIG_NET_SCH_RR is not set | ||
560 | CONFIG_NET_SCH_RED=m | 569 | CONFIG_NET_SCH_RED=m |
561 | CONFIG_NET_SCH_SFQ=m | 570 | CONFIG_NET_SCH_SFQ=m |
562 | CONFIG_NET_SCH_TEQL=m | 571 | CONFIG_NET_SCH_TEQL=m |
@@ -601,7 +610,6 @@ CONFIG_BT_RFCOMM_TTY=y | |||
601 | CONFIG_BT_BNEP=m | 610 | CONFIG_BT_BNEP=m |
602 | CONFIG_BT_BNEP_MC_FILTER=y | 611 | CONFIG_BT_BNEP_MC_FILTER=y |
603 | CONFIG_BT_BNEP_PROTO_FILTER=y | 612 | CONFIG_BT_BNEP_PROTO_FILTER=y |
604 | CONFIG_BT_CMTP=m | ||
605 | CONFIG_BT_HIDP=m | 613 | CONFIG_BT_HIDP=m |
606 | 614 | ||
607 | # | 615 | # |
@@ -609,6 +617,7 @@ CONFIG_BT_HIDP=m | |||
609 | # | 617 | # |
610 | CONFIG_BT_HCIUSB=m | 618 | CONFIG_BT_HCIUSB=m |
611 | CONFIG_BT_HCIUSB_SCO=y | 619 | CONFIG_BT_HCIUSB_SCO=y |
620 | # CONFIG_BT_HCIBTUSB is not set | ||
612 | CONFIG_BT_HCIUART=m | 621 | CONFIG_BT_HCIUART=m |
613 | CONFIG_BT_HCIUART_H4=y | 622 | CONFIG_BT_HCIUART_H4=y |
614 | CONFIG_BT_HCIUART_BCSP=y | 623 | CONFIG_BT_HCIUART_BCSP=y |
@@ -625,6 +634,7 @@ CONFIG_FIB_RULES=y | |||
625 | # | 634 | # |
626 | # CONFIG_CFG80211 is not set | 635 | # CONFIG_CFG80211 is not set |
627 | CONFIG_WIRELESS_EXT=y | 636 | CONFIG_WIRELESS_EXT=y |
637 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
628 | # CONFIG_MAC80211 is not set | 638 | # CONFIG_MAC80211 is not set |
629 | CONFIG_IEEE80211=m | 639 | CONFIG_IEEE80211=m |
630 | # CONFIG_IEEE80211_DEBUG is not set | 640 | # CONFIG_IEEE80211_DEBUG is not set |
@@ -645,6 +655,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
645 | CONFIG_STANDALONE=y | 655 | CONFIG_STANDALONE=y |
646 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 656 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
647 | CONFIG_FW_LOADER=y | 657 | CONFIG_FW_LOADER=y |
658 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
659 | CONFIG_EXTRA_FIRMWARE="" | ||
648 | # CONFIG_DEBUG_DRIVER is not set | 660 | # CONFIG_DEBUG_DRIVER is not set |
649 | # CONFIG_DEBUG_DEVRES is not set | 661 | # CONFIG_DEBUG_DEVRES is not set |
650 | # CONFIG_SYS_HYPERVISOR is not set | 662 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -749,6 +761,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
749 | # CONFIG_BLK_DEV_XIP is not set | 761 | # CONFIG_BLK_DEV_XIP is not set |
750 | # CONFIG_CDROM_PKTCDVD is not set | 762 | # CONFIG_CDROM_PKTCDVD is not set |
751 | # CONFIG_ATA_OVER_ETH is not set | 763 | # CONFIG_ATA_OVER_ETH is not set |
764 | # CONFIG_BLK_DEV_HD is not set | ||
752 | # CONFIG_MISC_DEVICES is not set | 765 | # CONFIG_MISC_DEVICES is not set |
753 | CONFIG_HAVE_IDE=y | 766 | CONFIG_HAVE_IDE=y |
754 | # CONFIG_IDE is not set | 767 | # CONFIG_IDE is not set |
@@ -844,6 +857,7 @@ CONFIG_SCSI_LPFC=m | |||
844 | # CONFIG_SCSI_NSP32 is not set | 857 | # CONFIG_SCSI_NSP32 is not set |
845 | # CONFIG_SCSI_DEBUG is not set | 858 | # CONFIG_SCSI_DEBUG is not set |
846 | # CONFIG_SCSI_SRP is not set | 859 | # CONFIG_SCSI_SRP is not set |
860 | # CONFIG_SCSI_DH is not set | ||
847 | # CONFIG_ATA is not set | 861 | # CONFIG_ATA is not set |
848 | # CONFIG_MD is not set | 862 | # CONFIG_MD is not set |
849 | # CONFIG_FUSION is not set | 863 | # CONFIG_FUSION is not set |
@@ -851,12 +865,15 @@ CONFIG_SCSI_LPFC=m | |||
851 | # | 865 | # |
852 | # IEEE 1394 (FireWire) support | 866 | # IEEE 1394 (FireWire) support |
853 | # | 867 | # |
868 | |||
869 | # | ||
870 | # Enable only one of the two stacks, unless you know what you are doing | ||
871 | # | ||
854 | # CONFIG_FIREWIRE is not set | 872 | # CONFIG_FIREWIRE is not set |
855 | # CONFIG_IEEE1394 is not set | 873 | # CONFIG_IEEE1394 is not set |
856 | # CONFIG_I2O is not set | 874 | # CONFIG_I2O is not set |
857 | # CONFIG_MACINTOSH_DRIVERS is not set | 875 | # CONFIG_MACINTOSH_DRIVERS is not set |
858 | CONFIG_NETDEVICES=y | 876 | CONFIG_NETDEVICES=y |
859 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
860 | CONFIG_DUMMY=m | 877 | CONFIG_DUMMY=m |
861 | CONFIG_BONDING=m | 878 | CONFIG_BONDING=m |
862 | # CONFIG_MACVLAN is not set | 879 | # CONFIG_MACVLAN is not set |
@@ -900,7 +917,6 @@ CONFIG_NETDEV_1000=y | |||
900 | # CONFIG_DL2K is not set | 917 | # CONFIG_DL2K is not set |
901 | # CONFIG_E1000 is not set | 918 | # CONFIG_E1000 is not set |
902 | # CONFIG_E1000E is not set | 919 | # CONFIG_E1000E is not set |
903 | # CONFIG_E1000E_ENABLED is not set | ||
904 | # CONFIG_IP1000 is not set | 920 | # CONFIG_IP1000 is not set |
905 | # CONFIG_IGB is not set | 921 | # CONFIG_IGB is not set |
906 | # CONFIG_NS83820 is not set | 922 | # CONFIG_NS83820 is not set |
@@ -916,6 +932,7 @@ CONFIG_NETDEV_1000=y | |||
916 | CONFIG_MV643XX_ETH=y | 932 | CONFIG_MV643XX_ETH=y |
917 | # CONFIG_QLA3XXX is not set | 933 | # CONFIG_QLA3XXX is not set |
918 | # CONFIG_ATL1 is not set | 934 | # CONFIG_ATL1 is not set |
935 | # CONFIG_ATL1E is not set | ||
919 | # CONFIG_NETDEV_10000 is not set | 936 | # CONFIG_NETDEV_10000 is not set |
920 | # CONFIG_TR is not set | 937 | # CONFIG_TR is not set |
921 | 938 | ||
@@ -940,112 +957,13 @@ CONFIG_MV643XX_ETH=y | |||
940 | # CONFIG_HIPPI is not set | 957 | # CONFIG_HIPPI is not set |
941 | # CONFIG_PPP is not set | 958 | # CONFIG_PPP is not set |
942 | # CONFIG_SLIP is not set | 959 | # CONFIG_SLIP is not set |
943 | CONFIG_SLHC=m | ||
944 | # CONFIG_NET_FC is not set | 960 | # CONFIG_NET_FC is not set |
945 | CONFIG_NETCONSOLE=m | 961 | CONFIG_NETCONSOLE=m |
946 | # CONFIG_NETCONSOLE_DYNAMIC is not set | 962 | # CONFIG_NETCONSOLE_DYNAMIC is not set |
947 | CONFIG_NETPOLL=y | 963 | CONFIG_NETPOLL=y |
948 | CONFIG_NETPOLL_TRAP=y | 964 | CONFIG_NETPOLL_TRAP=y |
949 | CONFIG_NET_POLL_CONTROLLER=y | 965 | CONFIG_NET_POLL_CONTROLLER=y |
950 | CONFIG_ISDN=m | 966 | # CONFIG_ISDN is not set |
951 | CONFIG_ISDN_I4L=m | ||
952 | CONFIG_ISDN_PPP=y | ||
953 | CONFIG_ISDN_PPP_VJ=y | ||
954 | CONFIG_ISDN_MPP=y | ||
955 | CONFIG_IPPP_FILTER=y | ||
956 | # CONFIG_ISDN_PPP_BSDCOMP is not set | ||
957 | CONFIG_ISDN_AUDIO=y | ||
958 | CONFIG_ISDN_TTY_FAX=y | ||
959 | |||
960 | # | ||
961 | # ISDN feature submodules | ||
962 | # | ||
963 | CONFIG_ISDN_DRV_LOOP=m | ||
964 | # CONFIG_ISDN_DIVERSION is not set | ||
965 | |||
966 | # | ||
967 | # ISDN4Linux hardware drivers | ||
968 | # | ||
969 | |||
970 | # | ||
971 | # Passive cards | ||
972 | # | ||
973 | CONFIG_ISDN_DRV_HISAX=m | ||
974 | |||
975 | # | ||
976 | # D-channel protocol features | ||
977 | # | ||
978 | CONFIG_HISAX_EURO=y | ||
979 | CONFIG_DE_AOC=y | ||
980 | CONFIG_HISAX_NO_SENDCOMPLETE=y | ||
981 | CONFIG_HISAX_NO_LLC=y | ||
982 | CONFIG_HISAX_NO_KEYPAD=y | ||
983 | CONFIG_HISAX_1TR6=y | ||
984 | CONFIG_HISAX_NI1=y | ||
985 | CONFIG_HISAX_MAX_CARDS=8 | ||
986 | |||
987 | # | ||
988 | # HiSax supported cards | ||
989 | # | ||
990 | CONFIG_HISAX_16_3=y | ||
991 | CONFIG_HISAX_S0BOX=y | ||
992 | CONFIG_HISAX_FRITZPCI=y | ||
993 | CONFIG_HISAX_AVM_A1_PCMCIA=y | ||
994 | CONFIG_HISAX_ELSA=y | ||
995 | CONFIG_HISAX_DIEHLDIVA=y | ||
996 | CONFIG_HISAX_SEDLBAUER=y | ||
997 | CONFIG_HISAX_NICCY=y | ||
998 | CONFIG_HISAX_BKM_A4T=y | ||
999 | CONFIG_HISAX_SCT_QUADRO=y | ||
1000 | CONFIG_HISAX_GAZEL=y | ||
1001 | CONFIG_HISAX_W6692=y | ||
1002 | CONFIG_HISAX_HFC_SX=y | ||
1003 | # CONFIG_HISAX_DEBUG is not set | ||
1004 | |||
1005 | # | ||
1006 | # HiSax PCMCIA card service modules | ||
1007 | # | ||
1008 | |||
1009 | # | ||
1010 | # HiSax sub driver modules | ||
1011 | # | ||
1012 | CONFIG_HISAX_ST5481=m | ||
1013 | CONFIG_HISAX_HFCUSB=m | ||
1014 | # CONFIG_HISAX_HFC4S8S is not set | ||
1015 | CONFIG_HISAX_FRITZ_PCIPNP=m | ||
1016 | CONFIG_HISAX_HDLC=y | ||
1017 | |||
1018 | # | ||
1019 | # Active cards | ||
1020 | # | ||
1021 | CONFIG_HYSDN=m | ||
1022 | CONFIG_HYSDN_CAPI=y | ||
1023 | # CONFIG_ISDN_DRV_GIGASET is not set | ||
1024 | CONFIG_ISDN_CAPI=m | ||
1025 | CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y | ||
1026 | CONFIG_CAPI_TRACE=y | ||
1027 | CONFIG_ISDN_CAPI_MIDDLEWARE=y | ||
1028 | CONFIG_ISDN_CAPI_CAPI20=m | ||
1029 | CONFIG_ISDN_CAPI_CAPIFS_BOOL=y | ||
1030 | CONFIG_ISDN_CAPI_CAPIFS=m | ||
1031 | CONFIG_ISDN_CAPI_CAPIDRV=m | ||
1032 | |||
1033 | # | ||
1034 | # CAPI hardware drivers | ||
1035 | # | ||
1036 | CONFIG_CAPI_AVM=y | ||
1037 | CONFIG_ISDN_DRV_AVMB1_B1PCI=m | ||
1038 | CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y | ||
1039 | CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m | ||
1040 | CONFIG_ISDN_DRV_AVMB1_T1PCI=m | ||
1041 | CONFIG_ISDN_DRV_AVMB1_C4=m | ||
1042 | CONFIG_CAPI_EICON=y | ||
1043 | CONFIG_ISDN_DIVAS=m | ||
1044 | CONFIG_ISDN_DIVAS_BRIPCI=y | ||
1045 | CONFIG_ISDN_DIVAS_PRIPCI=y | ||
1046 | CONFIG_ISDN_DIVAS_DIVACAPI=m | ||
1047 | CONFIG_ISDN_DIVAS_USERIDI=m | ||
1048 | CONFIG_ISDN_DIVAS_MAINT=m | ||
1049 | # CONFIG_PHONE is not set | 967 | # CONFIG_PHONE is not set |
1050 | 968 | ||
1051 | # | 969 | # |
@@ -1092,6 +1010,7 @@ CONFIG_INPUT_UINPUT=m | |||
1092 | # Character devices | 1010 | # Character devices |
1093 | # | 1011 | # |
1094 | CONFIG_VT=y | 1012 | CONFIG_VT=y |
1013 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
1095 | CONFIG_VT_CONSOLE=y | 1014 | CONFIG_VT_CONSOLE=y |
1096 | CONFIG_HW_CONSOLE=y | 1015 | CONFIG_HW_CONSOLE=y |
1097 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1016 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -1145,44 +1064,65 @@ CONFIG_DEVPORT=y | |||
1145 | CONFIG_I2C=m | 1064 | CONFIG_I2C=m |
1146 | CONFIG_I2C_BOARDINFO=y | 1065 | CONFIG_I2C_BOARDINFO=y |
1147 | CONFIG_I2C_CHARDEV=m | 1066 | CONFIG_I2C_CHARDEV=m |
1067 | CONFIG_I2C_HELPER_AUTO=y | ||
1148 | 1068 | ||
1149 | # | 1069 | # |
1150 | # I2C Hardware Bus support | 1070 | # I2C Hardware Bus support |
1151 | # | 1071 | # |
1072 | |||
1073 | # | ||
1074 | # PC SMBus host controller drivers | ||
1075 | # | ||
1152 | # CONFIG_I2C_ALI1535 is not set | 1076 | # CONFIG_I2C_ALI1535 is not set |
1153 | # CONFIG_I2C_ALI1563 is not set | 1077 | # CONFIG_I2C_ALI1563 is not set |
1154 | # CONFIG_I2C_ALI15X3 is not set | 1078 | # CONFIG_I2C_ALI15X3 is not set |
1155 | # CONFIG_I2C_AMD756 is not set | 1079 | # CONFIG_I2C_AMD756 is not set |
1156 | # CONFIG_I2C_AMD8111 is not set | 1080 | # CONFIG_I2C_AMD8111 is not set |
1157 | # CONFIG_I2C_I801 is not set | 1081 | # CONFIG_I2C_I801 is not set |
1158 | # CONFIG_I2C_I810 is not set | 1082 | # CONFIG_I2C_ISCH is not set |
1159 | # CONFIG_I2C_PIIX4 is not set | 1083 | # CONFIG_I2C_PIIX4 is not set |
1160 | # CONFIG_I2C_MPC is not set | ||
1161 | # CONFIG_I2C_NFORCE2 is not set | 1084 | # CONFIG_I2C_NFORCE2 is not set |
1162 | # CONFIG_I2C_OCORES is not set | ||
1163 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1164 | # CONFIG_I2C_PROSAVAGE is not set | ||
1165 | # CONFIG_I2C_SAVAGE4 is not set | ||
1166 | # CONFIG_I2C_SIMTEC is not set | ||
1167 | # CONFIG_I2C_SIS5595 is not set | 1085 | # CONFIG_I2C_SIS5595 is not set |
1168 | # CONFIG_I2C_SIS630 is not set | 1086 | # CONFIG_I2C_SIS630 is not set |
1169 | # CONFIG_I2C_SIS96X is not set | 1087 | # CONFIG_I2C_SIS96X is not set |
1170 | # CONFIG_I2C_TAOS_EVM is not set | ||
1171 | # CONFIG_I2C_STUB is not set | ||
1172 | # CONFIG_I2C_TINY_USB is not set | ||
1173 | # CONFIG_I2C_VIA is not set | 1088 | # CONFIG_I2C_VIA is not set |
1174 | # CONFIG_I2C_VIAPRO is not set | 1089 | # CONFIG_I2C_VIAPRO is not set |
1090 | |||
1091 | # | ||
1092 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
1093 | # | ||
1094 | # CONFIG_I2C_MPC is not set | ||
1095 | CONFIG_I2C_MV64XXX=m | ||
1096 | # CONFIG_I2C_OCORES is not set | ||
1097 | # CONFIG_I2C_SIMTEC is not set | ||
1098 | |||
1099 | # | ||
1100 | # External I2C/SMBus adapter drivers | ||
1101 | # | ||
1102 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1103 | # CONFIG_I2C_TAOS_EVM is not set | ||
1104 | # CONFIG_I2C_TINY_USB is not set | ||
1105 | |||
1106 | # | ||
1107 | # Graphics adapter I2C/DDC channel drivers | ||
1108 | # | ||
1175 | # CONFIG_I2C_VOODOO3 is not set | 1109 | # CONFIG_I2C_VOODOO3 is not set |
1110 | |||
1111 | # | ||
1112 | # Other I2C/SMBus bus drivers | ||
1113 | # | ||
1176 | # CONFIG_I2C_PCA_PLATFORM is not set | 1114 | # CONFIG_I2C_PCA_PLATFORM is not set |
1177 | CONFIG_I2C_MV64XXX=m | 1115 | # CONFIG_I2C_STUB is not set |
1178 | 1116 | ||
1179 | # | 1117 | # |
1180 | # Miscellaneous I2C Chip support | 1118 | # Miscellaneous I2C Chip support |
1181 | # | 1119 | # |
1182 | # CONFIG_DS1682 is not set | 1120 | # CONFIG_DS1682 is not set |
1121 | # CONFIG_AT24 is not set | ||
1183 | CONFIG_SENSORS_EEPROM=m | 1122 | CONFIG_SENSORS_EEPROM=m |
1184 | CONFIG_SENSORS_PCF8574=m | 1123 | CONFIG_SENSORS_PCF8574=m |
1185 | # CONFIG_PCF8575 is not set | 1124 | # CONFIG_PCF8575 is not set |
1125 | # CONFIG_SENSORS_PCA9539 is not set | ||
1186 | CONFIG_SENSORS_PCF8591=m | 1126 | CONFIG_SENSORS_PCF8591=m |
1187 | # CONFIG_SENSORS_MAX6875 is not set | 1127 | # CONFIG_SENSORS_MAX6875 is not set |
1188 | # CONFIG_SENSORS_TSL2550 is not set | 1128 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -1191,10 +1131,13 @@ CONFIG_SENSORS_PCF8591=m | |||
1191 | # CONFIG_I2C_DEBUG_BUS is not set | 1131 | # CONFIG_I2C_DEBUG_BUS is not set |
1192 | # CONFIG_I2C_DEBUG_CHIP is not set | 1132 | # CONFIG_I2C_DEBUG_CHIP is not set |
1193 | # CONFIG_SPI is not set | 1133 | # CONFIG_SPI is not set |
1134 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
1135 | # CONFIG_GPIOLIB is not set | ||
1194 | # CONFIG_W1 is not set | 1136 | # CONFIG_W1 is not set |
1195 | # CONFIG_POWER_SUPPLY is not set | 1137 | # CONFIG_POWER_SUPPLY is not set |
1196 | CONFIG_HWMON=m | 1138 | CONFIG_HWMON=m |
1197 | CONFIG_HWMON_VID=m | 1139 | CONFIG_HWMON_VID=m |
1140 | # CONFIG_SENSORS_AD7414 is not set | ||
1198 | # CONFIG_SENSORS_AD7418 is not set | 1141 | # CONFIG_SENSORS_AD7418 is not set |
1199 | CONFIG_SENSORS_ADM1021=m | 1142 | CONFIG_SENSORS_ADM1021=m |
1200 | CONFIG_SENSORS_ADM1025=m | 1143 | CONFIG_SENSORS_ADM1025=m |
@@ -1255,6 +1198,7 @@ CONFIG_WATCHDOG=y | |||
1255 | # Watchdog Device Drivers | 1198 | # Watchdog Device Drivers |
1256 | # | 1199 | # |
1257 | CONFIG_SOFT_WATCHDOG=m | 1200 | CONFIG_SOFT_WATCHDOG=m |
1201 | # CONFIG_ALIM7101_WDT is not set | ||
1258 | # CONFIG_MV64X60_WDT is not set | 1202 | # CONFIG_MV64X60_WDT is not set |
1259 | 1203 | ||
1260 | # | 1204 | # |
@@ -1278,8 +1222,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1278 | # | 1222 | # |
1279 | # Multifunction device drivers | 1223 | # Multifunction device drivers |
1280 | # | 1224 | # |
1225 | # CONFIG_MFD_CORE is not set | ||
1281 | # CONFIG_MFD_SM501 is not set | 1226 | # CONFIG_MFD_SM501 is not set |
1282 | # CONFIG_HTC_PASIC3 is not set | 1227 | # CONFIG_HTC_PASIC3 is not set |
1228 | # CONFIG_MFD_TMIO is not set | ||
1283 | 1229 | ||
1284 | # | 1230 | # |
1285 | # Multimedia devices | 1231 | # Multimedia devices |
@@ -1290,6 +1236,7 @@ CONFIG_SSB_POSSIBLE=y | |||
1290 | # | 1236 | # |
1291 | # CONFIG_VIDEO_DEV is not set | 1237 | # CONFIG_VIDEO_DEV is not set |
1292 | # CONFIG_DVB_CORE is not set | 1238 | # CONFIG_DVB_CORE is not set |
1239 | # CONFIG_VIDEO_MEDIA is not set | ||
1293 | 1240 | ||
1294 | # | 1241 | # |
1295 | # Multimedia drivers | 1242 | # Multimedia drivers |
@@ -1316,10 +1263,6 @@ CONFIG_SSB_POSSIBLE=y | |||
1316 | # | 1263 | # |
1317 | # CONFIG_VGA_CONSOLE is not set | 1264 | # CONFIG_VGA_CONSOLE is not set |
1318 | CONFIG_DUMMY_CONSOLE=y | 1265 | CONFIG_DUMMY_CONSOLE=y |
1319 | |||
1320 | # | ||
1321 | # Sound | ||
1322 | # | ||
1323 | # CONFIG_SOUND is not set | 1266 | # CONFIG_SOUND is not set |
1324 | # CONFIG_HID_SUPPORT is not set | 1267 | # CONFIG_HID_SUPPORT is not set |
1325 | CONFIG_HID=m | 1268 | CONFIG_HID=m |
@@ -1339,6 +1282,7 @@ CONFIG_USB_DEVICEFS=y | |||
1339 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1282 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1340 | CONFIG_USB_SUSPEND=y | 1283 | CONFIG_USB_SUSPEND=y |
1341 | # CONFIG_USB_OTG is not set | 1284 | # CONFIG_USB_OTG is not set |
1285 | CONFIG_USB_MON=y | ||
1342 | 1286 | ||
1343 | # | 1287 | # |
1344 | # USB Host Controller Drivers | 1288 | # USB Host Controller Drivers |
@@ -1363,10 +1307,15 @@ CONFIG_USB_UHCI_HCD=m | |||
1363 | # CONFIG_USB_R8A66597_HCD is not set | 1307 | # CONFIG_USB_R8A66597_HCD is not set |
1364 | 1308 | ||
1365 | # | 1309 | # |
1310 | # Enable Host or Gadget support to see Inventra options | ||
1311 | # | ||
1312 | |||
1313 | # | ||
1366 | # USB Device Class drivers | 1314 | # USB Device Class drivers |
1367 | # | 1315 | # |
1368 | CONFIG_USB_ACM=m | 1316 | CONFIG_USB_ACM=m |
1369 | CONFIG_USB_PRINTER=m | 1317 | CONFIG_USB_PRINTER=m |
1318 | # CONFIG_USB_WDM is not set | ||
1370 | 1319 | ||
1371 | # | 1320 | # |
1372 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1321 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1388,6 +1337,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1388 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1337 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1389 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1338 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1390 | # CONFIG_USB_STORAGE_KARMA is not set | 1339 | # CONFIG_USB_STORAGE_KARMA is not set |
1340 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1391 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1341 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1392 | # CONFIG_USB_LIBUSUAL is not set | 1342 | # CONFIG_USB_LIBUSUAL is not set |
1393 | 1343 | ||
@@ -1396,7 +1346,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1396 | # | 1346 | # |
1397 | CONFIG_USB_MDC800=m | 1347 | CONFIG_USB_MDC800=m |
1398 | CONFIG_USB_MICROTEK=m | 1348 | CONFIG_USB_MICROTEK=m |
1399 | CONFIG_USB_MON=y | ||
1400 | 1349 | ||
1401 | # | 1350 | # |
1402 | # USB port drivers | 1351 | # USB port drivers |
@@ -1405,7 +1354,6 @@ CONFIG_USB_SERIAL=m | |||
1405 | CONFIG_USB_EZUSB=y | 1354 | CONFIG_USB_EZUSB=y |
1406 | CONFIG_USB_SERIAL_GENERIC=y | 1355 | CONFIG_USB_SERIAL_GENERIC=y |
1407 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1356 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
1408 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
1409 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1357 | # CONFIG_USB_SERIAL_ARK3116 is not set |
1410 | CONFIG_USB_SERIAL_BELKIN=m | 1358 | CONFIG_USB_SERIAL_BELKIN=m |
1411 | # CONFIG_USB_SERIAL_CH341 is not set | 1359 | # CONFIG_USB_SERIAL_CH341 is not set |
@@ -1443,6 +1391,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m | |||
1443 | CONFIG_USB_SERIAL_MCT_U232=m | 1391 | CONFIG_USB_SERIAL_MCT_U232=m |
1444 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1392 | # CONFIG_USB_SERIAL_MOS7720 is not set |
1445 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1393 | # CONFIG_USB_SERIAL_MOS7840 is not set |
1394 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
1446 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1395 | # CONFIG_USB_SERIAL_NAVMAN is not set |
1447 | CONFIG_USB_SERIAL_PL2303=m | 1396 | CONFIG_USB_SERIAL_PL2303=m |
1448 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1397 | # CONFIG_USB_SERIAL_OTI6858 is not set |
@@ -1464,7 +1413,6 @@ CONFIG_USB_SERIAL_OMNINET=m | |||
1464 | CONFIG_USB_EMI62=m | 1413 | CONFIG_USB_EMI62=m |
1465 | # CONFIG_USB_EMI26 is not set | 1414 | # CONFIG_USB_EMI26 is not set |
1466 | # CONFIG_USB_ADUTUX is not set | 1415 | # CONFIG_USB_ADUTUX is not set |
1467 | CONFIG_USB_AUERSWALD=m | ||
1468 | CONFIG_USB_RIO500=m | 1416 | CONFIG_USB_RIO500=m |
1469 | CONFIG_USB_LEGOTOWER=m | 1417 | CONFIG_USB_LEGOTOWER=m |
1470 | CONFIG_USB_LCD=m | 1418 | CONFIG_USB_LCD=m |
@@ -1481,6 +1429,7 @@ CONFIG_USB_LED=m | |||
1481 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1429 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1482 | # CONFIG_USB_IOWARRIOR is not set | 1430 | # CONFIG_USB_IOWARRIOR is not set |
1483 | CONFIG_USB_TEST=m | 1431 | CONFIG_USB_TEST=m |
1432 | # CONFIG_USB_ISIGHTFW is not set | ||
1484 | CONFIG_USB_ATM=m | 1433 | CONFIG_USB_ATM=m |
1485 | CONFIG_USB_SPEEDTOUCH=m | 1434 | CONFIG_USB_SPEEDTOUCH=m |
1486 | # CONFIG_USB_CXACRU is not set | 1435 | # CONFIG_USB_CXACRU is not set |
@@ -1601,6 +1550,7 @@ CONFIG_JFFS2_RTIME=y | |||
1601 | CONFIG_CRAMFS=m | 1550 | CONFIG_CRAMFS=m |
1602 | CONFIG_VXFS_FS=m | 1551 | CONFIG_VXFS_FS=m |
1603 | # CONFIG_MINIX_FS is not set | 1552 | # CONFIG_MINIX_FS is not set |
1553 | # CONFIG_OMFS_FS is not set | ||
1604 | # CONFIG_HPFS_FS is not set | 1554 | # CONFIG_HPFS_FS is not set |
1605 | # CONFIG_QNX4FS_FS is not set | 1555 | # CONFIG_QNX4FS_FS is not set |
1606 | # CONFIG_ROMFS_FS is not set | 1556 | # CONFIG_ROMFS_FS is not set |
@@ -1611,8 +1561,8 @@ CONFIG_NFS_FS=y | |||
1611 | CONFIG_NFS_V3=y | 1561 | CONFIG_NFS_V3=y |
1612 | CONFIG_NFS_V3_ACL=y | 1562 | CONFIG_NFS_V3_ACL=y |
1613 | CONFIG_NFS_V4=y | 1563 | CONFIG_NFS_V4=y |
1614 | # CONFIG_NFSD is not set | ||
1615 | CONFIG_ROOT_NFS=y | 1564 | CONFIG_ROOT_NFS=y |
1565 | # CONFIG_NFSD is not set | ||
1616 | CONFIG_LOCKD=y | 1566 | CONFIG_LOCKD=y |
1617 | CONFIG_LOCKD_V4=y | 1567 | CONFIG_LOCKD_V4=y |
1618 | CONFIG_NFS_ACL_SUPPORT=y | 1568 | CONFIG_NFS_ACL_SUPPORT=y |
@@ -1620,7 +1570,6 @@ CONFIG_NFS_COMMON=y | |||
1620 | CONFIG_SUNRPC=y | 1570 | CONFIG_SUNRPC=y |
1621 | CONFIG_SUNRPC_GSS=y | 1571 | CONFIG_SUNRPC_GSS=y |
1622 | CONFIG_SUNRPC_XPRT_RDMA=m | 1572 | CONFIG_SUNRPC_XPRT_RDMA=m |
1623 | # CONFIG_SUNRPC_BIND34 is not set | ||
1624 | CONFIG_RPCSEC_GSS_KRB5=y | 1573 | CONFIG_RPCSEC_GSS_KRB5=y |
1625 | CONFIG_RPCSEC_GSS_SPKM3=m | 1574 | CONFIG_RPCSEC_GSS_SPKM3=m |
1626 | # CONFIG_SMB_FS is not set | 1575 | # CONFIG_SMB_FS is not set |
@@ -1705,6 +1654,7 @@ CONFIG_BITREVERSE=y | |||
1705 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1654 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1706 | CONFIG_CRC_CCITT=m | 1655 | CONFIG_CRC_CCITT=m |
1707 | # CONFIG_CRC16 is not set | 1656 | # CONFIG_CRC16 is not set |
1657 | CONFIG_CRC_T10DIF=m | ||
1708 | CONFIG_CRC_ITU_T=m | 1658 | CONFIG_CRC_ITU_T=m |
1709 | CONFIG_CRC32=y | 1659 | CONFIG_CRC32=y |
1710 | # CONFIG_CRC7 is not set | 1660 | # CONFIG_CRC7 is not set |
@@ -1732,6 +1682,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1732 | CONFIG_DEBUG_KERNEL=y | 1682 | CONFIG_DEBUG_KERNEL=y |
1733 | # CONFIG_DEBUG_SHIRQ is not set | 1683 | # CONFIG_DEBUG_SHIRQ is not set |
1734 | CONFIG_DETECT_SOFTLOCKUP=y | 1684 | CONFIG_DETECT_SOFTLOCKUP=y |
1685 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1686 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1735 | CONFIG_SCHED_DEBUG=y | 1687 | CONFIG_SCHED_DEBUG=y |
1736 | # CONFIG_SCHEDSTATS is not set | 1688 | # CONFIG_SCHEDSTATS is not set |
1737 | # CONFIG_TIMER_STATS is not set | 1689 | # CONFIG_TIMER_STATS is not set |
@@ -1750,6 +1702,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1750 | CONFIG_DEBUG_INFO=y | 1702 | CONFIG_DEBUG_INFO=y |
1751 | # CONFIG_DEBUG_VM is not set | 1703 | # CONFIG_DEBUG_VM is not set |
1752 | # CONFIG_DEBUG_WRITECOUNT is not set | 1704 | # CONFIG_DEBUG_WRITECOUNT is not set |
1705 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1753 | # CONFIG_DEBUG_LIST is not set | 1706 | # CONFIG_DEBUG_LIST is not set |
1754 | # CONFIG_DEBUG_SG is not set | 1707 | # CONFIG_DEBUG_SG is not set |
1755 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1708 | # CONFIG_BOOT_PRINTK_DELAY is not set |
@@ -1758,11 +1711,22 @@ CONFIG_DEBUG_INFO=y | |||
1758 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1711 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1759 | # CONFIG_LKDTM is not set | 1712 | # CONFIG_LKDTM is not set |
1760 | # CONFIG_FAULT_INJECTION is not set | 1713 | # CONFIG_FAULT_INJECTION is not set |
1714 | # CONFIG_LATENCYTOP is not set | ||
1715 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1716 | CONFIG_HAVE_FTRACE=y | ||
1717 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1718 | # CONFIG_FTRACE is not set | ||
1719 | # CONFIG_SCHED_TRACER is not set | ||
1720 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1761 | # CONFIG_SAMPLES is not set | 1721 | # CONFIG_SAMPLES is not set |
1722 | CONFIG_HAVE_ARCH_KGDB=y | ||
1723 | # CONFIG_KGDB is not set | ||
1762 | CONFIG_DEBUG_STACKOVERFLOW=y | 1724 | CONFIG_DEBUG_STACKOVERFLOW=y |
1763 | CONFIG_DEBUG_STACK_USAGE=y | 1725 | CONFIG_DEBUG_STACK_USAGE=y |
1764 | # CONFIG_DEBUG_PAGEALLOC is not set | 1726 | # CONFIG_DEBUG_PAGEALLOC is not set |
1765 | # CONFIG_DEBUGGER is not set | 1727 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1728 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1729 | # CONFIG_XMON is not set | ||
1766 | # CONFIG_IRQSTACKS is not set | 1730 | # CONFIG_IRQSTACKS is not set |
1767 | # CONFIG_BDI_SWITCH is not set | 1731 | # CONFIG_BDI_SWITCH is not set |
1768 | CONFIG_BOOTX_TEXT=y | 1732 | CONFIG_BOOTX_TEXT=y |
@@ -1776,7 +1740,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y | |||
1776 | CONFIG_SECURITY=y | 1740 | CONFIG_SECURITY=y |
1777 | CONFIG_SECURITY_NETWORK=y | 1741 | CONFIG_SECURITY_NETWORK=y |
1778 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 1742 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
1779 | CONFIG_SECURITY_CAPABILITIES=y | ||
1780 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1743 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1781 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | 1744 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
1782 | CONFIG_SECURITY_SELINUX=y | 1745 | CONFIG_SECURITY_SELINUX=y |
@@ -1835,6 +1798,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
1835 | CONFIG_CRYPTO_MD4=m | 1798 | CONFIG_CRYPTO_MD4=m |
1836 | CONFIG_CRYPTO_MD5=y | 1799 | CONFIG_CRYPTO_MD5=y |
1837 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1800 | CONFIG_CRYPTO_MICHAEL_MIC=m |
1801 | # CONFIG_CRYPTO_RMD128 is not set | ||
1802 | # CONFIG_CRYPTO_RMD160 is not set | ||
1803 | # CONFIG_CRYPTO_RMD256 is not set | ||
1804 | # CONFIG_CRYPTO_RMD320 is not set | ||
1838 | CONFIG_CRYPTO_SHA1=y | 1805 | CONFIG_CRYPTO_SHA1=y |
1839 | CONFIG_CRYPTO_SHA256=m | 1806 | CONFIG_CRYPTO_SHA256=m |
1840 | CONFIG_CRYPTO_SHA512=m | 1807 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig index 05360d4ef1b1..2e0ef8c18227 100644 --- a/arch/powerpc/configs/chrp32_defconfig +++ b/arch/powerpc/configs/chrp32_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc3 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Tue May 20 20:00:44 2008 | 4 | # Tue Aug 26 13:12:40 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -90,7 +91,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
90 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
91 | # CONFIG_EMBEDDED is not set | 92 | # CONFIG_EMBEDDED is not set |
92 | CONFIG_SYSCTL_SYSCALL=y | 93 | CONFIG_SYSCTL_SYSCALL=y |
93 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
94 | CONFIG_KALLSYMS=y | 94 | CONFIG_KALLSYMS=y |
95 | # CONFIG_KALLSYMS_ALL is not set | 95 | # CONFIG_KALLSYMS_ALL is not set |
96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 96 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -117,10 +117,16 @@ CONFIG_SLUB=y | |||
117 | # CONFIG_MARKERS is not set | 117 | # CONFIG_MARKERS is not set |
118 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
119 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
120 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
122 | # CONFIG_HAVE_DMA_ATTRS is not set | 125 | # CONFIG_HAVE_DMA_ATTRS is not set |
126 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
127 | # CONFIG_HAVE_CLK is not set | ||
123 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
124 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
125 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
126 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
@@ -138,6 +144,7 @@ CONFIG_LBD=y | |||
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 144 | # CONFIG_BLK_DEV_IO_TRACE is not set |
139 | # CONFIG_LSF is not set | 145 | # CONFIG_LSF is not set |
140 | # CONFIG_BLK_DEV_BSG is not set | 146 | # CONFIG_BLK_DEV_BSG is not set |
147 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
141 | 148 | ||
142 | # | 149 | # |
143 | # IO Schedulers | 150 | # IO Schedulers |
@@ -157,19 +164,18 @@ CONFIG_CLASSIC_RCU=y | |||
157 | # Platform support | 164 | # Platform support |
158 | # | 165 | # |
159 | CONFIG_PPC_MULTIPLATFORM=y | 166 | CONFIG_PPC_MULTIPLATFORM=y |
160 | # CONFIG_PPC_82xx is not set | ||
161 | # CONFIG_PPC_83xx is not set | ||
162 | # CONFIG_PPC_86xx is not set | ||
163 | CONFIG_CLASSIC32=y | 167 | CONFIG_CLASSIC32=y |
164 | CONFIG_PPC_CHRP=y | 168 | CONFIG_PPC_CHRP=y |
165 | # CONFIG_PPC_MPC512x is not set | ||
166 | # CONFIG_PPC_MPC5121 is not set | ||
167 | # CONFIG_MPC5121_ADS is not set | 169 | # CONFIG_MPC5121_ADS is not set |
170 | # CONFIG_MPC5121_GENERIC is not set | ||
168 | # CONFIG_PPC_MPC52xx is not set | 171 | # CONFIG_PPC_MPC52xx is not set |
169 | # CONFIG_PPC_PMAC is not set | 172 | # CONFIG_PPC_PMAC is not set |
170 | # CONFIG_PPC_CELL is not set | 173 | # CONFIG_PPC_CELL is not set |
171 | # CONFIG_PPC_CELL_NATIVE is not set | 174 | # CONFIG_PPC_CELL_NATIVE is not set |
175 | # CONFIG_PPC_82xx is not set | ||
172 | # CONFIG_PQ2ADS is not set | 176 | # CONFIG_PQ2ADS is not set |
177 | # CONFIG_PPC_83xx is not set | ||
178 | # CONFIG_PPC_86xx is not set | ||
173 | CONFIG_PPC_NATIVE=y | 179 | CONFIG_PPC_NATIVE=y |
174 | # CONFIG_UDBG_RTAS_CONSOLE is not set | 180 | # CONFIG_UDBG_RTAS_CONSOLE is not set |
175 | # CONFIG_IPIC is not set | 181 | # CONFIG_IPIC is not set |
@@ -201,7 +207,7 @@ CONFIG_HZ_250=y | |||
201 | # CONFIG_HZ_300 is not set | 207 | # CONFIG_HZ_300 is not set |
202 | # CONFIG_HZ_1000 is not set | 208 | # CONFIG_HZ_1000 is not set |
203 | CONFIG_HZ=250 | 209 | CONFIG_HZ=250 |
204 | # CONFIG_SCHED_HRTICK is not set | 210 | CONFIG_SCHED_HRTICK=y |
205 | CONFIG_PREEMPT_NONE=y | 211 | CONFIG_PREEMPT_NONE=y |
206 | # CONFIG_PREEMPT_VOLUNTARY is not set | 212 | # CONFIG_PREEMPT_VOLUNTARY is not set |
207 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
@@ -225,6 +231,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
225 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 231 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
226 | CONFIG_PAGEFLAGS_EXTENDED=y | 232 | CONFIG_PAGEFLAGS_EXTENDED=y |
227 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 233 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
234 | # CONFIG_MIGRATION is not set | ||
228 | # CONFIG_RESOURCES_64BIT is not set | 235 | # CONFIG_RESOURCES_64BIT is not set |
229 | CONFIG_ZONE_DMA_FLAG=1 | 236 | CONFIG_ZONE_DMA_FLAG=1 |
230 | CONFIG_BOUNCE=y | 237 | CONFIG_BOUNCE=y |
@@ -232,6 +239,7 @@ CONFIG_VIRT_TO_BUS=y | |||
232 | CONFIG_FORCE_MAX_ZONEORDER=11 | 239 | CONFIG_FORCE_MAX_ZONEORDER=11 |
233 | CONFIG_PROC_DEVICETREE=y | 240 | CONFIG_PROC_DEVICETREE=y |
234 | # CONFIG_CMDLINE_BOOL is not set | 241 | # CONFIG_CMDLINE_BOOL is not set |
242 | CONFIG_EXTRA_TARGETS="" | ||
235 | # CONFIG_PM is not set | 243 | # CONFIG_PM is not set |
236 | CONFIG_SECCOMP=y | 244 | CONFIG_SECCOMP=y |
237 | CONFIG_ISA_DMA_API=y | 245 | CONFIG_ISA_DMA_API=y |
@@ -268,10 +276,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
268 | CONFIG_KERNEL_START=0xc0000000 | 276 | CONFIG_KERNEL_START=0xc0000000 |
269 | CONFIG_PHYSICAL_START=0x00000000 | 277 | CONFIG_PHYSICAL_START=0x00000000 |
270 | CONFIG_TASK_SIZE=0xc0000000 | 278 | CONFIG_TASK_SIZE=0xc0000000 |
271 | |||
272 | # | ||
273 | # Networking | ||
274 | # | ||
275 | CONFIG_NET=y | 279 | CONFIG_NET=y |
276 | 280 | ||
277 | # | 281 | # |
@@ -398,7 +402,9 @@ CONFIG_NF_NAT_SIP=m | |||
398 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 402 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
399 | # CONFIG_STANDALONE is not set | 403 | # CONFIG_STANDALONE is not set |
400 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 404 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
401 | # CONFIG_FW_LOADER is not set | 405 | CONFIG_FW_LOADER=y |
406 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
407 | CONFIG_EXTRA_FIRMWARE="" | ||
402 | # CONFIG_DEBUG_DRIVER is not set | 408 | # CONFIG_DEBUG_DRIVER is not set |
403 | # CONFIG_DEBUG_DEVRES is not set | 409 | # CONFIG_DEBUG_DEVRES is not set |
404 | # CONFIG_SYS_HYPERVISOR is not set | 410 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -427,12 +433,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
427 | # CONFIG_BLK_DEV_XIP is not set | 433 | # CONFIG_BLK_DEV_XIP is not set |
428 | # CONFIG_CDROM_PKTCDVD is not set | 434 | # CONFIG_CDROM_PKTCDVD is not set |
429 | # CONFIG_ATA_OVER_ETH is not set | 435 | # CONFIG_ATA_OVER_ETH is not set |
436 | # CONFIG_BLK_DEV_HD is not set | ||
430 | CONFIG_MISC_DEVICES=y | 437 | CONFIG_MISC_DEVICES=y |
431 | # CONFIG_PHANTOM is not set | 438 | # CONFIG_PHANTOM is not set |
432 | # CONFIG_EEPROM_93CX6 is not set | 439 | # CONFIG_EEPROM_93CX6 is not set |
433 | # CONFIG_SGI_IOC4 is not set | 440 | # CONFIG_SGI_IOC4 is not set |
434 | # CONFIG_TIFM_CORE is not set | 441 | # CONFIG_TIFM_CORE is not set |
435 | # CONFIG_ENCLOSURE_SERVICES is not set | 442 | # CONFIG_ENCLOSURE_SERVICES is not set |
443 | # CONFIG_HP_ILO is not set | ||
436 | CONFIG_HAVE_IDE=y | 444 | CONFIG_HAVE_IDE=y |
437 | CONFIG_IDE=y | 445 | CONFIG_IDE=y |
438 | CONFIG_BLK_DEV_IDE=y | 446 | CONFIG_BLK_DEV_IDE=y |
@@ -440,6 +448,7 @@ CONFIG_BLK_DEV_IDE=y | |||
440 | # | 448 | # |
441 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 449 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
442 | # | 450 | # |
451 | CONFIG_IDE_TIMINGS=y | ||
443 | # CONFIG_BLK_DEV_IDE_SATA is not set | 452 | # CONFIG_BLK_DEV_IDE_SATA is not set |
444 | CONFIG_BLK_DEV_IDEDISK=y | 453 | CONFIG_BLK_DEV_IDEDISK=y |
445 | CONFIG_IDEDISK_MULTI_MODE=y | 454 | CONFIG_IDEDISK_MULTI_MODE=y |
@@ -454,7 +463,6 @@ CONFIG_IDE_PROC_FS=y | |||
454 | # | 463 | # |
455 | # IDE chipset support/bugfixes | 464 | # IDE chipset support/bugfixes |
456 | # | 465 | # |
457 | CONFIG_IDE_GENERIC=y | ||
458 | # CONFIG_BLK_DEV_PLATFORM is not set | 466 | # CONFIG_BLK_DEV_PLATFORM is not set |
459 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 467 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
460 | 468 | ||
@@ -472,10 +480,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
472 | # CONFIG_BLK_DEV_AMD74XX is not set | 480 | # CONFIG_BLK_DEV_AMD74XX is not set |
473 | # CONFIG_BLK_DEV_CMD64X is not set | 481 | # CONFIG_BLK_DEV_CMD64X is not set |
474 | # CONFIG_BLK_DEV_TRIFLEX is not set | 482 | # CONFIG_BLK_DEV_TRIFLEX is not set |
475 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
476 | # CONFIG_BLK_DEV_CS5520 is not set | 483 | # CONFIG_BLK_DEV_CS5520 is not set |
477 | # CONFIG_BLK_DEV_CS5530 is not set | 484 | # CONFIG_BLK_DEV_CS5530 is not set |
478 | # CONFIG_BLK_DEV_HPT34X is not set | ||
479 | # CONFIG_BLK_DEV_HPT366 is not set | 485 | # CONFIG_BLK_DEV_HPT366 is not set |
480 | # CONFIG_BLK_DEV_JMICRON is not set | 486 | # CONFIG_BLK_DEV_JMICRON is not set |
481 | # CONFIG_BLK_DEV_SC1200 is not set | 487 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -493,8 +499,6 @@ CONFIG_BLK_DEV_SL82C105=y | |||
493 | CONFIG_BLK_DEV_VIA82CXXX=y | 499 | CONFIG_BLK_DEV_VIA82CXXX=y |
494 | # CONFIG_BLK_DEV_TC86C001 is not set | 500 | # CONFIG_BLK_DEV_TC86C001 is not set |
495 | CONFIG_BLK_DEV_IDEDMA=y | 501 | CONFIG_BLK_DEV_IDEDMA=y |
496 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
497 | # CONFIG_BLK_DEV_HD is not set | ||
498 | 502 | ||
499 | # | 503 | # |
500 | # SCSI device support | 504 | # SCSI device support |
@@ -588,6 +592,7 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
588 | # CONFIG_SCSI_NSP32 is not set | 592 | # CONFIG_SCSI_NSP32 is not set |
589 | # CONFIG_SCSI_DEBUG is not set | 593 | # CONFIG_SCSI_DEBUG is not set |
590 | # CONFIG_SCSI_SRP is not set | 594 | # CONFIG_SCSI_SRP is not set |
595 | # CONFIG_SCSI_DH is not set | ||
591 | # CONFIG_ATA is not set | 596 | # CONFIG_ATA is not set |
592 | # CONFIG_MD is not set | 597 | # CONFIG_MD is not set |
593 | # CONFIG_FUSION is not set | 598 | # CONFIG_FUSION is not set |
@@ -595,12 +600,15 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y | |||
595 | # | 600 | # |
596 | # IEEE 1394 (FireWire) support | 601 | # IEEE 1394 (FireWire) support |
597 | # | 602 | # |
603 | |||
604 | # | ||
605 | # Enable only one of the two stacks, unless you know what you are doing | ||
606 | # | ||
598 | # CONFIG_FIREWIRE is not set | 607 | # CONFIG_FIREWIRE is not set |
599 | # CONFIG_IEEE1394 is not set | 608 | # CONFIG_IEEE1394 is not set |
600 | # CONFIG_I2O is not set | 609 | # CONFIG_I2O is not set |
601 | # CONFIG_MACINTOSH_DRIVERS is not set | 610 | # CONFIG_MACINTOSH_DRIVERS is not set |
602 | CONFIG_NETDEVICES=y | 611 | CONFIG_NETDEVICES=y |
603 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
604 | # CONFIG_DUMMY is not set | 612 | # CONFIG_DUMMY is not set |
605 | # CONFIG_BONDING is not set | 613 | # CONFIG_BONDING is not set |
606 | # CONFIG_MACVLAN is not set | 614 | # CONFIG_MACVLAN is not set |
@@ -660,14 +668,12 @@ CONFIG_8139TOO=y | |||
660 | # CONFIG_TLAN is not set | 668 | # CONFIG_TLAN is not set |
661 | CONFIG_VIA_RHINE=y | 669 | CONFIG_VIA_RHINE=y |
662 | # CONFIG_VIA_RHINE_MMIO is not set | 670 | # CONFIG_VIA_RHINE_MMIO is not set |
663 | # CONFIG_VIA_RHINE_NAPI is not set | ||
664 | # CONFIG_SC92031 is not set | 671 | # CONFIG_SC92031 is not set |
665 | CONFIG_NETDEV_1000=y | 672 | CONFIG_NETDEV_1000=y |
666 | # CONFIG_ACENIC is not set | 673 | # CONFIG_ACENIC is not set |
667 | # CONFIG_DL2K is not set | 674 | # CONFIG_DL2K is not set |
668 | # CONFIG_E1000 is not set | 675 | # CONFIG_E1000 is not set |
669 | # CONFIG_E1000E is not set | 676 | # CONFIG_E1000E is not set |
670 | # CONFIG_E1000E_ENABLED is not set | ||
671 | # CONFIG_IP1000 is not set | 677 | # CONFIG_IP1000 is not set |
672 | # CONFIG_IGB is not set | 678 | # CONFIG_IGB is not set |
673 | # CONFIG_NS83820 is not set | 679 | # CONFIG_NS83820 is not set |
@@ -683,6 +689,7 @@ CONFIG_NETDEV_1000=y | |||
683 | CONFIG_MV643XX_ETH=y | 689 | CONFIG_MV643XX_ETH=y |
684 | # CONFIG_QLA3XXX is not set | 690 | # CONFIG_QLA3XXX is not set |
685 | # CONFIG_ATL1 is not set | 691 | # CONFIG_ATL1 is not set |
692 | # CONFIG_ATL1E is not set | ||
686 | CONFIG_NETDEV_10000=y | 693 | CONFIG_NETDEV_10000=y |
687 | # CONFIG_CHELSIO_T1 is not set | 694 | # CONFIG_CHELSIO_T1 is not set |
688 | # CONFIG_CHELSIO_T3 is not set | 695 | # CONFIG_CHELSIO_T3 is not set |
@@ -773,6 +780,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
773 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 780 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
774 | # CONFIG_MOUSE_SERIAL is not set | 781 | # CONFIG_MOUSE_SERIAL is not set |
775 | # CONFIG_MOUSE_APPLETOUCH is not set | 782 | # CONFIG_MOUSE_APPLETOUCH is not set |
783 | # CONFIG_MOUSE_BCM5974 is not set | ||
776 | # CONFIG_MOUSE_INPORT is not set | 784 | # CONFIG_MOUSE_INPORT is not set |
777 | # CONFIG_MOUSE_LOGIBM is not set | 785 | # CONFIG_MOUSE_LOGIBM is not set |
778 | # CONFIG_MOUSE_PC110PAD is not set | 786 | # CONFIG_MOUSE_PC110PAD is not set |
@@ -798,12 +806,14 @@ CONFIG_SERIO_SERPORT=y | |||
798 | # CONFIG_SERIO_PCIPS2 is not set | 806 | # CONFIG_SERIO_PCIPS2 is not set |
799 | CONFIG_SERIO_LIBPS2=y | 807 | CONFIG_SERIO_LIBPS2=y |
800 | # CONFIG_SERIO_RAW is not set | 808 | # CONFIG_SERIO_RAW is not set |
809 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
801 | # CONFIG_GAMEPORT is not set | 810 | # CONFIG_GAMEPORT is not set |
802 | 811 | ||
803 | # | 812 | # |
804 | # Character devices | 813 | # Character devices |
805 | # | 814 | # |
806 | CONFIG_VT=y | 815 | CONFIG_VT=y |
816 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
807 | CONFIG_VT_CONSOLE=y | 817 | CONFIG_VT_CONSOLE=y |
808 | CONFIG_HW_CONSOLE=y | 818 | CONFIG_HW_CONSOLE=y |
809 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 819 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -848,46 +858,71 @@ CONFIG_DEVPORT=y | |||
848 | CONFIG_I2C=y | 858 | CONFIG_I2C=y |
849 | CONFIG_I2C_BOARDINFO=y | 859 | CONFIG_I2C_BOARDINFO=y |
850 | # CONFIG_I2C_CHARDEV is not set | 860 | # CONFIG_I2C_CHARDEV is not set |
861 | CONFIG_I2C_HELPER_AUTO=y | ||
851 | CONFIG_I2C_ALGOBIT=y | 862 | CONFIG_I2C_ALGOBIT=y |
852 | 863 | ||
853 | # | 864 | # |
854 | # I2C Hardware Bus support | 865 | # I2C Hardware Bus support |
855 | # | 866 | # |
867 | |||
868 | # | ||
869 | # PC SMBus host controller drivers | ||
870 | # | ||
856 | # CONFIG_I2C_ALI1535 is not set | 871 | # CONFIG_I2C_ALI1535 is not set |
857 | # CONFIG_I2C_ALI1563 is not set | 872 | # CONFIG_I2C_ALI1563 is not set |
858 | # CONFIG_I2C_ALI15X3 is not set | 873 | # CONFIG_I2C_ALI15X3 is not set |
859 | # CONFIG_I2C_AMD756 is not set | 874 | # CONFIG_I2C_AMD756 is not set |
860 | # CONFIG_I2C_AMD8111 is not set | 875 | # CONFIG_I2C_AMD8111 is not set |
861 | # CONFIG_I2C_HYDRA is not set | ||
862 | # CONFIG_I2C_I801 is not set | 876 | # CONFIG_I2C_I801 is not set |
863 | # CONFIG_I2C_I810 is not set | 877 | # CONFIG_I2C_ISCH is not set |
864 | # CONFIG_I2C_PIIX4 is not set | 878 | # CONFIG_I2C_PIIX4 is not set |
865 | # CONFIG_I2C_MPC is not set | ||
866 | # CONFIG_I2C_NFORCE2 is not set | 879 | # CONFIG_I2C_NFORCE2 is not set |
867 | # CONFIG_I2C_OCORES is not set | ||
868 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
869 | # CONFIG_I2C_PROSAVAGE is not set | ||
870 | # CONFIG_I2C_SAVAGE4 is not set | ||
871 | # CONFIG_I2C_SIMTEC is not set | ||
872 | # CONFIG_I2C_SIS5595 is not set | 880 | # CONFIG_I2C_SIS5595 is not set |
873 | # CONFIG_I2C_SIS630 is not set | 881 | # CONFIG_I2C_SIS630 is not set |
874 | # CONFIG_I2C_SIS96X is not set | 882 | # CONFIG_I2C_SIS96X is not set |
875 | # CONFIG_I2C_TAOS_EVM is not set | ||
876 | # CONFIG_I2C_STUB is not set | ||
877 | # CONFIG_I2C_TINY_USB is not set | ||
878 | # CONFIG_I2C_VIA is not set | 883 | # CONFIG_I2C_VIA is not set |
879 | # CONFIG_I2C_VIAPRO is not set | 884 | # CONFIG_I2C_VIAPRO is not set |
885 | |||
886 | # | ||
887 | # Mac SMBus host controller drivers | ||
888 | # | ||
889 | # CONFIG_I2C_HYDRA is not set | ||
890 | |||
891 | # | ||
892 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
893 | # | ||
894 | # CONFIG_I2C_MPC is not set | ||
895 | # CONFIG_I2C_OCORES is not set | ||
896 | # CONFIG_I2C_SIMTEC is not set | ||
897 | |||
898 | # | ||
899 | # External I2C/SMBus adapter drivers | ||
900 | # | ||
901 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
902 | # CONFIG_I2C_TAOS_EVM is not set | ||
903 | # CONFIG_I2C_TINY_USB is not set | ||
904 | |||
905 | # | ||
906 | # Graphics adapter I2C/DDC channel drivers | ||
907 | # | ||
880 | # CONFIG_I2C_VOODOO3 is not set | 908 | # CONFIG_I2C_VOODOO3 is not set |
909 | |||
910 | # | ||
911 | # Other I2C/SMBus bus drivers | ||
912 | # | ||
881 | # CONFIG_I2C_PCA_ISA is not set | 913 | # CONFIG_I2C_PCA_ISA is not set |
882 | # CONFIG_I2C_PCA_PLATFORM is not set | 914 | # CONFIG_I2C_PCA_PLATFORM is not set |
915 | # CONFIG_I2C_STUB is not set | ||
883 | 916 | ||
884 | # | 917 | # |
885 | # Miscellaneous I2C Chip support | 918 | # Miscellaneous I2C Chip support |
886 | # | 919 | # |
887 | # CONFIG_DS1682 is not set | 920 | # CONFIG_DS1682 is not set |
921 | # CONFIG_AT24 is not set | ||
888 | # CONFIG_SENSORS_EEPROM is not set | 922 | # CONFIG_SENSORS_EEPROM is not set |
889 | # CONFIG_SENSORS_PCF8574 is not set | 923 | # CONFIG_SENSORS_PCF8574 is not set |
890 | # CONFIG_PCF8575 is not set | 924 | # CONFIG_PCF8575 is not set |
925 | # CONFIG_SENSORS_PCA9539 is not set | ||
891 | # CONFIG_SENSORS_PCF8591 is not set | 926 | # CONFIG_SENSORS_PCF8591 is not set |
892 | # CONFIG_SENSORS_MAX6875 is not set | 927 | # CONFIG_SENSORS_MAX6875 is not set |
893 | # CONFIG_SENSORS_TSL2550 is not set | 928 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -896,10 +931,13 @@ CONFIG_I2C_ALGOBIT=y | |||
896 | # CONFIG_I2C_DEBUG_BUS is not set | 931 | # CONFIG_I2C_DEBUG_BUS is not set |
897 | # CONFIG_I2C_DEBUG_CHIP is not set | 932 | # CONFIG_I2C_DEBUG_CHIP is not set |
898 | # CONFIG_SPI is not set | 933 | # CONFIG_SPI is not set |
934 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
935 | # CONFIG_GPIOLIB is not set | ||
899 | # CONFIG_W1 is not set | 936 | # CONFIG_W1 is not set |
900 | # CONFIG_POWER_SUPPLY is not set | 937 | # CONFIG_POWER_SUPPLY is not set |
901 | # CONFIG_HWMON is not set | 938 | # CONFIG_HWMON is not set |
902 | # CONFIG_THERMAL is not set | 939 | # CONFIG_THERMAL is not set |
940 | # CONFIG_THERMAL_HWMON is not set | ||
903 | # CONFIG_WATCHDOG is not set | 941 | # CONFIG_WATCHDOG is not set |
904 | 942 | ||
905 | # | 943 | # |
@@ -911,8 +949,10 @@ CONFIG_SSB_POSSIBLE=y | |||
911 | # | 949 | # |
912 | # Multifunction device drivers | 950 | # Multifunction device drivers |
913 | # | 951 | # |
952 | # CONFIG_MFD_CORE is not set | ||
914 | # CONFIG_MFD_SM501 is not set | 953 | # CONFIG_MFD_SM501 is not set |
915 | # CONFIG_HTC_PASIC3 is not set | 954 | # CONFIG_HTC_PASIC3 is not set |
955 | # CONFIG_MFD_TMIO is not set | ||
916 | 956 | ||
917 | # | 957 | # |
918 | # Multimedia devices | 958 | # Multimedia devices |
@@ -997,10 +1037,13 @@ CONFIG_FB_3DFX=y | |||
997 | # CONFIG_FB_TRIDENT is not set | 1037 | # CONFIG_FB_TRIDENT is not set |
998 | # CONFIG_FB_ARK is not set | 1038 | # CONFIG_FB_ARK is not set |
999 | # CONFIG_FB_PM3 is not set | 1039 | # CONFIG_FB_PM3 is not set |
1040 | # CONFIG_FB_CARMINE is not set | ||
1000 | # CONFIG_FB_IBM_GXT4500 is not set | 1041 | # CONFIG_FB_IBM_GXT4500 is not set |
1001 | # CONFIG_FB_VIRTUAL is not set | 1042 | # CONFIG_FB_VIRTUAL is not set |
1002 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1043 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
1003 | CONFIG_LCD_CLASS_DEVICE=m | 1044 | CONFIG_LCD_CLASS_DEVICE=m |
1045 | # CONFIG_LCD_ILI9320 is not set | ||
1046 | # CONFIG_LCD_PLATFORM is not set | ||
1004 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1047 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1005 | # CONFIG_BACKLIGHT_CORGI is not set | 1048 | # CONFIG_BACKLIGHT_CORGI is not set |
1006 | 1049 | ||
@@ -1030,10 +1073,6 @@ CONFIG_LOGO=y | |||
1030 | CONFIG_LOGO_LINUX_MONO=y | 1073 | CONFIG_LOGO_LINUX_MONO=y |
1031 | CONFIG_LOGO_LINUX_VGA16=y | 1074 | CONFIG_LOGO_LINUX_VGA16=y |
1032 | CONFIG_LOGO_LINUX_CLUT224=y | 1075 | CONFIG_LOGO_LINUX_CLUT224=y |
1033 | |||
1034 | # | ||
1035 | # Sound | ||
1036 | # | ||
1037 | # CONFIG_SOUND is not set | 1076 | # CONFIG_SOUND is not set |
1038 | CONFIG_HID_SUPPORT=y | 1077 | CONFIG_HID_SUPPORT=y |
1039 | CONFIG_HID=y | 1078 | CONFIG_HID=y |
@@ -1062,6 +1101,7 @@ CONFIG_USB_DEVICEFS=y | |||
1062 | CONFIG_USB_DEVICE_CLASS=y | 1101 | CONFIG_USB_DEVICE_CLASS=y |
1063 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1102 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1064 | # CONFIG_USB_OTG is not set | 1103 | # CONFIG_USB_OTG is not set |
1104 | CONFIG_USB_MON=y | ||
1065 | 1105 | ||
1066 | # | 1106 | # |
1067 | # USB Host Controller Drivers | 1107 | # USB Host Controller Drivers |
@@ -1087,6 +1127,7 @@ CONFIG_USB_UHCI_HCD=y | |||
1087 | # | 1127 | # |
1088 | # CONFIG_USB_ACM is not set | 1128 | # CONFIG_USB_ACM is not set |
1089 | # CONFIG_USB_PRINTER is not set | 1129 | # CONFIG_USB_PRINTER is not set |
1130 | # CONFIG_USB_WDM is not set | ||
1090 | 1131 | ||
1091 | # | 1132 | # |
1092 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1133 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1108,6 +1149,7 @@ CONFIG_USB_STORAGE=m | |||
1108 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1149 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1109 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1150 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1110 | # CONFIG_USB_STORAGE_KARMA is not set | 1151 | # CONFIG_USB_STORAGE_KARMA is not set |
1152 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1111 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1153 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1112 | # CONFIG_USB_LIBUSUAL is not set | 1154 | # CONFIG_USB_LIBUSUAL is not set |
1113 | 1155 | ||
@@ -1116,7 +1158,6 @@ CONFIG_USB_STORAGE=m | |||
1116 | # | 1158 | # |
1117 | # CONFIG_USB_MDC800 is not set | 1159 | # CONFIG_USB_MDC800 is not set |
1118 | # CONFIG_USB_MICROTEK is not set | 1160 | # CONFIG_USB_MICROTEK is not set |
1119 | CONFIG_USB_MON=y | ||
1120 | 1161 | ||
1121 | # | 1162 | # |
1122 | # USB port drivers | 1163 | # USB port drivers |
@@ -1129,7 +1170,6 @@ CONFIG_USB_MON=y | |||
1129 | # CONFIG_USB_EMI62 is not set | 1170 | # CONFIG_USB_EMI62 is not set |
1130 | # CONFIG_USB_EMI26 is not set | 1171 | # CONFIG_USB_EMI26 is not set |
1131 | # CONFIG_USB_ADUTUX is not set | 1172 | # CONFIG_USB_ADUTUX is not set |
1132 | # CONFIG_USB_AUERSWALD is not set | ||
1133 | # CONFIG_USB_RIO500 is not set | 1173 | # CONFIG_USB_RIO500 is not set |
1134 | # CONFIG_USB_LEGOTOWER is not set | 1174 | # CONFIG_USB_LEGOTOWER is not set |
1135 | # CONFIG_USB_LCD is not set | 1175 | # CONFIG_USB_LCD is not set |
@@ -1146,6 +1186,7 @@ CONFIG_USB_MON=y | |||
1146 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1186 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1147 | # CONFIG_USB_IOWARRIOR is not set | 1187 | # CONFIG_USB_IOWARRIOR is not set |
1148 | # CONFIG_USB_TEST is not set | 1188 | # CONFIG_USB_TEST is not set |
1189 | # CONFIG_USB_ISIGHTFW is not set | ||
1149 | # CONFIG_USB_GADGET is not set | 1190 | # CONFIG_USB_GADGET is not set |
1150 | # CONFIG_MMC is not set | 1191 | # CONFIG_MMC is not set |
1151 | # CONFIG_MEMSTICK is not set | 1192 | # CONFIG_MEMSTICK is not set |
@@ -1226,6 +1267,7 @@ CONFIG_TMPFS=y | |||
1226 | # CONFIG_CRAMFS is not set | 1267 | # CONFIG_CRAMFS is not set |
1227 | # CONFIG_VXFS_FS is not set | 1268 | # CONFIG_VXFS_FS is not set |
1228 | # CONFIG_MINIX_FS is not set | 1269 | # CONFIG_MINIX_FS is not set |
1270 | # CONFIG_OMFS_FS is not set | ||
1229 | # CONFIG_HPFS_FS is not set | 1271 | # CONFIG_HPFS_FS is not set |
1230 | # CONFIG_QNX4FS_FS is not set | 1272 | # CONFIG_QNX4FS_FS is not set |
1231 | # CONFIG_ROMFS_FS is not set | 1273 | # CONFIG_ROMFS_FS is not set |
@@ -1310,6 +1352,7 @@ CONFIG_BITREVERSE=y | |||
1310 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1352 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1311 | CONFIG_CRC_CCITT=m | 1353 | CONFIG_CRC_CCITT=m |
1312 | # CONFIG_CRC16 is not set | 1354 | # CONFIG_CRC16 is not set |
1355 | CONFIG_CRC_T10DIF=y | ||
1313 | # CONFIG_CRC_ITU_T is not set | 1356 | # CONFIG_CRC_ITU_T is not set |
1314 | CONFIG_CRC32=y | 1357 | CONFIG_CRC32=y |
1315 | # CONFIG_CRC7 is not set | 1358 | # CONFIG_CRC7 is not set |
@@ -1336,6 +1379,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1336 | CONFIG_DEBUG_KERNEL=y | 1379 | CONFIG_DEBUG_KERNEL=y |
1337 | # CONFIG_DEBUG_SHIRQ is not set | 1380 | # CONFIG_DEBUG_SHIRQ is not set |
1338 | CONFIG_DETECT_SOFTLOCKUP=y | 1381 | CONFIG_DETECT_SOFTLOCKUP=y |
1382 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1383 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1339 | CONFIG_SCHED_DEBUG=y | 1384 | CONFIG_SCHED_DEBUG=y |
1340 | # CONFIG_SCHEDSTATS is not set | 1385 | # CONFIG_SCHEDSTATS is not set |
1341 | # CONFIG_TIMER_STATS is not set | 1386 | # CONFIG_TIMER_STATS is not set |
@@ -1354,20 +1399,32 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1354 | # CONFIG_DEBUG_INFO is not set | 1399 | # CONFIG_DEBUG_INFO is not set |
1355 | # CONFIG_DEBUG_VM is not set | 1400 | # CONFIG_DEBUG_VM is not set |
1356 | # CONFIG_DEBUG_WRITECOUNT is not set | 1401 | # CONFIG_DEBUG_WRITECOUNT is not set |
1402 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1357 | # CONFIG_DEBUG_LIST is not set | 1403 | # CONFIG_DEBUG_LIST is not set |
1358 | # CONFIG_DEBUG_SG is not set | 1404 | # CONFIG_DEBUG_SG is not set |
1359 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1405 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1360 | # CONFIG_RCU_TORTURE_TEST is not set | 1406 | # CONFIG_RCU_TORTURE_TEST is not set |
1361 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1407 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1362 | # CONFIG_FAULT_INJECTION is not set | 1408 | # CONFIG_FAULT_INJECTION is not set |
1409 | # CONFIG_LATENCYTOP is not set | ||
1410 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1411 | CONFIG_HAVE_FTRACE=y | ||
1412 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1413 | # CONFIG_FTRACE is not set | ||
1414 | # CONFIG_SCHED_TRACER is not set | ||
1415 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1363 | # CONFIG_SAMPLES is not set | 1416 | # CONFIG_SAMPLES is not set |
1417 | CONFIG_HAVE_ARCH_KGDB=y | ||
1418 | # CONFIG_KGDB is not set | ||
1364 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1419 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1365 | # CONFIG_DEBUG_STACK_USAGE is not set | 1420 | # CONFIG_DEBUG_STACK_USAGE is not set |
1366 | # CONFIG_DEBUG_PAGEALLOC is not set | 1421 | # CONFIG_DEBUG_PAGEALLOC is not set |
1367 | CONFIG_DEBUGGER=y | 1422 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1423 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1368 | CONFIG_XMON=y | 1424 | CONFIG_XMON=y |
1369 | CONFIG_XMON_DEFAULT=y | 1425 | CONFIG_XMON_DEFAULT=y |
1370 | CONFIG_XMON_DISASSEMBLY=y | 1426 | CONFIG_XMON_DISASSEMBLY=y |
1427 | CONFIG_DEBUGGER=y | ||
1371 | CONFIG_IRQSTACKS=y | 1428 | CONFIG_IRQSTACKS=y |
1372 | # CONFIG_BDI_SWITCH is not set | 1429 | # CONFIG_BDI_SWITCH is not set |
1373 | # CONFIG_BOOTX_TEXT is not set | 1430 | # CONFIG_BOOTX_TEXT is not set |
@@ -1424,6 +1481,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1424 | # CONFIG_CRYPTO_MD4 is not set | 1481 | # CONFIG_CRYPTO_MD4 is not set |
1425 | # CONFIG_CRYPTO_MD5 is not set | 1482 | # CONFIG_CRYPTO_MD5 is not set |
1426 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1483 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1484 | # CONFIG_CRYPTO_RMD128 is not set | ||
1485 | # CONFIG_CRYPTO_RMD160 is not set | ||
1486 | # CONFIG_CRYPTO_RMD256 is not set | ||
1487 | # CONFIG_CRYPTO_RMD320 is not set | ||
1427 | CONFIG_CRYPTO_SHA1=m | 1488 | CONFIG_CRYPTO_SHA1=m |
1428 | # CONFIG_CRYPTO_SHA256 is not set | 1489 | # CONFIG_CRYPTO_SHA256 is not set |
1429 | # CONFIG_CRYPTO_SHA512 is not set | 1490 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig index ba2a463b9305..ef0c6e800508 100644 --- a/arch/powerpc/configs/ep8248e_defconfig +++ b/arch/powerpc/configs/ep8248e_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:09 2008 | 4 | # Thu Aug 21 00:52:03 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_6xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_ALTIVEC is not set | ||
18 | CONFIG_PPC_STD_MMU=y | 19 | CONFIG_PPC_STD_MMU=y |
19 | CONFIG_PPC_STD_MMU_32=y | 20 | CONFIG_PPC_STD_MMU_32=y |
20 | # CONFIG_PPC_MM_SLICES is not set | 21 | # CONFIG_PPC_MM_SLICES is not set |
@@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
42 | CONFIG_GENERIC_GPIO=y | ||
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 44 | CONFIG_PPC=y |
42 | CONFIG_EARLY_PRINTK=y | 45 | CONFIG_EARLY_PRINTK=y |
@@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
45 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 48 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
46 | CONFIG_PPC_OF=y | 49 | CONFIG_PPC_OF=y |
47 | CONFIG_OF=y | 50 | CONFIG_OF=y |
48 | # CONFIG_PPC_UDBG_16550 is not set | 51 | CONFIG_PPC_UDBG_16550=y |
49 | # CONFIG_GENERIC_TBSYNC is not set | 52 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
52 | # CONFIG_DEFAULT_UIMAGE is not set | 55 | # CONFIG_DEFAULT_UIMAGE is not set |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
53 | # CONFIG_PPC_DCR_NATIVE is not set | 58 | # CONFIG_PPC_DCR_NATIVE is not set |
54 | # CONFIG_PPC_DCR_MMIO is not set | 59 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -81,7 +86,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
81 | CONFIG_SYSCTL=y | 86 | CONFIG_SYSCTL=y |
82 | CONFIG_EMBEDDED=y | 87 | CONFIG_EMBEDDED=y |
83 | CONFIG_SYSCTL_SYSCALL=y | 88 | CONFIG_SYSCTL_SYSCALL=y |
84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
85 | CONFIG_KALLSYMS=y | 89 | CONFIG_KALLSYMS=y |
86 | CONFIG_KALLSYMS_ALL=y | 90 | CONFIG_KALLSYMS_ALL=y |
87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -89,6 +93,7 @@ CONFIG_HOTPLUG=y | |||
89 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
90 | CONFIG_BUG=y | 94 | CONFIG_BUG=y |
91 | CONFIG_ELF_CORE=y | 95 | CONFIG_ELF_CORE=y |
96 | CONFIG_PCSPKR_PLATFORM=y | ||
92 | CONFIG_COMPAT_BRK=y | 97 | CONFIG_COMPAT_BRK=y |
93 | CONFIG_BASE_FULL=y | 98 | CONFIG_BASE_FULL=y |
94 | CONFIG_FUTEX=y | 99 | CONFIG_FUTEX=y |
@@ -105,10 +110,16 @@ CONFIG_SLAB=y | |||
105 | # CONFIG_PROFILING is not set | 110 | # CONFIG_PROFILING is not set |
106 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
107 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
114 | CONFIG_HAVE_IOREMAP_PROT=y | ||
108 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
109 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
110 | # CONFIG_HAVE_DMA_ATTRS is not set | 118 | # CONFIG_HAVE_DMA_ATTRS is not set |
119 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
120 | CONFIG_HAVE_CLK=y | ||
111 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
112 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
113 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_RT_MUTEXES=y |
114 | # CONFIG_TINY_SHMEM is not set | 125 | # CONFIG_TINY_SHMEM is not set |
@@ -118,6 +129,7 @@ CONFIG_BLOCK=y | |||
118 | # CONFIG_LBD is not set | 129 | # CONFIG_LBD is not set |
119 | # CONFIG_BLK_DEV_IO_TRACE is not set | 130 | # CONFIG_BLK_DEV_IO_TRACE is not set |
120 | # CONFIG_LSF is not set | 131 | # CONFIG_LSF is not set |
132 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
121 | 133 | ||
122 | # | 134 | # |
123 | # IO Schedulers | 135 | # IO Schedulers |
@@ -136,33 +148,43 @@ CONFIG_CLASSIC_RCU=y | |||
136 | # | 148 | # |
137 | # Platform support | 149 | # Platform support |
138 | # | 150 | # |
139 | # CONFIG_PPC_MULTIPLATFORM is not set | 151 | CONFIG_PPC_MULTIPLATFORM=y |
140 | CONFIG_PPC_82xx=y | 152 | CONFIG_CLASSIC32=y |
141 | # CONFIG_PPC_83xx is not set | 153 | CONFIG_PPC_CHRP=y |
142 | # CONFIG_PPC_86xx is not set | 154 | # CONFIG_MPC5121_ADS is not set |
143 | # CONFIG_PPC_MPC512x is not set | 155 | # CONFIG_MPC5121_GENERIC is not set |
144 | # CONFIG_PPC_MPC5121 is not set | 156 | # CONFIG_PPC_MPC52xx is not set |
157 | CONFIG_PPC_PMAC=y | ||
145 | # CONFIG_PPC_CELL is not set | 158 | # CONFIG_PPC_CELL is not set |
146 | # CONFIG_PPC_CELL_NATIVE is not set | 159 | # CONFIG_PPC_CELL_NATIVE is not set |
160 | CONFIG_PPC_82xx=y | ||
147 | # CONFIG_MPC8272_ADS is not set | 161 | # CONFIG_MPC8272_ADS is not set |
148 | # CONFIG_PQ2FADS is not set | 162 | # CONFIG_PQ2FADS is not set |
149 | CONFIG_EP8248E=y | 163 | CONFIG_EP8248E=y |
150 | # CONFIG_PQ2ADS is not set | 164 | # CONFIG_PQ2ADS is not set |
151 | CONFIG_8260=y | 165 | CONFIG_8260=y |
152 | CONFIG_8272=y | 166 | CONFIG_8272=y |
167 | # CONFIG_PPC_83xx is not set | ||
168 | # CONFIG_PPC_86xx is not set | ||
169 | # CONFIG_EMBEDDED6xx is not set | ||
170 | CONFIG_PPC_NATIVE=y | ||
171 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
153 | # CONFIG_IPIC is not set | 172 | # CONFIG_IPIC is not set |
154 | # CONFIG_MPIC is not set | 173 | CONFIG_MPIC=y |
155 | # CONFIG_MPIC_WEIRD is not set | 174 | # CONFIG_MPIC_WEIRD is not set |
156 | # CONFIG_PPC_I8259 is not set | 175 | CONFIG_PPC_I8259=y |
157 | # CONFIG_PPC_RTAS is not set | 176 | CONFIG_PPC_RTAS=y |
177 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
178 | CONFIG_RTAS_PROC=y | ||
158 | # CONFIG_MMIO_NVRAM is not set | 179 | # CONFIG_MMIO_NVRAM is not set |
159 | # CONFIG_PPC_MPC106 is not set | 180 | CONFIG_PPC_MPC106=y |
160 | # CONFIG_PPC_970_NAP is not set | 181 | # CONFIG_PPC_970_NAP is not set |
161 | # CONFIG_PPC_INDIRECT_IO is not set | 182 | # CONFIG_PPC_INDIRECT_IO is not set |
162 | # CONFIG_GENERIC_IOMAP is not set | 183 | # CONFIG_GENERIC_IOMAP is not set |
163 | # CONFIG_CPU_FREQ is not set | 184 | # CONFIG_CPU_FREQ is not set |
185 | # CONFIG_PPC601_SYNC_FIX is not set | ||
186 | # CONFIG_TAU is not set | ||
164 | CONFIG_CPM2=y | 187 | CONFIG_CPM2=y |
165 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
166 | # CONFIG_FSL_ULI1575 is not set | 188 | # CONFIG_FSL_ULI1575 is not set |
167 | CONFIG_CPM=y | 189 | CONFIG_CPM=y |
168 | 190 | ||
@@ -197,6 +219,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
197 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
198 | CONFIG_PAGEFLAGS_EXTENDED=y | 220 | CONFIG_PAGEFLAGS_EXTENDED=y |
199 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 221 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
222 | CONFIG_MIGRATION=y | ||
200 | # CONFIG_RESOURCES_64BIT is not set | 223 | # CONFIG_RESOURCES_64BIT is not set |
201 | CONFIG_ZONE_DMA_FLAG=1 | 224 | CONFIG_ZONE_DMA_FLAG=1 |
202 | CONFIG_BOUNCE=y | 225 | CONFIG_BOUNCE=y |
@@ -204,6 +227,7 @@ CONFIG_VIRT_TO_BUS=y | |||
204 | CONFIG_FORCE_MAX_ZONEORDER=11 | 227 | CONFIG_FORCE_MAX_ZONEORDER=11 |
205 | CONFIG_PROC_DEVICETREE=y | 228 | CONFIG_PROC_DEVICETREE=y |
206 | # CONFIG_CMDLINE_BOOL is not set | 229 | # CONFIG_CMDLINE_BOOL is not set |
230 | CONFIG_EXTRA_TARGETS="" | ||
207 | # CONFIG_PM is not set | 231 | # CONFIG_PM is not set |
208 | # CONFIG_SECCOMP is not set | 232 | # CONFIG_SECCOMP is not set |
209 | CONFIG_ISA_DMA_API=y | 233 | CONFIG_ISA_DMA_API=y |
@@ -211,13 +235,22 @@ CONFIG_ISA_DMA_API=y | |||
211 | # | 235 | # |
212 | # Bus options | 236 | # Bus options |
213 | # | 237 | # |
238 | # CONFIG_ISA is not set | ||
214 | CONFIG_ZONE_DMA=y | 239 | CONFIG_ZONE_DMA=y |
240 | CONFIG_PPC_INDIRECT_PCI=y | ||
215 | CONFIG_FSL_SOC=y | 241 | CONFIG_FSL_SOC=y |
216 | # CONFIG_PCI is not set | 242 | CONFIG_PPC_PCI_CHOICE=y |
217 | # CONFIG_PCI_DOMAINS is not set | 243 | CONFIG_PCI=y |
218 | # CONFIG_PCI_SYSCALL is not set | 244 | CONFIG_PCI_DOMAINS=y |
219 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 245 | CONFIG_PCI_SYSCALL=y |
246 | CONFIG_PCI_8260=y | ||
247 | # CONFIG_PCIEPORTBUS is not set | ||
248 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
249 | # CONFIG_PCI_MSI is not set | ||
250 | CONFIG_PCI_LEGACY=y | ||
251 | # CONFIG_PCI_DEBUG is not set | ||
220 | # CONFIG_PCCARD is not set | 252 | # CONFIG_PCCARD is not set |
253 | # CONFIG_HOTPLUG_PCI is not set | ||
221 | # CONFIG_HAS_RAPIDIO is not set | 254 | # CONFIG_HAS_RAPIDIO is not set |
222 | 255 | ||
223 | # | 256 | # |
@@ -233,10 +266,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
233 | CONFIG_KERNEL_START=0xc0000000 | 266 | CONFIG_KERNEL_START=0xc0000000 |
234 | CONFIG_PHYSICAL_START=0x00000000 | 267 | CONFIG_PHYSICAL_START=0x00000000 |
235 | CONFIG_TASK_SIZE=0xc0000000 | 268 | CONFIG_TASK_SIZE=0xc0000000 |
236 | |||
237 | # | ||
238 | # Networking | ||
239 | # | ||
240 | CONFIG_NET=y | 269 | CONFIG_NET=y |
241 | 270 | ||
242 | # | 271 | # |
@@ -410,11 +439,13 @@ CONFIG_MTD_CFI_UTIL=y | |||
410 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 439 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
411 | # CONFIG_MTD_PHYSMAP is not set | 440 | # CONFIG_MTD_PHYSMAP is not set |
412 | CONFIG_MTD_PHYSMAP_OF=y | 441 | CONFIG_MTD_PHYSMAP_OF=y |
442 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
413 | # CONFIG_MTD_PLATRAM is not set | 443 | # CONFIG_MTD_PLATRAM is not set |
414 | 444 | ||
415 | # | 445 | # |
416 | # Self-contained MTD device drivers | 446 | # Self-contained MTD device drivers |
417 | # | 447 | # |
448 | # CONFIG_MTD_PMC551 is not set | ||
418 | # CONFIG_MTD_SLRAM is not set | 449 | # CONFIG_MTD_SLRAM is not set |
419 | # CONFIG_MTD_PHRAM is not set | 450 | # CONFIG_MTD_PHRAM is not set |
420 | # CONFIG_MTD_MTDRAM is not set | 451 | # CONFIG_MTD_MTDRAM is not set |
@@ -434,16 +465,23 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
434 | # | 465 | # |
435 | # CONFIG_MTD_UBI is not set | 466 | # CONFIG_MTD_UBI is not set |
436 | CONFIG_OF_DEVICE=y | 467 | CONFIG_OF_DEVICE=y |
468 | CONFIG_OF_GPIO=y | ||
437 | # CONFIG_PARPORT is not set | 469 | # CONFIG_PARPORT is not set |
438 | CONFIG_BLK_DEV=y | 470 | CONFIG_BLK_DEV=y |
439 | # CONFIG_BLK_DEV_FD is not set | 471 | # CONFIG_BLK_DEV_FD is not set |
472 | # CONFIG_MAC_FLOPPY is not set | ||
473 | # CONFIG_BLK_CPQ_DA is not set | ||
474 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
475 | # CONFIG_BLK_DEV_DAC960 is not set | ||
440 | # CONFIG_BLK_DEV_COW_COMMON is not set | 476 | # CONFIG_BLK_DEV_COW_COMMON is not set |
441 | CONFIG_BLK_DEV_LOOP=y | 477 | CONFIG_BLK_DEV_LOOP=y |
442 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 478 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
443 | # CONFIG_BLK_DEV_NBD is not set | 479 | # CONFIG_BLK_DEV_NBD is not set |
480 | # CONFIG_BLK_DEV_SX8 is not set | ||
444 | # CONFIG_BLK_DEV_RAM is not set | 481 | # CONFIG_BLK_DEV_RAM is not set |
445 | # CONFIG_CDROM_PKTCDVD is not set | 482 | # CONFIG_CDROM_PKTCDVD is not set |
446 | # CONFIG_ATA_OVER_ETH is not set | 483 | # CONFIG_ATA_OVER_ETH is not set |
484 | # CONFIG_BLK_DEV_HD is not set | ||
447 | # CONFIG_MISC_DEVICES is not set | 485 | # CONFIG_MISC_DEVICES is not set |
448 | CONFIG_HAVE_IDE=y | 486 | CONFIG_HAVE_IDE=y |
449 | # CONFIG_IDE is not set | 487 | # CONFIG_IDE is not set |
@@ -457,14 +495,25 @@ CONFIG_HAVE_IDE=y | |||
457 | # CONFIG_SCSI_NETLINK is not set | 495 | # CONFIG_SCSI_NETLINK is not set |
458 | # CONFIG_ATA is not set | 496 | # CONFIG_ATA is not set |
459 | # CONFIG_MD is not set | 497 | # CONFIG_MD is not set |
498 | # CONFIG_FUSION is not set | ||
499 | |||
500 | # | ||
501 | # IEEE 1394 (FireWire) support | ||
502 | # | ||
503 | |||
504 | # | ||
505 | # A new alternative FireWire stack is available with EXPERIMENTAL=y | ||
506 | # | ||
507 | # CONFIG_IEEE1394 is not set | ||
508 | # CONFIG_I2O is not set | ||
460 | # CONFIG_MACINTOSH_DRIVERS is not set | 509 | # CONFIG_MACINTOSH_DRIVERS is not set |
461 | CONFIG_NETDEVICES=y | 510 | CONFIG_NETDEVICES=y |
462 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
463 | # CONFIG_DUMMY is not set | 511 | # CONFIG_DUMMY is not set |
464 | # CONFIG_BONDING is not set | 512 | # CONFIG_BONDING is not set |
465 | # CONFIG_EQUALIZER is not set | 513 | # CONFIG_EQUALIZER is not set |
466 | # CONFIG_TUN is not set | 514 | # CONFIG_TUN is not set |
467 | # CONFIG_VETH is not set | 515 | # CONFIG_VETH is not set |
516 | # CONFIG_ARCNET is not set | ||
468 | CONFIG_PHYLIB=y | 517 | CONFIG_PHYLIB=y |
469 | 518 | ||
470 | # | 519 | # |
@@ -482,21 +531,59 @@ CONFIG_DAVICOM_PHY=y | |||
482 | # CONFIG_REALTEK_PHY is not set | 531 | # CONFIG_REALTEK_PHY is not set |
483 | # CONFIG_FIXED_PHY is not set | 532 | # CONFIG_FIXED_PHY is not set |
484 | CONFIG_MDIO_BITBANG=y | 533 | CONFIG_MDIO_BITBANG=y |
534 | # CONFIG_MDIO_OF_GPIO is not set | ||
485 | CONFIG_NET_ETHERNET=y | 535 | CONFIG_NET_ETHERNET=y |
486 | CONFIG_MII=y | 536 | CONFIG_MII=y |
537 | # CONFIG_MACE is not set | ||
538 | # CONFIG_BMAC is not set | ||
539 | # CONFIG_HAPPYMEAL is not set | ||
540 | # CONFIG_SUNGEM is not set | ||
541 | # CONFIG_CASSINI is not set | ||
542 | # CONFIG_NET_VENDOR_3COM is not set | ||
543 | # CONFIG_NET_TULIP is not set | ||
544 | # CONFIG_HP100 is not set | ||
487 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 545 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
488 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 546 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
489 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 547 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
490 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 548 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
549 | # CONFIG_NET_PCI is not set | ||
491 | # CONFIG_B44 is not set | 550 | # CONFIG_B44 is not set |
492 | CONFIG_FS_ENET=y | 551 | CONFIG_FS_ENET=y |
493 | # CONFIG_FS_ENET_HAS_SCC is not set | 552 | # CONFIG_FS_ENET_HAS_SCC is not set |
494 | CONFIG_FS_ENET_HAS_FCC=y | 553 | CONFIG_FS_ENET_HAS_FCC=y |
495 | # CONFIG_FS_ENET_MDIO_FCC is not set | 554 | # CONFIG_FS_ENET_MDIO_FCC is not set |
496 | CONFIG_NETDEV_1000=y | 555 | CONFIG_NETDEV_1000=y |
497 | # CONFIG_E1000E_ENABLED is not set | 556 | # CONFIG_ACENIC is not set |
557 | # CONFIG_DL2K is not set | ||
558 | # CONFIG_E1000 is not set | ||
559 | # CONFIG_E1000E is not set | ||
560 | # CONFIG_IGB is not set | ||
561 | # CONFIG_NS83820 is not set | ||
562 | # CONFIG_HAMACHI is not set | ||
563 | # CONFIG_R8169 is not set | ||
564 | # CONFIG_SIS190 is not set | ||
565 | # CONFIG_SKGE is not set | ||
566 | # CONFIG_SKY2 is not set | ||
567 | # CONFIG_VIA_VELOCITY is not set | ||
568 | # CONFIG_TIGON3 is not set | ||
569 | # CONFIG_BNX2 is not set | ||
498 | # CONFIG_GIANFAR is not set | 570 | # CONFIG_GIANFAR is not set |
571 | # CONFIG_MV643XX_ETH is not set | ||
572 | # CONFIG_QLA3XXX is not set | ||
499 | CONFIG_NETDEV_10000=y | 573 | CONFIG_NETDEV_10000=y |
574 | # CONFIG_CHELSIO_T1 is not set | ||
575 | # CONFIG_CHELSIO_T3 is not set | ||
576 | # CONFIG_IXGBE is not set | ||
577 | # CONFIG_IXGB is not set | ||
578 | # CONFIG_S2IO is not set | ||
579 | # CONFIG_MYRI10GE is not set | ||
580 | # CONFIG_NETXEN_NIC is not set | ||
581 | # CONFIG_NIU is not set | ||
582 | # CONFIG_MLX4_CORE is not set | ||
583 | # CONFIG_TEHUTI is not set | ||
584 | # CONFIG_BNX2X is not set | ||
585 | # CONFIG_SFC is not set | ||
586 | # CONFIG_TR is not set | ||
500 | 587 | ||
501 | # | 588 | # |
502 | # Wireless LAN | 589 | # Wireless LAN |
@@ -505,6 +592,7 @@ CONFIG_NETDEV_10000=y | |||
505 | # CONFIG_WLAN_80211 is not set | 592 | # CONFIG_WLAN_80211 is not set |
506 | # CONFIG_IWLWIFI_LEDS is not set | 593 | # CONFIG_IWLWIFI_LEDS is not set |
507 | # CONFIG_WAN is not set | 594 | # CONFIG_WAN is not set |
595 | # CONFIG_FDDI is not set | ||
508 | # CONFIG_PPP is not set | 596 | # CONFIG_PPP is not set |
509 | # CONFIG_SLIP is not set | 597 | # CONFIG_SLIP is not set |
510 | # CONFIG_NETPOLL is not set | 598 | # CONFIG_NETPOLL is not set |
@@ -541,6 +629,7 @@ CONFIG_DEVKMEM=y | |||
541 | # CONFIG_SERIAL_UARTLITE is not set | 629 | # CONFIG_SERIAL_UARTLITE is not set |
542 | CONFIG_SERIAL_CORE=y | 630 | CONFIG_SERIAL_CORE=y |
543 | CONFIG_SERIAL_CORE_CONSOLE=y | 631 | CONFIG_SERIAL_CORE_CONSOLE=y |
632 | # CONFIG_SERIAL_PMACZILOG is not set | ||
544 | CONFIG_SERIAL_CPM=y | 633 | CONFIG_SERIAL_CPM=y |
545 | CONFIG_SERIAL_CPM_CONSOLE=y | 634 | CONFIG_SERIAL_CPM_CONSOLE=y |
546 | CONFIG_SERIAL_CPM_SCC1=y | 635 | CONFIG_SERIAL_CPM_SCC1=y |
@@ -549,21 +638,44 @@ CONFIG_SERIAL_CPM_SCC1=y | |||
549 | CONFIG_SERIAL_CPM_SCC4=y | 638 | CONFIG_SERIAL_CPM_SCC4=y |
550 | # CONFIG_SERIAL_CPM_SMC1 is not set | 639 | # CONFIG_SERIAL_CPM_SMC1 is not set |
551 | # CONFIG_SERIAL_CPM_SMC2 is not set | 640 | # CONFIG_SERIAL_CPM_SMC2 is not set |
641 | # CONFIG_SERIAL_JSM is not set | ||
552 | CONFIG_UNIX98_PTYS=y | 642 | CONFIG_UNIX98_PTYS=y |
553 | CONFIG_LEGACY_PTYS=y | 643 | CONFIG_LEGACY_PTYS=y |
554 | CONFIG_LEGACY_PTY_COUNT=256 | 644 | CONFIG_LEGACY_PTY_COUNT=256 |
645 | # CONFIG_BRIQ_PANEL is not set | ||
646 | # CONFIG_HVC_RTAS is not set | ||
555 | # CONFIG_IPMI_HANDLER is not set | 647 | # CONFIG_IPMI_HANDLER is not set |
556 | CONFIG_HW_RANDOM=y | 648 | CONFIG_HW_RANDOM=y |
557 | # CONFIG_NVRAM is not set | 649 | # CONFIG_NVRAM is not set |
558 | # CONFIG_GEN_RTC is not set | 650 | # CONFIG_GEN_RTC is not set |
559 | # CONFIG_R3964 is not set | 651 | # CONFIG_R3964 is not set |
652 | # CONFIG_APPLICOM is not set | ||
560 | # CONFIG_RAW_DRIVER is not set | 653 | # CONFIG_RAW_DRIVER is not set |
654 | CONFIG_DEVPORT=y | ||
561 | # CONFIG_I2C is not set | 655 | # CONFIG_I2C is not set |
562 | # CONFIG_SPI is not set | 656 | # CONFIG_SPI is not set |
657 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
658 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
659 | CONFIG_GPIOLIB=y | ||
660 | # CONFIG_DEBUG_GPIO is not set | ||
661 | |||
662 | # | ||
663 | # I2C GPIO expanders: | ||
664 | # | ||
665 | |||
666 | # | ||
667 | # PCI GPIO expanders: | ||
668 | # | ||
669 | # CONFIG_GPIO_BT8XX is not set | ||
670 | |||
671 | # | ||
672 | # SPI GPIO expanders: | ||
673 | # | ||
563 | # CONFIG_W1 is not set | 674 | # CONFIG_W1 is not set |
564 | # CONFIG_POWER_SUPPLY is not set | 675 | # CONFIG_POWER_SUPPLY is not set |
565 | # CONFIG_HWMON is not set | 676 | # CONFIG_HWMON is not set |
566 | # CONFIG_THERMAL is not set | 677 | # CONFIG_THERMAL is not set |
678 | # CONFIG_THERMAL_HWMON is not set | ||
567 | # CONFIG_WATCHDOG is not set | 679 | # CONFIG_WATCHDOG is not set |
568 | 680 | ||
569 | # | 681 | # |
@@ -575,8 +687,10 @@ CONFIG_SSB_POSSIBLE=y | |||
575 | # | 687 | # |
576 | # Multifunction device drivers | 688 | # Multifunction device drivers |
577 | # | 689 | # |
690 | # CONFIG_MFD_CORE is not set | ||
578 | # CONFIG_MFD_SM501 is not set | 691 | # CONFIG_MFD_SM501 is not set |
579 | # CONFIG_HTC_PASIC3 is not set | 692 | # CONFIG_HTC_PASIC3 is not set |
693 | # CONFIG_MFD_TMIO is not set | ||
580 | 694 | ||
581 | # | 695 | # |
582 | # Multimedia devices | 696 | # Multimedia devices |
@@ -597,6 +711,8 @@ CONFIG_DAB=y | |||
597 | # | 711 | # |
598 | # Graphics support | 712 | # Graphics support |
599 | # | 713 | # |
714 | # CONFIG_AGP is not set | ||
715 | # CONFIG_DRM is not set | ||
600 | # CONFIG_VGASTATE is not set | 716 | # CONFIG_VGASTATE is not set |
601 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | 717 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set |
602 | # CONFIG_FB is not set | 718 | # CONFIG_FB is not set |
@@ -606,16 +722,13 @@ CONFIG_DAB=y | |||
606 | # Display device support | 722 | # Display device support |
607 | # | 723 | # |
608 | # CONFIG_DISPLAY_SUPPORT is not set | 724 | # CONFIG_DISPLAY_SUPPORT is not set |
609 | |||
610 | # | ||
611 | # Sound | ||
612 | # | ||
613 | # CONFIG_SOUND is not set | 725 | # CONFIG_SOUND is not set |
614 | # CONFIG_USB_SUPPORT is not set | 726 | # CONFIG_USB_SUPPORT is not set |
615 | # CONFIG_MMC is not set | 727 | # CONFIG_MMC is not set |
616 | # CONFIG_MEMSTICK is not set | 728 | # CONFIG_MEMSTICK is not set |
617 | # CONFIG_NEW_LEDS is not set | 729 | # CONFIG_NEW_LEDS is not set |
618 | # CONFIG_ACCESSIBILITY is not set | 730 | # CONFIG_ACCESSIBILITY is not set |
731 | # CONFIG_INFINIBAND is not set | ||
619 | # CONFIG_RTC_CLASS is not set | 732 | # CONFIG_RTC_CLASS is not set |
620 | # CONFIG_DMADEVICES is not set | 733 | # CONFIG_DMADEVICES is not set |
621 | # CONFIG_UIO is not set | 734 | # CONFIG_UIO is not set |
@@ -675,6 +788,7 @@ CONFIG_TMPFS=y | |||
675 | CONFIG_CRAMFS=y | 788 | CONFIG_CRAMFS=y |
676 | # CONFIG_VXFS_FS is not set | 789 | # CONFIG_VXFS_FS is not set |
677 | # CONFIG_MINIX_FS is not set | 790 | # CONFIG_MINIX_FS is not set |
791 | # CONFIG_OMFS_FS is not set | ||
678 | # CONFIG_HPFS_FS is not set | 792 | # CONFIG_HPFS_FS is not set |
679 | # CONFIG_QNX4FS_FS is not set | 793 | # CONFIG_QNX4FS_FS is not set |
680 | # CONFIG_ROMFS_FS is not set | 794 | # CONFIG_ROMFS_FS is not set |
@@ -684,8 +798,8 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
684 | CONFIG_NFS_FS=y | 798 | CONFIG_NFS_FS=y |
685 | CONFIG_NFS_V3=y | 799 | CONFIG_NFS_V3=y |
686 | # CONFIG_NFS_V3_ACL is not set | 800 | # CONFIG_NFS_V3_ACL is not set |
687 | # CONFIG_NFSD is not set | ||
688 | CONFIG_ROOT_NFS=y | 801 | CONFIG_ROOT_NFS=y |
802 | # CONFIG_NFSD is not set | ||
689 | CONFIG_LOCKD=y | 803 | CONFIG_LOCKD=y |
690 | CONFIG_LOCKD_V4=y | 804 | CONFIG_LOCKD_V4=y |
691 | CONFIG_NFS_COMMON=y | 805 | CONFIG_NFS_COMMON=y |
@@ -763,6 +877,7 @@ CONFIG_NLS_UTF8=y | |||
763 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 877 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
764 | # CONFIG_CRC_CCITT is not set | 878 | # CONFIG_CRC_CCITT is not set |
765 | # CONFIG_CRC16 is not set | 879 | # CONFIG_CRC16 is not set |
880 | # CONFIG_CRC_T10DIF is not set | ||
766 | # CONFIG_CRC_ITU_T is not set | 881 | # CONFIG_CRC_ITU_T is not set |
767 | # CONFIG_CRC32 is not set | 882 | # CONFIG_CRC32 is not set |
768 | # CONFIG_CRC7 is not set | 883 | # CONFIG_CRC7 is not set |
@@ -804,19 +919,31 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
804 | CONFIG_DEBUG_INFO=y | 919 | CONFIG_DEBUG_INFO=y |
805 | # CONFIG_DEBUG_VM is not set | 920 | # CONFIG_DEBUG_VM is not set |
806 | # CONFIG_DEBUG_WRITECOUNT is not set | 921 | # CONFIG_DEBUG_WRITECOUNT is not set |
922 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
807 | # CONFIG_DEBUG_LIST is not set | 923 | # CONFIG_DEBUG_LIST is not set |
808 | # CONFIG_DEBUG_SG is not set | 924 | # CONFIG_DEBUG_SG is not set |
809 | # CONFIG_BOOT_PRINTK_DELAY is not set | 925 | # CONFIG_BOOT_PRINTK_DELAY is not set |
926 | # CONFIG_RCU_TORTURE_TEST is not set | ||
810 | # CONFIG_BACKTRACE_SELF_TEST is not set | 927 | # CONFIG_BACKTRACE_SELF_TEST is not set |
811 | # CONFIG_FAULT_INJECTION is not set | 928 | # CONFIG_FAULT_INJECTION is not set |
929 | # CONFIG_LATENCYTOP is not set | ||
930 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
931 | CONFIG_HAVE_FTRACE=y | ||
932 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
933 | # CONFIG_FTRACE is not set | ||
934 | # CONFIG_SCHED_TRACER is not set | ||
935 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
812 | # CONFIG_SAMPLES is not set | 936 | # CONFIG_SAMPLES is not set |
937 | CONFIG_HAVE_ARCH_KGDB=y | ||
813 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 938 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
814 | # CONFIG_DEBUG_STACK_USAGE is not set | 939 | # CONFIG_DEBUG_STACK_USAGE is not set |
815 | # CONFIG_DEBUG_PAGEALLOC is not set | 940 | # CONFIG_DEBUG_PAGEALLOC is not set |
816 | # CONFIG_DEBUGGER is not set | 941 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
817 | # CONFIG_KGDB_CONSOLE is not set | 942 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
943 | # CONFIG_XMON is not set | ||
818 | # CONFIG_IRQSTACKS is not set | 944 | # CONFIG_IRQSTACKS is not set |
819 | CONFIG_BDI_SWITCH=y | 945 | CONFIG_BDI_SWITCH=y |
946 | # CONFIG_BOOTX_TEXT is not set | ||
820 | # CONFIG_PPC_EARLY_DEBUG is not set | 947 | # CONFIG_PPC_EARLY_DEBUG is not set |
821 | 948 | ||
822 | # | 949 | # |
@@ -824,6 +951,7 @@ CONFIG_BDI_SWITCH=y | |||
824 | # | 951 | # |
825 | # CONFIG_KEYS is not set | 952 | # CONFIG_KEYS is not set |
826 | # CONFIG_SECURITY is not set | 953 | # CONFIG_SECURITY is not set |
954 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
827 | CONFIG_CRYPTO=y | 955 | CONFIG_CRYPTO=y |
828 | 956 | ||
829 | # | 957 | # |
@@ -864,6 +992,10 @@ CONFIG_CRYPTO_PCBC=y | |||
864 | # CONFIG_CRYPTO_MD4 is not set | 992 | # CONFIG_CRYPTO_MD4 is not set |
865 | CONFIG_CRYPTO_MD5=y | 993 | CONFIG_CRYPTO_MD5=y |
866 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 994 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
995 | # CONFIG_CRYPTO_RMD128 is not set | ||
996 | # CONFIG_CRYPTO_RMD160 is not set | ||
997 | # CONFIG_CRYPTO_RMD256 is not set | ||
998 | # CONFIG_CRYPTO_RMD320 is not set | ||
867 | # CONFIG_CRYPTO_SHA1 is not set | 999 | # CONFIG_CRYPTO_SHA1 is not set |
868 | # CONFIG_CRYPTO_SHA256 is not set | 1000 | # CONFIG_CRYPTO_SHA256 is not set |
869 | # CONFIG_CRYPTO_SHA512 is not set | 1001 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -894,6 +1026,6 @@ CONFIG_CRYPTO_DES=y | |||
894 | # CONFIG_CRYPTO_DEFLATE is not set | 1026 | # CONFIG_CRYPTO_DEFLATE is not set |
895 | # CONFIG_CRYPTO_LZO is not set | 1027 | # CONFIG_CRYPTO_LZO is not set |
896 | # CONFIG_CRYPTO_HW is not set | 1028 | # CONFIG_CRYPTO_HW is not set |
897 | # CONFIG_PPC_CLOCK is not set | 1029 | CONFIG_PPC_CLOCK=y |
898 | CONFIG_PPC_LIB_RHEAP=y | 1030 | CONFIG_PPC_LIB_RHEAP=y |
899 | # CONFIG_VIRTUALIZATION is not set | 1031 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig index ac72b48542dc..480225be2f39 100644 --- a/arch/powerpc/configs/ep88xc_defconfig +++ b/arch/powerpc/configs/ep88xc_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:09 2008 | 4 | # Thu Aug 21 00:52:04 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -108,10 +109,16 @@ CONFIG_SLUB=y | |||
108 | # CONFIG_PROFILING is not set | 109 | # CONFIG_PROFILING is not set |
109 | # CONFIG_MARKERS is not set | 110 | # CONFIG_MARKERS is not set |
110 | CONFIG_HAVE_OPROFILE=y | 111 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
113 | CONFIG_HAVE_IOREMAP_PROT=y | ||
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
113 | # CONFIG_HAVE_DMA_ATTRS is not set | 117 | # CONFIG_HAVE_DMA_ATTRS is not set |
118 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
119 | CONFIG_HAVE_CLK=y | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
115 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
116 | # CONFIG_TINY_SHMEM is not set | 123 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=1 | 124 | CONFIG_BASE_SMALL=1 |
@@ -121,6 +128,7 @@ CONFIG_BLOCK=y | |||
121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 128 | # CONFIG_BLK_DEV_IO_TRACE is not set |
122 | # CONFIG_LSF is not set | 129 | # CONFIG_LSF is not set |
123 | # CONFIG_BLK_DEV_BSG is not set | 130 | # CONFIG_BLK_DEV_BSG is not set |
131 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
124 | 132 | ||
125 | # | 133 | # |
126 | # IO Schedulers | 134 | # IO Schedulers |
@@ -139,8 +147,6 @@ CONFIG_CLASSIC_RCU=y | |||
139 | # | 147 | # |
140 | # Platform support | 148 | # Platform support |
141 | # | 149 | # |
142 | # CONFIG_PPC_MPC512x is not set | ||
143 | # CONFIG_PPC_MPC5121 is not set | ||
144 | # CONFIG_PPC_CELL is not set | 150 | # CONFIG_PPC_CELL is not set |
145 | # CONFIG_PPC_CELL_NATIVE is not set | 151 | # CONFIG_PPC_CELL_NATIVE is not set |
146 | CONFIG_CPM1=y | 152 | CONFIG_CPM1=y |
@@ -158,6 +164,7 @@ CONFIG_PPC_EP88XC=y | |||
158 | # Generic MPC8xx Options | 164 | # Generic MPC8xx Options |
159 | # | 165 | # |
160 | CONFIG_8xx_COPYBACK=y | 166 | CONFIG_8xx_COPYBACK=y |
167 | # CONFIG_8xx_GPIO is not set | ||
161 | # CONFIG_8xx_CPU6 is not set | 168 | # CONFIG_8xx_CPU6 is not set |
162 | CONFIG_8xx_CPU15=y | 169 | CONFIG_8xx_CPU15=y |
163 | CONFIG_NO_UCODE_PATCH=y | 170 | CONFIG_NO_UCODE_PATCH=y |
@@ -176,7 +183,6 @@ CONFIG_NO_UCODE_PATCH=y | |||
176 | # CONFIG_PPC_INDIRECT_IO is not set | 183 | # CONFIG_PPC_INDIRECT_IO is not set |
177 | # CONFIG_GENERIC_IOMAP is not set | 184 | # CONFIG_GENERIC_IOMAP is not set |
178 | # CONFIG_CPU_FREQ is not set | 185 | # CONFIG_CPU_FREQ is not set |
179 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
180 | # CONFIG_FSL_ULI1575 is not set | 186 | # CONFIG_FSL_ULI1575 is not set |
181 | CONFIG_CPM=y | 187 | CONFIG_CPM=y |
182 | 188 | ||
@@ -193,7 +199,7 @@ CONFIG_HZ_100=y | |||
193 | # CONFIG_HZ_300 is not set | 199 | # CONFIG_HZ_300 is not set |
194 | # CONFIG_HZ_1000 is not set | 200 | # CONFIG_HZ_1000 is not set |
195 | CONFIG_HZ=100 | 201 | CONFIG_HZ=100 |
196 | # CONFIG_SCHED_HRTICK is not set | 202 | CONFIG_SCHED_HRTICK=y |
197 | CONFIG_PREEMPT_NONE=y | 203 | CONFIG_PREEMPT_NONE=y |
198 | # CONFIG_PREEMPT_VOLUNTARY is not set | 204 | # CONFIG_PREEMPT_VOLUNTARY is not set |
199 | # CONFIG_PREEMPT is not set | 205 | # CONFIG_PREEMPT is not set |
@@ -217,6 +223,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
217 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
218 | CONFIG_PAGEFLAGS_EXTENDED=y | 224 | CONFIG_PAGEFLAGS_EXTENDED=y |
219 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 225 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
226 | CONFIG_MIGRATION=y | ||
220 | # CONFIG_RESOURCES_64BIT is not set | 227 | # CONFIG_RESOURCES_64BIT is not set |
221 | CONFIG_ZONE_DMA_FLAG=1 | 228 | CONFIG_ZONE_DMA_FLAG=1 |
222 | CONFIG_BOUNCE=y | 229 | CONFIG_BOUNCE=y |
@@ -224,6 +231,7 @@ CONFIG_VIRT_TO_BUS=y | |||
224 | CONFIG_FORCE_MAX_ZONEORDER=11 | 231 | CONFIG_FORCE_MAX_ZONEORDER=11 |
225 | CONFIG_PROC_DEVICETREE=y | 232 | CONFIG_PROC_DEVICETREE=y |
226 | # CONFIG_CMDLINE_BOOL is not set | 233 | # CONFIG_CMDLINE_BOOL is not set |
234 | CONFIG_EXTRA_TARGETS="" | ||
227 | # CONFIG_PM is not set | 235 | # CONFIG_PM is not set |
228 | # CONFIG_SECCOMP is not set | 236 | # CONFIG_SECCOMP is not set |
229 | CONFIG_ISA_DMA_API=y | 237 | CONFIG_ISA_DMA_API=y |
@@ -256,10 +264,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
256 | CONFIG_TASK_SIZE=0x80000000 | 264 | CONFIG_TASK_SIZE=0x80000000 |
257 | CONFIG_CONSISTENT_START=0xfd000000 | 265 | CONFIG_CONSISTENT_START=0xfd000000 |
258 | CONFIG_CONSISTENT_SIZE=0x00200000 | 266 | CONFIG_CONSISTENT_SIZE=0x00200000 |
259 | |||
260 | # | ||
261 | # Networking | ||
262 | # | ||
263 | CONFIG_NET=y | 267 | CONFIG_NET=y |
264 | 268 | ||
265 | # | 269 | # |
@@ -442,7 +446,6 @@ CONFIG_HAVE_IDE=y | |||
442 | # CONFIG_MD is not set | 446 | # CONFIG_MD is not set |
443 | # CONFIG_MACINTOSH_DRIVERS is not set | 447 | # CONFIG_MACINTOSH_DRIVERS is not set |
444 | CONFIG_NETDEVICES=y | 448 | CONFIG_NETDEVICES=y |
445 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
446 | # CONFIG_DUMMY is not set | 449 | # CONFIG_DUMMY is not set |
447 | # CONFIG_BONDING is not set | 450 | # CONFIG_BONDING is not set |
448 | # CONFIG_MACVLAN is not set | 451 | # CONFIG_MACVLAN is not set |
@@ -544,10 +547,13 @@ CONFIG_GEN_RTC=y | |||
544 | # CONFIG_TCG_TPM is not set | 547 | # CONFIG_TCG_TPM is not set |
545 | # CONFIG_I2C is not set | 548 | # CONFIG_I2C is not set |
546 | # CONFIG_SPI is not set | 549 | # CONFIG_SPI is not set |
550 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
551 | # CONFIG_GPIOLIB is not set | ||
547 | # CONFIG_W1 is not set | 552 | # CONFIG_W1 is not set |
548 | # CONFIG_POWER_SUPPLY is not set | 553 | # CONFIG_POWER_SUPPLY is not set |
549 | # CONFIG_HWMON is not set | 554 | # CONFIG_HWMON is not set |
550 | # CONFIG_THERMAL is not set | 555 | # CONFIG_THERMAL is not set |
556 | # CONFIG_THERMAL_HWMON is not set | ||
551 | # CONFIG_WATCHDOG is not set | 557 | # CONFIG_WATCHDOG is not set |
552 | 558 | ||
553 | # | 559 | # |
@@ -559,8 +565,10 @@ CONFIG_SSB_POSSIBLE=y | |||
559 | # | 565 | # |
560 | # Multifunction device drivers | 566 | # Multifunction device drivers |
561 | # | 567 | # |
568 | # CONFIG_MFD_CORE is not set | ||
562 | # CONFIG_MFD_SM501 is not set | 569 | # CONFIG_MFD_SM501 is not set |
563 | # CONFIG_HTC_PASIC3 is not set | 570 | # CONFIG_HTC_PASIC3 is not set |
571 | # CONFIG_MFD_TMIO is not set | ||
564 | 572 | ||
565 | # | 573 | # |
566 | # Multimedia devices | 574 | # Multimedia devices |
@@ -590,10 +598,6 @@ CONFIG_DAB=y | |||
590 | # Display device support | 598 | # Display device support |
591 | # | 599 | # |
592 | # CONFIG_DISPLAY_SUPPORT is not set | 600 | # CONFIG_DISPLAY_SUPPORT is not set |
593 | |||
594 | # | ||
595 | # Sound | ||
596 | # | ||
597 | # CONFIG_SOUND is not set | 601 | # CONFIG_SOUND is not set |
598 | # CONFIG_USB_SUPPORT is not set | 602 | # CONFIG_USB_SUPPORT is not set |
599 | # CONFIG_MMC is not set | 603 | # CONFIG_MMC is not set |
@@ -662,6 +666,7 @@ CONFIG_TMPFS=y | |||
662 | CONFIG_CRAMFS=y | 666 | CONFIG_CRAMFS=y |
663 | # CONFIG_VXFS_FS is not set | 667 | # CONFIG_VXFS_FS is not set |
664 | # CONFIG_MINIX_FS is not set | 668 | # CONFIG_MINIX_FS is not set |
669 | # CONFIG_OMFS_FS is not set | ||
665 | # CONFIG_HPFS_FS is not set | 670 | # CONFIG_HPFS_FS is not set |
666 | # CONFIG_QNX4FS_FS is not set | 671 | # CONFIG_QNX4FS_FS is not set |
667 | # CONFIG_ROMFS_FS is not set | 672 | # CONFIG_ROMFS_FS is not set |
@@ -672,13 +677,12 @@ CONFIG_NFS_FS=y | |||
672 | CONFIG_NFS_V3=y | 677 | CONFIG_NFS_V3=y |
673 | # CONFIG_NFS_V3_ACL is not set | 678 | # CONFIG_NFS_V3_ACL is not set |
674 | # CONFIG_NFS_V4 is not set | 679 | # CONFIG_NFS_V4 is not set |
675 | # CONFIG_NFSD is not set | ||
676 | CONFIG_ROOT_NFS=y | 680 | CONFIG_ROOT_NFS=y |
681 | # CONFIG_NFSD is not set | ||
677 | CONFIG_LOCKD=y | 682 | CONFIG_LOCKD=y |
678 | CONFIG_LOCKD_V4=y | 683 | CONFIG_LOCKD_V4=y |
679 | CONFIG_NFS_COMMON=y | 684 | CONFIG_NFS_COMMON=y |
680 | CONFIG_SUNRPC=y | 685 | CONFIG_SUNRPC=y |
681 | # CONFIG_SUNRPC_BIND34 is not set | ||
682 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 686 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
683 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 687 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
684 | # CONFIG_SMB_FS is not set | 688 | # CONFIG_SMB_FS is not set |
@@ -717,6 +721,7 @@ CONFIG_MSDOS_PARTITION=y | |||
717 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 721 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
718 | # CONFIG_CRC_CCITT is not set | 722 | # CONFIG_CRC_CCITT is not set |
719 | # CONFIG_CRC16 is not set | 723 | # CONFIG_CRC16 is not set |
724 | # CONFIG_CRC_T10DIF is not set | ||
720 | # CONFIG_CRC_ITU_T is not set | 725 | # CONFIG_CRC_ITU_T is not set |
721 | # CONFIG_CRC32 is not set | 726 | # CONFIG_CRC32 is not set |
722 | # CONFIG_CRC7 is not set | 727 | # CONFIG_CRC7 is not set |
@@ -741,6 +746,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
741 | CONFIG_DEBUG_KERNEL=y | 746 | CONFIG_DEBUG_KERNEL=y |
742 | # CONFIG_DEBUG_SHIRQ is not set | 747 | # CONFIG_DEBUG_SHIRQ is not set |
743 | CONFIG_DETECT_SOFTLOCKUP=y | 748 | CONFIG_DETECT_SOFTLOCKUP=y |
749 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
750 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
744 | CONFIG_SCHED_DEBUG=y | 751 | CONFIG_SCHED_DEBUG=y |
745 | # CONFIG_SCHEDSTATS is not set | 752 | # CONFIG_SCHEDSTATS is not set |
746 | # CONFIG_TIMER_STATS is not set | 753 | # CONFIG_TIMER_STATS is not set |
@@ -756,16 +763,28 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
756 | CONFIG_DEBUG_INFO=y | 763 | CONFIG_DEBUG_INFO=y |
757 | # CONFIG_DEBUG_VM is not set | 764 | # CONFIG_DEBUG_VM is not set |
758 | # CONFIG_DEBUG_WRITECOUNT is not set | 765 | # CONFIG_DEBUG_WRITECOUNT is not set |
766 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
759 | # CONFIG_DEBUG_LIST is not set | 767 | # CONFIG_DEBUG_LIST is not set |
760 | # CONFIG_DEBUG_SG is not set | 768 | # CONFIG_DEBUG_SG is not set |
761 | # CONFIG_BOOT_PRINTK_DELAY is not set | 769 | # CONFIG_BOOT_PRINTK_DELAY is not set |
770 | # CONFIG_RCU_TORTURE_TEST is not set | ||
762 | # CONFIG_BACKTRACE_SELF_TEST is not set | 771 | # CONFIG_BACKTRACE_SELF_TEST is not set |
763 | # CONFIG_FAULT_INJECTION is not set | 772 | # CONFIG_FAULT_INJECTION is not set |
773 | # CONFIG_LATENCYTOP is not set | ||
774 | CONFIG_HAVE_FTRACE=y | ||
775 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
776 | # CONFIG_FTRACE is not set | ||
777 | # CONFIG_SCHED_TRACER is not set | ||
778 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
764 | # CONFIG_SAMPLES is not set | 779 | # CONFIG_SAMPLES is not set |
780 | CONFIG_HAVE_ARCH_KGDB=y | ||
781 | # CONFIG_KGDB is not set | ||
765 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 782 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
766 | # CONFIG_DEBUG_STACK_USAGE is not set | 783 | # CONFIG_DEBUG_STACK_USAGE is not set |
767 | # CONFIG_DEBUG_PAGEALLOC is not set | 784 | # CONFIG_DEBUG_PAGEALLOC is not set |
768 | # CONFIG_DEBUGGER is not set | 785 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
786 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
787 | # CONFIG_XMON is not set | ||
769 | # CONFIG_IRQSTACKS is not set | 788 | # CONFIG_IRQSTACKS is not set |
770 | # CONFIG_BDI_SWITCH is not set | 789 | # CONFIG_BDI_SWITCH is not set |
771 | # CONFIG_PPC_EARLY_DEBUG is not set | 790 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -777,6 +796,6 @@ CONFIG_DEBUG_INFO=y | |||
777 | # CONFIG_SECURITY is not set | 796 | # CONFIG_SECURITY is not set |
778 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 797 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
779 | # CONFIG_CRYPTO is not set | 798 | # CONFIG_CRYPTO is not set |
780 | # CONFIG_PPC_CLOCK is not set | 799 | CONFIG_PPC_CLOCK=y |
781 | CONFIG_PPC_LIB_RHEAP=y | 800 | CONFIG_PPC_LIB_RHEAP=y |
782 | # CONFIG_VIRTUALIZATION is not set | 801 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 0ccc6e493dcb..cfa5d053ee5e 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc6 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 16 21:08:31 2008 | 4 | # Tue Aug 26 13:15:06 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -13,6 +13,7 @@ CONFIG_POWER4=y | |||
13 | # CONFIG_TUNE_CELL is not set | 13 | # CONFIG_TUNE_CELL is not set |
14 | CONFIG_PPC_FPU=y | 14 | CONFIG_PPC_FPU=y |
15 | CONFIG_ALTIVEC=y | 15 | CONFIG_ALTIVEC=y |
16 | # CONFIG_VSX is not set | ||
16 | CONFIG_PPC_STD_MMU=y | 17 | CONFIG_PPC_STD_MMU=y |
17 | CONFIG_PPC_MM_SLICES=y | 18 | CONFIG_PPC_MM_SLICES=y |
18 | CONFIG_VIRT_CPU_ACCOUNTING=y | 19 | CONFIG_VIRT_CPU_ACCOUNTING=y |
@@ -30,6 +31,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
31 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
33 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
@@ -94,9 +96,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
94 | CONFIG_SYSCTL=y | 96 | CONFIG_SYSCTL=y |
95 | # CONFIG_EMBEDDED is not set | 97 | # CONFIG_EMBEDDED is not set |
96 | CONFIG_SYSCTL_SYSCALL=y | 98 | CONFIG_SYSCTL_SYSCALL=y |
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
98 | CONFIG_KALLSYMS=y | 99 | CONFIG_KALLSYMS=y |
99 | # CONFIG_KALLSYMS_ALL is not set | 100 | CONFIG_KALLSYMS_ALL=y |
100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 101 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
101 | CONFIG_HOTPLUG=y | 102 | CONFIG_HOTPLUG=y |
102 | CONFIG_PRINTK=y | 103 | CONFIG_PRINTK=y |
@@ -121,10 +122,16 @@ CONFIG_PROFILING=y | |||
121 | CONFIG_OPROFILE=y | 122 | CONFIG_OPROFILE=y |
122 | CONFIG_HAVE_OPROFILE=y | 123 | CONFIG_HAVE_OPROFILE=y |
123 | # CONFIG_KPROBES is not set | 124 | # CONFIG_KPROBES is not set |
125 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
126 | CONFIG_HAVE_IOREMAP_PROT=y | ||
124 | CONFIG_HAVE_KPROBES=y | 127 | CONFIG_HAVE_KPROBES=y |
125 | CONFIG_HAVE_KRETPROBES=y | 128 | CONFIG_HAVE_KRETPROBES=y |
126 | # CONFIG_HAVE_DMA_ATTRS is not set | 129 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
130 | CONFIG_HAVE_DMA_ATTRS=y | ||
131 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
132 | # CONFIG_HAVE_CLK is not set | ||
127 | CONFIG_PROC_PAGE_MONITOR=y | 133 | CONFIG_PROC_PAGE_MONITOR=y |
134 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
128 | CONFIG_SLABINFO=y | 135 | CONFIG_SLABINFO=y |
129 | CONFIG_RT_MUTEXES=y | 136 | CONFIG_RT_MUTEXES=y |
130 | # CONFIG_TINY_SHMEM is not set | 137 | # CONFIG_TINY_SHMEM is not set |
@@ -140,6 +147,7 @@ CONFIG_STOP_MACHINE=y | |||
140 | CONFIG_BLOCK=y | 147 | CONFIG_BLOCK=y |
141 | # CONFIG_BLK_DEV_IO_TRACE is not set | 148 | # CONFIG_BLK_DEV_IO_TRACE is not set |
142 | CONFIG_BLK_DEV_BSG=y | 149 | CONFIG_BLK_DEV_BSG=y |
150 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
143 | CONFIG_BLOCK_COMPAT=y | 151 | CONFIG_BLOCK_COMPAT=y |
144 | 152 | ||
145 | # | 153 | # |
@@ -160,13 +168,8 @@ CONFIG_CLASSIC_RCU=y | |||
160 | # Platform support | 168 | # Platform support |
161 | # | 169 | # |
162 | CONFIG_PPC_MULTIPLATFORM=y | 170 | CONFIG_PPC_MULTIPLATFORM=y |
163 | # CONFIG_PPC_82xx is not set | ||
164 | # CONFIG_PPC_83xx is not set | ||
165 | # CONFIG_PPC_86xx is not set | ||
166 | # CONFIG_PPC_PSERIES is not set | 171 | # CONFIG_PPC_PSERIES is not set |
167 | # CONFIG_PPC_ISERIES is not set | 172 | # CONFIG_PPC_ISERIES is not set |
168 | # CONFIG_PPC_MPC512x is not set | ||
169 | # CONFIG_PPC_MPC5121 is not set | ||
170 | CONFIG_PPC_PMAC=y | 173 | CONFIG_PPC_PMAC=y |
171 | CONFIG_PPC_PMAC64=y | 174 | CONFIG_PPC_PMAC64=y |
172 | # CONFIG_PPC_MAPLE is not set | 175 | # CONFIG_PPC_MAPLE is not set |
@@ -224,7 +227,7 @@ CONFIG_HZ_250=y | |||
224 | # CONFIG_HZ_300 is not set | 227 | # CONFIG_HZ_300 is not set |
225 | # CONFIG_HZ_1000 is not set | 228 | # CONFIG_HZ_1000 is not set |
226 | CONFIG_HZ=250 | 229 | CONFIG_HZ=250 |
227 | # CONFIG_SCHED_HRTICK is not set | 230 | CONFIG_SCHED_HRTICK=y |
228 | CONFIG_PREEMPT_NONE=y | 231 | CONFIG_PREEMPT_NONE=y |
229 | # CONFIG_PREEMPT_VOLUNTARY is not set | 232 | # CONFIG_PREEMPT_VOLUNTARY is not set |
230 | # CONFIG_PREEMPT is not set | 233 | # CONFIG_PREEMPT is not set |
@@ -256,6 +259,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
256 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 259 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
257 | CONFIG_PAGEFLAGS_EXTENDED=y | 260 | CONFIG_PAGEFLAGS_EXTENDED=y |
258 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 261 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
262 | # CONFIG_MIGRATION is not set | ||
259 | CONFIG_RESOURCES_64BIT=y | 263 | CONFIG_RESOURCES_64BIT=y |
260 | CONFIG_ZONE_DMA_FLAG=1 | 264 | CONFIG_ZONE_DMA_FLAG=1 |
261 | CONFIG_BOUNCE=y | 265 | CONFIG_BOUNCE=y |
@@ -265,6 +269,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
265 | # CONFIG_SCHED_SMT is not set | 269 | # CONFIG_SCHED_SMT is not set |
266 | CONFIG_PROC_DEVICETREE=y | 270 | CONFIG_PROC_DEVICETREE=y |
267 | # CONFIG_CMDLINE_BOOL is not set | 271 | # CONFIG_CMDLINE_BOOL is not set |
272 | CONFIG_EXTRA_TARGETS="" | ||
268 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 273 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
269 | # CONFIG_PM is not set | 274 | # CONFIG_PM is not set |
270 | CONFIG_SECCOMP=y | 275 | CONFIG_SECCOMP=y |
@@ -290,10 +295,6 @@ CONFIG_PCI_MSI=y | |||
290 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 295 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
291 | CONFIG_KERNEL_START=0xc000000000000000 | 296 | CONFIG_KERNEL_START=0xc000000000000000 |
292 | CONFIG_PHYSICAL_START=0x00000000 | 297 | CONFIG_PHYSICAL_START=0x00000000 |
293 | |||
294 | # | ||
295 | # Networking | ||
296 | # | ||
297 | CONFIG_NET=y | 298 | CONFIG_NET=y |
298 | 299 | ||
299 | # | 300 | # |
@@ -307,6 +308,7 @@ CONFIG_XFRM_USER=m | |||
307 | # CONFIG_XFRM_SUB_POLICY is not set | 308 | # CONFIG_XFRM_SUB_POLICY is not set |
308 | # CONFIG_XFRM_MIGRATE is not set | 309 | # CONFIG_XFRM_MIGRATE is not set |
309 | # CONFIG_XFRM_STATISTICS is not set | 310 | # CONFIG_XFRM_STATISTICS is not set |
311 | CONFIG_XFRM_IPCOMP=m | ||
310 | CONFIG_NET_KEY=m | 312 | CONFIG_NET_KEY=m |
311 | # CONFIG_NET_KEY_MIGRATE is not set | 313 | # CONFIG_NET_KEY_MIGRATE is not set |
312 | CONFIG_INET=y | 314 | CONFIG_INET=y |
@@ -422,6 +424,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
422 | CONFIG_STANDALONE=y | 424 | CONFIG_STANDALONE=y |
423 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 425 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
424 | CONFIG_FW_LOADER=y | 426 | CONFIG_FW_LOADER=y |
427 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
428 | CONFIG_EXTRA_FIRMWARE="" | ||
425 | # CONFIG_DEBUG_DRIVER is not set | 429 | # CONFIG_DEBUG_DRIVER is not set |
426 | # CONFIG_DEBUG_DEVRES is not set | 430 | # CONFIG_DEBUG_DEVRES is not set |
427 | # CONFIG_SYS_HYPERVISOR is not set | 431 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -449,12 +453,14 @@ CONFIG_CDROM_PKTCDVD=m | |||
449 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 | 453 | CONFIG_CDROM_PKTCDVD_BUFFERS=8 |
450 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 454 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
451 | # CONFIG_ATA_OVER_ETH is not set | 455 | # CONFIG_ATA_OVER_ETH is not set |
456 | # CONFIG_BLK_DEV_HD is not set | ||
452 | CONFIG_MISC_DEVICES=y | 457 | CONFIG_MISC_DEVICES=y |
453 | # CONFIG_PHANTOM is not set | 458 | # CONFIG_PHANTOM is not set |
454 | # CONFIG_EEPROM_93CX6 is not set | 459 | # CONFIG_EEPROM_93CX6 is not set |
455 | # CONFIG_SGI_IOC4 is not set | 460 | # CONFIG_SGI_IOC4 is not set |
456 | # CONFIG_TIFM_CORE is not set | 461 | # CONFIG_TIFM_CORE is not set |
457 | # CONFIG_ENCLOSURE_SERVICES is not set | 462 | # CONFIG_ENCLOSURE_SERVICES is not set |
463 | # CONFIG_HP_ILO is not set | ||
458 | CONFIG_HAVE_IDE=y | 464 | CONFIG_HAVE_IDE=y |
459 | CONFIG_IDE=y | 465 | CONFIG_IDE=y |
460 | CONFIG_BLK_DEV_IDE=y | 466 | CONFIG_BLK_DEV_IDE=y |
@@ -462,6 +468,7 @@ CONFIG_BLK_DEV_IDE=y | |||
462 | # | 468 | # |
463 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 469 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
464 | # | 470 | # |
471 | CONFIG_IDE_TIMINGS=y | ||
465 | # CONFIG_BLK_DEV_IDE_SATA is not set | 472 | # CONFIG_BLK_DEV_IDE_SATA is not set |
466 | CONFIG_BLK_DEV_IDEDISK=y | 473 | CONFIG_BLK_DEV_IDEDISK=y |
467 | # CONFIG_IDEDISK_MULTI_MODE is not set | 474 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -492,10 +499,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
492 | # CONFIG_BLK_DEV_AMD74XX is not set | 499 | # CONFIG_BLK_DEV_AMD74XX is not set |
493 | # CONFIG_BLK_DEV_CMD64X is not set | 500 | # CONFIG_BLK_DEV_CMD64X is not set |
494 | # CONFIG_BLK_DEV_TRIFLEX is not set | 501 | # CONFIG_BLK_DEV_TRIFLEX is not set |
495 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
496 | # CONFIG_BLK_DEV_CS5520 is not set | 502 | # CONFIG_BLK_DEV_CS5520 is not set |
497 | # CONFIG_BLK_DEV_CS5530 is not set | 503 | # CONFIG_BLK_DEV_CS5530 is not set |
498 | # CONFIG_BLK_DEV_HPT34X is not set | ||
499 | # CONFIG_BLK_DEV_HPT366 is not set | 504 | # CONFIG_BLK_DEV_HPT366 is not set |
500 | # CONFIG_BLK_DEV_JMICRON is not set | 505 | # CONFIG_BLK_DEV_JMICRON is not set |
501 | # CONFIG_BLK_DEV_SC1200 is not set | 506 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -516,8 +521,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
516 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 521 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
517 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 522 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
518 | CONFIG_BLK_DEV_IDEDMA=y | 523 | CONFIG_BLK_DEV_IDEDMA=y |
519 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
520 | # CONFIG_BLK_DEV_HD is not set | ||
521 | 524 | ||
522 | # | 525 | # |
523 | # SCSI device support | 526 | # SCSI device support |
@@ -592,6 +595,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
592 | # CONFIG_SCSI_DC390T is not set | 595 | # CONFIG_SCSI_DC390T is not set |
593 | # CONFIG_SCSI_DEBUG is not set | 596 | # CONFIG_SCSI_DEBUG is not set |
594 | # CONFIG_SCSI_SRP is not set | 597 | # CONFIG_SCSI_SRP is not set |
598 | # CONFIG_SCSI_DH is not set | ||
595 | CONFIG_ATA=y | 599 | CONFIG_ATA=y |
596 | # CONFIG_ATA_NONSTANDARD is not set | 600 | # CONFIG_ATA_NONSTANDARD is not set |
597 | CONFIG_SATA_PMP=y | 601 | CONFIG_SATA_PMP=y |
@@ -675,29 +679,21 @@ CONFIG_DM_ZERO=m | |||
675 | # | 679 | # |
676 | # IEEE 1394 (FireWire) support | 680 | # IEEE 1394 (FireWire) support |
677 | # | 681 | # |
678 | # CONFIG_FIREWIRE is not set | ||
679 | CONFIG_IEEE1394=y | ||
680 | |||
681 | # | ||
682 | # Subsystem Options | ||
683 | # | ||
684 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
685 | 682 | ||
686 | # | 683 | # |
687 | # Controllers | 684 | # Enable only one of the two stacks, unless you know what you are doing |
688 | # | 685 | # |
689 | # CONFIG_IEEE1394_PCILYNX is not set | 686 | # CONFIG_FIREWIRE is not set |
687 | CONFIG_IEEE1394=y | ||
690 | CONFIG_IEEE1394_OHCI1394=y | 688 | CONFIG_IEEE1394_OHCI1394=y |
691 | 689 | # CONFIG_IEEE1394_PCILYNX is not set | |
692 | # | ||
693 | # Protocols | ||
694 | # | ||
695 | CONFIG_IEEE1394_VIDEO1394=m | ||
696 | CONFIG_IEEE1394_SBP2=m | 690 | CONFIG_IEEE1394_SBP2=m |
697 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y | 691 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y |
698 | CONFIG_IEEE1394_ETH1394=m | 692 | CONFIG_IEEE1394_ETH1394=m |
699 | CONFIG_IEEE1394_DV1394=m | ||
700 | CONFIG_IEEE1394_RAWIO=y | 693 | CONFIG_IEEE1394_RAWIO=y |
694 | CONFIG_IEEE1394_VIDEO1394=m | ||
695 | CONFIG_IEEE1394_DV1394=m | ||
696 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
701 | # CONFIG_I2O is not set | 697 | # CONFIG_I2O is not set |
702 | CONFIG_MACINTOSH_DRIVERS=y | 698 | CONFIG_MACINTOSH_DRIVERS=y |
703 | CONFIG_ADB_PMU=y | 699 | CONFIG_ADB_PMU=y |
@@ -712,7 +708,6 @@ CONFIG_WINDFARM_PM112=y | |||
712 | CONFIG_WINDFARM_PM121=y | 708 | CONFIG_WINDFARM_PM121=y |
713 | # CONFIG_PMAC_RACKMETER is not set | 709 | # CONFIG_PMAC_RACKMETER is not set |
714 | CONFIG_NETDEVICES=y | 710 | CONFIG_NETDEVICES=y |
715 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
716 | CONFIG_DUMMY=m | 711 | CONFIG_DUMMY=m |
717 | CONFIG_BONDING=m | 712 | CONFIG_BONDING=m |
718 | # CONFIG_MACVLAN is not set | 713 | # CONFIG_MACVLAN is not set |
@@ -720,7 +715,23 @@ CONFIG_BONDING=m | |||
720 | CONFIG_TUN=m | 715 | CONFIG_TUN=m |
721 | # CONFIG_VETH is not set | 716 | # CONFIG_VETH is not set |
722 | # CONFIG_ARCNET is not set | 717 | # CONFIG_ARCNET is not set |
723 | # CONFIG_PHYLIB is not set | 718 | CONFIG_PHYLIB=y |
719 | |||
720 | # | ||
721 | # MII PHY device drivers | ||
722 | # | ||
723 | # CONFIG_MARVELL_PHY is not set | ||
724 | # CONFIG_DAVICOM_PHY is not set | ||
725 | # CONFIG_QSEMI_PHY is not set | ||
726 | # CONFIG_LXT_PHY is not set | ||
727 | # CONFIG_CICADA_PHY is not set | ||
728 | # CONFIG_VITESSE_PHY is not set | ||
729 | # CONFIG_SMSC_PHY is not set | ||
730 | # CONFIG_BROADCOM_PHY is not set | ||
731 | # CONFIG_ICPLUS_PHY is not set | ||
732 | # CONFIG_REALTEK_PHY is not set | ||
733 | # CONFIG_FIXED_PHY is not set | ||
734 | # CONFIG_MDIO_BITBANG is not set | ||
724 | CONFIG_NET_ETHERNET=y | 735 | CONFIG_NET_ETHERNET=y |
725 | CONFIG_MII=y | 736 | CONFIG_MII=y |
726 | # CONFIG_HAPPYMEAL is not set | 737 | # CONFIG_HAPPYMEAL is not set |
@@ -740,10 +751,8 @@ CONFIG_ACENIC=y | |||
740 | CONFIG_ACENIC_OMIT_TIGON_I=y | 751 | CONFIG_ACENIC_OMIT_TIGON_I=y |
741 | # CONFIG_DL2K is not set | 752 | # CONFIG_DL2K is not set |
742 | CONFIG_E1000=y | 753 | CONFIG_E1000=y |
743 | # CONFIG_E1000_NAPI is not set | ||
744 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 754 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
745 | # CONFIG_E1000E is not set | 755 | # CONFIG_E1000E is not set |
746 | # CONFIG_E1000E_ENABLED is not set | ||
747 | # CONFIG_IP1000 is not set | 756 | # CONFIG_IP1000 is not set |
748 | # CONFIG_IGB is not set | 757 | # CONFIG_IGB is not set |
749 | # CONFIG_NS83820 is not set | 758 | # CONFIG_NS83820 is not set |
@@ -758,6 +767,7 @@ CONFIG_TIGON3=y | |||
758 | # CONFIG_BNX2 is not set | 767 | # CONFIG_BNX2 is not set |
759 | # CONFIG_QLA3XXX is not set | 768 | # CONFIG_QLA3XXX is not set |
760 | # CONFIG_ATL1 is not set | 769 | # CONFIG_ATL1 is not set |
770 | # CONFIG_ATL1E is not set | ||
761 | CONFIG_NETDEV_10000=y | 771 | CONFIG_NETDEV_10000=y |
762 | # CONFIG_CHELSIO_T1 is not set | 772 | # CONFIG_CHELSIO_T1 is not set |
763 | # CONFIG_CHELSIO_T3 is not set | 773 | # CONFIG_CHELSIO_T3 is not set |
@@ -855,6 +865,7 @@ CONFIG_INPUT_MOUSE=y | |||
855 | # CONFIG_MOUSE_PS2 is not set | 865 | # CONFIG_MOUSE_PS2 is not set |
856 | # CONFIG_MOUSE_SERIAL is not set | 866 | # CONFIG_MOUSE_SERIAL is not set |
857 | # CONFIG_MOUSE_APPLETOUCH is not set | 867 | # CONFIG_MOUSE_APPLETOUCH is not set |
868 | # CONFIG_MOUSE_BCM5974 is not set | ||
858 | # CONFIG_MOUSE_VSXXXAA is not set | 869 | # CONFIG_MOUSE_VSXXXAA is not set |
859 | # CONFIG_INPUT_JOYSTICK is not set | 870 | # CONFIG_INPUT_JOYSTICK is not set |
860 | # CONFIG_INPUT_TABLET is not set | 871 | # CONFIG_INPUT_TABLET is not set |
@@ -869,12 +880,14 @@ CONFIG_SERIO=y | |||
869 | # CONFIG_SERIO_SERPORT is not set | 880 | # CONFIG_SERIO_SERPORT is not set |
870 | # CONFIG_SERIO_PCIPS2 is not set | 881 | # CONFIG_SERIO_PCIPS2 is not set |
871 | # CONFIG_SERIO_RAW is not set | 882 | # CONFIG_SERIO_RAW is not set |
883 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
872 | # CONFIG_GAMEPORT is not set | 884 | # CONFIG_GAMEPORT is not set |
873 | 885 | ||
874 | # | 886 | # |
875 | # Character devices | 887 | # Character devices |
876 | # | 888 | # |
877 | CONFIG_VT=y | 889 | CONFIG_VT=y |
890 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
878 | CONFIG_VT_CONSOLE=y | 891 | CONFIG_VT_CONSOLE=y |
879 | CONFIG_HW_CONSOLE=y | 892 | CONFIG_HW_CONSOLE=y |
880 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 893 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -909,44 +922,69 @@ CONFIG_DEVPORT=y | |||
909 | CONFIG_I2C=y | 922 | CONFIG_I2C=y |
910 | CONFIG_I2C_BOARDINFO=y | 923 | CONFIG_I2C_BOARDINFO=y |
911 | CONFIG_I2C_CHARDEV=y | 924 | CONFIG_I2C_CHARDEV=y |
925 | CONFIG_I2C_HELPER_AUTO=y | ||
912 | CONFIG_I2C_ALGOBIT=y | 926 | CONFIG_I2C_ALGOBIT=y |
913 | 927 | ||
914 | # | 928 | # |
915 | # I2C Hardware Bus support | 929 | # I2C Hardware Bus support |
916 | # | 930 | # |
931 | |||
932 | # | ||
933 | # PC SMBus host controller drivers | ||
934 | # | ||
917 | # CONFIG_I2C_ALI1535 is not set | 935 | # CONFIG_I2C_ALI1535 is not set |
918 | # CONFIG_I2C_ALI1563 is not set | 936 | # CONFIG_I2C_ALI1563 is not set |
919 | # CONFIG_I2C_ALI15X3 is not set | 937 | # CONFIG_I2C_ALI15X3 is not set |
920 | # CONFIG_I2C_AMD756 is not set | 938 | # CONFIG_I2C_AMD756 is not set |
921 | # CONFIG_I2C_AMD8111 is not set | 939 | # CONFIG_I2C_AMD8111 is not set |
922 | # CONFIG_I2C_I801 is not set | 940 | # CONFIG_I2C_I801 is not set |
923 | # CONFIG_I2C_I810 is not set | 941 | # CONFIG_I2C_ISCH is not set |
924 | # CONFIG_I2C_PIIX4 is not set | 942 | # CONFIG_I2C_PIIX4 is not set |
925 | CONFIG_I2C_POWERMAC=y | ||
926 | # CONFIG_I2C_NFORCE2 is not set | 943 | # CONFIG_I2C_NFORCE2 is not set |
927 | # CONFIG_I2C_OCORES is not set | ||
928 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
929 | # CONFIG_I2C_PROSAVAGE is not set | ||
930 | # CONFIG_I2C_SAVAGE4 is not set | ||
931 | # CONFIG_I2C_SIMTEC is not set | ||
932 | # CONFIG_I2C_SIS5595 is not set | 944 | # CONFIG_I2C_SIS5595 is not set |
933 | # CONFIG_I2C_SIS630 is not set | 945 | # CONFIG_I2C_SIS630 is not set |
934 | # CONFIG_I2C_SIS96X is not set | 946 | # CONFIG_I2C_SIS96X is not set |
935 | # CONFIG_I2C_TAOS_EVM is not set | ||
936 | # CONFIG_I2C_STUB is not set | ||
937 | # CONFIG_I2C_TINY_USB is not set | ||
938 | # CONFIG_I2C_VIA is not set | 947 | # CONFIG_I2C_VIA is not set |
939 | # CONFIG_I2C_VIAPRO is not set | 948 | # CONFIG_I2C_VIAPRO is not set |
949 | |||
950 | # | ||
951 | # Mac SMBus host controller drivers | ||
952 | # | ||
953 | CONFIG_I2C_POWERMAC=y | ||
954 | |||
955 | # | ||
956 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
957 | # | ||
958 | # CONFIG_I2C_OCORES is not set | ||
959 | # CONFIG_I2C_SIMTEC is not set | ||
960 | |||
961 | # | ||
962 | # External I2C/SMBus adapter drivers | ||
963 | # | ||
964 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
965 | # CONFIG_I2C_TAOS_EVM is not set | ||
966 | # CONFIG_I2C_TINY_USB is not set | ||
967 | |||
968 | # | ||
969 | # Graphics adapter I2C/DDC channel drivers | ||
970 | # | ||
940 | # CONFIG_I2C_VOODOO3 is not set | 971 | # CONFIG_I2C_VOODOO3 is not set |
972 | |||
973 | # | ||
974 | # Other I2C/SMBus bus drivers | ||
975 | # | ||
941 | # CONFIG_I2C_PCA_PLATFORM is not set | 976 | # CONFIG_I2C_PCA_PLATFORM is not set |
977 | # CONFIG_I2C_STUB is not set | ||
942 | 978 | ||
943 | # | 979 | # |
944 | # Miscellaneous I2C Chip support | 980 | # Miscellaneous I2C Chip support |
945 | # | 981 | # |
946 | # CONFIG_DS1682 is not set | 982 | # CONFIG_DS1682 is not set |
983 | # CONFIG_AT24 is not set | ||
947 | # CONFIG_SENSORS_EEPROM is not set | 984 | # CONFIG_SENSORS_EEPROM is not set |
948 | # CONFIG_SENSORS_PCF8574 is not set | 985 | # CONFIG_SENSORS_PCF8574 is not set |
949 | # CONFIG_PCF8575 is not set | 986 | # CONFIG_PCF8575 is not set |
987 | # CONFIG_SENSORS_PCA9539 is not set | ||
950 | # CONFIG_SENSORS_PCF8591 is not set | 988 | # CONFIG_SENSORS_PCF8591 is not set |
951 | # CONFIG_SENSORS_MAX6875 is not set | 989 | # CONFIG_SENSORS_MAX6875 is not set |
952 | # CONFIG_SENSORS_TSL2550 is not set | 990 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -955,10 +993,13 @@ CONFIG_I2C_POWERMAC=y | |||
955 | # CONFIG_I2C_DEBUG_BUS is not set | 993 | # CONFIG_I2C_DEBUG_BUS is not set |
956 | # CONFIG_I2C_DEBUG_CHIP is not set | 994 | # CONFIG_I2C_DEBUG_CHIP is not set |
957 | # CONFIG_SPI is not set | 995 | # CONFIG_SPI is not set |
996 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
997 | # CONFIG_GPIOLIB is not set | ||
958 | # CONFIG_W1 is not set | 998 | # CONFIG_W1 is not set |
959 | # CONFIG_POWER_SUPPLY is not set | 999 | # CONFIG_POWER_SUPPLY is not set |
960 | # CONFIG_HWMON is not set | 1000 | # CONFIG_HWMON is not set |
961 | # CONFIG_THERMAL is not set | 1001 | # CONFIG_THERMAL is not set |
1002 | # CONFIG_THERMAL_HWMON is not set | ||
962 | # CONFIG_WATCHDOG is not set | 1003 | # CONFIG_WATCHDOG is not set |
963 | 1004 | ||
964 | # | 1005 | # |
@@ -970,8 +1011,10 @@ CONFIG_SSB_POSSIBLE=y | |||
970 | # | 1011 | # |
971 | # Multifunction device drivers | 1012 | # Multifunction device drivers |
972 | # | 1013 | # |
1014 | # CONFIG_MFD_CORE is not set | ||
973 | # CONFIG_MFD_SM501 is not set | 1015 | # CONFIG_MFD_SM501 is not set |
974 | # CONFIG_HTC_PASIC3 is not set | 1016 | # CONFIG_HTC_PASIC3 is not set |
1017 | # CONFIG_MFD_TMIO is not set | ||
975 | 1018 | ||
976 | # | 1019 | # |
977 | # Multimedia devices | 1020 | # Multimedia devices |
@@ -1050,10 +1093,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
1050 | # CONFIG_FB_TRIDENT is not set | 1093 | # CONFIG_FB_TRIDENT is not set |
1051 | # CONFIG_FB_ARK is not set | 1094 | # CONFIG_FB_ARK is not set |
1052 | # CONFIG_FB_PM3 is not set | 1095 | # CONFIG_FB_PM3 is not set |
1096 | # CONFIG_FB_CARMINE is not set | ||
1053 | # CONFIG_FB_IBM_GXT4500 is not set | 1097 | # CONFIG_FB_IBM_GXT4500 is not set |
1054 | # CONFIG_FB_VIRTUAL is not set | 1098 | # CONFIG_FB_VIRTUAL is not set |
1055 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1099 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
1056 | CONFIG_LCD_CLASS_DEVICE=m | 1100 | CONFIG_LCD_CLASS_DEVICE=m |
1101 | # CONFIG_LCD_ILI9320 is not set | ||
1102 | # CONFIG_LCD_PLATFORM is not set | ||
1057 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1103 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1058 | # CONFIG_BACKLIGHT_CORGI is not set | 1104 | # CONFIG_BACKLIGHT_CORGI is not set |
1059 | 1105 | ||
@@ -1077,15 +1123,7 @@ CONFIG_LOGO=y | |||
1077 | CONFIG_LOGO_LINUX_MONO=y | 1123 | CONFIG_LOGO_LINUX_MONO=y |
1078 | CONFIG_LOGO_LINUX_VGA16=y | 1124 | CONFIG_LOGO_LINUX_VGA16=y |
1079 | CONFIG_LOGO_LINUX_CLUT224=y | 1125 | CONFIG_LOGO_LINUX_CLUT224=y |
1080 | |||
1081 | # | ||
1082 | # Sound | ||
1083 | # | ||
1084 | CONFIG_SOUND=m | 1126 | CONFIG_SOUND=m |
1085 | |||
1086 | # | ||
1087 | # Advanced Linux Sound Architecture | ||
1088 | # | ||
1089 | CONFIG_SND=m | 1127 | CONFIG_SND=m |
1090 | CONFIG_SND_TIMER=m | 1128 | CONFIG_SND_TIMER=m |
1091 | CONFIG_SND_PCM=m | 1129 | CONFIG_SND_PCM=m |
@@ -1103,19 +1141,13 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
1103 | CONFIG_SND_VERBOSE_PROCFS=y | 1141 | CONFIG_SND_VERBOSE_PROCFS=y |
1104 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1142 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1105 | # CONFIG_SND_DEBUG is not set | 1143 | # CONFIG_SND_DEBUG is not set |
1106 | 1144 | CONFIG_SND_DRIVERS=y | |
1107 | # | ||
1108 | # Generic devices | ||
1109 | # | ||
1110 | # CONFIG_SND_DUMMY is not set | 1145 | # CONFIG_SND_DUMMY is not set |
1111 | # CONFIG_SND_VIRMIDI is not set | 1146 | # CONFIG_SND_VIRMIDI is not set |
1112 | # CONFIG_SND_MTPAV is not set | 1147 | # CONFIG_SND_MTPAV is not set |
1113 | # CONFIG_SND_SERIAL_U16550 is not set | 1148 | # CONFIG_SND_SERIAL_U16550 is not set |
1114 | # CONFIG_SND_MPU401 is not set | 1149 | # CONFIG_SND_MPU401 is not set |
1115 | 1150 | CONFIG_SND_PCI=y | |
1116 | # | ||
1117 | # PCI devices | ||
1118 | # | ||
1119 | # CONFIG_SND_AD1889 is not set | 1151 | # CONFIG_SND_AD1889 is not set |
1120 | # CONFIG_SND_ALS300 is not set | 1152 | # CONFIG_SND_ALS300 is not set |
1121 | # CONFIG_SND_ALS4000 is not set | 1153 | # CONFIG_SND_ALS4000 is not set |
@@ -1177,20 +1209,9 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1177 | # CONFIG_SND_VIRTUOSO is not set | 1209 | # CONFIG_SND_VIRTUOSO is not set |
1178 | # CONFIG_SND_VX222 is not set | 1210 | # CONFIG_SND_VX222 is not set |
1179 | # CONFIG_SND_YMFPCI is not set | 1211 | # CONFIG_SND_YMFPCI is not set |
1180 | 1212 | CONFIG_SND_PPC=y | |
1181 | # | ||
1182 | # ALSA PowerMac devices | ||
1183 | # | ||
1184 | CONFIG_SND_POWERMAC=m | 1213 | CONFIG_SND_POWERMAC=m |
1185 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1214 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
1186 | |||
1187 | # | ||
1188 | # ALSA PowerPC devices | ||
1189 | # | ||
1190 | |||
1191 | # | ||
1192 | # Apple Onboard Audio driver | ||
1193 | # | ||
1194 | CONFIG_SND_AOA=m | 1215 | CONFIG_SND_AOA=m |
1195 | CONFIG_SND_AOA_FABRIC_LAYOUT=m | 1216 | CONFIG_SND_AOA_FABRIC_LAYOUT=m |
1196 | CONFIG_SND_AOA_ONYX=m | 1217 | CONFIG_SND_AOA_ONYX=m |
@@ -1198,30 +1219,11 @@ CONFIG_SND_AOA_TAS=m | |||
1198 | CONFIG_SND_AOA_TOONIE=m | 1219 | CONFIG_SND_AOA_TOONIE=m |
1199 | CONFIG_SND_AOA_SOUNDBUS=m | 1220 | CONFIG_SND_AOA_SOUNDBUS=m |
1200 | CONFIG_SND_AOA_SOUNDBUS_I2S=m | 1221 | CONFIG_SND_AOA_SOUNDBUS_I2S=m |
1201 | 1222 | CONFIG_SND_USB=y | |
1202 | # | ||
1203 | # USB devices | ||
1204 | # | ||
1205 | CONFIG_SND_USB_AUDIO=m | 1223 | CONFIG_SND_USB_AUDIO=m |
1206 | # CONFIG_SND_USB_USX2Y is not set | 1224 | # CONFIG_SND_USB_USX2Y is not set |
1207 | # CONFIG_SND_USB_CAIAQ is not set | 1225 | # CONFIG_SND_USB_CAIAQ is not set |
1208 | |||
1209 | # | ||
1210 | # System on Chip audio support | ||
1211 | # | ||
1212 | # CONFIG_SND_SOC is not set | 1226 | # CONFIG_SND_SOC is not set |
1213 | |||
1214 | # | ||
1215 | # ALSA SoC audio for Freescale SOCs | ||
1216 | # | ||
1217 | |||
1218 | # | ||
1219 | # SoC Audio for the Texas Instruments OMAP | ||
1220 | # | ||
1221 | |||
1222 | # | ||
1223 | # Open Sound System | ||
1224 | # | ||
1225 | # CONFIG_SOUND_PRIME is not set | 1227 | # CONFIG_SOUND_PRIME is not set |
1226 | CONFIG_HID_SUPPORT=y | 1228 | CONFIG_HID_SUPPORT=y |
1227 | CONFIG_HID=y | 1229 | CONFIG_HID=y |
@@ -1256,6 +1258,7 @@ CONFIG_USB_DEVICEFS=y | |||
1256 | CONFIG_USB_DEVICE_CLASS=y | 1258 | CONFIG_USB_DEVICE_CLASS=y |
1257 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1259 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1258 | # CONFIG_USB_OTG is not set | 1260 | # CONFIG_USB_OTG is not set |
1261 | CONFIG_USB_MON=y | ||
1259 | 1262 | ||
1260 | # | 1263 | # |
1261 | # USB Host Controller Drivers | 1264 | # USB Host Controller Drivers |
@@ -1306,6 +1309,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1306 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1309 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1307 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1310 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1308 | # CONFIG_USB_STORAGE_KARMA is not set | 1311 | # CONFIG_USB_STORAGE_KARMA is not set |
1312 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1309 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1313 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1310 | # CONFIG_USB_LIBUSUAL is not set | 1314 | # CONFIG_USB_LIBUSUAL is not set |
1311 | 1315 | ||
@@ -1314,7 +1318,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
1314 | # | 1318 | # |
1315 | # CONFIG_USB_MDC800 is not set | 1319 | # CONFIG_USB_MDC800 is not set |
1316 | # CONFIG_USB_MICROTEK is not set | 1320 | # CONFIG_USB_MICROTEK is not set |
1317 | CONFIG_USB_MON=y | ||
1318 | 1321 | ||
1319 | # | 1322 | # |
1320 | # USB port drivers | 1323 | # USB port drivers |
@@ -1323,7 +1326,6 @@ CONFIG_USB_SERIAL=m | |||
1323 | CONFIG_USB_EZUSB=y | 1326 | CONFIG_USB_EZUSB=y |
1324 | CONFIG_USB_SERIAL_GENERIC=y | 1327 | CONFIG_USB_SERIAL_GENERIC=y |
1325 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1328 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
1326 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
1327 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1329 | # CONFIG_USB_SERIAL_ARK3116 is not set |
1328 | CONFIG_USB_SERIAL_BELKIN=m | 1330 | CONFIG_USB_SERIAL_BELKIN=m |
1329 | # CONFIG_USB_SERIAL_CH341 is not set | 1331 | # CONFIG_USB_SERIAL_CH341 is not set |
@@ -1383,7 +1385,6 @@ CONFIG_USB_SERIAL_OMNINET=m | |||
1383 | # CONFIG_USB_EMI62 is not set | 1385 | # CONFIG_USB_EMI62 is not set |
1384 | # CONFIG_USB_EMI26 is not set | 1386 | # CONFIG_USB_EMI26 is not set |
1385 | # CONFIG_USB_ADUTUX is not set | 1387 | # CONFIG_USB_ADUTUX is not set |
1386 | # CONFIG_USB_AUERSWALD is not set | ||
1387 | # CONFIG_USB_RIO500 is not set | 1388 | # CONFIG_USB_RIO500 is not set |
1388 | # CONFIG_USB_LEGOTOWER is not set | 1389 | # CONFIG_USB_LEGOTOWER is not set |
1389 | # CONFIG_USB_LCD is not set | 1390 | # CONFIG_USB_LCD is not set |
@@ -1497,6 +1498,7 @@ CONFIG_HFSPLUS_FS=m | |||
1497 | CONFIG_CRAMFS=y | 1498 | CONFIG_CRAMFS=y |
1498 | # CONFIG_VXFS_FS is not set | 1499 | # CONFIG_VXFS_FS is not set |
1499 | # CONFIG_MINIX_FS is not set | 1500 | # CONFIG_MINIX_FS is not set |
1501 | # CONFIG_OMFS_FS is not set | ||
1500 | # CONFIG_HPFS_FS is not set | 1502 | # CONFIG_HPFS_FS is not set |
1501 | # CONFIG_QNX4FS_FS is not set | 1503 | # CONFIG_QNX4FS_FS is not set |
1502 | # CONFIG_ROMFS_FS is not set | 1504 | # CONFIG_ROMFS_FS is not set |
@@ -1519,7 +1521,6 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
1519 | CONFIG_NFS_COMMON=y | 1521 | CONFIG_NFS_COMMON=y |
1520 | CONFIG_SUNRPC=y | 1522 | CONFIG_SUNRPC=y |
1521 | CONFIG_SUNRPC_GSS=y | 1523 | CONFIG_SUNRPC_GSS=y |
1522 | # CONFIG_SUNRPC_BIND34 is not set | ||
1523 | CONFIG_RPCSEC_GSS_KRB5=y | 1524 | CONFIG_RPCSEC_GSS_KRB5=y |
1524 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1525 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1525 | # CONFIG_SMB_FS is not set | 1526 | # CONFIG_SMB_FS is not set |
@@ -1603,6 +1604,7 @@ CONFIG_BITREVERSE=y | |||
1603 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1604 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1604 | CONFIG_CRC_CCITT=m | 1605 | CONFIG_CRC_CCITT=m |
1605 | # CONFIG_CRC16 is not set | 1606 | # CONFIG_CRC16 is not set |
1607 | CONFIG_CRC_T10DIF=y | ||
1606 | CONFIG_CRC_ITU_T=m | 1608 | CONFIG_CRC_ITU_T=m |
1607 | CONFIG_CRC32=y | 1609 | CONFIG_CRC32=y |
1608 | # CONFIG_CRC7 is not set | 1610 | # CONFIG_CRC7 is not set |
@@ -1629,8 +1631,10 @@ CONFIG_DEBUG_FS=y | |||
1629 | CONFIG_DEBUG_KERNEL=y | 1631 | CONFIG_DEBUG_KERNEL=y |
1630 | # CONFIG_DEBUG_SHIRQ is not set | 1632 | # CONFIG_DEBUG_SHIRQ is not set |
1631 | CONFIG_DETECT_SOFTLOCKUP=y | 1633 | CONFIG_DETECT_SOFTLOCKUP=y |
1634 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1635 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1632 | CONFIG_SCHED_DEBUG=y | 1636 | CONFIG_SCHED_DEBUG=y |
1633 | # CONFIG_SCHEDSTATS is not set | 1637 | CONFIG_SCHEDSTATS=y |
1634 | # CONFIG_TIMER_STATS is not set | 1638 | # CONFIG_TIMER_STATS is not set |
1635 | # CONFIG_DEBUG_OBJECTS is not set | 1639 | # CONFIG_DEBUG_OBJECTS is not set |
1636 | # CONFIG_SLUB_DEBUG_ON is not set | 1640 | # CONFIG_SLUB_DEBUG_ON is not set |
@@ -1644,22 +1648,37 @@ CONFIG_DEBUG_MUTEXES=y | |||
1644 | # CONFIG_LOCK_STAT is not set | 1648 | # CONFIG_LOCK_STAT is not set |
1645 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1649 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1646 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1650 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1651 | CONFIG_STACKTRACE=y | ||
1647 | # CONFIG_DEBUG_KOBJECT is not set | 1652 | # CONFIG_DEBUG_KOBJECT is not set |
1648 | CONFIG_DEBUG_BUGVERBOSE=y | 1653 | CONFIG_DEBUG_BUGVERBOSE=y |
1649 | # CONFIG_DEBUG_INFO is not set | 1654 | # CONFIG_DEBUG_INFO is not set |
1650 | # CONFIG_DEBUG_VM is not set | 1655 | # CONFIG_DEBUG_VM is not set |
1651 | # CONFIG_DEBUG_WRITECOUNT is not set | 1656 | # CONFIG_DEBUG_WRITECOUNT is not set |
1657 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1652 | # CONFIG_DEBUG_LIST is not set | 1658 | # CONFIG_DEBUG_LIST is not set |
1653 | # CONFIG_DEBUG_SG is not set | 1659 | # CONFIG_DEBUG_SG is not set |
1660 | CONFIG_FRAME_POINTER=y | ||
1654 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1661 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1655 | # CONFIG_RCU_TORTURE_TEST is not set | 1662 | # CONFIG_RCU_TORTURE_TEST is not set |
1656 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1663 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1657 | # CONFIG_FAULT_INJECTION is not set | 1664 | # CONFIG_FAULT_INJECTION is not set |
1665 | CONFIG_LATENCYTOP=y | ||
1666 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1667 | CONFIG_HAVE_FTRACE=y | ||
1668 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1669 | # CONFIG_FTRACE is not set | ||
1670 | # CONFIG_IRQSOFF_TRACER is not set | ||
1671 | # CONFIG_SCHED_TRACER is not set | ||
1672 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1658 | # CONFIG_SAMPLES is not set | 1673 | # CONFIG_SAMPLES is not set |
1674 | CONFIG_HAVE_ARCH_KGDB=y | ||
1675 | # CONFIG_KGDB is not set | ||
1659 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1676 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1660 | # CONFIG_DEBUG_STACK_USAGE is not set | 1677 | # CONFIG_DEBUG_STACK_USAGE is not set |
1661 | # CONFIG_DEBUG_PAGEALLOC is not set | 1678 | # CONFIG_DEBUG_PAGEALLOC is not set |
1662 | # CONFIG_DEBUGGER is not set | 1679 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1680 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1681 | # CONFIG_XMON is not set | ||
1663 | CONFIG_IRQSTACKS=y | 1682 | CONFIG_IRQSTACKS=y |
1664 | # CONFIG_VIRQ_DEBUG is not set | 1683 | # CONFIG_VIRQ_DEBUG is not set |
1665 | CONFIG_BOOTX_TEXT=y | 1684 | CONFIG_BOOTX_TEXT=y |
@@ -1718,6 +1737,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
1718 | CONFIG_CRYPTO_MD4=m | 1737 | CONFIG_CRYPTO_MD4=m |
1719 | CONFIG_CRYPTO_MD5=y | 1738 | CONFIG_CRYPTO_MD5=y |
1720 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1739 | CONFIG_CRYPTO_MICHAEL_MIC=m |
1740 | # CONFIG_CRYPTO_RMD128 is not set | ||
1741 | # CONFIG_CRYPTO_RMD160 is not set | ||
1742 | # CONFIG_CRYPTO_RMD256 is not set | ||
1743 | # CONFIG_CRYPTO_RMD320 is not set | ||
1721 | CONFIG_CRYPTO_SHA1=m | 1744 | CONFIG_CRYPTO_SHA1=m |
1722 | CONFIG_CRYPTO_SHA256=m | 1745 | CONFIG_CRYPTO_SHA256=m |
1723 | CONFIG_CRYPTO_SHA512=m | 1746 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 63f0bdb6340d..2c3f13577f4b 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc3 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Tue May 20 20:01:36 2008 | 4 | # Tue Aug 26 13:15:49 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -31,6 +31,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 32 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | 33 | CONFIG_STACKTRACE_SUPPORT=y |
34 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 35 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
@@ -94,9 +95,8 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
94 | CONFIG_SYSCTL=y | 95 | CONFIG_SYSCTL=y |
95 | # CONFIG_EMBEDDED is not set | 96 | # CONFIG_EMBEDDED is not set |
96 | CONFIG_SYSCTL_SYSCALL=y | 97 | CONFIG_SYSCTL_SYSCALL=y |
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
98 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
99 | # CONFIG_KALLSYMS_ALL is not set | 99 | CONFIG_KALLSYMS_ALL=y |
100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 100 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
101 | CONFIG_HOTPLUG=y | 101 | CONFIG_HOTPLUG=y |
102 | CONFIG_PRINTK=y | 102 | CONFIG_PRINTK=y |
@@ -120,10 +120,16 @@ CONFIG_SLUB=y | |||
120 | # CONFIG_MARKERS is not set | 120 | # CONFIG_MARKERS is not set |
121 | CONFIG_HAVE_OPROFILE=y | 121 | CONFIG_HAVE_OPROFILE=y |
122 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
124 | CONFIG_HAVE_IOREMAP_PROT=y | ||
123 | CONFIG_HAVE_KPROBES=y | 125 | CONFIG_HAVE_KPROBES=y |
124 | CONFIG_HAVE_KRETPROBES=y | 126 | CONFIG_HAVE_KRETPROBES=y |
125 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
128 | CONFIG_HAVE_DMA_ATTRS=y | ||
129 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
130 | # CONFIG_HAVE_CLK is not set | ||
126 | CONFIG_PROC_PAGE_MONITOR=y | 131 | CONFIG_PROC_PAGE_MONITOR=y |
132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
127 | CONFIG_SLABINFO=y | 133 | CONFIG_SLABINFO=y |
128 | CONFIG_RT_MUTEXES=y | 134 | CONFIG_RT_MUTEXES=y |
129 | # CONFIG_TINY_SHMEM is not set | 135 | # CONFIG_TINY_SHMEM is not set |
@@ -139,6 +145,7 @@ CONFIG_STOP_MACHINE=y | |||
139 | CONFIG_BLOCK=y | 145 | CONFIG_BLOCK=y |
140 | # CONFIG_BLK_DEV_IO_TRACE is not set | 146 | # CONFIG_BLK_DEV_IO_TRACE is not set |
141 | CONFIG_BLK_DEV_BSG=y | 147 | CONFIG_BLK_DEV_BSG=y |
148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
142 | CONFIG_BLOCK_COMPAT=y | 149 | CONFIG_BLOCK_COMPAT=y |
143 | 150 | ||
144 | # | 151 | # |
@@ -159,9 +166,6 @@ CONFIG_CLASSIC_RCU=y | |||
159 | # Platform support | 166 | # Platform support |
160 | # | 167 | # |
161 | CONFIG_PPC_MULTIPLATFORM=y | 168 | CONFIG_PPC_MULTIPLATFORM=y |
162 | # CONFIG_PPC_82xx is not set | ||
163 | # CONFIG_PPC_83xx is not set | ||
164 | # CONFIG_PPC_86xx is not set | ||
165 | # CONFIG_PPC_PSERIES is not set | 169 | # CONFIG_PPC_PSERIES is not set |
166 | CONFIG_LPARCFG=y | 170 | CONFIG_LPARCFG=y |
167 | CONFIG_PPC_ISERIES=y | 171 | CONFIG_PPC_ISERIES=y |
@@ -173,8 +177,6 @@ CONFIG_VIODASD=y | |||
173 | CONFIG_VIOCD=m | 177 | CONFIG_VIOCD=m |
174 | CONFIG_VIOTAPE=m | 178 | CONFIG_VIOTAPE=m |
175 | CONFIG_VIOPATH=y | 179 | CONFIG_VIOPATH=y |
176 | # CONFIG_PPC_MPC512x is not set | ||
177 | # CONFIG_PPC_MPC5121 is not set | ||
178 | # CONFIG_PPC_PMAC is not set | 180 | # CONFIG_PPC_PMAC is not set |
179 | # CONFIG_PPC_MAPLE is not set | 181 | # CONFIG_PPC_MAPLE is not set |
180 | # CONFIG_PPC_PASEMI is not set | 182 | # CONFIG_PPC_PASEMI is not set |
@@ -211,7 +213,7 @@ CONFIG_HZ_250=y | |||
211 | # CONFIG_HZ_300 is not set | 213 | # CONFIG_HZ_300 is not set |
212 | # CONFIG_HZ_1000 is not set | 214 | # CONFIG_HZ_1000 is not set |
213 | CONFIG_HZ=250 | 215 | CONFIG_HZ=250 |
214 | # CONFIG_SCHED_HRTICK is not set | 216 | CONFIG_SCHED_HRTICK=y |
215 | CONFIG_PREEMPT_NONE=y | 217 | CONFIG_PREEMPT_NONE=y |
216 | # CONFIG_PREEMPT_VOLUNTARY is not set | 218 | # CONFIG_PREEMPT_VOLUNTARY is not set |
217 | # CONFIG_PREEMPT is not set | 219 | # CONFIG_PREEMPT is not set |
@@ -241,6 +243,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
241 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 243 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
242 | CONFIG_PAGEFLAGS_EXTENDED=y | 244 | CONFIG_PAGEFLAGS_EXTENDED=y |
243 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 245 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
246 | # CONFIG_MIGRATION is not set | ||
244 | CONFIG_RESOURCES_64BIT=y | 247 | CONFIG_RESOURCES_64BIT=y |
245 | CONFIG_ZONE_DMA_FLAG=1 | 248 | CONFIG_ZONE_DMA_FLAG=1 |
246 | CONFIG_BOUNCE=y | 249 | CONFIG_BOUNCE=y |
@@ -250,6 +253,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
250 | # CONFIG_SCHED_SMT is not set | 253 | # CONFIG_SCHED_SMT is not set |
251 | CONFIG_PROC_DEVICETREE=y | 254 | CONFIG_PROC_DEVICETREE=y |
252 | # CONFIG_CMDLINE_BOOL is not set | 255 | # CONFIG_CMDLINE_BOOL is not set |
256 | CONFIG_EXTRA_TARGETS="" | ||
253 | # CONFIG_PM is not set | 257 | # CONFIG_PM is not set |
254 | CONFIG_SECCOMP=y | 258 | CONFIG_SECCOMP=y |
255 | CONFIG_ISA_DMA_API=y | 259 | CONFIG_ISA_DMA_API=y |
@@ -274,10 +278,6 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
274 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 278 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
275 | CONFIG_KERNEL_START=0xc000000000000000 | 279 | CONFIG_KERNEL_START=0xc000000000000000 |
276 | CONFIG_PHYSICAL_START=0x00000000 | 280 | CONFIG_PHYSICAL_START=0x00000000 |
277 | |||
278 | # | ||
279 | # Networking | ||
280 | # | ||
281 | CONFIG_NET=y | 281 | CONFIG_NET=y |
282 | 282 | ||
283 | # | 283 | # |
@@ -291,6 +291,7 @@ CONFIG_XFRM_USER=m | |||
291 | CONFIG_XFRM_SUB_POLICY=y | 291 | CONFIG_XFRM_SUB_POLICY=y |
292 | # CONFIG_XFRM_MIGRATE is not set | 292 | # CONFIG_XFRM_MIGRATE is not set |
293 | # CONFIG_XFRM_STATISTICS is not set | 293 | # CONFIG_XFRM_STATISTICS is not set |
294 | CONFIG_XFRM_IPCOMP=m | ||
294 | CONFIG_NET_KEY=m | 295 | CONFIG_NET_KEY=m |
295 | # CONFIG_NET_KEY_MIGRATE is not set | 296 | # CONFIG_NET_KEY_MIGRATE is not set |
296 | CONFIG_INET=y | 297 | CONFIG_INET=y |
@@ -480,7 +481,9 @@ CONFIG_NET_CLS_ROUTE=y | |||
480 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 481 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
481 | CONFIG_STANDALONE=y | 482 | CONFIG_STANDALONE=y |
482 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 483 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
483 | CONFIG_FW_LOADER=m | 484 | CONFIG_FW_LOADER=y |
485 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
486 | CONFIG_EXTRA_FIRMWARE="" | ||
484 | # CONFIG_DEBUG_DRIVER is not set | 487 | # CONFIG_DEBUG_DRIVER is not set |
485 | # CONFIG_DEBUG_DEVRES is not set | 488 | # CONFIG_DEBUG_DEVRES is not set |
486 | # CONFIG_SYS_HYPERVISOR is not set | 489 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -504,12 +507,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
504 | # CONFIG_BLK_DEV_XIP is not set | 507 | # CONFIG_BLK_DEV_XIP is not set |
505 | # CONFIG_CDROM_PKTCDVD is not set | 508 | # CONFIG_CDROM_PKTCDVD is not set |
506 | # CONFIG_ATA_OVER_ETH is not set | 509 | # CONFIG_ATA_OVER_ETH is not set |
510 | # CONFIG_BLK_DEV_HD is not set | ||
507 | CONFIG_MISC_DEVICES=y | 511 | CONFIG_MISC_DEVICES=y |
508 | # CONFIG_PHANTOM is not set | 512 | # CONFIG_PHANTOM is not set |
509 | # CONFIG_EEPROM_93CX6 is not set | 513 | # CONFIG_EEPROM_93CX6 is not set |
510 | # CONFIG_SGI_IOC4 is not set | 514 | # CONFIG_SGI_IOC4 is not set |
511 | # CONFIG_TIFM_CORE is not set | 515 | # CONFIG_TIFM_CORE is not set |
512 | # CONFIG_ENCLOSURE_SERVICES is not set | 516 | # CONFIG_ENCLOSURE_SERVICES is not set |
517 | # CONFIG_HP_ILO is not set | ||
513 | CONFIG_HAVE_IDE=y | 518 | CONFIG_HAVE_IDE=y |
514 | # CONFIG_IDE is not set | 519 | # CONFIG_IDE is not set |
515 | 520 | ||
@@ -588,6 +593,7 @@ CONFIG_SCSI_IBMVSCSI=m | |||
588 | # CONFIG_SCSI_DC390T is not set | 593 | # CONFIG_SCSI_DC390T is not set |
589 | # CONFIG_SCSI_DEBUG is not set | 594 | # CONFIG_SCSI_DEBUG is not set |
590 | # CONFIG_SCSI_SRP is not set | 595 | # CONFIG_SCSI_SRP is not set |
596 | # CONFIG_SCSI_DH is not set | ||
591 | # CONFIG_ATA is not set | 597 | # CONFIG_ATA is not set |
592 | CONFIG_MD=y | 598 | CONFIG_MD=y |
593 | CONFIG_BLK_DEV_MD=y | 599 | CONFIG_BLK_DEV_MD=y |
@@ -612,12 +618,15 @@ CONFIG_DM_ZERO=m | |||
612 | # | 618 | # |
613 | # IEEE 1394 (FireWire) support | 619 | # IEEE 1394 (FireWire) support |
614 | # | 620 | # |
621 | |||
622 | # | ||
623 | # Enable only one of the two stacks, unless you know what you are doing | ||
624 | # | ||
615 | # CONFIG_FIREWIRE is not set | 625 | # CONFIG_FIREWIRE is not set |
616 | # CONFIG_IEEE1394 is not set | 626 | # CONFIG_IEEE1394 is not set |
617 | # CONFIG_I2O is not set | 627 | # CONFIG_I2O is not set |
618 | # CONFIG_MACINTOSH_DRIVERS is not set | 628 | # CONFIG_MACINTOSH_DRIVERS is not set |
619 | CONFIG_NETDEVICES=y | 629 | CONFIG_NETDEVICES=y |
620 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
621 | CONFIG_DUMMY=m | 630 | CONFIG_DUMMY=m |
622 | CONFIG_BONDING=m | 631 | CONFIG_BONDING=m |
623 | # CONFIG_MACVLAN is not set | 632 | # CONFIG_MACVLAN is not set |
@@ -655,6 +664,7 @@ CONFIG_E100=y | |||
655 | # CONFIG_SIS900 is not set | 664 | # CONFIG_SIS900 is not set |
656 | # CONFIG_EPIC100 is not set | 665 | # CONFIG_EPIC100 is not set |
657 | # CONFIG_SUNDANCE is not set | 666 | # CONFIG_SUNDANCE is not set |
667 | # CONFIG_TLAN is not set | ||
658 | # CONFIG_VIA_RHINE is not set | 668 | # CONFIG_VIA_RHINE is not set |
659 | # CONFIG_SC92031 is not set | 669 | # CONFIG_SC92031 is not set |
660 | CONFIG_NETDEV_1000=y | 670 | CONFIG_NETDEV_1000=y |
@@ -662,10 +672,8 @@ CONFIG_ACENIC=m | |||
662 | # CONFIG_ACENIC_OMIT_TIGON_I is not set | 672 | # CONFIG_ACENIC_OMIT_TIGON_I is not set |
663 | # CONFIG_DL2K is not set | 673 | # CONFIG_DL2K is not set |
664 | CONFIG_E1000=m | 674 | CONFIG_E1000=m |
665 | # CONFIG_E1000_NAPI is not set | ||
666 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 675 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
667 | # CONFIG_E1000E is not set | 676 | # CONFIG_E1000E is not set |
668 | # CONFIG_E1000E_ENABLED is not set | ||
669 | # CONFIG_IP1000 is not set | 677 | # CONFIG_IP1000 is not set |
670 | # CONFIG_IGB is not set | 678 | # CONFIG_IGB is not set |
671 | # CONFIG_NS83820 is not set | 679 | # CONFIG_NS83820 is not set |
@@ -680,6 +688,7 @@ CONFIG_E1000=m | |||
680 | # CONFIG_BNX2 is not set | 688 | # CONFIG_BNX2 is not set |
681 | # CONFIG_QLA3XXX is not set | 689 | # CONFIG_QLA3XXX is not set |
682 | # CONFIG_ATL1 is not set | 690 | # CONFIG_ATL1 is not set |
691 | # CONFIG_ATL1E is not set | ||
683 | CONFIG_NETDEV_10000=y | 692 | CONFIG_NETDEV_10000=y |
684 | # CONFIG_CHELSIO_T1 is not set | 693 | # CONFIG_CHELSIO_T1 is not set |
685 | # CONFIG_CHELSIO_T3 is not set | 694 | # CONFIG_CHELSIO_T3 is not set |
@@ -767,6 +776,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
767 | # Character devices | 776 | # Character devices |
768 | # | 777 | # |
769 | CONFIG_VT=y | 778 | CONFIG_VT=y |
779 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
770 | CONFIG_VT_CONSOLE=y | 780 | CONFIG_VT_CONSOLE=y |
771 | CONFIG_HW_CONSOLE=y | 781 | CONFIG_HW_CONSOLE=y |
772 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 782 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -789,6 +799,7 @@ CONFIG_UNIX98_PTYS=y | |||
789 | CONFIG_LEGACY_PTYS=y | 799 | CONFIG_LEGACY_PTYS=y |
790 | CONFIG_LEGACY_PTY_COUNT=256 | 800 | CONFIG_LEGACY_PTY_COUNT=256 |
791 | CONFIG_HVC_DRIVER=y | 801 | CONFIG_HVC_DRIVER=y |
802 | CONFIG_HVC_IRQ=y | ||
792 | CONFIG_HVC_ISERIES=y | 803 | CONFIG_HVC_ISERIES=y |
793 | # CONFIG_IPMI_HANDLER is not set | 804 | # CONFIG_IPMI_HANDLER is not set |
794 | # CONFIG_HW_RANDOM is not set | 805 | # CONFIG_HW_RANDOM is not set |
@@ -803,10 +814,13 @@ CONFIG_MAX_RAW_DEVS=256 | |||
803 | CONFIG_DEVPORT=y | 814 | CONFIG_DEVPORT=y |
804 | # CONFIG_I2C is not set | 815 | # CONFIG_I2C is not set |
805 | # CONFIG_SPI is not set | 816 | # CONFIG_SPI is not set |
817 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
818 | # CONFIG_GPIOLIB is not set | ||
806 | # CONFIG_W1 is not set | 819 | # CONFIG_W1 is not set |
807 | # CONFIG_POWER_SUPPLY is not set | 820 | # CONFIG_POWER_SUPPLY is not set |
808 | # CONFIG_HWMON is not set | 821 | # CONFIG_HWMON is not set |
809 | # CONFIG_THERMAL is not set | 822 | # CONFIG_THERMAL is not set |
823 | # CONFIG_THERMAL_HWMON is not set | ||
810 | # CONFIG_WATCHDOG is not set | 824 | # CONFIG_WATCHDOG is not set |
811 | 825 | ||
812 | # | 826 | # |
@@ -818,8 +832,10 @@ CONFIG_SSB_POSSIBLE=y | |||
818 | # | 832 | # |
819 | # Multifunction device drivers | 833 | # Multifunction device drivers |
820 | # | 834 | # |
835 | # CONFIG_MFD_CORE is not set | ||
821 | # CONFIG_MFD_SM501 is not set | 836 | # CONFIG_MFD_SM501 is not set |
822 | # CONFIG_HTC_PASIC3 is not set | 837 | # CONFIG_HTC_PASIC3 is not set |
838 | # CONFIG_MFD_TMIO is not set | ||
823 | 839 | ||
824 | # | 840 | # |
825 | # Multimedia devices | 841 | # Multimedia devices |
@@ -858,10 +874,6 @@ CONFIG_SSB_POSSIBLE=y | |||
858 | CONFIG_VGA_CONSOLE=y | 874 | CONFIG_VGA_CONSOLE=y |
859 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 875 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
860 | CONFIG_DUMMY_CONSOLE=y | 876 | CONFIG_DUMMY_CONSOLE=y |
861 | |||
862 | # | ||
863 | # Sound | ||
864 | # | ||
865 | # CONFIG_SOUND is not set | 877 | # CONFIG_SOUND is not set |
866 | # CONFIG_HID_SUPPORT is not set | 878 | # CONFIG_HID_SUPPORT is not set |
867 | # CONFIG_USB_SUPPORT is not set | 879 | # CONFIG_USB_SUPPORT is not set |
@@ -910,7 +922,6 @@ CONFIG_XFS_POSIX_ACL=y | |||
910 | # CONFIG_XFS_RT is not set | 922 | # CONFIG_XFS_RT is not set |
911 | # CONFIG_XFS_DEBUG is not set | 923 | # CONFIG_XFS_DEBUG is not set |
912 | CONFIG_GFS2_FS=m | 924 | CONFIG_GFS2_FS=m |
913 | CONFIG_GFS2_FS_LOCKING_NOLOCK=m | ||
914 | CONFIG_GFS2_FS_LOCKING_DLM=m | 925 | CONFIG_GFS2_FS_LOCKING_DLM=m |
915 | # CONFIG_OCFS2_FS is not set | 926 | # CONFIG_OCFS2_FS is not set |
916 | CONFIG_DNOTIFY=y | 927 | CONFIG_DNOTIFY=y |
@@ -967,6 +978,7 @@ CONFIG_CONFIGFS_FS=m | |||
967 | CONFIG_CRAMFS=y | 978 | CONFIG_CRAMFS=y |
968 | # CONFIG_VXFS_FS is not set | 979 | # CONFIG_VXFS_FS is not set |
969 | # CONFIG_MINIX_FS is not set | 980 | # CONFIG_MINIX_FS is not set |
981 | # CONFIG_OMFS_FS is not set | ||
970 | # CONFIG_HPFS_FS is not set | 982 | # CONFIG_HPFS_FS is not set |
971 | # CONFIG_QNX4FS_FS is not set | 983 | # CONFIG_QNX4FS_FS is not set |
972 | # CONFIG_ROMFS_FS is not set | 984 | # CONFIG_ROMFS_FS is not set |
@@ -989,7 +1001,6 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
989 | CONFIG_NFS_COMMON=y | 1001 | CONFIG_NFS_COMMON=y |
990 | CONFIG_SUNRPC=y | 1002 | CONFIG_SUNRPC=y |
991 | CONFIG_SUNRPC_GSS=y | 1003 | CONFIG_SUNRPC_GSS=y |
992 | # CONFIG_SUNRPC_BIND34 is not set | ||
993 | CONFIG_RPCSEC_GSS_KRB5=y | 1004 | CONFIG_RPCSEC_GSS_KRB5=y |
994 | CONFIG_RPCSEC_GSS_SPKM3=m | 1005 | CONFIG_RPCSEC_GSS_SPKM3=m |
995 | # CONFIG_SMB_FS is not set | 1006 | # CONFIG_SMB_FS is not set |
@@ -1059,6 +1070,7 @@ CONFIG_BITREVERSE=y | |||
1059 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1070 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1060 | CONFIG_CRC_CCITT=m | 1071 | CONFIG_CRC_CCITT=m |
1061 | # CONFIG_CRC16 is not set | 1072 | # CONFIG_CRC16 is not set |
1073 | CONFIG_CRC_T10DIF=y | ||
1062 | CONFIG_CRC_ITU_T=m | 1074 | CONFIG_CRC_ITU_T=m |
1063 | CONFIG_CRC32=y | 1075 | CONFIG_CRC32=y |
1064 | # CONFIG_CRC7 is not set | 1076 | # CONFIG_CRC7 is not set |
@@ -1089,8 +1101,10 @@ CONFIG_DEBUG_FS=y | |||
1089 | CONFIG_DEBUG_KERNEL=y | 1101 | CONFIG_DEBUG_KERNEL=y |
1090 | # CONFIG_DEBUG_SHIRQ is not set | 1102 | # CONFIG_DEBUG_SHIRQ is not set |
1091 | CONFIG_DETECT_SOFTLOCKUP=y | 1103 | CONFIG_DETECT_SOFTLOCKUP=y |
1104 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1105 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1092 | CONFIG_SCHED_DEBUG=y | 1106 | CONFIG_SCHED_DEBUG=y |
1093 | # CONFIG_SCHEDSTATS is not set | 1107 | CONFIG_SCHEDSTATS=y |
1094 | # CONFIG_TIMER_STATS is not set | 1108 | # CONFIG_TIMER_STATS is not set |
1095 | # CONFIG_DEBUG_OBJECTS is not set | 1109 | # CONFIG_DEBUG_OBJECTS is not set |
1096 | # CONFIG_SLUB_DEBUG_ON is not set | 1110 | # CONFIG_SLUB_DEBUG_ON is not set |
@@ -1104,22 +1118,37 @@ CONFIG_SCHED_DEBUG=y | |||
1104 | # CONFIG_LOCK_STAT is not set | 1118 | # CONFIG_LOCK_STAT is not set |
1105 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1119 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1106 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1120 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1121 | CONFIG_STACKTRACE=y | ||
1107 | # CONFIG_DEBUG_KOBJECT is not set | 1122 | # CONFIG_DEBUG_KOBJECT is not set |
1108 | CONFIG_DEBUG_BUGVERBOSE=y | 1123 | CONFIG_DEBUG_BUGVERBOSE=y |
1109 | # CONFIG_DEBUG_INFO is not set | 1124 | # CONFIG_DEBUG_INFO is not set |
1110 | # CONFIG_DEBUG_VM is not set | 1125 | # CONFIG_DEBUG_VM is not set |
1111 | # CONFIG_DEBUG_WRITECOUNT is not set | 1126 | # CONFIG_DEBUG_WRITECOUNT is not set |
1127 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1112 | # CONFIG_DEBUG_LIST is not set | 1128 | # CONFIG_DEBUG_LIST is not set |
1113 | # CONFIG_DEBUG_SG is not set | 1129 | # CONFIG_DEBUG_SG is not set |
1130 | CONFIG_FRAME_POINTER=y | ||
1114 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1131 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1115 | # CONFIG_RCU_TORTURE_TEST is not set | 1132 | # CONFIG_RCU_TORTURE_TEST is not set |
1116 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1133 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1117 | # CONFIG_FAULT_INJECTION is not set | 1134 | # CONFIG_FAULT_INJECTION is not set |
1135 | CONFIG_LATENCYTOP=y | ||
1136 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1137 | CONFIG_HAVE_FTRACE=y | ||
1138 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1139 | # CONFIG_FTRACE is not set | ||
1140 | # CONFIG_IRQSOFF_TRACER is not set | ||
1141 | # CONFIG_SCHED_TRACER is not set | ||
1142 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1118 | # CONFIG_SAMPLES is not set | 1143 | # CONFIG_SAMPLES is not set |
1144 | CONFIG_HAVE_ARCH_KGDB=y | ||
1145 | # CONFIG_KGDB is not set | ||
1119 | CONFIG_DEBUG_STACKOVERFLOW=y | 1146 | CONFIG_DEBUG_STACKOVERFLOW=y |
1120 | CONFIG_DEBUG_STACK_USAGE=y | 1147 | CONFIG_DEBUG_STACK_USAGE=y |
1121 | # CONFIG_DEBUG_PAGEALLOC is not set | 1148 | # CONFIG_DEBUG_PAGEALLOC is not set |
1122 | # CONFIG_DEBUGGER is not set | 1149 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1150 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1151 | # CONFIG_XMON is not set | ||
1123 | CONFIG_IRQSTACKS=y | 1152 | CONFIG_IRQSTACKS=y |
1124 | # CONFIG_VIRQ_DEBUG is not set | 1153 | # CONFIG_VIRQ_DEBUG is not set |
1125 | # CONFIG_BOOTX_TEXT is not set | 1154 | # CONFIG_BOOTX_TEXT is not set |
@@ -1178,6 +1207,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
1178 | CONFIG_CRYPTO_MD4=m | 1207 | CONFIG_CRYPTO_MD4=m |
1179 | CONFIG_CRYPTO_MD5=y | 1208 | CONFIG_CRYPTO_MD5=y |
1180 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1209 | CONFIG_CRYPTO_MICHAEL_MIC=m |
1210 | # CONFIG_CRYPTO_RMD128 is not set | ||
1211 | # CONFIG_CRYPTO_RMD160 is not set | ||
1212 | # CONFIG_CRYPTO_RMD256 is not set | ||
1213 | # CONFIG_CRYPTO_RMD320 is not set | ||
1181 | CONFIG_CRYPTO_SHA1=m | 1214 | CONFIG_CRYPTO_SHA1=m |
1182 | CONFIG_CRYPTO_SHA256=m | 1215 | CONFIG_CRYPTO_SHA256=m |
1183 | CONFIG_CRYPTO_SHA512=m | 1216 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 48434c2c7628..6fc4c2127757 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:10 2008 | 4 | # Thu Aug 21 00:52:05 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -93,7 +94,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
93 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
94 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
95 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
97 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
98 | # CONFIG_KALLSYMS_ALL is not set | 98 | # CONFIG_KALLSYMS_ALL is not set |
99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -119,10 +119,16 @@ CONFIG_SLUB=y | |||
119 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
120 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
121 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
122 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
123 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
124 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
129 | # CONFIG_HAVE_CLK is not set | ||
125 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
126 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
127 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
128 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
@@ -139,6 +145,7 @@ CONFIG_BLOCK=y | |||
139 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
140 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
141 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
142 | 149 | ||
143 | # | 150 | # |
144 | # IO Schedulers | 151 | # IO Schedulers |
@@ -158,25 +165,25 @@ CONFIG_CLASSIC_RCU=y | |||
158 | # Platform support | 165 | # Platform support |
159 | # | 166 | # |
160 | CONFIG_PPC_MULTIPLATFORM=y | 167 | CONFIG_PPC_MULTIPLATFORM=y |
161 | # CONFIG_PPC_82xx is not set | ||
162 | # CONFIG_PPC_83xx is not set | ||
163 | # CONFIG_PPC_86xx is not set | ||
164 | CONFIG_CLASSIC32=y | 168 | CONFIG_CLASSIC32=y |
165 | # CONFIG_PPC_CHRP is not set | 169 | # CONFIG_PPC_CHRP is not set |
166 | # CONFIG_PPC_MPC512x is not set | ||
167 | # CONFIG_PPC_MPC5121 is not set | ||
168 | # CONFIG_MPC5121_ADS is not set | 170 | # CONFIG_MPC5121_ADS is not set |
171 | # CONFIG_MPC5121_GENERIC is not set | ||
169 | # CONFIG_PPC_MPC52xx is not set | 172 | # CONFIG_PPC_MPC52xx is not set |
170 | # CONFIG_PPC_PMAC is not set | 173 | # CONFIG_PPC_PMAC is not set |
171 | # CONFIG_PPC_CELL is not set | 174 | # CONFIG_PPC_CELL is not set |
172 | # CONFIG_PPC_CELL_NATIVE is not set | 175 | # CONFIG_PPC_CELL_NATIVE is not set |
176 | # CONFIG_PPC_82xx is not set | ||
173 | # CONFIG_PQ2ADS is not set | 177 | # CONFIG_PQ2ADS is not set |
178 | # CONFIG_PPC_83xx is not set | ||
179 | # CONFIG_PPC_86xx is not set | ||
174 | CONFIG_EMBEDDED6xx=y | 180 | CONFIG_EMBEDDED6xx=y |
175 | CONFIG_LINKSTATION=y | 181 | CONFIG_LINKSTATION=y |
176 | # CONFIG_STORCENTER is not set | 182 | # CONFIG_STORCENTER is not set |
177 | # CONFIG_MPC7448HPC2 is not set | 183 | # CONFIG_MPC7448HPC2 is not set |
178 | # CONFIG_PPC_HOLLY is not set | 184 | # CONFIG_PPC_HOLLY is not set |
179 | # CONFIG_PPC_PRPMC2800 is not set | 185 | # CONFIG_PPC_PRPMC2800 is not set |
186 | # CONFIG_PPC_C2K is not set | ||
180 | CONFIG_MPC10X_BRIDGE=y | 187 | CONFIG_MPC10X_BRIDGE=y |
181 | CONFIG_MPC10X_OPENPIC=y | 188 | CONFIG_MPC10X_OPENPIC=y |
182 | # CONFIG_MPC10X_STORE_GATHERING is not set | 189 | # CONFIG_MPC10X_STORE_GATHERING is not set |
@@ -207,7 +214,7 @@ CONFIG_HZ_100=y | |||
207 | # CONFIG_HZ_300 is not set | 214 | # CONFIG_HZ_300 is not set |
208 | # CONFIG_HZ_1000 is not set | 215 | # CONFIG_HZ_1000 is not set |
209 | CONFIG_HZ=100 | 216 | CONFIG_HZ=100 |
210 | # CONFIG_SCHED_HRTICK is not set | 217 | CONFIG_SCHED_HRTICK=y |
211 | CONFIG_PREEMPT_NONE=y | 218 | CONFIG_PREEMPT_NONE=y |
212 | # CONFIG_PREEMPT_VOLUNTARY is not set | 219 | # CONFIG_PREEMPT_VOLUNTARY is not set |
213 | # CONFIG_PREEMPT is not set | 220 | # CONFIG_PREEMPT is not set |
@@ -230,6 +237,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 237 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
231 | CONFIG_PAGEFLAGS_EXTENDED=y | 238 | CONFIG_PAGEFLAGS_EXTENDED=y |
232 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 239 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
240 | CONFIG_MIGRATION=y | ||
233 | # CONFIG_RESOURCES_64BIT is not set | 241 | # CONFIG_RESOURCES_64BIT is not set |
234 | CONFIG_ZONE_DMA_FLAG=1 | 242 | CONFIG_ZONE_DMA_FLAG=1 |
235 | CONFIG_BOUNCE=y | 243 | CONFIG_BOUNCE=y |
@@ -237,6 +245,7 @@ CONFIG_VIRT_TO_BUS=y | |||
237 | CONFIG_FORCE_MAX_ZONEORDER=11 | 245 | CONFIG_FORCE_MAX_ZONEORDER=11 |
238 | CONFIG_PROC_DEVICETREE=y | 246 | CONFIG_PROC_DEVICETREE=y |
239 | # CONFIG_CMDLINE_BOOL is not set | 247 | # CONFIG_CMDLINE_BOOL is not set |
248 | CONFIG_EXTRA_TARGETS="" | ||
240 | # CONFIG_PM is not set | 249 | # CONFIG_PM is not set |
241 | CONFIG_SECCOMP=y | 250 | CONFIG_SECCOMP=y |
242 | CONFIG_ISA_DMA_API=y | 251 | CONFIG_ISA_DMA_API=y |
@@ -273,10 +282,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
273 | CONFIG_KERNEL_START=0xc0000000 | 282 | CONFIG_KERNEL_START=0xc0000000 |
274 | CONFIG_PHYSICAL_START=0x00000000 | 283 | CONFIG_PHYSICAL_START=0x00000000 |
275 | CONFIG_TASK_SIZE=0xc0000000 | 284 | CONFIG_TASK_SIZE=0xc0000000 |
276 | |||
277 | # | ||
278 | # Networking | ||
279 | # | ||
280 | CONFIG_NET=y | 285 | CONFIG_NET=y |
281 | 286 | ||
282 | # | 287 | # |
@@ -461,6 +466,7 @@ CONFIG_IP_NF_ARP_MANGLE=m | |||
461 | # | 466 | # |
462 | # CONFIG_CFG80211 is not set | 467 | # CONFIG_CFG80211 is not set |
463 | CONFIG_WIRELESS_EXT=y | 468 | CONFIG_WIRELESS_EXT=y |
469 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
464 | # CONFIG_MAC80211 is not set | 470 | # CONFIG_MAC80211 is not set |
465 | CONFIG_IEEE80211=m | 471 | CONFIG_IEEE80211=m |
466 | CONFIG_IEEE80211_DEBUG=y | 472 | CONFIG_IEEE80211_DEBUG=y |
@@ -480,7 +486,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
480 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 486 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
481 | CONFIG_STANDALONE=y | 487 | CONFIG_STANDALONE=y |
482 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 488 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
483 | CONFIG_FW_LOADER=m | 489 | CONFIG_FW_LOADER=y |
490 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
491 | CONFIG_EXTRA_FIRMWARE="" | ||
484 | # CONFIG_DEBUG_DRIVER is not set | 492 | # CONFIG_DEBUG_DRIVER is not set |
485 | # CONFIG_DEBUG_DEVRES is not set | 493 | # CONFIG_DEBUG_DEVRES is not set |
486 | # CONFIG_SYS_HYPERVISOR is not set | 494 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -592,12 +600,14 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 | |||
592 | # CONFIG_BLK_DEV_XIP is not set | 600 | # CONFIG_BLK_DEV_XIP is not set |
593 | # CONFIG_CDROM_PKTCDVD is not set | 601 | # CONFIG_CDROM_PKTCDVD is not set |
594 | # CONFIG_ATA_OVER_ETH is not set | 602 | # CONFIG_ATA_OVER_ETH is not set |
603 | # CONFIG_BLK_DEV_HD is not set | ||
595 | CONFIG_MISC_DEVICES=y | 604 | CONFIG_MISC_DEVICES=y |
596 | # CONFIG_PHANTOM is not set | 605 | # CONFIG_PHANTOM is not set |
597 | # CONFIG_EEPROM_93CX6 is not set | 606 | # CONFIG_EEPROM_93CX6 is not set |
598 | # CONFIG_SGI_IOC4 is not set | 607 | # CONFIG_SGI_IOC4 is not set |
599 | # CONFIG_TIFM_CORE is not set | 608 | # CONFIG_TIFM_CORE is not set |
600 | # CONFIG_ENCLOSURE_SERVICES is not set | 609 | # CONFIG_ENCLOSURE_SERVICES is not set |
610 | # CONFIG_HP_ILO is not set | ||
601 | CONFIG_HAVE_IDE=y | 611 | CONFIG_HAVE_IDE=y |
602 | # CONFIG_IDE is not set | 612 | # CONFIG_IDE is not set |
603 | 613 | ||
@@ -676,6 +686,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
676 | # CONFIG_SCSI_NSP32 is not set | 686 | # CONFIG_SCSI_NSP32 is not set |
677 | # CONFIG_SCSI_DEBUG is not set | 687 | # CONFIG_SCSI_DEBUG is not set |
678 | # CONFIG_SCSI_SRP is not set | 688 | # CONFIG_SCSI_SRP is not set |
689 | # CONFIG_SCSI_DH is not set | ||
679 | CONFIG_ATA=y | 690 | CONFIG_ATA=y |
680 | # CONFIG_ATA_NONSTANDARD is not set | 691 | # CONFIG_ATA_NONSTANDARD is not set |
681 | CONFIG_SATA_PMP=y | 692 | CONFIG_SATA_PMP=y |
@@ -743,12 +754,15 @@ CONFIG_PATA_SIL680=y | |||
743 | # | 754 | # |
744 | # IEEE 1394 (FireWire) support | 755 | # IEEE 1394 (FireWire) support |
745 | # | 756 | # |
757 | |||
758 | # | ||
759 | # Enable only one of the two stacks, unless you know what you are doing | ||
760 | # | ||
746 | # CONFIG_FIREWIRE is not set | 761 | # CONFIG_FIREWIRE is not set |
747 | # CONFIG_IEEE1394 is not set | 762 | # CONFIG_IEEE1394 is not set |
748 | # CONFIG_I2O is not set | 763 | # CONFIG_I2O is not set |
749 | # CONFIG_MACINTOSH_DRIVERS is not set | 764 | # CONFIG_MACINTOSH_DRIVERS is not set |
750 | CONFIG_NETDEVICES=y | 765 | CONFIG_NETDEVICES=y |
751 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
752 | # CONFIG_DUMMY is not set | 766 | # CONFIG_DUMMY is not set |
753 | # CONFIG_BONDING is not set | 767 | # CONFIG_BONDING is not set |
754 | # CONFIG_MACVLAN is not set | 768 | # CONFIG_MACVLAN is not set |
@@ -785,14 +799,12 @@ CONFIG_NETDEV_1000=y | |||
785 | # CONFIG_DL2K is not set | 799 | # CONFIG_DL2K is not set |
786 | # CONFIG_E1000 is not set | 800 | # CONFIG_E1000 is not set |
787 | # CONFIG_E1000E is not set | 801 | # CONFIG_E1000E is not set |
788 | # CONFIG_E1000E_ENABLED is not set | ||
789 | # CONFIG_IP1000 is not set | 802 | # CONFIG_IP1000 is not set |
790 | # CONFIG_IGB is not set | 803 | # CONFIG_IGB is not set |
791 | # CONFIG_NS83820 is not set | 804 | # CONFIG_NS83820 is not set |
792 | # CONFIG_HAMACHI is not set | 805 | # CONFIG_HAMACHI is not set |
793 | # CONFIG_YELLOWFIN is not set | 806 | # CONFIG_YELLOWFIN is not set |
794 | CONFIG_R8169=y | 807 | CONFIG_R8169=y |
795 | # CONFIG_R8169_NAPI is not set | ||
796 | # CONFIG_SIS190 is not set | 808 | # CONFIG_SIS190 is not set |
797 | # CONFIG_SKGE is not set | 809 | # CONFIG_SKGE is not set |
798 | # CONFIG_SKY2 is not set | 810 | # CONFIG_SKY2 is not set |
@@ -803,6 +815,7 @@ CONFIG_R8169=y | |||
803 | # CONFIG_MV643XX_ETH is not set | 815 | # CONFIG_MV643XX_ETH is not set |
804 | # CONFIG_QLA3XXX is not set | 816 | # CONFIG_QLA3XXX is not set |
805 | # CONFIG_ATL1 is not set | 817 | # CONFIG_ATL1 is not set |
818 | # CONFIG_ATL1E is not set | ||
806 | CONFIG_NETDEV_10000=y | 819 | CONFIG_NETDEV_10000=y |
807 | # CONFIG_CHELSIO_T1 is not set | 820 | # CONFIG_CHELSIO_T1 is not set |
808 | # CONFIG_CHELSIO_T3 is not set | 821 | # CONFIG_CHELSIO_T3 is not set |
@@ -889,12 +902,14 @@ CONFIG_SERIO=y | |||
889 | CONFIG_SERIO_SERPORT=y | 902 | CONFIG_SERIO_SERPORT=y |
890 | # CONFIG_SERIO_PCIPS2 is not set | 903 | # CONFIG_SERIO_PCIPS2 is not set |
891 | # CONFIG_SERIO_RAW is not set | 904 | # CONFIG_SERIO_RAW is not set |
905 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
892 | # CONFIG_GAMEPORT is not set | 906 | # CONFIG_GAMEPORT is not set |
893 | 907 | ||
894 | # | 908 | # |
895 | # Character devices | 909 | # Character devices |
896 | # | 910 | # |
897 | CONFIG_VT=y | 911 | CONFIG_VT=y |
912 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
898 | CONFIG_VT_CONSOLE=y | 913 | CONFIG_VT_CONSOLE=y |
899 | CONFIG_HW_CONSOLE=y | 914 | CONFIG_HW_CONSOLE=y |
900 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 915 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -934,43 +949,64 @@ CONFIG_DEVPORT=y | |||
934 | CONFIG_I2C=y | 949 | CONFIG_I2C=y |
935 | CONFIG_I2C_BOARDINFO=y | 950 | CONFIG_I2C_BOARDINFO=y |
936 | CONFIG_I2C_CHARDEV=y | 951 | CONFIG_I2C_CHARDEV=y |
952 | CONFIG_I2C_HELPER_AUTO=y | ||
937 | 953 | ||
938 | # | 954 | # |
939 | # I2C Hardware Bus support | 955 | # I2C Hardware Bus support |
940 | # | 956 | # |
957 | |||
958 | # | ||
959 | # PC SMBus host controller drivers | ||
960 | # | ||
941 | # CONFIG_I2C_ALI1535 is not set | 961 | # CONFIG_I2C_ALI1535 is not set |
942 | # CONFIG_I2C_ALI1563 is not set | 962 | # CONFIG_I2C_ALI1563 is not set |
943 | # CONFIG_I2C_ALI15X3 is not set | 963 | # CONFIG_I2C_ALI15X3 is not set |
944 | # CONFIG_I2C_AMD756 is not set | 964 | # CONFIG_I2C_AMD756 is not set |
945 | # CONFIG_I2C_AMD8111 is not set | 965 | # CONFIG_I2C_AMD8111 is not set |
946 | # CONFIG_I2C_I801 is not set | 966 | # CONFIG_I2C_I801 is not set |
947 | # CONFIG_I2C_I810 is not set | 967 | # CONFIG_I2C_ISCH is not set |
948 | # CONFIG_I2C_PIIX4 is not set | 968 | # CONFIG_I2C_PIIX4 is not set |
949 | CONFIG_I2C_MPC=y | ||
950 | # CONFIG_I2C_NFORCE2 is not set | 969 | # CONFIG_I2C_NFORCE2 is not set |
951 | # CONFIG_I2C_OCORES is not set | ||
952 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
953 | # CONFIG_I2C_PROSAVAGE is not set | ||
954 | # CONFIG_I2C_SAVAGE4 is not set | ||
955 | # CONFIG_I2C_SIMTEC is not set | ||
956 | # CONFIG_I2C_SIS5595 is not set | 970 | # CONFIG_I2C_SIS5595 is not set |
957 | # CONFIG_I2C_SIS630 is not set | 971 | # CONFIG_I2C_SIS630 is not set |
958 | # CONFIG_I2C_SIS96X is not set | 972 | # CONFIG_I2C_SIS96X is not set |
959 | # CONFIG_I2C_TAOS_EVM is not set | ||
960 | # CONFIG_I2C_STUB is not set | ||
961 | # CONFIG_I2C_TINY_USB is not set | ||
962 | # CONFIG_I2C_VIA is not set | 973 | # CONFIG_I2C_VIA is not set |
963 | # CONFIG_I2C_VIAPRO is not set | 974 | # CONFIG_I2C_VIAPRO is not set |
975 | |||
976 | # | ||
977 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
978 | # | ||
979 | CONFIG_I2C_MPC=y | ||
980 | # CONFIG_I2C_OCORES is not set | ||
981 | # CONFIG_I2C_SIMTEC is not set | ||
982 | |||
983 | # | ||
984 | # External I2C/SMBus adapter drivers | ||
985 | # | ||
986 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
987 | # CONFIG_I2C_TAOS_EVM is not set | ||
988 | # CONFIG_I2C_TINY_USB is not set | ||
989 | |||
990 | # | ||
991 | # Graphics adapter I2C/DDC channel drivers | ||
992 | # | ||
964 | # CONFIG_I2C_VOODOO3 is not set | 993 | # CONFIG_I2C_VOODOO3 is not set |
994 | |||
995 | # | ||
996 | # Other I2C/SMBus bus drivers | ||
997 | # | ||
965 | # CONFIG_I2C_PCA_PLATFORM is not set | 998 | # CONFIG_I2C_PCA_PLATFORM is not set |
999 | # CONFIG_I2C_STUB is not set | ||
966 | 1000 | ||
967 | # | 1001 | # |
968 | # Miscellaneous I2C Chip support | 1002 | # Miscellaneous I2C Chip support |
969 | # | 1003 | # |
970 | # CONFIG_DS1682 is not set | 1004 | # CONFIG_DS1682 is not set |
1005 | # CONFIG_AT24 is not set | ||
971 | CONFIG_SENSORS_EEPROM=m | 1006 | CONFIG_SENSORS_EEPROM=m |
972 | # CONFIG_SENSORS_PCF8574 is not set | 1007 | # CONFIG_SENSORS_PCF8574 is not set |
973 | # CONFIG_PCF8575 is not set | 1008 | # CONFIG_PCF8575 is not set |
1009 | # CONFIG_SENSORS_PCA9539 is not set | ||
974 | # CONFIG_SENSORS_PCF8591 is not set | 1010 | # CONFIG_SENSORS_PCF8591 is not set |
975 | # CONFIG_SENSORS_MAX6875 is not set | 1011 | # CONFIG_SENSORS_MAX6875 is not set |
976 | # CONFIG_SENSORS_TSL2550 is not set | 1012 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -979,10 +1015,13 @@ CONFIG_SENSORS_EEPROM=m | |||
979 | # CONFIG_I2C_DEBUG_BUS is not set | 1015 | # CONFIG_I2C_DEBUG_BUS is not set |
980 | # CONFIG_I2C_DEBUG_CHIP is not set | 1016 | # CONFIG_I2C_DEBUG_CHIP is not set |
981 | # CONFIG_SPI is not set | 1017 | # CONFIG_SPI is not set |
1018 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
1019 | # CONFIG_GPIOLIB is not set | ||
982 | # CONFIG_W1 is not set | 1020 | # CONFIG_W1 is not set |
983 | # CONFIG_POWER_SUPPLY is not set | 1021 | # CONFIG_POWER_SUPPLY is not set |
984 | CONFIG_HWMON=y | 1022 | CONFIG_HWMON=y |
985 | # CONFIG_HWMON_VID is not set | 1023 | # CONFIG_HWMON_VID is not set |
1024 | # CONFIG_SENSORS_AD7414 is not set | ||
986 | # CONFIG_SENSORS_AD7418 is not set | 1025 | # CONFIG_SENSORS_AD7418 is not set |
987 | # CONFIG_SENSORS_ADM1021 is not set | 1026 | # CONFIG_SENSORS_ADM1021 is not set |
988 | # CONFIG_SENSORS_ADM1025 is not set | 1027 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -1036,6 +1075,7 @@ CONFIG_HWMON=y | |||
1036 | # CONFIG_SENSORS_W83627EHF is not set | 1075 | # CONFIG_SENSORS_W83627EHF is not set |
1037 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1076 | # CONFIG_HWMON_DEBUG_CHIP is not set |
1038 | # CONFIG_THERMAL is not set | 1077 | # CONFIG_THERMAL is not set |
1078 | # CONFIG_THERMAL_HWMON is not set | ||
1039 | # CONFIG_WATCHDOG is not set | 1079 | # CONFIG_WATCHDOG is not set |
1040 | 1080 | ||
1041 | # | 1081 | # |
@@ -1047,8 +1087,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1047 | # | 1087 | # |
1048 | # Multifunction device drivers | 1088 | # Multifunction device drivers |
1049 | # | 1089 | # |
1090 | # CONFIG_MFD_CORE is not set | ||
1050 | # CONFIG_MFD_SM501 is not set | 1091 | # CONFIG_MFD_SM501 is not set |
1051 | # CONFIG_HTC_PASIC3 is not set | 1092 | # CONFIG_HTC_PASIC3 is not set |
1093 | # CONFIG_MFD_TMIO is not set | ||
1052 | 1094 | ||
1053 | # | 1095 | # |
1054 | # Multimedia devices | 1096 | # Multimedia devices |
@@ -1086,10 +1128,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
1086 | # | 1128 | # |
1087 | # CONFIG_VGA_CONSOLE is not set | 1129 | # CONFIG_VGA_CONSOLE is not set |
1088 | CONFIG_DUMMY_CONSOLE=y | 1130 | CONFIG_DUMMY_CONSOLE=y |
1089 | |||
1090 | # | ||
1091 | # Sound | ||
1092 | # | ||
1093 | # CONFIG_SOUND is not set | 1131 | # CONFIG_SOUND is not set |
1094 | CONFIG_HID_SUPPORT=y | 1132 | CONFIG_HID_SUPPORT=y |
1095 | CONFIG_HID=m | 1133 | CONFIG_HID=m |
@@ -1121,6 +1159,7 @@ CONFIG_USB_DEVICEFS=y | |||
1121 | CONFIG_USB_DEVICE_CLASS=y | 1159 | CONFIG_USB_DEVICE_CLASS=y |
1122 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1160 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1123 | # CONFIG_USB_OTG is not set | 1161 | # CONFIG_USB_OTG is not set |
1162 | CONFIG_USB_MON=y | ||
1124 | 1163 | ||
1125 | # | 1164 | # |
1126 | # USB Host Controller Drivers | 1165 | # USB Host Controller Drivers |
@@ -1172,6 +1211,7 @@ CONFIG_USB_STORAGE=m | |||
1172 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1211 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1173 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1212 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1174 | # CONFIG_USB_STORAGE_KARMA is not set | 1213 | # CONFIG_USB_STORAGE_KARMA is not set |
1214 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1175 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1215 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1176 | # CONFIG_USB_LIBUSUAL is not set | 1216 | # CONFIG_USB_LIBUSUAL is not set |
1177 | 1217 | ||
@@ -1180,7 +1220,6 @@ CONFIG_USB_STORAGE=m | |||
1180 | # | 1220 | # |
1181 | # CONFIG_USB_MDC800 is not set | 1221 | # CONFIG_USB_MDC800 is not set |
1182 | # CONFIG_USB_MICROTEK is not set | 1222 | # CONFIG_USB_MICROTEK is not set |
1183 | CONFIG_USB_MON=y | ||
1184 | 1223 | ||
1185 | # | 1224 | # |
1186 | # USB port drivers | 1225 | # USB port drivers |
@@ -1190,7 +1229,6 @@ CONFIG_USB_SERIAL_CONSOLE=y | |||
1190 | # CONFIG_USB_EZUSB is not set | 1229 | # CONFIG_USB_EZUSB is not set |
1191 | # CONFIG_USB_SERIAL_GENERIC is not set | 1230 | # CONFIG_USB_SERIAL_GENERIC is not set |
1192 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1231 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
1193 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
1194 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1232 | # CONFIG_USB_SERIAL_ARK3116 is not set |
1195 | # CONFIG_USB_SERIAL_BELKIN is not set | 1233 | # CONFIG_USB_SERIAL_BELKIN is not set |
1196 | # CONFIG_USB_SERIAL_CH341 is not set | 1234 | # CONFIG_USB_SERIAL_CH341 is not set |
@@ -1237,7 +1275,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=y | |||
1237 | # CONFIG_USB_EMI62 is not set | 1275 | # CONFIG_USB_EMI62 is not set |
1238 | # CONFIG_USB_EMI26 is not set | 1276 | # CONFIG_USB_EMI26 is not set |
1239 | # CONFIG_USB_ADUTUX is not set | 1277 | # CONFIG_USB_ADUTUX is not set |
1240 | # CONFIG_USB_AUERSWALD is not set | ||
1241 | # CONFIG_USB_RIO500 is not set | 1278 | # CONFIG_USB_RIO500 is not set |
1242 | # CONFIG_USB_LEGOTOWER is not set | 1279 | # CONFIG_USB_LEGOTOWER is not set |
1243 | # CONFIG_USB_LCD is not set | 1280 | # CONFIG_USB_LCD is not set |
@@ -1291,6 +1328,7 @@ CONFIG_RTC_DRV_RS5C372=y | |||
1291 | # CONFIG_RTC_DRV_PCF8583 is not set | 1328 | # CONFIG_RTC_DRV_PCF8583 is not set |
1292 | # CONFIG_RTC_DRV_M41T80 is not set | 1329 | # CONFIG_RTC_DRV_M41T80 is not set |
1293 | # CONFIG_RTC_DRV_S35390A is not set | 1330 | # CONFIG_RTC_DRV_S35390A is not set |
1331 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1294 | 1332 | ||
1295 | # | 1333 | # |
1296 | # SPI RTC drivers | 1334 | # SPI RTC drivers |
@@ -1392,6 +1430,7 @@ CONFIG_TMPFS=y | |||
1392 | # CONFIG_CRAMFS is not set | 1430 | # CONFIG_CRAMFS is not set |
1393 | # CONFIG_VXFS_FS is not set | 1431 | # CONFIG_VXFS_FS is not set |
1394 | # CONFIG_MINIX_FS is not set | 1432 | # CONFIG_MINIX_FS is not set |
1433 | # CONFIG_OMFS_FS is not set | ||
1395 | # CONFIG_HPFS_FS is not set | 1434 | # CONFIG_HPFS_FS is not set |
1396 | # CONFIG_QNX4FS_FS is not set | 1435 | # CONFIG_QNX4FS_FS is not set |
1397 | # CONFIG_ROMFS_FS is not set | 1436 | # CONFIG_ROMFS_FS is not set |
@@ -1402,11 +1441,11 @@ CONFIG_NFS_FS=y | |||
1402 | CONFIG_NFS_V3=y | 1441 | CONFIG_NFS_V3=y |
1403 | CONFIG_NFS_V3_ACL=y | 1442 | CONFIG_NFS_V3_ACL=y |
1404 | CONFIG_NFS_V4=y | 1443 | CONFIG_NFS_V4=y |
1444 | CONFIG_ROOT_NFS=y | ||
1405 | CONFIG_NFSD=m | 1445 | CONFIG_NFSD=m |
1406 | CONFIG_NFSD_V3=y | 1446 | CONFIG_NFSD_V3=y |
1407 | # CONFIG_NFSD_V3_ACL is not set | 1447 | # CONFIG_NFSD_V3_ACL is not set |
1408 | # CONFIG_NFSD_V4 is not set | 1448 | # CONFIG_NFSD_V4 is not set |
1409 | CONFIG_ROOT_NFS=y | ||
1410 | CONFIG_LOCKD=y | 1449 | CONFIG_LOCKD=y |
1411 | CONFIG_LOCKD_V4=y | 1450 | CONFIG_LOCKD_V4=y |
1412 | CONFIG_EXPORTFS=m | 1451 | CONFIG_EXPORTFS=m |
@@ -1414,7 +1453,6 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
1414 | CONFIG_NFS_COMMON=y | 1453 | CONFIG_NFS_COMMON=y |
1415 | CONFIG_SUNRPC=y | 1454 | CONFIG_SUNRPC=y |
1416 | CONFIG_SUNRPC_GSS=y | 1455 | CONFIG_SUNRPC_GSS=y |
1417 | # CONFIG_SUNRPC_BIND34 is not set | ||
1418 | CONFIG_RPCSEC_GSS_KRB5=y | 1456 | CONFIG_RPCSEC_GSS_KRB5=y |
1419 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1457 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1420 | # CONFIG_SMB_FS is not set | 1458 | # CONFIG_SMB_FS is not set |
@@ -1482,6 +1520,7 @@ CONFIG_BITREVERSE=y | |||
1482 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1520 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1483 | CONFIG_CRC_CCITT=m | 1521 | CONFIG_CRC_CCITT=m |
1484 | # CONFIG_CRC16 is not set | 1522 | # CONFIG_CRC16 is not set |
1523 | CONFIG_CRC_T10DIF=y | ||
1485 | CONFIG_CRC_ITU_T=m | 1524 | CONFIG_CRC_ITU_T=m |
1486 | CONFIG_CRC32=y | 1525 | CONFIG_CRC32=y |
1487 | # CONFIG_CRC7 is not set | 1526 | # CONFIG_CRC7 is not set |
@@ -1510,6 +1549,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1510 | CONFIG_DEBUG_KERNEL=y | 1549 | CONFIG_DEBUG_KERNEL=y |
1511 | # CONFIG_DEBUG_SHIRQ is not set | 1550 | # CONFIG_DEBUG_SHIRQ is not set |
1512 | CONFIG_DETECT_SOFTLOCKUP=y | 1551 | CONFIG_DETECT_SOFTLOCKUP=y |
1552 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1553 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1513 | CONFIG_SCHED_DEBUG=y | 1554 | CONFIG_SCHED_DEBUG=y |
1514 | # CONFIG_SCHEDSTATS is not set | 1555 | # CONFIG_SCHEDSTATS is not set |
1515 | # CONFIG_TIMER_STATS is not set | 1556 | # CONFIG_TIMER_STATS is not set |
@@ -1527,17 +1568,29 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1527 | # CONFIG_DEBUG_INFO is not set | 1568 | # CONFIG_DEBUG_INFO is not set |
1528 | # CONFIG_DEBUG_VM is not set | 1569 | # CONFIG_DEBUG_VM is not set |
1529 | # CONFIG_DEBUG_WRITECOUNT is not set | 1570 | # CONFIG_DEBUG_WRITECOUNT is not set |
1571 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1530 | # CONFIG_DEBUG_LIST is not set | 1572 | # CONFIG_DEBUG_LIST is not set |
1531 | # CONFIG_DEBUG_SG is not set | 1573 | # CONFIG_DEBUG_SG is not set |
1532 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1574 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1533 | # CONFIG_RCU_TORTURE_TEST is not set | 1575 | # CONFIG_RCU_TORTURE_TEST is not set |
1534 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1576 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1535 | # CONFIG_FAULT_INJECTION is not set | 1577 | # CONFIG_FAULT_INJECTION is not set |
1578 | # CONFIG_LATENCYTOP is not set | ||
1579 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1580 | CONFIG_HAVE_FTRACE=y | ||
1581 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1582 | # CONFIG_FTRACE is not set | ||
1583 | # CONFIG_SCHED_TRACER is not set | ||
1584 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1536 | # CONFIG_SAMPLES is not set | 1585 | # CONFIG_SAMPLES is not set |
1586 | CONFIG_HAVE_ARCH_KGDB=y | ||
1587 | # CONFIG_KGDB is not set | ||
1537 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1588 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1538 | # CONFIG_DEBUG_STACK_USAGE is not set | 1589 | # CONFIG_DEBUG_STACK_USAGE is not set |
1539 | # CONFIG_DEBUG_PAGEALLOC is not set | 1590 | # CONFIG_DEBUG_PAGEALLOC is not set |
1540 | # CONFIG_DEBUGGER is not set | 1591 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1592 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1593 | # CONFIG_XMON is not set | ||
1541 | # CONFIG_IRQSTACKS is not set | 1594 | # CONFIG_IRQSTACKS is not set |
1542 | # CONFIG_BDI_SWITCH is not set | 1595 | # CONFIG_BDI_SWITCH is not set |
1543 | # CONFIG_BOOTX_TEXT is not set | 1596 | # CONFIG_BOOTX_TEXT is not set |
@@ -1556,6 +1609,7 @@ CONFIG_CRYPTO=y | |||
1556 | # | 1609 | # |
1557 | CONFIG_CRYPTO_ALGAPI=y | 1610 | CONFIG_CRYPTO_ALGAPI=y |
1558 | CONFIG_CRYPTO_BLKCIPHER=y | 1611 | CONFIG_CRYPTO_BLKCIPHER=y |
1612 | CONFIG_CRYPTO_HASH=m | ||
1559 | CONFIG_CRYPTO_MANAGER=y | 1613 | CONFIG_CRYPTO_MANAGER=y |
1560 | # CONFIG_CRYPTO_GF128MUL is not set | 1614 | # CONFIG_CRYPTO_GF128MUL is not set |
1561 | # CONFIG_CRYPTO_NULL is not set | 1615 | # CONFIG_CRYPTO_NULL is not set |
@@ -1594,6 +1648,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
1594 | CONFIG_CRYPTO_MD4=m | 1648 | CONFIG_CRYPTO_MD4=m |
1595 | CONFIG_CRYPTO_MD5=y | 1649 | CONFIG_CRYPTO_MD5=y |
1596 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1650 | CONFIG_CRYPTO_MICHAEL_MIC=m |
1651 | # CONFIG_CRYPTO_RMD128 is not set | ||
1652 | # CONFIG_CRYPTO_RMD160 is not set | ||
1653 | # CONFIG_CRYPTO_RMD256 is not set | ||
1654 | # CONFIG_CRYPTO_RMD320 is not set | ||
1597 | CONFIG_CRYPTO_SHA1=m | 1655 | CONFIG_CRYPTO_SHA1=m |
1598 | # CONFIG_CRYPTO_SHA256 is not set | 1656 | # CONFIG_CRYPTO_SHA256 is not set |
1599 | # CONFIG_CRYPTO_SHA512 is not set | 1657 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1627,5 +1685,6 @@ CONFIG_CRYPTO_DEFLATE=m | |||
1627 | # CONFIG_CRYPTO_LZO is not set | 1685 | # CONFIG_CRYPTO_LZO is not set |
1628 | CONFIG_CRYPTO_HW=y | 1686 | CONFIG_CRYPTO_HW=y |
1629 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1687 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1688 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1630 | # CONFIG_PPC_CLOCK is not set | 1689 | # CONFIG_PPC_CLOCK is not set |
1631 | # CONFIG_VIRTUALIZATION is not set | 1690 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 7a166a39d92d..1a3b6423222b 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.24-rc4 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Thu Dec 6 16:48:26 2007 | 4 | # Tue Aug 26 13:18:58 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -27,7 +27,12 @@ CONFIG_GENERIC_TIME=y | |||
27 | CONFIG_GENERIC_TIME_VSYSCALL=y | 27 | CONFIG_GENERIC_TIME_VSYSCALL=y |
28 | CONFIG_GENERIC_CLOCKEVENTS=y | 28 | CONFIG_GENERIC_CLOCKEVENTS=y |
29 | CONFIG_GENERIC_HARDIRQS=y | 29 | CONFIG_GENERIC_HARDIRQS=y |
30 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
30 | CONFIG_IRQ_PER_CPU=y | 31 | CONFIG_IRQ_PER_CPU=y |
32 | CONFIG_STACKTRACE_SUPPORT=y | ||
33 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | ||
31 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
32 | CONFIG_ARCH_HAS_ILOG2_U32=y | 37 | CONFIG_ARCH_HAS_ILOG2_U32=y |
33 | CONFIG_ARCH_HAS_ILOG2_U64=y | 38 | CONFIG_ARCH_HAS_ILOG2_U64=y |
@@ -67,16 +72,20 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
67 | CONFIG_POSIX_MQUEUE=y | 72 | CONFIG_POSIX_MQUEUE=y |
68 | # CONFIG_BSD_PROCESS_ACCT is not set | 73 | # CONFIG_BSD_PROCESS_ACCT is not set |
69 | # CONFIG_TASKSTATS is not set | 74 | # CONFIG_TASKSTATS is not set |
70 | # CONFIG_USER_NS is not set | ||
71 | # CONFIG_PID_NS is not set | ||
72 | # CONFIG_AUDIT is not set | 75 | # CONFIG_AUDIT is not set |
73 | CONFIG_IKCONFIG=y | 76 | CONFIG_IKCONFIG=y |
74 | CONFIG_IKCONFIG_PROC=y | 77 | CONFIG_IKCONFIG_PROC=y |
75 | CONFIG_LOG_BUF_SHIFT=17 | 78 | CONFIG_LOG_BUF_SHIFT=17 |
76 | # CONFIG_CGROUPS is not set | 79 | # CONFIG_CGROUPS is not set |
77 | # CONFIG_FAIR_GROUP_SCHED is not set | 80 | # CONFIG_GROUP_SCHED is not set |
78 | CONFIG_SYSFS_DEPRECATED=y | 81 | CONFIG_SYSFS_DEPRECATED=y |
82 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
79 | # CONFIG_RELAY is not set | 83 | # CONFIG_RELAY is not set |
84 | CONFIG_NAMESPACES=y | ||
85 | # CONFIG_UTS_NS is not set | ||
86 | # CONFIG_IPC_NS is not set | ||
87 | # CONFIG_USER_NS is not set | ||
88 | # CONFIG_PID_NS is not set | ||
80 | # CONFIG_BLK_DEV_INITRD is not set | 89 | # CONFIG_BLK_DEV_INITRD is not set |
81 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 90 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
82 | CONFIG_SYSCTL=y | 91 | CONFIG_SYSCTL=y |
@@ -89,11 +98,13 @@ CONFIG_HOTPLUG=y | |||
89 | CONFIG_PRINTK=y | 98 | CONFIG_PRINTK=y |
90 | CONFIG_BUG=y | 99 | CONFIG_BUG=y |
91 | CONFIG_ELF_CORE=y | 100 | CONFIG_ELF_CORE=y |
101 | # CONFIG_COMPAT_BRK is not set | ||
92 | CONFIG_BASE_FULL=y | 102 | CONFIG_BASE_FULL=y |
93 | CONFIG_FUTEX=y | 103 | CONFIG_FUTEX=y |
94 | CONFIG_ANON_INODES=y | 104 | CONFIG_ANON_INODES=y |
95 | CONFIG_EPOLL=y | 105 | CONFIG_EPOLL=y |
96 | CONFIG_SIGNALFD=y | 106 | CONFIG_SIGNALFD=y |
107 | CONFIG_TIMERFD=y | ||
97 | CONFIG_EVENTFD=y | 108 | CONFIG_EVENTFD=y |
98 | CONFIG_SHMEM=y | 109 | CONFIG_SHMEM=y |
99 | CONFIG_VM_EVENT_COUNTERS=y | 110 | CONFIG_VM_EVENT_COUNTERS=y |
@@ -101,10 +112,28 @@ CONFIG_SLUB_DEBUG=y | |||
101 | # CONFIG_SLAB is not set | 112 | # CONFIG_SLAB is not set |
102 | CONFIG_SLUB=y | 113 | CONFIG_SLUB=y |
103 | # CONFIG_SLOB is not set | 114 | # CONFIG_SLOB is not set |
115 | CONFIG_PROFILING=y | ||
116 | # CONFIG_MARKERS is not set | ||
117 | CONFIG_OPROFILE=m | ||
118 | CONFIG_HAVE_OPROFILE=y | ||
119 | CONFIG_KPROBES=y | ||
120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
121 | CONFIG_KRETPROBES=y | ||
122 | CONFIG_HAVE_IOREMAP_PROT=y | ||
123 | CONFIG_HAVE_KPROBES=y | ||
124 | CONFIG_HAVE_KRETPROBES=y | ||
125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
126 | CONFIG_HAVE_DMA_ATTRS=y | ||
127 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
128 | # CONFIG_HAVE_CLK is not set | ||
129 | CONFIG_PROC_PAGE_MONITOR=y | ||
130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
131 | CONFIG_SLABINFO=y | ||
104 | CONFIG_RT_MUTEXES=y | 132 | CONFIG_RT_MUTEXES=y |
105 | # CONFIG_TINY_SHMEM is not set | 133 | # CONFIG_TINY_SHMEM is not set |
106 | CONFIG_BASE_SMALL=0 | 134 | CONFIG_BASE_SMALL=0 |
107 | CONFIG_MODULES=y | 135 | CONFIG_MODULES=y |
136 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
108 | CONFIG_MODULE_UNLOAD=y | 137 | CONFIG_MODULE_UNLOAD=y |
109 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 138 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
110 | CONFIG_MODVERSIONS=y | 139 | CONFIG_MODVERSIONS=y |
@@ -114,6 +143,7 @@ CONFIG_STOP_MACHINE=y | |||
114 | CONFIG_BLOCK=y | 143 | CONFIG_BLOCK=y |
115 | # CONFIG_BLK_DEV_IO_TRACE is not set | 144 | # CONFIG_BLK_DEV_IO_TRACE is not set |
116 | # CONFIG_BLK_DEV_BSG is not set | 145 | # CONFIG_BLK_DEV_BSG is not set |
146 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
117 | CONFIG_BLOCK_COMPAT=y | 147 | CONFIG_BLOCK_COMPAT=y |
118 | 148 | ||
119 | # | 149 | # |
@@ -128,29 +158,26 @@ CONFIG_DEFAULT_AS=y | |||
128 | # CONFIG_DEFAULT_CFQ is not set | 158 | # CONFIG_DEFAULT_CFQ is not set |
129 | # CONFIG_DEFAULT_NOOP is not set | 159 | # CONFIG_DEFAULT_NOOP is not set |
130 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 160 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
161 | CONFIG_CLASSIC_RCU=y | ||
131 | 162 | ||
132 | # | 163 | # |
133 | # Platform support | 164 | # Platform support |
134 | # | 165 | # |
135 | CONFIG_PPC_MULTIPLATFORM=y | 166 | CONFIG_PPC_MULTIPLATFORM=y |
136 | # CONFIG_PPC_82xx is not set | ||
137 | # CONFIG_PPC_83xx is not set | ||
138 | # CONFIG_PPC_86xx is not set | ||
139 | # CONFIG_PPC_PSERIES is not set | 167 | # CONFIG_PPC_PSERIES is not set |
140 | # CONFIG_PPC_ISERIES is not set | 168 | # CONFIG_PPC_ISERIES is not set |
141 | # CONFIG_PPC_MPC52xx is not set | ||
142 | # CONFIG_PPC_MPC5200 is not set | ||
143 | # CONFIG_PPC_PMAC is not set | 169 | # CONFIG_PPC_PMAC is not set |
144 | CONFIG_PPC_MAPLE=y | 170 | CONFIG_PPC_MAPLE=y |
145 | # CONFIG_PPC_PASEMI is not set | 171 | # CONFIG_PPC_PASEMI is not set |
146 | # CONFIG_PPC_CELLEB is not set | ||
147 | # CONFIG_PPC_PS3 is not set | 172 | # CONFIG_PPC_PS3 is not set |
148 | # CONFIG_PPC_CELL is not set | 173 | # CONFIG_PPC_CELL is not set |
149 | # CONFIG_PPC_CELL_NATIVE is not set | 174 | # CONFIG_PPC_CELL_NATIVE is not set |
150 | # CONFIG_PPC_IBM_CELL_BLADE is not set | 175 | # CONFIG_PPC_IBM_CELL_BLADE is not set |
176 | # CONFIG_PPC_CELLEB is not set | ||
151 | # CONFIG_PQ2ADS is not set | 177 | # CONFIG_PQ2ADS is not set |
152 | CONFIG_PPC_NATIVE=y | 178 | CONFIG_PPC_NATIVE=y |
153 | CONFIG_UDBG_RTAS_CONSOLE=y | 179 | CONFIG_UDBG_RTAS_CONSOLE=y |
180 | # CONFIG_IPIC is not set | ||
154 | CONFIG_MPIC=y | 181 | CONFIG_MPIC=y |
155 | # CONFIG_MPIC_WEIRD is not set | 182 | # CONFIG_MPIC_WEIRD is not set |
156 | # CONFIG_PPC_I8259 is not set | 183 | # CONFIG_PPC_I8259 is not set |
@@ -166,7 +193,6 @@ CONFIG_PPC_970_NAP=y | |||
166 | # CONFIG_PPC_INDIRECT_IO is not set | 193 | # CONFIG_PPC_INDIRECT_IO is not set |
167 | # CONFIG_GENERIC_IOMAP is not set | 194 | # CONFIG_GENERIC_IOMAP is not set |
168 | # CONFIG_CPU_FREQ is not set | 195 | # CONFIG_CPU_FREQ is not set |
169 | # CONFIG_CPM2 is not set | ||
170 | # CONFIG_FSL_ULI1575 is not set | 196 | # CONFIG_FSL_ULI1575 is not set |
171 | 197 | ||
172 | # | 198 | # |
@@ -181,16 +207,19 @@ CONFIG_HZ_250=y | |||
181 | # CONFIG_HZ_300 is not set | 207 | # CONFIG_HZ_300 is not set |
182 | # CONFIG_HZ_1000 is not set | 208 | # CONFIG_HZ_1000 is not set |
183 | CONFIG_HZ=250 | 209 | CONFIG_HZ=250 |
210 | CONFIG_SCHED_HRTICK=y | ||
184 | CONFIG_PREEMPT_NONE=y | 211 | CONFIG_PREEMPT_NONE=y |
185 | # CONFIG_PREEMPT_VOLUNTARY is not set | 212 | # CONFIG_PREEMPT_VOLUNTARY is not set |
186 | # CONFIG_PREEMPT is not set | 213 | # CONFIG_PREEMPT is not set |
187 | # CONFIG_PREEMPT_BKL is not set | ||
188 | CONFIG_BINFMT_ELF=y | 214 | CONFIG_BINFMT_ELF=y |
215 | CONFIG_COMPAT_BINFMT_ELF=y | ||
189 | # CONFIG_BINFMT_MISC is not set | 216 | # CONFIG_BINFMT_MISC is not set |
190 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
191 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y | 217 | CONFIG_HUGETLB_PAGE_SIZE_VARIABLE=y |
192 | CONFIG_IOMMU_VMERGE=y | 218 | CONFIG_IOMMU_VMERGE=y |
219 | CONFIG_IOMMU_HELPER=y | ||
193 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 220 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
221 | CONFIG_ARCH_HAS_WALK_MEMORY=y | ||
222 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | ||
194 | CONFIG_KEXEC=y | 223 | CONFIG_KEXEC=y |
195 | # CONFIG_CRASH_DUMP is not set | 224 | # CONFIG_CRASH_DUMP is not set |
196 | CONFIG_IRQ_ALL_CPUS=y | 225 | CONFIG_IRQ_ALL_CPUS=y |
@@ -207,18 +236,21 @@ CONFIG_FLATMEM=y | |||
207 | CONFIG_FLAT_NODE_MEM_MAP=y | 236 | CONFIG_FLAT_NODE_MEM_MAP=y |
208 | # CONFIG_SPARSEMEM_STATIC is not set | 237 | # CONFIG_SPARSEMEM_STATIC is not set |
209 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 238 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
239 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
210 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 240 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
241 | # CONFIG_MIGRATION is not set | ||
211 | CONFIG_RESOURCES_64BIT=y | 242 | CONFIG_RESOURCES_64BIT=y |
212 | CONFIG_ZONE_DMA_FLAG=1 | 243 | CONFIG_ZONE_DMA_FLAG=1 |
213 | CONFIG_BOUNCE=y | 244 | CONFIG_BOUNCE=y |
214 | # CONFIG_PPC_HAS_HASH_64K is not set | 245 | # CONFIG_PPC_HAS_HASH_64K is not set |
215 | # CONFIG_PPC_64K_PAGES is not set | 246 | # CONFIG_PPC_64K_PAGES is not set |
247 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
216 | # CONFIG_SCHED_SMT is not set | 248 | # CONFIG_SCHED_SMT is not set |
217 | CONFIG_PROC_DEVICETREE=y | 249 | CONFIG_PROC_DEVICETREE=y |
218 | # CONFIG_CMDLINE_BOOL is not set | 250 | # CONFIG_CMDLINE_BOOL is not set |
251 | CONFIG_EXTRA_TARGETS="" | ||
219 | # CONFIG_PM is not set | 252 | # CONFIG_PM is not set |
220 | CONFIG_SECCOMP=y | 253 | CONFIG_SECCOMP=y |
221 | # CONFIG_WANT_DEVICE_TREE is not set | ||
222 | CONFIG_ISA_DMA_API=y | 254 | CONFIG_ISA_DMA_API=y |
223 | 255 | ||
224 | # | 256 | # |
@@ -237,11 +269,10 @@ CONFIG_PCI_LEGACY=y | |||
237 | # CONFIG_PCI_DEBUG is not set | 269 | # CONFIG_PCI_DEBUG is not set |
238 | # CONFIG_PCCARD is not set | 270 | # CONFIG_PCCARD is not set |
239 | # CONFIG_HOTPLUG_PCI is not set | 271 | # CONFIG_HOTPLUG_PCI is not set |
272 | # CONFIG_HAS_RAPIDIO is not set | ||
273 | CONFIG_PAGE_OFFSET=0xc000000000000000 | ||
240 | CONFIG_KERNEL_START=0xc000000000000000 | 274 | CONFIG_KERNEL_START=0xc000000000000000 |
241 | 275 | CONFIG_PHYSICAL_START=0x00000000 | |
242 | # | ||
243 | # Networking | ||
244 | # | ||
245 | CONFIG_NET=y | 276 | CONFIG_NET=y |
246 | 277 | ||
247 | # | 278 | # |
@@ -254,6 +285,7 @@ CONFIG_XFRM=y | |||
254 | CONFIG_XFRM_USER=m | 285 | CONFIG_XFRM_USER=m |
255 | # CONFIG_XFRM_SUB_POLICY is not set | 286 | # CONFIG_XFRM_SUB_POLICY is not set |
256 | # CONFIG_XFRM_MIGRATE is not set | 287 | # CONFIG_XFRM_MIGRATE is not set |
288 | # CONFIG_XFRM_STATISTICS is not set | ||
257 | # CONFIG_NET_KEY is not set | 289 | # CONFIG_NET_KEY is not set |
258 | CONFIG_INET=y | 290 | CONFIG_INET=y |
259 | CONFIG_IP_MULTICAST=y | 291 | CONFIG_IP_MULTICAST=y |
@@ -284,8 +316,6 @@ CONFIG_TCP_CONG_CUBIC=y | |||
284 | CONFIG_DEFAULT_TCP_CONG="cubic" | 316 | CONFIG_DEFAULT_TCP_CONG="cubic" |
285 | # CONFIG_TCP_MD5SIG is not set | 317 | # CONFIG_TCP_MD5SIG is not set |
286 | # CONFIG_IPV6 is not set | 318 | # CONFIG_IPV6 is not set |
287 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
288 | # CONFIG_INET6_TUNNEL is not set | ||
289 | # CONFIG_NETWORK_SECMARK is not set | 319 | # CONFIG_NETWORK_SECMARK is not set |
290 | # CONFIG_NETFILTER is not set | 320 | # CONFIG_NETFILTER is not set |
291 | # CONFIG_IP_DCCP is not set | 321 | # CONFIG_IP_DCCP is not set |
@@ -308,7 +338,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
308 | # Network testing | 338 | # Network testing |
309 | # | 339 | # |
310 | # CONFIG_NET_PKTGEN is not set | 340 | # CONFIG_NET_PKTGEN is not set |
341 | # CONFIG_NET_TCPPROBE is not set | ||
311 | # CONFIG_HAMRADIO is not set | 342 | # CONFIG_HAMRADIO is not set |
343 | # CONFIG_CAN is not set | ||
312 | # CONFIG_IRDA is not set | 344 | # CONFIG_IRDA is not set |
313 | # CONFIG_BT is not set | 345 | # CONFIG_BT is not set |
314 | # CONFIG_AF_RXRPC is not set | 346 | # CONFIG_AF_RXRPC is not set |
@@ -334,12 +366,15 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
334 | CONFIG_STANDALONE=y | 366 | CONFIG_STANDALONE=y |
335 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 367 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
336 | CONFIG_FW_LOADER=y | 368 | CONFIG_FW_LOADER=y |
369 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
370 | CONFIG_EXTRA_FIRMWARE="" | ||
337 | # CONFIG_DEBUG_DRIVER is not set | 371 | # CONFIG_DEBUG_DRIVER is not set |
338 | # CONFIG_DEBUG_DEVRES is not set | 372 | # CONFIG_DEBUG_DEVRES is not set |
339 | # CONFIG_SYS_HYPERVISOR is not set | 373 | # CONFIG_SYS_HYPERVISOR is not set |
340 | # CONFIG_CONNECTOR is not set | 374 | # CONFIG_CONNECTOR is not set |
341 | # CONFIG_MTD is not set | 375 | # CONFIG_MTD is not set |
342 | CONFIG_OF_DEVICE=y | 376 | CONFIG_OF_DEVICE=y |
377 | CONFIG_OF_I2C=y | ||
343 | # CONFIG_PARPORT is not set | 378 | # CONFIG_PARPORT is not set |
344 | CONFIG_BLK_DEV=y | 379 | CONFIG_BLK_DEV=y |
345 | # CONFIG_BLK_DEV_FD is not set | 380 | # CONFIG_BLK_DEV_FD is not set |
@@ -354,24 +389,30 @@ CONFIG_BLK_DEV=y | |||
354 | CONFIG_BLK_DEV_RAM=y | 389 | CONFIG_BLK_DEV_RAM=y |
355 | CONFIG_BLK_DEV_RAM_COUNT=16 | 390 | CONFIG_BLK_DEV_RAM_COUNT=16 |
356 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 391 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
357 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 392 | # CONFIG_BLK_DEV_XIP is not set |
358 | # CONFIG_CDROM_PKTCDVD is not set | 393 | # CONFIG_CDROM_PKTCDVD is not set |
359 | # CONFIG_ATA_OVER_ETH is not set | 394 | # CONFIG_ATA_OVER_ETH is not set |
395 | # CONFIG_BLK_DEV_HD is not set | ||
360 | CONFIG_MISC_DEVICES=y | 396 | CONFIG_MISC_DEVICES=y |
361 | # CONFIG_PHANTOM is not set | 397 | # CONFIG_PHANTOM is not set |
362 | # CONFIG_EEPROM_93CX6 is not set | 398 | # CONFIG_EEPROM_93CX6 is not set |
363 | # CONFIG_SGI_IOC4 is not set | 399 | # CONFIG_SGI_IOC4 is not set |
364 | # CONFIG_TIFM_CORE is not set | 400 | # CONFIG_TIFM_CORE is not set |
401 | # CONFIG_ENCLOSURE_SERVICES is not set | ||
402 | # CONFIG_HP_ILO is not set | ||
403 | CONFIG_HAVE_IDE=y | ||
365 | CONFIG_IDE=y | 404 | CONFIG_IDE=y |
366 | CONFIG_BLK_DEV_IDE=y | 405 | CONFIG_BLK_DEV_IDE=y |
367 | 406 | ||
368 | # | 407 | # |
369 | # Please see Documentation/ide.txt for help/info on IDE drives | 408 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
370 | # | 409 | # |
410 | CONFIG_IDE_TIMINGS=y | ||
371 | # CONFIG_BLK_DEV_IDE_SATA is not set | 411 | # CONFIG_BLK_DEV_IDE_SATA is not set |
372 | CONFIG_BLK_DEV_IDEDISK=y | 412 | CONFIG_BLK_DEV_IDEDISK=y |
373 | # CONFIG_IDEDISK_MULTI_MODE is not set | 413 | # CONFIG_IDEDISK_MULTI_MODE is not set |
374 | CONFIG_BLK_DEV_IDECD=y | 414 | CONFIG_BLK_DEV_IDECD=y |
415 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
375 | # CONFIG_BLK_DEV_IDETAPE is not set | 416 | # CONFIG_BLK_DEV_IDETAPE is not set |
376 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | 417 | # CONFIG_BLK_DEV_IDEFLOPPY is not set |
377 | # CONFIG_BLK_DEV_IDESCSI is not set | 418 | # CONFIG_BLK_DEV_IDESCSI is not set |
@@ -381,14 +422,13 @@ CONFIG_IDE_PROC_FS=y | |||
381 | # | 422 | # |
382 | # IDE chipset support/bugfixes | 423 | # IDE chipset support/bugfixes |
383 | # | 424 | # |
384 | CONFIG_IDE_GENERIC=y | ||
385 | # CONFIG_BLK_DEV_PLATFORM is not set | 425 | # CONFIG_BLK_DEV_PLATFORM is not set |
426 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
386 | 427 | ||
387 | # | 428 | # |
388 | # PCI IDE chipsets support | 429 | # PCI IDE chipsets support |
389 | # | 430 | # |
390 | CONFIG_BLK_DEV_IDEPCI=y | 431 | CONFIG_BLK_DEV_IDEPCI=y |
391 | CONFIG_IDEPCI_SHARE_IRQ=y | ||
392 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 432 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
393 | # CONFIG_BLK_DEV_OFFBOARD is not set | 433 | # CONFIG_BLK_DEV_OFFBOARD is not set |
394 | CONFIG_BLK_DEV_GENERIC=y | 434 | CONFIG_BLK_DEV_GENERIC=y |
@@ -399,10 +439,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
399 | CONFIG_BLK_DEV_AMD74XX=y | 439 | CONFIG_BLK_DEV_AMD74XX=y |
400 | # CONFIG_BLK_DEV_CMD64X is not set | 440 | # CONFIG_BLK_DEV_CMD64X is not set |
401 | # CONFIG_BLK_DEV_TRIFLEX is not set | 441 | # CONFIG_BLK_DEV_TRIFLEX is not set |
402 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
403 | # CONFIG_BLK_DEV_CS5520 is not set | 442 | # CONFIG_BLK_DEV_CS5520 is not set |
404 | # CONFIG_BLK_DEV_CS5530 is not set | 443 | # CONFIG_BLK_DEV_CS5530 is not set |
405 | # CONFIG_BLK_DEV_HPT34X is not set | ||
406 | # CONFIG_BLK_DEV_HPT366 is not set | 444 | # CONFIG_BLK_DEV_HPT366 is not set |
407 | # CONFIG_BLK_DEV_JMICRON is not set | 445 | # CONFIG_BLK_DEV_JMICRON is not set |
408 | # CONFIG_BLK_DEV_SC1200 is not set | 446 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -419,10 +457,7 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
419 | # CONFIG_BLK_DEV_TRM290 is not set | 457 | # CONFIG_BLK_DEV_TRM290 is not set |
420 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 458 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
421 | # CONFIG_BLK_DEV_TC86C001 is not set | 459 | # CONFIG_BLK_DEV_TC86C001 is not set |
422 | # CONFIG_IDE_ARM is not set | ||
423 | CONFIG_BLK_DEV_IDEDMA=y | 460 | CONFIG_BLK_DEV_IDEDMA=y |
424 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y | ||
425 | # CONFIG_BLK_DEV_HD is not set | ||
426 | 461 | ||
427 | # | 462 | # |
428 | # SCSI device support | 463 | # SCSI device support |
@@ -483,6 +518,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
483 | # CONFIG_SCSI_IPS is not set | 518 | # CONFIG_SCSI_IPS is not set |
484 | # CONFIG_SCSI_INITIO is not set | 519 | # CONFIG_SCSI_INITIO is not set |
485 | # CONFIG_SCSI_INIA100 is not set | 520 | # CONFIG_SCSI_INIA100 is not set |
521 | # CONFIG_SCSI_MVSAS is not set | ||
486 | # CONFIG_SCSI_STEX is not set | 522 | # CONFIG_SCSI_STEX is not set |
487 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 523 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
488 | CONFIG_SCSI_IPR=y | 524 | CONFIG_SCSI_IPR=y |
@@ -496,9 +532,13 @@ CONFIG_SCSI_IPR_DUMP=y | |||
496 | # CONFIG_SCSI_DC390T is not set | 532 | # CONFIG_SCSI_DC390T is not set |
497 | # CONFIG_SCSI_DEBUG is not set | 533 | # CONFIG_SCSI_DEBUG is not set |
498 | # CONFIG_SCSI_SRP is not set | 534 | # CONFIG_SCSI_SRP is not set |
535 | # CONFIG_SCSI_DH is not set | ||
499 | CONFIG_ATA=y | 536 | CONFIG_ATA=y |
500 | CONFIG_ATA_NONSTANDARD=y | 537 | CONFIG_ATA_NONSTANDARD=y |
538 | CONFIG_SATA_PMP=y | ||
501 | # CONFIG_SATA_AHCI is not set | 539 | # CONFIG_SATA_AHCI is not set |
540 | # CONFIG_SATA_SIL24 is not set | ||
541 | CONFIG_ATA_SFF=y | ||
502 | # CONFIG_SATA_SVW is not set | 542 | # CONFIG_SATA_SVW is not set |
503 | # CONFIG_ATA_PIIX is not set | 543 | # CONFIG_ATA_PIIX is not set |
504 | # CONFIG_SATA_MV is not set | 544 | # CONFIG_SATA_MV is not set |
@@ -508,7 +548,6 @@ CONFIG_ATA_NONSTANDARD=y | |||
508 | # CONFIG_SATA_PROMISE is not set | 548 | # CONFIG_SATA_PROMISE is not set |
509 | # CONFIG_SATA_SX4 is not set | 549 | # CONFIG_SATA_SX4 is not set |
510 | # CONFIG_SATA_SIL is not set | 550 | # CONFIG_SATA_SIL is not set |
511 | # CONFIG_SATA_SIL24 is not set | ||
512 | # CONFIG_SATA_SIS is not set | 551 | # CONFIG_SATA_SIS is not set |
513 | # CONFIG_SATA_ULI is not set | 552 | # CONFIG_SATA_ULI is not set |
514 | # CONFIG_SATA_VIA is not set | 553 | # CONFIG_SATA_VIA is not set |
@@ -537,6 +576,7 @@ CONFIG_ATA_NONSTANDARD=y | |||
537 | # CONFIG_PATA_MPIIX is not set | 576 | # CONFIG_PATA_MPIIX is not set |
538 | # CONFIG_PATA_OLDPIIX is not set | 577 | # CONFIG_PATA_OLDPIIX is not set |
539 | # CONFIG_PATA_NETCELL is not set | 578 | # CONFIG_PATA_NETCELL is not set |
579 | # CONFIG_PATA_NINJA32 is not set | ||
540 | # CONFIG_PATA_NS87410 is not set | 580 | # CONFIG_PATA_NS87410 is not set |
541 | # CONFIG_PATA_NS87415 is not set | 581 | # CONFIG_PATA_NS87415 is not set |
542 | # CONFIG_PATA_OPTI is not set | 582 | # CONFIG_PATA_OPTI is not set |
@@ -551,27 +591,47 @@ CONFIG_ATA_NONSTANDARD=y | |||
551 | # CONFIG_PATA_SIS is not set | 591 | # CONFIG_PATA_SIS is not set |
552 | # CONFIG_PATA_VIA is not set | 592 | # CONFIG_PATA_VIA is not set |
553 | # CONFIG_PATA_WINBOND is not set | 593 | # CONFIG_PATA_WINBOND is not set |
594 | # CONFIG_PATA_PLATFORM is not set | ||
595 | # CONFIG_PATA_SCH is not set | ||
554 | # CONFIG_MD is not set | 596 | # CONFIG_MD is not set |
555 | # CONFIG_FUSION is not set | 597 | # CONFIG_FUSION is not set |
556 | 598 | ||
557 | # | 599 | # |
558 | # IEEE 1394 (FireWire) support | 600 | # IEEE 1394 (FireWire) support |
559 | # | 601 | # |
602 | |||
603 | # | ||
604 | # Enable only one of the two stacks, unless you know what you are doing | ||
605 | # | ||
560 | # CONFIG_FIREWIRE is not set | 606 | # CONFIG_FIREWIRE is not set |
561 | # CONFIG_IEEE1394 is not set | 607 | # CONFIG_IEEE1394 is not set |
562 | # CONFIG_I2O is not set | 608 | # CONFIG_I2O is not set |
563 | # CONFIG_MACINTOSH_DRIVERS is not set | 609 | # CONFIG_MACINTOSH_DRIVERS is not set |
564 | CONFIG_NETDEVICES=y | 610 | CONFIG_NETDEVICES=y |
565 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
566 | # CONFIG_DUMMY is not set | 611 | # CONFIG_DUMMY is not set |
567 | # CONFIG_BONDING is not set | 612 | # CONFIG_BONDING is not set |
568 | # CONFIG_MACVLAN is not set | 613 | # CONFIG_MACVLAN is not set |
569 | # CONFIG_EQUALIZER is not set | 614 | # CONFIG_EQUALIZER is not set |
570 | # CONFIG_TUN is not set | 615 | # CONFIG_TUN is not set |
571 | # CONFIG_VETH is not set | 616 | # CONFIG_VETH is not set |
572 | # CONFIG_IP1000 is not set | ||
573 | # CONFIG_ARCNET is not set | 617 | # CONFIG_ARCNET is not set |
574 | # CONFIG_PHYLIB is not set | 618 | CONFIG_PHYLIB=y |
619 | |||
620 | # | ||
621 | # MII PHY device drivers | ||
622 | # | ||
623 | # CONFIG_MARVELL_PHY is not set | ||
624 | # CONFIG_DAVICOM_PHY is not set | ||
625 | # CONFIG_QSEMI_PHY is not set | ||
626 | # CONFIG_LXT_PHY is not set | ||
627 | # CONFIG_CICADA_PHY is not set | ||
628 | # CONFIG_VITESSE_PHY is not set | ||
629 | # CONFIG_SMSC_PHY is not set | ||
630 | # CONFIG_BROADCOM_PHY is not set | ||
631 | # CONFIG_ICPLUS_PHY is not set | ||
632 | # CONFIG_REALTEK_PHY is not set | ||
633 | # CONFIG_FIXED_PHY is not set | ||
634 | # CONFIG_MDIO_BITBANG is not set | ||
575 | CONFIG_NET_ETHERNET=y | 635 | CONFIG_NET_ETHERNET=y |
576 | CONFIG_MII=y | 636 | CONFIG_MII=y |
577 | # CONFIG_HAPPYMEAL is not set | 637 | # CONFIG_HAPPYMEAL is not set |
@@ -587,7 +647,6 @@ CONFIG_MII=y | |||
587 | CONFIG_NET_PCI=y | 647 | CONFIG_NET_PCI=y |
588 | # CONFIG_PCNET32 is not set | 648 | # CONFIG_PCNET32 is not set |
589 | CONFIG_AMD8111_ETH=y | 649 | CONFIG_AMD8111_ETH=y |
590 | # CONFIG_AMD8111E_NAPI is not set | ||
591 | # CONFIG_ADAPTEC_STARFIRE is not set | 650 | # CONFIG_ADAPTEC_STARFIRE is not set |
592 | # CONFIG_B44 is not set | 651 | # CONFIG_B44 is not set |
593 | # CONFIG_FORCEDETH is not set | 652 | # CONFIG_FORCEDETH is not set |
@@ -598,18 +657,21 @@ CONFIG_AMD8111_ETH=y | |||
598 | # CONFIG_NE2K_PCI is not set | 657 | # CONFIG_NE2K_PCI is not set |
599 | # CONFIG_8139CP is not set | 658 | # CONFIG_8139CP is not set |
600 | # CONFIG_8139TOO is not set | 659 | # CONFIG_8139TOO is not set |
660 | # CONFIG_R6040 is not set | ||
601 | # CONFIG_SIS900 is not set | 661 | # CONFIG_SIS900 is not set |
602 | # CONFIG_EPIC100 is not set | 662 | # CONFIG_EPIC100 is not set |
603 | # CONFIG_SUNDANCE is not set | 663 | # CONFIG_SUNDANCE is not set |
664 | # CONFIG_TLAN is not set | ||
604 | # CONFIG_VIA_RHINE is not set | 665 | # CONFIG_VIA_RHINE is not set |
605 | # CONFIG_SC92031 is not set | 666 | # CONFIG_SC92031 is not set |
606 | CONFIG_NETDEV_1000=y | 667 | CONFIG_NETDEV_1000=y |
607 | # CONFIG_ACENIC is not set | 668 | # CONFIG_ACENIC is not set |
608 | # CONFIG_DL2K is not set | 669 | # CONFIG_DL2K is not set |
609 | CONFIG_E1000=y | 670 | CONFIG_E1000=y |
610 | # CONFIG_E1000_NAPI is not set | ||
611 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 671 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
612 | # CONFIG_E1000E is not set | 672 | # CONFIG_E1000E is not set |
673 | # CONFIG_IP1000 is not set | ||
674 | # CONFIG_IGB is not set | ||
613 | # CONFIG_NS83820 is not set | 675 | # CONFIG_NS83820 is not set |
614 | # CONFIG_HAMACHI is not set | 676 | # CONFIG_HAMACHI is not set |
615 | # CONFIG_YELLOWFIN is not set | 677 | # CONFIG_YELLOWFIN is not set |
@@ -617,12 +679,12 @@ CONFIG_E1000=y | |||
617 | # CONFIG_SIS190 is not set | 679 | # CONFIG_SIS190 is not set |
618 | # CONFIG_SKGE is not set | 680 | # CONFIG_SKGE is not set |
619 | # CONFIG_SKY2 is not set | 681 | # CONFIG_SKY2 is not set |
620 | # CONFIG_SK98LIN is not set | ||
621 | # CONFIG_VIA_VELOCITY is not set | 682 | # CONFIG_VIA_VELOCITY is not set |
622 | CONFIG_TIGON3=y | 683 | CONFIG_TIGON3=y |
623 | # CONFIG_BNX2 is not set | 684 | # CONFIG_BNX2 is not set |
624 | # CONFIG_QLA3XXX is not set | 685 | # CONFIG_QLA3XXX is not set |
625 | # CONFIG_ATL1 is not set | 686 | # CONFIG_ATL1 is not set |
687 | # CONFIG_ATL1E is not set | ||
626 | CONFIG_NETDEV_10000=y | 688 | CONFIG_NETDEV_10000=y |
627 | # CONFIG_CHELSIO_T1 is not set | 689 | # CONFIG_CHELSIO_T1 is not set |
628 | # CONFIG_CHELSIO_T3 is not set | 690 | # CONFIG_CHELSIO_T3 is not set |
@@ -632,9 +694,10 @@ CONFIG_NETDEV_10000=y | |||
632 | # CONFIG_MYRI10GE is not set | 694 | # CONFIG_MYRI10GE is not set |
633 | # CONFIG_NETXEN_NIC is not set | 695 | # CONFIG_NETXEN_NIC is not set |
634 | # CONFIG_NIU is not set | 696 | # CONFIG_NIU is not set |
635 | # CONFIG_PASEMI_MAC is not set | ||
636 | # CONFIG_MLX4_CORE is not set | 697 | # CONFIG_MLX4_CORE is not set |
637 | # CONFIG_TEHUTI is not set | 698 | # CONFIG_TEHUTI is not set |
699 | # CONFIG_BNX2X is not set | ||
700 | # CONFIG_SFC is not set | ||
638 | # CONFIG_TR is not set | 701 | # CONFIG_TR is not set |
639 | 702 | ||
640 | # | 703 | # |
@@ -642,6 +705,7 @@ CONFIG_NETDEV_10000=y | |||
642 | # | 705 | # |
643 | # CONFIG_WLAN_PRE80211 is not set | 706 | # CONFIG_WLAN_PRE80211 is not set |
644 | # CONFIG_WLAN_80211 is not set | 707 | # CONFIG_WLAN_80211 is not set |
708 | # CONFIG_IWLWIFI_LEDS is not set | ||
645 | 709 | ||
646 | # | 710 | # |
647 | # USB Network Adapters | 711 | # USB Network Adapters |
@@ -657,7 +721,6 @@ CONFIG_USB_PEGASUS=y | |||
657 | # CONFIG_PPP is not set | 721 | # CONFIG_PPP is not set |
658 | # CONFIG_SLIP is not set | 722 | # CONFIG_SLIP is not set |
659 | # CONFIG_NET_FC is not set | 723 | # CONFIG_NET_FC is not set |
660 | # CONFIG_SHAPER is not set | ||
661 | # CONFIG_NETCONSOLE is not set | 724 | # CONFIG_NETCONSOLE is not set |
662 | # CONFIG_NETPOLL is not set | 725 | # CONFIG_NETPOLL is not set |
663 | # CONFIG_NET_POLL_CONTROLLER is not set | 726 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -702,10 +765,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200 | |||
702 | # Character devices | 765 | # Character devices |
703 | # | 766 | # |
704 | CONFIG_VT=y | 767 | CONFIG_VT=y |
768 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
705 | CONFIG_VT_CONSOLE=y | 769 | CONFIG_VT_CONSOLE=y |
706 | CONFIG_HW_CONSOLE=y | 770 | CONFIG_HW_CONSOLE=y |
707 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 771 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
772 | CONFIG_DEVKMEM=y | ||
708 | # CONFIG_SERIAL_NONSTANDARD is not set | 773 | # CONFIG_SERIAL_NONSTANDARD is not set |
774 | # CONFIG_NOZOMI is not set | ||
709 | 775 | ||
710 | # | 776 | # |
711 | # Serial drivers | 777 | # Serial drivers |
@@ -742,16 +808,14 @@ CONFIG_DEVPORT=y | |||
742 | CONFIG_I2C=y | 808 | CONFIG_I2C=y |
743 | CONFIG_I2C_BOARDINFO=y | 809 | CONFIG_I2C_BOARDINFO=y |
744 | CONFIG_I2C_CHARDEV=y | 810 | CONFIG_I2C_CHARDEV=y |
811 | CONFIG_I2C_HELPER_AUTO=y | ||
745 | 812 | ||
746 | # | 813 | # |
747 | # I2C Algorithms | 814 | # I2C Hardware Bus support |
748 | # | 815 | # |
749 | CONFIG_I2C_ALGOBIT=y | ||
750 | # CONFIG_I2C_ALGOPCF is not set | ||
751 | # CONFIG_I2C_ALGOPCA is not set | ||
752 | 816 | ||
753 | # | 817 | # |
754 | # I2C Hardware Bus support | 818 | # PC SMBus host controller drivers |
755 | # | 819 | # |
756 | # CONFIG_I2C_ALI1535 is not set | 820 | # CONFIG_I2C_ALI1535 is not set |
757 | # CONFIG_I2C_ALI1563 is not set | 821 | # CONFIG_I2C_ALI1563 is not set |
@@ -759,32 +823,47 @@ CONFIG_I2C_ALGOBIT=y | |||
759 | # CONFIG_I2C_AMD756 is not set | 823 | # CONFIG_I2C_AMD756 is not set |
760 | CONFIG_I2C_AMD8111=y | 824 | CONFIG_I2C_AMD8111=y |
761 | # CONFIG_I2C_I801 is not set | 825 | # CONFIG_I2C_I801 is not set |
762 | # CONFIG_I2C_I810 is not set | 826 | # CONFIG_I2C_ISCH is not set |
763 | # CONFIG_I2C_PIIX4 is not set | 827 | # CONFIG_I2C_PIIX4 is not set |
764 | # CONFIG_I2C_NFORCE2 is not set | 828 | # CONFIG_I2C_NFORCE2 is not set |
765 | # CONFIG_I2C_OCORES is not set | ||
766 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
767 | # CONFIG_I2C_PROSAVAGE is not set | ||
768 | # CONFIG_I2C_SAVAGE4 is not set | ||
769 | # CONFIG_I2C_SIMTEC is not set | ||
770 | # CONFIG_I2C_SIS5595 is not set | 829 | # CONFIG_I2C_SIS5595 is not set |
771 | # CONFIG_I2C_SIS630 is not set | 830 | # CONFIG_I2C_SIS630 is not set |
772 | # CONFIG_I2C_SIS96X is not set | 831 | # CONFIG_I2C_SIS96X is not set |
773 | # CONFIG_I2C_TAOS_EVM is not set | ||
774 | # CONFIG_I2C_STUB is not set | ||
775 | # CONFIG_I2C_TINY_USB is not set | ||
776 | # CONFIG_I2C_VIA is not set | 832 | # CONFIG_I2C_VIA is not set |
777 | # CONFIG_I2C_VIAPRO is not set | 833 | # CONFIG_I2C_VIAPRO is not set |
834 | |||
835 | # | ||
836 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
837 | # | ||
838 | # CONFIG_I2C_OCORES is not set | ||
839 | # CONFIG_I2C_SIMTEC is not set | ||
840 | |||
841 | # | ||
842 | # External I2C/SMBus adapter drivers | ||
843 | # | ||
844 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
845 | # CONFIG_I2C_TAOS_EVM is not set | ||
846 | # CONFIG_I2C_TINY_USB is not set | ||
847 | |||
848 | # | ||
849 | # Graphics adapter I2C/DDC channel drivers | ||
850 | # | ||
778 | # CONFIG_I2C_VOODOO3 is not set | 851 | # CONFIG_I2C_VOODOO3 is not set |
779 | 852 | ||
780 | # | 853 | # |
854 | # Other I2C/SMBus bus drivers | ||
855 | # | ||
856 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
857 | # CONFIG_I2C_STUB is not set | ||
858 | |||
859 | # | ||
781 | # Miscellaneous I2C Chip support | 860 | # Miscellaneous I2C Chip support |
782 | # | 861 | # |
783 | # CONFIG_SENSORS_DS1337 is not set | ||
784 | # CONFIG_SENSORS_DS1374 is not set | ||
785 | # CONFIG_DS1682 is not set | 862 | # CONFIG_DS1682 is not set |
863 | # CONFIG_AT24 is not set | ||
786 | # CONFIG_SENSORS_EEPROM is not set | 864 | # CONFIG_SENSORS_EEPROM is not set |
787 | # CONFIG_SENSORS_PCF8574 is not set | 865 | # CONFIG_SENSORS_PCF8574 is not set |
866 | # CONFIG_PCF8575 is not set | ||
788 | # CONFIG_SENSORS_PCA9539 is not set | 867 | # CONFIG_SENSORS_PCA9539 is not set |
789 | # CONFIG_SENSORS_PCF8591 is not set | 868 | # CONFIG_SENSORS_PCF8591 is not set |
790 | # CONFIG_SENSORS_MAX6875 is not set | 869 | # CONFIG_SENSORS_MAX6875 is not set |
@@ -793,15 +872,14 @@ CONFIG_I2C_AMD8111=y | |||
793 | # CONFIG_I2C_DEBUG_ALGO is not set | 872 | # CONFIG_I2C_DEBUG_ALGO is not set |
794 | # CONFIG_I2C_DEBUG_BUS is not set | 873 | # CONFIG_I2C_DEBUG_BUS is not set |
795 | # CONFIG_I2C_DEBUG_CHIP is not set | 874 | # CONFIG_I2C_DEBUG_CHIP is not set |
796 | |||
797 | # | ||
798 | # SPI support | ||
799 | # | ||
800 | # CONFIG_SPI is not set | 875 | # CONFIG_SPI is not set |
801 | # CONFIG_SPI_MASTER is not set | 876 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
877 | # CONFIG_GPIOLIB is not set | ||
802 | # CONFIG_W1 is not set | 878 | # CONFIG_W1 is not set |
803 | # CONFIG_POWER_SUPPLY is not set | 879 | # CONFIG_POWER_SUPPLY is not set |
804 | # CONFIG_HWMON is not set | 880 | # CONFIG_HWMON is not set |
881 | # CONFIG_THERMAL is not set | ||
882 | # CONFIG_THERMAL_HWMON is not set | ||
805 | # CONFIG_WATCHDOG is not set | 883 | # CONFIG_WATCHDOG is not set |
806 | 884 | ||
807 | # | 885 | # |
@@ -813,13 +891,25 @@ CONFIG_SSB_POSSIBLE=y | |||
813 | # | 891 | # |
814 | # Multifunction device drivers | 892 | # Multifunction device drivers |
815 | # | 893 | # |
894 | # CONFIG_MFD_CORE is not set | ||
816 | # CONFIG_MFD_SM501 is not set | 895 | # CONFIG_MFD_SM501 is not set |
896 | # CONFIG_HTC_PASIC3 is not set | ||
897 | # CONFIG_MFD_TMIO is not set | ||
817 | 898 | ||
818 | # | 899 | # |
819 | # Multimedia devices | 900 | # Multimedia devices |
820 | # | 901 | # |
902 | |||
903 | # | ||
904 | # Multimedia core support | ||
905 | # | ||
821 | # CONFIG_VIDEO_DEV is not set | 906 | # CONFIG_VIDEO_DEV is not set |
822 | # CONFIG_DVB_CORE is not set | 907 | # CONFIG_DVB_CORE is not set |
908 | # CONFIG_VIDEO_MEDIA is not set | ||
909 | |||
910 | # | ||
911 | # Multimedia drivers | ||
912 | # | ||
823 | # CONFIG_DAB is not set | 913 | # CONFIG_DAB is not set |
824 | 914 | ||
825 | # | 915 | # |
@@ -842,10 +932,6 @@ CONFIG_SSB_POSSIBLE=y | |||
842 | # | 932 | # |
843 | # CONFIG_VGA_CONSOLE is not set | 933 | # CONFIG_VGA_CONSOLE is not set |
844 | CONFIG_DUMMY_CONSOLE=y | 934 | CONFIG_DUMMY_CONSOLE=y |
845 | |||
846 | # | ||
847 | # Sound | ||
848 | # | ||
849 | # CONFIG_SOUND is not set | 935 | # CONFIG_SOUND is not set |
850 | CONFIG_HID_SUPPORT=y | 936 | CONFIG_HID_SUPPORT=y |
851 | CONFIG_HID=y | 937 | CONFIG_HID=y |
@@ -865,6 +951,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y | |||
865 | CONFIG_USB_ARCH_HAS_EHCI=y | 951 | CONFIG_USB_ARCH_HAS_EHCI=y |
866 | CONFIG_USB=y | 952 | CONFIG_USB=y |
867 | # CONFIG_USB_DEBUG is not set | 953 | # CONFIG_USB_DEBUG is not set |
954 | # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set | ||
868 | 955 | ||
869 | # | 956 | # |
870 | # Miscellaneous USB options | 957 | # Miscellaneous USB options |
@@ -873,15 +960,18 @@ CONFIG_USB_DEVICEFS=y | |||
873 | CONFIG_USB_DEVICE_CLASS=y | 960 | CONFIG_USB_DEVICE_CLASS=y |
874 | # CONFIG_USB_DYNAMIC_MINORS is not set | 961 | # CONFIG_USB_DYNAMIC_MINORS is not set |
875 | # CONFIG_USB_OTG is not set | 962 | # CONFIG_USB_OTG is not set |
963 | CONFIG_USB_MON=y | ||
876 | 964 | ||
877 | # | 965 | # |
878 | # USB Host Controller Drivers | 966 | # USB Host Controller Drivers |
879 | # | 967 | # |
968 | # CONFIG_USB_C67X00_HCD is not set | ||
880 | CONFIG_USB_EHCI_HCD=y | 969 | CONFIG_USB_EHCI_HCD=y |
881 | CONFIG_USB_EHCI_SPLIT_ISO=y | ||
882 | CONFIG_USB_EHCI_ROOT_HUB_TT=y | 970 | CONFIG_USB_EHCI_ROOT_HUB_TT=y |
883 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 971 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
972 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | ||
884 | # CONFIG_USB_ISP116X_HCD is not set | 973 | # CONFIG_USB_ISP116X_HCD is not set |
974 | # CONFIG_USB_ISP1760_HCD is not set | ||
885 | CONFIG_USB_OHCI_HCD=y | 975 | CONFIG_USB_OHCI_HCD=y |
886 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set | 976 | # CONFIG_USB_OHCI_HCD_PPC_OF is not set |
887 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 977 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
@@ -896,6 +986,7 @@ CONFIG_USB_UHCI_HCD=y | |||
896 | # | 986 | # |
897 | # CONFIG_USB_ACM is not set | 987 | # CONFIG_USB_ACM is not set |
898 | # CONFIG_USB_PRINTER is not set | 988 | # CONFIG_USB_PRINTER is not set |
989 | # CONFIG_USB_WDM is not set | ||
899 | 990 | ||
900 | # | 991 | # |
901 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 992 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -912,20 +1003,15 @@ CONFIG_USB_UHCI_HCD=y | |||
912 | # | 1003 | # |
913 | # CONFIG_USB_MDC800 is not set | 1004 | # CONFIG_USB_MDC800 is not set |
914 | # CONFIG_USB_MICROTEK is not set | 1005 | # CONFIG_USB_MICROTEK is not set |
915 | CONFIG_USB_MON=y | ||
916 | 1006 | ||
917 | # | 1007 | # |
918 | # USB port drivers | 1008 | # USB port drivers |
919 | # | 1009 | # |
920 | |||
921 | # | ||
922 | # USB Serial Converter support | ||
923 | # | ||
924 | CONFIG_USB_SERIAL=y | 1010 | CONFIG_USB_SERIAL=y |
925 | # CONFIG_USB_SERIAL_CONSOLE is not set | 1011 | # CONFIG_USB_SERIAL_CONSOLE is not set |
1012 | CONFIG_USB_EZUSB=y | ||
926 | CONFIG_USB_SERIAL_GENERIC=y | 1013 | CONFIG_USB_SERIAL_GENERIC=y |
927 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1014 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
928 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
929 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1015 | # CONFIG_USB_SERIAL_ARK3116 is not set |
930 | # CONFIG_USB_SERIAL_BELKIN is not set | 1016 | # CONFIG_USB_SERIAL_BELKIN is not set |
931 | # CONFIG_USB_SERIAL_CH341 is not set | 1017 | # CONFIG_USB_SERIAL_CH341 is not set |
@@ -943,6 +1029,7 @@ CONFIG_USB_SERIAL_CYPRESS_M8=m | |||
943 | # CONFIG_USB_SERIAL_EDGEPORT_TI is not set | 1029 | # CONFIG_USB_SERIAL_EDGEPORT_TI is not set |
944 | CONFIG_USB_SERIAL_GARMIN=m | 1030 | CONFIG_USB_SERIAL_GARMIN=m |
945 | CONFIG_USB_SERIAL_IPW=m | 1031 | CONFIG_USB_SERIAL_IPW=m |
1032 | # CONFIG_USB_SERIAL_IUU is not set | ||
946 | # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set | 1033 | # CONFIG_USB_SERIAL_KEYSPAN_PDA is not set |
947 | CONFIG_USB_SERIAL_KEYSPAN=y | 1034 | CONFIG_USB_SERIAL_KEYSPAN=y |
948 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y | 1035 | CONFIG_USB_SERIAL_KEYSPAN_MPR=y |
@@ -962,9 +1049,11 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
962 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 1049 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
963 | # CONFIG_USB_SERIAL_MOS7720 is not set | 1050 | # CONFIG_USB_SERIAL_MOS7720 is not set |
964 | # CONFIG_USB_SERIAL_MOS7840 is not set | 1051 | # CONFIG_USB_SERIAL_MOS7840 is not set |
1052 | # CONFIG_USB_SERIAL_MOTOROLA is not set | ||
965 | # CONFIG_USB_SERIAL_NAVMAN is not set | 1053 | # CONFIG_USB_SERIAL_NAVMAN is not set |
966 | # CONFIG_USB_SERIAL_PL2303 is not set | 1054 | # CONFIG_USB_SERIAL_PL2303 is not set |
967 | # CONFIG_USB_SERIAL_OTI6858 is not set | 1055 | # CONFIG_USB_SERIAL_OTI6858 is not set |
1056 | # CONFIG_USB_SERIAL_SPCP8X5 is not set | ||
968 | # CONFIG_USB_SERIAL_HP4X is not set | 1057 | # CONFIG_USB_SERIAL_HP4X is not set |
969 | # CONFIG_USB_SERIAL_SAFE is not set | 1058 | # CONFIG_USB_SERIAL_SAFE is not set |
970 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set | 1059 | # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
@@ -974,7 +1063,6 @@ CONFIG_USB_SERIAL_TI=m | |||
974 | # CONFIG_USB_SERIAL_OPTION is not set | 1063 | # CONFIG_USB_SERIAL_OPTION is not set |
975 | # CONFIG_USB_SERIAL_OMNINET is not set | 1064 | # CONFIG_USB_SERIAL_OMNINET is not set |
976 | # CONFIG_USB_SERIAL_DEBUG is not set | 1065 | # CONFIG_USB_SERIAL_DEBUG is not set |
977 | CONFIG_USB_EZUSB=y | ||
978 | 1066 | ||
979 | # | 1067 | # |
980 | # USB Miscellaneous drivers | 1068 | # USB Miscellaneous drivers |
@@ -982,7 +1070,6 @@ CONFIG_USB_EZUSB=y | |||
982 | # CONFIG_USB_EMI62 is not set | 1070 | # CONFIG_USB_EMI62 is not set |
983 | # CONFIG_USB_EMI26 is not set | 1071 | # CONFIG_USB_EMI26 is not set |
984 | # CONFIG_USB_ADUTUX is not set | 1072 | # CONFIG_USB_ADUTUX is not set |
985 | # CONFIG_USB_AUERSWALD is not set | ||
986 | # CONFIG_USB_RIO500 is not set | 1073 | # CONFIG_USB_RIO500 is not set |
987 | # CONFIG_USB_LEGOTOWER is not set | 1074 | # CONFIG_USB_LEGOTOWER is not set |
988 | # CONFIG_USB_LCD is not set | 1075 | # CONFIG_USB_LCD is not set |
@@ -999,24 +1086,16 @@ CONFIG_USB_EZUSB=y | |||
999 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1086 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1000 | # CONFIG_USB_IOWARRIOR is not set | 1087 | # CONFIG_USB_IOWARRIOR is not set |
1001 | # CONFIG_USB_TEST is not set | 1088 | # CONFIG_USB_TEST is not set |
1002 | 1089 | # CONFIG_USB_ISIGHTFW is not set | |
1003 | # | ||
1004 | # USB DSL modem support | ||
1005 | # | ||
1006 | |||
1007 | # | ||
1008 | # USB Gadget Support | ||
1009 | # | ||
1010 | # CONFIG_USB_GADGET is not set | 1090 | # CONFIG_USB_GADGET is not set |
1011 | # CONFIG_MMC is not set | 1091 | # CONFIG_MMC is not set |
1092 | # CONFIG_MEMSTICK is not set | ||
1012 | # CONFIG_NEW_LEDS is not set | 1093 | # CONFIG_NEW_LEDS is not set |
1094 | # CONFIG_ACCESSIBILITY is not set | ||
1013 | # CONFIG_INFINIBAND is not set | 1095 | # CONFIG_INFINIBAND is not set |
1014 | # CONFIG_EDAC is not set | 1096 | # CONFIG_EDAC is not set |
1015 | # CONFIG_RTC_CLASS is not set | 1097 | # CONFIG_RTC_CLASS is not set |
1016 | 1098 | # CONFIG_DMADEVICES is not set | |
1017 | # | ||
1018 | # Userspace I/O | ||
1019 | # | ||
1020 | # CONFIG_UIO is not set | 1099 | # CONFIG_UIO is not set |
1021 | 1100 | ||
1022 | # | 1101 | # |
@@ -1037,12 +1116,10 @@ CONFIG_FS_POSIX_ACL=y | |||
1037 | # CONFIG_XFS_FS is not set | 1116 | # CONFIG_XFS_FS is not set |
1038 | # CONFIG_GFS2_FS is not set | 1117 | # CONFIG_GFS2_FS is not set |
1039 | # CONFIG_OCFS2_FS is not set | 1118 | # CONFIG_OCFS2_FS is not set |
1040 | # CONFIG_MINIX_FS is not set | 1119 | CONFIG_DNOTIFY=y |
1041 | # CONFIG_ROMFS_FS is not set | ||
1042 | CONFIG_INOTIFY=y | 1120 | CONFIG_INOTIFY=y |
1043 | CONFIG_INOTIFY_USER=y | 1121 | CONFIG_INOTIFY_USER=y |
1044 | # CONFIG_QUOTA is not set | 1122 | # CONFIG_QUOTA is not set |
1045 | CONFIG_DNOTIFY=y | ||
1046 | # CONFIG_AUTOFS_FS is not set | 1123 | # CONFIG_AUTOFS_FS is not set |
1047 | # CONFIG_AUTOFS4_FS is not set | 1124 | # CONFIG_AUTOFS4_FS is not set |
1048 | # CONFIG_FUSE_FS is not set | 1125 | # CONFIG_FUSE_FS is not set |
@@ -1088,8 +1165,11 @@ CONFIG_HUGETLB_PAGE=y | |||
1088 | # CONFIG_EFS_FS is not set | 1165 | # CONFIG_EFS_FS is not set |
1089 | CONFIG_CRAMFS=y | 1166 | CONFIG_CRAMFS=y |
1090 | # CONFIG_VXFS_FS is not set | 1167 | # CONFIG_VXFS_FS is not set |
1168 | # CONFIG_MINIX_FS is not set | ||
1169 | # CONFIG_OMFS_FS is not set | ||
1091 | # CONFIG_HPFS_FS is not set | 1170 | # CONFIG_HPFS_FS is not set |
1092 | # CONFIG_QNX4FS_FS is not set | 1171 | # CONFIG_QNX4FS_FS is not set |
1172 | # CONFIG_ROMFS_FS is not set | ||
1093 | # CONFIG_SYSV_FS is not set | 1173 | # CONFIG_SYSV_FS is not set |
1094 | # CONFIG_UFS_FS is not set | 1174 | # CONFIG_UFS_FS is not set |
1095 | CONFIG_NETWORK_FILESYSTEMS=y | 1175 | CONFIG_NETWORK_FILESYSTEMS=y |
@@ -1097,16 +1177,14 @@ CONFIG_NFS_FS=y | |||
1097 | CONFIG_NFS_V3=y | 1177 | CONFIG_NFS_V3=y |
1098 | CONFIG_NFS_V3_ACL=y | 1178 | CONFIG_NFS_V3_ACL=y |
1099 | CONFIG_NFS_V4=y | 1179 | CONFIG_NFS_V4=y |
1100 | # CONFIG_NFS_DIRECTIO is not set | ||
1101 | # CONFIG_NFSD is not set | ||
1102 | CONFIG_ROOT_NFS=y | 1180 | CONFIG_ROOT_NFS=y |
1181 | # CONFIG_NFSD is not set | ||
1103 | CONFIG_LOCKD=y | 1182 | CONFIG_LOCKD=y |
1104 | CONFIG_LOCKD_V4=y | 1183 | CONFIG_LOCKD_V4=y |
1105 | CONFIG_NFS_ACL_SUPPORT=y | 1184 | CONFIG_NFS_ACL_SUPPORT=y |
1106 | CONFIG_NFS_COMMON=y | 1185 | CONFIG_NFS_COMMON=y |
1107 | CONFIG_SUNRPC=y | 1186 | CONFIG_SUNRPC=y |
1108 | CONFIG_SUNRPC_GSS=y | 1187 | CONFIG_SUNRPC_GSS=y |
1109 | # CONFIG_SUNRPC_BIND34 is not set | ||
1110 | CONFIG_RPCSEC_GSS_KRB5=y | 1188 | CONFIG_RPCSEC_GSS_KRB5=y |
1111 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1189 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1112 | # CONFIG_SMB_FS is not set | 1190 | # CONFIG_SMB_FS is not set |
@@ -1177,14 +1255,15 @@ CONFIG_NLS_DEFAULT="utf-8" | |||
1177 | # CONFIG_NLS_KOI8_U is not set | 1255 | # CONFIG_NLS_KOI8_U is not set |
1178 | CONFIG_NLS_UTF8=y | 1256 | CONFIG_NLS_UTF8=y |
1179 | # CONFIG_DLM is not set | 1257 | # CONFIG_DLM is not set |
1180 | # CONFIG_UCC_SLOW is not set | ||
1181 | 1258 | ||
1182 | # | 1259 | # |
1183 | # Library routines | 1260 | # Library routines |
1184 | # | 1261 | # |
1185 | CONFIG_BITREVERSE=y | 1262 | CONFIG_BITREVERSE=y |
1263 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | ||
1186 | CONFIG_CRC_CCITT=y | 1264 | CONFIG_CRC_CCITT=y |
1187 | # CONFIG_CRC16 is not set | 1265 | # CONFIG_CRC16 is not set |
1266 | CONFIG_CRC_T10DIF=y | ||
1188 | # CONFIG_CRC_ITU_T is not set | 1267 | # CONFIG_CRC_ITU_T is not set |
1189 | CONFIG_CRC32=y | 1268 | CONFIG_CRC32=y |
1190 | # CONFIG_CRC7 is not set | 1269 | # CONFIG_CRC7 is not set |
@@ -1194,7 +1273,7 @@ CONFIG_PLIST=y | |||
1194 | CONFIG_HAS_IOMEM=y | 1273 | CONFIG_HAS_IOMEM=y |
1195 | CONFIG_HAS_IOPORT=y | 1274 | CONFIG_HAS_IOPORT=y |
1196 | CONFIG_HAS_DMA=y | 1275 | CONFIG_HAS_DMA=y |
1197 | # CONFIG_INSTRUMENTATION is not set | 1276 | CONFIG_HAVE_LMB=y |
1198 | 1277 | ||
1199 | # | 1278 | # |
1200 | # Kernel hacking | 1279 | # Kernel hacking |
@@ -1202,6 +1281,7 @@ CONFIG_HAS_DMA=y | |||
1202 | # CONFIG_PRINTK_TIME is not set | 1281 | # CONFIG_PRINTK_TIME is not set |
1203 | CONFIG_ENABLE_WARN_DEPRECATED=y | 1282 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1204 | CONFIG_ENABLE_MUST_CHECK=y | 1283 | CONFIG_ENABLE_MUST_CHECK=y |
1284 | CONFIG_FRAME_WARN=2048 | ||
1205 | CONFIG_MAGIC_SYSRQ=y | 1285 | CONFIG_MAGIC_SYSRQ=y |
1206 | # CONFIG_UNUSED_SYMBOLS is not set | 1286 | # CONFIG_UNUSED_SYMBOLS is not set |
1207 | CONFIG_DEBUG_FS=y | 1287 | CONFIG_DEBUG_FS=y |
@@ -1209,34 +1289,59 @@ CONFIG_DEBUG_FS=y | |||
1209 | CONFIG_DEBUG_KERNEL=y | 1289 | CONFIG_DEBUG_KERNEL=y |
1210 | # CONFIG_DEBUG_SHIRQ is not set | 1290 | # CONFIG_DEBUG_SHIRQ is not set |
1211 | CONFIG_DETECT_SOFTLOCKUP=y | 1291 | CONFIG_DETECT_SOFTLOCKUP=y |
1292 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1293 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1212 | CONFIG_SCHED_DEBUG=y | 1294 | CONFIG_SCHED_DEBUG=y |
1213 | # CONFIG_SCHEDSTATS is not set | 1295 | CONFIG_SCHEDSTATS=y |
1214 | # CONFIG_TIMER_STATS is not set | 1296 | # CONFIG_TIMER_STATS is not set |
1297 | # CONFIG_DEBUG_OBJECTS is not set | ||
1215 | # CONFIG_SLUB_DEBUG_ON is not set | 1298 | # CONFIG_SLUB_DEBUG_ON is not set |
1299 | # CONFIG_SLUB_STATS is not set | ||
1216 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1300 | # CONFIG_DEBUG_RT_MUTEXES is not set |
1217 | # CONFIG_RT_MUTEX_TESTER is not set | 1301 | # CONFIG_RT_MUTEX_TESTER is not set |
1218 | # CONFIG_DEBUG_SPINLOCK is not set | 1302 | # CONFIG_DEBUG_SPINLOCK is not set |
1219 | # CONFIG_DEBUG_MUTEXES is not set | 1303 | # CONFIG_DEBUG_MUTEXES is not set |
1304 | # CONFIG_DEBUG_LOCK_ALLOC is not set | ||
1305 | # CONFIG_PROVE_LOCKING is not set | ||
1306 | # CONFIG_LOCK_STAT is not set | ||
1220 | CONFIG_DEBUG_SPINLOCK_SLEEP=y | 1307 | CONFIG_DEBUG_SPINLOCK_SLEEP=y |
1221 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1308 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1309 | CONFIG_STACKTRACE=y | ||
1222 | # CONFIG_DEBUG_KOBJECT is not set | 1310 | # CONFIG_DEBUG_KOBJECT is not set |
1223 | CONFIG_DEBUG_BUGVERBOSE=y | 1311 | CONFIG_DEBUG_BUGVERBOSE=y |
1224 | # CONFIG_DEBUG_INFO is not set | 1312 | # CONFIG_DEBUG_INFO is not set |
1225 | # CONFIG_DEBUG_VM is not set | 1313 | # CONFIG_DEBUG_VM is not set |
1314 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
1315 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1226 | # CONFIG_DEBUG_LIST is not set | 1316 | # CONFIG_DEBUG_LIST is not set |
1227 | # CONFIG_DEBUG_SG is not set | 1317 | # CONFIG_DEBUG_SG is not set |
1228 | # CONFIG_FORCED_INLINING is not set | 1318 | CONFIG_FRAME_POINTER=y |
1229 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1319 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1230 | # CONFIG_RCU_TORTURE_TEST is not set | 1320 | # CONFIG_RCU_TORTURE_TEST is not set |
1321 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
1322 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
1323 | # CONFIG_LKDTM is not set | ||
1231 | # CONFIG_FAULT_INJECTION is not set | 1324 | # CONFIG_FAULT_INJECTION is not set |
1325 | CONFIG_LATENCYTOP=y | ||
1326 | # CONFIG_SYSCTL_SYSCALL_CHECK is not set | ||
1327 | CONFIG_HAVE_FTRACE=y | ||
1328 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1329 | # CONFIG_FTRACE is not set | ||
1330 | # CONFIG_IRQSOFF_TRACER is not set | ||
1331 | # CONFIG_SCHED_TRACER is not set | ||
1332 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1232 | # CONFIG_SAMPLES is not set | 1333 | # CONFIG_SAMPLES is not set |
1334 | CONFIG_HAVE_ARCH_KGDB=y | ||
1335 | # CONFIG_KGDB is not set | ||
1233 | CONFIG_DEBUG_STACKOVERFLOW=y | 1336 | CONFIG_DEBUG_STACKOVERFLOW=y |
1234 | CONFIG_DEBUG_STACK_USAGE=y | 1337 | CONFIG_DEBUG_STACK_USAGE=y |
1235 | # CONFIG_DEBUG_PAGEALLOC is not set | 1338 | # CONFIG_DEBUG_PAGEALLOC is not set |
1236 | CONFIG_DEBUGGER=y | 1339 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1340 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1237 | CONFIG_XMON=y | 1341 | CONFIG_XMON=y |
1238 | CONFIG_XMON_DEFAULT=y | 1342 | CONFIG_XMON_DEFAULT=y |
1239 | CONFIG_XMON_DISASSEMBLY=y | 1343 | CONFIG_XMON_DISASSEMBLY=y |
1344 | CONFIG_DEBUGGER=y | ||
1240 | # CONFIG_IRQSTACKS is not set | 1345 | # CONFIG_IRQSTACKS is not set |
1241 | # CONFIG_VIRQ_DEBUG is not set | 1346 | # CONFIG_VIRQ_DEBUG is not set |
1242 | CONFIG_BOOTX_TEXT=y | 1347 | CONFIG_BOOTX_TEXT=y |
@@ -1249,44 +1354,84 @@ CONFIG_BOOTX_TEXT=y | |||
1249 | # CONFIG_SECURITY is not set | 1354 | # CONFIG_SECURITY is not set |
1250 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1355 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1251 | CONFIG_CRYPTO=y | 1356 | CONFIG_CRYPTO=y |
1357 | |||
1358 | # | ||
1359 | # Crypto core or helper | ||
1360 | # | ||
1252 | CONFIG_CRYPTO_ALGAPI=y | 1361 | CONFIG_CRYPTO_ALGAPI=y |
1253 | CONFIG_CRYPTO_BLKCIPHER=y | 1362 | CONFIG_CRYPTO_BLKCIPHER=y |
1254 | CONFIG_CRYPTO_MANAGER=y | 1363 | CONFIG_CRYPTO_MANAGER=y |
1364 | # CONFIG_CRYPTO_GF128MUL is not set | ||
1365 | # CONFIG_CRYPTO_NULL is not set | ||
1366 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1367 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1368 | # CONFIG_CRYPTO_TEST is not set | ||
1369 | |||
1370 | # | ||
1371 | # Authenticated Encryption with Associated Data | ||
1372 | # | ||
1373 | # CONFIG_CRYPTO_CCM is not set | ||
1374 | # CONFIG_CRYPTO_GCM is not set | ||
1375 | # CONFIG_CRYPTO_SEQIV is not set | ||
1376 | |||
1377 | # | ||
1378 | # Block modes | ||
1379 | # | ||
1380 | CONFIG_CRYPTO_CBC=y | ||
1381 | # CONFIG_CRYPTO_CTR is not set | ||
1382 | # CONFIG_CRYPTO_CTS is not set | ||
1383 | CONFIG_CRYPTO_ECB=m | ||
1384 | # CONFIG_CRYPTO_LRW is not set | ||
1385 | CONFIG_CRYPTO_PCBC=m | ||
1386 | # CONFIG_CRYPTO_XTS is not set | ||
1387 | |||
1388 | # | ||
1389 | # Hash modes | ||
1390 | # | ||
1255 | # CONFIG_CRYPTO_HMAC is not set | 1391 | # CONFIG_CRYPTO_HMAC is not set |
1256 | # CONFIG_CRYPTO_XCBC is not set | 1392 | # CONFIG_CRYPTO_XCBC is not set |
1257 | # CONFIG_CRYPTO_NULL is not set | 1393 | |
1394 | # | ||
1395 | # Digest | ||
1396 | # | ||
1397 | # CONFIG_CRYPTO_CRC32C is not set | ||
1258 | # CONFIG_CRYPTO_MD4 is not set | 1398 | # CONFIG_CRYPTO_MD4 is not set |
1259 | CONFIG_CRYPTO_MD5=y | 1399 | CONFIG_CRYPTO_MD5=y |
1400 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
1401 | # CONFIG_CRYPTO_RMD128 is not set | ||
1402 | # CONFIG_CRYPTO_RMD160 is not set | ||
1403 | # CONFIG_CRYPTO_RMD256 is not set | ||
1404 | # CONFIG_CRYPTO_RMD320 is not set | ||
1260 | # CONFIG_CRYPTO_SHA1 is not set | 1405 | # CONFIG_CRYPTO_SHA1 is not set |
1261 | # CONFIG_CRYPTO_SHA256 is not set | 1406 | # CONFIG_CRYPTO_SHA256 is not set |
1262 | # CONFIG_CRYPTO_SHA512 is not set | 1407 | # CONFIG_CRYPTO_SHA512 is not set |
1263 | # CONFIG_CRYPTO_WP512 is not set | ||
1264 | # CONFIG_CRYPTO_TGR192 is not set | 1408 | # CONFIG_CRYPTO_TGR192 is not set |
1265 | # CONFIG_CRYPTO_GF128MUL is not set | 1409 | # CONFIG_CRYPTO_WP512 is not set |
1266 | CONFIG_CRYPTO_ECB=m | 1410 | |
1267 | CONFIG_CRYPTO_CBC=y | 1411 | # |
1268 | CONFIG_CRYPTO_PCBC=m | 1412 | # Ciphers |
1269 | # CONFIG_CRYPTO_LRW is not set | 1413 | # |
1270 | # CONFIG_CRYPTO_XTS is not set | ||
1271 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1272 | CONFIG_CRYPTO_DES=y | ||
1273 | # CONFIG_CRYPTO_FCRYPT is not set | ||
1274 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1275 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1276 | # CONFIG_CRYPTO_SERPENT is not set | ||
1277 | # CONFIG_CRYPTO_AES is not set | 1414 | # CONFIG_CRYPTO_AES is not set |
1415 | # CONFIG_CRYPTO_ANUBIS is not set | ||
1416 | # CONFIG_CRYPTO_ARC4 is not set | ||
1417 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
1418 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1278 | # CONFIG_CRYPTO_CAST5 is not set | 1419 | # CONFIG_CRYPTO_CAST5 is not set |
1279 | # CONFIG_CRYPTO_CAST6 is not set | 1420 | # CONFIG_CRYPTO_CAST6 is not set |
1280 | # CONFIG_CRYPTO_TEA is not set | 1421 | CONFIG_CRYPTO_DES=y |
1281 | # CONFIG_CRYPTO_ARC4 is not set | 1422 | # CONFIG_CRYPTO_FCRYPT is not set |
1282 | # CONFIG_CRYPTO_KHAZAD is not set | 1423 | # CONFIG_CRYPTO_KHAZAD is not set |
1283 | # CONFIG_CRYPTO_ANUBIS is not set | 1424 | # CONFIG_CRYPTO_SALSA20 is not set |
1284 | # CONFIG_CRYPTO_SEED is not set | 1425 | # CONFIG_CRYPTO_SEED is not set |
1426 | # CONFIG_CRYPTO_SERPENT is not set | ||
1427 | # CONFIG_CRYPTO_TEA is not set | ||
1428 | # CONFIG_CRYPTO_TWOFISH is not set | ||
1429 | |||
1430 | # | ||
1431 | # Compression | ||
1432 | # | ||
1285 | # CONFIG_CRYPTO_DEFLATE is not set | 1433 | # CONFIG_CRYPTO_DEFLATE is not set |
1286 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1434 | # CONFIG_CRYPTO_LZO is not set |
1287 | # CONFIG_CRYPTO_CRC32C is not set | ||
1288 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
1289 | # CONFIG_CRYPTO_TEST is not set | ||
1290 | # CONFIG_CRYPTO_AUTHENC is not set | ||
1291 | # CONFIG_CRYPTO_HW is not set | 1435 | # CONFIG_CRYPTO_HW is not set |
1292 | # CONFIG_PPC_CLOCK is not set | 1436 | # CONFIG_PPC_CLOCK is not set |
1437 | # CONFIG_VIRTUALIZATION is not set | ||
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig index 066c583c1f8a..ab5199f26a24 100644 --- a/arch/powerpc/configs/mpc7448_hpc2_defconfig +++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:11 2008 | 4 | # Thu Aug 21 00:52:06 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -88,7 +89,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 89 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 90 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 91 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | CONFIG_KALLSYMS=y | 92 | CONFIG_KALLSYMS=y |
93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
94 | CONFIG_HOTPLUG=y | 94 | CONFIG_HOTPLUG=y |
@@ -112,10 +112,16 @@ CONFIG_SLUB=y | |||
112 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
113 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
114 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
119 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 120 | # CONFIG_HAVE_DMA_ATTRS is not set |
121 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
122 | # CONFIG_HAVE_CLK is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
@@ -126,6 +132,7 @@ CONFIG_LBD=y | |||
126 | # CONFIG_BLK_DEV_IO_TRACE is not set | 132 | # CONFIG_BLK_DEV_IO_TRACE is not set |
127 | # CONFIG_LSF is not set | 133 | # CONFIG_LSF is not set |
128 | # CONFIG_BLK_DEV_BSG is not set | 134 | # CONFIG_BLK_DEV_BSG is not set |
135 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
129 | 136 | ||
130 | # | 137 | # |
131 | # IO Schedulers | 138 | # IO Schedulers |
@@ -145,25 +152,25 @@ CONFIG_CLASSIC_RCU=y | |||
145 | # Platform support | 152 | # Platform support |
146 | # | 153 | # |
147 | CONFIG_PPC_MULTIPLATFORM=y | 154 | CONFIG_PPC_MULTIPLATFORM=y |
148 | # CONFIG_PPC_82xx is not set | ||
149 | # CONFIG_PPC_83xx is not set | ||
150 | # CONFIG_PPC_86xx is not set | ||
151 | CONFIG_CLASSIC32=y | 155 | CONFIG_CLASSIC32=y |
152 | # CONFIG_PPC_CHRP is not set | 156 | # CONFIG_PPC_CHRP is not set |
153 | # CONFIG_PPC_MPC512x is not set | ||
154 | # CONFIG_PPC_MPC5121 is not set | ||
155 | # CONFIG_MPC5121_ADS is not set | 157 | # CONFIG_MPC5121_ADS is not set |
158 | # CONFIG_MPC5121_GENERIC is not set | ||
156 | # CONFIG_PPC_MPC52xx is not set | 159 | # CONFIG_PPC_MPC52xx is not set |
157 | # CONFIG_PPC_PMAC is not set | 160 | # CONFIG_PPC_PMAC is not set |
158 | # CONFIG_PPC_CELL is not set | 161 | # CONFIG_PPC_CELL is not set |
159 | # CONFIG_PPC_CELL_NATIVE is not set | 162 | # CONFIG_PPC_CELL_NATIVE is not set |
163 | # CONFIG_PPC_82xx is not set | ||
160 | # CONFIG_PQ2ADS is not set | 164 | # CONFIG_PQ2ADS is not set |
165 | # CONFIG_PPC_83xx is not set | ||
166 | # CONFIG_PPC_86xx is not set | ||
161 | CONFIG_EMBEDDED6xx=y | 167 | CONFIG_EMBEDDED6xx=y |
162 | # CONFIG_LINKSTATION is not set | 168 | # CONFIG_LINKSTATION is not set |
163 | # CONFIG_STORCENTER is not set | 169 | # CONFIG_STORCENTER is not set |
164 | CONFIG_MPC7448HPC2=y | 170 | CONFIG_MPC7448HPC2=y |
165 | # CONFIG_PPC_HOLLY is not set | 171 | # CONFIG_PPC_HOLLY is not set |
166 | # CONFIG_PPC_PRPMC2800 is not set | 172 | # CONFIG_PPC_PRPMC2800 is not set |
173 | # CONFIG_PPC_C2K is not set | ||
167 | CONFIG_TSI108_BRIDGE=y | 174 | CONFIG_TSI108_BRIDGE=y |
168 | # CONFIG_IPIC is not set | 175 | # CONFIG_IPIC is not set |
169 | CONFIG_MPIC=y | 176 | CONFIG_MPIC=y |
@@ -192,7 +199,7 @@ CONFIG_HZ_250=y | |||
192 | # CONFIG_HZ_300 is not set | 199 | # CONFIG_HZ_300 is not set |
193 | # CONFIG_HZ_1000 is not set | 200 | # CONFIG_HZ_1000 is not set |
194 | CONFIG_HZ=250 | 201 | CONFIG_HZ=250 |
195 | # CONFIG_SCHED_HRTICK is not set | 202 | CONFIG_SCHED_HRTICK=y |
196 | CONFIG_PREEMPT_NONE=y | 203 | CONFIG_PREEMPT_NONE=y |
197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 204 | # CONFIG_PREEMPT_VOLUNTARY is not set |
198 | # CONFIG_PREEMPT is not set | 205 | # CONFIG_PREEMPT is not set |
@@ -215,6 +222,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 222 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
216 | CONFIG_PAGEFLAGS_EXTENDED=y | 223 | CONFIG_PAGEFLAGS_EXTENDED=y |
217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 224 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
225 | CONFIG_MIGRATION=y | ||
218 | # CONFIG_RESOURCES_64BIT is not set | 226 | # CONFIG_RESOURCES_64BIT is not set |
219 | CONFIG_ZONE_DMA_FLAG=1 | 227 | CONFIG_ZONE_DMA_FLAG=1 |
220 | CONFIG_BOUNCE=y | 228 | CONFIG_BOUNCE=y |
@@ -222,6 +230,7 @@ CONFIG_VIRT_TO_BUS=y | |||
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 230 | CONFIG_FORCE_MAX_ZONEORDER=11 |
223 | CONFIG_PROC_DEVICETREE=y | 231 | CONFIG_PROC_DEVICETREE=y |
224 | # CONFIG_CMDLINE_BOOL is not set | 232 | # CONFIG_CMDLINE_BOOL is not set |
233 | CONFIG_EXTRA_TARGETS="" | ||
225 | # CONFIG_PM is not set | 234 | # CONFIG_PM is not set |
226 | # CONFIG_SECCOMP is not set | 235 | # CONFIG_SECCOMP is not set |
227 | CONFIG_ISA_DMA_API=y | 236 | CONFIG_ISA_DMA_API=y |
@@ -256,10 +265,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
256 | CONFIG_KERNEL_START=0xc0000000 | 265 | CONFIG_KERNEL_START=0xc0000000 |
257 | CONFIG_PHYSICAL_START=0x00000000 | 266 | CONFIG_PHYSICAL_START=0x00000000 |
258 | CONFIG_TASK_SIZE=0xc0000000 | 267 | CONFIG_TASK_SIZE=0xc0000000 |
259 | |||
260 | # | ||
261 | # Networking | ||
262 | # | ||
263 | CONFIG_NET=y | 268 | CONFIG_NET=y |
264 | 269 | ||
265 | # | 270 | # |
@@ -374,12 +379,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
374 | # CONFIG_BLK_DEV_XIP is not set | 379 | # CONFIG_BLK_DEV_XIP is not set |
375 | # CONFIG_CDROM_PKTCDVD is not set | 380 | # CONFIG_CDROM_PKTCDVD is not set |
376 | # CONFIG_ATA_OVER_ETH is not set | 381 | # CONFIG_ATA_OVER_ETH is not set |
382 | # CONFIG_BLK_DEV_HD is not set | ||
377 | CONFIG_MISC_DEVICES=y | 383 | CONFIG_MISC_DEVICES=y |
378 | # CONFIG_PHANTOM is not set | 384 | # CONFIG_PHANTOM is not set |
379 | # CONFIG_EEPROM_93CX6 is not set | 385 | # CONFIG_EEPROM_93CX6 is not set |
380 | # CONFIG_SGI_IOC4 is not set | 386 | # CONFIG_SGI_IOC4 is not set |
381 | # CONFIG_TIFM_CORE is not set | 387 | # CONFIG_TIFM_CORE is not set |
382 | # CONFIG_ENCLOSURE_SERVICES is not set | 388 | # CONFIG_ENCLOSURE_SERVICES is not set |
389 | # CONFIG_HP_ILO is not set | ||
383 | CONFIG_HAVE_IDE=y | 390 | CONFIG_HAVE_IDE=y |
384 | # CONFIG_IDE is not set | 391 | # CONFIG_IDE is not set |
385 | 392 | ||
@@ -457,6 +464,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
457 | # CONFIG_SCSI_NSP32 is not set | 464 | # CONFIG_SCSI_NSP32 is not set |
458 | # CONFIG_SCSI_DEBUG is not set | 465 | # CONFIG_SCSI_DEBUG is not set |
459 | # CONFIG_SCSI_SRP is not set | 466 | # CONFIG_SCSI_SRP is not set |
467 | # CONFIG_SCSI_DH is not set | ||
460 | CONFIG_ATA=y | 468 | CONFIG_ATA=y |
461 | # CONFIG_ATA_NONSTANDARD is not set | 469 | # CONFIG_ATA_NONSTANDARD is not set |
462 | CONFIG_SATA_PMP=y | 470 | CONFIG_SATA_PMP=y |
@@ -523,12 +531,15 @@ CONFIG_SATA_MV=y | |||
523 | # | 531 | # |
524 | # IEEE 1394 (FireWire) support | 532 | # IEEE 1394 (FireWire) support |
525 | # | 533 | # |
534 | |||
535 | # | ||
536 | # Enable only one of the two stacks, unless you know what you are doing | ||
537 | # | ||
526 | # CONFIG_FIREWIRE is not set | 538 | # CONFIG_FIREWIRE is not set |
527 | # CONFIG_IEEE1394 is not set | 539 | # CONFIG_IEEE1394 is not set |
528 | # CONFIG_I2O is not set | 540 | # CONFIG_I2O is not set |
529 | # CONFIG_MACINTOSH_DRIVERS is not set | 541 | # CONFIG_MACINTOSH_DRIVERS is not set |
530 | CONFIG_NETDEVICES=y | 542 | CONFIG_NETDEVICES=y |
531 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
532 | # CONFIG_DUMMY is not set | 543 | # CONFIG_DUMMY is not set |
533 | # CONFIG_BONDING is not set | 544 | # CONFIG_BONDING is not set |
534 | # CONFIG_MACVLAN is not set | 545 | # CONFIG_MACVLAN is not set |
@@ -594,7 +605,6 @@ CONFIG_NETDEV_1000=y | |||
594 | # CONFIG_DL2K is not set | 605 | # CONFIG_DL2K is not set |
595 | # CONFIG_E1000 is not set | 606 | # CONFIG_E1000 is not set |
596 | # CONFIG_E1000E is not set | 607 | # CONFIG_E1000E is not set |
597 | # CONFIG_E1000E_ENABLED is not set | ||
598 | # CONFIG_IP1000 is not set | 608 | # CONFIG_IP1000 is not set |
599 | # CONFIG_IGB is not set | 609 | # CONFIG_IGB is not set |
600 | # CONFIG_NS83820 is not set | 610 | # CONFIG_NS83820 is not set |
@@ -611,6 +621,7 @@ CONFIG_TSI108_ETH=y | |||
611 | # CONFIG_MV643XX_ETH is not set | 621 | # CONFIG_MV643XX_ETH is not set |
612 | # CONFIG_QLA3XXX is not set | 622 | # CONFIG_QLA3XXX is not set |
613 | # CONFIG_ATL1 is not set | 623 | # CONFIG_ATL1 is not set |
624 | # CONFIG_ATL1E is not set | ||
614 | CONFIG_NETDEV_10000=y | 625 | CONFIG_NETDEV_10000=y |
615 | # CONFIG_CHELSIO_T1 is not set | 626 | # CONFIG_CHELSIO_T1 is not set |
616 | # CONFIG_CHELSIO_T3 is not set | 627 | # CONFIG_CHELSIO_T3 is not set |
@@ -716,6 +727,8 @@ CONFIG_GEN_RTC=y | |||
716 | CONFIG_DEVPORT=y | 727 | CONFIG_DEVPORT=y |
717 | # CONFIG_I2C is not set | 728 | # CONFIG_I2C is not set |
718 | # CONFIG_SPI is not set | 729 | # CONFIG_SPI is not set |
730 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
731 | # CONFIG_GPIOLIB is not set | ||
719 | # CONFIG_W1 is not set | 732 | # CONFIG_W1 is not set |
720 | # CONFIG_POWER_SUPPLY is not set | 733 | # CONFIG_POWER_SUPPLY is not set |
721 | CONFIG_HWMON=y | 734 | CONFIG_HWMON=y |
@@ -736,6 +749,7 @@ CONFIG_HWMON=y | |||
736 | # CONFIG_SENSORS_W83627EHF is not set | 749 | # CONFIG_SENSORS_W83627EHF is not set |
737 | # CONFIG_HWMON_DEBUG_CHIP is not set | 750 | # CONFIG_HWMON_DEBUG_CHIP is not set |
738 | # CONFIG_THERMAL is not set | 751 | # CONFIG_THERMAL is not set |
752 | # CONFIG_THERMAL_HWMON is not set | ||
739 | # CONFIG_WATCHDOG is not set | 753 | # CONFIG_WATCHDOG is not set |
740 | 754 | ||
741 | # | 755 | # |
@@ -747,8 +761,10 @@ CONFIG_SSB_POSSIBLE=y | |||
747 | # | 761 | # |
748 | # Multifunction device drivers | 762 | # Multifunction device drivers |
749 | # | 763 | # |
764 | # CONFIG_MFD_CORE is not set | ||
750 | # CONFIG_MFD_SM501 is not set | 765 | # CONFIG_MFD_SM501 is not set |
751 | # CONFIG_HTC_PASIC3 is not set | 766 | # CONFIG_HTC_PASIC3 is not set |
767 | # CONFIG_MFD_TMIO is not set | ||
752 | 768 | ||
753 | # | 769 | # |
754 | # Multimedia devices | 770 | # Multimedia devices |
@@ -780,10 +796,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
780 | # Display device support | 796 | # Display device support |
781 | # | 797 | # |
782 | # CONFIG_DISPLAY_SUPPORT is not set | 798 | # CONFIG_DISPLAY_SUPPORT is not set |
783 | |||
784 | # | ||
785 | # Sound | ||
786 | # | ||
787 | # CONFIG_SOUND is not set | 799 | # CONFIG_SOUND is not set |
788 | CONFIG_HID_SUPPORT=y | 800 | CONFIG_HID_SUPPORT=y |
789 | CONFIG_HID=y | 801 | CONFIG_HID=y |
@@ -798,6 +810,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
798 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 810 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
799 | 811 | ||
800 | # | 812 | # |
813 | # Enable Host or Gadget support to see Inventra options | ||
814 | # | ||
815 | |||
816 | # | ||
801 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 817 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
802 | # | 818 | # |
803 | # CONFIG_USB_GADGET is not set | 819 | # CONFIG_USB_GADGET is not set |
@@ -875,6 +891,7 @@ CONFIG_TMPFS=y | |||
875 | # CONFIG_CRAMFS is not set | 891 | # CONFIG_CRAMFS is not set |
876 | # CONFIG_VXFS_FS is not set | 892 | # CONFIG_VXFS_FS is not set |
877 | # CONFIG_MINIX_FS is not set | 893 | # CONFIG_MINIX_FS is not set |
894 | # CONFIG_OMFS_FS is not set | ||
878 | # CONFIG_HPFS_FS is not set | 895 | # CONFIG_HPFS_FS is not set |
879 | # CONFIG_QNX4FS_FS is not set | 896 | # CONFIG_QNX4FS_FS is not set |
880 | # CONFIG_ROMFS_FS is not set | 897 | # CONFIG_ROMFS_FS is not set |
@@ -884,12 +901,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
884 | CONFIG_NFS_FS=y | 901 | CONFIG_NFS_FS=y |
885 | # CONFIG_NFS_V3 is not set | 902 | # CONFIG_NFS_V3 is not set |
886 | # CONFIG_NFS_V4 is not set | 903 | # CONFIG_NFS_V4 is not set |
887 | # CONFIG_NFSD is not set | ||
888 | CONFIG_ROOT_NFS=y | 904 | CONFIG_ROOT_NFS=y |
905 | # CONFIG_NFSD is not set | ||
889 | CONFIG_LOCKD=y | 906 | CONFIG_LOCKD=y |
890 | CONFIG_NFS_COMMON=y | 907 | CONFIG_NFS_COMMON=y |
891 | CONFIG_SUNRPC=y | 908 | CONFIG_SUNRPC=y |
892 | # CONFIG_SUNRPC_BIND34 is not set | ||
893 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 909 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
894 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 910 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
895 | # CONFIG_SMB_FS is not set | 911 | # CONFIG_SMB_FS is not set |
@@ -929,6 +945,7 @@ CONFIG_BITREVERSE=y | |||
929 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 945 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
930 | # CONFIG_CRC_CCITT is not set | 946 | # CONFIG_CRC_CCITT is not set |
931 | # CONFIG_CRC16 is not set | 947 | # CONFIG_CRC16 is not set |
948 | CONFIG_CRC_T10DIF=y | ||
932 | # CONFIG_CRC_ITU_T is not set | 949 | # CONFIG_CRC_ITU_T is not set |
933 | CONFIG_CRC32=y | 950 | CONFIG_CRC32=y |
934 | # CONFIG_CRC7 is not set | 951 | # CONFIG_CRC7 is not set |
@@ -954,7 +971,16 @@ CONFIG_FRAME_WARN=1024 | |||
954 | # CONFIG_SLUB_DEBUG_ON is not set | 971 | # CONFIG_SLUB_DEBUG_ON is not set |
955 | # CONFIG_SLUB_STATS is not set | 972 | # CONFIG_SLUB_STATS is not set |
956 | # CONFIG_DEBUG_BUGVERBOSE is not set | 973 | # CONFIG_DEBUG_BUGVERBOSE is not set |
974 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
975 | # CONFIG_LATENCYTOP is not set | ||
976 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
977 | CONFIG_HAVE_FTRACE=y | ||
978 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
979 | # CONFIG_FTRACE is not set | ||
980 | # CONFIG_SCHED_TRACER is not set | ||
981 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
957 | # CONFIG_SAMPLES is not set | 982 | # CONFIG_SAMPLES is not set |
983 | CONFIG_HAVE_ARCH_KGDB=y | ||
958 | # CONFIG_IRQSTACKS is not set | 984 | # CONFIG_IRQSTACKS is not set |
959 | # CONFIG_BOOTX_TEXT is not set | 985 | # CONFIG_BOOTX_TEXT is not set |
960 | # CONFIG_PPC_EARLY_DEBUG is not set | 986 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1007,6 +1033,10 @@ CONFIG_CRYPTO=y | |||
1007 | # CONFIG_CRYPTO_MD4 is not set | 1033 | # CONFIG_CRYPTO_MD4 is not set |
1008 | # CONFIG_CRYPTO_MD5 is not set | 1034 | # CONFIG_CRYPTO_MD5 is not set |
1009 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1035 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1036 | # CONFIG_CRYPTO_RMD128 is not set | ||
1037 | # CONFIG_CRYPTO_RMD160 is not set | ||
1038 | # CONFIG_CRYPTO_RMD256 is not set | ||
1039 | # CONFIG_CRYPTO_RMD320 is not set | ||
1010 | # CONFIG_CRYPTO_SHA1 is not set | 1040 | # CONFIG_CRYPTO_SHA1 is not set |
1011 | # CONFIG_CRYPTO_SHA256 is not set | 1041 | # CONFIG_CRYPTO_SHA256 is not set |
1012 | # CONFIG_CRYPTO_SHA512 is not set | 1042 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig index 30d7834b7db1..7c435c84c875 100644 --- a/arch/powerpc/configs/mpc8272_ads_defconfig +++ b/arch/powerpc/configs/mpc8272_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:12 2008 | 4 | # Thu Aug 21 00:52:07 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_6xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_ALTIVEC is not set | ||
18 | CONFIG_PPC_STD_MMU=y | 19 | CONFIG_PPC_STD_MMU=y |
19 | CONFIG_PPC_STD_MMU_32=y | 20 | CONFIG_PPC_STD_MMU_32=y |
20 | # CONFIG_PPC_MM_SLICES is not set | 21 | # CONFIG_PPC_MM_SLICES is not set |
@@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
42 | CONFIG_GENERIC_GPIO=y | ||
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 44 | CONFIG_PPC=y |
42 | CONFIG_EARLY_PRINTK=y | 45 | CONFIG_EARLY_PRINTK=y |
@@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
45 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 48 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
46 | CONFIG_PPC_OF=y | 49 | CONFIG_PPC_OF=y |
47 | CONFIG_OF=y | 50 | CONFIG_OF=y |
48 | # CONFIG_PPC_UDBG_16550 is not set | 51 | CONFIG_PPC_UDBG_16550=y |
49 | # CONFIG_GENERIC_TBSYNC is not set | 52 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
52 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
53 | # CONFIG_PPC_DCR_NATIVE is not set | 58 | # CONFIG_PPC_DCR_NATIVE is not set |
54 | # CONFIG_PPC_DCR_MMIO is not set | 59 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -81,7 +86,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
81 | CONFIG_SYSCTL=y | 86 | CONFIG_SYSCTL=y |
82 | CONFIG_EMBEDDED=y | 87 | CONFIG_EMBEDDED=y |
83 | CONFIG_SYSCTL_SYSCALL=y | 88 | CONFIG_SYSCTL_SYSCALL=y |
84 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
85 | CONFIG_KALLSYMS=y | 89 | CONFIG_KALLSYMS=y |
86 | CONFIG_KALLSYMS_ALL=y | 90 | CONFIG_KALLSYMS_ALL=y |
87 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 91 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -89,6 +93,7 @@ CONFIG_HOTPLUG=y | |||
89 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
90 | CONFIG_BUG=y | 94 | CONFIG_BUG=y |
91 | CONFIG_ELF_CORE=y | 95 | CONFIG_ELF_CORE=y |
96 | CONFIG_PCSPKR_PLATFORM=y | ||
92 | CONFIG_COMPAT_BRK=y | 97 | CONFIG_COMPAT_BRK=y |
93 | CONFIG_BASE_FULL=y | 98 | CONFIG_BASE_FULL=y |
94 | CONFIG_FUTEX=y | 99 | CONFIG_FUTEX=y |
@@ -106,10 +111,16 @@ CONFIG_SLUB=y | |||
106 | # CONFIG_PROFILING is not set | 111 | # CONFIG_PROFILING is not set |
107 | # CONFIG_MARKERS is not set | 112 | # CONFIG_MARKERS is not set |
108 | CONFIG_HAVE_OPROFILE=y | 113 | CONFIG_HAVE_OPROFILE=y |
114 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
115 | CONFIG_HAVE_IOREMAP_PROT=y | ||
109 | CONFIG_HAVE_KPROBES=y | 116 | CONFIG_HAVE_KPROBES=y |
110 | CONFIG_HAVE_KRETPROBES=y | 117 | CONFIG_HAVE_KRETPROBES=y |
118 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
111 | # CONFIG_HAVE_DMA_ATTRS is not set | 119 | # CONFIG_HAVE_DMA_ATTRS is not set |
120 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
121 | CONFIG_HAVE_CLK=y | ||
112 | CONFIG_PROC_PAGE_MONITOR=y | 122 | CONFIG_PROC_PAGE_MONITOR=y |
123 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
113 | CONFIG_SLABINFO=y | 124 | CONFIG_SLABINFO=y |
114 | CONFIG_RT_MUTEXES=y | 125 | CONFIG_RT_MUTEXES=y |
115 | # CONFIG_TINY_SHMEM is not set | 126 | # CONFIG_TINY_SHMEM is not set |
@@ -119,6 +130,7 @@ CONFIG_BLOCK=y | |||
119 | # CONFIG_LBD is not set | 130 | # CONFIG_LBD is not set |
120 | # CONFIG_BLK_DEV_IO_TRACE is not set | 131 | # CONFIG_BLK_DEV_IO_TRACE is not set |
121 | # CONFIG_LSF is not set | 132 | # CONFIG_LSF is not set |
133 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
122 | 134 | ||
123 | # | 135 | # |
124 | # IO Schedulers | 136 | # IO Schedulers |
@@ -137,14 +149,16 @@ CONFIG_CLASSIC_RCU=y | |||
137 | # | 149 | # |
138 | # Platform support | 150 | # Platform support |
139 | # | 151 | # |
140 | # CONFIG_PPC_MULTIPLATFORM is not set | 152 | CONFIG_PPC_MULTIPLATFORM=y |
141 | CONFIG_PPC_82xx=y | 153 | CONFIG_CLASSIC32=y |
142 | # CONFIG_PPC_83xx is not set | 154 | CONFIG_PPC_CHRP=y |
143 | # CONFIG_PPC_86xx is not set | 155 | # CONFIG_MPC5121_ADS is not set |
144 | # CONFIG_PPC_MPC512x is not set | 156 | # CONFIG_MPC5121_GENERIC is not set |
145 | # CONFIG_PPC_MPC5121 is not set | 157 | # CONFIG_PPC_MPC52xx is not set |
158 | CONFIG_PPC_PMAC=y | ||
146 | # CONFIG_PPC_CELL is not set | 159 | # CONFIG_PPC_CELL is not set |
147 | # CONFIG_PPC_CELL_NATIVE is not set | 160 | # CONFIG_PPC_CELL_NATIVE is not set |
161 | CONFIG_PPC_82xx=y | ||
148 | CONFIG_MPC8272_ADS=y | 162 | CONFIG_MPC8272_ADS=y |
149 | # CONFIG_PQ2FADS is not set | 163 | # CONFIG_PQ2FADS is not set |
150 | # CONFIG_EP8248E is not set | 164 | # CONFIG_EP8248E is not set |
@@ -152,19 +166,27 @@ CONFIG_PQ2ADS=y | |||
152 | CONFIG_8260=y | 166 | CONFIG_8260=y |
153 | CONFIG_8272=y | 167 | CONFIG_8272=y |
154 | CONFIG_PQ2_ADS_PCI_PIC=y | 168 | CONFIG_PQ2_ADS_PCI_PIC=y |
169 | # CONFIG_PPC_83xx is not set | ||
170 | # CONFIG_PPC_86xx is not set | ||
171 | # CONFIG_EMBEDDED6xx is not set | ||
172 | CONFIG_PPC_NATIVE=y | ||
173 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
155 | # CONFIG_IPIC is not set | 174 | # CONFIG_IPIC is not set |
156 | # CONFIG_MPIC is not set | 175 | CONFIG_MPIC=y |
157 | # CONFIG_MPIC_WEIRD is not set | 176 | # CONFIG_MPIC_WEIRD is not set |
158 | # CONFIG_PPC_I8259 is not set | 177 | CONFIG_PPC_I8259=y |
159 | # CONFIG_PPC_RTAS is not set | 178 | CONFIG_PPC_RTAS=y |
179 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
180 | CONFIG_RTAS_PROC=y | ||
160 | # CONFIG_MMIO_NVRAM is not set | 181 | # CONFIG_MMIO_NVRAM is not set |
161 | # CONFIG_PPC_MPC106 is not set | 182 | CONFIG_PPC_MPC106=y |
162 | # CONFIG_PPC_970_NAP is not set | 183 | # CONFIG_PPC_970_NAP is not set |
163 | # CONFIG_PPC_INDIRECT_IO is not set | 184 | # CONFIG_PPC_INDIRECT_IO is not set |
164 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
165 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
187 | # CONFIG_PPC601_SYNC_FIX is not set | ||
188 | # CONFIG_TAU is not set | ||
166 | CONFIG_CPM2=y | 189 | CONFIG_CPM2=y |
167 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
168 | # CONFIG_FSL_ULI1575 is not set | 190 | # CONFIG_FSL_ULI1575 is not set |
169 | CONFIG_CPM=y | 191 | CONFIG_CPM=y |
170 | 192 | ||
@@ -181,7 +203,7 @@ CONFIG_HZ_250=y | |||
181 | # CONFIG_HZ_300 is not set | 203 | # CONFIG_HZ_300 is not set |
182 | # CONFIG_HZ_1000 is not set | 204 | # CONFIG_HZ_1000 is not set |
183 | CONFIG_HZ=250 | 205 | CONFIG_HZ=250 |
184 | # CONFIG_SCHED_HRTICK is not set | 206 | CONFIG_SCHED_HRTICK=y |
185 | CONFIG_PREEMPT_NONE=y | 207 | CONFIG_PREEMPT_NONE=y |
186 | # CONFIG_PREEMPT_VOLUNTARY is not set | 208 | # CONFIG_PREEMPT_VOLUNTARY is not set |
187 | # CONFIG_PREEMPT is not set | 209 | # CONFIG_PREEMPT is not set |
@@ -199,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
200 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
201 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | ||
202 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
203 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
204 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
@@ -206,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
206 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
207 | CONFIG_PROC_DEVICETREE=y | 230 | CONFIG_PROC_DEVICETREE=y |
208 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
232 | CONFIG_EXTRA_TARGETS="" | ||
209 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
210 | CONFIG_SECCOMP=y | 234 | CONFIG_SECCOMP=y |
211 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
@@ -213,9 +237,11 @@ CONFIG_ISA_DMA_API=y | |||
213 | # | 237 | # |
214 | # Bus options | 238 | # Bus options |
215 | # | 239 | # |
240 | # CONFIG_ISA is not set | ||
216 | CONFIG_ZONE_DMA=y | 241 | CONFIG_ZONE_DMA=y |
217 | CONFIG_PPC_INDIRECT_PCI=y | 242 | CONFIG_PPC_INDIRECT_PCI=y |
218 | CONFIG_FSL_SOC=y | 243 | CONFIG_FSL_SOC=y |
244 | CONFIG_PPC_PCI_CHOICE=y | ||
219 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
220 | CONFIG_PCI_DOMAINS=y | 246 | CONFIG_PCI_DOMAINS=y |
221 | CONFIG_PCI_SYSCALL=y | 247 | CONFIG_PCI_SYSCALL=y |
@@ -242,10 +268,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
242 | CONFIG_KERNEL_START=0xc0000000 | 268 | CONFIG_KERNEL_START=0xc0000000 |
243 | CONFIG_PHYSICAL_START=0x00000000 | 269 | CONFIG_PHYSICAL_START=0x00000000 |
244 | CONFIG_TASK_SIZE=0xc0000000 | 270 | CONFIG_TASK_SIZE=0xc0000000 |
245 | |||
246 | # | ||
247 | # Networking | ||
248 | # | ||
249 | CONFIG_NET=y | 271 | CONFIG_NET=y |
250 | 272 | ||
251 | # | 273 | # |
@@ -446,9 +468,11 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
446 | # | 468 | # |
447 | # CONFIG_MTD_UBI is not set | 469 | # CONFIG_MTD_UBI is not set |
448 | CONFIG_OF_DEVICE=y | 470 | CONFIG_OF_DEVICE=y |
471 | CONFIG_OF_GPIO=y | ||
449 | # CONFIG_PARPORT is not set | 472 | # CONFIG_PARPORT is not set |
450 | CONFIG_BLK_DEV=y | 473 | CONFIG_BLK_DEV=y |
451 | # CONFIG_BLK_DEV_FD is not set | 474 | # CONFIG_BLK_DEV_FD is not set |
475 | # CONFIG_MAC_FLOPPY is not set | ||
452 | # CONFIG_BLK_CPQ_DA is not set | 476 | # CONFIG_BLK_CPQ_DA is not set |
453 | # CONFIG_BLK_CPQ_CISS_DA is not set | 477 | # CONFIG_BLK_CPQ_CISS_DA is not set |
454 | # CONFIG_BLK_DEV_DAC960 is not set | 478 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -460,6 +484,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
460 | # CONFIG_BLK_DEV_RAM is not set | 484 | # CONFIG_BLK_DEV_RAM is not set |
461 | # CONFIG_CDROM_PKTCDVD is not set | 485 | # CONFIG_CDROM_PKTCDVD is not set |
462 | # CONFIG_ATA_OVER_ETH is not set | 486 | # CONFIG_ATA_OVER_ETH is not set |
487 | # CONFIG_BLK_DEV_HD is not set | ||
463 | # CONFIG_MISC_DEVICES is not set | 488 | # CONFIG_MISC_DEVICES is not set |
464 | CONFIG_HAVE_IDE=y | 489 | CONFIG_HAVE_IDE=y |
465 | # CONFIG_IDE is not set | 490 | # CONFIG_IDE is not set |
@@ -480,13 +505,12 @@ CONFIG_HAVE_IDE=y | |||
480 | # | 505 | # |
481 | 506 | ||
482 | # | 507 | # |
483 | # An alternative FireWire stack is available with EXPERIMENTAL=y | 508 | # A new alternative FireWire stack is available with EXPERIMENTAL=y |
484 | # | 509 | # |
485 | # CONFIG_IEEE1394 is not set | 510 | # CONFIG_IEEE1394 is not set |
486 | # CONFIG_I2O is not set | 511 | # CONFIG_I2O is not set |
487 | # CONFIG_MACINTOSH_DRIVERS is not set | 512 | # CONFIG_MACINTOSH_DRIVERS is not set |
488 | CONFIG_NETDEVICES=y | 513 | CONFIG_NETDEVICES=y |
489 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
490 | # CONFIG_DUMMY is not set | 514 | # CONFIG_DUMMY is not set |
491 | # CONFIG_BONDING is not set | 515 | # CONFIG_BONDING is not set |
492 | # CONFIG_EQUALIZER is not set | 516 | # CONFIG_EQUALIZER is not set |
@@ -510,8 +534,11 @@ CONFIG_DAVICOM_PHY=y | |||
510 | # CONFIG_REALTEK_PHY is not set | 534 | # CONFIG_REALTEK_PHY is not set |
511 | # CONFIG_FIXED_PHY is not set | 535 | # CONFIG_FIXED_PHY is not set |
512 | CONFIG_MDIO_BITBANG=y | 536 | CONFIG_MDIO_BITBANG=y |
537 | # CONFIG_MDIO_OF_GPIO is not set | ||
513 | CONFIG_NET_ETHERNET=y | 538 | CONFIG_NET_ETHERNET=y |
514 | CONFIG_MII=y | 539 | CONFIG_MII=y |
540 | # CONFIG_MACE is not set | ||
541 | # CONFIG_BMAC is not set | ||
515 | # CONFIG_HAPPYMEAL is not set | 542 | # CONFIG_HAPPYMEAL is not set |
516 | # CONFIG_SUNGEM is not set | 543 | # CONFIG_SUNGEM is not set |
517 | # CONFIG_CASSINI is not set | 544 | # CONFIG_CASSINI is not set |
@@ -533,7 +560,6 @@ CONFIG_NETDEV_1000=y | |||
533 | # CONFIG_DL2K is not set | 560 | # CONFIG_DL2K is not set |
534 | # CONFIG_E1000 is not set | 561 | # CONFIG_E1000 is not set |
535 | # CONFIG_E1000E is not set | 562 | # CONFIG_E1000E is not set |
536 | # CONFIG_E1000E_ENABLED is not set | ||
537 | # CONFIG_IGB is not set | 563 | # CONFIG_IGB is not set |
538 | # CONFIG_NS83820 is not set | 564 | # CONFIG_NS83820 is not set |
539 | # CONFIG_HAMACHI is not set | 565 | # CONFIG_HAMACHI is not set |
@@ -545,6 +571,7 @@ CONFIG_NETDEV_1000=y | |||
545 | # CONFIG_TIGON3 is not set | 571 | # CONFIG_TIGON3 is not set |
546 | # CONFIG_BNX2 is not set | 572 | # CONFIG_BNX2 is not set |
547 | # CONFIG_GIANFAR is not set | 573 | # CONFIG_GIANFAR is not set |
574 | # CONFIG_MV643XX_ETH is not set | ||
548 | # CONFIG_QLA3XXX is not set | 575 | # CONFIG_QLA3XXX is not set |
549 | CONFIG_NETDEV_10000=y | 576 | CONFIG_NETDEV_10000=y |
550 | # CONFIG_CHELSIO_T1 is not set | 577 | # CONFIG_CHELSIO_T1 is not set |
@@ -610,6 +637,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
610 | # CONFIG_KEYBOARD_XTKBD is not set | 637 | # CONFIG_KEYBOARD_XTKBD is not set |
611 | # CONFIG_KEYBOARD_NEWTON is not set | 638 | # CONFIG_KEYBOARD_NEWTON is not set |
612 | # CONFIG_KEYBOARD_STOWAWAY is not set | 639 | # CONFIG_KEYBOARD_STOWAWAY is not set |
640 | # CONFIG_KEYBOARD_GPIO is not set | ||
613 | CONFIG_INPUT_MOUSE=y | 641 | CONFIG_INPUT_MOUSE=y |
614 | CONFIG_MOUSE_PS2=y | 642 | CONFIG_MOUSE_PS2=y |
615 | CONFIG_MOUSE_PS2_ALPS=y | 643 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -620,6 +648,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
620 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 648 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
621 | # CONFIG_MOUSE_SERIAL is not set | 649 | # CONFIG_MOUSE_SERIAL is not set |
622 | # CONFIG_MOUSE_VSXXXAA is not set | 650 | # CONFIG_MOUSE_VSXXXAA is not set |
651 | # CONFIG_MOUSE_GPIO is not set | ||
623 | # CONFIG_INPUT_JOYSTICK is not set | 652 | # CONFIG_INPUT_JOYSTICK is not set |
624 | # CONFIG_INPUT_TABLET is not set | 653 | # CONFIG_INPUT_TABLET is not set |
625 | # CONFIG_INPUT_TOUCHSCREEN is not set | 654 | # CONFIG_INPUT_TOUCHSCREEN is not set |
@@ -634,6 +663,7 @@ CONFIG_SERIO_SERPORT=y | |||
634 | # CONFIG_SERIO_PCIPS2 is not set | 663 | # CONFIG_SERIO_PCIPS2 is not set |
635 | CONFIG_SERIO_LIBPS2=y | 664 | CONFIG_SERIO_LIBPS2=y |
636 | # CONFIG_SERIO_RAW is not set | 665 | # CONFIG_SERIO_RAW is not set |
666 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
637 | # CONFIG_GAMEPORT is not set | 667 | # CONFIG_GAMEPORT is not set |
638 | 668 | ||
639 | # | 669 | # |
@@ -654,6 +684,7 @@ CONFIG_DEVKMEM=y | |||
654 | # CONFIG_SERIAL_UARTLITE is not set | 684 | # CONFIG_SERIAL_UARTLITE is not set |
655 | CONFIG_SERIAL_CORE=y | 685 | CONFIG_SERIAL_CORE=y |
656 | CONFIG_SERIAL_CORE_CONSOLE=y | 686 | CONFIG_SERIAL_CORE_CONSOLE=y |
687 | # CONFIG_SERIAL_PMACZILOG is not set | ||
657 | CONFIG_SERIAL_CPM=y | 688 | CONFIG_SERIAL_CPM=y |
658 | CONFIG_SERIAL_CPM_CONSOLE=y | 689 | CONFIG_SERIAL_CPM_CONSOLE=y |
659 | CONFIG_SERIAL_CPM_SCC1=y | 690 | CONFIG_SERIAL_CPM_SCC1=y |
@@ -666,6 +697,8 @@ CONFIG_SERIAL_CPM_SCC4=y | |||
666 | CONFIG_UNIX98_PTYS=y | 697 | CONFIG_UNIX98_PTYS=y |
667 | CONFIG_LEGACY_PTYS=y | 698 | CONFIG_LEGACY_PTYS=y |
668 | CONFIG_LEGACY_PTY_COUNT=256 | 699 | CONFIG_LEGACY_PTY_COUNT=256 |
700 | # CONFIG_BRIQ_PANEL is not set | ||
701 | # CONFIG_HVC_RTAS is not set | ||
669 | # CONFIG_IPMI_HANDLER is not set | 702 | # CONFIG_IPMI_HANDLER is not set |
670 | CONFIG_HW_RANDOM=y | 703 | CONFIG_HW_RANDOM=y |
671 | # CONFIG_NVRAM is not set | 704 | # CONFIG_NVRAM is not set |
@@ -676,10 +709,28 @@ CONFIG_HW_RANDOM=y | |||
676 | CONFIG_DEVPORT=y | 709 | CONFIG_DEVPORT=y |
677 | # CONFIG_I2C is not set | 710 | # CONFIG_I2C is not set |
678 | # CONFIG_SPI is not set | 711 | # CONFIG_SPI is not set |
712 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
713 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
714 | CONFIG_GPIOLIB=y | ||
715 | # CONFIG_DEBUG_GPIO is not set | ||
716 | |||
717 | # | ||
718 | # I2C GPIO expanders: | ||
719 | # | ||
720 | |||
721 | # | ||
722 | # PCI GPIO expanders: | ||
723 | # | ||
724 | # CONFIG_GPIO_BT8XX is not set | ||
725 | |||
726 | # | ||
727 | # SPI GPIO expanders: | ||
728 | # | ||
679 | # CONFIG_W1 is not set | 729 | # CONFIG_W1 is not set |
680 | # CONFIG_POWER_SUPPLY is not set | 730 | # CONFIG_POWER_SUPPLY is not set |
681 | # CONFIG_HWMON is not set | 731 | # CONFIG_HWMON is not set |
682 | # CONFIG_THERMAL is not set | 732 | # CONFIG_THERMAL is not set |
733 | # CONFIG_THERMAL_HWMON is not set | ||
683 | # CONFIG_WATCHDOG is not set | 734 | # CONFIG_WATCHDOG is not set |
684 | 735 | ||
685 | # | 736 | # |
@@ -691,8 +742,10 @@ CONFIG_SSB_POSSIBLE=y | |||
691 | # | 742 | # |
692 | # Multifunction device drivers | 743 | # Multifunction device drivers |
693 | # | 744 | # |
745 | # CONFIG_MFD_CORE is not set | ||
694 | # CONFIG_MFD_SM501 is not set | 746 | # CONFIG_MFD_SM501 is not set |
695 | # CONFIG_HTC_PASIC3 is not set | 747 | # CONFIG_HTC_PASIC3 is not set |
748 | # CONFIG_MFD_TMIO is not set | ||
696 | 749 | ||
697 | # | 750 | # |
698 | # Multimedia devices | 751 | # Multimedia devices |
@@ -724,10 +777,6 @@ CONFIG_DAB=y | |||
724 | # Display device support | 777 | # Display device support |
725 | # | 778 | # |
726 | # CONFIG_DISPLAY_SUPPORT is not set | 779 | # CONFIG_DISPLAY_SUPPORT is not set |
727 | |||
728 | # | ||
729 | # Sound | ||
730 | # | ||
731 | # CONFIG_SOUND is not set | 780 | # CONFIG_SOUND is not set |
732 | # CONFIG_HID_SUPPORT is not set | 781 | # CONFIG_HID_SUPPORT is not set |
733 | # CONFIG_USB_SUPPORT is not set | 782 | # CONFIG_USB_SUPPORT is not set |
@@ -798,6 +847,7 @@ CONFIG_TMPFS=y | |||
798 | CONFIG_CRAMFS=y | 847 | CONFIG_CRAMFS=y |
799 | # CONFIG_VXFS_FS is not set | 848 | # CONFIG_VXFS_FS is not set |
800 | # CONFIG_MINIX_FS is not set | 849 | # CONFIG_MINIX_FS is not set |
850 | # CONFIG_OMFS_FS is not set | ||
801 | # CONFIG_HPFS_FS is not set | 851 | # CONFIG_HPFS_FS is not set |
802 | # CONFIG_QNX4FS_FS is not set | 852 | # CONFIG_QNX4FS_FS is not set |
803 | # CONFIG_ROMFS_FS is not set | 853 | # CONFIG_ROMFS_FS is not set |
@@ -807,8 +857,8 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
807 | CONFIG_NFS_FS=y | 857 | CONFIG_NFS_FS=y |
808 | CONFIG_NFS_V3=y | 858 | CONFIG_NFS_V3=y |
809 | CONFIG_NFS_V3_ACL=y | 859 | CONFIG_NFS_V3_ACL=y |
810 | # CONFIG_NFSD is not set | ||
811 | CONFIG_ROOT_NFS=y | 860 | CONFIG_ROOT_NFS=y |
861 | # CONFIG_NFSD is not set | ||
812 | CONFIG_LOCKD=y | 862 | CONFIG_LOCKD=y |
813 | CONFIG_LOCKD_V4=y | 863 | CONFIG_LOCKD_V4=y |
814 | CONFIG_NFS_ACL_SUPPORT=y | 864 | CONFIG_NFS_ACL_SUPPORT=y |
@@ -888,6 +938,7 @@ CONFIG_BITREVERSE=y | |||
888 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 938 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
889 | CONFIG_CRC_CCITT=y | 939 | CONFIG_CRC_CCITT=y |
890 | # CONFIG_CRC16 is not set | 940 | # CONFIG_CRC16 is not set |
941 | # CONFIG_CRC_T10DIF is not set | ||
891 | # CONFIG_CRC_ITU_T is not set | 942 | # CONFIG_CRC_ITU_T is not set |
892 | CONFIG_CRC32=y | 943 | CONFIG_CRC32=y |
893 | # CONFIG_CRC7 is not set | 944 | # CONFIG_CRC7 is not set |
@@ -914,6 +965,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
914 | CONFIG_DEBUG_KERNEL=y | 965 | CONFIG_DEBUG_KERNEL=y |
915 | # CONFIG_DEBUG_SHIRQ is not set | 966 | # CONFIG_DEBUG_SHIRQ is not set |
916 | CONFIG_DETECT_SOFTLOCKUP=y | 967 | CONFIG_DETECT_SOFTLOCKUP=y |
968 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
969 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
917 | CONFIG_SCHED_DEBUG=y | 970 | CONFIG_SCHED_DEBUG=y |
918 | # CONFIG_SCHEDSTATS is not set | 971 | # CONFIG_SCHEDSTATS is not set |
919 | # CONFIG_TIMER_STATS is not set | 972 | # CONFIG_TIMER_STATS is not set |
@@ -931,19 +984,31 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
931 | CONFIG_DEBUG_INFO=y | 984 | CONFIG_DEBUG_INFO=y |
932 | # CONFIG_DEBUG_VM is not set | 985 | # CONFIG_DEBUG_VM is not set |
933 | # CONFIG_DEBUG_WRITECOUNT is not set | 986 | # CONFIG_DEBUG_WRITECOUNT is not set |
987 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
934 | # CONFIG_DEBUG_LIST is not set | 988 | # CONFIG_DEBUG_LIST is not set |
935 | # CONFIG_DEBUG_SG is not set | 989 | # CONFIG_DEBUG_SG is not set |
936 | # CONFIG_BOOT_PRINTK_DELAY is not set | 990 | # CONFIG_BOOT_PRINTK_DELAY is not set |
991 | # CONFIG_RCU_TORTURE_TEST is not set | ||
937 | # CONFIG_BACKTRACE_SELF_TEST is not set | 992 | # CONFIG_BACKTRACE_SELF_TEST is not set |
938 | # CONFIG_FAULT_INJECTION is not set | 993 | # CONFIG_FAULT_INJECTION is not set |
994 | # CONFIG_LATENCYTOP is not set | ||
995 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
996 | CONFIG_HAVE_FTRACE=y | ||
997 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
998 | # CONFIG_FTRACE is not set | ||
999 | # CONFIG_SCHED_TRACER is not set | ||
1000 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
939 | # CONFIG_SAMPLES is not set | 1001 | # CONFIG_SAMPLES is not set |
1002 | CONFIG_HAVE_ARCH_KGDB=y | ||
940 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1003 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
941 | # CONFIG_DEBUG_STACK_USAGE is not set | 1004 | # CONFIG_DEBUG_STACK_USAGE is not set |
942 | # CONFIG_DEBUG_PAGEALLOC is not set | 1005 | # CONFIG_DEBUG_PAGEALLOC is not set |
943 | # CONFIG_DEBUGGER is not set | 1006 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
944 | # CONFIG_KGDB_CONSOLE is not set | 1007 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1008 | # CONFIG_XMON is not set | ||
945 | # CONFIG_IRQSTACKS is not set | 1009 | # CONFIG_IRQSTACKS is not set |
946 | CONFIG_BDI_SWITCH=y | 1010 | CONFIG_BDI_SWITCH=y |
1011 | # CONFIG_BOOTX_TEXT is not set | ||
947 | # CONFIG_PPC_EARLY_DEBUG is not set | 1012 | # CONFIG_PPC_EARLY_DEBUG is not set |
948 | 1013 | ||
949 | # | 1014 | # |
@@ -951,6 +1016,7 @@ CONFIG_BDI_SWITCH=y | |||
951 | # | 1016 | # |
952 | # CONFIG_KEYS is not set | 1017 | # CONFIG_KEYS is not set |
953 | # CONFIG_SECURITY is not set | 1018 | # CONFIG_SECURITY is not set |
1019 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
954 | CONFIG_CRYPTO=y | 1020 | CONFIG_CRYPTO=y |
955 | 1021 | ||
956 | # | 1022 | # |
@@ -991,6 +1057,10 @@ CONFIG_CRYPTO_PCBC=y | |||
991 | # CONFIG_CRYPTO_MD4 is not set | 1057 | # CONFIG_CRYPTO_MD4 is not set |
992 | CONFIG_CRYPTO_MD5=y | 1058 | CONFIG_CRYPTO_MD5=y |
993 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1059 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1060 | # CONFIG_CRYPTO_RMD128 is not set | ||
1061 | # CONFIG_CRYPTO_RMD160 is not set | ||
1062 | # CONFIG_CRYPTO_RMD256 is not set | ||
1063 | # CONFIG_CRYPTO_RMD320 is not set | ||
994 | # CONFIG_CRYPTO_SHA1 is not set | 1064 | # CONFIG_CRYPTO_SHA1 is not set |
995 | # CONFIG_CRYPTO_SHA256 is not set | 1065 | # CONFIG_CRYPTO_SHA256 is not set |
996 | # CONFIG_CRYPTO_SHA512 is not set | 1066 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1021,6 +1091,6 @@ CONFIG_CRYPTO_DES=y | |||
1021 | # CONFIG_CRYPTO_DEFLATE is not set | 1091 | # CONFIG_CRYPTO_DEFLATE is not set |
1022 | # CONFIG_CRYPTO_LZO is not set | 1092 | # CONFIG_CRYPTO_LZO is not set |
1023 | # CONFIG_CRYPTO_HW is not set | 1093 | # CONFIG_CRYPTO_HW is not set |
1024 | # CONFIG_PPC_CLOCK is not set | 1094 | CONFIG_PPC_CLOCK=y |
1025 | CONFIG_PPC_LIB_RHEAP=y | 1095 | CONFIG_PPC_LIB_RHEAP=y |
1026 | # CONFIG_VIRTUALIZATION is not set | 1096 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig index 4293c8be06e1..916e3df7cc45 100644 --- a/arch/powerpc/configs/mpc83xx_defconfig +++ b/arch/powerpc/configs/mpc83xx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:14 2008 | 4 | # Thu Aug 21 07:16:25 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -16,6 +16,7 @@ CONFIG_6xx=y | |||
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_FSL_EMB_PERFMON is not set | 18 | # CONFIG_FSL_EMB_PERFMON is not set |
19 | # CONFIG_ALTIVEC is not set | ||
19 | CONFIG_PPC_STD_MMU=y | 20 | CONFIG_PPC_STD_MMU=y |
20 | CONFIG_PPC_STD_MMU_32=y | 21 | CONFIG_PPC_STD_MMU_32=y |
21 | # CONFIG_PPC_MM_SLICES is not set | 22 | # CONFIG_PPC_MM_SLICES is not set |
@@ -32,12 +33,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
38 | CONFIG_GENERIC_HWEIGHT=y | 40 | CONFIG_GENERIC_HWEIGHT=y |
39 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 41 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
40 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 42 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
43 | CONFIG_GENERIC_GPIO=y | ||
41 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 44 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
42 | CONFIG_PPC=y | 45 | CONFIG_PPC=y |
43 | CONFIG_EARLY_PRINTK=y | 46 | CONFIG_EARLY_PRINTK=y |
@@ -51,6 +54,10 @@ CONFIG_PPC_UDBG_16550=y | |||
51 | CONFIG_AUDIT_ARCH=y | 54 | CONFIG_AUDIT_ARCH=y |
52 | CONFIG_GENERIC_BUG=y | 55 | CONFIG_GENERIC_BUG=y |
53 | CONFIG_DEFAULT_UIMAGE=y | 56 | CONFIG_DEFAULT_UIMAGE=y |
57 | CONFIG_REDBOOT=y | ||
58 | CONFIG_HIBERNATE_32=y | ||
59 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
60 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
54 | # CONFIG_PPC_DCR_NATIVE is not set | 61 | # CONFIG_PPC_DCR_NATIVE is not set |
55 | # CONFIG_PPC_DCR_MMIO is not set | 62 | # CONFIG_PPC_DCR_MMIO is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 63 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -88,13 +95,13 @@ CONFIG_INITRAMFS_SOURCE="" | |||
88 | CONFIG_SYSCTL=y | 95 | CONFIG_SYSCTL=y |
89 | CONFIG_EMBEDDED=y | 96 | CONFIG_EMBEDDED=y |
90 | CONFIG_SYSCTL_SYSCALL=y | 97 | CONFIG_SYSCTL_SYSCALL=y |
91 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
92 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
93 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
94 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
95 | CONFIG_PRINTK=y | 101 | CONFIG_PRINTK=y |
96 | CONFIG_BUG=y | 102 | CONFIG_BUG=y |
97 | CONFIG_ELF_CORE=y | 103 | CONFIG_ELF_CORE=y |
104 | CONFIG_PCSPKR_PLATFORM=y | ||
98 | CONFIG_COMPAT_BRK=y | 105 | CONFIG_COMPAT_BRK=y |
99 | CONFIG_BASE_FULL=y | 106 | CONFIG_BASE_FULL=y |
100 | CONFIG_FUTEX=y | 107 | CONFIG_FUTEX=y |
@@ -112,10 +119,16 @@ CONFIG_SLAB=y | |||
112 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
113 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
114 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
115 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
116 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
117 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
128 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
129 | # CONFIG_HAVE_CLK is not set | ||
118 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
119 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
120 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
121 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
@@ -126,12 +139,13 @@ CONFIG_MODULE_UNLOAD=y | |||
126 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 139 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
127 | # CONFIG_MODVERSIONS is not set | 140 | # CONFIG_MODVERSIONS is not set |
128 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 141 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
129 | # CONFIG_KMOD is not set | 142 | CONFIG_KMOD=y |
130 | CONFIG_BLOCK=y | 143 | CONFIG_BLOCK=y |
131 | # CONFIG_LBD is not set | 144 | # CONFIG_LBD is not set |
132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
133 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
134 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
135 | 149 | ||
136 | # | 150 | # |
137 | # IO Schedulers | 151 | # IO Schedulers |
@@ -150,40 +164,52 @@ CONFIG_CLASSIC_RCU=y | |||
150 | # | 164 | # |
151 | # Platform support | 165 | # Platform support |
152 | # | 166 | # |
153 | # CONFIG_PPC_MULTIPLATFORM is not set | 167 | CONFIG_PPC_MULTIPLATFORM=y |
154 | # CONFIG_PPC_82xx is not set | 168 | CONFIG_CLASSIC32=y |
155 | CONFIG_PPC_83xx=y | 169 | CONFIG_PPC_CHRP=y |
156 | # CONFIG_PPC_86xx is not set | 170 | # CONFIG_MPC5121_ADS is not set |
157 | # CONFIG_PPC_MPC512x is not set | 171 | # CONFIG_MPC5121_GENERIC is not set |
158 | # CONFIG_PPC_MPC5121 is not set | 172 | # CONFIG_PPC_MPC52xx is not set |
173 | CONFIG_PPC_PMAC=y | ||
159 | # CONFIG_PPC_CELL is not set | 174 | # CONFIG_PPC_CELL is not set |
160 | # CONFIG_PPC_CELL_NATIVE is not set | 175 | # CONFIG_PPC_CELL_NATIVE is not set |
176 | # CONFIG_PPC_82xx is not set | ||
161 | # CONFIG_PQ2ADS is not set | 177 | # CONFIG_PQ2ADS is not set |
162 | CONFIG_MPC83xx=y | 178 | CONFIG_PPC_83xx=y |
163 | CONFIG_MPC831x_RDB=y | 179 | CONFIG_MPC831x_RDB=y |
164 | CONFIG_MPC832x_MDS=y | 180 | CONFIG_MPC832x_MDS=y |
165 | CONFIG_MPC832x_RDB=y | 181 | CONFIG_MPC832x_RDB=y |
166 | CONFIG_MPC834x_MDS=y | 182 | CONFIG_MPC834x_MDS=y |
167 | CONFIG_MPC834x_ITX=y | 183 | CONFIG_MPC834x_ITX=y |
168 | CONFIG_MPC836x_MDS=y | 184 | CONFIG_MPC836x_MDS=y |
185 | CONFIG_MPC836x_RDK=y | ||
169 | CONFIG_MPC837x_MDS=y | 186 | CONFIG_MPC837x_MDS=y |
170 | CONFIG_MPC837x_RDB=y | 187 | CONFIG_MPC837x_RDB=y |
171 | CONFIG_SBC834x=y | 188 | CONFIG_SBC834x=y |
189 | CONFIG_ASP834x=y | ||
172 | CONFIG_PPC_MPC831x=y | 190 | CONFIG_PPC_MPC831x=y |
173 | CONFIG_PPC_MPC832x=y | 191 | CONFIG_PPC_MPC832x=y |
174 | CONFIG_PPC_MPC834x=y | 192 | CONFIG_PPC_MPC834x=y |
175 | CONFIG_PPC_MPC837x=y | 193 | CONFIG_PPC_MPC837x=y |
194 | # CONFIG_PPC_86xx is not set | ||
195 | # CONFIG_EMBEDDED6xx is not set | ||
196 | CONFIG_PPC_NATIVE=y | ||
197 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
176 | CONFIG_IPIC=y | 198 | CONFIG_IPIC=y |
177 | # CONFIG_MPIC is not set | 199 | CONFIG_MPIC=y |
178 | # CONFIG_MPIC_WEIRD is not set | 200 | # CONFIG_MPIC_WEIRD is not set |
179 | # CONFIG_PPC_I8259 is not set | 201 | CONFIG_PPC_I8259=y |
180 | # CONFIG_PPC_RTAS is not set | 202 | CONFIG_PPC_RTAS=y |
203 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
204 | CONFIG_RTAS_PROC=y | ||
181 | # CONFIG_MMIO_NVRAM is not set | 205 | # CONFIG_MMIO_NVRAM is not set |
182 | # CONFIG_PPC_MPC106 is not set | 206 | CONFIG_PPC_MPC106=y |
183 | # CONFIG_PPC_970_NAP is not set | 207 | # CONFIG_PPC_970_NAP is not set |
184 | # CONFIG_PPC_INDIRECT_IO is not set | 208 | # CONFIG_PPC_INDIRECT_IO is not set |
185 | # CONFIG_GENERIC_IOMAP is not set | 209 | # CONFIG_GENERIC_IOMAP is not set |
186 | # CONFIG_CPU_FREQ is not set | 210 | # CONFIG_CPU_FREQ is not set |
211 | # CONFIG_PPC601_SYNC_FIX is not set | ||
212 | # CONFIG_TAU is not set | ||
187 | CONFIG_QUICC_ENGINE=y | 213 | CONFIG_QUICC_ENGINE=y |
188 | # CONFIG_FSL_ULI1575 is not set | 214 | # CONFIG_FSL_ULI1575 is not set |
189 | 215 | ||
@@ -211,6 +237,7 @@ CONFIG_MATH_EMULATION=y | |||
211 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 237 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
212 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 238 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
213 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 239 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
240 | # CONFIG_KEXEC is not set | ||
214 | CONFIG_ARCH_FLATMEM_ENABLE=y | 241 | CONFIG_ARCH_FLATMEM_ENABLE=y |
215 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 242 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
216 | CONFIG_SELECT_MEMORY_MODEL=y | 243 | CONFIG_SELECT_MEMORY_MODEL=y |
@@ -223,6 +250,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
223 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 250 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
224 | CONFIG_PAGEFLAGS_EXTENDED=y | 251 | CONFIG_PAGEFLAGS_EXTENDED=y |
225 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 252 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
253 | CONFIG_MIGRATION=y | ||
226 | # CONFIG_RESOURCES_64BIT is not set | 254 | # CONFIG_RESOURCES_64BIT is not set |
227 | CONFIG_ZONE_DMA_FLAG=1 | 255 | CONFIG_ZONE_DMA_FLAG=1 |
228 | CONFIG_BOUNCE=y | 256 | CONFIG_BOUNCE=y |
@@ -230,6 +258,7 @@ CONFIG_VIRT_TO_BUS=y | |||
230 | CONFIG_FORCE_MAX_ZONEORDER=11 | 258 | CONFIG_FORCE_MAX_ZONEORDER=11 |
231 | CONFIG_PROC_DEVICETREE=y | 259 | CONFIG_PROC_DEVICETREE=y |
232 | # CONFIG_CMDLINE_BOOL is not set | 260 | # CONFIG_CMDLINE_BOOL is not set |
261 | CONFIG_EXTRA_TARGETS="" | ||
233 | # CONFIG_PM is not set | 262 | # CONFIG_PM is not set |
234 | CONFIG_SECCOMP=y | 263 | CONFIG_SECCOMP=y |
235 | CONFIG_ISA_DMA_API=y | 264 | CONFIG_ISA_DMA_API=y |
@@ -237,15 +266,24 @@ CONFIG_ISA_DMA_API=y | |||
237 | # | 266 | # |
238 | # Bus options | 267 | # Bus options |
239 | # | 268 | # |
269 | # CONFIG_ISA is not set | ||
240 | CONFIG_ZONE_DMA=y | 270 | CONFIG_ZONE_DMA=y |
241 | CONFIG_GENERIC_ISA_DMA=y | 271 | CONFIG_GENERIC_ISA_DMA=y |
242 | CONFIG_PPC_INDIRECT_PCI=y | 272 | CONFIG_PPC_INDIRECT_PCI=y |
243 | CONFIG_FSL_SOC=y | 273 | CONFIG_FSL_SOC=y |
244 | # CONFIG_PCI is not set | 274 | CONFIG_FSL_PCI=y |
245 | # CONFIG_PCI_DOMAINS is not set | 275 | CONFIG_FSL_LBC=y |
246 | # CONFIG_PCI_SYSCALL is not set | 276 | CONFIG_FSL_GTM=y |
247 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 277 | CONFIG_PPC_PCI_CHOICE=y |
278 | CONFIG_PCI=y | ||
279 | CONFIG_PCI_DOMAINS=y | ||
280 | CONFIG_PCI_SYSCALL=y | ||
281 | # CONFIG_PCIEPORTBUS is not set | ||
282 | CONFIG_ARCH_SUPPORTS_MSI=y | ||
283 | # CONFIG_PCI_MSI is not set | ||
284 | CONFIG_PCI_LEGACY=y | ||
248 | # CONFIG_PCCARD is not set | 285 | # CONFIG_PCCARD is not set |
286 | # CONFIG_HOTPLUG_PCI is not set | ||
249 | # CONFIG_HAS_RAPIDIO is not set | 287 | # CONFIG_HAS_RAPIDIO is not set |
250 | 288 | ||
251 | # | 289 | # |
@@ -261,10 +299,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
261 | CONFIG_KERNEL_START=0xc0000000 | 299 | CONFIG_KERNEL_START=0xc0000000 |
262 | CONFIG_PHYSICAL_START=0x00000000 | 300 | CONFIG_PHYSICAL_START=0x00000000 |
263 | CONFIG_TASK_SIZE=0xc0000000 | 301 | CONFIG_TASK_SIZE=0xc0000000 |
264 | |||
265 | # | ||
266 | # Networking | ||
267 | # | ||
268 | CONFIG_NET=y | 302 | CONFIG_NET=y |
269 | 303 | ||
270 | # | 304 | # |
@@ -412,11 +446,13 @@ CONFIG_MTD_CFI_UTIL=y | |||
412 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | 446 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set |
413 | # CONFIG_MTD_PHYSMAP is not set | 447 | # CONFIG_MTD_PHYSMAP is not set |
414 | CONFIG_MTD_PHYSMAP_OF=y | 448 | CONFIG_MTD_PHYSMAP_OF=y |
449 | # CONFIG_MTD_INTEL_VR_NOR is not set | ||
415 | # CONFIG_MTD_PLATRAM is not set | 450 | # CONFIG_MTD_PLATRAM is not set |
416 | 451 | ||
417 | # | 452 | # |
418 | # Self-contained MTD device drivers | 453 | # Self-contained MTD device drivers |
419 | # | 454 | # |
455 | # CONFIG_MTD_PMC551 is not set | ||
420 | # CONFIG_MTD_SLRAM is not set | 456 | # CONFIG_MTD_SLRAM is not set |
421 | # CONFIG_MTD_PHRAM is not set | 457 | # CONFIG_MTD_PHRAM is not set |
422 | # CONFIG_MTD_MTDRAM is not set | 458 | # CONFIG_MTD_MTDRAM is not set |
@@ -434,10 +470,12 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y | |||
434 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 470 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
435 | CONFIG_MTD_NAND_IDS=y | 471 | CONFIG_MTD_NAND_IDS=y |
436 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 472 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
473 | # CONFIG_MTD_NAND_CAFE is not set | ||
437 | # CONFIG_MTD_NAND_NANDSIM is not set | 474 | # CONFIG_MTD_NAND_NANDSIM is not set |
438 | # CONFIG_MTD_NAND_PLATFORM is not set | 475 | # CONFIG_MTD_NAND_PLATFORM is not set |
439 | # CONFIG_MTD_ALAUDA is not set | 476 | # CONFIG_MTD_ALAUDA is not set |
440 | CONFIG_MTD_NAND_FSL_ELBC=y | 477 | CONFIG_MTD_NAND_FSL_ELBC=y |
478 | # CONFIG_MTD_NAND_FSL_UPM is not set | ||
441 | # CONFIG_MTD_ONENAND is not set | 479 | # CONFIG_MTD_ONENAND is not set |
442 | 480 | ||
443 | # | 481 | # |
@@ -445,14 +483,21 @@ CONFIG_MTD_NAND_FSL_ELBC=y | |||
445 | # | 483 | # |
446 | # CONFIG_MTD_UBI is not set | 484 | # CONFIG_MTD_UBI is not set |
447 | CONFIG_OF_DEVICE=y | 485 | CONFIG_OF_DEVICE=y |
486 | CONFIG_OF_GPIO=y | ||
448 | CONFIG_OF_I2C=y | 487 | CONFIG_OF_I2C=y |
449 | # CONFIG_PARPORT is not set | 488 | # CONFIG_PARPORT is not set |
450 | CONFIG_BLK_DEV=y | 489 | CONFIG_BLK_DEV=y |
451 | # CONFIG_BLK_DEV_FD is not set | 490 | # CONFIG_BLK_DEV_FD is not set |
491 | # CONFIG_MAC_FLOPPY is not set | ||
492 | # CONFIG_BLK_CPQ_DA is not set | ||
493 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
494 | # CONFIG_BLK_DEV_DAC960 is not set | ||
495 | # CONFIG_BLK_DEV_UMEM is not set | ||
452 | # CONFIG_BLK_DEV_COW_COMMON is not set | 496 | # CONFIG_BLK_DEV_COW_COMMON is not set |
453 | CONFIG_BLK_DEV_LOOP=y | 497 | CONFIG_BLK_DEV_LOOP=y |
454 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 498 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
455 | # CONFIG_BLK_DEV_NBD is not set | 499 | # CONFIG_BLK_DEV_NBD is not set |
500 | # CONFIG_BLK_DEV_SX8 is not set | ||
456 | # CONFIG_BLK_DEV_UB is not set | 501 | # CONFIG_BLK_DEV_UB is not set |
457 | CONFIG_BLK_DEV_RAM=y | 502 | CONFIG_BLK_DEV_RAM=y |
458 | CONFIG_BLK_DEV_RAM_COUNT=16 | 503 | CONFIG_BLK_DEV_RAM_COUNT=16 |
@@ -460,9 +505,14 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 | |||
460 | # CONFIG_BLK_DEV_XIP is not set | 505 | # CONFIG_BLK_DEV_XIP is not set |
461 | # CONFIG_CDROM_PKTCDVD is not set | 506 | # CONFIG_CDROM_PKTCDVD is not set |
462 | # CONFIG_ATA_OVER_ETH is not set | 507 | # CONFIG_ATA_OVER_ETH is not set |
508 | # CONFIG_BLK_DEV_HD is not set | ||
463 | CONFIG_MISC_DEVICES=y | 509 | CONFIG_MISC_DEVICES=y |
510 | # CONFIG_PHANTOM is not set | ||
464 | # CONFIG_EEPROM_93CX6 is not set | 511 | # CONFIG_EEPROM_93CX6 is not set |
512 | # CONFIG_SGI_IOC4 is not set | ||
513 | # CONFIG_TIFM_CORE is not set | ||
465 | # CONFIG_ENCLOSURE_SERVICES is not set | 514 | # CONFIG_ENCLOSURE_SERVICES is not set |
515 | # CONFIG_HP_ILO is not set | ||
466 | CONFIG_HAVE_IDE=y | 516 | CONFIG_HAVE_IDE=y |
467 | # CONFIG_IDE is not set | 517 | # CONFIG_IDE is not set |
468 | 518 | ||
@@ -505,24 +555,128 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
505 | # CONFIG_SCSI_SRP_ATTRS is not set | 555 | # CONFIG_SCSI_SRP_ATTRS is not set |
506 | CONFIG_SCSI_LOWLEVEL=y | 556 | CONFIG_SCSI_LOWLEVEL=y |
507 | # CONFIG_ISCSI_TCP is not set | 557 | # CONFIG_ISCSI_TCP is not set |
558 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
559 | # CONFIG_SCSI_3W_9XXX is not set | ||
560 | # CONFIG_SCSI_ACARD is not set | ||
561 | # CONFIG_SCSI_AACRAID is not set | ||
562 | # CONFIG_SCSI_AIC7XXX is not set | ||
563 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
564 | # CONFIG_SCSI_AIC79XX is not set | ||
565 | # CONFIG_SCSI_AIC94XX is not set | ||
566 | # CONFIG_SCSI_DPT_I2O is not set | ||
567 | # CONFIG_SCSI_ADVANSYS is not set | ||
568 | # CONFIG_SCSI_ARCMSR is not set | ||
569 | # CONFIG_MEGARAID_NEWGEN is not set | ||
570 | # CONFIG_MEGARAID_LEGACY is not set | ||
571 | # CONFIG_MEGARAID_SAS is not set | ||
572 | # CONFIG_SCSI_HPTIOP is not set | ||
573 | # CONFIG_SCSI_BUSLOGIC is not set | ||
574 | # CONFIG_SCSI_DMX3191D is not set | ||
575 | # CONFIG_SCSI_EATA is not set | ||
576 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
577 | # CONFIG_SCSI_GDTH is not set | ||
578 | # CONFIG_SCSI_IPS is not set | ||
579 | # CONFIG_SCSI_INITIO is not set | ||
580 | # CONFIG_SCSI_INIA100 is not set | ||
581 | # CONFIG_SCSI_MVSAS is not set | ||
582 | # CONFIG_SCSI_STEX is not set | ||
583 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
584 | # CONFIG_SCSI_IPR is not set | ||
585 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
586 | # CONFIG_SCSI_QLA_FC is not set | ||
587 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
588 | # CONFIG_SCSI_LPFC is not set | ||
589 | # CONFIG_SCSI_DC395x is not set | ||
590 | # CONFIG_SCSI_DC390T is not set | ||
591 | # CONFIG_SCSI_NSP32 is not set | ||
508 | # CONFIG_SCSI_DEBUG is not set | 592 | # CONFIG_SCSI_DEBUG is not set |
593 | # CONFIG_SCSI_MESH is not set | ||
594 | # CONFIG_SCSI_MAC53C94 is not set | ||
595 | # CONFIG_SCSI_SRP is not set | ||
596 | # CONFIG_SCSI_DH is not set | ||
509 | CONFIG_ATA=y | 597 | CONFIG_ATA=y |
510 | # CONFIG_ATA_NONSTANDARD is not set | 598 | # CONFIG_ATA_NONSTANDARD is not set |
511 | CONFIG_SATA_PMP=y | 599 | CONFIG_SATA_PMP=y |
600 | # CONFIG_SATA_AHCI is not set | ||
601 | # CONFIG_SATA_SIL24 is not set | ||
512 | CONFIG_SATA_FSL=y | 602 | CONFIG_SATA_FSL=y |
513 | CONFIG_ATA_SFF=y | 603 | CONFIG_ATA_SFF=y |
604 | # CONFIG_SATA_SVW is not set | ||
605 | # CONFIG_ATA_PIIX is not set | ||
514 | # CONFIG_SATA_MV is not set | 606 | # CONFIG_SATA_MV is not set |
607 | # CONFIG_SATA_NV is not set | ||
608 | # CONFIG_PDC_ADMA is not set | ||
609 | # CONFIG_SATA_QSTOR is not set | ||
610 | # CONFIG_SATA_PROMISE is not set | ||
611 | # CONFIG_SATA_SX4 is not set | ||
612 | # CONFIG_SATA_SIL is not set | ||
613 | # CONFIG_SATA_SIS is not set | ||
614 | # CONFIG_SATA_ULI is not set | ||
615 | # CONFIG_SATA_VIA is not set | ||
616 | # CONFIG_SATA_VITESSE is not set | ||
617 | # CONFIG_SATA_INIC162X is not set | ||
618 | # CONFIG_PATA_ALI is not set | ||
619 | # CONFIG_PATA_AMD is not set | ||
620 | # CONFIG_PATA_ARTOP is not set | ||
621 | # CONFIG_PATA_ATIIXP is not set | ||
622 | # CONFIG_PATA_CMD640_PCI is not set | ||
623 | # CONFIG_PATA_CMD64X is not set | ||
624 | # CONFIG_PATA_CS5520 is not set | ||
625 | # CONFIG_PATA_CS5530 is not set | ||
626 | # CONFIG_PATA_CYPRESS is not set | ||
627 | # CONFIG_PATA_EFAR is not set | ||
628 | # CONFIG_ATA_GENERIC is not set | ||
629 | # CONFIG_PATA_HPT366 is not set | ||
630 | # CONFIG_PATA_HPT37X is not set | ||
631 | # CONFIG_PATA_HPT3X2N is not set | ||
632 | # CONFIG_PATA_HPT3X3 is not set | ||
633 | # CONFIG_PATA_IT821X is not set | ||
634 | # CONFIG_PATA_IT8213 is not set | ||
635 | # CONFIG_PATA_JMICRON is not set | ||
636 | # CONFIG_PATA_TRIFLEX is not set | ||
637 | # CONFIG_PATA_MARVELL is not set | ||
638 | # CONFIG_PATA_MPIIX is not set | ||
639 | # CONFIG_PATA_OLDPIIX is not set | ||
640 | # CONFIG_PATA_NETCELL is not set | ||
641 | # CONFIG_PATA_NINJA32 is not set | ||
642 | # CONFIG_PATA_NS87410 is not set | ||
643 | # CONFIG_PATA_NS87415 is not set | ||
644 | # CONFIG_PATA_OPTI is not set | ||
645 | # CONFIG_PATA_OPTIDMA is not set | ||
646 | # CONFIG_PATA_PDC_OLD is not set | ||
647 | # CONFIG_PATA_RADISYS is not set | ||
648 | # CONFIG_PATA_RZ1000 is not set | ||
649 | # CONFIG_PATA_SC1200 is not set | ||
650 | # CONFIG_PATA_SERVERWORKS is not set | ||
651 | # CONFIG_PATA_PDC2027X is not set | ||
652 | # CONFIG_PATA_SIL680 is not set | ||
653 | # CONFIG_PATA_SIS is not set | ||
654 | # CONFIG_PATA_VIA is not set | ||
655 | # CONFIG_PATA_WINBOND is not set | ||
515 | # CONFIG_PATA_PLATFORM is not set | 656 | # CONFIG_PATA_PLATFORM is not set |
657 | # CONFIG_PATA_SCH is not set | ||
516 | # CONFIG_MD is not set | 658 | # CONFIG_MD is not set |
659 | # CONFIG_FUSION is not set | ||
660 | |||
661 | # | ||
662 | # IEEE 1394 (FireWire) support | ||
663 | # | ||
664 | |||
665 | # | ||
666 | # Enable only one of the two stacks, unless you know what you are doing | ||
667 | # | ||
668 | # CONFIG_FIREWIRE is not set | ||
669 | # CONFIG_IEEE1394 is not set | ||
670 | # CONFIG_I2O is not set | ||
517 | # CONFIG_MACINTOSH_DRIVERS is not set | 671 | # CONFIG_MACINTOSH_DRIVERS is not set |
518 | CONFIG_NETDEVICES=y | 672 | CONFIG_NETDEVICES=y |
519 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
520 | # CONFIG_DUMMY is not set | 673 | # CONFIG_DUMMY is not set |
521 | # CONFIG_BONDING is not set | 674 | # CONFIG_BONDING is not set |
522 | # CONFIG_MACVLAN is not set | 675 | # CONFIG_MACVLAN is not set |
523 | # CONFIG_EQUALIZER is not set | 676 | # CONFIG_EQUALIZER is not set |
524 | # CONFIG_TUN is not set | 677 | # CONFIG_TUN is not set |
525 | # CONFIG_VETH is not set | 678 | # CONFIG_VETH is not set |
679 | # CONFIG_ARCNET is not set | ||
526 | CONFIG_PHYLIB=y | 680 | CONFIG_PHYLIB=y |
527 | 681 | ||
528 | # | 682 | # |
@@ -542,21 +696,60 @@ CONFIG_ICPLUS_PHY=y | |||
542 | # CONFIG_MDIO_BITBANG is not set | 696 | # CONFIG_MDIO_BITBANG is not set |
543 | CONFIG_NET_ETHERNET=y | 697 | CONFIG_NET_ETHERNET=y |
544 | CONFIG_MII=y | 698 | CONFIG_MII=y |
699 | # CONFIG_MACE is not set | ||
700 | # CONFIG_BMAC is not set | ||
701 | # CONFIG_HAPPYMEAL is not set | ||
702 | # CONFIG_SUNGEM is not set | ||
703 | # CONFIG_CASSINI is not set | ||
704 | # CONFIG_NET_VENDOR_3COM is not set | ||
705 | # CONFIG_NET_TULIP is not set | ||
706 | # CONFIG_HP100 is not set | ||
545 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | 707 | # CONFIG_IBM_NEW_EMAC_ZMII is not set |
546 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 708 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
547 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 709 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
548 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 710 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
711 | # CONFIG_NET_PCI is not set | ||
549 | # CONFIG_B44 is not set | 712 | # CONFIG_B44 is not set |
550 | CONFIG_NETDEV_1000=y | 713 | CONFIG_NETDEV_1000=y |
551 | # CONFIG_E1000E_ENABLED is not set | 714 | # CONFIG_ACENIC is not set |
715 | # CONFIG_DL2K is not set | ||
716 | # CONFIG_E1000 is not set | ||
717 | # CONFIG_E1000E is not set | ||
718 | # CONFIG_IP1000 is not set | ||
719 | # CONFIG_IGB is not set | ||
720 | # CONFIG_NS83820 is not set | ||
721 | # CONFIG_HAMACHI is not set | ||
722 | # CONFIG_YELLOWFIN is not set | ||
723 | # CONFIG_R8169 is not set | ||
724 | # CONFIG_SIS190 is not set | ||
725 | # CONFIG_SKGE is not set | ||
726 | # CONFIG_SKY2 is not set | ||
727 | # CONFIG_VIA_VELOCITY is not set | ||
728 | # CONFIG_TIGON3 is not set | ||
729 | # CONFIG_BNX2 is not set | ||
552 | CONFIG_GIANFAR=y | 730 | CONFIG_GIANFAR=y |
553 | # CONFIG_GFAR_NAPI is not set | ||
554 | CONFIG_UCC_GETH=y | 731 | CONFIG_UCC_GETH=y |
555 | # CONFIG_UGETH_NAPI is not set | ||
556 | # CONFIG_UGETH_MAGIC_PACKET is not set | 732 | # CONFIG_UGETH_MAGIC_PACKET is not set |
557 | # CONFIG_UGETH_FILTERING is not set | 733 | # CONFIG_UGETH_FILTERING is not set |
558 | # CONFIG_UGETH_TX_ON_DEMAND is not set | 734 | # CONFIG_UGETH_TX_ON_DEMAND is not set |
735 | # CONFIG_MV643XX_ETH is not set | ||
736 | # CONFIG_QLA3XXX is not set | ||
737 | # CONFIG_ATL1 is not set | ||
738 | # CONFIG_ATL1E is not set | ||
559 | CONFIG_NETDEV_10000=y | 739 | CONFIG_NETDEV_10000=y |
740 | # CONFIG_CHELSIO_T1 is not set | ||
741 | # CONFIG_CHELSIO_T3 is not set | ||
742 | # CONFIG_IXGBE is not set | ||
743 | # CONFIG_IXGB is not set | ||
744 | # CONFIG_S2IO is not set | ||
745 | # CONFIG_MYRI10GE is not set | ||
746 | # CONFIG_NETXEN_NIC is not set | ||
747 | # CONFIG_NIU is not set | ||
748 | # CONFIG_MLX4_CORE is not set | ||
749 | # CONFIG_TEHUTI is not set | ||
750 | # CONFIG_BNX2X is not set | ||
751 | # CONFIG_SFC is not set | ||
752 | # CONFIG_TR is not set | ||
560 | 753 | ||
561 | # | 754 | # |
562 | # Wireless LAN | 755 | # Wireless LAN |
@@ -574,8 +767,11 @@ CONFIG_NETDEV_10000=y | |||
574 | # CONFIG_USB_RTL8150 is not set | 767 | # CONFIG_USB_RTL8150 is not set |
575 | # CONFIG_USB_USBNET is not set | 768 | # CONFIG_USB_USBNET is not set |
576 | # CONFIG_WAN is not set | 769 | # CONFIG_WAN is not set |
770 | # CONFIG_FDDI is not set | ||
771 | # CONFIG_HIPPI is not set | ||
577 | # CONFIG_PPP is not set | 772 | # CONFIG_PPP is not set |
578 | # CONFIG_SLIP is not set | 773 | # CONFIG_SLIP is not set |
774 | # CONFIG_NET_FC is not set | ||
579 | # CONFIG_NETCONSOLE is not set | 775 | # CONFIG_NETCONSOLE is not set |
580 | # CONFIG_NETPOLL is not set | 776 | # CONFIG_NETPOLL is not set |
581 | # CONFIG_NET_POLL_CONTROLLER is not set | 777 | # CONFIG_NET_POLL_CONTROLLER is not set |
@@ -619,12 +815,14 @@ CONFIG_INPUT=y | |||
619 | # CONFIG_VT is not set | 815 | # CONFIG_VT is not set |
620 | CONFIG_DEVKMEM=y | 816 | CONFIG_DEVKMEM=y |
621 | # CONFIG_SERIAL_NONSTANDARD is not set | 817 | # CONFIG_SERIAL_NONSTANDARD is not set |
818 | # CONFIG_NOZOMI is not set | ||
622 | 819 | ||
623 | # | 820 | # |
624 | # Serial drivers | 821 | # Serial drivers |
625 | # | 822 | # |
626 | CONFIG_SERIAL_8250=y | 823 | CONFIG_SERIAL_8250=y |
627 | CONFIG_SERIAL_8250_CONSOLE=y | 824 | CONFIG_SERIAL_8250_CONSOLE=y |
825 | CONFIG_SERIAL_8250_PCI=y | ||
628 | CONFIG_SERIAL_8250_NR_UARTS=4 | 826 | CONFIG_SERIAL_8250_NR_UARTS=4 |
629 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 827 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
630 | # CONFIG_SERIAL_8250_EXTENDED is not set | 828 | # CONFIG_SERIAL_8250_EXTENDED is not set |
@@ -635,43 +833,95 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
635 | # CONFIG_SERIAL_UARTLITE is not set | 833 | # CONFIG_SERIAL_UARTLITE is not set |
636 | CONFIG_SERIAL_CORE=y | 834 | CONFIG_SERIAL_CORE=y |
637 | CONFIG_SERIAL_CORE_CONSOLE=y | 835 | CONFIG_SERIAL_CORE_CONSOLE=y |
836 | # CONFIG_SERIAL_PMACZILOG is not set | ||
837 | # CONFIG_SERIAL_JSM is not set | ||
638 | # CONFIG_SERIAL_OF_PLATFORM is not set | 838 | # CONFIG_SERIAL_OF_PLATFORM is not set |
639 | # CONFIG_SERIAL_QE is not set | 839 | # CONFIG_SERIAL_QE is not set |
640 | CONFIG_UNIX98_PTYS=y | 840 | CONFIG_UNIX98_PTYS=y |
641 | CONFIG_LEGACY_PTYS=y | 841 | CONFIG_LEGACY_PTYS=y |
642 | CONFIG_LEGACY_PTY_COUNT=256 | 842 | CONFIG_LEGACY_PTY_COUNT=256 |
843 | # CONFIG_BRIQ_PANEL is not set | ||
844 | # CONFIG_HVC_RTAS is not set | ||
643 | # CONFIG_IPMI_HANDLER is not set | 845 | # CONFIG_IPMI_HANDLER is not set |
644 | # CONFIG_HW_RANDOM is not set | 846 | CONFIG_HW_RANDOM=y |
645 | # CONFIG_NVRAM is not set | 847 | # CONFIG_NVRAM is not set |
646 | CONFIG_GEN_RTC=y | 848 | CONFIG_GEN_RTC=y |
647 | # CONFIG_GEN_RTC_X is not set | 849 | # CONFIG_GEN_RTC_X is not set |
648 | # CONFIG_R3964 is not set | 850 | # CONFIG_R3964 is not set |
851 | # CONFIG_APPLICOM is not set | ||
649 | # CONFIG_RAW_DRIVER is not set | 852 | # CONFIG_RAW_DRIVER is not set |
650 | # CONFIG_TCG_TPM is not set | 853 | # CONFIG_TCG_TPM is not set |
854 | CONFIG_DEVPORT=y | ||
651 | CONFIG_I2C=y | 855 | CONFIG_I2C=y |
652 | CONFIG_I2C_BOARDINFO=y | 856 | CONFIG_I2C_BOARDINFO=y |
653 | CONFIG_I2C_CHARDEV=y | 857 | CONFIG_I2C_CHARDEV=y |
858 | CONFIG_I2C_HELPER_AUTO=y | ||
654 | 859 | ||
655 | # | 860 | # |
656 | # I2C Hardware Bus support | 861 | # I2C Hardware Bus support |
657 | # | 862 | # |
863 | |||
864 | # | ||
865 | # PC SMBus host controller drivers | ||
866 | # | ||
867 | # CONFIG_I2C_ALI1535 is not set | ||
868 | # CONFIG_I2C_ALI1563 is not set | ||
869 | # CONFIG_I2C_ALI15X3 is not set | ||
870 | # CONFIG_I2C_AMD756 is not set | ||
871 | # CONFIG_I2C_AMD8111 is not set | ||
872 | # CONFIG_I2C_I801 is not set | ||
873 | # CONFIG_I2C_ISCH is not set | ||
874 | # CONFIG_I2C_PIIX4 is not set | ||
875 | # CONFIG_I2C_NFORCE2 is not set | ||
876 | # CONFIG_I2C_SIS5595 is not set | ||
877 | # CONFIG_I2C_SIS630 is not set | ||
878 | # CONFIG_I2C_SIS96X is not set | ||
879 | # CONFIG_I2C_VIA is not set | ||
880 | # CONFIG_I2C_VIAPRO is not set | ||
881 | |||
882 | # | ||
883 | # Mac SMBus host controller drivers | ||
884 | # | ||
885 | # CONFIG_I2C_HYDRA is not set | ||
886 | CONFIG_I2C_POWERMAC=y | ||
887 | |||
888 | # | ||
889 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
890 | # | ||
891 | # CONFIG_I2C_GPIO is not set | ||
658 | CONFIG_I2C_MPC=y | 892 | CONFIG_I2C_MPC=y |
659 | # CONFIG_I2C_OCORES is not set | 893 | # CONFIG_I2C_OCORES is not set |
660 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
661 | # CONFIG_I2C_SIMTEC is not set | 894 | # CONFIG_I2C_SIMTEC is not set |
895 | |||
896 | # | ||
897 | # External I2C/SMBus adapter drivers | ||
898 | # | ||
899 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
662 | # CONFIG_I2C_TAOS_EVM is not set | 900 | # CONFIG_I2C_TAOS_EVM is not set |
663 | # CONFIG_I2C_STUB is not set | ||
664 | # CONFIG_I2C_TINY_USB is not set | 901 | # CONFIG_I2C_TINY_USB is not set |
902 | |||
903 | # | ||
904 | # Graphics adapter I2C/DDC channel drivers | ||
905 | # | ||
906 | # CONFIG_I2C_VOODOO3 is not set | ||
907 | |||
908 | # | ||
909 | # Other I2C/SMBus bus drivers | ||
910 | # | ||
665 | # CONFIG_I2C_PCA_PLATFORM is not set | 911 | # CONFIG_I2C_PCA_PLATFORM is not set |
912 | # CONFIG_I2C_STUB is not set | ||
666 | 913 | ||
667 | # | 914 | # |
668 | # Miscellaneous I2C Chip support | 915 | # Miscellaneous I2C Chip support |
669 | # | 916 | # |
670 | # CONFIG_DS1682 is not set | 917 | # CONFIG_DS1682 is not set |
918 | # CONFIG_AT24 is not set | ||
671 | # CONFIG_SENSORS_EEPROM is not set | 919 | # CONFIG_SENSORS_EEPROM is not set |
672 | # CONFIG_SENSORS_PCF8574 is not set | 920 | # CONFIG_SENSORS_PCF8574 is not set |
673 | # CONFIG_PCF8575 is not set | 921 | # CONFIG_PCF8575 is not set |
922 | # CONFIG_SENSORS_PCA9539 is not set | ||
674 | # CONFIG_SENSORS_PCF8591 is not set | 923 | # CONFIG_SENSORS_PCF8591 is not set |
924 | # CONFIG_TPS65010 is not set | ||
675 | # CONFIG_SENSORS_MAX6875 is not set | 925 | # CONFIG_SENSORS_MAX6875 is not set |
676 | # CONFIG_SENSORS_TSL2550 is not set | 926 | # CONFIG_SENSORS_TSL2550 is not set |
677 | # CONFIG_I2C_DEBUG_CORE is not set | 927 | # CONFIG_I2C_DEBUG_CORE is not set |
@@ -679,10 +929,31 @@ CONFIG_I2C_MPC=y | |||
679 | # CONFIG_I2C_DEBUG_BUS is not set | 929 | # CONFIG_I2C_DEBUG_BUS is not set |
680 | # CONFIG_I2C_DEBUG_CHIP is not set | 930 | # CONFIG_I2C_DEBUG_CHIP is not set |
681 | # CONFIG_SPI is not set | 931 | # CONFIG_SPI is not set |
932 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
933 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
934 | CONFIG_GPIOLIB=y | ||
935 | # CONFIG_GPIO_SYSFS is not set | ||
936 | |||
937 | # | ||
938 | # I2C GPIO expanders: | ||
939 | # | ||
940 | # CONFIG_GPIO_MAX732X is not set | ||
941 | # CONFIG_GPIO_PCA953X is not set | ||
942 | # CONFIG_GPIO_PCF857X is not set | ||
943 | |||
944 | # | ||
945 | # PCI GPIO expanders: | ||
946 | # | ||
947 | # CONFIG_GPIO_BT8XX is not set | ||
948 | |||
949 | # | ||
950 | # SPI GPIO expanders: | ||
951 | # | ||
682 | # CONFIG_W1 is not set | 952 | # CONFIG_W1 is not set |
683 | # CONFIG_POWER_SUPPLY is not set | 953 | # CONFIG_POWER_SUPPLY is not set |
684 | CONFIG_HWMON=y | 954 | CONFIG_HWMON=y |
685 | # CONFIG_HWMON_VID is not set | 955 | # CONFIG_HWMON_VID is not set |
956 | # CONFIG_SENSORS_AD7414 is not set | ||
686 | # CONFIG_SENSORS_AD7418 is not set | 957 | # CONFIG_SENSORS_AD7418 is not set |
687 | # CONFIG_SENSORS_ADM1021 is not set | 958 | # CONFIG_SENSORS_ADM1021 is not set |
688 | # CONFIG_SENSORS_ADM1025 is not set | 959 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -692,8 +963,10 @@ CONFIG_HWMON=y | |||
692 | # CONFIG_SENSORS_ADM9240 is not set | 963 | # CONFIG_SENSORS_ADM9240 is not set |
693 | # CONFIG_SENSORS_ADT7470 is not set | 964 | # CONFIG_SENSORS_ADT7470 is not set |
694 | # CONFIG_SENSORS_ADT7473 is not set | 965 | # CONFIG_SENSORS_ADT7473 is not set |
966 | # CONFIG_SENSORS_AMS is not set | ||
695 | # CONFIG_SENSORS_ATXP1 is not set | 967 | # CONFIG_SENSORS_ATXP1 is not set |
696 | # CONFIG_SENSORS_DS1621 is not set | 968 | # CONFIG_SENSORS_DS1621 is not set |
969 | # CONFIG_SENSORS_I5K_AMB is not set | ||
697 | # CONFIG_SENSORS_F71805F is not set | 970 | # CONFIG_SENSORS_F71805F is not set |
698 | # CONFIG_SENSORS_F71882FG is not set | 971 | # CONFIG_SENSORS_F71882FG is not set |
699 | # CONFIG_SENSORS_F75375S is not set | 972 | # CONFIG_SENSORS_F75375S is not set |
@@ -715,13 +988,16 @@ CONFIG_HWMON=y | |||
715 | # CONFIG_SENSORS_MAX6650 is not set | 988 | # CONFIG_SENSORS_MAX6650 is not set |
716 | # CONFIG_SENSORS_PC87360 is not set | 989 | # CONFIG_SENSORS_PC87360 is not set |
717 | # CONFIG_SENSORS_PC87427 is not set | 990 | # CONFIG_SENSORS_PC87427 is not set |
991 | # CONFIG_SENSORS_SIS5595 is not set | ||
718 | # CONFIG_SENSORS_DME1737 is not set | 992 | # CONFIG_SENSORS_DME1737 is not set |
719 | # CONFIG_SENSORS_SMSC47M1 is not set | 993 | # CONFIG_SENSORS_SMSC47M1 is not set |
720 | # CONFIG_SENSORS_SMSC47M192 is not set | 994 | # CONFIG_SENSORS_SMSC47M192 is not set |
721 | # CONFIG_SENSORS_SMSC47B397 is not set | 995 | # CONFIG_SENSORS_SMSC47B397 is not set |
722 | # CONFIG_SENSORS_ADS7828 is not set | 996 | # CONFIG_SENSORS_ADS7828 is not set |
723 | # CONFIG_SENSORS_THMC50 is not set | 997 | # CONFIG_SENSORS_THMC50 is not set |
998 | # CONFIG_SENSORS_VIA686A is not set | ||
724 | # CONFIG_SENSORS_VT1211 is not set | 999 | # CONFIG_SENSORS_VT1211 is not set |
1000 | # CONFIG_SENSORS_VT8231 is not set | ||
725 | # CONFIG_SENSORS_W83781D is not set | 1001 | # CONFIG_SENSORS_W83781D is not set |
726 | # CONFIG_SENSORS_W83791D is not set | 1002 | # CONFIG_SENSORS_W83791D is not set |
727 | # CONFIG_SENSORS_W83792D is not set | 1003 | # CONFIG_SENSORS_W83792D is not set |
@@ -732,6 +1008,7 @@ CONFIG_HWMON=y | |||
732 | # CONFIG_SENSORS_W83627EHF is not set | 1008 | # CONFIG_SENSORS_W83627EHF is not set |
733 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1009 | # CONFIG_HWMON_DEBUG_CHIP is not set |
734 | # CONFIG_THERMAL is not set | 1010 | # CONFIG_THERMAL is not set |
1011 | # CONFIG_THERMAL_HWMON is not set | ||
735 | CONFIG_WATCHDOG=y | 1012 | CONFIG_WATCHDOG=y |
736 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1013 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
737 | 1014 | ||
@@ -739,7 +1016,15 @@ CONFIG_WATCHDOG=y | |||
739 | # Watchdog Device Drivers | 1016 | # Watchdog Device Drivers |
740 | # | 1017 | # |
741 | # CONFIG_SOFT_WATCHDOG is not set | 1018 | # CONFIG_SOFT_WATCHDOG is not set |
742 | CONFIG_83xx_WDT=y | 1019 | # CONFIG_ALIM7101_WDT is not set |
1020 | # CONFIG_8xxx_WDT is not set | ||
1021 | # CONFIG_WATCHDOG_RTAS is not set | ||
1022 | |||
1023 | # | ||
1024 | # PCI-based Watchdog Cards | ||
1025 | # | ||
1026 | # CONFIG_PCIPCWATCHDOG is not set | ||
1027 | # CONFIG_WDTPCI is not set | ||
743 | 1028 | ||
744 | # | 1029 | # |
745 | # USB-based Watchdog Cards | 1030 | # USB-based Watchdog Cards |
@@ -755,8 +1040,10 @@ CONFIG_SSB_POSSIBLE=y | |||
755 | # | 1040 | # |
756 | # Multifunction device drivers | 1041 | # Multifunction device drivers |
757 | # | 1042 | # |
1043 | # CONFIG_MFD_CORE is not set | ||
758 | # CONFIG_MFD_SM501 is not set | 1044 | # CONFIG_MFD_SM501 is not set |
759 | # CONFIG_HTC_PASIC3 is not set | 1045 | # CONFIG_HTC_PASIC3 is not set |
1046 | # CONFIG_MFD_TMIO is not set | ||
760 | 1047 | ||
761 | # | 1048 | # |
762 | # Multimedia devices | 1049 | # Multimedia devices |
@@ -778,6 +1065,8 @@ CONFIG_DAB=y | |||
778 | # | 1065 | # |
779 | # Graphics support | 1066 | # Graphics support |
780 | # | 1067 | # |
1068 | # CONFIG_AGP is not set | ||
1069 | # CONFIG_DRM is not set | ||
781 | # CONFIG_VGASTATE is not set | 1070 | # CONFIG_VGASTATE is not set |
782 | CONFIG_VIDEO_OUTPUT_CONTROL=m | 1071 | CONFIG_VIDEO_OUTPUT_CONTROL=m |
783 | # CONFIG_FB is not set | 1072 | # CONFIG_FB is not set |
@@ -787,10 +1076,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
787 | # Display device support | 1076 | # Display device support |
788 | # | 1077 | # |
789 | # CONFIG_DISPLAY_SUPPORT is not set | 1078 | # CONFIG_DISPLAY_SUPPORT is not set |
790 | |||
791 | # | ||
792 | # Sound | ||
793 | # | ||
794 | # CONFIG_SOUND is not set | 1079 | # CONFIG_SOUND is not set |
795 | CONFIG_HID_SUPPORT=y | 1080 | CONFIG_HID_SUPPORT=y |
796 | CONFIG_HID=y | 1081 | CONFIG_HID=y |
@@ -806,7 +1091,7 @@ CONFIG_USB_HID=y | |||
806 | # CONFIG_USB_HIDDEV is not set | 1091 | # CONFIG_USB_HIDDEV is not set |
807 | CONFIG_USB_SUPPORT=y | 1092 | CONFIG_USB_SUPPORT=y |
808 | CONFIG_USB_ARCH_HAS_HCD=y | 1093 | CONFIG_USB_ARCH_HAS_HCD=y |
809 | # CONFIG_USB_ARCH_HAS_OHCI is not set | 1094 | CONFIG_USB_ARCH_HAS_OHCI=y |
810 | CONFIG_USB_ARCH_HAS_EHCI=y | 1095 | CONFIG_USB_ARCH_HAS_EHCI=y |
811 | CONFIG_USB=y | 1096 | CONFIG_USB=y |
812 | # CONFIG_USB_DEBUG is not set | 1097 | # CONFIG_USB_DEBUG is not set |
@@ -821,6 +1106,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
821 | # CONFIG_USB_OTG is not set | 1106 | # CONFIG_USB_OTG is not set |
822 | # CONFIG_USB_OTG_WHITELIST is not set | 1107 | # CONFIG_USB_OTG_WHITELIST is not set |
823 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1108 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1109 | CONFIG_USB_MON=y | ||
824 | 1110 | ||
825 | # | 1111 | # |
826 | # USB Host Controller Drivers | 1112 | # USB Host Controller Drivers |
@@ -833,6 +1119,8 @@ CONFIG_USB_EHCI_FSL=y | |||
833 | CONFIG_USB_EHCI_HCD_PPC_OF=y | 1119 | CONFIG_USB_EHCI_HCD_PPC_OF=y |
834 | # CONFIG_USB_ISP116X_HCD is not set | 1120 | # CONFIG_USB_ISP116X_HCD is not set |
835 | # CONFIG_USB_ISP1760_HCD is not set | 1121 | # CONFIG_USB_ISP1760_HCD is not set |
1122 | # CONFIG_USB_OHCI_HCD is not set | ||
1123 | # CONFIG_USB_UHCI_HCD is not set | ||
836 | # CONFIG_USB_SL811_HCD is not set | 1124 | # CONFIG_USB_SL811_HCD is not set |
837 | # CONFIG_USB_R8A66597_HCD is not set | 1125 | # CONFIG_USB_R8A66597_HCD is not set |
838 | 1126 | ||
@@ -858,7 +1146,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y | |||
858 | # | 1146 | # |
859 | # CONFIG_USB_MDC800 is not set | 1147 | # CONFIG_USB_MDC800 is not set |
860 | # CONFIG_USB_MICROTEK is not set | 1148 | # CONFIG_USB_MICROTEK is not set |
861 | CONFIG_USB_MON=y | ||
862 | 1149 | ||
863 | # | 1150 | # |
864 | # USB port drivers | 1151 | # USB port drivers |
@@ -871,7 +1158,6 @@ CONFIG_USB_MON=y | |||
871 | # CONFIG_USB_EMI62 is not set | 1158 | # CONFIG_USB_EMI62 is not set |
872 | # CONFIG_USB_EMI26 is not set | 1159 | # CONFIG_USB_EMI26 is not set |
873 | # CONFIG_USB_ADUTUX is not set | 1160 | # CONFIG_USB_ADUTUX is not set |
874 | # CONFIG_USB_AUERSWALD is not set | ||
875 | # CONFIG_USB_RIO500 is not set | 1161 | # CONFIG_USB_RIO500 is not set |
876 | # CONFIG_USB_LEGOTOWER is not set | 1162 | # CONFIG_USB_LEGOTOWER is not set |
877 | # CONFIG_USB_LCD is not set | 1163 | # CONFIG_USB_LCD is not set |
@@ -893,6 +1179,7 @@ CONFIG_USB_MON=y | |||
893 | # CONFIG_MEMSTICK is not set | 1179 | # CONFIG_MEMSTICK is not set |
894 | # CONFIG_NEW_LEDS is not set | 1180 | # CONFIG_NEW_LEDS is not set |
895 | # CONFIG_ACCESSIBILITY is not set | 1181 | # CONFIG_ACCESSIBILITY is not set |
1182 | # CONFIG_INFINIBAND is not set | ||
896 | # CONFIG_EDAC is not set | 1183 | # CONFIG_EDAC is not set |
897 | # CONFIG_RTC_CLASS is not set | 1184 | # CONFIG_RTC_CLASS is not set |
898 | # CONFIG_DMADEVICES is not set | 1185 | # CONFIG_DMADEVICES is not set |
@@ -963,6 +1250,7 @@ CONFIG_TMPFS=y | |||
963 | # CONFIG_CRAMFS is not set | 1250 | # CONFIG_CRAMFS is not set |
964 | # CONFIG_VXFS_FS is not set | 1251 | # CONFIG_VXFS_FS is not set |
965 | # CONFIG_MINIX_FS is not set | 1252 | # CONFIG_MINIX_FS is not set |
1253 | # CONFIG_OMFS_FS is not set | ||
966 | # CONFIG_HPFS_FS is not set | 1254 | # CONFIG_HPFS_FS is not set |
967 | # CONFIG_QNX4FS_FS is not set | 1255 | # CONFIG_QNX4FS_FS is not set |
968 | # CONFIG_ROMFS_FS is not set | 1256 | # CONFIG_ROMFS_FS is not set |
@@ -973,14 +1261,13 @@ CONFIG_NFS_FS=y | |||
973 | CONFIG_NFS_V3=y | 1261 | CONFIG_NFS_V3=y |
974 | # CONFIG_NFS_V3_ACL is not set | 1262 | # CONFIG_NFS_V3_ACL is not set |
975 | CONFIG_NFS_V4=y | 1263 | CONFIG_NFS_V4=y |
976 | # CONFIG_NFSD is not set | ||
977 | CONFIG_ROOT_NFS=y | 1264 | CONFIG_ROOT_NFS=y |
1265 | # CONFIG_NFSD is not set | ||
978 | CONFIG_LOCKD=y | 1266 | CONFIG_LOCKD=y |
979 | CONFIG_LOCKD_V4=y | 1267 | CONFIG_LOCKD_V4=y |
980 | CONFIG_NFS_COMMON=y | 1268 | CONFIG_NFS_COMMON=y |
981 | CONFIG_SUNRPC=y | 1269 | CONFIG_SUNRPC=y |
982 | CONFIG_SUNRPC_GSS=y | 1270 | CONFIG_SUNRPC_GSS=y |
983 | # CONFIG_SUNRPC_BIND34 is not set | ||
984 | CONFIG_RPCSEC_GSS_KRB5=y | 1271 | CONFIG_RPCSEC_GSS_KRB5=y |
985 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1272 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
986 | # CONFIG_SMB_FS is not set | 1273 | # CONFIG_SMB_FS is not set |
@@ -1014,6 +1301,7 @@ CONFIG_MSDOS_PARTITION=y | |||
1014 | # CONFIG_DLM is not set | 1301 | # CONFIG_DLM is not set |
1015 | CONFIG_UCC_FAST=y | 1302 | CONFIG_UCC_FAST=y |
1016 | CONFIG_UCC=y | 1303 | CONFIG_UCC=y |
1304 | CONFIG_QE_GPIO=y | ||
1017 | 1305 | ||
1018 | # | 1306 | # |
1019 | # Library routines | 1307 | # Library routines |
@@ -1022,6 +1310,7 @@ CONFIG_BITREVERSE=y | |||
1022 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1310 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1023 | # CONFIG_CRC_CCITT is not set | 1311 | # CONFIG_CRC_CCITT is not set |
1024 | # CONFIG_CRC16 is not set | 1312 | # CONFIG_CRC16 is not set |
1313 | CONFIG_CRC_T10DIF=y | ||
1025 | # CONFIG_CRC_ITU_T is not set | 1314 | # CONFIG_CRC_ITU_T is not set |
1026 | CONFIG_CRC32=y | 1315 | CONFIG_CRC32=y |
1027 | # CONFIG_CRC7 is not set | 1316 | # CONFIG_CRC7 is not set |
@@ -1045,8 +1334,18 @@ CONFIG_FRAME_WARN=1024 | |||
1045 | # CONFIG_HEADERS_CHECK is not set | 1334 | # CONFIG_HEADERS_CHECK is not set |
1046 | # CONFIG_DEBUG_KERNEL is not set | 1335 | # CONFIG_DEBUG_KERNEL is not set |
1047 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1336 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1337 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1338 | # CONFIG_LATENCYTOP is not set | ||
1339 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1340 | CONFIG_HAVE_FTRACE=y | ||
1341 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1342 | # CONFIG_FTRACE is not set | ||
1343 | # CONFIG_SCHED_TRACER is not set | ||
1344 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1048 | # CONFIG_SAMPLES is not set | 1345 | # CONFIG_SAMPLES is not set |
1346 | CONFIG_HAVE_ARCH_KGDB=y | ||
1049 | # CONFIG_IRQSTACKS is not set | 1347 | # CONFIG_IRQSTACKS is not set |
1348 | # CONFIG_BOOTX_TEXT is not set | ||
1050 | # CONFIG_PPC_EARLY_DEBUG is not set | 1349 | # CONFIG_PPC_EARLY_DEBUG is not set |
1051 | 1350 | ||
1052 | # | 1351 | # |
@@ -1061,12 +1360,14 @@ CONFIG_CRYPTO=y | |||
1061 | # Crypto core or helper | 1360 | # Crypto core or helper |
1062 | # | 1361 | # |
1063 | CONFIG_CRYPTO_ALGAPI=y | 1362 | CONFIG_CRYPTO_ALGAPI=y |
1363 | CONFIG_CRYPTO_AEAD=y | ||
1064 | CONFIG_CRYPTO_BLKCIPHER=y | 1364 | CONFIG_CRYPTO_BLKCIPHER=y |
1365 | CONFIG_CRYPTO_HASH=y | ||
1065 | CONFIG_CRYPTO_MANAGER=y | 1366 | CONFIG_CRYPTO_MANAGER=y |
1066 | # CONFIG_CRYPTO_GF128MUL is not set | 1367 | # CONFIG_CRYPTO_GF128MUL is not set |
1067 | # CONFIG_CRYPTO_NULL is not set | 1368 | # CONFIG_CRYPTO_NULL is not set |
1068 | # CONFIG_CRYPTO_CRYPTD is not set | 1369 | # CONFIG_CRYPTO_CRYPTD is not set |
1069 | # CONFIG_CRYPTO_AUTHENC is not set | 1370 | CONFIG_CRYPTO_AUTHENC=y |
1070 | # CONFIG_CRYPTO_TEST is not set | 1371 | # CONFIG_CRYPTO_TEST is not set |
1071 | 1372 | ||
1072 | # | 1373 | # |
@@ -1100,6 +1401,10 @@ CONFIG_CRYPTO_PCBC=m | |||
1100 | # CONFIG_CRYPTO_MD4 is not set | 1401 | # CONFIG_CRYPTO_MD4 is not set |
1101 | CONFIG_CRYPTO_MD5=y | 1402 | CONFIG_CRYPTO_MD5=y |
1102 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1403 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1404 | # CONFIG_CRYPTO_RMD128 is not set | ||
1405 | # CONFIG_CRYPTO_RMD160 is not set | ||
1406 | # CONFIG_CRYPTO_RMD256 is not set | ||
1407 | # CONFIG_CRYPTO_RMD320 is not set | ||
1103 | # CONFIG_CRYPTO_SHA1 is not set | 1408 | # CONFIG_CRYPTO_SHA1 is not set |
1104 | # CONFIG_CRYPTO_SHA256 is not set | 1409 | # CONFIG_CRYPTO_SHA256 is not set |
1105 | # CONFIG_CRYPTO_SHA512 is not set | 1410 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1131,6 +1436,8 @@ CONFIG_CRYPTO_DES=y | |||
1131 | # CONFIG_CRYPTO_DEFLATE is not set | 1436 | # CONFIG_CRYPTO_DEFLATE is not set |
1132 | # CONFIG_CRYPTO_LZO is not set | 1437 | # CONFIG_CRYPTO_LZO is not set |
1133 | CONFIG_CRYPTO_HW=y | 1438 | CONFIG_CRYPTO_HW=y |
1439 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
1440 | CONFIG_CRYPTO_DEV_TALITOS=y | ||
1134 | # CONFIG_PPC_CLOCK is not set | 1441 | # CONFIG_PPC_CLOCK is not set |
1135 | CONFIG_PPC_LIB_RHEAP=y | 1442 | CONFIG_PPC_LIB_RHEAP=y |
1136 | # CONFIG_VIRTUALIZATION is not set | 1443 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index fa0170504b88..f0a13bebf50c 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 09:03:46 2008 | 4 | # Thu Aug 21 07:15:20 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_PPC_85xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_E500=y | 17 | CONFIG_E500=y |
18 | # CONFIG_PPC_E500MC is not set | ||
18 | CONFIG_BOOKE=y | 19 | CONFIG_BOOKE=y |
19 | CONFIG_FSL_BOOKE=y | 20 | CONFIG_FSL_BOOKE=y |
20 | CONFIG_FSL_EMB_PERFMON=y | 21 | CONFIG_FSL_EMB_PERFMON=y |
@@ -33,12 +34,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
39 | CONFIG_GENERIC_HWEIGHT=y | 41 | CONFIG_GENERIC_HWEIGHT=y |
40 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 42 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
41 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 43 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
44 | CONFIG_GENERIC_GPIO=y | ||
42 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 45 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
43 | CONFIG_PPC=y | 46 | CONFIG_PPC=y |
44 | CONFIG_EARLY_PRINTK=y | 47 | CONFIG_EARLY_PRINTK=y |
@@ -92,7 +95,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
92 | CONFIG_SYSCTL=y | 95 | CONFIG_SYSCTL=y |
93 | CONFIG_EMBEDDED=y | 96 | CONFIG_EMBEDDED=y |
94 | CONFIG_SYSCTL_SYSCALL=y | 97 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
96 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
97 | CONFIG_KALLSYMS_ALL=y | 99 | CONFIG_KALLSYMS_ALL=y |
98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 100 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -118,10 +120,16 @@ CONFIG_SLUB=y | |||
118 | # CONFIG_MARKERS is not set | 120 | # CONFIG_MARKERS is not set |
119 | CONFIG_HAVE_OPROFILE=y | 121 | CONFIG_HAVE_OPROFILE=y |
120 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
124 | CONFIG_HAVE_IOREMAP_PROT=y | ||
121 | CONFIG_HAVE_KPROBES=y | 125 | CONFIG_HAVE_KPROBES=y |
122 | CONFIG_HAVE_KRETPROBES=y | 126 | CONFIG_HAVE_KRETPROBES=y |
127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
123 | # CONFIG_HAVE_DMA_ATTRS is not set | 128 | # CONFIG_HAVE_DMA_ATTRS is not set |
129 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
130 | CONFIG_HAVE_CLK=y | ||
124 | CONFIG_PROC_PAGE_MONITOR=y | 131 | CONFIG_PROC_PAGE_MONITOR=y |
132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
125 | CONFIG_SLABINFO=y | 133 | CONFIG_SLABINFO=y |
126 | CONFIG_RT_MUTEXES=y | 134 | CONFIG_RT_MUTEXES=y |
127 | # CONFIG_TINY_SHMEM is not set | 135 | # CONFIG_TINY_SHMEM is not set |
@@ -138,6 +146,7 @@ CONFIG_LBD=y | |||
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 146 | # CONFIG_BLK_DEV_IO_TRACE is not set |
139 | # CONFIG_LSF is not set | 147 | # CONFIG_LSF is not set |
140 | # CONFIG_BLK_DEV_BSG is not set | 148 | # CONFIG_BLK_DEV_BSG is not set |
149 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
141 | 150 | ||
142 | # | 151 | # |
143 | # IO Schedulers | 152 | # IO Schedulers |
@@ -156,8 +165,6 @@ CONFIG_CLASSIC_RCU=y | |||
156 | # | 165 | # |
157 | # Platform support | 166 | # Platform support |
158 | # | 167 | # |
159 | # CONFIG_PPC_MPC512x is not set | ||
160 | # CONFIG_PPC_MPC5121 is not set | ||
161 | # CONFIG_PPC_CELL is not set | 168 | # CONFIG_PPC_CELL is not set |
162 | # CONFIG_PPC_CELL_NATIVE is not set | 169 | # CONFIG_PPC_CELL_NATIVE is not set |
163 | # CONFIG_PQ2ADS is not set | 170 | # CONFIG_PQ2ADS is not set |
@@ -166,11 +173,13 @@ CONFIG_MPC8540_ADS=y | |||
166 | CONFIG_MPC8560_ADS=y | 173 | CONFIG_MPC8560_ADS=y |
167 | CONFIG_MPC85xx_CDS=y | 174 | CONFIG_MPC85xx_CDS=y |
168 | CONFIG_MPC85xx_MDS=y | 175 | CONFIG_MPC85xx_MDS=y |
176 | CONFIG_MPC8536_DS=y | ||
169 | CONFIG_MPC85xx_DS=y | 177 | CONFIG_MPC85xx_DS=y |
170 | CONFIG_KSI8560=y | 178 | CONFIG_KSI8560=y |
171 | # CONFIG_STX_GP3 is not set | 179 | # CONFIG_STX_GP3 is not set |
172 | CONFIG_TQM8540=y | 180 | CONFIG_TQM8540=y |
173 | CONFIG_TQM8541=y | 181 | CONFIG_TQM8541=y |
182 | CONFIG_TQM8548=y | ||
174 | CONFIG_TQM8555=y | 183 | CONFIG_TQM8555=y |
175 | CONFIG_TQM8560=y | 184 | CONFIG_TQM8560=y |
176 | CONFIG_SBC8548=y | 185 | CONFIG_SBC8548=y |
@@ -189,7 +198,6 @@ CONFIG_PPC_I8259=y | |||
189 | # CONFIG_CPU_FREQ is not set | 198 | # CONFIG_CPU_FREQ is not set |
190 | CONFIG_QUICC_ENGINE=y | 199 | CONFIG_QUICC_ENGINE=y |
191 | CONFIG_CPM2=y | 200 | CONFIG_CPM2=y |
192 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
193 | CONFIG_FSL_ULI1575=y | 201 | CONFIG_FSL_ULI1575=y |
194 | CONFIG_CPM=y | 202 | CONFIG_CPM=y |
195 | 203 | ||
@@ -206,7 +214,7 @@ CONFIG_HZ_250=y | |||
206 | # CONFIG_HZ_300 is not set | 214 | # CONFIG_HZ_300 is not set |
207 | # CONFIG_HZ_1000 is not set | 215 | # CONFIG_HZ_1000 is not set |
208 | CONFIG_HZ=250 | 216 | CONFIG_HZ=250 |
209 | # CONFIG_SCHED_HRTICK is not set | 217 | CONFIG_SCHED_HRTICK=y |
210 | CONFIG_PREEMPT_NONE=y | 218 | CONFIG_PREEMPT_NONE=y |
211 | # CONFIG_PREEMPT_VOLUNTARY is not set | 219 | # CONFIG_PREEMPT_VOLUNTARY is not set |
212 | # CONFIG_PREEMPT is not set | 220 | # CONFIG_PREEMPT is not set |
@@ -229,6 +237,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
229 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 237 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
230 | CONFIG_PAGEFLAGS_EXTENDED=y | 238 | CONFIG_PAGEFLAGS_EXTENDED=y |
231 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 239 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
240 | CONFIG_MIGRATION=y | ||
232 | # CONFIG_RESOURCES_64BIT is not set | 241 | # CONFIG_RESOURCES_64BIT is not set |
233 | CONFIG_ZONE_DMA_FLAG=1 | 242 | CONFIG_ZONE_DMA_FLAG=1 |
234 | CONFIG_BOUNCE=y | 243 | CONFIG_BOUNCE=y |
@@ -236,6 +245,7 @@ CONFIG_VIRT_TO_BUS=y | |||
236 | CONFIG_FORCE_MAX_ZONEORDER=11 | 245 | CONFIG_FORCE_MAX_ZONEORDER=11 |
237 | CONFIG_PROC_DEVICETREE=y | 246 | CONFIG_PROC_DEVICETREE=y |
238 | # CONFIG_CMDLINE_BOOL is not set | 247 | # CONFIG_CMDLINE_BOOL is not set |
248 | CONFIG_EXTRA_TARGETS="" | ||
239 | # CONFIG_PM is not set | 249 | # CONFIG_PM is not set |
240 | CONFIG_SECCOMP=y | 250 | CONFIG_SECCOMP=y |
241 | CONFIG_ISA_DMA_API=y | 251 | CONFIG_ISA_DMA_API=y |
@@ -248,6 +258,7 @@ CONFIG_GENERIC_ISA_DMA=y | |||
248 | CONFIG_PPC_INDIRECT_PCI=y | 258 | CONFIG_PPC_INDIRECT_PCI=y |
249 | CONFIG_FSL_SOC=y | 259 | CONFIG_FSL_SOC=y |
250 | CONFIG_FSL_PCI=y | 260 | CONFIG_FSL_PCI=y |
261 | CONFIG_PPC_PCI_CHOICE=y | ||
251 | CONFIG_PCI=y | 262 | CONFIG_PCI=y |
252 | CONFIG_PCI_DOMAINS=y | 263 | CONFIG_PCI_DOMAINS=y |
253 | CONFIG_PCI_SYSCALL=y | 264 | CONFIG_PCI_SYSCALL=y |
@@ -274,10 +285,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
274 | CONFIG_PHYSICAL_START=0x00000000 | 285 | CONFIG_PHYSICAL_START=0x00000000 |
275 | CONFIG_PHYSICAL_ALIGN=0x10000000 | 286 | CONFIG_PHYSICAL_ALIGN=0x10000000 |
276 | CONFIG_TASK_SIZE=0xc0000000 | 287 | CONFIG_TASK_SIZE=0xc0000000 |
277 | |||
278 | # | ||
279 | # Networking | ||
280 | # | ||
281 | CONFIG_NET=y | 288 | CONFIG_NET=y |
282 | 289 | ||
283 | # | 290 | # |
@@ -403,12 +410,15 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
403 | CONFIG_STANDALONE=y | 410 | CONFIG_STANDALONE=y |
404 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 411 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
405 | CONFIG_FW_LOADER=y | 412 | CONFIG_FW_LOADER=y |
413 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
414 | CONFIG_EXTRA_FIRMWARE="" | ||
406 | # CONFIG_DEBUG_DRIVER is not set | 415 | # CONFIG_DEBUG_DRIVER is not set |
407 | # CONFIG_DEBUG_DEVRES is not set | 416 | # CONFIG_DEBUG_DEVRES is not set |
408 | # CONFIG_SYS_HYPERVISOR is not set | 417 | # CONFIG_SYS_HYPERVISOR is not set |
409 | # CONFIG_CONNECTOR is not set | 418 | # CONFIG_CONNECTOR is not set |
410 | # CONFIG_MTD is not set | 419 | # CONFIG_MTD is not set |
411 | CONFIG_OF_DEVICE=y | 420 | CONFIG_OF_DEVICE=y |
421 | CONFIG_OF_GPIO=y | ||
412 | CONFIG_OF_I2C=y | 422 | CONFIG_OF_I2C=y |
413 | # CONFIG_PARPORT is not set | 423 | # CONFIG_PARPORT is not set |
414 | CONFIG_BLK_DEV=y | 424 | CONFIG_BLK_DEV=y |
@@ -429,12 +439,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
429 | # CONFIG_BLK_DEV_XIP is not set | 439 | # CONFIG_BLK_DEV_XIP is not set |
430 | # CONFIG_CDROM_PKTCDVD is not set | 440 | # CONFIG_CDROM_PKTCDVD is not set |
431 | # CONFIG_ATA_OVER_ETH is not set | 441 | # CONFIG_ATA_OVER_ETH is not set |
442 | # CONFIG_BLK_DEV_HD is not set | ||
432 | CONFIG_MISC_DEVICES=y | 443 | CONFIG_MISC_DEVICES=y |
433 | # CONFIG_PHANTOM is not set | 444 | # CONFIG_PHANTOM is not set |
434 | # CONFIG_EEPROM_93CX6 is not set | 445 | # CONFIG_EEPROM_93CX6 is not set |
435 | # CONFIG_SGI_IOC4 is not set | 446 | # CONFIG_SGI_IOC4 is not set |
436 | # CONFIG_TIFM_CORE is not set | 447 | # CONFIG_TIFM_CORE is not set |
437 | # CONFIG_ENCLOSURE_SERVICES is not set | 448 | # CONFIG_ENCLOSURE_SERVICES is not set |
449 | # CONFIG_HP_ILO is not set | ||
438 | CONFIG_HAVE_IDE=y | 450 | CONFIG_HAVE_IDE=y |
439 | # CONFIG_IDE is not set | 451 | # CONFIG_IDE is not set |
440 | 452 | ||
@@ -514,6 +526,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
514 | # CONFIG_SCSI_NSP32 is not set | 526 | # CONFIG_SCSI_NSP32 is not set |
515 | # CONFIG_SCSI_DEBUG is not set | 527 | # CONFIG_SCSI_DEBUG is not set |
516 | # CONFIG_SCSI_SRP is not set | 528 | # CONFIG_SCSI_SRP is not set |
529 | # CONFIG_SCSI_DH is not set | ||
517 | CONFIG_ATA=y | 530 | CONFIG_ATA=y |
518 | # CONFIG_ATA_NONSTANDARD is not set | 531 | # CONFIG_ATA_NONSTANDARD is not set |
519 | CONFIG_SATA_PMP=y | 532 | CONFIG_SATA_PMP=y |
@@ -581,12 +594,15 @@ CONFIG_PATA_ALI=y | |||
581 | # | 594 | # |
582 | # IEEE 1394 (FireWire) support | 595 | # IEEE 1394 (FireWire) support |
583 | # | 596 | # |
597 | |||
598 | # | ||
599 | # Enable only one of the two stacks, unless you know what you are doing | ||
600 | # | ||
584 | # CONFIG_FIREWIRE is not set | 601 | # CONFIG_FIREWIRE is not set |
585 | # CONFIG_IEEE1394 is not set | 602 | # CONFIG_IEEE1394 is not set |
586 | # CONFIG_I2O is not set | 603 | # CONFIG_I2O is not set |
587 | # CONFIG_MACINTOSH_DRIVERS is not set | 604 | # CONFIG_MACINTOSH_DRIVERS is not set |
588 | CONFIG_NETDEVICES=y | 605 | CONFIG_NETDEVICES=y |
589 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
590 | CONFIG_DUMMY=y | 606 | CONFIG_DUMMY=y |
591 | # CONFIG_BONDING is not set | 607 | # CONFIG_BONDING is not set |
592 | # CONFIG_MACVLAN is not set | 608 | # CONFIG_MACVLAN is not set |
@@ -631,7 +647,6 @@ CONFIG_NETDEV_1000=y | |||
631 | # CONFIG_DL2K is not set | 647 | # CONFIG_DL2K is not set |
632 | # CONFIG_E1000 is not set | 648 | # CONFIG_E1000 is not set |
633 | # CONFIG_E1000E is not set | 649 | # CONFIG_E1000E is not set |
634 | # CONFIG_E1000E_ENABLED is not set | ||
635 | # CONFIG_IP1000 is not set | 650 | # CONFIG_IP1000 is not set |
636 | # CONFIG_IGB is not set | 651 | # CONFIG_IGB is not set |
637 | # CONFIG_NS83820 is not set | 652 | # CONFIG_NS83820 is not set |
@@ -645,10 +660,10 @@ CONFIG_NETDEV_1000=y | |||
645 | # CONFIG_TIGON3 is not set | 660 | # CONFIG_TIGON3 is not set |
646 | # CONFIG_BNX2 is not set | 661 | # CONFIG_BNX2 is not set |
647 | CONFIG_GIANFAR=y | 662 | CONFIG_GIANFAR=y |
648 | CONFIG_GFAR_NAPI=y | ||
649 | # CONFIG_UCC_GETH is not set | 663 | # CONFIG_UCC_GETH is not set |
650 | # CONFIG_QLA3XXX is not set | 664 | # CONFIG_QLA3XXX is not set |
651 | # CONFIG_ATL1 is not set | 665 | # CONFIG_ATL1 is not set |
666 | # CONFIG_ATL1E is not set | ||
652 | CONFIG_NETDEV_10000=y | 667 | CONFIG_NETDEV_10000=y |
653 | # CONFIG_CHELSIO_T1 is not set | 668 | # CONFIG_CHELSIO_T1 is not set |
654 | # CONFIG_CHELSIO_T3 is not set | 669 | # CONFIG_CHELSIO_T3 is not set |
@@ -725,12 +740,14 @@ CONFIG_SERIO_SERPORT=y | |||
725 | # CONFIG_SERIO_PCIPS2 is not set | 740 | # CONFIG_SERIO_PCIPS2 is not set |
726 | CONFIG_SERIO_LIBPS2=y | 741 | CONFIG_SERIO_LIBPS2=y |
727 | # CONFIG_SERIO_RAW is not set | 742 | # CONFIG_SERIO_RAW is not set |
743 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
728 | # CONFIG_GAMEPORT is not set | 744 | # CONFIG_GAMEPORT is not set |
729 | 745 | ||
730 | # | 746 | # |
731 | # Character devices | 747 | # Character devices |
732 | # | 748 | # |
733 | CONFIG_VT=y | 749 | CONFIG_VT=y |
750 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
734 | CONFIG_VT_CONSOLE=y | 751 | CONFIG_VT_CONSOLE=y |
735 | CONFIG_HW_CONSOLE=y | 752 | CONFIG_HW_CONSOLE=y |
736 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 753 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -776,44 +793,68 @@ CONFIG_DEVPORT=y | |||
776 | CONFIG_I2C=y | 793 | CONFIG_I2C=y |
777 | CONFIG_I2C_BOARDINFO=y | 794 | CONFIG_I2C_BOARDINFO=y |
778 | # CONFIG_I2C_CHARDEV is not set | 795 | # CONFIG_I2C_CHARDEV is not set |
796 | CONFIG_I2C_HELPER_AUTO=y | ||
779 | 797 | ||
780 | # | 798 | # |
781 | # I2C Hardware Bus support | 799 | # I2C Hardware Bus support |
782 | # | 800 | # |
801 | |||
802 | # | ||
803 | # PC SMBus host controller drivers | ||
804 | # | ||
783 | # CONFIG_I2C_ALI1535 is not set | 805 | # CONFIG_I2C_ALI1535 is not set |
784 | # CONFIG_I2C_ALI1563 is not set | 806 | # CONFIG_I2C_ALI1563 is not set |
785 | # CONFIG_I2C_ALI15X3 is not set | 807 | # CONFIG_I2C_ALI15X3 is not set |
786 | # CONFIG_I2C_AMD756 is not set | 808 | # CONFIG_I2C_AMD756 is not set |
787 | # CONFIG_I2C_AMD8111 is not set | 809 | # CONFIG_I2C_AMD8111 is not set |
788 | # CONFIG_I2C_I801 is not set | 810 | # CONFIG_I2C_I801 is not set |
789 | # CONFIG_I2C_I810 is not set | 811 | # CONFIG_I2C_ISCH is not set |
790 | # CONFIG_I2C_PIIX4 is not set | 812 | # CONFIG_I2C_PIIX4 is not set |
791 | CONFIG_I2C_MPC=y | ||
792 | # CONFIG_I2C_NFORCE2 is not set | 813 | # CONFIG_I2C_NFORCE2 is not set |
793 | # CONFIG_I2C_OCORES is not set | ||
794 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
795 | # CONFIG_I2C_PROSAVAGE is not set | ||
796 | # CONFIG_I2C_SAVAGE4 is not set | ||
797 | # CONFIG_I2C_SIMTEC is not set | ||
798 | # CONFIG_I2C_SIS5595 is not set | 814 | # CONFIG_I2C_SIS5595 is not set |
799 | # CONFIG_I2C_SIS630 is not set | 815 | # CONFIG_I2C_SIS630 is not set |
800 | # CONFIG_I2C_SIS96X is not set | 816 | # CONFIG_I2C_SIS96X is not set |
801 | # CONFIG_I2C_TAOS_EVM is not set | ||
802 | # CONFIG_I2C_STUB is not set | ||
803 | # CONFIG_I2C_TINY_USB is not set | ||
804 | # CONFIG_I2C_VIA is not set | 817 | # CONFIG_I2C_VIA is not set |
805 | # CONFIG_I2C_VIAPRO is not set | 818 | # CONFIG_I2C_VIAPRO is not set |
819 | |||
820 | # | ||
821 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
822 | # | ||
823 | # CONFIG_I2C_CPM is not set | ||
824 | # CONFIG_I2C_GPIO is not set | ||
825 | CONFIG_I2C_MPC=y | ||
826 | # CONFIG_I2C_OCORES is not set | ||
827 | # CONFIG_I2C_SIMTEC is not set | ||
828 | |||
829 | # | ||
830 | # External I2C/SMBus adapter drivers | ||
831 | # | ||
832 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
833 | # CONFIG_I2C_TAOS_EVM is not set | ||
834 | # CONFIG_I2C_TINY_USB is not set | ||
835 | |||
836 | # | ||
837 | # Graphics adapter I2C/DDC channel drivers | ||
838 | # | ||
806 | # CONFIG_I2C_VOODOO3 is not set | 839 | # CONFIG_I2C_VOODOO3 is not set |
840 | |||
841 | # | ||
842 | # Other I2C/SMBus bus drivers | ||
843 | # | ||
807 | # CONFIG_I2C_PCA_PLATFORM is not set | 844 | # CONFIG_I2C_PCA_PLATFORM is not set |
845 | # CONFIG_I2C_STUB is not set | ||
808 | 846 | ||
809 | # | 847 | # |
810 | # Miscellaneous I2C Chip support | 848 | # Miscellaneous I2C Chip support |
811 | # | 849 | # |
812 | # CONFIG_DS1682 is not set | 850 | # CONFIG_DS1682 is not set |
851 | # CONFIG_AT24 is not set | ||
813 | CONFIG_SENSORS_EEPROM=y | 852 | CONFIG_SENSORS_EEPROM=y |
814 | # CONFIG_SENSORS_PCF8574 is not set | 853 | # CONFIG_SENSORS_PCF8574 is not set |
815 | # CONFIG_PCF8575 is not set | 854 | # CONFIG_PCF8575 is not set |
855 | # CONFIG_SENSORS_PCA9539 is not set | ||
816 | # CONFIG_SENSORS_PCF8591 is not set | 856 | # CONFIG_SENSORS_PCF8591 is not set |
857 | # CONFIG_TPS65010 is not set | ||
817 | # CONFIG_SENSORS_MAX6875 is not set | 858 | # CONFIG_SENSORS_MAX6875 is not set |
818 | # CONFIG_SENSORS_TSL2550 is not set | 859 | # CONFIG_SENSORS_TSL2550 is not set |
819 | # CONFIG_I2C_DEBUG_CORE is not set | 860 | # CONFIG_I2C_DEBUG_CORE is not set |
@@ -821,10 +862,32 @@ CONFIG_SENSORS_EEPROM=y | |||
821 | # CONFIG_I2C_DEBUG_BUS is not set | 862 | # CONFIG_I2C_DEBUG_BUS is not set |
822 | # CONFIG_I2C_DEBUG_CHIP is not set | 863 | # CONFIG_I2C_DEBUG_CHIP is not set |
823 | # CONFIG_SPI is not set | 864 | # CONFIG_SPI is not set |
865 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
866 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
867 | CONFIG_GPIOLIB=y | ||
868 | # CONFIG_DEBUG_GPIO is not set | ||
869 | # CONFIG_GPIO_SYSFS is not set | ||
870 | |||
871 | # | ||
872 | # I2C GPIO expanders: | ||
873 | # | ||
874 | # CONFIG_GPIO_MAX732X is not set | ||
875 | # CONFIG_GPIO_PCA953X is not set | ||
876 | # CONFIG_GPIO_PCF857X is not set | ||
877 | |||
878 | # | ||
879 | # PCI GPIO expanders: | ||
880 | # | ||
881 | # CONFIG_GPIO_BT8XX is not set | ||
882 | |||
883 | # | ||
884 | # SPI GPIO expanders: | ||
885 | # | ||
824 | # CONFIG_W1 is not set | 886 | # CONFIG_W1 is not set |
825 | # CONFIG_POWER_SUPPLY is not set | 887 | # CONFIG_POWER_SUPPLY is not set |
826 | # CONFIG_HWMON is not set | 888 | # CONFIG_HWMON is not set |
827 | # CONFIG_THERMAL is not set | 889 | # CONFIG_THERMAL is not set |
890 | # CONFIG_THERMAL_HWMON is not set | ||
828 | # CONFIG_WATCHDOG is not set | 891 | # CONFIG_WATCHDOG is not set |
829 | 892 | ||
830 | # | 893 | # |
@@ -836,8 +899,10 @@ CONFIG_SSB_POSSIBLE=y | |||
836 | # | 899 | # |
837 | # Multifunction device drivers | 900 | # Multifunction device drivers |
838 | # | 901 | # |
902 | # CONFIG_MFD_CORE is not set | ||
839 | # CONFIG_MFD_SM501 is not set | 903 | # CONFIG_MFD_SM501 is not set |
840 | # CONFIG_HTC_PASIC3 is not set | 904 | # CONFIG_HTC_PASIC3 is not set |
905 | # CONFIG_MFD_TMIO is not set | ||
841 | 906 | ||
842 | # | 907 | # |
843 | # Multimedia devices | 908 | # Multimedia devices |
@@ -879,6 +944,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
879 | # CONFIG_DVB_TTUSB_BUDGET is not set | 944 | # CONFIG_DVB_TTUSB_BUDGET is not set |
880 | # CONFIG_DVB_TTUSB_DEC is not set | 945 | # CONFIG_DVB_TTUSB_DEC is not set |
881 | # CONFIG_DVB_CINERGYT2 is not set | 946 | # CONFIG_DVB_CINERGYT2 is not set |
947 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
882 | 948 | ||
883 | # | 949 | # |
884 | # Supported FlexCopII (B2C2) Adapters | 950 | # Supported FlexCopII (B2C2) Adapters |
@@ -925,6 +991,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
925 | # CONFIG_DVB_SP887X is not set | 991 | # CONFIG_DVB_SP887X is not set |
926 | # CONFIG_DVB_CX22700 is not set | 992 | # CONFIG_DVB_CX22700 is not set |
927 | # CONFIG_DVB_CX22702 is not set | 993 | # CONFIG_DVB_CX22702 is not set |
994 | # CONFIG_DVB_DRX397XD is not set | ||
928 | # CONFIG_DVB_L64781 is not set | 995 | # CONFIG_DVB_L64781 is not set |
929 | # CONFIG_DVB_TDA1004X is not set | 996 | # CONFIG_DVB_TDA1004X is not set |
930 | # CONFIG_DVB_NXT6000 is not set | 997 | # CONFIG_DVB_NXT6000 is not set |
@@ -992,15 +1059,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
992 | CONFIG_VGA_CONSOLE=y | 1059 | CONFIG_VGA_CONSOLE=y |
993 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1060 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
994 | CONFIG_DUMMY_CONSOLE=y | 1061 | CONFIG_DUMMY_CONSOLE=y |
995 | |||
996 | # | ||
997 | # Sound | ||
998 | # | ||
999 | CONFIG_SOUND=y | 1062 | CONFIG_SOUND=y |
1000 | |||
1001 | # | ||
1002 | # Advanced Linux Sound Architecture | ||
1003 | # | ||
1004 | CONFIG_SND=y | 1063 | CONFIG_SND=y |
1005 | CONFIG_SND_TIMER=y | 1064 | CONFIG_SND_TIMER=y |
1006 | CONFIG_SND_PCM=y | 1065 | CONFIG_SND_PCM=y |
@@ -1014,19 +1073,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
1014 | CONFIG_SND_VERBOSE_PROCFS=y | 1073 | CONFIG_SND_VERBOSE_PROCFS=y |
1015 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1074 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1016 | # CONFIG_SND_DEBUG is not set | 1075 | # CONFIG_SND_DEBUG is not set |
1017 | 1076 | CONFIG_SND_VMASTER=y | |
1018 | # | ||
1019 | # Generic devices | ||
1020 | # | ||
1021 | CONFIG_SND_AC97_CODEC=y | 1077 | CONFIG_SND_AC97_CODEC=y |
1078 | CONFIG_SND_DRIVERS=y | ||
1022 | # CONFIG_SND_DUMMY is not set | 1079 | # CONFIG_SND_DUMMY is not set |
1023 | # CONFIG_SND_MTPAV is not set | 1080 | # CONFIG_SND_MTPAV is not set |
1024 | # CONFIG_SND_SERIAL_U16550 is not set | 1081 | # CONFIG_SND_SERIAL_U16550 is not set |
1025 | # CONFIG_SND_MPU401 is not set | 1082 | # CONFIG_SND_MPU401 is not set |
1026 | 1083 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
1027 | # | 1084 | CONFIG_SND_PCI=y |
1028 | # PCI devices | ||
1029 | # | ||
1030 | # CONFIG_SND_AD1889 is not set | 1085 | # CONFIG_SND_AD1889 is not set |
1031 | # CONFIG_SND_ALS300 is not set | 1086 | # CONFIG_SND_ALS300 is not set |
1032 | # CONFIG_SND_ALS4000 is not set | 1087 | # CONFIG_SND_ALS4000 is not set |
@@ -1088,39 +1143,12 @@ CONFIG_SND_INTEL8X0=y | |||
1088 | # CONFIG_SND_VIRTUOSO is not set | 1143 | # CONFIG_SND_VIRTUOSO is not set |
1089 | # CONFIG_SND_VX222 is not set | 1144 | # CONFIG_SND_VX222 is not set |
1090 | # CONFIG_SND_YMFPCI is not set | 1145 | # CONFIG_SND_YMFPCI is not set |
1091 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1146 | CONFIG_SND_PPC=y |
1092 | 1147 | CONFIG_SND_USB=y | |
1093 | # | ||
1094 | # ALSA PowerMac devices | ||
1095 | # | ||
1096 | |||
1097 | # | ||
1098 | # ALSA PowerPC devices | ||
1099 | # | ||
1100 | |||
1101 | # | ||
1102 | # USB devices | ||
1103 | # | ||
1104 | # CONFIG_SND_USB_AUDIO is not set | 1148 | # CONFIG_SND_USB_AUDIO is not set |
1105 | # CONFIG_SND_USB_USX2Y is not set | 1149 | # CONFIG_SND_USB_USX2Y is not set |
1106 | # CONFIG_SND_USB_CAIAQ is not set | 1150 | # CONFIG_SND_USB_CAIAQ is not set |
1107 | |||
1108 | # | ||
1109 | # System on Chip audio support | ||
1110 | # | ||
1111 | # CONFIG_SND_SOC is not set | 1151 | # CONFIG_SND_SOC is not set |
1112 | |||
1113 | # | ||
1114 | # ALSA SoC audio for Freescale SOCs | ||
1115 | # | ||
1116 | |||
1117 | # | ||
1118 | # SoC Audio for the Texas Instruments OMAP | ||
1119 | # | ||
1120 | |||
1121 | # | ||
1122 | # Open Sound System | ||
1123 | # | ||
1124 | # CONFIG_SOUND_PRIME is not set | 1152 | # CONFIG_SOUND_PRIME is not set |
1125 | CONFIG_AC97_BUS=y | 1153 | CONFIG_AC97_BUS=y |
1126 | CONFIG_HID_SUPPORT=y | 1154 | CONFIG_HID_SUPPORT=y |
@@ -1152,6 +1180,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1152 | # CONFIG_USB_OTG is not set | 1180 | # CONFIG_USB_OTG is not set |
1153 | # CONFIG_USB_OTG_WHITELIST is not set | 1181 | # CONFIG_USB_OTG_WHITELIST is not set |
1154 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1182 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1183 | CONFIG_USB_MON=y | ||
1155 | 1184 | ||
1156 | # | 1185 | # |
1157 | # USB Host Controller Drivers | 1186 | # USB Host Controller Drivers |
@@ -1175,6 +1204,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1175 | # CONFIG_USB_UHCI_HCD is not set | 1204 | # CONFIG_USB_UHCI_HCD is not set |
1176 | # CONFIG_USB_SL811_HCD is not set | 1205 | # CONFIG_USB_SL811_HCD is not set |
1177 | # CONFIG_USB_R8A66597_HCD is not set | 1206 | # CONFIG_USB_R8A66597_HCD is not set |
1207 | # CONFIG_USB_MUSB_HDRC is not set | ||
1178 | 1208 | ||
1179 | # | 1209 | # |
1180 | # USB Device Class drivers | 1210 | # USB Device Class drivers |
@@ -1203,6 +1233,7 @@ CONFIG_USB_STORAGE=y | |||
1203 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1233 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1204 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1234 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1205 | # CONFIG_USB_STORAGE_KARMA is not set | 1235 | # CONFIG_USB_STORAGE_KARMA is not set |
1236 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1206 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1237 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1207 | # CONFIG_USB_LIBUSUAL is not set | 1238 | # CONFIG_USB_LIBUSUAL is not set |
1208 | 1239 | ||
@@ -1211,7 +1242,6 @@ CONFIG_USB_STORAGE=y | |||
1211 | # | 1242 | # |
1212 | # CONFIG_USB_MDC800 is not set | 1243 | # CONFIG_USB_MDC800 is not set |
1213 | # CONFIG_USB_MICROTEK is not set | 1244 | # CONFIG_USB_MICROTEK is not set |
1214 | CONFIG_USB_MON=y | ||
1215 | 1245 | ||
1216 | # | 1246 | # |
1217 | # USB port drivers | 1247 | # USB port drivers |
@@ -1224,7 +1254,6 @@ CONFIG_USB_MON=y | |||
1224 | # CONFIG_USB_EMI62 is not set | 1254 | # CONFIG_USB_EMI62 is not set |
1225 | # CONFIG_USB_EMI26 is not set | 1255 | # CONFIG_USB_EMI26 is not set |
1226 | # CONFIG_USB_ADUTUX is not set | 1256 | # CONFIG_USB_ADUTUX is not set |
1227 | # CONFIG_USB_AUERSWALD is not set | ||
1228 | # CONFIG_USB_RIO500 is not set | 1257 | # CONFIG_USB_RIO500 is not set |
1229 | # CONFIG_USB_LEGOTOWER is not set | 1258 | # CONFIG_USB_LEGOTOWER is not set |
1230 | # CONFIG_USB_LCD is not set | 1259 | # CONFIG_USB_LCD is not set |
@@ -1285,6 +1314,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1285 | # CONFIG_RTC_DRV_PCF8583 is not set | 1314 | # CONFIG_RTC_DRV_PCF8583 is not set |
1286 | # CONFIG_RTC_DRV_M41T80 is not set | 1315 | # CONFIG_RTC_DRV_M41T80 is not set |
1287 | # CONFIG_RTC_DRV_S35390A is not set | 1316 | # CONFIG_RTC_DRV_S35390A is not set |
1317 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1288 | 1318 | ||
1289 | # | 1319 | # |
1290 | # SPI RTC drivers | 1320 | # SPI RTC drivers |
@@ -1318,6 +1348,7 @@ CONFIG_DMA_ENGINE=y | |||
1318 | # DMA Clients | 1348 | # DMA Clients |
1319 | # | 1349 | # |
1320 | # CONFIG_NET_DMA is not set | 1350 | # CONFIG_NET_DMA is not set |
1351 | # CONFIG_DMATEST is not set | ||
1321 | # CONFIG_UIO is not set | 1352 | # CONFIG_UIO is not set |
1322 | 1353 | ||
1323 | # | 1354 | # |
@@ -1332,6 +1363,7 @@ CONFIG_EXT3_FS_XATTR=y | |||
1332 | # CONFIG_EXT3_FS_SECURITY is not set | 1363 | # CONFIG_EXT3_FS_SECURITY is not set |
1333 | # CONFIG_EXT4DEV_FS is not set | 1364 | # CONFIG_EXT4DEV_FS is not set |
1334 | CONFIG_JBD=y | 1365 | CONFIG_JBD=y |
1366 | # CONFIG_JBD_DEBUG is not set | ||
1335 | CONFIG_FS_MBCACHE=y | 1367 | CONFIG_FS_MBCACHE=y |
1336 | # CONFIG_REISERFS_FS is not set | 1368 | # CONFIG_REISERFS_FS is not set |
1337 | # CONFIG_JFS_FS is not set | 1369 | # CONFIG_JFS_FS is not set |
@@ -1394,6 +1426,7 @@ CONFIG_EFS_FS=m | |||
1394 | CONFIG_CRAMFS=y | 1426 | CONFIG_CRAMFS=y |
1395 | CONFIG_VXFS_FS=m | 1427 | CONFIG_VXFS_FS=m |
1396 | # CONFIG_MINIX_FS is not set | 1428 | # CONFIG_MINIX_FS is not set |
1429 | # CONFIG_OMFS_FS is not set | ||
1397 | CONFIG_HPFS_FS=m | 1430 | CONFIG_HPFS_FS=m |
1398 | CONFIG_QNX4FS_FS=m | 1431 | CONFIG_QNX4FS_FS=m |
1399 | # CONFIG_ROMFS_FS is not set | 1432 | # CONFIG_ROMFS_FS is not set |
@@ -1406,17 +1439,16 @@ CONFIG_NFS_FS=y | |||
1406 | CONFIG_NFS_V3=y | 1439 | CONFIG_NFS_V3=y |
1407 | # CONFIG_NFS_V3_ACL is not set | 1440 | # CONFIG_NFS_V3_ACL is not set |
1408 | CONFIG_NFS_V4=y | 1441 | CONFIG_NFS_V4=y |
1442 | CONFIG_ROOT_NFS=y | ||
1409 | CONFIG_NFSD=y | 1443 | CONFIG_NFSD=y |
1410 | # CONFIG_NFSD_V3 is not set | 1444 | # CONFIG_NFSD_V3 is not set |
1411 | # CONFIG_NFSD_V4 is not set | 1445 | # CONFIG_NFSD_V4 is not set |
1412 | CONFIG_ROOT_NFS=y | ||
1413 | CONFIG_LOCKD=y | 1446 | CONFIG_LOCKD=y |
1414 | CONFIG_LOCKD_V4=y | 1447 | CONFIG_LOCKD_V4=y |
1415 | CONFIG_EXPORTFS=y | 1448 | CONFIG_EXPORTFS=y |
1416 | CONFIG_NFS_COMMON=y | 1449 | CONFIG_NFS_COMMON=y |
1417 | CONFIG_SUNRPC=y | 1450 | CONFIG_SUNRPC=y |
1418 | CONFIG_SUNRPC_GSS=y | 1451 | CONFIG_SUNRPC_GSS=y |
1419 | # CONFIG_SUNRPC_BIND34 is not set | ||
1420 | CONFIG_RPCSEC_GSS_KRB5=y | 1452 | CONFIG_RPCSEC_GSS_KRB5=y |
1421 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1453 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1422 | # CONFIG_SMB_FS is not set | 1454 | # CONFIG_SMB_FS is not set |
@@ -1487,6 +1519,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" | |||
1487 | # CONFIG_NLS_KOI8_U is not set | 1519 | # CONFIG_NLS_KOI8_U is not set |
1488 | CONFIG_NLS_UTF8=m | 1520 | CONFIG_NLS_UTF8=m |
1489 | # CONFIG_DLM is not set | 1521 | # CONFIG_DLM is not set |
1522 | # CONFIG_QE_GPIO is not set | ||
1490 | 1523 | ||
1491 | # | 1524 | # |
1492 | # Library routines | 1525 | # Library routines |
@@ -1495,6 +1528,7 @@ CONFIG_BITREVERSE=y | |||
1495 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1528 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1496 | # CONFIG_CRC_CCITT is not set | 1529 | # CONFIG_CRC_CCITT is not set |
1497 | # CONFIG_CRC16 is not set | 1530 | # CONFIG_CRC16 is not set |
1531 | CONFIG_CRC_T10DIF=y | ||
1498 | CONFIG_CRC_ITU_T=m | 1532 | CONFIG_CRC_ITU_T=m |
1499 | CONFIG_CRC32=y | 1533 | CONFIG_CRC32=y |
1500 | # CONFIG_CRC7 is not set | 1534 | # CONFIG_CRC7 is not set |
@@ -1515,11 +1549,13 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1515 | CONFIG_FRAME_WARN=1024 | 1549 | CONFIG_FRAME_WARN=1024 |
1516 | # CONFIG_MAGIC_SYSRQ is not set | 1550 | # CONFIG_MAGIC_SYSRQ is not set |
1517 | # CONFIG_UNUSED_SYMBOLS is not set | 1551 | # CONFIG_UNUSED_SYMBOLS is not set |
1518 | # CONFIG_DEBUG_FS is not set | 1552 | CONFIG_DEBUG_FS=y |
1519 | # CONFIG_HEADERS_CHECK is not set | 1553 | # CONFIG_HEADERS_CHECK is not set |
1520 | CONFIG_DEBUG_KERNEL=y | 1554 | CONFIG_DEBUG_KERNEL=y |
1521 | # CONFIG_DEBUG_SHIRQ is not set | 1555 | # CONFIG_DEBUG_SHIRQ is not set |
1522 | CONFIG_DETECT_SOFTLOCKUP=y | 1556 | CONFIG_DETECT_SOFTLOCKUP=y |
1557 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1558 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1523 | CONFIG_SCHED_DEBUG=y | 1559 | CONFIG_SCHED_DEBUG=y |
1524 | # CONFIG_SCHEDSTATS is not set | 1560 | # CONFIG_SCHEDSTATS is not set |
1525 | # CONFIG_TIMER_STATS is not set | 1561 | # CONFIG_TIMER_STATS is not set |
@@ -1538,19 +1574,31 @@ CONFIG_SCHED_DEBUG=y | |||
1538 | CONFIG_DEBUG_INFO=y | 1574 | CONFIG_DEBUG_INFO=y |
1539 | # CONFIG_DEBUG_VM is not set | 1575 | # CONFIG_DEBUG_VM is not set |
1540 | # CONFIG_DEBUG_WRITECOUNT is not set | 1576 | # CONFIG_DEBUG_WRITECOUNT is not set |
1577 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1541 | # CONFIG_DEBUG_LIST is not set | 1578 | # CONFIG_DEBUG_LIST is not set |
1542 | # CONFIG_DEBUG_SG is not set | 1579 | # CONFIG_DEBUG_SG is not set |
1543 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1580 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1544 | # CONFIG_RCU_TORTURE_TEST is not set | 1581 | # CONFIG_RCU_TORTURE_TEST is not set |
1545 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1582 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1546 | # CONFIG_FAULT_INJECTION is not set | 1583 | # CONFIG_FAULT_INJECTION is not set |
1584 | # CONFIG_LATENCYTOP is not set | ||
1585 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1586 | CONFIG_HAVE_FTRACE=y | ||
1587 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1588 | # CONFIG_FTRACE is not set | ||
1589 | # CONFIG_SCHED_TRACER is not set | ||
1590 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1547 | # CONFIG_SAMPLES is not set | 1591 | # CONFIG_SAMPLES is not set |
1592 | CONFIG_HAVE_ARCH_KGDB=y | ||
1593 | # CONFIG_KGDB is not set | ||
1548 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1594 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1549 | # CONFIG_DEBUG_STACK_USAGE is not set | 1595 | # CONFIG_DEBUG_STACK_USAGE is not set |
1550 | # CONFIG_DEBUG_PAGEALLOC is not set | 1596 | # CONFIG_DEBUG_PAGEALLOC is not set |
1551 | # CONFIG_DEBUGGER is not set | 1597 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1552 | # CONFIG_KGDB_CONSOLE is not set | 1598 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1599 | # CONFIG_XMON is not set | ||
1553 | # CONFIG_IRQSTACKS is not set | 1600 | # CONFIG_IRQSTACKS is not set |
1601 | CONFIG_VIRQ_DEBUG=y | ||
1554 | # CONFIG_BDI_SWITCH is not set | 1602 | # CONFIG_BDI_SWITCH is not set |
1555 | # CONFIG_PPC_EARLY_DEBUG is not set | 1603 | # CONFIG_PPC_EARLY_DEBUG is not set |
1556 | 1604 | ||
@@ -1606,6 +1654,10 @@ CONFIG_CRYPTO_HMAC=y | |||
1606 | # CONFIG_CRYPTO_MD4 is not set | 1654 | # CONFIG_CRYPTO_MD4 is not set |
1607 | CONFIG_CRYPTO_MD5=y | 1655 | CONFIG_CRYPTO_MD5=y |
1608 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1656 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1657 | # CONFIG_CRYPTO_RMD128 is not set | ||
1658 | # CONFIG_CRYPTO_RMD160 is not set | ||
1659 | # CONFIG_CRYPTO_RMD256 is not set | ||
1660 | # CONFIG_CRYPTO_RMD320 is not set | ||
1609 | CONFIG_CRYPTO_SHA1=m | 1661 | CONFIG_CRYPTO_SHA1=m |
1610 | # CONFIG_CRYPTO_SHA256 is not set | 1662 | # CONFIG_CRYPTO_SHA256 is not set |
1611 | # CONFIG_CRYPTO_SHA512 is not set | 1663 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1638,6 +1690,7 @@ CONFIG_CRYPTO_DES=y | |||
1638 | # CONFIG_CRYPTO_LZO is not set | 1690 | # CONFIG_CRYPTO_LZO is not set |
1639 | CONFIG_CRYPTO_HW=y | 1691 | CONFIG_CRYPTO_HW=y |
1640 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1692 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1641 | # CONFIG_PPC_CLOCK is not set | 1693 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
1694 | CONFIG_PPC_CLOCK=y | ||
1642 | CONFIG_PPC_LIB_RHEAP=y | 1695 | CONFIG_PPC_LIB_RHEAP=y |
1643 | # CONFIG_VIRTUALIZATION is not set | 1696 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig index cdf98ae3682b..1a9990731eb0 100644 --- a/arch/powerpc/configs/mpc8610_hpcd_defconfig +++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Tue Jul 15 08:31:01 2008 | 4 | # Thu Aug 21 00:52:10 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -91,7 +92,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
91 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
92 | CONFIG_EMBEDDED=y | 93 | CONFIG_EMBEDDED=y |
93 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
94 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
95 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
96 | # CONFIG_KALLSYMS_ALL is not set | 96 | # CONFIG_KALLSYMS_ALL is not set |
97 | CONFIG_KALLSYMS_EXTRA_PASS=y | 97 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -118,10 +118,16 @@ CONFIG_SLUB=y | |||
118 | # CONFIG_MARKERS is not set | 118 | # CONFIG_MARKERS is not set |
119 | CONFIG_HAVE_OPROFILE=y | 119 | CONFIG_HAVE_OPROFILE=y |
120 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
122 | CONFIG_HAVE_IOREMAP_PROT=y | ||
121 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
122 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
123 | CONFIG_HAVE_DMA_ATTRS=y | 125 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
126 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
127 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
128 | # CONFIG_HAVE_CLK is not set | ||
124 | CONFIG_PROC_PAGE_MONITOR=y | 129 | CONFIG_PROC_PAGE_MONITOR=y |
130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
125 | CONFIG_SLABINFO=y | 131 | CONFIG_SLABINFO=y |
126 | CONFIG_RT_MUTEXES=y | 132 | CONFIG_RT_MUTEXES=y |
127 | # CONFIG_TINY_SHMEM is not set | 133 | # CONFIG_TINY_SHMEM is not set |
@@ -138,6 +144,7 @@ CONFIG_BLOCK=y | |||
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 144 | # CONFIG_BLK_DEV_IO_TRACE is not set |
139 | # CONFIG_LSF is not set | 145 | # CONFIG_LSF is not set |
140 | # CONFIG_BLK_DEV_BSG is not set | 146 | # CONFIG_BLK_DEV_BSG is not set |
147 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
141 | 148 | ||
142 | # | 149 | # |
143 | # IO Schedulers | 150 | # IO Schedulers |
@@ -159,9 +166,8 @@ CONFIG_CLASSIC_RCU=y | |||
159 | CONFIG_PPC_MULTIPLATFORM=y | 166 | CONFIG_PPC_MULTIPLATFORM=y |
160 | CONFIG_CLASSIC32=y | 167 | CONFIG_CLASSIC32=y |
161 | CONFIG_PPC_CHRP=y | 168 | CONFIG_PPC_CHRP=y |
162 | # CONFIG_PPC_MPC512x is not set | ||
163 | # CONFIG_PPC_MPC5121 is not set | ||
164 | # CONFIG_MPC5121_ADS is not set | 169 | # CONFIG_MPC5121_ADS is not set |
170 | # CONFIG_MPC5121_GENERIC is not set | ||
165 | # CONFIG_PPC_MPC52xx is not set | 171 | # CONFIG_PPC_MPC52xx is not set |
166 | CONFIG_PPC_PMAC=y | 172 | CONFIG_PPC_PMAC=y |
167 | # CONFIG_PPC_CELL is not set | 173 | # CONFIG_PPC_CELL is not set |
@@ -207,7 +213,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
207 | # CONFIG_HZ_300 is not set | 213 | # CONFIG_HZ_300 is not set |
208 | CONFIG_HZ_1000=y | 214 | CONFIG_HZ_1000=y |
209 | CONFIG_HZ=1000 | 215 | CONFIG_HZ=1000 |
210 | # CONFIG_SCHED_HRTICK is not set | 216 | CONFIG_SCHED_HRTICK=y |
211 | CONFIG_PREEMPT_NONE=y | 217 | CONFIG_PREEMPT_NONE=y |
212 | # CONFIG_PREEMPT_VOLUNTARY is not set | 218 | # CONFIG_PREEMPT_VOLUNTARY is not set |
213 | # CONFIG_PREEMPT is not set | 219 | # CONFIG_PREEMPT is not set |
@@ -230,6 +236,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 236 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
231 | CONFIG_PAGEFLAGS_EXTENDED=y | 237 | CONFIG_PAGEFLAGS_EXTENDED=y |
232 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 238 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
239 | CONFIG_MIGRATION=y | ||
233 | # CONFIG_RESOURCES_64BIT is not set | 240 | # CONFIG_RESOURCES_64BIT is not set |
234 | CONFIG_ZONE_DMA_FLAG=1 | 241 | CONFIG_ZONE_DMA_FLAG=1 |
235 | CONFIG_BOUNCE=y | 242 | CONFIG_BOUNCE=y |
@@ -237,6 +244,7 @@ CONFIG_VIRT_TO_BUS=y | |||
237 | CONFIG_FORCE_MAX_ZONEORDER=12 | 244 | CONFIG_FORCE_MAX_ZONEORDER=12 |
238 | CONFIG_PROC_DEVICETREE=y | 245 | CONFIG_PROC_DEVICETREE=y |
239 | # CONFIG_CMDLINE_BOOL is not set | 246 | # CONFIG_CMDLINE_BOOL is not set |
247 | CONFIG_EXTRA_TARGETS="" | ||
240 | # CONFIG_PM is not set | 248 | # CONFIG_PM is not set |
241 | # CONFIG_SECCOMP is not set | 249 | # CONFIG_SECCOMP is not set |
242 | CONFIG_ISA_DMA_API=y | 250 | CONFIG_ISA_DMA_API=y |
@@ -278,10 +286,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
278 | CONFIG_KERNEL_START=0xc0000000 | 286 | CONFIG_KERNEL_START=0xc0000000 |
279 | CONFIG_PHYSICAL_START=0x00000000 | 287 | CONFIG_PHYSICAL_START=0x00000000 |
280 | CONFIG_TASK_SIZE=0xc0000000 | 288 | CONFIG_TASK_SIZE=0xc0000000 |
281 | |||
282 | # | ||
283 | # Networking | ||
284 | # | ||
285 | CONFIG_NET=y | 289 | CONFIG_NET=y |
286 | 290 | ||
287 | # | 291 | # |
@@ -391,6 +395,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
391 | CONFIG_STANDALONE=y | 395 | CONFIG_STANDALONE=y |
392 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 396 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
393 | CONFIG_FW_LOADER=y | 397 | CONFIG_FW_LOADER=y |
398 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
399 | CONFIG_EXTRA_FIRMWARE="" | ||
394 | # CONFIG_DEBUG_DRIVER is not set | 400 | # CONFIG_DEBUG_DRIVER is not set |
395 | # CONFIG_DEBUG_DEVRES is not set | 401 | # CONFIG_DEBUG_DEVRES is not set |
396 | # CONFIG_SYS_HYPERVISOR is not set | 402 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -503,18 +509,17 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
503 | # CONFIG_BLK_DEV_XIP is not set | 509 | # CONFIG_BLK_DEV_XIP is not set |
504 | # CONFIG_CDROM_PKTCDVD is not set | 510 | # CONFIG_CDROM_PKTCDVD is not set |
505 | # CONFIG_ATA_OVER_ETH is not set | 511 | # CONFIG_ATA_OVER_ETH is not set |
512 | # CONFIG_BLK_DEV_HD is not set | ||
506 | CONFIG_MISC_DEVICES=y | 513 | CONFIG_MISC_DEVICES=y |
507 | # CONFIG_PHANTOM is not set | 514 | # CONFIG_PHANTOM is not set |
508 | # CONFIG_EEPROM_93CX6 is not set | 515 | # CONFIG_EEPROM_93CX6 is not set |
509 | # CONFIG_SGI_IOC4 is not set | 516 | # CONFIG_SGI_IOC4 is not set |
510 | # CONFIG_TIFM_CORE is not set | 517 | # CONFIG_TIFM_CORE is not set |
511 | # CONFIG_ENCLOSURE_SERVICES is not set | 518 | # CONFIG_ENCLOSURE_SERVICES is not set |
519 | # CONFIG_HP_ILO is not set | ||
512 | CONFIG_HAVE_IDE=y | 520 | CONFIG_HAVE_IDE=y |
513 | CONFIG_IDE=y | 521 | CONFIG_IDE=y |
514 | CONFIG_IDE_MAX_HWIFS=4 | ||
515 | # CONFIG_BLK_DEV_IDE is not set | 522 | # CONFIG_BLK_DEV_IDE is not set |
516 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
517 | # CONFIG_BLK_DEV_HD is not set | ||
518 | 523 | ||
519 | # | 524 | # |
520 | # SCSI device support | 525 | # SCSI device support |
@@ -593,6 +598,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
593 | # CONFIG_SCSI_MESH is not set | 598 | # CONFIG_SCSI_MESH is not set |
594 | # CONFIG_SCSI_MAC53C94 is not set | 599 | # CONFIG_SCSI_MAC53C94 is not set |
595 | # CONFIG_SCSI_SRP is not set | 600 | # CONFIG_SCSI_SRP is not set |
601 | # CONFIG_SCSI_DH is not set | ||
596 | CONFIG_ATA=y | 602 | CONFIG_ATA=y |
597 | # CONFIG_ATA_NONSTANDARD is not set | 603 | # CONFIG_ATA_NONSTANDARD is not set |
598 | CONFIG_SATA_PMP=y | 604 | CONFIG_SATA_PMP=y |
@@ -669,7 +675,6 @@ CONFIG_PATA_ALI=y | |||
669 | # CONFIG_I2O is not set | 675 | # CONFIG_I2O is not set |
670 | # CONFIG_MACINTOSH_DRIVERS is not set | 676 | # CONFIG_MACINTOSH_DRIVERS is not set |
671 | CONFIG_NETDEVICES=y | 677 | CONFIG_NETDEVICES=y |
672 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
673 | CONFIG_DUMMY=y | 678 | CONFIG_DUMMY=y |
674 | # CONFIG_BONDING is not set | 679 | # CONFIG_BONDING is not set |
675 | # CONFIG_MACVLAN is not set | 680 | # CONFIG_MACVLAN is not set |
@@ -756,12 +761,14 @@ CONFIG_SERIO_SERPORT=y | |||
756 | # CONFIG_SERIO_PCIPS2 is not set | 761 | # CONFIG_SERIO_PCIPS2 is not set |
757 | CONFIG_SERIO_LIBPS2=y | 762 | CONFIG_SERIO_LIBPS2=y |
758 | # CONFIG_SERIO_RAW is not set | 763 | # CONFIG_SERIO_RAW is not set |
764 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
759 | # CONFIG_GAMEPORT is not set | 765 | # CONFIG_GAMEPORT is not set |
760 | 766 | ||
761 | # | 767 | # |
762 | # Character devices | 768 | # Character devices |
763 | # | 769 | # |
764 | CONFIG_VT=y | 770 | CONFIG_VT=y |
771 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
765 | CONFIG_VT_CONSOLE=y | 772 | CONFIG_VT_CONSOLE=y |
766 | CONFIG_HW_CONSOLE=y | 773 | CONFIG_HW_CONSOLE=y |
767 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 774 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -807,44 +814,69 @@ CONFIG_DEVPORT=y | |||
807 | CONFIG_I2C=y | 814 | CONFIG_I2C=y |
808 | CONFIG_I2C_BOARDINFO=y | 815 | CONFIG_I2C_BOARDINFO=y |
809 | # CONFIG_I2C_CHARDEV is not set | 816 | # CONFIG_I2C_CHARDEV is not set |
817 | CONFIG_I2C_HELPER_AUTO=y | ||
810 | 818 | ||
811 | # | 819 | # |
812 | # I2C Hardware Bus support | 820 | # I2C Hardware Bus support |
813 | # | 821 | # |
822 | |||
823 | # | ||
824 | # PC SMBus host controller drivers | ||
825 | # | ||
814 | # CONFIG_I2C_ALI1535 is not set | 826 | # CONFIG_I2C_ALI1535 is not set |
815 | # CONFIG_I2C_ALI1563 is not set | 827 | # CONFIG_I2C_ALI1563 is not set |
816 | # CONFIG_I2C_ALI15X3 is not set | 828 | # CONFIG_I2C_ALI15X3 is not set |
817 | # CONFIG_I2C_AMD756 is not set | 829 | # CONFIG_I2C_AMD756 is not set |
818 | # CONFIG_I2C_AMD8111 is not set | 830 | # CONFIG_I2C_AMD8111 is not set |
819 | # CONFIG_I2C_HYDRA is not set | ||
820 | # CONFIG_I2C_I801 is not set | 831 | # CONFIG_I2C_I801 is not set |
821 | # CONFIG_I2C_I810 is not set | 832 | # CONFIG_I2C_ISCH is not set |
822 | # CONFIG_I2C_PIIX4 is not set | 833 | # CONFIG_I2C_PIIX4 is not set |
823 | CONFIG_I2C_POWERMAC=y | ||
824 | CONFIG_I2C_MPC=y | ||
825 | # CONFIG_I2C_NFORCE2 is not set | 834 | # CONFIG_I2C_NFORCE2 is not set |
826 | # CONFIG_I2C_OCORES is not set | ||
827 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
828 | # CONFIG_I2C_PROSAVAGE is not set | ||
829 | # CONFIG_I2C_SAVAGE4 is not set | ||
830 | # CONFIG_I2C_SIMTEC is not set | ||
831 | # CONFIG_I2C_SIS5595 is not set | 835 | # CONFIG_I2C_SIS5595 is not set |
832 | # CONFIG_I2C_SIS630 is not set | 836 | # CONFIG_I2C_SIS630 is not set |
833 | # CONFIG_I2C_SIS96X is not set | 837 | # CONFIG_I2C_SIS96X is not set |
834 | # CONFIG_I2C_TAOS_EVM is not set | ||
835 | # CONFIG_I2C_STUB is not set | ||
836 | # CONFIG_I2C_VIA is not set | 838 | # CONFIG_I2C_VIA is not set |
837 | # CONFIG_I2C_VIAPRO is not set | 839 | # CONFIG_I2C_VIAPRO is not set |
840 | |||
841 | # | ||
842 | # Mac SMBus host controller drivers | ||
843 | # | ||
844 | # CONFIG_I2C_HYDRA is not set | ||
845 | CONFIG_I2C_POWERMAC=y | ||
846 | |||
847 | # | ||
848 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
849 | # | ||
850 | CONFIG_I2C_MPC=y | ||
851 | # CONFIG_I2C_OCORES is not set | ||
852 | # CONFIG_I2C_SIMTEC is not set | ||
853 | |||
854 | # | ||
855 | # External I2C/SMBus adapter drivers | ||
856 | # | ||
857 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
858 | # CONFIG_I2C_TAOS_EVM is not set | ||
859 | |||
860 | # | ||
861 | # Graphics adapter I2C/DDC channel drivers | ||
862 | # | ||
838 | # CONFIG_I2C_VOODOO3 is not set | 863 | # CONFIG_I2C_VOODOO3 is not set |
864 | |||
865 | # | ||
866 | # Other I2C/SMBus bus drivers | ||
867 | # | ||
839 | # CONFIG_I2C_PCA_PLATFORM is not set | 868 | # CONFIG_I2C_PCA_PLATFORM is not set |
869 | # CONFIG_I2C_STUB is not set | ||
840 | 870 | ||
841 | # | 871 | # |
842 | # Miscellaneous I2C Chip support | 872 | # Miscellaneous I2C Chip support |
843 | # | 873 | # |
844 | # CONFIG_DS1682 is not set | 874 | # CONFIG_DS1682 is not set |
875 | # CONFIG_AT24 is not set | ||
845 | # CONFIG_SENSORS_EEPROM is not set | 876 | # CONFIG_SENSORS_EEPROM is not set |
846 | # CONFIG_SENSORS_PCF8574 is not set | 877 | # CONFIG_SENSORS_PCF8574 is not set |
847 | # CONFIG_PCF8575 is not set | 878 | # CONFIG_PCF8575 is not set |
879 | # CONFIG_SENSORS_PCA9539 is not set | ||
848 | # CONFIG_SENSORS_PCF8591 is not set | 880 | # CONFIG_SENSORS_PCF8591 is not set |
849 | # CONFIG_SENSORS_MAX6875 is not set | 881 | # CONFIG_SENSORS_MAX6875 is not set |
850 | # CONFIG_SENSORS_TSL2550 is not set | 882 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -853,6 +885,8 @@ CONFIG_I2C_MPC=y | |||
853 | # CONFIG_I2C_DEBUG_BUS is not set | 885 | # CONFIG_I2C_DEBUG_BUS is not set |
854 | # CONFIG_I2C_DEBUG_CHIP is not set | 886 | # CONFIG_I2C_DEBUG_CHIP is not set |
855 | # CONFIG_SPI is not set | 887 | # CONFIG_SPI is not set |
888 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
889 | # CONFIG_GPIOLIB is not set | ||
856 | # CONFIG_W1 is not set | 890 | # CONFIG_W1 is not set |
857 | # CONFIG_POWER_SUPPLY is not set | 891 | # CONFIG_POWER_SUPPLY is not set |
858 | # CONFIG_HWMON is not set | 892 | # CONFIG_HWMON is not set |
@@ -869,8 +903,10 @@ CONFIG_SSB_POSSIBLE=y | |||
869 | # | 903 | # |
870 | # Multifunction device drivers | 904 | # Multifunction device drivers |
871 | # | 905 | # |
906 | # CONFIG_MFD_CORE is not set | ||
872 | # CONFIG_MFD_SM501 is not set | 907 | # CONFIG_MFD_SM501 is not set |
873 | # CONFIG_HTC_PASIC3 is not set | 908 | # CONFIG_HTC_PASIC3 is not set |
909 | # CONFIG_MFD_TMIO is not set | ||
874 | 910 | ||
875 | # | 911 | # |
876 | # Multimedia devices | 912 | # Multimedia devices |
@@ -945,6 +981,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
945 | # CONFIG_FB_TRIDENT is not set | 981 | # CONFIG_FB_TRIDENT is not set |
946 | # CONFIG_FB_ARK is not set | 982 | # CONFIG_FB_ARK is not set |
947 | # CONFIG_FB_PM3 is not set | 983 | # CONFIG_FB_PM3 is not set |
984 | # CONFIG_FB_CARMINE is not set | ||
948 | CONFIG_FB_FSL_DIU=y | 985 | CONFIG_FB_FSL_DIU=y |
949 | # CONFIG_FB_IBM_GXT4500 is not set | 986 | # CONFIG_FB_IBM_GXT4500 is not set |
950 | # CONFIG_FB_VIRTUAL is not set | 987 | # CONFIG_FB_VIRTUAL is not set |
@@ -963,15 +1000,7 @@ CONFIG_VGA_CONSOLE=y | |||
963 | CONFIG_DUMMY_CONSOLE=y | 1000 | CONFIG_DUMMY_CONSOLE=y |
964 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 1001 | # CONFIG_FRAMEBUFFER_CONSOLE is not set |
965 | # CONFIG_LOGO is not set | 1002 | # CONFIG_LOGO is not set |
966 | |||
967 | # | ||
968 | # Sound | ||
969 | # | ||
970 | CONFIG_SOUND=y | 1003 | CONFIG_SOUND=y |
971 | |||
972 | # | ||
973 | # Advanced Linux Sound Architecture | ||
974 | # | ||
975 | CONFIG_SND=y | 1004 | CONFIG_SND=y |
976 | CONFIG_SND_TIMER=y | 1005 | CONFIG_SND_TIMER=y |
977 | CONFIG_SND_PCM=y | 1006 | CONFIG_SND_PCM=y |
@@ -985,18 +1014,12 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
985 | CONFIG_SND_VERBOSE_PROCFS=y | 1014 | CONFIG_SND_VERBOSE_PROCFS=y |
986 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1015 | # CONFIG_SND_VERBOSE_PRINTK is not set |
987 | # CONFIG_SND_DEBUG is not set | 1016 | # CONFIG_SND_DEBUG is not set |
988 | 1017 | CONFIG_SND_DRIVERS=y | |
989 | # | ||
990 | # Generic devices | ||
991 | # | ||
992 | # CONFIG_SND_DUMMY is not set | 1018 | # CONFIG_SND_DUMMY is not set |
993 | # CONFIG_SND_MTPAV is not set | 1019 | # CONFIG_SND_MTPAV is not set |
994 | # CONFIG_SND_SERIAL_U16550 is not set | 1020 | # CONFIG_SND_SERIAL_U16550 is not set |
995 | # CONFIG_SND_MPU401 is not set | 1021 | # CONFIG_SND_MPU401 is not set |
996 | 1022 | CONFIG_SND_PCI=y | |
997 | # | ||
998 | # PCI devices | ||
999 | # | ||
1000 | # CONFIG_SND_AD1889 is not set | 1023 | # CONFIG_SND_AD1889 is not set |
1001 | # CONFIG_SND_ALS300 is not set | 1024 | # CONFIG_SND_ALS300 is not set |
1002 | # CONFIG_SND_ALS4000 is not set | 1025 | # CONFIG_SND_ALS4000 is not set |
@@ -1058,42 +1081,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1058 | # CONFIG_SND_VIRTUOSO is not set | 1081 | # CONFIG_SND_VIRTUOSO is not set |
1059 | # CONFIG_SND_VX222 is not set | 1082 | # CONFIG_SND_VX222 is not set |
1060 | # CONFIG_SND_YMFPCI is not set | 1083 | # CONFIG_SND_YMFPCI is not set |
1061 | 1084 | CONFIG_SND_PPC=y | |
1062 | # | ||
1063 | # ALSA PowerMac devices | ||
1064 | # | ||
1065 | # CONFIG_SND_POWERMAC is not set | 1085 | # CONFIG_SND_POWERMAC is not set |
1066 | |||
1067 | # | ||
1068 | # ALSA PowerPC devices | ||
1069 | # | ||
1070 | |||
1071 | # | ||
1072 | # Apple Onboard Audio driver | ||
1073 | # | ||
1074 | # CONFIG_SND_AOA is not set | 1086 | # CONFIG_SND_AOA is not set |
1075 | # CONFIG_SND_AOA_SOUNDBUS is not set | ||
1076 | |||
1077 | # | ||
1078 | # System on Chip audio support | ||
1079 | # | ||
1080 | CONFIG_SND_SOC=y | 1087 | CONFIG_SND_SOC=y |
1081 | |||
1082 | # | ||
1083 | # ALSA SoC audio for Freescale SOCs | ||
1084 | # | ||
1085 | CONFIG_SND_SOC_MPC8610=y | 1088 | CONFIG_SND_SOC_MPC8610=y |
1086 | CONFIG_SND_SOC_MPC8610_HPCD=y | 1089 | CONFIG_SND_SOC_MPC8610_HPCD=y |
1087 | |||
1088 | # | ||
1089 | # SoC Audio for the Texas Instruments OMAP | ||
1090 | # | ||
1091 | CONFIG_SND_SOC_CS4270=y | 1090 | CONFIG_SND_SOC_CS4270=y |
1092 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y | 1091 | CONFIG_SND_SOC_CS4270_VD33_ERRATA=y |
1093 | |||
1094 | # | ||
1095 | # Open Sound System | ||
1096 | # | ||
1097 | # CONFIG_SOUND_PRIME is not set | 1092 | # CONFIG_SOUND_PRIME is not set |
1098 | CONFIG_HID_SUPPORT=y | 1093 | CONFIG_HID_SUPPORT=y |
1099 | CONFIG_HID=y | 1094 | CONFIG_HID=y |
@@ -1108,6 +1103,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1108 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1103 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1109 | 1104 | ||
1110 | # | 1105 | # |
1106 | # Enable Host or Gadget support to see Inventra options | ||
1107 | # | ||
1108 | |||
1109 | # | ||
1111 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1110 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
1112 | # | 1111 | # |
1113 | # CONFIG_USB_GADGET is not set | 1112 | # CONFIG_USB_GADGET is not set |
@@ -1235,6 +1234,7 @@ CONFIG_TMPFS=y | |||
1235 | # CONFIG_CRAMFS is not set | 1234 | # CONFIG_CRAMFS is not set |
1236 | # CONFIG_VXFS_FS is not set | 1235 | # CONFIG_VXFS_FS is not set |
1237 | # CONFIG_MINIX_FS is not set | 1236 | # CONFIG_MINIX_FS is not set |
1237 | # CONFIG_OMFS_FS is not set | ||
1238 | # CONFIG_HPFS_FS is not set | 1238 | # CONFIG_HPFS_FS is not set |
1239 | # CONFIG_QNX4FS_FS is not set | 1239 | # CONFIG_QNX4FS_FS is not set |
1240 | # CONFIG_ROMFS_FS is not set | 1240 | # CONFIG_ROMFS_FS is not set |
@@ -1245,16 +1245,15 @@ CONFIG_NFS_FS=y | |||
1245 | CONFIG_NFS_V3=y | 1245 | CONFIG_NFS_V3=y |
1246 | # CONFIG_NFS_V3_ACL is not set | 1246 | # CONFIG_NFS_V3_ACL is not set |
1247 | # CONFIG_NFS_V4 is not set | 1247 | # CONFIG_NFS_V4 is not set |
1248 | CONFIG_ROOT_NFS=y | ||
1248 | CONFIG_NFSD=y | 1249 | CONFIG_NFSD=y |
1249 | # CONFIG_NFSD_V3 is not set | 1250 | # CONFIG_NFSD_V3 is not set |
1250 | # CONFIG_NFSD_V4 is not set | 1251 | # CONFIG_NFSD_V4 is not set |
1251 | CONFIG_ROOT_NFS=y | ||
1252 | CONFIG_LOCKD=y | 1252 | CONFIG_LOCKD=y |
1253 | CONFIG_LOCKD_V4=y | 1253 | CONFIG_LOCKD_V4=y |
1254 | CONFIG_EXPORTFS=y | 1254 | CONFIG_EXPORTFS=y |
1255 | CONFIG_NFS_COMMON=y | 1255 | CONFIG_NFS_COMMON=y |
1256 | CONFIG_SUNRPC=y | 1256 | CONFIG_SUNRPC=y |
1257 | # CONFIG_SUNRPC_BIND34 is not set | ||
1258 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1257 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1259 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1258 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1260 | # CONFIG_SMB_FS is not set | 1259 | # CONFIG_SMB_FS is not set |
@@ -1334,6 +1333,7 @@ CONFIG_BITREVERSE=y | |||
1334 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1333 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1335 | # CONFIG_CRC_CCITT is not set | 1334 | # CONFIG_CRC_CCITT is not set |
1336 | # CONFIG_CRC16 is not set | 1335 | # CONFIG_CRC16 is not set |
1336 | CONFIG_CRC_T10DIF=y | ||
1337 | # CONFIG_CRC_ITU_T is not set | 1337 | # CONFIG_CRC_ITU_T is not set |
1338 | CONFIG_CRC32=y | 1338 | CONFIG_CRC32=y |
1339 | # CONFIG_CRC7 is not set | 1339 | # CONFIG_CRC7 is not set |
@@ -1358,6 +1358,8 @@ CONFIG_FRAME_WARN=1024 | |||
1358 | CONFIG_DEBUG_KERNEL=y | 1358 | CONFIG_DEBUG_KERNEL=y |
1359 | CONFIG_DEBUG_SHIRQ=y | 1359 | CONFIG_DEBUG_SHIRQ=y |
1360 | CONFIG_DETECT_SOFTLOCKUP=y | 1360 | CONFIG_DETECT_SOFTLOCKUP=y |
1361 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1362 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1361 | CONFIG_SCHED_DEBUG=y | 1363 | CONFIG_SCHED_DEBUG=y |
1362 | # CONFIG_SCHEDSTATS is not set | 1364 | # CONFIG_SCHEDSTATS is not set |
1363 | # CONFIG_TIMER_STATS is not set | 1365 | # CONFIG_TIMER_STATS is not set |
@@ -1376,19 +1378,29 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1376 | CONFIG_DEBUG_INFO=y | 1378 | CONFIG_DEBUG_INFO=y |
1377 | # CONFIG_DEBUG_VM is not set | 1379 | # CONFIG_DEBUG_VM is not set |
1378 | # CONFIG_DEBUG_WRITECOUNT is not set | 1380 | # CONFIG_DEBUG_WRITECOUNT is not set |
1381 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1379 | # CONFIG_DEBUG_LIST is not set | 1382 | # CONFIG_DEBUG_LIST is not set |
1380 | # CONFIG_DEBUG_SG is not set | 1383 | # CONFIG_DEBUG_SG is not set |
1381 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1384 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1382 | # CONFIG_RCU_TORTURE_TEST is not set | 1385 | # CONFIG_RCU_TORTURE_TEST is not set |
1383 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1386 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1384 | # CONFIG_FAULT_INJECTION is not set | 1387 | # CONFIG_FAULT_INJECTION is not set |
1388 | # CONFIG_LATENCYTOP is not set | ||
1389 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1390 | CONFIG_HAVE_FTRACE=y | ||
1391 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1392 | # CONFIG_FTRACE is not set | ||
1393 | # CONFIG_SCHED_TRACER is not set | ||
1394 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1385 | # CONFIG_SAMPLES is not set | 1395 | # CONFIG_SAMPLES is not set |
1396 | CONFIG_HAVE_ARCH_KGDB=y | ||
1397 | # CONFIG_KGDB is not set | ||
1386 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1398 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1387 | # CONFIG_DEBUG_STACK_USAGE is not set | 1399 | # CONFIG_DEBUG_STACK_USAGE is not set |
1388 | # CONFIG_DEBUG_PAGEALLOC is not set | 1400 | # CONFIG_DEBUG_PAGEALLOC is not set |
1389 | # CONFIG_DEBUGGER is not set | ||
1390 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1401 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1391 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1402 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1403 | # CONFIG_XMON is not set | ||
1392 | # CONFIG_IRQSTACKS is not set | 1404 | # CONFIG_IRQSTACKS is not set |
1393 | # CONFIG_BDI_SWITCH is not set | 1405 | # CONFIG_BDI_SWITCH is not set |
1394 | # CONFIG_BOOTX_TEXT is not set | 1406 | # CONFIG_BOOTX_TEXT is not set |
@@ -1443,6 +1455,10 @@ CONFIG_CRYPTO=y | |||
1443 | # CONFIG_CRYPTO_MD4 is not set | 1455 | # CONFIG_CRYPTO_MD4 is not set |
1444 | # CONFIG_CRYPTO_MD5 is not set | 1456 | # CONFIG_CRYPTO_MD5 is not set |
1445 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1457 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1458 | # CONFIG_CRYPTO_RMD128 is not set | ||
1459 | # CONFIG_CRYPTO_RMD160 is not set | ||
1460 | # CONFIG_CRYPTO_RMD256 is not set | ||
1461 | # CONFIG_CRYPTO_RMD320 is not set | ||
1446 | # CONFIG_CRYPTO_SHA1 is not set | 1462 | # CONFIG_CRYPTO_SHA1 is not set |
1447 | # CONFIG_CRYPTO_SHA256 is not set | 1463 | # CONFIG_CRYPTO_SHA256 is not set |
1448 | # CONFIG_CRYPTO_SHA512 is not set | 1464 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1475,6 +1491,7 @@ CONFIG_CRYPTO=y | |||
1475 | # CONFIG_CRYPTO_LZO is not set | 1491 | # CONFIG_CRYPTO_LZO is not set |
1476 | CONFIG_CRYPTO_HW=y | 1492 | CONFIG_CRYPTO_HW=y |
1477 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1493 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1494 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1478 | # CONFIG_PPC_CLOCK is not set | 1495 | # CONFIG_PPC_CLOCK is not set |
1479 | CONFIG_PPC_LIB_RHEAP=y | 1496 | CONFIG_PPC_LIB_RHEAP=y |
1480 | # CONFIG_VIRTUALIZATION is not set | 1497 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig index 867b8c0215f3..ea09be31b6ea 100644 --- a/arch/powerpc/configs/mpc8641_hpcn_defconfig +++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:15 2008 | 4 | # Thu Aug 21 00:52:11 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_ARCH_HAS_ILOG2_U32=y | 39 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -92,7 +93,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
92 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
93 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
94 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
96 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
97 | CONFIG_KALLSYMS_ALL=y | 97 | CONFIG_KALLSYMS_ALL=y |
98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 98 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -100,6 +100,7 @@ CONFIG_HOTPLUG=y | |||
100 | CONFIG_PRINTK=y | 100 | CONFIG_PRINTK=y |
101 | CONFIG_BUG=y | 101 | CONFIG_BUG=y |
102 | CONFIG_ELF_CORE=y | 102 | CONFIG_ELF_CORE=y |
103 | CONFIG_PCSPKR_PLATFORM=y | ||
103 | CONFIG_COMPAT_BRK=y | 104 | CONFIG_COMPAT_BRK=y |
104 | CONFIG_BASE_FULL=y | 105 | CONFIG_BASE_FULL=y |
105 | CONFIG_FUTEX=y | 106 | CONFIG_FUTEX=y |
@@ -118,10 +119,16 @@ CONFIG_SLUB=y | |||
118 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
119 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
120 | # CONFIG_KPROBES is not set | 121 | # CONFIG_KPROBES is not set |
122 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
123 | CONFIG_HAVE_IOREMAP_PROT=y | ||
121 | CONFIG_HAVE_KPROBES=y | 124 | CONFIG_HAVE_KPROBES=y |
122 | CONFIG_HAVE_KRETPROBES=y | 125 | CONFIG_HAVE_KRETPROBES=y |
126 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
123 | # CONFIG_HAVE_DMA_ATTRS is not set | 127 | # CONFIG_HAVE_DMA_ATTRS is not set |
128 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
129 | # CONFIG_HAVE_CLK is not set | ||
124 | CONFIG_PROC_PAGE_MONITOR=y | 130 | CONFIG_PROC_PAGE_MONITOR=y |
131 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
125 | CONFIG_SLABINFO=y | 132 | CONFIG_SLABINFO=y |
126 | CONFIG_RT_MUTEXES=y | 133 | CONFIG_RT_MUTEXES=y |
127 | # CONFIG_TINY_SHMEM is not set | 134 | # CONFIG_TINY_SHMEM is not set |
@@ -139,6 +146,7 @@ CONFIG_LBD=y | |||
139 | # CONFIG_BLK_DEV_IO_TRACE is not set | 146 | # CONFIG_BLK_DEV_IO_TRACE is not set |
140 | # CONFIG_LSF is not set | 147 | # CONFIG_LSF is not set |
141 | # CONFIG_BLK_DEV_BSG is not set | 148 | # CONFIG_BLK_DEV_BSG is not set |
149 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
142 | 150 | ||
143 | # | 151 | # |
144 | # IO Schedulers | 152 | # IO Schedulers |
@@ -157,30 +165,40 @@ CONFIG_CLASSIC_RCU=y | |||
157 | # | 165 | # |
158 | # Platform support | 166 | # Platform support |
159 | # | 167 | # |
160 | # CONFIG_PPC_MULTIPLATFORM is not set | 168 | CONFIG_PPC_MULTIPLATFORM=y |
161 | # CONFIG_PPC_82xx is not set | 169 | CONFIG_CLASSIC32=y |
162 | # CONFIG_PPC_83xx is not set | 170 | CONFIG_PPC_CHRP=y |
163 | CONFIG_PPC_86xx=y | 171 | # CONFIG_MPC5121_ADS is not set |
164 | # CONFIG_PPC_MPC512x is not set | 172 | # CONFIG_MPC5121_GENERIC is not set |
165 | # CONFIG_PPC_MPC5121 is not set | 173 | # CONFIG_PPC_MPC52xx is not set |
174 | CONFIG_PPC_PMAC=y | ||
166 | # CONFIG_PPC_CELL is not set | 175 | # CONFIG_PPC_CELL is not set |
167 | # CONFIG_PPC_CELL_NATIVE is not set | 176 | # CONFIG_PPC_CELL_NATIVE is not set |
177 | # CONFIG_PPC_82xx is not set | ||
168 | # CONFIG_PQ2ADS is not set | 178 | # CONFIG_PQ2ADS is not set |
179 | # CONFIG_PPC_83xx is not set | ||
180 | CONFIG_PPC_86xx=y | ||
169 | CONFIG_MPC8641_HPCN=y | 181 | CONFIG_MPC8641_HPCN=y |
170 | # CONFIG_SBC8641D is not set | 182 | # CONFIG_SBC8641D is not set |
171 | # CONFIG_MPC8610_HPCD is not set | 183 | # CONFIG_MPC8610_HPCD is not set |
172 | CONFIG_MPC8641=y | 184 | CONFIG_MPC8641=y |
185 | CONFIG_PPC_NATIVE=y | ||
186 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
173 | # CONFIG_IPIC is not set | 187 | # CONFIG_IPIC is not set |
174 | CONFIG_MPIC=y | 188 | CONFIG_MPIC=y |
175 | # CONFIG_MPIC_WEIRD is not set | 189 | # CONFIG_MPIC_WEIRD is not set |
176 | CONFIG_PPC_I8259=y | 190 | CONFIG_PPC_I8259=y |
177 | # CONFIG_PPC_RTAS is not set | 191 | CONFIG_PPC_RTAS=y |
192 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
193 | CONFIG_RTAS_PROC=y | ||
178 | # CONFIG_MMIO_NVRAM is not set | 194 | # CONFIG_MMIO_NVRAM is not set |
179 | # CONFIG_PPC_MPC106 is not set | 195 | CONFIG_PPC_MPC106=y |
180 | # CONFIG_PPC_970_NAP is not set | 196 | # CONFIG_PPC_970_NAP is not set |
181 | # CONFIG_PPC_INDIRECT_IO is not set | 197 | # CONFIG_PPC_INDIRECT_IO is not set |
182 | # CONFIG_GENERIC_IOMAP is not set | 198 | # CONFIG_GENERIC_IOMAP is not set |
183 | # CONFIG_CPU_FREQ is not set | 199 | # CONFIG_CPU_FREQ is not set |
200 | # CONFIG_PPC601_SYNC_FIX is not set | ||
201 | # CONFIG_TAU is not set | ||
184 | CONFIG_FSL_ULI1575=y | 202 | CONFIG_FSL_ULI1575=y |
185 | 203 | ||
186 | # | 204 | # |
@@ -196,16 +214,18 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
196 | # CONFIG_HZ_300 is not set | 214 | # CONFIG_HZ_300 is not set |
197 | CONFIG_HZ_1000=y | 215 | CONFIG_HZ_1000=y |
198 | CONFIG_HZ=1000 | 216 | CONFIG_HZ=1000 |
199 | # CONFIG_SCHED_HRTICK is not set | 217 | CONFIG_SCHED_HRTICK=y |
200 | CONFIG_PREEMPT_NONE=y | 218 | CONFIG_PREEMPT_NONE=y |
201 | # CONFIG_PREEMPT_VOLUNTARY is not set | 219 | # CONFIG_PREEMPT_VOLUNTARY is not set |
202 | # CONFIG_PREEMPT is not set | 220 | # CONFIG_PREEMPT is not set |
203 | CONFIG_BINFMT_ELF=y | 221 | CONFIG_BINFMT_ELF=y |
204 | CONFIG_BINFMT_MISC=m | 222 | CONFIG_BINFMT_MISC=m |
205 | # CONFIG_IOMMU_HELPER is not set | 223 | # CONFIG_IOMMU_HELPER is not set |
224 | # CONFIG_HOTPLUG_CPU is not set | ||
206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 225 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
207 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 226 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
208 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 227 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
228 | # CONFIG_KEXEC is not set | ||
209 | # CONFIG_IRQ_ALL_CPUS is not set | 229 | # CONFIG_IRQ_ALL_CPUS is not set |
210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 230 | CONFIG_ARCH_FLATMEM_ENABLE=y |
211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 231 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
@@ -219,6 +239,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 239 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | 240 | CONFIG_PAGEFLAGS_EXTENDED=y |
221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 241 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
242 | CONFIG_MIGRATION=y | ||
222 | # CONFIG_RESOURCES_64BIT is not set | 243 | # CONFIG_RESOURCES_64BIT is not set |
223 | CONFIG_ZONE_DMA_FLAG=1 | 244 | CONFIG_ZONE_DMA_FLAG=1 |
224 | CONFIG_BOUNCE=y | 245 | CONFIG_BOUNCE=y |
@@ -226,6 +247,7 @@ CONFIG_VIRT_TO_BUS=y | |||
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 247 | CONFIG_FORCE_MAX_ZONEORDER=11 |
227 | CONFIG_PROC_DEVICETREE=y | 248 | CONFIG_PROC_DEVICETREE=y |
228 | # CONFIG_CMDLINE_BOOL is not set | 249 | # CONFIG_CMDLINE_BOOL is not set |
250 | CONFIG_EXTRA_TARGETS="" | ||
229 | # CONFIG_PM is not set | 251 | # CONFIG_PM is not set |
230 | CONFIG_SECCOMP=y | 252 | CONFIG_SECCOMP=y |
231 | CONFIG_ISA_DMA_API=y | 253 | CONFIG_ISA_DMA_API=y |
@@ -233,11 +255,13 @@ CONFIG_ISA_DMA_API=y | |||
233 | # | 255 | # |
234 | # Bus options | 256 | # Bus options |
235 | # | 257 | # |
258 | # CONFIG_ISA is not set | ||
236 | CONFIG_ZONE_DMA=y | 259 | CONFIG_ZONE_DMA=y |
237 | CONFIG_GENERIC_ISA_DMA=y | 260 | CONFIG_GENERIC_ISA_DMA=y |
238 | CONFIG_PPC_INDIRECT_PCI=y | 261 | CONFIG_PPC_INDIRECT_PCI=y |
239 | CONFIG_FSL_SOC=y | 262 | CONFIG_FSL_SOC=y |
240 | CONFIG_FSL_PCI=y | 263 | CONFIG_FSL_PCI=y |
264 | CONFIG_PPC_PCI_CHOICE=y | ||
241 | CONFIG_PCI=y | 265 | CONFIG_PCI=y |
242 | CONFIG_PCI_DOMAINS=y | 266 | CONFIG_PCI_DOMAINS=y |
243 | CONFIG_PCI_SYSCALL=y | 267 | CONFIG_PCI_SYSCALL=y |
@@ -264,10 +288,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
264 | CONFIG_KERNEL_START=0xc0000000 | 288 | CONFIG_KERNEL_START=0xc0000000 |
265 | CONFIG_PHYSICAL_START=0x00000000 | 289 | CONFIG_PHYSICAL_START=0x00000000 |
266 | CONFIG_TASK_SIZE=0xc0000000 | 290 | CONFIG_TASK_SIZE=0xc0000000 |
267 | |||
268 | # | ||
269 | # Networking | ||
270 | # | ||
271 | CONFIG_NET=y | 291 | CONFIG_NET=y |
272 | 292 | ||
273 | # | 293 | # |
@@ -393,6 +413,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
393 | CONFIG_STANDALONE=y | 413 | CONFIG_STANDALONE=y |
394 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 414 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
395 | CONFIG_FW_LOADER=y | 415 | CONFIG_FW_LOADER=y |
416 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
417 | CONFIG_EXTRA_FIRMWARE="" | ||
396 | # CONFIG_DEBUG_DRIVER is not set | 418 | # CONFIG_DEBUG_DRIVER is not set |
397 | # CONFIG_DEBUG_DEVRES is not set | 419 | # CONFIG_DEBUG_DEVRES is not set |
398 | # CONFIG_SYS_HYPERVISOR is not set | 420 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -403,6 +425,7 @@ CONFIG_OF_I2C=y | |||
403 | # CONFIG_PARPORT is not set | 425 | # CONFIG_PARPORT is not set |
404 | CONFIG_BLK_DEV=y | 426 | CONFIG_BLK_DEV=y |
405 | # CONFIG_BLK_DEV_FD is not set | 427 | # CONFIG_BLK_DEV_FD is not set |
428 | # CONFIG_MAC_FLOPPY is not set | ||
406 | # CONFIG_BLK_CPQ_DA is not set | 429 | # CONFIG_BLK_CPQ_DA is not set |
407 | # CONFIG_BLK_CPQ_CISS_DA is not set | 430 | # CONFIG_BLK_CPQ_CISS_DA is not set |
408 | # CONFIG_BLK_DEV_DAC960 is not set | 431 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -419,12 +442,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
419 | # CONFIG_BLK_DEV_XIP is not set | 442 | # CONFIG_BLK_DEV_XIP is not set |
420 | # CONFIG_CDROM_PKTCDVD is not set | 443 | # CONFIG_CDROM_PKTCDVD is not set |
421 | # CONFIG_ATA_OVER_ETH is not set | 444 | # CONFIG_ATA_OVER_ETH is not set |
445 | # CONFIG_BLK_DEV_HD is not set | ||
422 | CONFIG_MISC_DEVICES=y | 446 | CONFIG_MISC_DEVICES=y |
423 | # CONFIG_PHANTOM is not set | 447 | # CONFIG_PHANTOM is not set |
424 | # CONFIG_EEPROM_93CX6 is not set | 448 | # CONFIG_EEPROM_93CX6 is not set |
425 | # CONFIG_SGI_IOC4 is not set | 449 | # CONFIG_SGI_IOC4 is not set |
426 | # CONFIG_TIFM_CORE is not set | 450 | # CONFIG_TIFM_CORE is not set |
427 | # CONFIG_ENCLOSURE_SERVICES is not set | 451 | # CONFIG_ENCLOSURE_SERVICES is not set |
452 | # CONFIG_HP_ILO is not set | ||
428 | CONFIG_HAVE_IDE=y | 453 | CONFIG_HAVE_IDE=y |
429 | # CONFIG_IDE is not set | 454 | # CONFIG_IDE is not set |
430 | 455 | ||
@@ -503,7 +528,10 @@ CONFIG_SCSI_LOWLEVEL=y | |||
503 | # CONFIG_SCSI_DC390T is not set | 528 | # CONFIG_SCSI_DC390T is not set |
504 | # CONFIG_SCSI_NSP32 is not set | 529 | # CONFIG_SCSI_NSP32 is not set |
505 | # CONFIG_SCSI_DEBUG is not set | 530 | # CONFIG_SCSI_DEBUG is not set |
531 | # CONFIG_SCSI_MESH is not set | ||
532 | # CONFIG_SCSI_MAC53C94 is not set | ||
506 | # CONFIG_SCSI_SRP is not set | 533 | # CONFIG_SCSI_SRP is not set |
534 | # CONFIG_SCSI_DH is not set | ||
507 | CONFIG_ATA=y | 535 | CONFIG_ATA=y |
508 | # CONFIG_ATA_NONSTANDARD is not set | 536 | # CONFIG_ATA_NONSTANDARD is not set |
509 | CONFIG_SATA_PMP=y | 537 | CONFIG_SATA_PMP=y |
@@ -571,12 +599,15 @@ CONFIG_PATA_ALI=y | |||
571 | # | 599 | # |
572 | # IEEE 1394 (FireWire) support | 600 | # IEEE 1394 (FireWire) support |
573 | # | 601 | # |
602 | |||
603 | # | ||
604 | # Enable only one of the two stacks, unless you know what you are doing | ||
605 | # | ||
574 | # CONFIG_FIREWIRE is not set | 606 | # CONFIG_FIREWIRE is not set |
575 | # CONFIG_IEEE1394 is not set | 607 | # CONFIG_IEEE1394 is not set |
576 | # CONFIG_I2O is not set | 608 | # CONFIG_I2O is not set |
577 | # CONFIG_MACINTOSH_DRIVERS is not set | 609 | # CONFIG_MACINTOSH_DRIVERS is not set |
578 | CONFIG_NETDEVICES=y | 610 | CONFIG_NETDEVICES=y |
579 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
580 | CONFIG_DUMMY=y | 611 | CONFIG_DUMMY=y |
581 | # CONFIG_BONDING is not set | 612 | # CONFIG_BONDING is not set |
582 | # CONFIG_MACVLAN is not set | 613 | # CONFIG_MACVLAN is not set |
@@ -603,6 +634,8 @@ CONFIG_VITESSE_PHY=y | |||
603 | # CONFIG_MDIO_BITBANG is not set | 634 | # CONFIG_MDIO_BITBANG is not set |
604 | CONFIG_NET_ETHERNET=y | 635 | CONFIG_NET_ETHERNET=y |
605 | CONFIG_MII=y | 636 | CONFIG_MII=y |
637 | # CONFIG_MACE is not set | ||
638 | # CONFIG_BMAC is not set | ||
606 | # CONFIG_HAPPYMEAL is not set | 639 | # CONFIG_HAPPYMEAL is not set |
607 | # CONFIG_SUNGEM is not set | 640 | # CONFIG_SUNGEM is not set |
608 | # CONFIG_CASSINI is not set | 641 | # CONFIG_CASSINI is not set |
@@ -620,7 +653,6 @@ CONFIG_NETDEV_1000=y | |||
620 | # CONFIG_DL2K is not set | 653 | # CONFIG_DL2K is not set |
621 | # CONFIG_E1000 is not set | 654 | # CONFIG_E1000 is not set |
622 | # CONFIG_E1000E is not set | 655 | # CONFIG_E1000E is not set |
623 | # CONFIG_E1000E_ENABLED is not set | ||
624 | # CONFIG_IP1000 is not set | 656 | # CONFIG_IP1000 is not set |
625 | # CONFIG_IGB is not set | 657 | # CONFIG_IGB is not set |
626 | # CONFIG_NS83820 is not set | 658 | # CONFIG_NS83820 is not set |
@@ -634,9 +666,10 @@ CONFIG_NETDEV_1000=y | |||
634 | # CONFIG_TIGON3 is not set | 666 | # CONFIG_TIGON3 is not set |
635 | # CONFIG_BNX2 is not set | 667 | # CONFIG_BNX2 is not set |
636 | CONFIG_GIANFAR=y | 668 | CONFIG_GIANFAR=y |
637 | CONFIG_GFAR_NAPI=y | 669 | # CONFIG_MV643XX_ETH is not set |
638 | # CONFIG_QLA3XXX is not set | 670 | # CONFIG_QLA3XXX is not set |
639 | # CONFIG_ATL1 is not set | 671 | # CONFIG_ATL1 is not set |
672 | # CONFIG_ATL1E is not set | ||
640 | CONFIG_NETDEV_10000=y | 673 | CONFIG_NETDEV_10000=y |
641 | # CONFIG_CHELSIO_T1 is not set | 674 | # CONFIG_CHELSIO_T1 is not set |
642 | # CONFIG_CHELSIO_T3 is not set | 675 | # CONFIG_CHELSIO_T3 is not set |
@@ -713,12 +746,14 @@ CONFIG_SERIO_SERPORT=y | |||
713 | # CONFIG_SERIO_PCIPS2 is not set | 746 | # CONFIG_SERIO_PCIPS2 is not set |
714 | CONFIG_SERIO_LIBPS2=y | 747 | CONFIG_SERIO_LIBPS2=y |
715 | # CONFIG_SERIO_RAW is not set | 748 | # CONFIG_SERIO_RAW is not set |
749 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
716 | # CONFIG_GAMEPORT is not set | 750 | # CONFIG_GAMEPORT is not set |
717 | 751 | ||
718 | # | 752 | # |
719 | # Character devices | 753 | # Character devices |
720 | # | 754 | # |
721 | CONFIG_VT=y | 755 | CONFIG_VT=y |
756 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
722 | CONFIG_VT_CONSOLE=y | 757 | CONFIG_VT_CONSOLE=y |
723 | CONFIG_HW_CONSOLE=y | 758 | CONFIG_HW_CONSOLE=y |
724 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 759 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -746,11 +781,14 @@ CONFIG_SERIAL_8250_RSA=y | |||
746 | # CONFIG_SERIAL_UARTLITE is not set | 781 | # CONFIG_SERIAL_UARTLITE is not set |
747 | CONFIG_SERIAL_CORE=y | 782 | CONFIG_SERIAL_CORE=y |
748 | CONFIG_SERIAL_CORE_CONSOLE=y | 783 | CONFIG_SERIAL_CORE_CONSOLE=y |
784 | # CONFIG_SERIAL_PMACZILOG is not set | ||
749 | # CONFIG_SERIAL_JSM is not set | 785 | # CONFIG_SERIAL_JSM is not set |
750 | # CONFIG_SERIAL_OF_PLATFORM is not set | 786 | # CONFIG_SERIAL_OF_PLATFORM is not set |
751 | CONFIG_UNIX98_PTYS=y | 787 | CONFIG_UNIX98_PTYS=y |
752 | CONFIG_LEGACY_PTYS=y | 788 | CONFIG_LEGACY_PTYS=y |
753 | CONFIG_LEGACY_PTY_COUNT=256 | 789 | CONFIG_LEGACY_PTY_COUNT=256 |
790 | # CONFIG_BRIQ_PANEL is not set | ||
791 | # CONFIG_HVC_RTAS is not set | ||
754 | # CONFIG_IPMI_HANDLER is not set | 792 | # CONFIG_IPMI_HANDLER is not set |
755 | # CONFIG_HW_RANDOM is not set | 793 | # CONFIG_HW_RANDOM is not set |
756 | CONFIG_NVRAM=y | 794 | CONFIG_NVRAM=y |
@@ -762,43 +800,70 @@ CONFIG_DEVPORT=y | |||
762 | CONFIG_I2C=y | 800 | CONFIG_I2C=y |
763 | CONFIG_I2C_BOARDINFO=y | 801 | CONFIG_I2C_BOARDINFO=y |
764 | # CONFIG_I2C_CHARDEV is not set | 802 | # CONFIG_I2C_CHARDEV is not set |
803 | CONFIG_I2C_HELPER_AUTO=y | ||
765 | 804 | ||
766 | # | 805 | # |
767 | # I2C Hardware Bus support | 806 | # I2C Hardware Bus support |
768 | # | 807 | # |
808 | |||
809 | # | ||
810 | # PC SMBus host controller drivers | ||
811 | # | ||
769 | # CONFIG_I2C_ALI1535 is not set | 812 | # CONFIG_I2C_ALI1535 is not set |
770 | # CONFIG_I2C_ALI1563 is not set | 813 | # CONFIG_I2C_ALI1563 is not set |
771 | # CONFIG_I2C_ALI15X3 is not set | 814 | # CONFIG_I2C_ALI15X3 is not set |
772 | # CONFIG_I2C_AMD756 is not set | 815 | # CONFIG_I2C_AMD756 is not set |
773 | # CONFIG_I2C_AMD8111 is not set | 816 | # CONFIG_I2C_AMD8111 is not set |
774 | # CONFIG_I2C_I801 is not set | 817 | # CONFIG_I2C_I801 is not set |
775 | # CONFIG_I2C_I810 is not set | 818 | # CONFIG_I2C_ISCH is not set |
776 | # CONFIG_I2C_PIIX4 is not set | 819 | # CONFIG_I2C_PIIX4 is not set |
777 | CONFIG_I2C_MPC=y | ||
778 | # CONFIG_I2C_NFORCE2 is not set | 820 | # CONFIG_I2C_NFORCE2 is not set |
779 | # CONFIG_I2C_OCORES is not set | ||
780 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
781 | # CONFIG_I2C_PROSAVAGE is not set | ||
782 | # CONFIG_I2C_SAVAGE4 is not set | ||
783 | # CONFIG_I2C_SIMTEC is not set | ||
784 | # CONFIG_I2C_SIS5595 is not set | 821 | # CONFIG_I2C_SIS5595 is not set |
785 | # CONFIG_I2C_SIS630 is not set | 822 | # CONFIG_I2C_SIS630 is not set |
786 | # CONFIG_I2C_SIS96X is not set | 823 | # CONFIG_I2C_SIS96X is not set |
787 | # CONFIG_I2C_TAOS_EVM is not set | ||
788 | # CONFIG_I2C_STUB is not set | ||
789 | # CONFIG_I2C_TINY_USB is not set | ||
790 | # CONFIG_I2C_VIA is not set | 824 | # CONFIG_I2C_VIA is not set |
791 | # CONFIG_I2C_VIAPRO is not set | 825 | # CONFIG_I2C_VIAPRO is not set |
826 | |||
827 | # | ||
828 | # Mac SMBus host controller drivers | ||
829 | # | ||
830 | # CONFIG_I2C_HYDRA is not set | ||
831 | CONFIG_I2C_POWERMAC=y | ||
832 | |||
833 | # | ||
834 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
835 | # | ||
836 | CONFIG_I2C_MPC=y | ||
837 | # CONFIG_I2C_OCORES is not set | ||
838 | # CONFIG_I2C_SIMTEC is not set | ||
839 | |||
840 | # | ||
841 | # External I2C/SMBus adapter drivers | ||
842 | # | ||
843 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
844 | # CONFIG_I2C_TAOS_EVM is not set | ||
845 | # CONFIG_I2C_TINY_USB is not set | ||
846 | |||
847 | # | ||
848 | # Graphics adapter I2C/DDC channel drivers | ||
849 | # | ||
792 | # CONFIG_I2C_VOODOO3 is not set | 850 | # CONFIG_I2C_VOODOO3 is not set |
851 | |||
852 | # | ||
853 | # Other I2C/SMBus bus drivers | ||
854 | # | ||
793 | # CONFIG_I2C_PCA_PLATFORM is not set | 855 | # CONFIG_I2C_PCA_PLATFORM is not set |
856 | # CONFIG_I2C_STUB is not set | ||
794 | 857 | ||
795 | # | 858 | # |
796 | # Miscellaneous I2C Chip support | 859 | # Miscellaneous I2C Chip support |
797 | # | 860 | # |
798 | # CONFIG_DS1682 is not set | 861 | # CONFIG_DS1682 is not set |
862 | # CONFIG_AT24 is not set | ||
799 | CONFIG_SENSORS_EEPROM=y | 863 | CONFIG_SENSORS_EEPROM=y |
800 | # CONFIG_SENSORS_PCF8574 is not set | 864 | # CONFIG_SENSORS_PCF8574 is not set |
801 | # CONFIG_PCF8575 is not set | 865 | # CONFIG_PCF8575 is not set |
866 | # CONFIG_SENSORS_PCA9539 is not set | ||
802 | # CONFIG_SENSORS_PCF8591 is not set | 867 | # CONFIG_SENSORS_PCF8591 is not set |
803 | # CONFIG_SENSORS_MAX6875 is not set | 868 | # CONFIG_SENSORS_MAX6875 is not set |
804 | # CONFIG_SENSORS_TSL2550 is not set | 869 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -807,10 +872,13 @@ CONFIG_SENSORS_EEPROM=y | |||
807 | # CONFIG_I2C_DEBUG_BUS is not set | 872 | # CONFIG_I2C_DEBUG_BUS is not set |
808 | # CONFIG_I2C_DEBUG_CHIP is not set | 873 | # CONFIG_I2C_DEBUG_CHIP is not set |
809 | # CONFIG_SPI is not set | 874 | # CONFIG_SPI is not set |
875 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
876 | # CONFIG_GPIOLIB is not set | ||
810 | # CONFIG_W1 is not set | 877 | # CONFIG_W1 is not set |
811 | # CONFIG_POWER_SUPPLY is not set | 878 | # CONFIG_POWER_SUPPLY is not set |
812 | # CONFIG_HWMON is not set | 879 | # CONFIG_HWMON is not set |
813 | # CONFIG_THERMAL is not set | 880 | # CONFIG_THERMAL is not set |
881 | # CONFIG_THERMAL_HWMON is not set | ||
814 | # CONFIG_WATCHDOG is not set | 882 | # CONFIG_WATCHDOG is not set |
815 | 883 | ||
816 | # | 884 | # |
@@ -822,8 +890,10 @@ CONFIG_SSB_POSSIBLE=y | |||
822 | # | 890 | # |
823 | # Multifunction device drivers | 891 | # Multifunction device drivers |
824 | # | 892 | # |
893 | # CONFIG_MFD_CORE is not set | ||
825 | # CONFIG_MFD_SM501 is not set | 894 | # CONFIG_MFD_SM501 is not set |
826 | # CONFIG_HTC_PASIC3 is not set | 895 | # CONFIG_HTC_PASIC3 is not set |
896 | # CONFIG_MFD_TMIO is not set | ||
827 | 897 | ||
828 | # | 898 | # |
829 | # Multimedia devices | 899 | # Multimedia devices |
@@ -865,6 +935,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
865 | # CONFIG_DVB_TTUSB_BUDGET is not set | 935 | # CONFIG_DVB_TTUSB_BUDGET is not set |
866 | # CONFIG_DVB_TTUSB_DEC is not set | 936 | # CONFIG_DVB_TTUSB_DEC is not set |
867 | # CONFIG_DVB_CINERGYT2 is not set | 937 | # CONFIG_DVB_CINERGYT2 is not set |
938 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
868 | 939 | ||
869 | # | 940 | # |
870 | # Supported FlexCopII (B2C2) Adapters | 941 | # Supported FlexCopII (B2C2) Adapters |
@@ -911,6 +982,7 @@ CONFIG_DVB_CAPTURE_DRIVERS=y | |||
911 | # CONFIG_DVB_SP887X is not set | 982 | # CONFIG_DVB_SP887X is not set |
912 | # CONFIG_DVB_CX22700 is not set | 983 | # CONFIG_DVB_CX22700 is not set |
913 | # CONFIG_DVB_CX22702 is not set | 984 | # CONFIG_DVB_CX22702 is not set |
985 | # CONFIG_DVB_DRX397XD is not set | ||
914 | # CONFIG_DVB_L64781 is not set | 986 | # CONFIG_DVB_L64781 is not set |
915 | # CONFIG_DVB_TDA1004X is not set | 987 | # CONFIG_DVB_TDA1004X is not set |
916 | # CONFIG_DVB_NXT6000 is not set | 988 | # CONFIG_DVB_NXT6000 is not set |
@@ -978,15 +1050,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
978 | CONFIG_VGA_CONSOLE=y | 1050 | CONFIG_VGA_CONSOLE=y |
979 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1051 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
980 | CONFIG_DUMMY_CONSOLE=y | 1052 | CONFIG_DUMMY_CONSOLE=y |
981 | |||
982 | # | ||
983 | # Sound | ||
984 | # | ||
985 | CONFIG_SOUND=y | 1053 | CONFIG_SOUND=y |
986 | |||
987 | # | ||
988 | # Advanced Linux Sound Architecture | ||
989 | # | ||
990 | CONFIG_SND=y | 1054 | CONFIG_SND=y |
991 | CONFIG_SND_TIMER=y | 1055 | CONFIG_SND_TIMER=y |
992 | CONFIG_SND_PCM=y | 1056 | CONFIG_SND_PCM=y |
@@ -1000,19 +1064,15 @@ CONFIG_SND_PCM_OSS_PLUGINS=y | |||
1000 | CONFIG_SND_VERBOSE_PROCFS=y | 1064 | CONFIG_SND_VERBOSE_PROCFS=y |
1001 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1065 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1002 | # CONFIG_SND_DEBUG is not set | 1066 | # CONFIG_SND_DEBUG is not set |
1003 | 1067 | CONFIG_SND_VMASTER=y | |
1004 | # | ||
1005 | # Generic devices | ||
1006 | # | ||
1007 | CONFIG_SND_AC97_CODEC=y | 1068 | CONFIG_SND_AC97_CODEC=y |
1069 | CONFIG_SND_DRIVERS=y | ||
1008 | # CONFIG_SND_DUMMY is not set | 1070 | # CONFIG_SND_DUMMY is not set |
1009 | # CONFIG_SND_MTPAV is not set | 1071 | # CONFIG_SND_MTPAV is not set |
1010 | # CONFIG_SND_SERIAL_U16550 is not set | 1072 | # CONFIG_SND_SERIAL_U16550 is not set |
1011 | # CONFIG_SND_MPU401 is not set | 1073 | # CONFIG_SND_MPU401 is not set |
1012 | 1074 | # CONFIG_SND_AC97_POWER_SAVE is not set | |
1013 | # | 1075 | CONFIG_SND_PCI=y |
1014 | # PCI devices | ||
1015 | # | ||
1016 | # CONFIG_SND_AD1889 is not set | 1076 | # CONFIG_SND_AD1889 is not set |
1017 | # CONFIG_SND_ALS300 is not set | 1077 | # CONFIG_SND_ALS300 is not set |
1018 | # CONFIG_SND_ALS4000 is not set | 1078 | # CONFIG_SND_ALS4000 is not set |
@@ -1074,39 +1134,14 @@ CONFIG_SND_INTEL8X0=y | |||
1074 | # CONFIG_SND_VIRTUOSO is not set | 1134 | # CONFIG_SND_VIRTUOSO is not set |
1075 | # CONFIG_SND_VX222 is not set | 1135 | # CONFIG_SND_VX222 is not set |
1076 | # CONFIG_SND_YMFPCI is not set | 1136 | # CONFIG_SND_YMFPCI is not set |
1077 | # CONFIG_SND_AC97_POWER_SAVE is not set | 1137 | CONFIG_SND_PPC=y |
1078 | 1138 | # CONFIG_SND_POWERMAC is not set | |
1079 | # | 1139 | # CONFIG_SND_AOA is not set |
1080 | # ALSA PowerMac devices | 1140 | CONFIG_SND_USB=y |
1081 | # | ||
1082 | |||
1083 | # | ||
1084 | # ALSA PowerPC devices | ||
1085 | # | ||
1086 | |||
1087 | # | ||
1088 | # USB devices | ||
1089 | # | ||
1090 | # CONFIG_SND_USB_AUDIO is not set | 1141 | # CONFIG_SND_USB_AUDIO is not set |
1091 | # CONFIG_SND_USB_USX2Y is not set | 1142 | # CONFIG_SND_USB_USX2Y is not set |
1092 | # CONFIG_SND_USB_CAIAQ is not set | 1143 | # CONFIG_SND_USB_CAIAQ is not set |
1093 | |||
1094 | # | ||
1095 | # System on Chip audio support | ||
1096 | # | ||
1097 | # CONFIG_SND_SOC is not set | 1144 | # CONFIG_SND_SOC is not set |
1098 | |||
1099 | # | ||
1100 | # ALSA SoC audio for Freescale SOCs | ||
1101 | # | ||
1102 | |||
1103 | # | ||
1104 | # SoC Audio for the Texas Instruments OMAP | ||
1105 | # | ||
1106 | |||
1107 | # | ||
1108 | # Open Sound System | ||
1109 | # | ||
1110 | # CONFIG_SOUND_PRIME is not set | 1145 | # CONFIG_SOUND_PRIME is not set |
1111 | CONFIG_AC97_BUS=y | 1146 | CONFIG_AC97_BUS=y |
1112 | CONFIG_HID_SUPPORT=y | 1147 | CONFIG_HID_SUPPORT=y |
@@ -1138,6 +1173,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1138 | # CONFIG_USB_OTG is not set | 1173 | # CONFIG_USB_OTG is not set |
1139 | # CONFIG_USB_OTG_WHITELIST is not set | 1174 | # CONFIG_USB_OTG_WHITELIST is not set |
1140 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1175 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1176 | CONFIG_USB_MON=y | ||
1141 | 1177 | ||
1142 | # | 1178 | # |
1143 | # USB Host Controller Drivers | 1179 | # USB Host Controller Drivers |
@@ -1189,6 +1225,7 @@ CONFIG_USB_STORAGE=y | |||
1189 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1225 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1190 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1226 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1191 | # CONFIG_USB_STORAGE_KARMA is not set | 1227 | # CONFIG_USB_STORAGE_KARMA is not set |
1228 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1192 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1229 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1193 | # CONFIG_USB_LIBUSUAL is not set | 1230 | # CONFIG_USB_LIBUSUAL is not set |
1194 | 1231 | ||
@@ -1197,7 +1234,6 @@ CONFIG_USB_STORAGE=y | |||
1197 | # | 1234 | # |
1198 | # CONFIG_USB_MDC800 is not set | 1235 | # CONFIG_USB_MDC800 is not set |
1199 | # CONFIG_USB_MICROTEK is not set | 1236 | # CONFIG_USB_MICROTEK is not set |
1200 | CONFIG_USB_MON=y | ||
1201 | 1237 | ||
1202 | # | 1238 | # |
1203 | # USB port drivers | 1239 | # USB port drivers |
@@ -1210,7 +1246,6 @@ CONFIG_USB_MON=y | |||
1210 | # CONFIG_USB_EMI62 is not set | 1246 | # CONFIG_USB_EMI62 is not set |
1211 | # CONFIG_USB_EMI26 is not set | 1247 | # CONFIG_USB_EMI26 is not set |
1212 | # CONFIG_USB_ADUTUX is not set | 1248 | # CONFIG_USB_ADUTUX is not set |
1213 | # CONFIG_USB_AUERSWALD is not set | ||
1214 | # CONFIG_USB_RIO500 is not set | 1249 | # CONFIG_USB_RIO500 is not set |
1215 | # CONFIG_USB_LEGOTOWER is not set | 1250 | # CONFIG_USB_LEGOTOWER is not set |
1216 | # CONFIG_USB_LCD is not set | 1251 | # CONFIG_USB_LCD is not set |
@@ -1264,6 +1299,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1264 | # CONFIG_RTC_DRV_PCF8583 is not set | 1299 | # CONFIG_RTC_DRV_PCF8583 is not set |
1265 | # CONFIG_RTC_DRV_M41T80 is not set | 1300 | # CONFIG_RTC_DRV_M41T80 is not set |
1266 | # CONFIG_RTC_DRV_S35390A is not set | 1301 | # CONFIG_RTC_DRV_S35390A is not set |
1302 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1267 | 1303 | ||
1268 | # | 1304 | # |
1269 | # SPI RTC drivers | 1305 | # SPI RTC drivers |
@@ -1362,6 +1398,7 @@ CONFIG_EFS_FS=m | |||
1362 | CONFIG_CRAMFS=y | 1398 | CONFIG_CRAMFS=y |
1363 | CONFIG_VXFS_FS=m | 1399 | CONFIG_VXFS_FS=m |
1364 | # CONFIG_MINIX_FS is not set | 1400 | # CONFIG_MINIX_FS is not set |
1401 | # CONFIG_OMFS_FS is not set | ||
1365 | CONFIG_HPFS_FS=m | 1402 | CONFIG_HPFS_FS=m |
1366 | CONFIG_QNX4FS_FS=m | 1403 | CONFIG_QNX4FS_FS=m |
1367 | # CONFIG_ROMFS_FS is not set | 1404 | # CONFIG_ROMFS_FS is not set |
@@ -1374,17 +1411,16 @@ CONFIG_NFS_FS=y | |||
1374 | CONFIG_NFS_V3=y | 1411 | CONFIG_NFS_V3=y |
1375 | # CONFIG_NFS_V3_ACL is not set | 1412 | # CONFIG_NFS_V3_ACL is not set |
1376 | CONFIG_NFS_V4=y | 1413 | CONFIG_NFS_V4=y |
1414 | CONFIG_ROOT_NFS=y | ||
1377 | CONFIG_NFSD=y | 1415 | CONFIG_NFSD=y |
1378 | # CONFIG_NFSD_V3 is not set | 1416 | # CONFIG_NFSD_V3 is not set |
1379 | # CONFIG_NFSD_V4 is not set | 1417 | # CONFIG_NFSD_V4 is not set |
1380 | CONFIG_ROOT_NFS=y | ||
1381 | CONFIG_LOCKD=y | 1418 | CONFIG_LOCKD=y |
1382 | CONFIG_LOCKD_V4=y | 1419 | CONFIG_LOCKD_V4=y |
1383 | CONFIG_EXPORTFS=y | 1420 | CONFIG_EXPORTFS=y |
1384 | CONFIG_NFS_COMMON=y | 1421 | CONFIG_NFS_COMMON=y |
1385 | CONFIG_SUNRPC=y | 1422 | CONFIG_SUNRPC=y |
1386 | CONFIG_SUNRPC_GSS=y | 1423 | CONFIG_SUNRPC_GSS=y |
1387 | # CONFIG_SUNRPC_BIND34 is not set | ||
1388 | CONFIG_RPCSEC_GSS_KRB5=y | 1424 | CONFIG_RPCSEC_GSS_KRB5=y |
1389 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1425 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1390 | # CONFIG_SMB_FS is not set | 1426 | # CONFIG_SMB_FS is not set |
@@ -1463,6 +1499,7 @@ CONFIG_BITREVERSE=y | |||
1463 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1499 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1464 | # CONFIG_CRC_CCITT is not set | 1500 | # CONFIG_CRC_CCITT is not set |
1465 | # CONFIG_CRC16 is not set | 1501 | # CONFIG_CRC16 is not set |
1502 | CONFIG_CRC_T10DIF=y | ||
1466 | CONFIG_CRC_ITU_T=m | 1503 | CONFIG_CRC_ITU_T=m |
1467 | CONFIG_CRC32=y | 1504 | CONFIG_CRC32=y |
1468 | # CONFIG_CRC7 is not set | 1505 | # CONFIG_CRC7 is not set |
@@ -1488,6 +1525,8 @@ CONFIG_FRAME_WARN=1024 | |||
1488 | CONFIG_DEBUG_KERNEL=y | 1525 | CONFIG_DEBUG_KERNEL=y |
1489 | # CONFIG_DEBUG_SHIRQ is not set | 1526 | # CONFIG_DEBUG_SHIRQ is not set |
1490 | CONFIG_DETECT_SOFTLOCKUP=y | 1527 | CONFIG_DETECT_SOFTLOCKUP=y |
1528 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1529 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1491 | CONFIG_SCHED_DEBUG=y | 1530 | CONFIG_SCHED_DEBUG=y |
1492 | # CONFIG_SCHEDSTATS is not set | 1531 | # CONFIG_SCHEDSTATS is not set |
1493 | # CONFIG_TIMER_STATS is not set | 1532 | # CONFIG_TIMER_STATS is not set |
@@ -1506,19 +1545,32 @@ CONFIG_SCHED_DEBUG=y | |||
1506 | CONFIG_DEBUG_INFO=y | 1545 | CONFIG_DEBUG_INFO=y |
1507 | # CONFIG_DEBUG_VM is not set | 1546 | # CONFIG_DEBUG_VM is not set |
1508 | # CONFIG_DEBUG_WRITECOUNT is not set | 1547 | # CONFIG_DEBUG_WRITECOUNT is not set |
1548 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1509 | # CONFIG_DEBUG_LIST is not set | 1549 | # CONFIG_DEBUG_LIST is not set |
1510 | # CONFIG_DEBUG_SG is not set | 1550 | # CONFIG_DEBUG_SG is not set |
1511 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1551 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1512 | # CONFIG_RCU_TORTURE_TEST is not set | 1552 | # CONFIG_RCU_TORTURE_TEST is not set |
1513 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1553 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1514 | # CONFIG_FAULT_INJECTION is not set | 1554 | # CONFIG_FAULT_INJECTION is not set |
1555 | # CONFIG_LATENCYTOP is not set | ||
1556 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1557 | CONFIG_HAVE_FTRACE=y | ||
1558 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1559 | # CONFIG_FTRACE is not set | ||
1560 | # CONFIG_SCHED_TRACER is not set | ||
1561 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1515 | # CONFIG_SAMPLES is not set | 1562 | # CONFIG_SAMPLES is not set |
1563 | CONFIG_HAVE_ARCH_KGDB=y | ||
1564 | # CONFIG_KGDB is not set | ||
1516 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1565 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1517 | # CONFIG_DEBUG_STACK_USAGE is not set | 1566 | # CONFIG_DEBUG_STACK_USAGE is not set |
1518 | # CONFIG_DEBUG_PAGEALLOC is not set | 1567 | # CONFIG_DEBUG_PAGEALLOC is not set |
1519 | # CONFIG_DEBUGGER is not set | 1568 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1569 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1570 | # CONFIG_XMON is not set | ||
1520 | # CONFIG_IRQSTACKS is not set | 1571 | # CONFIG_IRQSTACKS is not set |
1521 | # CONFIG_BDI_SWITCH is not set | 1572 | # CONFIG_BDI_SWITCH is not set |
1573 | # CONFIG_BOOTX_TEXT is not set | ||
1522 | # CONFIG_PPC_EARLY_DEBUG is not set | 1574 | # CONFIG_PPC_EARLY_DEBUG is not set |
1523 | 1575 | ||
1524 | # | 1576 | # |
@@ -1573,6 +1625,10 @@ CONFIG_CRYPTO_HMAC=y | |||
1573 | # CONFIG_CRYPTO_MD4 is not set | 1625 | # CONFIG_CRYPTO_MD4 is not set |
1574 | CONFIG_CRYPTO_MD5=y | 1626 | CONFIG_CRYPTO_MD5=y |
1575 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1627 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1628 | # CONFIG_CRYPTO_RMD128 is not set | ||
1629 | # CONFIG_CRYPTO_RMD160 is not set | ||
1630 | # CONFIG_CRYPTO_RMD256 is not set | ||
1631 | # CONFIG_CRYPTO_RMD320 is not set | ||
1576 | CONFIG_CRYPTO_SHA1=m | 1632 | CONFIG_CRYPTO_SHA1=m |
1577 | # CONFIG_CRYPTO_SHA256 is not set | 1633 | # CONFIG_CRYPTO_SHA256 is not set |
1578 | # CONFIG_CRYPTO_SHA512 is not set | 1634 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1605,5 +1661,6 @@ CONFIG_CRYPTO_DES=y | |||
1605 | # CONFIG_CRYPTO_LZO is not set | 1661 | # CONFIG_CRYPTO_LZO is not set |
1606 | CONFIG_CRYPTO_HW=y | 1662 | CONFIG_CRYPTO_HW=y |
1607 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1663 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1664 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1608 | # CONFIG_PPC_CLOCK is not set | 1665 | # CONFIG_PPC_CLOCK is not set |
1609 | # CONFIG_VIRTUALIZATION is not set | 1666 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig index 46fffbcd3f99..1501c4336b3d 100644 --- a/arch/powerpc/configs/mpc866_ads_defconfig +++ b/arch/powerpc/configs/mpc866_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:16 2008 | 4 | # Thu Aug 21 00:52:11 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -106,10 +107,16 @@ CONFIG_SLUB=y | |||
106 | # CONFIG_PROFILING is not set | 107 | # CONFIG_PROFILING is not set |
107 | # CONFIG_MARKERS is not set | 108 | # CONFIG_MARKERS is not set |
108 | CONFIG_HAVE_OPROFILE=y | 109 | CONFIG_HAVE_OPROFILE=y |
110 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
111 | CONFIG_HAVE_IOREMAP_PROT=y | ||
109 | CONFIG_HAVE_KPROBES=y | 112 | CONFIG_HAVE_KPROBES=y |
110 | CONFIG_HAVE_KRETPROBES=y | 113 | CONFIG_HAVE_KRETPROBES=y |
114 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
111 | # CONFIG_HAVE_DMA_ATTRS is not set | 115 | # CONFIG_HAVE_DMA_ATTRS is not set |
116 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
117 | CONFIG_HAVE_CLK=y | ||
112 | CONFIG_PROC_PAGE_MONITOR=y | 118 | CONFIG_PROC_PAGE_MONITOR=y |
119 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
113 | CONFIG_SLABINFO=y | 120 | CONFIG_SLABINFO=y |
114 | CONFIG_RT_MUTEXES=y | 121 | CONFIG_RT_MUTEXES=y |
115 | # CONFIG_TINY_SHMEM is not set | 122 | # CONFIG_TINY_SHMEM is not set |
@@ -120,6 +127,7 @@ CONFIG_BLOCK=y | |||
120 | # CONFIG_BLK_DEV_IO_TRACE is not set | 127 | # CONFIG_BLK_DEV_IO_TRACE is not set |
121 | # CONFIG_LSF is not set | 128 | # CONFIG_LSF is not set |
122 | # CONFIG_BLK_DEV_BSG is not set | 129 | # CONFIG_BLK_DEV_BSG is not set |
130 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
123 | 131 | ||
124 | # | 132 | # |
125 | # IO Schedulers | 133 | # IO Schedulers |
@@ -138,8 +146,6 @@ CONFIG_CLASSIC_RCU=y | |||
138 | # | 146 | # |
139 | # Platform support | 147 | # Platform support |
140 | # | 148 | # |
141 | # CONFIG_PPC_MPC512x is not set | ||
142 | # CONFIG_PPC_MPC5121 is not set | ||
143 | # CONFIG_PPC_CELL is not set | 149 | # CONFIG_PPC_CELL is not set |
144 | # CONFIG_PPC_CELL_NATIVE is not set | 150 | # CONFIG_PPC_CELL_NATIVE is not set |
145 | CONFIG_CPM1=y | 151 | CONFIG_CPM1=y |
@@ -157,6 +163,7 @@ CONFIG_MPC86XADS=y | |||
157 | # Generic MPC8xx Options | 163 | # Generic MPC8xx Options |
158 | # | 164 | # |
159 | CONFIG_8xx_COPYBACK=y | 165 | CONFIG_8xx_COPYBACK=y |
166 | # CONFIG_8xx_GPIO is not set | ||
160 | CONFIG_8xx_CPU6=y | 167 | CONFIG_8xx_CPU6=y |
161 | CONFIG_8xx_CPU15=y | 168 | CONFIG_8xx_CPU15=y |
162 | CONFIG_NO_UCODE_PATCH=y | 169 | CONFIG_NO_UCODE_PATCH=y |
@@ -175,7 +182,6 @@ CONFIG_NO_UCODE_PATCH=y | |||
175 | # CONFIG_PPC_INDIRECT_IO is not set | 182 | # CONFIG_PPC_INDIRECT_IO is not set |
176 | # CONFIG_GENERIC_IOMAP is not set | 183 | # CONFIG_GENERIC_IOMAP is not set |
177 | # CONFIG_CPU_FREQ is not set | 184 | # CONFIG_CPU_FREQ is not set |
178 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
179 | # CONFIG_FSL_ULI1575 is not set | 185 | # CONFIG_FSL_ULI1575 is not set |
180 | CONFIG_CPM=y | 186 | CONFIG_CPM=y |
181 | 187 | ||
@@ -192,7 +198,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
192 | # CONFIG_HZ_300 is not set | 198 | # CONFIG_HZ_300 is not set |
193 | CONFIG_HZ_1000=y | 199 | CONFIG_HZ_1000=y |
194 | CONFIG_HZ=1000 | 200 | CONFIG_HZ=1000 |
195 | # CONFIG_SCHED_HRTICK is not set | 201 | CONFIG_SCHED_HRTICK=y |
196 | CONFIG_PREEMPT_NONE=y | 202 | CONFIG_PREEMPT_NONE=y |
197 | # CONFIG_PREEMPT_VOLUNTARY is not set | 203 | # CONFIG_PREEMPT_VOLUNTARY is not set |
198 | # CONFIG_PREEMPT is not set | 204 | # CONFIG_PREEMPT is not set |
@@ -215,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
215 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
216 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
217 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | ||
218 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
219 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
220 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
@@ -222,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
222 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
223 | # CONFIG_PROC_DEVICETREE is not set | 230 | # CONFIG_PROC_DEVICETREE is not set |
224 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
232 | CONFIG_EXTRA_TARGETS="" | ||
225 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
226 | # CONFIG_SECCOMP is not set | 234 | # CONFIG_SECCOMP is not set |
227 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
@@ -253,10 +261,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
253 | CONFIG_TASK_SIZE=0x80000000 | 261 | CONFIG_TASK_SIZE=0x80000000 |
254 | CONFIG_CONSISTENT_START=0xfd000000 | 262 | CONFIG_CONSISTENT_START=0xfd000000 |
255 | CONFIG_CONSISTENT_SIZE=0x00200000 | 263 | CONFIG_CONSISTENT_SIZE=0x00200000 |
256 | |||
257 | # | ||
258 | # Networking | ||
259 | # | ||
260 | CONFIG_NET=y | 264 | CONFIG_NET=y |
261 | 265 | ||
262 | # | 266 | # |
@@ -361,6 +365,7 @@ CONFIG_BLK_DEV_LOOP=y | |||
361 | # CONFIG_BLK_DEV_RAM is not set | 365 | # CONFIG_BLK_DEV_RAM is not set |
362 | # CONFIG_CDROM_PKTCDVD is not set | 366 | # CONFIG_CDROM_PKTCDVD is not set |
363 | # CONFIG_ATA_OVER_ETH is not set | 367 | # CONFIG_ATA_OVER_ETH is not set |
368 | # CONFIG_BLK_DEV_HD is not set | ||
364 | CONFIG_MISC_DEVICES=y | 369 | CONFIG_MISC_DEVICES=y |
365 | # CONFIG_EEPROM_93CX6 is not set | 370 | # CONFIG_EEPROM_93CX6 is not set |
366 | # CONFIG_ENCLOSURE_SERVICES is not set | 371 | # CONFIG_ENCLOSURE_SERVICES is not set |
@@ -378,7 +383,6 @@ CONFIG_HAVE_IDE=y | |||
378 | # CONFIG_MD is not set | 383 | # CONFIG_MD is not set |
379 | # CONFIG_MACINTOSH_DRIVERS is not set | 384 | # CONFIG_MACINTOSH_DRIVERS is not set |
380 | CONFIG_NETDEVICES=y | 385 | CONFIG_NETDEVICES=y |
381 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
382 | # CONFIG_DUMMY is not set | 386 | # CONFIG_DUMMY is not set |
383 | # CONFIG_BONDING is not set | 387 | # CONFIG_BONDING is not set |
384 | # CONFIG_MACVLAN is not set | 388 | # CONFIG_MACVLAN is not set |
@@ -414,7 +418,6 @@ CONFIG_FS_ENET_HAS_SCC=y | |||
414 | CONFIG_FS_ENET_HAS_FEC=y | 418 | CONFIG_FS_ENET_HAS_FEC=y |
415 | CONFIG_FS_ENET_MDIO_FEC=y | 419 | CONFIG_FS_ENET_MDIO_FEC=y |
416 | CONFIG_NETDEV_1000=y | 420 | CONFIG_NETDEV_1000=y |
417 | # CONFIG_E1000E_ENABLED is not set | ||
418 | # CONFIG_GIANFAR is not set | 421 | # CONFIG_GIANFAR is not set |
419 | CONFIG_NETDEV_10000=y | 422 | CONFIG_NETDEV_10000=y |
420 | 423 | ||
@@ -484,6 +487,7 @@ CONFIG_SERIO_I8042=y | |||
484 | CONFIG_SERIO_SERPORT=y | 487 | CONFIG_SERIO_SERPORT=y |
485 | CONFIG_SERIO_LIBPS2=y | 488 | CONFIG_SERIO_LIBPS2=y |
486 | # CONFIG_SERIO_RAW is not set | 489 | # CONFIG_SERIO_RAW is not set |
490 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
487 | # CONFIG_GAMEPORT is not set | 491 | # CONFIG_GAMEPORT is not set |
488 | 492 | ||
489 | # | 493 | # |
@@ -524,6 +528,8 @@ CONFIG_GEN_RTC=y | |||
524 | # CONFIG_TCG_TPM is not set | 528 | # CONFIG_TCG_TPM is not set |
525 | # CONFIG_I2C is not set | 529 | # CONFIG_I2C is not set |
526 | # CONFIG_SPI is not set | 530 | # CONFIG_SPI is not set |
531 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
532 | # CONFIG_GPIOLIB is not set | ||
527 | # CONFIG_W1 is not set | 533 | # CONFIG_W1 is not set |
528 | # CONFIG_POWER_SUPPLY is not set | 534 | # CONFIG_POWER_SUPPLY is not set |
529 | CONFIG_HWMON=y | 535 | CONFIG_HWMON=y |
@@ -540,6 +546,7 @@ CONFIG_HWMON=y | |||
540 | # CONFIG_SENSORS_W83627EHF is not set | 546 | # CONFIG_SENSORS_W83627EHF is not set |
541 | # CONFIG_HWMON_DEBUG_CHIP is not set | 547 | # CONFIG_HWMON_DEBUG_CHIP is not set |
542 | # CONFIG_THERMAL is not set | 548 | # CONFIG_THERMAL is not set |
549 | # CONFIG_THERMAL_HWMON is not set | ||
543 | # CONFIG_WATCHDOG is not set | 550 | # CONFIG_WATCHDOG is not set |
544 | 551 | ||
545 | # | 552 | # |
@@ -551,8 +558,10 @@ CONFIG_SSB_POSSIBLE=y | |||
551 | # | 558 | # |
552 | # Multifunction device drivers | 559 | # Multifunction device drivers |
553 | # | 560 | # |
561 | # CONFIG_MFD_CORE is not set | ||
554 | # CONFIG_MFD_SM501 is not set | 562 | # CONFIG_MFD_SM501 is not set |
555 | # CONFIG_HTC_PASIC3 is not set | 563 | # CONFIG_HTC_PASIC3 is not set |
564 | # CONFIG_MFD_TMIO is not set | ||
556 | 565 | ||
557 | # | 566 | # |
558 | # Multimedia devices | 567 | # Multimedia devices |
@@ -582,10 +591,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
582 | # Display device support | 591 | # Display device support |
583 | # | 592 | # |
584 | # CONFIG_DISPLAY_SUPPORT is not set | 593 | # CONFIG_DISPLAY_SUPPORT is not set |
585 | |||
586 | # | ||
587 | # Sound | ||
588 | # | ||
589 | # CONFIG_SOUND is not set | 594 | # CONFIG_SOUND is not set |
590 | CONFIG_HID_SUPPORT=y | 595 | CONFIG_HID_SUPPORT=y |
591 | CONFIG_HID=y | 596 | CONFIG_HID=y |
@@ -599,6 +604,10 @@ CONFIG_USB_SUPPORT=y | |||
599 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 604 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
600 | 605 | ||
601 | # | 606 | # |
607 | # Enable Host or Gadget support to see Inventra options | ||
608 | # | ||
609 | |||
610 | # | ||
602 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 611 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
603 | # | 612 | # |
604 | # CONFIG_USB_GADGET is not set | 613 | # CONFIG_USB_GADGET is not set |
@@ -677,6 +686,7 @@ CONFIG_TMPFS=y | |||
677 | CONFIG_CRAMFS=y | 686 | CONFIG_CRAMFS=y |
678 | # CONFIG_VXFS_FS is not set | 687 | # CONFIG_VXFS_FS is not set |
679 | # CONFIG_MINIX_FS is not set | 688 | # CONFIG_MINIX_FS is not set |
689 | # CONFIG_OMFS_FS is not set | ||
680 | # CONFIG_HPFS_FS is not set | 690 | # CONFIG_HPFS_FS is not set |
681 | # CONFIG_QNX4FS_FS is not set | 691 | # CONFIG_QNX4FS_FS is not set |
682 | # CONFIG_ROMFS_FS is not set | 692 | # CONFIG_ROMFS_FS is not set |
@@ -687,13 +697,12 @@ CONFIG_NFS_FS=y | |||
687 | CONFIG_NFS_V3=y | 697 | CONFIG_NFS_V3=y |
688 | # CONFIG_NFS_V3_ACL is not set | 698 | # CONFIG_NFS_V3_ACL is not set |
689 | # CONFIG_NFS_V4 is not set | 699 | # CONFIG_NFS_V4 is not set |
690 | # CONFIG_NFSD is not set | ||
691 | CONFIG_ROOT_NFS=y | 700 | CONFIG_ROOT_NFS=y |
701 | # CONFIG_NFSD is not set | ||
692 | CONFIG_LOCKD=y | 702 | CONFIG_LOCKD=y |
693 | CONFIG_LOCKD_V4=y | 703 | CONFIG_LOCKD_V4=y |
694 | CONFIG_NFS_COMMON=y | 704 | CONFIG_NFS_COMMON=y |
695 | CONFIG_SUNRPC=y | 705 | CONFIG_SUNRPC=y |
696 | # CONFIG_SUNRPC_BIND34 is not set | ||
697 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 706 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
698 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 707 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
699 | # CONFIG_SMB_FS is not set | 708 | # CONFIG_SMB_FS is not set |
@@ -733,6 +742,7 @@ CONFIG_BITREVERSE=y | |||
733 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 742 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
734 | CONFIG_CRC_CCITT=y | 743 | CONFIG_CRC_CCITT=y |
735 | # CONFIG_CRC16 is not set | 744 | # CONFIG_CRC16 is not set |
745 | # CONFIG_CRC_T10DIF is not set | ||
736 | # CONFIG_CRC_ITU_T is not set | 746 | # CONFIG_CRC_ITU_T is not set |
737 | CONFIG_CRC32=y | 747 | CONFIG_CRC32=y |
738 | # CONFIG_CRC7 is not set | 748 | # CONFIG_CRC7 is not set |
@@ -758,7 +768,15 @@ CONFIG_FRAME_WARN=1024 | |||
758 | # CONFIG_DEBUG_KERNEL is not set | 768 | # CONFIG_DEBUG_KERNEL is not set |
759 | # CONFIG_SLUB_DEBUG_ON is not set | 769 | # CONFIG_SLUB_DEBUG_ON is not set |
760 | # CONFIG_SLUB_STATS is not set | 770 | # CONFIG_SLUB_STATS is not set |
771 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
772 | # CONFIG_LATENCYTOP is not set | ||
773 | CONFIG_HAVE_FTRACE=y | ||
774 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
775 | # CONFIG_FTRACE is not set | ||
776 | # CONFIG_SCHED_TRACER is not set | ||
777 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
761 | # CONFIG_SAMPLES is not set | 778 | # CONFIG_SAMPLES is not set |
779 | CONFIG_HAVE_ARCH_KGDB=y | ||
762 | # CONFIG_IRQSTACKS is not set | 780 | # CONFIG_IRQSTACKS is not set |
763 | # CONFIG_PPC_EARLY_DEBUG is not set | 781 | # CONFIG_PPC_EARLY_DEBUG is not set |
764 | 782 | ||
@@ -810,6 +828,10 @@ CONFIG_CRYPTO=y | |||
810 | # CONFIG_CRYPTO_MD4 is not set | 828 | # CONFIG_CRYPTO_MD4 is not set |
811 | # CONFIG_CRYPTO_MD5 is not set | 829 | # CONFIG_CRYPTO_MD5 is not set |
812 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 830 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
831 | # CONFIG_CRYPTO_RMD128 is not set | ||
832 | # CONFIG_CRYPTO_RMD160 is not set | ||
833 | # CONFIG_CRYPTO_RMD256 is not set | ||
834 | # CONFIG_CRYPTO_RMD320 is not set | ||
813 | # CONFIG_CRYPTO_SHA1 is not set | 835 | # CONFIG_CRYPTO_SHA1 is not set |
814 | # CONFIG_CRYPTO_SHA256 is not set | 836 | # CONFIG_CRYPTO_SHA256 is not set |
815 | # CONFIG_CRYPTO_SHA512 is not set | 837 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -841,6 +863,7 @@ CONFIG_CRYPTO=y | |||
841 | # CONFIG_CRYPTO_DEFLATE is not set | 863 | # CONFIG_CRYPTO_DEFLATE is not set |
842 | # CONFIG_CRYPTO_LZO is not set | 864 | # CONFIG_CRYPTO_LZO is not set |
843 | CONFIG_CRYPTO_HW=y | 865 | CONFIG_CRYPTO_HW=y |
844 | # CONFIG_PPC_CLOCK is not set | 866 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
867 | CONFIG_PPC_CLOCK=y | ||
845 | CONFIG_PPC_LIB_RHEAP=y | 868 | CONFIG_PPC_LIB_RHEAP=y |
846 | # CONFIG_VIRTUALIZATION is not set | 869 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 9df78973005e..fc3f6dc58126 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:17 2008 | 4 | # Thu Aug 21 00:52:12 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -29,6 +29,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 29 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
30 | CONFIG_IRQ_PER_CPU=y | 30 | CONFIG_IRQ_PER_CPU=y |
31 | CONFIG_STACKTRACE_SUPPORT=y | 31 | CONFIG_STACKTRACE_SUPPORT=y |
32 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
32 | CONFIG_LOCKDEP_SUPPORT=y | 33 | CONFIG_LOCKDEP_SUPPORT=y |
33 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 34 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
34 | CONFIG_ARCH_HAS_ILOG2_U32=y | 35 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -108,10 +109,16 @@ CONFIG_SLUB=y | |||
108 | # CONFIG_PROFILING is not set | 109 | # CONFIG_PROFILING is not set |
109 | # CONFIG_MARKERS is not set | 110 | # CONFIG_MARKERS is not set |
110 | CONFIG_HAVE_OPROFILE=y | 111 | CONFIG_HAVE_OPROFILE=y |
112 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
113 | CONFIG_HAVE_IOREMAP_PROT=y | ||
111 | CONFIG_HAVE_KPROBES=y | 114 | CONFIG_HAVE_KPROBES=y |
112 | CONFIG_HAVE_KRETPROBES=y | 115 | CONFIG_HAVE_KRETPROBES=y |
116 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
113 | # CONFIG_HAVE_DMA_ATTRS is not set | 117 | # CONFIG_HAVE_DMA_ATTRS is not set |
118 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
119 | CONFIG_HAVE_CLK=y | ||
114 | CONFIG_PROC_PAGE_MONITOR=y | 120 | CONFIG_PROC_PAGE_MONITOR=y |
121 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
115 | CONFIG_SLABINFO=y | 122 | CONFIG_SLABINFO=y |
116 | # CONFIG_TINY_SHMEM is not set | 123 | # CONFIG_TINY_SHMEM is not set |
117 | CONFIG_BASE_SMALL=1 | 124 | CONFIG_BASE_SMALL=1 |
@@ -121,6 +128,7 @@ CONFIG_BLOCK=y | |||
121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 128 | # CONFIG_BLK_DEV_IO_TRACE is not set |
122 | # CONFIG_LSF is not set | 129 | # CONFIG_LSF is not set |
123 | # CONFIG_BLK_DEV_BSG is not set | 130 | # CONFIG_BLK_DEV_BSG is not set |
131 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
124 | 132 | ||
125 | # | 133 | # |
126 | # IO Schedulers | 134 | # IO Schedulers |
@@ -139,8 +147,6 @@ CONFIG_CLASSIC_RCU=y | |||
139 | # | 147 | # |
140 | # Platform support | 148 | # Platform support |
141 | # | 149 | # |
142 | # CONFIG_PPC_MPC512x is not set | ||
143 | # CONFIG_PPC_MPC5121 is not set | ||
144 | # CONFIG_PPC_CELL is not set | 150 | # CONFIG_PPC_CELL is not set |
145 | # CONFIG_PPC_CELL_NATIVE is not set | 151 | # CONFIG_PPC_CELL_NATIVE is not set |
146 | CONFIG_CPM1=y | 152 | CONFIG_CPM1=y |
@@ -165,6 +171,7 @@ CONFIG_MPC8xx_SECOND_ETH_FEC2=y | |||
165 | # Generic MPC8xx Options | 171 | # Generic MPC8xx Options |
166 | # | 172 | # |
167 | CONFIG_8xx_COPYBACK=y | 173 | CONFIG_8xx_COPYBACK=y |
174 | # CONFIG_8xx_GPIO is not set | ||
168 | # CONFIG_8xx_CPU6 is not set | 175 | # CONFIG_8xx_CPU6 is not set |
169 | CONFIG_8xx_CPU15=y | 176 | CONFIG_8xx_CPU15=y |
170 | CONFIG_NO_UCODE_PATCH=y | 177 | CONFIG_NO_UCODE_PATCH=y |
@@ -183,7 +190,6 @@ CONFIG_NO_UCODE_PATCH=y | |||
183 | # CONFIG_PPC_INDIRECT_IO is not set | 190 | # CONFIG_PPC_INDIRECT_IO is not set |
184 | # CONFIG_GENERIC_IOMAP is not set | 191 | # CONFIG_GENERIC_IOMAP is not set |
185 | # CONFIG_CPU_FREQ is not set | 192 | # CONFIG_CPU_FREQ is not set |
186 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
187 | # CONFIG_FSL_ULI1575 is not set | 193 | # CONFIG_FSL_ULI1575 is not set |
188 | CONFIG_CPM=y | 194 | CONFIG_CPM=y |
189 | 195 | ||
@@ -200,7 +206,7 @@ CONFIG_HZ_100=y | |||
200 | # CONFIG_HZ_300 is not set | 206 | # CONFIG_HZ_300 is not set |
201 | # CONFIG_HZ_1000 is not set | 207 | # CONFIG_HZ_1000 is not set |
202 | CONFIG_HZ=100 | 208 | CONFIG_HZ=100 |
203 | # CONFIG_SCHED_HRTICK is not set | 209 | CONFIG_SCHED_HRTICK=y |
204 | CONFIG_PREEMPT_NONE=y | 210 | CONFIG_PREEMPT_NONE=y |
205 | # CONFIG_PREEMPT_VOLUNTARY is not set | 211 | # CONFIG_PREEMPT_VOLUNTARY is not set |
206 | # CONFIG_PREEMPT is not set | 212 | # CONFIG_PREEMPT is not set |
@@ -224,6 +230,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
224 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 230 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
225 | CONFIG_PAGEFLAGS_EXTENDED=y | 231 | CONFIG_PAGEFLAGS_EXTENDED=y |
226 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 232 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
233 | CONFIG_MIGRATION=y | ||
227 | # CONFIG_RESOURCES_64BIT is not set | 234 | # CONFIG_RESOURCES_64BIT is not set |
228 | CONFIG_ZONE_DMA_FLAG=1 | 235 | CONFIG_ZONE_DMA_FLAG=1 |
229 | CONFIG_BOUNCE=y | 236 | CONFIG_BOUNCE=y |
@@ -231,6 +238,7 @@ CONFIG_VIRT_TO_BUS=y | |||
231 | CONFIG_FORCE_MAX_ZONEORDER=11 | 238 | CONFIG_FORCE_MAX_ZONEORDER=11 |
232 | CONFIG_PROC_DEVICETREE=y | 239 | CONFIG_PROC_DEVICETREE=y |
233 | # CONFIG_CMDLINE_BOOL is not set | 240 | # CONFIG_CMDLINE_BOOL is not set |
241 | CONFIG_EXTRA_TARGETS="" | ||
234 | # CONFIG_PM is not set | 242 | # CONFIG_PM is not set |
235 | # CONFIG_SECCOMP is not set | 243 | # CONFIG_SECCOMP is not set |
236 | CONFIG_ISA_DMA_API=y | 244 | CONFIG_ISA_DMA_API=y |
@@ -263,10 +271,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
263 | CONFIG_TASK_SIZE=0x80000000 | 271 | CONFIG_TASK_SIZE=0x80000000 |
264 | CONFIG_CONSISTENT_START=0xfd000000 | 272 | CONFIG_CONSISTENT_START=0xfd000000 |
265 | CONFIG_CONSISTENT_SIZE=0x00200000 | 273 | CONFIG_CONSISTENT_SIZE=0x00200000 |
266 | |||
267 | # | ||
268 | # Networking | ||
269 | # | ||
270 | CONFIG_NET=y | 274 | CONFIG_NET=y |
271 | 275 | ||
272 | # | 276 | # |
@@ -453,7 +457,6 @@ CONFIG_HAVE_IDE=y | |||
453 | # CONFIG_MD is not set | 457 | # CONFIG_MD is not set |
454 | # CONFIG_MACINTOSH_DRIVERS is not set | 458 | # CONFIG_MACINTOSH_DRIVERS is not set |
455 | CONFIG_NETDEVICES=y | 459 | CONFIG_NETDEVICES=y |
456 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
457 | # CONFIG_DUMMY is not set | 460 | # CONFIG_DUMMY is not set |
458 | # CONFIG_BONDING is not set | 461 | # CONFIG_BONDING is not set |
459 | # CONFIG_MACVLAN is not set | 462 | # CONFIG_MACVLAN is not set |
@@ -555,10 +558,13 @@ CONFIG_GEN_RTC=y | |||
555 | # CONFIG_TCG_TPM is not set | 558 | # CONFIG_TCG_TPM is not set |
556 | # CONFIG_I2C is not set | 559 | # CONFIG_I2C is not set |
557 | # CONFIG_SPI is not set | 560 | # CONFIG_SPI is not set |
561 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
562 | # CONFIG_GPIOLIB is not set | ||
558 | # CONFIG_W1 is not set | 563 | # CONFIG_W1 is not set |
559 | # CONFIG_POWER_SUPPLY is not set | 564 | # CONFIG_POWER_SUPPLY is not set |
560 | # CONFIG_HWMON is not set | 565 | # CONFIG_HWMON is not set |
561 | # CONFIG_THERMAL is not set | 566 | # CONFIG_THERMAL is not set |
567 | # CONFIG_THERMAL_HWMON is not set | ||
562 | # CONFIG_WATCHDOG is not set | 568 | # CONFIG_WATCHDOG is not set |
563 | 569 | ||
564 | # | 570 | # |
@@ -570,8 +576,10 @@ CONFIG_SSB_POSSIBLE=y | |||
570 | # | 576 | # |
571 | # Multifunction device drivers | 577 | # Multifunction device drivers |
572 | # | 578 | # |
579 | # CONFIG_MFD_CORE is not set | ||
573 | # CONFIG_MFD_SM501 is not set | 580 | # CONFIG_MFD_SM501 is not set |
574 | # CONFIG_HTC_PASIC3 is not set | 581 | # CONFIG_HTC_PASIC3 is not set |
582 | # CONFIG_MFD_TMIO is not set | ||
575 | 583 | ||
576 | # | 584 | # |
577 | # Multimedia devices | 585 | # Multimedia devices |
@@ -601,10 +609,6 @@ CONFIG_DAB=y | |||
601 | # Display device support | 609 | # Display device support |
602 | # | 610 | # |
603 | # CONFIG_DISPLAY_SUPPORT is not set | 611 | # CONFIG_DISPLAY_SUPPORT is not set |
604 | |||
605 | # | ||
606 | # Sound | ||
607 | # | ||
608 | # CONFIG_SOUND is not set | 612 | # CONFIG_SOUND is not set |
609 | # CONFIG_USB_SUPPORT is not set | 613 | # CONFIG_USB_SUPPORT is not set |
610 | # CONFIG_MMC is not set | 614 | # CONFIG_MMC is not set |
@@ -673,6 +677,7 @@ CONFIG_TMPFS=y | |||
673 | CONFIG_CRAMFS=y | 677 | CONFIG_CRAMFS=y |
674 | # CONFIG_VXFS_FS is not set | 678 | # CONFIG_VXFS_FS is not set |
675 | # CONFIG_MINIX_FS is not set | 679 | # CONFIG_MINIX_FS is not set |
680 | # CONFIG_OMFS_FS is not set | ||
676 | # CONFIG_HPFS_FS is not set | 681 | # CONFIG_HPFS_FS is not set |
677 | # CONFIG_QNX4FS_FS is not set | 682 | # CONFIG_QNX4FS_FS is not set |
678 | # CONFIG_ROMFS_FS is not set | 683 | # CONFIG_ROMFS_FS is not set |
@@ -683,13 +688,12 @@ CONFIG_NFS_FS=y | |||
683 | CONFIG_NFS_V3=y | 688 | CONFIG_NFS_V3=y |
684 | # CONFIG_NFS_V3_ACL is not set | 689 | # CONFIG_NFS_V3_ACL is not set |
685 | # CONFIG_NFS_V4 is not set | 690 | # CONFIG_NFS_V4 is not set |
686 | # CONFIG_NFSD is not set | ||
687 | CONFIG_ROOT_NFS=y | 691 | CONFIG_ROOT_NFS=y |
692 | # CONFIG_NFSD is not set | ||
688 | CONFIG_LOCKD=y | 693 | CONFIG_LOCKD=y |
689 | CONFIG_LOCKD_V4=y | 694 | CONFIG_LOCKD_V4=y |
690 | CONFIG_NFS_COMMON=y | 695 | CONFIG_NFS_COMMON=y |
691 | CONFIG_SUNRPC=y | 696 | CONFIG_SUNRPC=y |
692 | # CONFIG_SUNRPC_BIND34 is not set | ||
693 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 697 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
694 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 698 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
695 | # CONFIG_SMB_FS is not set | 699 | # CONFIG_SMB_FS is not set |
@@ -728,6 +732,7 @@ CONFIG_MSDOS_PARTITION=y | |||
728 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 732 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
729 | # CONFIG_CRC_CCITT is not set | 733 | # CONFIG_CRC_CCITT is not set |
730 | # CONFIG_CRC16 is not set | 734 | # CONFIG_CRC16 is not set |
735 | # CONFIG_CRC_T10DIF is not set | ||
731 | # CONFIG_CRC_ITU_T is not set | 736 | # CONFIG_CRC_ITU_T is not set |
732 | # CONFIG_CRC32 is not set | 737 | # CONFIG_CRC32 is not set |
733 | # CONFIG_CRC7 is not set | 738 | # CONFIG_CRC7 is not set |
@@ -752,6 +757,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
752 | CONFIG_DEBUG_KERNEL=y | 757 | CONFIG_DEBUG_KERNEL=y |
753 | # CONFIG_DEBUG_SHIRQ is not set | 758 | # CONFIG_DEBUG_SHIRQ is not set |
754 | CONFIG_DETECT_SOFTLOCKUP=y | 759 | CONFIG_DETECT_SOFTLOCKUP=y |
760 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
761 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
755 | CONFIG_SCHED_DEBUG=y | 762 | CONFIG_SCHED_DEBUG=y |
756 | # CONFIG_SCHEDSTATS is not set | 763 | # CONFIG_SCHEDSTATS is not set |
757 | # CONFIG_TIMER_STATS is not set | 764 | # CONFIG_TIMER_STATS is not set |
@@ -767,16 +774,28 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
767 | CONFIG_DEBUG_INFO=y | 774 | CONFIG_DEBUG_INFO=y |
768 | # CONFIG_DEBUG_VM is not set | 775 | # CONFIG_DEBUG_VM is not set |
769 | # CONFIG_DEBUG_WRITECOUNT is not set | 776 | # CONFIG_DEBUG_WRITECOUNT is not set |
777 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
770 | # CONFIG_DEBUG_LIST is not set | 778 | # CONFIG_DEBUG_LIST is not set |
771 | # CONFIG_DEBUG_SG is not set | 779 | # CONFIG_DEBUG_SG is not set |
772 | # CONFIG_BOOT_PRINTK_DELAY is not set | 780 | # CONFIG_BOOT_PRINTK_DELAY is not set |
781 | # CONFIG_RCU_TORTURE_TEST is not set | ||
773 | # CONFIG_BACKTRACE_SELF_TEST is not set | 782 | # CONFIG_BACKTRACE_SELF_TEST is not set |
774 | # CONFIG_FAULT_INJECTION is not set | 783 | # CONFIG_FAULT_INJECTION is not set |
784 | # CONFIG_LATENCYTOP is not set | ||
785 | CONFIG_HAVE_FTRACE=y | ||
786 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
787 | # CONFIG_FTRACE is not set | ||
788 | # CONFIG_SCHED_TRACER is not set | ||
789 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
775 | # CONFIG_SAMPLES is not set | 790 | # CONFIG_SAMPLES is not set |
791 | CONFIG_HAVE_ARCH_KGDB=y | ||
792 | # CONFIG_KGDB is not set | ||
776 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 793 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
777 | # CONFIG_DEBUG_STACK_USAGE is not set | 794 | # CONFIG_DEBUG_STACK_USAGE is not set |
778 | # CONFIG_DEBUG_PAGEALLOC is not set | 795 | # CONFIG_DEBUG_PAGEALLOC is not set |
779 | # CONFIG_DEBUGGER is not set | 796 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
797 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
798 | # CONFIG_XMON is not set | ||
780 | # CONFIG_IRQSTACKS is not set | 799 | # CONFIG_IRQSTACKS is not set |
781 | # CONFIG_BDI_SWITCH is not set | 800 | # CONFIG_BDI_SWITCH is not set |
782 | # CONFIG_PPC_EARLY_DEBUG is not set | 801 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -788,6 +807,6 @@ CONFIG_DEBUG_INFO=y | |||
788 | # CONFIG_SECURITY is not set | 807 | # CONFIG_SECURITY is not set |
789 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 808 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
790 | # CONFIG_CRYPTO is not set | 809 | # CONFIG_CRYPTO is not set |
791 | # CONFIG_PPC_CLOCK is not set | 810 | CONFIG_PPC_CLOCK=y |
792 | CONFIG_PPC_LIB_RHEAP=y | 811 | CONFIG_PPC_LIB_RHEAP=y |
793 | # CONFIG_VIRTUALIZATION is not set | 812 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig index 3688e4bb6fc2..80481f270133 100644 --- a/arch/powerpc/configs/pmac32_defconfig +++ b/arch/powerpc/configs/pmac32_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc3 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Tue May 20 20:02:24 2008 | 4 | # Tue Aug 26 13:20:26 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -93,9 +94,8 @@ CONFIG_INITRAMFS_SOURCE="" | |||
93 | CONFIG_SYSCTL=y | 94 | CONFIG_SYSCTL=y |
94 | # CONFIG_EMBEDDED is not set | 95 | # CONFIG_EMBEDDED is not set |
95 | CONFIG_SYSCTL_SYSCALL=y | 96 | CONFIG_SYSCTL_SYSCALL=y |
96 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
97 | CONFIG_KALLSYMS=y | 97 | CONFIG_KALLSYMS=y |
98 | # CONFIG_KALLSYMS_ALL is not set | 98 | CONFIG_KALLSYMS_ALL=y |
99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
100 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
101 | CONFIG_PRINTK=y | 101 | CONFIG_PRINTK=y |
@@ -120,10 +120,16 @@ CONFIG_PROFILING=y | |||
120 | CONFIG_OPROFILE=y | 120 | CONFIG_OPROFILE=y |
121 | CONFIG_HAVE_OPROFILE=y | 121 | CONFIG_HAVE_OPROFILE=y |
122 | # CONFIG_KPROBES is not set | 122 | # CONFIG_KPROBES is not set |
123 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
124 | CONFIG_HAVE_IOREMAP_PROT=y | ||
123 | CONFIG_HAVE_KPROBES=y | 125 | CONFIG_HAVE_KPROBES=y |
124 | CONFIG_HAVE_KRETPROBES=y | 126 | CONFIG_HAVE_KRETPROBES=y |
127 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
125 | # CONFIG_HAVE_DMA_ATTRS is not set | 128 | # CONFIG_HAVE_DMA_ATTRS is not set |
129 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
130 | # CONFIG_HAVE_CLK is not set | ||
126 | CONFIG_PROC_PAGE_MONITOR=y | 131 | CONFIG_PROC_PAGE_MONITOR=y |
132 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
127 | CONFIG_SLABINFO=y | 133 | CONFIG_SLABINFO=y |
128 | CONFIG_RT_MUTEXES=y | 134 | CONFIG_RT_MUTEXES=y |
129 | # CONFIG_TINY_SHMEM is not set | 135 | # CONFIG_TINY_SHMEM is not set |
@@ -140,6 +146,7 @@ CONFIG_LBD=y | |||
140 | # CONFIG_BLK_DEV_IO_TRACE is not set | 146 | # CONFIG_BLK_DEV_IO_TRACE is not set |
141 | CONFIG_LSF=y | 147 | CONFIG_LSF=y |
142 | CONFIG_BLK_DEV_BSG=y | 148 | CONFIG_BLK_DEV_BSG=y |
149 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
143 | 150 | ||
144 | # | 151 | # |
145 | # IO Schedulers | 152 | # IO Schedulers |
@@ -159,19 +166,18 @@ CONFIG_CLASSIC_RCU=y | |||
159 | # Platform support | 166 | # Platform support |
160 | # | 167 | # |
161 | CONFIG_PPC_MULTIPLATFORM=y | 168 | CONFIG_PPC_MULTIPLATFORM=y |
162 | # CONFIG_PPC_82xx is not set | ||
163 | # CONFIG_PPC_83xx is not set | ||
164 | # CONFIG_PPC_86xx is not set | ||
165 | CONFIG_CLASSIC32=y | 169 | CONFIG_CLASSIC32=y |
166 | # CONFIG_PPC_CHRP is not set | 170 | # CONFIG_PPC_CHRP is not set |
167 | # CONFIG_PPC_MPC512x is not set | ||
168 | # CONFIG_PPC_MPC5121 is not set | ||
169 | # CONFIG_MPC5121_ADS is not set | 171 | # CONFIG_MPC5121_ADS is not set |
172 | # CONFIG_MPC5121_GENERIC is not set | ||
170 | # CONFIG_PPC_MPC52xx is not set | 173 | # CONFIG_PPC_MPC52xx is not set |
171 | CONFIG_PPC_PMAC=y | 174 | CONFIG_PPC_PMAC=y |
172 | # CONFIG_PPC_CELL is not set | 175 | # CONFIG_PPC_CELL is not set |
173 | # CONFIG_PPC_CELL_NATIVE is not set | 176 | # CONFIG_PPC_CELL_NATIVE is not set |
177 | # CONFIG_PPC_82xx is not set | ||
174 | # CONFIG_PQ2ADS is not set | 178 | # CONFIG_PQ2ADS is not set |
179 | # CONFIG_PPC_83xx is not set | ||
180 | # CONFIG_PPC_86xx is not set | ||
175 | # CONFIG_EMBEDDED6xx is not set | 181 | # CONFIG_EMBEDDED6xx is not set |
176 | CONFIG_PPC_NATIVE=y | 182 | CONFIG_PPC_NATIVE=y |
177 | # CONFIG_IPIC is not set | 183 | # CONFIG_IPIC is not set |
@@ -221,7 +227,7 @@ CONFIG_HZ_250=y | |||
221 | # CONFIG_HZ_300 is not set | 227 | # CONFIG_HZ_300 is not set |
222 | # CONFIG_HZ_1000 is not set | 228 | # CONFIG_HZ_1000 is not set |
223 | CONFIG_HZ=250 | 229 | CONFIG_HZ=250 |
224 | # CONFIG_SCHED_HRTICK is not set | 230 | CONFIG_SCHED_HRTICK=y |
225 | CONFIG_PREEMPT_NONE=y | 231 | CONFIG_PREEMPT_NONE=y |
226 | # CONFIG_PREEMPT_VOLUNTARY is not set | 232 | # CONFIG_PREEMPT_VOLUNTARY is not set |
227 | # CONFIG_PREEMPT is not set | 233 | # CONFIG_PREEMPT is not set |
@@ -244,6 +250,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
244 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 250 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
245 | CONFIG_PAGEFLAGS_EXTENDED=y | 251 | CONFIG_PAGEFLAGS_EXTENDED=y |
246 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 252 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
253 | # CONFIG_MIGRATION is not set | ||
247 | # CONFIG_RESOURCES_64BIT is not set | 254 | # CONFIG_RESOURCES_64BIT is not set |
248 | CONFIG_ZONE_DMA_FLAG=1 | 255 | CONFIG_ZONE_DMA_FLAG=1 |
249 | CONFIG_BOUNCE=y | 256 | CONFIG_BOUNCE=y |
@@ -251,6 +258,7 @@ CONFIG_VIRT_TO_BUS=y | |||
251 | CONFIG_FORCE_MAX_ZONEORDER=11 | 258 | CONFIG_FORCE_MAX_ZONEORDER=11 |
252 | CONFIG_PROC_DEVICETREE=y | 259 | CONFIG_PROC_DEVICETREE=y |
253 | # CONFIG_CMDLINE_BOOL is not set | 260 | # CONFIG_CMDLINE_BOOL is not set |
261 | CONFIG_EXTRA_TARGETS="" | ||
254 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 262 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
255 | CONFIG_PM=y | 263 | CONFIG_PM=y |
256 | CONFIG_PM_DEBUG=y | 264 | CONFIG_PM_DEBUG=y |
@@ -314,10 +322,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
314 | CONFIG_KERNEL_START=0xc0000000 | 322 | CONFIG_KERNEL_START=0xc0000000 |
315 | CONFIG_PHYSICAL_START=0x00000000 | 323 | CONFIG_PHYSICAL_START=0x00000000 |
316 | CONFIG_TASK_SIZE=0xc0000000 | 324 | CONFIG_TASK_SIZE=0xc0000000 |
317 | |||
318 | # | ||
319 | # Networking | ||
320 | # | ||
321 | CONFIG_NET=y | 325 | CONFIG_NET=y |
322 | 326 | ||
323 | # | 327 | # |
@@ -501,7 +505,6 @@ CONFIG_IP_DCCP_TFRC_LIB=m | |||
501 | # CONFIG_WAN_ROUTER is not set | 505 | # CONFIG_WAN_ROUTER is not set |
502 | # CONFIG_NET_SCHED is not set | 506 | # CONFIG_NET_SCHED is not set |
503 | CONFIG_NET_CLS_ROUTE=y | 507 | CONFIG_NET_CLS_ROUTE=y |
504 | CONFIG_NET_SCH_FIFO=y | ||
505 | 508 | ||
506 | # | 509 | # |
507 | # Network testing | 510 | # Network testing |
@@ -571,6 +574,7 @@ CONFIG_BT_HIDP=m | |||
571 | # | 574 | # |
572 | CONFIG_BT_HCIUSB=m | 575 | CONFIG_BT_HCIUSB=m |
573 | # CONFIG_BT_HCIUSB_SCO is not set | 576 | # CONFIG_BT_HCIUSB_SCO is not set |
577 | # CONFIG_BT_HCIBTUSB is not set | ||
574 | # CONFIG_BT_HCIUART is not set | 578 | # CONFIG_BT_HCIUART is not set |
575 | CONFIG_BT_HCIBCM203X=m | 579 | CONFIG_BT_HCIBCM203X=m |
576 | # CONFIG_BT_HCIBPA10X is not set | 580 | # CONFIG_BT_HCIBPA10X is not set |
@@ -588,27 +592,18 @@ CONFIG_BT_HCIBFUSB=m | |||
588 | CONFIG_CFG80211=m | 592 | CONFIG_CFG80211=m |
589 | CONFIG_NL80211=y | 593 | CONFIG_NL80211=y |
590 | CONFIG_WIRELESS_EXT=y | 594 | CONFIG_WIRELESS_EXT=y |
595 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
591 | CONFIG_MAC80211=m | 596 | CONFIG_MAC80211=m |
592 | 597 | ||
593 | # | 598 | # |
594 | # Rate control algorithm selection | 599 | # Rate control algorithm selection |
595 | # | 600 | # |
601 | CONFIG_MAC80211_RC_PID=y | ||
596 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 602 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
597 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
598 | |||
599 | # | ||
600 | # Selecting 'y' for an algorithm will | ||
601 | # | ||
602 | |||
603 | # | ||
604 | # build the algorithm into mac80211. | ||
605 | # | ||
606 | CONFIG_MAC80211_RC_DEFAULT="pid" | 603 | CONFIG_MAC80211_RC_DEFAULT="pid" |
607 | CONFIG_MAC80211_RC_PID=y | ||
608 | # CONFIG_MAC80211_MESH is not set | 604 | # CONFIG_MAC80211_MESH is not set |
609 | CONFIG_MAC80211_LEDS=y | 605 | CONFIG_MAC80211_LEDS=y |
610 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 606 | # CONFIG_MAC80211_DEBUG_MENU is not set |
611 | # CONFIG_MAC80211_DEBUG is not set | ||
612 | CONFIG_IEEE80211=m | 607 | CONFIG_IEEE80211=m |
613 | # CONFIG_IEEE80211_DEBUG is not set | 608 | # CONFIG_IEEE80211_DEBUG is not set |
614 | CONFIG_IEEE80211_CRYPT_WEP=m | 609 | CONFIG_IEEE80211_CRYPT_WEP=m |
@@ -628,6 +623,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
628 | # CONFIG_STANDALONE is not set | 623 | # CONFIG_STANDALONE is not set |
629 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 624 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
630 | CONFIG_FW_LOADER=y | 625 | CONFIG_FW_LOADER=y |
626 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
627 | CONFIG_EXTRA_FIRMWARE="" | ||
631 | # CONFIG_DEBUG_DRIVER is not set | 628 | # CONFIG_DEBUG_DRIVER is not set |
632 | # CONFIG_DEBUG_DEVRES is not set | 629 | # CONFIG_DEBUG_DEVRES is not set |
633 | # CONFIG_SYS_HYPERVISOR is not set | 630 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -656,12 +653,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
656 | # CONFIG_BLK_DEV_XIP is not set | 653 | # CONFIG_BLK_DEV_XIP is not set |
657 | # CONFIG_CDROM_PKTCDVD is not set | 654 | # CONFIG_CDROM_PKTCDVD is not set |
658 | # CONFIG_ATA_OVER_ETH is not set | 655 | # CONFIG_ATA_OVER_ETH is not set |
656 | # CONFIG_BLK_DEV_HD is not set | ||
659 | CONFIG_MISC_DEVICES=y | 657 | CONFIG_MISC_DEVICES=y |
660 | # CONFIG_PHANTOM is not set | 658 | # CONFIG_PHANTOM is not set |
661 | # CONFIG_EEPROM_93CX6 is not set | 659 | # CONFIG_EEPROM_93CX6 is not set |
662 | # CONFIG_SGI_IOC4 is not set | 660 | # CONFIG_SGI_IOC4 is not set |
663 | # CONFIG_TIFM_CORE is not set | 661 | # CONFIG_TIFM_CORE is not set |
664 | # CONFIG_ENCLOSURE_SERVICES is not set | 662 | # CONFIG_ENCLOSURE_SERVICES is not set |
663 | # CONFIG_HP_ILO is not set | ||
665 | CONFIG_HAVE_IDE=y | 664 | CONFIG_HAVE_IDE=y |
666 | CONFIG_IDE=y | 665 | CONFIG_IDE=y |
667 | CONFIG_BLK_DEV_IDE=y | 666 | CONFIG_BLK_DEV_IDE=y |
@@ -669,6 +668,8 @@ CONFIG_BLK_DEV_IDE=y | |||
669 | # | 668 | # |
670 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 669 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
671 | # | 670 | # |
671 | CONFIG_IDE_TIMINGS=y | ||
672 | CONFIG_IDE_ATAPI=y | ||
672 | # CONFIG_BLK_DEV_IDE_SATA is not set | 673 | # CONFIG_BLK_DEV_IDE_SATA is not set |
673 | CONFIG_BLK_DEV_IDEDISK=y | 674 | CONFIG_BLK_DEV_IDEDISK=y |
674 | # CONFIG_IDEDISK_MULTI_MODE is not set | 675 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -685,7 +686,6 @@ CONFIG_IDE_PROC_FS=y | |||
685 | # | 686 | # |
686 | # IDE chipset support/bugfixes | 687 | # IDE chipset support/bugfixes |
687 | # | 688 | # |
688 | # CONFIG_IDE_GENERIC is not set | ||
689 | # CONFIG_BLK_DEV_PLATFORM is not set | 689 | # CONFIG_BLK_DEV_PLATFORM is not set |
690 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 690 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
691 | 691 | ||
@@ -703,10 +703,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
703 | # CONFIG_BLK_DEV_AMD74XX is not set | 703 | # CONFIG_BLK_DEV_AMD74XX is not set |
704 | # CONFIG_BLK_DEV_CMD64X is not set | 704 | # CONFIG_BLK_DEV_CMD64X is not set |
705 | # CONFIG_BLK_DEV_TRIFLEX is not set | 705 | # CONFIG_BLK_DEV_TRIFLEX is not set |
706 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
707 | # CONFIG_BLK_DEV_CS5520 is not set | 706 | # CONFIG_BLK_DEV_CS5520 is not set |
708 | # CONFIG_BLK_DEV_CS5530 is not set | 707 | # CONFIG_BLK_DEV_CS5530 is not set |
709 | # CONFIG_BLK_DEV_HPT34X is not set | ||
710 | # CONFIG_BLK_DEV_HPT366 is not set | 708 | # CONFIG_BLK_DEV_HPT366 is not set |
711 | # CONFIG_BLK_DEV_JMICRON is not set | 709 | # CONFIG_BLK_DEV_JMICRON is not set |
712 | # CONFIG_BLK_DEV_SC1200 is not set | 710 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -727,8 +725,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
727 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 725 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
728 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 726 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
729 | CONFIG_BLK_DEV_IDEDMA=y | 727 | CONFIG_BLK_DEV_IDEDMA=y |
730 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
731 | # CONFIG_BLK_DEV_HD is not set | ||
732 | 728 | ||
733 | # | 729 | # |
734 | # SCSI device support | 730 | # SCSI device support |
@@ -820,6 +816,7 @@ CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 | |||
820 | CONFIG_SCSI_MAC53C94=y | 816 | CONFIG_SCSI_MAC53C94=y |
821 | # CONFIG_SCSI_SRP is not set | 817 | # CONFIG_SCSI_SRP is not set |
822 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 818 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
819 | # CONFIG_SCSI_DH is not set | ||
823 | # CONFIG_ATA is not set | 820 | # CONFIG_ATA is not set |
824 | CONFIG_MD=y | 821 | CONFIG_MD=y |
825 | CONFIG_BLK_DEV_MD=m | 822 | CONFIG_BLK_DEV_MD=m |
@@ -844,30 +841,22 @@ CONFIG_DM_ZERO=m | |||
844 | # | 841 | # |
845 | # IEEE 1394 (FireWire) support | 842 | # IEEE 1394 (FireWire) support |
846 | # | 843 | # |
847 | # CONFIG_FIREWIRE is not set | ||
848 | CONFIG_IEEE1394=m | ||
849 | |||
850 | # | ||
851 | # Subsystem Options | ||
852 | # | ||
853 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
854 | 844 | ||
855 | # | 845 | # |
856 | # Controllers | 846 | # Enable only one of the two stacks, unless you know what you are doing |
857 | # | 847 | # |
858 | # CONFIG_IEEE1394_PCILYNX is not set | 848 | # CONFIG_FIREWIRE is not set |
849 | CONFIG_IEEE1394=m | ||
859 | CONFIG_IEEE1394_OHCI1394=m | 850 | CONFIG_IEEE1394_OHCI1394=m |
860 | 851 | # CONFIG_IEEE1394_PCILYNX is not set | |
861 | # | ||
862 | # Protocols | ||
863 | # | ||
864 | CONFIG_IEEE1394_VIDEO1394=m | ||
865 | CONFIG_IEEE1394_SBP2=m | 852 | CONFIG_IEEE1394_SBP2=m |
866 | # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set | 853 | # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set |
867 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | 854 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set |
868 | # CONFIG_IEEE1394_ETH1394 is not set | 855 | # CONFIG_IEEE1394_ETH1394 is not set |
869 | CONFIG_IEEE1394_DV1394=m | ||
870 | CONFIG_IEEE1394_RAWIO=m | 856 | CONFIG_IEEE1394_RAWIO=m |
857 | CONFIG_IEEE1394_VIDEO1394=m | ||
858 | CONFIG_IEEE1394_DV1394=m | ||
859 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
871 | # CONFIG_I2O is not set | 860 | # CONFIG_I2O is not set |
872 | CONFIG_MACINTOSH_DRIVERS=y | 861 | CONFIG_MACINTOSH_DRIVERS=y |
873 | CONFIG_ADB=y | 862 | CONFIG_ADB=y |
@@ -887,7 +876,6 @@ CONFIG_THERM_ADT746X=m | |||
887 | # CONFIG_ANSLCD is not set | 876 | # CONFIG_ANSLCD is not set |
888 | CONFIG_PMAC_RACKMETER=m | 877 | CONFIG_PMAC_RACKMETER=m |
889 | CONFIG_NETDEVICES=y | 878 | CONFIG_NETDEVICES=y |
890 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
891 | CONFIG_DUMMY=m | 879 | CONFIG_DUMMY=m |
892 | # CONFIG_BONDING is not set | 880 | # CONFIG_BONDING is not set |
893 | # CONFIG_MACVLAN is not set | 881 | # CONFIG_MACVLAN is not set |
@@ -936,7 +924,6 @@ CONFIG_NETDEV_1000=y | |||
936 | # CONFIG_DL2K is not set | 924 | # CONFIG_DL2K is not set |
937 | # CONFIG_E1000 is not set | 925 | # CONFIG_E1000 is not set |
938 | # CONFIG_E1000E is not set | 926 | # CONFIG_E1000E is not set |
939 | # CONFIG_E1000E_ENABLED is not set | ||
940 | # CONFIG_IP1000 is not set | 927 | # CONFIG_IP1000 is not set |
941 | # CONFIG_IGB is not set | 928 | # CONFIG_IGB is not set |
942 | # CONFIG_NS83820 is not set | 929 | # CONFIG_NS83820 is not set |
@@ -952,6 +939,7 @@ CONFIG_NETDEV_1000=y | |||
952 | # CONFIG_MV643XX_ETH is not set | 939 | # CONFIG_MV643XX_ETH is not set |
953 | # CONFIG_QLA3XXX is not set | 940 | # CONFIG_QLA3XXX is not set |
954 | # CONFIG_ATL1 is not set | 941 | # CONFIG_ATL1 is not set |
942 | # CONFIG_ATL1E is not set | ||
955 | CONFIG_NETDEV_10000=y | 943 | CONFIG_NETDEV_10000=y |
956 | # CONFIG_CHELSIO_T1 is not set | 944 | # CONFIG_CHELSIO_T1 is not set |
957 | # CONFIG_CHELSIO_T3 is not set | 945 | # CONFIG_CHELSIO_T3 is not set |
@@ -994,13 +982,15 @@ CONFIG_PRISM54=m | |||
994 | # CONFIG_RTL8180 is not set | 982 | # CONFIG_RTL8180 is not set |
995 | # CONFIG_RTL8187 is not set | 983 | # CONFIG_RTL8187 is not set |
996 | # CONFIG_ADM8211 is not set | 984 | # CONFIG_ADM8211 is not set |
985 | # CONFIG_MAC80211_HWSIM is not set | ||
997 | CONFIG_P54_COMMON=m | 986 | CONFIG_P54_COMMON=m |
998 | # CONFIG_P54_USB is not set | 987 | # CONFIG_P54_USB is not set |
999 | # CONFIG_P54_PCI is not set | 988 | # CONFIG_P54_PCI is not set |
1000 | # CONFIG_ATH5K is not set | 989 | # CONFIG_ATH5K is not set |
990 | # CONFIG_ATH9K is not set | ||
1001 | # CONFIG_IWLCORE is not set | 991 | # CONFIG_IWLCORE is not set |
1002 | # CONFIG_IWLWIFI_LEDS is not set | 992 | # CONFIG_IWLWIFI_LEDS is not set |
1003 | # CONFIG_IWL4965 is not set | 993 | # CONFIG_IWLAGN is not set |
1004 | # CONFIG_IWL3945 is not set | 994 | # CONFIG_IWL3945 is not set |
1005 | # CONFIG_HOSTAP is not set | 995 | # CONFIG_HOSTAP is not set |
1006 | CONFIG_B43=m | 996 | CONFIG_B43=m |
@@ -1095,6 +1085,7 @@ CONFIG_INPUT_MOUSE=y | |||
1095 | # CONFIG_MOUSE_PS2 is not set | 1085 | # CONFIG_MOUSE_PS2 is not set |
1096 | # CONFIG_MOUSE_SERIAL is not set | 1086 | # CONFIG_MOUSE_SERIAL is not set |
1097 | # CONFIG_MOUSE_APPLETOUCH is not set | 1087 | # CONFIG_MOUSE_APPLETOUCH is not set |
1088 | # CONFIG_MOUSE_BCM5974 is not set | ||
1098 | # CONFIG_MOUSE_VSXXXAA is not set | 1089 | # CONFIG_MOUSE_VSXXXAA is not set |
1099 | # CONFIG_INPUT_JOYSTICK is not set | 1090 | # CONFIG_INPUT_JOYSTICK is not set |
1100 | # CONFIG_INPUT_TABLET is not set | 1091 | # CONFIG_INPUT_TABLET is not set |
@@ -1109,12 +1100,14 @@ CONFIG_SERIO=y | |||
1109 | # CONFIG_SERIO_SERPORT is not set | 1100 | # CONFIG_SERIO_SERPORT is not set |
1110 | # CONFIG_SERIO_PCIPS2 is not set | 1101 | # CONFIG_SERIO_PCIPS2 is not set |
1111 | # CONFIG_SERIO_RAW is not set | 1102 | # CONFIG_SERIO_RAW is not set |
1103 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
1112 | # CONFIG_GAMEPORT is not set | 1104 | # CONFIG_GAMEPORT is not set |
1113 | 1105 | ||
1114 | # | 1106 | # |
1115 | # Character devices | 1107 | # Character devices |
1116 | # | 1108 | # |
1117 | CONFIG_VT=y | 1109 | CONFIG_VT=y |
1110 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
1118 | CONFIG_VT_CONSOLE=y | 1111 | CONFIG_VT_CONSOLE=y |
1119 | CONFIG_HW_CONSOLE=y | 1112 | CONFIG_HW_CONSOLE=y |
1120 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1113 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -1165,45 +1158,70 @@ CONFIG_DEVPORT=y | |||
1165 | CONFIG_I2C=y | 1158 | CONFIG_I2C=y |
1166 | CONFIG_I2C_BOARDINFO=y | 1159 | CONFIG_I2C_BOARDINFO=y |
1167 | CONFIG_I2C_CHARDEV=m | 1160 | CONFIG_I2C_CHARDEV=m |
1161 | CONFIG_I2C_HELPER_AUTO=y | ||
1168 | CONFIG_I2C_ALGOBIT=y | 1162 | CONFIG_I2C_ALGOBIT=y |
1169 | 1163 | ||
1170 | # | 1164 | # |
1171 | # I2C Hardware Bus support | 1165 | # I2C Hardware Bus support |
1172 | # | 1166 | # |
1167 | |||
1168 | # | ||
1169 | # PC SMBus host controller drivers | ||
1170 | # | ||
1173 | # CONFIG_I2C_ALI1535 is not set | 1171 | # CONFIG_I2C_ALI1535 is not set |
1174 | # CONFIG_I2C_ALI1563 is not set | 1172 | # CONFIG_I2C_ALI1563 is not set |
1175 | # CONFIG_I2C_ALI15X3 is not set | 1173 | # CONFIG_I2C_ALI15X3 is not set |
1176 | # CONFIG_I2C_AMD756 is not set | 1174 | # CONFIG_I2C_AMD756 is not set |
1177 | # CONFIG_I2C_AMD8111 is not set | 1175 | # CONFIG_I2C_AMD8111 is not set |
1178 | # CONFIG_I2C_I801 is not set | 1176 | # CONFIG_I2C_I801 is not set |
1179 | # CONFIG_I2C_I810 is not set | 1177 | # CONFIG_I2C_ISCH is not set |
1180 | # CONFIG_I2C_PIIX4 is not set | 1178 | # CONFIG_I2C_PIIX4 is not set |
1181 | CONFIG_I2C_POWERMAC=y | ||
1182 | # CONFIG_I2C_MPC is not set | ||
1183 | # CONFIG_I2C_NFORCE2 is not set | 1179 | # CONFIG_I2C_NFORCE2 is not set |
1184 | # CONFIG_I2C_OCORES is not set | ||
1185 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1186 | # CONFIG_I2C_PROSAVAGE is not set | ||
1187 | # CONFIG_I2C_SAVAGE4 is not set | ||
1188 | # CONFIG_I2C_SIMTEC is not set | ||
1189 | # CONFIG_I2C_SIS5595 is not set | 1180 | # CONFIG_I2C_SIS5595 is not set |
1190 | # CONFIG_I2C_SIS630 is not set | 1181 | # CONFIG_I2C_SIS630 is not set |
1191 | # CONFIG_I2C_SIS96X is not set | 1182 | # CONFIG_I2C_SIS96X is not set |
1192 | # CONFIG_I2C_TAOS_EVM is not set | ||
1193 | # CONFIG_I2C_STUB is not set | ||
1194 | # CONFIG_I2C_TINY_USB is not set | ||
1195 | # CONFIG_I2C_VIA is not set | 1183 | # CONFIG_I2C_VIA is not set |
1196 | # CONFIG_I2C_VIAPRO is not set | 1184 | # CONFIG_I2C_VIAPRO is not set |
1185 | |||
1186 | # | ||
1187 | # Mac SMBus host controller drivers | ||
1188 | # | ||
1189 | CONFIG_I2C_POWERMAC=y | ||
1190 | |||
1191 | # | ||
1192 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
1193 | # | ||
1194 | # CONFIG_I2C_MPC is not set | ||
1195 | # CONFIG_I2C_OCORES is not set | ||
1196 | # CONFIG_I2C_SIMTEC is not set | ||
1197 | |||
1198 | # | ||
1199 | # External I2C/SMBus adapter drivers | ||
1200 | # | ||
1201 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1202 | # CONFIG_I2C_TAOS_EVM is not set | ||
1203 | # CONFIG_I2C_TINY_USB is not set | ||
1204 | |||
1205 | # | ||
1206 | # Graphics adapter I2C/DDC channel drivers | ||
1207 | # | ||
1197 | # CONFIG_I2C_VOODOO3 is not set | 1208 | # CONFIG_I2C_VOODOO3 is not set |
1209 | |||
1210 | # | ||
1211 | # Other I2C/SMBus bus drivers | ||
1212 | # | ||
1198 | # CONFIG_I2C_PCA_PLATFORM is not set | 1213 | # CONFIG_I2C_PCA_PLATFORM is not set |
1214 | # CONFIG_I2C_STUB is not set | ||
1199 | 1215 | ||
1200 | # | 1216 | # |
1201 | # Miscellaneous I2C Chip support | 1217 | # Miscellaneous I2C Chip support |
1202 | # | 1218 | # |
1203 | # CONFIG_DS1682 is not set | 1219 | # CONFIG_DS1682 is not set |
1220 | # CONFIG_AT24 is not set | ||
1204 | # CONFIG_SENSORS_EEPROM is not set | 1221 | # CONFIG_SENSORS_EEPROM is not set |
1205 | # CONFIG_SENSORS_PCF8574 is not set | 1222 | # CONFIG_SENSORS_PCF8574 is not set |
1206 | # CONFIG_PCF8575 is not set | 1223 | # CONFIG_PCF8575 is not set |
1224 | # CONFIG_SENSORS_PCA9539 is not set | ||
1207 | # CONFIG_SENSORS_PCF8591 is not set | 1225 | # CONFIG_SENSORS_PCF8591 is not set |
1208 | # CONFIG_SENSORS_MAX6875 is not set | 1226 | # CONFIG_SENSORS_MAX6875 is not set |
1209 | # CONFIG_SENSORS_TSL2550 is not set | 1227 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -1212,6 +1230,8 @@ CONFIG_I2C_POWERMAC=y | |||
1212 | # CONFIG_I2C_DEBUG_BUS is not set | 1230 | # CONFIG_I2C_DEBUG_BUS is not set |
1213 | # CONFIG_I2C_DEBUG_CHIP is not set | 1231 | # CONFIG_I2C_DEBUG_CHIP is not set |
1214 | # CONFIG_SPI is not set | 1232 | # CONFIG_SPI is not set |
1233 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
1234 | # CONFIG_GPIOLIB is not set | ||
1215 | # CONFIG_W1 is not set | 1235 | # CONFIG_W1 is not set |
1216 | CONFIG_POWER_SUPPLY=y | 1236 | CONFIG_POWER_SUPPLY=y |
1217 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1237 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
@@ -1221,6 +1241,7 @@ CONFIG_APM_POWER=y | |||
1221 | CONFIG_BATTERY_PMU=y | 1241 | CONFIG_BATTERY_PMU=y |
1222 | # CONFIG_HWMON is not set | 1242 | # CONFIG_HWMON is not set |
1223 | # CONFIG_THERMAL is not set | 1243 | # CONFIG_THERMAL is not set |
1244 | # CONFIG_THERMAL_HWMON is not set | ||
1224 | # CONFIG_WATCHDOG is not set | 1245 | # CONFIG_WATCHDOG is not set |
1225 | 1246 | ||
1226 | # | 1247 | # |
@@ -1241,8 +1262,10 @@ CONFIG_SSB_DRIVER_PCICORE=y | |||
1241 | # | 1262 | # |
1242 | # Multifunction device drivers | 1263 | # Multifunction device drivers |
1243 | # | 1264 | # |
1265 | # CONFIG_MFD_CORE is not set | ||
1244 | # CONFIG_MFD_SM501 is not set | 1266 | # CONFIG_MFD_SM501 is not set |
1245 | # CONFIG_HTC_PASIC3 is not set | 1267 | # CONFIG_HTC_PASIC3 is not set |
1268 | # CONFIG_MFD_TMIO is not set | ||
1246 | 1269 | ||
1247 | # | 1270 | # |
1248 | # Multimedia devices | 1271 | # Multimedia devices |
@@ -1343,10 +1366,13 @@ CONFIG_FB_3DFX=y | |||
1343 | # CONFIG_FB_TRIDENT is not set | 1366 | # CONFIG_FB_TRIDENT is not set |
1344 | # CONFIG_FB_ARK is not set | 1367 | # CONFIG_FB_ARK is not set |
1345 | # CONFIG_FB_PM3 is not set | 1368 | # CONFIG_FB_PM3 is not set |
1369 | # CONFIG_FB_CARMINE is not set | ||
1346 | # CONFIG_FB_IBM_GXT4500 is not set | 1370 | # CONFIG_FB_IBM_GXT4500 is not set |
1347 | # CONFIG_FB_VIRTUAL is not set | 1371 | # CONFIG_FB_VIRTUAL is not set |
1348 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1372 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
1349 | CONFIG_LCD_CLASS_DEVICE=m | 1373 | CONFIG_LCD_CLASS_DEVICE=m |
1374 | # CONFIG_LCD_ILI9320 is not set | ||
1375 | # CONFIG_LCD_PLATFORM is not set | ||
1350 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1376 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1351 | # CONFIG_BACKLIGHT_CORGI is not set | 1377 | # CONFIG_BACKLIGHT_CORGI is not set |
1352 | 1378 | ||
@@ -1374,15 +1400,7 @@ CONFIG_LOGO=y | |||
1374 | CONFIG_LOGO_LINUX_MONO=y | 1400 | CONFIG_LOGO_LINUX_MONO=y |
1375 | CONFIG_LOGO_LINUX_VGA16=y | 1401 | CONFIG_LOGO_LINUX_VGA16=y |
1376 | CONFIG_LOGO_LINUX_CLUT224=y | 1402 | CONFIG_LOGO_LINUX_CLUT224=y |
1377 | |||
1378 | # | ||
1379 | # Sound | ||
1380 | # | ||
1381 | CONFIG_SOUND=m | 1403 | CONFIG_SOUND=m |
1382 | |||
1383 | # | ||
1384 | # Advanced Linux Sound Architecture | ||
1385 | # | ||
1386 | CONFIG_SND=m | 1404 | CONFIG_SND=m |
1387 | CONFIG_SND_TIMER=m | 1405 | CONFIG_SND_TIMER=m |
1388 | CONFIG_SND_PCM=m | 1406 | CONFIG_SND_PCM=m |
@@ -1400,19 +1418,13 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
1400 | CONFIG_SND_VERBOSE_PROCFS=y | 1418 | CONFIG_SND_VERBOSE_PROCFS=y |
1401 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1419 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1402 | # CONFIG_SND_DEBUG is not set | 1420 | # CONFIG_SND_DEBUG is not set |
1403 | 1421 | CONFIG_SND_DRIVERS=y | |
1404 | # | ||
1405 | # Generic devices | ||
1406 | # | ||
1407 | CONFIG_SND_DUMMY=m | 1422 | CONFIG_SND_DUMMY=m |
1408 | # CONFIG_SND_VIRMIDI is not set | 1423 | # CONFIG_SND_VIRMIDI is not set |
1409 | # CONFIG_SND_MTPAV is not set | 1424 | # CONFIG_SND_MTPAV is not set |
1410 | # CONFIG_SND_SERIAL_U16550 is not set | 1425 | # CONFIG_SND_SERIAL_U16550 is not set |
1411 | # CONFIG_SND_MPU401 is not set | 1426 | # CONFIG_SND_MPU401 is not set |
1412 | 1427 | CONFIG_SND_PCI=y | |
1413 | # | ||
1414 | # PCI devices | ||
1415 | # | ||
1416 | # CONFIG_SND_AD1889 is not set | 1428 | # CONFIG_SND_AD1889 is not set |
1417 | # CONFIG_SND_ALS300 is not set | 1429 | # CONFIG_SND_ALS300 is not set |
1418 | # CONFIG_SND_ALS4000 is not set | 1430 | # CONFIG_SND_ALS4000 is not set |
@@ -1474,20 +1486,9 @@ CONFIG_SND_DUMMY=m | |||
1474 | # CONFIG_SND_VIRTUOSO is not set | 1486 | # CONFIG_SND_VIRTUOSO is not set |
1475 | # CONFIG_SND_VX222 is not set | 1487 | # CONFIG_SND_VX222 is not set |
1476 | # CONFIG_SND_YMFPCI is not set | 1488 | # CONFIG_SND_YMFPCI is not set |
1477 | 1489 | CONFIG_SND_PPC=y | |
1478 | # | ||
1479 | # ALSA PowerMac devices | ||
1480 | # | ||
1481 | CONFIG_SND_POWERMAC=m | 1490 | CONFIG_SND_POWERMAC=m |
1482 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1491 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
1483 | |||
1484 | # | ||
1485 | # ALSA PowerPC devices | ||
1486 | # | ||
1487 | |||
1488 | # | ||
1489 | # Apple Onboard Audio driver | ||
1490 | # | ||
1491 | CONFIG_SND_AOA=m | 1492 | CONFIG_SND_AOA=m |
1492 | CONFIG_SND_AOA_FABRIC_LAYOUT=m | 1493 | CONFIG_SND_AOA_FABRIC_LAYOUT=m |
1493 | CONFIG_SND_AOA_ONYX=m | 1494 | CONFIG_SND_AOA_ONYX=m |
@@ -1495,36 +1496,14 @@ CONFIG_SND_AOA_TAS=m | |||
1495 | CONFIG_SND_AOA_TOONIE=m | 1496 | CONFIG_SND_AOA_TOONIE=m |
1496 | CONFIG_SND_AOA_SOUNDBUS=m | 1497 | CONFIG_SND_AOA_SOUNDBUS=m |
1497 | CONFIG_SND_AOA_SOUNDBUS_I2S=m | 1498 | CONFIG_SND_AOA_SOUNDBUS_I2S=m |
1498 | 1499 | CONFIG_SND_USB=y | |
1499 | # | ||
1500 | # USB devices | ||
1501 | # | ||
1502 | CONFIG_SND_USB_AUDIO=m | 1500 | CONFIG_SND_USB_AUDIO=m |
1503 | # CONFIG_SND_USB_USX2Y is not set | 1501 | # CONFIG_SND_USB_USX2Y is not set |
1504 | # CONFIG_SND_USB_CAIAQ is not set | 1502 | # CONFIG_SND_USB_CAIAQ is not set |
1505 | 1503 | CONFIG_SND_PCMCIA=y | |
1506 | # | ||
1507 | # PCMCIA devices | ||
1508 | # | ||
1509 | # CONFIG_SND_VXPOCKET is not set | 1504 | # CONFIG_SND_VXPOCKET is not set |
1510 | # CONFIG_SND_PDAUDIOCF is not set | 1505 | # CONFIG_SND_PDAUDIOCF is not set |
1511 | |||
1512 | # | ||
1513 | # System on Chip audio support | ||
1514 | # | ||
1515 | # CONFIG_SND_SOC is not set | 1506 | # CONFIG_SND_SOC is not set |
1516 | |||
1517 | # | ||
1518 | # ALSA SoC audio for Freescale SOCs | ||
1519 | # | ||
1520 | |||
1521 | # | ||
1522 | # SoC Audio for the Texas Instruments OMAP | ||
1523 | # | ||
1524 | |||
1525 | # | ||
1526 | # Open Sound System | ||
1527 | # | ||
1528 | # CONFIG_SOUND_PRIME is not set | 1507 | # CONFIG_SOUND_PRIME is not set |
1529 | CONFIG_HID_SUPPORT=y | 1508 | CONFIG_HID_SUPPORT=y |
1530 | CONFIG_HID=y | 1509 | CONFIG_HID=y |
@@ -1554,6 +1533,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
1554 | CONFIG_USB_DYNAMIC_MINORS=y | 1533 | CONFIG_USB_DYNAMIC_MINORS=y |
1555 | # CONFIG_USB_SUSPEND is not set | 1534 | # CONFIG_USB_SUSPEND is not set |
1556 | # CONFIG_USB_OTG is not set | 1535 | # CONFIG_USB_OTG is not set |
1536 | CONFIG_USB_MON=y | ||
1557 | 1537 | ||
1558 | # | 1538 | # |
1559 | # USB Host Controller Drivers | 1539 | # USB Host Controller Drivers |
@@ -1579,6 +1559,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1579 | # | 1559 | # |
1580 | CONFIG_USB_ACM=m | 1560 | CONFIG_USB_ACM=m |
1581 | CONFIG_USB_PRINTER=m | 1561 | CONFIG_USB_PRINTER=m |
1562 | # CONFIG_USB_WDM is not set | ||
1582 | 1563 | ||
1583 | # | 1564 | # |
1584 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1565 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1600,6 +1581,7 @@ CONFIG_USB_STORAGE=m | |||
1600 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1581 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1601 | CONFIG_USB_STORAGE_ONETOUCH=y | 1582 | CONFIG_USB_STORAGE_ONETOUCH=y |
1602 | # CONFIG_USB_STORAGE_KARMA is not set | 1583 | # CONFIG_USB_STORAGE_KARMA is not set |
1584 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1603 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1585 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1604 | # CONFIG_USB_LIBUSUAL is not set | 1586 | # CONFIG_USB_LIBUSUAL is not set |
1605 | 1587 | ||
@@ -1608,7 +1590,6 @@ CONFIG_USB_STORAGE_ONETOUCH=y | |||
1608 | # | 1590 | # |
1609 | # CONFIG_USB_MDC800 is not set | 1591 | # CONFIG_USB_MDC800 is not set |
1610 | # CONFIG_USB_MICROTEK is not set | 1592 | # CONFIG_USB_MICROTEK is not set |
1611 | CONFIG_USB_MON=y | ||
1612 | 1593 | ||
1613 | # | 1594 | # |
1614 | # USB port drivers | 1595 | # USB port drivers |
@@ -1617,7 +1598,6 @@ CONFIG_USB_SERIAL=m | |||
1617 | CONFIG_USB_EZUSB=y | 1598 | CONFIG_USB_EZUSB=y |
1618 | # CONFIG_USB_SERIAL_GENERIC is not set | 1599 | # CONFIG_USB_SERIAL_GENERIC is not set |
1619 | # CONFIG_USB_SERIAL_AIRCABLE is not set | 1600 | # CONFIG_USB_SERIAL_AIRCABLE is not set |
1620 | # CONFIG_USB_SERIAL_AIRPRIME is not set | ||
1621 | # CONFIG_USB_SERIAL_ARK3116 is not set | 1601 | # CONFIG_USB_SERIAL_ARK3116 is not set |
1622 | # CONFIG_USB_SERIAL_BELKIN is not set | 1602 | # CONFIG_USB_SERIAL_BELKIN is not set |
1623 | # CONFIG_USB_SERIAL_CH341 is not set | 1603 | # CONFIG_USB_SERIAL_CH341 is not set |
@@ -1676,7 +1656,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
1676 | # CONFIG_USB_EMI62 is not set | 1656 | # CONFIG_USB_EMI62 is not set |
1677 | # CONFIG_USB_EMI26 is not set | 1657 | # CONFIG_USB_EMI26 is not set |
1678 | # CONFIG_USB_ADUTUX is not set | 1658 | # CONFIG_USB_ADUTUX is not set |
1679 | # CONFIG_USB_AUERSWALD is not set | ||
1680 | # CONFIG_USB_RIO500 is not set | 1659 | # CONFIG_USB_RIO500 is not set |
1681 | # CONFIG_USB_LEGOTOWER is not set | 1660 | # CONFIG_USB_LEGOTOWER is not set |
1682 | # CONFIG_USB_LCD is not set | 1661 | # CONFIG_USB_LCD is not set |
@@ -1693,6 +1672,7 @@ CONFIG_USB_APPLEDISPLAY=m | |||
1693 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1672 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1694 | # CONFIG_USB_IOWARRIOR is not set | 1673 | # CONFIG_USB_IOWARRIOR is not set |
1695 | # CONFIG_USB_TEST is not set | 1674 | # CONFIG_USB_TEST is not set |
1675 | # CONFIG_USB_ISIGHTFW is not set | ||
1696 | # CONFIG_USB_GADGET is not set | 1676 | # CONFIG_USB_GADGET is not set |
1697 | # CONFIG_MMC is not set | 1677 | # CONFIG_MMC is not set |
1698 | # CONFIG_MEMSTICK is not set | 1678 | # CONFIG_MEMSTICK is not set |
@@ -1702,6 +1682,8 @@ CONFIG_LEDS_CLASS=y | |||
1702 | # | 1682 | # |
1703 | # LED drivers | 1683 | # LED drivers |
1704 | # | 1684 | # |
1685 | # CONFIG_LEDS_PCA9532 is not set | ||
1686 | # CONFIG_LEDS_PCA955X is not set | ||
1705 | 1687 | ||
1706 | # | 1688 | # |
1707 | # LED Triggers | 1689 | # LED Triggers |
@@ -1789,6 +1771,7 @@ CONFIG_HFSPLUS_FS=m | |||
1789 | # CONFIG_CRAMFS is not set | 1771 | # CONFIG_CRAMFS is not set |
1790 | # CONFIG_VXFS_FS is not set | 1772 | # CONFIG_VXFS_FS is not set |
1791 | # CONFIG_MINIX_FS is not set | 1773 | # CONFIG_MINIX_FS is not set |
1774 | # CONFIG_OMFS_FS is not set | ||
1792 | # CONFIG_HPFS_FS is not set | 1775 | # CONFIG_HPFS_FS is not set |
1793 | # CONFIG_QNX4FS_FS is not set | 1776 | # CONFIG_QNX4FS_FS is not set |
1794 | # CONFIG_ROMFS_FS is not set | 1777 | # CONFIG_ROMFS_FS is not set |
@@ -1811,7 +1794,6 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
1811 | CONFIG_NFS_COMMON=y | 1794 | CONFIG_NFS_COMMON=y |
1812 | CONFIG_SUNRPC=y | 1795 | CONFIG_SUNRPC=y |
1813 | CONFIG_SUNRPC_GSS=y | 1796 | CONFIG_SUNRPC_GSS=y |
1814 | # CONFIG_SUNRPC_BIND34 is not set | ||
1815 | CONFIG_RPCSEC_GSS_KRB5=y | 1797 | CONFIG_RPCSEC_GSS_KRB5=y |
1816 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1798 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1817 | CONFIG_SMB_FS=m | 1799 | CONFIG_SMB_FS=m |
@@ -1891,6 +1873,7 @@ CONFIG_BITREVERSE=y | |||
1891 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1873 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1892 | CONFIG_CRC_CCITT=y | 1874 | CONFIG_CRC_CCITT=y |
1893 | CONFIG_CRC16=y | 1875 | CONFIG_CRC16=y |
1876 | CONFIG_CRC_T10DIF=y | ||
1894 | CONFIG_CRC_ITU_T=m | 1877 | CONFIG_CRC_ITU_T=m |
1895 | CONFIG_CRC32=y | 1878 | CONFIG_CRC32=y |
1896 | # CONFIG_CRC7 is not set | 1879 | # CONFIG_CRC7 is not set |
@@ -1921,8 +1904,10 @@ CONFIG_MAGIC_SYSRQ=y | |||
1921 | CONFIG_DEBUG_KERNEL=y | 1904 | CONFIG_DEBUG_KERNEL=y |
1922 | # CONFIG_DEBUG_SHIRQ is not set | 1905 | # CONFIG_DEBUG_SHIRQ is not set |
1923 | CONFIG_DETECT_SOFTLOCKUP=y | 1906 | CONFIG_DETECT_SOFTLOCKUP=y |
1907 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1908 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1924 | CONFIG_SCHED_DEBUG=y | 1909 | CONFIG_SCHED_DEBUG=y |
1925 | # CONFIG_SCHEDSTATS is not set | 1910 | CONFIG_SCHEDSTATS=y |
1926 | # CONFIG_TIMER_STATS is not set | 1911 | # CONFIG_TIMER_STATS is not set |
1927 | # CONFIG_DEBUG_OBJECTS is not set | 1912 | # CONFIG_DEBUG_OBJECTS is not set |
1928 | # CONFIG_SLUB_DEBUG_ON is not set | 1913 | # CONFIG_SLUB_DEBUG_ON is not set |
@@ -1933,24 +1918,38 @@ CONFIG_SCHED_DEBUG=y | |||
1933 | # CONFIG_DEBUG_MUTEXES is not set | 1918 | # CONFIG_DEBUG_MUTEXES is not set |
1934 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1919 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1935 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1920 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1921 | CONFIG_STACKTRACE=y | ||
1936 | # CONFIG_DEBUG_KOBJECT is not set | 1922 | # CONFIG_DEBUG_KOBJECT is not set |
1937 | CONFIG_DEBUG_BUGVERBOSE=y | 1923 | CONFIG_DEBUG_BUGVERBOSE=y |
1938 | # CONFIG_DEBUG_INFO is not set | 1924 | # CONFIG_DEBUG_INFO is not set |
1939 | # CONFIG_DEBUG_VM is not set | 1925 | # CONFIG_DEBUG_VM is not set |
1940 | # CONFIG_DEBUG_WRITECOUNT is not set | 1926 | # CONFIG_DEBUG_WRITECOUNT is not set |
1927 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1941 | # CONFIG_DEBUG_LIST is not set | 1928 | # CONFIG_DEBUG_LIST is not set |
1942 | # CONFIG_DEBUG_SG is not set | 1929 | # CONFIG_DEBUG_SG is not set |
1930 | CONFIG_FRAME_POINTER=y | ||
1943 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1931 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1944 | # CONFIG_RCU_TORTURE_TEST is not set | 1932 | # CONFIG_RCU_TORTURE_TEST is not set |
1945 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1933 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1946 | # CONFIG_FAULT_INJECTION is not set | 1934 | # CONFIG_FAULT_INJECTION is not set |
1935 | CONFIG_LATENCYTOP=y | ||
1936 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1937 | CONFIG_HAVE_FTRACE=y | ||
1938 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1939 | # CONFIG_FTRACE is not set | ||
1940 | # CONFIG_SCHED_TRACER is not set | ||
1941 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1947 | # CONFIG_SAMPLES is not set | 1942 | # CONFIG_SAMPLES is not set |
1943 | CONFIG_HAVE_ARCH_KGDB=y | ||
1944 | # CONFIG_KGDB is not set | ||
1948 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1945 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1949 | # CONFIG_DEBUG_STACK_USAGE is not set | 1946 | # CONFIG_DEBUG_STACK_USAGE is not set |
1950 | CONFIG_DEBUGGER=y | 1947 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1948 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1951 | CONFIG_XMON=y | 1949 | CONFIG_XMON=y |
1952 | CONFIG_XMON_DEFAULT=y | 1950 | CONFIG_XMON_DEFAULT=y |
1953 | CONFIG_XMON_DISASSEMBLY=y | 1951 | CONFIG_XMON_DISASSEMBLY=y |
1952 | CONFIG_DEBUGGER=y | ||
1954 | CONFIG_IRQSTACKS=y | 1953 | CONFIG_IRQSTACKS=y |
1955 | # CONFIG_BDI_SWITCH is not set | 1954 | # CONFIG_BDI_SWITCH is not set |
1956 | CONFIG_BOOTX_TEXT=y | 1955 | CONFIG_BOOTX_TEXT=y |
@@ -2009,6 +2008,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
2009 | CONFIG_CRYPTO_MD4=m | 2008 | CONFIG_CRYPTO_MD4=m |
2010 | CONFIG_CRYPTO_MD5=y | 2009 | CONFIG_CRYPTO_MD5=y |
2011 | CONFIG_CRYPTO_MICHAEL_MIC=m | 2010 | CONFIG_CRYPTO_MICHAEL_MIC=m |
2011 | # CONFIG_CRYPTO_RMD128 is not set | ||
2012 | # CONFIG_CRYPTO_RMD160 is not set | ||
2013 | # CONFIG_CRYPTO_RMD256 is not set | ||
2014 | # CONFIG_CRYPTO_RMD320 is not set | ||
2012 | CONFIG_CRYPTO_SHA1=y | 2015 | CONFIG_CRYPTO_SHA1=y |
2013 | CONFIG_CRYPTO_SHA256=m | 2016 | CONFIG_CRYPTO_SHA256=m |
2014 | CONFIG_CRYPTO_SHA512=m | 2017 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index ce250bc98584..fc5930caeb5f 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc6 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 16 21:11:19 2008 | 4 | # Tue Aug 26 13:22:03 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -14,6 +14,7 @@ CONFIG_POWER4=y | |||
14 | # CONFIG_TUNE_CELL is not set | 14 | # CONFIG_TUNE_CELL is not set |
15 | CONFIG_PPC_FPU=y | 15 | CONFIG_PPC_FPU=y |
16 | CONFIG_ALTIVEC=y | 16 | CONFIG_ALTIVEC=y |
17 | CONFIG_VSX=y | ||
17 | CONFIG_PPC_STD_MMU=y | 18 | CONFIG_PPC_STD_MMU=y |
18 | CONFIG_PPC_MM_SLICES=y | 19 | CONFIG_PPC_MM_SLICES=y |
19 | CONFIG_VIRT_CPU_ACCOUNTING=y | 20 | CONFIG_VIRT_CPU_ACCOUNTING=y |
@@ -31,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 32 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 36 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
@@ -105,7 +107,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
105 | CONFIG_SYSCTL=y | 107 | CONFIG_SYSCTL=y |
106 | # CONFIG_EMBEDDED is not set | 108 | # CONFIG_EMBEDDED is not set |
107 | CONFIG_SYSCTL_SYSCALL=y | 109 | CONFIG_SYSCTL_SYSCALL=y |
108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
109 | CONFIG_KALLSYMS=y | 110 | CONFIG_KALLSYMS=y |
110 | CONFIG_KALLSYMS_ALL=y | 111 | CONFIG_KALLSYMS_ALL=y |
111 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 112 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -129,14 +130,20 @@ CONFIG_SLUB_DEBUG=y | |||
129 | CONFIG_SLUB=y | 130 | CONFIG_SLUB=y |
130 | # CONFIG_SLOB is not set | 131 | # CONFIG_SLOB is not set |
131 | CONFIG_PROFILING=y | 132 | CONFIG_PROFILING=y |
132 | # CONFIG_MARKERS is not set | 133 | CONFIG_MARKERS=y |
133 | CONFIG_OPROFILE=y | 134 | CONFIG_OPROFILE=y |
134 | CONFIG_HAVE_OPROFILE=y | 135 | CONFIG_HAVE_OPROFILE=y |
135 | # CONFIG_KPROBES is not set | 136 | # CONFIG_KPROBES is not set |
137 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
138 | CONFIG_HAVE_IOREMAP_PROT=y | ||
136 | CONFIG_HAVE_KPROBES=y | 139 | CONFIG_HAVE_KPROBES=y |
137 | CONFIG_HAVE_KRETPROBES=y | 140 | CONFIG_HAVE_KRETPROBES=y |
138 | # CONFIG_HAVE_DMA_ATTRS is not set | 141 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
142 | CONFIG_HAVE_DMA_ATTRS=y | ||
143 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
144 | # CONFIG_HAVE_CLK is not set | ||
139 | CONFIG_PROC_PAGE_MONITOR=y | 145 | CONFIG_PROC_PAGE_MONITOR=y |
146 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
140 | CONFIG_SLABINFO=y | 147 | CONFIG_SLABINFO=y |
141 | CONFIG_RT_MUTEXES=y | 148 | CONFIG_RT_MUTEXES=y |
142 | # CONFIG_TINY_SHMEM is not set | 149 | # CONFIG_TINY_SHMEM is not set |
@@ -152,6 +159,7 @@ CONFIG_STOP_MACHINE=y | |||
152 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
153 | CONFIG_BLK_DEV_IO_TRACE=y | 160 | CONFIG_BLK_DEV_IO_TRACE=y |
154 | CONFIG_BLK_DEV_BSG=y | 161 | CONFIG_BLK_DEV_BSG=y |
162 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
155 | CONFIG_BLOCK_COMPAT=y | 163 | CONFIG_BLOCK_COMPAT=y |
156 | 164 | ||
157 | # | 165 | # |
@@ -172,14 +180,13 @@ CONFIG_CLASSIC_RCU=y | |||
172 | # Platform support | 180 | # Platform support |
173 | # | 181 | # |
174 | CONFIG_PPC_MULTIPLATFORM=y | 182 | CONFIG_PPC_MULTIPLATFORM=y |
175 | # CONFIG_PPC_82xx is not set | ||
176 | # CONFIG_PPC_83xx is not set | ||
177 | # CONFIG_PPC_86xx is not set | ||
178 | CONFIG_PPC_PSERIES=y | 183 | CONFIG_PPC_PSERIES=y |
179 | CONFIG_PPC_SPLPAR=y | 184 | CONFIG_PPC_SPLPAR=y |
180 | CONFIG_EEH=y | 185 | CONFIG_EEH=y |
181 | CONFIG_SCANLOG=m | 186 | CONFIG_SCANLOG=m |
182 | CONFIG_LPARCFG=y | 187 | CONFIG_LPARCFG=y |
188 | CONFIG_PPC_SMLPAR=y | ||
189 | CONFIG_CMM=y | ||
183 | CONFIG_PPC_ISERIES=y | 190 | CONFIG_PPC_ISERIES=y |
184 | 191 | ||
185 | # | 192 | # |
@@ -189,8 +196,6 @@ CONFIG_VIODASD=y | |||
189 | CONFIG_VIOCD=m | 196 | CONFIG_VIOCD=m |
190 | CONFIG_VIOTAPE=m | 197 | CONFIG_VIOTAPE=m |
191 | CONFIG_VIOPATH=y | 198 | CONFIG_VIOPATH=y |
192 | # CONFIG_PPC_MPC512x is not set | ||
193 | # CONFIG_PPC_MPC5121 is not set | ||
194 | CONFIG_PPC_PMAC=y | 199 | CONFIG_PPC_PMAC=y |
195 | CONFIG_PPC_PMAC64=y | 200 | CONFIG_PPC_PMAC64=y |
196 | CONFIG_PPC_MAPLE=y | 201 | CONFIG_PPC_MAPLE=y |
@@ -213,11 +218,15 @@ CONFIG_PPC_CELLEB=y | |||
213 | # | 218 | # |
214 | CONFIG_SPU_FS=m | 219 | CONFIG_SPU_FS=m |
215 | CONFIG_SPU_FS_64K_LS=y | 220 | CONFIG_SPU_FS_64K_LS=y |
221 | # CONFIG_SPU_TRACE is not set | ||
216 | CONFIG_SPU_BASE=y | 222 | CONFIG_SPU_BASE=y |
217 | CONFIG_CBE_RAS=y | 223 | CONFIG_CBE_RAS=y |
224 | CONFIG_PPC_IBM_CELL_RESETBUTTON=y | ||
225 | CONFIG_PPC_IBM_CELL_POWERBUTTON=m | ||
218 | CONFIG_CBE_THERM=m | 226 | CONFIG_CBE_THERM=m |
219 | CONFIG_CBE_CPUFREQ=m | 227 | CONFIG_CBE_CPUFREQ=m |
220 | CONFIG_CBE_CPUFREQ_PMI=m | 228 | CONFIG_CBE_CPUFREQ_PMI=m |
229 | CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m | ||
221 | CONFIG_OPROFILE_CELL=y | 230 | CONFIG_OPROFILE_CELL=y |
222 | # CONFIG_PQ2ADS is not set | 231 | # CONFIG_PQ2ADS is not set |
223 | CONFIG_PPC_NATIVE=y | 232 | CONFIG_PPC_NATIVE=y |
@@ -279,7 +288,7 @@ CONFIG_HZ_250=y | |||
279 | # CONFIG_HZ_300 is not set | 288 | # CONFIG_HZ_300 is not set |
280 | # CONFIG_HZ_1000 is not set | 289 | # CONFIG_HZ_1000 is not set |
281 | CONFIG_HZ=250 | 290 | CONFIG_HZ=250 |
282 | # CONFIG_SCHED_HRTICK is not set | 291 | CONFIG_SCHED_HRTICK=y |
283 | CONFIG_PREEMPT_NONE=y | 292 | CONFIG_PREEMPT_NONE=y |
284 | # CONFIG_PREEMPT_VOLUNTARY is not set | 293 | # CONFIG_PREEMPT_VOLUNTARY is not set |
285 | # CONFIG_PREEMPT is not set | 294 | # CONFIG_PREEMPT is not set |
@@ -315,8 +324,10 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | |||
315 | CONFIG_SPARSEMEM_VMEMMAP=y | 324 | CONFIG_SPARSEMEM_VMEMMAP=y |
316 | CONFIG_MEMORY_HOTPLUG=y | 325 | CONFIG_MEMORY_HOTPLUG=y |
317 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | 326 | CONFIG_MEMORY_HOTPLUG_SPARSE=y |
327 | CONFIG_MEMORY_HOTREMOVE=y | ||
318 | CONFIG_PAGEFLAGS_EXTENDED=y | 328 | CONFIG_PAGEFLAGS_EXTENDED=y |
319 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 329 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
330 | CONFIG_MIGRATION=y | ||
320 | CONFIG_RESOURCES_64BIT=y | 331 | CONFIG_RESOURCES_64BIT=y |
321 | CONFIG_ZONE_DMA_FLAG=1 | 332 | CONFIG_ZONE_DMA_FLAG=1 |
322 | CONFIG_BOUNCE=y | 333 | CONFIG_BOUNCE=y |
@@ -327,6 +338,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
327 | # CONFIG_SCHED_SMT is not set | 338 | # CONFIG_SCHED_SMT is not set |
328 | CONFIG_PROC_DEVICETREE=y | 339 | CONFIG_PROC_DEVICETREE=y |
329 | # CONFIG_CMDLINE_BOOL is not set | 340 | # CONFIG_CMDLINE_BOOL is not set |
341 | CONFIG_EXTRA_TARGETS="" | ||
330 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y | 342 | CONFIG_ARCH_WANTS_FREEZER_CONTROL=y |
331 | # CONFIG_PM is not set | 343 | # CONFIG_PM is not set |
332 | CONFIG_SECCOMP=y | 344 | CONFIG_SECCOMP=y |
@@ -370,10 +382,6 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | |||
370 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 382 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
371 | CONFIG_KERNEL_START=0xc000000000000000 | 383 | CONFIG_KERNEL_START=0xc000000000000000 |
372 | CONFIG_PHYSICAL_START=0x00000000 | 384 | CONFIG_PHYSICAL_START=0x00000000 |
373 | |||
374 | # | ||
375 | # Networking | ||
376 | # | ||
377 | CONFIG_NET=y | 385 | CONFIG_NET=y |
378 | 386 | ||
379 | # | 387 | # |
@@ -387,6 +395,7 @@ CONFIG_XFRM_USER=m | |||
387 | # CONFIG_XFRM_SUB_POLICY is not set | 395 | # CONFIG_XFRM_SUB_POLICY is not set |
388 | # CONFIG_XFRM_MIGRATE is not set | 396 | # CONFIG_XFRM_MIGRATE is not set |
389 | # CONFIG_XFRM_STATISTICS is not set | 397 | # CONFIG_XFRM_STATISTICS is not set |
398 | CONFIG_XFRM_IPCOMP=m | ||
390 | CONFIG_NET_KEY=m | 399 | CONFIG_NET_KEY=m |
391 | # CONFIG_NET_KEY_MIGRATE is not set | 400 | # CONFIG_NET_KEY_MIGRATE is not set |
392 | CONFIG_INET=y | 401 | CONFIG_INET=y |
@@ -578,6 +587,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
578 | CONFIG_STANDALONE=y | 587 | CONFIG_STANDALONE=y |
579 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 588 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
580 | CONFIG_FW_LOADER=y | 589 | CONFIG_FW_LOADER=y |
590 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
591 | CONFIG_EXTRA_FIRMWARE="" | ||
581 | # CONFIG_DEBUG_DRIVER is not set | 592 | # CONFIG_DEBUG_DRIVER is not set |
582 | # CONFIG_DEBUG_DEVRES is not set | 593 | # CONFIG_DEBUG_DEVRES is not set |
583 | # CONFIG_SYS_HYPERVISOR is not set | 594 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -603,12 +614,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
603 | # CONFIG_BLK_DEV_XIP is not set | 614 | # CONFIG_BLK_DEV_XIP is not set |
604 | # CONFIG_CDROM_PKTCDVD is not set | 615 | # CONFIG_CDROM_PKTCDVD is not set |
605 | # CONFIG_ATA_OVER_ETH is not set | 616 | # CONFIG_ATA_OVER_ETH is not set |
617 | # CONFIG_BLK_DEV_HD is not set | ||
606 | CONFIG_MISC_DEVICES=y | 618 | CONFIG_MISC_DEVICES=y |
607 | # CONFIG_PHANTOM is not set | 619 | # CONFIG_PHANTOM is not set |
608 | # CONFIG_EEPROM_93CX6 is not set | 620 | # CONFIG_EEPROM_93CX6 is not set |
609 | # CONFIG_SGI_IOC4 is not set | 621 | # CONFIG_SGI_IOC4 is not set |
610 | # CONFIG_TIFM_CORE is not set | 622 | # CONFIG_TIFM_CORE is not set |
611 | # CONFIG_ENCLOSURE_SERVICES is not set | 623 | # CONFIG_ENCLOSURE_SERVICES is not set |
624 | # CONFIG_HP_ILO is not set | ||
612 | CONFIG_HAVE_IDE=y | 625 | CONFIG_HAVE_IDE=y |
613 | CONFIG_IDE=y | 626 | CONFIG_IDE=y |
614 | CONFIG_BLK_DEV_IDE=y | 627 | CONFIG_BLK_DEV_IDE=y |
@@ -616,6 +629,7 @@ CONFIG_BLK_DEV_IDE=y | |||
616 | # | 629 | # |
617 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 630 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
618 | # | 631 | # |
632 | CONFIG_IDE_TIMINGS=y | ||
619 | # CONFIG_BLK_DEV_IDE_SATA is not set | 633 | # CONFIG_BLK_DEV_IDE_SATA is not set |
620 | CONFIG_BLK_DEV_IDEDISK=y | 634 | CONFIG_BLK_DEV_IDEDISK=y |
621 | # CONFIG_IDEDISK_MULTI_MODE is not set | 635 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -649,10 +663,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
649 | CONFIG_BLK_DEV_AMD74XX=y | 663 | CONFIG_BLK_DEV_AMD74XX=y |
650 | # CONFIG_BLK_DEV_CMD64X is not set | 664 | # CONFIG_BLK_DEV_CMD64X is not set |
651 | # CONFIG_BLK_DEV_TRIFLEX is not set | 665 | # CONFIG_BLK_DEV_TRIFLEX is not set |
652 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
653 | # CONFIG_BLK_DEV_CS5520 is not set | 666 | # CONFIG_BLK_DEV_CS5520 is not set |
654 | # CONFIG_BLK_DEV_CS5530 is not set | 667 | # CONFIG_BLK_DEV_CS5530 is not set |
655 | # CONFIG_BLK_DEV_HPT34X is not set | ||
656 | # CONFIG_BLK_DEV_HPT366 is not set | 668 | # CONFIG_BLK_DEV_HPT366 is not set |
657 | # CONFIG_BLK_DEV_JMICRON is not set | 669 | # CONFIG_BLK_DEV_JMICRON is not set |
658 | # CONFIG_BLK_DEV_SC1200 is not set | 670 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -674,8 +686,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
674 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 686 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
675 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 687 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
676 | CONFIG_BLK_DEV_IDEDMA=y | 688 | CONFIG_BLK_DEV_IDEDMA=y |
677 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
678 | # CONFIG_BLK_DEV_HD is not set | ||
679 | 689 | ||
680 | # | 690 | # |
681 | # SCSI device support | 691 | # SCSI device support |
@@ -737,6 +747,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
737 | # CONFIG_SCSI_GDTH is not set | 747 | # CONFIG_SCSI_GDTH is not set |
738 | # CONFIG_SCSI_IPS is not set | 748 | # CONFIG_SCSI_IPS is not set |
739 | CONFIG_SCSI_IBMVSCSI=y | 749 | CONFIG_SCSI_IBMVSCSI=y |
750 | CONFIG_SCSI_IBMVFC=m | ||
751 | CONFIG_SCSI_IBMVFC_TRACE=y | ||
740 | # CONFIG_SCSI_INITIO is not set | 752 | # CONFIG_SCSI_INITIO is not set |
741 | # CONFIG_SCSI_INIA100 is not set | 753 | # CONFIG_SCSI_INIA100 is not set |
742 | # CONFIG_SCSI_MVSAS is not set | 754 | # CONFIG_SCSI_MVSAS is not set |
@@ -758,6 +770,7 @@ CONFIG_SCSI_LPFC=m | |||
758 | CONFIG_SCSI_DEBUG=m | 770 | CONFIG_SCSI_DEBUG=m |
759 | # CONFIG_SCSI_SRP is not set | 771 | # CONFIG_SCSI_SRP is not set |
760 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 772 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
773 | # CONFIG_SCSI_DH is not set | ||
761 | CONFIG_ATA=y | 774 | CONFIG_ATA=y |
762 | CONFIG_ATA_NONSTANDARD=y | 775 | CONFIG_ATA_NONSTANDARD=y |
763 | CONFIG_SATA_PMP=y | 776 | CONFIG_SATA_PMP=y |
@@ -837,9 +850,6 @@ CONFIG_DM_SNAPSHOT=m | |||
837 | CONFIG_DM_MIRROR=m | 850 | CONFIG_DM_MIRROR=m |
838 | CONFIG_DM_ZERO=m | 851 | CONFIG_DM_ZERO=m |
839 | CONFIG_DM_MULTIPATH=m | 852 | CONFIG_DM_MULTIPATH=m |
840 | CONFIG_DM_MULTIPATH_EMC=m | ||
841 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
842 | # CONFIG_DM_MULTIPATH_HP is not set | ||
843 | # CONFIG_DM_DELAY is not set | 853 | # CONFIG_DM_DELAY is not set |
844 | # CONFIG_DM_UEVENT is not set | 854 | # CONFIG_DM_UEVENT is not set |
845 | # CONFIG_FUSION is not set | 855 | # CONFIG_FUSION is not set |
@@ -847,29 +857,21 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
847 | # | 857 | # |
848 | # IEEE 1394 (FireWire) support | 858 | # IEEE 1394 (FireWire) support |
849 | # | 859 | # |
850 | # CONFIG_FIREWIRE is not set | ||
851 | CONFIG_IEEE1394=y | ||
852 | |||
853 | # | ||
854 | # Subsystem Options | ||
855 | # | ||
856 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
857 | 860 | ||
858 | # | 861 | # |
859 | # Controllers | 862 | # Enable only one of the two stacks, unless you know what you are doing |
860 | # | 863 | # |
861 | # CONFIG_IEEE1394_PCILYNX is not set | 864 | # CONFIG_FIREWIRE is not set |
865 | CONFIG_IEEE1394=y | ||
862 | CONFIG_IEEE1394_OHCI1394=y | 866 | CONFIG_IEEE1394_OHCI1394=y |
863 | 867 | # CONFIG_IEEE1394_PCILYNX is not set | |
864 | # | ||
865 | # Protocols | ||
866 | # | ||
867 | CONFIG_IEEE1394_VIDEO1394=m | ||
868 | CONFIG_IEEE1394_SBP2=m | 868 | CONFIG_IEEE1394_SBP2=m |
869 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y | 869 | CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y |
870 | CONFIG_IEEE1394_ETH1394=m | 870 | CONFIG_IEEE1394_ETH1394=m |
871 | CONFIG_IEEE1394_DV1394=m | ||
872 | CONFIG_IEEE1394_RAWIO=y | 871 | CONFIG_IEEE1394_RAWIO=y |
872 | CONFIG_IEEE1394_VIDEO1394=m | ||
873 | CONFIG_IEEE1394_DV1394=m | ||
874 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
873 | # CONFIG_I2O is not set | 875 | # CONFIG_I2O is not set |
874 | CONFIG_MACINTOSH_DRIVERS=y | 876 | CONFIG_MACINTOSH_DRIVERS=y |
875 | CONFIG_ADB_PMU=y | 877 | CONFIG_ADB_PMU=y |
@@ -884,7 +886,6 @@ CONFIG_WINDFARM_PM112=y | |||
884 | CONFIG_WINDFARM_PM121=y | 886 | CONFIG_WINDFARM_PM121=y |
885 | # CONFIG_PMAC_RACKMETER is not set | 887 | # CONFIG_PMAC_RACKMETER is not set |
886 | CONFIG_NETDEVICES=y | 888 | CONFIG_NETDEVICES=y |
887 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
888 | CONFIG_DUMMY=m | 889 | CONFIG_DUMMY=m |
889 | CONFIG_BONDING=m | 890 | CONFIG_BONDING=m |
890 | # CONFIG_MACVLAN is not set | 891 | # CONFIG_MACVLAN is not set |
@@ -942,6 +943,7 @@ CONFIG_E100=y | |||
942 | # CONFIG_SIS900 is not set | 943 | # CONFIG_SIS900 is not set |
943 | # CONFIG_EPIC100 is not set | 944 | # CONFIG_EPIC100 is not set |
944 | # CONFIG_SUNDANCE is not set | 945 | # CONFIG_SUNDANCE is not set |
946 | # CONFIG_TLAN is not set | ||
945 | # CONFIG_VIA_RHINE is not set | 947 | # CONFIG_VIA_RHINE is not set |
946 | # CONFIG_SC92031 is not set | 948 | # CONFIG_SC92031 is not set |
947 | CONFIG_NETDEV_1000=y | 949 | CONFIG_NETDEV_1000=y |
@@ -949,10 +951,8 @@ CONFIG_ACENIC=y | |||
949 | CONFIG_ACENIC_OMIT_TIGON_I=y | 951 | CONFIG_ACENIC_OMIT_TIGON_I=y |
950 | # CONFIG_DL2K is not set | 952 | # CONFIG_DL2K is not set |
951 | CONFIG_E1000=y | 953 | CONFIG_E1000=y |
952 | # CONFIG_E1000_NAPI is not set | ||
953 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 954 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
954 | # CONFIG_E1000E is not set | 955 | # CONFIG_E1000E is not set |
955 | # CONFIG_E1000E_ENABLED is not set | ||
956 | # CONFIG_IP1000 is not set | 956 | # CONFIG_IP1000 is not set |
957 | # CONFIG_IGB is not set | 957 | # CONFIG_IGB is not set |
958 | # CONFIG_NS83820 is not set | 958 | # CONFIG_NS83820 is not set |
@@ -968,13 +968,13 @@ CONFIG_TIGON3=y | |||
968 | CONFIG_SPIDER_NET=m | 968 | CONFIG_SPIDER_NET=m |
969 | # CONFIG_QLA3XXX is not set | 969 | # CONFIG_QLA3XXX is not set |
970 | # CONFIG_ATL1 is not set | 970 | # CONFIG_ATL1 is not set |
971 | # CONFIG_ATL1E is not set | ||
971 | CONFIG_NETDEV_10000=y | 972 | CONFIG_NETDEV_10000=y |
972 | # CONFIG_CHELSIO_T1 is not set | 973 | # CONFIG_CHELSIO_T1 is not set |
973 | # CONFIG_CHELSIO_T3 is not set | 974 | # CONFIG_CHELSIO_T3 is not set |
974 | CONFIG_EHEA=m | 975 | CONFIG_EHEA=m |
975 | # CONFIG_IXGBE is not set | 976 | # CONFIG_IXGBE is not set |
976 | CONFIG_IXGB=m | 977 | CONFIG_IXGB=m |
977 | # CONFIG_IXGB_NAPI is not set | ||
978 | # CONFIG_S2IO is not set | 978 | # CONFIG_S2IO is not set |
979 | # CONFIG_MYRI10GE is not set | 979 | # CONFIG_MYRI10GE is not set |
980 | # CONFIG_NETXEN_NIC is not set | 980 | # CONFIG_NETXEN_NIC is not set |
@@ -1068,6 +1068,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
1068 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1068 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
1069 | # CONFIG_MOUSE_SERIAL is not set | 1069 | # CONFIG_MOUSE_SERIAL is not set |
1070 | # CONFIG_MOUSE_APPLETOUCH is not set | 1070 | # CONFIG_MOUSE_APPLETOUCH is not set |
1071 | # CONFIG_MOUSE_BCM5974 is not set | ||
1071 | # CONFIG_MOUSE_VSXXXAA is not set | 1072 | # CONFIG_MOUSE_VSXXXAA is not set |
1072 | # CONFIG_INPUT_JOYSTICK is not set | 1073 | # CONFIG_INPUT_JOYSTICK is not set |
1073 | # CONFIG_INPUT_TABLET is not set | 1074 | # CONFIG_INPUT_TABLET is not set |
@@ -1090,12 +1091,14 @@ CONFIG_SERIO_I8042=y | |||
1090 | # CONFIG_SERIO_PCIPS2 is not set | 1091 | # CONFIG_SERIO_PCIPS2 is not set |
1091 | CONFIG_SERIO_LIBPS2=y | 1092 | CONFIG_SERIO_LIBPS2=y |
1092 | # CONFIG_SERIO_RAW is not set | 1093 | # CONFIG_SERIO_RAW is not set |
1094 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
1093 | # CONFIG_GAMEPORT is not set | 1095 | # CONFIG_GAMEPORT is not set |
1094 | 1096 | ||
1095 | # | 1097 | # |
1096 | # Character devices | 1098 | # Character devices |
1097 | # | 1099 | # |
1098 | CONFIG_VT=y | 1100 | CONFIG_VT=y |
1101 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
1099 | CONFIG_VT_CONSOLE=y | 1102 | CONFIG_VT_CONSOLE=y |
1100 | CONFIG_HW_CONSOLE=y | 1103 | CONFIG_HW_CONSOLE=y |
1101 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1104 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -1131,11 +1134,13 @@ CONFIG_UNIX98_PTYS=y | |||
1131 | CONFIG_LEGACY_PTYS=y | 1134 | CONFIG_LEGACY_PTYS=y |
1132 | CONFIG_LEGACY_PTY_COUNT=256 | 1135 | CONFIG_LEGACY_PTY_COUNT=256 |
1133 | CONFIG_HVC_DRIVER=y | 1136 | CONFIG_HVC_DRIVER=y |
1137 | CONFIG_HVC_IRQ=y | ||
1134 | CONFIG_HVC_CONSOLE=y | 1138 | CONFIG_HVC_CONSOLE=y |
1135 | CONFIG_HVC_ISERIES=y | 1139 | CONFIG_HVC_ISERIES=y |
1136 | CONFIG_HVC_RTAS=y | 1140 | CONFIG_HVC_RTAS=y |
1137 | CONFIG_HVC_BEAT=y | 1141 | CONFIG_HVC_BEAT=y |
1138 | CONFIG_HVCS=m | 1142 | CONFIG_HVCS=m |
1143 | CONFIG_IBM_BSR=m | ||
1139 | # CONFIG_IPMI_HANDLER is not set | 1144 | # CONFIG_IPMI_HANDLER is not set |
1140 | # CONFIG_HW_RANDOM is not set | 1145 | # CONFIG_HW_RANDOM is not set |
1141 | # CONFIG_R3964 is not set | 1146 | # CONFIG_R3964 is not set |
@@ -1156,45 +1161,70 @@ CONFIG_DEVPORT=y | |||
1156 | CONFIG_I2C=y | 1161 | CONFIG_I2C=y |
1157 | CONFIG_I2C_BOARDINFO=y | 1162 | CONFIG_I2C_BOARDINFO=y |
1158 | CONFIG_I2C_CHARDEV=y | 1163 | CONFIG_I2C_CHARDEV=y |
1164 | CONFIG_I2C_HELPER_AUTO=y | ||
1159 | CONFIG_I2C_ALGOBIT=y | 1165 | CONFIG_I2C_ALGOBIT=y |
1160 | 1166 | ||
1161 | # | 1167 | # |
1162 | # I2C Hardware Bus support | 1168 | # I2C Hardware Bus support |
1163 | # | 1169 | # |
1170 | |||
1171 | # | ||
1172 | # PC SMBus host controller drivers | ||
1173 | # | ||
1164 | # CONFIG_I2C_ALI1535 is not set | 1174 | # CONFIG_I2C_ALI1535 is not set |
1165 | # CONFIG_I2C_ALI1563 is not set | 1175 | # CONFIG_I2C_ALI1563 is not set |
1166 | # CONFIG_I2C_ALI15X3 is not set | 1176 | # CONFIG_I2C_ALI15X3 is not set |
1167 | # CONFIG_I2C_AMD756 is not set | 1177 | # CONFIG_I2C_AMD756 is not set |
1168 | CONFIG_I2C_AMD8111=y | 1178 | CONFIG_I2C_AMD8111=y |
1169 | # CONFIG_I2C_I801 is not set | 1179 | # CONFIG_I2C_I801 is not set |
1170 | # CONFIG_I2C_I810 is not set | 1180 | # CONFIG_I2C_ISCH is not set |
1171 | # CONFIG_I2C_PIIX4 is not set | 1181 | # CONFIG_I2C_PIIX4 is not set |
1172 | CONFIG_I2C_POWERMAC=y | ||
1173 | # CONFIG_I2C_NFORCE2 is not set | 1182 | # CONFIG_I2C_NFORCE2 is not set |
1174 | # CONFIG_I2C_OCORES is not set | ||
1175 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1176 | CONFIG_I2C_PASEMI=y | ||
1177 | # CONFIG_I2C_PROSAVAGE is not set | ||
1178 | # CONFIG_I2C_SAVAGE4 is not set | ||
1179 | # CONFIG_I2C_SIMTEC is not set | ||
1180 | # CONFIG_I2C_SIS5595 is not set | 1183 | # CONFIG_I2C_SIS5595 is not set |
1181 | # CONFIG_I2C_SIS630 is not set | 1184 | # CONFIG_I2C_SIS630 is not set |
1182 | # CONFIG_I2C_SIS96X is not set | 1185 | # CONFIG_I2C_SIS96X is not set |
1183 | # CONFIG_I2C_TAOS_EVM is not set | ||
1184 | # CONFIG_I2C_STUB is not set | ||
1185 | # CONFIG_I2C_TINY_USB is not set | ||
1186 | # CONFIG_I2C_VIA is not set | 1186 | # CONFIG_I2C_VIA is not set |
1187 | # CONFIG_I2C_VIAPRO is not set | 1187 | # CONFIG_I2C_VIAPRO is not set |
1188 | |||
1189 | # | ||
1190 | # Mac SMBus host controller drivers | ||
1191 | # | ||
1192 | CONFIG_I2C_POWERMAC=y | ||
1193 | |||
1194 | # | ||
1195 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
1196 | # | ||
1197 | # CONFIG_I2C_OCORES is not set | ||
1198 | CONFIG_I2C_PASEMI=y | ||
1199 | # CONFIG_I2C_SIMTEC is not set | ||
1200 | |||
1201 | # | ||
1202 | # External I2C/SMBus adapter drivers | ||
1203 | # | ||
1204 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1205 | # CONFIG_I2C_TAOS_EVM is not set | ||
1206 | # CONFIG_I2C_TINY_USB is not set | ||
1207 | |||
1208 | # | ||
1209 | # Graphics adapter I2C/DDC channel drivers | ||
1210 | # | ||
1188 | # CONFIG_I2C_VOODOO3 is not set | 1211 | # CONFIG_I2C_VOODOO3 is not set |
1212 | |||
1213 | # | ||
1214 | # Other I2C/SMBus bus drivers | ||
1215 | # | ||
1189 | # CONFIG_I2C_PCA_PLATFORM is not set | 1216 | # CONFIG_I2C_PCA_PLATFORM is not set |
1217 | # CONFIG_I2C_STUB is not set | ||
1190 | 1218 | ||
1191 | # | 1219 | # |
1192 | # Miscellaneous I2C Chip support | 1220 | # Miscellaneous I2C Chip support |
1193 | # | 1221 | # |
1194 | # CONFIG_DS1682 is not set | 1222 | # CONFIG_DS1682 is not set |
1223 | # CONFIG_AT24 is not set | ||
1195 | # CONFIG_SENSORS_EEPROM is not set | 1224 | # CONFIG_SENSORS_EEPROM is not set |
1196 | # CONFIG_SENSORS_PCF8574 is not set | 1225 | # CONFIG_SENSORS_PCF8574 is not set |
1197 | # CONFIG_PCF8575 is not set | 1226 | # CONFIG_PCF8575 is not set |
1227 | # CONFIG_SENSORS_PCA9539 is not set | ||
1198 | # CONFIG_SENSORS_PCF8591 is not set | 1228 | # CONFIG_SENSORS_PCF8591 is not set |
1199 | # CONFIG_SENSORS_MAX6875 is not set | 1229 | # CONFIG_SENSORS_MAX6875 is not set |
1200 | # CONFIG_SENSORS_TSL2550 is not set | 1230 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -1203,10 +1233,13 @@ CONFIG_I2C_PASEMI=y | |||
1203 | # CONFIG_I2C_DEBUG_BUS is not set | 1233 | # CONFIG_I2C_DEBUG_BUS is not set |
1204 | # CONFIG_I2C_DEBUG_CHIP is not set | 1234 | # CONFIG_I2C_DEBUG_CHIP is not set |
1205 | # CONFIG_SPI is not set | 1235 | # CONFIG_SPI is not set |
1236 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
1237 | # CONFIG_GPIOLIB is not set | ||
1206 | # CONFIG_W1 is not set | 1238 | # CONFIG_W1 is not set |
1207 | # CONFIG_POWER_SUPPLY is not set | 1239 | # CONFIG_POWER_SUPPLY is not set |
1208 | # CONFIG_HWMON is not set | 1240 | # CONFIG_HWMON is not set |
1209 | # CONFIG_THERMAL is not set | 1241 | # CONFIG_THERMAL is not set |
1242 | # CONFIG_THERMAL_HWMON is not set | ||
1210 | # CONFIG_WATCHDOG is not set | 1243 | # CONFIG_WATCHDOG is not set |
1211 | 1244 | ||
1212 | # | 1245 | # |
@@ -1218,8 +1251,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1218 | # | 1251 | # |
1219 | # Multifunction device drivers | 1252 | # Multifunction device drivers |
1220 | # | 1253 | # |
1254 | # CONFIG_MFD_CORE is not set | ||
1221 | # CONFIG_MFD_SM501 is not set | 1255 | # CONFIG_MFD_SM501 is not set |
1222 | # CONFIG_HTC_PASIC3 is not set | 1256 | # CONFIG_HTC_PASIC3 is not set |
1257 | # CONFIG_MFD_TMIO is not set | ||
1223 | 1258 | ||
1224 | # | 1259 | # |
1225 | # Multimedia devices | 1260 | # Multimedia devices |
@@ -1299,10 +1334,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
1299 | # CONFIG_FB_TRIDENT is not set | 1334 | # CONFIG_FB_TRIDENT is not set |
1300 | # CONFIG_FB_ARK is not set | 1335 | # CONFIG_FB_ARK is not set |
1301 | # CONFIG_FB_PM3 is not set | 1336 | # CONFIG_FB_PM3 is not set |
1337 | # CONFIG_FB_CARMINE is not set | ||
1302 | CONFIG_FB_IBM_GXT4500=y | 1338 | CONFIG_FB_IBM_GXT4500=y |
1303 | # CONFIG_FB_VIRTUAL is not set | 1339 | # CONFIG_FB_VIRTUAL is not set |
1304 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1340 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
1305 | CONFIG_LCD_CLASS_DEVICE=y | 1341 | CONFIG_LCD_CLASS_DEVICE=y |
1342 | # CONFIG_LCD_ILI9320 is not set | ||
1343 | # CONFIG_LCD_PLATFORM is not set | ||
1306 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1344 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1307 | # CONFIG_BACKLIGHT_CORGI is not set | 1345 | # CONFIG_BACKLIGHT_CORGI is not set |
1308 | 1346 | ||
@@ -1331,15 +1369,7 @@ CONFIG_FB_LOGO_EXTRA=y | |||
1331 | CONFIG_LOGO_LINUX_MONO=y | 1369 | CONFIG_LOGO_LINUX_MONO=y |
1332 | CONFIG_LOGO_LINUX_VGA16=y | 1370 | CONFIG_LOGO_LINUX_VGA16=y |
1333 | CONFIG_LOGO_LINUX_CLUT224=y | 1371 | CONFIG_LOGO_LINUX_CLUT224=y |
1334 | |||
1335 | # | ||
1336 | # Sound | ||
1337 | # | ||
1338 | CONFIG_SOUND=m | 1372 | CONFIG_SOUND=m |
1339 | |||
1340 | # | ||
1341 | # Advanced Linux Sound Architecture | ||
1342 | # | ||
1343 | CONFIG_SND=m | 1373 | CONFIG_SND=m |
1344 | CONFIG_SND_TIMER=m | 1374 | CONFIG_SND_TIMER=m |
1345 | CONFIG_SND_PCM=m | 1375 | CONFIG_SND_PCM=m |
@@ -1355,19 +1385,13 @@ CONFIG_SND_SUPPORT_OLD_API=y | |||
1355 | CONFIG_SND_VERBOSE_PROCFS=y | 1385 | CONFIG_SND_VERBOSE_PROCFS=y |
1356 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1386 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1357 | # CONFIG_SND_DEBUG is not set | 1387 | # CONFIG_SND_DEBUG is not set |
1358 | 1388 | CONFIG_SND_DRIVERS=y | |
1359 | # | ||
1360 | # Generic devices | ||
1361 | # | ||
1362 | # CONFIG_SND_DUMMY is not set | 1389 | # CONFIG_SND_DUMMY is not set |
1363 | # CONFIG_SND_VIRMIDI is not set | 1390 | # CONFIG_SND_VIRMIDI is not set |
1364 | # CONFIG_SND_MTPAV is not set | 1391 | # CONFIG_SND_MTPAV is not set |
1365 | # CONFIG_SND_SERIAL_U16550 is not set | 1392 | # CONFIG_SND_SERIAL_U16550 is not set |
1366 | # CONFIG_SND_MPU401 is not set | 1393 | # CONFIG_SND_MPU401 is not set |
1367 | 1394 | CONFIG_SND_PCI=y | |
1368 | # | ||
1369 | # PCI devices | ||
1370 | # | ||
1371 | # CONFIG_SND_AD1889 is not set | 1395 | # CONFIG_SND_AD1889 is not set |
1372 | # CONFIG_SND_ALS300 is not set | 1396 | # CONFIG_SND_ALS300 is not set |
1373 | # CONFIG_SND_ALS4000 is not set | 1397 | # CONFIG_SND_ALS4000 is not set |
@@ -1429,20 +1453,9 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1429 | # CONFIG_SND_VIRTUOSO is not set | 1453 | # CONFIG_SND_VIRTUOSO is not set |
1430 | # CONFIG_SND_VX222 is not set | 1454 | # CONFIG_SND_VX222 is not set |
1431 | # CONFIG_SND_YMFPCI is not set | 1455 | # CONFIG_SND_YMFPCI is not set |
1432 | 1456 | CONFIG_SND_PPC=y | |
1433 | # | ||
1434 | # ALSA PowerMac devices | ||
1435 | # | ||
1436 | CONFIG_SND_POWERMAC=m | 1457 | CONFIG_SND_POWERMAC=m |
1437 | CONFIG_SND_POWERMAC_AUTO_DRC=y | 1458 | CONFIG_SND_POWERMAC_AUTO_DRC=y |
1438 | |||
1439 | # | ||
1440 | # ALSA PowerPC devices | ||
1441 | # | ||
1442 | |||
1443 | # | ||
1444 | # Apple Onboard Audio driver | ||
1445 | # | ||
1446 | CONFIG_SND_AOA=m | 1459 | CONFIG_SND_AOA=m |
1447 | CONFIG_SND_AOA_FABRIC_LAYOUT=m | 1460 | CONFIG_SND_AOA_FABRIC_LAYOUT=m |
1448 | CONFIG_SND_AOA_ONYX=m | 1461 | CONFIG_SND_AOA_ONYX=m |
@@ -1450,36 +1463,14 @@ CONFIG_SND_AOA_TAS=m | |||
1450 | CONFIG_SND_AOA_TOONIE=m | 1463 | CONFIG_SND_AOA_TOONIE=m |
1451 | CONFIG_SND_AOA_SOUNDBUS=m | 1464 | CONFIG_SND_AOA_SOUNDBUS=m |
1452 | CONFIG_SND_AOA_SOUNDBUS_I2S=m | 1465 | CONFIG_SND_AOA_SOUNDBUS_I2S=m |
1453 | 1466 | CONFIG_SND_USB=y | |
1454 | # | ||
1455 | # USB devices | ||
1456 | # | ||
1457 | # CONFIG_SND_USB_AUDIO is not set | 1467 | # CONFIG_SND_USB_AUDIO is not set |
1458 | # CONFIG_SND_USB_USX2Y is not set | 1468 | # CONFIG_SND_USB_USX2Y is not set |
1459 | # CONFIG_SND_USB_CAIAQ is not set | 1469 | # CONFIG_SND_USB_CAIAQ is not set |
1460 | 1470 | CONFIG_SND_PCMCIA=y | |
1461 | # | ||
1462 | # PCMCIA devices | ||
1463 | # | ||
1464 | # CONFIG_SND_VXPOCKET is not set | 1471 | # CONFIG_SND_VXPOCKET is not set |
1465 | # CONFIG_SND_PDAUDIOCF is not set | 1472 | # CONFIG_SND_PDAUDIOCF is not set |
1466 | |||
1467 | # | ||
1468 | # System on Chip audio support | ||
1469 | # | ||
1470 | # CONFIG_SND_SOC is not set | 1473 | # CONFIG_SND_SOC is not set |
1471 | |||
1472 | # | ||
1473 | # ALSA SoC audio for Freescale SOCs | ||
1474 | # | ||
1475 | |||
1476 | # | ||
1477 | # SoC Audio for the Texas Instruments OMAP | ||
1478 | # | ||
1479 | |||
1480 | # | ||
1481 | # Open Sound System | ||
1482 | # | ||
1483 | # CONFIG_SOUND_PRIME is not set | 1474 | # CONFIG_SOUND_PRIME is not set |
1484 | CONFIG_HID_SUPPORT=y | 1475 | CONFIG_HID_SUPPORT=y |
1485 | CONFIG_HID=y | 1476 | CONFIG_HID=y |
@@ -1508,6 +1499,7 @@ CONFIG_USB_DEVICEFS=y | |||
1508 | CONFIG_USB_DEVICE_CLASS=y | 1499 | CONFIG_USB_DEVICE_CLASS=y |
1509 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1500 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1510 | # CONFIG_USB_OTG is not set | 1501 | # CONFIG_USB_OTG is not set |
1502 | # CONFIG_USB_MON is not set | ||
1511 | 1503 | ||
1512 | # | 1504 | # |
1513 | # USB Host Controller Drivers | 1505 | # USB Host Controller Drivers |
@@ -1556,6 +1548,7 @@ CONFIG_USB_STORAGE=m | |||
1556 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1548 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1557 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1549 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1558 | # CONFIG_USB_STORAGE_KARMA is not set | 1550 | # CONFIG_USB_STORAGE_KARMA is not set |
1551 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1559 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1552 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1560 | # CONFIG_USB_LIBUSUAL is not set | 1553 | # CONFIG_USB_LIBUSUAL is not set |
1561 | 1554 | ||
@@ -1564,7 +1557,6 @@ CONFIG_USB_STORAGE=m | |||
1564 | # | 1557 | # |
1565 | # CONFIG_USB_MDC800 is not set | 1558 | # CONFIG_USB_MDC800 is not set |
1566 | # CONFIG_USB_MICROTEK is not set | 1559 | # CONFIG_USB_MICROTEK is not set |
1567 | # CONFIG_USB_MON is not set | ||
1568 | 1560 | ||
1569 | # | 1561 | # |
1570 | # USB port drivers | 1562 | # USB port drivers |
@@ -1577,7 +1569,6 @@ CONFIG_USB_STORAGE=m | |||
1577 | # CONFIG_USB_EMI62 is not set | 1569 | # CONFIG_USB_EMI62 is not set |
1578 | # CONFIG_USB_EMI26 is not set | 1570 | # CONFIG_USB_EMI26 is not set |
1579 | # CONFIG_USB_ADUTUX is not set | 1571 | # CONFIG_USB_ADUTUX is not set |
1580 | # CONFIG_USB_AUERSWALD is not set | ||
1581 | # CONFIG_USB_RIO500 is not set | 1572 | # CONFIG_USB_RIO500 is not set |
1582 | # CONFIG_USB_LEGOTOWER is not set | 1573 | # CONFIG_USB_LEGOTOWER is not set |
1583 | # CONFIG_USB_LCD is not set | 1574 | # CONFIG_USB_LCD is not set |
@@ -1769,6 +1760,7 @@ CONFIG_HFSPLUS_FS=m | |||
1769 | CONFIG_CRAMFS=y | 1760 | CONFIG_CRAMFS=y |
1770 | # CONFIG_VXFS_FS is not set | 1761 | # CONFIG_VXFS_FS is not set |
1771 | # CONFIG_MINIX_FS is not set | 1762 | # CONFIG_MINIX_FS is not set |
1763 | # CONFIG_OMFS_FS is not set | ||
1772 | # CONFIG_HPFS_FS is not set | 1764 | # CONFIG_HPFS_FS is not set |
1773 | # CONFIG_QNX4FS_FS is not set | 1765 | # CONFIG_QNX4FS_FS is not set |
1774 | # CONFIG_ROMFS_FS is not set | 1766 | # CONFIG_ROMFS_FS is not set |
@@ -1779,12 +1771,12 @@ CONFIG_NFS_FS=y | |||
1779 | CONFIG_NFS_V3=y | 1771 | CONFIG_NFS_V3=y |
1780 | CONFIG_NFS_V3_ACL=y | 1772 | CONFIG_NFS_V3_ACL=y |
1781 | CONFIG_NFS_V4=y | 1773 | CONFIG_NFS_V4=y |
1774 | CONFIG_ROOT_NFS=y | ||
1782 | CONFIG_NFSD=m | 1775 | CONFIG_NFSD=m |
1783 | CONFIG_NFSD_V2_ACL=y | 1776 | CONFIG_NFSD_V2_ACL=y |
1784 | CONFIG_NFSD_V3=y | 1777 | CONFIG_NFSD_V3=y |
1785 | CONFIG_NFSD_V3_ACL=y | 1778 | CONFIG_NFSD_V3_ACL=y |
1786 | CONFIG_NFSD_V4=y | 1779 | CONFIG_NFSD_V4=y |
1787 | CONFIG_ROOT_NFS=y | ||
1788 | CONFIG_LOCKD=y | 1780 | CONFIG_LOCKD=y |
1789 | CONFIG_LOCKD_V4=y | 1781 | CONFIG_LOCKD_V4=y |
1790 | CONFIG_EXPORTFS=m | 1782 | CONFIG_EXPORTFS=m |
@@ -1793,7 +1785,6 @@ CONFIG_NFS_COMMON=y | |||
1793 | CONFIG_SUNRPC=y | 1785 | CONFIG_SUNRPC=y |
1794 | CONFIG_SUNRPC_GSS=y | 1786 | CONFIG_SUNRPC_GSS=y |
1795 | CONFIG_SUNRPC_XPRT_RDMA=m | 1787 | CONFIG_SUNRPC_XPRT_RDMA=m |
1796 | # CONFIG_SUNRPC_BIND34 is not set | ||
1797 | CONFIG_RPCSEC_GSS_KRB5=y | 1788 | CONFIG_RPCSEC_GSS_KRB5=y |
1798 | CONFIG_RPCSEC_GSS_SPKM3=m | 1789 | CONFIG_RPCSEC_GSS_SPKM3=m |
1799 | # CONFIG_SMB_FS is not set | 1790 | # CONFIG_SMB_FS is not set |
@@ -1878,6 +1869,7 @@ CONFIG_BITREVERSE=y | |||
1878 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1869 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1879 | CONFIG_CRC_CCITT=m | 1870 | CONFIG_CRC_CCITT=m |
1880 | # CONFIG_CRC16 is not set | 1871 | # CONFIG_CRC16 is not set |
1872 | CONFIG_CRC_T10DIF=y | ||
1881 | CONFIG_CRC_ITU_T=m | 1873 | CONFIG_CRC_ITU_T=m |
1882 | CONFIG_CRC32=y | 1874 | CONFIG_CRC32=y |
1883 | # CONFIG_CRC7 is not set | 1875 | # CONFIG_CRC7 is not set |
@@ -1910,8 +1902,10 @@ CONFIG_DEBUG_FS=y | |||
1910 | CONFIG_DEBUG_KERNEL=y | 1902 | CONFIG_DEBUG_KERNEL=y |
1911 | # CONFIG_DEBUG_SHIRQ is not set | 1903 | # CONFIG_DEBUG_SHIRQ is not set |
1912 | CONFIG_DETECT_SOFTLOCKUP=y | 1904 | CONFIG_DETECT_SOFTLOCKUP=y |
1905 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1906 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1913 | CONFIG_SCHED_DEBUG=y | 1907 | CONFIG_SCHED_DEBUG=y |
1914 | # CONFIG_SCHEDSTATS is not set | 1908 | CONFIG_SCHEDSTATS=y |
1915 | # CONFIG_TIMER_STATS is not set | 1909 | # CONFIG_TIMER_STATS is not set |
1916 | # CONFIG_DEBUG_OBJECTS is not set | 1910 | # CONFIG_DEBUG_OBJECTS is not set |
1917 | # CONFIG_SLUB_DEBUG_ON is not set | 1911 | # CONFIG_SLUB_DEBUG_ON is not set |
@@ -1923,28 +1917,47 @@ CONFIG_DEBUG_MUTEXES=y | |||
1923 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 1917 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
1924 | # CONFIG_PROVE_LOCKING is not set | 1918 | # CONFIG_PROVE_LOCKING is not set |
1925 | # CONFIG_LOCK_STAT is not set | 1919 | # CONFIG_LOCK_STAT is not set |
1920 | CONFIG_TRACE_IRQFLAGS=y | ||
1926 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1921 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1927 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1922 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1923 | CONFIG_STACKTRACE=y | ||
1928 | # CONFIG_DEBUG_KOBJECT is not set | 1924 | # CONFIG_DEBUG_KOBJECT is not set |
1929 | CONFIG_DEBUG_BUGVERBOSE=y | 1925 | CONFIG_DEBUG_BUGVERBOSE=y |
1930 | # CONFIG_DEBUG_INFO is not set | 1926 | # CONFIG_DEBUG_INFO is not set |
1931 | # CONFIG_DEBUG_VM is not set | 1927 | # CONFIG_DEBUG_VM is not set |
1932 | # CONFIG_DEBUG_WRITECOUNT is not set | 1928 | # CONFIG_DEBUG_WRITECOUNT is not set |
1929 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1933 | # CONFIG_DEBUG_LIST is not set | 1930 | # CONFIG_DEBUG_LIST is not set |
1934 | # CONFIG_DEBUG_SG is not set | 1931 | # CONFIG_DEBUG_SG is not set |
1932 | CONFIG_FRAME_POINTER=y | ||
1935 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1933 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1936 | # CONFIG_RCU_TORTURE_TEST is not set | 1934 | # CONFIG_RCU_TORTURE_TEST is not set |
1937 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1935 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1938 | # CONFIG_FAULT_INJECTION is not set | 1936 | # CONFIG_FAULT_INJECTION is not set |
1937 | CONFIG_LATENCYTOP=y | ||
1938 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1939 | CONFIG_HAVE_FTRACE=y | ||
1940 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1941 | CONFIG_TRACER_MAX_TRACE=y | ||
1942 | CONFIG_TRACING=y | ||
1943 | # CONFIG_FTRACE is not set | ||
1944 | CONFIG_IRQSOFF_TRACER=y | ||
1945 | CONFIG_SCHED_TRACER=y | ||
1946 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
1947 | # CONFIG_FTRACE_STARTUP_TEST is not set | ||
1939 | # CONFIG_SAMPLES is not set | 1948 | # CONFIG_SAMPLES is not set |
1949 | CONFIG_HAVE_ARCH_KGDB=y | ||
1950 | # CONFIG_KGDB is not set | ||
1940 | CONFIG_DEBUG_STACKOVERFLOW=y | 1951 | CONFIG_DEBUG_STACKOVERFLOW=y |
1941 | CONFIG_DEBUG_STACK_USAGE=y | 1952 | CONFIG_DEBUG_STACK_USAGE=y |
1942 | # CONFIG_DEBUG_PAGEALLOC is not set | 1953 | # CONFIG_DEBUG_PAGEALLOC is not set |
1943 | # CONFIG_HCALL_STATS is not set | 1954 | # CONFIG_HCALL_STATS is not set |
1944 | CONFIG_DEBUGGER=y | 1955 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1956 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1945 | CONFIG_XMON=y | 1957 | CONFIG_XMON=y |
1946 | # CONFIG_XMON_DEFAULT is not set | 1958 | # CONFIG_XMON_DEFAULT is not set |
1947 | CONFIG_XMON_DISASSEMBLY=y | 1959 | CONFIG_XMON_DISASSEMBLY=y |
1960 | CONFIG_DEBUGGER=y | ||
1948 | CONFIG_IRQSTACKS=y | 1961 | CONFIG_IRQSTACKS=y |
1949 | # CONFIG_VIRQ_DEBUG is not set | 1962 | # CONFIG_VIRQ_DEBUG is not set |
1950 | CONFIG_BOOTX_TEXT=y | 1963 | CONFIG_BOOTX_TEXT=y |
@@ -2007,6 +2020,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
2007 | CONFIG_CRYPTO_MD4=m | 2020 | CONFIG_CRYPTO_MD4=m |
2008 | CONFIG_CRYPTO_MD5=y | 2021 | CONFIG_CRYPTO_MD5=y |
2009 | CONFIG_CRYPTO_MICHAEL_MIC=m | 2022 | CONFIG_CRYPTO_MICHAEL_MIC=m |
2023 | # CONFIG_CRYPTO_RMD128 is not set | ||
2024 | # CONFIG_CRYPTO_RMD160 is not set | ||
2025 | # CONFIG_CRYPTO_RMD256 is not set | ||
2026 | # CONFIG_CRYPTO_RMD320 is not set | ||
2010 | CONFIG_CRYPTO_SHA1=m | 2027 | CONFIG_CRYPTO_SHA1=m |
2011 | CONFIG_CRYPTO_SHA256=m | 2028 | CONFIG_CRYPTO_SHA256=m |
2012 | CONFIG_CRYPTO_SHA512=m | 2029 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index e6e91c85da31..3c6dbdef56eb 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig | |||
@@ -1,8 +1,7 @@ | |||
1 | # powerpc | ||
2 | # | 1 | # |
3 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
4 | # Linux kernel version: 2.6.26-git2 | 3 | # Linux kernel version: 2.6.27-rc4 |
5 | # Tue Jul 15 23:54:18 2008 | 4 | # Tue Aug 26 13:29:50 2008 |
6 | # | 5 | # |
7 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
8 | 7 | ||
@@ -112,7 +111,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
112 | CONFIG_SYSCTL=y | 111 | CONFIG_SYSCTL=y |
113 | # CONFIG_EMBEDDED is not set | 112 | # CONFIG_EMBEDDED is not set |
114 | CONFIG_SYSCTL_SYSCALL=y | 113 | CONFIG_SYSCTL_SYSCALL=y |
115 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
116 | CONFIG_KALLSYMS=y | 114 | CONFIG_KALLSYMS=y |
117 | CONFIG_KALLSYMS_ALL=y | 115 | CONFIG_KALLSYMS_ALL=y |
118 | CONFIG_KALLSYMS_EXTRA_PASS=y | 116 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -140,12 +138,17 @@ CONFIG_MARKERS=y | |||
140 | CONFIG_OPROFILE=m | 138 | CONFIG_OPROFILE=m |
141 | CONFIG_HAVE_OPROFILE=y | 139 | CONFIG_HAVE_OPROFILE=y |
142 | CONFIG_KPROBES=y | 140 | CONFIG_KPROBES=y |
141 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
143 | CONFIG_KRETPROBES=y | 142 | CONFIG_KRETPROBES=y |
143 | CONFIG_HAVE_IOREMAP_PROT=y | ||
144 | CONFIG_HAVE_KPROBES=y | 144 | CONFIG_HAVE_KPROBES=y |
145 | CONFIG_HAVE_KRETPROBES=y | 145 | CONFIG_HAVE_KRETPROBES=y |
146 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
146 | # CONFIG_HAVE_DMA_ATTRS is not set | 147 | # CONFIG_HAVE_DMA_ATTRS is not set |
147 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | 148 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set |
149 | CONFIG_HAVE_CLK=y | ||
148 | CONFIG_PROC_PAGE_MONITOR=y | 150 | CONFIG_PROC_PAGE_MONITOR=y |
151 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
149 | CONFIG_SLABINFO=y | 152 | CONFIG_SLABINFO=y |
150 | CONFIG_RT_MUTEXES=y | 153 | CONFIG_RT_MUTEXES=y |
151 | # CONFIG_TINY_SHMEM is not set | 154 | # CONFIG_TINY_SHMEM is not set |
@@ -266,7 +269,6 @@ CONFIG_TAU=y | |||
266 | CONFIG_TAU_AVERAGE=y | 269 | CONFIG_TAU_AVERAGE=y |
267 | CONFIG_QUICC_ENGINE=y | 270 | CONFIG_QUICC_ENGINE=y |
268 | CONFIG_CPM2=y | 271 | CONFIG_CPM2=y |
269 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
270 | CONFIG_FSL_ULI1575=y | 272 | CONFIG_FSL_ULI1575=y |
271 | CONFIG_CPM=y | 273 | CONFIG_CPM=y |
272 | CONFIG_PPC_BESTCOMM=y | 274 | CONFIG_PPC_BESTCOMM=y |
@@ -287,7 +289,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | |||
287 | # CONFIG_HZ_300 is not set | 289 | # CONFIG_HZ_300 is not set |
288 | CONFIG_HZ_1000=y | 290 | CONFIG_HZ_1000=y |
289 | CONFIG_HZ=1000 | 291 | CONFIG_HZ=1000 |
290 | # CONFIG_SCHED_HRTICK is not set | 292 | CONFIG_SCHED_HRTICK=y |
291 | # CONFIG_PREEMPT_NONE is not set | 293 | # CONFIG_PREEMPT_NONE is not set |
292 | CONFIG_PREEMPT_VOLUNTARY=y | 294 | CONFIG_PREEMPT_VOLUNTARY=y |
293 | # CONFIG_PREEMPT is not set | 295 | # CONFIG_PREEMPT is not set |
@@ -311,6 +313,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
311 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 313 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
312 | CONFIG_PAGEFLAGS_EXTENDED=y | 314 | CONFIG_PAGEFLAGS_EXTENDED=y |
313 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 315 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
316 | # CONFIG_MIGRATION is not set | ||
314 | CONFIG_RESOURCES_64BIT=y | 317 | CONFIG_RESOURCES_64BIT=y |
315 | CONFIG_ZONE_DMA_FLAG=1 | 318 | CONFIG_ZONE_DMA_FLAG=1 |
316 | CONFIG_BOUNCE=y | 319 | CONFIG_BOUNCE=y |
@@ -326,6 +329,7 @@ CONFIG_PM_DEBUG=y | |||
326 | CONFIG_CAN_PM_TRACE=y | 329 | CONFIG_CAN_PM_TRACE=y |
327 | CONFIG_PM_SLEEP=y | 330 | CONFIG_PM_SLEEP=y |
328 | CONFIG_SUSPEND=y | 331 | CONFIG_SUSPEND=y |
332 | # CONFIG_PM_TEST_SUSPEND is not set | ||
329 | CONFIG_SUSPEND_FREEZER=y | 333 | CONFIG_SUSPEND_FREEZER=y |
330 | CONFIG_HIBERNATION=y | 334 | CONFIG_HIBERNATION=y |
331 | CONFIG_PM_STD_PARTITION="" | 335 | CONFIG_PM_STD_PARTITION="" |
@@ -344,6 +348,7 @@ CONFIG_FSL_SOC=y | |||
344 | CONFIG_FSL_PCI=y | 348 | CONFIG_FSL_PCI=y |
345 | CONFIG_FSL_LBC=y | 349 | CONFIG_FSL_LBC=y |
346 | CONFIG_FSL_GTM=y | 350 | CONFIG_FSL_GTM=y |
351 | CONFIG_PPC_PCI_CHOICE=y | ||
347 | CONFIG_PCI=y | 352 | CONFIG_PCI=y |
348 | CONFIG_PCI_DOMAINS=y | 353 | CONFIG_PCI_DOMAINS=y |
349 | CONFIG_PCI_SYSCALL=y | 354 | CONFIG_PCI_SYSCALL=y |
@@ -395,10 +400,6 @@ CONFIG_KERNEL_START=0xc0000000 | |||
395 | CONFIG_PHYSICAL_START=0x00000000 | 400 | CONFIG_PHYSICAL_START=0x00000000 |
396 | # CONFIG_TASK_SIZE_BOOL is not set | 401 | # CONFIG_TASK_SIZE_BOOL is not set |
397 | CONFIG_TASK_SIZE=0xc0000000 | 402 | CONFIG_TASK_SIZE=0xc0000000 |
398 | |||
399 | # | ||
400 | # Networking | ||
401 | # | ||
402 | CONFIG_NET=y | 403 | CONFIG_NET=y |
403 | 404 | ||
404 | # | 405 | # |
@@ -412,6 +413,7 @@ CONFIG_XFRM_USER=y | |||
412 | CONFIG_XFRM_SUB_POLICY=y | 413 | CONFIG_XFRM_SUB_POLICY=y |
413 | CONFIG_XFRM_MIGRATE=y | 414 | CONFIG_XFRM_MIGRATE=y |
414 | CONFIG_XFRM_STATISTICS=y | 415 | CONFIG_XFRM_STATISTICS=y |
416 | CONFIG_XFRM_IPCOMP=m | ||
415 | CONFIG_NET_KEY=m | 417 | CONFIG_NET_KEY=m |
416 | CONFIG_NET_KEY_MIGRATE=y | 418 | CONFIG_NET_KEY_MIGRATE=y |
417 | CONFIG_INET=y | 419 | CONFIG_INET=y |
@@ -602,6 +604,7 @@ CONFIG_IP_NF_TARGET_ECN=m | |||
602 | CONFIG_IP_NF_TARGET_TTL=m | 604 | CONFIG_IP_NF_TARGET_TTL=m |
603 | CONFIG_IP_NF_TARGET_CLUSTERIP=m | 605 | CONFIG_IP_NF_TARGET_CLUSTERIP=m |
604 | CONFIG_IP_NF_RAW=m | 606 | CONFIG_IP_NF_RAW=m |
607 | CONFIG_IP_NF_SECURITY=m | ||
605 | CONFIG_IP_NF_ARPTABLES=m | 608 | CONFIG_IP_NF_ARPTABLES=m |
606 | CONFIG_IP_NF_ARPFILTER=m | 609 | CONFIG_IP_NF_ARPFILTER=m |
607 | CONFIG_IP_NF_ARP_MANGLE=m | 610 | CONFIG_IP_NF_ARP_MANGLE=m |
@@ -626,6 +629,7 @@ CONFIG_IP6_NF_TARGET_REJECT=m | |||
626 | CONFIG_IP6_NF_MANGLE=m | 629 | CONFIG_IP6_NF_MANGLE=m |
627 | CONFIG_IP6_NF_TARGET_HL=m | 630 | CONFIG_IP6_NF_TARGET_HL=m |
628 | CONFIG_IP6_NF_RAW=m | 631 | CONFIG_IP6_NF_RAW=m |
632 | CONFIG_IP6_NF_SECURITY=m | ||
629 | 633 | ||
630 | # | 634 | # |
631 | # DECnet: Netfilter Configuration | 635 | # DECnet: Netfilter Configuration |
@@ -643,6 +647,7 @@ CONFIG_BRIDGE_EBT_802_3=m | |||
643 | CONFIG_BRIDGE_EBT_AMONG=m | 647 | CONFIG_BRIDGE_EBT_AMONG=m |
644 | CONFIG_BRIDGE_EBT_ARP=m | 648 | CONFIG_BRIDGE_EBT_ARP=m |
645 | CONFIG_BRIDGE_EBT_IP=m | 649 | CONFIG_BRIDGE_EBT_IP=m |
650 | CONFIG_BRIDGE_EBT_IP6=m | ||
646 | CONFIG_BRIDGE_EBT_LIMIT=m | 651 | CONFIG_BRIDGE_EBT_LIMIT=m |
647 | CONFIG_BRIDGE_EBT_MARK=m | 652 | CONFIG_BRIDGE_EBT_MARK=m |
648 | CONFIG_BRIDGE_EBT_PKTTYPE=m | 653 | CONFIG_BRIDGE_EBT_PKTTYPE=m |
@@ -691,8 +696,10 @@ CONFIG_ATM_LANE=m | |||
691 | # CONFIG_ATM_MPOA is not set | 696 | # CONFIG_ATM_MPOA is not set |
692 | CONFIG_ATM_BR2684=m | 697 | CONFIG_ATM_BR2684=m |
693 | # CONFIG_ATM_BR2684_IPFILTER is not set | 698 | # CONFIG_ATM_BR2684_IPFILTER is not set |
699 | CONFIG_STP=m | ||
694 | CONFIG_BRIDGE=m | 700 | CONFIG_BRIDGE=m |
695 | CONFIG_VLAN_8021Q=m | 701 | CONFIG_VLAN_8021Q=m |
702 | # CONFIG_VLAN_8021Q_GVRP is not set | ||
696 | CONFIG_DECNET=m | 703 | CONFIG_DECNET=m |
697 | CONFIG_DECNET_ROUTER=y | 704 | CONFIG_DECNET_ROUTER=y |
698 | CONFIG_LLC=m | 705 | CONFIG_LLC=m |
@@ -832,6 +839,7 @@ CONFIG_BT_HIDP=m | |||
832 | # | 839 | # |
833 | CONFIG_BT_HCIUSB=m | 840 | CONFIG_BT_HCIUSB=m |
834 | CONFIG_BT_HCIUSB_SCO=y | 841 | CONFIG_BT_HCIUSB_SCO=y |
842 | # CONFIG_BT_HCIBTUSB is not set | ||
835 | CONFIG_BT_HCIUART=m | 843 | CONFIG_BT_HCIUART=m |
836 | CONFIG_BT_HCIUART_H4=y | 844 | CONFIG_BT_HCIUART_H4=y |
837 | CONFIG_BT_HCIUART_BCSP=y | 845 | CONFIG_BT_HCIUART_BCSP=y |
@@ -855,7 +863,6 @@ CONFIG_NL80211=y | |||
855 | CONFIG_WIRELESS_EXT=y | 863 | CONFIG_WIRELESS_EXT=y |
856 | CONFIG_WIRELESS_EXT_SYSFS=y | 864 | CONFIG_WIRELESS_EXT_SYSFS=y |
857 | CONFIG_MAC80211=m | 865 | CONFIG_MAC80211=m |
858 | CONFIG_MAC80211_QOS=y | ||
859 | 866 | ||
860 | # | 867 | # |
861 | # Rate control algorithm selection | 868 | # Rate control algorithm selection |
@@ -941,12 +948,14 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 | |||
941 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set | 948 | # CONFIG_CDROM_PKTCDVD_WCACHE is not set |
942 | # CONFIG_ATA_OVER_ETH is not set | 949 | # CONFIG_ATA_OVER_ETH is not set |
943 | CONFIG_VIRTIO_BLK=m | 950 | CONFIG_VIRTIO_BLK=m |
951 | CONFIG_BLK_DEV_HD=y | ||
944 | CONFIG_MISC_DEVICES=y | 952 | CONFIG_MISC_DEVICES=y |
945 | # CONFIG_PHANTOM is not set | 953 | # CONFIG_PHANTOM is not set |
946 | CONFIG_EEPROM_93CX6=m | 954 | CONFIG_EEPROM_93CX6=m |
947 | # CONFIG_SGI_IOC4 is not set | 955 | # CONFIG_SGI_IOC4 is not set |
948 | # CONFIG_TIFM_CORE is not set | 956 | # CONFIG_TIFM_CORE is not set |
949 | CONFIG_ENCLOSURE_SERVICES=m | 957 | CONFIG_ENCLOSURE_SERVICES=m |
958 | # CONFIG_HP_ILO is not set | ||
950 | CONFIG_HAVE_IDE=y | 959 | CONFIG_HAVE_IDE=y |
951 | CONFIG_IDE=y | 960 | CONFIG_IDE=y |
952 | CONFIG_BLK_DEV_IDE=y | 961 | CONFIG_BLK_DEV_IDE=y |
@@ -954,6 +963,7 @@ CONFIG_BLK_DEV_IDE=y | |||
954 | # | 963 | # |
955 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 964 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
956 | # | 965 | # |
966 | CONFIG_IDE_TIMINGS=y | ||
957 | CONFIG_IDE_ATAPI=y | 967 | CONFIG_IDE_ATAPI=y |
958 | # CONFIG_BLK_DEV_IDE_SATA is not set | 968 | # CONFIG_BLK_DEV_IDE_SATA is not set |
959 | CONFIG_BLK_DEV_IDEDISK=y | 969 | CONFIG_BLK_DEV_IDEDISK=y |
@@ -971,7 +981,6 @@ CONFIG_IDE_PROC_FS=y | |||
971 | # | 981 | # |
972 | # IDE chipset support/bugfixes | 982 | # IDE chipset support/bugfixes |
973 | # | 983 | # |
974 | # CONFIG_IDE_GENERIC is not set | ||
975 | # CONFIG_BLK_DEV_PLATFORM is not set | 984 | # CONFIG_BLK_DEV_PLATFORM is not set |
976 | # CONFIG_BLK_DEV_IDEPNP is not set | 985 | # CONFIG_BLK_DEV_IDEPNP is not set |
977 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 986 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
@@ -990,10 +999,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
990 | # CONFIG_BLK_DEV_AMD74XX is not set | 999 | # CONFIG_BLK_DEV_AMD74XX is not set |
991 | # CONFIG_BLK_DEV_CMD64X is not set | 1000 | # CONFIG_BLK_DEV_CMD64X is not set |
992 | # CONFIG_BLK_DEV_TRIFLEX is not set | 1001 | # CONFIG_BLK_DEV_TRIFLEX is not set |
993 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
994 | # CONFIG_BLK_DEV_CS5520 is not set | 1002 | # CONFIG_BLK_DEV_CS5520 is not set |
995 | # CONFIG_BLK_DEV_CS5530 is not set | 1003 | # CONFIG_BLK_DEV_CS5530 is not set |
996 | # CONFIG_BLK_DEV_HPT34X is not set | ||
997 | # CONFIG_BLK_DEV_HPT366 is not set | 1004 | # CONFIG_BLK_DEV_HPT366 is not set |
998 | # CONFIG_BLK_DEV_JMICRON is not set | 1005 | # CONFIG_BLK_DEV_JMICRON is not set |
999 | # CONFIG_BLK_DEV_SC1200 is not set | 1006 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -1014,8 +1021,6 @@ CONFIG_BLK_DEV_IDE_PMAC=y | |||
1014 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y | 1021 | CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y |
1015 | CONFIG_BLK_DEV_IDEDMA_PMAC=y | 1022 | CONFIG_BLK_DEV_IDEDMA_PMAC=y |
1016 | CONFIG_BLK_DEV_IDEDMA=y | 1023 | CONFIG_BLK_DEV_IDEDMA=y |
1017 | CONFIG_BLK_DEV_HD_ONLY=y | ||
1018 | CONFIG_BLK_DEV_HD=y | ||
1019 | 1024 | ||
1020 | # | 1025 | # |
1021 | # SCSI device support | 1026 | # SCSI device support |
@@ -1125,6 +1130,7 @@ CONFIG_SCSI_DH=y | |||
1125 | CONFIG_SCSI_DH_RDAC=m | 1130 | CONFIG_SCSI_DH_RDAC=m |
1126 | CONFIG_SCSI_DH_HP_SW=m | 1131 | CONFIG_SCSI_DH_HP_SW=m |
1127 | CONFIG_SCSI_DH_EMC=m | 1132 | CONFIG_SCSI_DH_EMC=m |
1133 | # CONFIG_SCSI_DH_ALUA is not set | ||
1128 | CONFIG_ATA=y | 1134 | CONFIG_ATA=y |
1129 | # CONFIG_ATA_NONSTANDARD is not set | 1135 | # CONFIG_ATA_NONSTANDARD is not set |
1130 | # CONFIG_SATA_PMP is not set | 1136 | # CONFIG_SATA_PMP is not set |
@@ -1246,7 +1252,6 @@ CONFIG_WINDFARM=y | |||
1246 | # CONFIG_ANSLCD is not set | 1252 | # CONFIG_ANSLCD is not set |
1247 | CONFIG_PMAC_RACKMETER=m | 1253 | CONFIG_PMAC_RACKMETER=m |
1248 | CONFIG_NETDEVICES=y | 1254 | CONFIG_NETDEVICES=y |
1249 | CONFIG_NETDEVICES_MULTIQUEUE=y | ||
1250 | CONFIG_IFB=m | 1255 | CONFIG_IFB=m |
1251 | CONFIG_DUMMY=m | 1256 | CONFIG_DUMMY=m |
1252 | CONFIG_BONDING=m | 1257 | CONFIG_BONDING=m |
@@ -1256,7 +1261,7 @@ CONFIG_TUN=m | |||
1256 | CONFIG_VETH=m | 1261 | CONFIG_VETH=m |
1257 | CONFIG_NET_SB1000=m | 1262 | CONFIG_NET_SB1000=m |
1258 | # CONFIG_ARCNET is not set | 1263 | # CONFIG_ARCNET is not set |
1259 | CONFIG_PHYLIB=m | 1264 | CONFIG_PHYLIB=y |
1260 | 1265 | ||
1261 | # | 1266 | # |
1262 | # MII PHY device drivers | 1267 | # MII PHY device drivers |
@@ -1271,7 +1276,9 @@ CONFIG_SMSC_PHY=m | |||
1271 | CONFIG_BROADCOM_PHY=m | 1276 | CONFIG_BROADCOM_PHY=m |
1272 | CONFIG_ICPLUS_PHY=m | 1277 | CONFIG_ICPLUS_PHY=m |
1273 | CONFIG_REALTEK_PHY=m | 1278 | CONFIG_REALTEK_PHY=m |
1279 | # CONFIG_FIXED_PHY is not set | ||
1274 | CONFIG_MDIO_BITBANG=y | 1280 | CONFIG_MDIO_BITBANG=y |
1281 | # CONFIG_MDIO_OF_GPIO is not set | ||
1275 | CONFIG_NET_ETHERNET=y | 1282 | CONFIG_NET_ETHERNET=y |
1276 | CONFIG_MII=m | 1283 | CONFIG_MII=m |
1277 | CONFIG_MACE=m | 1284 | CONFIG_MACE=m |
@@ -1328,9 +1335,7 @@ CONFIG_NE2000=m | |||
1328 | CONFIG_NET_PCI=y | 1335 | CONFIG_NET_PCI=y |
1329 | CONFIG_PCNET32=m | 1336 | CONFIG_PCNET32=m |
1330 | CONFIG_AMD8111_ETH=m | 1337 | CONFIG_AMD8111_ETH=m |
1331 | CONFIG_AMD8111E_NAPI=y | ||
1332 | CONFIG_ADAPTEC_STARFIRE=m | 1338 | CONFIG_ADAPTEC_STARFIRE=m |
1333 | CONFIG_ADAPTEC_STARFIRE_NAPI=y | ||
1334 | # CONFIG_AC3200 is not set | 1339 | # CONFIG_AC3200 is not set |
1335 | # CONFIG_APRICOT is not set | 1340 | # CONFIG_APRICOT is not set |
1336 | CONFIG_B44=m | 1341 | CONFIG_B44=m |
@@ -1359,7 +1364,6 @@ CONFIG_SUNDANCE=m | |||
1359 | CONFIG_TLAN=m | 1364 | CONFIG_TLAN=m |
1360 | CONFIG_VIA_RHINE=m | 1365 | CONFIG_VIA_RHINE=m |
1361 | CONFIG_VIA_RHINE_MMIO=y | 1366 | CONFIG_VIA_RHINE_MMIO=y |
1362 | CONFIG_VIA_RHINE_NAPI=y | ||
1363 | CONFIG_SC92031=m | 1367 | CONFIG_SC92031=m |
1364 | CONFIG_NET_POCKET=y | 1368 | CONFIG_NET_POCKET=y |
1365 | CONFIG_DE600=m | 1369 | CONFIG_DE600=m |
@@ -1372,17 +1376,15 @@ CONFIG_ACENIC=m | |||
1372 | # CONFIG_ACENIC_OMIT_TIGON_I is not set | 1376 | # CONFIG_ACENIC_OMIT_TIGON_I is not set |
1373 | CONFIG_DL2K=m | 1377 | CONFIG_DL2K=m |
1374 | CONFIG_E1000=m | 1378 | CONFIG_E1000=m |
1375 | CONFIG_E1000_NAPI=y | ||
1376 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 1379 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
1377 | CONFIG_E1000E=m | 1380 | CONFIG_E1000E=m |
1378 | CONFIG_E1000E_ENABLED=y | ||
1379 | CONFIG_IP1000=m | 1381 | CONFIG_IP1000=m |
1380 | CONFIG_IGB=m | 1382 | CONFIG_IGB=m |
1383 | CONFIG_IGB_LRO=y | ||
1381 | CONFIG_NS83820=m | 1384 | CONFIG_NS83820=m |
1382 | CONFIG_HAMACHI=m | 1385 | CONFIG_HAMACHI=m |
1383 | CONFIG_YELLOWFIN=m | 1386 | CONFIG_YELLOWFIN=m |
1384 | CONFIG_R8169=m | 1387 | CONFIG_R8169=m |
1385 | CONFIG_R8169_NAPI=y | ||
1386 | CONFIG_R8169_VLAN=y | 1388 | CONFIG_R8169_VLAN=y |
1387 | CONFIG_SIS190=m | 1389 | CONFIG_SIS190=m |
1388 | CONFIG_SKGE=m | 1390 | CONFIG_SKGE=m |
@@ -1393,21 +1395,18 @@ CONFIG_VIA_VELOCITY=m | |||
1393 | CONFIG_TIGON3=m | 1395 | CONFIG_TIGON3=m |
1394 | CONFIG_BNX2=m | 1396 | CONFIG_BNX2=m |
1395 | CONFIG_GIANFAR=m | 1397 | CONFIG_GIANFAR=m |
1396 | CONFIG_GFAR_NAPI=y | ||
1397 | # CONFIG_UCC_GETH is not set | 1398 | # CONFIG_UCC_GETH is not set |
1398 | CONFIG_MV643XX_ETH=m | 1399 | CONFIG_MV643XX_ETH=m |
1399 | CONFIG_QLA3XXX=m | 1400 | CONFIG_QLA3XXX=m |
1400 | CONFIG_ATL1=m | 1401 | CONFIG_ATL1=m |
1402 | # CONFIG_ATL1E is not set | ||
1401 | CONFIG_NETDEV_10000=y | 1403 | CONFIG_NETDEV_10000=y |
1402 | CONFIG_CHELSIO_T1=m | 1404 | CONFIG_CHELSIO_T1=m |
1403 | CONFIG_CHELSIO_T1_1G=y | 1405 | CONFIG_CHELSIO_T1_1G=y |
1404 | CONFIG_CHELSIO_T1_NAPI=y | ||
1405 | CONFIG_CHELSIO_T3=m | 1406 | CONFIG_CHELSIO_T3=m |
1406 | CONFIG_IXGBE=m | 1407 | CONFIG_IXGBE=m |
1407 | CONFIG_IXGB=m | 1408 | CONFIG_IXGB=m |
1408 | CONFIG_IXGB_NAPI=y | ||
1409 | CONFIG_S2IO=m | 1409 | CONFIG_S2IO=m |
1410 | CONFIG_S2IO_NAPI=y | ||
1411 | CONFIG_MYRI10GE=m | 1410 | CONFIG_MYRI10GE=m |
1412 | CONFIG_NETXEN_NIC=m | 1411 | CONFIG_NETXEN_NIC=m |
1413 | CONFIG_NIU=m | 1412 | CONFIG_NIU=m |
@@ -1477,8 +1476,7 @@ CONFIG_ATM_IDT77252_USE_SUNI=y | |||
1477 | # CONFIG_ATM_AMBASSADOR is not set | 1476 | # CONFIG_ATM_AMBASSADOR is not set |
1478 | # CONFIG_ATM_HORIZON is not set | 1477 | # CONFIG_ATM_HORIZON is not set |
1479 | # CONFIG_ATM_IA is not set | 1478 | # CONFIG_ATM_IA is not set |
1480 | CONFIG_ATM_FORE200E_MAYBE=m | 1479 | # CONFIG_ATM_FORE200E is not set |
1481 | # CONFIG_ATM_FORE200E_PCA is not set | ||
1482 | CONFIG_ATM_HE=m | 1480 | CONFIG_ATM_HE=m |
1483 | # CONFIG_ATM_HE_USE_SUNI is not set | 1481 | # CONFIG_ATM_HE_USE_SUNI is not set |
1484 | CONFIG_FDDI=y | 1482 | CONFIG_FDDI=y |
@@ -1551,6 +1549,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
1551 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1549 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
1552 | CONFIG_MOUSE_SERIAL=m | 1550 | CONFIG_MOUSE_SERIAL=m |
1553 | CONFIG_MOUSE_APPLETOUCH=m | 1551 | CONFIG_MOUSE_APPLETOUCH=m |
1552 | # CONFIG_MOUSE_BCM5974 is not set | ||
1554 | # CONFIG_MOUSE_INPORT is not set | 1553 | # CONFIG_MOUSE_INPORT is not set |
1555 | # CONFIG_MOUSE_LOGIBM is not set | 1554 | # CONFIG_MOUSE_LOGIBM is not set |
1556 | # CONFIG_MOUSE_PC110PAD is not set | 1555 | # CONFIG_MOUSE_PC110PAD is not set |
@@ -1611,33 +1610,18 @@ CONFIG_SERIO_SERPORT=y | |||
1611 | # CONFIG_SERIO_PCIPS2 is not set | 1610 | # CONFIG_SERIO_PCIPS2 is not set |
1612 | CONFIG_SERIO_LIBPS2=y | 1611 | CONFIG_SERIO_LIBPS2=y |
1613 | CONFIG_SERIO_RAW=m | 1612 | CONFIG_SERIO_RAW=m |
1613 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
1614 | CONFIG_GAMEPORT=m | 1614 | CONFIG_GAMEPORT=m |
1615 | CONFIG_GAMEPORT_NS558=m | 1615 | CONFIG_GAMEPORT_NS558=m |
1616 | CONFIG_GAMEPORT_L4=m | 1616 | CONFIG_GAMEPORT_L4=m |
1617 | CONFIG_GAMEPORT_EMU10K1=m | 1617 | CONFIG_GAMEPORT_EMU10K1=m |
1618 | CONFIG_GAMEPORT_FM801=m | 1618 | CONFIG_GAMEPORT_FM801=m |
1619 | CONFIG_INPUT_LIRC=y | ||
1620 | CONFIG_LIRC_DEV=m | ||
1621 | CONFIG_LIRC_ATIUSB=m | ||
1622 | CONFIG_LIRC_BT829=m | ||
1623 | CONFIG_LIRC_CMDIR=m | ||
1624 | CONFIG_LIRC_I2C=m | ||
1625 | CONFIG_LIRC_IGORPLUGUSB=m | ||
1626 | CONFIG_LIRC_IMON=m | ||
1627 | CONFIG_LIRC_IT87=m | ||
1628 | CONFIG_LIRC_MCEUSB=m | ||
1629 | CONFIG_LIRC_MCEUSB2=m | ||
1630 | CONFIG_LIRC_PVR150=m | ||
1631 | CONFIG_LIRC_PARALLEL=m | ||
1632 | CONFIG_LIRC_SERIAL=m | ||
1633 | CONFIG_LIRC_SIR=m | ||
1634 | CONFIG_LIRC_STREAMZAP=m | ||
1635 | CONFIG_LIRC_TTUSBIR=m | ||
1636 | 1619 | ||
1637 | # | 1620 | # |
1638 | # Character devices | 1621 | # Character devices |
1639 | # | 1622 | # |
1640 | CONFIG_VT=y | 1623 | CONFIG_VT=y |
1624 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
1641 | CONFIG_VT_CONSOLE=y | 1625 | CONFIG_VT_CONSOLE=y |
1642 | CONFIG_HW_CONSOLE=y | 1626 | CONFIG_HW_CONSOLE=y |
1643 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1627 | CONFIG_VT_HW_CONSOLE_BINDING=y |
@@ -1701,12 +1685,12 @@ CONFIG_SERIAL_OF_PLATFORM=y | |||
1701 | # CONFIG_SERIAL_QE is not set | 1685 | # CONFIG_SERIAL_QE is not set |
1702 | CONFIG_UNIX98_PTYS=y | 1686 | CONFIG_UNIX98_PTYS=y |
1703 | # CONFIG_LEGACY_PTYS is not set | 1687 | # CONFIG_LEGACY_PTYS is not set |
1704 | # CONFIG_CRASH is not set | ||
1705 | CONFIG_BRIQ_PANEL=m | 1688 | CONFIG_BRIQ_PANEL=m |
1706 | CONFIG_PRINTER=m | 1689 | CONFIG_PRINTER=m |
1707 | CONFIG_LP_CONSOLE=y | 1690 | CONFIG_LP_CONSOLE=y |
1708 | CONFIG_PPDEV=m | 1691 | CONFIG_PPDEV=m |
1709 | # CONFIG_HVC_RTAS is not set | 1692 | # CONFIG_HVC_RTAS is not set |
1693 | # CONFIG_VIRTIO_CONSOLE is not set | ||
1710 | # CONFIG_IPMI_HANDLER is not set | 1694 | # CONFIG_IPMI_HANDLER is not set |
1711 | CONFIG_HW_RANDOM=y | 1695 | CONFIG_HW_RANDOM=y |
1712 | CONFIG_HW_RANDOM_VIRTIO=m | 1696 | CONFIG_HW_RANDOM_VIRTIO=m |
@@ -1728,6 +1712,7 @@ CONFIG_DEVPORT=y | |||
1728 | CONFIG_I2C=y | 1712 | CONFIG_I2C=y |
1729 | CONFIG_I2C_BOARDINFO=y | 1713 | CONFIG_I2C_BOARDINFO=y |
1730 | CONFIG_I2C_CHARDEV=m | 1714 | CONFIG_I2C_CHARDEV=m |
1715 | CONFIG_I2C_HELPER_AUTO=y | ||
1731 | CONFIG_I2C_ALGOBIT=y | 1716 | CONFIG_I2C_ALGOBIT=y |
1732 | CONFIG_I2C_ALGOPCA=m | 1717 | CONFIG_I2C_ALGOPCA=m |
1733 | 1718 | ||
@@ -1807,20 +1792,24 @@ CONFIG_SENSORS_TSL2550=m | |||
1807 | # CONFIG_I2C_DEBUG_BUS is not set | 1792 | # CONFIG_I2C_DEBUG_BUS is not set |
1808 | # CONFIG_I2C_DEBUG_CHIP is not set | 1793 | # CONFIG_I2C_DEBUG_CHIP is not set |
1809 | # CONFIG_SPI is not set | 1794 | # CONFIG_SPI is not set |
1810 | CONFIG_HAVE_GPIO_LIB=y | 1795 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
1811 | 1796 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | |
1812 | # | 1797 | CONFIG_GPIOLIB=y |
1813 | # GPIO Support | ||
1814 | # | ||
1815 | # CONFIG_DEBUG_GPIO is not set | 1798 | # CONFIG_DEBUG_GPIO is not set |
1799 | CONFIG_GPIO_SYSFS=y | ||
1816 | 1800 | ||
1817 | # | 1801 | # |
1818 | # I2C GPIO expanders: | 1802 | # I2C GPIO expanders: |
1819 | # | 1803 | # |
1804 | # CONFIG_GPIO_MAX732X is not set | ||
1820 | # CONFIG_GPIO_PCA953X is not set | 1805 | # CONFIG_GPIO_PCA953X is not set |
1821 | # CONFIG_GPIO_PCF857X is not set | 1806 | # CONFIG_GPIO_PCF857X is not set |
1822 | 1807 | ||
1823 | # | 1808 | # |
1809 | # PCI GPIO expanders: | ||
1810 | # | ||
1811 | |||
1812 | # | ||
1824 | # SPI GPIO expanders: | 1813 | # SPI GPIO expanders: |
1825 | # | 1814 | # |
1826 | CONFIG_W1=m | 1815 | CONFIG_W1=m |
@@ -1850,6 +1839,7 @@ CONFIG_APM_POWER=m | |||
1850 | CONFIG_BATTERY_PMU=m | 1839 | CONFIG_BATTERY_PMU=m |
1851 | CONFIG_HWMON=m | 1840 | CONFIG_HWMON=m |
1852 | CONFIG_HWMON_VID=m | 1841 | CONFIG_HWMON_VID=m |
1842 | # CONFIG_SENSORS_AD7414 is not set | ||
1853 | CONFIG_SENSORS_AD7418=m | 1843 | CONFIG_SENSORS_AD7418=m |
1854 | CONFIG_SENSORS_ADM1021=m | 1844 | CONFIG_SENSORS_ADM1021=m |
1855 | CONFIG_SENSORS_ADM1025=m | 1845 | CONFIG_SENSORS_ADM1025=m |
@@ -1913,8 +1903,9 @@ CONFIG_WATCHDOG=y | |||
1913 | # Watchdog Device Drivers | 1903 | # Watchdog Device Drivers |
1914 | # | 1904 | # |
1915 | CONFIG_SOFT_WATCHDOG=m | 1905 | CONFIG_SOFT_WATCHDOG=m |
1906 | # CONFIG_ALIM7101_WDT is not set | ||
1916 | # CONFIG_MPC5200_WDT is not set | 1907 | # CONFIG_MPC5200_WDT is not set |
1917 | CONFIG_83xx_WDT=m | 1908 | # CONFIG_8xxx_WDT is not set |
1918 | CONFIG_WATCHDOG_RTAS=m | 1909 | CONFIG_WATCHDOG_RTAS=m |
1919 | 1910 | ||
1920 | # | 1911 | # |
@@ -1953,8 +1944,10 @@ CONFIG_SSB_DRIVER_PCICORE=y | |||
1953 | # | 1944 | # |
1954 | # Multifunction device drivers | 1945 | # Multifunction device drivers |
1955 | # | 1946 | # |
1947 | # CONFIG_MFD_CORE is not set | ||
1956 | CONFIG_MFD_SM501=m | 1948 | CONFIG_MFD_SM501=m |
1957 | # CONFIG_HTC_PASIC3 is not set | 1949 | # CONFIG_HTC_PASIC3 is not set |
1950 | # CONFIG_MFD_TMIO is not set | ||
1958 | 1951 | ||
1959 | # | 1952 | # |
1960 | # Multimedia devices | 1953 | # Multimedia devices |
@@ -1993,6 +1986,7 @@ CONFIG_MEDIA_TUNER_QT1010=m | |||
1993 | CONFIG_MEDIA_TUNER_XC2028=m | 1986 | CONFIG_MEDIA_TUNER_XC2028=m |
1994 | CONFIG_MEDIA_TUNER_XC5000=m | 1987 | CONFIG_MEDIA_TUNER_XC5000=m |
1995 | CONFIG_MEDIA_TUNER_MXL5005S=m | 1988 | CONFIG_MEDIA_TUNER_MXL5005S=m |
1989 | CONFIG_MEDIA_TUNER_MXL5007T=m | ||
1996 | CONFIG_VIDEO_V4L2=m | 1990 | CONFIG_VIDEO_V4L2=m |
1997 | CONFIG_VIDEO_V4L1=m | 1991 | CONFIG_VIDEO_V4L1=m |
1998 | CONFIG_VIDEOBUF_GEN=m | 1992 | CONFIG_VIDEOBUF_GEN=m |
@@ -2000,13 +1994,13 @@ CONFIG_VIDEOBUF_DMA_SG=m | |||
2000 | CONFIG_VIDEOBUF_VMALLOC=m | 1994 | CONFIG_VIDEOBUF_VMALLOC=m |
2001 | CONFIG_VIDEOBUF_DVB=m | 1995 | CONFIG_VIDEOBUF_DVB=m |
2002 | CONFIG_VIDEO_BTCX=m | 1996 | CONFIG_VIDEO_BTCX=m |
2003 | CONFIG_VIDEO_IR_I2C=m | ||
2004 | CONFIG_VIDEO_IR=m | 1997 | CONFIG_VIDEO_IR=m |
2005 | CONFIG_VIDEO_TVEEPROM=m | 1998 | CONFIG_VIDEO_TVEEPROM=m |
2006 | CONFIG_VIDEO_TUNER=m | 1999 | CONFIG_VIDEO_TUNER=m |
2007 | CONFIG_VIDEO_CAPTURE_DRIVERS=y | 2000 | CONFIG_VIDEO_CAPTURE_DRIVERS=y |
2008 | # CONFIG_VIDEO_ADV_DEBUG is not set | 2001 | # CONFIG_VIDEO_ADV_DEBUG is not set |
2009 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | 2002 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set |
2003 | CONFIG_VIDEO_IR_I2C=m | ||
2010 | 2004 | ||
2011 | # | 2005 | # |
2012 | # Encoders/decoders and other helper chips | 2006 | # Encoders/decoders and other helper chips |
@@ -2108,6 +2102,8 @@ CONFIG_VIDEO_CX18=m | |||
2108 | # CONFIG_VIDEO_CAFE_CCIC is not set | 2102 | # CONFIG_VIDEO_CAFE_CCIC is not set |
2109 | CONFIG_V4L_USB_DRIVERS=y | 2103 | CONFIG_V4L_USB_DRIVERS=y |
2110 | CONFIG_USB_VIDEO_CLASS=m | 2104 | CONFIG_USB_VIDEO_CLASS=m |
2105 | CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | ||
2106 | CONFIG_USB_GSPCA=m | ||
2111 | CONFIG_VIDEO_PVRUSB2=m | 2107 | CONFIG_VIDEO_PVRUSB2=m |
2112 | CONFIG_VIDEO_PVRUSB2_SYSFS=y | 2108 | CONFIG_VIDEO_PVRUSB2_SYSFS=y |
2113 | CONFIG_VIDEO_PVRUSB2_DVB=y | 2109 | CONFIG_VIDEO_PVRUSB2_DVB=y |
@@ -2133,11 +2129,14 @@ CONFIG_USB_PWC=m | |||
2133 | # CONFIG_USB_PWC_DEBUG is not set | 2129 | # CONFIG_USB_PWC_DEBUG is not set |
2134 | CONFIG_USB_ZR364XX=m | 2130 | CONFIG_USB_ZR364XX=m |
2135 | CONFIG_USB_STKWEBCAM=m | 2131 | CONFIG_USB_STKWEBCAM=m |
2132 | # CONFIG_USB_S2255 is not set | ||
2136 | CONFIG_SOC_CAMERA=m | 2133 | CONFIG_SOC_CAMERA=m |
2137 | CONFIG_SOC_CAMERA_MT9M001=m | 2134 | CONFIG_SOC_CAMERA_MT9M001=m |
2138 | # CONFIG_MT9M001_PCA9536_SWITCH is not set | 2135 | # CONFIG_MT9M001_PCA9536_SWITCH is not set |
2139 | CONFIG_SOC_CAMERA_MT9V022=m | 2136 | CONFIG_SOC_CAMERA_MT9V022=m |
2140 | # CONFIG_MT9V022_PCA9536_SWITCH is not set | 2137 | # CONFIG_MT9V022_PCA9536_SWITCH is not set |
2138 | # CONFIG_SOC_CAMERA_PLATFORM is not set | ||
2139 | # CONFIG_VIDEO_SH_MOBILE_CEU is not set | ||
2141 | CONFIG_RADIO_ADAPTERS=y | 2140 | CONFIG_RADIO_ADAPTERS=y |
2142 | # CONFIG_RADIO_CADET is not set | 2141 | # CONFIG_RADIO_CADET is not set |
2143 | # CONFIG_RADIO_RTRACK is not set | 2142 | # CONFIG_RADIO_RTRACK is not set |
@@ -2194,6 +2193,8 @@ CONFIG_DVB_USB_DTT200U=m | |||
2194 | CONFIG_DVB_USB_OPERA1=m | 2193 | CONFIG_DVB_USB_OPERA1=m |
2195 | CONFIG_DVB_USB_AF9005=m | 2194 | CONFIG_DVB_USB_AF9005=m |
2196 | CONFIG_DVB_USB_AF9005_REMOTE=m | 2195 | CONFIG_DVB_USB_AF9005_REMOTE=m |
2196 | # CONFIG_DVB_USB_DW2102 is not set | ||
2197 | # CONFIG_DVB_USB_ANYSEE is not set | ||
2197 | CONFIG_DVB_TTUSB_BUDGET=m | 2198 | CONFIG_DVB_TTUSB_BUDGET=m |
2198 | CONFIG_DVB_TTUSB_DEC=m | 2199 | CONFIG_DVB_TTUSB_DEC=m |
2199 | CONFIG_DVB_CINERGYT2=m | 2200 | CONFIG_DVB_CINERGYT2=m |
@@ -2203,6 +2204,7 @@ CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 | |||
2203 | CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 | 2204 | CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 |
2204 | CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y | 2205 | CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y |
2205 | CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 | 2206 | CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100 |
2207 | # CONFIG_DVB_SIANO_SMS1XXX is not set | ||
2206 | 2208 | ||
2207 | # | 2209 | # |
2208 | # Supported FlexCopII (B2C2) Adapters | 2210 | # Supported FlexCopII (B2C2) Adapters |
@@ -2253,6 +2255,7 @@ CONFIG_DVB_SP8870=m | |||
2253 | CONFIG_DVB_SP887X=m | 2255 | CONFIG_DVB_SP887X=m |
2254 | CONFIG_DVB_CX22700=m | 2256 | CONFIG_DVB_CX22700=m |
2255 | CONFIG_DVB_CX22702=m | 2257 | CONFIG_DVB_CX22702=m |
2258 | # CONFIG_DVB_DRX397XD is not set | ||
2256 | CONFIG_DVB_L64781=m | 2259 | CONFIG_DVB_L64781=m |
2257 | CONFIG_DVB_TDA1004X=m | 2260 | CONFIG_DVB_TDA1004X=m |
2258 | CONFIG_DVB_NXT6000=m | 2261 | CONFIG_DVB_NXT6000=m |
@@ -2389,12 +2392,15 @@ CONFIG_FB_TRIDENT=m | |||
2389 | CONFIG_FB_TRIDENT_ACCEL=y | 2392 | CONFIG_FB_TRIDENT_ACCEL=y |
2390 | # CONFIG_FB_ARK is not set | 2393 | # CONFIG_FB_ARK is not set |
2391 | # CONFIG_FB_PM3 is not set | 2394 | # CONFIG_FB_PM3 is not set |
2395 | # CONFIG_FB_CARMINE is not set | ||
2392 | # CONFIG_FB_FSL_DIU is not set | 2396 | # CONFIG_FB_FSL_DIU is not set |
2393 | CONFIG_FB_SM501=m | 2397 | CONFIG_FB_SM501=m |
2394 | CONFIG_FB_IBM_GXT4500=y | 2398 | CONFIG_FB_IBM_GXT4500=y |
2395 | # CONFIG_FB_VIRTUAL is not set | 2399 | # CONFIG_FB_VIRTUAL is not set |
2396 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 2400 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
2397 | CONFIG_LCD_CLASS_DEVICE=m | 2401 | CONFIG_LCD_CLASS_DEVICE=m |
2402 | # CONFIG_LCD_ILI9320 is not set | ||
2403 | CONFIG_LCD_PLATFORM=m | ||
2398 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 2404 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
2399 | # CONFIG_BACKLIGHT_CORGI is not set | 2405 | # CONFIG_BACKLIGHT_CORGI is not set |
2400 | 2406 | ||
@@ -2613,6 +2619,7 @@ CONFIG_USB_DEVICEFS=y | |||
2613 | # CONFIG_USB_DYNAMIC_MINORS is not set | 2619 | # CONFIG_USB_DYNAMIC_MINORS is not set |
2614 | CONFIG_USB_SUSPEND=y | 2620 | CONFIG_USB_SUSPEND=y |
2615 | # CONFIG_USB_OTG is not set | 2621 | # CONFIG_USB_OTG is not set |
2622 | CONFIG_USB_MON=y | ||
2616 | 2623 | ||
2617 | # | 2624 | # |
2618 | # USB Host Controller Drivers | 2625 | # USB Host Controller Drivers |
@@ -2640,6 +2647,7 @@ CONFIG_USB_U132_HCD=m | |||
2640 | CONFIG_USB_SL811_HCD=m | 2647 | CONFIG_USB_SL811_HCD=m |
2641 | # CONFIG_USB_SL811_CS is not set | 2648 | # CONFIG_USB_SL811_CS is not set |
2642 | # CONFIG_USB_R8A66597_HCD is not set | 2649 | # CONFIG_USB_R8A66597_HCD is not set |
2650 | # CONFIG_USB_MUSB_HDRC is not set | ||
2643 | 2651 | ||
2644 | # | 2652 | # |
2645 | # USB Device Class drivers | 2653 | # USB Device Class drivers |
@@ -2668,6 +2676,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y | |||
2668 | CONFIG_USB_STORAGE_ALAUDA=y | 2676 | CONFIG_USB_STORAGE_ALAUDA=y |
2669 | CONFIG_USB_STORAGE_ONETOUCH=y | 2677 | CONFIG_USB_STORAGE_ONETOUCH=y |
2670 | CONFIG_USB_STORAGE_KARMA=y | 2678 | CONFIG_USB_STORAGE_KARMA=y |
2679 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
2671 | CONFIG_USB_STORAGE_CYPRESS_ATACB=y | 2680 | CONFIG_USB_STORAGE_CYPRESS_ATACB=y |
2672 | # CONFIG_USB_LIBUSUAL is not set | 2681 | # CONFIG_USB_LIBUSUAL is not set |
2673 | 2682 | ||
@@ -2676,7 +2685,6 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=y | |||
2676 | # | 2685 | # |
2677 | CONFIG_USB_MDC800=m | 2686 | CONFIG_USB_MDC800=m |
2678 | CONFIG_USB_MICROTEK=m | 2687 | CONFIG_USB_MICROTEK=m |
2679 | CONFIG_USB_MON=y | ||
2680 | 2688 | ||
2681 | # | 2689 | # |
2682 | # USB port drivers | 2690 | # USB port drivers |
@@ -2686,7 +2694,6 @@ CONFIG_USB_SERIAL=m | |||
2686 | CONFIG_USB_EZUSB=y | 2694 | CONFIG_USB_EZUSB=y |
2687 | CONFIG_USB_SERIAL_GENERIC=y | 2695 | CONFIG_USB_SERIAL_GENERIC=y |
2688 | CONFIG_USB_SERIAL_AIRCABLE=m | 2696 | CONFIG_USB_SERIAL_AIRCABLE=m |
2689 | CONFIG_USB_SERIAL_AIRPRIME=m | ||
2690 | CONFIG_USB_SERIAL_ARK3116=m | 2697 | CONFIG_USB_SERIAL_ARK3116=m |
2691 | CONFIG_USB_SERIAL_BELKIN=m | 2698 | CONFIG_USB_SERIAL_BELKIN=m |
2692 | CONFIG_USB_SERIAL_CH341=m | 2699 | CONFIG_USB_SERIAL_CH341=m |
@@ -2734,7 +2741,6 @@ CONFIG_USB_SERIAL_DEBUG=m | |||
2734 | CONFIG_USB_EMI62=m | 2741 | CONFIG_USB_EMI62=m |
2735 | CONFIG_USB_EMI26=m | 2742 | CONFIG_USB_EMI26=m |
2736 | CONFIG_USB_ADUTUX=m | 2743 | CONFIG_USB_ADUTUX=m |
2737 | CONFIG_USB_AUERSWALD=m | ||
2738 | # CONFIG_USB_RIO500 is not set | 2744 | # CONFIG_USB_RIO500 is not set |
2739 | CONFIG_USB_LEGOTOWER=m | 2745 | CONFIG_USB_LEGOTOWER=m |
2740 | CONFIG_USB_LCD=m | 2746 | CONFIG_USB_LCD=m |
@@ -2770,7 +2776,9 @@ CONFIG_LEDS_CLASS=y | |||
2770 | # | 2776 | # |
2771 | # LED drivers | 2777 | # LED drivers |
2772 | # | 2778 | # |
2779 | # CONFIG_LEDS_PCA9532 is not set | ||
2773 | # CONFIG_LEDS_GPIO is not set | 2780 | # CONFIG_LEDS_GPIO is not set |
2781 | # CONFIG_LEDS_PCA955X is not set | ||
2774 | 2782 | ||
2775 | # | 2783 | # |
2776 | # LED Triggers | 2784 | # LED Triggers |
@@ -2853,6 +2861,7 @@ CONFIG_KS0108_PORT=0x378 | |||
2853 | CONFIG_KS0108_DELAY=2 | 2861 | CONFIG_KS0108_DELAY=2 |
2854 | CONFIG_UIO=m | 2862 | CONFIG_UIO=m |
2855 | CONFIG_UIO_CIF=m | 2863 | CONFIG_UIO_CIF=m |
2864 | CONFIG_UIO_PDRV=m | ||
2856 | CONFIG_UIO_SMX=m | 2865 | CONFIG_UIO_SMX=m |
2857 | 2866 | ||
2858 | # | 2867 | # |
@@ -2899,6 +2908,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=m | |||
2899 | CONFIG_OCFS2_FS=m | 2908 | CONFIG_OCFS2_FS=m |
2900 | CONFIG_OCFS2_FS_O2CB=m | 2909 | CONFIG_OCFS2_FS_O2CB=m |
2901 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m | 2910 | CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m |
2911 | CONFIG_OCFS2_FS_STATS=y | ||
2902 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set | 2912 | # CONFIG_OCFS2_DEBUG_MASKLOG is not set |
2903 | # CONFIG_OCFS2_DEBUG_FS is not set | 2913 | # CONFIG_OCFS2_DEBUG_FS is not set |
2904 | CONFIG_DNOTIFY=y | 2914 | CONFIG_DNOTIFY=y |
@@ -2959,11 +2969,9 @@ CONFIG_BEFS_FS=m | |||
2959 | CONFIG_BFS_FS=m | 2969 | CONFIG_BFS_FS=m |
2960 | CONFIG_EFS_FS=m | 2970 | CONFIG_EFS_FS=m |
2961 | CONFIG_CRAMFS=m | 2971 | CONFIG_CRAMFS=m |
2962 | CONFIG_SQUASHFS=m | ||
2963 | # CONFIG_SQUASHFS_EMBEDDED is not set | ||
2964 | CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 | ||
2965 | CONFIG_VXFS_FS=m | 2972 | CONFIG_VXFS_FS=m |
2966 | CONFIG_MINIX_FS=m | 2973 | CONFIG_MINIX_FS=m |
2974 | CONFIG_OMFS_FS=m | ||
2967 | # CONFIG_HPFS_FS is not set | 2975 | # CONFIG_HPFS_FS is not set |
2968 | CONFIG_QNX4FS_FS=m | 2976 | CONFIG_QNX4FS_FS=m |
2969 | CONFIG_ROMFS_FS=m | 2977 | CONFIG_ROMFS_FS=m |
@@ -2988,7 +2996,6 @@ CONFIG_NFS_ACL_SUPPORT=m | |||
2988 | CONFIG_NFS_COMMON=y | 2996 | CONFIG_NFS_COMMON=y |
2989 | CONFIG_SUNRPC=m | 2997 | CONFIG_SUNRPC=m |
2990 | CONFIG_SUNRPC_GSS=m | 2998 | CONFIG_SUNRPC_GSS=m |
2991 | CONFIG_SUNRPC_BIND34=y | ||
2992 | CONFIG_RPCSEC_GSS_KRB5=m | 2999 | CONFIG_RPCSEC_GSS_KRB5=m |
2993 | CONFIG_RPCSEC_GSS_SPKM3=m | 3000 | CONFIG_RPCSEC_GSS_SPKM3=m |
2994 | # CONFIG_SMB_FS is not set | 3001 | # CONFIG_SMB_FS is not set |
@@ -3011,7 +3018,6 @@ CONFIG_NCPFS_SMALLDOS=y | |||
3011 | CONFIG_NCPFS_NLS=y | 3018 | CONFIG_NCPFS_NLS=y |
3012 | CONFIG_NCPFS_EXTRAS=y | 3019 | CONFIG_NCPFS_EXTRAS=y |
3013 | CONFIG_CODA_FS=m | 3020 | CONFIG_CODA_FS=m |
3014 | # CONFIG_CODA_FS_OLD_API is not set | ||
3015 | # CONFIG_AFS_FS is not set | 3021 | # CONFIG_AFS_FS is not set |
3016 | CONFIG_9P_FS=m | 3022 | CONFIG_9P_FS=m |
3017 | 3023 | ||
@@ -3087,7 +3093,7 @@ CONFIG_BITREVERSE=y | |||
3087 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 3093 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
3088 | CONFIG_CRC_CCITT=m | 3094 | CONFIG_CRC_CCITT=m |
3089 | CONFIG_CRC16=m | 3095 | CONFIG_CRC16=m |
3090 | CONFIG_CRC_T10DIF=m | 3096 | CONFIG_CRC_T10DIF=y |
3091 | CONFIG_CRC_ITU_T=m | 3097 | CONFIG_CRC_ITU_T=m |
3092 | CONFIG_CRC32=y | 3098 | CONFIG_CRC32=y |
3093 | # CONFIG_CRC7 is not set | 3099 | # CONFIG_CRC7 is not set |
@@ -3120,6 +3126,8 @@ CONFIG_HEADERS_CHECK=y | |||
3120 | CONFIG_DEBUG_KERNEL=y | 3126 | CONFIG_DEBUG_KERNEL=y |
3121 | CONFIG_DEBUG_SHIRQ=y | 3127 | CONFIG_DEBUG_SHIRQ=y |
3122 | CONFIG_DETECT_SOFTLOCKUP=y | 3128 | CONFIG_DETECT_SOFTLOCKUP=y |
3129 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
3130 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
3123 | CONFIG_SCHED_DEBUG=y | 3131 | CONFIG_SCHED_DEBUG=y |
3124 | CONFIG_SCHEDSTATS=y | 3132 | CONFIG_SCHEDSTATS=y |
3125 | CONFIG_TIMER_STATS=y | 3133 | CONFIG_TIMER_STATS=y |
@@ -3143,6 +3151,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
3143 | CONFIG_DEBUG_INFO=y | 3151 | CONFIG_DEBUG_INFO=y |
3144 | CONFIG_DEBUG_VM=y | 3152 | CONFIG_DEBUG_VM=y |
3145 | CONFIG_DEBUG_WRITECOUNT=y | 3153 | CONFIG_DEBUG_WRITECOUNT=y |
3154 | CONFIG_DEBUG_MEMORY_INIT=y | ||
3146 | CONFIG_DEBUG_LIST=y | 3155 | CONFIG_DEBUG_LIST=y |
3147 | CONFIG_DEBUG_SG=y | 3156 | CONFIG_DEBUG_SG=y |
3148 | CONFIG_FRAME_POINTER=y | 3157 | CONFIG_FRAME_POINTER=y |
@@ -3158,6 +3167,7 @@ CONFIG_FAIL_MAKE_REQUEST=y | |||
3158 | CONFIG_FAULT_INJECTION_DEBUG_FS=y | 3167 | CONFIG_FAULT_INJECTION_DEBUG_FS=y |
3159 | CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y | 3168 | CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y |
3160 | CONFIG_LATENCYTOP=y | 3169 | CONFIG_LATENCYTOP=y |
3170 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
3161 | CONFIG_HAVE_FTRACE=y | 3171 | CONFIG_HAVE_FTRACE=y |
3162 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 3172 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
3163 | CONFIG_TRACER_MAX_TRACE=y | 3173 | CONFIG_TRACER_MAX_TRACE=y |
@@ -3168,16 +3178,18 @@ CONFIG_CONTEXT_SWITCH_TRACER=y | |||
3168 | CONFIG_DYNAMIC_FTRACE=y | 3178 | CONFIG_DYNAMIC_FTRACE=y |
3169 | # CONFIG_FTRACE_STARTUP_TEST is not set | 3179 | # CONFIG_FTRACE_STARTUP_TEST is not set |
3170 | # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set | 3180 | # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set |
3181 | # CONFIG_BUILD_DOCSRC is not set | ||
3171 | # CONFIG_SAMPLES is not set | 3182 | # CONFIG_SAMPLES is not set |
3183 | CONFIG_HAVE_ARCH_KGDB=y | ||
3184 | # CONFIG_KGDB is not set | ||
3172 | CONFIG_DEBUG_STACKOVERFLOW=y | 3185 | CONFIG_DEBUG_STACKOVERFLOW=y |
3173 | CONFIG_DEBUG_STACK_USAGE=y | 3186 | CONFIG_DEBUG_STACK_USAGE=y |
3174 | CONFIG_DEBUGGER=y | ||
3175 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 3187 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
3176 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 3188 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
3177 | # CONFIG_KGDB_CONSOLE is not set | ||
3178 | CONFIG_XMON=y | 3189 | CONFIG_XMON=y |
3179 | # CONFIG_XMON_DEFAULT is not set | 3190 | # CONFIG_XMON_DEFAULT is not set |
3180 | CONFIG_XMON_DISASSEMBLY=y | 3191 | CONFIG_XMON_DISASSEMBLY=y |
3192 | CONFIG_DEBUGGER=y | ||
3181 | CONFIG_IRQSTACKS=y | 3193 | CONFIG_IRQSTACKS=y |
3182 | # CONFIG_VIRQ_DEBUG is not set | 3194 | # CONFIG_VIRQ_DEBUG is not set |
3183 | # CONFIG_BDI_SWITCH is not set | 3195 | # CONFIG_BDI_SWITCH is not set |
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig index bc3bf62ddc2f..b390b7476649 100644 --- a/arch/powerpc/configs/pq2fads_defconfig +++ b/arch/powerpc/configs/pq2fads_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:18 2008 | 4 | # Thu Aug 21 00:52:13 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -15,6 +15,7 @@ CONFIG_6xx=y | |||
15 | # CONFIG_44x is not set | 15 | # CONFIG_44x is not set |
16 | # CONFIG_E200 is not set | 16 | # CONFIG_E200 is not set |
17 | CONFIG_PPC_FPU=y | 17 | CONFIG_PPC_FPU=y |
18 | # CONFIG_ALTIVEC is not set | ||
18 | CONFIG_PPC_STD_MMU=y | 19 | CONFIG_PPC_STD_MMU=y |
19 | CONFIG_PPC_STD_MMU_32=y | 20 | CONFIG_PPC_STD_MMU_32=y |
20 | # CONFIG_PPC_MM_SLICES is not set | 21 | # CONFIG_PPC_MM_SLICES is not set |
@@ -31,12 +32,14 @@ CONFIG_GENERIC_HARDIRQS=y | |||
31 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
34 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
35 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
36 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
37 | CONFIG_GENERIC_HWEIGHT=y | 39 | CONFIG_GENERIC_HWEIGHT=y |
38 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 40 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
39 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 41 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
42 | CONFIG_GENERIC_GPIO=y | ||
40 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set | 43 | # CONFIG_ARCH_NO_VIRT_TO_BUS is not set |
41 | CONFIG_PPC=y | 44 | CONFIG_PPC=y |
42 | CONFIG_EARLY_PRINTK=y | 45 | CONFIG_EARLY_PRINTK=y |
@@ -45,11 +48,13 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
45 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 48 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
46 | CONFIG_PPC_OF=y | 49 | CONFIG_PPC_OF=y |
47 | CONFIG_OF=y | 50 | CONFIG_OF=y |
48 | # CONFIG_PPC_UDBG_16550 is not set | 51 | CONFIG_PPC_UDBG_16550=y |
49 | # CONFIG_GENERIC_TBSYNC is not set | 52 | # CONFIG_GENERIC_TBSYNC is not set |
50 | CONFIG_AUDIT_ARCH=y | 53 | CONFIG_AUDIT_ARCH=y |
51 | CONFIG_GENERIC_BUG=y | 54 | CONFIG_GENERIC_BUG=y |
52 | CONFIG_DEFAULT_UIMAGE=y | 55 | CONFIG_DEFAULT_UIMAGE=y |
56 | CONFIG_HIBERNATE_32=y | ||
57 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
53 | # CONFIG_PPC_DCR_NATIVE is not set | 58 | # CONFIG_PPC_DCR_NATIVE is not set |
54 | # CONFIG_PPC_DCR_MMIO is not set | 59 | # CONFIG_PPC_DCR_MMIO is not set |
55 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 60 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
@@ -82,7 +87,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
82 | CONFIG_SYSCTL=y | 87 | CONFIG_SYSCTL=y |
83 | CONFIG_EMBEDDED=y | 88 | CONFIG_EMBEDDED=y |
84 | CONFIG_SYSCTL_SYSCALL=y | 89 | CONFIG_SYSCTL_SYSCALL=y |
85 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
86 | CONFIG_KALLSYMS=y | 90 | CONFIG_KALLSYMS=y |
87 | CONFIG_KALLSYMS_ALL=y | 91 | CONFIG_KALLSYMS_ALL=y |
88 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 92 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -90,6 +94,7 @@ CONFIG_HOTPLUG=y | |||
90 | CONFIG_PRINTK=y | 94 | CONFIG_PRINTK=y |
91 | CONFIG_BUG=y | 95 | CONFIG_BUG=y |
92 | CONFIG_ELF_CORE=y | 96 | CONFIG_ELF_CORE=y |
97 | CONFIG_PCSPKR_PLATFORM=y | ||
93 | CONFIG_COMPAT_BRK=y | 98 | CONFIG_COMPAT_BRK=y |
94 | CONFIG_BASE_FULL=y | 99 | CONFIG_BASE_FULL=y |
95 | CONFIG_FUTEX=y | 100 | CONFIG_FUTEX=y |
@@ -107,10 +112,16 @@ CONFIG_SLUB=y | |||
107 | # CONFIG_PROFILING is not set | 112 | # CONFIG_PROFILING is not set |
108 | # CONFIG_MARKERS is not set | 113 | # CONFIG_MARKERS is not set |
109 | CONFIG_HAVE_OPROFILE=y | 114 | CONFIG_HAVE_OPROFILE=y |
115 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
116 | CONFIG_HAVE_IOREMAP_PROT=y | ||
110 | CONFIG_HAVE_KPROBES=y | 117 | CONFIG_HAVE_KPROBES=y |
111 | CONFIG_HAVE_KRETPROBES=y | 118 | CONFIG_HAVE_KRETPROBES=y |
119 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
112 | # CONFIG_HAVE_DMA_ATTRS is not set | 120 | # CONFIG_HAVE_DMA_ATTRS is not set |
121 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
122 | CONFIG_HAVE_CLK=y | ||
113 | CONFIG_PROC_PAGE_MONITOR=y | 123 | CONFIG_PROC_PAGE_MONITOR=y |
124 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
114 | CONFIG_SLABINFO=y | 125 | CONFIG_SLABINFO=y |
115 | CONFIG_RT_MUTEXES=y | 126 | CONFIG_RT_MUTEXES=y |
116 | # CONFIG_TINY_SHMEM is not set | 127 | # CONFIG_TINY_SHMEM is not set |
@@ -120,6 +131,7 @@ CONFIG_BLOCK=y | |||
120 | # CONFIG_LBD is not set | 131 | # CONFIG_LBD is not set |
121 | # CONFIG_BLK_DEV_IO_TRACE is not set | 132 | # CONFIG_BLK_DEV_IO_TRACE is not set |
122 | # CONFIG_LSF is not set | 133 | # CONFIG_LSF is not set |
134 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
123 | 135 | ||
124 | # | 136 | # |
125 | # IO Schedulers | 137 | # IO Schedulers |
@@ -138,33 +150,43 @@ CONFIG_CLASSIC_RCU=y | |||
138 | # | 150 | # |
139 | # Platform support | 151 | # Platform support |
140 | # | 152 | # |
141 | # CONFIG_PPC_MULTIPLATFORM is not set | 153 | CONFIG_PPC_MULTIPLATFORM=y |
142 | CONFIG_PPC_82xx=y | 154 | CONFIG_CLASSIC32=y |
143 | # CONFIG_PPC_83xx is not set | 155 | CONFIG_PPC_CHRP=y |
144 | # CONFIG_PPC_86xx is not set | 156 | # CONFIG_MPC5121_ADS is not set |
145 | # CONFIG_PPC_MPC512x is not set | 157 | # CONFIG_MPC5121_GENERIC is not set |
146 | # CONFIG_PPC_MPC5121 is not set | 158 | # CONFIG_PPC_MPC52xx is not set |
159 | CONFIG_PPC_PMAC=y | ||
147 | # CONFIG_PPC_CELL is not set | 160 | # CONFIG_PPC_CELL is not set |
148 | # CONFIG_PPC_CELL_NATIVE is not set | 161 | # CONFIG_PPC_CELL_NATIVE is not set |
162 | CONFIG_PPC_82xx=y | ||
149 | # CONFIG_MPC8272_ADS is not set | 163 | # CONFIG_MPC8272_ADS is not set |
150 | CONFIG_PQ2FADS=y | 164 | CONFIG_PQ2FADS=y |
151 | # CONFIG_EP8248E is not set | 165 | # CONFIG_EP8248E is not set |
152 | CONFIG_PQ2ADS=y | 166 | CONFIG_PQ2ADS=y |
153 | CONFIG_8260=y | 167 | CONFIG_8260=y |
154 | CONFIG_PQ2_ADS_PCI_PIC=y | 168 | CONFIG_PQ2_ADS_PCI_PIC=y |
169 | # CONFIG_PPC_83xx is not set | ||
170 | # CONFIG_PPC_86xx is not set | ||
171 | # CONFIG_EMBEDDED6xx is not set | ||
172 | CONFIG_PPC_NATIVE=y | ||
173 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
155 | # CONFIG_IPIC is not set | 174 | # CONFIG_IPIC is not set |
156 | # CONFIG_MPIC is not set | 175 | CONFIG_MPIC=y |
157 | # CONFIG_MPIC_WEIRD is not set | 176 | # CONFIG_MPIC_WEIRD is not set |
158 | # CONFIG_PPC_I8259 is not set | 177 | CONFIG_PPC_I8259=y |
159 | # CONFIG_PPC_RTAS is not set | 178 | CONFIG_PPC_RTAS=y |
179 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
180 | CONFIG_RTAS_PROC=y | ||
160 | # CONFIG_MMIO_NVRAM is not set | 181 | # CONFIG_MMIO_NVRAM is not set |
161 | # CONFIG_PPC_MPC106 is not set | 182 | CONFIG_PPC_MPC106=y |
162 | # CONFIG_PPC_970_NAP is not set | 183 | # CONFIG_PPC_970_NAP is not set |
163 | # CONFIG_PPC_INDIRECT_IO is not set | 184 | # CONFIG_PPC_INDIRECT_IO is not set |
164 | # CONFIG_GENERIC_IOMAP is not set | 185 | # CONFIG_GENERIC_IOMAP is not set |
165 | # CONFIG_CPU_FREQ is not set | 186 | # CONFIG_CPU_FREQ is not set |
187 | # CONFIG_PPC601_SYNC_FIX is not set | ||
188 | # CONFIG_TAU is not set | ||
166 | CONFIG_CPM2=y | 189 | CONFIG_CPM2=y |
167 | CONFIG_PPC_CPM_NEW_BINDING=y | ||
168 | # CONFIG_FSL_ULI1575 is not set | 190 | # CONFIG_FSL_ULI1575 is not set |
169 | CONFIG_CPM=y | 191 | CONFIG_CPM=y |
170 | 192 | ||
@@ -181,7 +203,7 @@ CONFIG_HZ_250=y | |||
181 | # CONFIG_HZ_300 is not set | 203 | # CONFIG_HZ_300 is not set |
182 | # CONFIG_HZ_1000 is not set | 204 | # CONFIG_HZ_1000 is not set |
183 | CONFIG_HZ=250 | 205 | CONFIG_HZ=250 |
184 | # CONFIG_SCHED_HRTICK is not set | 206 | CONFIG_SCHED_HRTICK=y |
185 | CONFIG_PREEMPT_NONE=y | 207 | CONFIG_PREEMPT_NONE=y |
186 | # CONFIG_PREEMPT_VOLUNTARY is not set | 208 | # CONFIG_PREEMPT_VOLUNTARY is not set |
187 | # CONFIG_PREEMPT is not set | 209 | # CONFIG_PREEMPT is not set |
@@ -199,6 +221,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
199 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
200 | CONFIG_PAGEFLAGS_EXTENDED=y | 222 | CONFIG_PAGEFLAGS_EXTENDED=y |
201 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 223 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
224 | CONFIG_MIGRATION=y | ||
202 | # CONFIG_RESOURCES_64BIT is not set | 225 | # CONFIG_RESOURCES_64BIT is not set |
203 | CONFIG_ZONE_DMA_FLAG=1 | 226 | CONFIG_ZONE_DMA_FLAG=1 |
204 | CONFIG_BOUNCE=y | 227 | CONFIG_BOUNCE=y |
@@ -206,6 +229,7 @@ CONFIG_VIRT_TO_BUS=y | |||
206 | CONFIG_FORCE_MAX_ZONEORDER=11 | 229 | CONFIG_FORCE_MAX_ZONEORDER=11 |
207 | CONFIG_PROC_DEVICETREE=y | 230 | CONFIG_PROC_DEVICETREE=y |
208 | # CONFIG_CMDLINE_BOOL is not set | 231 | # CONFIG_CMDLINE_BOOL is not set |
232 | CONFIG_EXTRA_TARGETS="" | ||
209 | # CONFIG_PM is not set | 233 | # CONFIG_PM is not set |
210 | CONFIG_SECCOMP=y | 234 | CONFIG_SECCOMP=y |
211 | CONFIG_ISA_DMA_API=y | 235 | CONFIG_ISA_DMA_API=y |
@@ -213,9 +237,11 @@ CONFIG_ISA_DMA_API=y | |||
213 | # | 237 | # |
214 | # Bus options | 238 | # Bus options |
215 | # | 239 | # |
240 | # CONFIG_ISA is not set | ||
216 | CONFIG_ZONE_DMA=y | 241 | CONFIG_ZONE_DMA=y |
217 | CONFIG_PPC_INDIRECT_PCI=y | 242 | CONFIG_PPC_INDIRECT_PCI=y |
218 | CONFIG_FSL_SOC=y | 243 | CONFIG_FSL_SOC=y |
244 | CONFIG_PPC_PCI_CHOICE=y | ||
219 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
220 | CONFIG_PCI_DOMAINS=y | 246 | CONFIG_PCI_DOMAINS=y |
221 | CONFIG_PCI_SYSCALL=y | 247 | CONFIG_PCI_SYSCALL=y |
@@ -243,10 +269,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
243 | CONFIG_KERNEL_START=0xc0000000 | 269 | CONFIG_KERNEL_START=0xc0000000 |
244 | CONFIG_PHYSICAL_START=0x00000000 | 270 | CONFIG_PHYSICAL_START=0x00000000 |
245 | CONFIG_TASK_SIZE=0xc0000000 | 271 | CONFIG_TASK_SIZE=0xc0000000 |
246 | |||
247 | # | ||
248 | # Networking | ||
249 | # | ||
250 | CONFIG_NET=y | 272 | CONFIG_NET=y |
251 | 273 | ||
252 | # | 274 | # |
@@ -447,9 +469,11 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
447 | # | 469 | # |
448 | # CONFIG_MTD_UBI is not set | 470 | # CONFIG_MTD_UBI is not set |
449 | CONFIG_OF_DEVICE=y | 471 | CONFIG_OF_DEVICE=y |
472 | CONFIG_OF_GPIO=y | ||
450 | # CONFIG_PARPORT is not set | 473 | # CONFIG_PARPORT is not set |
451 | CONFIG_BLK_DEV=y | 474 | CONFIG_BLK_DEV=y |
452 | # CONFIG_BLK_DEV_FD is not set | 475 | # CONFIG_BLK_DEV_FD is not set |
476 | # CONFIG_MAC_FLOPPY is not set | ||
453 | # CONFIG_BLK_CPQ_DA is not set | 477 | # CONFIG_BLK_CPQ_DA is not set |
454 | # CONFIG_BLK_CPQ_CISS_DA is not set | 478 | # CONFIG_BLK_CPQ_CISS_DA is not set |
455 | # CONFIG_BLK_DEV_DAC960 is not set | 479 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -461,14 +485,15 @@ CONFIG_BLK_DEV_LOOP=y | |||
461 | # CONFIG_BLK_DEV_RAM is not set | 485 | # CONFIG_BLK_DEV_RAM is not set |
462 | # CONFIG_CDROM_PKTCDVD is not set | 486 | # CONFIG_CDROM_PKTCDVD is not set |
463 | # CONFIG_ATA_OVER_ETH is not set | 487 | # CONFIG_ATA_OVER_ETH is not set |
488 | # CONFIG_BLK_DEV_HD is not set | ||
464 | CONFIG_MISC_DEVICES=y | 489 | CONFIG_MISC_DEVICES=y |
465 | # CONFIG_PHANTOM is not set | 490 | # CONFIG_PHANTOM is not set |
466 | # CONFIG_EEPROM_93CX6 is not set | 491 | # CONFIG_EEPROM_93CX6 is not set |
467 | # CONFIG_SGI_IOC4 is not set | 492 | # CONFIG_SGI_IOC4 is not set |
468 | # CONFIG_ENCLOSURE_SERVICES is not set | 493 | # CONFIG_ENCLOSURE_SERVICES is not set |
494 | # CONFIG_HP_ILO is not set | ||
469 | CONFIG_HAVE_IDE=y | 495 | CONFIG_HAVE_IDE=y |
470 | CONFIG_IDE=y | 496 | CONFIG_IDE=y |
471 | CONFIG_IDE_MAX_HWIFS=4 | ||
472 | CONFIG_BLK_DEV_IDE=y | 497 | CONFIG_BLK_DEV_IDE=y |
473 | 498 | ||
474 | # | 499 | # |
@@ -486,7 +511,6 @@ CONFIG_IDE_PROC_FS=y | |||
486 | # | 511 | # |
487 | # IDE chipset support/bugfixes | 512 | # IDE chipset support/bugfixes |
488 | # | 513 | # |
489 | # CONFIG_IDE_GENERIC is not set | ||
490 | # CONFIG_BLK_DEV_PLATFORM is not set | 514 | # CONFIG_BLK_DEV_PLATFORM is not set |
491 | 515 | ||
492 | # | 516 | # |
@@ -498,9 +522,7 @@ CONFIG_IDE_PROC_FS=y | |||
498 | # CONFIG_BLK_DEV_AMD74XX is not set | 522 | # CONFIG_BLK_DEV_AMD74XX is not set |
499 | # CONFIG_BLK_DEV_CMD64X is not set | 523 | # CONFIG_BLK_DEV_CMD64X is not set |
500 | # CONFIG_BLK_DEV_TRIFLEX is not set | 524 | # CONFIG_BLK_DEV_TRIFLEX is not set |
501 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
502 | # CONFIG_BLK_DEV_CS5530 is not set | 525 | # CONFIG_BLK_DEV_CS5530 is not set |
503 | # CONFIG_BLK_DEV_HPT34X is not set | ||
504 | # CONFIG_BLK_DEV_HPT366 is not set | 526 | # CONFIG_BLK_DEV_HPT366 is not set |
505 | # CONFIG_BLK_DEV_JMICRON is not set | 527 | # CONFIG_BLK_DEV_JMICRON is not set |
506 | # CONFIG_BLK_DEV_SC1200 is not set | 528 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -517,9 +539,8 @@ CONFIG_IDE_PROC_FS=y | |||
517 | # CONFIG_BLK_DEV_TRM290 is not set | 539 | # CONFIG_BLK_DEV_TRM290 is not set |
518 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 540 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
519 | # CONFIG_BLK_DEV_TC86C001 is not set | 541 | # CONFIG_BLK_DEV_TC86C001 is not set |
542 | # CONFIG_BLK_DEV_IDE_PMAC is not set | ||
520 | # CONFIG_BLK_DEV_IDEDMA is not set | 543 | # CONFIG_BLK_DEV_IDEDMA is not set |
521 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
522 | # CONFIG_BLK_DEV_HD is not set | ||
523 | 544 | ||
524 | # | 545 | # |
525 | # SCSI device support | 546 | # SCSI device support |
@@ -537,13 +558,12 @@ CONFIG_IDE_PROC_FS=y | |||
537 | # | 558 | # |
538 | 559 | ||
539 | # | 560 | # |
540 | # An alternative FireWire stack is available with EXPERIMENTAL=y | 561 | # A new alternative FireWire stack is available with EXPERIMENTAL=y |
541 | # | 562 | # |
542 | # CONFIG_IEEE1394 is not set | 563 | # CONFIG_IEEE1394 is not set |
543 | # CONFIG_I2O is not set | 564 | # CONFIG_I2O is not set |
544 | # CONFIG_MACINTOSH_DRIVERS is not set | 565 | # CONFIG_MACINTOSH_DRIVERS is not set |
545 | CONFIG_NETDEVICES=y | 566 | CONFIG_NETDEVICES=y |
546 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
547 | # CONFIG_DUMMY is not set | 567 | # CONFIG_DUMMY is not set |
548 | # CONFIG_BONDING is not set | 568 | # CONFIG_BONDING is not set |
549 | # CONFIG_EQUALIZER is not set | 569 | # CONFIG_EQUALIZER is not set |
@@ -567,8 +587,11 @@ CONFIG_DAVICOM_PHY=y | |||
567 | # CONFIG_REALTEK_PHY is not set | 587 | # CONFIG_REALTEK_PHY is not set |
568 | # CONFIG_FIXED_PHY is not set | 588 | # CONFIG_FIXED_PHY is not set |
569 | CONFIG_MDIO_BITBANG=y | 589 | CONFIG_MDIO_BITBANG=y |
590 | # CONFIG_MDIO_OF_GPIO is not set | ||
570 | CONFIG_NET_ETHERNET=y | 591 | CONFIG_NET_ETHERNET=y |
571 | CONFIG_MII=y | 592 | CONFIG_MII=y |
593 | # CONFIG_MACE is not set | ||
594 | # CONFIG_BMAC is not set | ||
572 | # CONFIG_HAPPYMEAL is not set | 595 | # CONFIG_HAPPYMEAL is not set |
573 | # CONFIG_SUNGEM is not set | 596 | # CONFIG_SUNGEM is not set |
574 | # CONFIG_CASSINI is not set | 597 | # CONFIG_CASSINI is not set |
@@ -590,7 +613,6 @@ CONFIG_NETDEV_1000=y | |||
590 | # CONFIG_DL2K is not set | 613 | # CONFIG_DL2K is not set |
591 | # CONFIG_E1000 is not set | 614 | # CONFIG_E1000 is not set |
592 | # CONFIG_E1000E is not set | 615 | # CONFIG_E1000E is not set |
593 | # CONFIG_E1000E_ENABLED is not set | ||
594 | # CONFIG_IGB is not set | 616 | # CONFIG_IGB is not set |
595 | # CONFIG_NS83820 is not set | 617 | # CONFIG_NS83820 is not set |
596 | # CONFIG_HAMACHI is not set | 618 | # CONFIG_HAMACHI is not set |
@@ -602,6 +624,7 @@ CONFIG_NETDEV_1000=y | |||
602 | # CONFIG_TIGON3 is not set | 624 | # CONFIG_TIGON3 is not set |
603 | # CONFIG_BNX2 is not set | 625 | # CONFIG_BNX2 is not set |
604 | # CONFIG_GIANFAR is not set | 626 | # CONFIG_GIANFAR is not set |
627 | # CONFIG_MV643XX_ETH is not set | ||
605 | # CONFIG_QLA3XXX is not set | 628 | # CONFIG_QLA3XXX is not set |
606 | CONFIG_NETDEV_10000=y | 629 | CONFIG_NETDEV_10000=y |
607 | # CONFIG_CHELSIO_T1 is not set | 630 | # CONFIG_CHELSIO_T1 is not set |
@@ -667,6 +690,7 @@ CONFIG_KEYBOARD_ATKBD=y | |||
667 | # CONFIG_KEYBOARD_XTKBD is not set | 690 | # CONFIG_KEYBOARD_XTKBD is not set |
668 | # CONFIG_KEYBOARD_NEWTON is not set | 691 | # CONFIG_KEYBOARD_NEWTON is not set |
669 | # CONFIG_KEYBOARD_STOWAWAY is not set | 692 | # CONFIG_KEYBOARD_STOWAWAY is not set |
693 | # CONFIG_KEYBOARD_GPIO is not set | ||
670 | CONFIG_INPUT_MOUSE=y | 694 | CONFIG_INPUT_MOUSE=y |
671 | CONFIG_MOUSE_PS2=y | 695 | CONFIG_MOUSE_PS2=y |
672 | CONFIG_MOUSE_PS2_ALPS=y | 696 | CONFIG_MOUSE_PS2_ALPS=y |
@@ -677,7 +701,9 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
677 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 701 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
678 | # CONFIG_MOUSE_SERIAL is not set | 702 | # CONFIG_MOUSE_SERIAL is not set |
679 | # CONFIG_MOUSE_APPLETOUCH is not set | 703 | # CONFIG_MOUSE_APPLETOUCH is not set |
704 | # CONFIG_MOUSE_BCM5974 is not set | ||
680 | # CONFIG_MOUSE_VSXXXAA is not set | 705 | # CONFIG_MOUSE_VSXXXAA is not set |
706 | # CONFIG_MOUSE_GPIO is not set | ||
681 | # CONFIG_INPUT_JOYSTICK is not set | 707 | # CONFIG_INPUT_JOYSTICK is not set |
682 | # CONFIG_INPUT_TABLET is not set | 708 | # CONFIG_INPUT_TABLET is not set |
683 | # CONFIG_INPUT_TOUCHSCREEN is not set | 709 | # CONFIG_INPUT_TOUCHSCREEN is not set |
@@ -692,6 +718,7 @@ CONFIG_SERIO_SERPORT=y | |||
692 | # CONFIG_SERIO_PCIPS2 is not set | 718 | # CONFIG_SERIO_PCIPS2 is not set |
693 | CONFIG_SERIO_LIBPS2=y | 719 | CONFIG_SERIO_LIBPS2=y |
694 | # CONFIG_SERIO_RAW is not set | 720 | # CONFIG_SERIO_RAW is not set |
721 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
695 | # CONFIG_GAMEPORT is not set | 722 | # CONFIG_GAMEPORT is not set |
696 | 723 | ||
697 | # | 724 | # |
@@ -712,6 +739,7 @@ CONFIG_DEVKMEM=y | |||
712 | # CONFIG_SERIAL_UARTLITE is not set | 739 | # CONFIG_SERIAL_UARTLITE is not set |
713 | CONFIG_SERIAL_CORE=y | 740 | CONFIG_SERIAL_CORE=y |
714 | CONFIG_SERIAL_CORE_CONSOLE=y | 741 | CONFIG_SERIAL_CORE_CONSOLE=y |
742 | # CONFIG_SERIAL_PMACZILOG is not set | ||
715 | CONFIG_SERIAL_CPM=y | 743 | CONFIG_SERIAL_CPM=y |
716 | CONFIG_SERIAL_CPM_CONSOLE=y | 744 | CONFIG_SERIAL_CPM_CONSOLE=y |
717 | CONFIG_SERIAL_CPM_SCC1=y | 745 | CONFIG_SERIAL_CPM_SCC1=y |
@@ -724,6 +752,8 @@ CONFIG_SERIAL_CPM_SCC4=y | |||
724 | CONFIG_UNIX98_PTYS=y | 752 | CONFIG_UNIX98_PTYS=y |
725 | CONFIG_LEGACY_PTYS=y | 753 | CONFIG_LEGACY_PTYS=y |
726 | CONFIG_LEGACY_PTY_COUNT=256 | 754 | CONFIG_LEGACY_PTY_COUNT=256 |
755 | # CONFIG_BRIQ_PANEL is not set | ||
756 | # CONFIG_HVC_RTAS is not set | ||
727 | # CONFIG_IPMI_HANDLER is not set | 757 | # CONFIG_IPMI_HANDLER is not set |
728 | CONFIG_HW_RANDOM=y | 758 | CONFIG_HW_RANDOM=y |
729 | # CONFIG_NVRAM is not set | 759 | # CONFIG_NVRAM is not set |
@@ -734,10 +764,28 @@ CONFIG_HW_RANDOM=y | |||
734 | CONFIG_DEVPORT=y | 764 | CONFIG_DEVPORT=y |
735 | # CONFIG_I2C is not set | 765 | # CONFIG_I2C is not set |
736 | # CONFIG_SPI is not set | 766 | # CONFIG_SPI is not set |
767 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
768 | CONFIG_ARCH_REQUIRE_GPIOLIB=y | ||
769 | CONFIG_GPIOLIB=y | ||
770 | # CONFIG_DEBUG_GPIO is not set | ||
771 | |||
772 | # | ||
773 | # I2C GPIO expanders: | ||
774 | # | ||
775 | |||
776 | # | ||
777 | # PCI GPIO expanders: | ||
778 | # | ||
779 | # CONFIG_GPIO_BT8XX is not set | ||
780 | |||
781 | # | ||
782 | # SPI GPIO expanders: | ||
783 | # | ||
737 | # CONFIG_W1 is not set | 784 | # CONFIG_W1 is not set |
738 | # CONFIG_POWER_SUPPLY is not set | 785 | # CONFIG_POWER_SUPPLY is not set |
739 | # CONFIG_HWMON is not set | 786 | # CONFIG_HWMON is not set |
740 | # CONFIG_THERMAL is not set | 787 | # CONFIG_THERMAL is not set |
788 | # CONFIG_THERMAL_HWMON is not set | ||
741 | # CONFIG_WATCHDOG is not set | 789 | # CONFIG_WATCHDOG is not set |
742 | 790 | ||
743 | # | 791 | # |
@@ -749,8 +797,10 @@ CONFIG_SSB_POSSIBLE=y | |||
749 | # | 797 | # |
750 | # Multifunction device drivers | 798 | # Multifunction device drivers |
751 | # | 799 | # |
800 | # CONFIG_MFD_CORE is not set | ||
752 | # CONFIG_MFD_SM501 is not set | 801 | # CONFIG_MFD_SM501 is not set |
753 | # CONFIG_HTC_PASIC3 is not set | 802 | # CONFIG_HTC_PASIC3 is not set |
803 | # CONFIG_MFD_TMIO is not set | ||
754 | 804 | ||
755 | # | 805 | # |
756 | # Multimedia devices | 806 | # Multimedia devices |
@@ -782,10 +832,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
782 | # Display device support | 832 | # Display device support |
783 | # | 833 | # |
784 | # CONFIG_DISPLAY_SUPPORT is not set | 834 | # CONFIG_DISPLAY_SUPPORT is not set |
785 | |||
786 | # | ||
787 | # Sound | ||
788 | # | ||
789 | # CONFIG_SOUND is not set | 835 | # CONFIG_SOUND is not set |
790 | # CONFIG_HID_SUPPORT is not set | 836 | # CONFIG_HID_SUPPORT is not set |
791 | CONFIG_USB_SUPPORT=y | 837 | CONFIG_USB_SUPPORT=y |
@@ -795,6 +841,8 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
795 | # CONFIG_USB is not set | 841 | # CONFIG_USB is not set |
796 | # CONFIG_USB_OTG_WHITELIST is not set | 842 | # CONFIG_USB_OTG_WHITELIST is not set |
797 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 843 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
844 | # CONFIG_USB_MUSB_HDRC is not set | ||
845 | # CONFIG_USB_GADGET_MUSB_HDRC is not set | ||
798 | 846 | ||
799 | # | 847 | # |
800 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 848 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -807,7 +855,7 @@ CONFIG_USB_GADGET_SELECTED=y | |||
807 | # CONFIG_USB_GADGET_ATMEL_USBA is not set | 855 | # CONFIG_USB_GADGET_ATMEL_USBA is not set |
808 | # CONFIG_USB_GADGET_FSL_USB2 is not set | 856 | # CONFIG_USB_GADGET_FSL_USB2 is not set |
809 | # CONFIG_USB_GADGET_NET2280 is not set | 857 | # CONFIG_USB_GADGET_NET2280 is not set |
810 | # CONFIG_USB_GADGET_PXA2XX is not set | 858 | # CONFIG_USB_GADGET_PXA25X is not set |
811 | CONFIG_USB_GADGET_M66592=y | 859 | CONFIG_USB_GADGET_M66592=y |
812 | CONFIG_USB_M66592=y | 860 | CONFIG_USB_M66592=y |
813 | # CONFIG_USB_GADGET_PXA27X is not set | 861 | # CONFIG_USB_GADGET_PXA27X is not set |
@@ -826,6 +874,7 @@ CONFIG_USB_ETH_RNDIS=y | |||
826 | # CONFIG_USB_G_SERIAL is not set | 874 | # CONFIG_USB_G_SERIAL is not set |
827 | # CONFIG_USB_MIDI_GADGET is not set | 875 | # CONFIG_USB_MIDI_GADGET is not set |
828 | # CONFIG_USB_G_PRINTER is not set | 876 | # CONFIG_USB_G_PRINTER is not set |
877 | # CONFIG_USB_CDC_COMPOSITE is not set | ||
829 | # CONFIG_MMC is not set | 878 | # CONFIG_MMC is not set |
830 | # CONFIG_MEMSTICK is not set | 879 | # CONFIG_MEMSTICK is not set |
831 | # CONFIG_NEW_LEDS is not set | 880 | # CONFIG_NEW_LEDS is not set |
@@ -893,6 +942,7 @@ CONFIG_TMPFS=y | |||
893 | CONFIG_CRAMFS=y | 942 | CONFIG_CRAMFS=y |
894 | # CONFIG_VXFS_FS is not set | 943 | # CONFIG_VXFS_FS is not set |
895 | # CONFIG_MINIX_FS is not set | 944 | # CONFIG_MINIX_FS is not set |
945 | # CONFIG_OMFS_FS is not set | ||
896 | # CONFIG_HPFS_FS is not set | 946 | # CONFIG_HPFS_FS is not set |
897 | # CONFIG_QNX4FS_FS is not set | 947 | # CONFIG_QNX4FS_FS is not set |
898 | # CONFIG_ROMFS_FS is not set | 948 | # CONFIG_ROMFS_FS is not set |
@@ -902,8 +952,8 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
902 | CONFIG_NFS_FS=y | 952 | CONFIG_NFS_FS=y |
903 | CONFIG_NFS_V3=y | 953 | CONFIG_NFS_V3=y |
904 | CONFIG_NFS_V3_ACL=y | 954 | CONFIG_NFS_V3_ACL=y |
905 | # CONFIG_NFSD is not set | ||
906 | CONFIG_ROOT_NFS=y | 955 | CONFIG_ROOT_NFS=y |
956 | # CONFIG_NFSD is not set | ||
907 | CONFIG_LOCKD=y | 957 | CONFIG_LOCKD=y |
908 | CONFIG_LOCKD_V4=y | 958 | CONFIG_LOCKD_V4=y |
909 | CONFIG_NFS_ACL_SUPPORT=y | 959 | CONFIG_NFS_ACL_SUPPORT=y |
@@ -983,6 +1033,7 @@ CONFIG_BITREVERSE=y | |||
983 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1033 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
984 | CONFIG_CRC_CCITT=y | 1034 | CONFIG_CRC_CCITT=y |
985 | # CONFIG_CRC16 is not set | 1035 | # CONFIG_CRC16 is not set |
1036 | # CONFIG_CRC_T10DIF is not set | ||
986 | # CONFIG_CRC_ITU_T is not set | 1037 | # CONFIG_CRC_ITU_T is not set |
987 | CONFIG_CRC32=y | 1038 | CONFIG_CRC32=y |
988 | # CONFIG_CRC7 is not set | 1039 | # CONFIG_CRC7 is not set |
@@ -1009,6 +1060,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1009 | CONFIG_DEBUG_KERNEL=y | 1060 | CONFIG_DEBUG_KERNEL=y |
1010 | # CONFIG_DEBUG_SHIRQ is not set | 1061 | # CONFIG_DEBUG_SHIRQ is not set |
1011 | CONFIG_DETECT_SOFTLOCKUP=y | 1062 | CONFIG_DETECT_SOFTLOCKUP=y |
1063 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1064 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1012 | # CONFIG_SCHED_DEBUG is not set | 1065 | # CONFIG_SCHED_DEBUG is not set |
1013 | # CONFIG_SCHEDSTATS is not set | 1066 | # CONFIG_SCHEDSTATS is not set |
1014 | # CONFIG_TIMER_STATS is not set | 1067 | # CONFIG_TIMER_STATS is not set |
@@ -1026,19 +1079,31 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1026 | CONFIG_DEBUG_INFO=y | 1079 | CONFIG_DEBUG_INFO=y |
1027 | # CONFIG_DEBUG_VM is not set | 1080 | # CONFIG_DEBUG_VM is not set |
1028 | # CONFIG_DEBUG_WRITECOUNT is not set | 1081 | # CONFIG_DEBUG_WRITECOUNT is not set |
1082 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1029 | # CONFIG_DEBUG_LIST is not set | 1083 | # CONFIG_DEBUG_LIST is not set |
1030 | # CONFIG_DEBUG_SG is not set | 1084 | # CONFIG_DEBUG_SG is not set |
1031 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1085 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1086 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1032 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1087 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1033 | # CONFIG_FAULT_INJECTION is not set | 1088 | # CONFIG_FAULT_INJECTION is not set |
1089 | # CONFIG_LATENCYTOP is not set | ||
1090 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1091 | CONFIG_HAVE_FTRACE=y | ||
1092 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1093 | # CONFIG_FTRACE is not set | ||
1094 | # CONFIG_SCHED_TRACER is not set | ||
1095 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1034 | # CONFIG_SAMPLES is not set | 1096 | # CONFIG_SAMPLES is not set |
1097 | CONFIG_HAVE_ARCH_KGDB=y | ||
1035 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1098 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1036 | # CONFIG_DEBUG_STACK_USAGE is not set | 1099 | # CONFIG_DEBUG_STACK_USAGE is not set |
1037 | # CONFIG_DEBUG_PAGEALLOC is not set | 1100 | # CONFIG_DEBUG_PAGEALLOC is not set |
1038 | # CONFIG_DEBUGGER is not set | 1101 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1039 | # CONFIG_KGDB_CONSOLE is not set | 1102 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1103 | # CONFIG_XMON is not set | ||
1040 | # CONFIG_IRQSTACKS is not set | 1104 | # CONFIG_IRQSTACKS is not set |
1041 | CONFIG_BDI_SWITCH=y | 1105 | CONFIG_BDI_SWITCH=y |
1106 | # CONFIG_BOOTX_TEXT is not set | ||
1042 | # CONFIG_PPC_EARLY_DEBUG is not set | 1107 | # CONFIG_PPC_EARLY_DEBUG is not set |
1043 | 1108 | ||
1044 | # | 1109 | # |
@@ -1046,6 +1111,7 @@ CONFIG_BDI_SWITCH=y | |||
1046 | # | 1111 | # |
1047 | # CONFIG_KEYS is not set | 1112 | # CONFIG_KEYS is not set |
1048 | # CONFIG_SECURITY is not set | 1113 | # CONFIG_SECURITY is not set |
1114 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | ||
1049 | CONFIG_CRYPTO=y | 1115 | CONFIG_CRYPTO=y |
1050 | 1116 | ||
1051 | # | 1117 | # |
@@ -1086,6 +1152,10 @@ CONFIG_CRYPTO_PCBC=y | |||
1086 | # CONFIG_CRYPTO_MD4 is not set | 1152 | # CONFIG_CRYPTO_MD4 is not set |
1087 | CONFIG_CRYPTO_MD5=y | 1153 | CONFIG_CRYPTO_MD5=y |
1088 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1154 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1155 | # CONFIG_CRYPTO_RMD128 is not set | ||
1156 | # CONFIG_CRYPTO_RMD160 is not set | ||
1157 | # CONFIG_CRYPTO_RMD256 is not set | ||
1158 | # CONFIG_CRYPTO_RMD320 is not set | ||
1089 | # CONFIG_CRYPTO_SHA1 is not set | 1159 | # CONFIG_CRYPTO_SHA1 is not set |
1090 | # CONFIG_CRYPTO_SHA256 is not set | 1160 | # CONFIG_CRYPTO_SHA256 is not set |
1091 | # CONFIG_CRYPTO_SHA512 is not set | 1161 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -1117,6 +1187,7 @@ CONFIG_CRYPTO_DES=y | |||
1117 | # CONFIG_CRYPTO_LZO is not set | 1187 | # CONFIG_CRYPTO_LZO is not set |
1118 | CONFIG_CRYPTO_HW=y | 1188 | CONFIG_CRYPTO_HW=y |
1119 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1189 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1120 | # CONFIG_PPC_CLOCK is not set | 1190 | # CONFIG_CRYPTO_DEV_TALITOS is not set |
1191 | CONFIG_PPC_CLOCK=y | ||
1121 | CONFIG_PPC_LIB_RHEAP=y | 1192 | CONFIG_PPC_LIB_RHEAP=y |
1122 | # CONFIG_VIRTUALIZATION is not set | 1193 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig index c6b83577c055..01b54eac1ff6 100644 --- a/arch/powerpc/configs/prpmc2800_defconfig +++ b/arch/powerpc/configs/prpmc2800_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:18 2008 | 4 | # Thu Aug 21 00:52:14 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -34,6 +34,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 34 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
35 | CONFIG_IRQ_PER_CPU=y | 35 | CONFIG_IRQ_PER_CPU=y |
36 | CONFIG_STACKTRACE_SUPPORT=y | 36 | CONFIG_STACKTRACE_SUPPORT=y |
37 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
37 | CONFIG_LOCKDEP_SUPPORT=y | 38 | CONFIG_LOCKDEP_SUPPORT=y |
38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 39 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
39 | CONFIG_ARCH_HAS_ILOG2_U32=y | 40 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -94,7 +95,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
94 | CONFIG_SYSCTL=y | 95 | CONFIG_SYSCTL=y |
95 | # CONFIG_EMBEDDED is not set | 96 | # CONFIG_EMBEDDED is not set |
96 | CONFIG_SYSCTL_SYSCALL=y | 97 | CONFIG_SYSCTL_SYSCALL=y |
97 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
98 | CONFIG_KALLSYMS=y | 98 | CONFIG_KALLSYMS=y |
99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 99 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
100 | CONFIG_HOTPLUG=y | 100 | CONFIG_HOTPLUG=y |
@@ -118,10 +118,16 @@ CONFIG_SLUB=y | |||
118 | # CONFIG_PROFILING is not set | 118 | # CONFIG_PROFILING is not set |
119 | # CONFIG_MARKERS is not set | 119 | # CONFIG_MARKERS is not set |
120 | CONFIG_HAVE_OPROFILE=y | 120 | CONFIG_HAVE_OPROFILE=y |
121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
122 | CONFIG_HAVE_IOREMAP_PROT=y | ||
121 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
122 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
123 | # CONFIG_HAVE_DMA_ATTRS is not set | 126 | # CONFIG_HAVE_DMA_ATTRS is not set |
127 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
128 | # CONFIG_HAVE_CLK is not set | ||
124 | CONFIG_PROC_PAGE_MONITOR=y | 129 | CONFIG_PROC_PAGE_MONITOR=y |
130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
125 | CONFIG_SLABINFO=y | 131 | CONFIG_SLABINFO=y |
126 | CONFIG_RT_MUTEXES=y | 132 | CONFIG_RT_MUTEXES=y |
127 | # CONFIG_TINY_SHMEM is not set | 133 | # CONFIG_TINY_SHMEM is not set |
@@ -132,6 +138,7 @@ CONFIG_LBD=y | |||
132 | # CONFIG_BLK_DEV_IO_TRACE is not set | 138 | # CONFIG_BLK_DEV_IO_TRACE is not set |
133 | # CONFIG_LSF is not set | 139 | # CONFIG_LSF is not set |
134 | # CONFIG_BLK_DEV_BSG is not set | 140 | # CONFIG_BLK_DEV_BSG is not set |
141 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
135 | 142 | ||
136 | # | 143 | # |
137 | # IO Schedulers | 144 | # IO Schedulers |
@@ -151,25 +158,25 @@ CONFIG_CLASSIC_RCU=y | |||
151 | # Platform support | 158 | # Platform support |
152 | # | 159 | # |
153 | CONFIG_PPC_MULTIPLATFORM=y | 160 | CONFIG_PPC_MULTIPLATFORM=y |
154 | # CONFIG_PPC_82xx is not set | ||
155 | # CONFIG_PPC_83xx is not set | ||
156 | # CONFIG_PPC_86xx is not set | ||
157 | CONFIG_CLASSIC32=y | 161 | CONFIG_CLASSIC32=y |
158 | # CONFIG_PPC_CHRP is not set | 162 | # CONFIG_PPC_CHRP is not set |
159 | # CONFIG_PPC_MPC512x is not set | ||
160 | # CONFIG_PPC_MPC5121 is not set | ||
161 | # CONFIG_MPC5121_ADS is not set | 163 | # CONFIG_MPC5121_ADS is not set |
164 | # CONFIG_MPC5121_GENERIC is not set | ||
162 | # CONFIG_PPC_MPC52xx is not set | 165 | # CONFIG_PPC_MPC52xx is not set |
163 | # CONFIG_PPC_PMAC is not set | 166 | # CONFIG_PPC_PMAC is not set |
164 | # CONFIG_PPC_CELL is not set | 167 | # CONFIG_PPC_CELL is not set |
165 | # CONFIG_PPC_CELL_NATIVE is not set | 168 | # CONFIG_PPC_CELL_NATIVE is not set |
169 | # CONFIG_PPC_82xx is not set | ||
166 | # CONFIG_PQ2ADS is not set | 170 | # CONFIG_PQ2ADS is not set |
171 | # CONFIG_PPC_83xx is not set | ||
172 | # CONFIG_PPC_86xx is not set | ||
167 | CONFIG_EMBEDDED6xx=y | 173 | CONFIG_EMBEDDED6xx=y |
168 | # CONFIG_LINKSTATION is not set | 174 | # CONFIG_LINKSTATION is not set |
169 | # CONFIG_STORCENTER is not set | 175 | # CONFIG_STORCENTER is not set |
170 | # CONFIG_MPC7448HPC2 is not set | 176 | # CONFIG_MPC7448HPC2 is not set |
171 | # CONFIG_PPC_HOLLY is not set | 177 | # CONFIG_PPC_HOLLY is not set |
172 | CONFIG_PPC_PRPMC2800=y | 178 | CONFIG_PPC_PRPMC2800=y |
179 | # CONFIG_PPC_C2K is not set | ||
173 | CONFIG_MV64X60=y | 180 | CONFIG_MV64X60=y |
174 | # CONFIG_IPIC is not set | 181 | # CONFIG_IPIC is not set |
175 | # CONFIG_MPIC is not set | 182 | # CONFIG_MPIC is not set |
@@ -198,7 +205,7 @@ CONFIG_HZ_250=y | |||
198 | # CONFIG_HZ_300 is not set | 205 | # CONFIG_HZ_300 is not set |
199 | # CONFIG_HZ_1000 is not set | 206 | # CONFIG_HZ_1000 is not set |
200 | CONFIG_HZ=250 | 207 | CONFIG_HZ=250 |
201 | # CONFIG_SCHED_HRTICK is not set | 208 | CONFIG_SCHED_HRTICK=y |
202 | CONFIG_PREEMPT_NONE=y | 209 | CONFIG_PREEMPT_NONE=y |
203 | # CONFIG_PREEMPT_VOLUNTARY is not set | 210 | # CONFIG_PREEMPT_VOLUNTARY is not set |
204 | # CONFIG_PREEMPT is not set | 211 | # CONFIG_PREEMPT is not set |
@@ -221,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
222 | CONFIG_PAGEFLAGS_EXTENDED=y | 229 | CONFIG_PAGEFLAGS_EXTENDED=y |
223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
231 | CONFIG_MIGRATION=y | ||
224 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
225 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
226 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
@@ -228,6 +236,7 @@ CONFIG_VIRT_TO_BUS=y | |||
228 | CONFIG_FORCE_MAX_ZONEORDER=11 | 236 | CONFIG_FORCE_MAX_ZONEORDER=11 |
229 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
230 | # CONFIG_CMDLINE_BOOL is not set | 238 | # CONFIG_CMDLINE_BOOL is not set |
239 | CONFIG_EXTRA_TARGETS="" | ||
231 | # CONFIG_PM is not set | 240 | # CONFIG_PM is not set |
232 | # CONFIG_SECCOMP is not set | 241 | # CONFIG_SECCOMP is not set |
233 | CONFIG_ISA_DMA_API=y | 242 | CONFIG_ISA_DMA_API=y |
@@ -264,10 +273,6 @@ CONFIG_PHYSICAL_START=0x00000000 | |||
264 | CONFIG_TASK_SIZE=0xc0000000 | 273 | CONFIG_TASK_SIZE=0xc0000000 |
265 | CONFIG_CONSISTENT_START=0xff100000 | 274 | CONFIG_CONSISTENT_START=0xff100000 |
266 | CONFIG_CONSISTENT_SIZE=0x00200000 | 275 | CONFIG_CONSISTENT_SIZE=0x00200000 |
267 | |||
268 | # | ||
269 | # Networking | ||
270 | # | ||
271 | CONFIG_NET=y | 276 | CONFIG_NET=y |
272 | 277 | ||
273 | # | 278 | # |
@@ -359,7 +364,9 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
359 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 364 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
360 | CONFIG_STANDALONE=y | 365 | CONFIG_STANDALONE=y |
361 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 366 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
362 | # CONFIG_FW_LOADER is not set | 367 | CONFIG_FW_LOADER=y |
368 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
369 | CONFIG_EXTRA_FIRMWARE="" | ||
363 | # CONFIG_SYS_HYPERVISOR is not set | 370 | # CONFIG_SYS_HYPERVISOR is not set |
364 | # CONFIG_CONNECTOR is not set | 371 | # CONFIG_CONNECTOR is not set |
365 | CONFIG_MTD=y | 372 | CONFIG_MTD=y |
@@ -461,12 +468,14 @@ CONFIG_BLK_DEV_RAM_SIZE=131072 | |||
461 | # CONFIG_BLK_DEV_XIP is not set | 468 | # CONFIG_BLK_DEV_XIP is not set |
462 | # CONFIG_CDROM_PKTCDVD is not set | 469 | # CONFIG_CDROM_PKTCDVD is not set |
463 | # CONFIG_ATA_OVER_ETH is not set | 470 | # CONFIG_ATA_OVER_ETH is not set |
471 | # CONFIG_BLK_DEV_HD is not set | ||
464 | CONFIG_MISC_DEVICES=y | 472 | CONFIG_MISC_DEVICES=y |
465 | # CONFIG_PHANTOM is not set | 473 | # CONFIG_PHANTOM is not set |
466 | # CONFIG_EEPROM_93CX6 is not set | 474 | # CONFIG_EEPROM_93CX6 is not set |
467 | # CONFIG_SGI_IOC4 is not set | 475 | # CONFIG_SGI_IOC4 is not set |
468 | # CONFIG_TIFM_CORE is not set | 476 | # CONFIG_TIFM_CORE is not set |
469 | # CONFIG_ENCLOSURE_SERVICES is not set | 477 | # CONFIG_ENCLOSURE_SERVICES is not set |
478 | # CONFIG_HP_ILO is not set | ||
470 | CONFIG_HAVE_IDE=y | 479 | CONFIG_HAVE_IDE=y |
471 | CONFIG_IDE=y | 480 | CONFIG_IDE=y |
472 | CONFIG_BLK_DEV_IDE=y | 481 | CONFIG_BLK_DEV_IDE=y |
@@ -487,7 +496,6 @@ CONFIG_IDE_PROC_FS=y | |||
487 | # | 496 | # |
488 | # IDE chipset support/bugfixes | 497 | # IDE chipset support/bugfixes |
489 | # | 498 | # |
490 | CONFIG_IDE_GENERIC=y | ||
491 | # CONFIG_BLK_DEV_PLATFORM is not set | 499 | # CONFIG_BLK_DEV_PLATFORM is not set |
492 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 500 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
493 | 501 | ||
@@ -505,10 +513,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
505 | # CONFIG_BLK_DEV_AMD74XX is not set | 513 | # CONFIG_BLK_DEV_AMD74XX is not set |
506 | # CONFIG_BLK_DEV_CMD64X is not set | 514 | # CONFIG_BLK_DEV_CMD64X is not set |
507 | # CONFIG_BLK_DEV_TRIFLEX is not set | 515 | # CONFIG_BLK_DEV_TRIFLEX is not set |
508 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
509 | # CONFIG_BLK_DEV_CS5520 is not set | 516 | # CONFIG_BLK_DEV_CS5520 is not set |
510 | # CONFIG_BLK_DEV_CS5530 is not set | 517 | # CONFIG_BLK_DEV_CS5530 is not set |
511 | # CONFIG_BLK_DEV_HPT34X is not set | ||
512 | # CONFIG_BLK_DEV_HPT366 is not set | 518 | # CONFIG_BLK_DEV_HPT366 is not set |
513 | # CONFIG_BLK_DEV_JMICRON is not set | 519 | # CONFIG_BLK_DEV_JMICRON is not set |
514 | # CONFIG_BLK_DEV_SC1200 is not set | 520 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -526,8 +532,6 @@ CONFIG_BLK_DEV_PDC202XX_NEW=y | |||
526 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 532 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
527 | # CONFIG_BLK_DEV_TC86C001 is not set | 533 | # CONFIG_BLK_DEV_TC86C001 is not set |
528 | CONFIG_BLK_DEV_IDEDMA=y | 534 | CONFIG_BLK_DEV_IDEDMA=y |
529 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
530 | # CONFIG_BLK_DEV_HD is not set | ||
531 | 535 | ||
532 | # | 536 | # |
533 | # SCSI device support | 537 | # SCSI device support |
@@ -603,6 +607,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
603 | # CONFIG_SCSI_NSP32 is not set | 607 | # CONFIG_SCSI_NSP32 is not set |
604 | # CONFIG_SCSI_DEBUG is not set | 608 | # CONFIG_SCSI_DEBUG is not set |
605 | # CONFIG_SCSI_SRP is not set | 609 | # CONFIG_SCSI_SRP is not set |
610 | # CONFIG_SCSI_DH is not set | ||
606 | CONFIG_ATA=y | 611 | CONFIG_ATA=y |
607 | # CONFIG_ATA_NONSTANDARD is not set | 612 | # CONFIG_ATA_NONSTANDARD is not set |
608 | CONFIG_SATA_PMP=y | 613 | CONFIG_SATA_PMP=y |
@@ -669,6 +674,10 @@ CONFIG_SATA_MV=y | |||
669 | # | 674 | # |
670 | # IEEE 1394 (FireWire) support | 675 | # IEEE 1394 (FireWire) support |
671 | # | 676 | # |
677 | |||
678 | # | ||
679 | # Enable only one of the two stacks, unless you know what you are doing | ||
680 | # | ||
672 | # CONFIG_FIREWIRE is not set | 681 | # CONFIG_FIREWIRE is not set |
673 | # CONFIG_IEEE1394 is not set | 682 | # CONFIG_IEEE1394 is not set |
674 | # CONFIG_I2O is not set | 683 | # CONFIG_I2O is not set |
@@ -676,7 +685,6 @@ CONFIG_MACINTOSH_DRIVERS=y | |||
676 | # CONFIG_MAC_EMUMOUSEBTN is not set | 685 | # CONFIG_MAC_EMUMOUSEBTN is not set |
677 | # CONFIG_WINDFARM is not set | 686 | # CONFIG_WINDFARM is not set |
678 | CONFIG_NETDEVICES=y | 687 | CONFIG_NETDEVICES=y |
679 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
680 | # CONFIG_DUMMY is not set | 688 | # CONFIG_DUMMY is not set |
681 | # CONFIG_BONDING is not set | 689 | # CONFIG_BONDING is not set |
682 | # CONFIG_MACVLAN is not set | 690 | # CONFIG_MACVLAN is not set |
@@ -741,10 +749,8 @@ CONFIG_NETDEV_1000=y | |||
741 | # CONFIG_ACENIC is not set | 749 | # CONFIG_ACENIC is not set |
742 | # CONFIG_DL2K is not set | 750 | # CONFIG_DL2K is not set |
743 | CONFIG_E1000=y | 751 | CONFIG_E1000=y |
744 | # CONFIG_E1000_NAPI is not set | ||
745 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 752 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
746 | # CONFIG_E1000E is not set | 753 | # CONFIG_E1000E is not set |
747 | # CONFIG_E1000E_ENABLED is not set | ||
748 | # CONFIG_IP1000 is not set | 754 | # CONFIG_IP1000 is not set |
749 | # CONFIG_IGB is not set | 755 | # CONFIG_IGB is not set |
750 | # CONFIG_NS83820 is not set | 756 | # CONFIG_NS83820 is not set |
@@ -760,6 +766,7 @@ CONFIG_E1000=y | |||
760 | CONFIG_MV643XX_ETH=y | 766 | CONFIG_MV643XX_ETH=y |
761 | # CONFIG_QLA3XXX is not set | 767 | # CONFIG_QLA3XXX is not set |
762 | # CONFIG_ATL1 is not set | 768 | # CONFIG_ATL1 is not set |
769 | # CONFIG_ATL1E is not set | ||
763 | CONFIG_NETDEV_10000=y | 770 | CONFIG_NETDEV_10000=y |
764 | # CONFIG_CHELSIO_T1 is not set | 771 | # CONFIG_CHELSIO_T1 is not set |
765 | # CONFIG_CHELSIO_T3 is not set | 772 | # CONFIG_CHELSIO_T3 is not set |
@@ -840,6 +847,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
840 | # Character devices | 847 | # Character devices |
841 | # | 848 | # |
842 | CONFIG_VT=y | 849 | CONFIG_VT=y |
850 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
843 | CONFIG_VT_CONSOLE=y | 851 | CONFIG_VT_CONSOLE=y |
844 | CONFIG_HW_CONSOLE=y | 852 | CONFIG_HW_CONSOLE=y |
845 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 853 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -875,43 +883,64 @@ CONFIG_DEVPORT=y | |||
875 | CONFIG_I2C=y | 883 | CONFIG_I2C=y |
876 | CONFIG_I2C_BOARDINFO=y | 884 | CONFIG_I2C_BOARDINFO=y |
877 | CONFIG_I2C_CHARDEV=y | 885 | CONFIG_I2C_CHARDEV=y |
886 | CONFIG_I2C_HELPER_AUTO=y | ||
878 | 887 | ||
879 | # | 888 | # |
880 | # I2C Hardware Bus support | 889 | # I2C Hardware Bus support |
881 | # | 890 | # |
891 | |||
892 | # | ||
893 | # PC SMBus host controller drivers | ||
894 | # | ||
882 | # CONFIG_I2C_ALI1535 is not set | 895 | # CONFIG_I2C_ALI1535 is not set |
883 | # CONFIG_I2C_ALI1563 is not set | 896 | # CONFIG_I2C_ALI1563 is not set |
884 | # CONFIG_I2C_ALI15X3 is not set | 897 | # CONFIG_I2C_ALI15X3 is not set |
885 | # CONFIG_I2C_AMD756 is not set | 898 | # CONFIG_I2C_AMD756 is not set |
886 | # CONFIG_I2C_AMD8111 is not set | 899 | # CONFIG_I2C_AMD8111 is not set |
887 | # CONFIG_I2C_I801 is not set | 900 | # CONFIG_I2C_I801 is not set |
888 | # CONFIG_I2C_I810 is not set | 901 | # CONFIG_I2C_ISCH is not set |
889 | # CONFIG_I2C_PIIX4 is not set | 902 | # CONFIG_I2C_PIIX4 is not set |
890 | # CONFIG_I2C_MPC is not set | ||
891 | # CONFIG_I2C_NFORCE2 is not set | 903 | # CONFIG_I2C_NFORCE2 is not set |
892 | # CONFIG_I2C_OCORES is not set | ||
893 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
894 | # CONFIG_I2C_PROSAVAGE is not set | ||
895 | # CONFIG_I2C_SAVAGE4 is not set | ||
896 | # CONFIG_I2C_SIMTEC is not set | ||
897 | # CONFIG_I2C_SIS5595 is not set | 904 | # CONFIG_I2C_SIS5595 is not set |
898 | # CONFIG_I2C_SIS630 is not set | 905 | # CONFIG_I2C_SIS630 is not set |
899 | # CONFIG_I2C_SIS96X is not set | 906 | # CONFIG_I2C_SIS96X is not set |
900 | # CONFIG_I2C_TAOS_EVM is not set | ||
901 | # CONFIG_I2C_TINY_USB is not set | ||
902 | # CONFIG_I2C_VIA is not set | 907 | # CONFIG_I2C_VIA is not set |
903 | # CONFIG_I2C_VIAPRO is not set | 908 | # CONFIG_I2C_VIAPRO is not set |
909 | |||
910 | # | ||
911 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
912 | # | ||
913 | # CONFIG_I2C_MPC is not set | ||
914 | CONFIG_I2C_MV64XXX=y | ||
915 | # CONFIG_I2C_OCORES is not set | ||
916 | # CONFIG_I2C_SIMTEC is not set | ||
917 | |||
918 | # | ||
919 | # External I2C/SMBus adapter drivers | ||
920 | # | ||
921 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
922 | # CONFIG_I2C_TAOS_EVM is not set | ||
923 | # CONFIG_I2C_TINY_USB is not set | ||
924 | |||
925 | # | ||
926 | # Graphics adapter I2C/DDC channel drivers | ||
927 | # | ||
904 | # CONFIG_I2C_VOODOO3 is not set | 928 | # CONFIG_I2C_VOODOO3 is not set |
929 | |||
930 | # | ||
931 | # Other I2C/SMBus bus drivers | ||
932 | # | ||
905 | # CONFIG_I2C_PCA_PLATFORM is not set | 933 | # CONFIG_I2C_PCA_PLATFORM is not set |
906 | CONFIG_I2C_MV64XXX=y | ||
907 | 934 | ||
908 | # | 935 | # |
909 | # Miscellaneous I2C Chip support | 936 | # Miscellaneous I2C Chip support |
910 | # | 937 | # |
911 | # CONFIG_DS1682 is not set | 938 | # CONFIG_DS1682 is not set |
939 | # CONFIG_AT24 is not set | ||
912 | # CONFIG_SENSORS_EEPROM is not set | 940 | # CONFIG_SENSORS_EEPROM is not set |
913 | # CONFIG_SENSORS_PCF8574 is not set | 941 | # CONFIG_SENSORS_PCF8574 is not set |
914 | # CONFIG_PCF8575 is not set | 942 | # CONFIG_PCF8575 is not set |
943 | # CONFIG_SENSORS_PCA9539 is not set | ||
915 | # CONFIG_SENSORS_PCF8591 is not set | 944 | # CONFIG_SENSORS_PCF8591 is not set |
916 | # CONFIG_SENSORS_MAX6875 is not set | 945 | # CONFIG_SENSORS_MAX6875 is not set |
917 | # CONFIG_SENSORS_TSL2550 is not set | 946 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -920,10 +949,13 @@ CONFIG_I2C_MV64XXX=y | |||
920 | # CONFIG_I2C_DEBUG_BUS is not set | 949 | # CONFIG_I2C_DEBUG_BUS is not set |
921 | # CONFIG_I2C_DEBUG_CHIP is not set | 950 | # CONFIG_I2C_DEBUG_CHIP is not set |
922 | # CONFIG_SPI is not set | 951 | # CONFIG_SPI is not set |
952 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
953 | # CONFIG_GPIOLIB is not set | ||
923 | # CONFIG_W1 is not set | 954 | # CONFIG_W1 is not set |
924 | # CONFIG_POWER_SUPPLY is not set | 955 | # CONFIG_POWER_SUPPLY is not set |
925 | CONFIG_HWMON=y | 956 | CONFIG_HWMON=y |
926 | # CONFIG_HWMON_VID is not set | 957 | # CONFIG_HWMON_VID is not set |
958 | # CONFIG_SENSORS_AD7414 is not set | ||
927 | # CONFIG_SENSORS_AD7418 is not set | 959 | # CONFIG_SENSORS_AD7418 is not set |
928 | # CONFIG_SENSORS_ADM1021 is not set | 960 | # CONFIG_SENSORS_ADM1021 is not set |
929 | # CONFIG_SENSORS_ADM1025 is not set | 961 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -977,6 +1009,7 @@ CONFIG_HWMON=y | |||
977 | # CONFIG_SENSORS_W83627EHF is not set | 1009 | # CONFIG_SENSORS_W83627EHF is not set |
978 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1010 | # CONFIG_HWMON_DEBUG_CHIP is not set |
979 | # CONFIG_THERMAL is not set | 1011 | # CONFIG_THERMAL is not set |
1012 | # CONFIG_THERMAL_HWMON is not set | ||
980 | # CONFIG_WATCHDOG is not set | 1013 | # CONFIG_WATCHDOG is not set |
981 | 1014 | ||
982 | # | 1015 | # |
@@ -988,8 +1021,10 @@ CONFIG_SSB_POSSIBLE=y | |||
988 | # | 1021 | # |
989 | # Multifunction device drivers | 1022 | # Multifunction device drivers |
990 | # | 1023 | # |
1024 | # CONFIG_MFD_CORE is not set | ||
991 | # CONFIG_MFD_SM501 is not set | 1025 | # CONFIG_MFD_SM501 is not set |
992 | # CONFIG_HTC_PASIC3 is not set | 1026 | # CONFIG_HTC_PASIC3 is not set |
1027 | # CONFIG_MFD_TMIO is not set | ||
993 | 1028 | ||
994 | # | 1029 | # |
995 | # Multimedia devices | 1030 | # Multimedia devices |
@@ -1028,10 +1063,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y | |||
1028 | CONFIG_VGA_CONSOLE=y | 1063 | CONFIG_VGA_CONSOLE=y |
1029 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1064 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
1030 | CONFIG_DUMMY_CONSOLE=y | 1065 | CONFIG_DUMMY_CONSOLE=y |
1031 | |||
1032 | # | ||
1033 | # Sound | ||
1034 | # | ||
1035 | # CONFIG_SOUND is not set | 1066 | # CONFIG_SOUND is not set |
1036 | CONFIG_HID_SUPPORT=y | 1067 | CONFIG_HID_SUPPORT=y |
1037 | CONFIG_HID=y | 1068 | CONFIG_HID=y |
@@ -1060,6 +1091,7 @@ CONFIG_USB_DEVICEFS=y | |||
1060 | # CONFIG_USB_DEVICE_CLASS is not set | 1091 | # CONFIG_USB_DEVICE_CLASS is not set |
1061 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1092 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1062 | # CONFIG_USB_OTG is not set | 1093 | # CONFIG_USB_OTG is not set |
1094 | CONFIG_USB_MON=y | ||
1063 | 1095 | ||
1064 | # | 1096 | # |
1065 | # USB Host Controller Drivers | 1097 | # USB Host Controller Drivers |
@@ -1102,7 +1134,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1102 | # | 1134 | # |
1103 | # CONFIG_USB_MDC800 is not set | 1135 | # CONFIG_USB_MDC800 is not set |
1104 | # CONFIG_USB_MICROTEK is not set | 1136 | # CONFIG_USB_MICROTEK is not set |
1105 | CONFIG_USB_MON=y | ||
1106 | 1137 | ||
1107 | # | 1138 | # |
1108 | # USB port drivers | 1139 | # USB port drivers |
@@ -1115,7 +1146,6 @@ CONFIG_USB_MON=y | |||
1115 | # CONFIG_USB_EMI62 is not set | 1146 | # CONFIG_USB_EMI62 is not set |
1116 | # CONFIG_USB_EMI26 is not set | 1147 | # CONFIG_USB_EMI26 is not set |
1117 | # CONFIG_USB_ADUTUX is not set | 1148 | # CONFIG_USB_ADUTUX is not set |
1118 | # CONFIG_USB_AUERSWALD is not set | ||
1119 | # CONFIG_USB_RIO500 is not set | 1149 | # CONFIG_USB_RIO500 is not set |
1120 | # CONFIG_USB_LEGOTOWER is not set | 1150 | # CONFIG_USB_LEGOTOWER is not set |
1121 | # CONFIG_USB_LCD is not set | 1151 | # CONFIG_USB_LCD is not set |
@@ -1169,6 +1199,7 @@ CONFIG_RTC_DRV_MAX6900=y | |||
1169 | # CONFIG_RTC_DRV_PCF8583 is not set | 1199 | # CONFIG_RTC_DRV_PCF8583 is not set |
1170 | # CONFIG_RTC_DRV_M41T80 is not set | 1200 | # CONFIG_RTC_DRV_M41T80 is not set |
1171 | # CONFIG_RTC_DRV_S35390A is not set | 1201 | # CONFIG_RTC_DRV_S35390A is not set |
1202 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1172 | 1203 | ||
1173 | # | 1204 | # |
1174 | # SPI RTC drivers | 1205 | # SPI RTC drivers |
@@ -1258,6 +1289,7 @@ CONFIG_TMPFS=y | |||
1258 | # CONFIG_CRAMFS is not set | 1289 | # CONFIG_CRAMFS is not set |
1259 | # CONFIG_VXFS_FS is not set | 1290 | # CONFIG_VXFS_FS is not set |
1260 | # CONFIG_MINIX_FS is not set | 1291 | # CONFIG_MINIX_FS is not set |
1292 | # CONFIG_OMFS_FS is not set | ||
1261 | # CONFIG_HPFS_FS is not set | 1293 | # CONFIG_HPFS_FS is not set |
1262 | # CONFIG_QNX4FS_FS is not set | 1294 | # CONFIG_QNX4FS_FS is not set |
1263 | # CONFIG_ROMFS_FS is not set | 1295 | # CONFIG_ROMFS_FS is not set |
@@ -1267,12 +1299,11 @@ CONFIG_NETWORK_FILESYSTEMS=y | |||
1267 | CONFIG_NFS_FS=y | 1299 | CONFIG_NFS_FS=y |
1268 | # CONFIG_NFS_V3 is not set | 1300 | # CONFIG_NFS_V3 is not set |
1269 | # CONFIG_NFS_V4 is not set | 1301 | # CONFIG_NFS_V4 is not set |
1270 | # CONFIG_NFSD is not set | ||
1271 | CONFIG_ROOT_NFS=y | 1302 | CONFIG_ROOT_NFS=y |
1303 | # CONFIG_NFSD is not set | ||
1272 | CONFIG_LOCKD=y | 1304 | CONFIG_LOCKD=y |
1273 | CONFIG_NFS_COMMON=y | 1305 | CONFIG_NFS_COMMON=y |
1274 | CONFIG_SUNRPC=y | 1306 | CONFIG_SUNRPC=y |
1275 | # CONFIG_SUNRPC_BIND34 is not set | ||
1276 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1307 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
1277 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1308 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1278 | # CONFIG_SMB_FS is not set | 1309 | # CONFIG_SMB_FS is not set |
@@ -1312,6 +1343,7 @@ CONFIG_BITREVERSE=y | |||
1312 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1343 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1313 | # CONFIG_CRC_CCITT is not set | 1344 | # CONFIG_CRC_CCITT is not set |
1314 | # CONFIG_CRC16 is not set | 1345 | # CONFIG_CRC16 is not set |
1346 | CONFIG_CRC_T10DIF=y | ||
1315 | # CONFIG_CRC_ITU_T is not set | 1347 | # CONFIG_CRC_ITU_T is not set |
1316 | CONFIG_CRC32=y | 1348 | CONFIG_CRC32=y |
1317 | # CONFIG_CRC7 is not set | 1349 | # CONFIG_CRC7 is not set |
@@ -1337,7 +1369,16 @@ CONFIG_FRAME_WARN=1024 | |||
1337 | # CONFIG_SLUB_DEBUG_ON is not set | 1369 | # CONFIG_SLUB_DEBUG_ON is not set |
1338 | # CONFIG_SLUB_STATS is not set | 1370 | # CONFIG_SLUB_STATS is not set |
1339 | CONFIG_DEBUG_BUGVERBOSE=y | 1371 | CONFIG_DEBUG_BUGVERBOSE=y |
1372 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1373 | # CONFIG_LATENCYTOP is not set | ||
1374 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1375 | CONFIG_HAVE_FTRACE=y | ||
1376 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1377 | # CONFIG_FTRACE is not set | ||
1378 | # CONFIG_SCHED_TRACER is not set | ||
1379 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1340 | # CONFIG_SAMPLES is not set | 1380 | # CONFIG_SAMPLES is not set |
1381 | CONFIG_HAVE_ARCH_KGDB=y | ||
1341 | # CONFIG_IRQSTACKS is not set | 1382 | # CONFIG_IRQSTACKS is not set |
1342 | # CONFIG_BOOTX_TEXT is not set | 1383 | # CONFIG_BOOTX_TEXT is not set |
1343 | # CONFIG_PPC_EARLY_DEBUG is not set | 1384 | # CONFIG_PPC_EARLY_DEBUG is not set |
@@ -1390,6 +1431,10 @@ CONFIG_CRYPTO=y | |||
1390 | # CONFIG_CRYPTO_MD4 is not set | 1431 | # CONFIG_CRYPTO_MD4 is not set |
1391 | # CONFIG_CRYPTO_MD5 is not set | 1432 | # CONFIG_CRYPTO_MD5 is not set |
1392 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1433 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1434 | # CONFIG_CRYPTO_RMD128 is not set | ||
1435 | # CONFIG_CRYPTO_RMD160 is not set | ||
1436 | # CONFIG_CRYPTO_RMD256 is not set | ||
1437 | # CONFIG_CRYPTO_RMD320 is not set | ||
1393 | # CONFIG_CRYPTO_SHA1 is not set | 1438 | # CONFIG_CRYPTO_SHA1 is not set |
1394 | # CONFIG_CRYPTO_SHA256 is not set | 1439 | # CONFIG_CRYPTO_SHA256 is not set |
1395 | # CONFIG_CRYPTO_SHA512 is not set | 1440 | # CONFIG_CRYPTO_SHA512 is not set |
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index f9a3d3b394cf..b6eee7c93cdd 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26 | 3 | # Linux kernel version: 2.6.27-rc3 |
4 | # Wed Jul 16 13:59:24 2008 | 4 | # Wed Aug 20 08:16:53 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -92,7 +92,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
92 | CONFIG_SYSCTL=y | 92 | CONFIG_SYSCTL=y |
93 | # CONFIG_EMBEDDED is not set | 93 | # CONFIG_EMBEDDED is not set |
94 | CONFIG_SYSCTL_SYSCALL=y | 94 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
96 | CONFIG_KALLSYMS=y | 95 | CONFIG_KALLSYMS=y |
97 | CONFIG_KALLSYMS_ALL=y | 96 | CONFIG_KALLSYMS_ALL=y |
98 | CONFIG_KALLSYMS_EXTRA_PASS=y | 97 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -118,11 +117,16 @@ CONFIG_PROFILING=y | |||
118 | CONFIG_OPROFILE=m | 117 | CONFIG_OPROFILE=m |
119 | CONFIG_HAVE_OPROFILE=y | 118 | CONFIG_HAVE_OPROFILE=y |
120 | # CONFIG_KPROBES is not set | 119 | # CONFIG_KPROBES is not set |
120 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
121 | CONFIG_HAVE_IOREMAP_PROT=y | ||
121 | CONFIG_HAVE_KPROBES=y | 122 | CONFIG_HAVE_KPROBES=y |
122 | CONFIG_HAVE_KRETPROBES=y | 123 | CONFIG_HAVE_KRETPROBES=y |
124 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
123 | CONFIG_HAVE_DMA_ATTRS=y | 125 | CONFIG_HAVE_DMA_ATTRS=y |
124 | CONFIG_USE_GENERIC_SMP_HELPERS=y | 126 | CONFIG_USE_GENERIC_SMP_HELPERS=y |
127 | # CONFIG_HAVE_CLK is not set | ||
125 | CONFIG_PROC_PAGE_MONITOR=y | 128 | CONFIG_PROC_PAGE_MONITOR=y |
129 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
126 | CONFIG_SLABINFO=y | 130 | CONFIG_SLABINFO=y |
127 | CONFIG_RT_MUTEXES=y | 131 | CONFIG_RT_MUTEXES=y |
128 | # CONFIG_TINY_SHMEM is not set | 132 | # CONFIG_TINY_SHMEM is not set |
@@ -179,6 +183,7 @@ CONFIG_PS3_STORAGE=y | |||
179 | CONFIG_PS3_DISK=y | 183 | CONFIG_PS3_DISK=y |
180 | CONFIG_PS3_ROM=y | 184 | CONFIG_PS3_ROM=y |
181 | CONFIG_PS3_FLASH=y | 185 | CONFIG_PS3_FLASH=y |
186 | CONFIG_OPROFILE_PS3=y | ||
182 | CONFIG_PS3_LPM=m | 187 | CONFIG_PS3_LPM=m |
183 | CONFIG_PPC_CELL=y | 188 | CONFIG_PPC_CELL=y |
184 | # CONFIG_PPC_CELL_NATIVE is not set | 189 | # CONFIG_PPC_CELL_NATIVE is not set |
@@ -218,7 +223,7 @@ CONFIG_HZ_250=y | |||
218 | # CONFIG_HZ_300 is not set | 223 | # CONFIG_HZ_300 is not set |
219 | # CONFIG_HZ_1000 is not set | 224 | # CONFIG_HZ_1000 is not set |
220 | CONFIG_HZ=250 | 225 | CONFIG_HZ=250 |
221 | # CONFIG_SCHED_HRTICK is not set | 226 | CONFIG_SCHED_HRTICK=y |
222 | CONFIG_PREEMPT_NONE=y | 227 | CONFIG_PREEMPT_NONE=y |
223 | # CONFIG_PREEMPT_VOLUNTARY is not set | 228 | # CONFIG_PREEMPT_VOLUNTARY is not set |
224 | # CONFIG_PREEMPT is not set | 229 | # CONFIG_PREEMPT is not set |
@@ -252,8 +257,10 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | |||
252 | # CONFIG_SPARSEMEM_VMEMMAP is not set | 257 | # CONFIG_SPARSEMEM_VMEMMAP is not set |
253 | CONFIG_MEMORY_HOTPLUG=y | 258 | CONFIG_MEMORY_HOTPLUG=y |
254 | CONFIG_MEMORY_HOTPLUG_SPARSE=y | 259 | CONFIG_MEMORY_HOTPLUG_SPARSE=y |
260 | # CONFIG_MEMORY_HOTREMOVE is not set | ||
255 | CONFIG_PAGEFLAGS_EXTENDED=y | 261 | CONFIG_PAGEFLAGS_EXTENDED=y |
256 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 262 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
263 | CONFIG_MIGRATION=y | ||
257 | CONFIG_RESOURCES_64BIT=y | 264 | CONFIG_RESOURCES_64BIT=y |
258 | CONFIG_ZONE_DMA_FLAG=1 | 265 | CONFIG_ZONE_DMA_FLAG=1 |
259 | CONFIG_BOUNCE=y | 266 | CONFIG_BOUNCE=y |
@@ -276,19 +283,17 @@ CONFIG_ISA_DMA_API=y | |||
276 | # | 283 | # |
277 | CONFIG_ZONE_DMA=y | 284 | CONFIG_ZONE_DMA=y |
278 | CONFIG_GENERIC_ISA_DMA=y | 285 | CONFIG_GENERIC_ISA_DMA=y |
286 | CONFIG_PPC_PCI_CHOICE=y | ||
279 | # CONFIG_PCI is not set | 287 | # CONFIG_PCI is not set |
280 | # CONFIG_PCI_DOMAINS is not set | 288 | # CONFIG_PCI_DOMAINS is not set |
281 | # CONFIG_PCI_SYSCALL is not set | 289 | # CONFIG_PCI_SYSCALL is not set |
282 | # CONFIG_ARCH_SUPPORTS_MSI is not set | 290 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
283 | # CONFIG_PCCARD is not set | 291 | # CONFIG_PCCARD is not set |
284 | # CONFIG_HAS_RAPIDIO is not set | 292 | # CONFIG_HAS_RAPIDIO is not set |
293 | # CONFIG_RELOCATABLE is not set | ||
285 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 294 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
286 | CONFIG_KERNEL_START=0xc000000000000000 | 295 | CONFIG_KERNEL_START=0xc000000000000000 |
287 | CONFIG_PHYSICAL_START=0x00000000 | 296 | CONFIG_PHYSICAL_START=0x00000000 |
288 | |||
289 | # | ||
290 | # Networking | ||
291 | # | ||
292 | CONFIG_NET=y | 297 | CONFIG_NET=y |
293 | 298 | ||
294 | # | 299 | # |
@@ -399,9 +404,22 @@ CONFIG_BT_HCIUSB_SCO=y | |||
399 | # | 404 | # |
400 | # Wireless | 405 | # Wireless |
401 | # | 406 | # |
402 | # CONFIG_CFG80211 is not set | 407 | CONFIG_CFG80211=m |
408 | CONFIG_NL80211=y | ||
403 | CONFIG_WIRELESS_EXT=y | 409 | CONFIG_WIRELESS_EXT=y |
404 | # CONFIG_MAC80211 is not set | 410 | # CONFIG_WIRELESS_EXT_SYSFS is not set |
411 | CONFIG_MAC80211=m | ||
412 | |||
413 | # | ||
414 | # Rate control algorithm selection | ||
415 | # | ||
416 | CONFIG_MAC80211_RC_PID=y | ||
417 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
418 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
419 | # CONFIG_MAC80211_MESH is not set | ||
420 | # CONFIG_MAC80211_LEDS is not set | ||
421 | # CONFIG_MAC80211_DEBUGFS is not set | ||
422 | # CONFIG_MAC80211_DEBUG_MENU is not set | ||
405 | CONFIG_IEEE80211=m | 423 | CONFIG_IEEE80211=m |
406 | # CONFIG_IEEE80211_DEBUG is not set | 424 | # CONFIG_IEEE80211_DEBUG is not set |
407 | CONFIG_IEEE80211_CRYPT_WEP=m | 425 | CONFIG_IEEE80211_CRYPT_WEP=m |
@@ -420,14 +438,79 @@ CONFIG_IEEE80211_CRYPT_TKIP=m | |||
420 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 438 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
421 | CONFIG_STANDALONE=y | 439 | CONFIG_STANDALONE=y |
422 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 440 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
423 | CONFIG_FW_LOADER=m | 441 | CONFIG_FW_LOADER=y |
424 | # CONFIG_FIRMWARE_IN_KERNEL is not set | 442 | # CONFIG_FIRMWARE_IN_KERNEL is not set |
425 | CONFIG_EXTRA_FIRMWARE="" | 443 | CONFIG_EXTRA_FIRMWARE="" |
426 | # CONFIG_DEBUG_DRIVER is not set | 444 | # CONFIG_DEBUG_DRIVER is not set |
427 | # CONFIG_DEBUG_DEVRES is not set | 445 | # CONFIG_DEBUG_DEVRES is not set |
428 | # CONFIG_SYS_HYPERVISOR is not set | 446 | # CONFIG_SYS_HYPERVISOR is not set |
429 | # CONFIG_CONNECTOR is not set | 447 | # CONFIG_CONNECTOR is not set |
430 | # CONFIG_MTD is not set | 448 | CONFIG_MTD=y |
449 | CONFIG_MTD_DEBUG=y | ||
450 | CONFIG_MTD_DEBUG_VERBOSE=0 | ||
451 | # CONFIG_MTD_CONCAT is not set | ||
452 | # CONFIG_MTD_PARTITIONS is not set | ||
453 | |||
454 | # | ||
455 | # User Modules And Translation Layers | ||
456 | # | ||
457 | # CONFIG_MTD_CHAR is not set | ||
458 | CONFIG_MTD_BLKDEVS=y | ||
459 | CONFIG_MTD_BLOCK=y | ||
460 | # CONFIG_FTL is not set | ||
461 | # CONFIG_NFTL is not set | ||
462 | # CONFIG_INFTL is not set | ||
463 | # CONFIG_RFD_FTL is not set | ||
464 | # CONFIG_SSFDC is not set | ||
465 | # CONFIG_MTD_OOPS is not set | ||
466 | |||
467 | # | ||
468 | # RAM/ROM/Flash chip drivers | ||
469 | # | ||
470 | # CONFIG_MTD_CFI is not set | ||
471 | # CONFIG_MTD_JEDECPROBE is not set | ||
472 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
473 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
474 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
475 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
476 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
477 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
478 | CONFIG_MTD_CFI_I1=y | ||
479 | CONFIG_MTD_CFI_I2=y | ||
480 | # CONFIG_MTD_CFI_I4 is not set | ||
481 | # CONFIG_MTD_CFI_I8 is not set | ||
482 | # CONFIG_MTD_RAM is not set | ||
483 | # CONFIG_MTD_ROM is not set | ||
484 | # CONFIG_MTD_ABSENT is not set | ||
485 | |||
486 | # | ||
487 | # Mapping drivers for chip access | ||
488 | # | ||
489 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
490 | # CONFIG_MTD_PLATRAM is not set | ||
491 | |||
492 | # | ||
493 | # Self-contained MTD device drivers | ||
494 | # | ||
495 | # CONFIG_MTD_SLRAM is not set | ||
496 | # CONFIG_MTD_PHRAM is not set | ||
497 | CONFIG_MTD_PS3VRAM=y | ||
498 | # CONFIG_MTD_MTDRAM is not set | ||
499 | # CONFIG_MTD_BLOCK2MTD is not set | ||
500 | |||
501 | # | ||
502 | # Disk-On-Chip Device Drivers | ||
503 | # | ||
504 | # CONFIG_MTD_DOC2000 is not set | ||
505 | # CONFIG_MTD_DOC2001 is not set | ||
506 | # CONFIG_MTD_DOC2001PLUS is not set | ||
507 | # CONFIG_MTD_NAND is not set | ||
508 | # CONFIG_MTD_ONENAND is not set | ||
509 | |||
510 | # | ||
511 | # UBI - Unsorted block images | ||
512 | # | ||
513 | # CONFIG_MTD_UBI is not set | ||
431 | CONFIG_OF_DEVICE=y | 514 | CONFIG_OF_DEVICE=y |
432 | # CONFIG_PARPORT is not set | 515 | # CONFIG_PARPORT is not set |
433 | CONFIG_BLK_DEV=y | 516 | CONFIG_BLK_DEV=y |
@@ -443,6 +526,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65535 | |||
443 | # CONFIG_BLK_DEV_XIP is not set | 526 | # CONFIG_BLK_DEV_XIP is not set |
444 | # CONFIG_CDROM_PKTCDVD is not set | 527 | # CONFIG_CDROM_PKTCDVD is not set |
445 | # CONFIG_ATA_OVER_ETH is not set | 528 | # CONFIG_ATA_OVER_ETH is not set |
529 | # CONFIG_BLK_DEV_HD is not set | ||
446 | CONFIG_MISC_DEVICES=y | 530 | CONFIG_MISC_DEVICES=y |
447 | # CONFIG_EEPROM_93CX6 is not set | 531 | # CONFIG_EEPROM_93CX6 is not set |
448 | # CONFIG_ENCLOSURE_SERVICES is not set | 532 | # CONFIG_ENCLOSURE_SERVICES is not set |
@@ -494,7 +578,6 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
494 | # CONFIG_MD is not set | 578 | # CONFIG_MD is not set |
495 | # CONFIG_MACINTOSH_DRIVERS is not set | 579 | # CONFIG_MACINTOSH_DRIVERS is not set |
496 | CONFIG_NETDEVICES=y | 580 | CONFIG_NETDEVICES=y |
497 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
498 | # CONFIG_DUMMY is not set | 581 | # CONFIG_DUMMY is not set |
499 | # CONFIG_BONDING is not set | 582 | # CONFIG_BONDING is not set |
500 | # CONFIG_MACVLAN is not set | 583 | # CONFIG_MACVLAN is not set |
@@ -510,9 +593,9 @@ CONFIG_MII=m | |||
510 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 593 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
511 | # CONFIG_B44 is not set | 594 | # CONFIG_B44 is not set |
512 | CONFIG_NETDEV_1000=y | 595 | CONFIG_NETDEV_1000=y |
513 | # CONFIG_E1000E_ENABLED is not set | ||
514 | CONFIG_GELIC_NET=y | 596 | CONFIG_GELIC_NET=y |
515 | CONFIG_GELIC_WIRELESS=y | 597 | CONFIG_GELIC_WIRELESS=y |
598 | CONFIG_GELIC_WIRELESS_OLD_PSK_INTERFACE=y | ||
516 | # CONFIG_NETDEV_10000 is not set | 599 | # CONFIG_NETDEV_10000 is not set |
517 | 600 | ||
518 | # | 601 | # |
@@ -523,8 +606,22 @@ CONFIG_WLAN_80211=y | |||
523 | # CONFIG_LIBERTAS is not set | 606 | # CONFIG_LIBERTAS is not set |
524 | # CONFIG_USB_ZD1201 is not set | 607 | # CONFIG_USB_ZD1201 is not set |
525 | # CONFIG_USB_NET_RNDIS_WLAN is not set | 608 | # CONFIG_USB_NET_RNDIS_WLAN is not set |
609 | # CONFIG_RTL8187 is not set | ||
610 | # CONFIG_MAC80211_HWSIM is not set | ||
611 | # CONFIG_P54_COMMON is not set | ||
526 | # CONFIG_IWLWIFI_LEDS is not set | 612 | # CONFIG_IWLWIFI_LEDS is not set |
527 | # CONFIG_HOSTAP is not set | 613 | # CONFIG_HOSTAP is not set |
614 | # CONFIG_B43 is not set | ||
615 | # CONFIG_B43LEGACY is not set | ||
616 | CONFIG_ZD1211RW=m | ||
617 | # CONFIG_ZD1211RW_DEBUG is not set | ||
618 | CONFIG_RT2X00=m | ||
619 | CONFIG_RT2X00_LIB=m | ||
620 | CONFIG_RT2X00_LIB_USB=m | ||
621 | CONFIG_RT2X00_LIB_FIRMWARE=y | ||
622 | # CONFIG_RT2500USB is not set | ||
623 | CONFIG_RT73USB=m | ||
624 | # CONFIG_RT2X00_DEBUG is not set | ||
528 | 625 | ||
529 | # | 626 | # |
530 | # USB Network Adapters | 627 | # USB Network Adapters |
@@ -622,6 +719,7 @@ CONFIG_INPUT_JOYSTICK=y | |||
622 | # Character devices | 719 | # Character devices |
623 | # | 720 | # |
624 | CONFIG_VT=y | 721 | CONFIG_VT=y |
722 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
625 | CONFIG_VT_CONSOLE=y | 723 | CONFIG_VT_CONSOLE=y |
626 | CONFIG_HW_CONSOLE=y | 724 | CONFIG_HW_CONSOLE=y |
627 | CONFIG_VT_HW_CONSOLE_BINDING=y | 725 | CONFIG_VT_HW_CONSOLE_BINDING=y |
@@ -647,6 +745,8 @@ CONFIG_LEGACY_PTY_COUNT=16 | |||
647 | # CONFIG_TCG_TPM is not set | 745 | # CONFIG_TCG_TPM is not set |
648 | # CONFIG_I2C is not set | 746 | # CONFIG_I2C is not set |
649 | # CONFIG_SPI is not set | 747 | # CONFIG_SPI is not set |
748 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
749 | # CONFIG_GPIOLIB is not set | ||
650 | # CONFIG_W1 is not set | 750 | # CONFIG_W1 is not set |
651 | # CONFIG_POWER_SUPPLY is not set | 751 | # CONFIG_POWER_SUPPLY is not set |
652 | # CONFIG_HWMON is not set | 752 | # CONFIG_HWMON is not set |
@@ -663,8 +763,10 @@ CONFIG_SSB_POSSIBLE=y | |||
663 | # | 763 | # |
664 | # Multifunction device drivers | 764 | # Multifunction device drivers |
665 | # | 765 | # |
766 | # CONFIG_MFD_CORE is not set | ||
666 | # CONFIG_MFD_SM501 is not set | 767 | # CONFIG_MFD_SM501 is not set |
667 | # CONFIG_HTC_PASIC3 is not set | 768 | # CONFIG_HTC_PASIC3 is not set |
769 | # CONFIG_MFD_TMIO is not set | ||
668 | 770 | ||
669 | # | 771 | # |
670 | # Multimedia devices | 772 | # Multimedia devices |
@@ -796,6 +898,7 @@ CONFIG_USB_DEVICEFS=y | |||
796 | # CONFIG_USB_DYNAMIC_MINORS is not set | 898 | # CONFIG_USB_DYNAMIC_MINORS is not set |
797 | CONFIG_USB_SUSPEND=y | 899 | CONFIG_USB_SUSPEND=y |
798 | # CONFIG_USB_OTG is not set | 900 | # CONFIG_USB_OTG is not set |
901 | CONFIG_USB_MON=y | ||
799 | 902 | ||
800 | # | 903 | # |
801 | # USB Host Controller Drivers | 904 | # USB Host Controller Drivers |
@@ -817,6 +920,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
817 | # CONFIG_USB_R8A66597_HCD is not set | 920 | # CONFIG_USB_R8A66597_HCD is not set |
818 | 921 | ||
819 | # | 922 | # |
923 | # Enable Host or Gadget support to see Inventra options | ||
924 | # | ||
925 | |||
926 | # | ||
820 | # USB Device Class drivers | 927 | # USB Device Class drivers |
821 | # | 928 | # |
822 | # CONFIG_USB_ACM is not set | 929 | # CONFIG_USB_ACM is not set |
@@ -843,6 +950,7 @@ CONFIG_USB_STORAGE=m | |||
843 | # CONFIG_USB_STORAGE_ALAUDA is not set | 950 | # CONFIG_USB_STORAGE_ALAUDA is not set |
844 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 951 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
845 | # CONFIG_USB_STORAGE_KARMA is not set | 952 | # CONFIG_USB_STORAGE_KARMA is not set |
953 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
846 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 954 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
847 | # CONFIG_USB_LIBUSUAL is not set | 955 | # CONFIG_USB_LIBUSUAL is not set |
848 | 956 | ||
@@ -851,7 +959,6 @@ CONFIG_USB_STORAGE=m | |||
851 | # | 959 | # |
852 | # CONFIG_USB_MDC800 is not set | 960 | # CONFIG_USB_MDC800 is not set |
853 | # CONFIG_USB_MICROTEK is not set | 961 | # CONFIG_USB_MICROTEK is not set |
854 | CONFIG_USB_MON=y | ||
855 | 962 | ||
856 | # | 963 | # |
857 | # USB port drivers | 964 | # USB port drivers |
@@ -864,7 +971,6 @@ CONFIG_USB_MON=y | |||
864 | # CONFIG_USB_EMI62 is not set | 971 | # CONFIG_USB_EMI62 is not set |
865 | # CONFIG_USB_EMI26 is not set | 972 | # CONFIG_USB_EMI26 is not set |
866 | # CONFIG_USB_ADUTUX is not set | 973 | # CONFIG_USB_ADUTUX is not set |
867 | # CONFIG_USB_AUERSWALD is not set | ||
868 | # CONFIG_USB_RIO500 is not set | 974 | # CONFIG_USB_RIO500 is not set |
869 | # CONFIG_USB_LEGOTOWER is not set | 975 | # CONFIG_USB_LEGOTOWER is not set |
870 | # CONFIG_USB_LCD is not set | 976 | # CONFIG_USB_LCD is not set |
@@ -998,9 +1104,11 @@ CONFIG_HUGETLB_PAGE=y | |||
998 | # CONFIG_BEFS_FS is not set | 1104 | # CONFIG_BEFS_FS is not set |
999 | # CONFIG_BFS_FS is not set | 1105 | # CONFIG_BFS_FS is not set |
1000 | # CONFIG_EFS_FS is not set | 1106 | # CONFIG_EFS_FS is not set |
1107 | # CONFIG_JFFS2_FS is not set | ||
1001 | # CONFIG_CRAMFS is not set | 1108 | # CONFIG_CRAMFS is not set |
1002 | # CONFIG_VXFS_FS is not set | 1109 | # CONFIG_VXFS_FS is not set |
1003 | # CONFIG_MINIX_FS is not set | 1110 | # CONFIG_MINIX_FS is not set |
1111 | # CONFIG_OMFS_FS is not set | ||
1004 | # CONFIG_HPFS_FS is not set | 1112 | # CONFIG_HPFS_FS is not set |
1005 | # CONFIG_QNX4FS_FS is not set | 1113 | # CONFIG_QNX4FS_FS is not set |
1006 | # CONFIG_ROMFS_FS is not set | 1114 | # CONFIG_ROMFS_FS is not set |
@@ -1011,14 +1119,13 @@ CONFIG_NFS_FS=y | |||
1011 | CONFIG_NFS_V3=y | 1119 | CONFIG_NFS_V3=y |
1012 | # CONFIG_NFS_V3_ACL is not set | 1120 | # CONFIG_NFS_V3_ACL is not set |
1013 | CONFIG_NFS_V4=y | 1121 | CONFIG_NFS_V4=y |
1014 | # CONFIG_NFSD is not set | ||
1015 | CONFIG_ROOT_NFS=y | 1122 | CONFIG_ROOT_NFS=y |
1123 | # CONFIG_NFSD is not set | ||
1016 | CONFIG_LOCKD=y | 1124 | CONFIG_LOCKD=y |
1017 | CONFIG_LOCKD_V4=y | 1125 | CONFIG_LOCKD_V4=y |
1018 | CONFIG_NFS_COMMON=y | 1126 | CONFIG_NFS_COMMON=y |
1019 | CONFIG_SUNRPC=y | 1127 | CONFIG_SUNRPC=y |
1020 | CONFIG_SUNRPC_GSS=y | 1128 | CONFIG_SUNRPC_GSS=y |
1021 | # CONFIG_SUNRPC_BIND34 is not set | ||
1022 | CONFIG_RPCSEC_GSS_KRB5=y | 1129 | CONFIG_RPCSEC_GSS_KRB5=y |
1023 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1130 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1024 | # CONFIG_SMB_FS is not set | 1131 | # CONFIG_SMB_FS is not set |
@@ -1086,7 +1193,7 @@ CONFIG_BITREVERSE=y | |||
1086 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1193 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1087 | CONFIG_CRC_CCITT=m | 1194 | CONFIG_CRC_CCITT=m |
1088 | # CONFIG_CRC16 is not set | 1195 | # CONFIG_CRC16 is not set |
1089 | # CONFIG_CRC_T10DIF is not set | 1196 | CONFIG_CRC_T10DIF=y |
1090 | CONFIG_CRC_ITU_T=m | 1197 | CONFIG_CRC_ITU_T=m |
1091 | CONFIG_CRC32=y | 1198 | CONFIG_CRC32=y |
1092 | # CONFIG_CRC7 is not set | 1199 | # CONFIG_CRC7 is not set |
@@ -1115,6 +1222,8 @@ CONFIG_DEBUG_FS=y | |||
1115 | CONFIG_DEBUG_KERNEL=y | 1222 | CONFIG_DEBUG_KERNEL=y |
1116 | # CONFIG_DEBUG_SHIRQ is not set | 1223 | # CONFIG_DEBUG_SHIRQ is not set |
1117 | CONFIG_DETECT_SOFTLOCKUP=y | 1224 | CONFIG_DETECT_SOFTLOCKUP=y |
1225 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1226 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1118 | CONFIG_SCHED_DEBUG=y | 1227 | CONFIG_SCHED_DEBUG=y |
1119 | # CONFIG_SCHEDSTATS is not set | 1228 | # CONFIG_SCHEDSTATS is not set |
1120 | # CONFIG_TIMER_STATS is not set | 1229 | # CONFIG_TIMER_STATS is not set |
@@ -1138,6 +1247,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1138 | CONFIG_DEBUG_INFO=y | 1247 | CONFIG_DEBUG_INFO=y |
1139 | # CONFIG_DEBUG_VM is not set | 1248 | # CONFIG_DEBUG_VM is not set |
1140 | CONFIG_DEBUG_WRITECOUNT=y | 1249 | CONFIG_DEBUG_WRITECOUNT=y |
1250 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1141 | CONFIG_DEBUG_LIST=y | 1251 | CONFIG_DEBUG_LIST=y |
1142 | # CONFIG_DEBUG_SG is not set | 1252 | # CONFIG_DEBUG_SG is not set |
1143 | CONFIG_FRAME_POINTER=y | 1253 | CONFIG_FRAME_POINTER=y |
@@ -1146,6 +1256,7 @@ CONFIG_FRAME_POINTER=y | |||
1146 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1256 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1147 | # CONFIG_FAULT_INJECTION is not set | 1257 | # CONFIG_FAULT_INJECTION is not set |
1148 | # CONFIG_LATENCYTOP is not set | 1258 | # CONFIG_LATENCYTOP is not set |
1259 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1149 | CONFIG_HAVE_FTRACE=y | 1260 | CONFIG_HAVE_FTRACE=y |
1150 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 1261 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
1151 | # CONFIG_FTRACE is not set | 1262 | # CONFIG_FTRACE is not set |
@@ -1153,12 +1264,14 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y | |||
1153 | # CONFIG_SCHED_TRACER is not set | 1264 | # CONFIG_SCHED_TRACER is not set |
1154 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 1265 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
1155 | # CONFIG_SAMPLES is not set | 1266 | # CONFIG_SAMPLES is not set |
1267 | CONFIG_HAVE_ARCH_KGDB=y | ||
1268 | # CONFIG_KGDB is not set | ||
1156 | CONFIG_DEBUG_STACKOVERFLOW=y | 1269 | CONFIG_DEBUG_STACKOVERFLOW=y |
1157 | # CONFIG_DEBUG_STACK_USAGE is not set | 1270 | # CONFIG_DEBUG_STACK_USAGE is not set |
1158 | # CONFIG_DEBUG_PAGEALLOC is not set | 1271 | # CONFIG_DEBUG_PAGEALLOC is not set |
1159 | # CONFIG_DEBUGGER is not set | ||
1160 | # CONFIG_CODE_PATCHING_SELFTEST is not set | 1272 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1161 | # CONFIG_FTR_FIXUP_SELFTEST is not set | 1273 | # CONFIG_FTR_FIXUP_SELFTEST is not set |
1274 | # CONFIG_XMON is not set | ||
1162 | CONFIG_IRQSTACKS=y | 1275 | CONFIG_IRQSTACKS=y |
1163 | # CONFIG_VIRQ_DEBUG is not set | 1276 | # CONFIG_VIRQ_DEBUG is not set |
1164 | # CONFIG_BOOTX_TEXT is not set | 1277 | # CONFIG_BOOTX_TEXT is not set |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index fe6ffa683d78..e77c5e7a0be2 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc3 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Tue May 20 20:03:28 2008 | 4 | # Tue Aug 26 13:31:07 2008 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | 7 | ||
@@ -14,6 +14,7 @@ CONFIG_POWER4=y | |||
14 | # CONFIG_TUNE_CELL is not set | 14 | # CONFIG_TUNE_CELL is not set |
15 | CONFIG_PPC_FPU=y | 15 | CONFIG_PPC_FPU=y |
16 | CONFIG_ALTIVEC=y | 16 | CONFIG_ALTIVEC=y |
17 | CONFIG_VSX=y | ||
17 | CONFIG_PPC_STD_MMU=y | 18 | CONFIG_PPC_STD_MMU=y |
18 | CONFIG_PPC_MM_SLICES=y | 19 | CONFIG_PPC_MM_SLICES=y |
19 | CONFIG_VIRT_CPU_ACCOUNTING=y | 20 | CONFIG_VIRT_CPU_ACCOUNTING=y |
@@ -31,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
31 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 32 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
32 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
33 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
34 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 36 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
35 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
@@ -104,7 +106,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
104 | CONFIG_SYSCTL=y | 106 | CONFIG_SYSCTL=y |
105 | # CONFIG_EMBEDDED is not set | 107 | # CONFIG_EMBEDDED is not set |
106 | CONFIG_SYSCTL_SYSCALL=y | 108 | CONFIG_SYSCTL_SYSCALL=y |
107 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
108 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
109 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
110 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -132,11 +133,17 @@ CONFIG_MARKERS=y | |||
132 | CONFIG_OPROFILE=y | 133 | CONFIG_OPROFILE=y |
133 | CONFIG_HAVE_OPROFILE=y | 134 | CONFIG_HAVE_OPROFILE=y |
134 | CONFIG_KPROBES=y | 135 | CONFIG_KPROBES=y |
136 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
135 | CONFIG_KRETPROBES=y | 137 | CONFIG_KRETPROBES=y |
138 | CONFIG_HAVE_IOREMAP_PROT=y | ||
136 | CONFIG_HAVE_KPROBES=y | 139 | CONFIG_HAVE_KPROBES=y |
137 | CONFIG_HAVE_KRETPROBES=y | 140 | CONFIG_HAVE_KRETPROBES=y |
138 | # CONFIG_HAVE_DMA_ATTRS is not set | 141 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
142 | CONFIG_HAVE_DMA_ATTRS=y | ||
143 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
144 | # CONFIG_HAVE_CLK is not set | ||
139 | CONFIG_PROC_PAGE_MONITOR=y | 145 | CONFIG_PROC_PAGE_MONITOR=y |
146 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
140 | CONFIG_SLABINFO=y | 147 | CONFIG_SLABINFO=y |
141 | CONFIG_RT_MUTEXES=y | 148 | CONFIG_RT_MUTEXES=y |
142 | # CONFIG_TINY_SHMEM is not set | 149 | # CONFIG_TINY_SHMEM is not set |
@@ -152,6 +159,7 @@ CONFIG_STOP_MACHINE=y | |||
152 | CONFIG_BLOCK=y | 159 | CONFIG_BLOCK=y |
153 | # CONFIG_BLK_DEV_IO_TRACE is not set | 160 | # CONFIG_BLK_DEV_IO_TRACE is not set |
154 | CONFIG_BLK_DEV_BSG=y | 161 | CONFIG_BLK_DEV_BSG=y |
162 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
155 | CONFIG_BLOCK_COMPAT=y | 163 | CONFIG_BLOCK_COMPAT=y |
156 | 164 | ||
157 | # | 165 | # |
@@ -172,17 +180,14 @@ CONFIG_CLASSIC_RCU=y | |||
172 | # Platform support | 180 | # Platform support |
173 | # | 181 | # |
174 | CONFIG_PPC_MULTIPLATFORM=y | 182 | CONFIG_PPC_MULTIPLATFORM=y |
175 | # CONFIG_PPC_82xx is not set | ||
176 | # CONFIG_PPC_83xx is not set | ||
177 | # CONFIG_PPC_86xx is not set | ||
178 | CONFIG_PPC_PSERIES=y | 183 | CONFIG_PPC_PSERIES=y |
179 | CONFIG_PPC_SPLPAR=y | 184 | CONFIG_PPC_SPLPAR=y |
180 | CONFIG_EEH=y | 185 | CONFIG_EEH=y |
181 | CONFIG_SCANLOG=m | 186 | CONFIG_SCANLOG=m |
182 | CONFIG_LPARCFG=y | 187 | CONFIG_LPARCFG=y |
188 | CONFIG_PPC_SMLPAR=y | ||
189 | CONFIG_CMM=y | ||
183 | # CONFIG_PPC_ISERIES is not set | 190 | # CONFIG_PPC_ISERIES is not set |
184 | # CONFIG_PPC_MPC512x is not set | ||
185 | # CONFIG_PPC_MPC5121 is not set | ||
186 | # CONFIG_PPC_PMAC is not set | 191 | # CONFIG_PPC_PMAC is not set |
187 | # CONFIG_PPC_MAPLE is not set | 192 | # CONFIG_PPC_MAPLE is not set |
188 | # CONFIG_PPC_PASEMI is not set | 193 | # CONFIG_PPC_PASEMI is not set |
@@ -226,7 +231,7 @@ CONFIG_HZ_250=y | |||
226 | # CONFIG_HZ_300 is not set | 231 | # CONFIG_HZ_300 is not set |
227 | # CONFIG_HZ_1000 is not set | 232 | # CONFIG_HZ_1000 is not set |
228 | CONFIG_HZ=250 | 233 | CONFIG_HZ=250 |
229 | # CONFIG_SCHED_HRTICK is not set | 234 | CONFIG_SCHED_HRTICK=y |
230 | CONFIG_PREEMPT_NONE=y | 235 | CONFIG_PREEMPT_NONE=y |
231 | # CONFIG_PREEMPT_VOLUNTARY is not set | 236 | # CONFIG_PREEMPT_VOLUNTARY is not set |
232 | # CONFIG_PREEMPT is not set | 237 | # CONFIG_PREEMPT is not set |
@@ -275,6 +280,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
275 | CONFIG_SCHED_SMT=y | 280 | CONFIG_SCHED_SMT=y |
276 | CONFIG_PROC_DEVICETREE=y | 281 | CONFIG_PROC_DEVICETREE=y |
277 | # CONFIG_CMDLINE_BOOL is not set | 282 | # CONFIG_CMDLINE_BOOL is not set |
283 | CONFIG_EXTRA_TARGETS="" | ||
278 | # CONFIG_PM is not set | 284 | # CONFIG_PM is not set |
279 | CONFIG_SECCOMP=y | 285 | CONFIG_SECCOMP=y |
280 | CONFIG_ISA_DMA_API=y | 286 | CONFIG_ISA_DMA_API=y |
@@ -304,10 +310,6 @@ CONFIG_HOTPLUG_PCI_RPA_DLPAR=m | |||
304 | CONFIG_PAGE_OFFSET=0xc000000000000000 | 310 | CONFIG_PAGE_OFFSET=0xc000000000000000 |
305 | CONFIG_KERNEL_START=0xc000000000000000 | 311 | CONFIG_KERNEL_START=0xc000000000000000 |
306 | CONFIG_PHYSICAL_START=0x00000000 | 312 | CONFIG_PHYSICAL_START=0x00000000 |
307 | |||
308 | # | ||
309 | # Networking | ||
310 | # | ||
311 | CONFIG_NET=y | 313 | CONFIG_NET=y |
312 | 314 | ||
313 | # | 315 | # |
@@ -321,6 +323,7 @@ CONFIG_XFRM_USER=m | |||
321 | # CONFIG_XFRM_SUB_POLICY is not set | 323 | # CONFIG_XFRM_SUB_POLICY is not set |
322 | # CONFIG_XFRM_MIGRATE is not set | 324 | # CONFIG_XFRM_MIGRATE is not set |
323 | # CONFIG_XFRM_STATISTICS is not set | 325 | # CONFIG_XFRM_STATISTICS is not set |
326 | CONFIG_XFRM_IPCOMP=m | ||
324 | CONFIG_NET_KEY=m | 327 | CONFIG_NET_KEY=m |
325 | # CONFIG_NET_KEY_MIGRATE is not set | 328 | # CONFIG_NET_KEY_MIGRATE is not set |
326 | CONFIG_INET=y | 329 | CONFIG_INET=y |
@@ -498,6 +501,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
498 | CONFIG_STANDALONE=y | 501 | CONFIG_STANDALONE=y |
499 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 502 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
500 | CONFIG_FW_LOADER=y | 503 | CONFIG_FW_LOADER=y |
504 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
505 | CONFIG_EXTRA_FIRMWARE="" | ||
501 | # CONFIG_DEBUG_DRIVER is not set | 506 | # CONFIG_DEBUG_DRIVER is not set |
502 | # CONFIG_DEBUG_DEVRES is not set | 507 | # CONFIG_DEBUG_DEVRES is not set |
503 | # CONFIG_SYS_HYPERVISOR is not set | 508 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -531,12 +536,14 @@ CONFIG_BLK_DEV_RAM_SIZE=65536 | |||
531 | # CONFIG_BLK_DEV_XIP is not set | 536 | # CONFIG_BLK_DEV_XIP is not set |
532 | # CONFIG_CDROM_PKTCDVD is not set | 537 | # CONFIG_CDROM_PKTCDVD is not set |
533 | # CONFIG_ATA_OVER_ETH is not set | 538 | # CONFIG_ATA_OVER_ETH is not set |
539 | # CONFIG_BLK_DEV_HD is not set | ||
534 | CONFIG_MISC_DEVICES=y | 540 | CONFIG_MISC_DEVICES=y |
535 | # CONFIG_PHANTOM is not set | 541 | # CONFIG_PHANTOM is not set |
536 | # CONFIG_EEPROM_93CX6 is not set | 542 | # CONFIG_EEPROM_93CX6 is not set |
537 | # CONFIG_SGI_IOC4 is not set | 543 | # CONFIG_SGI_IOC4 is not set |
538 | # CONFIG_TIFM_CORE is not set | 544 | # CONFIG_TIFM_CORE is not set |
539 | # CONFIG_ENCLOSURE_SERVICES is not set | 545 | # CONFIG_ENCLOSURE_SERVICES is not set |
546 | # CONFIG_HP_ILO is not set | ||
540 | CONFIG_HAVE_IDE=y | 547 | CONFIG_HAVE_IDE=y |
541 | CONFIG_IDE=y | 548 | CONFIG_IDE=y |
542 | CONFIG_BLK_DEV_IDE=y | 549 | CONFIG_BLK_DEV_IDE=y |
@@ -544,6 +551,7 @@ CONFIG_BLK_DEV_IDE=y | |||
544 | # | 551 | # |
545 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 552 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
546 | # | 553 | # |
554 | CONFIG_IDE_TIMINGS=y | ||
547 | # CONFIG_BLK_DEV_IDE_SATA is not set | 555 | # CONFIG_BLK_DEV_IDE_SATA is not set |
548 | CONFIG_BLK_DEV_IDEDISK=y | 556 | CONFIG_BLK_DEV_IDEDISK=y |
549 | # CONFIG_IDEDISK_MULTI_MODE is not set | 557 | # CONFIG_IDEDISK_MULTI_MODE is not set |
@@ -575,10 +583,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
575 | CONFIG_BLK_DEV_AMD74XX=y | 583 | CONFIG_BLK_DEV_AMD74XX=y |
576 | # CONFIG_BLK_DEV_CMD64X is not set | 584 | # CONFIG_BLK_DEV_CMD64X is not set |
577 | # CONFIG_BLK_DEV_TRIFLEX is not set | 585 | # CONFIG_BLK_DEV_TRIFLEX is not set |
578 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
579 | # CONFIG_BLK_DEV_CS5520 is not set | 586 | # CONFIG_BLK_DEV_CS5520 is not set |
580 | # CONFIG_BLK_DEV_CS5530 is not set | 587 | # CONFIG_BLK_DEV_CS5530 is not set |
581 | # CONFIG_BLK_DEV_HPT34X is not set | ||
582 | # CONFIG_BLK_DEV_HPT366 is not set | 588 | # CONFIG_BLK_DEV_HPT366 is not set |
583 | # CONFIG_BLK_DEV_JMICRON is not set | 589 | # CONFIG_BLK_DEV_JMICRON is not set |
584 | # CONFIG_BLK_DEV_SC1200 is not set | 590 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -596,8 +602,6 @@ CONFIG_BLK_DEV_AMD74XX=y | |||
596 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 602 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
597 | # CONFIG_BLK_DEV_TC86C001 is not set | 603 | # CONFIG_BLK_DEV_TC86C001 is not set |
598 | CONFIG_BLK_DEV_IDEDMA=y | 604 | CONFIG_BLK_DEV_IDEDMA=y |
599 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
600 | # CONFIG_BLK_DEV_HD is not set | ||
601 | 605 | ||
602 | # | 606 | # |
603 | # SCSI device support | 607 | # SCSI device support |
@@ -659,6 +663,8 @@ CONFIG_SCSI_LOWLEVEL=y | |||
659 | # CONFIG_SCSI_GDTH is not set | 663 | # CONFIG_SCSI_GDTH is not set |
660 | # CONFIG_SCSI_IPS is not set | 664 | # CONFIG_SCSI_IPS is not set |
661 | CONFIG_SCSI_IBMVSCSI=y | 665 | CONFIG_SCSI_IBMVSCSI=y |
666 | CONFIG_SCSI_IBMVFC=m | ||
667 | CONFIG_SCSI_IBMVFC_TRACE=y | ||
662 | # CONFIG_SCSI_INITIO is not set | 668 | # CONFIG_SCSI_INITIO is not set |
663 | # CONFIG_SCSI_INIA100 is not set | 669 | # CONFIG_SCSI_INIA100 is not set |
664 | # CONFIG_SCSI_PPA is not set | 670 | # CONFIG_SCSI_PPA is not set |
@@ -681,6 +687,7 @@ CONFIG_SCSI_LPFC=m | |||
681 | # CONFIG_SCSI_DC390T is not set | 687 | # CONFIG_SCSI_DC390T is not set |
682 | # CONFIG_SCSI_DEBUG is not set | 688 | # CONFIG_SCSI_DEBUG is not set |
683 | # CONFIG_SCSI_SRP is not set | 689 | # CONFIG_SCSI_SRP is not set |
690 | # CONFIG_SCSI_DH is not set | ||
684 | CONFIG_ATA=y | 691 | CONFIG_ATA=y |
685 | # CONFIG_ATA_NONSTANDARD is not set | 692 | # CONFIG_ATA_NONSTANDARD is not set |
686 | CONFIG_SATA_PMP=y | 693 | CONFIG_SATA_PMP=y |
@@ -703,9 +710,6 @@ CONFIG_DM_SNAPSHOT=m | |||
703 | CONFIG_DM_MIRROR=m | 710 | CONFIG_DM_MIRROR=m |
704 | CONFIG_DM_ZERO=m | 711 | CONFIG_DM_ZERO=m |
705 | CONFIG_DM_MULTIPATH=m | 712 | CONFIG_DM_MULTIPATH=m |
706 | CONFIG_DM_MULTIPATH_EMC=m | ||
707 | # CONFIG_DM_MULTIPATH_RDAC is not set | ||
708 | # CONFIG_DM_MULTIPATH_HP is not set | ||
709 | # CONFIG_DM_DELAY is not set | 713 | # CONFIG_DM_DELAY is not set |
710 | # CONFIG_DM_UEVENT is not set | 714 | # CONFIG_DM_UEVENT is not set |
711 | # CONFIG_FUSION is not set | 715 | # CONFIG_FUSION is not set |
@@ -713,12 +717,15 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
713 | # | 717 | # |
714 | # IEEE 1394 (FireWire) support | 718 | # IEEE 1394 (FireWire) support |
715 | # | 719 | # |
720 | |||
721 | # | ||
722 | # Enable only one of the two stacks, unless you know what you are doing | ||
723 | # | ||
716 | # CONFIG_FIREWIRE is not set | 724 | # CONFIG_FIREWIRE is not set |
717 | # CONFIG_IEEE1394 is not set | 725 | # CONFIG_IEEE1394 is not set |
718 | # CONFIG_I2O is not set | 726 | # CONFIG_I2O is not set |
719 | # CONFIG_MACINTOSH_DRIVERS is not set | 727 | # CONFIG_MACINTOSH_DRIVERS is not set |
720 | CONFIG_NETDEVICES=y | 728 | CONFIG_NETDEVICES=y |
721 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
722 | CONFIG_DUMMY=m | 729 | CONFIG_DUMMY=m |
723 | CONFIG_BONDING=m | 730 | CONFIG_BONDING=m |
724 | # CONFIG_MACVLAN is not set | 731 | # CONFIG_MACVLAN is not set |
@@ -726,7 +733,23 @@ CONFIG_BONDING=m | |||
726 | CONFIG_TUN=m | 733 | CONFIG_TUN=m |
727 | # CONFIG_VETH is not set | 734 | # CONFIG_VETH is not set |
728 | # CONFIG_ARCNET is not set | 735 | # CONFIG_ARCNET is not set |
729 | # CONFIG_PHYLIB is not set | 736 | CONFIG_PHYLIB=y |
737 | |||
738 | # | ||
739 | # MII PHY device drivers | ||
740 | # | ||
741 | # CONFIG_MARVELL_PHY is not set | ||
742 | # CONFIG_DAVICOM_PHY is not set | ||
743 | # CONFIG_QSEMI_PHY is not set | ||
744 | # CONFIG_LXT_PHY is not set | ||
745 | # CONFIG_CICADA_PHY is not set | ||
746 | # CONFIG_VITESSE_PHY is not set | ||
747 | # CONFIG_SMSC_PHY is not set | ||
748 | # CONFIG_BROADCOM_PHY is not set | ||
749 | # CONFIG_ICPLUS_PHY is not set | ||
750 | # CONFIG_REALTEK_PHY is not set | ||
751 | # CONFIG_FIXED_PHY is not set | ||
752 | # CONFIG_MDIO_BITBANG is not set | ||
730 | CONFIG_NET_ETHERNET=y | 753 | CONFIG_NET_ETHERNET=y |
731 | CONFIG_MII=y | 754 | CONFIG_MII=y |
732 | # CONFIG_HAPPYMEAL is not set | 755 | # CONFIG_HAPPYMEAL is not set |
@@ -759,6 +782,7 @@ CONFIG_E100=y | |||
759 | # CONFIG_SIS900 is not set | 782 | # CONFIG_SIS900 is not set |
760 | # CONFIG_EPIC100 is not set | 783 | # CONFIG_EPIC100 is not set |
761 | # CONFIG_SUNDANCE is not set | 784 | # CONFIG_SUNDANCE is not set |
785 | # CONFIG_TLAN is not set | ||
762 | # CONFIG_VIA_RHINE is not set | 786 | # CONFIG_VIA_RHINE is not set |
763 | # CONFIG_SC92031 is not set | 787 | # CONFIG_SC92031 is not set |
764 | # CONFIG_NET_POCKET is not set | 788 | # CONFIG_NET_POCKET is not set |
@@ -767,10 +791,8 @@ CONFIG_ACENIC=y | |||
767 | CONFIG_ACENIC_OMIT_TIGON_I=y | 791 | CONFIG_ACENIC_OMIT_TIGON_I=y |
768 | # CONFIG_DL2K is not set | 792 | # CONFIG_DL2K is not set |
769 | CONFIG_E1000=y | 793 | CONFIG_E1000=y |
770 | # CONFIG_E1000_NAPI is not set | ||
771 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 794 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
772 | # CONFIG_E1000E is not set | 795 | # CONFIG_E1000E is not set |
773 | # CONFIG_E1000E_ENABLED is not set | ||
774 | # CONFIG_IP1000 is not set | 796 | # CONFIG_IP1000 is not set |
775 | # CONFIG_IGB is not set | 797 | # CONFIG_IGB is not set |
776 | # CONFIG_NS83820 is not set | 798 | # CONFIG_NS83820 is not set |
@@ -785,14 +807,14 @@ CONFIG_TIGON3=y | |||
785 | # CONFIG_BNX2 is not set | 807 | # CONFIG_BNX2 is not set |
786 | # CONFIG_QLA3XXX is not set | 808 | # CONFIG_QLA3XXX is not set |
787 | # CONFIG_ATL1 is not set | 809 | # CONFIG_ATL1 is not set |
810 | # CONFIG_ATL1E is not set | ||
788 | CONFIG_NETDEV_10000=y | 811 | CONFIG_NETDEV_10000=y |
789 | # CONFIG_CHELSIO_T1 is not set | 812 | # CONFIG_CHELSIO_T1 is not set |
790 | # CONFIG_CHELSIO_T3 is not set | 813 | # CONFIG_CHELSIO_T3 is not set |
814 | CONFIG_EHEA=y | ||
791 | # CONFIG_IXGBE is not set | 815 | # CONFIG_IXGBE is not set |
792 | CONFIG_IXGB=m | 816 | CONFIG_IXGB=m |
793 | # CONFIG_IXGB_NAPI is not set | ||
794 | CONFIG_S2IO=m | 817 | CONFIG_S2IO=m |
795 | # CONFIG_S2IO_NAPI is not set | ||
796 | # CONFIG_MYRI10GE is not set | 818 | # CONFIG_MYRI10GE is not set |
797 | # CONFIG_NETXEN_NIC is not set | 819 | # CONFIG_NETXEN_NIC is not set |
798 | # CONFIG_NIU is not set | 820 | # CONFIG_NIU is not set |
@@ -883,6 +905,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
883 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 905 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
884 | # CONFIG_MOUSE_SERIAL is not set | 906 | # CONFIG_MOUSE_SERIAL is not set |
885 | # CONFIG_MOUSE_APPLETOUCH is not set | 907 | # CONFIG_MOUSE_APPLETOUCH is not set |
908 | # CONFIG_MOUSE_BCM5974 is not set | ||
886 | # CONFIG_MOUSE_VSXXXAA is not set | 909 | # CONFIG_MOUSE_VSXXXAA is not set |
887 | # CONFIG_INPUT_JOYSTICK is not set | 910 | # CONFIG_INPUT_JOYSTICK is not set |
888 | # CONFIG_INPUT_TABLET is not set | 911 | # CONFIG_INPUT_TABLET is not set |
@@ -906,12 +929,14 @@ CONFIG_SERIO_I8042=y | |||
906 | # CONFIG_SERIO_PCIPS2 is not set | 929 | # CONFIG_SERIO_PCIPS2 is not set |
907 | CONFIG_SERIO_LIBPS2=y | 930 | CONFIG_SERIO_LIBPS2=y |
908 | # CONFIG_SERIO_RAW is not set | 931 | # CONFIG_SERIO_RAW is not set |
932 | # CONFIG_SERIO_XILINX_XPS_PS2 is not set | ||
909 | # CONFIG_GAMEPORT is not set | 933 | # CONFIG_GAMEPORT is not set |
910 | 934 | ||
911 | # | 935 | # |
912 | # Character devices | 936 | # Character devices |
913 | # | 937 | # |
914 | CONFIG_VT=y | 938 | CONFIG_VT=y |
939 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
915 | CONFIG_VT_CONSOLE=y | 940 | CONFIG_VT_CONSOLE=y |
916 | CONFIG_HW_CONSOLE=y | 941 | CONFIG_HW_CONSOLE=y |
917 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 942 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -943,6 +968,7 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
943 | # CONFIG_PRINTER is not set | 968 | # CONFIG_PRINTER is not set |
944 | # CONFIG_PPDEV is not set | 969 | # CONFIG_PPDEV is not set |
945 | CONFIG_HVC_DRIVER=y | 970 | CONFIG_HVC_DRIVER=y |
971 | CONFIG_HVC_IRQ=y | ||
946 | CONFIG_HVC_CONSOLE=y | 972 | CONFIG_HVC_CONSOLE=y |
947 | CONFIG_HVC_RTAS=y | 973 | CONFIG_HVC_RTAS=y |
948 | CONFIG_HVCS=m | 974 | CONFIG_HVCS=m |
@@ -961,44 +987,65 @@ CONFIG_DEVPORT=y | |||
961 | CONFIG_I2C=y | 987 | CONFIG_I2C=y |
962 | CONFIG_I2C_BOARDINFO=y | 988 | CONFIG_I2C_BOARDINFO=y |
963 | # CONFIG_I2C_CHARDEV is not set | 989 | # CONFIG_I2C_CHARDEV is not set |
990 | CONFIG_I2C_HELPER_AUTO=y | ||
964 | CONFIG_I2C_ALGOBIT=y | 991 | CONFIG_I2C_ALGOBIT=y |
965 | 992 | ||
966 | # | 993 | # |
967 | # I2C Hardware Bus support | 994 | # I2C Hardware Bus support |
968 | # | 995 | # |
996 | |||
997 | # | ||
998 | # PC SMBus host controller drivers | ||
999 | # | ||
969 | # CONFIG_I2C_ALI1535 is not set | 1000 | # CONFIG_I2C_ALI1535 is not set |
970 | # CONFIG_I2C_ALI1563 is not set | 1001 | # CONFIG_I2C_ALI1563 is not set |
971 | # CONFIG_I2C_ALI15X3 is not set | 1002 | # CONFIG_I2C_ALI15X3 is not set |
972 | # CONFIG_I2C_AMD756 is not set | 1003 | # CONFIG_I2C_AMD756 is not set |
973 | # CONFIG_I2C_AMD8111 is not set | 1004 | # CONFIG_I2C_AMD8111 is not set |
974 | # CONFIG_I2C_I801 is not set | 1005 | # CONFIG_I2C_I801 is not set |
975 | # CONFIG_I2C_I810 is not set | 1006 | # CONFIG_I2C_ISCH is not set |
976 | # CONFIG_I2C_PIIX4 is not set | 1007 | # CONFIG_I2C_PIIX4 is not set |
977 | # CONFIG_I2C_NFORCE2 is not set | 1008 | # CONFIG_I2C_NFORCE2 is not set |
978 | # CONFIG_I2C_OCORES is not set | ||
979 | # CONFIG_I2C_PARPORT is not set | ||
980 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
981 | # CONFIG_I2C_PROSAVAGE is not set | ||
982 | # CONFIG_I2C_SAVAGE4 is not set | ||
983 | # CONFIG_I2C_SIMTEC is not set | ||
984 | # CONFIG_I2C_SIS5595 is not set | 1009 | # CONFIG_I2C_SIS5595 is not set |
985 | # CONFIG_I2C_SIS630 is not set | 1010 | # CONFIG_I2C_SIS630 is not set |
986 | # CONFIG_I2C_SIS96X is not set | 1011 | # CONFIG_I2C_SIS96X is not set |
987 | # CONFIG_I2C_TAOS_EVM is not set | ||
988 | # CONFIG_I2C_STUB is not set | ||
989 | # CONFIG_I2C_TINY_USB is not set | ||
990 | # CONFIG_I2C_VIA is not set | 1012 | # CONFIG_I2C_VIA is not set |
991 | # CONFIG_I2C_VIAPRO is not set | 1013 | # CONFIG_I2C_VIAPRO is not set |
1014 | |||
1015 | # | ||
1016 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
1017 | # | ||
1018 | # CONFIG_I2C_OCORES is not set | ||
1019 | # CONFIG_I2C_SIMTEC is not set | ||
1020 | |||
1021 | # | ||
1022 | # External I2C/SMBus adapter drivers | ||
1023 | # | ||
1024 | # CONFIG_I2C_PARPORT is not set | ||
1025 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1026 | # CONFIG_I2C_TAOS_EVM is not set | ||
1027 | # CONFIG_I2C_TINY_USB is not set | ||
1028 | |||
1029 | # | ||
1030 | # Graphics adapter I2C/DDC channel drivers | ||
1031 | # | ||
992 | # CONFIG_I2C_VOODOO3 is not set | 1032 | # CONFIG_I2C_VOODOO3 is not set |
1033 | |||
1034 | # | ||
1035 | # Other I2C/SMBus bus drivers | ||
1036 | # | ||
993 | # CONFIG_I2C_PCA_PLATFORM is not set | 1037 | # CONFIG_I2C_PCA_PLATFORM is not set |
1038 | # CONFIG_I2C_STUB is not set | ||
994 | 1039 | ||
995 | # | 1040 | # |
996 | # Miscellaneous I2C Chip support | 1041 | # Miscellaneous I2C Chip support |
997 | # | 1042 | # |
998 | # CONFIG_DS1682 is not set | 1043 | # CONFIG_DS1682 is not set |
1044 | # CONFIG_AT24 is not set | ||
999 | # CONFIG_SENSORS_EEPROM is not set | 1045 | # CONFIG_SENSORS_EEPROM is not set |
1000 | # CONFIG_SENSORS_PCF8574 is not set | 1046 | # CONFIG_SENSORS_PCF8574 is not set |
1001 | # CONFIG_PCF8575 is not set | 1047 | # CONFIG_PCF8575 is not set |
1048 | # CONFIG_SENSORS_PCA9539 is not set | ||
1002 | # CONFIG_SENSORS_PCF8591 is not set | 1049 | # CONFIG_SENSORS_PCF8591 is not set |
1003 | # CONFIG_SENSORS_MAX6875 is not set | 1050 | # CONFIG_SENSORS_MAX6875 is not set |
1004 | # CONFIG_SENSORS_TSL2550 is not set | 1051 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -1007,10 +1054,13 @@ CONFIG_I2C_ALGOBIT=y | |||
1007 | # CONFIG_I2C_DEBUG_BUS is not set | 1054 | # CONFIG_I2C_DEBUG_BUS is not set |
1008 | # CONFIG_I2C_DEBUG_CHIP is not set | 1055 | # CONFIG_I2C_DEBUG_CHIP is not set |
1009 | # CONFIG_SPI is not set | 1056 | # CONFIG_SPI is not set |
1057 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
1058 | # CONFIG_GPIOLIB is not set | ||
1010 | # CONFIG_W1 is not set | 1059 | # CONFIG_W1 is not set |
1011 | # CONFIG_POWER_SUPPLY is not set | 1060 | # CONFIG_POWER_SUPPLY is not set |
1012 | # CONFIG_HWMON is not set | 1061 | # CONFIG_HWMON is not set |
1013 | # CONFIG_THERMAL is not set | 1062 | # CONFIG_THERMAL is not set |
1063 | # CONFIG_THERMAL_HWMON is not set | ||
1014 | # CONFIG_WATCHDOG is not set | 1064 | # CONFIG_WATCHDOG is not set |
1015 | 1065 | ||
1016 | # | 1066 | # |
@@ -1022,8 +1072,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1022 | # | 1072 | # |
1023 | # Multifunction device drivers | 1073 | # Multifunction device drivers |
1024 | # | 1074 | # |
1075 | # CONFIG_MFD_CORE is not set | ||
1025 | # CONFIG_MFD_SM501 is not set | 1076 | # CONFIG_MFD_SM501 is not set |
1026 | # CONFIG_HTC_PASIC3 is not set | 1077 | # CONFIG_HTC_PASIC3 is not set |
1078 | # CONFIG_MFD_TMIO is not set | ||
1027 | 1079 | ||
1028 | # | 1080 | # |
1029 | # Multimedia devices | 1081 | # Multimedia devices |
@@ -1102,10 +1154,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y | |||
1102 | # CONFIG_FB_TRIDENT is not set | 1154 | # CONFIG_FB_TRIDENT is not set |
1103 | # CONFIG_FB_ARK is not set | 1155 | # CONFIG_FB_ARK is not set |
1104 | # CONFIG_FB_PM3 is not set | 1156 | # CONFIG_FB_PM3 is not set |
1157 | # CONFIG_FB_CARMINE is not set | ||
1105 | CONFIG_FB_IBM_GXT4500=y | 1158 | CONFIG_FB_IBM_GXT4500=y |
1106 | # CONFIG_FB_VIRTUAL is not set | 1159 | # CONFIG_FB_VIRTUAL is not set |
1107 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1160 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
1108 | CONFIG_LCD_CLASS_DEVICE=m | 1161 | CONFIG_LCD_CLASS_DEVICE=m |
1162 | # CONFIG_LCD_ILI9320 is not set | ||
1163 | CONFIG_LCD_PLATFORM=m | ||
1109 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1164 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1110 | # CONFIG_BACKLIGHT_CORGI is not set | 1165 | # CONFIG_BACKLIGHT_CORGI is not set |
1111 | 1166 | ||
@@ -1133,10 +1188,6 @@ CONFIG_LOGO=y | |||
1133 | CONFIG_LOGO_LINUX_MONO=y | 1188 | CONFIG_LOGO_LINUX_MONO=y |
1134 | CONFIG_LOGO_LINUX_VGA16=y | 1189 | CONFIG_LOGO_LINUX_VGA16=y |
1135 | CONFIG_LOGO_LINUX_CLUT224=y | 1190 | CONFIG_LOGO_LINUX_CLUT224=y |
1136 | |||
1137 | # | ||
1138 | # Sound | ||
1139 | # | ||
1140 | # CONFIG_SOUND is not set | 1191 | # CONFIG_SOUND is not set |
1141 | CONFIG_HID_SUPPORT=y | 1192 | CONFIG_HID_SUPPORT=y |
1142 | CONFIG_HID=y | 1193 | CONFIG_HID=y |
@@ -1165,6 +1216,7 @@ CONFIG_USB_DEVICEFS=y | |||
1165 | CONFIG_USB_DEVICE_CLASS=y | 1216 | CONFIG_USB_DEVICE_CLASS=y |
1166 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1217 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1167 | # CONFIG_USB_OTG is not set | 1218 | # CONFIG_USB_OTG is not set |
1219 | CONFIG_USB_MON=y | ||
1168 | 1220 | ||
1169 | # | 1221 | # |
1170 | # USB Host Controller Drivers | 1222 | # USB Host Controller Drivers |
@@ -1190,6 +1242,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1190 | # | 1242 | # |
1191 | # CONFIG_USB_ACM is not set | 1243 | # CONFIG_USB_ACM is not set |
1192 | # CONFIG_USB_PRINTER is not set | 1244 | # CONFIG_USB_PRINTER is not set |
1245 | # CONFIG_USB_WDM is not set | ||
1193 | 1246 | ||
1194 | # | 1247 | # |
1195 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1248 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1211,6 +1264,7 @@ CONFIG_USB_STORAGE=y | |||
1211 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1264 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1212 | CONFIG_USB_STORAGE_ONETOUCH=y | 1265 | CONFIG_USB_STORAGE_ONETOUCH=y |
1213 | # CONFIG_USB_STORAGE_KARMA is not set | 1266 | # CONFIG_USB_STORAGE_KARMA is not set |
1267 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1214 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1268 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1215 | # CONFIG_USB_LIBUSUAL is not set | 1269 | # CONFIG_USB_LIBUSUAL is not set |
1216 | 1270 | ||
@@ -1219,7 +1273,6 @@ CONFIG_USB_STORAGE_ONETOUCH=y | |||
1219 | # | 1273 | # |
1220 | # CONFIG_USB_MDC800 is not set | 1274 | # CONFIG_USB_MDC800 is not set |
1221 | # CONFIG_USB_MICROTEK is not set | 1275 | # CONFIG_USB_MICROTEK is not set |
1222 | CONFIG_USB_MON=y | ||
1223 | 1276 | ||
1224 | # | 1277 | # |
1225 | # USB port drivers | 1278 | # USB port drivers |
@@ -1233,7 +1286,6 @@ CONFIG_USB_MON=y | |||
1233 | # CONFIG_USB_EMI62 is not set | 1286 | # CONFIG_USB_EMI62 is not set |
1234 | # CONFIG_USB_EMI26 is not set | 1287 | # CONFIG_USB_EMI26 is not set |
1235 | # CONFIG_USB_ADUTUX is not set | 1288 | # CONFIG_USB_ADUTUX is not set |
1236 | # CONFIG_USB_AUERSWALD is not set | ||
1237 | # CONFIG_USB_RIO500 is not set | 1289 | # CONFIG_USB_RIO500 is not set |
1238 | # CONFIG_USB_LEGOTOWER is not set | 1290 | # CONFIG_USB_LEGOTOWER is not set |
1239 | # CONFIG_USB_LCD is not set | 1291 | # CONFIG_USB_LCD is not set |
@@ -1250,6 +1302,7 @@ CONFIG_USB_MON=y | |||
1250 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1302 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1251 | # CONFIG_USB_IOWARRIOR is not set | 1303 | # CONFIG_USB_IOWARRIOR is not set |
1252 | # CONFIG_USB_TEST is not set | 1304 | # CONFIG_USB_TEST is not set |
1305 | # CONFIG_USB_ISIGHTFW is not set | ||
1253 | # CONFIG_USB_GADGET is not set | 1306 | # CONFIG_USB_GADGET is not set |
1254 | # CONFIG_MMC is not set | 1307 | # CONFIG_MMC is not set |
1255 | # CONFIG_MEMSTICK is not set | 1308 | # CONFIG_MEMSTICK is not set |
@@ -1316,6 +1369,7 @@ CONFIG_XFS_POSIX_ACL=y | |||
1316 | # CONFIG_GFS2_FS is not set | 1369 | # CONFIG_GFS2_FS is not set |
1317 | CONFIG_OCFS2_FS=m | 1370 | CONFIG_OCFS2_FS=m |
1318 | CONFIG_OCFS2_FS_O2CB=m | 1371 | CONFIG_OCFS2_FS_O2CB=m |
1372 | CONFIG_OCFS2_FS_STATS=y | ||
1319 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1373 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
1320 | # CONFIG_OCFS2_DEBUG_FS is not set | 1374 | # CONFIG_OCFS2_DEBUG_FS is not set |
1321 | CONFIG_DNOTIFY=y | 1375 | CONFIG_DNOTIFY=y |
@@ -1371,6 +1425,7 @@ CONFIG_CONFIGFS_FS=m | |||
1371 | CONFIG_CRAMFS=y | 1425 | CONFIG_CRAMFS=y |
1372 | # CONFIG_VXFS_FS is not set | 1426 | # CONFIG_VXFS_FS is not set |
1373 | # CONFIG_MINIX_FS is not set | 1427 | # CONFIG_MINIX_FS is not set |
1428 | # CONFIG_OMFS_FS is not set | ||
1374 | # CONFIG_HPFS_FS is not set | 1429 | # CONFIG_HPFS_FS is not set |
1375 | # CONFIG_QNX4FS_FS is not set | 1430 | # CONFIG_QNX4FS_FS is not set |
1376 | # CONFIG_ROMFS_FS is not set | 1431 | # CONFIG_ROMFS_FS is not set |
@@ -1394,7 +1449,6 @@ CONFIG_NFS_COMMON=y | |||
1394 | CONFIG_SUNRPC=y | 1449 | CONFIG_SUNRPC=y |
1395 | CONFIG_SUNRPC_GSS=y | 1450 | CONFIG_SUNRPC_GSS=y |
1396 | CONFIG_SUNRPC_XPRT_RDMA=m | 1451 | CONFIG_SUNRPC_XPRT_RDMA=m |
1397 | # CONFIG_SUNRPC_BIND34 is not set | ||
1398 | CONFIG_RPCSEC_GSS_KRB5=y | 1452 | CONFIG_RPCSEC_GSS_KRB5=y |
1399 | CONFIG_RPCSEC_GSS_SPKM3=m | 1453 | CONFIG_RPCSEC_GSS_SPKM3=m |
1400 | # CONFIG_SMB_FS is not set | 1454 | # CONFIG_SMB_FS is not set |
@@ -1463,6 +1517,7 @@ CONFIG_BITREVERSE=y | |||
1463 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1517 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1464 | CONFIG_CRC_CCITT=m | 1518 | CONFIG_CRC_CCITT=m |
1465 | # CONFIG_CRC16 is not set | 1519 | # CONFIG_CRC16 is not set |
1520 | CONFIG_CRC_T10DIF=y | ||
1466 | CONFIG_CRC_ITU_T=m | 1521 | CONFIG_CRC_ITU_T=m |
1467 | CONFIG_CRC32=y | 1522 | CONFIG_CRC32=y |
1468 | # CONFIG_CRC7 is not set | 1523 | # CONFIG_CRC7 is not set |
@@ -1495,8 +1550,10 @@ CONFIG_DEBUG_FS=y | |||
1495 | CONFIG_DEBUG_KERNEL=y | 1550 | CONFIG_DEBUG_KERNEL=y |
1496 | # CONFIG_DEBUG_SHIRQ is not set | 1551 | # CONFIG_DEBUG_SHIRQ is not set |
1497 | CONFIG_DETECT_SOFTLOCKUP=y | 1552 | CONFIG_DETECT_SOFTLOCKUP=y |
1553 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1554 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1498 | CONFIG_SCHED_DEBUG=y | 1555 | CONFIG_SCHED_DEBUG=y |
1499 | # CONFIG_SCHEDSTATS is not set | 1556 | CONFIG_SCHEDSTATS=y |
1500 | # CONFIG_TIMER_STATS is not set | 1557 | # CONFIG_TIMER_STATS is not set |
1501 | # CONFIG_DEBUG_OBJECTS is not set | 1558 | # CONFIG_DEBUG_OBJECTS is not set |
1502 | # CONFIG_SLUB_DEBUG_ON is not set | 1559 | # CONFIG_SLUB_DEBUG_ON is not set |
@@ -1508,30 +1565,49 @@ CONFIG_SCHED_DEBUG=y | |||
1508 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 1565 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
1509 | # CONFIG_PROVE_LOCKING is not set | 1566 | # CONFIG_PROVE_LOCKING is not set |
1510 | # CONFIG_LOCK_STAT is not set | 1567 | # CONFIG_LOCK_STAT is not set |
1568 | CONFIG_TRACE_IRQFLAGS=y | ||
1511 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1569 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1512 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1570 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1571 | CONFIG_STACKTRACE=y | ||
1513 | # CONFIG_DEBUG_KOBJECT is not set | 1572 | # CONFIG_DEBUG_KOBJECT is not set |
1514 | CONFIG_DEBUG_BUGVERBOSE=y | 1573 | CONFIG_DEBUG_BUGVERBOSE=y |
1515 | # CONFIG_DEBUG_INFO is not set | 1574 | # CONFIG_DEBUG_INFO is not set |
1516 | # CONFIG_DEBUG_VM is not set | 1575 | # CONFIG_DEBUG_VM is not set |
1517 | # CONFIG_DEBUG_WRITECOUNT is not set | 1576 | # CONFIG_DEBUG_WRITECOUNT is not set |
1577 | CONFIG_DEBUG_MEMORY_INIT=y | ||
1518 | # CONFIG_DEBUG_LIST is not set | 1578 | # CONFIG_DEBUG_LIST is not set |
1519 | # CONFIG_DEBUG_SG is not set | 1579 | # CONFIG_DEBUG_SG is not set |
1580 | CONFIG_FRAME_POINTER=y | ||
1520 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1581 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1521 | # CONFIG_RCU_TORTURE_TEST is not set | 1582 | # CONFIG_RCU_TORTURE_TEST is not set |
1522 | # CONFIG_KPROBES_SANITY_TEST is not set | 1583 | # CONFIG_KPROBES_SANITY_TEST is not set |
1523 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1584 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1524 | # CONFIG_LKDTM is not set | 1585 | # CONFIG_LKDTM is not set |
1525 | # CONFIG_FAULT_INJECTION is not set | 1586 | # CONFIG_FAULT_INJECTION is not set |
1587 | CONFIG_LATENCYTOP=y | ||
1588 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1589 | CONFIG_HAVE_FTRACE=y | ||
1590 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1591 | CONFIG_TRACER_MAX_TRACE=y | ||
1592 | CONFIG_TRACING=y | ||
1593 | # CONFIG_FTRACE is not set | ||
1594 | CONFIG_IRQSOFF_TRACER=y | ||
1595 | CONFIG_SCHED_TRACER=y | ||
1596 | CONFIG_CONTEXT_SWITCH_TRACER=y | ||
1597 | # CONFIG_FTRACE_STARTUP_TEST is not set | ||
1526 | # CONFIG_SAMPLES is not set | 1598 | # CONFIG_SAMPLES is not set |
1599 | CONFIG_HAVE_ARCH_KGDB=y | ||
1600 | # CONFIG_KGDB is not set | ||
1527 | CONFIG_DEBUG_STACKOVERFLOW=y | 1601 | CONFIG_DEBUG_STACKOVERFLOW=y |
1528 | # CONFIG_DEBUG_STACK_USAGE is not set | 1602 | # CONFIG_DEBUG_STACK_USAGE is not set |
1529 | # CONFIG_DEBUG_PAGEALLOC is not set | 1603 | # CONFIG_DEBUG_PAGEALLOC is not set |
1530 | CONFIG_HCALL_STATS=y | 1604 | CONFIG_HCALL_STATS=y |
1531 | CONFIG_DEBUGGER=y | 1605 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1606 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1532 | CONFIG_XMON=y | 1607 | CONFIG_XMON=y |
1533 | CONFIG_XMON_DEFAULT=y | 1608 | CONFIG_XMON_DEFAULT=y |
1534 | CONFIG_XMON_DISASSEMBLY=y | 1609 | CONFIG_XMON_DISASSEMBLY=y |
1610 | CONFIG_DEBUGGER=y | ||
1535 | CONFIG_IRQSTACKS=y | 1611 | CONFIG_IRQSTACKS=y |
1536 | CONFIG_VIRQ_DEBUG=y | 1612 | CONFIG_VIRQ_DEBUG=y |
1537 | # CONFIG_BOOTX_TEXT is not set | 1613 | # CONFIG_BOOTX_TEXT is not set |
@@ -1590,6 +1666,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
1590 | CONFIG_CRYPTO_MD4=m | 1666 | CONFIG_CRYPTO_MD4=m |
1591 | CONFIG_CRYPTO_MD5=y | 1667 | CONFIG_CRYPTO_MD5=y |
1592 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1668 | CONFIG_CRYPTO_MICHAEL_MIC=m |
1669 | # CONFIG_CRYPTO_RMD128 is not set | ||
1670 | # CONFIG_CRYPTO_RMD160 is not set | ||
1671 | # CONFIG_CRYPTO_RMD256 is not set | ||
1672 | # CONFIG_CRYPTO_RMD320 is not set | ||
1593 | CONFIG_CRYPTO_SHA1=m | 1673 | CONFIG_CRYPTO_SHA1=m |
1594 | CONFIG_CRYPTO_SHA256=m | 1674 | CONFIG_CRYPTO_SHA256=m |
1595 | CONFIG_CRYPTO_SHA512=m | 1675 | CONFIG_CRYPTO_SHA512=m |
diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/sbc8641d_defconfig index 8227510b41a9..f545421f9857 100644 --- a/arch/powerpc/configs/sbc8641d_defconfig +++ b/arch/powerpc/configs/sbc8641d_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:19 2008 | 4 | # Thu Aug 21 00:52:15 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -33,6 +33,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 33 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
34 | CONFIG_IRQ_PER_CPU=y | 34 | CONFIG_IRQ_PER_CPU=y |
35 | CONFIG_STACKTRACE_SUPPORT=y | 35 | CONFIG_STACKTRACE_SUPPORT=y |
36 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
36 | CONFIG_LOCKDEP_SUPPORT=y | 37 | CONFIG_LOCKDEP_SUPPORT=y |
37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 38 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
38 | CONFIG_GENERIC_LOCKBREAK=y | 39 | CONFIG_GENERIC_LOCKBREAK=y |
@@ -92,7 +93,6 @@ CONFIG_INITRAMFS_SOURCE="" | |||
92 | CONFIG_SYSCTL=y | 93 | CONFIG_SYSCTL=y |
93 | CONFIG_EMBEDDED=y | 94 | CONFIG_EMBEDDED=y |
94 | CONFIG_SYSCTL_SYSCALL=y | 95 | CONFIG_SYSCTL_SYSCALL=y |
95 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
96 | CONFIG_KALLSYMS=y | 96 | CONFIG_KALLSYMS=y |
97 | # CONFIG_KALLSYMS_ALL is not set | 97 | # CONFIG_KALLSYMS_ALL is not set |
98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 98 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
@@ -100,6 +100,7 @@ CONFIG_HOTPLUG=y | |||
100 | CONFIG_PRINTK=y | 100 | CONFIG_PRINTK=y |
101 | CONFIG_BUG=y | 101 | CONFIG_BUG=y |
102 | CONFIG_ELF_CORE=y | 102 | CONFIG_ELF_CORE=y |
103 | CONFIG_PCSPKR_PLATFORM=y | ||
103 | CONFIG_COMPAT_BRK=y | 104 | CONFIG_COMPAT_BRK=y |
104 | CONFIG_BASE_FULL=y | 105 | CONFIG_BASE_FULL=y |
105 | CONFIG_FUTEX=y | 106 | CONFIG_FUTEX=y |
@@ -117,10 +118,16 @@ CONFIG_SLAB=y | |||
117 | # CONFIG_MARKERS is not set | 118 | # CONFIG_MARKERS is not set |
118 | CONFIG_HAVE_OPROFILE=y | 119 | CONFIG_HAVE_OPROFILE=y |
119 | # CONFIG_KPROBES is not set | 120 | # CONFIG_KPROBES is not set |
121 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
122 | CONFIG_HAVE_IOREMAP_PROT=y | ||
120 | CONFIG_HAVE_KPROBES=y | 123 | CONFIG_HAVE_KPROBES=y |
121 | CONFIG_HAVE_KRETPROBES=y | 124 | CONFIG_HAVE_KRETPROBES=y |
125 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
122 | # CONFIG_HAVE_DMA_ATTRS is not set | 126 | # CONFIG_HAVE_DMA_ATTRS is not set |
127 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
128 | # CONFIG_HAVE_CLK is not set | ||
123 | CONFIG_PROC_PAGE_MONITOR=y | 129 | CONFIG_PROC_PAGE_MONITOR=y |
130 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
124 | CONFIG_SLABINFO=y | 131 | CONFIG_SLABINFO=y |
125 | CONFIG_RT_MUTEXES=y | 132 | CONFIG_RT_MUTEXES=y |
126 | # CONFIG_TINY_SHMEM is not set | 133 | # CONFIG_TINY_SHMEM is not set |
@@ -138,6 +145,7 @@ CONFIG_BLOCK=y | |||
138 | # CONFIG_BLK_DEV_IO_TRACE is not set | 145 | # CONFIG_BLK_DEV_IO_TRACE is not set |
139 | # CONFIG_LSF is not set | 146 | # CONFIG_LSF is not set |
140 | # CONFIG_BLK_DEV_BSG is not set | 147 | # CONFIG_BLK_DEV_BSG is not set |
148 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
141 | 149 | ||
142 | # | 150 | # |
143 | # IO Schedulers | 151 | # IO Schedulers |
@@ -156,30 +164,40 @@ CONFIG_CLASSIC_RCU=y | |||
156 | # | 164 | # |
157 | # Platform support | 165 | # Platform support |
158 | # | 166 | # |
159 | # CONFIG_PPC_MULTIPLATFORM is not set | 167 | CONFIG_PPC_MULTIPLATFORM=y |
160 | # CONFIG_PPC_82xx is not set | 168 | CONFIG_CLASSIC32=y |
161 | # CONFIG_PPC_83xx is not set | 169 | CONFIG_PPC_CHRP=y |
162 | CONFIG_PPC_86xx=y | 170 | # CONFIG_MPC5121_ADS is not set |
163 | # CONFIG_PPC_MPC512x is not set | 171 | # CONFIG_MPC5121_GENERIC is not set |
164 | # CONFIG_PPC_MPC5121 is not set | 172 | # CONFIG_PPC_MPC52xx is not set |
173 | CONFIG_PPC_PMAC=y | ||
165 | # CONFIG_PPC_CELL is not set | 174 | # CONFIG_PPC_CELL is not set |
166 | # CONFIG_PPC_CELL_NATIVE is not set | 175 | # CONFIG_PPC_CELL_NATIVE is not set |
176 | # CONFIG_PPC_82xx is not set | ||
167 | # CONFIG_PQ2ADS is not set | 177 | # CONFIG_PQ2ADS is not set |
178 | # CONFIG_PPC_83xx is not set | ||
179 | CONFIG_PPC_86xx=y | ||
168 | # CONFIG_MPC8641_HPCN is not set | 180 | # CONFIG_MPC8641_HPCN is not set |
169 | CONFIG_SBC8641D=y | 181 | CONFIG_SBC8641D=y |
170 | # CONFIG_MPC8610_HPCD is not set | 182 | # CONFIG_MPC8610_HPCD is not set |
171 | CONFIG_MPC8641=y | 183 | CONFIG_MPC8641=y |
184 | CONFIG_PPC_NATIVE=y | ||
185 | # CONFIG_UDBG_RTAS_CONSOLE is not set | ||
172 | # CONFIG_IPIC is not set | 186 | # CONFIG_IPIC is not set |
173 | CONFIG_MPIC=y | 187 | CONFIG_MPIC=y |
174 | # CONFIG_MPIC_WEIRD is not set | 188 | # CONFIG_MPIC_WEIRD is not set |
175 | # CONFIG_PPC_I8259 is not set | 189 | CONFIG_PPC_I8259=y |
176 | # CONFIG_PPC_RTAS is not set | 190 | CONFIG_PPC_RTAS=y |
191 | # CONFIG_RTAS_ERROR_LOGGING is not set | ||
192 | CONFIG_RTAS_PROC=y | ||
177 | # CONFIG_MMIO_NVRAM is not set | 193 | # CONFIG_MMIO_NVRAM is not set |
178 | # CONFIG_PPC_MPC106 is not set | 194 | CONFIG_PPC_MPC106=y |
179 | # CONFIG_PPC_970_NAP is not set | 195 | # CONFIG_PPC_970_NAP is not set |
180 | # CONFIG_PPC_INDIRECT_IO is not set | 196 | # CONFIG_PPC_INDIRECT_IO is not set |
181 | # CONFIG_GENERIC_IOMAP is not set | 197 | # CONFIG_GENERIC_IOMAP is not set |
182 | # CONFIG_CPU_FREQ is not set | 198 | # CONFIG_CPU_FREQ is not set |
199 | # CONFIG_PPC601_SYNC_FIX is not set | ||
200 | # CONFIG_TAU is not set | ||
183 | # CONFIG_FSL_ULI1575 is not set | 201 | # CONFIG_FSL_ULI1575 is not set |
184 | 202 | ||
185 | # | 203 | # |
@@ -195,7 +213,7 @@ CONFIG_HZ_250=y | |||
195 | # CONFIG_HZ_300 is not set | 213 | # CONFIG_HZ_300 is not set |
196 | # CONFIG_HZ_1000 is not set | 214 | # CONFIG_HZ_1000 is not set |
197 | CONFIG_HZ=250 | 215 | CONFIG_HZ=250 |
198 | # CONFIG_SCHED_HRTICK is not set | 216 | CONFIG_SCHED_HRTICK=y |
199 | # CONFIG_PREEMPT_NONE is not set | 217 | # CONFIG_PREEMPT_NONE is not set |
200 | # CONFIG_PREEMPT_VOLUNTARY is not set | 218 | # CONFIG_PREEMPT_VOLUNTARY is not set |
201 | CONFIG_PREEMPT=y | 219 | CONFIG_PREEMPT=y |
@@ -203,9 +221,11 @@ CONFIG_PREEMPT=y | |||
203 | CONFIG_BINFMT_ELF=y | 221 | CONFIG_BINFMT_ELF=y |
204 | CONFIG_BINFMT_MISC=m | 222 | CONFIG_BINFMT_MISC=m |
205 | # CONFIG_IOMMU_HELPER is not set | 223 | # CONFIG_IOMMU_HELPER is not set |
224 | # CONFIG_HOTPLUG_CPU is not set | ||
206 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 225 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
207 | CONFIG_ARCH_HAS_WALK_MEMORY=y | 226 | CONFIG_ARCH_HAS_WALK_MEMORY=y |
208 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y | 227 | CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y |
228 | # CONFIG_KEXEC is not set | ||
209 | CONFIG_IRQ_ALL_CPUS=y | 229 | CONFIG_IRQ_ALL_CPUS=y |
210 | CONFIG_ARCH_FLATMEM_ENABLE=y | 230 | CONFIG_ARCH_FLATMEM_ENABLE=y |
211 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 231 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
@@ -219,6 +239,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
219 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 239 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
220 | CONFIG_PAGEFLAGS_EXTENDED=y | 240 | CONFIG_PAGEFLAGS_EXTENDED=y |
221 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 241 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
242 | CONFIG_MIGRATION=y | ||
222 | # CONFIG_RESOURCES_64BIT is not set | 243 | # CONFIG_RESOURCES_64BIT is not set |
223 | CONFIG_ZONE_DMA_FLAG=1 | 244 | CONFIG_ZONE_DMA_FLAG=1 |
224 | CONFIG_BOUNCE=y | 245 | CONFIG_BOUNCE=y |
@@ -226,6 +247,7 @@ CONFIG_VIRT_TO_BUS=y | |||
226 | CONFIG_FORCE_MAX_ZONEORDER=11 | 247 | CONFIG_FORCE_MAX_ZONEORDER=11 |
227 | # CONFIG_PROC_DEVICETREE is not set | 248 | # CONFIG_PROC_DEVICETREE is not set |
228 | # CONFIG_CMDLINE_BOOL is not set | 249 | # CONFIG_CMDLINE_BOOL is not set |
250 | CONFIG_EXTRA_TARGETS="" | ||
229 | # CONFIG_PM is not set | 251 | # CONFIG_PM is not set |
230 | CONFIG_SECCOMP=y | 252 | CONFIG_SECCOMP=y |
231 | CONFIG_ISA_DMA_API=y | 253 | CONFIG_ISA_DMA_API=y |
@@ -233,11 +255,13 @@ CONFIG_ISA_DMA_API=y | |||
233 | # | 255 | # |
234 | # Bus options | 256 | # Bus options |
235 | # | 257 | # |
258 | # CONFIG_ISA is not set | ||
236 | CONFIG_ZONE_DMA=y | 259 | CONFIG_ZONE_DMA=y |
237 | CONFIG_GENERIC_ISA_DMA=y | 260 | CONFIG_GENERIC_ISA_DMA=y |
238 | CONFIG_PPC_INDIRECT_PCI=y | 261 | CONFIG_PPC_INDIRECT_PCI=y |
239 | CONFIG_FSL_SOC=y | 262 | CONFIG_FSL_SOC=y |
240 | CONFIG_FSL_PCI=y | 263 | CONFIG_FSL_PCI=y |
264 | CONFIG_PPC_PCI_CHOICE=y | ||
241 | CONFIG_PCI=y | 265 | CONFIG_PCI=y |
242 | CONFIG_PCI_DOMAINS=y | 266 | CONFIG_PCI_DOMAINS=y |
243 | CONFIG_PCI_SYSCALL=y | 267 | CONFIG_PCI_SYSCALL=y |
@@ -265,10 +289,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
265 | CONFIG_KERNEL_START=0xc0000000 | 289 | CONFIG_KERNEL_START=0xc0000000 |
266 | CONFIG_PHYSICAL_START=0x00000000 | 290 | CONFIG_PHYSICAL_START=0x00000000 |
267 | CONFIG_TASK_SIZE=0xc0000000 | 291 | CONFIG_TASK_SIZE=0xc0000000 |
268 | |||
269 | # | ||
270 | # Networking | ||
271 | # | ||
272 | CONFIG_NET=y | 292 | CONFIG_NET=y |
273 | 293 | ||
274 | # | 294 | # |
@@ -282,6 +302,7 @@ CONFIG_XFRM_USER=m | |||
282 | # CONFIG_XFRM_SUB_POLICY is not set | 302 | # CONFIG_XFRM_SUB_POLICY is not set |
283 | # CONFIG_XFRM_MIGRATE is not set | 303 | # CONFIG_XFRM_MIGRATE is not set |
284 | # CONFIG_XFRM_STATISTICS is not set | 304 | # CONFIG_XFRM_STATISTICS is not set |
305 | CONFIG_XFRM_IPCOMP=m | ||
285 | CONFIG_NET_KEY=m | 306 | CONFIG_NET_KEY=m |
286 | # CONFIG_NET_KEY_MIGRATE is not set | 307 | # CONFIG_NET_KEY_MIGRATE is not set |
287 | CONFIG_INET=y | 308 | CONFIG_INET=y |
@@ -406,6 +427,7 @@ CONFIG_IP_NF_MANGLE=m | |||
406 | CONFIG_IP_NF_TARGET_ECN=m | 427 | CONFIG_IP_NF_TARGET_ECN=m |
407 | # CONFIG_IP_NF_TARGET_TTL is not set | 428 | # CONFIG_IP_NF_TARGET_TTL is not set |
408 | CONFIG_IP_NF_RAW=m | 429 | CONFIG_IP_NF_RAW=m |
430 | # CONFIG_IP_NF_SECURITY is not set | ||
409 | CONFIG_IP_NF_ARPTABLES=m | 431 | CONFIG_IP_NF_ARPTABLES=m |
410 | CONFIG_IP_NF_ARPFILTER=m | 432 | CONFIG_IP_NF_ARPFILTER=m |
411 | CONFIG_IP_NF_ARP_MANGLE=m | 433 | CONFIG_IP_NF_ARP_MANGLE=m |
@@ -429,6 +451,7 @@ CONFIG_IP6_NF_TARGET_LOG=m | |||
429 | CONFIG_IP6_NF_MANGLE=m | 451 | CONFIG_IP6_NF_MANGLE=m |
430 | # CONFIG_IP6_NF_TARGET_HL is not set | 452 | # CONFIG_IP6_NF_TARGET_HL is not set |
431 | CONFIG_IP6_NF_RAW=m | 453 | CONFIG_IP6_NF_RAW=m |
454 | # CONFIG_IP6_NF_SECURITY is not set | ||
432 | 455 | ||
433 | # | 456 | # |
434 | # Bridge: Netfilter Configuration | 457 | # Bridge: Netfilter Configuration |
@@ -451,8 +474,10 @@ CONFIG_ATM_LANE=m | |||
451 | CONFIG_ATM_MPOA=m | 474 | CONFIG_ATM_MPOA=m |
452 | CONFIG_ATM_BR2684=m | 475 | CONFIG_ATM_BR2684=m |
453 | # CONFIG_ATM_BR2684_IPFILTER is not set | 476 | # CONFIG_ATM_BR2684_IPFILTER is not set |
477 | CONFIG_STP=m | ||
454 | CONFIG_BRIDGE=m | 478 | CONFIG_BRIDGE=m |
455 | CONFIG_VLAN_8021Q=m | 479 | CONFIG_VLAN_8021Q=m |
480 | # CONFIG_VLAN_8021Q_GVRP is not set | ||
456 | # CONFIG_DECNET is not set | 481 | # CONFIG_DECNET is not set |
457 | CONFIG_LLC=m | 482 | CONFIG_LLC=m |
458 | # CONFIG_LLC2 is not set | 483 | # CONFIG_LLC2 is not set |
@@ -472,7 +497,6 @@ CONFIG_NET_SCH_HTB=m | |||
472 | CONFIG_NET_SCH_HFSC=m | 497 | CONFIG_NET_SCH_HFSC=m |
473 | CONFIG_NET_SCH_ATM=m | 498 | CONFIG_NET_SCH_ATM=m |
474 | CONFIG_NET_SCH_PRIO=m | 499 | CONFIG_NET_SCH_PRIO=m |
475 | # CONFIG_NET_SCH_RR is not set | ||
476 | CONFIG_NET_SCH_RED=m | 500 | CONFIG_NET_SCH_RED=m |
477 | CONFIG_NET_SCH_SFQ=m | 501 | CONFIG_NET_SCH_SFQ=m |
478 | CONFIG_NET_SCH_TEQL=m | 502 | CONFIG_NET_SCH_TEQL=m |
@@ -625,6 +649,7 @@ CONFIG_OF_I2C=y | |||
625 | # CONFIG_PARPORT is not set | 649 | # CONFIG_PARPORT is not set |
626 | CONFIG_BLK_DEV=y | 650 | CONFIG_BLK_DEV=y |
627 | # CONFIG_BLK_DEV_FD is not set | 651 | # CONFIG_BLK_DEV_FD is not set |
652 | # CONFIG_MAC_FLOPPY is not set | ||
628 | # CONFIG_BLK_CPQ_DA is not set | 653 | # CONFIG_BLK_CPQ_DA is not set |
629 | # CONFIG_BLK_CPQ_CISS_DA is not set | 654 | # CONFIG_BLK_CPQ_CISS_DA is not set |
630 | # CONFIG_BLK_DEV_DAC960 is not set | 655 | # CONFIG_BLK_DEV_DAC960 is not set |
@@ -640,12 +665,14 @@ CONFIG_BLK_DEV_RAM_SIZE=4096 | |||
640 | # CONFIG_BLK_DEV_XIP is not set | 665 | # CONFIG_BLK_DEV_XIP is not set |
641 | # CONFIG_CDROM_PKTCDVD is not set | 666 | # CONFIG_CDROM_PKTCDVD is not set |
642 | # CONFIG_ATA_OVER_ETH is not set | 667 | # CONFIG_ATA_OVER_ETH is not set |
668 | # CONFIG_BLK_DEV_HD is not set | ||
643 | CONFIG_MISC_DEVICES=y | 669 | CONFIG_MISC_DEVICES=y |
644 | # CONFIG_PHANTOM is not set | 670 | # CONFIG_PHANTOM is not set |
645 | # CONFIG_EEPROM_93CX6 is not set | 671 | # CONFIG_EEPROM_93CX6 is not set |
646 | # CONFIG_SGI_IOC4 is not set | 672 | # CONFIG_SGI_IOC4 is not set |
647 | # CONFIG_TIFM_CORE is not set | 673 | # CONFIG_TIFM_CORE is not set |
648 | # CONFIG_ENCLOSURE_SERVICES is not set | 674 | # CONFIG_ENCLOSURE_SERVICES is not set |
675 | # CONFIG_HP_ILO is not set | ||
649 | CONFIG_HAVE_IDE=y | 676 | CONFIG_HAVE_IDE=y |
650 | # CONFIG_IDE is not set | 677 | # CONFIG_IDE is not set |
651 | 678 | ||
@@ -680,12 +707,15 @@ CONFIG_DM_ZERO=y | |||
680 | # | 707 | # |
681 | # IEEE 1394 (FireWire) support | 708 | # IEEE 1394 (FireWire) support |
682 | # | 709 | # |
710 | |||
711 | # | ||
712 | # Enable only one of the two stacks, unless you know what you are doing | ||
713 | # | ||
683 | # CONFIG_FIREWIRE is not set | 714 | # CONFIG_FIREWIRE is not set |
684 | # CONFIG_IEEE1394 is not set | 715 | # CONFIG_IEEE1394 is not set |
685 | # CONFIG_I2O is not set | 716 | # CONFIG_I2O is not set |
686 | # CONFIG_MACINTOSH_DRIVERS is not set | 717 | # CONFIG_MACINTOSH_DRIVERS is not set |
687 | CONFIG_NETDEVICES=y | 718 | CONFIG_NETDEVICES=y |
688 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
689 | CONFIG_DUMMY=m | 719 | CONFIG_DUMMY=m |
690 | CONFIG_BONDING=m | 720 | CONFIG_BONDING=m |
691 | # CONFIG_MACVLAN is not set | 721 | # CONFIG_MACVLAN is not set |
@@ -712,6 +742,8 @@ CONFIG_BROADCOM_PHY=y | |||
712 | # CONFIG_MDIO_BITBANG is not set | 742 | # CONFIG_MDIO_BITBANG is not set |
713 | CONFIG_NET_ETHERNET=y | 743 | CONFIG_NET_ETHERNET=y |
714 | CONFIG_MII=y | 744 | CONFIG_MII=y |
745 | # CONFIG_MACE is not set | ||
746 | # CONFIG_BMAC is not set | ||
715 | # CONFIG_HAPPYMEAL is not set | 747 | # CONFIG_HAPPYMEAL is not set |
716 | # CONFIG_SUNGEM is not set | 748 | # CONFIG_SUNGEM is not set |
717 | # CONFIG_CASSINI is not set | 749 | # CONFIG_CASSINI is not set |
@@ -729,7 +761,6 @@ CONFIG_NETDEV_1000=y | |||
729 | # CONFIG_DL2K is not set | 761 | # CONFIG_DL2K is not set |
730 | # CONFIG_E1000 is not set | 762 | # CONFIG_E1000 is not set |
731 | # CONFIG_E1000E is not set | 763 | # CONFIG_E1000E is not set |
732 | # CONFIG_E1000E_ENABLED is not set | ||
733 | # CONFIG_IP1000 is not set | 764 | # CONFIG_IP1000 is not set |
734 | # CONFIG_IGB is not set | 765 | # CONFIG_IGB is not set |
735 | # CONFIG_NS83820 is not set | 766 | # CONFIG_NS83820 is not set |
@@ -743,9 +774,10 @@ CONFIG_NETDEV_1000=y | |||
743 | # CONFIG_TIGON3 is not set | 774 | # CONFIG_TIGON3 is not set |
744 | # CONFIG_BNX2 is not set | 775 | # CONFIG_BNX2 is not set |
745 | CONFIG_GIANFAR=y | 776 | CONFIG_GIANFAR=y |
746 | # CONFIG_GFAR_NAPI is not set | 777 | # CONFIG_MV643XX_ETH is not set |
747 | # CONFIG_QLA3XXX is not set | 778 | # CONFIG_QLA3XXX is not set |
748 | # CONFIG_ATL1 is not set | 779 | # CONFIG_ATL1 is not set |
780 | # CONFIG_ATL1E is not set | ||
749 | # CONFIG_NETDEV_10000 is not set | 781 | # CONFIG_NETDEV_10000 is not set |
750 | # CONFIG_TR is not set | 782 | # CONFIG_TR is not set |
751 | 783 | ||
@@ -768,7 +800,7 @@ CONFIG_ATM_DRIVERS=y | |||
768 | # CONFIG_ATM_AMBASSADOR is not set | 800 | # CONFIG_ATM_AMBASSADOR is not set |
769 | # CONFIG_ATM_HORIZON is not set | 801 | # CONFIG_ATM_HORIZON is not set |
770 | # CONFIG_ATM_IA is not set | 802 | # CONFIG_ATM_IA is not set |
771 | # CONFIG_ATM_FORE200E_MAYBE is not set | 803 | # CONFIG_ATM_FORE200E is not set |
772 | # CONFIG_ATM_HE is not set | 804 | # CONFIG_ATM_HE is not set |
773 | # CONFIG_FDDI is not set | 805 | # CONFIG_FDDI is not set |
774 | # CONFIG_HIPPI is not set | 806 | # CONFIG_HIPPI is not set |
@@ -834,6 +866,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
834 | # Character devices | 866 | # Character devices |
835 | # | 867 | # |
836 | CONFIG_VT=y | 868 | CONFIG_VT=y |
869 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
837 | CONFIG_VT_CONSOLE=y | 870 | CONFIG_VT_CONSOLE=y |
838 | CONFIG_HW_CONSOLE=y | 871 | CONFIG_HW_CONSOLE=y |
839 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 872 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
@@ -857,11 +890,14 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | |||
857 | # CONFIG_SERIAL_UARTLITE is not set | 890 | # CONFIG_SERIAL_UARTLITE is not set |
858 | CONFIG_SERIAL_CORE=y | 891 | CONFIG_SERIAL_CORE=y |
859 | CONFIG_SERIAL_CORE_CONSOLE=y | 892 | CONFIG_SERIAL_CORE_CONSOLE=y |
893 | # CONFIG_SERIAL_PMACZILOG is not set | ||
860 | # CONFIG_SERIAL_JSM is not set | 894 | # CONFIG_SERIAL_JSM is not set |
861 | # CONFIG_SERIAL_OF_PLATFORM is not set | 895 | # CONFIG_SERIAL_OF_PLATFORM is not set |
862 | CONFIG_UNIX98_PTYS=y | 896 | CONFIG_UNIX98_PTYS=y |
863 | CONFIG_LEGACY_PTYS=y | 897 | CONFIG_LEGACY_PTYS=y |
864 | CONFIG_LEGACY_PTY_COUNT=256 | 898 | CONFIG_LEGACY_PTY_COUNT=256 |
899 | # CONFIG_BRIQ_PANEL is not set | ||
900 | # CONFIG_HVC_RTAS is not set | ||
865 | # CONFIG_IPMI_HANDLER is not set | 901 | # CONFIG_IPMI_HANDLER is not set |
866 | CONFIG_HW_RANDOM=m | 902 | CONFIG_HW_RANDOM=m |
867 | # CONFIG_NVRAM is not set | 903 | # CONFIG_NVRAM is not set |
@@ -874,42 +910,69 @@ CONFIG_DEVPORT=y | |||
874 | CONFIG_I2C=y | 910 | CONFIG_I2C=y |
875 | CONFIG_I2C_BOARDINFO=y | 911 | CONFIG_I2C_BOARDINFO=y |
876 | CONFIG_I2C_CHARDEV=y | 912 | CONFIG_I2C_CHARDEV=y |
913 | CONFIG_I2C_HELPER_AUTO=y | ||
877 | 914 | ||
878 | # | 915 | # |
879 | # I2C Hardware Bus support | 916 | # I2C Hardware Bus support |
880 | # | 917 | # |
918 | |||
919 | # | ||
920 | # PC SMBus host controller drivers | ||
921 | # | ||
881 | # CONFIG_I2C_ALI1535 is not set | 922 | # CONFIG_I2C_ALI1535 is not set |
882 | # CONFIG_I2C_ALI1563 is not set | 923 | # CONFIG_I2C_ALI1563 is not set |
883 | # CONFIG_I2C_ALI15X3 is not set | 924 | # CONFIG_I2C_ALI15X3 is not set |
884 | # CONFIG_I2C_AMD756 is not set | 925 | # CONFIG_I2C_AMD756 is not set |
885 | # CONFIG_I2C_AMD8111 is not set | 926 | # CONFIG_I2C_AMD8111 is not set |
886 | # CONFIG_I2C_I801 is not set | 927 | # CONFIG_I2C_I801 is not set |
887 | # CONFIG_I2C_I810 is not set | 928 | # CONFIG_I2C_ISCH is not set |
888 | # CONFIG_I2C_PIIX4 is not set | 929 | # CONFIG_I2C_PIIX4 is not set |
889 | CONFIG_I2C_MPC=y | ||
890 | # CONFIG_I2C_NFORCE2 is not set | 930 | # CONFIG_I2C_NFORCE2 is not set |
891 | # CONFIG_I2C_OCORES is not set | ||
892 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
893 | # CONFIG_I2C_PROSAVAGE is not set | ||
894 | # CONFIG_I2C_SAVAGE4 is not set | ||
895 | # CONFIG_I2C_SIMTEC is not set | ||
896 | # CONFIG_I2C_SIS5595 is not set | 931 | # CONFIG_I2C_SIS5595 is not set |
897 | # CONFIG_I2C_SIS630 is not set | 932 | # CONFIG_I2C_SIS630 is not set |
898 | # CONFIG_I2C_SIS96X is not set | 933 | # CONFIG_I2C_SIS96X is not set |
899 | # CONFIG_I2C_TAOS_EVM is not set | ||
900 | # CONFIG_I2C_STUB is not set | ||
901 | # CONFIG_I2C_VIA is not set | 934 | # CONFIG_I2C_VIA is not set |
902 | # CONFIG_I2C_VIAPRO is not set | 935 | # CONFIG_I2C_VIAPRO is not set |
936 | |||
937 | # | ||
938 | # Mac SMBus host controller drivers | ||
939 | # | ||
940 | # CONFIG_I2C_HYDRA is not set | ||
941 | CONFIG_I2C_POWERMAC=y | ||
942 | |||
943 | # | ||
944 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
945 | # | ||
946 | CONFIG_I2C_MPC=y | ||
947 | # CONFIG_I2C_OCORES is not set | ||
948 | # CONFIG_I2C_SIMTEC is not set | ||
949 | |||
950 | # | ||
951 | # External I2C/SMBus adapter drivers | ||
952 | # | ||
953 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
954 | # CONFIG_I2C_TAOS_EVM is not set | ||
955 | |||
956 | # | ||
957 | # Graphics adapter I2C/DDC channel drivers | ||
958 | # | ||
903 | # CONFIG_I2C_VOODOO3 is not set | 959 | # CONFIG_I2C_VOODOO3 is not set |
960 | |||
961 | # | ||
962 | # Other I2C/SMBus bus drivers | ||
963 | # | ||
904 | # CONFIG_I2C_PCA_PLATFORM is not set | 964 | # CONFIG_I2C_PCA_PLATFORM is not set |
965 | # CONFIG_I2C_STUB is not set | ||
905 | 966 | ||
906 | # | 967 | # |
907 | # Miscellaneous I2C Chip support | 968 | # Miscellaneous I2C Chip support |
908 | # | 969 | # |
909 | # CONFIG_DS1682 is not set | 970 | # CONFIG_DS1682 is not set |
971 | # CONFIG_AT24 is not set | ||
910 | # CONFIG_SENSORS_EEPROM is not set | 972 | # CONFIG_SENSORS_EEPROM is not set |
911 | # CONFIG_SENSORS_PCF8574 is not set | 973 | # CONFIG_SENSORS_PCF8574 is not set |
912 | # CONFIG_PCF8575 is not set | 974 | # CONFIG_PCF8575 is not set |
975 | # CONFIG_SENSORS_PCA9539 is not set | ||
913 | # CONFIG_SENSORS_PCF8591 is not set | 976 | # CONFIG_SENSORS_PCF8591 is not set |
914 | # CONFIG_SENSORS_MAX6875 is not set | 977 | # CONFIG_SENSORS_MAX6875 is not set |
915 | # CONFIG_SENSORS_TSL2550 is not set | 978 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -918,10 +981,13 @@ CONFIG_I2C_MPC=y | |||
918 | # CONFIG_I2C_DEBUG_BUS is not set | 981 | # CONFIG_I2C_DEBUG_BUS is not set |
919 | # CONFIG_I2C_DEBUG_CHIP is not set | 982 | # CONFIG_I2C_DEBUG_CHIP is not set |
920 | # CONFIG_SPI is not set | 983 | # CONFIG_SPI is not set |
984 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
985 | # CONFIG_GPIOLIB is not set | ||
921 | # CONFIG_W1 is not set | 986 | # CONFIG_W1 is not set |
922 | # CONFIG_POWER_SUPPLY is not set | 987 | # CONFIG_POWER_SUPPLY is not set |
923 | CONFIG_HWMON=y | 988 | CONFIG_HWMON=y |
924 | # CONFIG_HWMON_VID is not set | 989 | # CONFIG_HWMON_VID is not set |
990 | # CONFIG_SENSORS_AD7414 is not set | ||
925 | # CONFIG_SENSORS_AD7418 is not set | 991 | # CONFIG_SENSORS_AD7418 is not set |
926 | # CONFIG_SENSORS_ADM1021 is not set | 992 | # CONFIG_SENSORS_ADM1021 is not set |
927 | # CONFIG_SENSORS_ADM1025 is not set | 993 | # CONFIG_SENSORS_ADM1025 is not set |
@@ -931,6 +997,7 @@ CONFIG_HWMON=y | |||
931 | # CONFIG_SENSORS_ADM9240 is not set | 997 | # CONFIG_SENSORS_ADM9240 is not set |
932 | # CONFIG_SENSORS_ADT7470 is not set | 998 | # CONFIG_SENSORS_ADT7470 is not set |
933 | # CONFIG_SENSORS_ADT7473 is not set | 999 | # CONFIG_SENSORS_ADT7473 is not set |
1000 | # CONFIG_SENSORS_AMS is not set | ||
934 | # CONFIG_SENSORS_ATXP1 is not set | 1001 | # CONFIG_SENSORS_ATXP1 is not set |
935 | # CONFIG_SENSORS_DS1621 is not set | 1002 | # CONFIG_SENSORS_DS1621 is not set |
936 | # CONFIG_SENSORS_I5K_AMB is not set | 1003 | # CONFIG_SENSORS_I5K_AMB is not set |
@@ -975,6 +1042,7 @@ CONFIG_HWMON=y | |||
975 | # CONFIG_SENSORS_W83627EHF is not set | 1042 | # CONFIG_SENSORS_W83627EHF is not set |
976 | # CONFIG_HWMON_DEBUG_CHIP is not set | 1043 | # CONFIG_HWMON_DEBUG_CHIP is not set |
977 | # CONFIG_THERMAL is not set | 1044 | # CONFIG_THERMAL is not set |
1045 | # CONFIG_THERMAL_HWMON is not set | ||
978 | CONFIG_WATCHDOG=y | 1046 | CONFIG_WATCHDOG=y |
979 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1047 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
980 | 1048 | ||
@@ -982,6 +1050,9 @@ CONFIG_WATCHDOG=y | |||
982 | # Watchdog Device Drivers | 1050 | # Watchdog Device Drivers |
983 | # | 1051 | # |
984 | CONFIG_SOFT_WATCHDOG=m | 1052 | CONFIG_SOFT_WATCHDOG=m |
1053 | # CONFIG_ALIM7101_WDT is not set | ||
1054 | # CONFIG_8xxx_WDT is not set | ||
1055 | # CONFIG_WATCHDOG_RTAS is not set | ||
985 | 1056 | ||
986 | # | 1057 | # |
987 | # PCI-based Watchdog Cards | 1058 | # PCI-based Watchdog Cards |
@@ -998,8 +1069,10 @@ CONFIG_SSB_POSSIBLE=y | |||
998 | # | 1069 | # |
999 | # Multifunction device drivers | 1070 | # Multifunction device drivers |
1000 | # | 1071 | # |
1072 | # CONFIG_MFD_CORE is not set | ||
1001 | # CONFIG_MFD_SM501 is not set | 1073 | # CONFIG_MFD_SM501 is not set |
1002 | # CONFIG_HTC_PASIC3 is not set | 1074 | # CONFIG_HTC_PASIC3 is not set |
1075 | # CONFIG_MFD_TMIO is not set | ||
1003 | 1076 | ||
1004 | # | 1077 | # |
1005 | # Multimedia devices | 1078 | # Multimedia devices |
@@ -1038,10 +1111,6 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m | |||
1038 | CONFIG_VGA_CONSOLE=y | 1111 | CONFIG_VGA_CONSOLE=y |
1039 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set | 1112 | # CONFIG_VGACON_SOFT_SCROLLBACK is not set |
1040 | CONFIG_DUMMY_CONSOLE=y | 1113 | CONFIG_DUMMY_CONSOLE=y |
1041 | |||
1042 | # | ||
1043 | # Sound | ||
1044 | # | ||
1045 | # CONFIG_SOUND is not set | 1114 | # CONFIG_SOUND is not set |
1046 | CONFIG_HID_SUPPORT=y | 1115 | CONFIG_HID_SUPPORT=y |
1047 | CONFIG_HID=y | 1116 | CONFIG_HID=y |
@@ -1056,6 +1125,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
1056 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 1125 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
1057 | 1126 | ||
1058 | # | 1127 | # |
1128 | # Enable Host or Gadget support to see Inventra options | ||
1129 | # | ||
1130 | |||
1131 | # | ||
1059 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1132 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
1060 | # | 1133 | # |
1061 | # CONFIG_USB_GADGET is not set | 1134 | # CONFIG_USB_GADGET is not set |
@@ -1096,6 +1169,7 @@ CONFIG_FS_POSIX_ACL=y | |||
1096 | # CONFIG_XFS_FS is not set | 1169 | # CONFIG_XFS_FS is not set |
1097 | CONFIG_OCFS2_FS=m | 1170 | CONFIG_OCFS2_FS=m |
1098 | CONFIG_OCFS2_FS_O2CB=m | 1171 | CONFIG_OCFS2_FS_O2CB=m |
1172 | CONFIG_OCFS2_FS_STATS=y | ||
1099 | CONFIG_OCFS2_DEBUG_MASKLOG=y | 1173 | CONFIG_OCFS2_DEBUG_MASKLOG=y |
1100 | # CONFIG_OCFS2_DEBUG_FS is not set | 1174 | # CONFIG_OCFS2_DEBUG_FS is not set |
1101 | CONFIG_DNOTIFY=y | 1175 | CONFIG_DNOTIFY=y |
@@ -1145,6 +1219,7 @@ CONFIG_CONFIGFS_FS=m | |||
1145 | # CONFIG_CRAMFS is not set | 1219 | # CONFIG_CRAMFS is not set |
1146 | # CONFIG_VXFS_FS is not set | 1220 | # CONFIG_VXFS_FS is not set |
1147 | CONFIG_MINIX_FS=m | 1221 | CONFIG_MINIX_FS=m |
1222 | # CONFIG_OMFS_FS is not set | ||
1148 | # CONFIG_HPFS_FS is not set | 1223 | # CONFIG_HPFS_FS is not set |
1149 | # CONFIG_QNX4FS_FS is not set | 1224 | # CONFIG_QNX4FS_FS is not set |
1150 | CONFIG_ROMFS_FS=m | 1225 | CONFIG_ROMFS_FS=m |
@@ -1155,14 +1230,13 @@ CONFIG_NFS_FS=y | |||
1155 | CONFIG_NFS_V3=y | 1230 | CONFIG_NFS_V3=y |
1156 | # CONFIG_NFS_V3_ACL is not set | 1231 | # CONFIG_NFS_V3_ACL is not set |
1157 | CONFIG_NFS_V4=y | 1232 | CONFIG_NFS_V4=y |
1158 | # CONFIG_NFSD is not set | ||
1159 | CONFIG_ROOT_NFS=y | 1233 | CONFIG_ROOT_NFS=y |
1234 | # CONFIG_NFSD is not set | ||
1160 | CONFIG_LOCKD=y | 1235 | CONFIG_LOCKD=y |
1161 | CONFIG_LOCKD_V4=y | 1236 | CONFIG_LOCKD_V4=y |
1162 | CONFIG_NFS_COMMON=y | 1237 | CONFIG_NFS_COMMON=y |
1163 | CONFIG_SUNRPC=y | 1238 | CONFIG_SUNRPC=y |
1164 | CONFIG_SUNRPC_GSS=y | 1239 | CONFIG_SUNRPC_GSS=y |
1165 | # CONFIG_SUNRPC_BIND34 is not set | ||
1166 | CONFIG_RPCSEC_GSS_KRB5=y | 1240 | CONFIG_RPCSEC_GSS_KRB5=y |
1167 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1241 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1168 | CONFIG_SMB_FS=m | 1242 | CONFIG_SMB_FS=m |
@@ -1183,6 +1257,7 @@ CONFIG_CIFS_POSIX=y | |||
1183 | # Partition Types | 1257 | # Partition Types |
1184 | # | 1258 | # |
1185 | # CONFIG_PARTITION_ADVANCED is not set | 1259 | # CONFIG_PARTITION_ADVANCED is not set |
1260 | CONFIG_MAC_PARTITION=y | ||
1186 | CONFIG_MSDOS_PARTITION=y | 1261 | CONFIG_MSDOS_PARTITION=y |
1187 | CONFIG_NLS=m | 1262 | CONFIG_NLS=m |
1188 | CONFIG_NLS_DEFAULT="iso8859-1" | 1263 | CONFIG_NLS_DEFAULT="iso8859-1" |
@@ -1233,6 +1308,7 @@ CONFIG_BITREVERSE=y | |||
1233 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1308 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1234 | CONFIG_CRC_CCITT=m | 1309 | CONFIG_CRC_CCITT=m |
1235 | # CONFIG_CRC16 is not set | 1310 | # CONFIG_CRC16 is not set |
1311 | # CONFIG_CRC_T10DIF is not set | ||
1236 | # CONFIG_CRC_ITU_T is not set | 1312 | # CONFIG_CRC_ITU_T is not set |
1237 | CONFIG_CRC32=y | 1313 | CONFIG_CRC32=y |
1238 | # CONFIG_CRC7 is not set | 1314 | # CONFIG_CRC7 is not set |
@@ -1259,6 +1335,8 @@ CONFIG_DEBUG_FS=y | |||
1259 | CONFIG_DEBUG_KERNEL=y | 1335 | CONFIG_DEBUG_KERNEL=y |
1260 | # CONFIG_DEBUG_SHIRQ is not set | 1336 | # CONFIG_DEBUG_SHIRQ is not set |
1261 | CONFIG_DETECT_SOFTLOCKUP=y | 1337 | CONFIG_DETECT_SOFTLOCKUP=y |
1338 | # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set | ||
1339 | CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 | ||
1262 | CONFIG_SCHED_DEBUG=y | 1340 | CONFIG_SCHED_DEBUG=y |
1263 | # CONFIG_SCHEDSTATS is not set | 1341 | # CONFIG_SCHEDSTATS is not set |
1264 | # CONFIG_TIMER_STATS is not set | 1342 | # CONFIG_TIMER_STATS is not set |
@@ -1275,21 +1353,34 @@ CONFIG_SCHED_DEBUG=y | |||
1275 | CONFIG_DEBUG_INFO=y | 1353 | CONFIG_DEBUG_INFO=y |
1276 | # CONFIG_DEBUG_VM is not set | 1354 | # CONFIG_DEBUG_VM is not set |
1277 | # CONFIG_DEBUG_WRITECOUNT is not set | 1355 | # CONFIG_DEBUG_WRITECOUNT is not set |
1356 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1278 | # CONFIG_DEBUG_LIST is not set | 1357 | # CONFIG_DEBUG_LIST is not set |
1279 | # CONFIG_DEBUG_SG is not set | 1358 | # CONFIG_DEBUG_SG is not set |
1280 | # CONFIG_BOOT_PRINTK_DELAY is not set | 1359 | # CONFIG_BOOT_PRINTK_DELAY is not set |
1281 | # CONFIG_RCU_TORTURE_TEST is not set | 1360 | # CONFIG_RCU_TORTURE_TEST is not set |
1282 | # CONFIG_BACKTRACE_SELF_TEST is not set | 1361 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1283 | # CONFIG_FAULT_INJECTION is not set | 1362 | # CONFIG_FAULT_INJECTION is not set |
1363 | # CONFIG_LATENCYTOP is not set | ||
1364 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1365 | CONFIG_HAVE_FTRACE=y | ||
1366 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1367 | # CONFIG_FTRACE is not set | ||
1368 | # CONFIG_PREEMPT_TRACER is not set | ||
1369 | # CONFIG_SCHED_TRACER is not set | ||
1370 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1284 | # CONFIG_SAMPLES is not set | 1371 | # CONFIG_SAMPLES is not set |
1372 | CONFIG_HAVE_ARCH_KGDB=y | ||
1373 | # CONFIG_KGDB is not set | ||
1285 | # CONFIG_DEBUG_STACKOVERFLOW is not set | 1374 | # CONFIG_DEBUG_STACKOVERFLOW is not set |
1286 | # CONFIG_DEBUG_STACK_USAGE is not set | 1375 | # CONFIG_DEBUG_STACK_USAGE is not set |
1287 | # CONFIG_DEBUG_PAGEALLOC is not set | 1376 | # CONFIG_DEBUG_PAGEALLOC is not set |
1288 | CONFIG_DEBUGGER=y | 1377 | # CONFIG_CODE_PATCHING_SELFTEST is not set |
1378 | # CONFIG_FTR_FIXUP_SELFTEST is not set | ||
1289 | # CONFIG_XMON is not set | 1379 | # CONFIG_XMON is not set |
1290 | # CONFIG_IRQSTACKS is not set | 1380 | # CONFIG_IRQSTACKS is not set |
1291 | # CONFIG_VIRQ_DEBUG is not set | 1381 | # CONFIG_VIRQ_DEBUG is not set |
1292 | # CONFIG_BDI_SWITCH is not set | 1382 | # CONFIG_BDI_SWITCH is not set |
1383 | # CONFIG_BOOTX_TEXT is not set | ||
1293 | # CONFIG_PPC_EARLY_DEBUG is not set | 1384 | # CONFIG_PPC_EARLY_DEBUG is not set |
1294 | 1385 | ||
1295 | # | 1386 | # |
@@ -1299,7 +1390,6 @@ CONFIG_DEBUGGER=y | |||
1299 | CONFIG_SECURITY=y | 1390 | CONFIG_SECURITY=y |
1300 | CONFIG_SECURITY_NETWORK=y | 1391 | CONFIG_SECURITY_NETWORK=y |
1301 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 1392 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
1302 | CONFIG_SECURITY_CAPABILITIES=y | ||
1303 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | 1393 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set |
1304 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 | 1394 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 |
1305 | CONFIG_CRYPTO=y | 1395 | CONFIG_CRYPTO=y |
@@ -1349,6 +1439,10 @@ CONFIG_CRYPTO_CRC32C=m | |||
1349 | CONFIG_CRYPTO_MD4=m | 1439 | CONFIG_CRYPTO_MD4=m |
1350 | CONFIG_CRYPTO_MD5=y | 1440 | CONFIG_CRYPTO_MD5=y |
1351 | CONFIG_CRYPTO_MICHAEL_MIC=m | 1441 | CONFIG_CRYPTO_MICHAEL_MIC=m |
1442 | # CONFIG_CRYPTO_RMD128 is not set | ||
1443 | # CONFIG_CRYPTO_RMD160 is not set | ||
1444 | # CONFIG_CRYPTO_RMD256 is not set | ||
1445 | # CONFIG_CRYPTO_RMD320 is not set | ||
1352 | CONFIG_CRYPTO_SHA1=m | 1446 | CONFIG_CRYPTO_SHA1=m |
1353 | CONFIG_CRYPTO_SHA256=m | 1447 | CONFIG_CRYPTO_SHA256=m |
1354 | CONFIG_CRYPTO_SHA512=m | 1448 | CONFIG_CRYPTO_SHA512=m |
@@ -1382,5 +1476,6 @@ CONFIG_CRYPTO_DEFLATE=m | |||
1382 | # CONFIG_CRYPTO_LZO is not set | 1476 | # CONFIG_CRYPTO_LZO is not set |
1383 | CONFIG_CRYPTO_HW=y | 1477 | CONFIG_CRYPTO_HW=y |
1384 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 1478 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1479 | # CONFIG_CRYPTO_DEV_TALITOS is not set | ||
1385 | # CONFIG_PPC_CLOCK is not set | 1480 | # CONFIG_PPC_CLOCK is not set |
1386 | # CONFIG_VIRTUALIZATION is not set | 1481 | # CONFIG_VIRTUALIZATION is not set |
diff --git a/arch/powerpc/configs/storcenter_defconfig b/arch/powerpc/configs/storcenter_defconfig index 88f6aa8273be..4340cc1c5b6a 100644 --- a/arch/powerpc/configs/storcenter_defconfig +++ b/arch/powerpc/configs/storcenter_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.26-rc5 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Mon Jun 9 08:52:20 2008 | 4 | # Thu Aug 21 00:52:16 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -32,6 +32,7 @@ CONFIG_GENERIC_HARDIRQS=y | |||
32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set | 32 | # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
33 | CONFIG_IRQ_PER_CPU=y | 33 | CONFIG_IRQ_PER_CPU=y |
34 | CONFIG_STACKTRACE_SUPPORT=y | 34 | CONFIG_STACKTRACE_SUPPORT=y |
35 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y | ||
35 | CONFIG_LOCKDEP_SUPPORT=y | 36 | CONFIG_LOCKDEP_SUPPORT=y |
36 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 37 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
37 | CONFIG_ARCH_HAS_ILOG2_U32=y | 38 | CONFIG_ARCH_HAS_ILOG2_U32=y |
@@ -87,7 +88,6 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y | |||
87 | CONFIG_SYSCTL=y | 88 | CONFIG_SYSCTL=y |
88 | CONFIG_EMBEDDED=y | 89 | CONFIG_EMBEDDED=y |
89 | CONFIG_SYSCTL_SYSCALL=y | 90 | CONFIG_SYSCTL_SYSCALL=y |
90 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
91 | # CONFIG_KALLSYMS is not set | 91 | # CONFIG_KALLSYMS is not set |
92 | CONFIG_HOTPLUG=y | 92 | CONFIG_HOTPLUG=y |
93 | CONFIG_PRINTK=y | 93 | CONFIG_PRINTK=y |
@@ -110,10 +110,16 @@ CONFIG_SLUB=y | |||
110 | # CONFIG_PROFILING is not set | 110 | # CONFIG_PROFILING is not set |
111 | # CONFIG_MARKERS is not set | 111 | # CONFIG_MARKERS is not set |
112 | CONFIG_HAVE_OPROFILE=y | 112 | CONFIG_HAVE_OPROFILE=y |
113 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
114 | CONFIG_HAVE_IOREMAP_PROT=y | ||
113 | CONFIG_HAVE_KPROBES=y | 115 | CONFIG_HAVE_KPROBES=y |
114 | CONFIG_HAVE_KRETPROBES=y | 116 | CONFIG_HAVE_KRETPROBES=y |
117 | CONFIG_HAVE_ARCH_TRACEHOOK=y | ||
115 | # CONFIG_HAVE_DMA_ATTRS is not set | 118 | # CONFIG_HAVE_DMA_ATTRS is not set |
119 | # CONFIG_USE_GENERIC_SMP_HELPERS is not set | ||
120 | # CONFIG_HAVE_CLK is not set | ||
116 | CONFIG_PROC_PAGE_MONITOR=y | 121 | CONFIG_PROC_PAGE_MONITOR=y |
122 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
117 | CONFIG_SLABINFO=y | 123 | CONFIG_SLABINFO=y |
118 | CONFIG_RT_MUTEXES=y | 124 | CONFIG_RT_MUTEXES=y |
119 | # CONFIG_TINY_SHMEM is not set | 125 | # CONFIG_TINY_SHMEM is not set |
@@ -130,6 +136,7 @@ CONFIG_LBD=y | |||
130 | # CONFIG_BLK_DEV_IO_TRACE is not set | 136 | # CONFIG_BLK_DEV_IO_TRACE is not set |
131 | # CONFIG_LSF is not set | 137 | # CONFIG_LSF is not set |
132 | # CONFIG_BLK_DEV_BSG is not set | 138 | # CONFIG_BLK_DEV_BSG is not set |
139 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
133 | 140 | ||
134 | # | 141 | # |
135 | # IO Schedulers | 142 | # IO Schedulers |
@@ -149,25 +156,25 @@ CONFIG_CLASSIC_RCU=y | |||
149 | # Platform support | 156 | # Platform support |
150 | # | 157 | # |
151 | CONFIG_PPC_MULTIPLATFORM=y | 158 | CONFIG_PPC_MULTIPLATFORM=y |
152 | # CONFIG_PPC_82xx is not set | ||
153 | # CONFIG_PPC_83xx is not set | ||
154 | # CONFIG_PPC_86xx is not set | ||
155 | CONFIG_CLASSIC32=y | 159 | CONFIG_CLASSIC32=y |
156 | # CONFIG_PPC_CHRP is not set | 160 | # CONFIG_PPC_CHRP is not set |
157 | # CONFIG_PPC_MPC512x is not set | ||
158 | # CONFIG_PPC_MPC5121 is not set | ||
159 | # CONFIG_MPC5121_ADS is not set | 161 | # CONFIG_MPC5121_ADS is not set |
162 | # CONFIG_MPC5121_GENERIC is not set | ||
160 | # CONFIG_PPC_MPC52xx is not set | 163 | # CONFIG_PPC_MPC52xx is not set |
161 | # CONFIG_PPC_PMAC is not set | 164 | # CONFIG_PPC_PMAC is not set |
162 | # CONFIG_PPC_CELL is not set | 165 | # CONFIG_PPC_CELL is not set |
163 | # CONFIG_PPC_CELL_NATIVE is not set | 166 | # CONFIG_PPC_CELL_NATIVE is not set |
167 | # CONFIG_PPC_82xx is not set | ||
164 | # CONFIG_PQ2ADS is not set | 168 | # CONFIG_PQ2ADS is not set |
169 | # CONFIG_PPC_83xx is not set | ||
170 | # CONFIG_PPC_86xx is not set | ||
165 | CONFIG_EMBEDDED6xx=y | 171 | CONFIG_EMBEDDED6xx=y |
166 | # CONFIG_LINKSTATION is not set | 172 | # CONFIG_LINKSTATION is not set |
167 | CONFIG_STORCENTER=y | 173 | CONFIG_STORCENTER=y |
168 | # CONFIG_MPC7448HPC2 is not set | 174 | # CONFIG_MPC7448HPC2 is not set |
169 | # CONFIG_PPC_HOLLY is not set | 175 | # CONFIG_PPC_HOLLY is not set |
170 | # CONFIG_PPC_PRPMC2800 is not set | 176 | # CONFIG_PPC_PRPMC2800 is not set |
177 | # CONFIG_PPC_C2K is not set | ||
171 | CONFIG_MPC10X_BRIDGE=y | 178 | CONFIG_MPC10X_BRIDGE=y |
172 | CONFIG_MPC10X_OPENPIC=y | 179 | CONFIG_MPC10X_OPENPIC=y |
173 | # CONFIG_MPC10X_STORE_GATHERING is not set | 180 | # CONFIG_MPC10X_STORE_GATHERING is not set |
@@ -221,6 +228,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y | |||
221 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 228 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
222 | CONFIG_PAGEFLAGS_EXTENDED=y | 229 | CONFIG_PAGEFLAGS_EXTENDED=y |
223 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 230 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
231 | CONFIG_MIGRATION=y | ||
224 | # CONFIG_RESOURCES_64BIT is not set | 232 | # CONFIG_RESOURCES_64BIT is not set |
225 | CONFIG_ZONE_DMA_FLAG=1 | 233 | CONFIG_ZONE_DMA_FLAG=1 |
226 | CONFIG_BOUNCE=y | 234 | CONFIG_BOUNCE=y |
@@ -229,6 +237,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11 | |||
229 | CONFIG_PROC_DEVICETREE=y | 237 | CONFIG_PROC_DEVICETREE=y |
230 | CONFIG_CMDLINE_BOOL=y | 238 | CONFIG_CMDLINE_BOOL=y |
231 | CONFIG_CMDLINE="console=ttyS0,115200" | 239 | CONFIG_CMDLINE="console=ttyS0,115200" |
240 | CONFIG_EXTRA_TARGETS="" | ||
232 | # CONFIG_PM is not set | 241 | # CONFIG_PM is not set |
233 | # CONFIG_SECCOMP is not set | 242 | # CONFIG_SECCOMP is not set |
234 | CONFIG_ISA_DMA_API=y | 243 | CONFIG_ISA_DMA_API=y |
@@ -264,10 +273,6 @@ CONFIG_PAGE_OFFSET=0xc0000000 | |||
264 | CONFIG_KERNEL_START=0xc0000000 | 273 | CONFIG_KERNEL_START=0xc0000000 |
265 | CONFIG_PHYSICAL_START=0x00000000 | 274 | CONFIG_PHYSICAL_START=0x00000000 |
266 | CONFIG_TASK_SIZE=0xc0000000 | 275 | CONFIG_TASK_SIZE=0xc0000000 |
267 | |||
268 | # | ||
269 | # Networking | ||
270 | # | ||
271 | CONFIG_NET=y | 276 | CONFIG_NET=y |
272 | 277 | ||
273 | # | 278 | # |
@@ -456,20 +461,22 @@ CONFIG_BLK_DEV=y | |||
456 | # CONFIG_BLK_DEV_RAM is not set | 461 | # CONFIG_BLK_DEV_RAM is not set |
457 | # CONFIG_CDROM_PKTCDVD is not set | 462 | # CONFIG_CDROM_PKTCDVD is not set |
458 | # CONFIG_ATA_OVER_ETH is not set | 463 | # CONFIG_ATA_OVER_ETH is not set |
464 | # CONFIG_BLK_DEV_HD is not set | ||
459 | CONFIG_MISC_DEVICES=y | 465 | CONFIG_MISC_DEVICES=y |
460 | # CONFIG_PHANTOM is not set | 466 | # CONFIG_PHANTOM is not set |
461 | # CONFIG_EEPROM_93CX6 is not set | 467 | # CONFIG_EEPROM_93CX6 is not set |
462 | # CONFIG_SGI_IOC4 is not set | 468 | # CONFIG_SGI_IOC4 is not set |
463 | # CONFIG_TIFM_CORE is not set | 469 | # CONFIG_TIFM_CORE is not set |
464 | # CONFIG_ENCLOSURE_SERVICES is not set | 470 | # CONFIG_ENCLOSURE_SERVICES is not set |
471 | # CONFIG_HP_ILO is not set | ||
465 | CONFIG_HAVE_IDE=y | 472 | CONFIG_HAVE_IDE=y |
466 | CONFIG_IDE=y | 473 | CONFIG_IDE=y |
467 | CONFIG_IDE_MAX_HWIFS=4 | ||
468 | CONFIG_BLK_DEV_IDE=y | 474 | CONFIG_BLK_DEV_IDE=y |
469 | 475 | ||
470 | # | 476 | # |
471 | # Please see Documentation/ide/ide.txt for help/info on IDE drives | 477 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
472 | # | 478 | # |
479 | CONFIG_IDE_TIMINGS=y | ||
473 | # CONFIG_BLK_DEV_IDE_SATA is not set | 480 | # CONFIG_BLK_DEV_IDE_SATA is not set |
474 | CONFIG_BLK_DEV_IDEDISK=y | 481 | CONFIG_BLK_DEV_IDEDISK=y |
475 | CONFIG_IDEDISK_MULTI_MODE=y | 482 | CONFIG_IDEDISK_MULTI_MODE=y |
@@ -483,7 +490,6 @@ CONFIG_IDE_PROC_FS=y | |||
483 | # | 490 | # |
484 | # IDE chipset support/bugfixes | 491 | # IDE chipset support/bugfixes |
485 | # | 492 | # |
486 | CONFIG_IDE_GENERIC=y | ||
487 | # CONFIG_BLK_DEV_PLATFORM is not set | 493 | # CONFIG_BLK_DEV_PLATFORM is not set |
488 | CONFIG_BLK_DEV_IDEDMA_SFF=y | 494 | CONFIG_BLK_DEV_IDEDMA_SFF=y |
489 | 495 | ||
@@ -500,10 +506,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
500 | # CONFIG_BLK_DEV_AMD74XX is not set | 506 | # CONFIG_BLK_DEV_AMD74XX is not set |
501 | # CONFIG_BLK_DEV_CMD64X is not set | 507 | # CONFIG_BLK_DEV_CMD64X is not set |
502 | # CONFIG_BLK_DEV_TRIFLEX is not set | 508 | # CONFIG_BLK_DEV_TRIFLEX is not set |
503 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
504 | # CONFIG_BLK_DEV_CS5520 is not set | 509 | # CONFIG_BLK_DEV_CS5520 is not set |
505 | # CONFIG_BLK_DEV_CS5530 is not set | 510 | # CONFIG_BLK_DEV_CS5530 is not set |
506 | # CONFIG_BLK_DEV_HPT34X is not set | ||
507 | # CONFIG_BLK_DEV_HPT366 is not set | 511 | # CONFIG_BLK_DEV_HPT366 is not set |
508 | # CONFIG_BLK_DEV_JMICRON is not set | 512 | # CONFIG_BLK_DEV_JMICRON is not set |
509 | # CONFIG_BLK_DEV_SC1200 is not set | 513 | # CONFIG_BLK_DEV_SC1200 is not set |
@@ -521,8 +525,6 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y | |||
521 | CONFIG_BLK_DEV_VIA82CXXX=y | 525 | CONFIG_BLK_DEV_VIA82CXXX=y |
522 | # CONFIG_BLK_DEV_TC86C001 is not set | 526 | # CONFIG_BLK_DEV_TC86C001 is not set |
523 | CONFIG_BLK_DEV_IDEDMA=y | 527 | CONFIG_BLK_DEV_IDEDMA=y |
524 | # CONFIG_BLK_DEV_HD_ONLY is not set | ||
525 | # CONFIG_BLK_DEV_HD is not set | ||
526 | 528 | ||
527 | # | 529 | # |
528 | # SCSI device support | 530 | # SCSI device support |
@@ -599,6 +601,7 @@ CONFIG_SCSI_LOWLEVEL=y | |||
599 | # CONFIG_SCSI_NSP32 is not set | 601 | # CONFIG_SCSI_NSP32 is not set |
600 | # CONFIG_SCSI_DEBUG is not set | 602 | # CONFIG_SCSI_DEBUG is not set |
601 | # CONFIG_SCSI_SRP is not set | 603 | # CONFIG_SCSI_SRP is not set |
604 | # CONFIG_SCSI_DH is not set | ||
602 | # CONFIG_ATA is not set | 605 | # CONFIG_ATA is not set |
603 | CONFIG_MD=y | 606 | CONFIG_MD=y |
604 | CONFIG_BLK_DEV_MD=y | 607 | CONFIG_BLK_DEV_MD=y |
@@ -616,12 +619,15 @@ CONFIG_MD_RAID5_RESHAPE=y | |||
616 | # | 619 | # |
617 | # IEEE 1394 (FireWire) support | 620 | # IEEE 1394 (FireWire) support |
618 | # | 621 | # |
622 | |||
623 | # | ||
624 | # Enable only one of the two stacks, unless you know what you are doing | ||
625 | # | ||
619 | # CONFIG_FIREWIRE is not set | 626 | # CONFIG_FIREWIRE is not set |
620 | # CONFIG_IEEE1394 is not set | 627 | # CONFIG_IEEE1394 is not set |
621 | # CONFIG_I2O is not set | 628 | # CONFIG_I2O is not set |
622 | # CONFIG_MACINTOSH_DRIVERS is not set | 629 | # CONFIG_MACINTOSH_DRIVERS is not set |
623 | CONFIG_NETDEVICES=y | 630 | CONFIG_NETDEVICES=y |
624 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
625 | CONFIG_DUMMY=m | 631 | CONFIG_DUMMY=m |
626 | # CONFIG_BONDING is not set | 632 | # CONFIG_BONDING is not set |
627 | # CONFIG_MACVLAN is not set | 633 | # CONFIG_MACVLAN is not set |
@@ -635,14 +641,12 @@ CONFIG_NETDEV_1000=y | |||
635 | # CONFIG_DL2K is not set | 641 | # CONFIG_DL2K is not set |
636 | # CONFIG_E1000 is not set | 642 | # CONFIG_E1000 is not set |
637 | # CONFIG_E1000E is not set | 643 | # CONFIG_E1000E is not set |
638 | # CONFIG_E1000E_ENABLED is not set | ||
639 | # CONFIG_IP1000 is not set | 644 | # CONFIG_IP1000 is not set |
640 | # CONFIG_IGB is not set | 645 | # CONFIG_IGB is not set |
641 | # CONFIG_NS83820 is not set | 646 | # CONFIG_NS83820 is not set |
642 | # CONFIG_HAMACHI is not set | 647 | # CONFIG_HAMACHI is not set |
643 | # CONFIG_YELLOWFIN is not set | 648 | # CONFIG_YELLOWFIN is not set |
644 | CONFIG_R8169=y | 649 | CONFIG_R8169=y |
645 | # CONFIG_R8169_NAPI is not set | ||
646 | # CONFIG_SIS190 is not set | 650 | # CONFIG_SIS190 is not set |
647 | # CONFIG_SKGE is not set | 651 | # CONFIG_SKGE is not set |
648 | # CONFIG_SKY2 is not set | 652 | # CONFIG_SKY2 is not set |
@@ -653,6 +657,7 @@ CONFIG_R8169=y | |||
653 | # CONFIG_MV643XX_ETH is not set | 657 | # CONFIG_MV643XX_ETH is not set |
654 | # CONFIG_QLA3XXX is not set | 658 | # CONFIG_QLA3XXX is not set |
655 | # CONFIG_ATL1 is not set | 659 | # CONFIG_ATL1 is not set |
660 | # CONFIG_ATL1E is not set | ||
656 | # CONFIG_NETDEV_10000 is not set | 661 | # CONFIG_NETDEV_10000 is not set |
657 | # CONFIG_TR is not set | 662 | # CONFIG_TR is not set |
658 | 663 | ||
@@ -734,43 +739,64 @@ CONFIG_DEVPORT=y | |||
734 | CONFIG_I2C=y | 739 | CONFIG_I2C=y |
735 | CONFIG_I2C_BOARDINFO=y | 740 | CONFIG_I2C_BOARDINFO=y |
736 | CONFIG_I2C_CHARDEV=y | 741 | CONFIG_I2C_CHARDEV=y |
742 | CONFIG_I2C_HELPER_AUTO=y | ||
737 | 743 | ||
738 | # | 744 | # |
739 | # I2C Hardware Bus support | 745 | # I2C Hardware Bus support |
740 | # | 746 | # |
747 | |||
748 | # | ||
749 | # PC SMBus host controller drivers | ||
750 | # | ||
741 | # CONFIG_I2C_ALI1535 is not set | 751 | # CONFIG_I2C_ALI1535 is not set |
742 | # CONFIG_I2C_ALI1563 is not set | 752 | # CONFIG_I2C_ALI1563 is not set |
743 | # CONFIG_I2C_ALI15X3 is not set | 753 | # CONFIG_I2C_ALI15X3 is not set |
744 | # CONFIG_I2C_AMD756 is not set | 754 | # CONFIG_I2C_AMD756 is not set |
745 | # CONFIG_I2C_AMD8111 is not set | 755 | # CONFIG_I2C_AMD8111 is not set |
746 | # CONFIG_I2C_I801 is not set | 756 | # CONFIG_I2C_I801 is not set |
747 | # CONFIG_I2C_I810 is not set | 757 | # CONFIG_I2C_ISCH is not set |
748 | # CONFIG_I2C_PIIX4 is not set | 758 | # CONFIG_I2C_PIIX4 is not set |
749 | CONFIG_I2C_MPC=y | ||
750 | # CONFIG_I2C_NFORCE2 is not set | 759 | # CONFIG_I2C_NFORCE2 is not set |
751 | # CONFIG_I2C_OCORES is not set | ||
752 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
753 | # CONFIG_I2C_PROSAVAGE is not set | ||
754 | # CONFIG_I2C_SAVAGE4 is not set | ||
755 | # CONFIG_I2C_SIMTEC is not set | ||
756 | # CONFIG_I2C_SIS5595 is not set | 760 | # CONFIG_I2C_SIS5595 is not set |
757 | # CONFIG_I2C_SIS630 is not set | 761 | # CONFIG_I2C_SIS630 is not set |
758 | # CONFIG_I2C_SIS96X is not set | 762 | # CONFIG_I2C_SIS96X is not set |
759 | # CONFIG_I2C_TAOS_EVM is not set | ||
760 | # CONFIG_I2C_STUB is not set | ||
761 | # CONFIG_I2C_TINY_USB is not set | ||
762 | # CONFIG_I2C_VIA is not set | 763 | # CONFIG_I2C_VIA is not set |
763 | # CONFIG_I2C_VIAPRO is not set | 764 | # CONFIG_I2C_VIAPRO is not set |
765 | |||
766 | # | ||
767 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
768 | # | ||
769 | CONFIG_I2C_MPC=y | ||
770 | # CONFIG_I2C_OCORES is not set | ||
771 | # CONFIG_I2C_SIMTEC is not set | ||
772 | |||
773 | # | ||
774 | # External I2C/SMBus adapter drivers | ||
775 | # | ||
776 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
777 | # CONFIG_I2C_TAOS_EVM is not set | ||
778 | # CONFIG_I2C_TINY_USB is not set | ||
779 | |||
780 | # | ||
781 | # Graphics adapter I2C/DDC channel drivers | ||
782 | # | ||
764 | # CONFIG_I2C_VOODOO3 is not set | 783 | # CONFIG_I2C_VOODOO3 is not set |
784 | |||
785 | # | ||
786 | # Other I2C/SMBus bus drivers | ||
787 | # | ||
765 | # CONFIG_I2C_PCA_PLATFORM is not set | 788 | # CONFIG_I2C_PCA_PLATFORM is not set |
789 | # CONFIG_I2C_STUB is not set | ||
766 | 790 | ||
767 | # | 791 | # |
768 | # Miscellaneous I2C Chip support | 792 | # Miscellaneous I2C Chip support |
769 | # | 793 | # |
770 | # CONFIG_DS1682 is not set | 794 | # CONFIG_DS1682 is not set |
795 | # CONFIG_AT24 is not set | ||
771 | # CONFIG_SENSORS_EEPROM is not set | 796 | # CONFIG_SENSORS_EEPROM is not set |
772 | # CONFIG_SENSORS_PCF8574 is not set | 797 | # CONFIG_SENSORS_PCF8574 is not set |
773 | # CONFIG_PCF8575 is not set | 798 | # CONFIG_PCF8575 is not set |
799 | # CONFIG_SENSORS_PCA9539 is not set | ||
774 | # CONFIG_SENSORS_PCF8591 is not set | 800 | # CONFIG_SENSORS_PCF8591 is not set |
775 | # CONFIG_SENSORS_MAX6875 is not set | 801 | # CONFIG_SENSORS_MAX6875 is not set |
776 | # CONFIG_SENSORS_TSL2550 is not set | 802 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -779,10 +805,13 @@ CONFIG_I2C_MPC=y | |||
779 | # CONFIG_I2C_DEBUG_BUS is not set | 805 | # CONFIG_I2C_DEBUG_BUS is not set |
780 | # CONFIG_I2C_DEBUG_CHIP is not set | 806 | # CONFIG_I2C_DEBUG_CHIP is not set |
781 | # CONFIG_SPI is not set | 807 | # CONFIG_SPI is not set |
808 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
809 | # CONFIG_GPIOLIB is not set | ||
782 | # CONFIG_W1 is not set | 810 | # CONFIG_W1 is not set |
783 | # CONFIG_POWER_SUPPLY is not set | 811 | # CONFIG_POWER_SUPPLY is not set |
784 | # CONFIG_HWMON is not set | 812 | # CONFIG_HWMON is not set |
785 | # CONFIG_THERMAL is not set | 813 | # CONFIG_THERMAL is not set |
814 | # CONFIG_THERMAL_HWMON is not set | ||
786 | # CONFIG_WATCHDOG is not set | 815 | # CONFIG_WATCHDOG is not set |
787 | 816 | ||
788 | # | 817 | # |
@@ -794,8 +823,10 @@ CONFIG_SSB_POSSIBLE=y | |||
794 | # | 823 | # |
795 | # Multifunction device drivers | 824 | # Multifunction device drivers |
796 | # | 825 | # |
826 | # CONFIG_MFD_CORE is not set | ||
797 | # CONFIG_MFD_SM501 is not set | 827 | # CONFIG_MFD_SM501 is not set |
798 | # CONFIG_HTC_PASIC3 is not set | 828 | # CONFIG_HTC_PASIC3 is not set |
829 | # CONFIG_MFD_TMIO is not set | ||
799 | 830 | ||
800 | # | 831 | # |
801 | # Multimedia devices | 832 | # Multimedia devices |
@@ -827,10 +858,6 @@ CONFIG_SSB_POSSIBLE=y | |||
827 | # Display device support | 858 | # Display device support |
828 | # | 859 | # |
829 | # CONFIG_DISPLAY_SUPPORT is not set | 860 | # CONFIG_DISPLAY_SUPPORT is not set |
830 | |||
831 | # | ||
832 | # Sound | ||
833 | # | ||
834 | # CONFIG_SOUND is not set | 861 | # CONFIG_SOUND is not set |
835 | CONFIG_USB_SUPPORT=y | 862 | CONFIG_USB_SUPPORT=y |
836 | CONFIG_USB_ARCH_HAS_HCD=y | 863 | CONFIG_USB_ARCH_HAS_HCD=y |
@@ -849,6 +876,7 @@ CONFIG_USB_DEVICE_CLASS=y | |||
849 | # CONFIG_USB_OTG is not set | 876 | # CONFIG_USB_OTG is not set |
850 | # CONFIG_USB_OTG_WHITELIST is not set | 877 | # CONFIG_USB_OTG_WHITELIST is not set |
851 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set | 878 | # CONFIG_USB_OTG_BLACKLIST_HUB is not set |
879 | # CONFIG_USB_MON is not set | ||
852 | 880 | ||
853 | # | 881 | # |
854 | # USB Host Controller Drivers | 882 | # USB Host Controller Drivers |
@@ -896,6 +924,7 @@ CONFIG_USB_STORAGE=y | |||
896 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 924 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
897 | # CONFIG_USB_STORAGE_ALAUDA is not set | 925 | # CONFIG_USB_STORAGE_ALAUDA is not set |
898 | # CONFIG_USB_STORAGE_KARMA is not set | 926 | # CONFIG_USB_STORAGE_KARMA is not set |
927 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
899 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 928 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
900 | # CONFIG_USB_LIBUSUAL is not set | 929 | # CONFIG_USB_LIBUSUAL is not set |
901 | 930 | ||
@@ -904,7 +933,6 @@ CONFIG_USB_STORAGE=y | |||
904 | # | 933 | # |
905 | # CONFIG_USB_MDC800 is not set | 934 | # CONFIG_USB_MDC800 is not set |
906 | # CONFIG_USB_MICROTEK is not set | 935 | # CONFIG_USB_MICROTEK is not set |
907 | # CONFIG_USB_MON is not set | ||
908 | 936 | ||
909 | # | 937 | # |
910 | # USB port drivers | 938 | # USB port drivers |
@@ -917,7 +945,6 @@ CONFIG_USB_STORAGE=y | |||
917 | # CONFIG_USB_EMI62 is not set | 945 | # CONFIG_USB_EMI62 is not set |
918 | # CONFIG_USB_EMI26 is not set | 946 | # CONFIG_USB_EMI26 is not set |
919 | # CONFIG_USB_ADUTUX is not set | 947 | # CONFIG_USB_ADUTUX is not set |
920 | # CONFIG_USB_AUERSWALD is not set | ||
921 | # CONFIG_USB_RIO500 is not set | 948 | # CONFIG_USB_RIO500 is not set |
922 | # CONFIG_USB_LEGOTOWER is not set | 949 | # CONFIG_USB_LEGOTOWER is not set |
923 | # CONFIG_USB_LCD is not set | 950 | # CONFIG_USB_LCD is not set |
@@ -971,6 +998,7 @@ CONFIG_RTC_DRV_DS1307=y | |||
971 | # CONFIG_RTC_DRV_PCF8583 is not set | 998 | # CONFIG_RTC_DRV_PCF8583 is not set |
972 | # CONFIG_RTC_DRV_M41T80 is not set | 999 | # CONFIG_RTC_DRV_M41T80 is not set |
973 | # CONFIG_RTC_DRV_S35390A is not set | 1000 | # CONFIG_RTC_DRV_S35390A is not set |
1001 | # CONFIG_RTC_DRV_FM3130 is not set | ||
974 | 1002 | ||
975 | # | 1003 | # |
976 | # SPI RTC drivers | 1004 | # SPI RTC drivers |
@@ -1074,6 +1102,7 @@ CONFIG_JFFS2_RTIME=y | |||
1074 | # CONFIG_CRAMFS is not set | 1102 | # CONFIG_CRAMFS is not set |
1075 | # CONFIG_VXFS_FS is not set | 1103 | # CONFIG_VXFS_FS is not set |
1076 | # CONFIG_MINIX_FS is not set | 1104 | # CONFIG_MINIX_FS is not set |
1105 | # CONFIG_OMFS_FS is not set | ||
1077 | # CONFIG_HPFS_FS is not set | 1106 | # CONFIG_HPFS_FS is not set |
1078 | # CONFIG_QNX4FS_FS is not set | 1107 | # CONFIG_QNX4FS_FS is not set |
1079 | # CONFIG_ROMFS_FS is not set | 1108 | # CONFIG_ROMFS_FS is not set |
@@ -1151,6 +1180,7 @@ CONFIG_BITREVERSE=y | |||
1151 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set | 1180 | # CONFIG_GENERIC_FIND_FIRST_BIT is not set |
1152 | # CONFIG_CRC_CCITT is not set | 1181 | # CONFIG_CRC_CCITT is not set |
1153 | # CONFIG_CRC16 is not set | 1182 | # CONFIG_CRC16 is not set |
1183 | CONFIG_CRC_T10DIF=y | ||
1154 | # CONFIG_CRC_ITU_T is not set | 1184 | # CONFIG_CRC_ITU_T is not set |
1155 | CONFIG_CRC32=y | 1185 | CONFIG_CRC32=y |
1156 | # CONFIG_CRC7 is not set | 1186 | # CONFIG_CRC7 is not set |
@@ -1178,7 +1208,16 @@ CONFIG_FRAME_WARN=1024 | |||
1178 | # CONFIG_SLUB_DEBUG_ON is not set | 1208 | # CONFIG_SLUB_DEBUG_ON is not set |
1179 | # CONFIG_SLUB_STATS is not set | 1209 | # CONFIG_SLUB_STATS is not set |
1180 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1210 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1211 | # CONFIG_DEBUG_MEMORY_INIT is not set | ||
1212 | # CONFIG_LATENCYTOP is not set | ||
1213 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
1214 | CONFIG_HAVE_FTRACE=y | ||
1215 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
1216 | # CONFIG_FTRACE is not set | ||
1217 | # CONFIG_SCHED_TRACER is not set | ||
1218 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
1181 | # CONFIG_SAMPLES is not set | 1219 | # CONFIG_SAMPLES is not set |
1220 | CONFIG_HAVE_ARCH_KGDB=y | ||
1182 | # CONFIG_IRQSTACKS is not set | 1221 | # CONFIG_IRQSTACKS is not set |
1183 | # CONFIG_BOOTX_TEXT is not set | 1222 | # CONFIG_BOOTX_TEXT is not set |
1184 | # CONFIG_PPC_EARLY_DEBUG is not set | 1223 | # CONFIG_PPC_EARLY_DEBUG is not set |
diff --git a/arch/powerpc/include/asm/cpm2.h b/arch/powerpc/include/asm/cpm2.h index 2a6fa0183ac9..0f5e8ff59a85 100644 --- a/arch/powerpc/include/asm/cpm2.h +++ b/arch/powerpc/include/asm/cpm2.h | |||
@@ -337,6 +337,11 @@ typedef struct scc_param { | |||
337 | uint scc_tcrc; /* Internal */ | 337 | uint scc_tcrc; /* Internal */ |
338 | } sccp_t; | 338 | } sccp_t; |
339 | 339 | ||
340 | /* Function code bits. | ||
341 | */ | ||
342 | #define SCC_EB ((u_char) 0x10) /* Set big endian byte order */ | ||
343 | #define SCC_GBL ((u_char) 0x20) /* Snooping enabled */ | ||
344 | |||
340 | /* CPM Ethernet through SCC1. | 345 | /* CPM Ethernet through SCC1. |
341 | */ | 346 | */ |
342 | typedef struct scc_enet { | 347 | typedef struct scc_enet { |
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c index 1cf901fa9031..6eb1d4d182c9 100644 --- a/arch/powerpc/platforms/ps3/htab.c +++ b/arch/powerpc/platforms/ps3/htab.c | |||
@@ -29,138 +29,75 @@ | |||
29 | 29 | ||
30 | #include "platform.h" | 30 | #include "platform.h" |
31 | 31 | ||
32 | #if defined(DEBUG) | 32 | /** |
33 | #define DBG udbg_printf | 33 | * enum lpar_vas_id - id of LPAR virtual address space. |
34 | #else | 34 | * @lpar_vas_id_current: Current selected virtual address space |
35 | #define DBG pr_debug | 35 | * |
36 | #endif | 36 | * Identify the target LPAR address space. |
37 | 37 | */ | |
38 | static struct hash_pte *htab; | 38 | |
39 | static unsigned long htab_addr; | 39 | enum ps3_lpar_vas_id { |
40 | static unsigned char *bolttab; | 40 | PS3_LPAR_VAS_ID_CURRENT = 0, |
41 | static unsigned char *inusetab; | 41 | }; |
42 | 42 | ||
43 | static DEFINE_SPINLOCK(ps3_bolttab_lock); | 43 | |
44 | 44 | static DEFINE_SPINLOCK(ps3_htab_lock); | |
45 | #define debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g) \ | ||
46 | _debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__) | ||
47 | static void _debug_dump_hpte(unsigned long pa, unsigned long va, | ||
48 | unsigned long group, unsigned long bitmap, struct hash_pte lhpte, | ||
49 | int psize, unsigned long slot, const char* func, int line) | ||
50 | { | ||
51 | DBG("%s:%d: pa = %lxh\n", func, line, pa); | ||
52 | DBG("%s:%d: lpar = %lxh\n", func, line, | ||
53 | ps3_mm_phys_to_lpar(pa)); | ||
54 | DBG("%s:%d: va = %lxh\n", func, line, va); | ||
55 | DBG("%s:%d: group = %lxh\n", func, line, group); | ||
56 | DBG("%s:%d: bitmap = %lxh\n", func, line, bitmap); | ||
57 | DBG("%s:%d: hpte.v = %lxh\n", func, line, lhpte.v); | ||
58 | DBG("%s:%d: hpte.r = %lxh\n", func, line, lhpte.r); | ||
59 | DBG("%s:%d: psize = %xh\n", func, line, psize); | ||
60 | DBG("%s:%d: slot = %lxh\n", func, line, slot); | ||
61 | } | ||
62 | 45 | ||
63 | static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va, | 46 | static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va, |
64 | unsigned long pa, unsigned long rflags, unsigned long vflags, | 47 | unsigned long pa, unsigned long rflags, unsigned long vflags, |
65 | int psize, int ssize) | 48 | int psize, int ssize) |
66 | { | 49 | { |
67 | unsigned long slot; | 50 | int result; |
68 | struct hash_pte lhpte; | 51 | u64 hpte_v, hpte_r; |
69 | int secondary = 0; | 52 | u64 inserted_index; |
70 | unsigned long result; | 53 | u64 evicted_v, evicted_r; |
71 | unsigned long bitmap; | 54 | u64 hpte_v_array[4], hpte_rs; |
72 | unsigned long flags; | 55 | unsigned long flags; |
73 | unsigned long p_pteg, s_pteg, b_index, b_mask, cb, ci; | 56 | long ret = -1; |
74 | |||
75 | vflags &= ~HPTE_V_SECONDARY; /* this bit is ignored */ | ||
76 | |||
77 | lhpte.v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M) | | ||
78 | vflags | HPTE_V_VALID; | ||
79 | lhpte.r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags; | ||
80 | |||
81 | p_pteg = hpte_group / HPTES_PER_GROUP; | ||
82 | s_pteg = ~p_pteg & htab_hash_mask; | ||
83 | |||
84 | spin_lock_irqsave(&ps3_bolttab_lock, flags); | ||
85 | |||
86 | BUG_ON(bolttab[p_pteg] == 0xff && bolttab[s_pteg] == 0xff); | ||
87 | 57 | ||
88 | bitmap = (inusetab[p_pteg] << 8) | inusetab[s_pteg]; | 58 | /* |
59 | * lv1_insert_htab_entry() will search for victim | ||
60 | * entry in both primary and secondary pte group | ||
61 | */ | ||
62 | vflags &= ~HPTE_V_SECONDARY; | ||
89 | 63 | ||
90 | if (bitmap == 0xffff) { | 64 | hpte_v = hpte_encode_v(va, psize, ssize) | vflags | HPTE_V_VALID; |
91 | /* | 65 | hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags; |
92 | * PTEG is full. Search for victim. | ||
93 | */ | ||
94 | bitmap &= ~((bolttab[p_pteg] << 8) | bolttab[s_pteg]); | ||
95 | do { | ||
96 | ci = mftb() & 15; | ||
97 | cb = 0x8000UL >> ci; | ||
98 | } while ((cb & bitmap) == 0); | ||
99 | } else { | ||
100 | /* | ||
101 | * search free slot in hardware order | ||
102 | * [primary] 0, 2, 4, 6, 1, 3, 5, 7 | ||
103 | * [secondary] 0, 2, 4, 6, 1, 3, 5, 7 | ||
104 | */ | ||
105 | for (ci = 0; ci < HPTES_PER_GROUP; ci += 2) { | ||
106 | cb = 0x8000UL >> ci; | ||
107 | if ((cb & bitmap) == 0) | ||
108 | goto found; | ||
109 | } | ||
110 | for (ci = 1; ci < HPTES_PER_GROUP; ci += 2) { | ||
111 | cb = 0x8000UL >> ci; | ||
112 | if ((cb & bitmap) == 0) | ||
113 | goto found; | ||
114 | } | ||
115 | for (ci = HPTES_PER_GROUP; ci < HPTES_PER_GROUP*2; ci += 2) { | ||
116 | cb = 0x8000UL >> ci; | ||
117 | if ((cb & bitmap) == 0) | ||
118 | goto found; | ||
119 | } | ||
120 | for (ci = HPTES_PER_GROUP+1; ci < HPTES_PER_GROUP*2; ci += 2) { | ||
121 | cb = 0x8000UL >> ci; | ||
122 | if ((cb & bitmap) == 0) | ||
123 | goto found; | ||
124 | } | ||
125 | } | ||
126 | 66 | ||
127 | found: | 67 | spin_lock_irqsave(&ps3_htab_lock, flags); |
128 | if (ci < HPTES_PER_GROUP) { | ||
129 | slot = p_pteg * HPTES_PER_GROUP + ci; | ||
130 | } else { | ||
131 | slot = s_pteg * HPTES_PER_GROUP + (ci & 7); | ||
132 | /* lhpte.dw0.dw0.h = 1; */ | ||
133 | vflags |= HPTE_V_SECONDARY; | ||
134 | lhpte.v |= HPTE_V_SECONDARY; | ||
135 | } | ||
136 | 68 | ||
137 | result = lv1_write_htab_entry(0, slot, lhpte.v, lhpte.r); | 69 | /* talk hvc to replace entries BOLTED == 0 */ |
70 | result = lv1_insert_htab_entry(PS3_LPAR_VAS_ID_CURRENT, hpte_group, | ||
71 | hpte_v, hpte_r, | ||
72 | HPTE_V_BOLTED, 0, | ||
73 | &inserted_index, | ||
74 | &evicted_v, &evicted_r); | ||
138 | 75 | ||
139 | if (result) { | 76 | if (result) { |
140 | debug_dump_hpte(pa, va, hpte_group, bitmap, lhpte, psize, slot); | 77 | /* all entries bolted !*/ |
78 | pr_info("%s:result=%d va=%lx pa=%lx ix=%lx v=%lx r=%lx\n", | ||
79 | __func__, result, va, pa, hpte_group, hpte_v, hpte_r); | ||
141 | BUG(); | 80 | BUG(); |
142 | } | 81 | } |
143 | 82 | ||
144 | /* | 83 | /* |
145 | * If used slot is not in primary HPTE group, | 84 | * see if the entry is inserted into secondary pteg |
146 | * the slot should be in secondary HPTE group. | ||
147 | */ | 85 | */ |
86 | result = lv1_read_htab_entries(PS3_LPAR_VAS_ID_CURRENT, | ||
87 | inserted_index & ~0x3UL, | ||
88 | &hpte_v_array[0], &hpte_v_array[1], | ||
89 | &hpte_v_array[2], &hpte_v_array[3], | ||
90 | &hpte_rs); | ||
91 | BUG_ON(result); | ||
148 | 92 | ||
149 | if ((hpte_group ^ slot) & ~(HPTES_PER_GROUP - 1)) { | 93 | if (hpte_v_array[inserted_index % 4] & HPTE_V_SECONDARY) |
150 | secondary = 1; | 94 | ret = (inserted_index & 7) | (1 << 3); |
151 | b_index = s_pteg; | 95 | else |
152 | } else { | 96 | ret = inserted_index & 7; |
153 | secondary = 0; | ||
154 | b_index = p_pteg; | ||
155 | } | ||
156 | 97 | ||
157 | b_mask = (lhpte.v & HPTE_V_BOLTED) ? 1 << 7 : 0 << 7; | 98 | spin_unlock_irqrestore(&ps3_htab_lock, flags); |
158 | bolttab[b_index] |= b_mask >> (slot & 7); | ||
159 | b_mask = 1 << 7; | ||
160 | inusetab[b_index] |= b_mask >> (slot & 7); | ||
161 | spin_unlock_irqrestore(&ps3_bolttab_lock, flags); | ||
162 | 99 | ||
163 | return (slot & 7) | (secondary << 3); | 100 | return ret; |
164 | } | 101 | } |
165 | 102 | ||
166 | static long ps3_hpte_remove(unsigned long hpte_group) | 103 | static long ps3_hpte_remove(unsigned long hpte_group) |
@@ -172,39 +109,48 @@ static long ps3_hpte_remove(unsigned long hpte_group) | |||
172 | static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp, | 109 | static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp, |
173 | unsigned long va, int psize, int ssize, int local) | 110 | unsigned long va, int psize, int ssize, int local) |
174 | { | 111 | { |
112 | int result; | ||
113 | u64 hpte_v, want_v, hpte_rs; | ||
114 | u64 hpte_v_array[4]; | ||
175 | unsigned long flags; | 115 | unsigned long flags; |
176 | unsigned long result; | 116 | long ret; |
177 | unsigned long pteg, bit; | ||
178 | unsigned long hpte_v, want_v; | ||
179 | 117 | ||
180 | want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M); | 118 | want_v = hpte_encode_v(va, psize, ssize); |
181 | 119 | ||
182 | spin_lock_irqsave(&ps3_bolttab_lock, flags); | 120 | spin_lock_irqsave(&ps3_htab_lock, flags); |
183 | 121 | ||
184 | hpte_v = htab[slot].v; | 122 | result = lv1_read_htab_entries(PS3_LPAR_VAS_ID_CURRENT, slot & ~0x3UL, |
185 | if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) { | 123 | &hpte_v_array[0], &hpte_v_array[1], |
186 | spin_unlock_irqrestore(&ps3_bolttab_lock, flags); | 124 | &hpte_v_array[2], &hpte_v_array[3], |
187 | 125 | &hpte_rs); | |
188 | /* ps3_hpte_insert() will be used to update PTE */ | ||
189 | return -1; | ||
190 | } | ||
191 | |||
192 | result = lv1_write_htab_entry(0, slot, 0, 0); | ||
193 | 126 | ||
194 | if (result) { | 127 | if (result) { |
195 | DBG("%s: va=%lx slot=%lx psize=%d result = %ld (0x%lx)\n", | 128 | pr_info("%s: res=%d read va=%lx slot=%lx psize=%d\n", |
196 | __func__, va, slot, psize, result, result); | 129 | __func__, result, va, slot, psize); |
197 | BUG(); | 130 | BUG(); |
198 | } | 131 | } |
199 | 132 | ||
200 | pteg = slot / HPTES_PER_GROUP; | 133 | hpte_v = hpte_v_array[slot % 4]; |
201 | bit = slot % HPTES_PER_GROUP; | ||
202 | inusetab[pteg] &= ~(0x80 >> bit); | ||
203 | 134 | ||
204 | spin_unlock_irqrestore(&ps3_bolttab_lock, flags); | 135 | /* |
136 | * As lv1_read_htab_entries() does not give us the RPN, we can | ||
137 | * not synthesize the new hpte_r value here, and therefore can | ||
138 | * not update the hpte with lv1_insert_htab_entry(), so we | ||
139 | * insted invalidate it and ask the caller to update it via | ||
140 | * ps3_hpte_insert() by returning a -1 value. | ||
141 | */ | ||
142 | if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) { | ||
143 | /* not found */ | ||
144 | ret = -1; | ||
145 | } else { | ||
146 | /* entry found, just invalidate it */ | ||
147 | result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, | ||
148 | slot, 0, 0); | ||
149 | ret = -1; | ||
150 | } | ||
205 | 151 | ||
206 | /* ps3_hpte_insert() will be used to update PTE */ | 152 | spin_unlock_irqrestore(&ps3_htab_lock, flags); |
207 | return -1; | 153 | return ret; |
208 | } | 154 | } |
209 | 155 | ||
210 | static void ps3_hpte_updateboltedpp(unsigned long newpp, unsigned long ea, | 156 | static void ps3_hpte_updateboltedpp(unsigned long newpp, unsigned long ea, |
@@ -217,45 +163,35 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long va, | |||
217 | int psize, int ssize, int local) | 163 | int psize, int ssize, int local) |
218 | { | 164 | { |
219 | unsigned long flags; | 165 | unsigned long flags; |
220 | unsigned long result; | 166 | int result; |
221 | unsigned long pteg, bit; | 167 | |
168 | spin_lock_irqsave(&ps3_htab_lock, flags); | ||
222 | 169 | ||
223 | spin_lock_irqsave(&ps3_bolttab_lock, flags); | 170 | result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, slot, 0, 0); |
224 | result = lv1_write_htab_entry(0, slot, 0, 0); | ||
225 | 171 | ||
226 | if (result) { | 172 | if (result) { |
227 | DBG("%s: va=%lx slot=%lx psize=%d result = %ld (0x%lx)\n", | 173 | pr_info("%s: res=%d va=%lx slot=%lx psize=%d\n", |
228 | __func__, va, slot, psize, result, result); | 174 | __func__, result, va, slot, psize); |
229 | BUG(); | 175 | BUG(); |
230 | } | 176 | } |
231 | 177 | ||
232 | pteg = slot / HPTES_PER_GROUP; | 178 | spin_unlock_irqrestore(&ps3_htab_lock, flags); |
233 | bit = slot % HPTES_PER_GROUP; | ||
234 | inusetab[pteg] &= ~(0x80 >> bit); | ||
235 | spin_unlock_irqrestore(&ps3_bolttab_lock, flags); | ||
236 | } | 179 | } |
237 | 180 | ||
238 | static void ps3_hpte_clear(void) | 181 | static void ps3_hpte_clear(void) |
239 | { | 182 | { |
240 | int result; | 183 | unsigned long hpte_count = (1UL << ppc64_pft_size) >> 4; |
241 | 184 | u64 i; | |
242 | DBG(" -> %s:%d\n", __func__, __LINE__); | ||
243 | 185 | ||
244 | result = lv1_unmap_htab(htab_addr); | 186 | for (i = 0; i < hpte_count; i++) |
245 | BUG_ON(result); | 187 | lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, i, 0, 0); |
246 | 188 | ||
247 | ps3_mm_shutdown(); | 189 | ps3_mm_shutdown(); |
248 | ps3_mm_vas_destroy(); | 190 | ps3_mm_vas_destroy(); |
249 | |||
250 | DBG(" <- %s:%d\n", __func__, __LINE__); | ||
251 | } | 191 | } |
252 | 192 | ||
253 | void __init ps3_hpte_init(unsigned long htab_size) | 193 | void __init ps3_hpte_init(unsigned long htab_size) |
254 | { | 194 | { |
255 | long bitmap_size; | ||
256 | |||
257 | DBG(" -> %s:%d\n", __func__, __LINE__); | ||
258 | |||
259 | ppc_md.hpte_invalidate = ps3_hpte_invalidate; | 195 | ppc_md.hpte_invalidate = ps3_hpte_invalidate; |
260 | ppc_md.hpte_updatepp = ps3_hpte_updatepp; | 196 | ppc_md.hpte_updatepp = ps3_hpte_updatepp; |
261 | ppc_md.hpte_updateboltedpp = ps3_hpte_updateboltedpp; | 197 | ppc_md.hpte_updateboltedpp = ps3_hpte_updateboltedpp; |
@@ -264,28 +200,5 @@ void __init ps3_hpte_init(unsigned long htab_size) | |||
264 | ppc_md.hpte_clear_all = ps3_hpte_clear; | 200 | ppc_md.hpte_clear_all = ps3_hpte_clear; |
265 | 201 | ||
266 | ppc64_pft_size = __ilog2(htab_size); | 202 | ppc64_pft_size = __ilog2(htab_size); |
267 | |||
268 | bitmap_size = htab_size / sizeof(struct hash_pte) / 8; | ||
269 | |||
270 | bolttab = __va(lmb_alloc(bitmap_size, 1)); | ||
271 | inusetab = __va(lmb_alloc(bitmap_size, 1)); | ||
272 | |||
273 | memset(bolttab, 0, bitmap_size); | ||
274 | memset(inusetab, 0, bitmap_size); | ||
275 | |||
276 | DBG(" <- %s:%d\n", __func__, __LINE__); | ||
277 | } | 203 | } |
278 | 204 | ||
279 | void __init ps3_map_htab(void) | ||
280 | { | ||
281 | long result; | ||
282 | unsigned long htab_size = (1UL << ppc64_pft_size); | ||
283 | |||
284 | result = lv1_map_htab(0, &htab_addr); | ||
285 | |||
286 | htab = (__force struct hash_pte *)ioremap_flags(htab_addr, htab_size, | ||
287 | pgprot_val(PAGE_READONLY_X)); | ||
288 | |||
289 | DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__, | ||
290 | htab_addr, (unsigned long)htab); | ||
291 | } | ||
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c index a413abbd4123..77bc330263c4 100644 --- a/arch/powerpc/platforms/ps3/setup.c +++ b/arch/powerpc/platforms/ps3/setup.c | |||
@@ -201,7 +201,6 @@ static void __init ps3_setup_arch(void) | |||
201 | ps3_firmware_version.rev); | 201 | ps3_firmware_version.rev); |
202 | 202 | ||
203 | ps3_spu_set_platform(); | 203 | ps3_spu_set_platform(); |
204 | ps3_map_htab(); | ||
205 | 204 | ||
206 | #ifdef CONFIG_SMP | 205 | #ifdef CONFIG_SMP |
207 | smp_init_ps3(); | 206 | smp_init_ps3(); |
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c index d135cef9ed6a..ccae3d446b98 100644 --- a/arch/powerpc/platforms/ps3/spu.c +++ b/arch/powerpc/platforms/ps3/spu.c | |||
@@ -186,14 +186,24 @@ static void spu_unmap(struct spu *spu) | |||
186 | iounmap(spu_pdata(spu)->shadow); | 186 | iounmap(spu_pdata(spu)->shadow); |
187 | } | 187 | } |
188 | 188 | ||
189 | /** | ||
190 | * setup_areas - Map the spu regions into the address space. | ||
191 | * | ||
192 | * The current HV requires the spu shadow regs to be mapped with the | ||
193 | * PTE page protection bits set as read-only (PP=3). This implementation | ||
194 | * uses the low level __ioremap() to bypass the page protection settings | ||
195 | * inforced by ioremap_flags() to get the needed PTE bits set for the | ||
196 | * shadow regs. | ||
197 | */ | ||
198 | |||
189 | static int __init setup_areas(struct spu *spu) | 199 | static int __init setup_areas(struct spu *spu) |
190 | { | 200 | { |
191 | struct table {char* name; unsigned long addr; unsigned long size;}; | 201 | struct table {char* name; unsigned long addr; unsigned long size;}; |
202 | static const unsigned long shadow_flags = _PAGE_NO_CACHE | 3; | ||
192 | 203 | ||
193 | spu_pdata(spu)->shadow = ioremap_flags(spu_pdata(spu)->shadow_addr, | 204 | spu_pdata(spu)->shadow = __ioremap(spu_pdata(spu)->shadow_addr, |
194 | sizeof(struct spe_shadow), | 205 | sizeof(struct spe_shadow), |
195 | pgprot_val(PAGE_READONLY) | | 206 | shadow_flags); |
196 | _PAGE_NO_CACHE); | ||
197 | if (!spu_pdata(spu)->shadow) { | 207 | if (!spu_pdata(spu)->shadow) { |
198 | pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__); | 208 | pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__); |
199 | goto fail_ioremap; | 209 | goto fail_ioremap; |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 3ce8a139b85d..7b01d67b4e48 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -71,6 +71,7 @@ | |||
71 | int CMO_PrPSP = -1; | 71 | int CMO_PrPSP = -1; |
72 | int CMO_SecPSP = -1; | 72 | int CMO_SecPSP = -1; |
73 | unsigned long CMO_PageSize = (ASM_CONST(1) << IOMMU_PAGE_SHIFT); | 73 | unsigned long CMO_PageSize = (ASM_CONST(1) << IOMMU_PAGE_SHIFT); |
74 | EXPORT_SYMBOL(CMO_PageSize); | ||
74 | 75 | ||
75 | int fwnmi_active; /* TRUE if an FWNMI handler is present */ | 76 | int fwnmi_active; /* TRUE if an FWNMI handler is present */ |
76 | 77 | ||
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c index 53da8a079f96..00d3d17c84a3 100644 --- a/arch/powerpc/sysdev/cpm_common.c +++ b/arch/powerpc/sysdev/cpm_common.c | |||
@@ -254,15 +254,11 @@ static int cpm2_gpio32_get(struct gpio_chip *gc, unsigned int gpio) | |||
254 | return !!(in_be32(&iop->dat) & pin_mask); | 254 | return !!(in_be32(&iop->dat) & pin_mask); |
255 | } | 255 | } |
256 | 256 | ||
257 | static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) | 257 | static void __cpm2_gpio32_set(struct of_mm_gpio_chip *mm_gc, u32 pin_mask, |
258 | int value) | ||
258 | { | 259 | { |
259 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | ||
260 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); | 260 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); |
261 | struct cpm2_ioports __iomem *iop = mm_gc->regs; | 261 | struct cpm2_ioports __iomem *iop = mm_gc->regs; |
262 | unsigned long flags; | ||
263 | u32 pin_mask = 1 << (31 - gpio); | ||
264 | |||
265 | spin_lock_irqsave(&cpm2_gc->lock, flags); | ||
266 | 262 | ||
267 | if (value) | 263 | if (value) |
268 | cpm2_gc->cpdata |= pin_mask; | 264 | cpm2_gc->cpdata |= pin_mask; |
@@ -270,6 +266,18 @@ static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) | |||
270 | cpm2_gc->cpdata &= ~pin_mask; | 266 | cpm2_gc->cpdata &= ~pin_mask; |
271 | 267 | ||
272 | out_be32(&iop->dat, cpm2_gc->cpdata); | 268 | out_be32(&iop->dat, cpm2_gc->cpdata); |
269 | } | ||
270 | |||
271 | static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) | ||
272 | { | ||
273 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | ||
274 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); | ||
275 | unsigned long flags; | ||
276 | u32 pin_mask = 1 << (31 - gpio); | ||
277 | |||
278 | spin_lock_irqsave(&cpm2_gc->lock, flags); | ||
279 | |||
280 | __cpm2_gpio32_set(mm_gc, pin_mask, value); | ||
273 | 281 | ||
274 | spin_unlock_irqrestore(&cpm2_gc->lock, flags); | 282 | spin_unlock_irqrestore(&cpm2_gc->lock, flags); |
275 | } | 283 | } |
@@ -277,14 +285,17 @@ static void cpm2_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value) | |||
277 | static int cpm2_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) | 285 | static int cpm2_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) |
278 | { | 286 | { |
279 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 287 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
288 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); | ||
280 | struct cpm2_ioports __iomem *iop = mm_gc->regs; | 289 | struct cpm2_ioports __iomem *iop = mm_gc->regs; |
281 | u32 pin_mask; | 290 | unsigned long flags; |
291 | u32 pin_mask = 1 << (31 - gpio); | ||
282 | 292 | ||
283 | pin_mask = 1 << (31 - gpio); | 293 | spin_lock_irqsave(&cpm2_gc->lock, flags); |
284 | 294 | ||
285 | setbits32(&iop->dir, pin_mask); | 295 | setbits32(&iop->dir, pin_mask); |
296 | __cpm2_gpio32_set(mm_gc, pin_mask, val); | ||
286 | 297 | ||
287 | cpm2_gpio32_set(gc, gpio, val); | 298 | spin_unlock_irqrestore(&cpm2_gc->lock, flags); |
288 | 299 | ||
289 | return 0; | 300 | return 0; |
290 | } | 301 | } |
@@ -292,13 +303,17 @@ static int cpm2_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) | |||
292 | static int cpm2_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio) | 303 | static int cpm2_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio) |
293 | { | 304 | { |
294 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); | 305 | struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc); |
306 | struct cpm2_gpio32_chip *cpm2_gc = to_cpm2_gpio32_chip(mm_gc); | ||
295 | struct cpm2_ioports __iomem *iop = mm_gc->regs; | 307 | struct cpm2_ioports __iomem *iop = mm_gc->regs; |
296 | u32 pin_mask; | 308 | unsigned long flags; |
309 | u32 pin_mask = 1 << (31 - gpio); | ||
297 | 310 | ||
298 | pin_mask = 1 << (31 - gpio); | 311 | spin_lock_irqsave(&cpm2_gc->lock, flags); |
299 | 312 | ||
300 | clrbits32(&iop->dir, pin_mask); | 313 | clrbits32(&iop->dir, pin_mask); |
301 | 314 | ||
315 | spin_unlock_irqrestore(&cpm2_gc->lock, flags); | ||
316 | |||
302 | return 0; | 317 | return 0; |
303 | } | 318 | } |
304 | 319 | ||
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c index 1aecb075a72e..25fbbfaa837d 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c +++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c | |||
@@ -208,6 +208,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc | |||
208 | uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast)); | 208 | uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast)); |
209 | if (uccf->uf_regs == NULL) { | 209 | if (uccf->uf_regs == NULL) { |
210 | printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__); | 210 | printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__); |
211 | kfree(uccf); | ||
211 | return -ENOMEM; | 212 | return -ENOMEM; |
212 | } | 213 | } |
213 | 214 | ||
@@ -355,6 +356,9 @@ void ucc_fast_free(struct ucc_fast_private * uccf) | |||
355 | if (uccf->ucc_fast_rx_virtual_fifo_base_offset) | 356 | if (uccf->ucc_fast_rx_virtual_fifo_base_offset) |
356 | qe_muram_free(uccf->ucc_fast_rx_virtual_fifo_base_offset); | 357 | qe_muram_free(uccf->ucc_fast_rx_virtual_fifo_base_offset); |
357 | 358 | ||
359 | if (uccf->uf_regs) | ||
360 | iounmap(uccf->uf_regs); | ||
361 | |||
358 | kfree(uccf); | 362 | kfree(uccf); |
359 | } | 363 | } |
360 | EXPORT_SYMBOL(ucc_fast_free); | 364 | EXPORT_SYMBOL(ucc_fast_free); |
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/arch/powerpc/sysdev/qe_lib/ucc_slow.c index a578bc77b9d5..e1d6a1340157 100644 --- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c +++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c | |||
@@ -171,6 +171,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc | |||
171 | uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow)); | 171 | uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow)); |
172 | if (uccs->us_regs == NULL) { | 172 | if (uccs->us_regs == NULL) { |
173 | printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__); | 173 | printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__); |
174 | kfree(uccs); | ||
174 | return -ENOMEM; | 175 | return -ENOMEM; |
175 | } | 176 | } |
176 | 177 | ||
@@ -367,10 +368,11 @@ void ucc_slow_free(struct ucc_slow_private * uccs) | |||
367 | if (uccs->tx_base_offset) | 368 | if (uccs->tx_base_offset) |
368 | qe_muram_free(uccs->tx_base_offset); | 369 | qe_muram_free(uccs->tx_base_offset); |
369 | 370 | ||
370 | if (uccs->us_pram) { | 371 | if (uccs->us_pram) |
371 | qe_muram_free(uccs->us_pram_offset); | 372 | qe_muram_free(uccs->us_pram_offset); |
372 | uccs->us_pram = NULL; | 373 | |
373 | } | 374 | if (uccs->us_regs) |
375 | iounmap(uccs->us_regs); | ||
374 | 376 | ||
375 | kfree(uccs); | 377 | kfree(uccs); |
376 | } | 378 | } |
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 76c1e60c92f3..607bd67a18ce 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
@@ -55,7 +55,7 @@ SECTIONS | |||
55 | __start___ex_table = .; | 55 | __start___ex_table = .; |
56 | *(__ex_table) | 56 | *(__ex_table) |
57 | __stop___ex_table = .; | 57 | __stop___ex_table = .; |
58 | } | 58 | } :data |
59 | 59 | ||
60 | .data : { /* Data */ | 60 | .data : { /* Data */ |
61 | DATA_DATA | 61 | DATA_DATA |
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 6668e6037af6..9592889a6fd0 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
@@ -52,20 +52,24 @@ endif | |||
52 | export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o | 52 | export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o |
53 | 53 | ||
54 | # Default target | 54 | # Default target |
55 | all: image | 55 | all: zImage |
56 | 56 | ||
57 | boot := arch/sparc/boot | 57 | boot := arch/sparc/boot |
58 | 58 | ||
59 | image tftpboot.img: vmlinux | 59 | image zImage tftpboot.img: vmlinux |
60 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ | 60 | $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ |
61 | 61 | ||
62 | archclean: | 62 | archclean: |
63 | $(Q)$(MAKE) $(clean)=$(boot) | 63 | $(Q)$(MAKE) $(clean)=$(boot) |
64 | 64 | ||
65 | # This is the image used for packaging | ||
66 | KBUILD_IMAGE := $(boot)/zImage | ||
67 | |||
65 | CLEAN_FILES += arch/$(ARCH)/boot/System.map | 68 | CLEAN_FILES += arch/$(ARCH)/boot/System.map |
66 | 69 | ||
67 | # Don't use tabs in echo arguments. | 70 | # Don't use tabs in echo arguments. |
68 | define archhelp | 71 | define archhelp |
69 | echo '* image - kernel image ($(boot)/image)' | 72 | echo '* image - kernel image ($(boot)/image)' |
73 | echo '* zImage - stripped kernel image ($(boot)/zImage)' | ||
70 | echo ' tftpboot.img - image prepared for tftp' | 74 | echo ' tftpboot.img - image prepared for tftp' |
71 | endef | 75 | endef |
diff --git a/arch/sparc/boot/Makefile b/arch/sparc/boot/Makefile index 22d331e1e941..3e77a9f52248 100644 --- a/arch/sparc/boot/Makefile +++ b/arch/sparc/boot/Makefile | |||
@@ -19,6 +19,9 @@ quiet_cmd_sysmap = SYSMAP $(obj)/System.map | |||
19 | cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap | 19 | cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap |
20 | quiet_cmd_image = LD $@ | 20 | quiet_cmd_image = LD $@ |
21 | cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@ | 21 | cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@ |
22 | quiet_cmd_strip = STRIP $@ | ||
23 | cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $(obj)/image -o $@ | ||
24 | |||
22 | 25 | ||
23 | define rule_image | 26 | define rule_image |
24 | $(if $($(quiet)cmd_image), \ | 27 | $(if $($(quiet)cmd_image), \ |
@@ -49,6 +52,9 @@ LDFLAGS_image := -T arch/sparc/kernel/vmlinux.lds $(BTOBJS) \ | |||
49 | $(obj)/image: $(obj)/btfix.o FORCE | 52 | $(obj)/image: $(obj)/btfix.o FORCE |
50 | $(call if_changed_rule,image) | 53 | $(call if_changed_rule,image) |
51 | 54 | ||
55 | $(obj)/zImage: $(obj)/image | ||
56 | $(call if_changed,strip) | ||
57 | |||
52 | $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE | 58 | $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE |
53 | $(call if_changed,elftoaout) | 59 | $(call if_changed,elftoaout) |
54 | $(call if_changed,piggy) | 60 | $(call if_changed,piggy) |
diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h index 7201752cf934..a8180e546a48 100644 --- a/arch/sparc/include/asm/smp_32.h +++ b/arch/sparc/include/asm/smp_32.h | |||
@@ -50,27 +50,24 @@ struct seq_file; | |||
50 | void smp_bogo(struct seq_file *); | 50 | void smp_bogo(struct seq_file *); |
51 | void smp_info(struct seq_file *); | 51 | void smp_info(struct seq_file *); |
52 | 52 | ||
53 | BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long) | 53 | BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, cpumask_t, unsigned long, unsigned long, unsigned long, unsigned long) |
54 | BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void) | 54 | BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void) |
55 | BTFIXUPDEF_BLACKBOX(hard_smp_processor_id) | 55 | BTFIXUPDEF_BLACKBOX(hard_smp_processor_id) |
56 | BTFIXUPDEF_BLACKBOX(load_current) | 56 | BTFIXUPDEF_BLACKBOX(load_current) |
57 | 57 | ||
58 | #define smp_cross_call(func,arg1,arg2,arg3,arg4,arg5) BTFIXUP_CALL(smp_cross_call)(func,arg1,arg2,arg3,arg4,arg5) | 58 | #define smp_cross_call(func,mask,arg1,arg2,arg3,arg4) BTFIXUP_CALL(smp_cross_call)(func,mask,arg1,arg2,arg3,arg4) |
59 | 59 | ||
60 | static inline void xc0(smpfunc_t func) { smp_cross_call(func, 0, 0, 0, 0, 0); } | 60 | static inline void xc0(smpfunc_t func) { smp_cross_call(func, cpu_online_map, 0, 0, 0, 0); } |
61 | static inline void xc1(smpfunc_t func, unsigned long arg1) | 61 | static inline void xc1(smpfunc_t func, unsigned long arg1) |
62 | { smp_cross_call(func, arg1, 0, 0, 0, 0); } | 62 | { smp_cross_call(func, cpu_online_map, arg1, 0, 0, 0); } |
63 | static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2) | 63 | static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2) |
64 | { smp_cross_call(func, arg1, arg2, 0, 0, 0); } | 64 | { smp_cross_call(func, cpu_online_map, arg1, arg2, 0, 0); } |
65 | static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2, | 65 | static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2, |
66 | unsigned long arg3) | 66 | unsigned long arg3) |
67 | { smp_cross_call(func, arg1, arg2, arg3, 0, 0); } | 67 | { smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, 0); } |
68 | static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2, | 68 | static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2, |
69 | unsigned long arg3, unsigned long arg4) | 69 | unsigned long arg3, unsigned long arg4) |
70 | { smp_cross_call(func, arg1, arg2, arg3, arg4, 0); } | 70 | { smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, arg4); } |
71 | static inline void xc5(smpfunc_t func, unsigned long arg1, unsigned long arg2, | ||
72 | unsigned long arg3, unsigned long arg4, unsigned long arg5) | ||
73 | { smp_cross_call(func, arg1, arg2, arg3, arg4, arg5); } | ||
74 | 71 | ||
75 | static inline int smp_call_function(void (*func)(void *info), void *info, int wait) | 72 | static inline int smp_call_function(void (*func)(void *info), void *info, int wait) |
76 | { | 73 | { |
@@ -78,6 +75,14 @@ static inline int smp_call_function(void (*func)(void *info), void *info, int wa | |||
78 | return 0; | 75 | return 0; |
79 | } | 76 | } |
80 | 77 | ||
78 | static inline int smp_call_function_single(int cpuid, void (*func) (void *info), | ||
79 | void *info, int wait) | ||
80 | { | ||
81 | smp_cross_call((smpfunc_t)func, cpumask_of_cpu(cpuid), | ||
82 | (unsigned long) info, 0, 0, 0); | ||
83 | return 0; | ||
84 | } | ||
85 | |||
81 | static inline int cpu_logical_map(int cpu) | 86 | static inline int cpu_logical_map(int cpu) |
82 | { | 87 | { |
83 | return cpu; | 88 | return cpu; |
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c index cc4c235c4f59..c481d45f97b7 100644 --- a/arch/sparc/kernel/of_device.c +++ b/arch/sparc/kernel/of_device.c | |||
@@ -70,7 +70,7 @@ struct of_bus { | |||
70 | int *addrc, int *sizec); | 70 | int *addrc, int *sizec); |
71 | int (*map)(u32 *addr, const u32 *range, | 71 | int (*map)(u32 *addr, const u32 *range, |
72 | int na, int ns, int pna); | 72 | int na, int ns, int pna); |
73 | unsigned int (*get_flags)(const u32 *addr); | 73 | unsigned long (*get_flags)(const u32 *addr, unsigned long); |
74 | }; | 74 | }; |
75 | 75 | ||
76 | /* | 76 | /* |
@@ -130,8 +130,10 @@ static int of_bus_default_map(u32 *addr, const u32 *range, | |||
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
132 | 132 | ||
133 | static unsigned int of_bus_default_get_flags(const u32 *addr) | 133 | static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags) |
134 | { | 134 | { |
135 | if (flags) | ||
136 | return flags; | ||
135 | return IORESOURCE_MEM; | 137 | return IORESOURCE_MEM; |
136 | } | 138 | } |
137 | 139 | ||
@@ -194,17 +196,21 @@ static int of_bus_pci_map(u32 *addr, const u32 *range, | |||
194 | return 0; | 196 | return 0; |
195 | } | 197 | } |
196 | 198 | ||
197 | static unsigned int of_bus_pci_get_flags(const u32 *addr) | 199 | static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) |
198 | { | 200 | { |
199 | unsigned int flags = 0; | ||
200 | u32 w = addr[0]; | 201 | u32 w = addr[0]; |
201 | 202 | ||
203 | /* For PCI, we override whatever child busses may have used. */ | ||
204 | flags = 0; | ||
202 | switch((w >> 24) & 0x03) { | 205 | switch((w >> 24) & 0x03) { |
203 | case 0x01: | 206 | case 0x01: |
204 | flags |= IORESOURCE_IO; | 207 | flags |= IORESOURCE_IO; |
208 | break; | ||
209 | |||
205 | case 0x02: /* 32 bits */ | 210 | case 0x02: /* 32 bits */ |
206 | case 0x03: /* 64 bits */ | 211 | case 0x03: /* 64 bits */ |
207 | flags |= IORESOURCE_MEM; | 212 | flags |= IORESOURCE_MEM; |
213 | break; | ||
208 | } | 214 | } |
209 | if (w & 0x40000000) | 215 | if (w & 0x40000000) |
210 | flags |= IORESOURCE_PREFETCH; | 216 | flags |= IORESOURCE_PREFETCH; |
@@ -362,10 +368,11 @@ static void __init build_device_resources(struct of_device *op, | |||
362 | int pna, pns; | 368 | int pna, pns; |
363 | 369 | ||
364 | size = of_read_addr(reg + na, ns); | 370 | size = of_read_addr(reg + na, ns); |
365 | flags = bus->get_flags(reg); | ||
366 | 371 | ||
367 | memcpy(addr, reg, na * 4); | 372 | memcpy(addr, reg, na * 4); |
368 | 373 | ||
374 | flags = bus->get_flags(reg, 0); | ||
375 | |||
369 | /* If the immediate parent has no ranges property to apply, | 376 | /* If the immediate parent has no ranges property to apply, |
370 | * just use a 1<->1 mapping. | 377 | * just use a 1<->1 mapping. |
371 | */ | 378 | */ |
@@ -393,6 +400,8 @@ static void __init build_device_resources(struct of_device *op, | |||
393 | dna, dns, pna)) | 400 | dna, dns, pna)) |
394 | break; | 401 | break; |
395 | 402 | ||
403 | flags = pbus->get_flags(addr, flags); | ||
404 | |||
396 | dna = pna; | 405 | dna = pna; |
397 | dns = pns; | 406 | dns = pns; |
398 | dbus = pbus; | 407 | dbus = pbus; |
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index dfde77ff0848..69596402a500 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c | |||
@@ -262,8 +262,9 @@ static struct smp_funcall { | |||
262 | static DEFINE_SPINLOCK(cross_call_lock); | 262 | static DEFINE_SPINLOCK(cross_call_lock); |
263 | 263 | ||
264 | /* Cross calls must be serialized, at least currently. */ | 264 | /* Cross calls must be serialized, at least currently. */ |
265 | void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, | 265 | static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1, |
266 | unsigned long arg3, unsigned long arg4, unsigned long arg5) | 266 | unsigned long arg2, unsigned long arg3, |
267 | unsigned long arg4) | ||
267 | { | 268 | { |
268 | if(smp_processors_ready) { | 269 | if(smp_processors_ready) { |
269 | register int high = smp_highest_cpu; | 270 | register int high = smp_highest_cpu; |
@@ -278,7 +279,7 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, | |||
278 | register unsigned long a2 asm("i2") = arg2; | 279 | register unsigned long a2 asm("i2") = arg2; |
279 | register unsigned long a3 asm("i3") = arg3; | 280 | register unsigned long a3 asm("i3") = arg3; |
280 | register unsigned long a4 asm("i4") = arg4; | 281 | register unsigned long a4 asm("i4") = arg4; |
281 | register unsigned long a5 asm("i5") = arg5; | 282 | register unsigned long a5 asm("i5") = 0; |
282 | 283 | ||
283 | __asm__ __volatile__( | 284 | __asm__ __volatile__( |
284 | "std %0, [%6]\n\t" | 285 | "std %0, [%6]\n\t" |
@@ -290,11 +291,10 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, | |||
290 | 291 | ||
291 | /* Init receive/complete mapping, plus fire the IPI's off. */ | 292 | /* Init receive/complete mapping, plus fire the IPI's off. */ |
292 | { | 293 | { |
293 | cpumask_t mask; | ||
294 | register int i; | 294 | register int i; |
295 | 295 | ||
296 | mask = cpumask_of_cpu(hard_smp4d_processor_id()); | 296 | cpu_clear(smp_processor_id(), mask); |
297 | cpus_andnot(mask, cpu_online_map, mask); | 297 | cpus_and(mask, cpu_online_map, mask); |
298 | for(i = 0; i <= high; i++) { | 298 | for(i = 0; i <= high; i++) { |
299 | if (cpu_isset(i, mask)) { | 299 | if (cpu_isset(i, mask)) { |
300 | ccall_info.processors_in[i] = 0; | 300 | ccall_info.processors_in[i] = 0; |
@@ -309,12 +309,16 @@ void smp4d_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2, | |||
309 | 309 | ||
310 | i = 0; | 310 | i = 0; |
311 | do { | 311 | do { |
312 | if (!cpu_isset(i, mask)) | ||
313 | continue; | ||
312 | while(!ccall_info.processors_in[i]) | 314 | while(!ccall_info.processors_in[i]) |
313 | barrier(); | 315 | barrier(); |
314 | } while(++i <= high); | 316 | } while(++i <= high); |
315 | 317 | ||
316 | i = 0; | 318 | i = 0; |
317 | do { | 319 | do { |
320 | if (!cpu_isset(i, mask)) | ||
321 | continue; | ||
318 | while(!ccall_info.processors_out[i]) | 322 | while(!ccall_info.processors_out[i]) |
319 | barrier(); | 323 | barrier(); |
320 | } while(++i <= high); | 324 | } while(++i <= high); |
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 406ac1abc83a..a14a76ac7f36 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -244,9 +244,9 @@ static struct smp_funcall { | |||
244 | static DEFINE_SPINLOCK(cross_call_lock); | 244 | static DEFINE_SPINLOCK(cross_call_lock); |
245 | 245 | ||
246 | /* Cross calls must be serialized, at least currently. */ | 246 | /* Cross calls must be serialized, at least currently. */ |
247 | static void smp4m_cross_call(smpfunc_t func, unsigned long arg1, | 247 | static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1, |
248 | unsigned long arg2, unsigned long arg3, | 248 | unsigned long arg2, unsigned long arg3, |
249 | unsigned long arg4, unsigned long arg5) | 249 | unsigned long arg4) |
250 | { | 250 | { |
251 | register int ncpus = SUN4M_NCPUS; | 251 | register int ncpus = SUN4M_NCPUS; |
252 | unsigned long flags; | 252 | unsigned long flags; |
@@ -259,14 +259,14 @@ static void smp4m_cross_call(smpfunc_t func, unsigned long arg1, | |||
259 | ccall_info.arg2 = arg2; | 259 | ccall_info.arg2 = arg2; |
260 | ccall_info.arg3 = arg3; | 260 | ccall_info.arg3 = arg3; |
261 | ccall_info.arg4 = arg4; | 261 | ccall_info.arg4 = arg4; |
262 | ccall_info.arg5 = arg5; | 262 | ccall_info.arg5 = 0; |
263 | 263 | ||
264 | /* Init receive/complete mapping, plus fire the IPI's off. */ | 264 | /* Init receive/complete mapping, plus fire the IPI's off. */ |
265 | { | 265 | { |
266 | cpumask_t mask = cpu_online_map; | ||
267 | register int i; | 266 | register int i; |
268 | 267 | ||
269 | cpu_clear(smp_processor_id(), mask); | 268 | cpu_clear(smp_processor_id(), mask); |
269 | cpus_and(mask, cpu_online_map, mask); | ||
270 | for(i = 0; i < ncpus; i++) { | 270 | for(i = 0; i < ncpus; i++) { |
271 | if (cpu_isset(i, mask)) { | 271 | if (cpu_isset(i, mask)) { |
272 | ccall_info.processors_in[i] = 0; | 272 | ccall_info.processors_in[i] = 0; |
@@ -284,12 +284,16 @@ static void smp4m_cross_call(smpfunc_t func, unsigned long arg1, | |||
284 | 284 | ||
285 | i = 0; | 285 | i = 0; |
286 | do { | 286 | do { |
287 | if (!cpu_isset(i, mask)) | ||
288 | continue; | ||
287 | while(!ccall_info.processors_in[i]) | 289 | while(!ccall_info.processors_in[i]) |
288 | barrier(); | 290 | barrier(); |
289 | } while(++i < ncpus); | 291 | } while(++i < ncpus); |
290 | 292 | ||
291 | i = 0; | 293 | i = 0; |
292 | do { | 294 | do { |
295 | if (!cpu_isset(i, mask)) | ||
296 | continue; | ||
293 | while(!ccall_info.processors_out[i]) | 297 | while(!ccall_info.processors_out[i]) |
294 | barrier(); | 298 | barrier(); |
295 | } while(++i < ncpus); | 299 | } while(++i < ncpus); |
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 923a98959fa7..36b4b7ab9cfb 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -231,6 +231,7 @@ endmenu | |||
231 | 231 | ||
232 | config NUMA | 232 | config NUMA |
233 | bool "NUMA support" | 233 | bool "NUMA support" |
234 | depends on SMP | ||
234 | 235 | ||
235 | config NODES_SHIFT | 236 | config NODES_SHIFT |
236 | int | 237 | int |
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index f8b50cbf4bf7..f845f150f565 100644 --- a/arch/sparc64/kernel/of_device.c +++ b/arch/sparc64/kernel/of_device.c | |||
@@ -96,7 +96,7 @@ struct of_bus { | |||
96 | int *addrc, int *sizec); | 96 | int *addrc, int *sizec); |
97 | int (*map)(u32 *addr, const u32 *range, | 97 | int (*map)(u32 *addr, const u32 *range, |
98 | int na, int ns, int pna); | 98 | int na, int ns, int pna); |
99 | unsigned int (*get_flags)(const u32 *addr); | 99 | unsigned long (*get_flags)(const u32 *addr, unsigned long); |
100 | }; | 100 | }; |
101 | 101 | ||
102 | /* | 102 | /* |
@@ -156,8 +156,10 @@ static int of_bus_default_map(u32 *addr, const u32 *range, | |||
156 | return 0; | 156 | return 0; |
157 | } | 157 | } |
158 | 158 | ||
159 | static unsigned int of_bus_default_get_flags(const u32 *addr) | 159 | static unsigned long of_bus_default_get_flags(const u32 *addr, unsigned long flags) |
160 | { | 160 | { |
161 | if (flags) | ||
162 | return flags; | ||
161 | return IORESOURCE_MEM; | 163 | return IORESOURCE_MEM; |
162 | } | 164 | } |
163 | 165 | ||
@@ -249,17 +251,21 @@ static int of_bus_pci_map(u32 *addr, const u32 *range, | |||
249 | return 0; | 251 | return 0; |
250 | } | 252 | } |
251 | 253 | ||
252 | static unsigned int of_bus_pci_get_flags(const u32 *addr) | 254 | static unsigned long of_bus_pci_get_flags(const u32 *addr, unsigned long flags) |
253 | { | 255 | { |
254 | unsigned int flags = 0; | ||
255 | u32 w = addr[0]; | 256 | u32 w = addr[0]; |
256 | 257 | ||
258 | /* For PCI, we override whatever child busses may have used. */ | ||
259 | flags = 0; | ||
257 | switch((w >> 24) & 0x03) { | 260 | switch((w >> 24) & 0x03) { |
258 | case 0x01: | 261 | case 0x01: |
259 | flags |= IORESOURCE_IO; | 262 | flags |= IORESOURCE_IO; |
263 | break; | ||
264 | |||
260 | case 0x02: /* 32 bits */ | 265 | case 0x02: /* 32 bits */ |
261 | case 0x03: /* 64 bits */ | 266 | case 0x03: /* 64 bits */ |
262 | flags |= IORESOURCE_MEM; | 267 | flags |= IORESOURCE_MEM; |
268 | break; | ||
263 | } | 269 | } |
264 | if (w & 0x40000000) | 270 | if (w & 0x40000000) |
265 | flags |= IORESOURCE_PREFETCH; | 271 | flags |= IORESOURCE_PREFETCH; |
@@ -478,10 +484,10 @@ static void __init build_device_resources(struct of_device *op, | |||
478 | int pna, pns; | 484 | int pna, pns; |
479 | 485 | ||
480 | size = of_read_addr(reg + na, ns); | 486 | size = of_read_addr(reg + na, ns); |
481 | flags = bus->get_flags(reg); | ||
482 | |||
483 | memcpy(addr, reg, na * 4); | 487 | memcpy(addr, reg, na * 4); |
484 | 488 | ||
489 | flags = bus->get_flags(addr, 0); | ||
490 | |||
485 | if (use_1to1_mapping(pp)) { | 491 | if (use_1to1_mapping(pp)) { |
486 | result = of_read_addr(addr, na); | 492 | result = of_read_addr(addr, na); |
487 | goto build_res; | 493 | goto build_res; |
@@ -506,6 +512,8 @@ static void __init build_device_resources(struct of_device *op, | |||
506 | dna, dns, pna)) | 512 | dna, dns, pna)) |
507 | break; | 513 | break; |
508 | 514 | ||
515 | flags = pbus->get_flags(addr, flags); | ||
516 | |||
509 | dna = pna; | 517 | dna = pna; |
510 | dns = pns; | 518 | dns = pns; |
511 | dbus = pbus; | 519 | dbus = pbus; |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index b4aeb0f696dc..a41df7bef035 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -1843,7 +1843,7 @@ static int pavail_rescan_ents __initdata; | |||
1843 | * memory list again, and make sure it provides at least as much | 1843 | * memory list again, and make sure it provides at least as much |
1844 | * memory as 'pavail' does. | 1844 | * memory as 'pavail' does. |
1845 | */ | 1845 | */ |
1846 | static void setup_valid_addr_bitmap_from_pavail(void) | 1846 | static void __init setup_valid_addr_bitmap_from_pavail(void) |
1847 | { | 1847 | { |
1848 | int i; | 1848 | int i; |
1849 | 1849 | ||
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 4d73f53287b6..104275e191a8 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
@@ -1,13 +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.26-rc1 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Sun May 4 19:59:02 2008 | 4 | # Mon Aug 25 15:04:00 2008 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
8 | # CONFIG_X86_64 is not set | 8 | # CONFIG_X86_64 is not set |
9 | CONFIG_X86=y | 9 | CONFIG_X86=y |
10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig" | 10 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" |
11 | # CONFIG_GENERIC_LOCKBREAK is not set | 11 | # CONFIG_GENERIC_LOCKBREAK is not set |
12 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
13 | CONFIG_GENERIC_CMOS_UPDATE=y | 13 | CONFIG_GENERIC_CMOS_UPDATE=y |
@@ -53,6 +53,7 @@ CONFIG_X86_HT=y | |||
53 | CONFIG_X86_BIOS_REBOOT=y | 53 | CONFIG_X86_BIOS_REBOOT=y |
54 | CONFIG_X86_TRAMPOLINE=y | 54 | CONFIG_X86_TRAMPOLINE=y |
55 | CONFIG_KTIME_SCALAR=y | 55 | CONFIG_KTIME_SCALAR=y |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
56 | 57 | ||
57 | # | 58 | # |
58 | # General setup | 59 | # General setup |
@@ -82,6 +83,7 @@ CONFIG_CGROUPS=y | |||
82 | CONFIG_CGROUP_NS=y | 83 | CONFIG_CGROUP_NS=y |
83 | # CONFIG_CGROUP_DEVICE is not set | 84 | # CONFIG_CGROUP_DEVICE is not set |
84 | CONFIG_CPUSETS=y | 85 | CONFIG_CPUSETS=y |
86 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y | ||
85 | CONFIG_GROUP_SCHED=y | 87 | CONFIG_GROUP_SCHED=y |
86 | CONFIG_FAIR_GROUP_SCHED=y | 88 | CONFIG_FAIR_GROUP_SCHED=y |
87 | # CONFIG_RT_GROUP_SCHED is not set | 89 | # CONFIG_RT_GROUP_SCHED is not set |
@@ -105,7 +107,6 @@ CONFIG_SYSCTL=y | |||
105 | # CONFIG_EMBEDDED is not set | 107 | # CONFIG_EMBEDDED is not set |
106 | CONFIG_UID16=y | 108 | CONFIG_UID16=y |
107 | CONFIG_SYSCTL_SYSCALL=y | 109 | CONFIG_SYSCTL_SYSCALL=y |
108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
109 | CONFIG_KALLSYMS=y | 110 | CONFIG_KALLSYMS=y |
110 | CONFIG_KALLSYMS_ALL=y | 111 | CONFIG_KALLSYMS_ALL=y |
111 | CONFIG_KALLSYMS_EXTRA_PASS=y | 112 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -113,6 +114,7 @@ CONFIG_HOTPLUG=y | |||
113 | CONFIG_PRINTK=y | 114 | CONFIG_PRINTK=y |
114 | CONFIG_BUG=y | 115 | CONFIG_BUG=y |
115 | CONFIG_ELF_CORE=y | 116 | CONFIG_ELF_CORE=y |
117 | CONFIG_PCSPKR_PLATFORM=y | ||
116 | # CONFIG_COMPAT_BRK is not set | 118 | # CONFIG_COMPAT_BRK is not set |
117 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
118 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
@@ -132,27 +134,35 @@ CONFIG_MARKERS=y | |||
132 | # CONFIG_OPROFILE is not set | 134 | # CONFIG_OPROFILE is not set |
133 | CONFIG_HAVE_OPROFILE=y | 135 | CONFIG_HAVE_OPROFILE=y |
134 | CONFIG_KPROBES=y | 136 | CONFIG_KPROBES=y |
137 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
135 | CONFIG_KRETPROBES=y | 138 | CONFIG_KRETPROBES=y |
139 | CONFIG_HAVE_IOREMAP_PROT=y | ||
136 | CONFIG_HAVE_KPROBES=y | 140 | CONFIG_HAVE_KPROBES=y |
137 | CONFIG_HAVE_KRETPROBES=y | 141 | CONFIG_HAVE_KRETPROBES=y |
142 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
138 | # CONFIG_HAVE_DMA_ATTRS is not set | 143 | # CONFIG_HAVE_DMA_ATTRS is not set |
144 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
145 | # CONFIG_HAVE_CLK is not set | ||
139 | CONFIG_PROC_PAGE_MONITOR=y | 146 | CONFIG_PROC_PAGE_MONITOR=y |
147 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | ||
140 | CONFIG_SLABINFO=y | 148 | CONFIG_SLABINFO=y |
141 | CONFIG_RT_MUTEXES=y | 149 | CONFIG_RT_MUTEXES=y |
142 | # CONFIG_TINY_SHMEM is not set | 150 | # CONFIG_TINY_SHMEM is not set |
143 | CONFIG_BASE_SMALL=0 | 151 | CONFIG_BASE_SMALL=0 |
144 | CONFIG_MODULES=y | 152 | CONFIG_MODULES=y |
153 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
145 | CONFIG_MODULE_UNLOAD=y | 154 | CONFIG_MODULE_UNLOAD=y |
146 | CONFIG_MODULE_FORCE_UNLOAD=y | 155 | CONFIG_MODULE_FORCE_UNLOAD=y |
147 | # CONFIG_MODVERSIONS is not set | 156 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 157 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | # CONFIG_KMOD is not set | 158 | CONFIG_KMOD=y |
150 | CONFIG_STOP_MACHINE=y | 159 | CONFIG_STOP_MACHINE=y |
151 | CONFIG_BLOCK=y | 160 | CONFIG_BLOCK=y |
152 | # CONFIG_LBD is not set | 161 | # CONFIG_LBD is not set |
153 | CONFIG_BLK_DEV_IO_TRACE=y | 162 | CONFIG_BLK_DEV_IO_TRACE=y |
154 | # CONFIG_LSF is not set | 163 | # CONFIG_LSF is not set |
155 | CONFIG_BLK_DEV_BSG=y | 164 | CONFIG_BLK_DEV_BSG=y |
165 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
156 | 166 | ||
157 | # | 167 | # |
158 | # IO Schedulers | 168 | # IO Schedulers |
@@ -176,19 +186,17 @@ CONFIG_NO_HZ=y | |||
176 | CONFIG_HIGH_RES_TIMERS=y | 186 | CONFIG_HIGH_RES_TIMERS=y |
177 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 187 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
178 | CONFIG_SMP=y | 188 | CONFIG_SMP=y |
189 | CONFIG_X86_FIND_SMP_CONFIG=y | ||
190 | CONFIG_X86_MPPARSE=y | ||
179 | CONFIG_X86_PC=y | 191 | CONFIG_X86_PC=y |
180 | # CONFIG_X86_ELAN is not set | 192 | # CONFIG_X86_ELAN is not set |
181 | # CONFIG_X86_VOYAGER is not set | 193 | # CONFIG_X86_VOYAGER is not set |
182 | # CONFIG_X86_NUMAQ is not set | ||
183 | # CONFIG_X86_SUMMIT is not set | ||
184 | # CONFIG_X86_BIGSMP is not set | ||
185 | # CONFIG_X86_VISWS is not set | ||
186 | # CONFIG_X86_GENERICARCH is not set | 194 | # CONFIG_X86_GENERICARCH is not set |
187 | # CONFIG_X86_ES7000 is not set | ||
188 | # CONFIG_X86_RDC321X is not set | ||
189 | # CONFIG_X86_VSMP is not set | 195 | # CONFIG_X86_VSMP is not set |
196 | # CONFIG_X86_RDC321X is not set | ||
190 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 197 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
191 | # CONFIG_PARAVIRT_GUEST is not set | 198 | # CONFIG_PARAVIRT_GUEST is not set |
199 | # CONFIG_MEMTEST is not set | ||
192 | # CONFIG_M386 is not set | 200 | # CONFIG_M386 is not set |
193 | # CONFIG_M486 is not set | 201 | # CONFIG_M486 is not set |
194 | # CONFIG_M586 is not set | 202 | # CONFIG_M586 is not set |
@@ -215,21 +223,19 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
215 | # CONFIG_MPSC is not set | 223 | # CONFIG_MPSC is not set |
216 | CONFIG_MCORE2=y | 224 | CONFIG_MCORE2=y |
217 | # CONFIG_GENERIC_CPU is not set | 225 | # CONFIG_GENERIC_CPU is not set |
218 | # CONFIG_X86_GENERIC is not set | 226 | CONFIG_X86_GENERIC=y |
219 | CONFIG_X86_CPU=y | 227 | CONFIG_X86_CPU=y |
220 | CONFIG_X86_CMPXCHG=y | 228 | CONFIG_X86_CMPXCHG=y |
221 | CONFIG_X86_L1_CACHE_SHIFT=6 | 229 | CONFIG_X86_L1_CACHE_SHIFT=7 |
222 | CONFIG_X86_XADD=y | 230 | CONFIG_X86_XADD=y |
223 | CONFIG_X86_WP_WORKS_OK=y | 231 | CONFIG_X86_WP_WORKS_OK=y |
224 | CONFIG_X86_INVLPG=y | 232 | CONFIG_X86_INVLPG=y |
225 | CONFIG_X86_BSWAP=y | 233 | CONFIG_X86_BSWAP=y |
226 | CONFIG_X86_POPAD_OK=y | 234 | CONFIG_X86_POPAD_OK=y |
227 | CONFIG_X86_GOOD_APIC=y | ||
228 | CONFIG_X86_INTEL_USERCOPY=y | 235 | CONFIG_X86_INTEL_USERCOPY=y |
229 | CONFIG_X86_USE_PPRO_CHECKSUM=y | 236 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
230 | CONFIG_X86_P6_NOP=y | ||
231 | CONFIG_X86_TSC=y | 237 | CONFIG_X86_TSC=y |
232 | CONFIG_X86_MINIMUM_CPU_FAMILY=6 | 238 | CONFIG_X86_MINIMUM_CPU_FAMILY=4 |
233 | CONFIG_X86_DEBUGCTLMSR=y | 239 | CONFIG_X86_DEBUGCTLMSR=y |
234 | CONFIG_HPET_TIMER=y | 240 | CONFIG_HPET_TIMER=y |
235 | CONFIG_HPET_EMULATE_RTC=y | 241 | CONFIG_HPET_EMULATE_RTC=y |
@@ -247,7 +253,7 @@ CONFIG_X86_IO_APIC=y | |||
247 | CONFIG_VM86=y | 253 | CONFIG_VM86=y |
248 | # CONFIG_TOSHIBA is not set | 254 | # CONFIG_TOSHIBA is not set |
249 | # CONFIG_I8K is not set | 255 | # CONFIG_I8K is not set |
250 | # CONFIG_X86_REBOOTFIXUPS is not set | 256 | CONFIG_X86_REBOOTFIXUPS=y |
251 | # CONFIG_MICROCODE is not set | 257 | # CONFIG_MICROCODE is not set |
252 | CONFIG_X86_MSR=y | 258 | CONFIG_X86_MSR=y |
253 | CONFIG_X86_CPUID=y | 259 | CONFIG_X86_CPUID=y |
@@ -256,32 +262,28 @@ CONFIG_HIGHMEM4G=y | |||
256 | # CONFIG_HIGHMEM64G is not set | 262 | # CONFIG_HIGHMEM64G is not set |
257 | CONFIG_PAGE_OFFSET=0xC0000000 | 263 | CONFIG_PAGE_OFFSET=0xC0000000 |
258 | CONFIG_HIGHMEM=y | 264 | CONFIG_HIGHMEM=y |
259 | CONFIG_NEED_NODE_MEMMAP_SIZE=y | ||
260 | CONFIG_ARCH_FLATMEM_ENABLE=y | 265 | CONFIG_ARCH_FLATMEM_ENABLE=y |
261 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 266 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
262 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 267 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
263 | CONFIG_SELECT_MEMORY_MODEL=y | 268 | CONFIG_SELECT_MEMORY_MODEL=y |
264 | # CONFIG_FLATMEM_MANUAL is not set | 269 | CONFIG_FLATMEM_MANUAL=y |
265 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 270 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
266 | CONFIG_SPARSEMEM_MANUAL=y | 271 | # CONFIG_SPARSEMEM_MANUAL is not set |
267 | CONFIG_SPARSEMEM=y | 272 | CONFIG_FLATMEM=y |
268 | CONFIG_HAVE_MEMORY_PRESENT=y | 273 | CONFIG_FLAT_NODE_MEM_MAP=y |
269 | CONFIG_SPARSEMEM_STATIC=y | 274 | CONFIG_SPARSEMEM_STATIC=y |
270 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | 275 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set |
271 | |||
272 | # | ||
273 | # Memory hotplug is currently incompatible with Software Suspend | ||
274 | # | ||
275 | CONFIG_PAGEFLAGS_EXTENDED=y | 276 | CONFIG_PAGEFLAGS_EXTENDED=y |
276 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 277 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
277 | CONFIG_RESOURCES_64BIT=y | 278 | CONFIG_RESOURCES_64BIT=y |
278 | CONFIG_ZONE_DMA_FLAG=1 | 279 | CONFIG_ZONE_DMA_FLAG=1 |
279 | CONFIG_BOUNCE=y | 280 | CONFIG_BOUNCE=y |
280 | CONFIG_VIRT_TO_BUS=y | 281 | CONFIG_VIRT_TO_BUS=y |
281 | # CONFIG_HIGHPTE is not set | 282 | CONFIG_HIGHPTE=y |
282 | # CONFIG_MATH_EMULATION is not set | 283 | # CONFIG_MATH_EMULATION is not set |
283 | CONFIG_MTRR=y | 284 | CONFIG_MTRR=y |
284 | # CONFIG_X86_PAT is not set | 285 | # CONFIG_MTRR_SANITIZER is not set |
286 | CONFIG_X86_PAT=y | ||
285 | CONFIG_EFI=y | 287 | CONFIG_EFI=y |
286 | # CONFIG_IRQBALANCE is not set | 288 | # CONFIG_IRQBALANCE is not set |
287 | CONFIG_SECCOMP=y | 289 | CONFIG_SECCOMP=y |
@@ -293,6 +295,7 @@ CONFIG_HZ=1000 | |||
293 | CONFIG_SCHED_HRTICK=y | 295 | CONFIG_SCHED_HRTICK=y |
294 | CONFIG_KEXEC=y | 296 | CONFIG_KEXEC=y |
295 | CONFIG_CRASH_DUMP=y | 297 | CONFIG_CRASH_DUMP=y |
298 | # CONFIG_KEXEC_JUMP is not set | ||
296 | CONFIG_PHYSICAL_START=0x1000000 | 299 | CONFIG_PHYSICAL_START=0x1000000 |
297 | CONFIG_RELOCATABLE=y | 300 | CONFIG_RELOCATABLE=y |
298 | CONFIG_PHYSICAL_ALIGN=0x200000 | 301 | CONFIG_PHYSICAL_ALIGN=0x200000 |
@@ -312,6 +315,7 @@ CONFIG_PM_TRACE_RTC=y | |||
312 | CONFIG_PM_SLEEP_SMP=y | 315 | CONFIG_PM_SLEEP_SMP=y |
313 | CONFIG_PM_SLEEP=y | 316 | CONFIG_PM_SLEEP=y |
314 | CONFIG_SUSPEND=y | 317 | CONFIG_SUSPEND=y |
318 | # CONFIG_PM_TEST_SUSPEND is not set | ||
315 | CONFIG_SUSPEND_FREEZER=y | 319 | CONFIG_SUSPEND_FREEZER=y |
316 | CONFIG_HIBERNATION=y | 320 | CONFIG_HIBERNATION=y |
317 | CONFIG_PM_STD_PARTITION="" | 321 | CONFIG_PM_STD_PARTITION="" |
@@ -337,6 +341,7 @@ CONFIG_ACPI_THERMAL=y | |||
337 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 341 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
338 | # CONFIG_ACPI_DEBUG is not set | 342 | # CONFIG_ACPI_DEBUG is not set |
339 | CONFIG_ACPI_EC=y | 343 | CONFIG_ACPI_EC=y |
344 | # CONFIG_ACPI_PCI_SLOT is not set | ||
340 | CONFIG_ACPI_POWER=y | 345 | CONFIG_ACPI_POWER=y |
341 | CONFIG_ACPI_SYSTEM=y | 346 | CONFIG_ACPI_SYSTEM=y |
342 | CONFIG_X86_PM_TIMER=y | 347 | CONFIG_X86_PM_TIMER=y |
@@ -395,8 +400,8 @@ CONFIG_PCI=y | |||
395 | # CONFIG_PCI_GOBIOS is not set | 400 | # CONFIG_PCI_GOBIOS is not set |
396 | # CONFIG_PCI_GOMMCONFIG is not set | 401 | # CONFIG_PCI_GOMMCONFIG is not set |
397 | # CONFIG_PCI_GODIRECT is not set | 402 | # CONFIG_PCI_GODIRECT is not set |
398 | CONFIG_PCI_GOANY=y | ||
399 | # CONFIG_PCI_GOOLPC is not set | 403 | # CONFIG_PCI_GOOLPC is not set |
404 | CONFIG_PCI_GOANY=y | ||
400 | CONFIG_PCI_BIOS=y | 405 | CONFIG_PCI_BIOS=y |
401 | CONFIG_PCI_DIRECT=y | 406 | CONFIG_PCI_DIRECT=y |
402 | CONFIG_PCI_MMCONFIG=y | 407 | CONFIG_PCI_MMCONFIG=y |
@@ -448,10 +453,6 @@ CONFIG_HOTPLUG_PCI=y | |||
448 | CONFIG_BINFMT_ELF=y | 453 | CONFIG_BINFMT_ELF=y |
449 | # CONFIG_BINFMT_AOUT is not set | 454 | # CONFIG_BINFMT_AOUT is not set |
450 | CONFIG_BINFMT_MISC=y | 455 | CONFIG_BINFMT_MISC=y |
451 | |||
452 | # | ||
453 | # Networking | ||
454 | # | ||
455 | CONFIG_NET=y | 456 | CONFIG_NET=y |
456 | 457 | ||
457 | # | 458 | # |
@@ -475,7 +476,10 @@ CONFIG_IP_FIB_HASH=y | |||
475 | CONFIG_IP_MULTIPLE_TABLES=y | 476 | CONFIG_IP_MULTIPLE_TABLES=y |
476 | CONFIG_IP_ROUTE_MULTIPATH=y | 477 | CONFIG_IP_ROUTE_MULTIPATH=y |
477 | CONFIG_IP_ROUTE_VERBOSE=y | 478 | CONFIG_IP_ROUTE_VERBOSE=y |
478 | # CONFIG_IP_PNP is not set | 479 | CONFIG_IP_PNP=y |
480 | CONFIG_IP_PNP_DHCP=y | ||
481 | CONFIG_IP_PNP_BOOTP=y | ||
482 | CONFIG_IP_PNP_RARP=y | ||
479 | # CONFIG_NET_IPIP is not set | 483 | # CONFIG_NET_IPIP is not set |
480 | # CONFIG_NET_IPGRE is not set | 484 | # CONFIG_NET_IPGRE is not set |
481 | CONFIG_IP_MROUTE=y | 485 | CONFIG_IP_MROUTE=y |
@@ -618,7 +622,6 @@ CONFIG_NET_SCHED=y | |||
618 | # CONFIG_NET_SCH_HTB is not set | 622 | # CONFIG_NET_SCH_HTB is not set |
619 | # CONFIG_NET_SCH_HFSC is not set | 623 | # CONFIG_NET_SCH_HFSC is not set |
620 | # CONFIG_NET_SCH_PRIO is not set | 624 | # CONFIG_NET_SCH_PRIO is not set |
621 | # CONFIG_NET_SCH_RR is not set | ||
622 | # CONFIG_NET_SCH_RED is not set | 625 | # CONFIG_NET_SCH_RED is not set |
623 | # CONFIG_NET_SCH_SFQ is not set | 626 | # CONFIG_NET_SCH_SFQ is not set |
624 | # CONFIG_NET_SCH_TEQL is not set | 627 | # CONFIG_NET_SCH_TEQL is not set |
@@ -680,28 +683,19 @@ CONFIG_FIB_RULES=y | |||
680 | CONFIG_CFG80211=y | 683 | CONFIG_CFG80211=y |
681 | CONFIG_NL80211=y | 684 | CONFIG_NL80211=y |
682 | CONFIG_WIRELESS_EXT=y | 685 | CONFIG_WIRELESS_EXT=y |
686 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
683 | CONFIG_MAC80211=y | 687 | CONFIG_MAC80211=y |
684 | 688 | ||
685 | # | 689 | # |
686 | # Rate control algorithm selection | 690 | # Rate control algorithm selection |
687 | # | 691 | # |
692 | CONFIG_MAC80211_RC_PID=y | ||
688 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 693 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
689 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
690 | |||
691 | # | ||
692 | # Selecting 'y' for an algorithm will | ||
693 | # | ||
694 | |||
695 | # | ||
696 | # build the algorithm into mac80211. | ||
697 | # | ||
698 | CONFIG_MAC80211_RC_DEFAULT="pid" | 694 | CONFIG_MAC80211_RC_DEFAULT="pid" |
699 | CONFIG_MAC80211_RC_PID=y | ||
700 | # CONFIG_MAC80211_MESH is not set | 695 | # CONFIG_MAC80211_MESH is not set |
701 | CONFIG_MAC80211_LEDS=y | 696 | CONFIG_MAC80211_LEDS=y |
702 | # CONFIG_MAC80211_DEBUGFS is not set | 697 | # CONFIG_MAC80211_DEBUGFS is not set |
703 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 698 | # CONFIG_MAC80211_DEBUG_MENU is not set |
704 | # CONFIG_MAC80211_DEBUG is not set | ||
705 | # CONFIG_IEEE80211 is not set | 699 | # CONFIG_IEEE80211 is not set |
706 | # CONFIG_RFKILL is not set | 700 | # CONFIG_RFKILL is not set |
707 | # CONFIG_NET_9P is not set | 701 | # CONFIG_NET_9P is not set |
@@ -717,6 +711,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
717 | CONFIG_STANDALONE=y | 711 | CONFIG_STANDALONE=y |
718 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 712 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
719 | CONFIG_FW_LOADER=y | 713 | CONFIG_FW_LOADER=y |
714 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
715 | CONFIG_EXTRA_FIRMWARE="" | ||
720 | # CONFIG_DEBUG_DRIVER is not set | 716 | # CONFIG_DEBUG_DRIVER is not set |
721 | CONFIG_DEBUG_DEVRES=y | 717 | CONFIG_DEBUG_DEVRES=y |
722 | # CONFIG_SYS_HYPERVISOR is not set | 718 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -749,6 +745,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
749 | # CONFIG_BLK_DEV_XIP is not set | 745 | # CONFIG_BLK_DEV_XIP is not set |
750 | # CONFIG_CDROM_PKTCDVD is not set | 746 | # CONFIG_CDROM_PKTCDVD is not set |
751 | # CONFIG_ATA_OVER_ETH is not set | 747 | # CONFIG_ATA_OVER_ETH is not set |
748 | # CONFIG_BLK_DEV_HD is not set | ||
752 | CONFIG_MISC_DEVICES=y | 749 | CONFIG_MISC_DEVICES=y |
753 | # CONFIG_IBM_ASM is not set | 750 | # CONFIG_IBM_ASM is not set |
754 | # CONFIG_PHANTOM is not set | 751 | # CONFIG_PHANTOM is not set |
@@ -760,10 +757,12 @@ CONFIG_MISC_DEVICES=y | |||
760 | # CONFIG_FUJITSU_LAPTOP is not set | 757 | # CONFIG_FUJITSU_LAPTOP is not set |
761 | # CONFIG_TC1100_WMI is not set | 758 | # CONFIG_TC1100_WMI is not set |
762 | # CONFIG_MSI_LAPTOP is not set | 759 | # CONFIG_MSI_LAPTOP is not set |
760 | # CONFIG_COMPAL_LAPTOP is not set | ||
763 | # CONFIG_SONY_LAPTOP is not set | 761 | # CONFIG_SONY_LAPTOP is not set |
764 | # CONFIG_THINKPAD_ACPI is not set | 762 | # CONFIG_THINKPAD_ACPI is not set |
765 | # CONFIG_INTEL_MENLOW is not set | 763 | # CONFIG_INTEL_MENLOW is not set |
766 | # CONFIG_ENCLOSURE_SERVICES is not set | 764 | # CONFIG_ENCLOSURE_SERVICES is not set |
765 | # CONFIG_HP_ILO is not set | ||
767 | CONFIG_HAVE_IDE=y | 766 | CONFIG_HAVE_IDE=y |
768 | # CONFIG_IDE is not set | 767 | # CONFIG_IDE is not set |
769 | 768 | ||
@@ -802,12 +801,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
802 | # | 801 | # |
803 | CONFIG_SCSI_SPI_ATTRS=y | 802 | CONFIG_SCSI_SPI_ATTRS=y |
804 | # CONFIG_SCSI_FC_ATTRS is not set | 803 | # CONFIG_SCSI_FC_ATTRS is not set |
805 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 804 | CONFIG_SCSI_ISCSI_ATTRS=y |
806 | # CONFIG_SCSI_SAS_ATTRS is not set | 805 | # CONFIG_SCSI_SAS_ATTRS is not set |
807 | # CONFIG_SCSI_SAS_LIBSAS is not set | 806 | # CONFIG_SCSI_SAS_LIBSAS is not set |
808 | # CONFIG_SCSI_SRP_ATTRS is not set | 807 | # CONFIG_SCSI_SRP_ATTRS is not set |
809 | # CONFIG_SCSI_LOWLEVEL is not set | 808 | # CONFIG_SCSI_LOWLEVEL is not set |
810 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 809 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
810 | # CONFIG_SCSI_DH is not set | ||
811 | CONFIG_ATA=y | 811 | CONFIG_ATA=y |
812 | # CONFIG_ATA_NONSTANDARD is not set | 812 | # CONFIG_ATA_NONSTANDARD is not set |
813 | CONFIG_ATA_ACPI=y | 813 | CONFIG_ATA_ACPI=y |
@@ -842,7 +842,7 @@ CONFIG_PATA_AMD=y | |||
842 | # CONFIG_PATA_CS5536 is not set | 842 | # CONFIG_PATA_CS5536 is not set |
843 | # CONFIG_PATA_CYPRESS is not set | 843 | # CONFIG_PATA_CYPRESS is not set |
844 | # CONFIG_PATA_EFAR is not set | 844 | # CONFIG_PATA_EFAR is not set |
845 | # CONFIG_ATA_GENERIC is not set | 845 | CONFIG_ATA_GENERIC=y |
846 | # CONFIG_PATA_HPT366 is not set | 846 | # CONFIG_PATA_HPT366 is not set |
847 | # CONFIG_PATA_HPT37X is not set | 847 | # CONFIG_PATA_HPT37X is not set |
848 | # CONFIG_PATA_HPT3X2N is not set | 848 | # CONFIG_PATA_HPT3X2N is not set |
@@ -852,7 +852,7 @@ CONFIG_PATA_AMD=y | |||
852 | # CONFIG_PATA_JMICRON is not set | 852 | # CONFIG_PATA_JMICRON is not set |
853 | # CONFIG_PATA_TRIFLEX is not set | 853 | # CONFIG_PATA_TRIFLEX is not set |
854 | # CONFIG_PATA_MARVELL is not set | 854 | # CONFIG_PATA_MARVELL is not set |
855 | # CONFIG_PATA_MPIIX is not set | 855 | CONFIG_PATA_MPIIX=y |
856 | CONFIG_PATA_OLDPIIX=y | 856 | CONFIG_PATA_OLDPIIX=y |
857 | # CONFIG_PATA_NETCELL is not set | 857 | # CONFIG_PATA_NETCELL is not set |
858 | # CONFIG_PATA_NINJA32 is not set | 858 | # CONFIG_PATA_NINJA32 is not set |
@@ -871,6 +871,7 @@ CONFIG_PATA_OLDPIIX=y | |||
871 | # CONFIG_PATA_SIS is not set | 871 | # CONFIG_PATA_SIS is not set |
872 | # CONFIG_PATA_VIA is not set | 872 | # CONFIG_PATA_VIA is not set |
873 | # CONFIG_PATA_WINBOND is not set | 873 | # CONFIG_PATA_WINBOND is not set |
874 | CONFIG_PATA_SCH=y | ||
874 | CONFIG_MD=y | 875 | CONFIG_MD=y |
875 | CONFIG_BLK_DEV_MD=y | 876 | CONFIG_BLK_DEV_MD=y |
876 | # CONFIG_MD_LINEAR is not set | 877 | # CONFIG_MD_LINEAR is not set |
@@ -894,13 +895,16 @@ CONFIG_DM_ZERO=y | |||
894 | # | 895 | # |
895 | # IEEE 1394 (FireWire) support | 896 | # IEEE 1394 (FireWire) support |
896 | # | 897 | # |
898 | |||
899 | # | ||
900 | # Enable only one of the two stacks, unless you know what you are doing | ||
901 | # | ||
897 | # CONFIG_FIREWIRE is not set | 902 | # CONFIG_FIREWIRE is not set |
898 | # CONFIG_IEEE1394 is not set | 903 | # CONFIG_IEEE1394 is not set |
899 | # CONFIG_I2O is not set | 904 | # CONFIG_I2O is not set |
900 | CONFIG_MACINTOSH_DRIVERS=y | 905 | CONFIG_MACINTOSH_DRIVERS=y |
901 | CONFIG_MAC_EMUMOUSEBTN=y | 906 | CONFIG_MAC_EMUMOUSEBTN=y |
902 | CONFIG_NETDEVICES=y | 907 | CONFIG_NETDEVICES=y |
903 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
904 | # CONFIG_IFB is not set | 908 | # CONFIG_IFB is not set |
905 | # CONFIG_DUMMY is not set | 909 | # CONFIG_DUMMY is not set |
906 | # CONFIG_BONDING is not set | 910 | # CONFIG_BONDING is not set |
@@ -910,7 +914,23 @@ CONFIG_NETDEVICES=y | |||
910 | # CONFIG_VETH is not set | 914 | # CONFIG_VETH is not set |
911 | # CONFIG_NET_SB1000 is not set | 915 | # CONFIG_NET_SB1000 is not set |
912 | # CONFIG_ARCNET is not set | 916 | # CONFIG_ARCNET is not set |
913 | # CONFIG_PHYLIB is not set | 917 | CONFIG_PHYLIB=y |
918 | |||
919 | # | ||
920 | # MII PHY device drivers | ||
921 | # | ||
922 | # CONFIG_MARVELL_PHY is not set | ||
923 | # CONFIG_DAVICOM_PHY is not set | ||
924 | # CONFIG_QSEMI_PHY is not set | ||
925 | # CONFIG_LXT_PHY is not set | ||
926 | # CONFIG_CICADA_PHY is not set | ||
927 | # CONFIG_VITESSE_PHY is not set | ||
928 | # CONFIG_SMSC_PHY is not set | ||
929 | # CONFIG_BROADCOM_PHY is not set | ||
930 | # CONFIG_ICPLUS_PHY is not set | ||
931 | # CONFIG_REALTEK_PHY is not set | ||
932 | # CONFIG_FIXED_PHY is not set | ||
933 | # CONFIG_MDIO_BITBANG is not set | ||
914 | CONFIG_NET_ETHERNET=y | 934 | CONFIG_NET_ETHERNET=y |
915 | CONFIG_MII=y | 935 | CONFIG_MII=y |
916 | # CONFIG_HAPPYMEAL is not set | 936 | # CONFIG_HAPPYMEAL is not set |
@@ -943,10 +963,10 @@ CONFIG_FORCEDETH=y | |||
943 | CONFIG_E100=y | 963 | CONFIG_E100=y |
944 | # CONFIG_FEALNX is not set | 964 | # CONFIG_FEALNX is not set |
945 | # CONFIG_NATSEMI is not set | 965 | # CONFIG_NATSEMI is not set |
946 | # CONFIG_NE2K_PCI is not set | 966 | CONFIG_NE2K_PCI=y |
947 | # CONFIG_8139CP is not set | 967 | # CONFIG_8139CP is not set |
948 | CONFIG_8139TOO=y | 968 | CONFIG_8139TOO=y |
949 | CONFIG_8139TOO_PIO=y | 969 | # CONFIG_8139TOO_PIO is not set |
950 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 970 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
951 | # CONFIG_8139TOO_8129 is not set | 971 | # CONFIG_8139TOO_8129 is not set |
952 | # CONFIG_8139_OLD_RX_RESET is not set | 972 | # CONFIG_8139_OLD_RX_RESET is not set |
@@ -961,25 +981,24 @@ CONFIG_NETDEV_1000=y | |||
961 | # CONFIG_ACENIC is not set | 981 | # CONFIG_ACENIC is not set |
962 | # CONFIG_DL2K is not set | 982 | # CONFIG_DL2K is not set |
963 | CONFIG_E1000=y | 983 | CONFIG_E1000=y |
964 | # CONFIG_E1000_NAPI is not set | ||
965 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 984 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
966 | # CONFIG_E1000E is not set | 985 | CONFIG_E1000E=y |
967 | # CONFIG_E1000E_ENABLED is not set | ||
968 | # CONFIG_IP1000 is not set | 986 | # CONFIG_IP1000 is not set |
969 | # CONFIG_IGB is not set | 987 | # CONFIG_IGB is not set |
970 | # CONFIG_NS83820 is not set | 988 | # CONFIG_NS83820 is not set |
971 | # CONFIG_HAMACHI is not set | 989 | # CONFIG_HAMACHI is not set |
972 | # CONFIG_YELLOWFIN is not set | 990 | # CONFIG_YELLOWFIN is not set |
973 | # CONFIG_R8169 is not set | 991 | CONFIG_R8169=y |
974 | # CONFIG_SIS190 is not set | 992 | # CONFIG_SIS190 is not set |
975 | # CONFIG_SKGE is not set | 993 | # CONFIG_SKGE is not set |
976 | CONFIG_SKY2=y | 994 | CONFIG_SKY2=y |
977 | # CONFIG_SKY2_DEBUG is not set | 995 | # CONFIG_SKY2_DEBUG is not set |
978 | # CONFIG_VIA_VELOCITY is not set | 996 | # CONFIG_VIA_VELOCITY is not set |
979 | CONFIG_TIGON3=y | 997 | CONFIG_TIGON3=y |
980 | # CONFIG_BNX2 is not set | 998 | CONFIG_BNX2=y |
981 | # CONFIG_QLA3XXX is not set | 999 | # CONFIG_QLA3XXX is not set |
982 | # CONFIG_ATL1 is not set | 1000 | # CONFIG_ATL1 is not set |
1001 | # CONFIG_ATL1E is not set | ||
983 | CONFIG_NETDEV_10000=y | 1002 | CONFIG_NETDEV_10000=y |
984 | # CONFIG_CHELSIO_T1 is not set | 1003 | # CONFIG_CHELSIO_T1 is not set |
985 | # CONFIG_CHELSIO_T3 is not set | 1004 | # CONFIG_CHELSIO_T3 is not set |
@@ -1019,13 +1038,14 @@ CONFIG_WLAN_80211=y | |||
1019 | # CONFIG_RTL8180 is not set | 1038 | # CONFIG_RTL8180 is not set |
1020 | # CONFIG_RTL8187 is not set | 1039 | # CONFIG_RTL8187 is not set |
1021 | # CONFIG_ADM8211 is not set | 1040 | # CONFIG_ADM8211 is not set |
1041 | # CONFIG_MAC80211_HWSIM is not set | ||
1022 | # CONFIG_P54_COMMON is not set | 1042 | # CONFIG_P54_COMMON is not set |
1023 | CONFIG_ATH5K=y | 1043 | CONFIG_ATH5K=y |
1024 | # CONFIG_ATH5K_DEBUG is not set | 1044 | # CONFIG_ATH5K_DEBUG is not set |
1025 | # CONFIG_IWLWIFI is not set | 1045 | # CONFIG_ATH9K is not set |
1026 | # CONFIG_IWLCORE is not set | 1046 | # CONFIG_IWLCORE is not set |
1027 | # CONFIG_IWLWIFI_LEDS is not set | 1047 | # CONFIG_IWLWIFI_LEDS is not set |
1028 | # CONFIG_IWL4965 is not set | 1048 | # CONFIG_IWLAGN is not set |
1029 | # CONFIG_IWL3945 is not set | 1049 | # CONFIG_IWL3945 is not set |
1030 | # CONFIG_HOSTAP is not set | 1050 | # CONFIG_HOSTAP is not set |
1031 | # CONFIG_B43 is not set | 1051 | # CONFIG_B43 is not set |
@@ -1105,6 +1125,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
1105 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1125 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
1106 | # CONFIG_MOUSE_SERIAL is not set | 1126 | # CONFIG_MOUSE_SERIAL is not set |
1107 | # CONFIG_MOUSE_APPLETOUCH is not set | 1127 | # CONFIG_MOUSE_APPLETOUCH is not set |
1128 | # CONFIG_MOUSE_BCM5974 is not set | ||
1108 | # CONFIG_MOUSE_VSXXXAA is not set | 1129 | # CONFIG_MOUSE_VSXXXAA is not set |
1109 | CONFIG_INPUT_JOYSTICK=y | 1130 | CONFIG_INPUT_JOYSTICK=y |
1110 | # CONFIG_JOYSTICK_ANALOG is not set | 1131 | # CONFIG_JOYSTICK_ANALOG is not set |
@@ -1139,12 +1160,14 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
1139 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 1160 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
1140 | # CONFIG_TOUCHSCREEN_ELO is not set | 1161 | # CONFIG_TOUCHSCREEN_ELO is not set |
1141 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 1162 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
1163 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
1142 | # CONFIG_TOUCHSCREEN_MK712 is not set | 1164 | # CONFIG_TOUCHSCREEN_MK712 is not set |
1143 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | 1165 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set |
1144 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 1166 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
1145 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 1167 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
1146 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | 1168 | # CONFIG_TOUCHSCREEN_UCB1400 is not set |
1147 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 1169 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
1170 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
1148 | CONFIG_INPUT_MISC=y | 1171 | CONFIG_INPUT_MISC=y |
1149 | # CONFIG_INPUT_PCSPKR is not set | 1172 | # CONFIG_INPUT_PCSPKR is not set |
1150 | # CONFIG_INPUT_APANEL is not set | 1173 | # CONFIG_INPUT_APANEL is not set |
@@ -1173,6 +1196,7 @@ CONFIG_SERIO_LIBPS2=y | |||
1173 | # Character devices | 1196 | # Character devices |
1174 | # | 1197 | # |
1175 | CONFIG_VT=y | 1198 | CONFIG_VT=y |
1199 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
1176 | CONFIG_VT_CONSOLE=y | 1200 | CONFIG_VT_CONSOLE=y |
1177 | CONFIG_HW_CONSOLE=y | 1201 | CONFIG_HW_CONSOLE=y |
1178 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1202 | CONFIG_VT_HW_CONSOLE_BINDING=y |
@@ -1223,8 +1247,8 @@ CONFIG_UNIX98_PTYS=y | |||
1223 | # CONFIG_LEGACY_PTYS is not set | 1247 | # CONFIG_LEGACY_PTYS is not set |
1224 | # CONFIG_IPMI_HANDLER is not set | 1248 | # CONFIG_IPMI_HANDLER is not set |
1225 | CONFIG_HW_RANDOM=y | 1249 | CONFIG_HW_RANDOM=y |
1226 | # CONFIG_HW_RANDOM_INTEL is not set | 1250 | CONFIG_HW_RANDOM_INTEL=y |
1227 | # CONFIG_HW_RANDOM_AMD is not set | 1251 | CONFIG_HW_RANDOM_AMD=y |
1228 | CONFIG_HW_RANDOM_GEODE=y | 1252 | CONFIG_HW_RANDOM_GEODE=y |
1229 | CONFIG_HW_RANDOM_VIA=y | 1253 | CONFIG_HW_RANDOM_VIA=y |
1230 | CONFIG_NVRAM=y | 1254 | CONFIG_NVRAM=y |
@@ -1245,7 +1269,6 @@ CONFIG_NVRAM=y | |||
1245 | # CONFIG_CS5535_GPIO is not set | 1269 | # CONFIG_CS5535_GPIO is not set |
1246 | # CONFIG_RAW_DRIVER is not set | 1270 | # CONFIG_RAW_DRIVER is not set |
1247 | CONFIG_HPET=y | 1271 | CONFIG_HPET=y |
1248 | # CONFIG_HPET_RTC_IRQ is not set | ||
1249 | # CONFIG_HPET_MMAP is not set | 1272 | # CONFIG_HPET_MMAP is not set |
1250 | # CONFIG_HANGCHECK_TIMER is not set | 1273 | # CONFIG_HANGCHECK_TIMER is not set |
1251 | # CONFIG_TCG_TPM is not set | 1274 | # CONFIG_TCG_TPM is not set |
@@ -1254,43 +1277,64 @@ CONFIG_DEVPORT=y | |||
1254 | CONFIG_I2C=y | 1277 | CONFIG_I2C=y |
1255 | CONFIG_I2C_BOARDINFO=y | 1278 | CONFIG_I2C_BOARDINFO=y |
1256 | # CONFIG_I2C_CHARDEV is not set | 1279 | # CONFIG_I2C_CHARDEV is not set |
1280 | CONFIG_I2C_HELPER_AUTO=y | ||
1257 | 1281 | ||
1258 | # | 1282 | # |
1259 | # I2C Hardware Bus support | 1283 | # I2C Hardware Bus support |
1260 | # | 1284 | # |
1285 | |||
1286 | # | ||
1287 | # PC SMBus host controller drivers | ||
1288 | # | ||
1261 | # CONFIG_I2C_ALI1535 is not set | 1289 | # CONFIG_I2C_ALI1535 is not set |
1262 | # CONFIG_I2C_ALI1563 is not set | 1290 | # CONFIG_I2C_ALI1563 is not set |
1263 | # CONFIG_I2C_ALI15X3 is not set | 1291 | # CONFIG_I2C_ALI15X3 is not set |
1264 | # CONFIG_I2C_AMD756 is not set | 1292 | # CONFIG_I2C_AMD756 is not set |
1265 | # CONFIG_I2C_AMD8111 is not set | 1293 | # CONFIG_I2C_AMD8111 is not set |
1266 | CONFIG_I2C_I801=y | 1294 | CONFIG_I2C_I801=y |
1267 | # CONFIG_I2C_I810 is not set | 1295 | # CONFIG_I2C_ISCH is not set |
1268 | # CONFIG_I2C_PIIX4 is not set | 1296 | # CONFIG_I2C_PIIX4 is not set |
1269 | # CONFIG_I2C_NFORCE2 is not set | 1297 | # CONFIG_I2C_NFORCE2 is not set |
1270 | # CONFIG_I2C_OCORES is not set | ||
1271 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1272 | # CONFIG_I2C_PROSAVAGE is not set | ||
1273 | # CONFIG_I2C_SAVAGE4 is not set | ||
1274 | # CONFIG_I2C_SIMTEC is not set | ||
1275 | # CONFIG_SCx200_ACB is not set | ||
1276 | # CONFIG_I2C_SIS5595 is not set | 1298 | # CONFIG_I2C_SIS5595 is not set |
1277 | # CONFIG_I2C_SIS630 is not set | 1299 | # CONFIG_I2C_SIS630 is not set |
1278 | # CONFIG_I2C_SIS96X is not set | 1300 | # CONFIG_I2C_SIS96X is not set |
1279 | # CONFIG_I2C_TAOS_EVM is not set | ||
1280 | # CONFIG_I2C_STUB is not set | ||
1281 | # CONFIG_I2C_TINY_USB is not set | ||
1282 | # CONFIG_I2C_VIA is not set | 1301 | # CONFIG_I2C_VIA is not set |
1283 | # CONFIG_I2C_VIAPRO is not set | 1302 | # CONFIG_I2C_VIAPRO is not set |
1303 | |||
1304 | # | ||
1305 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
1306 | # | ||
1307 | # CONFIG_I2C_OCORES is not set | ||
1308 | # CONFIG_I2C_SIMTEC is not set | ||
1309 | |||
1310 | # | ||
1311 | # External I2C/SMBus adapter drivers | ||
1312 | # | ||
1313 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1314 | # CONFIG_I2C_TAOS_EVM is not set | ||
1315 | # CONFIG_I2C_TINY_USB is not set | ||
1316 | |||
1317 | # | ||
1318 | # Graphics adapter I2C/DDC channel drivers | ||
1319 | # | ||
1284 | # CONFIG_I2C_VOODOO3 is not set | 1320 | # CONFIG_I2C_VOODOO3 is not set |
1321 | |||
1322 | # | ||
1323 | # Other I2C/SMBus bus drivers | ||
1324 | # | ||
1285 | # CONFIG_I2C_PCA_PLATFORM is not set | 1325 | # CONFIG_I2C_PCA_PLATFORM is not set |
1326 | # CONFIG_I2C_STUB is not set | ||
1327 | # CONFIG_SCx200_ACB is not set | ||
1286 | 1328 | ||
1287 | # | 1329 | # |
1288 | # Miscellaneous I2C Chip support | 1330 | # Miscellaneous I2C Chip support |
1289 | # | 1331 | # |
1290 | # CONFIG_DS1682 is not set | 1332 | # CONFIG_DS1682 is not set |
1333 | # CONFIG_AT24 is not set | ||
1291 | # CONFIG_SENSORS_EEPROM is not set | 1334 | # CONFIG_SENSORS_EEPROM is not set |
1292 | # CONFIG_SENSORS_PCF8574 is not set | 1335 | # CONFIG_SENSORS_PCF8574 is not set |
1293 | # CONFIG_PCF8575 is not set | 1336 | # CONFIG_PCF8575 is not set |
1337 | # CONFIG_SENSORS_PCA9539 is not set | ||
1294 | # CONFIG_SENSORS_PCF8591 is not set | 1338 | # CONFIG_SENSORS_PCF8591 is not set |
1295 | # CONFIG_SENSORS_MAX6875 is not set | 1339 | # CONFIG_SENSORS_MAX6875 is not set |
1296 | # CONFIG_SENSORS_TSL2550 is not set | 1340 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -1299,6 +1343,8 @@ CONFIG_I2C_I801=y | |||
1299 | # CONFIG_I2C_DEBUG_BUS is not set | 1343 | # CONFIG_I2C_DEBUG_BUS is not set |
1300 | # CONFIG_I2C_DEBUG_CHIP is not set | 1344 | # CONFIG_I2C_DEBUG_CHIP is not set |
1301 | # CONFIG_SPI is not set | 1345 | # CONFIG_SPI is not set |
1346 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
1347 | # CONFIG_GPIOLIB is not set | ||
1302 | # CONFIG_W1 is not set | 1348 | # CONFIG_W1 is not set |
1303 | CONFIG_POWER_SUPPLY=y | 1349 | CONFIG_POWER_SUPPLY=y |
1304 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1350 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
@@ -1360,8 +1406,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1360 | # | 1406 | # |
1361 | # Multifunction device drivers | 1407 | # Multifunction device drivers |
1362 | # | 1408 | # |
1409 | # CONFIG_MFD_CORE is not set | ||
1363 | # CONFIG_MFD_SM501 is not set | 1410 | # CONFIG_MFD_SM501 is not set |
1364 | # CONFIG_HTC_PASIC3 is not set | 1411 | # CONFIG_HTC_PASIC3 is not set |
1412 | # CONFIG_MFD_TMIO is not set | ||
1365 | 1413 | ||
1366 | # | 1414 | # |
1367 | # Multimedia devices | 1415 | # Multimedia devices |
@@ -1372,6 +1420,7 @@ CONFIG_SSB_POSSIBLE=y | |||
1372 | # | 1420 | # |
1373 | # CONFIG_VIDEO_DEV is not set | 1421 | # CONFIG_VIDEO_DEV is not set |
1374 | # CONFIG_DVB_CORE is not set | 1422 | # CONFIG_DVB_CORE is not set |
1423 | # CONFIG_VIDEO_MEDIA is not set | ||
1375 | 1424 | ||
1376 | # | 1425 | # |
1377 | # Multimedia drivers | 1426 | # Multimedia drivers |
@@ -1418,7 +1467,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1418 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1467 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1419 | # CONFIG_FB_FOREIGN_ENDIAN is not set | 1468 | # CONFIG_FB_FOREIGN_ENDIAN is not set |
1420 | # CONFIG_FB_SYS_FOPS is not set | 1469 | # CONFIG_FB_SYS_FOPS is not set |
1421 | CONFIG_FB_DEFERRED_IO=y | ||
1422 | # CONFIG_FB_SVGALIB is not set | 1470 | # CONFIG_FB_SVGALIB is not set |
1423 | # CONFIG_FB_MACMODES is not set | 1471 | # CONFIG_FB_MACMODES is not set |
1424 | # CONFIG_FB_BACKLIGHT is not set | 1472 | # CONFIG_FB_BACKLIGHT is not set |
@@ -1463,6 +1511,7 @@ CONFIG_FB_EFI=y | |||
1463 | # CONFIG_FB_TRIDENT is not set | 1511 | # CONFIG_FB_TRIDENT is not set |
1464 | # CONFIG_FB_ARK is not set | 1512 | # CONFIG_FB_ARK is not set |
1465 | # CONFIG_FB_PM3 is not set | 1513 | # CONFIG_FB_PM3 is not set |
1514 | # CONFIG_FB_CARMINE is not set | ||
1466 | # CONFIG_FB_GEODE is not set | 1515 | # CONFIG_FB_GEODE is not set |
1467 | # CONFIG_FB_VIRTUAL is not set | 1516 | # CONFIG_FB_VIRTUAL is not set |
1468 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1517 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
@@ -1470,6 +1519,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y | |||
1470 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1519 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1471 | # CONFIG_BACKLIGHT_CORGI is not set | 1520 | # CONFIG_BACKLIGHT_CORGI is not set |
1472 | # CONFIG_BACKLIGHT_PROGEAR is not set | 1521 | # CONFIG_BACKLIGHT_PROGEAR is not set |
1522 | # CONFIG_BACKLIGHT_MBP_NVIDIA is not set | ||
1473 | 1523 | ||
1474 | # | 1524 | # |
1475 | # Display device support | 1525 | # Display device support |
@@ -1489,15 +1539,7 @@ CONFIG_LOGO=y | |||
1489 | # CONFIG_LOGO_LINUX_MONO is not set | 1539 | # CONFIG_LOGO_LINUX_MONO is not set |
1490 | # CONFIG_LOGO_LINUX_VGA16 is not set | 1540 | # CONFIG_LOGO_LINUX_VGA16 is not set |
1491 | CONFIG_LOGO_LINUX_CLUT224=y | 1541 | CONFIG_LOGO_LINUX_CLUT224=y |
1492 | |||
1493 | # | ||
1494 | # Sound | ||
1495 | # | ||
1496 | CONFIG_SOUND=y | 1542 | CONFIG_SOUND=y |
1497 | |||
1498 | # | ||
1499 | # Advanced Linux Sound Architecture | ||
1500 | # | ||
1501 | CONFIG_SND=y | 1543 | CONFIG_SND=y |
1502 | CONFIG_SND_TIMER=y | 1544 | CONFIG_SND_TIMER=y |
1503 | CONFIG_SND_PCM=y | 1545 | CONFIG_SND_PCM=y |
@@ -1515,20 +1557,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1515 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1557 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1516 | # CONFIG_SND_DEBUG is not set | 1558 | # CONFIG_SND_DEBUG is not set |
1517 | CONFIG_SND_VMASTER=y | 1559 | CONFIG_SND_VMASTER=y |
1518 | 1560 | CONFIG_SND_DRIVERS=y | |
1519 | # | ||
1520 | # Generic devices | ||
1521 | # | ||
1522 | # CONFIG_SND_PCSP is not set | 1561 | # CONFIG_SND_PCSP is not set |
1523 | # CONFIG_SND_DUMMY is not set | 1562 | # CONFIG_SND_DUMMY is not set |
1524 | # CONFIG_SND_VIRMIDI is not set | 1563 | # CONFIG_SND_VIRMIDI is not set |
1525 | # CONFIG_SND_MTPAV is not set | 1564 | # CONFIG_SND_MTPAV is not set |
1526 | # CONFIG_SND_SERIAL_U16550 is not set | 1565 | # CONFIG_SND_SERIAL_U16550 is not set |
1527 | # CONFIG_SND_MPU401 is not set | 1566 | # CONFIG_SND_MPU401 is not set |
1528 | 1567 | CONFIG_SND_PCI=y | |
1529 | # | ||
1530 | # PCI devices | ||
1531 | # | ||
1532 | # CONFIG_SND_AD1889 is not set | 1568 | # CONFIG_SND_AD1889 is not set |
1533 | # CONFIG_SND_ALS300 is not set | 1569 | # CONFIG_SND_ALS300 is not set |
1534 | # CONFIG_SND_ALS4000 is not set | 1570 | # CONFIG_SND_ALS4000 is not set |
@@ -1603,36 +1639,14 @@ CONFIG_SND_HDA_GENERIC=y | |||
1603 | # CONFIG_SND_VIRTUOSO is not set | 1639 | # CONFIG_SND_VIRTUOSO is not set |
1604 | # CONFIG_SND_VX222 is not set | 1640 | # CONFIG_SND_VX222 is not set |
1605 | # CONFIG_SND_YMFPCI is not set | 1641 | # CONFIG_SND_YMFPCI is not set |
1606 | 1642 | CONFIG_SND_USB=y | |
1607 | # | ||
1608 | # USB devices | ||
1609 | # | ||
1610 | # CONFIG_SND_USB_AUDIO is not set | 1643 | # CONFIG_SND_USB_AUDIO is not set |
1611 | # CONFIG_SND_USB_USX2Y is not set | 1644 | # CONFIG_SND_USB_USX2Y is not set |
1612 | # CONFIG_SND_USB_CAIAQ is not set | 1645 | # CONFIG_SND_USB_CAIAQ is not set |
1613 | 1646 | CONFIG_SND_PCMCIA=y | |
1614 | # | ||
1615 | # PCMCIA devices | ||
1616 | # | ||
1617 | # CONFIG_SND_VXPOCKET is not set | 1647 | # CONFIG_SND_VXPOCKET is not set |
1618 | # CONFIG_SND_PDAUDIOCF is not set | 1648 | # CONFIG_SND_PDAUDIOCF is not set |
1619 | |||
1620 | # | ||
1621 | # System on Chip audio support | ||
1622 | # | ||
1623 | # CONFIG_SND_SOC is not set | 1649 | # CONFIG_SND_SOC is not set |
1624 | |||
1625 | # | ||
1626 | # ALSA SoC audio for Freescale SOCs | ||
1627 | # | ||
1628 | |||
1629 | # | ||
1630 | # SoC Audio for the Texas Instruments OMAP | ||
1631 | # | ||
1632 | |||
1633 | # | ||
1634 | # Open Sound System | ||
1635 | # | ||
1636 | # CONFIG_SOUND_PRIME is not set | 1650 | # CONFIG_SOUND_PRIME is not set |
1637 | CONFIG_HID_SUPPORT=y | 1651 | CONFIG_HID_SUPPORT=y |
1638 | CONFIG_HID=y | 1652 | CONFIG_HID=y |
@@ -1668,6 +1682,7 @@ CONFIG_USB_DEVICEFS=y | |||
1668 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1682 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1669 | CONFIG_USB_SUSPEND=y | 1683 | CONFIG_USB_SUSPEND=y |
1670 | # CONFIG_USB_OTG is not set | 1684 | # CONFIG_USB_OTG is not set |
1685 | CONFIG_USB_MON=y | ||
1671 | 1686 | ||
1672 | # | 1687 | # |
1673 | # USB Host Controller Drivers | 1688 | # USB Host Controller Drivers |
@@ -1691,6 +1706,7 @@ CONFIG_USB_UHCI_HCD=y | |||
1691 | # | 1706 | # |
1692 | # CONFIG_USB_ACM is not set | 1707 | # CONFIG_USB_ACM is not set |
1693 | CONFIG_USB_PRINTER=y | 1708 | CONFIG_USB_PRINTER=y |
1709 | # CONFIG_USB_WDM is not set | ||
1694 | 1710 | ||
1695 | # | 1711 | # |
1696 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1712 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1712,6 +1728,7 @@ CONFIG_USB_STORAGE=y | |||
1712 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1728 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1713 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1729 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1714 | # CONFIG_USB_STORAGE_KARMA is not set | 1730 | # CONFIG_USB_STORAGE_KARMA is not set |
1731 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1715 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1732 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1716 | CONFIG_USB_LIBUSUAL=y | 1733 | CONFIG_USB_LIBUSUAL=y |
1717 | 1734 | ||
@@ -1720,7 +1737,6 @@ CONFIG_USB_LIBUSUAL=y | |||
1720 | # | 1737 | # |
1721 | # CONFIG_USB_MDC800 is not set | 1738 | # CONFIG_USB_MDC800 is not set |
1722 | # CONFIG_USB_MICROTEK is not set | 1739 | # CONFIG_USB_MICROTEK is not set |
1723 | CONFIG_USB_MON=y | ||
1724 | 1740 | ||
1725 | # | 1741 | # |
1726 | # USB port drivers | 1742 | # USB port drivers |
@@ -1733,7 +1749,6 @@ CONFIG_USB_MON=y | |||
1733 | # CONFIG_USB_EMI62 is not set | 1749 | # CONFIG_USB_EMI62 is not set |
1734 | # CONFIG_USB_EMI26 is not set | 1750 | # CONFIG_USB_EMI26 is not set |
1735 | # CONFIG_USB_ADUTUX is not set | 1751 | # CONFIG_USB_ADUTUX is not set |
1736 | # CONFIG_USB_AUERSWALD is not set | ||
1737 | # CONFIG_USB_RIO500 is not set | 1752 | # CONFIG_USB_RIO500 is not set |
1738 | # CONFIG_USB_LEGOTOWER is not set | 1753 | # CONFIG_USB_LEGOTOWER is not set |
1739 | # CONFIG_USB_LCD is not set | 1754 | # CONFIG_USB_LCD is not set |
@@ -1750,6 +1765,7 @@ CONFIG_USB_MON=y | |||
1750 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1765 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1751 | # CONFIG_USB_IOWARRIOR is not set | 1766 | # CONFIG_USB_IOWARRIOR is not set |
1752 | # CONFIG_USB_TEST is not set | 1767 | # CONFIG_USB_TEST is not set |
1768 | # CONFIG_USB_ISIGHTFW is not set | ||
1753 | # CONFIG_USB_GADGET is not set | 1769 | # CONFIG_USB_GADGET is not set |
1754 | # CONFIG_MMC is not set | 1770 | # CONFIG_MMC is not set |
1755 | # CONFIG_MEMSTICK is not set | 1771 | # CONFIG_MEMSTICK is not set |
@@ -1759,7 +1775,9 @@ CONFIG_LEDS_CLASS=y | |||
1759 | # | 1775 | # |
1760 | # LED drivers | 1776 | # LED drivers |
1761 | # | 1777 | # |
1778 | # CONFIG_LEDS_PCA9532 is not set | ||
1762 | # CONFIG_LEDS_CLEVO_MAIL is not set | 1779 | # CONFIG_LEDS_CLEVO_MAIL is not set |
1780 | # CONFIG_LEDS_PCA955X is not set | ||
1763 | 1781 | ||
1764 | # | 1782 | # |
1765 | # LED Triggers | 1783 | # LED Triggers |
@@ -1805,6 +1823,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1805 | # CONFIG_RTC_DRV_PCF8583 is not set | 1823 | # CONFIG_RTC_DRV_PCF8583 is not set |
1806 | # CONFIG_RTC_DRV_M41T80 is not set | 1824 | # CONFIG_RTC_DRV_M41T80 is not set |
1807 | # CONFIG_RTC_DRV_S35390A is not set | 1825 | # CONFIG_RTC_DRV_S35390A is not set |
1826 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1808 | 1827 | ||
1809 | # | 1828 | # |
1810 | # SPI RTC drivers | 1829 | # SPI RTC drivers |
@@ -1837,11 +1856,13 @@ CONFIG_DMADEVICES=y | |||
1837 | # Firmware Drivers | 1856 | # Firmware Drivers |
1838 | # | 1857 | # |
1839 | # CONFIG_EDD is not set | 1858 | # CONFIG_EDD is not set |
1859 | CONFIG_FIRMWARE_MEMMAP=y | ||
1840 | CONFIG_EFI_VARS=y | 1860 | CONFIG_EFI_VARS=y |
1841 | # CONFIG_DELL_RBU is not set | 1861 | # CONFIG_DELL_RBU is not set |
1842 | # CONFIG_DCDBAS is not set | 1862 | # CONFIG_DCDBAS is not set |
1843 | CONFIG_DMIID=y | 1863 | CONFIG_DMIID=y |
1844 | # CONFIG_ISCSI_IBFT_FIND is not set | 1864 | CONFIG_ISCSI_IBFT_FIND=y |
1865 | CONFIG_ISCSI_IBFT=y | ||
1845 | 1866 | ||
1846 | # | 1867 | # |
1847 | # File systems | 1868 | # File systems |
@@ -1920,14 +1941,27 @@ CONFIG_HUGETLB_PAGE=y | |||
1920 | # CONFIG_CRAMFS is not set | 1941 | # CONFIG_CRAMFS is not set |
1921 | # CONFIG_VXFS_FS is not set | 1942 | # CONFIG_VXFS_FS is not set |
1922 | # CONFIG_MINIX_FS is not set | 1943 | # CONFIG_MINIX_FS is not set |
1944 | # CONFIG_OMFS_FS is not set | ||
1923 | # CONFIG_HPFS_FS is not set | 1945 | # CONFIG_HPFS_FS is not set |
1924 | # CONFIG_QNX4FS_FS is not set | 1946 | # CONFIG_QNX4FS_FS is not set |
1925 | # CONFIG_ROMFS_FS is not set | 1947 | # CONFIG_ROMFS_FS is not set |
1926 | # CONFIG_SYSV_FS is not set | 1948 | # CONFIG_SYSV_FS is not set |
1927 | # CONFIG_UFS_FS is not set | 1949 | # CONFIG_UFS_FS is not set |
1928 | CONFIG_NETWORK_FILESYSTEMS=y | 1950 | CONFIG_NETWORK_FILESYSTEMS=y |
1929 | # CONFIG_NFS_FS is not set | 1951 | CONFIG_NFS_FS=y |
1952 | CONFIG_NFS_V3=y | ||
1953 | CONFIG_NFS_V3_ACL=y | ||
1954 | CONFIG_NFS_V4=y | ||
1955 | CONFIG_ROOT_NFS=y | ||
1930 | # CONFIG_NFSD is not set | 1956 | # CONFIG_NFSD is not set |
1957 | CONFIG_LOCKD=y | ||
1958 | CONFIG_LOCKD_V4=y | ||
1959 | CONFIG_NFS_ACL_SUPPORT=y | ||
1960 | CONFIG_NFS_COMMON=y | ||
1961 | CONFIG_SUNRPC=y | ||
1962 | CONFIG_SUNRPC_GSS=y | ||
1963 | CONFIG_RPCSEC_GSS_KRB5=y | ||
1964 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1931 | # CONFIG_SMB_FS is not set | 1965 | # CONFIG_SMB_FS is not set |
1932 | # CONFIG_CIFS is not set | 1966 | # CONFIG_CIFS is not set |
1933 | # CONFIG_NCP_FS is not set | 1967 | # CONFIG_NCP_FS is not set |
@@ -2001,9 +2035,9 @@ CONFIG_NLS_UTF8=y | |||
2001 | # Kernel hacking | 2035 | # Kernel hacking |
2002 | # | 2036 | # |
2003 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2037 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
2004 | # CONFIG_PRINTK_TIME is not set | 2038 | CONFIG_PRINTK_TIME=y |
2005 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 2039 | CONFIG_ENABLE_WARN_DEPRECATED=y |
2006 | # CONFIG_ENABLE_MUST_CHECK is not set | 2040 | CONFIG_ENABLE_MUST_CHECK=y |
2007 | CONFIG_FRAME_WARN=2048 | 2041 | CONFIG_FRAME_WARN=2048 |
2008 | CONFIG_MAGIC_SYSRQ=y | 2042 | CONFIG_MAGIC_SYSRQ=y |
2009 | # CONFIG_UNUSED_SYMBOLS is not set | 2043 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -2033,6 +2067,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
2033 | # CONFIG_DEBUG_INFO is not set | 2067 | # CONFIG_DEBUG_INFO is not set |
2034 | # CONFIG_DEBUG_VM is not set | 2068 | # CONFIG_DEBUG_VM is not set |
2035 | # CONFIG_DEBUG_WRITECOUNT is not set | 2069 | # CONFIG_DEBUG_WRITECOUNT is not set |
2070 | CONFIG_DEBUG_MEMORY_INIT=y | ||
2036 | # CONFIG_DEBUG_LIST is not set | 2071 | # CONFIG_DEBUG_LIST is not set |
2037 | # CONFIG_DEBUG_SG is not set | 2072 | # CONFIG_DEBUG_SG is not set |
2038 | CONFIG_FRAME_POINTER=y | 2073 | CONFIG_FRAME_POINTER=y |
@@ -2043,23 +2078,32 @@ CONFIG_FRAME_POINTER=y | |||
2043 | # CONFIG_LKDTM is not set | 2078 | # CONFIG_LKDTM is not set |
2044 | # CONFIG_FAULT_INJECTION is not set | 2079 | # CONFIG_FAULT_INJECTION is not set |
2045 | # CONFIG_LATENCYTOP is not set | 2080 | # CONFIG_LATENCYTOP is not set |
2081 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
2082 | CONFIG_HAVE_FTRACE=y | ||
2083 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
2084 | # CONFIG_FTRACE is not set | ||
2085 | # CONFIG_IRQSOFF_TRACER is not set | ||
2086 | # CONFIG_SYSPROF_TRACER is not set | ||
2087 | # CONFIG_SCHED_TRACER is not set | ||
2088 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
2046 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | 2089 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
2047 | # CONFIG_SAMPLES is not set | 2090 | # CONFIG_SAMPLES is not set |
2048 | # CONFIG_KGDB is not set | ||
2049 | CONFIG_HAVE_ARCH_KGDB=y | 2091 | CONFIG_HAVE_ARCH_KGDB=y |
2092 | # CONFIG_KGDB is not set | ||
2050 | # CONFIG_STRICT_DEVMEM is not set | 2093 | # CONFIG_STRICT_DEVMEM is not set |
2094 | CONFIG_X86_VERBOSE_BOOTUP=y | ||
2051 | CONFIG_EARLY_PRINTK=y | 2095 | CONFIG_EARLY_PRINTK=y |
2052 | CONFIG_DEBUG_STACKOVERFLOW=y | 2096 | CONFIG_DEBUG_STACKOVERFLOW=y |
2053 | CONFIG_DEBUG_STACK_USAGE=y | 2097 | CONFIG_DEBUG_STACK_USAGE=y |
2054 | # CONFIG_DEBUG_PAGEALLOC is not set | 2098 | # CONFIG_DEBUG_PAGEALLOC is not set |
2099 | # CONFIG_DEBUG_PER_CPU_MAPS is not set | ||
2055 | # CONFIG_X86_PTDUMP is not set | 2100 | # CONFIG_X86_PTDUMP is not set |
2056 | CONFIG_DEBUG_RODATA=y | 2101 | CONFIG_DEBUG_RODATA=y |
2057 | # CONFIG_DEBUG_RODATA_TEST is not set | 2102 | # CONFIG_DEBUG_RODATA_TEST is not set |
2058 | CONFIG_DEBUG_NX_TEST=m | 2103 | CONFIG_DEBUG_NX_TEST=m |
2059 | # CONFIG_4KSTACKS is not set | 2104 | # CONFIG_4KSTACKS is not set |
2060 | CONFIG_X86_FIND_SMP_CONFIG=y | ||
2061 | CONFIG_X86_MPPARSE=y | ||
2062 | CONFIG_DOUBLEFAULT=y | 2105 | CONFIG_DOUBLEFAULT=y |
2106 | # CONFIG_MMIOTRACE is not set | ||
2063 | CONFIG_IO_DELAY_TYPE_0X80=0 | 2107 | CONFIG_IO_DELAY_TYPE_0X80=0 |
2064 | CONFIG_IO_DELAY_TYPE_0XED=1 | 2108 | CONFIG_IO_DELAY_TYPE_0XED=1 |
2065 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | 2109 | CONFIG_IO_DELAY_TYPE_UDELAY=2 |
@@ -2071,6 +2115,7 @@ CONFIG_IO_DELAY_0X80=y | |||
2071 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | 2115 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 |
2072 | CONFIG_DEBUG_BOOT_PARAMS=y | 2116 | CONFIG_DEBUG_BOOT_PARAMS=y |
2073 | # CONFIG_CPA_DEBUG is not set | 2117 | # CONFIG_CPA_DEBUG is not set |
2118 | # CONFIG_OPTIMIZE_INLINING is not set | ||
2074 | 2119 | ||
2075 | # | 2120 | # |
2076 | # Security options | 2121 | # Security options |
@@ -2080,7 +2125,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y | |||
2080 | CONFIG_SECURITY=y | 2125 | CONFIG_SECURITY=y |
2081 | CONFIG_SECURITY_NETWORK=y | 2126 | CONFIG_SECURITY_NETWORK=y |
2082 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 2127 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
2083 | CONFIG_SECURITY_CAPABILITIES=y | ||
2084 | CONFIG_SECURITY_FILE_CAPABILITIES=y | 2128 | CONFIG_SECURITY_FILE_CAPABILITIES=y |
2085 | # CONFIG_SECURITY_ROOTPLUG is not set | 2129 | # CONFIG_SECURITY_ROOTPLUG is not set |
2086 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | 2130 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 |
@@ -2141,6 +2185,10 @@ CONFIG_CRYPTO_HMAC=y | |||
2141 | # CONFIG_CRYPTO_MD4 is not set | 2185 | # CONFIG_CRYPTO_MD4 is not set |
2142 | CONFIG_CRYPTO_MD5=y | 2186 | CONFIG_CRYPTO_MD5=y |
2143 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 2187 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
2188 | # CONFIG_CRYPTO_RMD128 is not set | ||
2189 | # CONFIG_CRYPTO_RMD160 is not set | ||
2190 | # CONFIG_CRYPTO_RMD256 is not set | ||
2191 | # CONFIG_CRYPTO_RMD320 is not set | ||
2144 | CONFIG_CRYPTO_SHA1=y | 2192 | CONFIG_CRYPTO_SHA1=y |
2145 | # CONFIG_CRYPTO_SHA256 is not set | 2193 | # CONFIG_CRYPTO_SHA256 is not set |
2146 | # CONFIG_CRYPTO_SHA512 is not set | 2194 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -2151,7 +2199,7 @@ CONFIG_CRYPTO_SHA1=y | |||
2151 | # Ciphers | 2199 | # Ciphers |
2152 | # | 2200 | # |
2153 | CONFIG_CRYPTO_AES=y | 2201 | CONFIG_CRYPTO_AES=y |
2154 | # CONFIG_CRYPTO_AES_586 is not set | 2202 | CONFIG_CRYPTO_AES_586=y |
2155 | # CONFIG_CRYPTO_ANUBIS is not set | 2203 | # CONFIG_CRYPTO_ANUBIS is not set |
2156 | CONFIG_CRYPTO_ARC4=y | 2204 | CONFIG_CRYPTO_ARC4=y |
2157 | # CONFIG_CRYPTO_BLOWFISH is not set | 2205 | # CONFIG_CRYPTO_BLOWFISH is not set |
@@ -2193,6 +2241,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y | |||
2193 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 2241 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
2194 | # CONFIG_CRC_CCITT is not set | 2242 | # CONFIG_CRC_CCITT is not set |
2195 | # CONFIG_CRC16 is not set | 2243 | # CONFIG_CRC16 is not set |
2244 | CONFIG_CRC_T10DIF=y | ||
2196 | # CONFIG_CRC_ITU_T is not set | 2245 | # CONFIG_CRC_ITU_T is not set |
2197 | CONFIG_CRC32=y | 2246 | CONFIG_CRC32=y |
2198 | # CONFIG_CRC7 is not set | 2247 | # CONFIG_CRC7 is not set |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index a40452429625..678c8acefe04 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -1,13 +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.26-rc1 | 3 | # Linux kernel version: 2.6.27-rc4 |
4 | # Sun May 4 19:59:57 2008 | 4 | # Mon Aug 25 14:40:46 2008 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | # CONFIG_X86_32 is not set | 7 | # CONFIG_X86_32 is not set |
8 | CONFIG_X86_64=y | 8 | CONFIG_X86_64=y |
9 | CONFIG_X86=y | 9 | CONFIG_X86=y |
10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/x86_64_defconfig" | 10 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" |
11 | # CONFIG_GENERIC_LOCKBREAK is not set | 11 | # CONFIG_GENERIC_LOCKBREAK is not set |
12 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
13 | CONFIG_GENERIC_CMOS_UPDATE=y | 13 | CONFIG_GENERIC_CMOS_UPDATE=y |
@@ -53,6 +53,7 @@ CONFIG_X86_HT=y | |||
53 | CONFIG_X86_BIOS_REBOOT=y | 53 | CONFIG_X86_BIOS_REBOOT=y |
54 | CONFIG_X86_TRAMPOLINE=y | 54 | CONFIG_X86_TRAMPOLINE=y |
55 | # CONFIG_KTIME_SCALAR is not set | 55 | # CONFIG_KTIME_SCALAR is not set |
56 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
56 | 57 | ||
57 | # | 58 | # |
58 | # General setup | 59 | # General setup |
@@ -82,6 +83,7 @@ CONFIG_CGROUPS=y | |||
82 | CONFIG_CGROUP_NS=y | 83 | CONFIG_CGROUP_NS=y |
83 | # CONFIG_CGROUP_DEVICE is not set | 84 | # CONFIG_CGROUP_DEVICE is not set |
84 | CONFIG_CPUSETS=y | 85 | CONFIG_CPUSETS=y |
86 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y | ||
85 | CONFIG_GROUP_SCHED=y | 87 | CONFIG_GROUP_SCHED=y |
86 | CONFIG_FAIR_GROUP_SCHED=y | 88 | CONFIG_FAIR_GROUP_SCHED=y |
87 | # CONFIG_RT_GROUP_SCHED is not set | 89 | # CONFIG_RT_GROUP_SCHED is not set |
@@ -105,7 +107,6 @@ CONFIG_SYSCTL=y | |||
105 | # CONFIG_EMBEDDED is not set | 107 | # CONFIG_EMBEDDED is not set |
106 | CONFIG_UID16=y | 108 | CONFIG_UID16=y |
107 | CONFIG_SYSCTL_SYSCALL=y | 109 | CONFIG_SYSCTL_SYSCALL=y |
108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
109 | CONFIG_KALLSYMS=y | 110 | CONFIG_KALLSYMS=y |
110 | CONFIG_KALLSYMS_ALL=y | 111 | CONFIG_KALLSYMS_ALL=y |
111 | CONFIG_KALLSYMS_EXTRA_PASS=y | 112 | CONFIG_KALLSYMS_EXTRA_PASS=y |
@@ -113,6 +114,7 @@ CONFIG_HOTPLUG=y | |||
113 | CONFIG_PRINTK=y | 114 | CONFIG_PRINTK=y |
114 | CONFIG_BUG=y | 115 | CONFIG_BUG=y |
115 | CONFIG_ELF_CORE=y | 116 | CONFIG_ELF_CORE=y |
117 | CONFIG_PCSPKR_PLATFORM=y | ||
116 | # CONFIG_COMPAT_BRK is not set | 118 | # CONFIG_COMPAT_BRK is not set |
117 | CONFIG_BASE_FULL=y | 119 | CONFIG_BASE_FULL=y |
118 | CONFIG_FUTEX=y | 120 | CONFIG_FUTEX=y |
@@ -132,25 +134,33 @@ CONFIG_MARKERS=y | |||
132 | # CONFIG_OPROFILE is not set | 134 | # CONFIG_OPROFILE is not set |
133 | CONFIG_HAVE_OPROFILE=y | 135 | CONFIG_HAVE_OPROFILE=y |
134 | CONFIG_KPROBES=y | 136 | CONFIG_KPROBES=y |
137 | CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y | ||
135 | CONFIG_KRETPROBES=y | 138 | CONFIG_KRETPROBES=y |
139 | CONFIG_HAVE_IOREMAP_PROT=y | ||
136 | CONFIG_HAVE_KPROBES=y | 140 | CONFIG_HAVE_KPROBES=y |
137 | CONFIG_HAVE_KRETPROBES=y | 141 | CONFIG_HAVE_KRETPROBES=y |
142 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | ||
138 | # CONFIG_HAVE_DMA_ATTRS is not set | 143 | # CONFIG_HAVE_DMA_ATTRS is not set |
144 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
145 | # CONFIG_HAVE_CLK is not set | ||
139 | CONFIG_PROC_PAGE_MONITOR=y | 146 | CONFIG_PROC_PAGE_MONITOR=y |
147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | ||
140 | CONFIG_SLABINFO=y | 148 | CONFIG_SLABINFO=y |
141 | CONFIG_RT_MUTEXES=y | 149 | CONFIG_RT_MUTEXES=y |
142 | # CONFIG_TINY_SHMEM is not set | 150 | # CONFIG_TINY_SHMEM is not set |
143 | CONFIG_BASE_SMALL=0 | 151 | CONFIG_BASE_SMALL=0 |
144 | CONFIG_MODULES=y | 152 | CONFIG_MODULES=y |
153 | # CONFIG_MODULE_FORCE_LOAD is not set | ||
145 | CONFIG_MODULE_UNLOAD=y | 154 | CONFIG_MODULE_UNLOAD=y |
146 | CONFIG_MODULE_FORCE_UNLOAD=y | 155 | CONFIG_MODULE_FORCE_UNLOAD=y |
147 | # CONFIG_MODVERSIONS is not set | 156 | # CONFIG_MODVERSIONS is not set |
148 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 157 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
149 | # CONFIG_KMOD is not set | 158 | CONFIG_KMOD=y |
150 | CONFIG_STOP_MACHINE=y | 159 | CONFIG_STOP_MACHINE=y |
151 | CONFIG_BLOCK=y | 160 | CONFIG_BLOCK=y |
152 | CONFIG_BLK_DEV_IO_TRACE=y | 161 | CONFIG_BLK_DEV_IO_TRACE=y |
153 | CONFIG_BLK_DEV_BSG=y | 162 | CONFIG_BLK_DEV_BSG=y |
163 | # CONFIG_BLK_DEV_INTEGRITY is not set | ||
154 | CONFIG_BLOCK_COMPAT=y | 164 | CONFIG_BLOCK_COMPAT=y |
155 | 165 | ||
156 | # | 166 | # |
@@ -175,20 +185,15 @@ CONFIG_NO_HZ=y | |||
175 | CONFIG_HIGH_RES_TIMERS=y | 185 | CONFIG_HIGH_RES_TIMERS=y |
176 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 186 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
177 | CONFIG_SMP=y | 187 | CONFIG_SMP=y |
188 | CONFIG_X86_FIND_SMP_CONFIG=y | ||
189 | CONFIG_X86_MPPARSE=y | ||
178 | CONFIG_X86_PC=y | 190 | CONFIG_X86_PC=y |
179 | # CONFIG_X86_ELAN is not set | 191 | # CONFIG_X86_ELAN is not set |
180 | # CONFIG_X86_VOYAGER is not set | 192 | # CONFIG_X86_VOYAGER is not set |
181 | # CONFIG_X86_NUMAQ is not set | ||
182 | # CONFIG_X86_SUMMIT is not set | ||
183 | # CONFIG_X86_BIGSMP is not set | ||
184 | # CONFIG_X86_VISWS is not set | ||
185 | # CONFIG_X86_GENERICARCH is not set | 193 | # CONFIG_X86_GENERICARCH is not set |
186 | # CONFIG_X86_ES7000 is not set | ||
187 | # CONFIG_X86_RDC321X is not set | ||
188 | # CONFIG_X86_VSMP is not set | 194 | # CONFIG_X86_VSMP is not set |
189 | # CONFIG_PARAVIRT_GUEST is not set | 195 | # CONFIG_PARAVIRT_GUEST is not set |
190 | CONFIG_MEMTEST_BOOTPARAM=y | 196 | # CONFIG_MEMTEST is not set |
191 | CONFIG_MEMTEST_BOOTPARAM_VALUE=0 | ||
192 | # CONFIG_M386 is not set | 197 | # CONFIG_M386 is not set |
193 | # CONFIG_M486 is not set | 198 | # CONFIG_M486 is not set |
194 | # CONFIG_M586 is not set | 199 | # CONFIG_M586 is not set |
@@ -220,11 +225,12 @@ CONFIG_X86_L1_CACHE_BYTES=64 | |||
220 | CONFIG_X86_INTERNODE_CACHE_BYTES=64 | 225 | CONFIG_X86_INTERNODE_CACHE_BYTES=64 |
221 | CONFIG_X86_CMPXCHG=y | 226 | CONFIG_X86_CMPXCHG=y |
222 | CONFIG_X86_L1_CACHE_SHIFT=6 | 227 | CONFIG_X86_L1_CACHE_SHIFT=6 |
223 | CONFIG_X86_GOOD_APIC=y | 228 | CONFIG_X86_WP_WORKS_OK=y |
224 | CONFIG_X86_INTEL_USERCOPY=y | 229 | CONFIG_X86_INTEL_USERCOPY=y |
225 | CONFIG_X86_USE_PPRO_CHECKSUM=y | 230 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
226 | CONFIG_X86_P6_NOP=y | 231 | CONFIG_X86_P6_NOP=y |
227 | CONFIG_X86_TSC=y | 232 | CONFIG_X86_TSC=y |
233 | CONFIG_X86_CMPXCHG64=y | ||
228 | CONFIG_X86_CMOV=y | 234 | CONFIG_X86_CMOV=y |
229 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 | 235 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 |
230 | CONFIG_X86_DEBUGCTLMSR=y | 236 | CONFIG_X86_DEBUGCTLMSR=y |
@@ -234,8 +240,10 @@ CONFIG_DMI=y | |||
234 | CONFIG_GART_IOMMU=y | 240 | CONFIG_GART_IOMMU=y |
235 | CONFIG_CALGARY_IOMMU=y | 241 | CONFIG_CALGARY_IOMMU=y |
236 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y | 242 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y |
243 | CONFIG_AMD_IOMMU=y | ||
237 | CONFIG_SWIOTLB=y | 244 | CONFIG_SWIOTLB=y |
238 | CONFIG_IOMMU_HELPER=y | 245 | CONFIG_IOMMU_HELPER=y |
246 | # CONFIG_MAXSMP is not set | ||
239 | CONFIG_NR_CPUS=4 | 247 | CONFIG_NR_CPUS=4 |
240 | # CONFIG_SCHED_SMT is not set | 248 | # CONFIG_SCHED_SMT is not set |
241 | CONFIG_SCHED_MC=y | 249 | CONFIG_SCHED_MC=y |
@@ -281,6 +289,7 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
281 | CONFIG_BOUNCE=y | 289 | CONFIG_BOUNCE=y |
282 | CONFIG_VIRT_TO_BUS=y | 290 | CONFIG_VIRT_TO_BUS=y |
283 | CONFIG_MTRR=y | 291 | CONFIG_MTRR=y |
292 | # CONFIG_MTRR_SANITIZER is not set | ||
284 | # CONFIG_X86_PAT is not set | 293 | # CONFIG_X86_PAT is not set |
285 | CONFIG_EFI=y | 294 | CONFIG_EFI=y |
286 | CONFIG_SECCOMP=y | 295 | CONFIG_SECCOMP=y |
@@ -313,6 +322,7 @@ CONFIG_PM_TRACE_RTC=y | |||
313 | CONFIG_PM_SLEEP_SMP=y | 322 | CONFIG_PM_SLEEP_SMP=y |
314 | CONFIG_PM_SLEEP=y | 323 | CONFIG_PM_SLEEP=y |
315 | CONFIG_SUSPEND=y | 324 | CONFIG_SUSPEND=y |
325 | # CONFIG_PM_TEST_SUSPEND is not set | ||
316 | CONFIG_SUSPEND_FREEZER=y | 326 | CONFIG_SUSPEND_FREEZER=y |
317 | CONFIG_HIBERNATION=y | 327 | CONFIG_HIBERNATION=y |
318 | CONFIG_PM_STD_PARTITION="" | 328 | CONFIG_PM_STD_PARTITION="" |
@@ -339,6 +349,7 @@ CONFIG_ACPI_NUMA=y | |||
339 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 349 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
340 | # CONFIG_ACPI_DEBUG is not set | 350 | # CONFIG_ACPI_DEBUG is not set |
341 | CONFIG_ACPI_EC=y | 351 | CONFIG_ACPI_EC=y |
352 | # CONFIG_ACPI_PCI_SLOT is not set | ||
342 | CONFIG_ACPI_POWER=y | 353 | CONFIG_ACPI_POWER=y |
343 | CONFIG_ACPI_SYSTEM=y | 354 | CONFIG_ACPI_SYSTEM=y |
344 | CONFIG_X86_PM_TIMER=y | 355 | CONFIG_X86_PM_TIMER=y |
@@ -437,10 +448,6 @@ CONFIG_IA32_EMULATION=y | |||
437 | CONFIG_COMPAT=y | 448 | CONFIG_COMPAT=y |
438 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y | 449 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y |
439 | CONFIG_SYSVIPC_COMPAT=y | 450 | CONFIG_SYSVIPC_COMPAT=y |
440 | |||
441 | # | ||
442 | # Networking | ||
443 | # | ||
444 | CONFIG_NET=y | 451 | CONFIG_NET=y |
445 | 452 | ||
446 | # | 453 | # |
@@ -464,7 +471,10 @@ CONFIG_IP_FIB_HASH=y | |||
464 | CONFIG_IP_MULTIPLE_TABLES=y | 471 | CONFIG_IP_MULTIPLE_TABLES=y |
465 | CONFIG_IP_ROUTE_MULTIPATH=y | 472 | CONFIG_IP_ROUTE_MULTIPATH=y |
466 | CONFIG_IP_ROUTE_VERBOSE=y | 473 | CONFIG_IP_ROUTE_VERBOSE=y |
467 | # CONFIG_IP_PNP is not set | 474 | CONFIG_IP_PNP=y |
475 | CONFIG_IP_PNP_DHCP=y | ||
476 | CONFIG_IP_PNP_BOOTP=y | ||
477 | CONFIG_IP_PNP_RARP=y | ||
468 | # CONFIG_NET_IPIP is not set | 478 | # CONFIG_NET_IPIP is not set |
469 | # CONFIG_NET_IPGRE is not set | 479 | # CONFIG_NET_IPGRE is not set |
470 | CONFIG_IP_MROUTE=y | 480 | CONFIG_IP_MROUTE=y |
@@ -607,7 +617,6 @@ CONFIG_NET_SCHED=y | |||
607 | # CONFIG_NET_SCH_HTB is not set | 617 | # CONFIG_NET_SCH_HTB is not set |
608 | # CONFIG_NET_SCH_HFSC is not set | 618 | # CONFIG_NET_SCH_HFSC is not set |
609 | # CONFIG_NET_SCH_PRIO is not set | 619 | # CONFIG_NET_SCH_PRIO is not set |
610 | # CONFIG_NET_SCH_RR is not set | ||
611 | # CONFIG_NET_SCH_RED is not set | 620 | # CONFIG_NET_SCH_RED is not set |
612 | # CONFIG_NET_SCH_SFQ is not set | 621 | # CONFIG_NET_SCH_SFQ is not set |
613 | # CONFIG_NET_SCH_TEQL is not set | 622 | # CONFIG_NET_SCH_TEQL is not set |
@@ -669,28 +678,19 @@ CONFIG_FIB_RULES=y | |||
669 | CONFIG_CFG80211=y | 678 | CONFIG_CFG80211=y |
670 | CONFIG_NL80211=y | 679 | CONFIG_NL80211=y |
671 | CONFIG_WIRELESS_EXT=y | 680 | CONFIG_WIRELESS_EXT=y |
681 | CONFIG_WIRELESS_EXT_SYSFS=y | ||
672 | CONFIG_MAC80211=y | 682 | CONFIG_MAC80211=y |
673 | 683 | ||
674 | # | 684 | # |
675 | # Rate control algorithm selection | 685 | # Rate control algorithm selection |
676 | # | 686 | # |
687 | CONFIG_MAC80211_RC_PID=y | ||
677 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 688 | CONFIG_MAC80211_RC_DEFAULT_PID=y |
678 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
679 | |||
680 | # | ||
681 | # Selecting 'y' for an algorithm will | ||
682 | # | ||
683 | |||
684 | # | ||
685 | # build the algorithm into mac80211. | ||
686 | # | ||
687 | CONFIG_MAC80211_RC_DEFAULT="pid" | 689 | CONFIG_MAC80211_RC_DEFAULT="pid" |
688 | CONFIG_MAC80211_RC_PID=y | ||
689 | # CONFIG_MAC80211_MESH is not set | 690 | # CONFIG_MAC80211_MESH is not set |
690 | CONFIG_MAC80211_LEDS=y | 691 | CONFIG_MAC80211_LEDS=y |
691 | # CONFIG_MAC80211_DEBUGFS is not set | 692 | # CONFIG_MAC80211_DEBUGFS is not set |
692 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | 693 | # CONFIG_MAC80211_DEBUG_MENU is not set |
693 | # CONFIG_MAC80211_DEBUG is not set | ||
694 | # CONFIG_IEEE80211 is not set | 694 | # CONFIG_IEEE80211 is not set |
695 | # CONFIG_RFKILL is not set | 695 | # CONFIG_RFKILL is not set |
696 | # CONFIG_NET_9P is not set | 696 | # CONFIG_NET_9P is not set |
@@ -706,6 +706,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | |||
706 | CONFIG_STANDALONE=y | 706 | CONFIG_STANDALONE=y |
707 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 707 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
708 | CONFIG_FW_LOADER=y | 708 | CONFIG_FW_LOADER=y |
709 | CONFIG_FIRMWARE_IN_KERNEL=y | ||
710 | CONFIG_EXTRA_FIRMWARE="" | ||
709 | # CONFIG_DEBUG_DRIVER is not set | 711 | # CONFIG_DEBUG_DRIVER is not set |
710 | CONFIG_DEBUG_DEVRES=y | 712 | CONFIG_DEBUG_DEVRES=y |
711 | # CONFIG_SYS_HYPERVISOR is not set | 713 | # CONFIG_SYS_HYPERVISOR is not set |
@@ -738,6 +740,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
738 | # CONFIG_BLK_DEV_XIP is not set | 740 | # CONFIG_BLK_DEV_XIP is not set |
739 | # CONFIG_CDROM_PKTCDVD is not set | 741 | # CONFIG_CDROM_PKTCDVD is not set |
740 | # CONFIG_ATA_OVER_ETH is not set | 742 | # CONFIG_ATA_OVER_ETH is not set |
743 | # CONFIG_BLK_DEV_HD is not set | ||
741 | CONFIG_MISC_DEVICES=y | 744 | CONFIG_MISC_DEVICES=y |
742 | # CONFIG_IBM_ASM is not set | 745 | # CONFIG_IBM_ASM is not set |
743 | # CONFIG_PHANTOM is not set | 746 | # CONFIG_PHANTOM is not set |
@@ -748,10 +751,14 @@ CONFIG_MISC_DEVICES=y | |||
748 | # CONFIG_ASUS_LAPTOP is not set | 751 | # CONFIG_ASUS_LAPTOP is not set |
749 | # CONFIG_FUJITSU_LAPTOP is not set | 752 | # CONFIG_FUJITSU_LAPTOP is not set |
750 | # CONFIG_MSI_LAPTOP is not set | 753 | # CONFIG_MSI_LAPTOP is not set |
754 | # CONFIG_COMPAL_LAPTOP is not set | ||
751 | # CONFIG_SONY_LAPTOP is not set | 755 | # CONFIG_SONY_LAPTOP is not set |
752 | # CONFIG_THINKPAD_ACPI is not set | 756 | # CONFIG_THINKPAD_ACPI is not set |
753 | # CONFIG_INTEL_MENLOW is not set | 757 | # CONFIG_INTEL_MENLOW is not set |
754 | # CONFIG_ENCLOSURE_SERVICES is not set | 758 | # CONFIG_ENCLOSURE_SERVICES is not set |
759 | # CONFIG_SGI_XP is not set | ||
760 | # CONFIG_HP_ILO is not set | ||
761 | # CONFIG_SGI_GRU is not set | ||
755 | CONFIG_HAVE_IDE=y | 762 | CONFIG_HAVE_IDE=y |
756 | # CONFIG_IDE is not set | 763 | # CONFIG_IDE is not set |
757 | 764 | ||
@@ -790,12 +797,13 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
790 | # | 797 | # |
791 | CONFIG_SCSI_SPI_ATTRS=y | 798 | CONFIG_SCSI_SPI_ATTRS=y |
792 | # CONFIG_SCSI_FC_ATTRS is not set | 799 | # CONFIG_SCSI_FC_ATTRS is not set |
793 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 800 | CONFIG_SCSI_ISCSI_ATTRS=y |
794 | # CONFIG_SCSI_SAS_ATTRS is not set | 801 | # CONFIG_SCSI_SAS_ATTRS is not set |
795 | # CONFIG_SCSI_SAS_LIBSAS is not set | 802 | # CONFIG_SCSI_SAS_LIBSAS is not set |
796 | # CONFIG_SCSI_SRP_ATTRS is not set | 803 | # CONFIG_SCSI_SRP_ATTRS is not set |
797 | # CONFIG_SCSI_LOWLEVEL is not set | 804 | # CONFIG_SCSI_LOWLEVEL is not set |
798 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set | 805 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
806 | # CONFIG_SCSI_DH is not set | ||
799 | CONFIG_ATA=y | 807 | CONFIG_ATA=y |
800 | # CONFIG_ATA_NONSTANDARD is not set | 808 | # CONFIG_ATA_NONSTANDARD is not set |
801 | CONFIG_ATA_ACPI=y | 809 | CONFIG_ATA_ACPI=y |
@@ -857,6 +865,7 @@ CONFIG_PATA_OLDPIIX=y | |||
857 | # CONFIG_PATA_SIS is not set | 865 | # CONFIG_PATA_SIS is not set |
858 | # CONFIG_PATA_VIA is not set | 866 | # CONFIG_PATA_VIA is not set |
859 | # CONFIG_PATA_WINBOND is not set | 867 | # CONFIG_PATA_WINBOND is not set |
868 | CONFIG_PATA_SCH=y | ||
860 | CONFIG_MD=y | 869 | CONFIG_MD=y |
861 | CONFIG_BLK_DEV_MD=y | 870 | CONFIG_BLK_DEV_MD=y |
862 | # CONFIG_MD_LINEAR is not set | 871 | # CONFIG_MD_LINEAR is not set |
@@ -880,13 +889,16 @@ CONFIG_DM_ZERO=y | |||
880 | # | 889 | # |
881 | # IEEE 1394 (FireWire) support | 890 | # IEEE 1394 (FireWire) support |
882 | # | 891 | # |
892 | |||
893 | # | ||
894 | # Enable only one of the two stacks, unless you know what you are doing | ||
895 | # | ||
883 | # CONFIG_FIREWIRE is not set | 896 | # CONFIG_FIREWIRE is not set |
884 | # CONFIG_IEEE1394 is not set | 897 | # CONFIG_IEEE1394 is not set |
885 | # CONFIG_I2O is not set | 898 | # CONFIG_I2O is not set |
886 | CONFIG_MACINTOSH_DRIVERS=y | 899 | CONFIG_MACINTOSH_DRIVERS=y |
887 | CONFIG_MAC_EMUMOUSEBTN=y | 900 | CONFIG_MAC_EMUMOUSEBTN=y |
888 | CONFIG_NETDEVICES=y | 901 | CONFIG_NETDEVICES=y |
889 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
890 | # CONFIG_IFB is not set | 902 | # CONFIG_IFB is not set |
891 | # CONFIG_DUMMY is not set | 903 | # CONFIG_DUMMY is not set |
892 | # CONFIG_BONDING is not set | 904 | # CONFIG_BONDING is not set |
@@ -896,7 +908,23 @@ CONFIG_NETDEVICES=y | |||
896 | # CONFIG_VETH is not set | 908 | # CONFIG_VETH is not set |
897 | # CONFIG_NET_SB1000 is not set | 909 | # CONFIG_NET_SB1000 is not set |
898 | # CONFIG_ARCNET is not set | 910 | # CONFIG_ARCNET is not set |
899 | # CONFIG_PHYLIB is not set | 911 | CONFIG_PHYLIB=y |
912 | |||
913 | # | ||
914 | # MII PHY device drivers | ||
915 | # | ||
916 | # CONFIG_MARVELL_PHY is not set | ||
917 | # CONFIG_DAVICOM_PHY is not set | ||
918 | # CONFIG_QSEMI_PHY is not set | ||
919 | # CONFIG_LXT_PHY is not set | ||
920 | # CONFIG_CICADA_PHY is not set | ||
921 | # CONFIG_VITESSE_PHY is not set | ||
922 | # CONFIG_SMSC_PHY is not set | ||
923 | # CONFIG_BROADCOM_PHY is not set | ||
924 | # CONFIG_ICPLUS_PHY is not set | ||
925 | # CONFIG_REALTEK_PHY is not set | ||
926 | # CONFIG_FIXED_PHY is not set | ||
927 | # CONFIG_MDIO_BITBANG is not set | ||
900 | CONFIG_NET_ETHERNET=y | 928 | CONFIG_NET_ETHERNET=y |
901 | CONFIG_MII=y | 929 | CONFIG_MII=y |
902 | # CONFIG_HAPPYMEAL is not set | 930 | # CONFIG_HAPPYMEAL is not set |
@@ -940,16 +968,15 @@ CONFIG_8139TOO_PIO=y | |||
940 | # CONFIG_SIS900 is not set | 968 | # CONFIG_SIS900 is not set |
941 | # CONFIG_EPIC100 is not set | 969 | # CONFIG_EPIC100 is not set |
942 | # CONFIG_SUNDANCE is not set | 970 | # CONFIG_SUNDANCE is not set |
971 | # CONFIG_TLAN is not set | ||
943 | # CONFIG_VIA_RHINE is not set | 972 | # CONFIG_VIA_RHINE is not set |
944 | # CONFIG_SC92031 is not set | 973 | # CONFIG_SC92031 is not set |
945 | CONFIG_NETDEV_1000=y | 974 | CONFIG_NETDEV_1000=y |
946 | # CONFIG_ACENIC is not set | 975 | # CONFIG_ACENIC is not set |
947 | # CONFIG_DL2K is not set | 976 | # CONFIG_DL2K is not set |
948 | CONFIG_E1000=y | 977 | CONFIG_E1000=y |
949 | # CONFIG_E1000_NAPI is not set | ||
950 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 978 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
951 | # CONFIG_E1000E is not set | 979 | # CONFIG_E1000E is not set |
952 | # CONFIG_E1000E_ENABLED is not set | ||
953 | # CONFIG_IP1000 is not set | 980 | # CONFIG_IP1000 is not set |
954 | # CONFIG_IGB is not set | 981 | # CONFIG_IGB is not set |
955 | # CONFIG_NS83820 is not set | 982 | # CONFIG_NS83820 is not set |
@@ -965,6 +992,7 @@ CONFIG_TIGON3=y | |||
965 | # CONFIG_BNX2 is not set | 992 | # CONFIG_BNX2 is not set |
966 | # CONFIG_QLA3XXX is not set | 993 | # CONFIG_QLA3XXX is not set |
967 | # CONFIG_ATL1 is not set | 994 | # CONFIG_ATL1 is not set |
995 | # CONFIG_ATL1E is not set | ||
968 | CONFIG_NETDEV_10000=y | 996 | CONFIG_NETDEV_10000=y |
969 | # CONFIG_CHELSIO_T1 is not set | 997 | # CONFIG_CHELSIO_T1 is not set |
970 | # CONFIG_CHELSIO_T3 is not set | 998 | # CONFIG_CHELSIO_T3 is not set |
@@ -1003,13 +1031,14 @@ CONFIG_WLAN_80211=y | |||
1003 | # CONFIG_RTL8180 is not set | 1031 | # CONFIG_RTL8180 is not set |
1004 | # CONFIG_RTL8187 is not set | 1032 | # CONFIG_RTL8187 is not set |
1005 | # CONFIG_ADM8211 is not set | 1033 | # CONFIG_ADM8211 is not set |
1034 | # CONFIG_MAC80211_HWSIM is not set | ||
1006 | # CONFIG_P54_COMMON is not set | 1035 | # CONFIG_P54_COMMON is not set |
1007 | CONFIG_ATH5K=y | 1036 | CONFIG_ATH5K=y |
1008 | # CONFIG_ATH5K_DEBUG is not set | 1037 | # CONFIG_ATH5K_DEBUG is not set |
1009 | # CONFIG_IWLWIFI is not set | 1038 | # CONFIG_ATH9K is not set |
1010 | # CONFIG_IWLCORE is not set | 1039 | # CONFIG_IWLCORE is not set |
1011 | # CONFIG_IWLWIFI_LEDS is not set | 1040 | # CONFIG_IWLWIFI_LEDS is not set |
1012 | # CONFIG_IWL4965 is not set | 1041 | # CONFIG_IWLAGN is not set |
1013 | # CONFIG_IWL3945 is not set | 1042 | # CONFIG_IWL3945 is not set |
1014 | # CONFIG_HOSTAP is not set | 1043 | # CONFIG_HOSTAP is not set |
1015 | # CONFIG_B43 is not set | 1044 | # CONFIG_B43 is not set |
@@ -1088,6 +1117,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
1088 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1117 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
1089 | # CONFIG_MOUSE_SERIAL is not set | 1118 | # CONFIG_MOUSE_SERIAL is not set |
1090 | # CONFIG_MOUSE_APPLETOUCH is not set | 1119 | # CONFIG_MOUSE_APPLETOUCH is not set |
1120 | # CONFIG_MOUSE_BCM5974 is not set | ||
1091 | # CONFIG_MOUSE_VSXXXAA is not set | 1121 | # CONFIG_MOUSE_VSXXXAA is not set |
1092 | CONFIG_INPUT_JOYSTICK=y | 1122 | CONFIG_INPUT_JOYSTICK=y |
1093 | # CONFIG_JOYSTICK_ANALOG is not set | 1123 | # CONFIG_JOYSTICK_ANALOG is not set |
@@ -1122,12 +1152,14 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
1122 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 1152 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
1123 | # CONFIG_TOUCHSCREEN_ELO is not set | 1153 | # CONFIG_TOUCHSCREEN_ELO is not set |
1124 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 1154 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
1155 | # CONFIG_TOUCHSCREEN_INEXIO is not set | ||
1125 | # CONFIG_TOUCHSCREEN_MK712 is not set | 1156 | # CONFIG_TOUCHSCREEN_MK712 is not set |
1126 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | 1157 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set |
1127 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 1158 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
1128 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 1159 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
1129 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | 1160 | # CONFIG_TOUCHSCREEN_UCB1400 is not set |
1130 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 1161 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
1162 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | ||
1131 | CONFIG_INPUT_MISC=y | 1163 | CONFIG_INPUT_MISC=y |
1132 | # CONFIG_INPUT_PCSPKR is not set | 1164 | # CONFIG_INPUT_PCSPKR is not set |
1133 | # CONFIG_INPUT_APANEL is not set | 1165 | # CONFIG_INPUT_APANEL is not set |
@@ -1155,6 +1187,7 @@ CONFIG_SERIO_LIBPS2=y | |||
1155 | # Character devices | 1187 | # Character devices |
1156 | # | 1188 | # |
1157 | CONFIG_VT=y | 1189 | CONFIG_VT=y |
1190 | CONFIG_CONSOLE_TRANSLATIONS=y | ||
1158 | CONFIG_VT_CONSOLE=y | 1191 | CONFIG_VT_CONSOLE=y |
1159 | CONFIG_HW_CONSOLE=y | 1192 | CONFIG_HW_CONSOLE=y |
1160 | CONFIG_VT_HW_CONSOLE_BINDING=y | 1193 | CONFIG_VT_HW_CONSOLE_BINDING=y |
@@ -1222,7 +1255,6 @@ CONFIG_NVRAM=y | |||
1222 | # CONFIG_PC8736x_GPIO is not set | 1255 | # CONFIG_PC8736x_GPIO is not set |
1223 | # CONFIG_RAW_DRIVER is not set | 1256 | # CONFIG_RAW_DRIVER is not set |
1224 | CONFIG_HPET=y | 1257 | CONFIG_HPET=y |
1225 | # CONFIG_HPET_RTC_IRQ is not set | ||
1226 | # CONFIG_HPET_MMAP is not set | 1258 | # CONFIG_HPET_MMAP is not set |
1227 | # CONFIG_HANGCHECK_TIMER is not set | 1259 | # CONFIG_HANGCHECK_TIMER is not set |
1228 | # CONFIG_TCG_TPM is not set | 1260 | # CONFIG_TCG_TPM is not set |
@@ -1231,42 +1263,63 @@ CONFIG_DEVPORT=y | |||
1231 | CONFIG_I2C=y | 1263 | CONFIG_I2C=y |
1232 | CONFIG_I2C_BOARDINFO=y | 1264 | CONFIG_I2C_BOARDINFO=y |
1233 | # CONFIG_I2C_CHARDEV is not set | 1265 | # CONFIG_I2C_CHARDEV is not set |
1266 | CONFIG_I2C_HELPER_AUTO=y | ||
1234 | 1267 | ||
1235 | # | 1268 | # |
1236 | # I2C Hardware Bus support | 1269 | # I2C Hardware Bus support |
1237 | # | 1270 | # |
1271 | |||
1272 | # | ||
1273 | # PC SMBus host controller drivers | ||
1274 | # | ||
1238 | # CONFIG_I2C_ALI1535 is not set | 1275 | # CONFIG_I2C_ALI1535 is not set |
1239 | # CONFIG_I2C_ALI1563 is not set | 1276 | # CONFIG_I2C_ALI1563 is not set |
1240 | # CONFIG_I2C_ALI15X3 is not set | 1277 | # CONFIG_I2C_ALI15X3 is not set |
1241 | # CONFIG_I2C_AMD756 is not set | 1278 | # CONFIG_I2C_AMD756 is not set |
1242 | # CONFIG_I2C_AMD8111 is not set | 1279 | # CONFIG_I2C_AMD8111 is not set |
1243 | CONFIG_I2C_I801=y | 1280 | CONFIG_I2C_I801=y |
1244 | # CONFIG_I2C_I810 is not set | 1281 | # CONFIG_I2C_ISCH is not set |
1245 | # CONFIG_I2C_PIIX4 is not set | 1282 | # CONFIG_I2C_PIIX4 is not set |
1246 | # CONFIG_I2C_NFORCE2 is not set | 1283 | # CONFIG_I2C_NFORCE2 is not set |
1247 | # CONFIG_I2C_OCORES is not set | ||
1248 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1249 | # CONFIG_I2C_PROSAVAGE is not set | ||
1250 | # CONFIG_I2C_SAVAGE4 is not set | ||
1251 | # CONFIG_I2C_SIMTEC is not set | ||
1252 | # CONFIG_I2C_SIS5595 is not set | 1284 | # CONFIG_I2C_SIS5595 is not set |
1253 | # CONFIG_I2C_SIS630 is not set | 1285 | # CONFIG_I2C_SIS630 is not set |
1254 | # CONFIG_I2C_SIS96X is not set | 1286 | # CONFIG_I2C_SIS96X is not set |
1255 | # CONFIG_I2C_TAOS_EVM is not set | ||
1256 | # CONFIG_I2C_STUB is not set | ||
1257 | # CONFIG_I2C_TINY_USB is not set | ||
1258 | # CONFIG_I2C_VIA is not set | 1287 | # CONFIG_I2C_VIA is not set |
1259 | # CONFIG_I2C_VIAPRO is not set | 1288 | # CONFIG_I2C_VIAPRO is not set |
1289 | |||
1290 | # | ||
1291 | # I2C system bus drivers (mostly embedded / system-on-chip) | ||
1292 | # | ||
1293 | # CONFIG_I2C_OCORES is not set | ||
1294 | # CONFIG_I2C_SIMTEC is not set | ||
1295 | |||
1296 | # | ||
1297 | # External I2C/SMBus adapter drivers | ||
1298 | # | ||
1299 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
1300 | # CONFIG_I2C_TAOS_EVM is not set | ||
1301 | # CONFIG_I2C_TINY_USB is not set | ||
1302 | |||
1303 | # | ||
1304 | # Graphics adapter I2C/DDC channel drivers | ||
1305 | # | ||
1260 | # CONFIG_I2C_VOODOO3 is not set | 1306 | # CONFIG_I2C_VOODOO3 is not set |
1307 | |||
1308 | # | ||
1309 | # Other I2C/SMBus bus drivers | ||
1310 | # | ||
1261 | # CONFIG_I2C_PCA_PLATFORM is not set | 1311 | # CONFIG_I2C_PCA_PLATFORM is not set |
1312 | # CONFIG_I2C_STUB is not set | ||
1262 | 1313 | ||
1263 | # | 1314 | # |
1264 | # Miscellaneous I2C Chip support | 1315 | # Miscellaneous I2C Chip support |
1265 | # | 1316 | # |
1266 | # CONFIG_DS1682 is not set | 1317 | # CONFIG_DS1682 is not set |
1318 | # CONFIG_AT24 is not set | ||
1267 | # CONFIG_SENSORS_EEPROM is not set | 1319 | # CONFIG_SENSORS_EEPROM is not set |
1268 | # CONFIG_SENSORS_PCF8574 is not set | 1320 | # CONFIG_SENSORS_PCF8574 is not set |
1269 | # CONFIG_PCF8575 is not set | 1321 | # CONFIG_PCF8575 is not set |
1322 | # CONFIG_SENSORS_PCA9539 is not set | ||
1270 | # CONFIG_SENSORS_PCF8591 is not set | 1323 | # CONFIG_SENSORS_PCF8591 is not set |
1271 | # CONFIG_SENSORS_MAX6875 is not set | 1324 | # CONFIG_SENSORS_MAX6875 is not set |
1272 | # CONFIG_SENSORS_TSL2550 is not set | 1325 | # CONFIG_SENSORS_TSL2550 is not set |
@@ -1275,6 +1328,8 @@ CONFIG_I2C_I801=y | |||
1275 | # CONFIG_I2C_DEBUG_BUS is not set | 1328 | # CONFIG_I2C_DEBUG_BUS is not set |
1276 | # CONFIG_I2C_DEBUG_CHIP is not set | 1329 | # CONFIG_I2C_DEBUG_CHIP is not set |
1277 | # CONFIG_SPI is not set | 1330 | # CONFIG_SPI is not set |
1331 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y | ||
1332 | # CONFIG_GPIOLIB is not set | ||
1278 | # CONFIG_W1 is not set | 1333 | # CONFIG_W1 is not set |
1279 | CONFIG_POWER_SUPPLY=y | 1334 | CONFIG_POWER_SUPPLY=y |
1280 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1335 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
@@ -1335,8 +1390,10 @@ CONFIG_SSB_POSSIBLE=y | |||
1335 | # | 1390 | # |
1336 | # Multifunction device drivers | 1391 | # Multifunction device drivers |
1337 | # | 1392 | # |
1393 | # CONFIG_MFD_CORE is not set | ||
1338 | # CONFIG_MFD_SM501 is not set | 1394 | # CONFIG_MFD_SM501 is not set |
1339 | # CONFIG_HTC_PASIC3 is not set | 1395 | # CONFIG_HTC_PASIC3 is not set |
1396 | # CONFIG_MFD_TMIO is not set | ||
1340 | 1397 | ||
1341 | # | 1398 | # |
1342 | # Multimedia devices | 1399 | # Multimedia devices |
@@ -1347,6 +1404,7 @@ CONFIG_SSB_POSSIBLE=y | |||
1347 | # | 1404 | # |
1348 | # CONFIG_VIDEO_DEV is not set | 1405 | # CONFIG_VIDEO_DEV is not set |
1349 | # CONFIG_DVB_CORE is not set | 1406 | # CONFIG_DVB_CORE is not set |
1407 | # CONFIG_VIDEO_MEDIA is not set | ||
1350 | 1408 | ||
1351 | # | 1409 | # |
1352 | # Multimedia drivers | 1410 | # Multimedia drivers |
@@ -1387,7 +1445,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y | |||
1387 | # CONFIG_FB_SYS_IMAGEBLIT is not set | 1445 | # CONFIG_FB_SYS_IMAGEBLIT is not set |
1388 | # CONFIG_FB_FOREIGN_ENDIAN is not set | 1446 | # CONFIG_FB_FOREIGN_ENDIAN is not set |
1389 | # CONFIG_FB_SYS_FOPS is not set | 1447 | # CONFIG_FB_SYS_FOPS is not set |
1390 | CONFIG_FB_DEFERRED_IO=y | ||
1391 | # CONFIG_FB_SVGALIB is not set | 1448 | # CONFIG_FB_SVGALIB is not set |
1392 | # CONFIG_FB_MACMODES is not set | 1449 | # CONFIG_FB_MACMODES is not set |
1393 | # CONFIG_FB_BACKLIGHT is not set | 1450 | # CONFIG_FB_BACKLIGHT is not set |
@@ -1430,6 +1487,7 @@ CONFIG_FB_EFI=y | |||
1430 | # CONFIG_FB_TRIDENT is not set | 1487 | # CONFIG_FB_TRIDENT is not set |
1431 | # CONFIG_FB_ARK is not set | 1488 | # CONFIG_FB_ARK is not set |
1432 | # CONFIG_FB_PM3 is not set | 1489 | # CONFIG_FB_PM3 is not set |
1490 | # CONFIG_FB_CARMINE is not set | ||
1433 | # CONFIG_FB_GEODE is not set | 1491 | # CONFIG_FB_GEODE is not set |
1434 | # CONFIG_FB_VIRTUAL is not set | 1492 | # CONFIG_FB_VIRTUAL is not set |
1435 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1493 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
@@ -1437,6 +1495,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y | |||
1437 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1495 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1438 | # CONFIG_BACKLIGHT_CORGI is not set | 1496 | # CONFIG_BACKLIGHT_CORGI is not set |
1439 | # CONFIG_BACKLIGHT_PROGEAR is not set | 1497 | # CONFIG_BACKLIGHT_PROGEAR is not set |
1498 | # CONFIG_BACKLIGHT_MBP_NVIDIA is not set | ||
1440 | 1499 | ||
1441 | # | 1500 | # |
1442 | # Display device support | 1501 | # Display device support |
@@ -1456,15 +1515,7 @@ CONFIG_LOGO=y | |||
1456 | # CONFIG_LOGO_LINUX_MONO is not set | 1515 | # CONFIG_LOGO_LINUX_MONO is not set |
1457 | # CONFIG_LOGO_LINUX_VGA16 is not set | 1516 | # CONFIG_LOGO_LINUX_VGA16 is not set |
1458 | CONFIG_LOGO_LINUX_CLUT224=y | 1517 | CONFIG_LOGO_LINUX_CLUT224=y |
1459 | |||
1460 | # | ||
1461 | # Sound | ||
1462 | # | ||
1463 | CONFIG_SOUND=y | 1518 | CONFIG_SOUND=y |
1464 | |||
1465 | # | ||
1466 | # Advanced Linux Sound Architecture | ||
1467 | # | ||
1468 | CONFIG_SND=y | 1519 | CONFIG_SND=y |
1469 | CONFIG_SND_TIMER=y | 1520 | CONFIG_SND_TIMER=y |
1470 | CONFIG_SND_PCM=y | 1521 | CONFIG_SND_PCM=y |
@@ -1482,20 +1533,14 @@ CONFIG_SND_VERBOSE_PROCFS=y | |||
1482 | # CONFIG_SND_VERBOSE_PRINTK is not set | 1533 | # CONFIG_SND_VERBOSE_PRINTK is not set |
1483 | # CONFIG_SND_DEBUG is not set | 1534 | # CONFIG_SND_DEBUG is not set |
1484 | CONFIG_SND_VMASTER=y | 1535 | CONFIG_SND_VMASTER=y |
1485 | 1536 | CONFIG_SND_DRIVERS=y | |
1486 | # | ||
1487 | # Generic devices | ||
1488 | # | ||
1489 | # CONFIG_SND_PCSP is not set | 1537 | # CONFIG_SND_PCSP is not set |
1490 | # CONFIG_SND_DUMMY is not set | 1538 | # CONFIG_SND_DUMMY is not set |
1491 | # CONFIG_SND_VIRMIDI is not set | 1539 | # CONFIG_SND_VIRMIDI is not set |
1492 | # CONFIG_SND_MTPAV is not set | 1540 | # CONFIG_SND_MTPAV is not set |
1493 | # CONFIG_SND_SERIAL_U16550 is not set | 1541 | # CONFIG_SND_SERIAL_U16550 is not set |
1494 | # CONFIG_SND_MPU401 is not set | 1542 | # CONFIG_SND_MPU401 is not set |
1495 | 1543 | CONFIG_SND_PCI=y | |
1496 | # | ||
1497 | # PCI devices | ||
1498 | # | ||
1499 | # CONFIG_SND_AD1889 is not set | 1544 | # CONFIG_SND_AD1889 is not set |
1500 | # CONFIG_SND_ALS300 is not set | 1545 | # CONFIG_SND_ALS300 is not set |
1501 | # CONFIG_SND_ALS4000 is not set | 1546 | # CONFIG_SND_ALS4000 is not set |
@@ -1568,36 +1613,14 @@ CONFIG_SND_HDA_GENERIC=y | |||
1568 | # CONFIG_SND_VIRTUOSO is not set | 1613 | # CONFIG_SND_VIRTUOSO is not set |
1569 | # CONFIG_SND_VX222 is not set | 1614 | # CONFIG_SND_VX222 is not set |
1570 | # CONFIG_SND_YMFPCI is not set | 1615 | # CONFIG_SND_YMFPCI is not set |
1571 | 1616 | CONFIG_SND_USB=y | |
1572 | # | ||
1573 | # USB devices | ||
1574 | # | ||
1575 | # CONFIG_SND_USB_AUDIO is not set | 1617 | # CONFIG_SND_USB_AUDIO is not set |
1576 | # CONFIG_SND_USB_USX2Y is not set | 1618 | # CONFIG_SND_USB_USX2Y is not set |
1577 | # CONFIG_SND_USB_CAIAQ is not set | 1619 | # CONFIG_SND_USB_CAIAQ is not set |
1578 | 1620 | CONFIG_SND_PCMCIA=y | |
1579 | # | ||
1580 | # PCMCIA devices | ||
1581 | # | ||
1582 | # CONFIG_SND_VXPOCKET is not set | 1621 | # CONFIG_SND_VXPOCKET is not set |
1583 | # CONFIG_SND_PDAUDIOCF is not set | 1622 | # CONFIG_SND_PDAUDIOCF is not set |
1584 | |||
1585 | # | ||
1586 | # System on Chip audio support | ||
1587 | # | ||
1588 | # CONFIG_SND_SOC is not set | 1623 | # CONFIG_SND_SOC is not set |
1589 | |||
1590 | # | ||
1591 | # ALSA SoC audio for Freescale SOCs | ||
1592 | # | ||
1593 | |||
1594 | # | ||
1595 | # SoC Audio for the Texas Instruments OMAP | ||
1596 | # | ||
1597 | |||
1598 | # | ||
1599 | # Open Sound System | ||
1600 | # | ||
1601 | # CONFIG_SOUND_PRIME is not set | 1624 | # CONFIG_SOUND_PRIME is not set |
1602 | CONFIG_HID_SUPPORT=y | 1625 | CONFIG_HID_SUPPORT=y |
1603 | CONFIG_HID=y | 1626 | CONFIG_HID=y |
@@ -1633,6 +1656,7 @@ CONFIG_USB_DEVICEFS=y | |||
1633 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1656 | # CONFIG_USB_DYNAMIC_MINORS is not set |
1634 | CONFIG_USB_SUSPEND=y | 1657 | CONFIG_USB_SUSPEND=y |
1635 | # CONFIG_USB_OTG is not set | 1658 | # CONFIG_USB_OTG is not set |
1659 | CONFIG_USB_MON=y | ||
1636 | 1660 | ||
1637 | # | 1661 | # |
1638 | # USB Host Controller Drivers | 1662 | # USB Host Controller Drivers |
@@ -1656,6 +1680,7 @@ CONFIG_USB_UHCI_HCD=y | |||
1656 | # | 1680 | # |
1657 | # CONFIG_USB_ACM is not set | 1681 | # CONFIG_USB_ACM is not set |
1658 | CONFIG_USB_PRINTER=y | 1682 | CONFIG_USB_PRINTER=y |
1683 | # CONFIG_USB_WDM is not set | ||
1659 | 1684 | ||
1660 | # | 1685 | # |
1661 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1686 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
@@ -1677,6 +1702,7 @@ CONFIG_USB_STORAGE=y | |||
1677 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1702 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1678 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1703 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1679 | # CONFIG_USB_STORAGE_KARMA is not set | 1704 | # CONFIG_USB_STORAGE_KARMA is not set |
1705 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1680 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1706 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1681 | CONFIG_USB_LIBUSUAL=y | 1707 | CONFIG_USB_LIBUSUAL=y |
1682 | 1708 | ||
@@ -1685,7 +1711,6 @@ CONFIG_USB_LIBUSUAL=y | |||
1685 | # | 1711 | # |
1686 | # CONFIG_USB_MDC800 is not set | 1712 | # CONFIG_USB_MDC800 is not set |
1687 | # CONFIG_USB_MICROTEK is not set | 1713 | # CONFIG_USB_MICROTEK is not set |
1688 | CONFIG_USB_MON=y | ||
1689 | 1714 | ||
1690 | # | 1715 | # |
1691 | # USB port drivers | 1716 | # USB port drivers |
@@ -1698,7 +1723,6 @@ CONFIG_USB_MON=y | |||
1698 | # CONFIG_USB_EMI62 is not set | 1723 | # CONFIG_USB_EMI62 is not set |
1699 | # CONFIG_USB_EMI26 is not set | 1724 | # CONFIG_USB_EMI26 is not set |
1700 | # CONFIG_USB_ADUTUX is not set | 1725 | # CONFIG_USB_ADUTUX is not set |
1701 | # CONFIG_USB_AUERSWALD is not set | ||
1702 | # CONFIG_USB_RIO500 is not set | 1726 | # CONFIG_USB_RIO500 is not set |
1703 | # CONFIG_USB_LEGOTOWER is not set | 1727 | # CONFIG_USB_LEGOTOWER is not set |
1704 | # CONFIG_USB_LCD is not set | 1728 | # CONFIG_USB_LCD is not set |
@@ -1715,6 +1739,7 @@ CONFIG_USB_MON=y | |||
1715 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1739 | # CONFIG_USB_TRANCEVIBRATOR is not set |
1716 | # CONFIG_USB_IOWARRIOR is not set | 1740 | # CONFIG_USB_IOWARRIOR is not set |
1717 | # CONFIG_USB_TEST is not set | 1741 | # CONFIG_USB_TEST is not set |
1742 | # CONFIG_USB_ISIGHTFW is not set | ||
1718 | # CONFIG_USB_GADGET is not set | 1743 | # CONFIG_USB_GADGET is not set |
1719 | # CONFIG_MMC is not set | 1744 | # CONFIG_MMC is not set |
1720 | # CONFIG_MEMSTICK is not set | 1745 | # CONFIG_MEMSTICK is not set |
@@ -1724,7 +1749,9 @@ CONFIG_LEDS_CLASS=y | |||
1724 | # | 1749 | # |
1725 | # LED drivers | 1750 | # LED drivers |
1726 | # | 1751 | # |
1752 | # CONFIG_LEDS_PCA9532 is not set | ||
1727 | # CONFIG_LEDS_CLEVO_MAIL is not set | 1753 | # CONFIG_LEDS_CLEVO_MAIL is not set |
1754 | # CONFIG_LEDS_PCA955X is not set | ||
1728 | 1755 | ||
1729 | # | 1756 | # |
1730 | # LED Triggers | 1757 | # LED Triggers |
@@ -1770,6 +1797,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1770 | # CONFIG_RTC_DRV_PCF8583 is not set | 1797 | # CONFIG_RTC_DRV_PCF8583 is not set |
1771 | # CONFIG_RTC_DRV_M41T80 is not set | 1798 | # CONFIG_RTC_DRV_M41T80 is not set |
1772 | # CONFIG_RTC_DRV_S35390A is not set | 1799 | # CONFIG_RTC_DRV_S35390A is not set |
1800 | # CONFIG_RTC_DRV_FM3130 is not set | ||
1773 | 1801 | ||
1774 | # | 1802 | # |
1775 | # SPI RTC drivers | 1803 | # SPI RTC drivers |
@@ -1802,11 +1830,13 @@ CONFIG_DMADEVICES=y | |||
1802 | # Firmware Drivers | 1830 | # Firmware Drivers |
1803 | # | 1831 | # |
1804 | # CONFIG_EDD is not set | 1832 | # CONFIG_EDD is not set |
1833 | CONFIG_FIRMWARE_MEMMAP=y | ||
1805 | CONFIG_EFI_VARS=y | 1834 | CONFIG_EFI_VARS=y |
1806 | # CONFIG_DELL_RBU is not set | 1835 | # CONFIG_DELL_RBU is not set |
1807 | # CONFIG_DCDBAS is not set | 1836 | # CONFIG_DCDBAS is not set |
1808 | CONFIG_DMIID=y | 1837 | CONFIG_DMIID=y |
1809 | # CONFIG_ISCSI_IBFT_FIND is not set | 1838 | CONFIG_ISCSI_IBFT_FIND=y |
1839 | CONFIG_ISCSI_IBFT=y | ||
1810 | 1840 | ||
1811 | # | 1841 | # |
1812 | # File systems | 1842 | # File systems |
@@ -1886,14 +1916,27 @@ CONFIG_HUGETLB_PAGE=y | |||
1886 | # CONFIG_CRAMFS is not set | 1916 | # CONFIG_CRAMFS is not set |
1887 | # CONFIG_VXFS_FS is not set | 1917 | # CONFIG_VXFS_FS is not set |
1888 | # CONFIG_MINIX_FS is not set | 1918 | # CONFIG_MINIX_FS is not set |
1919 | # CONFIG_OMFS_FS is not set | ||
1889 | # CONFIG_HPFS_FS is not set | 1920 | # CONFIG_HPFS_FS is not set |
1890 | # CONFIG_QNX4FS_FS is not set | 1921 | # CONFIG_QNX4FS_FS is not set |
1891 | # CONFIG_ROMFS_FS is not set | 1922 | # CONFIG_ROMFS_FS is not set |
1892 | # CONFIG_SYSV_FS is not set | 1923 | # CONFIG_SYSV_FS is not set |
1893 | # CONFIG_UFS_FS is not set | 1924 | # CONFIG_UFS_FS is not set |
1894 | CONFIG_NETWORK_FILESYSTEMS=y | 1925 | CONFIG_NETWORK_FILESYSTEMS=y |
1895 | # CONFIG_NFS_FS is not set | 1926 | CONFIG_NFS_FS=y |
1927 | CONFIG_NFS_V3=y | ||
1928 | CONFIG_NFS_V3_ACL=y | ||
1929 | CONFIG_NFS_V4=y | ||
1930 | CONFIG_ROOT_NFS=y | ||
1896 | # CONFIG_NFSD is not set | 1931 | # CONFIG_NFSD is not set |
1932 | CONFIG_LOCKD=y | ||
1933 | CONFIG_LOCKD_V4=y | ||
1934 | CONFIG_NFS_ACL_SUPPORT=y | ||
1935 | CONFIG_NFS_COMMON=y | ||
1936 | CONFIG_SUNRPC=y | ||
1937 | CONFIG_SUNRPC_GSS=y | ||
1938 | CONFIG_RPCSEC_GSS_KRB5=y | ||
1939 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
1897 | # CONFIG_SMB_FS is not set | 1940 | # CONFIG_SMB_FS is not set |
1898 | # CONFIG_CIFS is not set | 1941 | # CONFIG_CIFS is not set |
1899 | # CONFIG_NCP_FS is not set | 1942 | # CONFIG_NCP_FS is not set |
@@ -1967,9 +2010,9 @@ CONFIG_NLS_UTF8=y | |||
1967 | # Kernel hacking | 2010 | # Kernel hacking |
1968 | # | 2011 | # |
1969 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2012 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
1970 | # CONFIG_PRINTK_TIME is not set | 2013 | CONFIG_PRINTK_TIME=y |
1971 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | 2014 | CONFIG_ENABLE_WARN_DEPRECATED=y |
1972 | # CONFIG_ENABLE_MUST_CHECK is not set | 2015 | CONFIG_ENABLE_MUST_CHECK=y |
1973 | CONFIG_FRAME_WARN=2048 | 2016 | CONFIG_FRAME_WARN=2048 |
1974 | CONFIG_MAGIC_SYSRQ=y | 2017 | CONFIG_MAGIC_SYSRQ=y |
1975 | # CONFIG_UNUSED_SYMBOLS is not set | 2018 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -1998,6 +2041,7 @@ CONFIG_DEBUG_BUGVERBOSE=y | |||
1998 | # CONFIG_DEBUG_INFO is not set | 2041 | # CONFIG_DEBUG_INFO is not set |
1999 | # CONFIG_DEBUG_VM is not set | 2042 | # CONFIG_DEBUG_VM is not set |
2000 | # CONFIG_DEBUG_WRITECOUNT is not set | 2043 | # CONFIG_DEBUG_WRITECOUNT is not set |
2044 | CONFIG_DEBUG_MEMORY_INIT=y | ||
2001 | # CONFIG_DEBUG_LIST is not set | 2045 | # CONFIG_DEBUG_LIST is not set |
2002 | # CONFIG_DEBUG_SG is not set | 2046 | # CONFIG_DEBUG_SG is not set |
2003 | CONFIG_FRAME_POINTER=y | 2047 | CONFIG_FRAME_POINTER=y |
@@ -2008,11 +2052,20 @@ CONFIG_FRAME_POINTER=y | |||
2008 | # CONFIG_LKDTM is not set | 2052 | # CONFIG_LKDTM is not set |
2009 | # CONFIG_FAULT_INJECTION is not set | 2053 | # CONFIG_FAULT_INJECTION is not set |
2010 | # CONFIG_LATENCYTOP is not set | 2054 | # CONFIG_LATENCYTOP is not set |
2055 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
2056 | CONFIG_HAVE_FTRACE=y | ||
2057 | CONFIG_HAVE_DYNAMIC_FTRACE=y | ||
2058 | # CONFIG_FTRACE is not set | ||
2059 | # CONFIG_IRQSOFF_TRACER is not set | ||
2060 | # CONFIG_SYSPROF_TRACER is not set | ||
2061 | # CONFIG_SCHED_TRACER is not set | ||
2062 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | ||
2011 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | 2063 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
2012 | # CONFIG_SAMPLES is not set | 2064 | # CONFIG_SAMPLES is not set |
2013 | # CONFIG_KGDB is not set | ||
2014 | CONFIG_HAVE_ARCH_KGDB=y | 2065 | CONFIG_HAVE_ARCH_KGDB=y |
2066 | # CONFIG_KGDB is not set | ||
2015 | # CONFIG_STRICT_DEVMEM is not set | 2067 | # CONFIG_STRICT_DEVMEM is not set |
2068 | CONFIG_X86_VERBOSE_BOOTUP=y | ||
2016 | CONFIG_EARLY_PRINTK=y | 2069 | CONFIG_EARLY_PRINTK=y |
2017 | CONFIG_DEBUG_STACKOVERFLOW=y | 2070 | CONFIG_DEBUG_STACKOVERFLOW=y |
2018 | CONFIG_DEBUG_STACK_USAGE=y | 2071 | CONFIG_DEBUG_STACK_USAGE=y |
@@ -2023,8 +2076,8 @@ CONFIG_DEBUG_RODATA=y | |||
2023 | # CONFIG_DIRECT_GBPAGES is not set | 2076 | # CONFIG_DIRECT_GBPAGES is not set |
2024 | # CONFIG_DEBUG_RODATA_TEST is not set | 2077 | # CONFIG_DEBUG_RODATA_TEST is not set |
2025 | CONFIG_DEBUG_NX_TEST=m | 2078 | CONFIG_DEBUG_NX_TEST=m |
2026 | CONFIG_X86_MPPARSE=y | ||
2027 | # CONFIG_IOMMU_DEBUG is not set | 2079 | # CONFIG_IOMMU_DEBUG is not set |
2080 | # CONFIG_MMIOTRACE is not set | ||
2028 | CONFIG_IO_DELAY_TYPE_0X80=0 | 2081 | CONFIG_IO_DELAY_TYPE_0X80=0 |
2029 | CONFIG_IO_DELAY_TYPE_0XED=1 | 2082 | CONFIG_IO_DELAY_TYPE_0XED=1 |
2030 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | 2083 | CONFIG_IO_DELAY_TYPE_UDELAY=2 |
@@ -2036,6 +2089,7 @@ CONFIG_IO_DELAY_0X80=y | |||
2036 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | 2089 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 |
2037 | CONFIG_DEBUG_BOOT_PARAMS=y | 2090 | CONFIG_DEBUG_BOOT_PARAMS=y |
2038 | # CONFIG_CPA_DEBUG is not set | 2091 | # CONFIG_CPA_DEBUG is not set |
2092 | # CONFIG_OPTIMIZE_INLINING is not set | ||
2039 | 2093 | ||
2040 | # | 2094 | # |
2041 | # Security options | 2095 | # Security options |
@@ -2045,7 +2099,6 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y | |||
2045 | CONFIG_SECURITY=y | 2099 | CONFIG_SECURITY=y |
2046 | CONFIG_SECURITY_NETWORK=y | 2100 | CONFIG_SECURITY_NETWORK=y |
2047 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 2101 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
2048 | CONFIG_SECURITY_CAPABILITIES=y | ||
2049 | CONFIG_SECURITY_FILE_CAPABILITIES=y | 2102 | CONFIG_SECURITY_FILE_CAPABILITIES=y |
2050 | # CONFIG_SECURITY_ROOTPLUG is not set | 2103 | # CONFIG_SECURITY_ROOTPLUG is not set |
2051 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | 2104 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 |
@@ -2106,6 +2159,10 @@ CONFIG_CRYPTO_HMAC=y | |||
2106 | # CONFIG_CRYPTO_MD4 is not set | 2159 | # CONFIG_CRYPTO_MD4 is not set |
2107 | CONFIG_CRYPTO_MD5=y | 2160 | CONFIG_CRYPTO_MD5=y |
2108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 2161 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
2162 | # CONFIG_CRYPTO_RMD128 is not set | ||
2163 | # CONFIG_CRYPTO_RMD160 is not set | ||
2164 | # CONFIG_CRYPTO_RMD256 is not set | ||
2165 | # CONFIG_CRYPTO_RMD320 is not set | ||
2109 | CONFIG_CRYPTO_SHA1=y | 2166 | CONFIG_CRYPTO_SHA1=y |
2110 | # CONFIG_CRYPTO_SHA256 is not set | 2167 | # CONFIG_CRYPTO_SHA256 is not set |
2111 | # CONFIG_CRYPTO_SHA512 is not set | 2168 | # CONFIG_CRYPTO_SHA512 is not set |
@@ -2155,6 +2212,7 @@ CONFIG_GENERIC_FIND_FIRST_BIT=y | |||
2155 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 2212 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
2156 | # CONFIG_CRC_CCITT is not set | 2213 | # CONFIG_CRC_CCITT is not set |
2157 | # CONFIG_CRC16 is not set | 2214 | # CONFIG_CRC16 is not set |
2215 | CONFIG_CRC_T10DIF=y | ||
2158 | # CONFIG_CRC_ITU_T is not set | 2216 | # CONFIG_CRC_ITU_T is not set |
2159 | CONFIG_CRC32=y | 2217 | CONFIG_CRC32=y |
2160 | # CONFIG_CRC7 is not set | 2218 | # CONFIG_CRC7 is not set |
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 14b11b3be31c..8e9cd6a8ec12 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c | |||
@@ -89,6 +89,8 @@ static ssize_t cpuid_read(struct file *file, char __user *buf, | |||
89 | struct cpuid_regs cmd; | 89 | struct cpuid_regs cmd; |
90 | int cpu = iminor(file->f_path.dentry->d_inode); | 90 | int cpu = iminor(file->f_path.dentry->d_inode); |
91 | u64 pos = *ppos; | 91 | u64 pos = *ppos; |
92 | ssize_t bytes = 0; | ||
93 | int err = 0; | ||
92 | 94 | ||
93 | if (count % 16) | 95 | if (count % 16) |
94 | return -EINVAL; /* Invalid chunk size */ | 96 | return -EINVAL; /* Invalid chunk size */ |
@@ -96,14 +98,19 @@ static ssize_t cpuid_read(struct file *file, char __user *buf, | |||
96 | for (; count; count -= 16) { | 98 | for (; count; count -= 16) { |
97 | cmd.eax = pos; | 99 | cmd.eax = pos; |
98 | cmd.ecx = pos >> 32; | 100 | cmd.ecx = pos >> 32; |
99 | smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1); | 101 | err = smp_call_function_single(cpu, cpuid_smp_cpuid, &cmd, 1); |
100 | if (copy_to_user(tmp, &cmd, 16)) | 102 | if (err) |
101 | return -EFAULT; | 103 | break; |
104 | if (copy_to_user(tmp, &cmd, 16)) { | ||
105 | err = -EFAULT; | ||
106 | break; | ||
107 | } | ||
102 | tmp += 16; | 108 | tmp += 16; |
109 | bytes += 16; | ||
103 | *ppos = ++pos; | 110 | *ppos = ++pos; |
104 | } | 111 | } |
105 | 112 | ||
106 | return tmp - buf; | 113 | return bytes ? bytes : err; |
107 | } | 114 | } |
108 | 115 | ||
109 | static int cpuid_open(struct inode *inode, struct file *file) | 116 | static int cpuid_open(struct inode *inode, struct file *file) |
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c index e43938086885..2e2af5d18191 100644 --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c | |||
@@ -72,21 +72,28 @@ static ssize_t msr_read(struct file *file, char __user *buf, | |||
72 | u32 data[2]; | 72 | u32 data[2]; |
73 | u32 reg = *ppos; | 73 | u32 reg = *ppos; |
74 | int cpu = iminor(file->f_path.dentry->d_inode); | 74 | int cpu = iminor(file->f_path.dentry->d_inode); |
75 | int err; | 75 | int err = 0; |
76 | ssize_t bytes = 0; | ||
76 | 77 | ||
77 | if (count % 8) | 78 | if (count % 8) |
78 | return -EINVAL; /* Invalid chunk size */ | 79 | return -EINVAL; /* Invalid chunk size */ |
79 | 80 | ||
80 | for (; count; count -= 8) { | 81 | for (; count; count -= 8) { |
81 | err = rdmsr_safe_on_cpu(cpu, reg, &data[0], &data[1]); | 82 | err = rdmsr_safe_on_cpu(cpu, reg, &data[0], &data[1]); |
82 | if (err) | 83 | if (err) { |
83 | return -EIO; | 84 | if (err == -EFAULT) /* Fix idiotic error code */ |
84 | if (copy_to_user(tmp, &data, 8)) | 85 | err = -EIO; |
85 | return -EFAULT; | 86 | break; |
87 | } | ||
88 | if (copy_to_user(tmp, &data, 8)) { | ||
89 | err = -EFAULT; | ||
90 | break; | ||
91 | } | ||
86 | tmp += 2; | 92 | tmp += 2; |
93 | bytes += 8; | ||
87 | } | 94 | } |
88 | 95 | ||
89 | return ((char __user *)tmp) - buf; | 96 | return bytes ? bytes : err; |
90 | } | 97 | } |
91 | 98 | ||
92 | static ssize_t msr_write(struct file *file, const char __user *buf, | 99 | static ssize_t msr_write(struct file *file, const char __user *buf, |
@@ -96,21 +103,28 @@ static ssize_t msr_write(struct file *file, const char __user *buf, | |||
96 | u32 data[2]; | 103 | u32 data[2]; |
97 | u32 reg = *ppos; | 104 | u32 reg = *ppos; |
98 | int cpu = iminor(file->f_path.dentry->d_inode); | 105 | int cpu = iminor(file->f_path.dentry->d_inode); |
99 | int err; | 106 | int err = 0; |
107 | ssize_t bytes = 0; | ||
100 | 108 | ||
101 | if (count % 8) | 109 | if (count % 8) |
102 | return -EINVAL; /* Invalid chunk size */ | 110 | return -EINVAL; /* Invalid chunk size */ |
103 | 111 | ||
104 | for (; count; count -= 8) { | 112 | for (; count; count -= 8) { |
105 | if (copy_from_user(&data, tmp, 8)) | 113 | if (copy_from_user(&data, tmp, 8)) { |
106 | return -EFAULT; | 114 | err = -EFAULT; |
115 | break; | ||
116 | } | ||
107 | err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]); | 117 | err = wrmsr_safe_on_cpu(cpu, reg, data[0], data[1]); |
108 | if (err) | 118 | if (err) { |
109 | return -EIO; | 119 | if (err == -EFAULT) /* Fix idiotic error code */ |
120 | err = -EIO; | ||
121 | break; | ||
122 | } | ||
110 | tmp += 2; | 123 | tmp += 2; |
124 | bytes += 8; | ||
111 | } | 125 | } |
112 | 126 | ||
113 | return ((char __user *)tmp) - buf; | 127 | return bytes ? bytes : err; |
114 | } | 128 | } |
115 | 129 | ||
116 | static int msr_open(struct inode *inode, struct file *file) | 130 | static int msr_open(struct inode *inode, struct file *file) |
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 8e786b0d665a..ac79bd143da8 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
@@ -127,75 +127,202 @@ static u64 tsc_read_refs(u64 *pm, u64 *hpet) | |||
127 | */ | 127 | */ |
128 | unsigned long native_calibrate_tsc(void) | 128 | unsigned long native_calibrate_tsc(void) |
129 | { | 129 | { |
130 | unsigned long flags; | 130 | u64 tsc1, tsc2, tr1, tr2, tsc, delta, pm1, pm2, hpet1, hpet2; |
131 | u64 tsc1, tsc2, tr1, tr2, delta, pm1, pm2, hpet1, hpet2; | 131 | unsigned long tsc_pit_min = ULONG_MAX, tsc_ref_min = ULONG_MAX; |
132 | int hpet = is_hpet_enabled(); | 132 | unsigned long flags, tscmin, tscmax; |
133 | unsigned int tsc_khz_val = 0; | 133 | int hpet = is_hpet_enabled(), pitcnt, i; |
134 | 134 | ||
135 | local_irq_save(flags); | 135 | /* |
136 | 136 | * Run 5 calibration loops to get the lowest frequency value | |
137 | tsc1 = tsc_read_refs(&pm1, hpet ? &hpet1 : NULL); | 137 | * (the best estimate). We use two different calibration modes |
138 | 138 | * here: | |
139 | outb((inb(0x61) & ~0x02) | 0x01, 0x61); | 139 | * |
140 | 140 | * 1) PIT loop. We set the PIT Channel 2 to oneshot mode and | |
141 | outb(0xb0, 0x43); | 141 | * load a timeout of 50ms. We read the time right after we |
142 | outb((CLOCK_TICK_RATE / (1000 / 50)) & 0xff, 0x42); | 142 | * started the timer and wait until the PIT count down reaches |
143 | outb((CLOCK_TICK_RATE / (1000 / 50)) >> 8, 0x42); | 143 | * zero. In each wait loop iteration we read the TSC and check |
144 | tr1 = get_cycles(); | 144 | * the delta to the previous read. We keep track of the min |
145 | while ((inb(0x61) & 0x20) == 0); | 145 | * and max values of that delta. The delta is mostly defined |
146 | tr2 = get_cycles(); | 146 | * by the IO time of the PIT access, so we can detect when a |
147 | 147 | * SMI/SMM disturbance happend between the two reads. If the | |
148 | tsc2 = tsc_read_refs(&pm2, hpet ? &hpet2 : NULL); | 148 | * maximum time is significantly larger than the minimum time, |
149 | 149 | * then we discard the result and have another try. | |
150 | local_irq_restore(flags); | 150 | * |
151 | * 2) Reference counter. If available we use the HPET or the | ||
152 | * PMTIMER as a reference to check the sanity of that value. | ||
153 | * We use separate TSC readouts and check inside of the | ||
154 | * reference read for a SMI/SMM disturbance. We dicard | ||
155 | * disturbed values here as well. We do that around the PIT | ||
156 | * calibration delay loop as we have to wait for a certain | ||
157 | * amount of time anyway. | ||
158 | */ | ||
159 | for (i = 0; i < 5; i++) { | ||
160 | |||
161 | tscmin = ULONG_MAX; | ||
162 | tscmax = 0; | ||
163 | pitcnt = 0; | ||
164 | |||
165 | local_irq_save(flags); | ||
166 | |||
167 | /* | ||
168 | * Read the start value and the reference count of | ||
169 | * hpet/pmtimer when available: | ||
170 | */ | ||
171 | tsc1 = tsc_read_refs(&pm1, hpet ? &hpet1 : NULL); | ||
172 | |||
173 | /* Set the Gate high, disable speaker */ | ||
174 | outb((inb(0x61) & ~0x02) | 0x01, 0x61); | ||
175 | |||
176 | /* | ||
177 | * Setup CTC channel 2* for mode 0, (interrupt on terminal | ||
178 | * count mode), binary count. Set the latch register to 50ms | ||
179 | * (LSB then MSB) to begin countdown. | ||
180 | * | ||
181 | * Some devices need a delay here. | ||
182 | */ | ||
183 | outb(0xb0, 0x43); | ||
184 | outb((CLOCK_TICK_RATE / (1000 / 50)) & 0xff, 0x42); | ||
185 | outb((CLOCK_TICK_RATE / (1000 / 50)) >> 8, 0x42); | ||
186 | |||
187 | tsc = tr1 = tr2 = get_cycles(); | ||
188 | |||
189 | while ((inb(0x61) & 0x20) == 0) { | ||
190 | tr2 = get_cycles(); | ||
191 | delta = tr2 - tsc; | ||
192 | tsc = tr2; | ||
193 | if ((unsigned int) delta < tscmin) | ||
194 | tscmin = (unsigned int) delta; | ||
195 | if ((unsigned int) delta > tscmax) | ||
196 | tscmax = (unsigned int) delta; | ||
197 | pitcnt++; | ||
198 | } | ||
199 | |||
200 | /* | ||
201 | * We waited at least 50ms above. Now read | ||
202 | * pmtimer/hpet reference again | ||
203 | */ | ||
204 | tsc2 = tsc_read_refs(&pm2, hpet ? &hpet2 : NULL); | ||
205 | |||
206 | local_irq_restore(flags); | ||
207 | |||
208 | /* | ||
209 | * Sanity checks: | ||
210 | * | ||
211 | * If we were not able to read the PIT more than 5000 | ||
212 | * times, then we have been hit by a massive SMI | ||
213 | * | ||
214 | * If the maximum is 10 times larger than the minimum, | ||
215 | * then we got hit by an SMI as well. | ||
216 | */ | ||
217 | if (pitcnt > 5000 && tscmax < 10 * tscmin) { | ||
218 | |||
219 | /* Calculate the PIT value */ | ||
220 | delta = tr2 - tr1; | ||
221 | do_div(delta, 50); | ||
222 | |||
223 | /* We take the smallest value into account */ | ||
224 | tsc_pit_min = min(tsc_pit_min, (unsigned long) delta); | ||
225 | } | ||
226 | |||
227 | /* hpet or pmtimer available ? */ | ||
228 | if (!hpet && !pm1 && !pm2) | ||
229 | continue; | ||
230 | |||
231 | /* Check, whether the sampling was disturbed by an SMI */ | ||
232 | if (tsc1 == ULLONG_MAX || tsc2 == ULLONG_MAX) | ||
233 | continue; | ||
234 | |||
235 | tsc2 = (tsc2 - tsc1) * 1000000LL; | ||
236 | |||
237 | if (hpet) { | ||
238 | if (hpet2 < hpet1) | ||
239 | hpet2 += 0x100000000ULL; | ||
240 | hpet2 -= hpet1; | ||
241 | tsc1 = ((u64)hpet2 * hpet_readl(HPET_PERIOD)); | ||
242 | do_div(tsc1, 1000000); | ||
243 | } else { | ||
244 | if (pm2 < pm1) | ||
245 | pm2 += (u64)ACPI_PM_OVRRUN; | ||
246 | pm2 -= pm1; | ||
247 | tsc1 = pm2 * 1000000000LL; | ||
248 | do_div(tsc1, PMTMR_TICKS_PER_SEC); | ||
249 | } | ||
250 | |||
251 | do_div(tsc2, tsc1); | ||
252 | tsc_ref_min = min(tsc_ref_min, (unsigned long) tsc2); | ||
253 | } | ||
151 | 254 | ||
152 | /* | 255 | /* |
153 | * Preset the result with the raw and inaccurate PIT | 256 | * Now check the results. |
154 | * calibration value | ||
155 | */ | 257 | */ |
156 | delta = (tr2 - tr1); | 258 | if (tsc_pit_min == ULONG_MAX) { |
157 | do_div(delta, 50); | 259 | /* PIT gave no useful value */ |
158 | tsc_khz_val = delta; | 260 | printk(KERN_WARNING "TSC: PIT calibration failed due to " |
261 | "SMI disturbance.\n"); | ||
262 | |||
263 | /* We don't have an alternative source, disable TSC */ | ||
264 | if (!hpet && !pm1 && !pm2) { | ||
265 | printk("TSC: No reference (HPET/PMTIMER) available\n"); | ||
266 | return 0; | ||
267 | } | ||
268 | |||
269 | /* The alternative source failed as well, disable TSC */ | ||
270 | if (tsc_ref_min == ULONG_MAX) { | ||
271 | printk(KERN_WARNING "TSC: HPET/PMTIMER calibration " | ||
272 | "failed due to SMI disturbance.\n"); | ||
273 | return 0; | ||
274 | } | ||
275 | |||
276 | /* Use the alternative source */ | ||
277 | printk(KERN_INFO "TSC: using %s reference calibration\n", | ||
278 | hpet ? "HPET" : "PMTIMER"); | ||
279 | |||
280 | return tsc_ref_min; | ||
281 | } | ||
159 | 282 | ||
160 | /* hpet or pmtimer available ? */ | 283 | /* We don't have an alternative source, use the PIT calibration value */ |
161 | if (!hpet && !pm1 && !pm2) { | 284 | if (!hpet && !pm1 && !pm2) { |
162 | printk(KERN_INFO "TSC calibrated against PIT\n"); | 285 | printk(KERN_INFO "TSC: Using PIT calibration value\n"); |
163 | goto out; | 286 | return tsc_pit_min; |
164 | } | 287 | } |
165 | 288 | ||
166 | /* Check, whether the sampling was disturbed by an SMI */ | 289 | /* The alternative source failed, use the PIT calibration value */ |
167 | if (tsc1 == ULLONG_MAX || tsc2 == ULLONG_MAX) { | 290 | if (tsc_ref_min == ULONG_MAX) { |
168 | printk(KERN_WARNING "TSC calibration disturbed by SMI, " | 291 | printk(KERN_WARNING "TSC: HPET/PMTIMER calibration failed due " |
169 | "using PIT calibration result\n"); | 292 | "to SMI disturbance. Using PIT calibration\n"); |
170 | goto out; | 293 | return tsc_pit_min; |
171 | } | 294 | } |
172 | 295 | ||
173 | tsc2 = (tsc2 - tsc1) * 1000000LL; | 296 | /* Check the reference deviation */ |
174 | 297 | delta = ((u64) tsc_pit_min) * 100; | |
175 | if (hpet) { | 298 | do_div(delta, tsc_ref_min); |
176 | printk(KERN_INFO "TSC calibrated against HPET\n"); | 299 | |
177 | if (hpet2 < hpet1) | 300 | /* |
178 | hpet2 += 0x100000000ULL; | 301 | * If both calibration results are inside a 5% window, the we |
179 | hpet2 -= hpet1; | 302 | * use the lower frequency of those as it is probably the |
180 | tsc1 = ((u64)hpet2 * hpet_readl(HPET_PERIOD)); | 303 | * closest estimate. |
181 | do_div(tsc1, 1000000); | 304 | */ |
182 | } else { | 305 | if (delta >= 95 && delta <= 105) { |
183 | printk(KERN_INFO "TSC calibrated against PM_TIMER\n"); | 306 | printk(KERN_INFO "TSC: PIT calibration confirmed by %s.\n", |
184 | if (pm2 < pm1) | 307 | hpet ? "HPET" : "PMTIMER"); |
185 | pm2 += (u64)ACPI_PM_OVRRUN; | 308 | printk(KERN_INFO "TSC: using %s calibration value\n", |
186 | pm2 -= pm1; | 309 | tsc_pit_min <= tsc_ref_min ? "PIT" : |
187 | tsc1 = pm2 * 1000000000LL; | 310 | hpet ? "HPET" : "PMTIMER"); |
188 | do_div(tsc1, PMTMR_TICKS_PER_SEC); | 311 | return tsc_pit_min <= tsc_ref_min ? tsc_pit_min : tsc_ref_min; |
189 | } | 312 | } |
190 | 313 | ||
191 | do_div(tsc2, tsc1); | 314 | printk(KERN_WARNING "TSC: PIT calibration deviates from %s: %lu %lu.\n", |
192 | tsc_khz_val = tsc2; | 315 | hpet ? "HPET" : "PMTIMER", tsc_pit_min, tsc_ref_min); |
193 | 316 | ||
194 | out: | 317 | /* |
195 | return tsc_khz_val; | 318 | * The calibration values differ too much. In doubt, we use |
319 | * the PIT value as we know that there are PMTIMERs around | ||
320 | * running at double speed. | ||
321 | */ | ||
322 | printk(KERN_INFO "TSC: Using PIT calibration value\n"); | ||
323 | return tsc_pit_min; | ||
196 | } | 324 | } |
197 | 325 | ||
198 | |||
199 | #ifdef CONFIG_X86_32 | 326 | #ifdef CONFIG_X86_32 |
200 | /* Only called from the Powernow K7 cpu freq driver */ | 327 | /* Only called from the Powernow K7 cpu freq driver */ |
201 | int recalibrate_cpu_khz(void) | 328 | int recalibrate_cpu_khz(void) |
diff --git a/arch/x86/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c index d5a2b39f882b..01b868ba82f8 100644 --- a/arch/x86/lib/msr-on-cpu.c +++ b/arch/x86/lib/msr-on-cpu.c | |||
@@ -30,10 +30,11 @@ static int _rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h, int safe) | |||
30 | 30 | ||
31 | rv.msr_no = msr_no; | 31 | rv.msr_no = msr_no; |
32 | if (safe) { | 32 | if (safe) { |
33 | smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 1); | 33 | err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu, |
34 | err = rv.err; | 34 | &rv, 1); |
35 | err = err ? err : rv.err; | ||
35 | } else { | 36 | } else { |
36 | smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1); | 37 | err = smp_call_function_single(cpu, __rdmsr_on_cpu, &rv, 1); |
37 | } | 38 | } |
38 | *l = rv.l; | 39 | *l = rv.l; |
39 | *h = rv.h; | 40 | *h = rv.h; |
@@ -64,23 +65,24 @@ static int _wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h, int safe) | |||
64 | rv.l = l; | 65 | rv.l = l; |
65 | rv.h = h; | 66 | rv.h = h; |
66 | if (safe) { | 67 | if (safe) { |
67 | smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 1); | 68 | err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu, |
68 | err = rv.err; | 69 | &rv, 1); |
70 | err = err ? err : rv.err; | ||
69 | } else { | 71 | } else { |
70 | smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1); | 72 | err = smp_call_function_single(cpu, __wrmsr_on_cpu, &rv, 1); |
71 | } | 73 | } |
72 | 74 | ||
73 | return err; | 75 | return err; |
74 | } | 76 | } |
75 | 77 | ||
76 | void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | 78 | int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) |
77 | { | 79 | { |
78 | _wrmsr_on_cpu(cpu, msr_no, l, h, 0); | 80 | return _wrmsr_on_cpu(cpu, msr_no, l, h, 0); |
79 | } | 81 | } |
80 | 82 | ||
81 | void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) | 83 | int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) |
82 | { | 84 | { |
83 | _rdmsr_on_cpu(cpu, msr_no, l, h, 0); | 85 | return _rdmsr_on_cpu(cpu, msr_no, l, h, 0); |
84 | } | 86 | } |
85 | 87 | ||
86 | /* These "safe" variants are slower and should be used when the target MSR | 88 | /* These "safe" variants are slower and should be used when the target MSR |
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index d765da913842..8791fc55e715 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c | |||
@@ -31,11 +31,8 @@ | |||
31 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
33 | #include <linux/bootmem.h> | 33 | #include <linux/bootmem.h> |
34 | #include <linux/acpi.h> | ||
35 | 34 | ||
36 | #include <asm/pat.h> | 35 | #include <asm/pat.h> |
37 | #include <asm/hpet.h> | ||
38 | #include <asm/io_apic.h> | ||
39 | 36 | ||
40 | #include "pci.h" | 37 | #include "pci.h" |
41 | 38 | ||
@@ -80,77 +77,6 @@ pcibios_align_resource(void *data, struct resource *res, | |||
80 | } | 77 | } |
81 | EXPORT_SYMBOL(pcibios_align_resource); | 78 | EXPORT_SYMBOL(pcibios_align_resource); |
82 | 79 | ||
83 | static int check_res_with_valid(struct pci_dev *dev, struct resource *res) | ||
84 | { | ||
85 | unsigned long base; | ||
86 | unsigned long size; | ||
87 | int i; | ||
88 | |||
89 | base = res->start; | ||
90 | size = (res->start == 0 && res->end == res->start) ? 0 : | ||
91 | (res->end - res->start + 1); | ||
92 | |||
93 | if (!base || !size) | ||
94 | return 0; | ||
95 | |||
96 | #ifdef CONFIG_HPET_TIMER | ||
97 | /* for hpet */ | ||
98 | if (base == hpet_address && (res->flags & IORESOURCE_MEM)) { | ||
99 | dev_info(&dev->dev, "BAR has HPET at %08lx-%08lx\n", | ||
100 | base, base + size - 1); | ||
101 | return 1; | ||
102 | } | ||
103 | #endif | ||
104 | |||
105 | #ifdef CONFIG_X86_IO_APIC | ||
106 | for (i = 0; i < nr_ioapics; i++) { | ||
107 | unsigned long ioapic_phys = mp_ioapics[i].mp_apicaddr; | ||
108 | |||
109 | if (base == ioapic_phys && (res->flags & IORESOURCE_MEM)) { | ||
110 | dev_info(&dev->dev, "BAR has ioapic at %08lx-%08lx\n", | ||
111 | base, base + size - 1); | ||
112 | return 1; | ||
113 | } | ||
114 | } | ||
115 | #endif | ||
116 | |||
117 | #ifdef CONFIG_PCI_MMCONFIG | ||
118 | for (i = 0; i < pci_mmcfg_config_num; i++) { | ||
119 | unsigned long addr; | ||
120 | |||
121 | addr = pci_mmcfg_config[i].address; | ||
122 | if (base == addr && (res->flags & IORESOURCE_MEM)) { | ||
123 | dev_info(&dev->dev, "BAR has MMCONFIG at %08lx-%08lx\n", | ||
124 | base, base + size - 1); | ||
125 | return 1; | ||
126 | } | ||
127 | } | ||
128 | #endif | ||
129 | |||
130 | return 0; | ||
131 | } | ||
132 | |||
133 | static int check_platform(struct pci_dev *dev, struct resource *res) | ||
134 | { | ||
135 | struct resource *root = NULL; | ||
136 | |||
137 | /* | ||
138 | * forcibly insert it into the | ||
139 | * resource tree | ||
140 | */ | ||
141 | if (res->flags & IORESOURCE_MEM) | ||
142 | root = &iomem_resource; | ||
143 | else if (res->flags & IORESOURCE_IO) | ||
144 | root = &ioport_resource; | ||
145 | |||
146 | if (root && check_res_with_valid(dev, res)) { | ||
147 | insert_resource(root, res); | ||
148 | |||
149 | return 1; | ||
150 | } | ||
151 | |||
152 | return 0; | ||
153 | } | ||
154 | /* | 80 | /* |
155 | * Handle resources of PCI devices. If the world were perfect, we could | 81 | * Handle resources of PCI devices. If the world were perfect, we could |
156 | * just allocate all the resource regions and do nothing more. It isn't. | 82 | * just allocate all the resource regions and do nothing more. It isn't. |
@@ -202,10 +128,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) | |||
202 | pr = pci_find_parent_resource(dev, r); | 128 | pr = pci_find_parent_resource(dev, r); |
203 | if (!r->start || !pr || | 129 | if (!r->start || !pr || |
204 | request_resource(pr, r) < 0) { | 130 | request_resource(pr, r) < 0) { |
205 | if (check_platform(dev, r)) | 131 | dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); |
206 | continue; | ||
207 | dev_err(&dev->dev, "BAR %d: can't " | ||
208 | "allocate resource\n", idx); | ||
209 | /* | 132 | /* |
210 | * Something is wrong with the region. | 133 | * Something is wrong with the region. |
211 | * Invalidate the resource to prevent | 134 | * Invalidate the resource to prevent |
@@ -240,17 +163,13 @@ static void __init pcibios_allocate_resources(int pass) | |||
240 | else | 163 | else |
241 | disabled = !(command & PCI_COMMAND_MEMORY); | 164 | disabled = !(command & PCI_COMMAND_MEMORY); |
242 | if (pass == disabled) { | 165 | if (pass == disabled) { |
243 | dev_dbg(&dev->dev, "resource %#08llx-%#08llx " | 166 | dev_dbg(&dev->dev, "resource %#08llx-%#08llx (f=%lx, d=%d, p=%d)\n", |
244 | "(f=%lx, d=%d, p=%d)\n", | ||
245 | (unsigned long long) r->start, | 167 | (unsigned long long) r->start, |
246 | (unsigned long long) r->end, | 168 | (unsigned long long) r->end, |
247 | r->flags, disabled, pass); | 169 | r->flags, disabled, pass); |
248 | pr = pci_find_parent_resource(dev, r); | 170 | pr = pci_find_parent_resource(dev, r); |
249 | if (!pr || request_resource(pr, r) < 0) { | 171 | if (!pr || request_resource(pr, r) < 0) { |
250 | if (check_platform(dev, r)) | 172 | dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); |
251 | continue; | ||
252 | dev_err(&dev->dev, "BAR %d: can't " | ||
253 | "allocate resource\n", idx); | ||
254 | /* We'll assign a new address later */ | 173 | /* We'll assign a new address later */ |
255 | r->end -= r->start; | 174 | r->end -= r->start; |
256 | r->start = 0; | 175 | r->start = 0; |
diff --git a/block/blk-core.c b/block/blk-core.c index 4889eb86a39e..2cba5ef97b2b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -582,6 +582,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) | |||
582 | 582 | ||
583 | q->sg_reserved_size = INT_MAX; | 583 | q->sg_reserved_size = INT_MAX; |
584 | 584 | ||
585 | blk_set_cmd_filter_defaults(&q->cmd_filter); | ||
586 | |||
585 | /* | 587 | /* |
586 | * all done | 588 | * all done |
587 | */ | 589 | */ |
diff --git a/block/blk-tag.c b/block/blk-tag.c index 32667beb03ee..ed5166fbc599 100644 --- a/block/blk-tag.c +++ b/block/blk-tag.c | |||
@@ -38,7 +38,8 @@ static int __blk_free_tags(struct blk_queue_tag *bqt) | |||
38 | 38 | ||
39 | retval = atomic_dec_and_test(&bqt->refcnt); | 39 | retval = atomic_dec_and_test(&bqt->refcnt); |
40 | if (retval) { | 40 | if (retval) { |
41 | BUG_ON(bqt->busy); | 41 | BUG_ON(find_first_bit(bqt->tag_map, bqt->max_depth) < |
42 | bqt->max_depth); | ||
42 | 43 | ||
43 | kfree(bqt->tag_index); | 44 | kfree(bqt->tag_index); |
44 | bqt->tag_index = NULL; | 45 | bqt->tag_index = NULL; |
@@ -147,7 +148,6 @@ static struct blk_queue_tag *__blk_queue_init_tags(struct request_queue *q, | |||
147 | if (init_tag_map(q, tags, depth)) | 148 | if (init_tag_map(q, tags, depth)) |
148 | goto fail; | 149 | goto fail; |
149 | 150 | ||
150 | tags->busy = 0; | ||
151 | atomic_set(&tags->refcnt, 1); | 151 | atomic_set(&tags->refcnt, 1); |
152 | return tags; | 152 | return tags; |
153 | fail: | 153 | fail: |
@@ -313,7 +313,6 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq) | |||
313 | * unlock memory barrier semantics. | 313 | * unlock memory barrier semantics. |
314 | */ | 314 | */ |
315 | clear_bit_unlock(tag, bqt->tag_map); | 315 | clear_bit_unlock(tag, bqt->tag_map); |
316 | bqt->busy--; | ||
317 | } | 316 | } |
318 | EXPORT_SYMBOL(blk_queue_end_tag); | 317 | EXPORT_SYMBOL(blk_queue_end_tag); |
319 | 318 | ||
@@ -368,7 +367,6 @@ int blk_queue_start_tag(struct request_queue *q, struct request *rq) | |||
368 | bqt->tag_index[tag] = rq; | 367 | bqt->tag_index[tag] = rq; |
369 | blkdev_dequeue_request(rq); | 368 | blkdev_dequeue_request(rq); |
370 | list_add(&rq->queuelist, &q->tag_busy_list); | 369 | list_add(&rq->queuelist, &q->tag_busy_list); |
371 | bqt->busy++; | ||
372 | return 0; | 370 | return 0; |
373 | } | 371 | } |
374 | EXPORT_SYMBOL(blk_queue_start_tag); | 372 | EXPORT_SYMBOL(blk_queue_start_tag); |
diff --git a/block/bsg.c b/block/bsg.c index 5a68b09a69ba..0aae8d7ba99c 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
@@ -45,8 +45,6 @@ struct bsg_device { | |||
45 | char name[BUS_ID_SIZE]; | 45 | char name[BUS_ID_SIZE]; |
46 | int max_queue; | 46 | int max_queue; |
47 | unsigned long flags; | 47 | unsigned long flags; |
48 | struct blk_scsi_cmd_filter *cmd_filter; | ||
49 | mode_t *f_mode; | ||
50 | }; | 48 | }; |
51 | 49 | ||
52 | enum { | 50 | enum { |
@@ -174,7 +172,8 @@ unlock: | |||
174 | } | 172 | } |
175 | 173 | ||
176 | static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, | 174 | static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, |
177 | struct sg_io_v4 *hdr, struct bsg_device *bd) | 175 | struct sg_io_v4 *hdr, struct bsg_device *bd, |
176 | int has_write_perm) | ||
178 | { | 177 | { |
179 | if (hdr->request_len > BLK_MAX_CDB) { | 178 | if (hdr->request_len > BLK_MAX_CDB) { |
180 | rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL); | 179 | rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL); |
@@ -187,8 +186,7 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq, | |||
187 | return -EFAULT; | 186 | return -EFAULT; |
188 | 187 | ||
189 | if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { | 188 | if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) { |
190 | if (blk_cmd_filter_verify_command(bd->cmd_filter, rq->cmd, | 189 | if (blk_verify_command(&q->cmd_filter, rq->cmd, has_write_perm)) |
191 | bd->f_mode)) | ||
192 | return -EPERM; | 190 | return -EPERM; |
193 | } else if (!capable(CAP_SYS_RAWIO)) | 191 | } else if (!capable(CAP_SYS_RAWIO)) |
194 | return -EPERM; | 192 | return -EPERM; |
@@ -244,7 +242,7 @@ bsg_validate_sgv4_hdr(struct request_queue *q, struct sg_io_v4 *hdr, int *rw) | |||
244 | * map sg_io_v4 to a request. | 242 | * map sg_io_v4 to a request. |
245 | */ | 243 | */ |
246 | static struct request * | 244 | static struct request * |
247 | bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) | 245 | bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, int has_write_perm) |
248 | { | 246 | { |
249 | struct request_queue *q = bd->queue; | 247 | struct request_queue *q = bd->queue; |
250 | struct request *rq, *next_rq = NULL; | 248 | struct request *rq, *next_rq = NULL; |
@@ -266,7 +264,7 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) | |||
266 | rq = blk_get_request(q, rw, GFP_KERNEL); | 264 | rq = blk_get_request(q, rw, GFP_KERNEL); |
267 | if (!rq) | 265 | if (!rq) |
268 | return ERR_PTR(-ENOMEM); | 266 | return ERR_PTR(-ENOMEM); |
269 | ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd); | 267 | ret = blk_fill_sgv4_hdr_rq(q, rq, hdr, bd, has_write_perm); |
270 | if (ret) | 268 | if (ret) |
271 | goto out; | 269 | goto out; |
272 | 270 | ||
@@ -568,25 +566,6 @@ static inline void bsg_set_block(struct bsg_device *bd, struct file *file) | |||
568 | set_bit(BSG_F_BLOCK, &bd->flags); | 566 | set_bit(BSG_F_BLOCK, &bd->flags); |
569 | } | 567 | } |
570 | 568 | ||
571 | static void bsg_set_cmd_filter(struct bsg_device *bd, | ||
572 | struct file *file) | ||
573 | { | ||
574 | struct inode *inode; | ||
575 | struct gendisk *disk; | ||
576 | |||
577 | if (!file) | ||
578 | return; | ||
579 | |||
580 | inode = file->f_dentry->d_inode; | ||
581 | if (!inode) | ||
582 | return; | ||
583 | |||
584 | disk = inode->i_bdev->bd_disk; | ||
585 | |||
586 | bd->cmd_filter = &disk->cmd_filter; | ||
587 | bd->f_mode = &file->f_mode; | ||
588 | } | ||
589 | |||
590 | /* | 569 | /* |
591 | * Check if the error is a "real" error that we should return. | 570 | * Check if the error is a "real" error that we should return. |
592 | */ | 571 | */ |
@@ -608,7 +587,6 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | |||
608 | dprintk("%s: read %Zd bytes\n", bd->name, count); | 587 | dprintk("%s: read %Zd bytes\n", bd->name, count); |
609 | 588 | ||
610 | bsg_set_block(bd, file); | 589 | bsg_set_block(bd, file); |
611 | bsg_set_cmd_filter(bd, file); | ||
612 | 590 | ||
613 | bytes_read = 0; | 591 | bytes_read = 0; |
614 | ret = __bsg_read(buf, count, bd, NULL, &bytes_read); | 592 | ret = __bsg_read(buf, count, bd, NULL, &bytes_read); |
@@ -621,7 +599,7 @@ bsg_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) | |||
621 | } | 599 | } |
622 | 600 | ||
623 | static int __bsg_write(struct bsg_device *bd, const char __user *buf, | 601 | static int __bsg_write(struct bsg_device *bd, const char __user *buf, |
624 | size_t count, ssize_t *bytes_written) | 602 | size_t count, ssize_t *bytes_written, int has_write_perm) |
625 | { | 603 | { |
626 | struct bsg_command *bc; | 604 | struct bsg_command *bc; |
627 | struct request *rq; | 605 | struct request *rq; |
@@ -652,7 +630,7 @@ static int __bsg_write(struct bsg_device *bd, const char __user *buf, | |||
652 | /* | 630 | /* |
653 | * get a request, fill in the blanks, and add to request queue | 631 | * get a request, fill in the blanks, and add to request queue |
654 | */ | 632 | */ |
655 | rq = bsg_map_hdr(bd, &bc->hdr); | 633 | rq = bsg_map_hdr(bd, &bc->hdr, has_write_perm); |
656 | if (IS_ERR(rq)) { | 634 | if (IS_ERR(rq)) { |
657 | ret = PTR_ERR(rq); | 635 | ret = PTR_ERR(rq); |
658 | rq = NULL; | 636 | rq = NULL; |
@@ -683,10 +661,11 @@ bsg_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) | |||
683 | dprintk("%s: write %Zd bytes\n", bd->name, count); | 661 | dprintk("%s: write %Zd bytes\n", bd->name, count); |
684 | 662 | ||
685 | bsg_set_block(bd, file); | 663 | bsg_set_block(bd, file); |
686 | bsg_set_cmd_filter(bd, file); | ||
687 | 664 | ||
688 | bytes_written = 0; | 665 | bytes_written = 0; |
689 | ret = __bsg_write(bd, buf, count, &bytes_written); | 666 | ret = __bsg_write(bd, buf, count, &bytes_written, |
667 | file->f_mode & FMODE_WRITE); | ||
668 | |||
690 | *ppos = bytes_written; | 669 | *ppos = bytes_written; |
691 | 670 | ||
692 | /* | 671 | /* |
@@ -792,7 +771,6 @@ static struct bsg_device *bsg_add_device(struct inode *inode, | |||
792 | bd->queue = rq; | 771 | bd->queue = rq; |
793 | 772 | ||
794 | bsg_set_block(bd, file); | 773 | bsg_set_block(bd, file); |
795 | bsg_set_cmd_filter(bd, file); | ||
796 | 774 | ||
797 | atomic_set(&bd->ref_count, 1); | 775 | atomic_set(&bd->ref_count, 1); |
798 | mutex_lock(&bsg_mutex); | 776 | mutex_lock(&bsg_mutex); |
@@ -943,7 +921,7 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
943 | if (copy_from_user(&hdr, uarg, sizeof(hdr))) | 921 | if (copy_from_user(&hdr, uarg, sizeof(hdr))) |
944 | return -EFAULT; | 922 | return -EFAULT; |
945 | 923 | ||
946 | rq = bsg_map_hdr(bd, &hdr); | 924 | rq = bsg_map_hdr(bd, &hdr, file->f_mode & FMODE_WRITE); |
947 | if (IS_ERR(rq)) | 925 | if (IS_ERR(rq)) |
948 | return PTR_ERR(rq); | 926 | return PTR_ERR(rq); |
949 | 927 | ||
diff --git a/block/cmd-filter.c b/block/cmd-filter.c index eec4404fd357..228b6447e89f 100644 --- a/block/cmd-filter.c +++ b/block/cmd-filter.c | |||
@@ -20,15 +20,14 @@ | |||
20 | #include <linux/list.h> | 20 | #include <linux/list.h> |
21 | #include <linux/genhd.h> | 21 | #include <linux/genhd.h> |
22 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
23 | #include <linux/parser.h> | ||
24 | #include <linux/capability.h> | 23 | #include <linux/capability.h> |
25 | #include <linux/bitops.h> | 24 | #include <linux/bitops.h> |
26 | 25 | ||
27 | #include <scsi/scsi.h> | 26 | #include <scsi/scsi.h> |
28 | #include <linux/cdrom.h> | 27 | #include <linux/cdrom.h> |
29 | 28 | ||
30 | int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter, | 29 | int blk_verify_command(struct blk_cmd_filter *filter, |
31 | unsigned char *cmd, mode_t *f_mode) | 30 | unsigned char *cmd, int has_write_perm) |
32 | { | 31 | { |
33 | /* root can do any command. */ | 32 | /* root can do any command. */ |
34 | if (capable(CAP_SYS_RAWIO)) | 33 | if (capable(CAP_SYS_RAWIO)) |
@@ -43,34 +42,15 @@ int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter, | |||
43 | return 0; | 42 | return 0; |
44 | 43 | ||
45 | /* Write-safe commands require a writable open */ | 44 | /* Write-safe commands require a writable open */ |
46 | if (test_bit(cmd[0], filter->write_ok) && (*f_mode & FMODE_WRITE)) | 45 | if (test_bit(cmd[0], filter->write_ok) && has_write_perm) |
47 | return 0; | 46 | return 0; |
48 | 47 | ||
49 | return -EPERM; | 48 | return -EPERM; |
50 | } | 49 | } |
51 | EXPORT_SYMBOL(blk_cmd_filter_verify_command); | ||
52 | |||
53 | int blk_verify_command(struct file *file, unsigned char *cmd) | ||
54 | { | ||
55 | struct gendisk *disk; | ||
56 | struct inode *inode; | ||
57 | |||
58 | if (!file) | ||
59 | return -EINVAL; | ||
60 | |||
61 | inode = file->f_dentry->d_inode; | ||
62 | if (!inode) | ||
63 | return -EINVAL; | ||
64 | |||
65 | disk = inode->i_bdev->bd_disk; | ||
66 | |||
67 | return blk_cmd_filter_verify_command(&disk->cmd_filter, | ||
68 | cmd, &file->f_mode); | ||
69 | } | ||
70 | EXPORT_SYMBOL(blk_verify_command); | 50 | EXPORT_SYMBOL(blk_verify_command); |
71 | 51 | ||
72 | /* and now, the sysfs stuff */ | 52 | /* and now, the sysfs stuff */ |
73 | static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page, | 53 | static ssize_t rcf_cmds_show(struct blk_cmd_filter *filter, char *page, |
74 | int rw) | 54 | int rw) |
75 | { | 55 | { |
76 | char *npage = page; | 56 | char *npage = page; |
@@ -84,8 +64,7 @@ static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page, | |||
84 | 64 | ||
85 | for (i = 0; i < BLK_SCSI_MAX_CMDS; i++) { | 65 | for (i = 0; i < BLK_SCSI_MAX_CMDS; i++) { |
86 | if (test_bit(i, okbits)) { | 66 | if (test_bit(i, okbits)) { |
87 | sprintf(npage, "%02x", i); | 67 | npage += sprintf(npage, "0x%02x", i); |
88 | npage += 2; | ||
89 | if (i < BLK_SCSI_MAX_CMDS - 1) | 68 | if (i < BLK_SCSI_MAX_CMDS - 1) |
90 | sprintf(npage++, " "); | 69 | sprintf(npage++, " "); |
91 | } | 70 | } |
@@ -97,57 +76,65 @@ static ssize_t rcf_cmds_show(struct blk_scsi_cmd_filter *filter, char *page, | |||
97 | return npage - page; | 76 | return npage - page; |
98 | } | 77 | } |
99 | 78 | ||
100 | static ssize_t rcf_readcmds_show(struct blk_scsi_cmd_filter *filter, char *page) | 79 | static ssize_t rcf_readcmds_show(struct blk_cmd_filter *filter, char *page) |
101 | { | 80 | { |
102 | return rcf_cmds_show(filter, page, READ); | 81 | return rcf_cmds_show(filter, page, READ); |
103 | } | 82 | } |
104 | 83 | ||
105 | static ssize_t rcf_writecmds_show(struct blk_scsi_cmd_filter *filter, | 84 | static ssize_t rcf_writecmds_show(struct blk_cmd_filter *filter, |
106 | char *page) | 85 | char *page) |
107 | { | 86 | { |
108 | return rcf_cmds_show(filter, page, WRITE); | 87 | return rcf_cmds_show(filter, page, WRITE); |
109 | } | 88 | } |
110 | 89 | ||
111 | static ssize_t rcf_cmds_store(struct blk_scsi_cmd_filter *filter, | 90 | static ssize_t rcf_cmds_store(struct blk_cmd_filter *filter, |
112 | const char *page, size_t count, int rw) | 91 | const char *page, size_t count, int rw) |
113 | { | 92 | { |
114 | ssize_t ret = 0; | ||
115 | unsigned long okbits[BLK_SCSI_CMD_PER_LONG], *target_okbits; | 93 | unsigned long okbits[BLK_SCSI_CMD_PER_LONG], *target_okbits; |
116 | int cmd, status, len; | 94 | int cmd, set; |
117 | substring_t ss; | 95 | char *p, *status; |
118 | 96 | ||
119 | memset(&okbits, 0, sizeof(okbits)); | 97 | if (rw == READ) { |
120 | 98 | memcpy(&okbits, filter->read_ok, sizeof(okbits)); | |
121 | for (len = strlen(page); len > 0; len -= 3) { | 99 | target_okbits = filter->read_ok; |
122 | if (len < 2) | 100 | } else { |
123 | break; | 101 | memcpy(&okbits, filter->write_ok, sizeof(okbits)); |
124 | ss.from = (char *) page + ret; | 102 | target_okbits = filter->write_ok; |
125 | ss.to = (char *) page + ret + 2; | 103 | } |
126 | ret += 3; | 104 | |
127 | status = match_hex(&ss, &cmd); | 105 | while ((p = strsep((char **)&page, " ")) != NULL) { |
106 | set = 1; | ||
107 | |||
108 | if (p[0] == '+') { | ||
109 | p++; | ||
110 | } else if (p[0] == '-') { | ||
111 | set = 0; | ||
112 | p++; | ||
113 | } | ||
114 | |||
115 | cmd = simple_strtol(p, &status, 16); | ||
116 | |||
128 | /* either of these cases means invalid input, so do nothing. */ | 117 | /* either of these cases means invalid input, so do nothing. */ |
129 | if (status || cmd >= BLK_SCSI_MAX_CMDS) | 118 | if ((status == p) || cmd >= BLK_SCSI_MAX_CMDS) |
130 | return -EINVAL; | 119 | return -EINVAL; |
131 | 120 | ||
132 | __set_bit(cmd, okbits); | 121 | if (set) |
122 | __set_bit(cmd, okbits); | ||
123 | else | ||
124 | __clear_bit(cmd, okbits); | ||
133 | } | 125 | } |
134 | 126 | ||
135 | if (rw == READ) | 127 | memcpy(target_okbits, okbits, sizeof(okbits)); |
136 | target_okbits = filter->read_ok; | ||
137 | else | ||
138 | target_okbits = filter->write_ok; | ||
139 | |||
140 | memmove(target_okbits, okbits, sizeof(okbits)); | ||
141 | return count; | 128 | return count; |
142 | } | 129 | } |
143 | 130 | ||
144 | static ssize_t rcf_readcmds_store(struct blk_scsi_cmd_filter *filter, | 131 | static ssize_t rcf_readcmds_store(struct blk_cmd_filter *filter, |
145 | const char *page, size_t count) | 132 | const char *page, size_t count) |
146 | { | 133 | { |
147 | return rcf_cmds_store(filter, page, count, READ); | 134 | return rcf_cmds_store(filter, page, count, READ); |
148 | } | 135 | } |
149 | 136 | ||
150 | static ssize_t rcf_writecmds_store(struct blk_scsi_cmd_filter *filter, | 137 | static ssize_t rcf_writecmds_store(struct blk_cmd_filter *filter, |
151 | const char *page, size_t count) | 138 | const char *page, size_t count) |
152 | { | 139 | { |
153 | return rcf_cmds_store(filter, page, count, WRITE); | 140 | return rcf_cmds_store(filter, page, count, WRITE); |
@@ -155,8 +142,8 @@ static ssize_t rcf_writecmds_store(struct blk_scsi_cmd_filter *filter, | |||
155 | 142 | ||
156 | struct rcf_sysfs_entry { | 143 | struct rcf_sysfs_entry { |
157 | struct attribute attr; | 144 | struct attribute attr; |
158 | ssize_t (*show)(struct blk_scsi_cmd_filter *, char *); | 145 | ssize_t (*show)(struct blk_cmd_filter *, char *); |
159 | ssize_t (*store)(struct blk_scsi_cmd_filter *, const char *, size_t); | 146 | ssize_t (*store)(struct blk_cmd_filter *, const char *, size_t); |
160 | }; | 147 | }; |
161 | 148 | ||
162 | static struct rcf_sysfs_entry rcf_readcmds_entry = { | 149 | static struct rcf_sysfs_entry rcf_readcmds_entry = { |
@@ -183,9 +170,9 @@ static ssize_t | |||
183 | rcf_attr_show(struct kobject *kobj, struct attribute *attr, char *page) | 170 | rcf_attr_show(struct kobject *kobj, struct attribute *attr, char *page) |
184 | { | 171 | { |
185 | struct rcf_sysfs_entry *entry = to_rcf(attr); | 172 | struct rcf_sysfs_entry *entry = to_rcf(attr); |
186 | struct blk_scsi_cmd_filter *filter; | 173 | struct blk_cmd_filter *filter; |
187 | 174 | ||
188 | filter = container_of(kobj, struct blk_scsi_cmd_filter, kobj); | 175 | filter = container_of(kobj, struct blk_cmd_filter, kobj); |
189 | if (entry->show) | 176 | if (entry->show) |
190 | return entry->show(filter, page); | 177 | return entry->show(filter, page); |
191 | 178 | ||
@@ -197,7 +184,7 @@ rcf_attr_store(struct kobject *kobj, struct attribute *attr, | |||
197 | const char *page, size_t length) | 184 | const char *page, size_t length) |
198 | { | 185 | { |
199 | struct rcf_sysfs_entry *entry = to_rcf(attr); | 186 | struct rcf_sysfs_entry *entry = to_rcf(attr); |
200 | struct blk_scsi_cmd_filter *filter; | 187 | struct blk_cmd_filter *filter; |
201 | 188 | ||
202 | if (!capable(CAP_SYS_RAWIO)) | 189 | if (!capable(CAP_SYS_RAWIO)) |
203 | return -EPERM; | 190 | return -EPERM; |
@@ -205,7 +192,7 @@ rcf_attr_store(struct kobject *kobj, struct attribute *attr, | |||
205 | if (!entry->store) | 192 | if (!entry->store) |
206 | return -EINVAL; | 193 | return -EINVAL; |
207 | 194 | ||
208 | filter = container_of(kobj, struct blk_scsi_cmd_filter, kobj); | 195 | filter = container_of(kobj, struct blk_cmd_filter, kobj); |
209 | return entry->store(filter, page, length); | 196 | return entry->store(filter, page, length); |
210 | } | 197 | } |
211 | 198 | ||
@@ -219,116 +206,30 @@ static struct kobj_type rcf_ktype = { | |||
219 | .default_attrs = default_attrs, | 206 | .default_attrs = default_attrs, |
220 | }; | 207 | }; |
221 | 208 | ||
222 | #ifndef MAINTENANCE_IN_CMD | ||
223 | #define MAINTENANCE_IN_CMD 0xa3 | ||
224 | #endif | ||
225 | |||
226 | static void rcf_set_defaults(struct blk_scsi_cmd_filter *filter) | ||
227 | { | ||
228 | /* Basic read-only commands */ | ||
229 | __set_bit(TEST_UNIT_READY, filter->read_ok); | ||
230 | __set_bit(REQUEST_SENSE, filter->read_ok); | ||
231 | __set_bit(READ_6, filter->read_ok); | ||
232 | __set_bit(READ_10, filter->read_ok); | ||
233 | __set_bit(READ_12, filter->read_ok); | ||
234 | __set_bit(READ_16, filter->read_ok); | ||
235 | __set_bit(READ_BUFFER, filter->read_ok); | ||
236 | __set_bit(READ_DEFECT_DATA, filter->read_ok); | ||
237 | __set_bit(READ_CAPACITY, filter->read_ok); | ||
238 | __set_bit(READ_LONG, filter->read_ok); | ||
239 | __set_bit(INQUIRY, filter->read_ok); | ||
240 | __set_bit(MODE_SENSE, filter->read_ok); | ||
241 | __set_bit(MODE_SENSE_10, filter->read_ok); | ||
242 | __set_bit(LOG_SENSE, filter->read_ok); | ||
243 | __set_bit(START_STOP, filter->read_ok); | ||
244 | __set_bit(GPCMD_VERIFY_10, filter->read_ok); | ||
245 | __set_bit(VERIFY_16, filter->read_ok); | ||
246 | __set_bit(REPORT_LUNS, filter->read_ok); | ||
247 | __set_bit(SERVICE_ACTION_IN, filter->read_ok); | ||
248 | __set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok); | ||
249 | __set_bit(MAINTENANCE_IN_CMD, filter->read_ok); | ||
250 | __set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok); | ||
251 | |||
252 | /* Audio CD commands */ | ||
253 | __set_bit(GPCMD_PLAY_CD, filter->read_ok); | ||
254 | __set_bit(GPCMD_PLAY_AUDIO_10, filter->read_ok); | ||
255 | __set_bit(GPCMD_PLAY_AUDIO_MSF, filter->read_ok); | ||
256 | __set_bit(GPCMD_PLAY_AUDIO_TI, filter->read_ok); | ||
257 | __set_bit(GPCMD_PAUSE_RESUME, filter->read_ok); | ||
258 | |||
259 | /* CD/DVD data reading */ | ||
260 | __set_bit(GPCMD_READ_CD, filter->read_ok); | ||
261 | __set_bit(GPCMD_READ_CD_MSF, filter->read_ok); | ||
262 | __set_bit(GPCMD_READ_DISC_INFO, filter->read_ok); | ||
263 | __set_bit(GPCMD_READ_CDVD_CAPACITY, filter->read_ok); | ||
264 | __set_bit(GPCMD_READ_DVD_STRUCTURE, filter->read_ok); | ||
265 | __set_bit(GPCMD_READ_HEADER, filter->read_ok); | ||
266 | __set_bit(GPCMD_READ_TRACK_RZONE_INFO, filter->read_ok); | ||
267 | __set_bit(GPCMD_READ_SUBCHANNEL, filter->read_ok); | ||
268 | __set_bit(GPCMD_READ_TOC_PMA_ATIP, filter->read_ok); | ||
269 | __set_bit(GPCMD_REPORT_KEY, filter->read_ok); | ||
270 | __set_bit(GPCMD_SCAN, filter->read_ok); | ||
271 | __set_bit(GPCMD_GET_CONFIGURATION, filter->read_ok); | ||
272 | __set_bit(GPCMD_READ_FORMAT_CAPACITIES, filter->read_ok); | ||
273 | __set_bit(GPCMD_GET_EVENT_STATUS_NOTIFICATION, filter->read_ok); | ||
274 | __set_bit(GPCMD_GET_PERFORMANCE, filter->read_ok); | ||
275 | __set_bit(GPCMD_SEEK, filter->read_ok); | ||
276 | __set_bit(GPCMD_STOP_PLAY_SCAN, filter->read_ok); | ||
277 | |||
278 | /* Basic writing commands */ | ||
279 | __set_bit(WRITE_6, filter->write_ok); | ||
280 | __set_bit(WRITE_10, filter->write_ok); | ||
281 | __set_bit(WRITE_VERIFY, filter->write_ok); | ||
282 | __set_bit(WRITE_12, filter->write_ok); | ||
283 | __set_bit(WRITE_VERIFY_12, filter->write_ok); | ||
284 | __set_bit(WRITE_16, filter->write_ok); | ||
285 | __set_bit(WRITE_LONG, filter->write_ok); | ||
286 | __set_bit(WRITE_LONG_2, filter->write_ok); | ||
287 | __set_bit(ERASE, filter->write_ok); | ||
288 | __set_bit(GPCMD_MODE_SELECT_10, filter->write_ok); | ||
289 | __set_bit(MODE_SELECT, filter->write_ok); | ||
290 | __set_bit(LOG_SELECT, filter->write_ok); | ||
291 | __set_bit(GPCMD_BLANK, filter->write_ok); | ||
292 | __set_bit(GPCMD_CLOSE_TRACK, filter->write_ok); | ||
293 | __set_bit(GPCMD_FLUSH_CACHE, filter->write_ok); | ||
294 | __set_bit(GPCMD_FORMAT_UNIT, filter->write_ok); | ||
295 | __set_bit(GPCMD_REPAIR_RZONE_TRACK, filter->write_ok); | ||
296 | __set_bit(GPCMD_RESERVE_RZONE_TRACK, filter->write_ok); | ||
297 | __set_bit(GPCMD_SEND_DVD_STRUCTURE, filter->write_ok); | ||
298 | __set_bit(GPCMD_SEND_EVENT, filter->write_ok); | ||
299 | __set_bit(GPCMD_SEND_KEY, filter->write_ok); | ||
300 | __set_bit(GPCMD_SEND_OPC, filter->write_ok); | ||
301 | __set_bit(GPCMD_SEND_CUE_SHEET, filter->write_ok); | ||
302 | __set_bit(GPCMD_SET_SPEED, filter->write_ok); | ||
303 | __set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok); | ||
304 | __set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok); | ||
305 | __set_bit(GPCMD_SET_STREAMING, filter->write_ok); | ||
306 | } | ||
307 | |||
308 | int blk_register_filter(struct gendisk *disk) | 209 | int blk_register_filter(struct gendisk *disk) |
309 | { | 210 | { |
310 | int ret; | 211 | int ret; |
311 | struct blk_scsi_cmd_filter *filter = &disk->cmd_filter; | 212 | struct blk_cmd_filter *filter = &disk->queue->cmd_filter; |
312 | struct kobject *parent = kobject_get(disk->holder_dir->parent); | 213 | struct kobject *parent = kobject_get(disk->holder_dir->parent); |
313 | 214 | ||
314 | if (!parent) | 215 | if (!parent) |
315 | return -ENODEV; | 216 | return -ENODEV; |
316 | 217 | ||
317 | ret = kobject_init_and_add(&filter->kobj, &rcf_ktype, parent, | 218 | ret = kobject_init_and_add(&filter->kobj, &rcf_ktype, parent, |
318 | "%s", "cmd_filter"); | 219 | "%s", "cmd_filter"); |
319 | 220 | ||
320 | if (ret < 0) | 221 | if (ret < 0) |
321 | return ret; | 222 | return ret; |
322 | 223 | ||
323 | rcf_set_defaults(filter); | ||
324 | return 0; | 224 | return 0; |
325 | } | 225 | } |
226 | EXPORT_SYMBOL(blk_register_filter); | ||
326 | 227 | ||
327 | void blk_unregister_filter(struct gendisk *disk) | 228 | void blk_unregister_filter(struct gendisk *disk) |
328 | { | 229 | { |
329 | struct blk_scsi_cmd_filter *filter = &disk->cmd_filter; | 230 | struct blk_cmd_filter *filter = &disk->queue->cmd_filter; |
330 | 231 | ||
331 | kobject_put(&filter->kobj); | 232 | kobject_put(&filter->kobj); |
332 | kobject_put(disk->holder_dir->parent); | 233 | kobject_put(disk->holder_dir->parent); |
333 | } | 234 | } |
334 | 235 | EXPORT_SYMBOL(blk_unregister_filter); | |
diff --git a/block/genhd.c b/block/genhd.c index 656c2c7abf99..e0ce23ac2ece 100644 --- a/block/genhd.c +++ b/block/genhd.c | |||
@@ -190,7 +190,6 @@ void add_disk(struct gendisk *disk) | |||
190 | disk->minors, NULL, exact_match, exact_lock, disk); | 190 | disk->minors, NULL, exact_match, exact_lock, disk); |
191 | register_disk(disk); | 191 | register_disk(disk); |
192 | blk_register_queue(disk); | 192 | blk_register_queue(disk); |
193 | blk_register_filter(disk); | ||
194 | 193 | ||
195 | bdi = &disk->queue->backing_dev_info; | 194 | bdi = &disk->queue->backing_dev_info; |
196 | bdi_register_dev(bdi, MKDEV(disk->major, disk->first_minor)); | 195 | bdi_register_dev(bdi, MKDEV(disk->major, disk->first_minor)); |
@@ -203,7 +202,6 @@ EXPORT_SYMBOL(del_gendisk); /* in partitions/check.c */ | |||
203 | 202 | ||
204 | void unlink_gendisk(struct gendisk *disk) | 203 | void unlink_gendisk(struct gendisk *disk) |
205 | { | 204 | { |
206 | blk_unregister_filter(disk); | ||
207 | sysfs_remove_link(&disk->dev.kobj, "bdi"); | 205 | sysfs_remove_link(&disk->dev.kobj, "bdi"); |
208 | bdi_unregister(&disk->queue->backing_dev_info); | 206 | bdi_unregister(&disk->queue->backing_dev_info); |
209 | blk_unregister_queue(disk); | 207 | blk_unregister_queue(disk); |
@@ -309,7 +307,7 @@ static void *part_start(struct seq_file *part, loff_t *pos) | |||
309 | loff_t k = *pos; | 307 | loff_t k = *pos; |
310 | 308 | ||
311 | if (!k) | 309 | if (!k) |
312 | seq_puts(part, "major minor #blocks name\n\n"); | 310 | part->private = (void *)1LU; /* tell show to print header */ |
313 | 311 | ||
314 | mutex_lock(&block_class_lock); | 312 | mutex_lock(&block_class_lock); |
315 | dev = class_find_device(&block_class, NULL, &k, find_start); | 313 | dev = class_find_device(&block_class, NULL, &k, find_start); |
@@ -351,6 +349,17 @@ static int show_partition(struct seq_file *part, void *v) | |||
351 | int n; | 349 | int n; |
352 | char buf[BDEVNAME_SIZE]; | 350 | char buf[BDEVNAME_SIZE]; |
353 | 351 | ||
352 | /* | ||
353 | * Print header if start told us to do. This is to preserve | ||
354 | * the original behavior of not printing header if no | ||
355 | * partition exists. This hackery will be removed later with | ||
356 | * class iteration clean up. | ||
357 | */ | ||
358 | if (part->private) { | ||
359 | seq_puts(part, "major minor #blocks name\n\n"); | ||
360 | part->private = NULL; | ||
361 | } | ||
362 | |||
354 | /* Don't show non-partitionable removeable devices or empty devices */ | 363 | /* Don't show non-partitionable removeable devices or empty devices */ |
355 | if (!get_capacity(sgp) || | 364 | if (!get_capacity(sgp) || |
356 | (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE))) | 365 | (sgp->minors == 1 && (sgp->flags & GENHD_FL_REMOVABLE))) |
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 12a5182173f6..ec4b7f234626 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
@@ -105,12 +105,96 @@ static int sg_emulated_host(struct request_queue *q, int __user *p) | |||
105 | return put_user(1, p); | 105 | return put_user(1, p); |
106 | } | 106 | } |
107 | 107 | ||
108 | void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter) | ||
109 | { | ||
110 | /* Basic read-only commands */ | ||
111 | __set_bit(TEST_UNIT_READY, filter->read_ok); | ||
112 | __set_bit(REQUEST_SENSE, filter->read_ok); | ||
113 | __set_bit(READ_6, filter->read_ok); | ||
114 | __set_bit(READ_10, filter->read_ok); | ||
115 | __set_bit(READ_12, filter->read_ok); | ||
116 | __set_bit(READ_16, filter->read_ok); | ||
117 | __set_bit(READ_BUFFER, filter->read_ok); | ||
118 | __set_bit(READ_DEFECT_DATA, filter->read_ok); | ||
119 | __set_bit(READ_CAPACITY, filter->read_ok); | ||
120 | __set_bit(READ_LONG, filter->read_ok); | ||
121 | __set_bit(INQUIRY, filter->read_ok); | ||
122 | __set_bit(MODE_SENSE, filter->read_ok); | ||
123 | __set_bit(MODE_SENSE_10, filter->read_ok); | ||
124 | __set_bit(LOG_SENSE, filter->read_ok); | ||
125 | __set_bit(START_STOP, filter->read_ok); | ||
126 | __set_bit(GPCMD_VERIFY_10, filter->read_ok); | ||
127 | __set_bit(VERIFY_16, filter->read_ok); | ||
128 | __set_bit(REPORT_LUNS, filter->read_ok); | ||
129 | __set_bit(SERVICE_ACTION_IN, filter->read_ok); | ||
130 | __set_bit(RECEIVE_DIAGNOSTIC, filter->read_ok); | ||
131 | __set_bit(MAINTENANCE_IN, filter->read_ok); | ||
132 | __set_bit(GPCMD_READ_BUFFER_CAPACITY, filter->read_ok); | ||
133 | |||
134 | /* Audio CD commands */ | ||
135 | __set_bit(GPCMD_PLAY_CD, filter->read_ok); | ||
136 | __set_bit(GPCMD_PLAY_AUDIO_10, filter->read_ok); | ||
137 | __set_bit(GPCMD_PLAY_AUDIO_MSF, filter->read_ok); | ||
138 | __set_bit(GPCMD_PLAY_AUDIO_TI, filter->read_ok); | ||
139 | __set_bit(GPCMD_PAUSE_RESUME, filter->read_ok); | ||
140 | |||
141 | /* CD/DVD data reading */ | ||
142 | __set_bit(GPCMD_READ_CD, filter->read_ok); | ||
143 | __set_bit(GPCMD_READ_CD_MSF, filter->read_ok); | ||
144 | __set_bit(GPCMD_READ_DISC_INFO, filter->read_ok); | ||
145 | __set_bit(GPCMD_READ_CDVD_CAPACITY, filter->read_ok); | ||
146 | __set_bit(GPCMD_READ_DVD_STRUCTURE, filter->read_ok); | ||
147 | __set_bit(GPCMD_READ_HEADER, filter->read_ok); | ||
148 | __set_bit(GPCMD_READ_TRACK_RZONE_INFO, filter->read_ok); | ||
149 | __set_bit(GPCMD_READ_SUBCHANNEL, filter->read_ok); | ||
150 | __set_bit(GPCMD_READ_TOC_PMA_ATIP, filter->read_ok); | ||
151 | __set_bit(GPCMD_REPORT_KEY, filter->read_ok); | ||
152 | __set_bit(GPCMD_SCAN, filter->read_ok); | ||
153 | __set_bit(GPCMD_GET_CONFIGURATION, filter->read_ok); | ||
154 | __set_bit(GPCMD_READ_FORMAT_CAPACITIES, filter->read_ok); | ||
155 | __set_bit(GPCMD_GET_EVENT_STATUS_NOTIFICATION, filter->read_ok); | ||
156 | __set_bit(GPCMD_GET_PERFORMANCE, filter->read_ok); | ||
157 | __set_bit(GPCMD_SEEK, filter->read_ok); | ||
158 | __set_bit(GPCMD_STOP_PLAY_SCAN, filter->read_ok); | ||
159 | |||
160 | /* Basic writing commands */ | ||
161 | __set_bit(WRITE_6, filter->write_ok); | ||
162 | __set_bit(WRITE_10, filter->write_ok); | ||
163 | __set_bit(WRITE_VERIFY, filter->write_ok); | ||
164 | __set_bit(WRITE_12, filter->write_ok); | ||
165 | __set_bit(WRITE_VERIFY_12, filter->write_ok); | ||
166 | __set_bit(WRITE_16, filter->write_ok); | ||
167 | __set_bit(WRITE_LONG, filter->write_ok); | ||
168 | __set_bit(WRITE_LONG_2, filter->write_ok); | ||
169 | __set_bit(ERASE, filter->write_ok); | ||
170 | __set_bit(GPCMD_MODE_SELECT_10, filter->write_ok); | ||
171 | __set_bit(MODE_SELECT, filter->write_ok); | ||
172 | __set_bit(LOG_SELECT, filter->write_ok); | ||
173 | __set_bit(GPCMD_BLANK, filter->write_ok); | ||
174 | __set_bit(GPCMD_CLOSE_TRACK, filter->write_ok); | ||
175 | __set_bit(GPCMD_FLUSH_CACHE, filter->write_ok); | ||
176 | __set_bit(GPCMD_FORMAT_UNIT, filter->write_ok); | ||
177 | __set_bit(GPCMD_REPAIR_RZONE_TRACK, filter->write_ok); | ||
178 | __set_bit(GPCMD_RESERVE_RZONE_TRACK, filter->write_ok); | ||
179 | __set_bit(GPCMD_SEND_DVD_STRUCTURE, filter->write_ok); | ||
180 | __set_bit(GPCMD_SEND_EVENT, filter->write_ok); | ||
181 | __set_bit(GPCMD_SEND_KEY, filter->write_ok); | ||
182 | __set_bit(GPCMD_SEND_OPC, filter->write_ok); | ||
183 | __set_bit(GPCMD_SEND_CUE_SHEET, filter->write_ok); | ||
184 | __set_bit(GPCMD_SET_SPEED, filter->write_ok); | ||
185 | __set_bit(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL, filter->write_ok); | ||
186 | __set_bit(GPCMD_LOAD_UNLOAD, filter->write_ok); | ||
187 | __set_bit(GPCMD_SET_STREAMING, filter->write_ok); | ||
188 | } | ||
189 | EXPORT_SYMBOL_GPL(blk_set_cmd_filter_defaults); | ||
190 | |||
108 | static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, | 191 | static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq, |
109 | struct sg_io_hdr *hdr, struct file *file) | 192 | struct sg_io_hdr *hdr, struct file *file) |
110 | { | 193 | { |
111 | if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len)) | 194 | if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len)) |
112 | return -EFAULT; | 195 | return -EFAULT; |
113 | if (blk_verify_command(file, rq->cmd)) | 196 | if (blk_verify_command(&q->cmd_filter, rq->cmd, |
197 | file->f_mode & FMODE_WRITE)) | ||
114 | return -EPERM; | 198 | return -EPERM; |
115 | 199 | ||
116 | /* | 200 | /* |
@@ -298,7 +382,7 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q, | |||
298 | struct gendisk *disk, struct scsi_ioctl_command __user *sic) | 382 | struct gendisk *disk, struct scsi_ioctl_command __user *sic) |
299 | { | 383 | { |
300 | struct request *rq; | 384 | struct request *rq; |
301 | int err; | 385 | int err, write_perm = 0; |
302 | unsigned int in_len, out_len, bytes, opcode, cmdlen; | 386 | unsigned int in_len, out_len, bytes, opcode, cmdlen; |
303 | char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; | 387 | char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE]; |
304 | 388 | ||
@@ -340,7 +424,11 @@ int sg_scsi_ioctl(struct file *file, struct request_queue *q, | |||
340 | if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) | 424 | if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) |
341 | goto error; | 425 | goto error; |
342 | 426 | ||
343 | err = blk_verify_command(file, rq->cmd); | 427 | /* scsi_ioctl passes NULL */ |
428 | if (file && (file->f_mode & FMODE_WRITE)) | ||
429 | write_perm = 1; | ||
430 | |||
431 | err = blk_verify_command(&q->cmd_filter, rq->cmd, write_perm); | ||
344 | if (err) | 432 | if (err) |
345 | goto error; | 433 | goto error; |
346 | 434 | ||
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index d3f0a62efcc1..ee68ac54c0d4 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
@@ -138,7 +138,7 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = { | |||
138 | { | 138 | { |
139 | set_no_mwait, "Extensa 5220", { | 139 | set_no_mwait, "Extensa 5220", { |
140 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), | 140 | DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), |
141 | DMI_MATCH(DMI_SYS_VENDOR, "ACER"), | 141 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), |
142 | DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), | 142 | DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), |
143 | DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, | 143 | DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL}, |
144 | {}, | 144 | {}, |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 158eed4d5161..29b7a648cc6e 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #include <linux/types.h> | 49 | #include <linux/types.h> |
50 | #include <linux/kernel.h> | 50 | #include <linux/kernel.h> |
51 | #include <linux/kthread.h> | 51 | #include <linux/kthread.h> |
52 | #include <linux/smp_lock.h> | ||
53 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
54 | #include <linux/spinlock.h> | 53 | #include <linux/spinlock.h> |
55 | #include <linux/file.h> | 54 | #include <linux/file.h> |
@@ -2798,14 +2797,9 @@ out_mem: | |||
2798 | return ret; | 2797 | return ret; |
2799 | } | 2798 | } |
2800 | 2799 | ||
2801 | static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | 2800 | static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) |
2802 | { | 2801 | { |
2803 | struct inode *inode = file->f_path.dentry->d_inode; | 2802 | struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data; |
2804 | struct pktcdvd_device *pd; | ||
2805 | long ret; | ||
2806 | |||
2807 | lock_kernel(); | ||
2808 | pd = inode->i_bdev->bd_disk->private_data; | ||
2809 | 2803 | ||
2810 | VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode)); | 2804 | VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode)); |
2811 | 2805 | ||
@@ -2818,8 +2812,7 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
2818 | case CDROM_LAST_WRITTEN: | 2812 | case CDROM_LAST_WRITTEN: |
2819 | case CDROM_SEND_PACKET: | 2813 | case CDROM_SEND_PACKET: |
2820 | case SCSI_IOCTL_SEND_COMMAND: | 2814 | case SCSI_IOCTL_SEND_COMMAND: |
2821 | ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); | 2815 | return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); |
2822 | break; | ||
2823 | 2816 | ||
2824 | case CDROMEJECT: | 2817 | case CDROMEJECT: |
2825 | /* | 2818 | /* |
@@ -2828,15 +2821,14 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
2828 | */ | 2821 | */ |
2829 | if (pd->refcnt == 1) | 2822 | if (pd->refcnt == 1) |
2830 | pkt_lock_door(pd, 0); | 2823 | pkt_lock_door(pd, 0); |
2831 | ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); | 2824 | return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); |
2832 | break; | ||
2833 | 2825 | ||
2834 | default: | 2826 | default: |
2835 | VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd); | 2827 | VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd); |
2836 | ret = -ENOTTY; | 2828 | return -ENOTTY; |
2837 | } | 2829 | } |
2838 | unlock_kernel(); | 2830 | |
2839 | return ret; | 2831 | return 0; |
2840 | } | 2832 | } |
2841 | 2833 | ||
2842 | static int pkt_media_changed(struct gendisk *disk) | 2834 | static int pkt_media_changed(struct gendisk *disk) |
@@ -2858,7 +2850,7 @@ static struct block_device_operations pktcdvd_ops = { | |||
2858 | .owner = THIS_MODULE, | 2850 | .owner = THIS_MODULE, |
2859 | .open = pkt_open, | 2851 | .open = pkt_open, |
2860 | .release = pkt_close, | 2852 | .release = pkt_close, |
2861 | .unlocked_ioctl = pkt_ioctl, | 2853 | .ioctl = pkt_ioctl, |
2862 | .media_changed = pkt_media_changed, | 2854 | .media_changed = pkt_media_changed, |
2863 | }; | 2855 | }; |
2864 | 2856 | ||
@@ -3023,8 +3015,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd) | |||
3023 | mutex_unlock(&ctl_mutex); | 3015 | mutex_unlock(&ctl_mutex); |
3024 | } | 3016 | } |
3025 | 3017 | ||
3026 | static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, | 3018 | static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) |
3027 | unsigned long arg) | ||
3028 | { | 3019 | { |
3029 | void __user *argp = (void __user *)arg; | 3020 | void __user *argp = (void __user *)arg; |
3030 | struct pkt_ctrl_command ctrl_cmd; | 3021 | struct pkt_ctrl_command ctrl_cmd; |
@@ -3041,22 +3032,16 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, | |||
3041 | case PKT_CTRL_CMD_SETUP: | 3032 | case PKT_CTRL_CMD_SETUP: |
3042 | if (!capable(CAP_SYS_ADMIN)) | 3033 | if (!capable(CAP_SYS_ADMIN)) |
3043 | return -EPERM; | 3034 | return -EPERM; |
3044 | lock_kernel(); | ||
3045 | ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &pkt_dev); | 3035 | ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &pkt_dev); |
3046 | ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev); | 3036 | ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev); |
3047 | unlock_kernel(); | ||
3048 | break; | 3037 | break; |
3049 | case PKT_CTRL_CMD_TEARDOWN: | 3038 | case PKT_CTRL_CMD_TEARDOWN: |
3050 | if (!capable(CAP_SYS_ADMIN)) | 3039 | if (!capable(CAP_SYS_ADMIN)) |
3051 | return -EPERM; | 3040 | return -EPERM; |
3052 | lock_kernel(); | ||
3053 | ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev)); | 3041 | ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev)); |
3054 | unlock_kernel(); | ||
3055 | break; | 3042 | break; |
3056 | case PKT_CTRL_CMD_STATUS: | 3043 | case PKT_CTRL_CMD_STATUS: |
3057 | lock_kernel(); | ||
3058 | pkt_get_status(&ctrl_cmd); | 3044 | pkt_get_status(&ctrl_cmd); |
3059 | unlock_kernel(); | ||
3060 | break; | 3045 | break; |
3061 | default: | 3046 | default: |
3062 | return -ENOTTY; | 3047 | return -ENOTTY; |
@@ -3069,7 +3054,7 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd, | |||
3069 | 3054 | ||
3070 | 3055 | ||
3071 | static const struct file_operations pkt_ctl_fops = { | 3056 | static const struct file_operations pkt_ctl_fops = { |
3072 | .unlocked_ioctl = pkt_ctl_ioctl, | 3057 | .ioctl = pkt_ctl_ioctl, |
3073 | .owner = THIS_MODULE, | 3058 | .owner = THIS_MODULE, |
3074 | }; | 3059 | }; |
3075 | 3060 | ||
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index 51738bdd834e..d4e7dca06e4f 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c | |||
@@ -118,18 +118,21 @@ static int __init omap_rng_probe(struct platform_device *pdev) | |||
118 | 118 | ||
119 | mem = request_mem_region(res->start, res->end - res->start + 1, | 119 | mem = request_mem_region(res->start, res->end - res->start + 1, |
120 | pdev->name); | 120 | pdev->name); |
121 | if (mem == NULL) | 121 | if (mem == NULL) { |
122 | return -EBUSY; | 122 | ret = -EBUSY; |
123 | goto err_region; | ||
124 | } | ||
123 | 125 | ||
124 | dev_set_drvdata(&pdev->dev, mem); | 126 | dev_set_drvdata(&pdev->dev, mem); |
125 | rng_base = (u32 __force __iomem *)io_p2v(res->start); | 127 | rng_base = ioremap(res->start, res->end - res->start + 1); |
128 | if (!rng_base) { | ||
129 | ret = -ENOMEM; | ||
130 | goto err_ioremap; | ||
131 | } | ||
126 | 132 | ||
127 | ret = hwrng_register(&omap_rng_ops); | 133 | ret = hwrng_register(&omap_rng_ops); |
128 | if (ret) { | 134 | if (ret) |
129 | release_resource(mem); | 135 | goto err_register; |
130 | rng_base = NULL; | ||
131 | return ret; | ||
132 | } | ||
133 | 136 | ||
134 | dev_info(&pdev->dev, "OMAP Random Number Generator ver. %02x\n", | 137 | dev_info(&pdev->dev, "OMAP Random Number Generator ver. %02x\n", |
135 | omap_rng_read_reg(RNG_REV_REG)); | 138 | omap_rng_read_reg(RNG_REV_REG)); |
@@ -138,6 +141,18 @@ static int __init omap_rng_probe(struct platform_device *pdev) | |||
138 | rng_dev = pdev; | 141 | rng_dev = pdev; |
139 | 142 | ||
140 | return 0; | 143 | return 0; |
144 | |||
145 | err_register: | ||
146 | iounmap(rng_base); | ||
147 | rng_base = NULL; | ||
148 | err_ioremap: | ||
149 | release_resource(mem); | ||
150 | err_region: | ||
151 | if (cpu_is_omap24xx()) { | ||
152 | clk_disable(rng_ick); | ||
153 | clk_put(rng_ick); | ||
154 | } | ||
155 | return ret; | ||
141 | } | 156 | } |
142 | 157 | ||
143 | static int __exit omap_rng_remove(struct platform_device *pdev) | 158 | static int __exit omap_rng_remove(struct platform_device *pdev) |
@@ -148,6 +163,8 @@ static int __exit omap_rng_remove(struct platform_device *pdev) | |||
148 | 163 | ||
149 | omap_rng_write_reg(RNG_MASK_REG, 0x0); | 164 | omap_rng_write_reg(RNG_MASK_REG, 0x0); |
150 | 165 | ||
166 | iounmap(rng_base); | ||
167 | |||
151 | if (cpu_is_omap24xx()) { | 168 | if (cpu_is_omap24xx()) { |
152 | clk_disable(rng_ick); | 169 | clk_disable(rng_ick); |
153 | clk_put(rng_ick); | 170 | clk_put(rng_ick); |
diff --git a/drivers/char/random.c b/drivers/char/random.c index 1838aa3d24fe..7ce1ac4baa6d 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -407,7 +407,7 @@ struct entropy_store { | |||
407 | /* read-write data: */ | 407 | /* read-write data: */ |
408 | spinlock_t lock; | 408 | spinlock_t lock; |
409 | unsigned add_ptr; | 409 | unsigned add_ptr; |
410 | int entropy_count; | 410 | int entropy_count; /* Must at no time exceed ->POOLBITS! */ |
411 | int input_rotate; | 411 | int input_rotate; |
412 | }; | 412 | }; |
413 | 413 | ||
@@ -520,6 +520,7 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes) | |||
520 | static void credit_entropy_bits(struct entropy_store *r, int nbits) | 520 | static void credit_entropy_bits(struct entropy_store *r, int nbits) |
521 | { | 521 | { |
522 | unsigned long flags; | 522 | unsigned long flags; |
523 | int entropy_count; | ||
523 | 524 | ||
524 | if (!nbits) | 525 | if (!nbits) |
525 | return; | 526 | return; |
@@ -527,20 +528,20 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits) | |||
527 | spin_lock_irqsave(&r->lock, flags); | 528 | spin_lock_irqsave(&r->lock, flags); |
528 | 529 | ||
529 | DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name); | 530 | DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name); |
530 | r->entropy_count += nbits; | 531 | entropy_count = r->entropy_count; |
531 | if (r->entropy_count < 0) { | 532 | entropy_count += nbits; |
533 | if (entropy_count < 0) { | ||
532 | DEBUG_ENT("negative entropy/overflow\n"); | 534 | DEBUG_ENT("negative entropy/overflow\n"); |
533 | r->entropy_count = 0; | 535 | entropy_count = 0; |
534 | } else if (r->entropy_count > r->poolinfo->POOLBITS) | 536 | } else if (entropy_count > r->poolinfo->POOLBITS) |
535 | r->entropy_count = r->poolinfo->POOLBITS; | 537 | entropy_count = r->poolinfo->POOLBITS; |
538 | r->entropy_count = entropy_count; | ||
536 | 539 | ||
537 | /* should we wake readers? */ | 540 | /* should we wake readers? */ |
538 | if (r == &input_pool && | 541 | if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) { |
539 | r->entropy_count >= random_read_wakeup_thresh) { | ||
540 | wake_up_interruptible(&random_read_wait); | 542 | wake_up_interruptible(&random_read_wait); |
541 | kill_fasync(&fasync, SIGIO, POLL_IN); | 543 | kill_fasync(&fasync, SIGIO, POLL_IN); |
542 | } | 544 | } |
543 | |||
544 | spin_unlock_irqrestore(&r->lock, flags); | 545 | spin_unlock_irqrestore(&r->lock, flags); |
545 | } | 546 | } |
546 | 547 | ||
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index a27160ba21d7..daeb8f766971 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -2498,7 +2498,7 @@ static int tiocgwinsz(struct tty_struct *tty, struct winsize __user *arg) | |||
2498 | /** | 2498 | /** |
2499 | * tty_do_resize - resize event | 2499 | * tty_do_resize - resize event |
2500 | * @tty: tty being resized | 2500 | * @tty: tty being resized |
2501 | * @real_tty: real tty (if using a pty/tty pair) | 2501 | * @real_tty: real tty (not the same as tty if using a pty/tty pair) |
2502 | * @rows: rows (character) | 2502 | * @rows: rows (character) |
2503 | * @cols: cols (character) | 2503 | * @cols: cols (character) |
2504 | * | 2504 | * |
@@ -2512,7 +2512,8 @@ int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty, | |||
2512 | struct pid *pgrp, *rpgrp; | 2512 | struct pid *pgrp, *rpgrp; |
2513 | unsigned long flags; | 2513 | unsigned long flags; |
2514 | 2514 | ||
2515 | mutex_lock(&tty->termios_mutex); | 2515 | /* For a PTY we need to lock the tty side */ |
2516 | mutex_lock(&real_tty->termios_mutex); | ||
2516 | if (!memcmp(ws, &tty->winsize, sizeof(*ws))) | 2517 | if (!memcmp(ws, &tty->winsize, sizeof(*ws))) |
2517 | goto done; | 2518 | goto done; |
2518 | /* Get the PID values and reference them so we can | 2519 | /* Get the PID values and reference them so we can |
@@ -2533,7 +2534,7 @@ int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty, | |||
2533 | tty->winsize = *ws; | 2534 | tty->winsize = *ws; |
2534 | real_tty->winsize = *ws; | 2535 | real_tty->winsize = *ws; |
2535 | done: | 2536 | done: |
2536 | mutex_unlock(&tty->termios_mutex); | 2537 | mutex_unlock(&real_tty->termios_mutex); |
2537 | return 0; | 2538 | return 0; |
2538 | } | 2539 | } |
2539 | 2540 | ||
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c index ea9fc5d03b99..bf34e4597421 100644 --- a/drivers/char/tty_ioctl.c +++ b/drivers/char/tty_ioctl.c | |||
@@ -937,12 +937,14 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file, | |||
937 | return 0; | 937 | return 0; |
938 | #endif | 938 | #endif |
939 | case TIOCGSOFTCAR: | 939 | case TIOCGSOFTCAR: |
940 | return put_user(C_CLOCAL(tty) ? 1 : 0, | 940 | /* FIXME: for correctness we may need to take the termios |
941 | lock here - review */ | ||
942 | return put_user(C_CLOCAL(real_tty) ? 1 : 0, | ||
941 | (int __user *)arg); | 943 | (int __user *)arg); |
942 | case TIOCSSOFTCAR: | 944 | case TIOCSSOFTCAR: |
943 | if (get_user(arg, (unsigned int __user *) arg)) | 945 | if (get_user(arg, (unsigned int __user *) arg)) |
944 | return -EFAULT; | 946 | return -EFAULT; |
945 | return tty_change_softcar(tty, arg); | 947 | return tty_change_softcar(real_tty, arg); |
946 | default: | 948 | default: |
947 | return -ENOIOCTLCMD; | 949 | return -ENOIOCTLCMD; |
948 | } | 950 | } |
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c index 8024e3bfd877..b91ef63126ed 100644 --- a/drivers/firmware/iscsi_ibft.c +++ b/drivers/firmware/iscsi_ibft.c | |||
@@ -669,8 +669,7 @@ static int __init ibft_register_kobjects(struct ibft_table_header *header, | |||
669 | 669 | ||
670 | control = (void *)header + sizeof(*header); | 670 | control = (void *)header + sizeof(*header); |
671 | end = (void *)control + control->hdr.length; | 671 | end = (void *)control + control->hdr.length; |
672 | eot_offset = (void *)header + header->length - | 672 | eot_offset = (void *)header + header->length - (void *)control; |
673 | (void *)control - sizeof(*header); | ||
674 | rc = ibft_verify_hdr("control", (struct ibft_hdr *)control, id_control, | 673 | rc = ibft_verify_hdr("control", (struct ibft_hdr *)control, id_control, |
675 | sizeof(*control)); | 674 | sizeof(*control)); |
676 | 675 | ||
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 089c015c01d1..53f0e5af1cc8 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
@@ -400,27 +400,31 @@ static void drm_locked_tasklet_func(unsigned long data) | |||
400 | { | 400 | { |
401 | struct drm_device *dev = (struct drm_device *)data; | 401 | struct drm_device *dev = (struct drm_device *)data; |
402 | unsigned long irqflags; | 402 | unsigned long irqflags; |
403 | 403 | void (*tasklet_func)(struct drm_device *); | |
404 | |||
404 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); | 405 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); |
406 | tasklet_func = dev->locked_tasklet_func; | ||
407 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | ||
405 | 408 | ||
406 | if (!dev->locked_tasklet_func || | 409 | if (!tasklet_func || |
407 | !drm_lock_take(&dev->lock, | 410 | !drm_lock_take(&dev->lock, |
408 | DRM_KERNEL_CONTEXT)) { | 411 | DRM_KERNEL_CONTEXT)) { |
409 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | ||
410 | return; | 412 | return; |
411 | } | 413 | } |
412 | 414 | ||
413 | dev->lock.lock_time = jiffies; | 415 | dev->lock.lock_time = jiffies; |
414 | atomic_inc(&dev->counts[_DRM_STAT_LOCKS]); | 416 | atomic_inc(&dev->counts[_DRM_STAT_LOCKS]); |
415 | 417 | ||
416 | dev->locked_tasklet_func(dev); | 418 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); |
419 | tasklet_func = dev->locked_tasklet_func; | ||
420 | dev->locked_tasklet_func = NULL; | ||
421 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | ||
422 | |||
423 | if (tasklet_func != NULL) | ||
424 | tasklet_func(dev); | ||
417 | 425 | ||
418 | drm_lock_free(&dev->lock, | 426 | drm_lock_free(&dev->lock, |
419 | DRM_KERNEL_CONTEXT); | 427 | DRM_KERNEL_CONTEXT); |
420 | |||
421 | dev->locked_tasklet_func = NULL; | ||
422 | |||
423 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | ||
424 | } | 428 | } |
425 | 429 | ||
426 | /** | 430 | /** |
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 0998723cde79..a4caf95485d7 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c | |||
@@ -105,14 +105,19 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv) | |||
105 | ret ? "interrupted" : "has lock"); | 105 | ret ? "interrupted" : "has lock"); |
106 | if (ret) return ret; | 106 | if (ret) return ret; |
107 | 107 | ||
108 | sigemptyset(&dev->sigmask); | 108 | /* don't set the block all signals on the master process for now |
109 | sigaddset(&dev->sigmask, SIGSTOP); | 109 | * really probably not the correct answer but lets us debug xkb |
110 | sigaddset(&dev->sigmask, SIGTSTP); | 110 | * xserver for now */ |
111 | sigaddset(&dev->sigmask, SIGTTIN); | 111 | if (!file_priv->master) { |
112 | sigaddset(&dev->sigmask, SIGTTOU); | 112 | sigemptyset(&dev->sigmask); |
113 | dev->sigdata.context = lock->context; | 113 | sigaddset(&dev->sigmask, SIGSTOP); |
114 | dev->sigdata.lock = dev->lock.hw_lock; | 114 | sigaddset(&dev->sigmask, SIGTSTP); |
115 | block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); | 115 | sigaddset(&dev->sigmask, SIGTTIN); |
116 | sigaddset(&dev->sigmask, SIGTTOU); | ||
117 | dev->sigdata.context = lock->context; | ||
118 | dev->sigdata.lock = dev->lock.hw_lock; | ||
119 | block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask); | ||
120 | } | ||
116 | 121 | ||
117 | if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY)) | 122 | if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY)) |
118 | dev->driver->dma_ready(dev); | 123 | dev->driver->dma_ready(dev); |
@@ -150,6 +155,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) | |||
150 | { | 155 | { |
151 | struct drm_lock *lock = data; | 156 | struct drm_lock *lock = data; |
152 | unsigned long irqflags; | 157 | unsigned long irqflags; |
158 | void (*tasklet_func)(struct drm_device *); | ||
153 | 159 | ||
154 | if (lock->context == DRM_KERNEL_CONTEXT) { | 160 | if (lock->context == DRM_KERNEL_CONTEXT) { |
155 | DRM_ERROR("Process %d using kernel context %d\n", | 161 | DRM_ERROR("Process %d using kernel context %d\n", |
@@ -158,14 +164,11 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv) | |||
158 | } | 164 | } |
159 | 165 | ||
160 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); | 166 | spin_lock_irqsave(&dev->tasklet_lock, irqflags); |
161 | 167 | tasklet_func = dev->locked_tasklet_func; | |
162 | if (dev->locked_tasklet_func) { | 168 | dev->locked_tasklet_func = NULL; |
163 | dev->locked_tasklet_func(dev); | ||
164 | |||
165 | dev->locked_tasklet_func = NULL; | ||
166 | } | ||
167 | |||
168 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); | 169 | spin_unlock_irqrestore(&dev->tasklet_lock, irqflags); |
170 | if (tasklet_func != NULL) | ||
171 | tasklet_func(dev); | ||
169 | 172 | ||
170 | atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]); | 173 | atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]); |
171 | 174 | ||
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index 702df45320f7..4b27d9abb7bc 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c | |||
@@ -77,6 +77,9 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv, | |||
77 | return -EFAULT; | 77 | return -EFAULT; |
78 | } | 78 | } |
79 | 79 | ||
80 | box.x2--; /* Hardware expects inclusive bottom-right corner */ | ||
81 | box.y2--; | ||
82 | |||
80 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { | 83 | if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) { |
81 | box.x1 = (box.x1) & | 84 | box.x1 = (box.x1) & |
82 | R300_CLIPRECT_MASK; | 85 | R300_CLIPRECT_MASK; |
@@ -95,8 +98,8 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv, | |||
95 | R300_CLIPRECT_MASK; | 98 | R300_CLIPRECT_MASK; |
96 | box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) & | 99 | box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) & |
97 | R300_CLIPRECT_MASK; | 100 | R300_CLIPRECT_MASK; |
98 | |||
99 | } | 101 | } |
102 | |||
100 | OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) | | 103 | OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) | |
101 | (box.y1 << R300_CLIPRECT_Y_SHIFT)); | 104 | (box.y1 << R300_CLIPRECT_Y_SHIFT)); |
102 | OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) | | 105 | OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) | |
@@ -136,6 +139,18 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv, | |||
136 | ADVANCE_RING(); | 139 | ADVANCE_RING(); |
137 | } | 140 | } |
138 | 141 | ||
142 | /* flus cache and wait idle clean after cliprect change */ | ||
143 | BEGIN_RING(2); | ||
144 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | ||
145 | OUT_RING(R300_RB3D_DC_FLUSH); | ||
146 | ADVANCE_RING(); | ||
147 | BEGIN_RING(2); | ||
148 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
149 | OUT_RING(RADEON_WAIT_3D_IDLECLEAN); | ||
150 | ADVANCE_RING(); | ||
151 | /* set flush flag */ | ||
152 | dev_priv->track_flush |= RADEON_FLUSH_EMITED; | ||
153 | |||
139 | return 0; | 154 | return 0; |
140 | } | 155 | } |
141 | 156 | ||
@@ -166,13 +181,13 @@ void r300_init_reg_flags(struct drm_device *dev) | |||
166 | ADD_RANGE(0x21DC, 1); | 181 | ADD_RANGE(0x21DC, 1); |
167 | ADD_RANGE(R300_VAP_UNKNOWN_221C, 1); | 182 | ADD_RANGE(R300_VAP_UNKNOWN_221C, 1); |
168 | ADD_RANGE(R300_VAP_CLIP_X_0, 4); | 183 | ADD_RANGE(R300_VAP_CLIP_X_0, 4); |
169 | ADD_RANGE(R300_VAP_PVS_WAITIDLE, 1); | 184 | ADD_RANGE(R300_VAP_PVS_STATE_FLUSH_REG, 1); |
170 | ADD_RANGE(R300_VAP_UNKNOWN_2288, 1); | 185 | ADD_RANGE(R300_VAP_UNKNOWN_2288, 1); |
171 | ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2); | 186 | ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2); |
172 | ADD_RANGE(R300_VAP_PVS_CNTL_1, 3); | 187 | ADD_RANGE(R300_VAP_PVS_CNTL_1, 3); |
173 | ADD_RANGE(R300_GB_ENABLE, 1); | 188 | ADD_RANGE(R300_GB_ENABLE, 1); |
174 | ADD_RANGE(R300_GB_MSPOS0, 5); | 189 | ADD_RANGE(R300_GB_MSPOS0, 5); |
175 | ADD_RANGE(R300_TX_CNTL, 1); | 190 | ADD_RANGE(R300_TX_INVALTAGS, 1); |
176 | ADD_RANGE(R300_TX_ENABLE, 1); | 191 | ADD_RANGE(R300_TX_ENABLE, 1); |
177 | ADD_RANGE(0x4200, 4); | 192 | ADD_RANGE(0x4200, 4); |
178 | ADD_RANGE(0x4214, 1); | 193 | ADD_RANGE(0x4214, 1); |
@@ -388,15 +403,28 @@ static __inline__ int r300_emit_vpu(drm_radeon_private_t *dev_priv, | |||
388 | if (sz * 16 > cmdbuf->bufsz) | 403 | if (sz * 16 > cmdbuf->bufsz) |
389 | return -EINVAL; | 404 | return -EINVAL; |
390 | 405 | ||
391 | BEGIN_RING(5 + sz * 4); | 406 | /* VAP is very sensitive so we purge cache before we program it |
392 | /* Wait for VAP to come to senses.. */ | 407 | * and we also flush its state before & after */ |
393 | /* there is no need to emit it multiple times, (only once before VAP is programmed, | 408 | BEGIN_RING(6); |
394 | but this optimization is for later */ | 409 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); |
395 | OUT_RING_REG(R300_VAP_PVS_WAITIDLE, 0); | 410 | OUT_RING(R300_RB3D_DC_FLUSH); |
411 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
412 | OUT_RING(RADEON_WAIT_3D_IDLECLEAN); | ||
413 | OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0)); | ||
414 | OUT_RING(0); | ||
415 | ADVANCE_RING(); | ||
416 | /* set flush flag */ | ||
417 | dev_priv->track_flush |= RADEON_FLUSH_EMITED; | ||
418 | |||
419 | BEGIN_RING(3 + sz * 4); | ||
396 | OUT_RING_REG(R300_VAP_PVS_UPLOAD_ADDRESS, addr); | 420 | OUT_RING_REG(R300_VAP_PVS_UPLOAD_ADDRESS, addr); |
397 | OUT_RING(CP_PACKET0_TABLE(R300_VAP_PVS_UPLOAD_DATA, sz * 4 - 1)); | 421 | OUT_RING(CP_PACKET0_TABLE(R300_VAP_PVS_UPLOAD_DATA, sz * 4 - 1)); |
398 | OUT_RING_TABLE((int *)cmdbuf->buf, sz * 4); | 422 | OUT_RING_TABLE((int *)cmdbuf->buf, sz * 4); |
423 | ADVANCE_RING(); | ||
399 | 424 | ||
425 | BEGIN_RING(2); | ||
426 | OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0)); | ||
427 | OUT_RING(0); | ||
400 | ADVANCE_RING(); | 428 | ADVANCE_RING(); |
401 | 429 | ||
402 | cmdbuf->buf += sz * 16; | 430 | cmdbuf->buf += sz * 16; |
@@ -424,6 +452,15 @@ static __inline__ int r300_emit_clear(drm_radeon_private_t *dev_priv, | |||
424 | OUT_RING_TABLE((int *)cmdbuf->buf, 8); | 452 | OUT_RING_TABLE((int *)cmdbuf->buf, 8); |
425 | ADVANCE_RING(); | 453 | ADVANCE_RING(); |
426 | 454 | ||
455 | BEGIN_RING(4); | ||
456 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | ||
457 | OUT_RING(R300_RB3D_DC_FLUSH); | ||
458 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
459 | OUT_RING(RADEON_WAIT_3D_IDLECLEAN); | ||
460 | ADVANCE_RING(); | ||
461 | /* set flush flag */ | ||
462 | dev_priv->track_flush |= RADEON_FLUSH_EMITED; | ||
463 | |||
427 | cmdbuf->buf += 8 * 4; | 464 | cmdbuf->buf += 8 * 4; |
428 | cmdbuf->bufsz -= 8 * 4; | 465 | cmdbuf->bufsz -= 8 * 4; |
429 | 466 | ||
@@ -543,22 +580,23 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv, | |||
543 | return 0; | 580 | return 0; |
544 | } | 581 | } |
545 | 582 | ||
546 | static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv, | 583 | static __inline__ int r300_emit_draw_indx_2(drm_radeon_private_t *dev_priv, |
547 | drm_radeon_kcmd_buffer_t *cmdbuf) | 584 | drm_radeon_kcmd_buffer_t *cmdbuf) |
548 | { | 585 | { |
549 | u32 *cmd = (u32 *) cmdbuf->buf; | 586 | u32 *cmd; |
550 | int count, ret; | 587 | int count; |
588 | int expected_count; | ||
551 | RING_LOCALS; | 589 | RING_LOCALS; |
552 | 590 | ||
553 | count=(cmd[0]>>16) & 0x3fff; | 591 | cmd = (u32 *) cmdbuf->buf; |
592 | count = (cmd[0]>>16) & 0x3fff; | ||
593 | expected_count = cmd[1] >> 16; | ||
594 | if (!(cmd[1] & R300_VAP_VF_CNTL__INDEX_SIZE_32bit)) | ||
595 | expected_count = (expected_count+1)/2; | ||
554 | 596 | ||
555 | if ((cmd[1] & 0x8000ffff) != 0x80000810) { | 597 | if (count && count != expected_count) { |
556 | DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]); | 598 | DRM_ERROR("3D_DRAW_INDX_2: packet size %i, expected %i\n", |
557 | return -EINVAL; | 599 | count, expected_count); |
558 | } | ||
559 | ret = !radeon_check_offset(dev_priv, cmd[2]); | ||
560 | if (ret) { | ||
561 | DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]); | ||
562 | return -EINVAL; | 600 | return -EINVAL; |
563 | } | 601 | } |
564 | 602 | ||
@@ -570,6 +608,50 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv, | |||
570 | cmdbuf->buf += (count+2)*4; | 608 | cmdbuf->buf += (count+2)*4; |
571 | cmdbuf->bufsz -= (count+2)*4; | 609 | cmdbuf->bufsz -= (count+2)*4; |
572 | 610 | ||
611 | if (!count) { | ||
612 | drm_r300_cmd_header_t header; | ||
613 | |||
614 | if (cmdbuf->bufsz < 4*4 + sizeof(header)) { | ||
615 | DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER, but stream is too short.\n"); | ||
616 | return -EINVAL; | ||
617 | } | ||
618 | |||
619 | header.u = *(unsigned int *)cmdbuf->buf; | ||
620 | |||
621 | cmdbuf->buf += sizeof(header); | ||
622 | cmdbuf->bufsz -= sizeof(header); | ||
623 | cmd = (u32 *) cmdbuf->buf; | ||
624 | |||
625 | if (header.header.cmd_type != R300_CMD_PACKET3 || | ||
626 | header.packet3.packet != R300_CMD_PACKET3_RAW || | ||
627 | cmd[0] != CP_PACKET3(RADEON_CP_INDX_BUFFER, 2)) { | ||
628 | DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER.\n"); | ||
629 | return -EINVAL; | ||
630 | } | ||
631 | |||
632 | if ((cmd[1] & 0x8000ffff) != 0x80000810) { | ||
633 | DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]); | ||
634 | return -EINVAL; | ||
635 | } | ||
636 | if (!radeon_check_offset(dev_priv, cmd[2])) { | ||
637 | DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]); | ||
638 | return -EINVAL; | ||
639 | } | ||
640 | if (cmd[3] != expected_count) { | ||
641 | DRM_ERROR("INDX_BUFFER: buffer size %i, expected %i\n", | ||
642 | cmd[3], expected_count); | ||
643 | return -EINVAL; | ||
644 | } | ||
645 | |||
646 | BEGIN_RING(4); | ||
647 | OUT_RING(cmd[0]); | ||
648 | OUT_RING_TABLE((int *)(cmdbuf->buf + 4), 3); | ||
649 | ADVANCE_RING(); | ||
650 | |||
651 | cmdbuf->buf += 4*4; | ||
652 | cmdbuf->bufsz -= 4*4; | ||
653 | } | ||
654 | |||
573 | return 0; | 655 | return 0; |
574 | } | 656 | } |
575 | 657 | ||
@@ -613,11 +695,22 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv, | |||
613 | case RADEON_CNTL_BITBLT_MULTI: | 695 | case RADEON_CNTL_BITBLT_MULTI: |
614 | return r300_emit_bitblt_multi(dev_priv, cmdbuf); | 696 | return r300_emit_bitblt_multi(dev_priv, cmdbuf); |
615 | 697 | ||
616 | case RADEON_CP_INDX_BUFFER: /* DRAW_INDX_2 without INDX_BUFFER seems to lock up the gpu */ | 698 | case RADEON_CP_INDX_BUFFER: |
617 | return r300_emit_indx_buffer(dev_priv, cmdbuf); | 699 | DRM_ERROR("packet3 INDX_BUFFER without preceding 3D_DRAW_INDX_2 is illegal.\n"); |
618 | case RADEON_CP_3D_DRAW_IMMD_2: /* triggers drawing using in-packet vertex data */ | 700 | return -EINVAL; |
619 | case RADEON_CP_3D_DRAW_VBUF_2: /* triggers drawing of vertex buffers setup elsewhere */ | 701 | case RADEON_CP_3D_DRAW_IMMD_2: |
620 | case RADEON_CP_3D_DRAW_INDX_2: /* triggers drawing using indices to vertex buffer */ | 702 | /* triggers drawing using in-packet vertex data */ |
703 | case RADEON_CP_3D_DRAW_VBUF_2: | ||
704 | /* triggers drawing of vertex buffers setup elsewhere */ | ||
705 | dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED | | ||
706 | RADEON_PURGE_EMITED); | ||
707 | break; | ||
708 | case RADEON_CP_3D_DRAW_INDX_2: | ||
709 | /* triggers drawing using indices to vertex buffer */ | ||
710 | /* whenever we send vertex we clear flush & purge */ | ||
711 | dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED | | ||
712 | RADEON_PURGE_EMITED); | ||
713 | return r300_emit_draw_indx_2(dev_priv, cmdbuf); | ||
621 | case RADEON_WAIT_FOR_IDLE: | 714 | case RADEON_WAIT_FOR_IDLE: |
622 | case RADEON_CP_NOP: | 715 | case RADEON_CP_NOP: |
623 | /* these packets are safe */ | 716 | /* these packets are safe */ |
@@ -713,17 +806,53 @@ static __inline__ int r300_emit_packet3(drm_radeon_private_t *dev_priv, | |||
713 | */ | 806 | */ |
714 | static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv) | 807 | static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv) |
715 | { | 808 | { |
809 | uint32_t cache_z, cache_3d, cache_2d; | ||
716 | RING_LOCALS; | 810 | RING_LOCALS; |
717 | 811 | ||
718 | BEGIN_RING(6); | 812 | cache_z = R300_ZC_FLUSH; |
719 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | 813 | cache_2d = R300_RB2D_DC_FLUSH; |
720 | OUT_RING(R300_RB3D_DSTCACHE_UNKNOWN_0A); | 814 | cache_3d = R300_RB3D_DC_FLUSH; |
815 | if (!(dev_priv->track_flush & RADEON_PURGE_EMITED)) { | ||
816 | /* we can purge, primitive where draw since last purge */ | ||
817 | cache_z |= R300_ZC_FREE; | ||
818 | cache_2d |= R300_RB2D_DC_FREE; | ||
819 | cache_3d |= R300_RB3D_DC_FREE; | ||
820 | } | ||
821 | |||
822 | /* flush & purge zbuffer */ | ||
823 | BEGIN_RING(2); | ||
721 | OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0)); | 824 | OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0)); |
722 | OUT_RING(R300_ZB_ZCACHE_CTLSTAT_ZC_FLUSH_FLUSH_AND_FREE| | 825 | OUT_RING(cache_z); |
723 | R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE); | 826 | ADVANCE_RING(); |
724 | OUT_RING(CP_PACKET3(RADEON_CP_NOP, 0)); | 827 | /* flush & purge 3d */ |
725 | OUT_RING(0x0); | 828 | BEGIN_RING(2); |
829 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); | ||
830 | OUT_RING(cache_3d); | ||
831 | ADVANCE_RING(); | ||
832 | /* flush & purge texture */ | ||
833 | BEGIN_RING(2); | ||
834 | OUT_RING(CP_PACKET0(R300_TX_INVALTAGS, 0)); | ||
835 | OUT_RING(0); | ||
836 | ADVANCE_RING(); | ||
837 | /* FIXME: is this one really needed ? */ | ||
838 | BEGIN_RING(2); | ||
839 | OUT_RING(CP_PACKET0(R300_RB3D_AARESOLVE_CTL, 0)); | ||
840 | OUT_RING(0); | ||
841 | ADVANCE_RING(); | ||
842 | BEGIN_RING(2); | ||
843 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
844 | OUT_RING(RADEON_WAIT_3D_IDLECLEAN); | ||
845 | ADVANCE_RING(); | ||
846 | /* flush & purge 2d through E2 as RB2D will trigger lockup */ | ||
847 | BEGIN_RING(4); | ||
848 | OUT_RING(CP_PACKET0(R300_DSTCACHE_CTLSTAT, 0)); | ||
849 | OUT_RING(cache_2d); | ||
850 | OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0)); | ||
851 | OUT_RING(RADEON_WAIT_2D_IDLECLEAN | | ||
852 | RADEON_WAIT_HOST_IDLECLEAN); | ||
726 | ADVANCE_RING(); | 853 | ADVANCE_RING(); |
854 | /* set flush & purge flags */ | ||
855 | dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED; | ||
727 | } | 856 | } |
728 | 857 | ||
729 | /** | 858 | /** |
@@ -905,8 +1034,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev, | |||
905 | 1034 | ||
906 | DRM_DEBUG("\n"); | 1035 | DRM_DEBUG("\n"); |
907 | 1036 | ||
908 | /* See the comment above r300_emit_begin3d for why this call must be here, | 1037 | /* pacify */ |
909 | * and what the cleanup gotos are for. */ | ||
910 | r300_pacify(dev_priv); | 1038 | r300_pacify(dev_priv); |
911 | 1039 | ||
912 | if (cmdbuf->nbox <= R300_SIMULTANEOUS_CLIPRECTS) { | 1040 | if (cmdbuf->nbox <= R300_SIMULTANEOUS_CLIPRECTS) { |
diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h index a6802f26afc4..ee6f811599a3 100644 --- a/drivers/gpu/drm/radeon/r300_reg.h +++ b/drivers/gpu/drm/radeon/r300_reg.h | |||
@@ -317,7 +317,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
317 | * Therefore, I suspect writing zero to 0x2284 synchronizes the engine and | 317 | * Therefore, I suspect writing zero to 0x2284 synchronizes the engine and |
318 | * avoids bugs caused by still running shaders reading bad data from memory. | 318 | * avoids bugs caused by still running shaders reading bad data from memory. |
319 | */ | 319 | */ |
320 | #define R300_VAP_PVS_WAITIDLE 0x2284 /* GUESS */ | 320 | #define R300_VAP_PVS_STATE_FLUSH_REG 0x2284 |
321 | 321 | ||
322 | /* Absolutely no clue what this register is about. */ | 322 | /* Absolutely no clue what this register is about. */ |
323 | #define R300_VAP_UNKNOWN_2288 0x2288 | 323 | #define R300_VAP_UNKNOWN_2288 0x2288 |
@@ -513,7 +513,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
513 | /* gap */ | 513 | /* gap */ |
514 | 514 | ||
515 | /* Zero to flush caches. */ | 515 | /* Zero to flush caches. */ |
516 | #define R300_TX_CNTL 0x4100 | 516 | #define R300_TX_INVALTAGS 0x4100 |
517 | #define R300_TX_FLUSH 0x0 | 517 | #define R300_TX_FLUSH 0x0 |
518 | 518 | ||
519 | /* The upper enable bits are guessed, based on fglrx reported limits. */ | 519 | /* The upper enable bits are guessed, based on fglrx reported limits. */ |
@@ -1362,6 +1362,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. | |||
1362 | #define R300_RB3D_COLORPITCH2 0x4E40 /* GUESS */ | 1362 | #define R300_RB3D_COLORPITCH2 0x4E40 /* GUESS */ |
1363 | #define R300_RB3D_COLORPITCH3 0x4E44 /* GUESS */ | 1363 | #define R300_RB3D_COLORPITCH3 0x4E44 /* GUESS */ |
1364 | 1364 | ||
1365 | #define R300_RB3D_AARESOLVE_CTL 0x4E88 | ||
1365 | /* gap */ | 1366 | /* gap */ |
1366 | 1367 | ||
1367 | /* Guess by Vladimir. | 1368 | /* Guess by Vladimir. |
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c index f0de81a5689d..248ab4a7d39f 100644 --- a/drivers/gpu/drm/radeon/radeon_cp.c +++ b/drivers/gpu/drm/radeon/radeon_cp.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #define RADEON_FIFO_DEBUG 0 | 40 | #define RADEON_FIFO_DEBUG 0 |
41 | 41 | ||
42 | static int radeon_do_cleanup_cp(struct drm_device * dev); | 42 | static int radeon_do_cleanup_cp(struct drm_device * dev); |
43 | static void radeon_do_cp_start(drm_radeon_private_t * dev_priv); | ||
43 | 44 | ||
44 | static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) | 45 | static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr) |
45 | { | 46 | { |
@@ -198,23 +199,8 @@ static int radeon_do_pixcache_flush(drm_radeon_private_t * dev_priv) | |||
198 | DRM_UDELAY(1); | 199 | DRM_UDELAY(1); |
199 | } | 200 | } |
200 | } else { | 201 | } else { |
201 | /* 3D */ | 202 | /* don't flush or purge cache here or lockup */ |
202 | tmp = RADEON_READ(R300_RB3D_DSTCACHE_CTLSTAT); | 203 | return 0; |
203 | tmp |= RADEON_RB3D_DC_FLUSH_ALL; | ||
204 | RADEON_WRITE(R300_RB3D_DSTCACHE_CTLSTAT, tmp); | ||
205 | |||
206 | /* 2D */ | ||
207 | tmp = RADEON_READ(R300_DSTCACHE_CTLSTAT); | ||
208 | tmp |= RADEON_RB3D_DC_FLUSH_ALL; | ||
209 | RADEON_WRITE(R300_DSTCACHE_CTLSTAT, tmp); | ||
210 | |||
211 | for (i = 0; i < dev_priv->usec_timeout; i++) { | ||
212 | if (!(RADEON_READ(R300_DSTCACHE_CTLSTAT) | ||
213 | & RADEON_RB3D_DC_BUSY)) { | ||
214 | return 0; | ||
215 | } | ||
216 | DRM_UDELAY(1); | ||
217 | } | ||
218 | } | 204 | } |
219 | 205 | ||
220 | #if RADEON_FIFO_DEBUG | 206 | #if RADEON_FIFO_DEBUG |
@@ -237,6 +223,9 @@ static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries) | |||
237 | return 0; | 223 | return 0; |
238 | DRM_UDELAY(1); | 224 | DRM_UDELAY(1); |
239 | } | 225 | } |
226 | DRM_DEBUG("wait for fifo failed status : 0x%08X 0x%08X\n", | ||
227 | RADEON_READ(RADEON_RBBM_STATUS), | ||
228 | RADEON_READ(R300_VAP_CNTL_STATUS)); | ||
240 | 229 | ||
241 | #if RADEON_FIFO_DEBUG | 230 | #if RADEON_FIFO_DEBUG |
242 | DRM_ERROR("failed!\n"); | 231 | DRM_ERROR("failed!\n"); |
@@ -263,6 +252,9 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv) | |||
263 | } | 252 | } |
264 | DRM_UDELAY(1); | 253 | DRM_UDELAY(1); |
265 | } | 254 | } |
255 | DRM_DEBUG("wait idle failed status : 0x%08X 0x%08X\n", | ||
256 | RADEON_READ(RADEON_RBBM_STATUS), | ||
257 | RADEON_READ(R300_VAP_CNTL_STATUS)); | ||
266 | 258 | ||
267 | #if RADEON_FIFO_DEBUG | 259 | #if RADEON_FIFO_DEBUG |
268 | DRM_ERROR("failed!\n"); | 260 | DRM_ERROR("failed!\n"); |
@@ -443,14 +435,20 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv) | |||
443 | 435 | ||
444 | dev_priv->cp_running = 1; | 436 | dev_priv->cp_running = 1; |
445 | 437 | ||
446 | BEGIN_RING(6); | 438 | BEGIN_RING(8); |
447 | 439 | /* isync can only be written through cp on r5xx write it here */ | |
440 | OUT_RING(CP_PACKET0(RADEON_ISYNC_CNTL, 0)); | ||
441 | OUT_RING(RADEON_ISYNC_ANY2D_IDLE3D | | ||
442 | RADEON_ISYNC_ANY3D_IDLE2D | | ||
443 | RADEON_ISYNC_WAIT_IDLEGUI | | ||
444 | RADEON_ISYNC_CPSCRATCH_IDLEGUI); | ||
448 | RADEON_PURGE_CACHE(); | 445 | RADEON_PURGE_CACHE(); |
449 | RADEON_PURGE_ZCACHE(); | 446 | RADEON_PURGE_ZCACHE(); |
450 | RADEON_WAIT_UNTIL_IDLE(); | 447 | RADEON_WAIT_UNTIL_IDLE(); |
451 | |||
452 | ADVANCE_RING(); | 448 | ADVANCE_RING(); |
453 | COMMIT_RING(); | 449 | COMMIT_RING(); |
450 | |||
451 | dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED; | ||
454 | } | 452 | } |
455 | 453 | ||
456 | /* Reset the Command Processor. This will not flush any pending | 454 | /* Reset the Command Processor. This will not flush any pending |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 3f0eca957aa7..099381693175 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
@@ -220,6 +220,9 @@ struct radeon_virt_surface { | |||
220 | struct drm_file *file_priv; | 220 | struct drm_file *file_priv; |
221 | }; | 221 | }; |
222 | 222 | ||
223 | #define RADEON_FLUSH_EMITED (1 < 0) | ||
224 | #define RADEON_PURGE_EMITED (1 < 1) | ||
225 | |||
223 | typedef struct drm_radeon_private { | 226 | typedef struct drm_radeon_private { |
224 | drm_radeon_ring_buffer_t ring; | 227 | drm_radeon_ring_buffer_t ring; |
225 | drm_radeon_sarea_t *sarea_priv; | 228 | drm_radeon_sarea_t *sarea_priv; |
@@ -311,6 +314,7 @@ typedef struct drm_radeon_private { | |||
311 | unsigned long fb_aper_offset; | 314 | unsigned long fb_aper_offset; |
312 | 315 | ||
313 | int num_gb_pipes; | 316 | int num_gb_pipes; |
317 | int track_flush; | ||
314 | } drm_radeon_private_t; | 318 | } drm_radeon_private_t; |
315 | 319 | ||
316 | typedef struct drm_radeon_buf_priv { | 320 | typedef struct drm_radeon_buf_priv { |
@@ -693,7 +697,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
693 | #define R300_ZB_ZCACHE_CTLSTAT 0x4f18 | 697 | #define R300_ZB_ZCACHE_CTLSTAT 0x4f18 |
694 | # define R300_ZC_FLUSH (1 << 0) | 698 | # define R300_ZC_FLUSH (1 << 0) |
695 | # define R300_ZC_FREE (1 << 1) | 699 | # define R300_ZC_FREE (1 << 1) |
696 | # define R300_ZC_FLUSH_ALL 0x3 | ||
697 | # define R300_ZC_BUSY (1 << 31) | 700 | # define R300_ZC_BUSY (1 << 31) |
698 | #define RADEON_RB3D_DSTCACHE_CTLSTAT 0x325c | 701 | #define RADEON_RB3D_DSTCACHE_CTLSTAT 0x325c |
699 | # define RADEON_RB3D_DC_FLUSH (3 << 0) | 702 | # define RADEON_RB3D_DC_FLUSH (3 << 0) |
@@ -701,6 +704,8 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
701 | # define RADEON_RB3D_DC_FLUSH_ALL 0xf | 704 | # define RADEON_RB3D_DC_FLUSH_ALL 0xf |
702 | # define RADEON_RB3D_DC_BUSY (1 << 31) | 705 | # define RADEON_RB3D_DC_BUSY (1 << 31) |
703 | #define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c | 706 | #define R300_RB3D_DSTCACHE_CTLSTAT 0x4e4c |
707 | # define R300_RB3D_DC_FLUSH (2 << 0) | ||
708 | # define R300_RB3D_DC_FREE (2 << 2) | ||
704 | # define R300_RB3D_DC_FINISH (1 << 4) | 709 | # define R300_RB3D_DC_FINISH (1 << 4) |
705 | #define RADEON_RB3D_ZSTENCILCNTL 0x1c2c | 710 | #define RADEON_RB3D_ZSTENCILCNTL 0x1c2c |
706 | # define RADEON_Z_TEST_MASK (7 << 4) | 711 | # define RADEON_Z_TEST_MASK (7 << 4) |
@@ -1246,17 +1251,17 @@ do { \ | |||
1246 | OUT_RING(RADEON_RB3D_DC_FLUSH); \ | 1251 | OUT_RING(RADEON_RB3D_DC_FLUSH); \ |
1247 | } else { \ | 1252 | } else { \ |
1248 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | 1253 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ |
1249 | OUT_RING(RADEON_RB3D_DC_FLUSH); \ | 1254 | OUT_RING(R300_RB3D_DC_FLUSH); \ |
1250 | } \ | 1255 | } \ |
1251 | } while (0) | 1256 | } while (0) |
1252 | 1257 | ||
1253 | #define RADEON_PURGE_CACHE() do { \ | 1258 | #define RADEON_PURGE_CACHE() do { \ |
1254 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ | 1259 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ |
1255 | OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0)); \ | 1260 | OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0)); \ |
1256 | OUT_RING(RADEON_RB3D_DC_FLUSH_ALL); \ | 1261 | OUT_RING(RADEON_RB3D_DC_FLUSH | RADEON_RB3D_DC_FREE); \ |
1257 | } else { \ | 1262 | } else { \ |
1258 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | 1263 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ |
1259 | OUT_RING(RADEON_RB3D_DC_FLUSH_ALL); \ | 1264 | OUT_RING(R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE); \ |
1260 | } \ | 1265 | } \ |
1261 | } while (0) | 1266 | } while (0) |
1262 | 1267 | ||
@@ -1273,10 +1278,10 @@ do { \ | |||
1273 | #define RADEON_PURGE_ZCACHE() do { \ | 1278 | #define RADEON_PURGE_ZCACHE() do { \ |
1274 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ | 1279 | if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) { \ |
1275 | OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0)); \ | 1280 | OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0)); \ |
1276 | OUT_RING(RADEON_RB3D_ZC_FLUSH_ALL); \ | 1281 | OUT_RING(RADEON_RB3D_ZC_FLUSH | RADEON_RB3D_ZC_FREE); \ |
1277 | } else { \ | 1282 | } else { \ |
1278 | OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0)); \ | 1283 | OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0)); \ |
1279 | OUT_RING(R300_ZC_FLUSH_ALL); \ | 1284 | OUT_RING(R300_ZC_FLUSH | R300_ZC_FREE); \ |
1280 | } \ | 1285 | } \ |
1281 | } while (0) | 1286 | } while (0) |
1282 | 1287 | ||
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index e7eb7bf9ddec..608038d64f81 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -589,11 +589,16 @@ omap_i2c_probe(struct platform_device *pdev) | |||
589 | 589 | ||
590 | dev->dev = &pdev->dev; | 590 | dev->dev = &pdev->dev; |
591 | dev->irq = irq->start; | 591 | dev->irq = irq->start; |
592 | dev->base = (void __iomem *) IO_ADDRESS(mem->start); | 592 | dev->base = ioremap(mem->start, mem->end - mem->start + 1); |
593 | if (!dev->base) { | ||
594 | r = -ENOMEM; | ||
595 | goto err_free_mem; | ||
596 | } | ||
597 | |||
593 | platform_set_drvdata(pdev, dev); | 598 | platform_set_drvdata(pdev, dev); |
594 | 599 | ||
595 | if ((r = omap_i2c_get_clocks(dev)) != 0) | 600 | if ((r = omap_i2c_get_clocks(dev)) != 0) |
596 | goto err_free_mem; | 601 | goto err_iounmap; |
597 | 602 | ||
598 | omap_i2c_unidle(dev); | 603 | omap_i2c_unidle(dev); |
599 | 604 | ||
@@ -640,6 +645,8 @@ err_unuse_clocks: | |||
640 | omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0); | 645 | omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0); |
641 | omap_i2c_idle(dev); | 646 | omap_i2c_idle(dev); |
642 | omap_i2c_put_clocks(dev); | 647 | omap_i2c_put_clocks(dev); |
648 | err_iounmap: | ||
649 | iounmap(dev->base); | ||
643 | err_free_mem: | 650 | err_free_mem: |
644 | platform_set_drvdata(pdev, NULL); | 651 | platform_set_drvdata(pdev, NULL); |
645 | kfree(dev); | 652 | kfree(dev); |
@@ -661,6 +668,7 @@ omap_i2c_remove(struct platform_device *pdev) | |||
661 | i2c_del_adapter(&dev->adapter); | 668 | i2c_del_adapter(&dev->adapter); |
662 | omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0); | 669 | omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0); |
663 | omap_i2c_put_clocks(dev); | 670 | omap_i2c_put_clocks(dev); |
671 | iounmap(dev->base); | ||
664 | kfree(dev); | 672 | kfree(dev); |
665 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 673 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
666 | release_mem_region(mem->start, (mem->end - mem->start) + 1); | 674 | release_mem_region(mem->start, (mem->end - mem->start) + 1); |
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 550853f79ae8..b346a687ab59 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c | |||
@@ -108,6 +108,9 @@ static int i2c_device_probe(struct device *dev) | |||
108 | if (!driver->probe || !driver->id_table) | 108 | if (!driver->probe || !driver->id_table) |
109 | return -ENODEV; | 109 | return -ENODEV; |
110 | client->driver = driver; | 110 | client->driver = driver; |
111 | if (!device_can_wakeup(&client->dev)) | ||
112 | device_init_wakeup(&client->dev, | ||
113 | client->flags & I2C_CLIENT_WAKE); | ||
111 | dev_dbg(dev, "probe\n"); | 114 | dev_dbg(dev, "probe\n"); |
112 | 115 | ||
113 | status = driver->probe(client, i2c_match_id(driver->id_table, client)); | 116 | status = driver->probe(client, i2c_match_id(driver->id_table, client)); |
@@ -262,9 +265,8 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info) | |||
262 | client->adapter = adap; | 265 | client->adapter = adap; |
263 | 266 | ||
264 | client->dev.platform_data = info->platform_data; | 267 | client->dev.platform_data = info->platform_data; |
265 | device_init_wakeup(&client->dev, info->flags & I2C_CLIENT_WAKE); | ||
266 | 268 | ||
267 | client->flags = info->flags & ~I2C_CLIENT_WAKE; | 269 | client->flags = info->flags; |
268 | client->addr = info->addr; | 270 | client->addr = info->addr; |
269 | client->irq = info->irq; | 271 | client->irq = info->irq; |
270 | 272 | ||
@@ -1188,8 +1190,8 @@ int i2c_probe(struct i2c_adapter *adapter, | |||
1188 | && address_data->normal_i2c[0] == I2C_CLIENT_END) | 1190 | && address_data->normal_i2c[0] == I2C_CLIENT_END) |
1189 | return 0; | 1191 | return 0; |
1190 | 1192 | ||
1191 | dev_warn(&adapter->dev, "SMBus Quick command not supported, " | 1193 | dev_dbg(&adapter->dev, "SMBus Quick command not supported, " |
1192 | "can't probe for chips\n"); | 1194 | "can't probe for chips\n"); |
1193 | return -EOPNOTSUPP; | 1195 | return -EOPNOTSUPP; |
1194 | } | 1196 | } |
1195 | 1197 | ||
@@ -1350,6 +1352,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) | |||
1350 | } | 1352 | } |
1351 | } | 1353 | } |
1352 | 1354 | ||
1355 | /* Stop here if the classes do not match */ | ||
1356 | if (!(adapter->class & driver->class)) | ||
1357 | goto exit_free; | ||
1358 | |||
1353 | /* Stop here if we can't use SMBUS_QUICK */ | 1359 | /* Stop here if we can't use SMBUS_QUICK */ |
1354 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) { | 1360 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) { |
1355 | if (address_data->probe[0] == I2C_CLIENT_END | 1361 | if (address_data->probe[0] == I2C_CLIENT_END |
@@ -1362,10 +1368,6 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver) | |||
1362 | goto exit_free; | 1368 | goto exit_free; |
1363 | } | 1369 | } |
1364 | 1370 | ||
1365 | /* Stop here if the classes do not match */ | ||
1366 | if (!(adapter->class & driver->class)) | ||
1367 | goto exit_free; | ||
1368 | |||
1369 | /* Probe entries are done second, and are not affected by ignore | 1371 | /* Probe entries are done second, and are not affected by ignore |
1370 | entries either */ | 1372 | entries either */ |
1371 | for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) { | 1373 | for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) { |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index a34758d29516..fc735ab08ff4 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -242,7 +242,7 @@ config BLK_DEV_IDEFLOPPY | |||
242 | module will be called ide-floppy. | 242 | module will be called ide-floppy. |
243 | 243 | ||
244 | config BLK_DEV_IDESCSI | 244 | config BLK_DEV_IDESCSI |
245 | tristate "SCSI emulation support" | 245 | tristate "SCSI emulation support (DEPRECATED)" |
246 | depends on SCSI | 246 | depends on SCSI |
247 | select IDE_ATAPI | 247 | select IDE_ATAPI |
248 | ---help--- | 248 | ---help--- |
@@ -255,20 +255,6 @@ config BLK_DEV_IDESCSI | |||
255 | and will allow you to use a SCSI device driver instead of a native | 255 | and will allow you to use a SCSI device driver instead of a native |
256 | ATAPI driver. | 256 | ATAPI driver. |
257 | 257 | ||
258 | This is useful if you have an ATAPI device for which no native | ||
259 | driver has been written (for example, an ATAPI PD-CD drive); | ||
260 | you can then use this emulation together with an appropriate SCSI | ||
261 | device driver. In order to do this, say Y here and to "SCSI support" | ||
262 | and "SCSI generic support", below. You must then provide the kernel | ||
263 | command line "hdx=ide-scsi" (try "man bootparam" or see the | ||
264 | documentation of your boot loader (lilo or loadlin) about how to | ||
265 | pass options to the kernel at boot time) for devices if you want the | ||
266 | native EIDE sub-drivers to skip over the native support, so that | ||
267 | this SCSI emulation can be used instead. | ||
268 | |||
269 | Note that this option does NOT allow you to attach SCSI devices to a | ||
270 | box that doesn't have a SCSI host adapter installed. | ||
271 | |||
272 | If both this SCSI emulation and native ATAPI support are compiled | 258 | If both this SCSI emulation and native ATAPI support are compiled |
273 | into the kernel, the native support will be used. | 259 | into the kernel, the native support will be used. |
274 | 260 | ||
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c index f788fa5a977b..4fd91dcf1dc2 100644 --- a/drivers/ide/arm/palm_bk3710.c +++ b/drivers/ide/arm/palm_bk3710.c | |||
@@ -343,11 +343,10 @@ static struct ide_port_info __devinitdata palm_bk3710_port_info = { | |||
343 | .mwdma_mask = ATA_MWDMA2, | 343 | .mwdma_mask = ATA_MWDMA2, |
344 | }; | 344 | }; |
345 | 345 | ||
346 | static int __devinit palm_bk3710_probe(struct platform_device *pdev) | 346 | static int __init palm_bk3710_probe(struct platform_device *pdev) |
347 | { | 347 | { |
348 | struct clk *clk; | 348 | struct clk *clk; |
349 | struct resource *mem, *irq; | 349 | struct resource *mem, *irq; |
350 | struct ide_host *host; | ||
351 | unsigned long base, rate; | 350 | unsigned long base, rate; |
352 | int i, rc; | 351 | int i, rc; |
353 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 352 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; |
@@ -390,6 +389,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev) | |||
390 | hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i; | 389 | hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i; |
391 | hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET; | 390 | hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET; |
392 | hw.irq = irq->start; | 391 | hw.irq = irq->start; |
392 | hw.dev = &pdev->dev; | ||
393 | hw.chipset = ide_palm3710; | 393 | hw.chipset = ide_palm3710; |
394 | 394 | ||
395 | palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 : | 395 | palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 : |
@@ -413,13 +413,11 @@ static struct platform_driver platform_bk_driver = { | |||
413 | .name = "palm_bk3710", | 413 | .name = "palm_bk3710", |
414 | .owner = THIS_MODULE, | 414 | .owner = THIS_MODULE, |
415 | }, | 415 | }, |
416 | .probe = palm_bk3710_probe, | ||
417 | .remove = NULL, | ||
418 | }; | 416 | }; |
419 | 417 | ||
420 | static int __init palm_bk3710_init(void) | 418 | static int __init palm_bk3710_init(void) |
421 | { | 419 | { |
422 | return platform_driver_register(&platform_bk_driver); | 420 | return platform_driver_probe(&platform_bk_driver, palm_bk3710_probe); |
423 | } | 421 | } |
424 | 422 | ||
425 | module_init(palm_bk3710_init); | 423 | module_init(palm_bk3710_init); |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 49a8c589e346..f1489999cf91 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -1933,6 +1933,7 @@ static void ide_cd_remove(ide_drive_t *drive) | |||
1933 | 1933 | ||
1934 | ide_proc_unregister_driver(drive, info->driver); | 1934 | ide_proc_unregister_driver(drive, info->driver); |
1935 | 1935 | ||
1936 | blk_unregister_filter(info->disk); | ||
1936 | del_gendisk(info->disk); | 1937 | del_gendisk(info->disk); |
1937 | 1938 | ||
1938 | ide_cd_put(info); | 1939 | ide_cd_put(info); |
@@ -2158,6 +2159,7 @@ static int ide_cd_probe(ide_drive_t *drive) | |||
2158 | g->fops = &idecd_ops; | 2159 | g->fops = &idecd_ops; |
2159 | g->flags |= GENHD_FL_REMOVABLE; | 2160 | g->flags |= GENHD_FL_REMOVABLE; |
2160 | add_disk(g); | 2161 | add_disk(g); |
2162 | blk_register_filter(g); | ||
2161 | return 0; | 2163 | return 0; |
2162 | 2164 | ||
2163 | out_free_cd: | 2165 | out_free_cd: |
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 68b9cf0138b0..07ef88bd109b 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
@@ -445,20 +445,6 @@ static void idedisk_check_hpa(ide_drive_t *drive) | |||
445 | } | 445 | } |
446 | } | 446 | } |
447 | 447 | ||
448 | /* | ||
449 | * Compute drive->capacity, the full capacity of the drive | ||
450 | * Called with drive->id != NULL. | ||
451 | * | ||
452 | * To compute capacity, this uses either of | ||
453 | * | ||
454 | * 1. CHS value set by user (whatever user sets will be trusted) | ||
455 | * 2. LBA value from target drive (require new ATA feature) | ||
456 | * 3. LBA value from system BIOS (new one is OK, old one may break) | ||
457 | * 4. CHS value from system BIOS (traditional style) | ||
458 | * | ||
459 | * in above order (i.e., if value of higher priority is available, | ||
460 | * reset will be ignored). | ||
461 | */ | ||
462 | static void init_idedisk_capacity(ide_drive_t *drive) | 448 | static void init_idedisk_capacity(ide_drive_t *drive) |
463 | { | 449 | { |
464 | struct hd_driveid *id = drive->id; | 450 | struct hd_driveid *id = drive->id; |
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c index a4cdb465cd1d..87f5c5a87b98 100644 --- a/drivers/infiniband/hw/mlx4/mr.c +++ b/drivers/infiniband/hw/mlx4/mr.c | |||
@@ -204,6 +204,8 @@ struct ib_mr *mlx4_ib_alloc_fast_reg_mr(struct ib_pd *pd, | |||
204 | if (err) | 204 | if (err) |
205 | goto err_mr; | 205 | goto err_mr; |
206 | 206 | ||
207 | mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key; | ||
208 | |||
207 | return &mr->ibmr; | 209 | return &mr->ibmr; |
208 | 210 | ||
209 | err_mr: | 211 | err_mr: |
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index 6f227d3dbda1..e348cfccc17a 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <linux/input.h> | 43 | #include <linux/input.h> |
44 | 44 | ||
45 | #include <asm/portmux.h> | 45 | #include <asm/portmux.h> |
46 | #include <asm/mach/bf54x_keys.h> | 46 | #include <mach/bf54x_keys.h> |
47 | 47 | ||
48 | #define DRV_NAME "bf54x-keys" | 48 | #define DRV_NAME "bf54x-keys" |
49 | #define TIME_SCALE 100 /* 100 ns */ | 49 | #define TIME_SCALE 100 /* 100 ns */ |
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index dcea87a0bc56..039787f81ed8 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -62,7 +62,7 @@ struct omap_kp { | |||
62 | unsigned int debounce; | 62 | unsigned int debounce; |
63 | }; | 63 | }; |
64 | 64 | ||
65 | DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0); | 65 | static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0); |
66 | 66 | ||
67 | static int *keymap; | 67 | static int *keymap; |
68 | static unsigned int *row_gpios; | 68 | static unsigned int *row_gpios; |
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 7e65bad522cb..ac89a5deaca2 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -238,15 +238,47 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde | |||
238 | 238 | ||
239 | } | 239 | } |
240 | 240 | ||
241 | static mdk_rdev_t *next_active_rdev(mdk_rdev_t *rdev, mddev_t *mddev) | ||
242 | { | ||
243 | /* Iterate the disks of an mddev, using rcu to protect access to the | ||
244 | * linked list, and raising the refcount of devices we return to ensure | ||
245 | * they don't disappear while in use. | ||
246 | * As devices are only added or removed when raid_disk is < 0 and | ||
247 | * nr_pending is 0 and In_sync is clear, the entries we return will | ||
248 | * still be in the same position on the list when we re-enter | ||
249 | * list_for_each_continue_rcu. | ||
250 | */ | ||
251 | struct list_head *pos; | ||
252 | rcu_read_lock(); | ||
253 | if (rdev == NULL) | ||
254 | /* start at the beginning */ | ||
255 | pos = &mddev->disks; | ||
256 | else { | ||
257 | /* release the previous rdev and start from there. */ | ||
258 | rdev_dec_pending(rdev, mddev); | ||
259 | pos = &rdev->same_set; | ||
260 | } | ||
261 | list_for_each_continue_rcu(pos, &mddev->disks) { | ||
262 | rdev = list_entry(pos, mdk_rdev_t, same_set); | ||
263 | if (rdev->raid_disk >= 0 && | ||
264 | test_bit(In_sync, &rdev->flags) && | ||
265 | !test_bit(Faulty, &rdev->flags)) { | ||
266 | /* this is a usable devices */ | ||
267 | atomic_inc(&rdev->nr_pending); | ||
268 | rcu_read_unlock(); | ||
269 | return rdev; | ||
270 | } | ||
271 | } | ||
272 | rcu_read_unlock(); | ||
273 | return NULL; | ||
274 | } | ||
275 | |||
241 | static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) | 276 | static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) |
242 | { | 277 | { |
243 | mdk_rdev_t *rdev; | 278 | mdk_rdev_t *rdev = NULL; |
244 | mddev_t *mddev = bitmap->mddev; | 279 | mddev_t *mddev = bitmap->mddev; |
245 | 280 | ||
246 | rcu_read_lock(); | 281 | while ((rdev = next_active_rdev(rdev, mddev)) != NULL) { |
247 | rdev_for_each_rcu(rdev, mddev) | ||
248 | if (test_bit(In_sync, &rdev->flags) | ||
249 | && !test_bit(Faulty, &rdev->flags)) { | ||
250 | int size = PAGE_SIZE; | 282 | int size = PAGE_SIZE; |
251 | if (page->index == bitmap->file_pages-1) | 283 | if (page->index == bitmap->file_pages-1) |
252 | size = roundup(bitmap->last_page_size, | 284 | size = roundup(bitmap->last_page_size, |
@@ -281,8 +313,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) | |||
281 | + page->index * (PAGE_SIZE/512), | 313 | + page->index * (PAGE_SIZE/512), |
282 | size, | 314 | size, |
283 | page); | 315 | page); |
284 | } | 316 | } |
285 | rcu_read_unlock(); | ||
286 | 317 | ||
287 | if (wait) | 318 | if (wait) |
288 | md_super_wait(mddev); | 319 | md_super_wait(mddev); |
diff --git a/drivers/md/md.c b/drivers/md/md.c index 8cfadc5bd2ba..4790c83d78d0 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -3841,8 +3841,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) | |||
3841 | 3841 | ||
3842 | del_timer_sync(&mddev->safemode_timer); | 3842 | del_timer_sync(&mddev->safemode_timer); |
3843 | 3843 | ||
3844 | invalidate_partition(disk, 0); | ||
3845 | |||
3846 | switch(mode) { | 3844 | switch(mode) { |
3847 | case 1: /* readonly */ | 3845 | case 1: /* readonly */ |
3848 | err = -ENXIO; | 3846 | err = -ENXIO; |
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c index 48f4b92a8f8b..79faedf58521 100644 --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c | |||
@@ -403,6 +403,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname) | |||
403 | ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev); | 403 | ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev); |
404 | if (ret) { | 404 | if (ret) { |
405 | err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret); | 405 | err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret); |
406 | kfree(b); | ||
406 | return ret; | 407 | return ret; |
407 | } | 408 | } |
408 | 409 | ||
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c index c6c77a505ec1..d8b0d326e452 100644 --- a/drivers/misc/acer-wmi.c +++ b/drivers/misc/acer-wmi.c | |||
@@ -1189,7 +1189,7 @@ static int create_debugfs(void) | |||
1189 | return 0; | 1189 | return 0; |
1190 | 1190 | ||
1191 | error_debugfs: | 1191 | error_debugfs: |
1192 | remove_debugfs(); | 1192 | remove_debugfs(); |
1193 | return -ENOMEM; | 1193 | return -ENOMEM; |
1194 | } | 1194 | } |
1195 | 1195 | ||
@@ -1272,6 +1272,7 @@ error_platform_register: | |||
1272 | static void __exit acer_wmi_exit(void) | 1272 | static void __exit acer_wmi_exit(void) |
1273 | { | 1273 | { |
1274 | remove_sysfs(acer_platform_device); | 1274 | remove_sysfs(acer_platform_device); |
1275 | remove_debugfs(); | ||
1275 | platform_device_del(acer_platform_device); | 1276 | platform_device_del(acer_platform_device); |
1276 | platform_driver_unregister(&acer_platform_driver); | 1277 | platform_driver_unregister(&acer_platform_driver); |
1277 | 1278 | ||
diff --git a/drivers/misc/hp-wmi.c b/drivers/misc/hp-wmi.c index 1dbcbcb323a2..6d407c2a4f91 100644 --- a/drivers/misc/hp-wmi.c +++ b/drivers/misc/hp-wmi.c | |||
@@ -49,6 +49,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4"); | |||
49 | #define HPWMI_ALS_QUERY 0x3 | 49 | #define HPWMI_ALS_QUERY 0x3 |
50 | #define HPWMI_DOCK_QUERY 0x4 | 50 | #define HPWMI_DOCK_QUERY 0x4 |
51 | #define HPWMI_WIRELESS_QUERY 0x5 | 51 | #define HPWMI_WIRELESS_QUERY 0x5 |
52 | #define HPWMI_HOTKEY_QUERY 0xc | ||
52 | 53 | ||
53 | static int __init hp_wmi_bios_setup(struct platform_device *device); | 54 | static int __init hp_wmi_bios_setup(struct platform_device *device); |
54 | static int __exit hp_wmi_bios_remove(struct platform_device *device); | 55 | static int __exit hp_wmi_bios_remove(struct platform_device *device); |
@@ -69,7 +70,7 @@ struct bios_return { | |||
69 | 70 | ||
70 | struct key_entry { | 71 | struct key_entry { |
71 | char type; /* See KE_* below */ | 72 | char type; /* See KE_* below */ |
72 | u8 code; | 73 | u16 code; |
73 | u16 keycode; | 74 | u16 keycode; |
74 | }; | 75 | }; |
75 | 76 | ||
@@ -79,7 +80,9 @@ static struct key_entry hp_wmi_keymap[] = { | |||
79 | {KE_SW, 0x01, SW_DOCK}, | 80 | {KE_SW, 0x01, SW_DOCK}, |
80 | {KE_KEY, 0x02, KEY_BRIGHTNESSUP}, | 81 | {KE_KEY, 0x02, KEY_BRIGHTNESSUP}, |
81 | {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN}, | 82 | {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN}, |
82 | {KE_KEY, 0x04, KEY_HELP}, | 83 | {KE_KEY, 0x20e6, KEY_PROG1}, |
84 | {KE_KEY, 0x2142, KEY_MEDIA}, | ||
85 | {KE_KEY, 0x231b, KEY_HELP}, | ||
83 | {KE_END, 0} | 86 | {KE_END, 0} |
84 | }; | 87 | }; |
85 | 88 | ||
@@ -177,9 +180,9 @@ static int hp_wmi_wifi_state(void) | |||
177 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); | 180 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); |
178 | 181 | ||
179 | if (wireless & 0x100) | 182 | if (wireless & 0x100) |
180 | return 1; | 183 | return RFKILL_STATE_UNBLOCKED; |
181 | else | 184 | else |
182 | return 0; | 185 | return RFKILL_STATE_SOFT_BLOCKED; |
183 | } | 186 | } |
184 | 187 | ||
185 | static int hp_wmi_bluetooth_state(void) | 188 | static int hp_wmi_bluetooth_state(void) |
@@ -187,9 +190,9 @@ static int hp_wmi_bluetooth_state(void) | |||
187 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); | 190 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); |
188 | 191 | ||
189 | if (wireless & 0x10000) | 192 | if (wireless & 0x10000) |
190 | return 1; | 193 | return RFKILL_STATE_UNBLOCKED; |
191 | else | 194 | else |
192 | return 0; | 195 | return RFKILL_STATE_SOFT_BLOCKED; |
193 | } | 196 | } |
194 | 197 | ||
195 | static int hp_wmi_wwan_state(void) | 198 | static int hp_wmi_wwan_state(void) |
@@ -197,9 +200,9 @@ static int hp_wmi_wwan_state(void) | |||
197 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); | 200 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); |
198 | 201 | ||
199 | if (wireless & 0x1000000) | 202 | if (wireless & 0x1000000) |
200 | return 1; | 203 | return RFKILL_STATE_UNBLOCKED; |
201 | else | 204 | else |
202 | return 0; | 205 | return RFKILL_STATE_SOFT_BLOCKED; |
203 | } | 206 | } |
204 | 207 | ||
205 | static ssize_t show_display(struct device *dev, struct device_attribute *attr, | 208 | static ssize_t show_display(struct device *dev, struct device_attribute *attr, |
@@ -318,6 +321,9 @@ void hp_wmi_notify(u32 value, void *context) | |||
318 | 321 | ||
319 | if (obj && obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 8) { | 322 | if (obj && obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 8) { |
320 | int eventcode = *((u8 *) obj->buffer.pointer); | 323 | int eventcode = *((u8 *) obj->buffer.pointer); |
324 | if (eventcode == 0x4) | ||
325 | eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0, | ||
326 | 0); | ||
321 | key = hp_wmi_get_entry_by_scancode(eventcode); | 327 | key = hp_wmi_get_entry_by_scancode(eventcode); |
322 | if (key) { | 328 | if (key) { |
323 | switch (key->type) { | 329 | switch (key->type) { |
@@ -338,12 +344,14 @@ void hp_wmi_notify(u32 value, void *context) | |||
338 | } | 344 | } |
339 | } else if (eventcode == 0x5) { | 345 | } else if (eventcode == 0x5) { |
340 | if (wifi_rfkill) | 346 | if (wifi_rfkill) |
341 | wifi_rfkill->state = hp_wmi_wifi_state(); | 347 | rfkill_force_state(wifi_rfkill, |
348 | hp_wmi_wifi_state()); | ||
342 | if (bluetooth_rfkill) | 349 | if (bluetooth_rfkill) |
343 | bluetooth_rfkill->state = | 350 | rfkill_force_state(bluetooth_rfkill, |
344 | hp_wmi_bluetooth_state(); | 351 | hp_wmi_bluetooth_state()); |
345 | if (wwan_rfkill) | 352 | if (wwan_rfkill) |
346 | wwan_rfkill->state = hp_wmi_wwan_state(); | 353 | rfkill_force_state(wwan_rfkill, |
354 | hp_wmi_wwan_state()); | ||
347 | } else | 355 | } else |
348 | printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", | 356 | printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", |
349 | eventcode); | 357 | eventcode); |
@@ -398,6 +406,7 @@ static void cleanup_sysfs(struct platform_device *device) | |||
398 | static int __init hp_wmi_bios_setup(struct platform_device *device) | 406 | static int __init hp_wmi_bios_setup(struct platform_device *device) |
399 | { | 407 | { |
400 | int err; | 408 | int err; |
409 | int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0); | ||
401 | 410 | ||
402 | err = device_create_file(&device->dev, &dev_attr_display); | 411 | err = device_create_file(&device->dev, &dev_attr_display); |
403 | if (err) | 412 | if (err) |
@@ -412,28 +421,33 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) | |||
412 | if (err) | 421 | if (err) |
413 | goto add_sysfs_error; | 422 | goto add_sysfs_error; |
414 | 423 | ||
415 | wifi_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WLAN); | 424 | if (wireless & 0x1) { |
416 | wifi_rfkill->name = "hp-wifi"; | 425 | wifi_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WLAN); |
417 | wifi_rfkill->state = hp_wmi_wifi_state(); | 426 | wifi_rfkill->name = "hp-wifi"; |
418 | wifi_rfkill->toggle_radio = hp_wmi_wifi_set; | 427 | wifi_rfkill->state = hp_wmi_wifi_state(); |
419 | wifi_rfkill->user_claim_unsupported = 1; | 428 | wifi_rfkill->toggle_radio = hp_wmi_wifi_set; |
420 | 429 | wifi_rfkill->user_claim_unsupported = 1; | |
421 | bluetooth_rfkill = rfkill_allocate(&device->dev, | 430 | rfkill_register(wifi_rfkill); |
422 | RFKILL_TYPE_BLUETOOTH); | 431 | } |
423 | bluetooth_rfkill->name = "hp-bluetooth"; | 432 | |
424 | bluetooth_rfkill->state = hp_wmi_bluetooth_state(); | 433 | if (wireless & 0x2) { |
425 | bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set; | 434 | bluetooth_rfkill = rfkill_allocate(&device->dev, |
426 | bluetooth_rfkill->user_claim_unsupported = 1; | 435 | RFKILL_TYPE_BLUETOOTH); |
427 | 436 | bluetooth_rfkill->name = "hp-bluetooth"; | |
428 | wwan_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WIMAX); | 437 | bluetooth_rfkill->state = hp_wmi_bluetooth_state(); |
429 | wwan_rfkill->name = "hp-wwan"; | 438 | bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set; |
430 | wwan_rfkill->state = hp_wmi_wwan_state(); | 439 | bluetooth_rfkill->user_claim_unsupported = 1; |
431 | wwan_rfkill->toggle_radio = hp_wmi_wwan_set; | 440 | rfkill_register(bluetooth_rfkill); |
432 | wwan_rfkill->user_claim_unsupported = 1; | 441 | } |
433 | 442 | ||
434 | rfkill_register(wifi_rfkill); | 443 | if (wireless & 0x4) { |
435 | rfkill_register(bluetooth_rfkill); | 444 | wwan_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WWAN); |
436 | rfkill_register(wwan_rfkill); | 445 | wwan_rfkill->name = "hp-wwan"; |
446 | wwan_rfkill->state = hp_wmi_wwan_state(); | ||
447 | wwan_rfkill->toggle_radio = hp_wmi_wwan_set; | ||
448 | wwan_rfkill->user_claim_unsupported = 1; | ||
449 | rfkill_register(wwan_rfkill); | ||
450 | } | ||
437 | 451 | ||
438 | return 0; | 452 | return 0; |
439 | add_sysfs_error: | 453 | add_sysfs_error: |
@@ -445,9 +459,12 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device) | |||
445 | { | 459 | { |
446 | cleanup_sysfs(device); | 460 | cleanup_sysfs(device); |
447 | 461 | ||
448 | rfkill_unregister(wifi_rfkill); | 462 | if (wifi_rfkill) |
449 | rfkill_unregister(bluetooth_rfkill); | 463 | rfkill_unregister(wifi_rfkill); |
450 | rfkill_unregister(wwan_rfkill); | 464 | if (bluetooth_rfkill) |
465 | rfkill_unregister(bluetooth_rfkill); | ||
466 | if (wwan_rfkill) | ||
467 | rfkill_unregister(wwan_rfkill); | ||
451 | 468 | ||
452 | return 0; | 469 | return 0; |
453 | } | 470 | } |
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index 6915f40ac8ab..1f8b5b36222c 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
@@ -621,12 +621,21 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command | |||
621 | if (cpu_is_at91sam9260 () || cpu_is_at91sam9263()) | 621 | if (cpu_is_at91sam9260 () || cpu_is_at91sam9263()) |
622 | if (host->total_length < 12) | 622 | if (host->total_length < 12) |
623 | host->total_length = 12; | 623 | host->total_length = 12; |
624 | host->buffer = dma_alloc_coherent(NULL, | 624 | |
625 | host->total_length, | 625 | host->buffer = kmalloc(host->total_length, GFP_KERNEL); |
626 | &host->physical_address, GFP_KERNEL); | 626 | if (!host->buffer) { |
627 | pr_debug("Can't alloc tx buffer\n"); | ||
628 | cmd->error = -ENOMEM; | ||
629 | mmc_request_done(host->mmc, host->request); | ||
630 | return; | ||
631 | } | ||
627 | 632 | ||
628 | at91_mci_sg_to_dma(host, data); | 633 | at91_mci_sg_to_dma(host, data); |
629 | 634 | ||
635 | host->physical_address = dma_map_single(NULL, | ||
636 | host->buffer, host->total_length, | ||
637 | DMA_TO_DEVICE); | ||
638 | |||
630 | pr_debug("Transmitting %d bytes\n", host->total_length); | 639 | pr_debug("Transmitting %d bytes\n", host->total_length); |
631 | 640 | ||
632 | at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address); | 641 | at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address); |
@@ -694,7 +703,10 @@ static void at91_mci_completed_command(struct at91mci_host *host, unsigned int s | |||
694 | cmd->resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3)); | 703 | cmd->resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3)); |
695 | 704 | ||
696 | if (host->buffer) { | 705 | if (host->buffer) { |
697 | dma_free_coherent(NULL, host->total_length, host->buffer, host->physical_address); | 706 | dma_unmap_single(NULL, |
707 | host->physical_address, host->total_length, | ||
708 | DMA_TO_DEVICE); | ||
709 | kfree(host->buffer); | ||
698 | host->buffer = NULL; | 710 | host->buffer = NULL; |
699 | } | 711 | } |
700 | 712 | ||
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index c16028872bbb..1b9fc3c6b875 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -172,7 +172,7 @@ struct mmc_omap_host { | |||
172 | struct omap_mmc_platform_data *pdata; | 172 | struct omap_mmc_platform_data *pdata; |
173 | }; | 173 | }; |
174 | 174 | ||
175 | void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot) | 175 | static void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot) |
176 | { | 176 | { |
177 | unsigned long tick_ns; | 177 | unsigned long tick_ns; |
178 | 178 | ||
@@ -182,7 +182,7 @@ void mmc_omap_fclk_offdelay(struct mmc_omap_slot *slot) | |||
182 | } | 182 | } |
183 | } | 183 | } |
184 | 184 | ||
185 | void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable) | 185 | static void mmc_omap_fclk_enable(struct mmc_omap_host *host, unsigned int enable) |
186 | { | 186 | { |
187 | unsigned long flags; | 187 | unsigned long flags; |
188 | 188 | ||
@@ -1455,7 +1455,9 @@ static int __init mmc_omap_probe(struct platform_device *pdev) | |||
1455 | 1455 | ||
1456 | host->irq = irq; | 1456 | host->irq = irq; |
1457 | host->phys_base = host->mem_res->start; | 1457 | host->phys_base = host->mem_res->start; |
1458 | host->virt_base = (void __iomem *) IO_ADDRESS(host->phys_base); | 1458 | host->virt_base = ioremap(res->start, res->end - res->start + 1); |
1459 | if (!host->virt_base) | ||
1460 | goto err_ioremap; | ||
1459 | 1461 | ||
1460 | if (cpu_is_omap24xx()) { | 1462 | if (cpu_is_omap24xx()) { |
1461 | host->iclk = clk_get(&pdev->dev, "mmc_ick"); | 1463 | host->iclk = clk_get(&pdev->dev, "mmc_ick"); |
@@ -1510,6 +1512,8 @@ err_free_iclk: | |||
1510 | clk_put(host->iclk); | 1512 | clk_put(host->iclk); |
1511 | } | 1513 | } |
1512 | err_free_mmc_host: | 1514 | err_free_mmc_host: |
1515 | iounmap(host->virt_base); | ||
1516 | err_ioremap: | ||
1513 | kfree(host); | 1517 | kfree(host); |
1514 | err_free_mem_region: | 1518 | err_free_mem_region: |
1515 | release_mem_region(res->start, res->end - res->start + 1); | 1519 | release_mem_region(res->start, res->end - res->start + 1); |
@@ -1536,6 +1540,7 @@ static int mmc_omap_remove(struct platform_device *pdev) | |||
1536 | if (host->fclk && !IS_ERR(host->fclk)) | 1540 | if (host->fclk && !IS_ERR(host->fclk)) |
1537 | clk_put(host->fclk); | 1541 | clk_put(host->fclk); |
1538 | 1542 | ||
1543 | iounmap(host->virt_base); | ||
1539 | release_mem_region(pdev->resource[0].start, | 1544 | release_mem_region(pdev->resource[0].start, |
1540 | pdev->resource[0].end - pdev->resource[0].start + 1); | 1545 | pdev->resource[0].end - pdev->resource[0].start + 1); |
1541 | 1546 | ||
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index d2f331876e4c..e00d424e6575 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c | |||
@@ -410,16 +410,20 @@ static int mtd_ioctl(struct inode *inode, struct file *file, | |||
410 | 410 | ||
411 | case MEMGETREGIONINFO: | 411 | case MEMGETREGIONINFO: |
412 | { | 412 | { |
413 | struct region_info_user ur; | 413 | uint32_t ur_idx; |
414 | struct mtd_erase_region_info *kr; | ||
415 | struct region_info_user *ur = (struct region_info_user *) argp; | ||
414 | 416 | ||
415 | if (copy_from_user(&ur, argp, sizeof(struct region_info_user))) | 417 | if (get_user(ur_idx, &(ur->regionindex))) |
416 | return -EFAULT; | 418 | return -EFAULT; |
417 | 419 | ||
418 | if (ur.regionindex >= mtd->numeraseregions) | 420 | kr = &(mtd->eraseregions[ur_idx]); |
419 | return -EINVAL; | 421 | |
420 | if (copy_to_user(argp, &(mtd->eraseregions[ur.regionindex]), | 422 | if (put_user(kr->offset, &(ur->offset)) |
421 | sizeof(struct mtd_erase_region_info))) | 423 | || put_user(kr->erasesize, &(ur->erasesize)) |
424 | || put_user(kr->numblocks, &(ur->numblocks))) | ||
422 | return -EFAULT; | 425 | return -EFAULT; |
426 | |||
423 | break; | 427 | break; |
424 | } | 428 | } |
425 | 429 | ||
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index a5c141cecd4e..4a11296a9514 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -822,14 +822,14 @@ config ULTRA32 | |||
822 | will be called smc-ultra32. | 822 | will be called smc-ultra32. |
823 | 823 | ||
824 | config BFIN_MAC | 824 | config BFIN_MAC |
825 | tristate "Blackfin 527/536/537 on-chip mac support" | 825 | tristate "Blackfin on-chip MAC support" |
826 | depends on NET_ETHERNET && (BF527 || BF537 || BF536) | 826 | depends on NET_ETHERNET && (BF526 || BF527 || BF536 || BF537) |
827 | select CRC32 | 827 | select CRC32 |
828 | select MII | 828 | select MII |
829 | select PHYLIB | 829 | select PHYLIB |
830 | select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE | 830 | select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE |
831 | help | 831 | help |
832 | This is the driver for blackfin on-chip mac device. Say Y if you want it | 832 | This is the driver for Blackfin on-chip mac device. Say Y if you want it |
833 | compiled into the kernel. This driver is also available as a module | 833 | compiled into the kernel. This driver is also available as a module |
834 | ( = code which can be inserted in and removed from the running kernel | 834 | ( = code which can be inserted in and removed from the running kernel |
835 | whenever you want). The module will be called bfin_mac. | 835 | whenever you want). The module will be called bfin_mac. |
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 82d7be1655d3..7685b995ff9b 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -2232,10 +2232,11 @@ static int atl1e_resume(struct pci_dev *pdev) | |||
2232 | 2232 | ||
2233 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); | 2233 | AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); |
2234 | 2234 | ||
2235 | if (netif_running(netdev)) | 2235 | if (netif_running(netdev)) { |
2236 | err = atl1e_request_irq(adapter); | 2236 | err = atl1e_request_irq(adapter); |
2237 | if (err) | 2237 | if (err) |
2238 | return err; | 2238 | return err; |
2239 | } | ||
2239 | 2240 | ||
2240 | atl1e_reset_hw(&adapter->hw); | 2241 | atl1e_reset_hw(&adapter->hw); |
2241 | 2242 | ||
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index e6a7bb79d4df..e23ce77712f1 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -3022,7 +3022,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev, | |||
3022 | netdev->features = NETIF_F_HW_CSUM; | 3022 | netdev->features = NETIF_F_HW_CSUM; |
3023 | netdev->features |= NETIF_F_SG; | 3023 | netdev->features |= NETIF_F_SG; |
3024 | netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); | 3024 | netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX); |
3025 | netdev->features |= NETIF_F_TSO; | ||
3026 | netdev->features |= NETIF_F_LLTX; | 3025 | netdev->features |= NETIF_F_LLTX; |
3027 | 3026 | ||
3028 | /* | 3027 | /* |
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 19d32a227be1..453115acaad2 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1838,7 +1838,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, | |||
1838 | if ((le16_to_cpu(rfd->command) & cb_el) && | 1838 | if ((le16_to_cpu(rfd->command) & cb_el) && |
1839 | (RU_RUNNING == nic->ru_running)) | 1839 | (RU_RUNNING == nic->ru_running)) |
1840 | 1840 | ||
1841 | if (readb(&nic->csr->scb.status) & rus_no_res) | 1841 | if (ioread8(&nic->csr->scb.status) & rus_no_res) |
1842 | nic->ru_running = RU_SUSPENDED; | 1842 | nic->ru_running = RU_SUSPENDED; |
1843 | return -ENODATA; | 1843 | return -ENODATA; |
1844 | } | 1844 | } |
@@ -1861,7 +1861,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, | |||
1861 | if ((le16_to_cpu(rfd->command) & cb_el) && | 1861 | if ((le16_to_cpu(rfd->command) & cb_el) && |
1862 | (RU_RUNNING == nic->ru_running)) { | 1862 | (RU_RUNNING == nic->ru_running)) { |
1863 | 1863 | ||
1864 | if (readb(&nic->csr->scb.status) & rus_no_res) | 1864 | if (ioread8(&nic->csr->scb.status) & rus_no_res) |
1865 | nic->ru_running = RU_SUSPENDED; | 1865 | nic->ru_running = RU_SUSPENDED; |
1866 | } | 1866 | } |
1867 | 1867 | ||
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c index b9f90a5d3d4d..213437d13154 100644 --- a/drivers/net/e1000/e1000_param.c +++ b/drivers/net/e1000/e1000_param.c | |||
@@ -208,7 +208,7 @@ struct e1000_option { | |||
208 | } r; | 208 | } r; |
209 | struct { /* list_option info */ | 209 | struct { /* list_option info */ |
210 | int nr; | 210 | int nr; |
211 | struct e1000_opt_list { int i; char *str; } *p; | 211 | const struct e1000_opt_list { int i; char *str; } *p; |
212 | } l; | 212 | } l; |
213 | } arg; | 213 | } arg; |
214 | }; | 214 | }; |
@@ -242,7 +242,7 @@ static int __devinit e1000_validate_option(unsigned int *value, | |||
242 | break; | 242 | break; |
243 | case list_option: { | 243 | case list_option: { |
244 | int i; | 244 | int i; |
245 | struct e1000_opt_list *ent; | 245 | const struct e1000_opt_list *ent; |
246 | 246 | ||
247 | for (i = 0; i < opt->arg.l.nr; i++) { | 247 | for (i = 0; i < opt->arg.l.nr; i++) { |
248 | ent = &opt->arg.l.p[i]; | 248 | ent = &opt->arg.l.p[i]; |
@@ -279,7 +279,9 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter); | |||
279 | 279 | ||
280 | void __devinit e1000_check_options(struct e1000_adapter *adapter) | 280 | void __devinit e1000_check_options(struct e1000_adapter *adapter) |
281 | { | 281 | { |
282 | struct e1000_option opt; | ||
282 | int bd = adapter->bd_number; | 283 | int bd = adapter->bd_number; |
284 | |||
283 | if (bd >= E1000_MAX_NIC) { | 285 | if (bd >= E1000_MAX_NIC) { |
284 | DPRINTK(PROBE, NOTICE, | 286 | DPRINTK(PROBE, NOTICE, |
285 | "Warning: no configuration for board #%i\n", bd); | 287 | "Warning: no configuration for board #%i\n", bd); |
@@ -287,19 +289,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
287 | } | 289 | } |
288 | 290 | ||
289 | { /* Transmit Descriptor Count */ | 291 | { /* Transmit Descriptor Count */ |
290 | struct e1000_option opt = { | 292 | struct e1000_tx_ring *tx_ring = adapter->tx_ring; |
293 | int i; | ||
294 | e1000_mac_type mac_type = adapter->hw.mac_type; | ||
295 | |||
296 | opt = (struct e1000_option) { | ||
291 | .type = range_option, | 297 | .type = range_option, |
292 | .name = "Transmit Descriptors", | 298 | .name = "Transmit Descriptors", |
293 | .err = "using default of " | 299 | .err = "using default of " |
294 | __MODULE_STRING(E1000_DEFAULT_TXD), | 300 | __MODULE_STRING(E1000_DEFAULT_TXD), |
295 | .def = E1000_DEFAULT_TXD, | 301 | .def = E1000_DEFAULT_TXD, |
296 | .arg = { .r = { .min = E1000_MIN_TXD }} | 302 | .arg = { .r = { |
303 | .min = E1000_MIN_TXD, | ||
304 | .max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD | ||
305 | }} | ||
297 | }; | 306 | }; |
298 | struct e1000_tx_ring *tx_ring = adapter->tx_ring; | ||
299 | int i; | ||
300 | e1000_mac_type mac_type = adapter->hw.mac_type; | ||
301 | opt.arg.r.max = mac_type < e1000_82544 ? | ||
302 | E1000_MAX_TXD : E1000_MAX_82544_TXD; | ||
303 | 307 | ||
304 | if (num_TxDescriptors > bd) { | 308 | if (num_TxDescriptors > bd) { |
305 | tx_ring->count = TxDescriptors[bd]; | 309 | tx_ring->count = TxDescriptors[bd]; |
@@ -313,19 +317,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
313 | tx_ring[i].count = tx_ring->count; | 317 | tx_ring[i].count = tx_ring->count; |
314 | } | 318 | } |
315 | { /* Receive Descriptor Count */ | 319 | { /* Receive Descriptor Count */ |
316 | struct e1000_option opt = { | 320 | struct e1000_rx_ring *rx_ring = adapter->rx_ring; |
321 | int i; | ||
322 | e1000_mac_type mac_type = adapter->hw.mac_type; | ||
323 | |||
324 | opt = (struct e1000_option) { | ||
317 | .type = range_option, | 325 | .type = range_option, |
318 | .name = "Receive Descriptors", | 326 | .name = "Receive Descriptors", |
319 | .err = "using default of " | 327 | .err = "using default of " |
320 | __MODULE_STRING(E1000_DEFAULT_RXD), | 328 | __MODULE_STRING(E1000_DEFAULT_RXD), |
321 | .def = E1000_DEFAULT_RXD, | 329 | .def = E1000_DEFAULT_RXD, |
322 | .arg = { .r = { .min = E1000_MIN_RXD }} | 330 | .arg = { .r = { |
331 | .min = E1000_MIN_RXD, | ||
332 | .max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD | ||
333 | }} | ||
323 | }; | 334 | }; |
324 | struct e1000_rx_ring *rx_ring = adapter->rx_ring; | ||
325 | int i; | ||
326 | e1000_mac_type mac_type = adapter->hw.mac_type; | ||
327 | opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD : | ||
328 | E1000_MAX_82544_RXD; | ||
329 | 335 | ||
330 | if (num_RxDescriptors > bd) { | 336 | if (num_RxDescriptors > bd) { |
331 | rx_ring->count = RxDescriptors[bd]; | 337 | rx_ring->count = RxDescriptors[bd]; |
@@ -339,7 +345,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
339 | rx_ring[i].count = rx_ring->count; | 345 | rx_ring[i].count = rx_ring->count; |
340 | } | 346 | } |
341 | { /* Checksum Offload Enable/Disable */ | 347 | { /* Checksum Offload Enable/Disable */ |
342 | struct e1000_option opt = { | 348 | opt = (struct e1000_option) { |
343 | .type = enable_option, | 349 | .type = enable_option, |
344 | .name = "Checksum Offload", | 350 | .name = "Checksum Offload", |
345 | .err = "defaulting to Enabled", | 351 | .err = "defaulting to Enabled", |
@@ -363,7 +369,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
363 | { E1000_FC_FULL, "Flow Control Enabled" }, | 369 | { E1000_FC_FULL, "Flow Control Enabled" }, |
364 | { E1000_FC_DEFAULT, "Flow Control Hardware Default" }}; | 370 | { E1000_FC_DEFAULT, "Flow Control Hardware Default" }}; |
365 | 371 | ||
366 | struct e1000_option opt = { | 372 | opt = (struct e1000_option) { |
367 | .type = list_option, | 373 | .type = list_option, |
368 | .name = "Flow Control", | 374 | .name = "Flow Control", |
369 | .err = "reading default settings from EEPROM", | 375 | .err = "reading default settings from EEPROM", |
@@ -381,7 +387,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
381 | } | 387 | } |
382 | } | 388 | } |
383 | { /* Transmit Interrupt Delay */ | 389 | { /* Transmit Interrupt Delay */ |
384 | struct e1000_option opt = { | 390 | opt = (struct e1000_option) { |
385 | .type = range_option, | 391 | .type = range_option, |
386 | .name = "Transmit Interrupt Delay", | 392 | .name = "Transmit Interrupt Delay", |
387 | .err = "using default of " __MODULE_STRING(DEFAULT_TIDV), | 393 | .err = "using default of " __MODULE_STRING(DEFAULT_TIDV), |
@@ -399,7 +405,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
399 | } | 405 | } |
400 | } | 406 | } |
401 | { /* Transmit Absolute Interrupt Delay */ | 407 | { /* Transmit Absolute Interrupt Delay */ |
402 | struct e1000_option opt = { | 408 | opt = (struct e1000_option) { |
403 | .type = range_option, | 409 | .type = range_option, |
404 | .name = "Transmit Absolute Interrupt Delay", | 410 | .name = "Transmit Absolute Interrupt Delay", |
405 | .err = "using default of " __MODULE_STRING(DEFAULT_TADV), | 411 | .err = "using default of " __MODULE_STRING(DEFAULT_TADV), |
@@ -417,7 +423,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
417 | } | 423 | } |
418 | } | 424 | } |
419 | { /* Receive Interrupt Delay */ | 425 | { /* Receive Interrupt Delay */ |
420 | struct e1000_option opt = { | 426 | opt = (struct e1000_option) { |
421 | .type = range_option, | 427 | .type = range_option, |
422 | .name = "Receive Interrupt Delay", | 428 | .name = "Receive Interrupt Delay", |
423 | .err = "using default of " __MODULE_STRING(DEFAULT_RDTR), | 429 | .err = "using default of " __MODULE_STRING(DEFAULT_RDTR), |
@@ -435,7 +441,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
435 | } | 441 | } |
436 | } | 442 | } |
437 | { /* Receive Absolute Interrupt Delay */ | 443 | { /* Receive Absolute Interrupt Delay */ |
438 | struct e1000_option opt = { | 444 | opt = (struct e1000_option) { |
439 | .type = range_option, | 445 | .type = range_option, |
440 | .name = "Receive Absolute Interrupt Delay", | 446 | .name = "Receive Absolute Interrupt Delay", |
441 | .err = "using default of " __MODULE_STRING(DEFAULT_RADV), | 447 | .err = "using default of " __MODULE_STRING(DEFAULT_RADV), |
@@ -453,7 +459,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
453 | } | 459 | } |
454 | } | 460 | } |
455 | { /* Interrupt Throttling Rate */ | 461 | { /* Interrupt Throttling Rate */ |
456 | struct e1000_option opt = { | 462 | opt = (struct e1000_option) { |
457 | .type = range_option, | 463 | .type = range_option, |
458 | .name = "Interrupt Throttling Rate (ints/sec)", | 464 | .name = "Interrupt Throttling Rate (ints/sec)", |
459 | .err = "using default of " __MODULE_STRING(DEFAULT_ITR), | 465 | .err = "using default of " __MODULE_STRING(DEFAULT_ITR), |
@@ -497,7 +503,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
497 | } | 503 | } |
498 | } | 504 | } |
499 | { /* Smart Power Down */ | 505 | { /* Smart Power Down */ |
500 | struct e1000_option opt = { | 506 | opt = (struct e1000_option) { |
501 | .type = enable_option, | 507 | .type = enable_option, |
502 | .name = "PHY Smart Power Down", | 508 | .name = "PHY Smart Power Down", |
503 | .err = "defaulting to Disabled", | 509 | .err = "defaulting to Disabled", |
@@ -513,7 +519,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter) | |||
513 | } | 519 | } |
514 | } | 520 | } |
515 | { /* Kumeran Lock Loss Workaround */ | 521 | { /* Kumeran Lock Loss Workaround */ |
516 | struct e1000_option opt = { | 522 | opt = (struct e1000_option) { |
517 | .type = enable_option, | 523 | .type = enable_option, |
518 | .name = "Kumeran Lock Loss Workaround", | 524 | .name = "Kumeran Lock Loss Workaround", |
519 | .err = "defaulting to Enabled", | 525 | .err = "defaulting to Enabled", |
@@ -578,16 +584,18 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter) | |||
578 | 584 | ||
579 | static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) | 585 | static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) |
580 | { | 586 | { |
587 | struct e1000_option opt; | ||
581 | unsigned int speed, dplx, an; | 588 | unsigned int speed, dplx, an; |
582 | int bd = adapter->bd_number; | 589 | int bd = adapter->bd_number; |
583 | 590 | ||
584 | { /* Speed */ | 591 | { /* Speed */ |
585 | struct e1000_opt_list speed_list[] = {{ 0, "" }, | 592 | static const struct e1000_opt_list speed_list[] = { |
586 | { SPEED_10, "" }, | 593 | { 0, "" }, |
587 | { SPEED_100, "" }, | 594 | { SPEED_10, "" }, |
588 | { SPEED_1000, "" }}; | 595 | { SPEED_100, "" }, |
596 | { SPEED_1000, "" }}; | ||
589 | 597 | ||
590 | struct e1000_option opt = { | 598 | opt = (struct e1000_option) { |
591 | .type = list_option, | 599 | .type = list_option, |
592 | .name = "Speed", | 600 | .name = "Speed", |
593 | .err = "parameter ignored", | 601 | .err = "parameter ignored", |
@@ -604,11 +612,12 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) | |||
604 | } | 612 | } |
605 | } | 613 | } |
606 | { /* Duplex */ | 614 | { /* Duplex */ |
607 | struct e1000_opt_list dplx_list[] = {{ 0, "" }, | 615 | static const struct e1000_opt_list dplx_list[] = { |
608 | { HALF_DUPLEX, "" }, | 616 | { 0, "" }, |
609 | { FULL_DUPLEX, "" }}; | 617 | { HALF_DUPLEX, "" }, |
618 | { FULL_DUPLEX, "" }}; | ||
610 | 619 | ||
611 | struct e1000_option opt = { | 620 | opt = (struct e1000_option) { |
612 | .type = list_option, | 621 | .type = list_option, |
613 | .name = "Duplex", | 622 | .name = "Duplex", |
614 | .err = "parameter ignored", | 623 | .err = "parameter ignored", |
@@ -637,7 +646,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) | |||
637 | "parameter ignored\n"); | 646 | "parameter ignored\n"); |
638 | adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; | 647 | adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT; |
639 | } else { /* Autoneg */ | 648 | } else { /* Autoneg */ |
640 | struct e1000_opt_list an_list[] = | 649 | static const struct e1000_opt_list an_list[] = |
641 | #define AA "AutoNeg advertising " | 650 | #define AA "AutoNeg advertising " |
642 | {{ 0x01, AA "10/HD" }, | 651 | {{ 0x01, AA "10/HD" }, |
643 | { 0x02, AA "10/FD" }, | 652 | { 0x02, AA "10/FD" }, |
@@ -671,7 +680,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) | |||
671 | { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" }, | 680 | { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" }, |
672 | { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }}; | 681 | { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }}; |
673 | 682 | ||
674 | struct e1000_option opt = { | 683 | opt = (struct e1000_option) { |
675 | .type = list_option, | 684 | .type = list_option, |
676 | .name = "AutoNeg", | 685 | .name = "AutoNeg", |
677 | .err = "parameter ignored", | 686 | .err = "parameter ignored", |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 053971e5fc94..331b86b01fa9 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -5522,7 +5522,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5522 | if (id->driver_data & DEV_HAS_CHECKSUM) { | 5522 | if (id->driver_data & DEV_HAS_CHECKSUM) { |
5523 | np->rx_csum = 1; | 5523 | np->rx_csum = 1; |
5524 | np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK; | 5524 | np->txrxctl_bits |= NVREG_TXRXCTL_RXCHECK; |
5525 | dev->features |= NETIF_F_HW_CSUM | NETIF_F_SG; | 5525 | dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; |
5526 | dev->features |= NETIF_F_TSO; | 5526 | dev->features |= NETIF_F_TSO; |
5527 | } | 5527 | } |
5528 | 5528 | ||
@@ -5835,7 +5835,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i | |||
5835 | 5835 | ||
5836 | dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n", | 5836 | dev_printk(KERN_INFO, &pci_dev->dev, "%s%s%s%s%s%s%s%s%s%sdesc-v%u\n", |
5837 | dev->features & NETIF_F_HIGHDMA ? "highdma " : "", | 5837 | dev->features & NETIF_F_HIGHDMA ? "highdma " : "", |
5838 | dev->features & (NETIF_F_HW_CSUM | NETIF_F_SG) ? | 5838 | dev->features & (NETIF_F_IP_CSUM | NETIF_F_SG) ? |
5839 | "csum " : "", | 5839 | "csum " : "", |
5840 | dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ? | 5840 | dev->features & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX) ? |
5841 | "vlan " : "", | 5841 | "vlan " : "", |
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 9a51ec8293cc..9d461825bf4c 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -792,6 +792,10 @@ static int fs_enet_open(struct net_device *dev) | |||
792 | int r; | 792 | int r; |
793 | int err; | 793 | int err; |
794 | 794 | ||
795 | /* to initialize the fep->cur_rx,... */ | ||
796 | /* not doing this, will cause a crash in fs_enet_rx_napi */ | ||
797 | fs_init_bds(fep->ndev); | ||
798 | |||
795 | if (fep->fpi->use_napi) | 799 | if (fep->fpi->use_napi) |
796 | napi_enable(&fep->napi); | 800 | napi_enable(&fep->napi); |
797 | 801 | ||
@@ -1167,6 +1171,10 @@ static struct of_device_id fs_enet_match[] = { | |||
1167 | .compatible = "fsl,cpm1-scc-enet", | 1171 | .compatible = "fsl,cpm1-scc-enet", |
1168 | .data = (void *)&fs_scc_ops, | 1172 | .data = (void *)&fs_scc_ops, |
1169 | }, | 1173 | }, |
1174 | { | ||
1175 | .compatible = "fsl,cpm2-scc-enet", | ||
1176 | .data = (void *)&fs_scc_ops, | ||
1177 | }, | ||
1170 | #endif | 1178 | #endif |
1171 | #ifdef CONFIG_FS_ENET_HAS_FCC | 1179 | #ifdef CONFIG_FS_ENET_HAS_FCC |
1172 | { | 1180 | { |
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index 029b3c7ef29c..22f50dd8b277 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include "fs_enet.h" | 47 | #include "fs_enet.h" |
48 | 48 | ||
49 | /*************************************************/ | 49 | /*************************************************/ |
50 | |||
51 | #if defined(CONFIG_CPM1) | 50 | #if defined(CONFIG_CPM1) |
52 | /* for a 8xx __raw_xxx's are sufficient */ | 51 | /* for a 8xx __raw_xxx's are sufficient */ |
53 | #define __fs_out32(addr, x) __raw_writel(x, addr) | 52 | #define __fs_out32(addr, x) __raw_writel(x, addr) |
@@ -62,6 +61,8 @@ | |||
62 | #define __fs_out16(addr, x) out_be16(addr, x) | 61 | #define __fs_out16(addr, x) out_be16(addr, x) |
63 | #define __fs_in32(addr) in_be32(addr) | 62 | #define __fs_in32(addr) in_be32(addr) |
64 | #define __fs_in16(addr) in_be16(addr) | 63 | #define __fs_in16(addr) in_be16(addr) |
64 | #define __fs_out8(addr, x) out_8(addr, x) | ||
65 | #define __fs_in8(addr) in_8(addr) | ||
65 | #endif | 66 | #endif |
66 | 67 | ||
67 | /* write, read, set bits, clear bits */ | 68 | /* write, read, set bits, clear bits */ |
@@ -262,8 +263,13 @@ static void restart(struct net_device *dev) | |||
262 | 263 | ||
263 | /* Initialize function code registers for big-endian. | 264 | /* Initialize function code registers for big-endian. |
264 | */ | 265 | */ |
266 | #ifndef CONFIG_NOT_COHERENT_CACHE | ||
267 | W8(ep, sen_genscc.scc_rfcr, SCC_EB | SCC_GBL); | ||
268 | W8(ep, sen_genscc.scc_tfcr, SCC_EB | SCC_GBL); | ||
269 | #else | ||
265 | W8(ep, sen_genscc.scc_rfcr, SCC_EB); | 270 | W8(ep, sen_genscc.scc_rfcr, SCC_EB); |
266 | W8(ep, sen_genscc.scc_tfcr, SCC_EB); | 271 | W8(ep, sen_genscc.scc_tfcr, SCC_EB); |
272 | #endif | ||
267 | 273 | ||
268 | /* Set maximum bytes per receive buffer. | 274 | /* Set maximum bytes per receive buffer. |
269 | * This appears to be an Ethernet frame size, not the buffer | 275 | * This appears to be an Ethernet frame size, not the buffer |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 999d69168277..4320a983a588 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -105,6 +105,7 @@ const char gfar_driver_version[] = "1.3"; | |||
105 | 105 | ||
106 | static int gfar_enet_open(struct net_device *dev); | 106 | static int gfar_enet_open(struct net_device *dev); |
107 | static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); | 107 | static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev); |
108 | static void gfar_reset_task(struct work_struct *work); | ||
108 | static void gfar_timeout(struct net_device *dev); | 109 | static void gfar_timeout(struct net_device *dev); |
109 | static int gfar_close(struct net_device *dev); | 110 | static int gfar_close(struct net_device *dev); |
110 | struct sk_buff *gfar_new_skb(struct net_device *dev); | 111 | struct sk_buff *gfar_new_skb(struct net_device *dev); |
@@ -209,6 +210,7 @@ static int gfar_probe(struct platform_device *pdev) | |||
209 | spin_lock_init(&priv->txlock); | 210 | spin_lock_init(&priv->txlock); |
210 | spin_lock_init(&priv->rxlock); | 211 | spin_lock_init(&priv->rxlock); |
211 | spin_lock_init(&priv->bflock); | 212 | spin_lock_init(&priv->bflock); |
213 | INIT_WORK(&priv->reset_task, gfar_reset_task); | ||
212 | 214 | ||
213 | platform_set_drvdata(pdev, dev); | 215 | platform_set_drvdata(pdev, dev); |
214 | 216 | ||
@@ -1212,6 +1214,7 @@ static int gfar_close(struct net_device *dev) | |||
1212 | 1214 | ||
1213 | napi_disable(&priv->napi); | 1215 | napi_disable(&priv->napi); |
1214 | 1216 | ||
1217 | cancel_work_sync(&priv->reset_task); | ||
1215 | stop_gfar(dev); | 1218 | stop_gfar(dev); |
1216 | 1219 | ||
1217 | /* Disconnect from the PHY */ | 1220 | /* Disconnect from the PHY */ |
@@ -1326,13 +1329,16 @@ static int gfar_change_mtu(struct net_device *dev, int new_mtu) | |||
1326 | return 0; | 1329 | return 0; |
1327 | } | 1330 | } |
1328 | 1331 | ||
1329 | /* gfar_timeout gets called when a packet has not been | 1332 | /* gfar_reset_task gets scheduled when a packet has not been |
1330 | * transmitted after a set amount of time. | 1333 | * transmitted after a set amount of time. |
1331 | * For now, assume that clearing out all the structures, and | 1334 | * For now, assume that clearing out all the structures, and |
1332 | * starting over will fix the problem. */ | 1335 | * starting over will fix the problem. |
1333 | static void gfar_timeout(struct net_device *dev) | 1336 | */ |
1337 | static void gfar_reset_task(struct work_struct *work) | ||
1334 | { | 1338 | { |
1335 | dev->stats.tx_errors++; | 1339 | struct gfar_private *priv = container_of(work, struct gfar_private, |
1340 | reset_task); | ||
1341 | struct net_device *dev = priv->dev; | ||
1336 | 1342 | ||
1337 | if (dev->flags & IFF_UP) { | 1343 | if (dev->flags & IFF_UP) { |
1338 | stop_gfar(dev); | 1344 | stop_gfar(dev); |
@@ -1342,6 +1348,14 @@ static void gfar_timeout(struct net_device *dev) | |||
1342 | netif_tx_schedule_all(dev); | 1348 | netif_tx_schedule_all(dev); |
1343 | } | 1349 | } |
1344 | 1350 | ||
1351 | static void gfar_timeout(struct net_device *dev) | ||
1352 | { | ||
1353 | struct gfar_private *priv = netdev_priv(dev); | ||
1354 | |||
1355 | dev->stats.tx_errors++; | ||
1356 | schedule_work(&priv->reset_task); | ||
1357 | } | ||
1358 | |||
1345 | /* Interrupt Handler for Transmit complete */ | 1359 | /* Interrupt Handler for Transmit complete */ |
1346 | static int gfar_clean_tx_ring(struct net_device *dev) | 1360 | static int gfar_clean_tx_ring(struct net_device *dev) |
1347 | { | 1361 | { |
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index d59df98bd636..f46e9b63af13 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
@@ -756,6 +756,7 @@ struct gfar_private { | |||
756 | 756 | ||
757 | uint32_t msg_enable; | 757 | uint32_t msg_enable; |
758 | 758 | ||
759 | struct work_struct reset_task; | ||
759 | /* Network Statistics */ | 760 | /* Network Statistics */ |
760 | struct gfar_extra_stats extra_stats; | 761 | struct gfar_extra_stats extra_stats; |
761 | }; | 762 | }; |
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 2e720f26ca83..ccd9d9058f6d 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -663,9 +663,6 @@ static int emac_configure(struct emac_instance *dev) | |||
663 | if (emac_phy_gpcs(dev->phy.mode)) | 663 | if (emac_phy_gpcs(dev->phy.mode)) |
664 | emac_mii_reset_phy(&dev->phy); | 664 | emac_mii_reset_phy(&dev->phy); |
665 | 665 | ||
666 | /* Required for Pause packet support in EMAC */ | ||
667 | dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1); | ||
668 | |||
669 | return 0; | 666 | return 0; |
670 | } | 667 | } |
671 | 668 | ||
@@ -1150,6 +1147,9 @@ static int emac_open(struct net_device *ndev) | |||
1150 | } else | 1147 | } else |
1151 | netif_carrier_on(dev->ndev); | 1148 | netif_carrier_on(dev->ndev); |
1152 | 1149 | ||
1150 | /* Required for Pause packet support in EMAC */ | ||
1151 | dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1); | ||
1152 | |||
1153 | emac_configure(dev); | 1153 | emac_configure(dev); |
1154 | mal_poll_add(dev->mal, &dev->commac); | 1154 | mal_poll_add(dev->mal, &dev->commac); |
1155 | mal_enable_tx_channel(dev->mal, dev->mal_tx_chan); | 1155 | mal_enable_tx_channel(dev->mal, dev->mal_tx_chan); |
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index a03fe1fb61ca..c2d57f836088 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
@@ -904,8 +904,6 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
904 | unsigned long data_dma_addr; | 904 | unsigned long data_dma_addr; |
905 | 905 | ||
906 | desc.fields.flags_len = IBMVETH_BUF_VALID | skb->len; | 906 | desc.fields.flags_len = IBMVETH_BUF_VALID | skb->len; |
907 | data_dma_addr = dma_map_single(&adapter->vdev->dev, skb->data, | ||
908 | skb->len, DMA_TO_DEVICE); | ||
909 | 907 | ||
910 | if (skb->ip_summed == CHECKSUM_PARTIAL && | 908 | if (skb->ip_summed == CHECKSUM_PARTIAL && |
911 | ip_hdr(skb)->protocol != IPPROTO_TCP && skb_checksum_help(skb)) { | 909 | ip_hdr(skb)->protocol != IPPROTO_TCP && skb_checksum_help(skb)) { |
@@ -924,6 +922,8 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
924 | buf[1] = 0; | 922 | buf[1] = 0; |
925 | } | 923 | } |
926 | 924 | ||
925 | data_dma_addr = dma_map_single(&adapter->vdev->dev, skb->data, | ||
926 | skb->len, DMA_TO_DEVICE); | ||
927 | if (dma_mapping_error(&adapter->vdev->dev, data_dma_addr)) { | 927 | if (dma_mapping_error(&adapter->vdev->dev, data_dma_addr)) { |
928 | if (!firmware_has_feature(FW_FEATURE_CMO)) | 928 | if (!firmware_has_feature(FW_FEATURE_CMO)) |
929 | ibmveth_error_printk("tx: unable to map xmit buffer\n"); | 929 | ibmveth_error_printk("tx: unable to map xmit buffer\n"); |
@@ -932,6 +932,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
932 | desc.fields.address = adapter->bounce_buffer_dma; | 932 | desc.fields.address = adapter->bounce_buffer_dma; |
933 | tx_map_failed++; | 933 | tx_map_failed++; |
934 | used_bounce = 1; | 934 | used_bounce = 1; |
935 | wmb(); | ||
935 | } else | 936 | } else |
936 | desc.fields.address = data_dma_addr; | 937 | desc.fields.address = data_dma_addr; |
937 | 938 | ||
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index bb823acc7443..f5e2e7235fcb 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c | |||
@@ -87,7 +87,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) | |||
87 | case E1000_DEV_ID_82576: | 87 | case E1000_DEV_ID_82576: |
88 | case E1000_DEV_ID_82576_FIBER: | 88 | case E1000_DEV_ID_82576_FIBER: |
89 | case E1000_DEV_ID_82576_SERDES: | 89 | case E1000_DEV_ID_82576_SERDES: |
90 | case E1000_DEV_ID_82576_QUAD_COPPER: | ||
91 | mac->type = e1000_82576; | 90 | mac->type = e1000_82576; |
92 | break; | 91 | break; |
93 | default: | 92 | default: |
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index a65ccc3095c3..99504a600a80 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h | |||
@@ -41,7 +41,6 @@ struct e1000_hw; | |||
41 | #define E1000_DEV_ID_82576 0x10C9 | 41 | #define E1000_DEV_ID_82576 0x10C9 |
42 | #define E1000_DEV_ID_82576_FIBER 0x10E6 | 42 | #define E1000_DEV_ID_82576_FIBER 0x10E6 |
43 | #define E1000_DEV_ID_82576_SERDES 0x10E7 | 43 | #define E1000_DEV_ID_82576_SERDES 0x10E7 |
44 | #define E1000_DEV_ID_82576_QUAD_COPPER 0x10E8 | ||
45 | #define E1000_DEV_ID_82575EB_COPPER 0x10A7 | 44 | #define E1000_DEV_ID_82575EB_COPPER 0x10A7 |
46 | #define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9 | 45 | #define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9 |
47 | #define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6 | 46 | #define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6 |
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c index 11aee1309951..58906c984be9 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c | |||
@@ -373,13 +373,17 @@ static void igb_get_regs(struct net_device *netdev, | |||
373 | regs_buff[12] = rd32(E1000_EECD); | 373 | regs_buff[12] = rd32(E1000_EECD); |
374 | 374 | ||
375 | /* Interrupt */ | 375 | /* Interrupt */ |
376 | regs_buff[13] = rd32(E1000_EICR); | 376 | /* Reading EICS for EICR because they read the |
377 | * same but EICS does not clear on read */ | ||
378 | regs_buff[13] = rd32(E1000_EICS); | ||
377 | regs_buff[14] = rd32(E1000_EICS); | 379 | regs_buff[14] = rd32(E1000_EICS); |
378 | regs_buff[15] = rd32(E1000_EIMS); | 380 | regs_buff[15] = rd32(E1000_EIMS); |
379 | regs_buff[16] = rd32(E1000_EIMC); | 381 | regs_buff[16] = rd32(E1000_EIMC); |
380 | regs_buff[17] = rd32(E1000_EIAC); | 382 | regs_buff[17] = rd32(E1000_EIAC); |
381 | regs_buff[18] = rd32(E1000_EIAM); | 383 | regs_buff[18] = rd32(E1000_EIAM); |
382 | regs_buff[19] = rd32(E1000_ICR); | 384 | /* Reading ICS for ICR because they read the |
385 | * same but ICS does not clear on read */ | ||
386 | regs_buff[19] = rd32(E1000_ICS); | ||
383 | regs_buff[20] = rd32(E1000_ICS); | 387 | regs_buff[20] = rd32(E1000_ICS); |
384 | regs_buff[21] = rd32(E1000_IMS); | 388 | regs_buff[21] = rd32(E1000_IMS); |
385 | regs_buff[22] = rd32(E1000_IMC); | 389 | regs_buff[22] = rd32(E1000_IMC); |
@@ -1746,15 +1750,6 @@ static int igb_wol_exclusion(struct igb_adapter *adapter, | |||
1746 | /* return success for non excluded adapter ports */ | 1750 | /* return success for non excluded adapter ports */ |
1747 | retval = 0; | 1751 | retval = 0; |
1748 | break; | 1752 | break; |
1749 | case E1000_DEV_ID_82576_QUAD_COPPER: | ||
1750 | /* quad port adapters only support WoL on port A */ | ||
1751 | if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) { | ||
1752 | wol->supported = 0; | ||
1753 | break; | ||
1754 | } | ||
1755 | /* return success for non excluded adapter ports */ | ||
1756 | retval = 0; | ||
1757 | break; | ||
1758 | default: | 1753 | default: |
1759 | /* dual port cards only support WoL on port A from now on | 1754 | /* dual port cards only support WoL on port A from now on |
1760 | * unless it was enabled in the eeprom for port B | 1755 | * unless it was enabled in the eeprom for port B |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 8f66e15ec8d6..634c4c9d87be 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -61,7 +61,6 @@ static struct pci_device_id igb_pci_tbl[] = { | |||
61 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 }, | 61 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 }, |
62 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 }, | 62 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 }, |
63 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 }, | 63 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 }, |
64 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 }, | ||
65 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 }, | 64 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 }, |
66 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 }, | 65 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 }, |
67 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 }, | 66 | { PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 }, |
@@ -521,7 +520,7 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter) | |||
521 | adapter->msix_entries, | 520 | adapter->msix_entries, |
522 | numvecs); | 521 | numvecs); |
523 | if (err == 0) | 522 | if (err == 0) |
524 | return; | 523 | goto out; |
525 | 524 | ||
526 | igb_reset_interrupt_capability(adapter); | 525 | igb_reset_interrupt_capability(adapter); |
527 | 526 | ||
@@ -531,7 +530,7 @@ msi_only: | |||
531 | adapter->num_tx_queues = 1; | 530 | adapter->num_tx_queues = 1; |
532 | if (!pci_enable_msi(adapter->pdev)) | 531 | if (!pci_enable_msi(adapter->pdev)) |
533 | adapter->flags |= IGB_FLAG_HAS_MSI; | 532 | adapter->flags |= IGB_FLAG_HAS_MSI; |
534 | 533 | out: | |
535 | /* Notify the stack of the (possibly) reduced Tx Queue count. */ | 534 | /* Notify the stack of the (possibly) reduced Tx Queue count. */ |
536 | adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; | 535 | adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; |
537 | return; | 536 | return; |
@@ -1217,16 +1216,6 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
1217 | if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1) | 1216 | if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1) |
1218 | adapter->eeprom_wol = 0; | 1217 | adapter->eeprom_wol = 0; |
1219 | break; | 1218 | break; |
1220 | case E1000_DEV_ID_82576_QUAD_COPPER: | ||
1221 | /* if quad port adapter, disable WoL on all but port A */ | ||
1222 | if (global_quad_port_a != 0) | ||
1223 | adapter->eeprom_wol = 0; | ||
1224 | else | ||
1225 | adapter->flags |= IGB_FLAG_QUAD_PORT_A; | ||
1226 | /* Reset for multiple quad port adapters */ | ||
1227 | if (++global_quad_port_a == 4) | ||
1228 | global_quad_port_a = 0; | ||
1229 | break; | ||
1230 | } | 1219 | } |
1231 | 1220 | ||
1232 | /* initialize the wol settings based on the eeprom settings */ | 1221 | /* initialize the wol settings based on the eeprom settings */ |
@@ -2290,7 +2279,9 @@ static void igb_watchdog_task(struct work_struct *work) | |||
2290 | struct igb_ring *tx_ring = adapter->tx_ring; | 2279 | struct igb_ring *tx_ring = adapter->tx_ring; |
2291 | struct e1000_mac_info *mac = &adapter->hw.mac; | 2280 | struct e1000_mac_info *mac = &adapter->hw.mac; |
2292 | u32 link; | 2281 | u32 link; |
2282 | u32 eics = 0; | ||
2293 | s32 ret_val; | 2283 | s32 ret_val; |
2284 | int i; | ||
2294 | 2285 | ||
2295 | if ((netif_carrier_ok(netdev)) && | 2286 | if ((netif_carrier_ok(netdev)) && |
2296 | (rd32(E1000_STATUS) & E1000_STATUS_LU)) | 2287 | (rd32(E1000_STATUS) & E1000_STATUS_LU)) |
@@ -2392,7 +2383,13 @@ link_up: | |||
2392 | } | 2383 | } |
2393 | 2384 | ||
2394 | /* Cause software interrupt to ensure rx ring is cleaned */ | 2385 | /* Cause software interrupt to ensure rx ring is cleaned */ |
2395 | wr32(E1000_ICS, E1000_ICS_RXDMT0); | 2386 | if (adapter->msix_entries) { |
2387 | for (i = 0; i < adapter->num_rx_queues; i++) | ||
2388 | eics |= adapter->rx_ring[i].eims_value; | ||
2389 | wr32(E1000_EICS, eics); | ||
2390 | } else { | ||
2391 | wr32(E1000_ICS, E1000_ICS_RXDMT0); | ||
2392 | } | ||
2396 | 2393 | ||
2397 | /* Force detection of hung controller every watchdog period */ | 2394 | /* Force detection of hung controller every watchdog period */ |
2398 | tx_ring->detect_tx_hung = true; | 2395 | tx_ring->detect_tx_hung = true; |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 34bca16d48a6..53f41b649f03 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -1636,16 +1636,17 @@ static void ixgbe_set_multi(struct net_device *netdev) | |||
1636 | struct ixgbe_hw *hw = &adapter->hw; | 1636 | struct ixgbe_hw *hw = &adapter->hw; |
1637 | struct dev_mc_list *mc_ptr; | 1637 | struct dev_mc_list *mc_ptr; |
1638 | u8 *mta_list; | 1638 | u8 *mta_list; |
1639 | u32 fctrl; | 1639 | u32 fctrl, vlnctrl; |
1640 | int i; | 1640 | int i; |
1641 | 1641 | ||
1642 | /* Check for Promiscuous and All Multicast modes */ | 1642 | /* Check for Promiscuous and All Multicast modes */ |
1643 | 1643 | ||
1644 | fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL); | 1644 | fctrl = IXGBE_READ_REG(hw, IXGBE_FCTRL); |
1645 | vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL); | ||
1645 | 1646 | ||
1646 | if (netdev->flags & IFF_PROMISC) { | 1647 | if (netdev->flags & IFF_PROMISC) { |
1647 | fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); | 1648 | fctrl |= (IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); |
1648 | fctrl &= ~IXGBE_VLNCTRL_VFE; | 1649 | vlnctrl &= ~IXGBE_VLNCTRL_VFE; |
1649 | } else { | 1650 | } else { |
1650 | if (netdev->flags & IFF_ALLMULTI) { | 1651 | if (netdev->flags & IFF_ALLMULTI) { |
1651 | fctrl |= IXGBE_FCTRL_MPE; | 1652 | fctrl |= IXGBE_FCTRL_MPE; |
@@ -1653,10 +1654,11 @@ static void ixgbe_set_multi(struct net_device *netdev) | |||
1653 | } else { | 1654 | } else { |
1654 | fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); | 1655 | fctrl &= ~(IXGBE_FCTRL_UPE | IXGBE_FCTRL_MPE); |
1655 | } | 1656 | } |
1656 | fctrl |= IXGBE_VLNCTRL_VFE; | 1657 | vlnctrl |= IXGBE_VLNCTRL_VFE; |
1657 | } | 1658 | } |
1658 | 1659 | ||
1659 | IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl); | 1660 | IXGBE_WRITE_REG(hw, IXGBE_FCTRL, fctrl); |
1661 | IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl); | ||
1660 | 1662 | ||
1661 | if (netdev->mc_count) { | 1663 | if (netdev->mc_count) { |
1662 | mta_list = kcalloc(netdev->mc_count, ETH_ALEN, GFP_ATOMIC); | 1664 | mta_list = kcalloc(netdev->mc_count, ETH_ALEN, GFP_ATOMIC); |
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 46819af3b062..0a18b9e96da1 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -55,7 +55,7 @@ | |||
55 | #include <asm/system.h> | 55 | #include <asm/system.h> |
56 | 56 | ||
57 | static char mv643xx_eth_driver_name[] = "mv643xx_eth"; | 57 | static char mv643xx_eth_driver_name[] = "mv643xx_eth"; |
58 | static char mv643xx_eth_driver_version[] = "1.2"; | 58 | static char mv643xx_eth_driver_version[] = "1.3"; |
59 | 59 | ||
60 | #define MV643XX_ETH_CHECKSUM_OFFLOAD_TX | 60 | #define MV643XX_ETH_CHECKSUM_OFFLOAD_TX |
61 | #define MV643XX_ETH_NAPI | 61 | #define MV643XX_ETH_NAPI |
@@ -474,11 +474,19 @@ static void rxq_refill(struct rx_queue *rxq) | |||
474 | /* | 474 | /* |
475 | * Reserve 2+14 bytes for an ethernet header (the | 475 | * Reserve 2+14 bytes for an ethernet header (the |
476 | * hardware automatically prepends 2 bytes of dummy | 476 | * hardware automatically prepends 2 bytes of dummy |
477 | * data to each received packet), 4 bytes for a VLAN | 477 | * data to each received packet), 16 bytes for up to |
478 | * header, and 4 bytes for the trailing FCS -- 24 | 478 | * four VLAN tags, and 4 bytes for the trailing FCS |
479 | * bytes total. | 479 | * -- 36 bytes total. |
480 | */ | 480 | */ |
481 | skb_size = mp->dev->mtu + 24; | 481 | skb_size = mp->dev->mtu + 36; |
482 | |||
483 | /* | ||
484 | * Make sure that the skb size is a multiple of 8 | ||
485 | * bytes, as the lower three bits of the receive | ||
486 | * descriptor's buffer size field are ignored by | ||
487 | * the hardware. | ||
488 | */ | ||
489 | skb_size = (skb_size + 7) & ~7; | ||
482 | 490 | ||
483 | skb = dev_alloc_skb(skb_size + dma_get_cache_alignment() - 1); | 491 | skb = dev_alloc_skb(skb_size + dma_get_cache_alignment() - 1); |
484 | if (skb == NULL) | 492 | if (skb == NULL) |
@@ -509,10 +517,8 @@ static void rxq_refill(struct rx_queue *rxq) | |||
509 | skb_reserve(skb, 2); | 517 | skb_reserve(skb, 2); |
510 | } | 518 | } |
511 | 519 | ||
512 | if (rxq->rx_desc_count != rxq->rx_ring_size) { | 520 | if (rxq->rx_desc_count != rxq->rx_ring_size) |
513 | rxq->rx_oom.expires = jiffies + (HZ / 10); | 521 | mod_timer(&rxq->rx_oom, jiffies + (HZ / 10)); |
514 | add_timer(&rxq->rx_oom); | ||
515 | } | ||
516 | 522 | ||
517 | spin_unlock_irqrestore(&mp->lock, flags); | 523 | spin_unlock_irqrestore(&mp->lock, flags); |
518 | } | 524 | } |
@@ -529,7 +535,7 @@ static int rxq_process(struct rx_queue *rxq, int budget) | |||
529 | int rx; | 535 | int rx; |
530 | 536 | ||
531 | rx = 0; | 537 | rx = 0; |
532 | while (rx < budget) { | 538 | while (rx < budget && rxq->rx_desc_count) { |
533 | struct rx_desc *rx_desc; | 539 | struct rx_desc *rx_desc; |
534 | unsigned int cmd_sts; | 540 | unsigned int cmd_sts; |
535 | struct sk_buff *skb; | 541 | struct sk_buff *skb; |
@@ -554,7 +560,7 @@ static int rxq_process(struct rx_queue *rxq, int budget) | |||
554 | spin_unlock_irqrestore(&mp->lock, flags); | 560 | spin_unlock_irqrestore(&mp->lock, flags); |
555 | 561 | ||
556 | dma_unmap_single(NULL, rx_desc->buf_ptr + 2, | 562 | dma_unmap_single(NULL, rx_desc->buf_ptr + 2, |
557 | mp->dev->mtu + 24, DMA_FROM_DEVICE); | 563 | rx_desc->buf_size, DMA_FROM_DEVICE); |
558 | rxq->rx_desc_count--; | 564 | rxq->rx_desc_count--; |
559 | rx++; | 565 | rx++; |
560 | 566 | ||
@@ -636,9 +642,9 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
636 | txq_reclaim(mp->txq + i, 0); | 642 | txq_reclaim(mp->txq + i, 0); |
637 | 643 | ||
638 | if (netif_carrier_ok(mp->dev)) { | 644 | if (netif_carrier_ok(mp->dev)) { |
639 | spin_lock(&mp->lock); | 645 | spin_lock_irq(&mp->lock); |
640 | __txq_maybe_wake(mp->txq + mp->txq_primary); | 646 | __txq_maybe_wake(mp->txq + mp->txq_primary); |
641 | spin_unlock(&mp->lock); | 647 | spin_unlock_irq(&mp->lock); |
642 | } | 648 | } |
643 | } | 649 | } |
644 | #endif | 650 | #endif |
@@ -650,8 +656,6 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) | |||
650 | 656 | ||
651 | if (rx < budget) { | 657 | if (rx < budget) { |
652 | netif_rx_complete(mp->dev, napi); | 658 | netif_rx_complete(mp->dev, napi); |
653 | wrl(mp, INT_CAUSE(mp->port_num), 0); | ||
654 | wrl(mp, INT_CAUSE_EXT(mp->port_num), 0); | ||
655 | wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_EXT); | 659 | wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_EXT); |
656 | } | 660 | } |
657 | 661 | ||
@@ -1796,6 +1800,7 @@ static irqreturn_t mv643xx_eth_irq(int irq, void *dev_id) | |||
1796 | */ | 1800 | */ |
1797 | #ifdef MV643XX_ETH_NAPI | 1801 | #ifdef MV643XX_ETH_NAPI |
1798 | if (int_cause & INT_RX) { | 1802 | if (int_cause & INT_RX) { |
1803 | wrl(mp, INT_CAUSE(mp->port_num), ~(int_cause & INT_RX)); | ||
1799 | wrl(mp, INT_MASK(mp->port_num), 0x00000000); | 1804 | wrl(mp, INT_MASK(mp->port_num), 0x00000000); |
1800 | rdl(mp, INT_MASK(mp->port_num)); | 1805 | rdl(mp, INT_MASK(mp->port_num)); |
1801 | 1806 | ||
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 54cd89cb0838..d6524db321af 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -75,7 +75,7 @@ | |||
75 | #include "myri10ge_mcp.h" | 75 | #include "myri10ge_mcp.h" |
76 | #include "myri10ge_mcp_gen_header.h" | 76 | #include "myri10ge_mcp_gen_header.h" |
77 | 77 | ||
78 | #define MYRI10GE_VERSION_STR "1.3.99-1.347" | 78 | #define MYRI10GE_VERSION_STR "1.4.3-1.358" |
79 | 79 | ||
80 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); | 80 | MODULE_DESCRIPTION("Myricom 10G driver (10GbE)"); |
81 | MODULE_AUTHOR("Maintainer: help@myri.com"); | 81 | MODULE_AUTHOR("Maintainer: help@myri.com"); |
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index a3e3895e5032..0f6f9747d255 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c | |||
@@ -2792,7 +2792,7 @@ static int rtl8169_rx_interrupt(struct net_device *dev, | |||
2792 | pkt_size, PCI_DMA_FROMDEVICE); | 2792 | pkt_size, PCI_DMA_FROMDEVICE); |
2793 | rtl8169_mark_to_asic(desc, tp->rx_buf_sz); | 2793 | rtl8169_mark_to_asic(desc, tp->rx_buf_sz); |
2794 | } else { | 2794 | } else { |
2795 | pci_unmap_single(pdev, addr, pkt_size, | 2795 | pci_unmap_single(pdev, addr, tp->rx_buf_sz, |
2796 | PCI_DMA_FROMDEVICE); | 2796 | PCI_DMA_FROMDEVICE); |
2797 | tp->Rx_skbuff[entry] = NULL; | 2797 | tp->Rx_skbuff[entry] = NULL; |
2798 | } | 2798 | } |
diff --git a/drivers/net/skfp/ess.c b/drivers/net/skfp/ess.c index 889f98724610..a85efcfd9d0e 100644 --- a/drivers/net/skfp/ess.c +++ b/drivers/net/skfp/ess.c | |||
@@ -510,7 +510,7 @@ static void ess_send_response(struct s_smc *smc, struct smt_header *sm, | |||
510 | chg->path.para.p_type = SMT_P320B ; | 510 | chg->path.para.p_type = SMT_P320B ; |
511 | chg->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ; | 511 | chg->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ; |
512 | chg->path.mib_index = SBAPATHINDEX ; | 512 | chg->path.mib_index = SBAPATHINDEX ; |
513 | chg->path.path_pad = (u_short)NULL ; | 513 | chg->path.path_pad = 0; |
514 | chg->path.path_index = PRIMARY_RING ; | 514 | chg->path.path_index = PRIMARY_RING ; |
515 | 515 | ||
516 | /* set P320F */ | 516 | /* set P320F */ |
@@ -606,7 +606,7 @@ static void ess_send_alc_req(struct s_smc *smc) | |||
606 | req->path.para.p_type = SMT_P320B ; | 606 | req->path.para.p_type = SMT_P320B ; |
607 | req->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ; | 607 | req->path.para.p_len = sizeof(struct smt_p_320b) - PARA_LEN ; |
608 | req->path.mib_index = SBAPATHINDEX ; | 608 | req->path.mib_index = SBAPATHINDEX ; |
609 | req->path.path_pad = (u_short)NULL ; | 609 | req->path.path_pad = 0; |
610 | req->path.path_index = PRIMARY_RING ; | 610 | req->path.path_index = PRIMARY_RING ; |
611 | 611 | ||
612 | /* set P0017 */ | 612 | /* set P0017 */ |
@@ -636,7 +636,7 @@ static void ess_send_alc_req(struct s_smc *smc) | |||
636 | /* set P19 */ | 636 | /* set P19 */ |
637 | req->a_addr.para.p_type = SMT_P0019 ; | 637 | req->a_addr.para.p_type = SMT_P0019 ; |
638 | req->a_addr.para.p_len = sizeof(struct smt_p_0019) - PARA_LEN ; | 638 | req->a_addr.para.p_len = sizeof(struct smt_p_0019) - PARA_LEN ; |
639 | req->a_addr.sba_pad = (u_short)NULL ; | 639 | req->a_addr.sba_pad = 0; |
640 | req->a_addr.alloc_addr = null_addr ; | 640 | req->a_addr.alloc_addr = null_addr ; |
641 | 641 | ||
642 | /* set P1A */ | 642 | /* set P1A */ |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 2040965d7724..24768c10cadb 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -2255,7 +2255,7 @@ static int smc_drv_remove(struct platform_device *pdev) | |||
2255 | 2255 | ||
2256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); | 2256 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-regs"); |
2257 | if (!res) | 2257 | if (!res) |
2258 | platform_get_resource(pdev, IORESOURCE_MEM, 0); | 2258 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
2259 | release_mem_region(res->start, SMC_IO_EXTENT); | 2259 | release_mem_region(res->start, SMC_IO_EXTENT); |
2260 | 2260 | ||
2261 | free_netdev(ndev); | 2261 | free_netdev(ndev); |
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 1b7cac77159e..6e42b5a8c22b 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c | |||
@@ -397,7 +397,7 @@ static const struct usb_device_id hso_ids[] = { | |||
397 | {default_port_device(0x0af0, 0xc031)}, /* Icon-Edge */ | 397 | {default_port_device(0x0af0, 0xc031)}, /* Icon-Edge */ |
398 | {icon321_port_device(0x0af0, 0xd013)}, /* Module HSxPA */ | 398 | {icon321_port_device(0x0af0, 0xd013)}, /* Module HSxPA */ |
399 | {icon321_port_device(0x0af0, 0xd031)}, /* Icon-321 */ | 399 | {icon321_port_device(0x0af0, 0xd031)}, /* Icon-321 */ |
400 | {default_port_device(0x0af0, 0xd033)}, /* Icon-322 */ | 400 | {icon321_port_device(0x0af0, 0xd033)}, /* Icon-322 */ |
401 | {USB_DEVICE(0x0af0, 0x7301)}, /* GE40x */ | 401 | {USB_DEVICE(0x0af0, 0x7301)}, /* GE40x */ |
402 | {USB_DEVICE(0x0af0, 0x7361)}, /* GE40x */ | 402 | {USB_DEVICE(0x0af0, 0x7361)}, /* GE40x */ |
403 | {USB_DEVICE(0x0af0, 0x7401)}, /* GI 0401 */ | 403 | {USB_DEVICE(0x0af0, 0x7401)}, /* GI 0401 */ |
@@ -2613,6 +2613,7 @@ static int hso_resume(struct usb_interface *iface) | |||
2613 | "Transmitting lingering data\n"); | 2613 | "Transmitting lingering data\n"); |
2614 | hso_net_start_xmit(hso_net->skb_tx_buf, | 2614 | hso_net_start_xmit(hso_net->skb_tx_buf, |
2615 | hso_net->net); | 2615 | hso_net->net); |
2616 | hso_net->skb_tx_buf = NULL; | ||
2616 | } | 2617 | } |
2617 | result = hso_start_net_device(network_table[i]); | 2618 | result = hso_start_net_device(network_table[i]); |
2618 | if (result) | 2619 | if (result) |
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index c3d119f997f5..ca9d00c1194e 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
@@ -46,6 +46,10 @@ | |||
46 | 46 | ||
47 | #define MCS7830_VENDOR_ID 0x9710 | 47 | #define MCS7830_VENDOR_ID 0x9710 |
48 | #define MCS7830_PRODUCT_ID 0x7830 | 48 | #define MCS7830_PRODUCT_ID 0x7830 |
49 | #define MCS7730_PRODUCT_ID 0x7730 | ||
50 | |||
51 | #define SITECOM_VENDOR_ID 0x0DF6 | ||
52 | #define LN_030_PRODUCT_ID 0x0021 | ||
49 | 53 | ||
50 | #define MCS7830_MII_ADVERTISE (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \ | 54 | #define MCS7830_MII_ADVERTISE (ADVERTISE_PAUSE_CAP | ADVERTISE_100FULL | \ |
51 | ADVERTISE_100HALF | ADVERTISE_10FULL | \ | 55 | ADVERTISE_100HALF | ADVERTISE_10FULL | \ |
@@ -442,6 +446,29 @@ static struct ethtool_ops mcs7830_ethtool_ops = { | |||
442 | .nway_reset = usbnet_nway_reset, | 446 | .nway_reset = usbnet_nway_reset, |
443 | }; | 447 | }; |
444 | 448 | ||
449 | static int mcs7830_set_mac_address(struct net_device *netdev, void *p) | ||
450 | { | ||
451 | int ret; | ||
452 | struct usbnet *dev = netdev_priv(netdev); | ||
453 | struct sockaddr *addr = p; | ||
454 | |||
455 | if (netif_running(netdev)) | ||
456 | return -EBUSY; | ||
457 | |||
458 | if (!is_valid_ether_addr(addr->sa_data)) | ||
459 | return -EINVAL; | ||
460 | |||
461 | memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); | ||
462 | |||
463 | ret = mcs7830_set_reg(dev, HIF_REG_ETHERNET_ADDR, ETH_ALEN, | ||
464 | netdev->dev_addr); | ||
465 | |||
466 | if (ret < 0) | ||
467 | return ret; | ||
468 | |||
469 | return 0; | ||
470 | } | ||
471 | |||
445 | static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) | 472 | static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) |
446 | { | 473 | { |
447 | struct net_device *net = dev->net; | 474 | struct net_device *net = dev->net; |
@@ -455,6 +482,7 @@ static int mcs7830_bind(struct usbnet *dev, struct usb_interface *udev) | |||
455 | net->ethtool_ops = &mcs7830_ethtool_ops; | 482 | net->ethtool_ops = &mcs7830_ethtool_ops; |
456 | net->set_multicast_list = mcs7830_set_multicast; | 483 | net->set_multicast_list = mcs7830_set_multicast; |
457 | mcs7830_set_multicast(net); | 484 | mcs7830_set_multicast(net); |
485 | net->set_mac_address = mcs7830_set_mac_address; | ||
458 | 486 | ||
459 | /* reserve space for the status byte on rx */ | 487 | /* reserve space for the status byte on rx */ |
460 | dev->rx_urb_size = ETH_FRAME_LEN + 1; | 488 | dev->rx_urb_size = ETH_FRAME_LEN + 1; |
@@ -491,7 +519,16 @@ static int mcs7830_rx_fixup(struct usbnet *dev, struct sk_buff *skb) | |||
491 | } | 519 | } |
492 | 520 | ||
493 | static const struct driver_info moschip_info = { | 521 | static const struct driver_info moschip_info = { |
494 | .description = "MOSCHIP 7830 usb-NET adapter", | 522 | .description = "MOSCHIP 7830/7730 usb-NET adapter", |
523 | .bind = mcs7830_bind, | ||
524 | .rx_fixup = mcs7830_rx_fixup, | ||
525 | .flags = FLAG_ETHER, | ||
526 | .in = 1, | ||
527 | .out = 2, | ||
528 | }; | ||
529 | |||
530 | static const struct driver_info sitecom_info = { | ||
531 | .description = "Sitecom LN-30 usb-NET adapter", | ||
495 | .bind = mcs7830_bind, | 532 | .bind = mcs7830_bind, |
496 | .rx_fixup = mcs7830_rx_fixup, | 533 | .rx_fixup = mcs7830_rx_fixup, |
497 | .flags = FLAG_ETHER, | 534 | .flags = FLAG_ETHER, |
@@ -504,6 +541,14 @@ static const struct usb_device_id products[] = { | |||
504 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID), | 541 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7830_PRODUCT_ID), |
505 | .driver_info = (unsigned long) &moschip_info, | 542 | .driver_info = (unsigned long) &moschip_info, |
506 | }, | 543 | }, |
544 | { | ||
545 | USB_DEVICE(MCS7830_VENDOR_ID, MCS7730_PRODUCT_ID), | ||
546 | .driver_info = (unsigned long) &moschip_info, | ||
547 | }, | ||
548 | { | ||
549 | USB_DEVICE(SITECOM_VENDOR_ID, LN_030_PRODUCT_ID), | ||
550 | .driver_info = (unsigned long) &sitecom_info, | ||
551 | }, | ||
507 | {}, | 552 | {}, |
508 | }; | 553 | }; |
509 | MODULE_DEVICE_TABLE(usb, products); | 554 | MODULE_DEVICE_TABLE(usb, products); |
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index e59255a155a9..6596cd0742b9 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
@@ -1317,7 +1317,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) | |||
1317 | break; | 1317 | break; |
1318 | 1318 | ||
1319 | case SIOCDEVRESINSTATS : | 1319 | case SIOCDEVRESINSTATS : |
1320 | if( current->euid != 0 ) /* root only */ | 1320 | if (!capable(CAP_NET_ADMIN)) |
1321 | return -EPERM; | 1321 | return -EPERM; |
1322 | memset( &nl->in_stats, 0, sizeof(struct sbni_in_stats) ); | 1322 | memset( &nl->in_stats, 0, sizeof(struct sbni_in_stats) ); |
1323 | break; | 1323 | break; |
@@ -1334,7 +1334,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) | |||
1334 | break; | 1334 | break; |
1335 | 1335 | ||
1336 | case SIOCDEVSHWSTATE : | 1336 | case SIOCDEVSHWSTATE : |
1337 | if( current->euid != 0 ) /* root only */ | 1337 | if (!capable(CAP_NET_ADMIN)) |
1338 | return -EPERM; | 1338 | return -EPERM; |
1339 | 1339 | ||
1340 | spin_lock( &nl->lock ); | 1340 | spin_lock( &nl->lock ); |
@@ -1355,7 +1355,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) | |||
1355 | #ifdef CONFIG_SBNI_MULTILINE | 1355 | #ifdef CONFIG_SBNI_MULTILINE |
1356 | 1356 | ||
1357 | case SIOCDEVENSLAVE : | 1357 | case SIOCDEVENSLAVE : |
1358 | if( current->euid != 0 ) /* root only */ | 1358 | if (!capable(CAP_NET_ADMIN)) |
1359 | return -EPERM; | 1359 | return -EPERM; |
1360 | 1360 | ||
1361 | if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name )) | 1361 | if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name )) |
@@ -1370,7 +1370,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) | |||
1370 | return enslave( dev, slave_dev ); | 1370 | return enslave( dev, slave_dev ); |
1371 | 1371 | ||
1372 | case SIOCDEVEMANSIPATE : | 1372 | case SIOCDEVEMANSIPATE : |
1373 | if( current->euid != 0 ) /* root only */ | 1373 | if (!capable(CAP_NET_ADMIN)) |
1374 | return -EPERM; | 1374 | return -EPERM; |
1375 | 1375 | ||
1376 | return emancipate( dev ); | 1376 | return emancipate( dev ); |
diff --git a/drivers/net/wd.c b/drivers/net/wd.c index 6f9aa1643743..fa14255282af 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c | |||
@@ -337,7 +337,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) | |||
337 | #ifdef CONFIG_NET_POLL_CONTROLLER | 337 | #ifdef CONFIG_NET_POLL_CONTROLLER |
338 | dev->poll_controller = ei_poll; | 338 | dev->poll_controller = ei_poll; |
339 | #endif | 339 | #endif |
340 | NS8390p_init(dev, 0); | 340 | NS8390_init(dev, 0); |
341 | 341 | ||
342 | #if 1 | 342 | #if 1 |
343 | /* Enable interrupt generation on softconfig cards -- M.U */ | 343 | /* Enable interrupt generation on softconfig cards -- M.U */ |
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index b20a45aa8680..0676c6d84383 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -251,7 +251,7 @@ static inline void ath5k_txbuf_free(struct ath5k_softc *sc, | |||
251 | return; | 251 | return; |
252 | pci_unmap_single(sc->pdev, bf->skbaddr, bf->skb->len, | 252 | pci_unmap_single(sc->pdev, bf->skbaddr, bf->skb->len, |
253 | PCI_DMA_TODEVICE); | 253 | PCI_DMA_TODEVICE); |
254 | dev_kfree_skb(bf->skb); | 254 | dev_kfree_skb_any(bf->skb); |
255 | bf->skb = NULL; | 255 | bf->skb = NULL; |
256 | } | 256 | } |
257 | 257 | ||
@@ -466,6 +466,7 @@ ath5k_pci_probe(struct pci_dev *pdev, | |||
466 | mutex_init(&sc->lock); | 466 | mutex_init(&sc->lock); |
467 | spin_lock_init(&sc->rxbuflock); | 467 | spin_lock_init(&sc->rxbuflock); |
468 | spin_lock_init(&sc->txbuflock); | 468 | spin_lock_init(&sc->txbuflock); |
469 | spin_lock_init(&sc->block); | ||
469 | 470 | ||
470 | /* Set private data */ | 471 | /* Set private data */ |
471 | pci_set_drvdata(pdev, hw); | 472 | pci_set_drvdata(pdev, hw); |
@@ -2179,8 +2180,11 @@ ath5k_beacon_config(struct ath5k_softc *sc) | |||
2179 | 2180 | ||
2180 | sc->imask |= AR5K_INT_SWBA; | 2181 | sc->imask |= AR5K_INT_SWBA; |
2181 | 2182 | ||
2182 | if (ath5k_hw_hasveol(ah)) | 2183 | if (ath5k_hw_hasveol(ah)) { |
2184 | spin_lock(&sc->block); | ||
2183 | ath5k_beacon_send(sc); | 2185 | ath5k_beacon_send(sc); |
2186 | spin_unlock(&sc->block); | ||
2187 | } | ||
2184 | } | 2188 | } |
2185 | /* TODO else AP */ | 2189 | /* TODO else AP */ |
2186 | 2190 | ||
@@ -2403,7 +2407,9 @@ ath5k_intr(int irq, void *dev_id) | |||
2403 | TSF_TO_TU(tsf), | 2407 | TSF_TO_TU(tsf), |
2404 | (unsigned long long) tsf); | 2408 | (unsigned long long) tsf); |
2405 | } else { | 2409 | } else { |
2410 | spin_lock(&sc->block); | ||
2406 | ath5k_beacon_send(sc); | 2411 | ath5k_beacon_send(sc); |
2412 | spin_unlock(&sc->block); | ||
2407 | } | 2413 | } |
2408 | } | 2414 | } |
2409 | if (status & AR5K_INT_RXEOL) { | 2415 | if (status & AR5K_INT_RXEOL) { |
@@ -2745,6 +2751,11 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, | |||
2745 | ret = -EOPNOTSUPP; | 2751 | ret = -EOPNOTSUPP; |
2746 | goto end; | 2752 | goto end; |
2747 | } | 2753 | } |
2754 | |||
2755 | /* Set to a reasonable value. Note that this will | ||
2756 | * be set to mac80211's value at ath5k_config(). */ | ||
2757 | sc->bintval = 1000; | ||
2758 | |||
2748 | ret = 0; | 2759 | ret = 0; |
2749 | end: | 2760 | end: |
2750 | mutex_unlock(&sc->lock); | 2761 | mutex_unlock(&sc->lock); |
@@ -2789,9 +2800,6 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | |||
2789 | struct ath5k_hw *ah = sc->ah; | 2800 | struct ath5k_hw *ah = sc->ah; |
2790 | int ret; | 2801 | int ret; |
2791 | 2802 | ||
2792 | /* Set to a reasonable value. Note that this will | ||
2793 | * be set to mac80211's value at ath5k_config(). */ | ||
2794 | sc->bintval = 1000; | ||
2795 | mutex_lock(&sc->lock); | 2803 | mutex_lock(&sc->lock); |
2796 | if (sc->vif != vif) { | 2804 | if (sc->vif != vif) { |
2797 | ret = -EIO; | 2805 | ret = -EIO; |
@@ -3050,6 +3058,7 @@ static int | |||
3050 | ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | 3058 | ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) |
3051 | { | 3059 | { |
3052 | struct ath5k_softc *sc = hw->priv; | 3060 | struct ath5k_softc *sc = hw->priv; |
3061 | unsigned long flags; | ||
3053 | int ret; | 3062 | int ret; |
3054 | 3063 | ||
3055 | ath5k_debug_dump_skb(sc, skb, "BC ", 1); | 3064 | ath5k_debug_dump_skb(sc, skb, "BC ", 1); |
@@ -3059,12 +3068,14 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
3059 | goto end; | 3068 | goto end; |
3060 | } | 3069 | } |
3061 | 3070 | ||
3071 | spin_lock_irqsave(&sc->block, flags); | ||
3062 | ath5k_txbuf_free(sc, sc->bbuf); | 3072 | ath5k_txbuf_free(sc, sc->bbuf); |
3063 | sc->bbuf->skb = skb; | 3073 | sc->bbuf->skb = skb; |
3064 | ret = ath5k_beacon_setup(sc, sc->bbuf); | 3074 | ret = ath5k_beacon_setup(sc, sc->bbuf); |
3065 | if (ret) | 3075 | if (ret) |
3066 | sc->bbuf->skb = NULL; | 3076 | sc->bbuf->skb = NULL; |
3067 | else { | 3077 | spin_unlock_irqrestore(&sc->block, flags); |
3078 | if (!ret) { | ||
3068 | ath5k_beacon_config(sc); | 3079 | ath5k_beacon_config(sc); |
3069 | mmiowb(); | 3080 | mmiowb(); |
3070 | } | 3081 | } |
diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h index d7e03e6b8271..7ec2f377d5c7 100644 --- a/drivers/net/wireless/ath5k/base.h +++ b/drivers/net/wireless/ath5k/base.h | |||
@@ -172,6 +172,7 @@ struct ath5k_softc { | |||
172 | struct tasklet_struct txtq; /* tx intr tasklet */ | 172 | struct tasklet_struct txtq; /* tx intr tasklet */ |
173 | struct ath5k_led tx_led; /* tx led */ | 173 | struct ath5k_led tx_led; /* tx led */ |
174 | 174 | ||
175 | spinlock_t block; /* protects beacon */ | ||
175 | struct ath5k_buf *bbuf; /* beacon buffer */ | 176 | struct ath5k_buf *bbuf; /* beacon buffer */ |
176 | unsigned int bhalq, /* SW q for outgoing beacons */ | 177 | unsigned int bhalq, /* SW q for outgoing beacons */ |
177 | bmisscount, /* missed beacon transmits */ | 178 | bmisscount, /* missed beacon transmits */ |
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index a17eb130f574..6dbfed0b4149 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c | |||
@@ -7285,15 +7285,15 @@ ath9k_hw_set_keycache_entry(struct ath_hal *ah, u16 entry, | |||
7285 | } | 7285 | } |
7286 | break; | 7286 | break; |
7287 | case ATH9K_CIPHER_WEP: | 7287 | case ATH9K_CIPHER_WEP: |
7288 | if (k->kv_len < 40 / NBBY) { | 7288 | if (k->kv_len < LEN_WEP40) { |
7289 | DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE, | 7289 | DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE, |
7290 | "%s: WEP key length %u too small\n", | 7290 | "%s: WEP key length %u too small\n", |
7291 | __func__, k->kv_len); | 7291 | __func__, k->kv_len); |
7292 | return false; | 7292 | return false; |
7293 | } | 7293 | } |
7294 | if (k->kv_len <= 40 / NBBY) | 7294 | if (k->kv_len <= LEN_WEP40) |
7295 | keyType = AR_KEYTABLE_TYPE_40; | 7295 | keyType = AR_KEYTABLE_TYPE_40; |
7296 | else if (k->kv_len <= 104 / NBBY) | 7296 | else if (k->kv_len <= LEN_WEP104) |
7297 | keyType = AR_KEYTABLE_TYPE_104; | 7297 | keyType = AR_KEYTABLE_TYPE_104; |
7298 | else | 7298 | else |
7299 | keyType = AR_KEYTABLE_TYPE_128; | 7299 | keyType = AR_KEYTABLE_TYPE_128; |
@@ -7313,7 +7313,7 @@ ath9k_hw_set_keycache_entry(struct ath_hal *ah, u16 entry, | |||
7313 | key2 = get_unaligned_le32(k->kv_val + 6) ^ xorMask; | 7313 | key2 = get_unaligned_le32(k->kv_val + 6) ^ xorMask; |
7314 | key3 = (get_unaligned_le16(k->kv_val + 10) ^ xorMask) & 0xffff; | 7314 | key3 = (get_unaligned_le16(k->kv_val + 10) ^ xorMask) & 0xffff; |
7315 | key4 = get_unaligned_le32(k->kv_val + 12) ^ xorMask; | 7315 | key4 = get_unaligned_le32(k->kv_val + 12) ^ xorMask; |
7316 | if (k->kv_len <= 104 / NBBY) | 7316 | if (k->kv_len <= LEN_WEP104) |
7317 | key4 &= 0xff; | 7317 | key4 &= 0xff; |
7318 | 7318 | ||
7319 | if (keyType == AR_KEYTABLE_TYPE_TKIP && ATH9K_IS_MIC_ENABLED(ah)) { | 7319 | if (keyType == AR_KEYTABLE_TYPE_TKIP && ATH9K_IS_MIC_ENABLED(ah)) { |
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c index 2888778040e4..95b337149484 100644 --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c | |||
@@ -206,7 +206,8 @@ static int ath_key_config(struct ath_softc *sc, | |||
206 | if (!ret) | 206 | if (!ret) |
207 | return -EIO; | 207 | return -EIO; |
208 | 208 | ||
209 | sc->sc_keytype = hk.kv_type; | 209 | if (mac) |
210 | sc->sc_keytype = hk.kv_type; | ||
210 | return 0; | 211 | return 0; |
211 | } | 212 | } |
212 | 213 | ||
@@ -756,7 +757,8 @@ static int ath9k_set_key(struct ieee80211_hw *hw, | |||
756 | key->hw_key_idx = key->keyidx; | 757 | key->hw_key_idx = key->keyidx; |
757 | /* push IV and Michael MIC generation to stack */ | 758 | /* push IV and Michael MIC generation to stack */ |
758 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; | 759 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; |
759 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; | 760 | if (key->alg == ALG_TKIP) |
761 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; | ||
760 | } | 762 | } |
761 | break; | 763 | break; |
762 | case DISABLE_KEY: | 764 | case DISABLE_KEY: |
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c index 2fe806175c01..20ddb7acdb94 100644 --- a/drivers/net/wireless/ath9k/recv.c +++ b/drivers/net/wireless/ath9k/recv.c | |||
@@ -360,8 +360,9 @@ static void ath_rx_flush_tid(struct ath_softc *sc, | |||
360 | struct ath_arx_tid *rxtid, int drop) | 360 | struct ath_arx_tid *rxtid, int drop) |
361 | { | 361 | { |
362 | struct ath_rxbuf *rxbuf; | 362 | struct ath_rxbuf *rxbuf; |
363 | unsigned long flag; | ||
363 | 364 | ||
364 | spin_lock_bh(&rxtid->tidlock); | 365 | spin_lock_irqsave(&rxtid->tidlock, flag); |
365 | while (rxtid->baw_head != rxtid->baw_tail) { | 366 | while (rxtid->baw_head != rxtid->baw_tail) { |
366 | rxbuf = rxtid->rxbuf + rxtid->baw_head; | 367 | rxbuf = rxtid->rxbuf + rxtid->baw_head; |
367 | if (!rxbuf->rx_wbuf) { | 368 | if (!rxbuf->rx_wbuf) { |
@@ -382,7 +383,7 @@ static void ath_rx_flush_tid(struct ath_softc *sc, | |||
382 | INCR(rxtid->baw_head, ATH_TID_MAX_BUFS); | 383 | INCR(rxtid->baw_head, ATH_TID_MAX_BUFS); |
383 | INCR(rxtid->seq_next, IEEE80211_SEQ_MAX); | 384 | INCR(rxtid->seq_next, IEEE80211_SEQ_MAX); |
384 | } | 385 | } |
385 | spin_unlock_bh(&rxtid->tidlock); | 386 | spin_unlock_irqrestore(&rxtid->tidlock, flag); |
386 | } | 387 | } |
387 | 388 | ||
388 | static struct sk_buff *ath_rxbuf_alloc(struct ath_softc *sc, | 389 | static struct sk_buff *ath_rxbuf_alloc(struct ath_softc *sc, |
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index bd35bb0a1480..bd65c485098c 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c | |||
@@ -1304,7 +1304,7 @@ EXPORT_SYMBOL(atmel_open); | |||
1304 | int atmel_open(struct net_device *dev) | 1304 | int atmel_open(struct net_device *dev) |
1305 | { | 1305 | { |
1306 | struct atmel_private *priv = netdev_priv(dev); | 1306 | struct atmel_private *priv = netdev_priv(dev); |
1307 | int i, channel; | 1307 | int i, channel, err; |
1308 | 1308 | ||
1309 | /* any scheduled timer is no longer needed and might screw things up.. */ | 1309 | /* any scheduled timer is no longer needed and might screw things up.. */ |
1310 | del_timer_sync(&priv->management_timer); | 1310 | del_timer_sync(&priv->management_timer); |
@@ -1328,8 +1328,9 @@ int atmel_open(struct net_device *dev) | |||
1328 | priv->site_survey_state = SITE_SURVEY_IDLE; | 1328 | priv->site_survey_state = SITE_SURVEY_IDLE; |
1329 | priv->station_is_associated = 0; | 1329 | priv->station_is_associated = 0; |
1330 | 1330 | ||
1331 | if (!reset_atmel_card(dev)) | 1331 | err = reset_atmel_card(dev); |
1332 | return -EAGAIN; | 1332 | if (err) |
1333 | return err; | ||
1333 | 1334 | ||
1334 | if (priv->config_reg_domain) { | 1335 | if (priv->config_reg_domain) { |
1335 | priv->reg_domain = priv->config_reg_domain; | 1336 | priv->reg_domain = priv->config_reg_domain; |
@@ -3061,12 +3062,20 @@ static void authenticate(struct atmel_private *priv, u16 frame_len) | |||
3061 | } | 3062 | } |
3062 | 3063 | ||
3063 | if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) { | 3064 | if (status == WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG) { |
3064 | /* Do opensystem first, then try sharedkey */ | 3065 | /* Flip back and forth between WEP auth modes until the max |
3066 | * authentication tries has been exceeded. | ||
3067 | */ | ||
3065 | if (system == WLAN_AUTH_OPEN) { | 3068 | if (system == WLAN_AUTH_OPEN) { |
3066 | priv->CurrentAuthentTransactionSeqNum = 0x001; | 3069 | priv->CurrentAuthentTransactionSeqNum = 0x001; |
3067 | priv->exclude_unencrypted = 1; | 3070 | priv->exclude_unencrypted = 1; |
3068 | send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0); | 3071 | send_authentication_request(priv, WLAN_AUTH_SHARED_KEY, NULL, 0); |
3069 | return; | 3072 | return; |
3073 | } else if ( system == WLAN_AUTH_SHARED_KEY | ||
3074 | && priv->wep_is_on) { | ||
3075 | priv->CurrentAuthentTransactionSeqNum = 0x001; | ||
3076 | priv->exclude_unencrypted = 0; | ||
3077 | send_authentication_request(priv, WLAN_AUTH_OPEN, NULL, 0); | ||
3078 | return; | ||
3070 | } else if (priv->connect_to_any_BSS) { | 3079 | } else if (priv->connect_to_any_BSS) { |
3071 | int bss_index; | 3080 | int bss_index; |
3072 | 3081 | ||
@@ -3580,12 +3589,12 @@ static int atmel_wakeup_firmware(struct atmel_private *priv) | |||
3580 | 3589 | ||
3581 | if (i == 0) { | 3590 | if (i == 0) { |
3582 | printk(KERN_ALERT "%s: MAC failed to boot.\n", priv->dev->name); | 3591 | printk(KERN_ALERT "%s: MAC failed to boot.\n", priv->dev->name); |
3583 | return 0; | 3592 | return -EIO; |
3584 | } | 3593 | } |
3585 | 3594 | ||
3586 | if ((priv->host_info_base = atmel_read16(priv->dev, MR2)) == 0xffff) { | 3595 | if ((priv->host_info_base = atmel_read16(priv->dev, MR2)) == 0xffff) { |
3587 | printk(KERN_ALERT "%s: card missing.\n", priv->dev->name); | 3596 | printk(KERN_ALERT "%s: card missing.\n", priv->dev->name); |
3588 | return 0; | 3597 | return -ENODEV; |
3589 | } | 3598 | } |
3590 | 3599 | ||
3591 | /* now check for completion of MAC initialization through | 3600 | /* now check for completion of MAC initialization through |
@@ -3609,19 +3618,19 @@ static int atmel_wakeup_firmware(struct atmel_private *priv) | |||
3609 | if (i == 0) { | 3618 | if (i == 0) { |
3610 | printk(KERN_ALERT "%s: MAC failed to initialise.\n", | 3619 | printk(KERN_ALERT "%s: MAC failed to initialise.\n", |
3611 | priv->dev->name); | 3620 | priv->dev->name); |
3612 | return 0; | 3621 | return -EIO; |
3613 | } | 3622 | } |
3614 | 3623 | ||
3615 | /* Check for MAC_INIT_OK only on the register that the MAC_INIT_OK was set */ | 3624 | /* Check for MAC_INIT_OK only on the register that the MAC_INIT_OK was set */ |
3616 | if ((mr3 & MAC_INIT_COMPLETE) && | 3625 | if ((mr3 & MAC_INIT_COMPLETE) && |
3617 | !(atmel_read16(priv->dev, MR3) & MAC_INIT_OK)) { | 3626 | !(atmel_read16(priv->dev, MR3) & MAC_INIT_OK)) { |
3618 | printk(KERN_ALERT "%s: MAC failed MR3 self-test.\n", priv->dev->name); | 3627 | printk(KERN_ALERT "%s: MAC failed MR3 self-test.\n", priv->dev->name); |
3619 | return 0; | 3628 | return -EIO; |
3620 | } | 3629 | } |
3621 | if ((mr1 & MAC_INIT_COMPLETE) && | 3630 | if ((mr1 & MAC_INIT_COMPLETE) && |
3622 | !(atmel_read16(priv->dev, MR1) & MAC_INIT_OK)) { | 3631 | !(atmel_read16(priv->dev, MR1) & MAC_INIT_OK)) { |
3623 | printk(KERN_ALERT "%s: MAC failed MR1 self-test.\n", priv->dev->name); | 3632 | printk(KERN_ALERT "%s: MAC failed MR1 self-test.\n", priv->dev->name); |
3624 | return 0; | 3633 | return -EIO; |
3625 | } | 3634 | } |
3626 | 3635 | ||
3627 | atmel_copy_to_host(priv->dev, (unsigned char *)iface, | 3636 | atmel_copy_to_host(priv->dev, (unsigned char *)iface, |
@@ -3642,7 +3651,7 @@ static int atmel_wakeup_firmware(struct atmel_private *priv) | |||
3642 | iface->func_ctrl = le16_to_cpu(iface->func_ctrl); | 3651 | iface->func_ctrl = le16_to_cpu(iface->func_ctrl); |
3643 | iface->mac_status = le16_to_cpu(iface->mac_status); | 3652 | iface->mac_status = le16_to_cpu(iface->mac_status); |
3644 | 3653 | ||
3645 | return 1; | 3654 | return 0; |
3646 | } | 3655 | } |
3647 | 3656 | ||
3648 | /* determine type of memory and MAC address */ | 3657 | /* determine type of memory and MAC address */ |
@@ -3693,7 +3702,7 @@ static int probe_atmel_card(struct net_device *dev) | |||
3693 | /* Standard firmware in flash, boot it up and ask | 3702 | /* Standard firmware in flash, boot it up and ask |
3694 | for the Mac Address */ | 3703 | for the Mac Address */ |
3695 | priv->card_type = CARD_TYPE_SPI_FLASH; | 3704 | priv->card_type = CARD_TYPE_SPI_FLASH; |
3696 | if (atmel_wakeup_firmware(priv)) { | 3705 | if (atmel_wakeup_firmware(priv) == 0) { |
3697 | atmel_get_mib(priv, Mac_Address_Mib_Type, 0, dev->dev_addr, 6); | 3706 | atmel_get_mib(priv, Mac_Address_Mib_Type, 0, dev->dev_addr, 6); |
3698 | 3707 | ||
3699 | /* got address, now squash it again until the network | 3708 | /* got address, now squash it again until the network |
@@ -3835,6 +3844,7 @@ static int reset_atmel_card(struct net_device *dev) | |||
3835 | struct atmel_private *priv = netdev_priv(dev); | 3844 | struct atmel_private *priv = netdev_priv(dev); |
3836 | u8 configuration; | 3845 | u8 configuration; |
3837 | int old_state = priv->station_state; | 3846 | int old_state = priv->station_state; |
3847 | int err = 0; | ||
3838 | 3848 | ||
3839 | /* data to add to the firmware names, in priority order | 3849 | /* data to add to the firmware names, in priority order |
3840 | this implemenents firmware versioning */ | 3850 | this implemenents firmware versioning */ |
@@ -3868,11 +3878,12 @@ static int reset_atmel_card(struct net_device *dev) | |||
3868 | dev->name); | 3878 | dev->name); |
3869 | strcpy(priv->firmware_id, "atmel_at76c502.bin"); | 3879 | strcpy(priv->firmware_id, "atmel_at76c502.bin"); |
3870 | } | 3880 | } |
3871 | if (request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev) != 0) { | 3881 | err = request_firmware(&fw_entry, priv->firmware_id, priv->sys_dev); |
3882 | if (err != 0) { | ||
3872 | printk(KERN_ALERT | 3883 | printk(KERN_ALERT |
3873 | "%s: firmware %s is missing, cannot continue.\n", | 3884 | "%s: firmware %s is missing, cannot continue.\n", |
3874 | dev->name, priv->firmware_id); | 3885 | dev->name, priv->firmware_id); |
3875 | return 0; | 3886 | return err; |
3876 | } | 3887 | } |
3877 | } else { | 3888 | } else { |
3878 | int fw_index = 0; | 3889 | int fw_index = 0; |
@@ -3901,7 +3912,7 @@ static int reset_atmel_card(struct net_device *dev) | |||
3901 | "%s: firmware %s is missing, cannot start.\n", | 3912 | "%s: firmware %s is missing, cannot start.\n", |
3902 | dev->name, priv->firmware_id); | 3913 | dev->name, priv->firmware_id); |
3903 | priv->firmware_id[0] = '\0'; | 3914 | priv->firmware_id[0] = '\0'; |
3904 | return 0; | 3915 | return -ENOENT; |
3905 | } | 3916 | } |
3906 | } | 3917 | } |
3907 | 3918 | ||
@@ -3926,8 +3937,9 @@ static int reset_atmel_card(struct net_device *dev) | |||
3926 | release_firmware(fw_entry); | 3937 | release_firmware(fw_entry); |
3927 | } | 3938 | } |
3928 | 3939 | ||
3929 | if (!atmel_wakeup_firmware(priv)) | 3940 | err = atmel_wakeup_firmware(priv); |
3930 | return 0; | 3941 | if (err != 0) |
3942 | return err; | ||
3931 | 3943 | ||
3932 | /* Check the version and set the correct flag for wpa stuff, | 3944 | /* Check the version and set the correct flag for wpa stuff, |
3933 | old and new firmware is incompatible. | 3945 | old and new firmware is incompatible. |
@@ -3968,10 +3980,9 @@ static int reset_atmel_card(struct net_device *dev) | |||
3968 | if (!priv->radio_on_broken) { | 3980 | if (!priv->radio_on_broken) { |
3969 | if (atmel_send_command_wait(priv, CMD_EnableRadio, NULL, 0) == | 3981 | if (atmel_send_command_wait(priv, CMD_EnableRadio, NULL, 0) == |
3970 | CMD_STATUS_REJECTED_RADIO_OFF) { | 3982 | CMD_STATUS_REJECTED_RADIO_OFF) { |
3971 | printk(KERN_INFO | 3983 | printk(KERN_INFO "%s: cannot turn the radio on.\n", |
3972 | "%s: cannot turn the radio on. (Hey radio, you're beautiful!)\n", | ||
3973 | dev->name); | 3984 | dev->name); |
3974 | return 0; | 3985 | return -EIO; |
3975 | } | 3986 | } |
3976 | } | 3987 | } |
3977 | 3988 | ||
@@ -4006,7 +4017,7 @@ static int reset_atmel_card(struct net_device *dev) | |||
4006 | wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL); | 4017 | wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL); |
4007 | } | 4018 | } |
4008 | 4019 | ||
4009 | return 1; | 4020 | return 0; |
4010 | } | 4021 | } |
4011 | 4022 | ||
4012 | static void atmel_send_command(struct atmel_private *priv, int command, | 4023 | static void atmel_send_command(struct atmel_private *priv, int command, |
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index e2581229d8b2..23fed3298962 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -474,8 +474,8 @@ static void iwl4965_apm_stop(struct iwl_priv *priv) | |||
474 | iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET); | 474 | iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET); |
475 | 475 | ||
476 | udelay(10); | 476 | udelay(10); |
477 | 477 | /* clear "init complete" move adapter D0A* --> D0U state */ | |
478 | iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); | 478 | iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); |
479 | spin_unlock_irqrestore(&priv->lock, flags); | 479 | spin_unlock_irqrestore(&priv->lock, flags); |
480 | } | 480 | } |
481 | 481 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index cbc01a00eaf4..b08036a9d894 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c | |||
@@ -145,7 +145,8 @@ static void iwl5000_apm_stop(struct iwl_priv *priv) | |||
145 | 145 | ||
146 | udelay(10); | 146 | udelay(10); |
147 | 147 | ||
148 | iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); | 148 | /* clear "init complete" move adapter D0A* --> D0U state */ |
149 | iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE); | ||
149 | 150 | ||
150 | spin_unlock_irqrestore(&priv->lock, flags); | 151 | spin_unlock_irqrestore(&priv->lock, flags); |
151 | } | 152 | } |
@@ -577,14 +578,11 @@ static int iwl5000_load_section(struct iwl_priv *priv, | |||
577 | FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL), | 578 | FH_TFDIB_CTRL0_REG(FH_SRVC_CHNL), |
578 | phy_addr & FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK); | 579 | phy_addr & FH_MEM_TFDIB_DRAM_ADDR_LSB_MSK); |
579 | 580 | ||
580 | /* FIME: write the MSB of the phy_addr in CTRL1 | ||
581 | * iwl_write_direct32(priv, | ||
582 | IWL_FH_TFDIB_CTRL1_REG(IWL_FH_SRVC_CHNL), | ||
583 | ((phy_addr & MSB_MSK) | ||
584 | << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_count); | ||
585 | */ | ||
586 | iwl_write_direct32(priv, | 581 | iwl_write_direct32(priv, |
587 | FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL), byte_cnt); | 582 | FH_TFDIB_CTRL1_REG(FH_SRVC_CHNL), |
583 | (iwl_get_dma_hi_address(phy_addr) | ||
584 | << FH_MEM_TFDIB_REG1_ADDR_BITSHIFT) | byte_cnt); | ||
585 | |||
588 | iwl_write_direct32(priv, | 586 | iwl_write_direct32(priv, |
589 | FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL), | 587 | FH_TCSR_CHNL_TX_BUF_STS_REG(FH_SRVC_CHNL), |
590 | 1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM | | 588 | 1 << FH_TCSR_CHNL_TX_BUF_STS_REG_POS_TB_NUM | |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 061ffba9c884..c0b73c4d6f44 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2602,6 +2602,7 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw) | |||
2602 | { | 2602 | { |
2603 | struct iwl_priv *priv = hw->priv; | 2603 | struct iwl_priv *priv = hw->priv; |
2604 | int ret; | 2604 | int ret; |
2605 | u16 pci_cmd; | ||
2605 | 2606 | ||
2606 | IWL_DEBUG_MAC80211("enter\n"); | 2607 | IWL_DEBUG_MAC80211("enter\n"); |
2607 | 2608 | ||
@@ -2612,6 +2613,13 @@ static int iwl4965_mac_start(struct ieee80211_hw *hw) | |||
2612 | pci_restore_state(priv->pci_dev); | 2613 | pci_restore_state(priv->pci_dev); |
2613 | pci_enable_msi(priv->pci_dev); | 2614 | pci_enable_msi(priv->pci_dev); |
2614 | 2615 | ||
2616 | /* enable interrupts if needed: hw bug w/a */ | ||
2617 | pci_read_config_word(priv->pci_dev, PCI_COMMAND, &pci_cmd); | ||
2618 | if (pci_cmd & PCI_COMMAND_INTX_DISABLE) { | ||
2619 | pci_cmd &= ~PCI_COMMAND_INTX_DISABLE; | ||
2620 | pci_write_config_word(priv->pci_dev, PCI_COMMAND, pci_cmd); | ||
2621 | } | ||
2622 | |||
2615 | ret = request_irq(priv->pci_dev->irq, iwl4965_isr, IRQF_SHARED, | 2623 | ret = request_irq(priv->pci_dev->irq, iwl4965_isr, IRQF_SHARED, |
2616 | DRV_NAME, priv); | 2624 | DRV_NAME, priv); |
2617 | if (ret) { | 2625 | if (ret) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-fh.h b/drivers/net/wireless/iwlwifi/iwl-fh.h index 944642450d3d..cd11c0ca2991 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fh.h +++ b/drivers/net/wireless/iwlwifi/iwl-fh.h | |||
@@ -287,6 +287,7 @@ | |||
287 | 287 | ||
288 | #define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (0x01000000) | 288 | #define FH_RSSR_CHNL0_RX_STATUS_CHNL_IDLE (0x01000000) |
289 | 289 | ||
290 | #define FH_MEM_TFDIB_REG1_ADDR_BITSHIFT 28 | ||
290 | 291 | ||
291 | /** | 292 | /** |
292 | * Transmit DMA Channel Control/Status Registers (TCSR) | 293 | * Transmit DMA Channel Control/Status Registers (TCSR) |
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index d82823b5c8ab..ff879d46624a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
@@ -426,7 +426,7 @@ static int iwl_tx_queue_init(struct iwl_priv *priv, | |||
426 | continue; | 426 | continue; |
427 | } | 427 | } |
428 | 428 | ||
429 | txq->cmd[i] = kmalloc(len, GFP_KERNEL | GFP_DMA); | 429 | txq->cmd[i] = kmalloc(len, GFP_KERNEL); |
430 | if (!txq->cmd[i]) | 430 | if (!txq->cmd[i]) |
431 | return -ENOMEM; | 431 | return -ENOMEM; |
432 | } | 432 | } |
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 04d7a251e3f0..8941919001bb 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
@@ -595,7 +595,7 @@ static int if_cs_prog_helper(struct if_cs_card *card) | |||
595 | if (ret < 0) { | 595 | if (ret < 0) { |
596 | lbs_pr_err("can't download helper at 0x%x, ret %d\n", | 596 | lbs_pr_err("can't download helper at 0x%x, ret %d\n", |
597 | sent, ret); | 597 | sent, ret); |
598 | goto done; | 598 | goto err_release; |
599 | } | 599 | } |
600 | 600 | ||
601 | if (count == 0) | 601 | if (count == 0) |
@@ -604,9 +604,8 @@ static int if_cs_prog_helper(struct if_cs_card *card) | |||
604 | sent += count; | 604 | sent += count; |
605 | } | 605 | } |
606 | 606 | ||
607 | err_release: | ||
607 | release_firmware(fw); | 608 | release_firmware(fw); |
608 | ret = 0; | ||
609 | |||
610 | done: | 609 | done: |
611 | lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret); | 610 | lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret); |
612 | return ret; | 611 | return ret; |
@@ -676,14 +675,8 @@ static int if_cs_prog_real(struct if_cs_card *card) | |||
676 | } | 675 | } |
677 | 676 | ||
678 | ret = if_cs_poll_while_fw_download(card, IF_CS_SCRATCH, 0x5a); | 677 | ret = if_cs_poll_while_fw_download(card, IF_CS_SCRATCH, 0x5a); |
679 | if (ret < 0) { | 678 | if (ret < 0) |
680 | lbs_pr_err("firmware download failed\n"); | 679 | lbs_pr_err("firmware download failed\n"); |
681 | goto err_release; | ||
682 | } | ||
683 | |||
684 | ret = 0; | ||
685 | goto done; | ||
686 | |||
687 | 680 | ||
688 | err_release: | 681 | err_release: |
689 | release_firmware(fw); | 682 | release_firmware(fw); |
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 1ebcafe7ca5f..36c004e15602 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -1970,6 +1970,9 @@ __orinoco_set_multicast_list(struct net_device *dev) | |||
1970 | priv->promiscuous = promisc; | 1970 | priv->promiscuous = promisc; |
1971 | } | 1971 | } |
1972 | 1972 | ||
1973 | /* If we're not in promiscuous mode, then we need to set the | ||
1974 | * group address if either we want to multicast, or if we were | ||
1975 | * multicasting and want to stop */ | ||
1973 | if (! promisc && (mc_count || priv->mc_count) ) { | 1976 | if (! promisc && (mc_count || priv->mc_count) ) { |
1974 | struct dev_mc_list *p = dev->mc_list; | 1977 | struct dev_mc_list *p = dev->mc_list; |
1975 | struct hermes_multicast mclist; | 1978 | struct hermes_multicast mclist; |
@@ -1989,9 +1992,10 @@ __orinoco_set_multicast_list(struct net_device *dev) | |||
1989 | printk(KERN_WARNING "%s: Multicast list is " | 1992 | printk(KERN_WARNING "%s: Multicast list is " |
1990 | "longer than mc_count\n", dev->name); | 1993 | "longer than mc_count\n", dev->name); |
1991 | 1994 | ||
1992 | err = hermes_write_ltv(hw, USER_BAP, HERMES_RID_CNFGROUPADDRESSES, | 1995 | err = hermes_write_ltv(hw, USER_BAP, |
1993 | HERMES_BYTES_TO_RECLEN(priv->mc_count * ETH_ALEN), | 1996 | HERMES_RID_CNFGROUPADDRESSES, |
1994 | &mclist); | 1997 | HERMES_BYTES_TO_RECLEN(mc_count * ETH_ALEN), |
1998 | &mclist); | ||
1995 | if (err) | 1999 | if (err) |
1996 | printk(KERN_ERR "%s: Error %d setting multicast list.\n", | 2000 | printk(KERN_ERR "%s: Error %d setting multicast list.\n", |
1997 | dev->name, err); | 2001 | dev->name, err); |
diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h index 7e88ce5651b9..2ea7866abd5d 100644 --- a/drivers/net/wireless/rt2x00/rt2x00reg.h +++ b/drivers/net/wireless/rt2x00/rt2x00reg.h | |||
@@ -136,7 +136,7 @@ struct rt2x00_field32 { | |||
136 | */ | 136 | */ |
137 | #define is_power_of_two(x) ( !((x) & ((x)-1)) ) | 137 | #define is_power_of_two(x) ( !((x) & ((x)-1)) ) |
138 | #define low_bit_mask(x) ( ((x)-1) & ~(x) ) | 138 | #define low_bit_mask(x) ( ((x)-1) & ~(x) ) |
139 | #define is_valid_mask(x) is_power_of_two(1 + (x) + low_bit_mask(x)) | 139 | #define is_valid_mask(x) is_power_of_two(1LU + (x) + low_bit_mask(x)) |
140 | 140 | ||
141 | /* | 141 | /* |
142 | * Macro's to find first set bit in a variable. | 142 | * Macro's to find first set bit in a variable. |
@@ -173,8 +173,7 @@ struct rt2x00_field32 { | |||
173 | * does not exceed the given typelimit. | 173 | * does not exceed the given typelimit. |
174 | */ | 174 | */ |
175 | #define FIELD_CHECK(__mask, __type) \ | 175 | #define FIELD_CHECK(__mask, __type) \ |
176 | BUILD_BUG_ON(!__builtin_constant_p(__mask) || \ | 176 | BUILD_BUG_ON(!(__mask) || \ |
177 | !(__mask) || \ | ||
178 | !is_valid_mask(__mask) || \ | 177 | !is_valid_mask(__mask) || \ |
179 | (__mask) != (__type)(__mask)) \ | 178 | (__mask) != (__type)(__mask)) \ |
180 | 179 | ||
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c index 2450b3a393ff..7ba78e6d210e 100644 --- a/drivers/oprofile/cpu_buffer.c +++ b/drivers/oprofile/cpu_buffer.c | |||
@@ -38,8 +38,10 @@ void free_cpu_buffers(void) | |||
38 | { | 38 | { |
39 | int i; | 39 | int i; |
40 | 40 | ||
41 | for_each_online_cpu(i) | 41 | for_each_online_cpu(i) { |
42 | vfree(per_cpu(cpu_buffer, i).buffer); | 42 | vfree(per_cpu(cpu_buffer, i).buffer); |
43 | per_cpu(cpu_buffer, i).buffer = NULL; | ||
44 | } | ||
43 | } | 45 | } |
44 | 46 | ||
45 | int alloc_cpu_buffers(void) | 47 | int alloc_cpu_buffers(void) |
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c index e7fbac529935..8d692a5c8e73 100644 --- a/drivers/oprofile/event_buffer.c +++ b/drivers/oprofile/event_buffer.c | |||
@@ -93,6 +93,8 @@ out: | |||
93 | void free_event_buffer(void) | 93 | void free_event_buffer(void) |
94 | { | 94 | { |
95 | vfree(event_buffer); | 95 | vfree(event_buffer); |
96 | |||
97 | event_buffer = NULL; | ||
96 | } | 98 | } |
97 | 99 | ||
98 | 100 | ||
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 6ea349aba3ba..b184367637d0 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
@@ -800,7 +800,6 @@ static void __exit cmos_do_remove(struct device *dev) | |||
800 | static int cmos_suspend(struct device *dev, pm_message_t mesg) | 800 | static int cmos_suspend(struct device *dev, pm_message_t mesg) |
801 | { | 801 | { |
802 | struct cmos_rtc *cmos = dev_get_drvdata(dev); | 802 | struct cmos_rtc *cmos = dev_get_drvdata(dev); |
803 | int do_wake = device_may_wakeup(dev); | ||
804 | unsigned char tmp; | 803 | unsigned char tmp; |
805 | 804 | ||
806 | /* only the alarm might be a wakeup event source */ | 805 | /* only the alarm might be a wakeup event source */ |
@@ -809,7 +808,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg) | |||
809 | if (tmp & (RTC_PIE|RTC_AIE|RTC_UIE)) { | 808 | if (tmp & (RTC_PIE|RTC_AIE|RTC_UIE)) { |
810 | unsigned char mask; | 809 | unsigned char mask; |
811 | 810 | ||
812 | if (do_wake) | 811 | if (device_may_wakeup(dev)) |
813 | mask = RTC_IRQMASK & ~RTC_AIE; | 812 | mask = RTC_IRQMASK & ~RTC_AIE; |
814 | else | 813 | else |
815 | mask = RTC_IRQMASK; | 814 | mask = RTC_IRQMASK; |
@@ -837,6 +836,17 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg) | |||
837 | return 0; | 836 | return 0; |
838 | } | 837 | } |
839 | 838 | ||
839 | /* We want RTC alarms to wake us from e.g. ACPI G2/S5 "soft off", even | ||
840 | * after a detour through G3 "mechanical off", although the ACPI spec | ||
841 | * says wakeup should only work from G1/S4 "hibernate". To most users, | ||
842 | * distinctions between S4 and S5 are pointless. So when the hardware | ||
843 | * allows, don't draw that distinction. | ||
844 | */ | ||
845 | static inline int cmos_poweroff(struct device *dev) | ||
846 | { | ||
847 | return cmos_suspend(dev, PMSG_HIBERNATE); | ||
848 | } | ||
849 | |||
840 | static int cmos_resume(struct device *dev) | 850 | static int cmos_resume(struct device *dev) |
841 | { | 851 | { |
842 | struct cmos_rtc *cmos = dev_get_drvdata(dev); | 852 | struct cmos_rtc *cmos = dev_get_drvdata(dev); |
@@ -884,6 +894,12 @@ static int cmos_resume(struct device *dev) | |||
884 | #else | 894 | #else |
885 | #define cmos_suspend NULL | 895 | #define cmos_suspend NULL |
886 | #define cmos_resume NULL | 896 | #define cmos_resume NULL |
897 | |||
898 | static inline int cmos_poweroff(struct device *dev) | ||
899 | { | ||
900 | return -ENOSYS; | ||
901 | } | ||
902 | |||
887 | #endif | 903 | #endif |
888 | 904 | ||
889 | /*----------------------------------------------------------------*/ | 905 | /*----------------------------------------------------------------*/ |
@@ -903,10 +919,6 @@ static int cmos_resume(struct device *dev) | |||
903 | static int __devinit | 919 | static int __devinit |
904 | cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) | 920 | cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) |
905 | { | 921 | { |
906 | /* REVISIT paranoia argues for a shutdown notifier, since PNP | ||
907 | * drivers can't provide shutdown() methods to disable IRQs. | ||
908 | * Or better yet, fix PNP to allow those methods... | ||
909 | */ | ||
910 | if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0)) | 922 | if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0)) |
911 | /* Some machines contain a PNP entry for the RTC, but | 923 | /* Some machines contain a PNP entry for the RTC, but |
912 | * don't define the IRQ. It should always be safe to | 924 | * don't define the IRQ. It should always be safe to |
@@ -942,6 +954,13 @@ static int cmos_pnp_resume(struct pnp_dev *pnp) | |||
942 | #define cmos_pnp_resume NULL | 954 | #define cmos_pnp_resume NULL |
943 | #endif | 955 | #endif |
944 | 956 | ||
957 | static void cmos_pnp_shutdown(struct device *pdev) | ||
958 | { | ||
959 | if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(pdev)) | ||
960 | return; | ||
961 | |||
962 | cmos_do_shutdown(); | ||
963 | } | ||
945 | 964 | ||
946 | static const struct pnp_device_id rtc_ids[] = { | 965 | static const struct pnp_device_id rtc_ids[] = { |
947 | { .id = "PNP0b00", }, | 966 | { .id = "PNP0b00", }, |
@@ -961,6 +980,10 @@ static struct pnp_driver cmos_pnp_driver = { | |||
961 | .flags = PNP_DRIVER_RES_DO_NOT_CHANGE, | 980 | .flags = PNP_DRIVER_RES_DO_NOT_CHANGE, |
962 | .suspend = cmos_pnp_suspend, | 981 | .suspend = cmos_pnp_suspend, |
963 | .resume = cmos_pnp_resume, | 982 | .resume = cmos_pnp_resume, |
983 | .driver = { | ||
984 | .name = (char *)driver_name, | ||
985 | .shutdown = cmos_pnp_shutdown, | ||
986 | } | ||
964 | }; | 987 | }; |
965 | 988 | ||
966 | #endif /* CONFIG_PNP */ | 989 | #endif /* CONFIG_PNP */ |
@@ -986,6 +1009,9 @@ static int __exit cmos_platform_remove(struct platform_device *pdev) | |||
986 | 1009 | ||
987 | static void cmos_platform_shutdown(struct platform_device *pdev) | 1010 | static void cmos_platform_shutdown(struct platform_device *pdev) |
988 | { | 1011 | { |
1012 | if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(&pdev->dev)) | ||
1013 | return; | ||
1014 | |||
989 | cmos_do_shutdown(); | 1015 | cmos_do_shutdown(); |
990 | } | 1016 | } |
991 | 1017 | ||
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c index 9f996ec881ce..dd70bf73ce9d 100644 --- a/drivers/rtc/rtc-lib.c +++ b/drivers/rtc/rtc-lib.c | |||
@@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days); | |||
51 | */ | 51 | */ |
52 | void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) | 52 | void rtc_time_to_tm(unsigned long time, struct rtc_time *tm) |
53 | { | 53 | { |
54 | unsigned int days, month, year; | 54 | unsigned int month, year; |
55 | int days; | ||
55 | 56 | ||
56 | days = time / 86400; | 57 | days = time / 86400; |
57 | time -= days * 86400; | 58 | time -= (unsigned int) days * 86400; |
58 | 59 | ||
59 | /* day of the week, 1970-01-01 was a Thursday */ | 60 | /* day of the week, 1970-01-01 was a Thursday */ |
60 | tm->tm_wday = (days + 4) % 7; | 61 | tm->tm_wday = (days + 4) % 7; |
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index db85f1fb131e..711b3004b3e6 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c | |||
@@ -384,9 +384,10 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char | |||
384 | * get minor, add to list | 384 | * get minor, add to list |
385 | */ | 385 | */ |
386 | down_write(&dcssblk_devices_sem); | 386 | down_write(&dcssblk_devices_sem); |
387 | if (dcssblk_get_segment_by_name(local_buf)) { | 387 | if (dcssblk_get_device_by_name(local_buf)) { |
388 | up_write(&dcssblk_devices_sem); | ||
388 | rc = -EEXIST; | 389 | rc = -EEXIST; |
389 | goto release_gd; | 390 | goto unload_seg; |
390 | } | 391 | } |
391 | rc = dcssblk_assign_free_minor(dev_info); | 392 | rc = dcssblk_assign_free_minor(dev_info); |
392 | if (rc) { | 393 | if (rc) { |
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index a08b1682c8e8..e10ac9ab2d44 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c | |||
@@ -133,14 +133,14 @@ claw_register_debug_facility(void) | |||
133 | static inline void | 133 | static inline void |
134 | claw_set_busy(struct net_device *dev) | 134 | claw_set_busy(struct net_device *dev) |
135 | { | 135 | { |
136 | ((struct claw_privbk *) dev->priv)->tbusy=1; | 136 | ((struct claw_privbk *)dev->ml_priv)->tbusy = 1; |
137 | eieio(); | 137 | eieio(); |
138 | } | 138 | } |
139 | 139 | ||
140 | static inline void | 140 | static inline void |
141 | claw_clear_busy(struct net_device *dev) | 141 | claw_clear_busy(struct net_device *dev) |
142 | { | 142 | { |
143 | clear_bit(0, &(((struct claw_privbk *) dev->priv)->tbusy)); | 143 | clear_bit(0, &(((struct claw_privbk *) dev->ml_priv)->tbusy)); |
144 | netif_wake_queue(dev); | 144 | netif_wake_queue(dev); |
145 | eieio(); | 145 | eieio(); |
146 | } | 146 | } |
@@ -149,20 +149,20 @@ static inline int | |||
149 | claw_check_busy(struct net_device *dev) | 149 | claw_check_busy(struct net_device *dev) |
150 | { | 150 | { |
151 | eieio(); | 151 | eieio(); |
152 | return ((struct claw_privbk *) dev->priv)->tbusy; | 152 | return ((struct claw_privbk *) dev->ml_priv)->tbusy; |
153 | } | 153 | } |
154 | 154 | ||
155 | static inline void | 155 | static inline void |
156 | claw_setbit_busy(int nr,struct net_device *dev) | 156 | claw_setbit_busy(int nr,struct net_device *dev) |
157 | { | 157 | { |
158 | netif_stop_queue(dev); | 158 | netif_stop_queue(dev); |
159 | set_bit(nr, (void *)&(((struct claw_privbk *)dev->priv)->tbusy)); | 159 | set_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy)); |
160 | } | 160 | } |
161 | 161 | ||
162 | static inline void | 162 | static inline void |
163 | claw_clearbit_busy(int nr,struct net_device *dev) | 163 | claw_clearbit_busy(int nr,struct net_device *dev) |
164 | { | 164 | { |
165 | clear_bit(nr,(void *)&(((struct claw_privbk *)dev->priv)->tbusy)); | 165 | clear_bit(nr, (void *)&(((struct claw_privbk *)dev->ml_priv)->tbusy)); |
166 | netif_wake_queue(dev); | 166 | netif_wake_queue(dev); |
167 | } | 167 | } |
168 | 168 | ||
@@ -171,7 +171,7 @@ claw_test_and_setbit_busy(int nr,struct net_device *dev) | |||
171 | { | 171 | { |
172 | netif_stop_queue(dev); | 172 | netif_stop_queue(dev); |
173 | return test_and_set_bit(nr, | 173 | return test_and_set_bit(nr, |
174 | (void *)&(((struct claw_privbk *) dev->priv)->tbusy)); | 174 | (void *)&(((struct claw_privbk *) dev->ml_priv)->tbusy)); |
175 | } | 175 | } |
176 | 176 | ||
177 | 177 | ||
@@ -271,6 +271,7 @@ claw_probe(struct ccwgroup_device *cgdev) | |||
271 | if (!get_device(&cgdev->dev)) | 271 | if (!get_device(&cgdev->dev)) |
272 | return -ENODEV; | 272 | return -ENODEV; |
273 | privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL); | 273 | privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL); |
274 | cgdev->dev.driver_data = privptr; | ||
274 | if (privptr == NULL) { | 275 | if (privptr == NULL) { |
275 | probe_error(cgdev); | 276 | probe_error(cgdev); |
276 | put_device(&cgdev->dev); | 277 | put_device(&cgdev->dev); |
@@ -305,7 +306,6 @@ claw_probe(struct ccwgroup_device *cgdev) | |||
305 | privptr->p_env->p_priv = privptr; | 306 | privptr->p_env->p_priv = privptr; |
306 | cgdev->cdev[0]->handler = claw_irq_handler; | 307 | cgdev->cdev[0]->handler = claw_irq_handler; |
307 | cgdev->cdev[1]->handler = claw_irq_handler; | 308 | cgdev->cdev[1]->handler = claw_irq_handler; |
308 | cgdev->dev.driver_data = privptr; | ||
309 | CLAW_DBF_TEXT(2, setup, "prbext 0"); | 309 | CLAW_DBF_TEXT(2, setup, "prbext 0"); |
310 | 310 | ||
311 | return 0; | 311 | return 0; |
@@ -319,7 +319,7 @@ static int | |||
319 | claw_tx(struct sk_buff *skb, struct net_device *dev) | 319 | claw_tx(struct sk_buff *skb, struct net_device *dev) |
320 | { | 320 | { |
321 | int rc; | 321 | int rc; |
322 | struct claw_privbk *privptr=dev->priv; | 322 | struct claw_privbk *privptr = dev->ml_priv; |
323 | unsigned long saveflags; | 323 | unsigned long saveflags; |
324 | struct chbk *p_ch; | 324 | struct chbk *p_ch; |
325 | 325 | ||
@@ -404,7 +404,7 @@ claw_pack_skb(struct claw_privbk *privptr) | |||
404 | static int | 404 | static int |
405 | claw_change_mtu(struct net_device *dev, int new_mtu) | 405 | claw_change_mtu(struct net_device *dev, int new_mtu) |
406 | { | 406 | { |
407 | struct claw_privbk *privptr=dev->priv; | 407 | struct claw_privbk *privptr = dev->ml_priv; |
408 | int buff_size; | 408 | int buff_size; |
409 | CLAW_DBF_TEXT(4, trace, "setmtu"); | 409 | CLAW_DBF_TEXT(4, trace, "setmtu"); |
410 | buff_size = privptr->p_env->write_size; | 410 | buff_size = privptr->p_env->write_size; |
@@ -434,7 +434,7 @@ claw_open(struct net_device *dev) | |||
434 | struct ccwbk *p_buf; | 434 | struct ccwbk *p_buf; |
435 | 435 | ||
436 | CLAW_DBF_TEXT(4, trace, "open"); | 436 | CLAW_DBF_TEXT(4, trace, "open"); |
437 | privptr = (struct claw_privbk *)dev->priv; | 437 | privptr = (struct claw_privbk *)dev->ml_priv; |
438 | /* allocate and initialize CCW blocks */ | 438 | /* allocate and initialize CCW blocks */ |
439 | if (privptr->buffs_alloc == 0) { | 439 | if (privptr->buffs_alloc == 0) { |
440 | rc=init_ccw_bk(dev); | 440 | rc=init_ccw_bk(dev); |
@@ -780,7 +780,7 @@ claw_irq_tasklet ( unsigned long data ) | |||
780 | p_ch = (struct chbk *) data; | 780 | p_ch = (struct chbk *) data; |
781 | dev = (struct net_device *)p_ch->ndev; | 781 | dev = (struct net_device *)p_ch->ndev; |
782 | CLAW_DBF_TEXT(4, trace, "IRQtask"); | 782 | CLAW_DBF_TEXT(4, trace, "IRQtask"); |
783 | privptr = (struct claw_privbk *) dev->priv; | 783 | privptr = (struct claw_privbk *)dev->ml_priv; |
784 | unpack_read(dev); | 784 | unpack_read(dev); |
785 | clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a); | 785 | clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a); |
786 | CLAW_DBF_TEXT(4, trace, "TskletXt"); | 786 | CLAW_DBF_TEXT(4, trace, "TskletXt"); |
@@ -805,7 +805,7 @@ claw_release(struct net_device *dev) | |||
805 | 805 | ||
806 | if (!dev) | 806 | if (!dev) |
807 | return 0; | 807 | return 0; |
808 | privptr = (struct claw_privbk *) dev->priv; | 808 | privptr = (struct claw_privbk *)dev->ml_priv; |
809 | if (!privptr) | 809 | if (!privptr) |
810 | return 0; | 810 | return 0; |
811 | CLAW_DBF_TEXT(4, trace, "release"); | 811 | CLAW_DBF_TEXT(4, trace, "release"); |
@@ -960,7 +960,7 @@ claw_write_next ( struct chbk * p_ch ) | |||
960 | if (p_ch->claw_state == CLAW_STOP) | 960 | if (p_ch->claw_state == CLAW_STOP) |
961 | return; | 961 | return; |
962 | dev = (struct net_device *) p_ch->ndev; | 962 | dev = (struct net_device *) p_ch->ndev; |
963 | privptr = (struct claw_privbk *) dev->priv; | 963 | privptr = (struct claw_privbk *) dev->ml_priv; |
964 | claw_free_wrt_buf( dev ); | 964 | claw_free_wrt_buf( dev ); |
965 | if ((privptr->write_free_count > 0) && | 965 | if ((privptr->write_free_count > 0) && |
966 | !skb_queue_empty(&p_ch->collect_queue)) { | 966 | !skb_queue_empty(&p_ch->collect_queue)) { |
@@ -1042,7 +1042,7 @@ add_claw_reads(struct net_device *dev, struct ccwbk* p_first, | |||
1042 | struct ccw1 temp_ccw; | 1042 | struct ccw1 temp_ccw; |
1043 | struct endccw * p_end; | 1043 | struct endccw * p_end; |
1044 | CLAW_DBF_TEXT(4, trace, "addreads"); | 1044 | CLAW_DBF_TEXT(4, trace, "addreads"); |
1045 | privptr = dev->priv; | 1045 | privptr = dev->ml_priv; |
1046 | p_end = privptr->p_end_ccw; | 1046 | p_end = privptr->p_end_ccw; |
1047 | 1047 | ||
1048 | /* first CCW and last CCW contains a new set of read channel programs | 1048 | /* first CCW and last CCW contains a new set of read channel programs |
@@ -1212,7 +1212,7 @@ find_link(struct net_device *dev, char *host_name, char *ws_name ) | |||
1212 | int rc=0; | 1212 | int rc=0; |
1213 | 1213 | ||
1214 | CLAW_DBF_TEXT(2, setup, "findlink"); | 1214 | CLAW_DBF_TEXT(2, setup, "findlink"); |
1215 | privptr=dev->priv; | 1215 | privptr = dev->ml_priv; |
1216 | p_env=privptr->p_env; | 1216 | p_env=privptr->p_env; |
1217 | switch (p_env->packing) | 1217 | switch (p_env->packing) |
1218 | { | 1218 | { |
@@ -1264,7 +1264,7 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid) | |||
1264 | struct chbk *ch; | 1264 | struct chbk *ch; |
1265 | 1265 | ||
1266 | CLAW_DBF_TEXT(4, trace, "hw_tx"); | 1266 | CLAW_DBF_TEXT(4, trace, "hw_tx"); |
1267 | privptr = (struct claw_privbk *) (dev->priv); | 1267 | privptr = (struct claw_privbk *)(dev->ml_priv); |
1268 | p_ch=(struct chbk *)&privptr->channel[WRITE]; | 1268 | p_ch=(struct chbk *)&privptr->channel[WRITE]; |
1269 | p_env =privptr->p_env; | 1269 | p_env =privptr->p_env; |
1270 | claw_free_wrt_buf(dev); /* Clean up free chain if posible */ | 1270 | claw_free_wrt_buf(dev); /* Clean up free chain if posible */ |
@@ -1483,8 +1483,8 @@ init_ccw_bk(struct net_device *dev) | |||
1483 | struct ccwbk*p_last_CCWB; | 1483 | struct ccwbk*p_last_CCWB; |
1484 | struct ccwbk*p_first_CCWB; | 1484 | struct ccwbk*p_first_CCWB; |
1485 | struct endccw *p_endccw=NULL; | 1485 | struct endccw *p_endccw=NULL; |
1486 | addr_t real_address; | 1486 | addr_t real_address; |
1487 | struct claw_privbk *privptr=dev->priv; | 1487 | struct claw_privbk *privptr = dev->ml_priv; |
1488 | struct clawh *pClawH=NULL; | 1488 | struct clawh *pClawH=NULL; |
1489 | addr_t real_TIC_address; | 1489 | addr_t real_TIC_address; |
1490 | int i,j; | 1490 | int i,j; |
@@ -1960,19 +1960,16 @@ init_ccw_bk(struct net_device *dev) | |||
1960 | static void | 1960 | static void |
1961 | probe_error( struct ccwgroup_device *cgdev) | 1961 | probe_error( struct ccwgroup_device *cgdev) |
1962 | { | 1962 | { |
1963 | struct claw_privbk *privptr; | 1963 | struct claw_privbk *privptr; |
1964 | 1964 | ||
1965 | CLAW_DBF_TEXT(4, trace, "proberr"); | 1965 | CLAW_DBF_TEXT(4, trace, "proberr"); |
1966 | privptr=(struct claw_privbk *)cgdev->dev.driver_data; | 1966 | privptr = (struct claw_privbk *) cgdev->dev.driver_data; |
1967 | if (privptr!=NULL) { | 1967 | if (privptr != NULL) { |
1968 | cgdev->dev.driver_data = NULL; | ||
1968 | kfree(privptr->p_env); | 1969 | kfree(privptr->p_env); |
1969 | privptr->p_env=NULL; | 1970 | kfree(privptr->p_mtc_envelope); |
1970 | kfree(privptr->p_mtc_envelope); | 1971 | kfree(privptr); |
1971 | privptr->p_mtc_envelope=NULL; | 1972 | } |
1972 | kfree(privptr); | ||
1973 | privptr=NULL; | ||
1974 | } | ||
1975 | return; | ||
1976 | } /* probe_error */ | 1973 | } /* probe_error */ |
1977 | 1974 | ||
1978 | /*-------------------------------------------------------------------* | 1975 | /*-------------------------------------------------------------------* |
@@ -2000,7 +1997,7 @@ claw_process_control( struct net_device *dev, struct ccwbk * p_ccw) | |||
2000 | CLAW_DBF_TEXT(2, setup, "clw_cntl"); | 1997 | CLAW_DBF_TEXT(2, setup, "clw_cntl"); |
2001 | udelay(1000); /* Wait a ms for the control packets to | 1998 | udelay(1000); /* Wait a ms for the control packets to |
2002 | *catch up to each other */ | 1999 | *catch up to each other */ |
2003 | privptr=dev->priv; | 2000 | privptr = dev->ml_priv; |
2004 | p_env=privptr->p_env; | 2001 | p_env=privptr->p_env; |
2005 | tdev = &privptr->channel[READ].cdev->dev; | 2002 | tdev = &privptr->channel[READ].cdev->dev; |
2006 | memcpy( &temp_host_name, p_env->host_name, 8); | 2003 | memcpy( &temp_host_name, p_env->host_name, 8); |
@@ -2278,7 +2275,7 @@ claw_send_control(struct net_device *dev, __u8 type, __u8 link, | |||
2278 | struct sk_buff *skb; | 2275 | struct sk_buff *skb; |
2279 | 2276 | ||
2280 | CLAW_DBF_TEXT(2, setup, "sndcntl"); | 2277 | CLAW_DBF_TEXT(2, setup, "sndcntl"); |
2281 | privptr=dev->priv; | 2278 | privptr = dev->ml_priv; |
2282 | p_ctl=(struct clawctl *)&privptr->ctl_bk; | 2279 | p_ctl=(struct clawctl *)&privptr->ctl_bk; |
2283 | 2280 | ||
2284 | p_ctl->command=type; | 2281 | p_ctl->command=type; |
@@ -2348,7 +2345,7 @@ static int | |||
2348 | claw_snd_conn_req(struct net_device *dev, __u8 link) | 2345 | claw_snd_conn_req(struct net_device *dev, __u8 link) |
2349 | { | 2346 | { |
2350 | int rc; | 2347 | int rc; |
2351 | struct claw_privbk *privptr=dev->priv; | 2348 | struct claw_privbk *privptr = dev->ml_priv; |
2352 | struct clawctl *p_ctl; | 2349 | struct clawctl *p_ctl; |
2353 | 2350 | ||
2354 | CLAW_DBF_TEXT(2, setup, "snd_conn"); | 2351 | CLAW_DBF_TEXT(2, setup, "snd_conn"); |
@@ -2408,7 +2405,7 @@ claw_snd_sys_validate_rsp(struct net_device *dev, | |||
2408 | int rc; | 2405 | int rc; |
2409 | 2406 | ||
2410 | CLAW_DBF_TEXT(2, setup, "chkresp"); | 2407 | CLAW_DBF_TEXT(2, setup, "chkresp"); |
2411 | privptr = dev->priv; | 2408 | privptr = dev->ml_priv; |
2412 | p_env=privptr->p_env; | 2409 | p_env=privptr->p_env; |
2413 | rc=claw_send_control(dev, SYSTEM_VALIDATE_RESPONSE, | 2410 | rc=claw_send_control(dev, SYSTEM_VALIDATE_RESPONSE, |
2414 | p_ctl->linkid, | 2411 | p_ctl->linkid, |
@@ -2446,7 +2443,7 @@ net_device_stats *claw_stats(struct net_device *dev) | |||
2446 | struct claw_privbk *privptr; | 2443 | struct claw_privbk *privptr; |
2447 | 2444 | ||
2448 | CLAW_DBF_TEXT(4, trace, "stats"); | 2445 | CLAW_DBF_TEXT(4, trace, "stats"); |
2449 | privptr = dev->priv; | 2446 | privptr = dev->ml_priv; |
2450 | return &privptr->stats; | 2447 | return &privptr->stats; |
2451 | } /* end of claw_stats */ | 2448 | } /* end of claw_stats */ |
2452 | 2449 | ||
@@ -2482,7 +2479,7 @@ unpack_read(struct net_device *dev ) | |||
2482 | p_last_ccw=NULL; | 2479 | p_last_ccw=NULL; |
2483 | p_packh=NULL; | 2480 | p_packh=NULL; |
2484 | p_packd=NULL; | 2481 | p_packd=NULL; |
2485 | privptr=dev->priv; | 2482 | privptr = dev->ml_priv; |
2486 | 2483 | ||
2487 | p_dev = &privptr->channel[READ].cdev->dev; | 2484 | p_dev = &privptr->channel[READ].cdev->dev; |
2488 | p_env = privptr->p_env; | 2485 | p_env = privptr->p_env; |
@@ -2651,7 +2648,7 @@ claw_strt_read (struct net_device *dev, int lock ) | |||
2651 | int rc = 0; | 2648 | int rc = 0; |
2652 | __u32 parm; | 2649 | __u32 parm; |
2653 | unsigned long saveflags = 0; | 2650 | unsigned long saveflags = 0; |
2654 | struct claw_privbk *privptr=dev->priv; | 2651 | struct claw_privbk *privptr = dev->ml_priv; |
2655 | struct ccwbk*p_ccwbk; | 2652 | struct ccwbk*p_ccwbk; |
2656 | struct chbk *p_ch; | 2653 | struct chbk *p_ch; |
2657 | struct clawh *p_clawh; | 2654 | struct clawh *p_clawh; |
@@ -2708,7 +2705,7 @@ claw_strt_out_IO( struct net_device *dev ) | |||
2708 | if (!dev) { | 2705 | if (!dev) { |
2709 | return; | 2706 | return; |
2710 | } | 2707 | } |
2711 | privptr=(struct claw_privbk *)dev->priv; | 2708 | privptr = (struct claw_privbk *)dev->ml_priv; |
2712 | p_ch=&privptr->channel[WRITE]; | 2709 | p_ch=&privptr->channel[WRITE]; |
2713 | 2710 | ||
2714 | CLAW_DBF_TEXT(4, trace, "strt_io"); | 2711 | CLAW_DBF_TEXT(4, trace, "strt_io"); |
@@ -2741,7 +2738,7 @@ static void | |||
2741 | claw_free_wrt_buf( struct net_device *dev ) | 2738 | claw_free_wrt_buf( struct net_device *dev ) |
2742 | { | 2739 | { |
2743 | 2740 | ||
2744 | struct claw_privbk *privptr=(struct claw_privbk *)dev->priv; | 2741 | struct claw_privbk *privptr = (struct claw_privbk *)dev->ml_priv; |
2745 | struct ccwbk*p_first_ccw; | 2742 | struct ccwbk*p_first_ccw; |
2746 | struct ccwbk*p_last_ccw; | 2743 | struct ccwbk*p_last_ccw; |
2747 | struct ccwbk*p_this_ccw; | 2744 | struct ccwbk*p_this_ccw; |
@@ -2798,13 +2795,13 @@ claw_free_netdevice(struct net_device * dev, int free_dev) | |||
2798 | if (!dev) | 2795 | if (!dev) |
2799 | return; | 2796 | return; |
2800 | CLAW_DBF_TEXT_(2, setup, "%s", dev->name); | 2797 | CLAW_DBF_TEXT_(2, setup, "%s", dev->name); |
2801 | privptr = dev->priv; | 2798 | privptr = dev->ml_priv; |
2802 | if (dev->flags & IFF_RUNNING) | 2799 | if (dev->flags & IFF_RUNNING) |
2803 | claw_release(dev); | 2800 | claw_release(dev); |
2804 | if (privptr) { | 2801 | if (privptr) { |
2805 | privptr->channel[READ].ndev = NULL; /* say it's free */ | 2802 | privptr->channel[READ].ndev = NULL; /* say it's free */ |
2806 | } | 2803 | } |
2807 | dev->priv=NULL; | 2804 | dev->ml_priv = NULL; |
2808 | #ifdef MODULE | 2805 | #ifdef MODULE |
2809 | if (free_dev) { | 2806 | if (free_dev) { |
2810 | free_netdev(dev); | 2807 | free_netdev(dev); |
@@ -2921,7 +2918,7 @@ claw_new_device(struct ccwgroup_device *cgdev) | |||
2921 | printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__); | 2918 | printk(KERN_WARNING "%s:alloc_netdev failed\n",__func__); |
2922 | goto out; | 2919 | goto out; |
2923 | } | 2920 | } |
2924 | dev->priv = privptr; | 2921 | dev->ml_priv = privptr; |
2925 | cgdev->dev.driver_data = privptr; | 2922 | cgdev->dev.driver_data = privptr; |
2926 | cgdev->cdev[READ]->dev.driver_data = privptr; | 2923 | cgdev->cdev[READ]->dev.driver_data = privptr; |
2927 | cgdev->cdev[WRITE]->dev.driver_data = privptr; | 2924 | cgdev->cdev[WRITE]->dev.driver_data = privptr; |
@@ -3002,7 +2999,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev) | |||
3002 | ret = claw_release(ndev); | 2999 | ret = claw_release(ndev); |
3003 | ndev->flags &=~IFF_RUNNING; | 3000 | ndev->flags &=~IFF_RUNNING; |
3004 | unregister_netdev(ndev); | 3001 | unregister_netdev(ndev); |
3005 | ndev->priv = NULL; /* cgdev data, not ndev's to free */ | 3002 | ndev->ml_priv = NULL; /* cgdev data, not ndev's to free */ |
3006 | claw_free_netdevice(ndev, 1); | 3003 | claw_free_netdevice(ndev, 1); |
3007 | priv->channel[READ].ndev = NULL; | 3004 | priv->channel[READ].ndev = NULL; |
3008 | priv->channel[WRITE].ndev = NULL; | 3005 | priv->channel[WRITE].ndev = NULL; |
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c index 0b4e6253abe4..42776550acfd 100644 --- a/drivers/s390/net/ctcm_fsms.c +++ b/drivers/s390/net/ctcm_fsms.c | |||
@@ -245,7 +245,7 @@ static void chx_txdone(fsm_instance *fi, int event, void *arg) | |||
245 | { | 245 | { |
246 | struct channel *ch = arg; | 246 | struct channel *ch = arg; |
247 | struct net_device *dev = ch->netdev; | 247 | struct net_device *dev = ch->netdev; |
248 | struct ctcm_priv *priv = dev->priv; | 248 | struct ctcm_priv *priv = dev->ml_priv; |
249 | struct sk_buff *skb; | 249 | struct sk_buff *skb; |
250 | int first = 1; | 250 | int first = 1; |
251 | int i; | 251 | int i; |
@@ -336,7 +336,7 @@ void ctcm_chx_txidle(fsm_instance *fi, int event, void *arg) | |||
336 | { | 336 | { |
337 | struct channel *ch = arg; | 337 | struct channel *ch = arg; |
338 | struct net_device *dev = ch->netdev; | 338 | struct net_device *dev = ch->netdev; |
339 | struct ctcm_priv *priv = dev->priv; | 339 | struct ctcm_priv *priv = dev->ml_priv; |
340 | 340 | ||
341 | CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name); | 341 | CTCM_PR_DEBUG("%s(%s): %s\n", __func__, ch->id, dev->name); |
342 | 342 | ||
@@ -357,7 +357,7 @@ static void chx_rx(fsm_instance *fi, int event, void *arg) | |||
357 | { | 357 | { |
358 | struct channel *ch = arg; | 358 | struct channel *ch = arg; |
359 | struct net_device *dev = ch->netdev; | 359 | struct net_device *dev = ch->netdev; |
360 | struct ctcm_priv *priv = dev->priv; | 360 | struct ctcm_priv *priv = dev->ml_priv; |
361 | int len = ch->max_bufsize - ch->irb->scsw.cmd.count; | 361 | int len = ch->max_bufsize - ch->irb->scsw.cmd.count; |
362 | struct sk_buff *skb = ch->trans_skb; | 362 | struct sk_buff *skb = ch->trans_skb; |
363 | __u16 block_len = *((__u16 *)skb->data); | 363 | __u16 block_len = *((__u16 *)skb->data); |
@@ -459,7 +459,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) | |||
459 | chx_rxidle(fi, event, arg); | 459 | chx_rxidle(fi, event, arg); |
460 | } else { | 460 | } else { |
461 | struct net_device *dev = ch->netdev; | 461 | struct net_device *dev = ch->netdev; |
462 | struct ctcm_priv *priv = dev->priv; | 462 | struct ctcm_priv *priv = dev->ml_priv; |
463 | fsm_newstate(fi, CTC_STATE_TXIDLE); | 463 | fsm_newstate(fi, CTC_STATE_TXIDLE); |
464 | fsm_event(priv->fsm, DEV_EVENT_TXUP, dev); | 464 | fsm_event(priv->fsm, DEV_EVENT_TXUP, dev); |
465 | } | 465 | } |
@@ -496,7 +496,7 @@ static void chx_firstio(fsm_instance *fi, int event, void *arg) | |||
496 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && | 496 | if ((CHANNEL_DIRECTION(ch->flags) == READ) && |
497 | (ch->protocol == CTCM_PROTO_S390)) { | 497 | (ch->protocol == CTCM_PROTO_S390)) { |
498 | struct net_device *dev = ch->netdev; | 498 | struct net_device *dev = ch->netdev; |
499 | struct ctcm_priv *priv = dev->priv; | 499 | struct ctcm_priv *priv = dev->ml_priv; |
500 | fsm_event(priv->fsm, DEV_EVENT_RXUP, dev); | 500 | fsm_event(priv->fsm, DEV_EVENT_RXUP, dev); |
501 | } | 501 | } |
502 | } | 502 | } |
@@ -514,7 +514,7 @@ static void chx_rxidle(fsm_instance *fi, int event, void *arg) | |||
514 | { | 514 | { |
515 | struct channel *ch = arg; | 515 | struct channel *ch = arg; |
516 | struct net_device *dev = ch->netdev; | 516 | struct net_device *dev = ch->netdev; |
517 | struct ctcm_priv *priv = dev->priv; | 517 | struct ctcm_priv *priv = dev->ml_priv; |
518 | __u16 buflen; | 518 | __u16 buflen; |
519 | int rc; | 519 | int rc; |
520 | 520 | ||
@@ -699,7 +699,7 @@ static void ctcm_chx_cleanup(fsm_instance *fi, int state, | |||
699 | struct channel *ch) | 699 | struct channel *ch) |
700 | { | 700 | { |
701 | struct net_device *dev = ch->netdev; | 701 | struct net_device *dev = ch->netdev; |
702 | struct ctcm_priv *priv = dev->priv; | 702 | struct ctcm_priv *priv = dev->ml_priv; |
703 | 703 | ||
704 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, | 704 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, |
705 | "%s(%s): %s[%d]\n", | 705 | "%s(%s): %s[%d]\n", |
@@ -784,7 +784,7 @@ static void ctcm_chx_setuperr(fsm_instance *fi, int event, void *arg) | |||
784 | { | 784 | { |
785 | struct channel *ch = arg; | 785 | struct channel *ch = arg; |
786 | struct net_device *dev = ch->netdev; | 786 | struct net_device *dev = ch->netdev; |
787 | struct ctcm_priv *priv = dev->priv; | 787 | struct ctcm_priv *priv = dev->ml_priv; |
788 | 788 | ||
789 | /* | 789 | /* |
790 | * Special case: Got UC_RCRESET on setmode. | 790 | * Special case: Got UC_RCRESET on setmode. |
@@ -874,7 +874,7 @@ static void ctcm_chx_rxiniterr(fsm_instance *fi, int event, void *arg) | |||
874 | { | 874 | { |
875 | struct channel *ch = arg; | 875 | struct channel *ch = arg; |
876 | struct net_device *dev = ch->netdev; | 876 | struct net_device *dev = ch->netdev; |
877 | struct ctcm_priv *priv = dev->priv; | 877 | struct ctcm_priv *priv = dev->ml_priv; |
878 | 878 | ||
879 | if (event == CTC_EVENT_TIMER) { | 879 | if (event == CTC_EVENT_TIMER) { |
880 | if (!IS_MPCDEV(dev)) | 880 | if (!IS_MPCDEV(dev)) |
@@ -902,7 +902,7 @@ static void ctcm_chx_rxinitfail(fsm_instance *fi, int event, void *arg) | |||
902 | { | 902 | { |
903 | struct channel *ch = arg; | 903 | struct channel *ch = arg; |
904 | struct net_device *dev = ch->netdev; | 904 | struct net_device *dev = ch->netdev; |
905 | struct ctcm_priv *priv = dev->priv; | 905 | struct ctcm_priv *priv = dev->ml_priv; |
906 | 906 | ||
907 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 907 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
908 | "%s(%s): RX %s busy, init. fail", | 908 | "%s(%s): RX %s busy, init. fail", |
@@ -923,7 +923,7 @@ static void ctcm_chx_rxdisc(fsm_instance *fi, int event, void *arg) | |||
923 | struct channel *ch = arg; | 923 | struct channel *ch = arg; |
924 | struct channel *ch2; | 924 | struct channel *ch2; |
925 | struct net_device *dev = ch->netdev; | 925 | struct net_device *dev = ch->netdev; |
926 | struct ctcm_priv *priv = dev->priv; | 926 | struct ctcm_priv *priv = dev->ml_priv; |
927 | 927 | ||
928 | CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, | 928 | CTCM_DBF_TEXT_(TRACE, CTC_DBF_NOTICE, |
929 | "%s: %s: remote disconnect - re-init ...", | 929 | "%s: %s: remote disconnect - re-init ...", |
@@ -954,7 +954,7 @@ static void ctcm_chx_txiniterr(fsm_instance *fi, int event, void *arg) | |||
954 | { | 954 | { |
955 | struct channel *ch = arg; | 955 | struct channel *ch = arg; |
956 | struct net_device *dev = ch->netdev; | 956 | struct net_device *dev = ch->netdev; |
957 | struct ctcm_priv *priv = dev->priv; | 957 | struct ctcm_priv *priv = dev->ml_priv; |
958 | 958 | ||
959 | if (event == CTC_EVENT_TIMER) { | 959 | if (event == CTC_EVENT_TIMER) { |
960 | fsm_deltimer(&ch->timer); | 960 | fsm_deltimer(&ch->timer); |
@@ -984,7 +984,7 @@ static void ctcm_chx_txretry(fsm_instance *fi, int event, void *arg) | |||
984 | { | 984 | { |
985 | struct channel *ch = arg; | 985 | struct channel *ch = arg; |
986 | struct net_device *dev = ch->netdev; | 986 | struct net_device *dev = ch->netdev; |
987 | struct ctcm_priv *priv = dev->priv; | 987 | struct ctcm_priv *priv = dev->ml_priv; |
988 | struct sk_buff *skb; | 988 | struct sk_buff *skb; |
989 | 989 | ||
990 | CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n", | 990 | CTCM_PR_DEBUG("Enter: %s: cp=%i ch=0x%p id=%s\n", |
@@ -1057,7 +1057,7 @@ static void ctcm_chx_iofatal(fsm_instance *fi, int event, void *arg) | |||
1057 | { | 1057 | { |
1058 | struct channel *ch = arg; | 1058 | struct channel *ch = arg; |
1059 | struct net_device *dev = ch->netdev; | 1059 | struct net_device *dev = ch->netdev; |
1060 | struct ctcm_priv *priv = dev->priv; | 1060 | struct ctcm_priv *priv = dev->ml_priv; |
1061 | int rd = CHANNEL_DIRECTION(ch->flags); | 1061 | int rd = CHANNEL_DIRECTION(ch->flags); |
1062 | 1062 | ||
1063 | fsm_deltimer(&ch->timer); | 1063 | fsm_deltimer(&ch->timer); |
@@ -1207,7 +1207,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) | |||
1207 | { | 1207 | { |
1208 | struct channel *ch = arg; | 1208 | struct channel *ch = arg; |
1209 | struct net_device *dev = ch->netdev; | 1209 | struct net_device *dev = ch->netdev; |
1210 | struct ctcm_priv *priv = dev->priv; | 1210 | struct ctcm_priv *priv = dev->ml_priv; |
1211 | struct mpc_group *grp = priv->mpcg; | 1211 | struct mpc_group *grp = priv->mpcg; |
1212 | struct sk_buff *skb; | 1212 | struct sk_buff *skb; |
1213 | int first = 1; | 1213 | int first = 1; |
@@ -1368,7 +1368,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) | |||
1368 | { | 1368 | { |
1369 | struct channel *ch = arg; | 1369 | struct channel *ch = arg; |
1370 | struct net_device *dev = ch->netdev; | 1370 | struct net_device *dev = ch->netdev; |
1371 | struct ctcm_priv *priv = dev->priv; | 1371 | struct ctcm_priv *priv = dev->ml_priv; |
1372 | struct mpc_group *grp = priv->mpcg; | 1372 | struct mpc_group *grp = priv->mpcg; |
1373 | struct sk_buff *skb = ch->trans_skb; | 1373 | struct sk_buff *skb = ch->trans_skb; |
1374 | struct sk_buff *new_skb; | 1374 | struct sk_buff *new_skb; |
@@ -1471,7 +1471,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) | |||
1471 | { | 1471 | { |
1472 | struct channel *ch = arg; | 1472 | struct channel *ch = arg; |
1473 | struct net_device *dev = ch->netdev; | 1473 | struct net_device *dev = ch->netdev; |
1474 | struct ctcm_priv *priv = dev->priv; | 1474 | struct ctcm_priv *priv = dev->ml_priv; |
1475 | struct mpc_group *gptr = priv->mpcg; | 1475 | struct mpc_group *gptr = priv->mpcg; |
1476 | 1476 | ||
1477 | CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n", | 1477 | CTCM_PR_DEBUG("Enter %s: id=%s, ch=0x%p\n", |
@@ -1525,7 +1525,7 @@ void ctcmpc_chx_rxidle(fsm_instance *fi, int event, void *arg) | |||
1525 | { | 1525 | { |
1526 | struct channel *ch = arg; | 1526 | struct channel *ch = arg; |
1527 | struct net_device *dev = ch->netdev; | 1527 | struct net_device *dev = ch->netdev; |
1528 | struct ctcm_priv *priv = dev->priv; | 1528 | struct ctcm_priv *priv = dev->ml_priv; |
1529 | struct mpc_group *grp = priv->mpcg; | 1529 | struct mpc_group *grp = priv->mpcg; |
1530 | int rc; | 1530 | int rc; |
1531 | unsigned long saveflags = 0; /* avoids compiler warning */ | 1531 | unsigned long saveflags = 0; /* avoids compiler warning */ |
@@ -1580,7 +1580,7 @@ static void ctcmpc_chx_attn(fsm_instance *fsm, int event, void *arg) | |||
1580 | { | 1580 | { |
1581 | struct channel *ch = arg; | 1581 | struct channel *ch = arg; |
1582 | struct net_device *dev = ch->netdev; | 1582 | struct net_device *dev = ch->netdev; |
1583 | struct ctcm_priv *priv = dev->priv; | 1583 | struct ctcm_priv *priv = dev->ml_priv; |
1584 | struct mpc_group *grp = priv->mpcg; | 1584 | struct mpc_group *grp = priv->mpcg; |
1585 | 1585 | ||
1586 | CTCM_PR_DEBUG("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n", | 1586 | CTCM_PR_DEBUG("%s(%s): %s(ch=0x%p), cp=%i, ChStat:%s, GrpStat:%s\n", |
@@ -1639,7 +1639,7 @@ static void ctcmpc_chx_attnbusy(fsm_instance *fsm, int event, void *arg) | |||
1639 | { | 1639 | { |
1640 | struct channel *ch = arg; | 1640 | struct channel *ch = arg; |
1641 | struct net_device *dev = ch->netdev; | 1641 | struct net_device *dev = ch->netdev; |
1642 | struct ctcm_priv *priv = dev->priv; | 1642 | struct ctcm_priv *priv = dev->ml_priv; |
1643 | struct mpc_group *grp = priv->mpcg; | 1643 | struct mpc_group *grp = priv->mpcg; |
1644 | 1644 | ||
1645 | CTCM_PR_DEBUG("%s(%s): %s\n ChState:%s GrpState:%s\n", | 1645 | CTCM_PR_DEBUG("%s(%s): %s\n ChState:%s GrpState:%s\n", |
@@ -1724,7 +1724,7 @@ static void ctcmpc_chx_resend(fsm_instance *fsm, int event, void *arg) | |||
1724 | { | 1724 | { |
1725 | struct channel *ch = arg; | 1725 | struct channel *ch = arg; |
1726 | struct net_device *dev = ch->netdev; | 1726 | struct net_device *dev = ch->netdev; |
1727 | struct ctcm_priv *priv = dev->priv; | 1727 | struct ctcm_priv *priv = dev->ml_priv; |
1728 | struct mpc_group *grp = priv->mpcg; | 1728 | struct mpc_group *grp = priv->mpcg; |
1729 | 1729 | ||
1730 | fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch); | 1730 | fsm_event(grp->fsm, MPCG_EVENT_XID0DO, ch); |
@@ -1740,7 +1740,7 @@ static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg) | |||
1740 | { | 1740 | { |
1741 | struct channel *ach = arg; | 1741 | struct channel *ach = arg; |
1742 | struct net_device *dev = ach->netdev; | 1742 | struct net_device *dev = ach->netdev; |
1743 | struct ctcm_priv *priv = dev->priv; | 1743 | struct ctcm_priv *priv = dev->ml_priv; |
1744 | struct mpc_group *grp = priv->mpcg; | 1744 | struct mpc_group *grp = priv->mpcg; |
1745 | struct channel *wch = priv->channel[WRITE]; | 1745 | struct channel *wch = priv->channel[WRITE]; |
1746 | struct channel *rch = priv->channel[READ]; | 1746 | struct channel *rch = priv->channel[READ]; |
@@ -2050,7 +2050,7 @@ int mpc_ch_fsm_len = ARRAY_SIZE(ctcmpc_ch_fsm); | |||
2050 | static void dev_action_start(fsm_instance *fi, int event, void *arg) | 2050 | static void dev_action_start(fsm_instance *fi, int event, void *arg) |
2051 | { | 2051 | { |
2052 | struct net_device *dev = arg; | 2052 | struct net_device *dev = arg; |
2053 | struct ctcm_priv *priv = dev->priv; | 2053 | struct ctcm_priv *priv = dev->ml_priv; |
2054 | int direction; | 2054 | int direction; |
2055 | 2055 | ||
2056 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2056 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
@@ -2076,7 +2076,7 @@ static void dev_action_stop(fsm_instance *fi, int event, void *arg) | |||
2076 | { | 2076 | { |
2077 | int direction; | 2077 | int direction; |
2078 | struct net_device *dev = arg; | 2078 | struct net_device *dev = arg; |
2079 | struct ctcm_priv *priv = dev->priv; | 2079 | struct ctcm_priv *priv = dev->ml_priv; |
2080 | 2080 | ||
2081 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2081 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
2082 | 2082 | ||
@@ -2096,7 +2096,7 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) | |||
2096 | { | 2096 | { |
2097 | int restart_timer; | 2097 | int restart_timer; |
2098 | struct net_device *dev = arg; | 2098 | struct net_device *dev = arg; |
2099 | struct ctcm_priv *priv = dev->priv; | 2099 | struct ctcm_priv *priv = dev->ml_priv; |
2100 | 2100 | ||
2101 | CTCMY_DBF_DEV_NAME(TRACE, dev, ""); | 2101 | CTCMY_DBF_DEV_NAME(TRACE, dev, ""); |
2102 | 2102 | ||
@@ -2133,12 +2133,12 @@ static void dev_action_restart(fsm_instance *fi, int event, void *arg) | |||
2133 | static void dev_action_chup(fsm_instance *fi, int event, void *arg) | 2133 | static void dev_action_chup(fsm_instance *fi, int event, void *arg) |
2134 | { | 2134 | { |
2135 | struct net_device *dev = arg; | 2135 | struct net_device *dev = arg; |
2136 | struct ctcm_priv *priv = dev->priv; | 2136 | struct ctcm_priv *priv = dev->ml_priv; |
2137 | int dev_stat = fsm_getstate(fi); | 2137 | int dev_stat = fsm_getstate(fi); |
2138 | 2138 | ||
2139 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, | 2139 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_NOTICE, |
2140 | "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL, | 2140 | "%s(%s): priv = %p [%d,%d]\n ", CTCM_FUNTAIL, |
2141 | dev->name, dev->priv, dev_stat, event); | 2141 | dev->name, dev->ml_priv, dev_stat, event); |
2142 | 2142 | ||
2143 | switch (fsm_getstate(fi)) { | 2143 | switch (fsm_getstate(fi)) { |
2144 | case DEV_STATE_STARTWAIT_RXTX: | 2144 | case DEV_STATE_STARTWAIT_RXTX: |
@@ -2195,7 +2195,7 @@ static void dev_action_chdown(fsm_instance *fi, int event, void *arg) | |||
2195 | { | 2195 | { |
2196 | 2196 | ||
2197 | struct net_device *dev = arg; | 2197 | struct net_device *dev = arg; |
2198 | struct ctcm_priv *priv = dev->priv; | 2198 | struct ctcm_priv *priv = dev->ml_priv; |
2199 | 2199 | ||
2200 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 2200 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
2201 | 2201 | ||
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index 126a3ebb8ab2..b11fec24c7d2 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c | |||
@@ -69,7 +69,7 @@ struct channel *channels; | |||
69 | void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) | 69 | void ctcm_unpack_skb(struct channel *ch, struct sk_buff *pskb) |
70 | { | 70 | { |
71 | struct net_device *dev = ch->netdev; | 71 | struct net_device *dev = ch->netdev; |
72 | struct ctcm_priv *priv = dev->priv; | 72 | struct ctcm_priv *priv = dev->ml_priv; |
73 | __u16 len = *((__u16 *) pskb->data); | 73 | __u16 len = *((__u16 *) pskb->data); |
74 | 74 | ||
75 | skb_put(pskb, 2 + LL_HEADER_LENGTH); | 75 | skb_put(pskb, 2 + LL_HEADER_LENGTH); |
@@ -414,7 +414,7 @@ int ctcm_ch_alloc_buffer(struct channel *ch) | |||
414 | */ | 414 | */ |
415 | int ctcm_open(struct net_device *dev) | 415 | int ctcm_open(struct net_device *dev) |
416 | { | 416 | { |
417 | struct ctcm_priv *priv = dev->priv; | 417 | struct ctcm_priv *priv = dev->ml_priv; |
418 | 418 | ||
419 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 419 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
420 | if (!IS_MPC(priv)) | 420 | if (!IS_MPC(priv)) |
@@ -432,7 +432,7 @@ int ctcm_open(struct net_device *dev) | |||
432 | */ | 432 | */ |
433 | int ctcm_close(struct net_device *dev) | 433 | int ctcm_close(struct net_device *dev) |
434 | { | 434 | { |
435 | struct ctcm_priv *priv = dev->priv; | 435 | struct ctcm_priv *priv = dev->ml_priv; |
436 | 436 | ||
437 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); | 437 | CTCMY_DBF_DEV_NAME(SETUP, dev, ""); |
438 | if (!IS_MPC(priv)) | 438 | if (!IS_MPC(priv)) |
@@ -573,7 +573,7 @@ static int ctcm_transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
573 | skb_pull(skb, LL_HEADER_LENGTH + 2); | 573 | skb_pull(skb, LL_HEADER_LENGTH + 2); |
574 | } else if (ccw_idx == 0) { | 574 | } else if (ccw_idx == 0) { |
575 | struct net_device *dev = ch->netdev; | 575 | struct net_device *dev = ch->netdev; |
576 | struct ctcm_priv *priv = dev->priv; | 576 | struct ctcm_priv *priv = dev->ml_priv; |
577 | priv->stats.tx_packets++; | 577 | priv->stats.tx_packets++; |
578 | priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH; | 578 | priv->stats.tx_bytes += skb->len - LL_HEADER_LENGTH; |
579 | } | 579 | } |
@@ -592,7 +592,7 @@ static void ctcmpc_send_sweep_req(struct channel *rch) | |||
592 | struct channel *ch; | 592 | struct channel *ch; |
593 | /* int rc = 0; */ | 593 | /* int rc = 0; */ |
594 | 594 | ||
595 | priv = dev->priv; | 595 | priv = dev->ml_priv; |
596 | grp = priv->mpcg; | 596 | grp = priv->mpcg; |
597 | ch = priv->channel[WRITE]; | 597 | ch = priv->channel[WRITE]; |
598 | 598 | ||
@@ -652,7 +652,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
652 | { | 652 | { |
653 | struct pdu *p_header; | 653 | struct pdu *p_header; |
654 | struct net_device *dev = ch->netdev; | 654 | struct net_device *dev = ch->netdev; |
655 | struct ctcm_priv *priv = dev->priv; | 655 | struct ctcm_priv *priv = dev->ml_priv; |
656 | struct mpc_group *grp = priv->mpcg; | 656 | struct mpc_group *grp = priv->mpcg; |
657 | struct th_header *header; | 657 | struct th_header *header; |
658 | struct sk_buff *nskb; | 658 | struct sk_buff *nskb; |
@@ -867,7 +867,7 @@ done: | |||
867 | /* first merge version - leaving both functions separated */ | 867 | /* first merge version - leaving both functions separated */ |
868 | static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | 868 | static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) |
869 | { | 869 | { |
870 | struct ctcm_priv *priv = dev->priv; | 870 | struct ctcm_priv *priv = dev->ml_priv; |
871 | 871 | ||
872 | if (skb == NULL) { | 872 | if (skb == NULL) { |
873 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, | 873 | CTCM_DBF_TEXT_(ERROR, CTC_DBF_ERROR, |
@@ -911,7 +911,7 @@ static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) | |||
911 | static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) | 911 | static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) |
912 | { | 912 | { |
913 | int len = 0; | 913 | int len = 0; |
914 | struct ctcm_priv *priv = dev->priv; | 914 | struct ctcm_priv *priv = dev->ml_priv; |
915 | struct mpc_group *grp = priv->mpcg; | 915 | struct mpc_group *grp = priv->mpcg; |
916 | struct sk_buff *newskb = NULL; | 916 | struct sk_buff *newskb = NULL; |
917 | 917 | ||
@@ -1025,7 +1025,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) | |||
1025 | if (new_mtu < 576 || new_mtu > 65527) | 1025 | if (new_mtu < 576 || new_mtu > 65527) |
1026 | return -EINVAL; | 1026 | return -EINVAL; |
1027 | 1027 | ||
1028 | priv = dev->priv; | 1028 | priv = dev->ml_priv; |
1029 | max_bufsize = priv->channel[READ]->max_bufsize; | 1029 | max_bufsize = priv->channel[READ]->max_bufsize; |
1030 | 1030 | ||
1031 | if (IS_MPC(priv)) { | 1031 | if (IS_MPC(priv)) { |
@@ -1050,7 +1050,7 @@ static int ctcm_change_mtu(struct net_device *dev, int new_mtu) | |||
1050 | */ | 1050 | */ |
1051 | static struct net_device_stats *ctcm_stats(struct net_device *dev) | 1051 | static struct net_device_stats *ctcm_stats(struct net_device *dev) |
1052 | { | 1052 | { |
1053 | return &((struct ctcm_priv *)dev->priv)->stats; | 1053 | return &((struct ctcm_priv *)dev->ml_priv)->stats; |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | static void ctcm_free_netdevice(struct net_device *dev) | 1056 | static void ctcm_free_netdevice(struct net_device *dev) |
@@ -1060,7 +1060,7 @@ static void ctcm_free_netdevice(struct net_device *dev) | |||
1060 | 1060 | ||
1061 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, | 1061 | CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO, |
1062 | "%s(%s)", CTCM_FUNTAIL, dev->name); | 1062 | "%s(%s)", CTCM_FUNTAIL, dev->name); |
1063 | priv = dev->priv; | 1063 | priv = dev->ml_priv; |
1064 | if (priv) { | 1064 | if (priv) { |
1065 | grp = priv->mpcg; | 1065 | grp = priv->mpcg; |
1066 | if (grp) { | 1066 | if (grp) { |
@@ -1125,7 +1125,7 @@ static struct net_device *ctcm_init_netdevice(struct ctcm_priv *priv) | |||
1125 | CTCM_FUNTAIL); | 1125 | CTCM_FUNTAIL); |
1126 | return NULL; | 1126 | return NULL; |
1127 | } | 1127 | } |
1128 | dev->priv = priv; | 1128 | dev->ml_priv = priv; |
1129 | priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names, | 1129 | priv->fsm = init_fsm("ctcmdev", dev_state_names, dev_event_names, |
1130 | CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS, | 1130 | CTCM_NR_DEV_STATES, CTCM_NR_DEV_EVENTS, |
1131 | dev_fsm, dev_fsm_len, GFP_KERNEL); | 1131 | dev_fsm, dev_fsm_len, GFP_KERNEL); |
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h index a72e0feeb27f..8e10ee86a5ee 100644 --- a/drivers/s390/net/ctcm_main.h +++ b/drivers/s390/net/ctcm_main.h | |||
@@ -229,14 +229,14 @@ void ctcm_remove_files(struct device *dev); | |||
229 | */ | 229 | */ |
230 | static inline void ctcm_clear_busy_do(struct net_device *dev) | 230 | static inline void ctcm_clear_busy_do(struct net_device *dev) |
231 | { | 231 | { |
232 | clear_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy)); | 232 | clear_bit(0, &(((struct ctcm_priv *)dev->ml_priv)->tbusy)); |
233 | netif_wake_queue(dev); | 233 | netif_wake_queue(dev); |
234 | } | 234 | } |
235 | 235 | ||
236 | static inline void ctcm_clear_busy(struct net_device *dev) | 236 | static inline void ctcm_clear_busy(struct net_device *dev) |
237 | { | 237 | { |
238 | struct mpc_group *grp; | 238 | struct mpc_group *grp; |
239 | grp = ((struct ctcm_priv *)dev->priv)->mpcg; | 239 | grp = ((struct ctcm_priv *)dev->ml_priv)->mpcg; |
240 | 240 | ||
241 | if (!(grp && grp->in_sweep)) | 241 | if (!(grp && grp->in_sweep)) |
242 | ctcm_clear_busy_do(dev); | 242 | ctcm_clear_busy_do(dev); |
@@ -246,7 +246,8 @@ static inline void ctcm_clear_busy(struct net_device *dev) | |||
246 | static inline int ctcm_test_and_set_busy(struct net_device *dev) | 246 | static inline int ctcm_test_and_set_busy(struct net_device *dev) |
247 | { | 247 | { |
248 | netif_stop_queue(dev); | 248 | netif_stop_queue(dev); |
249 | return test_and_set_bit(0, &(((struct ctcm_priv *)dev->priv)->tbusy)); | 249 | return test_and_set_bit(0, |
250 | &(((struct ctcm_priv *)dev->ml_priv)->tbusy)); | ||
250 | } | 251 | } |
251 | 252 | ||
252 | extern int loglevel; | 253 | extern int loglevel; |
@@ -292,7 +293,7 @@ struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv); | |||
292 | #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC) | 293 | #define IS_MPC(p) ((p)->protocol == CTCM_PROTO_MPC) |
293 | 294 | ||
294 | /* test if struct ctcm_priv of struct net_device has MPC protocol setting */ | 295 | /* test if struct ctcm_priv of struct net_device has MPC protocol setting */ |
295 | #define IS_MPCDEV(d) IS_MPC((struct ctcm_priv *)d->priv) | 296 | #define IS_MPCDEV(dev) IS_MPC((struct ctcm_priv *)dev->ml_priv) |
296 | 297 | ||
297 | static inline gfp_t gfp_type(void) | 298 | static inline gfp_t gfp_type(void) |
298 | { | 299 | { |
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c index 2de1e2fccbf9..cbe470493bf0 100644 --- a/drivers/s390/net/ctcm_mpc.c +++ b/drivers/s390/net/ctcm_mpc.c | |||
@@ -312,10 +312,10 @@ static struct net_device *ctcmpc_get_dev(int port_num) | |||
312 | CTCM_FUNTAIL, device); | 312 | CTCM_FUNTAIL, device); |
313 | return NULL; | 313 | return NULL; |
314 | } | 314 | } |
315 | priv = dev->priv; | 315 | priv = dev->ml_priv; |
316 | if (priv == NULL) { | 316 | if (priv == NULL) { |
317 | CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, | 317 | CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, |
318 | "%s(%s): dev->priv is NULL", | 318 | "%s(%s): dev->ml_priv is NULL", |
319 | CTCM_FUNTAIL, device); | 319 | CTCM_FUNTAIL, device); |
320 | return NULL; | 320 | return NULL; |
321 | } | 321 | } |
@@ -344,7 +344,7 @@ int ctc_mpc_alloc_channel(int port_num, void (*callback)(int, int)) | |||
344 | dev = ctcmpc_get_dev(port_num); | 344 | dev = ctcmpc_get_dev(port_num); |
345 | if (dev == NULL) | 345 | if (dev == NULL) |
346 | return 1; | 346 | return 1; |
347 | priv = dev->priv; | 347 | priv = dev->ml_priv; |
348 | grp = priv->mpcg; | 348 | grp = priv->mpcg; |
349 | 349 | ||
350 | grp->allochanfunc = callback; | 350 | grp->allochanfunc = callback; |
@@ -416,7 +416,7 @@ void ctc_mpc_establish_connectivity(int port_num, | |||
416 | dev = ctcmpc_get_dev(port_num); | 416 | dev = ctcmpc_get_dev(port_num); |
417 | if (dev == NULL) | 417 | if (dev == NULL) |
418 | return; | 418 | return; |
419 | priv = dev->priv; | 419 | priv = dev->ml_priv; |
420 | grp = priv->mpcg; | 420 | grp = priv->mpcg; |
421 | rch = priv->channel[READ]; | 421 | rch = priv->channel[READ]; |
422 | wch = priv->channel[WRITE]; | 422 | wch = priv->channel[WRITE]; |
@@ -534,7 +534,7 @@ void ctc_mpc_dealloc_ch(int port_num) | |||
534 | dev = ctcmpc_get_dev(port_num); | 534 | dev = ctcmpc_get_dev(port_num); |
535 | if (dev == NULL) | 535 | if (dev == NULL) |
536 | return; | 536 | return; |
537 | priv = dev->priv; | 537 | priv = dev->ml_priv; |
538 | grp = priv->mpcg; | 538 | grp = priv->mpcg; |
539 | 539 | ||
540 | CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, | 540 | CTCM_DBF_TEXT_(MPC_SETUP, CTC_DBF_DEBUG, |
@@ -570,7 +570,7 @@ void ctc_mpc_flow_control(int port_num, int flowc) | |||
570 | dev = ctcmpc_get_dev(port_num); | 570 | dev = ctcmpc_get_dev(port_num); |
571 | if (dev == NULL) | 571 | if (dev == NULL) |
572 | return; | 572 | return; |
573 | priv = dev->priv; | 573 | priv = dev->ml_priv; |
574 | grp = priv->mpcg; | 574 | grp = priv->mpcg; |
575 | 575 | ||
576 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, | 576 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_DEBUG, |
@@ -619,7 +619,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) | |||
619 | { | 619 | { |
620 | struct channel *rch = mpcginfo->ch; | 620 | struct channel *rch = mpcginfo->ch; |
621 | struct net_device *dev = rch->netdev; | 621 | struct net_device *dev = rch->netdev; |
622 | struct ctcm_priv *priv = dev->priv; | 622 | struct ctcm_priv *priv = dev->ml_priv; |
623 | struct mpc_group *grp = priv->mpcg; | 623 | struct mpc_group *grp = priv->mpcg; |
624 | struct channel *ch = priv->channel[WRITE]; | 624 | struct channel *ch = priv->channel[WRITE]; |
625 | 625 | ||
@@ -650,7 +650,7 @@ static void mpc_rcvd_sweep_resp(struct mpcg_info *mpcginfo) | |||
650 | static void ctcmpc_send_sweep_resp(struct channel *rch) | 650 | static void ctcmpc_send_sweep_resp(struct channel *rch) |
651 | { | 651 | { |
652 | struct net_device *dev = rch->netdev; | 652 | struct net_device *dev = rch->netdev; |
653 | struct ctcm_priv *priv = dev->priv; | 653 | struct ctcm_priv *priv = dev->ml_priv; |
654 | struct mpc_group *grp = priv->mpcg; | 654 | struct mpc_group *grp = priv->mpcg; |
655 | int rc = 0; | 655 | int rc = 0; |
656 | struct th_sweep *header; | 656 | struct th_sweep *header; |
@@ -712,7 +712,7 @@ static void mpc_rcvd_sweep_req(struct mpcg_info *mpcginfo) | |||
712 | { | 712 | { |
713 | struct channel *rch = mpcginfo->ch; | 713 | struct channel *rch = mpcginfo->ch; |
714 | struct net_device *dev = rch->netdev; | 714 | struct net_device *dev = rch->netdev; |
715 | struct ctcm_priv *priv = dev->priv; | 715 | struct ctcm_priv *priv = dev->ml_priv; |
716 | struct mpc_group *grp = priv->mpcg; | 716 | struct mpc_group *grp = priv->mpcg; |
717 | struct channel *ch = priv->channel[WRITE]; | 717 | struct channel *ch = priv->channel[WRITE]; |
718 | 718 | ||
@@ -846,7 +846,7 @@ static int mpcg_fsm_len = ARRAY_SIZE(mpcg_fsm); | |||
846 | static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) | 846 | static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) |
847 | { | 847 | { |
848 | struct net_device *dev = arg; | 848 | struct net_device *dev = arg; |
849 | struct ctcm_priv *priv = dev->priv; | 849 | struct ctcm_priv *priv = dev->ml_priv; |
850 | struct mpc_group *grp = priv->mpcg; | 850 | struct mpc_group *grp = priv->mpcg; |
851 | 851 | ||
852 | if (grp == NULL) { | 852 | if (grp == NULL) { |
@@ -890,7 +890,7 @@ static void mpc_action_go_ready(fsm_instance *fsm, int event, void *arg) | |||
890 | void mpc_group_ready(unsigned long adev) | 890 | void mpc_group_ready(unsigned long adev) |
891 | { | 891 | { |
892 | struct net_device *dev = (struct net_device *)adev; | 892 | struct net_device *dev = (struct net_device *)adev; |
893 | struct ctcm_priv *priv = dev->priv; | 893 | struct ctcm_priv *priv = dev->ml_priv; |
894 | struct mpc_group *grp = priv->mpcg; | 894 | struct mpc_group *grp = priv->mpcg; |
895 | struct channel *ch = NULL; | 895 | struct channel *ch = NULL; |
896 | 896 | ||
@@ -946,7 +946,7 @@ void mpc_group_ready(unsigned long adev) | |||
946 | void mpc_channel_action(struct channel *ch, int direction, int action) | 946 | void mpc_channel_action(struct channel *ch, int direction, int action) |
947 | { | 947 | { |
948 | struct net_device *dev = ch->netdev; | 948 | struct net_device *dev = ch->netdev; |
949 | struct ctcm_priv *priv = dev->priv; | 949 | struct ctcm_priv *priv = dev->ml_priv; |
950 | struct mpc_group *grp = priv->mpcg; | 950 | struct mpc_group *grp = priv->mpcg; |
951 | 951 | ||
952 | if (grp == NULL) { | 952 | if (grp == NULL) { |
@@ -1056,7 +1056,7 @@ done: | |||
1056 | static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) | 1056 | static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) |
1057 | { | 1057 | { |
1058 | struct net_device *dev = ch->netdev; | 1058 | struct net_device *dev = ch->netdev; |
1059 | struct ctcm_priv *priv = dev->priv; | 1059 | struct ctcm_priv *priv = dev->ml_priv; |
1060 | struct mpc_group *grp = priv->mpcg; | 1060 | struct mpc_group *grp = priv->mpcg; |
1061 | struct pdu *curr_pdu; | 1061 | struct pdu *curr_pdu; |
1062 | struct mpcg_info *mpcginfo; | 1062 | struct mpcg_info *mpcginfo; |
@@ -1254,7 +1254,7 @@ void ctcmpc_bh(unsigned long thischan) | |||
1254 | struct channel *ch = (struct channel *)thischan; | 1254 | struct channel *ch = (struct channel *)thischan; |
1255 | struct sk_buff *skb; | 1255 | struct sk_buff *skb; |
1256 | struct net_device *dev = ch->netdev; | 1256 | struct net_device *dev = ch->netdev; |
1257 | struct ctcm_priv *priv = dev->priv; | 1257 | struct ctcm_priv *priv = dev->ml_priv; |
1258 | struct mpc_group *grp = priv->mpcg; | 1258 | struct mpc_group *grp = priv->mpcg; |
1259 | 1259 | ||
1260 | CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n", | 1260 | CTCM_PR_DEBUG("%s cp:%i enter: %s() %s\n", |
@@ -1376,7 +1376,7 @@ static void mpc_action_go_inop(fsm_instance *fi, int event, void *arg) | |||
1376 | BUG_ON(dev == NULL); | 1376 | BUG_ON(dev == NULL); |
1377 | CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); | 1377 | CTCM_PR_DEBUG("Enter %s: %s\n", __func__, dev->name); |
1378 | 1378 | ||
1379 | priv = dev->priv; | 1379 | priv = dev->ml_priv; |
1380 | grp = priv->mpcg; | 1380 | grp = priv->mpcg; |
1381 | grp->flow_off_called = 0; | 1381 | grp->flow_off_called = 0; |
1382 | fsm_deltimer(&grp->timer); | 1382 | fsm_deltimer(&grp->timer); |
@@ -1482,7 +1482,7 @@ static void mpc_action_timeout(fsm_instance *fi, int event, void *arg) | |||
1482 | 1482 | ||
1483 | BUG_ON(dev == NULL); | 1483 | BUG_ON(dev == NULL); |
1484 | 1484 | ||
1485 | priv = dev->priv; | 1485 | priv = dev->ml_priv; |
1486 | grp = priv->mpcg; | 1486 | grp = priv->mpcg; |
1487 | wch = priv->channel[WRITE]; | 1487 | wch = priv->channel[WRITE]; |
1488 | rch = priv->channel[READ]; | 1488 | rch = priv->channel[READ]; |
@@ -1520,7 +1520,7 @@ void mpc_action_discontact(fsm_instance *fi, int event, void *arg) | |||
1520 | if (ch) { | 1520 | if (ch) { |
1521 | dev = ch->netdev; | 1521 | dev = ch->netdev; |
1522 | if (dev) { | 1522 | if (dev) { |
1523 | priv = dev->priv; | 1523 | priv = dev->ml_priv; |
1524 | if (priv) { | 1524 | if (priv) { |
1525 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, | 1525 | CTCM_DBF_TEXT_(MPC_TRACE, CTC_DBF_NOTICE, |
1526 | "%s: %s: %s\n", | 1526 | "%s: %s: %s\n", |
@@ -1568,7 +1568,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo) | |||
1568 | { | 1568 | { |
1569 | struct channel *ch = mpcginfo->ch; | 1569 | struct channel *ch = mpcginfo->ch; |
1570 | struct net_device *dev = ch->netdev; | 1570 | struct net_device *dev = ch->netdev; |
1571 | struct ctcm_priv *priv = dev->priv; | 1571 | struct ctcm_priv *priv = dev->ml_priv; |
1572 | struct mpc_group *grp = priv->mpcg; | 1572 | struct mpc_group *grp = priv->mpcg; |
1573 | struct xid2 *xid = mpcginfo->xid; | 1573 | struct xid2 *xid = mpcginfo->xid; |
1574 | int rc = 0; | 1574 | int rc = 0; |
@@ -1865,7 +1865,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg) | |||
1865 | { | 1865 | { |
1866 | struct channel *ch = arg; | 1866 | struct channel *ch = arg; |
1867 | struct net_device *dev = ch->netdev; | 1867 | struct net_device *dev = ch->netdev; |
1868 | struct ctcm_priv *priv = dev->priv; | 1868 | struct ctcm_priv *priv = dev->ml_priv; |
1869 | struct mpc_group *grp = priv->mpcg; | 1869 | struct mpc_group *grp = priv->mpcg; |
1870 | 1870 | ||
1871 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", | 1871 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", |
@@ -1905,7 +1905,7 @@ static void mpc_action_doxid0(fsm_instance *fsm, int event, void *arg) | |||
1905 | static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) | 1905 | static void mpc_action_doxid7(fsm_instance *fsm, int event, void *arg) |
1906 | { | 1906 | { |
1907 | struct net_device *dev = arg; | 1907 | struct net_device *dev = arg; |
1908 | struct ctcm_priv *priv = dev->priv; | 1908 | struct ctcm_priv *priv = dev->ml_priv; |
1909 | struct mpc_group *grp = NULL; | 1909 | struct mpc_group *grp = NULL; |
1910 | int direction; | 1910 | int direction; |
1911 | int send = 0; | 1911 | int send = 0; |
@@ -1982,7 +1982,7 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg) | |||
1982 | struct mpcg_info *mpcginfo = arg; | 1982 | struct mpcg_info *mpcginfo = arg; |
1983 | struct channel *ch = mpcginfo->ch; | 1983 | struct channel *ch = mpcginfo->ch; |
1984 | struct net_device *dev = ch->netdev; | 1984 | struct net_device *dev = ch->netdev; |
1985 | struct ctcm_priv *priv = dev->priv; | 1985 | struct ctcm_priv *priv = dev->ml_priv; |
1986 | struct mpc_group *grp = priv->mpcg; | 1986 | struct mpc_group *grp = priv->mpcg; |
1987 | 1987 | ||
1988 | CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n", | 1988 | CTCM_PR_DEBUG("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n", |
@@ -2044,7 +2044,7 @@ static void mpc_action_rcvd_xid7(fsm_instance *fsm, int event, void *arg) | |||
2044 | struct mpcg_info *mpcginfo = arg; | 2044 | struct mpcg_info *mpcginfo = arg; |
2045 | struct channel *ch = mpcginfo->ch; | 2045 | struct channel *ch = mpcginfo->ch; |
2046 | struct net_device *dev = ch->netdev; | 2046 | struct net_device *dev = ch->netdev; |
2047 | struct ctcm_priv *priv = dev->priv; | 2047 | struct ctcm_priv *priv = dev->ml_priv; |
2048 | struct mpc_group *grp = priv->mpcg; | 2048 | struct mpc_group *grp = priv->mpcg; |
2049 | 2049 | ||
2050 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", | 2050 | CTCM_PR_DEBUG("Enter %s: cp=%i ch=0x%p id=%s\n", |
@@ -2096,7 +2096,7 @@ static int mpc_send_qllc_discontact(struct net_device *dev) | |||
2096 | __u32 new_len = 0; | 2096 | __u32 new_len = 0; |
2097 | struct sk_buff *skb; | 2097 | struct sk_buff *skb; |
2098 | struct qllc *qllcptr; | 2098 | struct qllc *qllcptr; |
2099 | struct ctcm_priv *priv = dev->priv; | 2099 | struct ctcm_priv *priv = dev->ml_priv; |
2100 | struct mpc_group *grp = priv->mpcg; | 2100 | struct mpc_group *grp = priv->mpcg; |
2101 | 2101 | ||
2102 | CTCM_PR_DEBUG("%s: GROUP STATE: %s\n", | 2102 | CTCM_PR_DEBUG("%s: GROUP STATE: %s\n", |
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 6de28385b354..9bcfa04d863b 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -1412,7 +1412,8 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
1412 | } | 1412 | } |
1413 | /* How far in the ccw chain have we processed? */ | 1413 | /* How far in the ccw chain have we processed? */ |
1414 | if ((channel->state != LCS_CH_STATE_INIT) && | 1414 | if ((channel->state != LCS_CH_STATE_INIT) && |
1415 | (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC)) { | 1415 | (irb->scsw.cmd.fctl & SCSW_FCTL_START_FUNC) && |
1416 | (irb->scsw.cmd.cpa != 0)) { | ||
1416 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) | 1417 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cmd.cpa) |
1417 | - channel->ccws; | 1418 | - channel->ccws; |
1418 | if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) || | 1419 | if ((irb->scsw.cmd.actl & SCSW_ACTL_SUSPENDED) || |
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h index 80971c21ea1a..bf8a75c92f28 100644 --- a/drivers/s390/net/qeth_core.h +++ b/drivers/s390/net/qeth_core.h | |||
@@ -689,6 +689,7 @@ struct qeth_mc_mac { | |||
689 | struct list_head list; | 689 | struct list_head list; |
690 | __u8 mc_addr[MAX_ADDR_LEN]; | 690 | __u8 mc_addr[MAX_ADDR_LEN]; |
691 | unsigned char mc_addrlen; | 691 | unsigned char mc_addrlen; |
692 | int is_vmac; | ||
692 | }; | 693 | }; |
693 | 694 | ||
694 | struct qeth_card { | 695 | struct qeth_card { |
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index bd420d1b9a0d..c7ab1b864516 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c | |||
@@ -3024,7 +3024,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb, | |||
3024 | struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, | 3024 | struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill, |
3025 | int offset) | 3025 | int offset) |
3026 | { | 3026 | { |
3027 | int length = skb->len; | 3027 | int length = skb->len - offset; |
3028 | int length_here; | 3028 | int length_here; |
3029 | int element; | 3029 | int element; |
3030 | char *data; | 3030 | char *data; |
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index b3cee032f578..3ac3cc1e03cc 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c | |||
@@ -177,9 +177,10 @@ static int qeth_l2_send_delgroupmac(struct qeth_card *card, __u8 *mac) | |||
177 | qeth_l2_send_delgroupmac_cb); | 177 | qeth_l2_send_delgroupmac_cb); |
178 | } | 178 | } |
179 | 179 | ||
180 | static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) | 180 | static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac, int vmac) |
181 | { | 181 | { |
182 | struct qeth_mc_mac *mc; | 182 | struct qeth_mc_mac *mc; |
183 | int rc; | ||
183 | 184 | ||
184 | mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); | 185 | mc = kmalloc(sizeof(struct qeth_mc_mac), GFP_ATOMIC); |
185 | 186 | ||
@@ -188,8 +189,16 @@ static void qeth_l2_add_mc(struct qeth_card *card, __u8 *mac) | |||
188 | 189 | ||
189 | memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); | 190 | memcpy(mc->mc_addr, mac, OSA_ADDR_LEN); |
190 | mc->mc_addrlen = OSA_ADDR_LEN; | 191 | mc->mc_addrlen = OSA_ADDR_LEN; |
192 | mc->is_vmac = vmac; | ||
193 | |||
194 | if (vmac) { | ||
195 | rc = qeth_l2_send_setdelmac(card, mac, IPA_CMD_SETVMAC, | ||
196 | NULL); | ||
197 | } else { | ||
198 | rc = qeth_l2_send_setgroupmac(card, mac); | ||
199 | } | ||
191 | 200 | ||
192 | if (!qeth_l2_send_setgroupmac(card, mac)) | 201 | if (!rc) |
193 | list_add_tail(&mc->list, &card->mc_list); | 202 | list_add_tail(&mc->list, &card->mc_list); |
194 | else | 203 | else |
195 | kfree(mc); | 204 | kfree(mc); |
@@ -201,7 +210,11 @@ static void qeth_l2_del_all_mc(struct qeth_card *card) | |||
201 | 210 | ||
202 | spin_lock_bh(&card->mclock); | 211 | spin_lock_bh(&card->mclock); |
203 | list_for_each_entry_safe(mc, tmp, &card->mc_list, list) { | 212 | list_for_each_entry_safe(mc, tmp, &card->mc_list, list) { |
204 | qeth_l2_send_delgroupmac(card, mc->mc_addr); | 213 | if (mc->is_vmac) |
214 | qeth_l2_send_setdelmac(card, mc->mc_addr, | ||
215 | IPA_CMD_DELVMAC, NULL); | ||
216 | else | ||
217 | qeth_l2_send_delgroupmac(card, mc->mc_addr); | ||
205 | list_del(&mc->list); | 218 | list_del(&mc->list); |
206 | kfree(mc); | 219 | kfree(mc); |
207 | } | 220 | } |
@@ -590,7 +603,7 @@ static int qeth_l2_set_mac_address(struct net_device *dev, void *p) | |||
590 | static void qeth_l2_set_multicast_list(struct net_device *dev) | 603 | static void qeth_l2_set_multicast_list(struct net_device *dev) |
591 | { | 604 | { |
592 | struct qeth_card *card = dev->ml_priv; | 605 | struct qeth_card *card = dev->ml_priv; |
593 | struct dev_mc_list *dm; | 606 | struct dev_addr_list *dm; |
594 | 607 | ||
595 | if (card->info.type == QETH_CARD_TYPE_OSN) | 608 | if (card->info.type == QETH_CARD_TYPE_OSN) |
596 | return ; | 609 | return ; |
@@ -599,7 +612,11 @@ static void qeth_l2_set_multicast_list(struct net_device *dev) | |||
599 | qeth_l2_del_all_mc(card); | 612 | qeth_l2_del_all_mc(card); |
600 | spin_lock_bh(&card->mclock); | 613 | spin_lock_bh(&card->mclock); |
601 | for (dm = dev->mc_list; dm; dm = dm->next) | 614 | for (dm = dev->mc_list; dm; dm = dm->next) |
602 | qeth_l2_add_mc(card, dm->dmi_addr); | 615 | qeth_l2_add_mc(card, dm->da_addr, 0); |
616 | |||
617 | for (dm = dev->uc_list; dm; dm = dm->next) | ||
618 | qeth_l2_add_mc(card, dm->da_addr, 1); | ||
619 | |||
603 | spin_unlock_bh(&card->mclock); | 620 | spin_unlock_bh(&card->mclock); |
604 | if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) | 621 | if (!qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) |
605 | return; | 622 | return; |
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c index ac1993708ae9..210ddb639748 100644 --- a/drivers/s390/net/qeth_l3_sys.c +++ b/drivers/s390/net/qeth_l3_sys.c | |||
@@ -136,7 +136,7 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev, | |||
136 | return -EINVAL; | 136 | return -EINVAL; |
137 | 137 | ||
138 | if (!qeth_is_supported(card, IPA_IPV6)) { | 138 | if (!qeth_is_supported(card, IPA_IPV6)) { |
139 | return -ENOTSUPP; | 139 | return -EOPNOTSUPP; |
140 | } | 140 | } |
141 | 141 | ||
142 | return qeth_l3_dev_route_store(card, &card->options.route6, | 142 | return qeth_l3_dev_route_store(card, &card->options.route6, |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index e5e7d7856454..2a2bc89aba83 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -1875,6 +1875,7 @@ static int sd_probe(struct device *dev) | |||
1875 | 1875 | ||
1876 | dev_set_drvdata(dev, sdkp); | 1876 | dev_set_drvdata(dev, sdkp); |
1877 | add_disk(gd); | 1877 | add_disk(gd); |
1878 | blk_register_filter(gd); | ||
1878 | sd_dif_config_host(sdkp); | 1879 | sd_dif_config_host(sdkp); |
1879 | 1880 | ||
1880 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", | 1881 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", |
@@ -1908,6 +1909,7 @@ static int sd_remove(struct device *dev) | |||
1908 | struct scsi_disk *sdkp = dev_get_drvdata(dev); | 1909 | struct scsi_disk *sdkp = dev_get_drvdata(dev); |
1909 | 1910 | ||
1910 | device_del(&sdkp->dev); | 1911 | device_del(&sdkp->dev); |
1912 | blk_unregister_filter(sdkp->disk); | ||
1911 | del_gendisk(sdkp->disk); | 1913 | del_gendisk(sdkp->disk); |
1912 | sd_shutdown(dev); | 1914 | sd_shutdown(dev); |
1913 | 1915 | ||
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 3d36270a8b4d..661f9f21650a 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
@@ -217,6 +217,18 @@ static int sg_last_dev(void); | |||
217 | #define SZ_SG_IOVEC sizeof(sg_iovec_t) | 217 | #define SZ_SG_IOVEC sizeof(sg_iovec_t) |
218 | #define SZ_SG_REQ_INFO sizeof(sg_req_info_t) | 218 | #define SZ_SG_REQ_INFO sizeof(sg_req_info_t) |
219 | 219 | ||
220 | static int sg_allow_access(struct file *filp, unsigned char *cmd) | ||
221 | { | ||
222 | struct sg_fd *sfp = (struct sg_fd *)filp->private_data; | ||
223 | struct request_queue *q = sfp->parentdp->device->request_queue; | ||
224 | |||
225 | if (sfp->parentdp->device->type == TYPE_SCANNER) | ||
226 | return 0; | ||
227 | |||
228 | return blk_verify_command(&q->cmd_filter, | ||
229 | cmd, filp->f_mode & FMODE_WRITE); | ||
230 | } | ||
231 | |||
220 | static int | 232 | static int |
221 | sg_open(struct inode *inode, struct file *filp) | 233 | sg_open(struct inode *inode, struct file *filp) |
222 | { | 234 | { |
@@ -689,7 +701,7 @@ sg_new_write(Sg_fd *sfp, struct file *file, const char __user *buf, | |||
689 | sg_remove_request(sfp, srp); | 701 | sg_remove_request(sfp, srp); |
690 | return -EFAULT; | 702 | return -EFAULT; |
691 | } | 703 | } |
692 | if (read_only && !blk_verify_command(file, cmnd)) { | 704 | if (read_only && sg_allow_access(file, cmnd)) { |
693 | sg_remove_request(sfp, srp); | 705 | sg_remove_request(sfp, srp); |
694 | return -EPERM; | 706 | return -EPERM; |
695 | } | 707 | } |
@@ -793,6 +805,7 @@ sg_ioctl(struct inode *inode, struct file *filp, | |||
793 | 805 | ||
794 | if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) | 806 | if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) |
795 | return -ENXIO; | 807 | return -ENXIO; |
808 | |||
796 | SCSI_LOG_TIMEOUT(3, printk("sg_ioctl: %s, cmd=0x%x\n", | 809 | SCSI_LOG_TIMEOUT(3, printk("sg_ioctl: %s, cmd=0x%x\n", |
797 | sdp->disk->disk_name, (int) cmd_in)); | 810 | sdp->disk->disk_name, (int) cmd_in)); |
798 | read_only = (O_RDWR != (filp->f_flags & O_ACCMODE)); | 811 | read_only = (O_RDWR != (filp->f_flags & O_ACCMODE)); |
@@ -1061,7 +1074,7 @@ sg_ioctl(struct inode *inode, struct file *filp, | |||
1061 | 1074 | ||
1062 | if (copy_from_user(&opcode, siocp->data, 1)) | 1075 | if (copy_from_user(&opcode, siocp->data, 1)) |
1063 | return -EFAULT; | 1076 | return -EFAULT; |
1064 | if (!blk_verify_command(filp, &opcode)) | 1077 | if (sg_allow_access(filp, &opcode)) |
1065 | return -EPERM; | 1078 | return -EPERM; |
1066 | } | 1079 | } |
1067 | return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p); | 1080 | return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p); |
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 27f5bfd1def3..3292965bfd84 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
@@ -656,6 +656,7 @@ static int sr_probe(struct device *dev) | |||
656 | dev_set_drvdata(dev, cd); | 656 | dev_set_drvdata(dev, cd); |
657 | disk->flags |= GENHD_FL_REMOVABLE; | 657 | disk->flags |= GENHD_FL_REMOVABLE; |
658 | add_disk(disk); | 658 | add_disk(disk); |
659 | blk_register_filter(disk); | ||
659 | 660 | ||
660 | sdev_printk(KERN_DEBUG, sdev, | 661 | sdev_printk(KERN_DEBUG, sdev, |
661 | "Attached scsi CD-ROM %s\n", cd->cdi.name); | 662 | "Attached scsi CD-ROM %s\n", cd->cdi.name); |
@@ -894,6 +895,7 @@ static int sr_remove(struct device *dev) | |||
894 | { | 895 | { |
895 | struct scsi_cd *cd = dev_get_drvdata(dev); | 896 | struct scsi_cd *cd = dev_get_drvdata(dev); |
896 | 897 | ||
898 | blk_unregister_filter(cd->disk); | ||
897 | del_gendisk(cd->disk); | 899 | del_gendisk(cd->disk); |
898 | 900 | ||
899 | mutex_lock(&sr_ref_mutex); | 901 | mutex_lock(&sr_ref_mutex); |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index 342e12fb1c25..8058533f8418 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
@@ -1908,15 +1908,23 @@ static int serial8250_startup(struct uart_port *port) | |||
1908 | * kick the UART on a regular basis. | 1908 | * kick the UART on a regular basis. |
1909 | */ | 1909 | */ |
1910 | if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) { | 1910 | if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) { |
1911 | up->bugs |= UART_BUG_THRE; | ||
1911 | pr_debug("ttyS%d - using backup timer\n", port->line); | 1912 | pr_debug("ttyS%d - using backup timer\n", port->line); |
1912 | up->timer.function = serial8250_backup_timeout; | ||
1913 | up->timer.data = (unsigned long)up; | ||
1914 | mod_timer(&up->timer, jiffies + | ||
1915 | poll_timeout(up->port.timeout) + HZ / 5); | ||
1916 | } | 1913 | } |
1917 | } | 1914 | } |
1918 | 1915 | ||
1919 | /* | 1916 | /* |
1917 | * The above check will only give an accurate result the first time | ||
1918 | * the port is opened so this value needs to be preserved. | ||
1919 | */ | ||
1920 | if (up->bugs & UART_BUG_THRE) { | ||
1921 | up->timer.function = serial8250_backup_timeout; | ||
1922 | up->timer.data = (unsigned long)up; | ||
1923 | mod_timer(&up->timer, jiffies + | ||
1924 | poll_timeout(up->port.timeout) + HZ / 5); | ||
1925 | } | ||
1926 | |||
1927 | /* | ||
1920 | * If the "interrupt" for this port doesn't correspond with any | 1928 | * If the "interrupt" for this port doesn't correspond with any |
1921 | * hardware interrupt, we use a timer-based system. The original | 1929 | * hardware interrupt, we use a timer-based system. The original |
1922 | * driver used to do this with IRQ0. | 1930 | * driver used to do this with IRQ0. |
@@ -2203,9 +2211,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, | |||
2203 | serial_outp(up, UART_EFR, efr); | 2211 | serial_outp(up, UART_EFR, efr); |
2204 | } | 2212 | } |
2205 | 2213 | ||
2206 | #ifdef CONFIG_ARCH_OMAP15XX | 2214 | #ifdef CONFIG_ARCH_OMAP |
2207 | /* Workaround to enable 115200 baud on OMAP1510 internal ports */ | 2215 | /* Workaround to enable 115200 baud on OMAP1510 internal ports */ |
2208 | if (cpu_is_omap1510() && is_omap_port((unsigned int)up->port.membase)) { | 2216 | if (cpu_is_omap1510() && is_omap_port(up)) { |
2209 | if (baud == 115200) { | 2217 | if (baud == 115200) { |
2210 | quot = 1; | 2218 | quot = 1; |
2211 | serial_out(up, UART_OMAP_OSC_12M_SEL, 1); | 2219 | serial_out(up, UART_OMAP_OSC_12M_SEL, 1); |
@@ -2258,18 +2266,27 @@ serial8250_pm(struct uart_port *port, unsigned int state, | |||
2258 | p->pm(port, state, oldstate); | 2266 | p->pm(port, state, oldstate); |
2259 | } | 2267 | } |
2260 | 2268 | ||
2269 | static unsigned int serial8250_port_size(struct uart_8250_port *pt) | ||
2270 | { | ||
2271 | if (pt->port.iotype == UPIO_AU) | ||
2272 | return 0x100000; | ||
2273 | #ifdef CONFIG_ARCH_OMAP | ||
2274 | if (is_omap_port(pt)) | ||
2275 | return 0x16 << pt->port.regshift; | ||
2276 | #endif | ||
2277 | return 8 << pt->port.regshift; | ||
2278 | } | ||
2279 | |||
2261 | /* | 2280 | /* |
2262 | * Resource handling. | 2281 | * Resource handling. |
2263 | */ | 2282 | */ |
2264 | static int serial8250_request_std_resource(struct uart_8250_port *up) | 2283 | static int serial8250_request_std_resource(struct uart_8250_port *up) |
2265 | { | 2284 | { |
2266 | unsigned int size = 8 << up->port.regshift; | 2285 | unsigned int size = serial8250_port_size(up); |
2267 | int ret = 0; | 2286 | int ret = 0; |
2268 | 2287 | ||
2269 | switch (up->port.iotype) { | 2288 | switch (up->port.iotype) { |
2270 | case UPIO_AU: | 2289 | case UPIO_AU: |
2271 | size = 0x100000; | ||
2272 | /* fall thru */ | ||
2273 | case UPIO_TSI: | 2290 | case UPIO_TSI: |
2274 | case UPIO_MEM32: | 2291 | case UPIO_MEM32: |
2275 | case UPIO_MEM: | 2292 | case UPIO_MEM: |
@@ -2303,12 +2320,10 @@ static int serial8250_request_std_resource(struct uart_8250_port *up) | |||
2303 | 2320 | ||
2304 | static void serial8250_release_std_resource(struct uart_8250_port *up) | 2321 | static void serial8250_release_std_resource(struct uart_8250_port *up) |
2305 | { | 2322 | { |
2306 | unsigned int size = 8 << up->port.regshift; | 2323 | unsigned int size = serial8250_port_size(up); |
2307 | 2324 | ||
2308 | switch (up->port.iotype) { | 2325 | switch (up->port.iotype) { |
2309 | case UPIO_AU: | 2326 | case UPIO_AU: |
2310 | size = 0x100000; | ||
2311 | /* fall thru */ | ||
2312 | case UPIO_TSI: | 2327 | case UPIO_TSI: |
2313 | case UPIO_MEM32: | 2328 | case UPIO_MEM32: |
2314 | case UPIO_MEM: | 2329 | case UPIO_MEM: |
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h index 78c00162b04e..520260326f3d 100644 --- a/drivers/serial/8250.h +++ b/drivers/serial/8250.h | |||
@@ -47,6 +47,7 @@ struct serial8250_config { | |||
47 | #define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */ | 47 | #define UART_BUG_QUOT (1 << 0) /* UART has buggy quot LSB */ |
48 | #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ | 48 | #define UART_BUG_TXEN (1 << 1) /* UART has buggy TX IIR status */ |
49 | #define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */ | 49 | #define UART_BUG_NOMSR (1 << 2) /* UART has buggy MSR status bits (Au1x00) */ |
50 | #define UART_BUG_THRE (1 << 3) /* UART has buggy THRE reassertion */ | ||
50 | 51 | ||
51 | #define PROBE_RSA (1 << 0) | 52 | #define PROBE_RSA (1 << 0) |
52 | #define PROBE_ANY (~0) | 53 | #define PROBE_ANY (~0) |
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index efcd44344fb1..4a0d30bed9f1 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #include <asm/gpio.h> | 30 | #include <asm/gpio.h> |
31 | #include <asm/mach/bfin_serial_5xx.h> | 31 | #include <mach/bfin_serial_5xx.h> |
32 | 32 | ||
33 | #ifdef CONFIG_SERIAL_BFIN_DMA | 33 | #ifdef CONFIG_SERIAL_BFIN_DMA |
34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 9d2186fd74aa..454a2712e629 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
@@ -119,12 +119,14 @@ struct omap2_mcspi { | |||
119 | struct clk *fck; | 119 | struct clk *fck; |
120 | /* Virtual base address of the controller */ | 120 | /* Virtual base address of the controller */ |
121 | void __iomem *base; | 121 | void __iomem *base; |
122 | unsigned long phys; | ||
122 | /* SPI1 has 4 channels, while SPI2 has 2 */ | 123 | /* SPI1 has 4 channels, while SPI2 has 2 */ |
123 | struct omap2_mcspi_dma *dma_channels; | 124 | struct omap2_mcspi_dma *dma_channels; |
124 | }; | 125 | }; |
125 | 126 | ||
126 | struct omap2_mcspi_cs { | 127 | struct omap2_mcspi_cs { |
127 | void __iomem *base; | 128 | void __iomem *base; |
129 | unsigned long phys; | ||
128 | int word_len; | 130 | int word_len; |
129 | }; | 131 | }; |
130 | 132 | ||
@@ -233,7 +235,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) | |||
233 | c = count; | 235 | c = count; |
234 | word_len = cs->word_len; | 236 | word_len = cs->word_len; |
235 | 237 | ||
236 | base = (unsigned long) io_v2p(cs->base); | 238 | base = cs->phys; |
237 | tx_reg = base + OMAP2_MCSPI_TX0; | 239 | tx_reg = base + OMAP2_MCSPI_TX0; |
238 | rx_reg = base + OMAP2_MCSPI_RX0; | 240 | rx_reg = base + OMAP2_MCSPI_RX0; |
239 | rx = xfer->rx_buf; | 241 | rx = xfer->rx_buf; |
@@ -633,6 +635,7 @@ static int omap2_mcspi_setup(struct spi_device *spi) | |||
633 | if (!cs) | 635 | if (!cs) |
634 | return -ENOMEM; | 636 | return -ENOMEM; |
635 | cs->base = mcspi->base + spi->chip_select * 0x14; | 637 | cs->base = mcspi->base + spi->chip_select * 0x14; |
638 | cs->phys = mcspi->phys + spi->chip_select * 0x14; | ||
636 | spi->controller_state = cs; | 639 | spi->controller_state = cs; |
637 | } | 640 | } |
638 | 641 | ||
@@ -1005,7 +1008,13 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) | |||
1005 | goto err1; | 1008 | goto err1; |
1006 | } | 1009 | } |
1007 | 1010 | ||
1008 | mcspi->base = (void __iomem *) io_p2v(r->start); | 1011 | mcspi->phys = r->start; |
1012 | mcspi->base = ioremap(r->start, r->end - r->start + 1); | ||
1013 | if (!mcspi->base) { | ||
1014 | dev_dbg(&pdev->dev, "can't ioremap MCSPI\n"); | ||
1015 | status = -ENOMEM; | ||
1016 | goto err1aa; | ||
1017 | } | ||
1009 | 1018 | ||
1010 | INIT_WORK(&mcspi->work, omap2_mcspi_work); | 1019 | INIT_WORK(&mcspi->work, omap2_mcspi_work); |
1011 | 1020 | ||
@@ -1055,6 +1064,8 @@ err3: | |||
1055 | err2: | 1064 | err2: |
1056 | clk_put(mcspi->ick); | 1065 | clk_put(mcspi->ick); |
1057 | err1a: | 1066 | err1a: |
1067 | iounmap(mcspi->base); | ||
1068 | err1aa: | ||
1058 | release_mem_region(r->start, (r->end - r->start) + 1); | 1069 | release_mem_region(r->start, (r->end - r->start) + 1); |
1059 | err1: | 1070 | err1: |
1060 | spi_master_put(master); | 1071 | spi_master_put(master); |
@@ -1067,6 +1078,7 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev) | |||
1067 | struct omap2_mcspi *mcspi; | 1078 | struct omap2_mcspi *mcspi; |
1068 | struct omap2_mcspi_dma *dma_channels; | 1079 | struct omap2_mcspi_dma *dma_channels; |
1069 | struct resource *r; | 1080 | struct resource *r; |
1081 | void __iomem *base; | ||
1070 | 1082 | ||
1071 | master = dev_get_drvdata(&pdev->dev); | 1083 | master = dev_get_drvdata(&pdev->dev); |
1072 | mcspi = spi_master_get_devdata(master); | 1084 | mcspi = spi_master_get_devdata(master); |
@@ -1078,7 +1090,9 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev) | |||
1078 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1090 | r = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
1079 | release_mem_region(r->start, (r->end - r->start) + 1); | 1091 | release_mem_region(r->start, (r->end - r->start) + 1); |
1080 | 1092 | ||
1093 | base = mcspi->base; | ||
1081 | spi_unregister_master(master); | 1094 | spi_unregister_master(master); |
1095 | iounmap(base); | ||
1082 | kfree(dma_channels); | 1096 | kfree(dma_channels); |
1083 | 1097 | ||
1084 | return 0; | 1098 | return 0; |
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index 5515eb97d7c5..bab6ff061e91 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c | |||
@@ -59,7 +59,6 @@ | |||
59 | * and irqs should show there too... | 59 | * and irqs should show there too... |
60 | */ | 60 | */ |
61 | #define UWIRE_BASE_PHYS 0xFFFB3000 | 61 | #define UWIRE_BASE_PHYS 0xFFFB3000 |
62 | #define UWIRE_BASE ((void *__iomem)IO_ADDRESS(UWIRE_BASE_PHYS)) | ||
63 | 62 | ||
64 | /* uWire Registers: */ | 63 | /* uWire Registers: */ |
65 | #define UWIRE_IO_SIZE 0x20 | 64 | #define UWIRE_IO_SIZE 0x20 |
@@ -103,16 +102,21 @@ struct uwire_state { | |||
103 | }; | 102 | }; |
104 | 103 | ||
105 | /* REVISIT compile time constant for idx_shift? */ | 104 | /* REVISIT compile time constant for idx_shift? */ |
105 | /* | ||
106 | * Or, put it in a structure which is used throughout the driver; | ||
107 | * that avoids having to issue two loads for each bit of static data. | ||
108 | */ | ||
106 | static unsigned int uwire_idx_shift; | 109 | static unsigned int uwire_idx_shift; |
110 | static void __iomem *uwire_base; | ||
107 | 111 | ||
108 | static inline void uwire_write_reg(int idx, u16 val) | 112 | static inline void uwire_write_reg(int idx, u16 val) |
109 | { | 113 | { |
110 | __raw_writew(val, UWIRE_BASE + (idx << uwire_idx_shift)); | 114 | __raw_writew(val, uwire_base + (idx << uwire_idx_shift)); |
111 | } | 115 | } |
112 | 116 | ||
113 | static inline u16 uwire_read_reg(int idx) | 117 | static inline u16 uwire_read_reg(int idx) |
114 | { | 118 | { |
115 | return __raw_readw(UWIRE_BASE + (idx << uwire_idx_shift)); | 119 | return __raw_readw(uwire_base + (idx << uwire_idx_shift)); |
116 | } | 120 | } |
117 | 121 | ||
118 | static inline void omap_uwire_configure_mode(u8 cs, unsigned long flags) | 122 | static inline void omap_uwire_configure_mode(u8 cs, unsigned long flags) |
@@ -492,6 +496,14 @@ static int __init uwire_probe(struct platform_device *pdev) | |||
492 | return -ENODEV; | 496 | return -ENODEV; |
493 | 497 | ||
494 | uwire = spi_master_get_devdata(master); | 498 | uwire = spi_master_get_devdata(master); |
499 | |||
500 | uwire_base = ioremap(UWIRE_BASE_PHYS, UWIRE_IO_SIZE); | ||
501 | if (!uwire_base) { | ||
502 | dev_dbg(&pdev->dev, "can't ioremap UWIRE\n"); | ||
503 | spi_master_put(master); | ||
504 | return -ENOMEM; | ||
505 | } | ||
506 | |||
495 | dev_set_drvdata(&pdev->dev, uwire); | 507 | dev_set_drvdata(&pdev->dev, uwire); |
496 | 508 | ||
497 | uwire->ck = clk_get(&pdev->dev, "armxor_ck"); | 509 | uwire->ck = clk_get(&pdev->dev, "armxor_ck"); |
@@ -520,8 +532,10 @@ static int __init uwire_probe(struct platform_device *pdev) | |||
520 | uwire->bitbang.txrx_bufs = uwire_txrx; | 532 | uwire->bitbang.txrx_bufs = uwire_txrx; |
521 | 533 | ||
522 | status = spi_bitbang_start(&uwire->bitbang); | 534 | status = spi_bitbang_start(&uwire->bitbang); |
523 | if (status < 0) | 535 | if (status < 0) { |
524 | uwire_off(uwire); | 536 | uwire_off(uwire); |
537 | iounmap(uwire_base); | ||
538 | } | ||
525 | return status; | 539 | return status; |
526 | } | 540 | } |
527 | 541 | ||
@@ -534,6 +548,7 @@ static int __exit uwire_remove(struct platform_device *pdev) | |||
534 | 548 | ||
535 | status = spi_bitbang_stop(&uwire->bitbang); | 549 | status = spi_bitbang_stop(&uwire->bitbang); |
536 | uwire_off(uwire); | 550 | uwire_off(uwire); |
551 | iounmap(uwire_base); | ||
537 | return status; | 552 | return status; |
538 | } | 553 | } |
539 | 554 | ||
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 1eb64d08b60a..522185629624 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
@@ -208,7 +208,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) | |||
208 | if (cpu_is_omap16xx()) | 208 | if (cpu_is_omap16xx()) |
209 | ocpi_enable(); | 209 | ocpi_enable(); |
210 | 210 | ||
211 | #ifdef CONFIG_ARCH_OMAP_OTG | 211 | #ifdef CONFIG_USB_OTG |
212 | if (need_transceiver) { | 212 | if (need_transceiver) { |
213 | ohci->transceiver = otg_get_transceiver(); | 213 | ohci->transceiver = otg_get_transceiver(); |
214 | if (ohci->transceiver) { | 214 | if (ohci->transceiver) { |
@@ -344,7 +344,12 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, | |||
344 | goto err1; | 344 | goto err1; |
345 | } | 345 | } |
346 | 346 | ||
347 | hcd->regs = (void __iomem *) (int) IO_ADDRESS(hcd->rsrc_start); | 347 | hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len); |
348 | if (!hcd->regs) { | ||
349 | dev_err(&pdev->dev, "can't ioremap OHCI HCD\n"); | ||
350 | retval = -ENOMEM; | ||
351 | goto err2; | ||
352 | } | ||
348 | 353 | ||
349 | ohci = hcd_to_ohci(hcd); | 354 | ohci = hcd_to_ohci(hcd); |
350 | ohci_hcd_init(ohci); | 355 | ohci_hcd_init(ohci); |
@@ -355,11 +360,11 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, | |||
355 | irq = platform_get_irq(pdev, 0); | 360 | irq = platform_get_irq(pdev, 0); |
356 | if (irq < 0) { | 361 | if (irq < 0) { |
357 | retval = -ENXIO; | 362 | retval = -ENXIO; |
358 | goto err2; | 363 | goto err3; |
359 | } | 364 | } |
360 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); | 365 | retval = usb_add_hcd(hcd, irq, IRQF_DISABLED); |
361 | if (retval) | 366 | if (retval) |
362 | goto err2; | 367 | goto err3; |
363 | 368 | ||
364 | host_initialized = 1; | 369 | host_initialized = 1; |
365 | 370 | ||
@@ -367,6 +372,8 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, | |||
367 | omap_ohci_clock_power(0); | 372 | omap_ohci_clock_power(0); |
368 | 373 | ||
369 | return 0; | 374 | return 0; |
375 | err3: | ||
376 | iounmap(hcd->regs); | ||
370 | err2: | 377 | err2: |
371 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); | 378 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); |
372 | err1: | 379 | err1: |
@@ -401,6 +408,7 @@ usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev) | |||
401 | } | 408 | } |
402 | if (machine_is_omap_osk()) | 409 | if (machine_is_omap_osk()) |
403 | omap_free_gpio(9); | 410 | omap_free_gpio(9); |
411 | iounmap(hcd->regs); | ||
404 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); | 412 | release_mem_region(hcd->rsrc_start, hcd->rsrc_len); |
405 | usb_put_hcd(hcd); | 413 | usb_put_hcd(hcd); |
406 | clk_put(usb_dc_ck); | 414 | clk_put(usb_dc_ck); |
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 6d5aa806777e..7644ed249564 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c | |||
@@ -58,7 +58,7 @@ | |||
58 | #include <asm/gpio.h> | 58 | #include <asm/gpio.h> |
59 | #include <asm/portmux.h> | 59 | #include <asm/portmux.h> |
60 | 60 | ||
61 | #include <asm/mach/bf54x-lq043.h> | 61 | #include <mach/bf54x-lq043.h> |
62 | 62 | ||
63 | #define NO_BL_SUPPORT | 63 | #define NO_BL_SUPPORT |
64 | 64 | ||
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index c14b2435d23e..e729fb279645 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
@@ -628,27 +628,18 @@ static long cirrusfb_get_mclk(long freq, int bpp, long *div) | |||
628 | static int cirrusfb_check_var(struct fb_var_screeninfo *var, | 628 | static int cirrusfb_check_var(struct fb_var_screeninfo *var, |
629 | struct fb_info *info) | 629 | struct fb_info *info) |
630 | { | 630 | { |
631 | int nom, den; /* translyting from pixels->bytes */ | 631 | int yres; |
632 | int yres, i; | 632 | /* memory size in pixels */ |
633 | static struct { int xres, yres; } modes[] = | 633 | unsigned pixels = info->screen_size * 8 / var->bits_per_pixel; |
634 | { { 1600, 1280 }, | ||
635 | { 1280, 1024 }, | ||
636 | { 1024, 768 }, | ||
637 | { 800, 600 }, | ||
638 | { 640, 480 }, | ||
639 | { -1, -1 } }; | ||
640 | 634 | ||
641 | switch (var->bits_per_pixel) { | 635 | switch (var->bits_per_pixel) { |
642 | case 1: | 636 | case 1: |
643 | nom = 4; | 637 | pixels /= 4; |
644 | den = 8; | ||
645 | break; /* 8 pixel per byte, only 1/4th of mem usable */ | 638 | break; /* 8 pixel per byte, only 1/4th of mem usable */ |
646 | case 8: | 639 | case 8: |
647 | case 16: | 640 | case 16: |
648 | case 24: | 641 | case 24: |
649 | case 32: | 642 | case 32: |
650 | nom = var->bits_per_pixel / 8; | ||
651 | den = 1; | ||
652 | break; /* 1 pixel == 1 byte */ | 643 | break; /* 1 pixel == 1 byte */ |
653 | default: | 644 | default: |
654 | printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..." | 645 | printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..." |
@@ -658,43 +649,29 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var, | |||
658 | return -EINVAL; | 649 | return -EINVAL; |
659 | } | 650 | } |
660 | 651 | ||
661 | if (var->xres * nom / den * var->yres > info->screen_size) { | 652 | if (var->xres_virtual < var->xres) |
662 | printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..." | 653 | var->xres_virtual = var->xres; |
663 | "resolution too high to fit into video memory!\n", | ||
664 | var->xres, var->yres, var->bits_per_pixel); | ||
665 | DPRINTK("EXIT - EINVAL error\n"); | ||
666 | return -EINVAL; | ||
667 | } | ||
668 | |||
669 | /* use highest possible virtual resolution */ | 654 | /* use highest possible virtual resolution */ |
670 | if (var->xres_virtual == -1 && | 655 | if (var->yres_virtual == -1) { |
671 | var->yres_virtual == -1) { | 656 | var->yres_virtual = pixels / var->xres_virtual; |
672 | printk(KERN_INFO | ||
673 | "cirrusfb: using maximum available virtual resolution\n"); | ||
674 | for (i = 0; modes[i].xres != -1; i++) { | ||
675 | int size = modes[i].xres * nom / den * modes[i].yres; | ||
676 | if (size < info->screen_size / 2) | ||
677 | break; | ||
678 | } | ||
679 | if (modes[i].xres == -1) { | ||
680 | printk(KERN_ERR "cirrusfb: could not find a virtual " | ||
681 | "resolution that fits into video memory!!\n"); | ||
682 | DPRINTK("EXIT - EINVAL error\n"); | ||
683 | return -EINVAL; | ||
684 | } | ||
685 | var->xres_virtual = modes[i].xres; | ||
686 | var->yres_virtual = modes[i].yres; | ||
687 | 657 | ||
688 | printk(KERN_INFO "cirrusfb: virtual resolution set to " | 658 | printk(KERN_INFO "cirrusfb: virtual resolution set to " |
689 | "maximum of %dx%d\n", var->xres_virtual, | 659 | "maximum of %dx%d\n", var->xres_virtual, |
690 | var->yres_virtual); | 660 | var->yres_virtual); |
691 | } | 661 | } |
692 | |||
693 | if (var->xres_virtual < var->xres) | ||
694 | var->xres_virtual = var->xres; | ||
695 | if (var->yres_virtual < var->yres) | 662 | if (var->yres_virtual < var->yres) |
696 | var->yres_virtual = var->yres; | 663 | var->yres_virtual = var->yres; |
697 | 664 | ||
665 | if (var->xres_virtual * var->yres_virtual > pixels) { | ||
666 | printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected... " | ||
667 | "virtual resolution too high to fit into video memory!\n", | ||
668 | var->xres_virtual, var->yres_virtual, | ||
669 | var->bits_per_pixel); | ||
670 | DPRINTK("EXIT - EINVAL error\n"); | ||
671 | return -EINVAL; | ||
672 | } | ||
673 | |||
674 | |||
698 | if (var->xoffset < 0) | 675 | if (var->xoffset < 0) |
699 | var->xoffset = 0; | 676 | var->xoffset = 0; |
700 | if (var->yoffset < 0) | 677 | if (var->yoffset < 0) |
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index 6efcf89e7fbe..dfb72f5e4c96 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c | |||
@@ -156,7 +156,7 @@ struct resmap { | |||
156 | }; | 156 | }; |
157 | 157 | ||
158 | static struct { | 158 | static struct { |
159 | u32 base; | 159 | void __iomem *base; |
160 | 160 | ||
161 | struct omapfb_mem_desc mem_desc; | 161 | struct omapfb_mem_desc mem_desc; |
162 | struct resmap *res_map[DISPC_MEMTYPE_NUM]; | 162 | struct resmap *res_map[DISPC_MEMTYPE_NUM]; |
@@ -212,9 +212,9 @@ static void enable_rfbi_mode(int enable) | |||
212 | dispc_write_reg(DISPC_CONTROL, l); | 212 | dispc_write_reg(DISPC_CONTROL, l); |
213 | 213 | ||
214 | /* Set bypass mode in RFBI module */ | 214 | /* Set bypass mode in RFBI module */ |
215 | l = __raw_readl(io_p2v(RFBI_CONTROL)); | 215 | l = __raw_readl(IO_ADDRESS(RFBI_CONTROL)); |
216 | l |= enable ? 0 : (1 << 1); | 216 | l |= enable ? 0 : (1 << 1); |
217 | __raw_writel(l, io_p2v(RFBI_CONTROL)); | 217 | __raw_writel(l, IO_ADDRESS(RFBI_CONTROL)); |
218 | } | 218 | } |
219 | 219 | ||
220 | static void set_lcd_data_lines(int data_lines) | 220 | static void set_lcd_data_lines(int data_lines) |
@@ -1349,14 +1349,19 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, | |||
1349 | 1349 | ||
1350 | memset(&dispc, 0, sizeof(dispc)); | 1350 | memset(&dispc, 0, sizeof(dispc)); |
1351 | 1351 | ||
1352 | dispc.base = io_p2v(DISPC_BASE); | 1352 | dispc.base = ioremap(DISPC_BASE, SZ_1K); |
1353 | if (!dispc.base) { | ||
1354 | dev_err(fbdev->dev, "can't ioremap DISPC\n"); | ||
1355 | return -ENOMEM; | ||
1356 | } | ||
1357 | |||
1353 | dispc.fbdev = fbdev; | 1358 | dispc.fbdev = fbdev; |
1354 | dispc.ext_mode = ext_mode; | 1359 | dispc.ext_mode = ext_mode; |
1355 | 1360 | ||
1356 | init_completion(&dispc.frame_done); | 1361 | init_completion(&dispc.frame_done); |
1357 | 1362 | ||
1358 | if ((r = get_dss_clocks()) < 0) | 1363 | if ((r = get_dss_clocks()) < 0) |
1359 | return r; | 1364 | goto fail0; |
1360 | 1365 | ||
1361 | enable_interface_clocks(1); | 1366 | enable_interface_clocks(1); |
1362 | enable_lcd_clocks(1); | 1367 | enable_lcd_clocks(1); |
@@ -1414,7 +1419,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, | |||
1414 | } | 1419 | } |
1415 | 1420 | ||
1416 | /* L3 firewall setting: enable access to OCM RAM */ | 1421 | /* L3 firewall setting: enable access to OCM RAM */ |
1417 | __raw_writel(0x402000b0, io_p2v(0x680050a0)); | 1422 | __raw_writel(0x402000b0, IO_ADDRESS(0x680050a0)); |
1418 | 1423 | ||
1419 | if ((r = alloc_palette_ram()) < 0) | 1424 | if ((r = alloc_palette_ram()) < 0) |
1420 | goto fail2; | 1425 | goto fail2; |
@@ -1464,7 +1469,8 @@ fail1: | |||
1464 | enable_lcd_clocks(0); | 1469 | enable_lcd_clocks(0); |
1465 | enable_interface_clocks(0); | 1470 | enable_interface_clocks(0); |
1466 | put_dss_clocks(); | 1471 | put_dss_clocks(); |
1467 | 1472 | fail0: | |
1473 | iounmap(dispc.base); | ||
1468 | return r; | 1474 | return r; |
1469 | } | 1475 | } |
1470 | 1476 | ||
@@ -1481,6 +1487,7 @@ static void omap_dispc_cleanup(void) | |||
1481 | free_irq(INT_24XX_DSS_IRQ, dispc.fbdev); | 1487 | free_irq(INT_24XX_DSS_IRQ, dispc.fbdev); |
1482 | enable_interface_clocks(0); | 1488 | enable_interface_clocks(0); |
1483 | put_dss_clocks(); | 1489 | put_dss_clocks(); |
1490 | iounmap(dispc.base); | ||
1484 | } | 1491 | } |
1485 | 1492 | ||
1486 | const struct lcd_ctrl omap2_int_ctrl = { | 1493 | const struct lcd_ctrl omap2_int_ctrl = { |
diff --git a/drivers/video/omap/dispc.h b/drivers/video/omap/dispc.h index eb1512b56ce8..ef720a78f6d5 100644 --- a/drivers/video/omap/dispc.h +++ b/drivers/video/omap/dispc.h | |||
@@ -40,4 +40,6 @@ extern void omap_dispc_enable_digit_out(int enable); | |||
40 | extern int omap_dispc_request_irq(void (*callback)(void *data), void *data); | 40 | extern int omap_dispc_request_irq(void (*callback)(void *data), void *data); |
41 | extern void omap_dispc_free_irq(void); | 41 | extern void omap_dispc_free_irq(void); |
42 | 42 | ||
43 | extern const struct lcd_ctrl omap2_int_ctrl; | ||
44 | |||
43 | #endif | 45 | #endif |
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c index 88c19d424ef7..6ff56430341b 100644 --- a/drivers/video/omap/lcd_h4.c +++ b/drivers/video/omap/lcd_h4.c | |||
@@ -47,7 +47,7 @@ static unsigned long h4_panel_get_caps(struct lcd_panel *panel) | |||
47 | return 0; | 47 | return 0; |
48 | } | 48 | } |
49 | 49 | ||
50 | struct lcd_panel h4_panel = { | 50 | static struct lcd_panel h4_panel = { |
51 | .name = "h4", | 51 | .name = "h4", |
52 | .config = OMAP_LCDC_PANEL_TFT, | 52 | .config = OMAP_LCDC_PANEL_TFT, |
53 | 53 | ||
@@ -91,7 +91,7 @@ static int h4_panel_resume(struct platform_device *pdev) | |||
91 | return 0; | 91 | return 0; |
92 | } | 92 | } |
93 | 93 | ||
94 | struct platform_driver h4_panel_driver = { | 94 | static struct platform_driver h4_panel_driver = { |
95 | .probe = h4_panel_probe, | 95 | .probe = h4_panel_probe, |
96 | .remove = h4_panel_remove, | 96 | .remove = h4_panel_remove, |
97 | .suspend = h4_panel_suspend, | 97 | .suspend = h4_panel_suspend, |
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 83514f066712..6e2ea7518761 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
@@ -34,6 +34,8 @@ | |||
34 | 34 | ||
35 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
36 | 36 | ||
37 | #include "lcdc.h" | ||
38 | |||
37 | #define MODULE_NAME "lcdc" | 39 | #define MODULE_NAME "lcdc" |
38 | 40 | ||
39 | #define OMAP_LCDC_BASE 0xfffec000 | 41 | #define OMAP_LCDC_BASE 0xfffec000 |
diff --git a/drivers/video/omap/lcdc.h b/drivers/video/omap/lcdc.h index adb731e5314a..845222270db3 100644 --- a/drivers/video/omap/lcdc.h +++ b/drivers/video/omap/lcdc.h | |||
@@ -4,4 +4,6 @@ | |||
4 | int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data); | 4 | int omap_lcdc_set_dma_callback(void (*callback)(void *data), void *data); |
5 | void omap_lcdc_free_dma_callback(void); | 5 | void omap_lcdc_free_dma_callback(void); |
6 | 6 | ||
7 | extern const struct lcd_ctrl omap1_int_ctrl; | ||
8 | |||
7 | #endif | 9 | #endif |
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 51a138bd113c..5a5e407dc45f 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
@@ -31,11 +31,14 @@ | |||
31 | #include <mach/dma.h> | 31 | #include <mach/dma.h> |
32 | #include <mach/omapfb.h> | 32 | #include <mach/omapfb.h> |
33 | 33 | ||
34 | #include "lcdc.h" | ||
35 | #include "dispc.h" | ||
36 | |||
34 | #define MODULE_NAME "omapfb" | 37 | #define MODULE_NAME "omapfb" |
35 | 38 | ||
36 | static unsigned int def_accel; | 39 | static unsigned int def_accel; |
37 | static unsigned long def_vram[OMAPFB_PLANE_NUM]; | 40 | static unsigned long def_vram[OMAPFB_PLANE_NUM]; |
38 | static int def_vram_cnt; | 41 | static unsigned int def_vram_cnt; |
39 | static unsigned long def_vxres; | 42 | static unsigned long def_vxres; |
40 | static unsigned long def_vyres; | 43 | static unsigned long def_vyres; |
41 | static unsigned int def_rotate; | 44 | static unsigned int def_rotate; |
@@ -84,12 +87,10 @@ static struct caps_table_struct color_caps[] = { | |||
84 | * LCD panel | 87 | * LCD panel |
85 | * --------------------------------------------------------------------------- | 88 | * --------------------------------------------------------------------------- |
86 | */ | 89 | */ |
87 | extern struct lcd_ctrl omap1_int_ctrl; | ||
88 | extern struct lcd_ctrl omap2_int_ctrl; | ||
89 | extern struct lcd_ctrl hwa742_ctrl; | 90 | extern struct lcd_ctrl hwa742_ctrl; |
90 | extern struct lcd_ctrl blizzard_ctrl; | 91 | extern struct lcd_ctrl blizzard_ctrl; |
91 | 92 | ||
92 | static struct lcd_ctrl *ctrls[] = { | 93 | static const struct lcd_ctrl *ctrls[] = { |
93 | #ifdef CONFIG_ARCH_OMAP1 | 94 | #ifdef CONFIG_ARCH_OMAP1 |
94 | &omap1_int_ctrl, | 95 | &omap1_int_ctrl, |
95 | #else | 96 | #else |
@@ -740,7 +741,7 @@ static int omapfb_update_win(struct fb_info *fbi, | |||
740 | int ret; | 741 | int ret; |
741 | 742 | ||
742 | omapfb_rqueue_lock(plane->fbdev); | 743 | omapfb_rqueue_lock(plane->fbdev); |
743 | ret = omapfb_update_window_async(fbi, win, NULL, 0); | 744 | ret = omapfb_update_window_async(fbi, win, NULL, NULL); |
744 | omapfb_rqueue_unlock(plane->fbdev); | 745 | omapfb_rqueue_unlock(plane->fbdev); |
745 | 746 | ||
746 | return ret; | 747 | return ret; |
@@ -768,7 +769,7 @@ static int omapfb_update_full_screen(struct fb_info *fbi) | |||
768 | win.format = 0; | 769 | win.format = 0; |
769 | 770 | ||
770 | omapfb_rqueue_lock(fbdev); | 771 | omapfb_rqueue_lock(fbdev); |
771 | r = fbdev->ctrl->update_window(fbi, &win, NULL, 0); | 772 | r = fbdev->ctrl->update_window(fbi, &win, NULL, NULL); |
772 | omapfb_rqueue_unlock(fbdev); | 773 | omapfb_rqueue_unlock(fbdev); |
773 | 774 | ||
774 | return r; | 775 | return r; |
@@ -1047,7 +1048,7 @@ void omapfb_write_first_pixel(struct omapfb_device *fbdev, u16 pixval) | |||
1047 | win.height = 2; | 1048 | win.height = 2; |
1048 | win.out_width = 2; | 1049 | win.out_width = 2; |
1049 | win.out_height = 2; | 1050 | win.out_height = 2; |
1050 | fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, 0); | 1051 | fbdev->ctrl->update_window(fbdev->fb_info[0], &win, NULL, NULL); |
1051 | } | 1052 | } |
1052 | omapfb_rqueue_unlock(fbdev); | 1053 | omapfb_rqueue_unlock(fbdev); |
1053 | } | 1054 | } |
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index 4a6f13d3facf..a13c8dcad2a8 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c | |||
@@ -59,7 +59,7 @@ | |||
59 | #define DISPC_CONTROL 0x0040 | 59 | #define DISPC_CONTROL 0x0040 |
60 | 60 | ||
61 | static struct { | 61 | static struct { |
62 | u32 base; | 62 | void __iomem *base; |
63 | void (*lcdc_callback)(void *data); | 63 | void (*lcdc_callback)(void *data); |
64 | void *lcdc_callback_data; | 64 | void *lcdc_callback_data; |
65 | unsigned long l4_khz; | 65 | unsigned long l4_khz; |
@@ -518,7 +518,11 @@ static int rfbi_init(struct omapfb_device *fbdev) | |||
518 | int r; | 518 | int r; |
519 | 519 | ||
520 | rfbi.fbdev = fbdev; | 520 | rfbi.fbdev = fbdev; |
521 | rfbi.base = io_p2v(RFBI_BASE); | 521 | rfbi.base = ioremap(RFBI_BASE, SZ_1K); |
522 | if (!rfbi.base) { | ||
523 | dev_err(fbdev->dev, "can't ioremap RFBI\n"); | ||
524 | return -ENOMEM; | ||
525 | } | ||
522 | 526 | ||
523 | if ((r = rfbi_get_clocks()) < 0) | 527 | if ((r = rfbi_get_clocks()) < 0) |
524 | return r; | 528 | return r; |
@@ -566,6 +570,7 @@ static void rfbi_cleanup(void) | |||
566 | { | 570 | { |
567 | omap_dispc_free_irq(); | 571 | omap_dispc_free_irq(); |
568 | rfbi_put_clocks(); | 572 | rfbi_put_clocks(); |
573 | iounmap(rfbi.base); | ||
569 | } | 574 | } |
570 | 575 | ||
571 | const struct lcd_ctrl_extif omap2_ext_if = { | 576 | const struct lcd_ctrl_extif omap2_ext_if = { |
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c index 6359353c2c67..a76946220249 100644 --- a/drivers/video/omap/sossi.c +++ b/drivers/video/omap/sossi.c | |||
@@ -574,7 +574,12 @@ static int sossi_init(struct omapfb_device *fbdev) | |||
574 | struct clk *dpll1out_ck; | 574 | struct clk *dpll1out_ck; |
575 | int r; | 575 | int r; |
576 | 576 | ||
577 | sossi.base = (void __iomem *)IO_ADDRESS(OMAP_SOSSI_BASE); | 577 | sossi.base = ioremap(OMAP_SOSSI_BASE, SZ_1K); |
578 | if (!sossi.base) { | ||
579 | dev_err(fbdev->dev, "can't ioremap SoSSI\n"); | ||
580 | return -ENOMEM; | ||
581 | } | ||
582 | |||
578 | sossi.fbdev = fbdev; | 583 | sossi.fbdev = fbdev; |
579 | spin_lock_init(&sossi.lock); | 584 | spin_lock_init(&sossi.lock); |
580 | 585 | ||
@@ -665,6 +670,7 @@ static void sossi_cleanup(void) | |||
665 | { | 670 | { |
666 | omap_lcdc_free_dma_callback(); | 671 | omap_lcdc_free_dma_callback(); |
667 | clk_put(sossi.fck); | 672 | clk_put(sossi.fck); |
673 | iounmap(sossi.base); | ||
668 | } | 674 | } |
669 | 675 | ||
670 | struct lcd_ctrl_extif omap1_ext_if = { | 676 | struct lcd_ctrl_extif omap1_ext_if = { |
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 77aafcfae037..4599a4385bc9 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c | |||
@@ -95,7 +95,6 @@ static inline int mtrr_del(int reg, unsigned long base, | |||
95 | #define VOODOO5_MAX_PIXCLOCK 350000 | 95 | #define VOODOO5_MAX_PIXCLOCK 350000 |
96 | 96 | ||
97 | static struct fb_fix_screeninfo tdfx_fix __devinitdata = { | 97 | static struct fb_fix_screeninfo tdfx_fix __devinitdata = { |
98 | .id = "3Dfx", | ||
99 | .type = FB_TYPE_PACKED_PIXELS, | 98 | .type = FB_TYPE_PACKED_PIXELS, |
100 | .visual = FB_VISUAL_PSEUDOCOLOR, | 99 | .visual = FB_VISUAL_PSEUDOCOLOR, |
101 | .ypanstep = 1, | 100 | .ypanstep = 1, |
@@ -426,7 +425,7 @@ static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id) | |||
426 | if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) { | 425 | if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) { |
427 | /* Banshee/Voodoo3 */ | 426 | /* Banshee/Voodoo3 */ |
428 | chip_size = 2; | 427 | chip_size = 2; |
429 | if (has_sgram && (draminit0 & DRAMINIT0_SGRAM_TYPE)) | 428 | if (has_sgram && !(draminit0 & DRAMINIT0_SGRAM_TYPE)) |
430 | chip_size = 1; | 429 | chip_size = 1; |
431 | } else { | 430 | } else { |
432 | /* Voodoo4/5 */ | 431 | /* Voodoo4/5 */ |
@@ -1200,15 +1199,15 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev, | |||
1200 | /* Configure the default fb_fix_screeninfo first */ | 1199 | /* Configure the default fb_fix_screeninfo first */ |
1201 | switch (pdev->device) { | 1200 | switch (pdev->device) { |
1202 | case PCI_DEVICE_ID_3DFX_BANSHEE: | 1201 | case PCI_DEVICE_ID_3DFX_BANSHEE: |
1203 | strcat(tdfx_fix.id, " Banshee"); | 1202 | strcpy(tdfx_fix.id, "3Dfx Banshee"); |
1204 | default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK; | 1203 | default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK; |
1205 | break; | 1204 | break; |
1206 | case PCI_DEVICE_ID_3DFX_VOODOO3: | 1205 | case PCI_DEVICE_ID_3DFX_VOODOO3: |
1207 | strcat(tdfx_fix.id, " Voodoo3"); | 1206 | strcpy(tdfx_fix.id, "3Dfx Voodoo3"); |
1208 | default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK; | 1207 | default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK; |
1209 | break; | 1208 | break; |
1210 | case PCI_DEVICE_ID_3DFX_VOODOO5: | 1209 | case PCI_DEVICE_ID_3DFX_VOODOO5: |
1211 | strcat(tdfx_fix.id, " Voodoo5"); | 1210 | strcpy(tdfx_fix.id, "3Dfx Voodoo5"); |
1212 | default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK; | 1211 | default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK; |
1213 | break; | 1212 | break; |
1214 | } | 1213 | } |
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index db20542796bf..c51036716700 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -465,6 +465,16 @@ config PC87413_WDT | |||
465 | 465 | ||
466 | Most people will say N. | 466 | Most people will say N. |
467 | 467 | ||
468 | config RDC321X_WDT | ||
469 | tristate "RDC R-321x SoC watchdog" | ||
470 | depends on X86_RDC321X | ||
471 | help | ||
472 | This is the driver for the built in hardware watchdog | ||
473 | in the RDC R-321x SoC. | ||
474 | |||
475 | To compile this driver as a module, choose M here: the | ||
476 | module will be called rdc321x_wdt. | ||
477 | |||
468 | config 60XX_WDT | 478 | config 60XX_WDT |
469 | tristate "SBC-60XX Watchdog Timer" | 479 | tristate "SBC-60XX Watchdog Timer" |
470 | depends on X86 | 480 | depends on X86 |
@@ -633,6 +643,16 @@ config SBC_EPX_C3_WATCHDOG | |||
633 | 643 | ||
634 | # MIPS Architecture | 644 | # MIPS Architecture |
635 | 645 | ||
646 | config RC32434_WDT | ||
647 | tristate "IDT RC32434 SoC Watchdog Timer" | ||
648 | depends on MIKROTIK_RB532 | ||
649 | help | ||
650 | Hardware driver for the IDT RC32434 SoC built-in | ||
651 | watchdog timer. | ||
652 | |||
653 | To compile this driver as a module, choose M here: the | ||
654 | module will be called rc32434_wdt. | ||
655 | |||
636 | config INDYDOG | 656 | config INDYDOG |
637 | tristate "Indy/I2 Hardware Watchdog" | 657 | tristate "Indy/I2 Hardware Watchdog" |
638 | depends on SGI_HAS_INDYDOG | 658 | depends on SGI_HAS_INDYDOG |
@@ -692,10 +712,6 @@ config MPC5200_WDT | |||
692 | tristate "MPC5200 Watchdog Timer" | 712 | tristate "MPC5200 Watchdog Timer" |
693 | depends on PPC_MPC52xx | 713 | depends on PPC_MPC52xx |
694 | 714 | ||
695 | config 8xx_WDT | ||
696 | tristate "MPC8xx Watchdog Timer" | ||
697 | depends on 8xx | ||
698 | |||
699 | config 8xxx_WDT | 715 | config 8xxx_WDT |
700 | tristate "MPC8xxx Platform Watchdog Timer" | 716 | tristate "MPC8xxx Platform Watchdog Timer" |
701 | depends on PPC_8xx || PPC_83xx || PPC_86xx | 717 | depends on PPC_8xx || PPC_83xx || PPC_86xx |
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index ca3dc043d786..e0ef123fbdea 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile | |||
@@ -75,6 +75,7 @@ obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o | |||
75 | obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o | 75 | obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o |
76 | obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o | 76 | obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o |
77 | obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o | 77 | obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o |
78 | obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o | ||
78 | obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o | 79 | obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o |
79 | obj-$(CONFIG_SBC8360_WDT) += sbc8360.o | 80 | obj-$(CONFIG_SBC8360_WDT) += sbc8360.o |
80 | obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o | 81 | obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o |
@@ -94,6 +95,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o | |||
94 | # M68KNOMMU Architecture | 95 | # M68KNOMMU Architecture |
95 | 96 | ||
96 | # MIPS Architecture | 97 | # MIPS Architecture |
98 | obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o | ||
97 | obj-$(CONFIG_INDYDOG) += indydog.o | 99 | obj-$(CONFIG_INDYDOG) += indydog.o |
98 | obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o | 100 | obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o |
99 | obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o | 101 | obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o |
@@ -104,7 +106,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o | |||
104 | # PARISC Architecture | 106 | # PARISC Architecture |
105 | 107 | ||
106 | # POWERPC Architecture | 108 | # POWERPC Architecture |
107 | obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o | ||
108 | obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o | 109 | obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o |
109 | obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o | 110 | obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o |
110 | obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o | 111 | obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o |
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c index d061f0ad2d20..993e5f52afef 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c | |||
@@ -241,7 +241,7 @@ static int at91wdt_resume(struct platform_device *pdev) | |||
241 | { | 241 | { |
242 | if (at91wdt_busy) | 242 | if (at91wdt_busy) |
243 | at91_wdt_start(); | 243 | at91_wdt_start(); |
244 | return 0; | 244 | return 0; |
245 | } | 245 | } |
246 | 246 | ||
247 | #else | 247 | #else |
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index d039d5f2fd1c..a3765e0be4a8 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
@@ -116,6 +116,7 @@ static unsigned int reload; /* the computed soft_margin */ | |||
116 | static int nowayout = WATCHDOG_NOWAYOUT; | 116 | static int nowayout = WATCHDOG_NOWAYOUT; |
117 | static char expect_release; | 117 | static char expect_release; |
118 | static unsigned long hpwdt_is_open; | 118 | static unsigned long hpwdt_is_open; |
119 | static unsigned int allow_kdump; | ||
119 | 120 | ||
120 | static void __iomem *pci_mem_addr; /* the PCI-memory address */ | 121 | static void __iomem *pci_mem_addr; /* the PCI-memory address */ |
121 | static unsigned long __iomem *hpwdt_timer_reg; | 122 | static unsigned long __iomem *hpwdt_timer_reg; |
@@ -221,19 +222,19 @@ static int __devinit cru_detect(unsigned long map_entry, | |||
221 | 222 | ||
222 | if (cmn_regs.u1.ral != 0) { | 223 | if (cmn_regs.u1.ral != 0) { |
223 | printk(KERN_WARNING | 224 | printk(KERN_WARNING |
224 | "hpwdt: Call succeeded but with an error: 0x%x\n", | 225 | "hpwdt: Call succeeded but with an error: 0x%x\n", |
225 | cmn_regs.u1.ral); | 226 | cmn_regs.u1.ral); |
226 | } else { | 227 | } else { |
227 | physical_bios_base = cmn_regs.u2.rebx; | 228 | physical_bios_base = cmn_regs.u2.rebx; |
228 | physical_bios_offset = cmn_regs.u4.redx; | 229 | physical_bios_offset = cmn_regs.u4.redx; |
229 | cru_length = cmn_regs.u3.recx; | 230 | cru_length = cmn_regs.u3.recx; |
230 | cru_physical_address = | 231 | cru_physical_address = |
231 | physical_bios_base + physical_bios_offset; | 232 | physical_bios_base + physical_bios_offset; |
232 | 233 | ||
233 | /* If the values look OK, then map it in. */ | 234 | /* If the values look OK, then map it in. */ |
234 | if ((physical_bios_base + physical_bios_offset)) { | 235 | if ((physical_bios_base + physical_bios_offset)) { |
235 | cru_rom_addr = | 236 | cru_rom_addr = |
236 | ioremap(cru_physical_address, cru_length); | 237 | ioremap(cru_physical_address, cru_length); |
237 | if (cru_rom_addr) | 238 | if (cru_rom_addr) |
238 | retval = 0; | 239 | retval = 0; |
239 | } | 240 | } |
@@ -356,7 +357,6 @@ asm(".text \n\t" | |||
356 | "call *%r12 \n\t" | 357 | "call *%r12 \n\t" |
357 | "pushfq \n\t" | 358 | "pushfq \n\t" |
358 | "popq %r12 \n\t" | 359 | "popq %r12 \n\t" |
359 | "popfq \n\t" | ||
360 | "movl %eax, (%r9) \n\t" | 360 | "movl %eax, (%r9) \n\t" |
361 | "movl %ebx, 4(%r9) \n\t" | 361 | "movl %ebx, 4(%r9) \n\t" |
362 | "movl %ecx, 8(%r9) \n\t" | 362 | "movl %ecx, 8(%r9) \n\t" |
@@ -390,10 +390,10 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm) | |||
390 | smbios_cru64_ptr = (struct smbios_cru64_info *) dm; | 390 | smbios_cru64_ptr = (struct smbios_cru64_info *) dm; |
391 | if (smbios_cru64_ptr->signature == CRU_BIOS_SIGNATURE_VALUE) { | 391 | if (smbios_cru64_ptr->signature == CRU_BIOS_SIGNATURE_VALUE) { |
392 | cru_physical_address = | 392 | cru_physical_address = |
393 | smbios_cru64_ptr->physical_address + | 393 | smbios_cru64_ptr->physical_address + |
394 | smbios_cru64_ptr->double_offset; | 394 | smbios_cru64_ptr->double_offset; |
395 | cru_rom_addr = ioremap(cru_physical_address, | 395 | cru_rom_addr = ioremap(cru_physical_address, |
396 | smbios_cru64_ptr->double_length); | 396 | smbios_cru64_ptr->double_length); |
397 | } | 397 | } |
398 | } | 398 | } |
399 | } | 399 | } |
@@ -405,7 +405,7 @@ static int __devinit detect_cru_service(void) | |||
405 | dmi_walk(dmi_find_cru); | 405 | dmi_walk(dmi_find_cru); |
406 | 406 | ||
407 | /* if cru_rom_addr has been set then we found a CRU service */ | 407 | /* if cru_rom_addr has been set then we found a CRU service */ |
408 | return ((cru_rom_addr != NULL) ? 0: -ENODEV); | 408 | return ((cru_rom_addr != NULL) ? 0 : -ENODEV); |
409 | } | 409 | } |
410 | 410 | ||
411 | /* ------------------------------------------------------------------------- */ | 411 | /* ------------------------------------------------------------------------- */ |
@@ -413,34 +413,6 @@ static int __devinit detect_cru_service(void) | |||
413 | #endif | 413 | #endif |
414 | 414 | ||
415 | /* | 415 | /* |
416 | * NMI Handler | ||
417 | */ | ||
418 | static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, | ||
419 | void *data) | ||
420 | { | ||
421 | unsigned long rom_pl; | ||
422 | static int die_nmi_called; | ||
423 | |||
424 | if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) | ||
425 | return NOTIFY_OK; | ||
426 | |||
427 | spin_lock_irqsave(&rom_lock, rom_pl); | ||
428 | if (!die_nmi_called) | ||
429 | asminline_call(&cmn_regs, cru_rom_addr); | ||
430 | die_nmi_called = 1; | ||
431 | spin_unlock_irqrestore(&rom_lock, rom_pl); | ||
432 | if (cmn_regs.u1.ral == 0) { | ||
433 | printk(KERN_WARNING "hpwdt: An NMI occurred, " | ||
434 | "but unable to determine source.\n"); | ||
435 | } else { | ||
436 | panic("An NMI occurred, please see the Integrated " | ||
437 | "Management Log for details.\n"); | ||
438 | } | ||
439 | |||
440 | return NOTIFY_STOP; | ||
441 | } | ||
442 | |||
443 | /* | ||
444 | * Watchdog operations | 416 | * Watchdog operations |
445 | */ | 417 | */ |
446 | static void hpwdt_start(void) | 418 | static void hpwdt_start(void) |
@@ -484,6 +456,36 @@ static int hpwdt_change_timer(int new_margin) | |||
484 | } | 456 | } |
485 | 457 | ||
486 | /* | 458 | /* |
459 | * NMI Handler | ||
460 | */ | ||
461 | static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, | ||
462 | void *data) | ||
463 | { | ||
464 | unsigned long rom_pl; | ||
465 | static int die_nmi_called; | ||
466 | |||
467 | if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) | ||
468 | return NOTIFY_OK; | ||
469 | |||
470 | spin_lock_irqsave(&rom_lock, rom_pl); | ||
471 | if (!die_nmi_called) | ||
472 | asminline_call(&cmn_regs, cru_rom_addr); | ||
473 | die_nmi_called = 1; | ||
474 | spin_unlock_irqrestore(&rom_lock, rom_pl); | ||
475 | if (cmn_regs.u1.ral == 0) { | ||
476 | printk(KERN_WARNING "hpwdt: An NMI occurred, " | ||
477 | "but unable to determine source.\n"); | ||
478 | } else { | ||
479 | if (allow_kdump) | ||
480 | hpwdt_stop(); | ||
481 | panic("An NMI occurred, please see the Integrated " | ||
482 | "Management Log for details.\n"); | ||
483 | } | ||
484 | |||
485 | return NOTIFY_STOP; | ||
486 | } | ||
487 | |||
488 | /* | ||
487 | * /dev/watchdog handling | 489 | * /dev/watchdog handling |
488 | */ | 490 | */ |
489 | static int hpwdt_open(struct inode *inode, struct file *file) | 491 | static int hpwdt_open(struct inode *inode, struct file *file) |
@@ -625,17 +627,18 @@ static struct notifier_block die_notifier = { | |||
625 | */ | 627 | */ |
626 | 628 | ||
627 | static int __devinit hpwdt_init_one(struct pci_dev *dev, | 629 | static int __devinit hpwdt_init_one(struct pci_dev *dev, |
628 | const struct pci_device_id *ent) | 630 | const struct pci_device_id *ent) |
629 | { | 631 | { |
630 | int retval; | 632 | int retval; |
631 | 633 | ||
632 | /* | 634 | /* |
633 | * First let's find out if we are on an iLO2 server. We will | 635 | * First let's find out if we are on an iLO2 server. We will |
634 | * not run on a legacy ASM box. | 636 | * not run on a legacy ASM box. |
637 | * So we only support the G5 ProLiant servers and higher. | ||
635 | */ | 638 | */ |
636 | if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) { | 639 | if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) { |
637 | dev_warn(&dev->dev, | 640 | dev_warn(&dev->dev, |
638 | "This server does not have an iLO2 ASIC.\n"); | 641 | "This server does not have an iLO2 ASIC.\n"); |
639 | return -ENODEV; | 642 | return -ENODEV; |
640 | } | 643 | } |
641 | 644 | ||
@@ -669,7 +672,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
669 | retval = detect_cru_service(); | 672 | retval = detect_cru_service(); |
670 | if (retval < 0) { | 673 | if (retval < 0) { |
671 | dev_warn(&dev->dev, | 674 | dev_warn(&dev->dev, |
672 | "Unable to detect the %d Bit CRU Service.\n", | 675 | "Unable to detect the %d Bit CRU Service.\n", |
673 | HPWDT_ARCH); | 676 | HPWDT_ARCH); |
674 | goto error_get_cru; | 677 | goto error_get_cru; |
675 | } | 678 | } |
@@ -684,7 +687,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
684 | retval = register_die_notifier(&die_notifier); | 687 | retval = register_die_notifier(&die_notifier); |
685 | if (retval != 0) { | 688 | if (retval != 0) { |
686 | dev_warn(&dev->dev, | 689 | dev_warn(&dev->dev, |
687 | "Unable to register a die notifier (err=%d).\n", | 690 | "Unable to register a die notifier (err=%d).\n", |
688 | retval); | 691 | retval); |
689 | goto error_die_notifier; | 692 | goto error_die_notifier; |
690 | } | 693 | } |
@@ -699,8 +702,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev, | |||
699 | 702 | ||
700 | printk(KERN_INFO | 703 | printk(KERN_INFO |
701 | "hp Watchdog Timer Driver: 1.00" | 704 | "hp Watchdog Timer Driver: 1.00" |
702 | ", timer margin: %d seconds( nowayout=%d).\n", | 705 | ", timer margin: %d seconds (nowayout=%d)" |
703 | soft_margin, nowayout); | 706 | ", allow kernel dump: %s (default = 0/OFF).\n", |
707 | soft_margin, nowayout, (allow_kdump == 0) ? "OFF" : "ON"); | ||
704 | 708 | ||
705 | return 0; | 709 | return 0; |
706 | 710 | ||
@@ -755,6 +759,9 @@ MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | |||
755 | module_param(soft_margin, int, 0); | 759 | module_param(soft_margin, int, 0); |
756 | MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); | 760 | MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds"); |
757 | 761 | ||
762 | module_param(allow_kdump, int, 0); | ||
763 | MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs"); | ||
764 | |||
758 | module_param(nowayout, int, 0); | 765 | module_param(nowayout, int, 0); |
759 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | 766 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" |
760 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | 767 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c deleted file mode 100644 index 1336425acf20..000000000000 --- a/drivers/watchdog/mpc8xx_wdt.c +++ /dev/null | |||
@@ -1,170 +0,0 @@ | |||
1 | /* | ||
2 | * mpc8xx_wdt.c - MPC8xx watchdog userspace interface | ||
3 | * | ||
4 | * Author: Florian Schirmer <jolt@tuxbox.org> | ||
5 | * | ||
6 | * 2002 (c) Florian Schirmer <jolt@tuxbox.org> This file is licensed under | ||
7 | * the terms of the GNU General Public License version 2. This program | ||
8 | * is licensed "as is" without any warranty of any kind, whether express | ||
9 | * or implied. | ||
10 | */ | ||
11 | |||
12 | #include <linux/fs.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/kernel.h> | ||
15 | #include <linux/miscdevice.h> | ||
16 | #include <linux/module.h> | ||
17 | #include <linux/watchdog.h> | ||
18 | #include <asm/8xx_immap.h> | ||
19 | #include <linux/uaccess.h> | ||
20 | #include <linux/io.h> | ||
21 | #include <syslib/m8xx_wdt.h> | ||
22 | |||
23 | static unsigned long wdt_opened; | ||
24 | static int wdt_status; | ||
25 | static spinlock_t wdt_lock; | ||
26 | |||
27 | static void mpc8xx_wdt_handler_disable(void) | ||
28 | { | ||
29 | volatile uint __iomem *piscr; | ||
30 | piscr = (uint *)&((immap_t *)IMAP_ADDR)->im_sit.sit_piscr; | ||
31 | |||
32 | if (!m8xx_has_internal_rtc) | ||
33 | m8xx_wdt_stop_timer(); | ||
34 | else | ||
35 | out_be32(piscr, in_be32(piscr) & ~(PISCR_PIE | PISCR_PTE)); | ||
36 | printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler deactivated\n"); | ||
37 | } | ||
38 | |||
39 | static void mpc8xx_wdt_handler_enable(void) | ||
40 | { | ||
41 | volatile uint __iomem *piscr; | ||
42 | piscr = (uint *)&((immap_t *)IMAP_ADDR)->im_sit.sit_piscr; | ||
43 | |||
44 | if (!m8xx_has_internal_rtc) | ||
45 | m8xx_wdt_install_timer(); | ||
46 | else | ||
47 | out_be32(piscr, in_be32(piscr) | PISCR_PIE | PISCR_PTE); | ||
48 | printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler activated\n"); | ||
49 | } | ||
50 | |||
51 | static int mpc8xx_wdt_open(struct inode *inode, struct file *file) | ||
52 | { | ||
53 | if (test_and_set_bit(0, &wdt_opened)) | ||
54 | return -EBUSY; | ||
55 | m8xx_wdt_reset(); | ||
56 | mpc8xx_wdt_handler_disable(); | ||
57 | return nonseekable_open(inode, file); | ||
58 | } | ||
59 | |||
60 | static int mpc8xx_wdt_release(struct inode *inode, struct file *file) | ||
61 | { | ||
62 | m8xx_wdt_reset(); | ||
63 | #if !defined(CONFIG_WATCHDOG_NOWAYOUT) | ||
64 | mpc8xx_wdt_handler_enable(); | ||
65 | #endif | ||
66 | clear_bit(0, &wdt_opened); | ||
67 | return 0; | ||
68 | } | ||
69 | |||
70 | static ssize_t mpc8xx_wdt_write(struct file *file, const char *data, | ||
71 | size_t len, loff_t *ppos) | ||
72 | { | ||
73 | if (len) { | ||
74 | spin_lock(&wdt_lock); | ||
75 | m8xx_wdt_reset(); | ||
76 | spin_unlock(&wdt_lock); | ||
77 | } | ||
78 | return len; | ||
79 | } | ||
80 | |||
81 | static long mpc8xx_wdt_ioctl(struct file *file, | ||
82 | unsigned int cmd, unsigned long arg) | ||
83 | { | ||
84 | int timeout; | ||
85 | static struct watchdog_info info = { | ||
86 | .options = WDIOF_KEEPALIVEPING, | ||
87 | .firmware_version = 0, | ||
88 | .identity = "MPC8xx watchdog", | ||
89 | }; | ||
90 | |||
91 | switch (cmd) { | ||
92 | case WDIOC_GETSUPPORT: | ||
93 | if (copy_to_user((void *)arg, &info, sizeof(info))) | ||
94 | return -EFAULT; | ||
95 | break; | ||
96 | |||
97 | case WDIOC_GETSTATUS: | ||
98 | case WDIOC_GETBOOTSTATUS: | ||
99 | if (put_user(wdt_status, (int *)arg)) | ||
100 | return -EFAULT; | ||
101 | wdt_status &= ~WDIOF_KEEPALIVEPING; | ||
102 | break; | ||
103 | |||
104 | case WDIOC_GETTEMP: | ||
105 | return -EOPNOTSUPP; | ||
106 | |||
107 | case WDIOC_SETOPTIONS: | ||
108 | return -EOPNOTSUPP; | ||
109 | |||
110 | case WDIOC_KEEPALIVE: | ||
111 | spin_lock(&wdt_lock); | ||
112 | m8xx_wdt_reset(); | ||
113 | wdt_status |= WDIOF_KEEPALIVEPING; | ||
114 | spin_unlock(&wdt_lock); | ||
115 | break; | ||
116 | |||
117 | case WDIOC_SETTIMEOUT: | ||
118 | return -EOPNOTSUPP; | ||
119 | |||
120 | case WDIOC_GETTIMEOUT: | ||
121 | spin_lock(&wdt_lock); | ||
122 | timeout = m8xx_wdt_get_timeout(); | ||
123 | spin_unlock(&wdt_lock); | ||
124 | if (put_user(timeout, (int *)arg)) | ||
125 | return -EFAULT; | ||
126 | break; | ||
127 | |||
128 | default: | ||
129 | return -ENOTTY; | ||
130 | } | ||
131 | |||
132 | return 0; | ||
133 | } | ||
134 | |||
135 | static const struct file_operations mpc8xx_wdt_fops = { | ||
136 | .owner = THIS_MODULE, | ||
137 | .llseek = no_llseek, | ||
138 | .write = mpc8xx_wdt_write, | ||
139 | .unlocked_ioctl = mpc8xx_wdt_ioctl, | ||
140 | .open = mpc8xx_wdt_open, | ||
141 | .release = mpc8xx_wdt_release, | ||
142 | }; | ||
143 | |||
144 | static struct miscdevice mpc8xx_wdt_miscdev = { | ||
145 | .minor = WATCHDOG_MINOR, | ||
146 | .name = "watchdog", | ||
147 | .fops = &mpc8xx_wdt_fops, | ||
148 | }; | ||
149 | |||
150 | static int __init mpc8xx_wdt_init(void) | ||
151 | { | ||
152 | spin_lock_init(&wdt_lock); | ||
153 | return misc_register(&mpc8xx_wdt_miscdev); | ||
154 | } | ||
155 | |||
156 | static void __exit mpc8xx_wdt_exit(void) | ||
157 | { | ||
158 | misc_deregister(&mpc8xx_wdt_miscdev); | ||
159 | |||
160 | m8xx_wdt_reset(); | ||
161 | mpc8xx_wdt_handler_enable(); | ||
162 | } | ||
163 | |||
164 | module_init(mpc8xx_wdt_init); | ||
165 | module_exit(mpc8xx_wdt_exit); | ||
166 | |||
167 | MODULE_AUTHOR("Florian Schirmer <jolt@tuxbox.org>"); | ||
168 | MODULE_DESCRIPTION("MPC8xx watchdog driver"); | ||
169 | MODULE_LICENSE("GPL"); | ||
170 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c index f2094960e662..38c588ee694f 100644 --- a/drivers/watchdog/mpc8xxx_wdt.c +++ b/drivers/watchdog/mpc8xxx_wdt.c | |||
@@ -48,6 +48,7 @@ struct mpc8xxx_wdt_type { | |||
48 | }; | 48 | }; |
49 | 49 | ||
50 | static struct mpc8xxx_wdt __iomem *wd_base; | 50 | static struct mpc8xxx_wdt __iomem *wd_base; |
51 | static int mpc8xxx_wdt_init_late(void); | ||
51 | 52 | ||
52 | static u16 timeout = 0xffff; | 53 | static u16 timeout = 0xffff; |
53 | module_param(timeout, ushort, 0); | 54 | module_param(timeout, ushort, 0); |
@@ -213,6 +214,12 @@ static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev, | |||
213 | else | 214 | else |
214 | timeout_sec = timeout / freq; | 215 | timeout_sec = timeout / freq; |
215 | 216 | ||
217 | #ifdef MODULE | ||
218 | ret = mpc8xxx_wdt_init_late(); | ||
219 | if (ret) | ||
220 | goto err_unmap; | ||
221 | #endif | ||
222 | |||
216 | pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d " | 223 | pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d " |
217 | "(%d seconds)\n", reset ? "reset" : "interrupt", timeout, | 224 | "(%d seconds)\n", reset ? "reset" : "interrupt", timeout, |
218 | timeout_sec); | 225 | timeout_sec); |
@@ -280,7 +287,7 @@ static struct of_platform_driver mpc8xxx_wdt_driver = { | |||
280 | * very early to start pinging the watchdog (misc devices are not yet | 287 | * very early to start pinging the watchdog (misc devices are not yet |
281 | * available), and later module_init() just registers the misc device. | 288 | * available), and later module_init() just registers the misc device. |
282 | */ | 289 | */ |
283 | static int __init mpc8xxx_wdt_init_late(void) | 290 | static int mpc8xxx_wdt_init_late(void) |
284 | { | 291 | { |
285 | int ret; | 292 | int ret; |
286 | 293 | ||
@@ -295,7 +302,9 @@ static int __init mpc8xxx_wdt_init_late(void) | |||
295 | } | 302 | } |
296 | return 0; | 303 | return 0; |
297 | } | 304 | } |
305 | #ifndef MODULE | ||
298 | module_init(mpc8xxx_wdt_init_late); | 306 | module_init(mpc8xxx_wdt_init_late); |
307 | #endif | ||
299 | 308 | ||
300 | static int __init mpc8xxx_wdt_init(void) | 309 | static int __init mpc8xxx_wdt_init(void) |
301 | { | 310 | { |
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c index e91ada72da1d..484c215e9f3f 100644 --- a/drivers/watchdog/pc87413_wdt.c +++ b/drivers/watchdog/pc87413_wdt.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
32 | #include <linux/moduleparam.h> | 32 | #include <linux/moduleparam.h> |
33 | #include <linux/version.h> | ||
34 | #include <linux/io.h> | 33 | #include <linux/io.h> |
35 | #include <linux/uaccess.h> | 34 | #include <linux/uaccess.h> |
36 | 35 | ||
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c new file mode 100644 index 000000000000..6756bcb009ed --- /dev/null +++ b/drivers/watchdog/rc32434_wdt.c | |||
@@ -0,0 +1,344 @@ | |||
1 | /* | ||
2 | * IDT Interprise 79RC32434 watchdog driver | ||
3 | * | ||
4 | * Copyright (C) 2006, Ondrej Zajicek <santiago@crfreenet.org> | ||
5 | * Copyright (C) 2008, Florian Fainelli <florian@openwrt.org> | ||
6 | * | ||
7 | * based on | ||
8 | * SoftDog 0.05: A Software Watchdog Device | ||
9 | * | ||
10 | * (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved. | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version | ||
15 | * 2 of the License, or (at your option) any later version. | ||
16 | * | ||
17 | */ | ||
18 | |||
19 | #include <linux/module.h> | ||
20 | #include <linux/types.h> | ||
21 | #include <linux/kernel.h> | ||
22 | #include <linux/fs.h> | ||
23 | #include <linux/mm.h> | ||
24 | #include <linux/miscdevice.h> | ||
25 | #include <linux/watchdog.h> | ||
26 | #include <linux/reboot.h> | ||
27 | #include <linux/smp_lock.h> | ||
28 | #include <linux/init.h> | ||
29 | #include <linux/platform_device.h> | ||
30 | #include <linux/uaccess.h> | ||
31 | |||
32 | #include <asm/bootinfo.h> | ||
33 | #include <asm/time.h> | ||
34 | #include <asm/mach-rc32434/integ.h> | ||
35 | |||
36 | #define MAX_TIMEOUT 20 | ||
37 | #define RC32434_WDT_INTERVAL (15 * HZ) | ||
38 | |||
39 | #define VERSION "0.2" | ||
40 | |||
41 | static struct { | ||
42 | struct completion stop; | ||
43 | int running; | ||
44 | struct timer_list timer; | ||
45 | int queue; | ||
46 | int default_ticks; | ||
47 | unsigned long inuse; | ||
48 | } rc32434_wdt_device; | ||
49 | |||
50 | static struct integ __iomem *wdt_reg; | ||
51 | static int ticks = 100 * HZ; | ||
52 | |||
53 | static int expect_close; | ||
54 | static int timeout; | ||
55 | |||
56 | static int nowayout = WATCHDOG_NOWAYOUT; | ||
57 | module_param(nowayout, int, 0); | ||
58 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | ||
59 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | ||
60 | |||
61 | |||
62 | static void rc32434_wdt_start(void) | ||
63 | { | ||
64 | u32 val; | ||
65 | |||
66 | if (!rc32434_wdt_device.inuse) { | ||
67 | writel(0, &wdt_reg->wtcount); | ||
68 | |||
69 | val = RC32434_ERR_WRE; | ||
70 | writel(readl(&wdt_reg->errcs) | val, &wdt_reg->errcs); | ||
71 | |||
72 | val = RC32434_WTC_EN; | ||
73 | writel(readl(&wdt_reg->wtc) | val, &wdt_reg->wtc); | ||
74 | } | ||
75 | rc32434_wdt_device.running++; | ||
76 | } | ||
77 | |||
78 | static void rc32434_wdt_stop(void) | ||
79 | { | ||
80 | u32 val; | ||
81 | |||
82 | if (rc32434_wdt_device.running) { | ||
83 | |||
84 | val = ~RC32434_WTC_EN; | ||
85 | writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc); | ||
86 | |||
87 | val = ~RC32434_ERR_WRE; | ||
88 | writel(readl(&wdt_reg->errcs) & val, &wdt_reg->errcs); | ||
89 | |||
90 | rc32434_wdt_device.running = 0; | ||
91 | } | ||
92 | } | ||
93 | |||
94 | static void rc32434_wdt_set(int new_timeout) | ||
95 | { | ||
96 | u32 cmp = new_timeout * HZ; | ||
97 | u32 state, val; | ||
98 | |||
99 | timeout = new_timeout; | ||
100 | /* | ||
101 | * store and disable WTC | ||
102 | */ | ||
103 | state = (u32)(readl(&wdt_reg->wtc) & RC32434_WTC_EN); | ||
104 | val = ~RC32434_WTC_EN; | ||
105 | writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc); | ||
106 | |||
107 | writel(0, &wdt_reg->wtcount); | ||
108 | writel(cmp, &wdt_reg->wtcompare); | ||
109 | |||
110 | /* | ||
111 | * restore WTC | ||
112 | */ | ||
113 | |||
114 | writel(readl(&wdt_reg->wtc) | state, &wdt_reg); | ||
115 | } | ||
116 | |||
117 | static void rc32434_wdt_reset(void) | ||
118 | { | ||
119 | ticks = rc32434_wdt_device.default_ticks; | ||
120 | } | ||
121 | |||
122 | static void rc32434_wdt_update(unsigned long unused) | ||
123 | { | ||
124 | if (rc32434_wdt_device.running) | ||
125 | ticks--; | ||
126 | |||
127 | writel(0, &wdt_reg->wtcount); | ||
128 | |||
129 | if (rc32434_wdt_device.queue && ticks) | ||
130 | mod_timer(&rc32434_wdt_device.timer, | ||
131 | jiffies + RC32434_WDT_INTERVAL); | ||
132 | else | ||
133 | complete(&rc32434_wdt_device.stop); | ||
134 | } | ||
135 | |||
136 | static int rc32434_wdt_open(struct inode *inode, struct file *file) | ||
137 | { | ||
138 | if (test_and_set_bit(0, &rc32434_wdt_device.inuse)) | ||
139 | return -EBUSY; | ||
140 | |||
141 | if (nowayout) | ||
142 | __module_get(THIS_MODULE); | ||
143 | |||
144 | return nonseekable_open(inode, file); | ||
145 | } | ||
146 | |||
147 | static int rc32434_wdt_release(struct inode *inode, struct file *file) | ||
148 | { | ||
149 | if (expect_close && nowayout == 0) { | ||
150 | rc32434_wdt_stop(); | ||
151 | printk(KERN_INFO KBUILD_MODNAME ": disabling watchdog timer\n"); | ||
152 | module_put(THIS_MODULE); | ||
153 | } else | ||
154 | printk(KERN_CRIT KBUILD_MODNAME | ||
155 | ": device closed unexpectedly. WDT will not stop !\n"); | ||
156 | |||
157 | clear_bit(0, &rc32434_wdt_device.inuse); | ||
158 | return 0; | ||
159 | } | ||
160 | |||
161 | static ssize_t rc32434_wdt_write(struct file *file, const char *data, | ||
162 | size_t len, loff_t *ppos) | ||
163 | { | ||
164 | if (len) { | ||
165 | if (!nowayout) { | ||
166 | size_t i; | ||
167 | |||
168 | /* In case it was set long ago */ | ||
169 | expect_close = 0; | ||
170 | |||
171 | for (i = 0; i != len; i++) { | ||
172 | char c; | ||
173 | if (get_user(c, data + i)) | ||
174 | return -EFAULT; | ||
175 | if (c == 'V') | ||
176 | expect_close = 1; | ||
177 | } | ||
178 | } | ||
179 | rc32434_wdt_update(0); | ||
180 | return len; | ||
181 | } | ||
182 | return 0; | ||
183 | } | ||
184 | |||
185 | static int rc32434_wdt_ioctl(struct inode *inode, struct file *file, | ||
186 | unsigned int cmd, unsigned long arg) | ||
187 | { | ||
188 | void __user *argp = (void __user *)arg; | ||
189 | int new_timeout; | ||
190 | unsigned int value; | ||
191 | static struct watchdog_info ident = { | ||
192 | .options = WDIOF_SETTIMEOUT | | ||
193 | WDIOF_KEEPALIVEPING | | ||
194 | WDIOF_MAGICCLOSE, | ||
195 | .identity = "RC32434_WDT Watchdog", | ||
196 | }; | ||
197 | switch (cmd) { | ||
198 | case WDIOC_KEEPALIVE: | ||
199 | rc32434_wdt_reset(); | ||
200 | break; | ||
201 | case WDIOC_GETSTATUS: | ||
202 | case WDIOC_GETBOOTSTATUS: | ||
203 | value = readl(&wdt_reg->wtcount); | ||
204 | if (copy_to_user(argp, &value, sizeof(int))) | ||
205 | return -EFAULT; | ||
206 | break; | ||
207 | case WDIOC_GETSUPPORT: | ||
208 | if (copy_to_user(argp, &ident, sizeof(ident))) | ||
209 | return -EFAULT; | ||
210 | break; | ||
211 | case WDIOC_SETOPTIONS: | ||
212 | if (copy_from_user(&value, argp, sizeof(int))) | ||
213 | return -EFAULT; | ||
214 | switch (value) { | ||
215 | case WDIOS_ENABLECARD: | ||
216 | rc32434_wdt_start(); | ||
217 | break; | ||
218 | case WDIOS_DISABLECARD: | ||
219 | rc32434_wdt_stop(); | ||
220 | default: | ||
221 | return -EINVAL; | ||
222 | } | ||
223 | break; | ||
224 | case WDIOC_SETTIMEOUT: | ||
225 | if (copy_from_user(&new_timeout, argp, sizeof(int))) | ||
226 | return -EFAULT; | ||
227 | if (new_timeout < 1) | ||
228 | return -EINVAL; | ||
229 | if (new_timeout > MAX_TIMEOUT) | ||
230 | return -EINVAL; | ||
231 | rc32434_wdt_set(new_timeout); | ||
232 | case WDIOC_GETTIMEOUT: | ||
233 | return copy_to_user(argp, &timeout, sizeof(int)); | ||
234 | default: | ||
235 | return -ENOTTY; | ||
236 | } | ||
237 | |||
238 | return 0; | ||
239 | } | ||
240 | |||
241 | static struct file_operations rc32434_wdt_fops = { | ||
242 | .owner = THIS_MODULE, | ||
243 | .llseek = no_llseek, | ||
244 | .write = rc32434_wdt_write, | ||
245 | .ioctl = rc32434_wdt_ioctl, | ||
246 | .open = rc32434_wdt_open, | ||
247 | .release = rc32434_wdt_release, | ||
248 | }; | ||
249 | |||
250 | static struct miscdevice rc32434_wdt_miscdev = { | ||
251 | .minor = WATCHDOG_MINOR, | ||
252 | .name = "watchdog", | ||
253 | .fops = &rc32434_wdt_fops, | ||
254 | }; | ||
255 | |||
256 | static char banner[] = KERN_INFO KBUILD_MODNAME | ||
257 | ": Watchdog Timer version " VERSION ", timer margin: %d sec\n"; | ||
258 | |||
259 | static int rc32434_wdt_probe(struct platform_device *pdev) | ||
260 | { | ||
261 | int ret; | ||
262 | struct resource *r; | ||
263 | |||
264 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb500_wdt_res"); | ||
265 | if (!r) { | ||
266 | printk(KERN_ERR KBUILD_MODNAME | ||
267 | "failed to retrieve resources\n"); | ||
268 | return -ENODEV; | ||
269 | } | ||
270 | |||
271 | wdt_reg = ioremap_nocache(r->start, r->end - r->start); | ||
272 | if (!wdt_reg) { | ||
273 | printk(KERN_ERR KBUILD_MODNAME | ||
274 | "failed to remap I/O resources\n"); | ||
275 | return -ENXIO; | ||
276 | } | ||
277 | |||
278 | ret = misc_register(&rc32434_wdt_miscdev); | ||
279 | |||
280 | if (ret < 0) { | ||
281 | printk(KERN_ERR KBUILD_MODNAME | ||
282 | "failed to register watchdog device\n"); | ||
283 | goto unmap; | ||
284 | } | ||
285 | |||
286 | init_completion(&rc32434_wdt_device.stop); | ||
287 | rc32434_wdt_device.queue = 0; | ||
288 | |||
289 | clear_bit(0, &rc32434_wdt_device.inuse); | ||
290 | |||
291 | setup_timer(&rc32434_wdt_device.timer, rc32434_wdt_update, 0L); | ||
292 | |||
293 | rc32434_wdt_device.default_ticks = ticks; | ||
294 | |||
295 | rc32434_wdt_start(); | ||
296 | |||
297 | printk(banner, timeout); | ||
298 | |||
299 | return 0; | ||
300 | |||
301 | unmap: | ||
302 | iounmap(wdt_reg); | ||
303 | return ret; | ||
304 | } | ||
305 | |||
306 | static int rc32434_wdt_remove(struct platform_device *pdev) | ||
307 | { | ||
308 | if (rc32434_wdt_device.queue) { | ||
309 | rc32434_wdt_device.queue = 0; | ||
310 | wait_for_completion(&rc32434_wdt_device.stop); | ||
311 | } | ||
312 | misc_deregister(&rc32434_wdt_miscdev); | ||
313 | |||
314 | iounmap(wdt_reg); | ||
315 | |||
316 | return 0; | ||
317 | } | ||
318 | |||
319 | static struct platform_driver rc32434_wdt = { | ||
320 | .probe = rc32434_wdt_probe, | ||
321 | .remove = rc32434_wdt_remove, | ||
322 | .driver = { | ||
323 | .name = "rc32434_wdt", | ||
324 | } | ||
325 | }; | ||
326 | |||
327 | static int __init rc32434_wdt_init(void) | ||
328 | { | ||
329 | return platform_driver_register(&rc32434_wdt); | ||
330 | } | ||
331 | |||
332 | static void __exit rc32434_wdt_exit(void) | ||
333 | { | ||
334 | platform_driver_unregister(&rc32434_wdt); | ||
335 | } | ||
336 | |||
337 | module_init(rc32434_wdt_init); | ||
338 | module_exit(rc32434_wdt_exit); | ||
339 | |||
340 | MODULE_AUTHOR("Ondrej Zajicek <santiago@crfreenet.org>," | ||
341 | "Florian Fainelli <florian@openwrt.org>"); | ||
342 | MODULE_DESCRIPTION("Driver for the IDT RC32434 SoC watchdog"); | ||
343 | MODULE_LICENSE("GPL"); | ||
344 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c new file mode 100644 index 000000000000..9108efa73e7d --- /dev/null +++ b/drivers/watchdog/rdc321x_wdt.c | |||
@@ -0,0 +1,285 @@ | |||
1 | /* | ||
2 | * RDC321x watchdog driver | ||
3 | * | ||
4 | * Copyright (C) 2007 Florian Fainelli <florian@openwrt.org> | ||
5 | * | ||
6 | * This driver is highly inspired from the cpu5_wdt driver | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
21 | * | ||
22 | */ | ||
23 | |||
24 | #include <linux/module.h> | ||
25 | #include <linux/moduleparam.h> | ||
26 | #include <linux/types.h> | ||
27 | #include <linux/errno.h> | ||
28 | #include <linux/miscdevice.h> | ||
29 | #include <linux/fs.h> | ||
30 | #include <linux/init.h> | ||
31 | #include <linux/ioport.h> | ||
32 | #include <linux/timer.h> | ||
33 | #include <linux/completion.h> | ||
34 | #include <linux/jiffies.h> | ||
35 | #include <linux/platform_device.h> | ||
36 | #include <linux/watchdog.h> | ||
37 | #include <linux/io.h> | ||
38 | #include <linux/uaccess.h> | ||
39 | |||
40 | #include <asm/mach-rdc321x/rdc321x_defs.h> | ||
41 | |||
42 | #define RDC_WDT_MASK 0x80000000 /* Mask */ | ||
43 | #define RDC_WDT_EN 0x00800000 /* Enable bit */ | ||
44 | #define RDC_WDT_WTI 0x00200000 /* Generate CPU reset/NMI/WDT on timeout */ | ||
45 | #define RDC_WDT_RST 0x00100000 /* Reset bit */ | ||
46 | #define RDC_WDT_WIF 0x00040000 /* WDT IRQ Flag */ | ||
47 | #define RDC_WDT_IRT 0x00000100 /* IRQ Routing table */ | ||
48 | #define RDC_WDT_CNT 0x00000001 /* WDT count */ | ||
49 | |||
50 | #define RDC_CLS_TMR 0x80003844 /* Clear timer */ | ||
51 | |||
52 | #define RDC_WDT_INTERVAL (HZ/10+1) | ||
53 | |||
54 | static int ticks = 1000; | ||
55 | |||
56 | /* some device data */ | ||
57 | |||
58 | static struct { | ||
59 | struct completion stop; | ||
60 | int running; | ||
61 | struct timer_list timer; | ||
62 | int queue; | ||
63 | int default_ticks; | ||
64 | unsigned long inuse; | ||
65 | spinlock_t lock; | ||
66 | } rdc321x_wdt_device; | ||
67 | |||
68 | /* generic helper functions */ | ||
69 | |||
70 | static void rdc321x_wdt_trigger(unsigned long unused) | ||
71 | { | ||
72 | unsigned long flags; | ||
73 | |||
74 | if (rdc321x_wdt_device.running) | ||
75 | ticks--; | ||
76 | |||
77 | /* keep watchdog alive */ | ||
78 | spin_lock_irqsave(&rdc321x_wdt_device.lock, flags); | ||
79 | outl(RDC_WDT_EN | inl(RDC3210_CFGREG_DATA), | ||
80 | RDC3210_CFGREG_DATA); | ||
81 | spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags); | ||
82 | |||
83 | /* requeue?? */ | ||
84 | if (rdc321x_wdt_device.queue && ticks) | ||
85 | mod_timer(&rdc321x_wdt_device.timer, | ||
86 | jiffies + RDC_WDT_INTERVAL); | ||
87 | else { | ||
88 | /* ticks doesn't matter anyway */ | ||
89 | complete(&rdc321x_wdt_device.stop); | ||
90 | } | ||
91 | |||
92 | } | ||
93 | |||
94 | static void rdc321x_wdt_reset(void) | ||
95 | { | ||
96 | ticks = rdc321x_wdt_device.default_ticks; | ||
97 | } | ||
98 | |||
99 | static void rdc321x_wdt_start(void) | ||
100 | { | ||
101 | unsigned long flags; | ||
102 | |||
103 | if (!rdc321x_wdt_device.queue) { | ||
104 | rdc321x_wdt_device.queue = 1; | ||
105 | |||
106 | /* Clear the timer */ | ||
107 | spin_lock_irqsave(&rdc321x_wdt_device.lock, flags); | ||
108 | outl(RDC_CLS_TMR, RDC3210_CFGREG_ADDR); | ||
109 | |||
110 | /* Enable watchdog and set the timeout to 81.92 us */ | ||
111 | outl(RDC_WDT_EN | RDC_WDT_CNT, RDC3210_CFGREG_DATA); | ||
112 | spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags); | ||
113 | |||
114 | mod_timer(&rdc321x_wdt_device.timer, | ||
115 | jiffies + RDC_WDT_INTERVAL); | ||
116 | } | ||
117 | |||
118 | /* if process dies, counter is not decremented */ | ||
119 | rdc321x_wdt_device.running++; | ||
120 | } | ||
121 | |||
122 | static int rdc321x_wdt_stop(void) | ||
123 | { | ||
124 | if (rdc321x_wdt_device.running) | ||
125 | rdc321x_wdt_device.running = 0; | ||
126 | |||
127 | ticks = rdc321x_wdt_device.default_ticks; | ||
128 | |||
129 | return -EIO; | ||
130 | } | ||
131 | |||
132 | /* filesystem operations */ | ||
133 | static int rdc321x_wdt_open(struct inode *inode, struct file *file) | ||
134 | { | ||
135 | if (test_and_set_bit(0, &rdc321x_wdt_device.inuse)) | ||
136 | return -EBUSY; | ||
137 | |||
138 | return nonseekable_open(inode, file); | ||
139 | } | ||
140 | |||
141 | static int rdc321x_wdt_release(struct inode *inode, struct file *file) | ||
142 | { | ||
143 | clear_bit(0, &rdc321x_wdt_device.inuse); | ||
144 | return 0; | ||
145 | } | ||
146 | |||
147 | static int rdc321x_wdt_ioctl(struct inode *inode, struct file *file, | ||
148 | unsigned int cmd, unsigned long arg) | ||
149 | { | ||
150 | void __user *argp = (void __user *)arg; | ||
151 | unsigned int value; | ||
152 | static struct watchdog_info ident = { | ||
153 | .options = WDIOF_CARDRESET, | ||
154 | .identity = "RDC321x WDT", | ||
155 | }; | ||
156 | unsigned long flags; | ||
157 | |||
158 | switch (cmd) { | ||
159 | case WDIOC_KEEPALIVE: | ||
160 | rdc321x_wdt_reset(); | ||
161 | break; | ||
162 | case WDIOC_GETSTATUS: | ||
163 | /* Read the value from the DATA register */ | ||
164 | spin_lock_irqsave(&rdc321x_wdt_device.lock, flags); | ||
165 | value = inl(RDC3210_CFGREG_DATA); | ||
166 | spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags); | ||
167 | if (copy_to_user(argp, &value, sizeof(int))) | ||
168 | return -EFAULT; | ||
169 | break; | ||
170 | case WDIOC_GETSUPPORT: | ||
171 | if (copy_to_user(argp, &ident, sizeof(ident))) | ||
172 | return -EFAULT; | ||
173 | break; | ||
174 | case WDIOC_SETOPTIONS: | ||
175 | if (copy_from_user(&value, argp, sizeof(int))) | ||
176 | return -EFAULT; | ||
177 | switch (value) { | ||
178 | case WDIOS_ENABLECARD: | ||
179 | rdc321x_wdt_start(); | ||
180 | break; | ||
181 | case WDIOS_DISABLECARD: | ||
182 | return rdc321x_wdt_stop(); | ||
183 | default: | ||
184 | return -EINVAL; | ||
185 | } | ||
186 | break; | ||
187 | default: | ||
188 | return -ENOTTY; | ||
189 | } | ||
190 | return 0; | ||
191 | } | ||
192 | |||
193 | static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf, | ||
194 | size_t count, loff_t *ppos) | ||
195 | { | ||
196 | if (!count) | ||
197 | return -EIO; | ||
198 | |||
199 | rdc321x_wdt_reset(); | ||
200 | |||
201 | return count; | ||
202 | } | ||
203 | |||
204 | static const struct file_operations rdc321x_wdt_fops = { | ||
205 | .owner = THIS_MODULE, | ||
206 | .llseek = no_llseek, | ||
207 | .ioctl = rdc321x_wdt_ioctl, | ||
208 | .open = rdc321x_wdt_open, | ||
209 | .write = rdc321x_wdt_write, | ||
210 | .release = rdc321x_wdt_release, | ||
211 | }; | ||
212 | |||
213 | static struct miscdevice rdc321x_wdt_misc = { | ||
214 | .minor = WATCHDOG_MINOR, | ||
215 | .name = "watchdog", | ||
216 | .fops = &rdc321x_wdt_fops, | ||
217 | }; | ||
218 | |||
219 | static int __devinit rdc321x_wdt_probe(struct platform_device *pdev) | ||
220 | { | ||
221 | int err; | ||
222 | |||
223 | err = misc_register(&rdc321x_wdt_misc); | ||
224 | if (err < 0) { | ||
225 | printk(KERN_ERR PFX "watchdog misc_register failed\n"); | ||
226 | return err; | ||
227 | } | ||
228 | |||
229 | spin_lock_init(&rdc321x_wdt_device.lock); | ||
230 | |||
231 | /* Reset the watchdog */ | ||
232 | outl(RDC_WDT_RST, RDC3210_CFGREG_DATA); | ||
233 | |||
234 | init_completion(&rdc321x_wdt_device.stop); | ||
235 | rdc321x_wdt_device.queue = 0; | ||
236 | |||
237 | clear_bit(0, &rdc321x_wdt_device.inuse); | ||
238 | |||
239 | setup_timer(&rdc321x_wdt_device.timer, rdc321x_wdt_trigger, 0); | ||
240 | |||
241 | rdc321x_wdt_device.default_ticks = ticks; | ||
242 | |||
243 | printk(KERN_INFO PFX "watchdog init success\n"); | ||
244 | |||
245 | return 0; | ||
246 | } | ||
247 | |||
248 | static int rdc321x_wdt_remove(struct platform_device *pdev) | ||
249 | { | ||
250 | if (rdc321x_wdt_device.queue) { | ||
251 | rdc321x_wdt_device.queue = 0; | ||
252 | wait_for_completion(&rdc321x_wdt_device.stop); | ||
253 | } | ||
254 | |||
255 | misc_deregister(&rdc321x_wdt_misc); | ||
256 | |||
257 | return 0; | ||
258 | } | ||
259 | |||
260 | static struct platform_driver rdc321x_wdt_driver = { | ||
261 | .probe = rdc321x_wdt_probe, | ||
262 | .remove = rdc321x_wdt_remove, | ||
263 | .driver = { | ||
264 | .owner = THIS_MODULE, | ||
265 | .name = "rdc321x-wdt", | ||
266 | }, | ||
267 | }; | ||
268 | |||
269 | static int __init rdc321x_wdt_init(void) | ||
270 | { | ||
271 | return platform_driver_register(&rdc321x_wdt_driver); | ||
272 | } | ||
273 | |||
274 | static void __exit rdc321x_wdt_exit(void) | ||
275 | { | ||
276 | platform_driver_unregister(&rdc321x_wdt_driver); | ||
277 | } | ||
278 | |||
279 | module_init(rdc321x_wdt_init); | ||
280 | module_exit(rdc321x_wdt_exit); | ||
281 | |||
282 | MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); | ||
283 | MODULE_DESCRIPTION("RDC321x watchdog driver"); | ||
284 | MODULE_LICENSE("GPL"); | ||
285 | MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); | ||
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 22715e3be5e7..86d42801de45 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
@@ -21,18 +21,6 @@ | |||
21 | * You should have received a copy of the GNU General Public License | 21 | * You should have received a copy of the GNU General Public License |
22 | * along with this program; if not, write to the Free Software | 22 | * along with this program; if not, write to the Free Software |
23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
24 | * | ||
25 | * Changelog: | ||
26 | * 05-Oct-2004 BJD Added semaphore init to stop crashes on open | ||
27 | * Fixed tmr_count / wdt_count confusion | ||
28 | * Added configurable debug | ||
29 | * | ||
30 | * 11-Jan-2005 BJD Fixed divide-by-2 in timeout code | ||
31 | * | ||
32 | * 25-Jan-2005 DA Added suspend/resume support | ||
33 | * Replaced reboot notifier with .shutdown method | ||
34 | * | ||
35 | * 10-Mar-2005 LCVR Changed S3C2410_VA to S3C24XX_VA | ||
36 | */ | 24 | */ |
37 | 25 | ||
38 | #include <linux/module.h> | 26 | #include <linux/module.h> |
@@ -365,7 +353,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev) | |||
365 | return -ENOENT; | 353 | return -ENOENT; |
366 | } | 354 | } |
367 | 355 | ||
368 | size = (res->end-res->start)+1; | 356 | size = (res->end - res->start) + 1; |
369 | wdt_mem = request_mem_region(res->start, size, pdev->name); | 357 | wdt_mem = request_mem_region(res->start, size, pdev->name); |
370 | if (wdt_mem == NULL) { | 358 | if (wdt_mem == NULL) { |
371 | dev_err(dev, "failed to get memory region\n"); | 359 | dev_err(dev, "failed to get memory region\n"); |
@@ -374,7 +362,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev) | |||
374 | } | 362 | } |
375 | 363 | ||
376 | wdt_base = ioremap(res->start, size); | 364 | wdt_base = ioremap(res->start, size); |
377 | if (wdt_base == 0) { | 365 | if (wdt_base == NULL) { |
378 | dev_err(dev, "failed to ioremap() region\n"); | 366 | dev_err(dev, "failed to ioremap() region\n"); |
379 | ret = -EINVAL; | 367 | ret = -EINVAL; |
380 | goto err_req; | 368 | goto err_req; |
diff --git a/firmware/Makefile b/firmware/Makefile index 9fe86041f86e..da75a6fbc6ba 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -146,15 +146,27 @@ $(patsubst %,$(obj)/%.gen.o, $(fw-external-y)): $(obj)/%.gen.o: $(fwdir)/% | |||
146 | $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %) | 146 | $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %) |
147 | $(call cmd,ihex) | 147 | $(call cmd,ihex) |
148 | 148 | ||
149 | # Don't depend on ihex2fw if we're installing and it already exists. | ||
150 | # Putting it after | in the dependencies doesn't seem sufficient when | ||
151 | # we're installing after a cross-compile, because ihex2fw has dependencies | ||
152 | # on stuff like /usr/lib/gcc/ppc64-redhat-linux/4.3.0/include/stddef.h and | ||
153 | # thus wants to be rebuilt. Which it can't be, if the prebuilt kernel tree | ||
154 | # is exported read-only for someone to run 'make install'. | ||
155 | ifeq ($(INSTALL):$(wildcard $(obj)/ihex2fw),install:$(obj)/ihex2fw) | ||
156 | ihex2fw_dep := | ||
157 | else | ||
158 | ihex2fw_dep := $(obj)/ihex2fw | ||
159 | endif | ||
160 | |||
149 | # .HEX is also Intel HEX, but where the offset and length in each record | 161 | # .HEX is also Intel HEX, but where the offset and length in each record |
150 | # is actually meaningful, because the firmware has to be loaded in a certain | 162 | # is actually meaningful, because the firmware has to be loaded in a certain |
151 | # order rather than as a single binary blob. Thus, we convert them into our | 163 | # order rather than as a single binary blob. Thus, we convert them into our |
152 | # more compact binary representation of ihex records (<linux/ihex.h>) | 164 | # more compact binary representation of ihex records (<linux/ihex.h>) |
153 | $(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %) | 165 | $(obj)/%.fw: $(obj)/%.HEX $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %) |
154 | $(call cmd,ihex2fw) | 166 | $(call cmd,ihex2fw) |
155 | 167 | ||
156 | # .H16 is our own modified form of Intel HEX, with 16-bit length for records. | 168 | # .H16 is our own modified form of Intel HEX, with 16-bit length for records. |
157 | $(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %) | 169 | $(obj)/%.fw: $(obj)/%.H16 $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %) |
158 | $(call cmd,h16tofw) | 170 | $(call cmd,h16tofw) |
159 | 171 | ||
160 | $(firmware-dirs): | 172 | $(firmware-dirs): |
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c index 88e3787c6ea9..e298fe194093 100644 --- a/fs/9p/vfs_dir.c +++ b/fs/9p/vfs_dir.c | |||
@@ -119,6 +119,7 @@ int v9fs_dir_release(struct inode *inode, struct file *filp) | |||
119 | 119 | ||
120 | const struct file_operations v9fs_dir_operations = { | 120 | const struct file_operations v9fs_dir_operations = { |
121 | .read = generic_read_dir, | 121 | .read = generic_read_dir, |
122 | .llseek = generic_file_llseek, | ||
122 | .readdir = v9fs_dir_readdir, | 123 | .readdir = v9fs_dir_readdir, |
123 | .open = v9fs_file_open, | 124 | .open = v9fs_file_open, |
124 | .release = v9fs_dir_release, | 125 | .release = v9fs_dir_release, |
diff --git a/fs/Kconfig b/fs/Kconfig index d3873583360b..abccb5dab9a8 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -1930,6 +1930,16 @@ config CIFS_WEAK_PW_HASH | |||
1930 | 1930 | ||
1931 | If unsure, say N. | 1931 | If unsure, say N. |
1932 | 1932 | ||
1933 | config CIFS_UPCALL | ||
1934 | bool "Kerberos/SPNEGO advanced session setup" | ||
1935 | depends on CIFS && KEYS | ||
1936 | help | ||
1937 | Enables an upcall mechanism for CIFS which accesses | ||
1938 | userspace helper utilities to provide SPNEGO packaged (RFC 4178) | ||
1939 | Kerberos tickets which are needed to mount to certain secure servers | ||
1940 | (for which more secure Kerberos authentication is required). If | ||
1941 | unsure, say N. | ||
1942 | |||
1933 | config CIFS_XATTR | 1943 | config CIFS_XATTR |
1934 | bool "CIFS extended attributes" | 1944 | bool "CIFS extended attributes" |
1935 | depends on CIFS | 1945 | depends on CIFS |
@@ -1982,17 +1992,6 @@ config CIFS_EXPERIMENTAL | |||
1982 | (which is disabled by default). See the file fs/cifs/README | 1992 | (which is disabled by default). See the file fs/cifs/README |
1983 | for more details. If unsure, say N. | 1993 | for more details. If unsure, say N. |
1984 | 1994 | ||
1985 | config CIFS_UPCALL | ||
1986 | bool "Kerberos/SPNEGO advanced session setup (EXPERIMENTAL)" | ||
1987 | depends on CIFS_EXPERIMENTAL | ||
1988 | depends on KEYS | ||
1989 | help | ||
1990 | Enables an upcall mechanism for CIFS which accesses | ||
1991 | userspace helper utilities to provide SPNEGO packaged (RFC 4178) | ||
1992 | Kerberos tickets which are needed to mount to certain secure servers | ||
1993 | (for which more secure Kerberos authentication is required). If | ||
1994 | unsure, say N. | ||
1995 | |||
1996 | config CIFS_DFS_UPCALL | 1995 | config CIFS_DFS_UPCALL |
1997 | bool "DFS feature support (EXPERIMENTAL)" | 1996 | bool "DFS feature support (EXPERIMENTAL)" |
1998 | depends on CIFS_EXPERIMENTAL | 1997 | depends on CIFS_EXPERIMENTAL |
diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c index fc1a8dc64d78..85a30e929800 100644 --- a/fs/adfs/dir.c +++ b/fs/adfs/dir.c | |||
@@ -197,6 +197,7 @@ out: | |||
197 | 197 | ||
198 | const struct file_operations adfs_dir_operations = { | 198 | const struct file_operations adfs_dir_operations = { |
199 | .read = generic_read_dir, | 199 | .read = generic_read_dir, |
200 | .llseek = generic_file_llseek, | ||
200 | .readdir = adfs_readdir, | 201 | .readdir = adfs_readdir, |
201 | .fsync = file_fsync, | 202 | .fsync = file_fsync, |
202 | }; | 203 | }; |
diff --git a/fs/affs/dir.c b/fs/affs/dir.c index 6e3f282424b0..7b36904dbeac 100644 --- a/fs/affs/dir.c +++ b/fs/affs/dir.c | |||
@@ -19,6 +19,7 @@ static int affs_readdir(struct file *, void *, filldir_t); | |||
19 | 19 | ||
20 | const struct file_operations affs_dir_operations = { | 20 | const struct file_operations affs_dir_operations = { |
21 | .read = generic_read_dir, | 21 | .read = generic_read_dir, |
22 | .llseek = generic_file_llseek, | ||
22 | .readdir = affs_readdir, | 23 | .readdir = affs_readdir, |
23 | .fsync = file_fsync, | 24 | .fsync = file_fsync, |
24 | }; | 25 | }; |
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c index bcfb2dc0a61b..2a41c2a7fc52 100644 --- a/fs/autofs4/root.c +++ b/fs/autofs4/root.c | |||
@@ -36,6 +36,7 @@ const struct file_operations autofs4_root_operations = { | |||
36 | .release = dcache_dir_close, | 36 | .release = dcache_dir_close, |
37 | .read = generic_read_dir, | 37 | .read = generic_read_dir, |
38 | .readdir = dcache_readdir, | 38 | .readdir = dcache_readdir, |
39 | .llseek = dcache_dir_lseek, | ||
39 | .ioctl = autofs4_root_ioctl, | 40 | .ioctl = autofs4_root_ioctl, |
40 | }; | 41 | }; |
41 | 42 | ||
@@ -44,6 +45,7 @@ const struct file_operations autofs4_dir_operations = { | |||
44 | .release = dcache_dir_close, | 45 | .release = dcache_dir_close, |
45 | .read = generic_read_dir, | 46 | .read = generic_read_dir, |
46 | .readdir = dcache_readdir, | 47 | .readdir = dcache_readdir, |
48 | .llseek = dcache_dir_lseek, | ||
47 | }; | 49 | }; |
48 | 50 | ||
49 | const struct inode_operations autofs4_indirect_root_inode_operations = { | 51 | const struct inode_operations autofs4_indirect_root_inode_operations = { |
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 02c6e62b72f8..740f53672a8a 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
@@ -66,6 +66,7 @@ static struct kmem_cache *befs_inode_cachep; | |||
66 | static const struct file_operations befs_dir_operations = { | 66 | static const struct file_operations befs_dir_operations = { |
67 | .read = generic_read_dir, | 67 | .read = generic_read_dir, |
68 | .readdir = befs_readdir, | 68 | .readdir = befs_readdir, |
69 | .llseek = generic_file_llseek, | ||
69 | }; | 70 | }; |
70 | 71 | ||
71 | static const struct inode_operations befs_dir_inode_operations = { | 72 | static const struct inode_operations befs_dir_inode_operations = { |
@@ -469,20 +469,21 @@ static void bio_free_map_data(struct bio_map_data *bmd) | |||
469 | kfree(bmd); | 469 | kfree(bmd); |
470 | } | 470 | } |
471 | 471 | ||
472 | static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count) | 472 | static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count, |
473 | gfp_t gfp_mask) | ||
473 | { | 474 | { |
474 | struct bio_map_data *bmd = kmalloc(sizeof(*bmd), GFP_KERNEL); | 475 | struct bio_map_data *bmd = kmalloc(sizeof(*bmd), gfp_mask); |
475 | 476 | ||
476 | if (!bmd) | 477 | if (!bmd) |
477 | return NULL; | 478 | return NULL; |
478 | 479 | ||
479 | bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, GFP_KERNEL); | 480 | bmd->iovecs = kmalloc(sizeof(struct bio_vec) * nr_segs, gfp_mask); |
480 | if (!bmd->iovecs) { | 481 | if (!bmd->iovecs) { |
481 | kfree(bmd); | 482 | kfree(bmd); |
482 | return NULL; | 483 | return NULL; |
483 | } | 484 | } |
484 | 485 | ||
485 | bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, GFP_KERNEL); | 486 | bmd->sgvecs = kmalloc(sizeof(struct sg_iovec) * iov_count, gfp_mask); |
486 | if (bmd->sgvecs) | 487 | if (bmd->sgvecs) |
487 | return bmd; | 488 | return bmd; |
488 | 489 | ||
@@ -491,8 +492,8 @@ static struct bio_map_data *bio_alloc_map_data(int nr_segs, int iov_count) | |||
491 | return NULL; | 492 | return NULL; |
492 | } | 493 | } |
493 | 494 | ||
494 | static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count, | 495 | static int __bio_copy_iov(struct bio *bio, struct bio_vec *iovecs, |
495 | int uncopy) | 496 | struct sg_iovec *iov, int iov_count, int uncopy) |
496 | { | 497 | { |
497 | int ret = 0, i; | 498 | int ret = 0, i; |
498 | struct bio_vec *bvec; | 499 | struct bio_vec *bvec; |
@@ -502,7 +503,7 @@ static int __bio_copy_iov(struct bio *bio, struct sg_iovec *iov, int iov_count, | |||
502 | 503 | ||
503 | __bio_for_each_segment(bvec, bio, i, 0) { | 504 | __bio_for_each_segment(bvec, bio, i, 0) { |
504 | char *bv_addr = page_address(bvec->bv_page); | 505 | char *bv_addr = page_address(bvec->bv_page); |
505 | unsigned int bv_len = bvec->bv_len; | 506 | unsigned int bv_len = iovecs[i].bv_len; |
506 | 507 | ||
507 | while (bv_len && iov_idx < iov_count) { | 508 | while (bv_len && iov_idx < iov_count) { |
508 | unsigned int bytes; | 509 | unsigned int bytes; |
@@ -554,7 +555,7 @@ int bio_uncopy_user(struct bio *bio) | |||
554 | struct bio_map_data *bmd = bio->bi_private; | 555 | struct bio_map_data *bmd = bio->bi_private; |
555 | int ret; | 556 | int ret; |
556 | 557 | ||
557 | ret = __bio_copy_iov(bio, bmd->sgvecs, bmd->nr_sgvecs, 1); | 558 | ret = __bio_copy_iov(bio, bmd->iovecs, bmd->sgvecs, bmd->nr_sgvecs, 1); |
558 | 559 | ||
559 | bio_free_map_data(bmd); | 560 | bio_free_map_data(bmd); |
560 | bio_put(bio); | 561 | bio_put(bio); |
@@ -596,7 +597,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov, | |||
596 | len += iov[i].iov_len; | 597 | len += iov[i].iov_len; |
597 | } | 598 | } |
598 | 599 | ||
599 | bmd = bio_alloc_map_data(nr_pages, iov_count); | 600 | bmd = bio_alloc_map_data(nr_pages, iov_count, GFP_KERNEL); |
600 | if (!bmd) | 601 | if (!bmd) |
601 | return ERR_PTR(-ENOMEM); | 602 | return ERR_PTR(-ENOMEM); |
602 | 603 | ||
@@ -633,7 +634,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, struct sg_iovec *iov, | |||
633 | * success | 634 | * success |
634 | */ | 635 | */ |
635 | if (!write_to_vm) { | 636 | if (!write_to_vm) { |
636 | ret = __bio_copy_iov(bio, iov, iov_count, 0); | 637 | ret = __bio_copy_iov(bio, bio->bi_io_vec, iov, iov_count, 0); |
637 | if (ret) | 638 | if (ret) |
638 | goto cleanup; | 639 | goto cleanup; |
639 | } | 640 | } |
@@ -942,19 +943,22 @@ static void bio_copy_kern_endio(struct bio *bio, int err) | |||
942 | { | 943 | { |
943 | struct bio_vec *bvec; | 944 | struct bio_vec *bvec; |
944 | const int read = bio_data_dir(bio) == READ; | 945 | const int read = bio_data_dir(bio) == READ; |
945 | char *p = bio->bi_private; | 946 | struct bio_map_data *bmd = bio->bi_private; |
946 | int i; | 947 | int i; |
948 | char *p = bmd->sgvecs[0].iov_base; | ||
947 | 949 | ||
948 | __bio_for_each_segment(bvec, bio, i, 0) { | 950 | __bio_for_each_segment(bvec, bio, i, 0) { |
949 | char *addr = page_address(bvec->bv_page); | 951 | char *addr = page_address(bvec->bv_page); |
952 | int len = bmd->iovecs[i].bv_len; | ||
950 | 953 | ||
951 | if (read && !err) | 954 | if (read && !err) |
952 | memcpy(p, addr, bvec->bv_len); | 955 | memcpy(p, addr, len); |
953 | 956 | ||
954 | __free_page(bvec->bv_page); | 957 | __free_page(bvec->bv_page); |
955 | p += bvec->bv_len; | 958 | p += len; |
956 | } | 959 | } |
957 | 960 | ||
961 | bio_free_map_data(bmd); | ||
958 | bio_put(bio); | 962 | bio_put(bio); |
959 | } | 963 | } |
960 | 964 | ||
@@ -978,11 +982,21 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, | |||
978 | const int nr_pages = end - start; | 982 | const int nr_pages = end - start; |
979 | struct bio *bio; | 983 | struct bio *bio; |
980 | struct bio_vec *bvec; | 984 | struct bio_vec *bvec; |
985 | struct bio_map_data *bmd; | ||
981 | int i, ret; | 986 | int i, ret; |
987 | struct sg_iovec iov; | ||
988 | |||
989 | iov.iov_base = data; | ||
990 | iov.iov_len = len; | ||
991 | |||
992 | bmd = bio_alloc_map_data(nr_pages, 1, gfp_mask); | ||
993 | if (!bmd) | ||
994 | return ERR_PTR(-ENOMEM); | ||
982 | 995 | ||
996 | ret = -ENOMEM; | ||
983 | bio = bio_alloc(gfp_mask, nr_pages); | 997 | bio = bio_alloc(gfp_mask, nr_pages); |
984 | if (!bio) | 998 | if (!bio) |
985 | return ERR_PTR(-ENOMEM); | 999 | goto out_bmd; |
986 | 1000 | ||
987 | while (len) { | 1001 | while (len) { |
988 | struct page *page; | 1002 | struct page *page; |
@@ -1016,14 +1030,18 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, | |||
1016 | } | 1030 | } |
1017 | } | 1031 | } |
1018 | 1032 | ||
1019 | bio->bi_private = data; | 1033 | bio->bi_private = bmd; |
1020 | bio->bi_end_io = bio_copy_kern_endio; | 1034 | bio->bi_end_io = bio_copy_kern_endio; |
1035 | |||
1036 | bio_set_map_data(bmd, bio, &iov, 1); | ||
1021 | return bio; | 1037 | return bio; |
1022 | cleanup: | 1038 | cleanup: |
1023 | bio_for_each_segment(bvec, bio, i) | 1039 | bio_for_each_segment(bvec, bio, i) |
1024 | __free_page(bvec->bv_page); | 1040 | __free_page(bvec->bv_page); |
1025 | 1041 | ||
1026 | bio_put(bio); | 1042 | bio_put(bio); |
1043 | out_bmd: | ||
1044 | bio_free_map_data(bmd); | ||
1027 | 1045 | ||
1028 | return ERR_PTR(ret); | 1046 | return ERR_PTR(ret); |
1029 | } | 1047 | } |
diff --git a/fs/buffer.c b/fs/buffer.c index 38653e36e225..ac78d4c19b3b 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -2926,14 +2926,17 @@ int submit_bh(int rw, struct buffer_head * bh) | |||
2926 | BUG_ON(!buffer_mapped(bh)); | 2926 | BUG_ON(!buffer_mapped(bh)); |
2927 | BUG_ON(!bh->b_end_io); | 2927 | BUG_ON(!bh->b_end_io); |
2928 | 2928 | ||
2929 | if (buffer_ordered(bh) && (rw == WRITE)) | 2929 | /* |
2930 | rw = WRITE_BARRIER; | 2930 | * Mask in barrier bit for a write (could be either a WRITE or a |
2931 | * WRITE_SYNC | ||
2932 | */ | ||
2933 | if (buffer_ordered(bh) && (rw & WRITE)) | ||
2934 | rw |= WRITE_BARRIER; | ||
2931 | 2935 | ||
2932 | /* | 2936 | /* |
2933 | * Only clear out a write error when rewriting, should this | 2937 | * Only clear out a write error when rewriting |
2934 | * include WRITE_SYNC as well? | ||
2935 | */ | 2938 | */ |
2936 | if (test_set_buffer_req(bh) && (rw == WRITE || rw == WRITE_BARRIER)) | 2939 | if (test_set_buffer_req(bh) && (rw & WRITE)) |
2937 | clear_buffer_write_io_error(bh); | 2940 | clear_buffer_write_io_error(bh); |
2938 | 2941 | ||
2939 | /* | 2942 | /* |
diff --git a/fs/cifs/CHANGES b/fs/cifs/CHANGES index f5d0083e09fa..06e521a945c3 100644 --- a/fs/cifs/CHANGES +++ b/fs/cifs/CHANGES | |||
@@ -4,7 +4,15 @@ Fix premature write failure on congested networks (we would give up | |||
4 | on EAGAIN from the socket too quickly on large writes). | 4 | on EAGAIN from the socket too quickly on large writes). |
5 | Cifs_mkdir and cifs_create now respect the setgid bit on parent dir. | 5 | Cifs_mkdir and cifs_create now respect the setgid bit on parent dir. |
6 | Fix endian problems in acl (mode from/to cifs acl) on bigendian | 6 | Fix endian problems in acl (mode from/to cifs acl) on bigendian |
7 | architectures. | 7 | architectures. Fix problems with preserving timestamps on copying open |
8 | files (e.g. "cp -a") to Windows servers. For mkdir and create honor setgid bit | ||
9 | on parent directory when server supports Unix Extensions but not POSIX | ||
10 | create. Update cifs.upcall version to handle new Kerberos sec flags | ||
11 | (this requires update of cifs.upcall program from Samba). Fix memory leak | ||
12 | on dns_upcall (resolving DFS referralls). Fix plain text password | ||
13 | authentication (requires setting SecurityFlags to 0x30030 to enable | ||
14 | lanman and plain text though). Fix writes to be at correct offset when | ||
15 | file is open with O_APPEND and file is on a directio (forcediretio) mount. | ||
8 | 16 | ||
9 | Version 1.53 | 17 | Version 1.53 |
10 | ------------ | 18 | ------------ |
diff --git a/fs/cifs/README b/fs/cifs/README index 2bd6fe556f88..bd2343d4c6a6 100644 --- a/fs/cifs/README +++ b/fs/cifs/README | |||
@@ -542,10 +542,20 @@ SecurityFlags Flags which control security negotiation and | |||
542 | hashing mechanisms (as "must use") on the other hand | 542 | hashing mechanisms (as "must use") on the other hand |
543 | does not make much sense. Default flags are | 543 | does not make much sense. Default flags are |
544 | 0x07007 | 544 | 0x07007 |
545 | (NTLM, NTLMv2 and packet signing allowed). Maximum | 545 | (NTLM, NTLMv2 and packet signing allowed). The maximum |
546 | allowable flags if you want to allow mounts to servers | 546 | allowable flags if you want to allow mounts to servers |
547 | using weaker password hashes is 0x37037 (lanman, | 547 | using weaker password hashes is 0x37037 (lanman, |
548 | plaintext, ntlm, ntlmv2, signing allowed): | 548 | plaintext, ntlm, ntlmv2, signing allowed). Some |
549 | SecurityFlags require the corresponding menuconfig | ||
550 | options to be enabled (lanman and plaintext require | ||
551 | CONFIG_CIFS_WEAK_PW_HASH for example). Enabling | ||
552 | plaintext authentication currently requires also | ||
553 | enabling lanman authentication in the security flags | ||
554 | because the cifs module only supports sending | ||
555 | laintext passwords using the older lanman dialect | ||
556 | form of the session setup SMB. (e.g. for authentication | ||
557 | using plain text passwords, set the SecurityFlags | ||
558 | to 0x30030): | ||
549 | 559 | ||
550 | may use packet signing 0x00001 | 560 | may use packet signing 0x00001 |
551 | must use packet signing 0x01001 | 561 | must use packet signing 0x01001 |
@@ -642,8 +652,30 @@ The statistics for the number of total SMBs and oplock breaks are different in | |||
642 | that they represent all for that share, not just those for which the server | 652 | that they represent all for that share, not just those for which the server |
643 | returned success. | 653 | returned success. |
644 | 654 | ||
645 | Also note that "cat /proc/fs/cifs/DebugData" will display information about | 655 | Also note that "cat /proc/fs/cifs/DebugData" will display information about |
646 | the active sessions and the shares that are mounted. | 656 | the active sessions and the shares that are mounted. |
647 | Enabling Kerberos (extended security) works when CONFIG_CIFS_EXPERIMENTAL is | 657 | |
648 | on but requires a user space helper (from the Samba project). NTLM and NTLMv2 and | 658 | Enabling Kerberos (extended security) works but requires version 1.2 or later |
649 | LANMAN support do not require this helper. | 659 | of the helper program cifs.upcall to be present and to be configured in the |
660 | /etc/request-key.conf file. The cifs.upcall helper program is from the Samba | ||
661 | project(http://www.samba.org). NTLM and NTLMv2 and LANMAN support do not | ||
662 | require this helper. Note that NTLMv2 security (which does not require the | ||
663 | cifs.upcall helper program), instead of using Kerberos, is sufficient for | ||
664 | some use cases. | ||
665 | |||
666 | Enabling DFS support (used to access shares transparently in an MS-DFS | ||
667 | global name space) requires that CONFIG_CIFS_EXPERIMENTAL be enabled. In | ||
668 | addition, DFS support for target shares which are specified as UNC | ||
669 | names which begin with host names (rather than IP addresses) requires | ||
670 | a user space helper (such as cifs.upcall) to be present in order to | ||
671 | translate host names to ip address, and the user space helper must also | ||
672 | be configured in the file /etc/request-key.conf | ||
673 | |||
674 | To use cifs Kerberos and DFS support, the Linux keyutils package should be | ||
675 | installed and something like the following lines should be added to the | ||
676 | /etc/request-key.conf file: | ||
677 | |||
678 | create cifs.spnego * * /usr/local/sbin/cifs.upcall %k | ||
679 | create dns_resolver * * /usr/local/sbin/cifs.upcall %k | ||
680 | |||
681 | |||
diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c index 5fabd2caf93c..1b09f1670061 100644 --- a/fs/cifs/asn1.c +++ b/fs/cifs/asn1.c | |||
@@ -476,6 +476,7 @@ decode_negTokenInit(unsigned char *security_blob, int length, | |||
476 | unsigned int cls, con, tag, oidlen, rc; | 476 | unsigned int cls, con, tag, oidlen, rc; |
477 | bool use_ntlmssp = false; | 477 | bool use_ntlmssp = false; |
478 | bool use_kerberos = false; | 478 | bool use_kerberos = false; |
479 | bool use_mskerberos = false; | ||
479 | 480 | ||
480 | *secType = NTLM; /* BB eventually make Kerberos or NLTMSSP the default*/ | 481 | *secType = NTLM; /* BB eventually make Kerberos or NLTMSSP the default*/ |
481 | 482 | ||
@@ -574,10 +575,12 @@ decode_negTokenInit(unsigned char *security_blob, int length, | |||
574 | *(oid + 1), *(oid + 2), *(oid + 3))); | 575 | *(oid + 1), *(oid + 2), *(oid + 3))); |
575 | 576 | ||
576 | if (compare_oid(oid, oidlen, MSKRB5_OID, | 577 | if (compare_oid(oid, oidlen, MSKRB5_OID, |
577 | MSKRB5_OID_LEN)) | 578 | MSKRB5_OID_LEN) && |
578 | use_kerberos = true; | 579 | !use_kerberos) |
580 | use_mskerberos = true; | ||
579 | else if (compare_oid(oid, oidlen, KRB5_OID, | 581 | else if (compare_oid(oid, oidlen, KRB5_OID, |
580 | KRB5_OID_LEN)) | 582 | KRB5_OID_LEN) && |
583 | !use_mskerberos) | ||
581 | use_kerberos = true; | 584 | use_kerberos = true; |
582 | else if (compare_oid(oid, oidlen, NTLMSSP_OID, | 585 | else if (compare_oid(oid, oidlen, NTLMSSP_OID, |
583 | NTLMSSP_OID_LEN)) | 586 | NTLMSSP_OID_LEN)) |
@@ -630,6 +633,8 @@ decode_negTokenInit(unsigned char *security_blob, int length, | |||
630 | 633 | ||
631 | if (use_kerberos) | 634 | if (use_kerberos) |
632 | *secType = Kerberos; | 635 | *secType = Kerberos; |
636 | else if (use_mskerberos) | ||
637 | *secType = MSKerberos; | ||
633 | else if (use_ntlmssp) | 638 | else if (use_ntlmssp) |
634 | *secType = NTLMSSP; | 639 | *secType = NTLMSSP; |
635 | 640 | ||
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c index 2434ab0e8791..117ef4bba68e 100644 --- a/fs/cifs/cifs_spnego.c +++ b/fs/cifs/cifs_spnego.c | |||
@@ -114,9 +114,11 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo) | |||
114 | 114 | ||
115 | dp = description + strlen(description); | 115 | dp = description + strlen(description); |
116 | 116 | ||
117 | /* for now, only sec=krb5 is valid */ | 117 | /* for now, only sec=krb5 and sec=mskrb5 are valid */ |
118 | if (server->secType == Kerberos) | 118 | if (server->secType == Kerberos) |
119 | sprintf(dp, ";sec=krb5"); | 119 | sprintf(dp, ";sec=krb5"); |
120 | else if (server->secType == MSKerberos) | ||
121 | sprintf(dp, ";sec=mskrb5"); | ||
120 | else | 122 | else |
121 | goto out; | 123 | goto out; |
122 | 124 | ||
diff --git a/fs/cifs/cifs_spnego.h b/fs/cifs/cifs_spnego.h index 05a34b17a1ab..e4041ec4d712 100644 --- a/fs/cifs/cifs_spnego.h +++ b/fs/cifs/cifs_spnego.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #ifndef _CIFS_SPNEGO_H | 23 | #ifndef _CIFS_SPNEGO_H |
24 | #define _CIFS_SPNEGO_H | 24 | #define _CIFS_SPNEGO_H |
25 | 25 | ||
26 | #define CIFS_SPNEGO_UPCALL_VERSION 1 | 26 | #define CIFS_SPNEGO_UPCALL_VERSION 2 |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * The version field should always be set to CIFS_SPNEGO_UPCALL_VERSION. | 29 | * The version field should always be set to CIFS_SPNEGO_UPCALL_VERSION. |
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c index 83fd40dc1ef0..bd5f13d38450 100644 --- a/fs/cifs/cifsencrypt.c +++ b/fs/cifs/cifsencrypt.c | |||
@@ -294,6 +294,7 @@ void calc_lanman_hash(struct cifsSesInfo *ses, char *lnm_session_key) | |||
294 | 294 | ||
295 | if ((ses->server->secMode & SECMODE_PW_ENCRYPT) == 0) | 295 | if ((ses->server->secMode & SECMODE_PW_ENCRYPT) == 0) |
296 | if (extended_security & CIFSSEC_MAY_PLNTXT) { | 296 | if (extended_security & CIFSSEC_MAY_PLNTXT) { |
297 | memset(lnm_session_key, 0, CIFS_SESS_KEY_SIZE); | ||
297 | memcpy(lnm_session_key, password_with_pad, | 298 | memcpy(lnm_session_key, password_with_pad, |
298 | CIFS_ENCPWD_SIZE); | 299 | CIFS_ENCPWD_SIZE); |
299 | return; | 300 | return; |
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 7e1cf262effe..8dfd6f24d488 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h | |||
@@ -80,7 +80,8 @@ enum securityEnum { | |||
80 | NTLMv2, /* Legacy NTLM auth with NTLMv2 hash */ | 80 | NTLMv2, /* Legacy NTLM auth with NTLMv2 hash */ |
81 | RawNTLMSSP, /* NTLMSSP without SPNEGO */ | 81 | RawNTLMSSP, /* NTLMSSP without SPNEGO */ |
82 | NTLMSSP, /* NTLMSSP via SPNEGO */ | 82 | NTLMSSP, /* NTLMSSP via SPNEGO */ |
83 | Kerberos /* Kerberos via SPNEGO */ | 83 | Kerberos, /* Kerberos via SPNEGO */ |
84 | MSKerberos, /* MS Kerberos via SPNEGO */ | ||
84 | }; | 85 | }; |
85 | 86 | ||
86 | enum protocolEnum { | 87 | enum protocolEnum { |
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 0711db65afe8..4c13bcdb92a5 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c | |||
@@ -3598,19 +3598,21 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
3598 | char ntlm_session_key[CIFS_SESS_KEY_SIZE]; | 3598 | char ntlm_session_key[CIFS_SESS_KEY_SIZE]; |
3599 | bool ntlmv2_flag = false; | 3599 | bool ntlmv2_flag = false; |
3600 | int first_time = 0; | 3600 | int first_time = 0; |
3601 | struct TCP_Server_Info *server = pSesInfo->server; | ||
3601 | 3602 | ||
3602 | /* what if server changes its buffer size after dropping the session? */ | 3603 | /* what if server changes its buffer size after dropping the session? */ |
3603 | if (pSesInfo->server->maxBuf == 0) /* no need to send on reconnect */ { | 3604 | if (server->maxBuf == 0) /* no need to send on reconnect */ { |
3604 | rc = CIFSSMBNegotiate(xid, pSesInfo); | 3605 | rc = CIFSSMBNegotiate(xid, pSesInfo); |
3605 | if (rc == -EAGAIN) /* retry only once on 1st time connection */ { | 3606 | if (rc == -EAGAIN) { |
3607 | /* retry only once on 1st time connection */ | ||
3606 | rc = CIFSSMBNegotiate(xid, pSesInfo); | 3608 | rc = CIFSSMBNegotiate(xid, pSesInfo); |
3607 | if (rc == -EAGAIN) | 3609 | if (rc == -EAGAIN) |
3608 | rc = -EHOSTDOWN; | 3610 | rc = -EHOSTDOWN; |
3609 | } | 3611 | } |
3610 | if (rc == 0) { | 3612 | if (rc == 0) { |
3611 | spin_lock(&GlobalMid_Lock); | 3613 | spin_lock(&GlobalMid_Lock); |
3612 | if (pSesInfo->server->tcpStatus != CifsExiting) | 3614 | if (server->tcpStatus != CifsExiting) |
3613 | pSesInfo->server->tcpStatus = CifsGood; | 3615 | server->tcpStatus = CifsGood; |
3614 | else | 3616 | else |
3615 | rc = -EHOSTDOWN; | 3617 | rc = -EHOSTDOWN; |
3616 | spin_unlock(&GlobalMid_Lock); | 3618 | spin_unlock(&GlobalMid_Lock); |
@@ -3623,23 +3625,22 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
3623 | goto ss_err_exit; | 3625 | goto ss_err_exit; |
3624 | 3626 | ||
3625 | pSesInfo->flags = 0; | 3627 | pSesInfo->flags = 0; |
3626 | pSesInfo->capabilities = pSesInfo->server->capabilities; | 3628 | pSesInfo->capabilities = server->capabilities; |
3627 | if (linuxExtEnabled == 0) | 3629 | if (linuxExtEnabled == 0) |
3628 | pSesInfo->capabilities &= (~CAP_UNIX); | 3630 | pSesInfo->capabilities &= (~CAP_UNIX); |
3629 | /* pSesInfo->sequence_number = 0;*/ | 3631 | /* pSesInfo->sequence_number = 0;*/ |
3630 | cFYI(1, ("Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d", | 3632 | cFYI(1, ("Security Mode: 0x%x Capabilities: 0x%x TimeAdjust: %d", |
3631 | pSesInfo->server->secMode, | 3633 | server->secMode, server->capabilities, server->timeAdj)); |
3632 | pSesInfo->server->capabilities, | 3634 | |
3633 | pSesInfo->server->timeAdj)); | ||
3634 | if (experimEnabled < 2) | 3635 | if (experimEnabled < 2) |
3635 | rc = CIFS_SessSetup(xid, pSesInfo, first_time, nls_info); | 3636 | rc = CIFS_SessSetup(xid, pSesInfo, first_time, nls_info); |
3636 | else if (extended_security | 3637 | else if (extended_security |
3637 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) | 3638 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) |
3638 | && (pSesInfo->server->secType == NTLMSSP)) { | 3639 | && (server->secType == NTLMSSP)) { |
3639 | rc = -EOPNOTSUPP; | 3640 | rc = -EOPNOTSUPP; |
3640 | } else if (extended_security | 3641 | } else if (extended_security |
3641 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) | 3642 | && (pSesInfo->capabilities & CAP_EXTENDED_SECURITY) |
3642 | && (pSesInfo->server->secType == RawNTLMSSP)) { | 3643 | && (server->secType == RawNTLMSSP)) { |
3643 | cFYI(1, ("NTLMSSP sesssetup")); | 3644 | cFYI(1, ("NTLMSSP sesssetup")); |
3644 | rc = CIFSNTLMSSPNegotiateSessSetup(xid, pSesInfo, &ntlmv2_flag, | 3645 | rc = CIFSNTLMSSPNegotiateSessSetup(xid, pSesInfo, &ntlmv2_flag, |
3645 | nls_info); | 3646 | nls_info); |
@@ -3668,12 +3669,12 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
3668 | 3669 | ||
3669 | } else { | 3670 | } else { |
3670 | SMBNTencrypt(pSesInfo->password, | 3671 | SMBNTencrypt(pSesInfo->password, |
3671 | pSesInfo->server->cryptKey, | 3672 | server->cryptKey, |
3672 | ntlm_session_key); | 3673 | ntlm_session_key); |
3673 | 3674 | ||
3674 | if (first_time) | 3675 | if (first_time) |
3675 | cifs_calculate_mac_key( | 3676 | cifs_calculate_mac_key( |
3676 | &pSesInfo->server->mac_signing_key, | 3677 | &server->mac_signing_key, |
3677 | ntlm_session_key, | 3678 | ntlm_session_key, |
3678 | pSesInfo->password); | 3679 | pSesInfo->password); |
3679 | } | 3680 | } |
@@ -3686,13 +3687,13 @@ int cifs_setup_session(unsigned int xid, struct cifsSesInfo *pSesInfo, | |||
3686 | nls_info); | 3687 | nls_info); |
3687 | } | 3688 | } |
3688 | } else { /* old style NTLM 0.12 session setup */ | 3689 | } else { /* old style NTLM 0.12 session setup */ |
3689 | SMBNTencrypt(pSesInfo->password, pSesInfo->server->cryptKey, | 3690 | SMBNTencrypt(pSesInfo->password, server->cryptKey, |
3690 | ntlm_session_key); | 3691 | ntlm_session_key); |
3691 | 3692 | ||
3692 | if (first_time) | 3693 | if (first_time) |
3693 | cifs_calculate_mac_key( | 3694 | cifs_calculate_mac_key(&server->mac_signing_key, |
3694 | &pSesInfo->server->mac_signing_key, | 3695 | ntlm_session_key, |
3695 | ntlm_session_key, pSesInfo->password); | 3696 | pSesInfo->password); |
3696 | 3697 | ||
3697 | rc = CIFSSessSetup(xid, pSesInfo, ntlm_session_key, nls_info); | 3698 | rc = CIFSSessSetup(xid, pSesInfo, ntlm_session_key, nls_info); |
3698 | } | 3699 | } |
diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c index f730ef35499e..a2e0673e1b08 100644 --- a/fs/cifs/dns_resolve.c +++ b/fs/cifs/dns_resolve.c | |||
@@ -47,11 +47,18 @@ static int dns_resolver_instantiate(struct key *key, const void *data, | |||
47 | return rc; | 47 | return rc; |
48 | } | 48 | } |
49 | 49 | ||
50 | static void | ||
51 | dns_resolver_destroy(struct key *key) | ||
52 | { | ||
53 | kfree(key->payload.data); | ||
54 | } | ||
55 | |||
50 | struct key_type key_type_dns_resolver = { | 56 | struct key_type key_type_dns_resolver = { |
51 | .name = "dns_resolver", | 57 | .name = "dns_resolver", |
52 | .def_datalen = sizeof(struct in_addr), | 58 | .def_datalen = sizeof(struct in_addr), |
53 | .describe = user_describe, | 59 | .describe = user_describe, |
54 | .instantiate = dns_resolver_instantiate, | 60 | .instantiate = dns_resolver_instantiate, |
61 | .destroy = dns_resolver_destroy, | ||
55 | .match = user_match, | 62 | .match = user_match, |
56 | }; | 63 | }; |
57 | 64 | ||
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index ff14d14903a0..cbefe1f1f9fe 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c | |||
@@ -833,6 +833,10 @@ ssize_t cifs_user_write(struct file *file, const char __user *write_data, | |||
833 | return -EBADF; | 833 | return -EBADF; |
834 | open_file = (struct cifsFileInfo *) file->private_data; | 834 | open_file = (struct cifsFileInfo *) file->private_data; |
835 | 835 | ||
836 | rc = generic_write_checks(file, poffset, &write_size, 0); | ||
837 | if (rc) | ||
838 | return rc; | ||
839 | |||
836 | xid = GetXid(); | 840 | xid = GetXid(); |
837 | 841 | ||
838 | if (*poffset > file->f_path.dentry->d_inode->i_size) | 842 | if (*poffset > file->f_path.dentry->d_inode->i_size) |
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 848286861c31..9c548f110102 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c | |||
@@ -546,7 +546,8 @@ int cifs_get_inode_info(struct inode **pinode, | |||
546 | if ((inode->i_mode & S_IWUGO) == 0 && | 546 | if ((inode->i_mode & S_IWUGO) == 0 && |
547 | (attr & ATTR_READONLY) == 0) | 547 | (attr & ATTR_READONLY) == 0) |
548 | inode->i_mode |= (S_IWUGO & default_mode); | 548 | inode->i_mode |= (S_IWUGO & default_mode); |
549 | inode->i_mode &= ~S_IFMT; | 549 | |
550 | inode->i_mode &= ~S_IFMT; | ||
550 | } | 551 | } |
551 | /* clear write bits if ATTR_READONLY is set */ | 552 | /* clear write bits if ATTR_READONLY is set */ |
552 | if (attr & ATTR_READONLY) | 553 | if (attr & ATTR_READONLY) |
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index ed150efbe27c..252fdc0567f1 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
@@ -409,6 +409,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
409 | #ifdef CONFIG_CIFS_WEAK_PW_HASH | 409 | #ifdef CONFIG_CIFS_WEAK_PW_HASH |
410 | char lnm_session_key[CIFS_SESS_KEY_SIZE]; | 410 | char lnm_session_key[CIFS_SESS_KEY_SIZE]; |
411 | 411 | ||
412 | pSMB->req.hdr.Flags2 &= ~SMBFLG2_UNICODE; | ||
413 | |||
412 | /* no capabilities flags in old lanman negotiation */ | 414 | /* no capabilities flags in old lanman negotiation */ |
413 | 415 | ||
414 | pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE); | 416 | pSMB->old_req.PasswordLength = cpu_to_le16(CIFS_SESS_KEY_SIZE); |
@@ -505,7 +507,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
505 | unicode_ssetup_strings(&bcc_ptr, ses, nls_cp); | 507 | unicode_ssetup_strings(&bcc_ptr, ses, nls_cp); |
506 | } else | 508 | } else |
507 | ascii_ssetup_strings(&bcc_ptr, ses, nls_cp); | 509 | ascii_ssetup_strings(&bcc_ptr, ses, nls_cp); |
508 | } else if (type == Kerberos) { | 510 | } else if (type == Kerberos || type == MSKerberos) { |
509 | #ifdef CONFIG_CIFS_UPCALL | 511 | #ifdef CONFIG_CIFS_UPCALL |
510 | struct cifs_spnego_msg *msg; | 512 | struct cifs_spnego_msg *msg; |
511 | spnego_key = cifs_get_spnego_key(ses); | 513 | spnego_key = cifs_get_spnego_key(ses); |
@@ -516,6 +518,15 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
516 | } | 518 | } |
517 | 519 | ||
518 | msg = spnego_key->payload.data; | 520 | msg = spnego_key->payload.data; |
521 | /* check version field to make sure that cifs.upcall is | ||
522 | sending us a response in an expected form */ | ||
523 | if (msg->version != CIFS_SPNEGO_UPCALL_VERSION) { | ||
524 | cERROR(1, ("incorrect version of cifs.upcall (expected" | ||
525 | " %d but got %d)", | ||
526 | CIFS_SPNEGO_UPCALL_VERSION, msg->version)); | ||
527 | rc = -EKEYREJECTED; | ||
528 | goto ssetup_exit; | ||
529 | } | ||
519 | /* bail out if key is too long */ | 530 | /* bail out if key is too long */ |
520 | if (msg->sesskey_len > | 531 | if (msg->sesskey_len > |
521 | sizeof(ses->server->mac_signing_key.data.krb5)) { | 532 | sizeof(ses->server->mac_signing_key.data.krb5)) { |
diff --git a/fs/compat.c b/fs/compat.c index c9d1472e65c5..075d0509970d 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -792,8 +792,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, | |||
792 | if (buf->result) | 792 | if (buf->result) |
793 | return -EINVAL; | 793 | return -EINVAL; |
794 | d_ino = ino; | 794 | d_ino = ino; |
795 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 795 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
796 | buf->result = -EOVERFLOW; | ||
796 | return -EOVERFLOW; | 797 | return -EOVERFLOW; |
798 | } | ||
797 | buf->result++; | 799 | buf->result++; |
798 | dirent = buf->dirent; | 800 | dirent = buf->dirent; |
799 | if (!access_ok(VERIFY_WRITE, dirent, | 801 | if (!access_ok(VERIFY_WRITE, dirent, |
@@ -862,8 +864,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen, | |||
862 | if (reclen > buf->count) | 864 | if (reclen > buf->count) |
863 | return -EINVAL; | 865 | return -EINVAL; |
864 | d_ino = ino; | 866 | d_ino = ino; |
865 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 867 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
868 | buf->error = -EOVERFLOW; | ||
866 | return -EOVERFLOW; | 869 | return -EOVERFLOW; |
870 | } | ||
867 | dirent = buf->previous; | 871 | dirent = buf->previous; |
868 | if (dirent) { | 872 | if (dirent) { |
869 | if (__put_user(offset, &dirent->d_off)) | 873 | if (__put_user(offset, &dirent->d_off)) |
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index 7a8db78a91d2..8e93341f3e82 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c | |||
@@ -1311,16 +1311,18 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
1311 | * Ensure that no racing symlink() will make detach_prep() fail while | 1311 | * Ensure that no racing symlink() will make detach_prep() fail while |
1312 | * the new link is temporarily attached | 1312 | * the new link is temporarily attached |
1313 | */ | 1313 | */ |
1314 | mutex_lock(&configfs_symlink_mutex); | ||
1315 | spin_lock(&configfs_dirent_lock); | ||
1316 | do { | 1314 | do { |
1317 | struct mutex *wait_mutex; | 1315 | struct mutex *wait_mutex; |
1318 | 1316 | ||
1317 | mutex_lock(&configfs_symlink_mutex); | ||
1318 | spin_lock(&configfs_dirent_lock); | ||
1319 | ret = configfs_detach_prep(dentry, &wait_mutex); | 1319 | ret = configfs_detach_prep(dentry, &wait_mutex); |
1320 | if (ret) { | 1320 | if (ret) |
1321 | configfs_detach_rollback(dentry); | 1321 | configfs_detach_rollback(dentry); |
1322 | spin_unlock(&configfs_dirent_lock); | 1322 | spin_unlock(&configfs_dirent_lock); |
1323 | mutex_unlock(&configfs_symlink_mutex); | 1323 | mutex_unlock(&configfs_symlink_mutex); |
1324 | |||
1325 | if (ret) { | ||
1324 | if (ret != -EAGAIN) { | 1326 | if (ret != -EAGAIN) { |
1325 | config_item_put(parent_item); | 1327 | config_item_put(parent_item); |
1326 | return ret; | 1328 | return ret; |
@@ -1329,13 +1331,8 @@ static int configfs_rmdir(struct inode *dir, struct dentry *dentry) | |||
1329 | /* Wait until the racing operation terminates */ | 1331 | /* Wait until the racing operation terminates */ |
1330 | mutex_lock(wait_mutex); | 1332 | mutex_lock(wait_mutex); |
1331 | mutex_unlock(wait_mutex); | 1333 | mutex_unlock(wait_mutex); |
1332 | |||
1333 | mutex_lock(&configfs_symlink_mutex); | ||
1334 | spin_lock(&configfs_dirent_lock); | ||
1335 | } | 1334 | } |
1336 | } while (ret == -EAGAIN); | 1335 | } while (ret == -EAGAIN); |
1337 | spin_unlock(&configfs_dirent_lock); | ||
1338 | mutex_unlock(&configfs_symlink_mutex); | ||
1339 | 1336 | ||
1340 | /* Get a working ref for the duration of this function */ | 1337 | /* Get a working ref for the duration of this function */ |
1341 | item = configfs_get_config_item(dentry); | 1338 | item = configfs_get_config_item(dentry); |
diff --git a/fs/dcache.c b/fs/dcache.c index 101663d15e9f..80e93956aced 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
@@ -1236,7 +1236,7 @@ struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry) | |||
1236 | * If no entry exists with the exact case name, allocate new dentry with | 1236 | * If no entry exists with the exact case name, allocate new dentry with |
1237 | * the exact case, and return the spliced entry. | 1237 | * the exact case, and return the spliced entry. |
1238 | */ | 1238 | */ |
1239 | struct dentry *d_add_ci(struct inode *inode, struct dentry *dentry, | 1239 | struct dentry *d_add_ci(struct dentry *dentry, struct inode *inode, |
1240 | struct qstr *name) | 1240 | struct qstr *name) |
1241 | { | 1241 | { |
1242 | int error; | 1242 | int error; |
diff --git a/fs/efs/namei.c b/fs/efs/namei.c index 3a404e7fad53..291abb11e20e 100644 --- a/fs/efs/namei.c +++ b/fs/efs/namei.c | |||
@@ -74,8 +74,7 @@ struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct namei | |||
74 | } | 74 | } |
75 | unlock_kernel(); | 75 | unlock_kernel(); |
76 | 76 | ||
77 | d_add(dentry, inode); | 77 | return d_splice_alias(inode, dentry); |
78 | return NULL; | ||
79 | } | 78 | } |
80 | 79 | ||
81 | static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino, | 80 | static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino, |
diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c index b6ed38380ab8..54b8b4140c8f 100644 --- a/fs/nfsd/nfs4acl.c +++ b/fs/nfsd/nfs4acl.c | |||
@@ -443,7 +443,7 @@ init_state(struct posix_acl_state *state, int cnt) | |||
443 | * enough space for either: | 443 | * enough space for either: |
444 | */ | 444 | */ |
445 | alloc = sizeof(struct posix_ace_state_array) | 445 | alloc = sizeof(struct posix_ace_state_array) |
446 | + cnt*sizeof(struct posix_ace_state); | 446 | + cnt*sizeof(struct posix_user_ace_state); |
447 | state->users = kzalloc(alloc, GFP_KERNEL); | 447 | state->users = kzalloc(alloc, GFP_KERNEL); |
448 | if (!state->users) | 448 | if (!state->users) |
449 | return -ENOMEM; | 449 | return -ENOMEM; |
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 2e51adac65de..e5b51ffafc6c 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c | |||
@@ -867,11 +867,6 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, | |||
867 | int slack_bytes; | 867 | int slack_bytes; |
868 | __be32 status; | 868 | __be32 status; |
869 | 869 | ||
870 | status = nfserr_resource; | ||
871 | cstate = cstate_alloc(); | ||
872 | if (cstate == NULL) | ||
873 | goto out; | ||
874 | |||
875 | resp->xbuf = &rqstp->rq_res; | 870 | resp->xbuf = &rqstp->rq_res; |
876 | resp->p = rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len; | 871 | resp->p = rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len; |
877 | resp->tagp = resp->p; | 872 | resp->tagp = resp->p; |
@@ -890,6 +885,11 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, | |||
890 | if (args->minorversion > NFSD_SUPPORTED_MINOR_VERSION) | 885 | if (args->minorversion > NFSD_SUPPORTED_MINOR_VERSION) |
891 | goto out; | 886 | goto out; |
892 | 887 | ||
888 | status = nfserr_resource; | ||
889 | cstate = cstate_alloc(); | ||
890 | if (cstate == NULL) | ||
891 | goto out; | ||
892 | |||
893 | status = nfs_ok; | 893 | status = nfs_ok; |
894 | while (!status && resp->opcnt < args->opcnt) { | 894 | while (!status && resp->opcnt < args->opcnt) { |
895 | op = &args->ops[resp->opcnt++]; | 895 | op = &args->ops[resp->opcnt++]; |
@@ -957,9 +957,9 @@ encode_op: | |||
957 | nfsd4_increment_op_stats(op->opnum); | 957 | nfsd4_increment_op_stats(op->opnum); |
958 | } | 958 | } |
959 | 959 | ||
960 | cstate_free(cstate); | ||
960 | out: | 961 | out: |
961 | nfsd4_release_compoundargs(args); | 962 | nfsd4_release_compoundargs(args); |
962 | cstate_free(cstate); | ||
963 | dprintk("nfsv4 compound returned %d\n", ntohl(status)); | 963 | dprintk("nfsv4 compound returned %d\n", ntohl(status)); |
964 | return status; | 964 | return status; |
965 | } | 965 | } |
diff --git a/fs/ntfs/namei.c b/fs/ntfs/namei.c index e1781c8b1650..9e8a95be7a1e 100644 --- a/fs/ntfs/namei.c +++ b/fs/ntfs/namei.c | |||
@@ -174,7 +174,6 @@ static struct dentry *ntfs_lookup(struct inode *dir_ino, struct dentry *dent, | |||
174 | // TODO: Consider moving this lot to a separate function! (AIA) | 174 | // TODO: Consider moving this lot to a separate function! (AIA) |
175 | handle_name: | 175 | handle_name: |
176 | { | 176 | { |
177 | struct dentry *real_dent, *new_dent; | ||
178 | MFT_RECORD *m; | 177 | MFT_RECORD *m; |
179 | ntfs_attr_search_ctx *ctx; | 178 | ntfs_attr_search_ctx *ctx; |
180 | ntfs_inode *ni = NTFS_I(dent_inode); | 179 | ntfs_inode *ni = NTFS_I(dent_inode); |
@@ -255,93 +254,9 @@ handle_name: | |||
255 | } | 254 | } |
256 | nls_name.hash = full_name_hash(nls_name.name, nls_name.len); | 255 | nls_name.hash = full_name_hash(nls_name.name, nls_name.len); |
257 | 256 | ||
258 | /* | 257 | dent = d_add_ci(dent, dent_inode, &nls_name); |
259 | * Note: No need for dent->d_lock lock as i_mutex is held on the | ||
260 | * parent inode. | ||
261 | */ | ||
262 | |||
263 | /* Does a dentry matching the nls_name exist already? */ | ||
264 | real_dent = d_lookup(dent->d_parent, &nls_name); | ||
265 | /* If not, create it now. */ | ||
266 | if (!real_dent) { | ||
267 | real_dent = d_alloc(dent->d_parent, &nls_name); | ||
268 | kfree(nls_name.name); | ||
269 | if (!real_dent) { | ||
270 | err = -ENOMEM; | ||
271 | goto err_out; | ||
272 | } | ||
273 | new_dent = d_splice_alias(dent_inode, real_dent); | ||
274 | if (new_dent) | ||
275 | dput(real_dent); | ||
276 | else | ||
277 | new_dent = real_dent; | ||
278 | ntfs_debug("Done. (Created new dentry.)"); | ||
279 | return new_dent; | ||
280 | } | ||
281 | kfree(nls_name.name); | 258 | kfree(nls_name.name); |
282 | /* Matching dentry exists, check if it is negative. */ | 259 | return dent; |
283 | if (real_dent->d_inode) { | ||
284 | if (unlikely(real_dent->d_inode != dent_inode)) { | ||
285 | /* This can happen because bad inodes are unhashed. */ | ||
286 | BUG_ON(!is_bad_inode(dent_inode)); | ||
287 | BUG_ON(!is_bad_inode(real_dent->d_inode)); | ||
288 | } | ||
289 | /* | ||
290 | * Already have the inode and the dentry attached, decrement | ||
291 | * the reference count to balance the ntfs_iget() we did | ||
292 | * earlier on. We found the dentry using d_lookup() so it | ||
293 | * cannot be disconnected and thus we do not need to worry | ||
294 | * about any NFS/disconnectedness issues here. | ||
295 | */ | ||
296 | iput(dent_inode); | ||
297 | ntfs_debug("Done. (Already had inode and dentry.)"); | ||
298 | return real_dent; | ||
299 | } | ||
300 | /* | ||
301 | * Negative dentry: instantiate it unless the inode is a directory and | ||
302 | * has a 'disconnected' dentry (i.e. IS_ROOT and DCACHE_DISCONNECTED), | ||
303 | * in which case d_move() that in place of the found dentry. | ||
304 | */ | ||
305 | if (!S_ISDIR(dent_inode->i_mode)) { | ||
306 | /* Not a directory; everything is easy. */ | ||
307 | d_instantiate(real_dent, dent_inode); | ||
308 | ntfs_debug("Done. (Already had negative file dentry.)"); | ||
309 | return real_dent; | ||
310 | } | ||
311 | spin_lock(&dcache_lock); | ||
312 | if (list_empty(&dent_inode->i_dentry)) { | ||
313 | /* | ||
314 | * Directory without a 'disconnected' dentry; we need to do | ||
315 | * d_instantiate() by hand because it takes dcache_lock which | ||
316 | * we already hold. | ||
317 | */ | ||
318 | list_add(&real_dent->d_alias, &dent_inode->i_dentry); | ||
319 | real_dent->d_inode = dent_inode; | ||
320 | spin_unlock(&dcache_lock); | ||
321 | security_d_instantiate(real_dent, dent_inode); | ||
322 | ntfs_debug("Done. (Already had negative directory dentry.)"); | ||
323 | return real_dent; | ||
324 | } | ||
325 | /* | ||
326 | * Directory with a 'disconnected' dentry; get a reference to the | ||
327 | * 'disconnected' dentry. | ||
328 | */ | ||
329 | new_dent = list_entry(dent_inode->i_dentry.next, struct dentry, | ||
330 | d_alias); | ||
331 | dget_locked(new_dent); | ||
332 | spin_unlock(&dcache_lock); | ||
333 | /* Do security vodoo. */ | ||
334 | security_d_instantiate(real_dent, dent_inode); | ||
335 | /* Move new_dent in place of real_dent. */ | ||
336 | d_move(new_dent, real_dent); | ||
337 | /* Balance the ntfs_iget() we did above. */ | ||
338 | iput(dent_inode); | ||
339 | /* Throw away real_dent. */ | ||
340 | dput(real_dent); | ||
341 | /* Use new_dent as the actual dentry. */ | ||
342 | ntfs_debug("Done. (Already had negative, disconnected directory " | ||
343 | "dentry.)"); | ||
344 | return new_dent; | ||
345 | 260 | ||
346 | eio_err_out: | 261 | eio_err_out: |
347 | ntfs_error(vol->sb, "Illegal file name attribute. Run chkdsk."); | 262 | ntfs_error(vol->sb, "Illegal file name attribute. Run chkdsk."); |
diff --git a/fs/ntfs/usnjrnl.h b/fs/ntfs/usnjrnl.h index 3a8af75351e8..4087fbdac327 100644 --- a/fs/ntfs/usnjrnl.h +++ b/fs/ntfs/usnjrnl.h | |||
@@ -113,7 +113,7 @@ typedef struct { | |||
113 | * Reason flags (32-bit). Cumulative flags describing the change(s) to the | 113 | * Reason flags (32-bit). Cumulative flags describing the change(s) to the |
114 | * file since it was last opened. I think the names speak for themselves but | 114 | * file since it was last opened. I think the names speak for themselves but |
115 | * if you disagree check out the descriptions in the Linux NTFS project NTFS | 115 | * if you disagree check out the descriptions in the Linux NTFS project NTFS |
116 | * documentation: http://linux-ntfs.sourceforge.net/ntfs/files/usnjrnl.html | 116 | * documentation: http://www.linux-ntfs.org/ |
117 | */ | 117 | */ |
118 | enum { | 118 | enum { |
119 | USN_REASON_DATA_OVERWRITE = const_cpu_to_le32(0x00000001), | 119 | USN_REASON_DATA_OVERWRITE = const_cpu_to_le32(0x00000001), |
@@ -145,7 +145,7 @@ typedef le32 USN_REASON_FLAGS; | |||
145 | * Source info flags (32-bit). Information about the source of the change(s) | 145 | * Source info flags (32-bit). Information about the source of the change(s) |
146 | * to the file. For detailed descriptions of what these mean, see the Linux | 146 | * to the file. For detailed descriptions of what these mean, see the Linux |
147 | * NTFS project NTFS documentation: | 147 | * NTFS project NTFS documentation: |
148 | * http://linux-ntfs.sourceforge.net/ntfs/files/usnjrnl.html | 148 | * http://www.linux-ntfs.org/ |
149 | */ | 149 | */ |
150 | enum { | 150 | enum { |
151 | USN_SOURCE_DATA_MANAGEMENT = const_cpu_to_le32(0x00000001), | 151 | USN_SOURCE_DATA_MANAGEMENT = const_cpu_to_le32(0x00000001), |
diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c index d8bfa0eb41b2..52276c02f710 100644 --- a/fs/ocfs2/cluster/netdebug.c +++ b/fs/ocfs2/cluster/netdebug.c | |||
@@ -138,20 +138,20 @@ static int nst_seq_show(struct seq_file *seq, void *v) | |||
138 | " message id: %d\n" | 138 | " message id: %d\n" |
139 | " message type: %u\n" | 139 | " message type: %u\n" |
140 | " message key: 0x%08x\n" | 140 | " message key: 0x%08x\n" |
141 | " sock acquiry: %lu.%lu\n" | 141 | " sock acquiry: %lu.%ld\n" |
142 | " send start: %lu.%lu\n" | 142 | " send start: %lu.%ld\n" |
143 | " wait start: %lu.%lu\n", | 143 | " wait start: %lu.%ld\n", |
144 | nst, (unsigned long)nst->st_task->pid, | 144 | nst, (unsigned long)nst->st_task->pid, |
145 | (unsigned long)nst->st_task->tgid, | 145 | (unsigned long)nst->st_task->tgid, |
146 | nst->st_task->comm, nst->st_node, | 146 | nst->st_task->comm, nst->st_node, |
147 | nst->st_sc, nst->st_id, nst->st_msg_type, | 147 | nst->st_sc, nst->st_id, nst->st_msg_type, |
148 | nst->st_msg_key, | 148 | nst->st_msg_key, |
149 | nst->st_sock_time.tv_sec, | 149 | nst->st_sock_time.tv_sec, |
150 | (unsigned long)nst->st_sock_time.tv_usec, | 150 | (long)nst->st_sock_time.tv_usec, |
151 | nst->st_send_time.tv_sec, | 151 | nst->st_send_time.tv_sec, |
152 | (unsigned long)nst->st_send_time.tv_usec, | 152 | (long)nst->st_send_time.tv_usec, |
153 | nst->st_status_time.tv_sec, | 153 | nst->st_status_time.tv_sec, |
154 | nst->st_status_time.tv_usec); | 154 | (long)nst->st_status_time.tv_usec); |
155 | } | 155 | } |
156 | 156 | ||
157 | spin_unlock(&o2net_debug_lock); | 157 | spin_unlock(&o2net_debug_lock); |
@@ -276,7 +276,7 @@ static void *sc_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
276 | return sc; /* unused, just needs to be null when done */ | 276 | return sc; /* unused, just needs to be null when done */ |
277 | } | 277 | } |
278 | 278 | ||
279 | #define TV_SEC_USEC(TV) TV.tv_sec, (unsigned long)TV.tv_usec | 279 | #define TV_SEC_USEC(TV) TV.tv_sec, (long)TV.tv_usec |
280 | 280 | ||
281 | static int sc_seq_show(struct seq_file *seq, void *v) | 281 | static int sc_seq_show(struct seq_file *seq, void *v) |
282 | { | 282 | { |
@@ -309,12 +309,12 @@ static int sc_seq_show(struct seq_file *seq, void *v) | |||
309 | " remote node: %s\n" | 309 | " remote node: %s\n" |
310 | " page off: %zu\n" | 310 | " page off: %zu\n" |
311 | " handshake ok: %u\n" | 311 | " handshake ok: %u\n" |
312 | " timer: %lu.%lu\n" | 312 | " timer: %lu.%ld\n" |
313 | " data ready: %lu.%lu\n" | 313 | " data ready: %lu.%ld\n" |
314 | " advance start: %lu.%lu\n" | 314 | " advance start: %lu.%ld\n" |
315 | " advance stop: %lu.%lu\n" | 315 | " advance stop: %lu.%ld\n" |
316 | " func start: %lu.%lu\n" | 316 | " func start: %lu.%ld\n" |
317 | " func stop: %lu.%lu\n" | 317 | " func stop: %lu.%ld\n" |
318 | " func key: %u\n" | 318 | " func key: %u\n" |
319 | " func type: %u\n", | 319 | " func type: %u\n", |
320 | sc, | 320 | sc, |
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index a27d61581bd6..2bcf706d9dd3 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
@@ -143,8 +143,8 @@ static void o2net_sc_postpone_idle(struct o2net_sock_container *sc); | |||
143 | static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc); | 143 | static void o2net_sc_reset_idle_timer(struct o2net_sock_container *sc); |
144 | 144 | ||
145 | #ifdef CONFIG_DEBUG_FS | 145 | #ifdef CONFIG_DEBUG_FS |
146 | void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | 146 | static void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, |
147 | u32 msgkey, struct task_struct *task, u8 node) | 147 | u32 msgkey, struct task_struct *task, u8 node) |
148 | { | 148 | { |
149 | INIT_LIST_HEAD(&nst->st_net_debug_item); | 149 | INIT_LIST_HEAD(&nst->st_net_debug_item); |
150 | nst->st_task = task; | 150 | nst->st_task = task; |
@@ -153,31 +153,61 @@ void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | |||
153 | nst->st_node = node; | 153 | nst->st_node = node; |
154 | } | 154 | } |
155 | 155 | ||
156 | void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) | 156 | static void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) |
157 | { | 157 | { |
158 | do_gettimeofday(&nst->st_sock_time); | 158 | do_gettimeofday(&nst->st_sock_time); |
159 | } | 159 | } |
160 | 160 | ||
161 | void o2net_set_nst_send_time(struct o2net_send_tracking *nst) | 161 | static void o2net_set_nst_send_time(struct o2net_send_tracking *nst) |
162 | { | 162 | { |
163 | do_gettimeofday(&nst->st_send_time); | 163 | do_gettimeofday(&nst->st_send_time); |
164 | } | 164 | } |
165 | 165 | ||
166 | void o2net_set_nst_status_time(struct o2net_send_tracking *nst) | 166 | static void o2net_set_nst_status_time(struct o2net_send_tracking *nst) |
167 | { | 167 | { |
168 | do_gettimeofday(&nst->st_status_time); | 168 | do_gettimeofday(&nst->st_status_time); |
169 | } | 169 | } |
170 | 170 | ||
171 | void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, | 171 | static void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, |
172 | struct o2net_sock_container *sc) | 172 | struct o2net_sock_container *sc) |
173 | { | 173 | { |
174 | nst->st_sc = sc; | 174 | nst->st_sc = sc; |
175 | } | 175 | } |
176 | 176 | ||
177 | void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id) | 177 | static void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id) |
178 | { | 178 | { |
179 | nst->st_id = msg_id; | 179 | nst->st_id = msg_id; |
180 | } | 180 | } |
181 | |||
182 | #else /* CONFIG_DEBUG_FS */ | ||
183 | |||
184 | static inline void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | ||
185 | u32 msgkey, struct task_struct *task, u8 node) | ||
186 | { | ||
187 | } | ||
188 | |||
189 | static inline void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) | ||
190 | { | ||
191 | } | ||
192 | |||
193 | static inline void o2net_set_nst_send_time(struct o2net_send_tracking *nst) | ||
194 | { | ||
195 | } | ||
196 | |||
197 | static inline void o2net_set_nst_status_time(struct o2net_send_tracking *nst) | ||
198 | { | ||
199 | } | ||
200 | |||
201 | static inline void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, | ||
202 | struct o2net_sock_container *sc) | ||
203 | { | ||
204 | } | ||
205 | |||
206 | static inline void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, | ||
207 | u32 msg_id) | ||
208 | { | ||
209 | } | ||
210 | |||
181 | #endif /* CONFIG_DEBUG_FS */ | 211 | #endif /* CONFIG_DEBUG_FS */ |
182 | 212 | ||
183 | static inline int o2net_reconnect_delay(void) | 213 | static inline int o2net_reconnect_delay(void) |
diff --git a/fs/ocfs2/cluster/tcp_internal.h b/fs/ocfs2/cluster/tcp_internal.h index 18307ff81b77..8d58cfe410b1 100644 --- a/fs/ocfs2/cluster/tcp_internal.h +++ b/fs/ocfs2/cluster/tcp_internal.h | |||
@@ -224,42 +224,10 @@ struct o2net_send_tracking { | |||
224 | struct timeval st_send_time; | 224 | struct timeval st_send_time; |
225 | struct timeval st_status_time; | 225 | struct timeval st_status_time; |
226 | }; | 226 | }; |
227 | |||
228 | void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | ||
229 | u32 msgkey, struct task_struct *task, u8 node); | ||
230 | void o2net_set_nst_sock_time(struct o2net_send_tracking *nst); | ||
231 | void o2net_set_nst_send_time(struct o2net_send_tracking *nst); | ||
232 | void o2net_set_nst_status_time(struct o2net_send_tracking *nst); | ||
233 | void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, | ||
234 | struct o2net_sock_container *sc); | ||
235 | void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, u32 msg_id); | ||
236 | |||
237 | #else | 227 | #else |
238 | struct o2net_send_tracking { | 228 | struct o2net_send_tracking { |
239 | u32 dummy; | 229 | u32 dummy; |
240 | }; | 230 | }; |
241 | |||
242 | static inline void o2net_init_nst(struct o2net_send_tracking *nst, u32 msgtype, | ||
243 | u32 msgkey, struct task_struct *task, u8 node) | ||
244 | { | ||
245 | } | ||
246 | static inline void o2net_set_nst_sock_time(struct o2net_send_tracking *nst) | ||
247 | { | ||
248 | } | ||
249 | static inline void o2net_set_nst_send_time(struct o2net_send_tracking *nst) | ||
250 | { | ||
251 | } | ||
252 | static inline void o2net_set_nst_status_time(struct o2net_send_tracking *nst) | ||
253 | { | ||
254 | } | ||
255 | static inline void o2net_set_nst_sock_container(struct o2net_send_tracking *nst, | ||
256 | struct o2net_sock_container *sc) | ||
257 | { | ||
258 | } | ||
259 | static inline void o2net_set_nst_msg_id(struct o2net_send_tracking *nst, | ||
260 | u32 msg_id) | ||
261 | { | ||
262 | } | ||
263 | #endif /* CONFIG_DEBUG_FS */ | 231 | #endif /* CONFIG_DEBUG_FS */ |
264 | 232 | ||
265 | #endif /* O2CLUSTER_TCP_INTERNAL_H */ | 233 | #endif /* O2CLUSTER_TCP_INTERNAL_H */ |
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 8a1875848080..9cce563fd627 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c | |||
@@ -1300,7 +1300,6 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, | |||
1300 | di->i_size = cpu_to_le64(sb->s_blocksize); | 1300 | di->i_size = cpu_to_le64(sb->s_blocksize); |
1301 | di->i_ctime = di->i_mtime = cpu_to_le64(dir->i_ctime.tv_sec); | 1301 | di->i_ctime = di->i_mtime = cpu_to_le64(dir->i_ctime.tv_sec); |
1302 | di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(dir->i_ctime.tv_nsec); | 1302 | di->i_ctime_nsec = di->i_mtime_nsec = cpu_to_le32(dir->i_ctime.tv_nsec); |
1303 | dir->i_blocks = ocfs2_inode_sector_count(dir); | ||
1304 | 1303 | ||
1305 | /* | 1304 | /* |
1306 | * This should never fail as our extent list is empty and all | 1305 | * This should never fail as our extent list is empty and all |
@@ -1310,9 +1309,15 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, | |||
1310 | NULL); | 1309 | NULL); |
1311 | if (ret) { | 1310 | if (ret) { |
1312 | mlog_errno(ret); | 1311 | mlog_errno(ret); |
1313 | goto out; | 1312 | goto out_commit; |
1314 | } | 1313 | } |
1315 | 1314 | ||
1315 | /* | ||
1316 | * Set i_blocks after the extent insert for the most up to | ||
1317 | * date ip_clusters value. | ||
1318 | */ | ||
1319 | dir->i_blocks = ocfs2_inode_sector_count(dir); | ||
1320 | |||
1316 | ret = ocfs2_journal_dirty(handle, di_bh); | 1321 | ret = ocfs2_journal_dirty(handle, di_bh); |
1317 | if (ret) { | 1322 | if (ret) { |
1318 | mlog_errno(ret); | 1323 | mlog_errno(ret); |
@@ -1336,7 +1341,7 @@ static int ocfs2_expand_inline_dir(struct inode *dir, struct buffer_head *di_bh, | |||
1336 | len, 0, NULL); | 1341 | len, 0, NULL); |
1337 | if (ret) { | 1342 | if (ret) { |
1338 | mlog_errno(ret); | 1343 | mlog_errno(ret); |
1339 | goto out; | 1344 | goto out_commit; |
1340 | } | 1345 | } |
1341 | } | 1346 | } |
1342 | 1347 | ||
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 7a37240f7a31..c47bc2a809c2 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
@@ -1418,13 +1418,13 @@ int ocfs2_mark_dead_nodes(struct ocfs2_super *osb) | |||
1418 | { | 1418 | { |
1419 | unsigned int node_num; | 1419 | unsigned int node_num; |
1420 | int status, i; | 1420 | int status, i; |
1421 | u32 gen; | ||
1421 | struct buffer_head *bh = NULL; | 1422 | struct buffer_head *bh = NULL; |
1422 | struct ocfs2_dinode *di; | 1423 | struct ocfs2_dinode *di; |
1423 | 1424 | ||
1424 | /* This is called with the super block cluster lock, so we | 1425 | /* This is called with the super block cluster lock, so we |
1425 | * know that the slot map can't change underneath us. */ | 1426 | * know that the slot map can't change underneath us. */ |
1426 | 1427 | ||
1427 | spin_lock(&osb->osb_lock); | ||
1428 | for (i = 0; i < osb->max_slots; i++) { | 1428 | for (i = 0; i < osb->max_slots; i++) { |
1429 | /* Read journal inode to get the recovery generation */ | 1429 | /* Read journal inode to get the recovery generation */ |
1430 | status = ocfs2_read_journal_inode(osb, i, &bh, NULL); | 1430 | status = ocfs2_read_journal_inode(osb, i, &bh, NULL); |
@@ -1433,23 +1433,31 @@ int ocfs2_mark_dead_nodes(struct ocfs2_super *osb) | |||
1433 | goto bail; | 1433 | goto bail; |
1434 | } | 1434 | } |
1435 | di = (struct ocfs2_dinode *)bh->b_data; | 1435 | di = (struct ocfs2_dinode *)bh->b_data; |
1436 | osb->slot_recovery_generations[i] = | 1436 | gen = ocfs2_get_recovery_generation(di); |
1437 | ocfs2_get_recovery_generation(di); | ||
1438 | brelse(bh); | 1437 | brelse(bh); |
1439 | bh = NULL; | 1438 | bh = NULL; |
1440 | 1439 | ||
1440 | spin_lock(&osb->osb_lock); | ||
1441 | osb->slot_recovery_generations[i] = gen; | ||
1442 | |||
1441 | mlog(0, "Slot %u recovery generation is %u\n", i, | 1443 | mlog(0, "Slot %u recovery generation is %u\n", i, |
1442 | osb->slot_recovery_generations[i]); | 1444 | osb->slot_recovery_generations[i]); |
1443 | 1445 | ||
1444 | if (i == osb->slot_num) | 1446 | if (i == osb->slot_num) { |
1447 | spin_unlock(&osb->osb_lock); | ||
1445 | continue; | 1448 | continue; |
1449 | } | ||
1446 | 1450 | ||
1447 | status = ocfs2_slot_to_node_num_locked(osb, i, &node_num); | 1451 | status = ocfs2_slot_to_node_num_locked(osb, i, &node_num); |
1448 | if (status == -ENOENT) | 1452 | if (status == -ENOENT) { |
1453 | spin_unlock(&osb->osb_lock); | ||
1449 | continue; | 1454 | continue; |
1455 | } | ||
1450 | 1456 | ||
1451 | if (__ocfs2_recovery_map_test(osb, node_num)) | 1457 | if (__ocfs2_recovery_map_test(osb, node_num)) { |
1458 | spin_unlock(&osb->osb_lock); | ||
1452 | continue; | 1459 | continue; |
1460 | } | ||
1453 | spin_unlock(&osb->osb_lock); | 1461 | spin_unlock(&osb->osb_lock); |
1454 | 1462 | ||
1455 | /* Ok, we have a slot occupied by another node which | 1463 | /* Ok, we have a slot occupied by another node which |
@@ -1465,10 +1473,7 @@ int ocfs2_mark_dead_nodes(struct ocfs2_super *osb) | |||
1465 | mlog_errno(status); | 1473 | mlog_errno(status); |
1466 | goto bail; | 1474 | goto bail; |
1467 | } | 1475 | } |
1468 | |||
1469 | spin_lock(&osb->osb_lock); | ||
1470 | } | 1476 | } |
1471 | spin_unlock(&osb->osb_lock); | ||
1472 | 1477 | ||
1473 | status = 0; | 1478 | status = 0; |
1474 | bail: | 1479 | bail: |
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index 10e149ae5e3a..07f348b8d721 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c | |||
@@ -97,13 +97,14 @@ static int ocfs2_stack_driver_request(const char *stack_name, | |||
97 | goto out; | 97 | goto out; |
98 | } | 98 | } |
99 | 99 | ||
100 | /* Ok, the stack is pinned */ | ||
101 | p->sp_count++; | ||
102 | active_stack = p; | 100 | active_stack = p; |
103 | |||
104 | rc = 0; | 101 | rc = 0; |
105 | 102 | ||
106 | out: | 103 | out: |
104 | /* If we found it, pin it */ | ||
105 | if (!rc) | ||
106 | active_stack->sp_count++; | ||
107 | |||
107 | spin_unlock(&ocfs2_stack_lock); | 108 | spin_unlock(&ocfs2_stack_lock); |
108 | return rc; | 109 | return rc; |
109 | } | 110 | } |
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 4fb81e9c94e3..bca0f81eb687 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -330,6 +330,7 @@ retry: | |||
330 | spin_lock(&proc_inum_lock); | 330 | spin_lock(&proc_inum_lock); |
331 | ida_remove(&proc_inum_ida, i); | 331 | ida_remove(&proc_inum_ida, i); |
332 | spin_unlock(&proc_inum_lock); | 332 | spin_unlock(&proc_inum_lock); |
333 | return 0; | ||
333 | } | 334 | } |
334 | return PROC_DYNAMIC_FIRST + i; | 335 | return PROC_DYNAMIC_FIRST + i; |
335 | } | 336 | } |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index ded969862960..00f10a2dcf12 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/tty.h> | 24 | #include <linux/tty.h> |
25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
26 | #include <linux/mman.h> | 26 | #include <linux/mman.h> |
27 | #include <linux/quicklist.h> | ||
27 | #include <linux/proc_fs.h> | 28 | #include <linux/proc_fs.h> |
28 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
29 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
@@ -189,7 +190,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
189 | "Committed_AS: %8lu kB\n" | 190 | "Committed_AS: %8lu kB\n" |
190 | "VmallocTotal: %8lu kB\n" | 191 | "VmallocTotal: %8lu kB\n" |
191 | "VmallocUsed: %8lu kB\n" | 192 | "VmallocUsed: %8lu kB\n" |
192 | "VmallocChunk: %8lu kB\n", | 193 | "VmallocChunk: %8lu kB\n" |
194 | "Quicklists: %8lu kB\n", | ||
193 | K(i.totalram), | 195 | K(i.totalram), |
194 | K(i.freeram), | 196 | K(i.freeram), |
195 | K(i.bufferram), | 197 | K(i.bufferram), |
@@ -221,7 +223,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
221 | K(committed), | 223 | K(committed), |
222 | (unsigned long)VMALLOC_TOTAL >> 10, | 224 | (unsigned long)VMALLOC_TOTAL >> 10, |
223 | vmi.used >> 10, | 225 | vmi.used >> 10, |
224 | vmi.largest_chunk >> 10 | 226 | vmi.largest_chunk >> 10, |
227 | K(quicklist_total_size()) | ||
225 | ); | 228 | ); |
226 | 229 | ||
227 | len += hugetlb_report_meminfo(page + len); | 230 | len += hugetlb_report_meminfo(page + len); |
diff --git a/fs/readdir.c b/fs/readdir.c index 4e026e5407fb..93a7559bbfd8 100644 --- a/fs/readdir.c +++ b/fs/readdir.c | |||
@@ -80,8 +80,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset | |||
80 | if (buf->result) | 80 | if (buf->result) |
81 | return -EINVAL; | 81 | return -EINVAL; |
82 | d_ino = ino; | 82 | d_ino = ino; |
83 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 83 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
84 | buf->result = -EOVERFLOW; | ||
84 | return -EOVERFLOW; | 85 | return -EOVERFLOW; |
86 | } | ||
85 | buf->result++; | 87 | buf->result++; |
86 | dirent = buf->dirent; | 88 | dirent = buf->dirent; |
87 | if (!access_ok(VERIFY_WRITE, dirent, | 89 | if (!access_ok(VERIFY_WRITE, dirent, |
@@ -155,8 +157,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, | |||
155 | if (reclen > buf->count) | 157 | if (reclen > buf->count) |
156 | return -EINVAL; | 158 | return -EINVAL; |
157 | d_ino = ino; | 159 | d_ino = ino; |
158 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) | 160 | if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) { |
161 | buf->error = -EOVERFLOW; | ||
159 | return -EOVERFLOW; | 162 | return -EOVERFLOW; |
163 | } | ||
160 | dirent = buf->previous; | 164 | dirent = buf->previous; |
161 | if (dirent) { | 165 | if (dirent) { |
162 | if (__put_user(offset, &dirent->d_off)) | 166 | if (__put_user(offset, &dirent->d_off)) |
diff --git a/fs/seq_file.c b/fs/seq_file.c index 5d54205e486b..bd20f7f5a933 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c | |||
@@ -108,9 +108,9 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) | |||
108 | goto Done; | 108 | goto Done; |
109 | } | 109 | } |
110 | /* we need at least one record in buffer */ | 110 | /* we need at least one record in buffer */ |
111 | pos = m->index; | ||
112 | p = m->op->start(m, &pos); | ||
111 | while (1) { | 113 | while (1) { |
112 | pos = m->index; | ||
113 | p = m->op->start(m, &pos); | ||
114 | err = PTR_ERR(p); | 114 | err = PTR_ERR(p); |
115 | if (!p || IS_ERR(p)) | 115 | if (!p || IS_ERR(p)) |
116 | break; | 116 | break; |
@@ -119,6 +119,11 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) | |||
119 | break; | 119 | break; |
120 | if (unlikely(err)) | 120 | if (unlikely(err)) |
121 | m->count = 0; | 121 | m->count = 0; |
122 | if (unlikely(!m->count)) { | ||
123 | p = m->op->next(m, p, &pos); | ||
124 | m->index = pos; | ||
125 | continue; | ||
126 | } | ||
122 | if (m->count < m->size) | 127 | if (m->count < m->size) |
123 | goto Fill; | 128 | goto Fill; |
124 | m->op->stop(m, p); | 129 | m->op->stop(m, p); |
@@ -128,6 +133,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos) | |||
128 | goto Enomem; | 133 | goto Enomem; |
129 | m->count = 0; | 134 | m->count = 0; |
130 | m->version = 0; | 135 | m->version = 0; |
136 | pos = m->index; | ||
137 | p = m->op->start(m, &pos); | ||
131 | } | 138 | } |
132 | m->op->stop(m, p); | 139 | m->op->stop(m, p); |
133 | m->count = 0; | 140 | m->count = 0; |
diff --git a/fs/xfs/linux-2.6/xfs_file.c b/fs/xfs/linux-2.6/xfs_file.c index 5f60363b9343..5311c1acdd40 100644 --- a/fs/xfs/linux-2.6/xfs_file.c +++ b/fs/xfs/linux-2.6/xfs_file.c | |||
@@ -475,6 +475,7 @@ const struct file_operations xfs_invis_file_operations = { | |||
475 | const struct file_operations xfs_dir_file_operations = { | 475 | const struct file_operations xfs_dir_file_operations = { |
476 | .read = generic_read_dir, | 476 | .read = generic_read_dir, |
477 | .readdir = xfs_file_readdir, | 477 | .readdir = xfs_file_readdir, |
478 | .llseek = generic_file_llseek, | ||
478 | .unlocked_ioctl = xfs_file_ioctl, | 479 | .unlocked_ioctl = xfs_file_ioctl, |
479 | #ifdef CONFIG_COMPAT | 480 | #ifdef CONFIG_COMPAT |
480 | .compat_ioctl = xfs_file_compat_ioctl, | 481 | .compat_ioctl = xfs_file_compat_ioctl, |
diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c index 91bcd979242c..095d271f3434 100644 --- a/fs/xfs/linux-2.6/xfs_iops.c +++ b/fs/xfs/linux-2.6/xfs_iops.c | |||
@@ -355,7 +355,7 @@ xfs_vn_ci_lookup( | |||
355 | /* else case-insensitive match... */ | 355 | /* else case-insensitive match... */ |
356 | dname.name = ci_name.name; | 356 | dname.name = ci_name.name; |
357 | dname.len = ci_name.len; | 357 | dname.len = ci_name.len; |
358 | dentry = d_add_ci(VFS_I(ip), dentry, &dname); | 358 | dentry = d_add_ci(dentry, VFS_I(ip), &dname); |
359 | kmem_free(ci_name.name); | 359 | kmem_free(ci_name.name); |
360 | return dentry; | 360 | return dentry; |
361 | } | 361 | } |
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 4964c82f85f9..a73e1531e151 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h | |||
@@ -344,16 +344,22 @@ | |||
344 | #define __NR_timerfd_create (__NR_Linux + 321) | 344 | #define __NR_timerfd_create (__NR_Linux + 321) |
345 | #define __NR_timerfd_gettime (__NR_Linux + 322) | 345 | #define __NR_timerfd_gettime (__NR_Linux + 322) |
346 | #define __NR_timerfd_settime (__NR_Linux + 323) | 346 | #define __NR_timerfd_settime (__NR_Linux + 323) |
347 | #define __NR_signalfd4 (__NR_Linux + 324) | ||
348 | #define __NR_eventfd2 (__NR_Linux + 325) | ||
349 | #define __NR_epoll_create1 (__NR_Linux + 326) | ||
350 | #define __NR_dup3 (__NR_Linux + 327) | ||
351 | #define __NR_pipe2 (__NR_Linux + 328) | ||
352 | #define __NR_inotify_init1 (__NR_Linux + 329) | ||
347 | 353 | ||
348 | /* | 354 | /* |
349 | * Offset of the last Linux o32 flavoured syscall | 355 | * Offset of the last Linux o32 flavoured syscall |
350 | */ | 356 | */ |
351 | #define __NR_Linux_syscalls 323 | 357 | #define __NR_Linux_syscalls 329 |
352 | 358 | ||
353 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 359 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
354 | 360 | ||
355 | #define __NR_O32_Linux 4000 | 361 | #define __NR_O32_Linux 4000 |
356 | #define __NR_O32_Linux_syscalls 323 | 362 | #define __NR_O32_Linux_syscalls 329 |
357 | 363 | ||
358 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 364 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
359 | 365 | ||
@@ -644,16 +650,22 @@ | |||
644 | #define __NR_timerfd_create (__NR_Linux + 280) | 650 | #define __NR_timerfd_create (__NR_Linux + 280) |
645 | #define __NR_timerfd_gettime (__NR_Linux + 281) | 651 | #define __NR_timerfd_gettime (__NR_Linux + 281) |
646 | #define __NR_timerfd_settime (__NR_Linux + 282) | 652 | #define __NR_timerfd_settime (__NR_Linux + 282) |
653 | #define __NR_signalfd4 (__NR_Linux + 283) | ||
654 | #define __NR_eventfd2 (__NR_Linux + 284) | ||
655 | #define __NR_epoll_create1 (__NR_Linux + 285) | ||
656 | #define __NR_dup3 (__NR_Linux + 286) | ||
657 | #define __NR_pipe2 (__NR_Linux + 287) | ||
658 | #define __NR_inotify_init1 (__NR_Linux + 288) | ||
647 | 659 | ||
648 | /* | 660 | /* |
649 | * Offset of the last Linux 64-bit flavoured syscall | 661 | * Offset of the last Linux 64-bit flavoured syscall |
650 | */ | 662 | */ |
651 | #define __NR_Linux_syscalls 282 | 663 | #define __NR_Linux_syscalls 288 |
652 | 664 | ||
653 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 665 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
654 | 666 | ||
655 | #define __NR_64_Linux 5000 | 667 | #define __NR_64_Linux 5000 |
656 | #define __NR_64_Linux_syscalls 282 | 668 | #define __NR_64_Linux_syscalls 288 |
657 | 669 | ||
658 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 670 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
659 | 671 | ||
@@ -948,16 +960,22 @@ | |||
948 | #define __NR_timerfd_create (__NR_Linux + 284) | 960 | #define __NR_timerfd_create (__NR_Linux + 284) |
949 | #define __NR_timerfd_gettime (__NR_Linux + 285) | 961 | #define __NR_timerfd_gettime (__NR_Linux + 285) |
950 | #define __NR_timerfd_settime (__NR_Linux + 286) | 962 | #define __NR_timerfd_settime (__NR_Linux + 286) |
963 | #define __NR_signalfd4 (__NR_Linux + 287) | ||
964 | #define __NR_eventfd2 (__NR_Linux + 288) | ||
965 | #define __NR_epoll_create1 (__NR_Linux + 289) | ||
966 | #define __NR_dup3 (__NR_Linux + 290) | ||
967 | #define __NR_pipe2 (__NR_Linux + 291) | ||
968 | #define __NR_inotify_init1 (__NR_Linux + 292) | ||
951 | 969 | ||
952 | /* | 970 | /* |
953 | * Offset of the last N32 flavoured syscall | 971 | * Offset of the last N32 flavoured syscall |
954 | */ | 972 | */ |
955 | #define __NR_Linux_syscalls 286 | 973 | #define __NR_Linux_syscalls 292 |
956 | 974 | ||
957 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 975 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
958 | 976 | ||
959 | #define __NR_N32_Linux 6000 | 977 | #define __NR_N32_Linux 6000 |
960 | #define __NR_N32_Linux_syscalls 286 | 978 | #define __NR_N32_Linux_syscalls 292 |
961 | 979 | ||
962 | #ifdef __KERNEL__ | 980 | #ifdef __KERNEL__ |
963 | 981 | ||
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index ca110ee73f07..2362cfda1fbc 100644 --- a/include/asm-x86/msr.h +++ b/include/asm-x86/msr.h | |||
@@ -52,14 +52,14 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr, | |||
52 | { | 52 | { |
53 | DECLARE_ARGS(val, low, high); | 53 | DECLARE_ARGS(val, low, high); |
54 | 54 | ||
55 | asm volatile("2: rdmsr ; xor %0,%0\n" | 55 | asm volatile("2: rdmsr ; xor %[err],%[err]\n" |
56 | "1:\n\t" | 56 | "1:\n\t" |
57 | ".section .fixup,\"ax\"\n\t" | 57 | ".section .fixup,\"ax\"\n\t" |
58 | "3: mov %3,%0 ; jmp 1b\n\t" | 58 | "3: mov %[fault],%[err] ; jmp 1b\n\t" |
59 | ".previous\n\t" | 59 | ".previous\n\t" |
60 | _ASM_EXTABLE(2b, 3b) | 60 | _ASM_EXTABLE(2b, 3b) |
61 | : "=r" (*err), EAX_EDX_RET(val, low, high) | 61 | : [err] "=r" (*err), EAX_EDX_RET(val, low, high) |
62 | : "c" (msr), "i" (-EFAULT)); | 62 | : "c" (msr), [fault] "i" (-EFAULT)); |
63 | return EAX_EDX_VAL(val, low, high); | 63 | return EAX_EDX_VAL(val, low, high); |
64 | } | 64 | } |
65 | 65 | ||
@@ -73,15 +73,15 @@ static inline int native_write_msr_safe(unsigned int msr, | |||
73 | unsigned low, unsigned high) | 73 | unsigned low, unsigned high) |
74 | { | 74 | { |
75 | int err; | 75 | int err; |
76 | asm volatile("2: wrmsr ; xor %0,%0\n" | 76 | asm volatile("2: wrmsr ; xor %[err],%[err]\n" |
77 | "1:\n\t" | 77 | "1:\n\t" |
78 | ".section .fixup,\"ax\"\n\t" | 78 | ".section .fixup,\"ax\"\n\t" |
79 | "3: mov %4,%0 ; jmp 1b\n\t" | 79 | "3: mov %[fault],%[err] ; jmp 1b\n\t" |
80 | ".previous\n\t" | 80 | ".previous\n\t" |
81 | _ASM_EXTABLE(2b, 3b) | 81 | _ASM_EXTABLE(2b, 3b) |
82 | : "=a" (err) | 82 | : [err] "=a" (err) |
83 | : "c" (msr), "0" (low), "d" (high), | 83 | : "c" (msr), "0" (low), "d" (high), |
84 | "i" (-EFAULT) | 84 | [fault] "i" (-EFAULT) |
85 | : "memory"); | 85 | : "memory"); |
86 | return err; | 86 | return err; |
87 | } | 87 | } |
@@ -192,19 +192,20 @@ do { \ | |||
192 | #define write_rdtscp_aux(val) wrmsr(0xc0000103, (val), 0) | 192 | #define write_rdtscp_aux(val) wrmsr(0xc0000103, (val), 0) |
193 | 193 | ||
194 | #ifdef CONFIG_SMP | 194 | #ifdef CONFIG_SMP |
195 | void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); | 195 | int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); |
196 | void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); | 196 | int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); |
197 | int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); | 197 | int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h); |
198 | |||
199 | int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); | 198 | int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h); |
200 | #else /* CONFIG_SMP */ | 199 | #else /* CONFIG_SMP */ |
201 | static inline void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) | 200 | static inline int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h) |
202 | { | 201 | { |
203 | rdmsr(msr_no, *l, *h); | 202 | rdmsr(msr_no, *l, *h); |
203 | return 0; | ||
204 | } | 204 | } |
205 | static inline void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) | 205 | static inline int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) |
206 | { | 206 | { |
207 | wrmsr(msr_no, l, h); | 207 | wrmsr(msr_no, l, h); |
208 | return 0; | ||
208 | } | 209 | } |
209 | static inline int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, | 210 | static inline int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, |
210 | u32 *l, u32 *h) | 211 | u32 *l, u32 *h) |
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 7d970678f940..59391250d51c 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -297,7 +297,6 @@ unifdef-y += parport.h | |||
297 | unifdef-y += patchkey.h | 297 | unifdef-y += patchkey.h |
298 | unifdef-y += pci.h | 298 | unifdef-y += pci.h |
299 | unifdef-y += personality.h | 299 | unifdef-y += personality.h |
300 | unifdef-y += pim.h | ||
301 | unifdef-y += pktcdvd.h | 300 | unifdef-y += pktcdvd.h |
302 | unifdef-y += pmu.h | 301 | unifdef-y += pmu.h |
303 | unifdef-y += poll.h | 302 | unifdef-y += poll.h |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index e61f22be4d0e..44710d7e7bff 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -280,6 +280,15 @@ struct blk_queue_tag { | |||
280 | atomic_t refcnt; /* map can be shared */ | 280 | atomic_t refcnt; /* map can be shared */ |
281 | }; | 281 | }; |
282 | 282 | ||
283 | #define BLK_SCSI_MAX_CMDS (256) | ||
284 | #define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8)) | ||
285 | |||
286 | struct blk_cmd_filter { | ||
287 | unsigned long read_ok[BLK_SCSI_CMD_PER_LONG]; | ||
288 | unsigned long write_ok[BLK_SCSI_CMD_PER_LONG]; | ||
289 | struct kobject kobj; | ||
290 | }; | ||
291 | |||
283 | struct request_queue | 292 | struct request_queue |
284 | { | 293 | { |
285 | /* | 294 | /* |
@@ -398,6 +407,7 @@ struct request_queue | |||
398 | #if defined(CONFIG_BLK_DEV_BSG) | 407 | #if defined(CONFIG_BLK_DEV_BSG) |
399 | struct bsg_class_device bsg_dev; | 408 | struct bsg_class_device bsg_dev; |
400 | #endif | 409 | #endif |
410 | struct blk_cmd_filter cmd_filter; | ||
401 | }; | 411 | }; |
402 | 412 | ||
403 | #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */ | 413 | #define QUEUE_FLAG_CLUSTER 0 /* cluster several segments into 1 */ |
@@ -807,8 +817,6 @@ extern void blk_put_queue(struct request_queue *); | |||
807 | /* | 817 | /* |
808 | * tag stuff | 818 | * tag stuff |
809 | */ | 819 | */ |
810 | #define blk_queue_tag_depth(q) ((q)->queue_tags->busy) | ||
811 | #define blk_queue_tag_queue(q) ((q)->queue_tags->busy < (q)->queue_tags->max_depth) | ||
812 | #define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED) | 820 | #define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED) |
813 | extern int blk_queue_start_tag(struct request_queue *, struct request *); | 821 | extern int blk_queue_start_tag(struct request_queue *, struct request *); |
814 | extern struct request *blk_queue_find_tag(struct request_queue *, int); | 822 | extern struct request *blk_queue_find_tag(struct request_queue *, int); |
@@ -833,11 +841,11 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *); | |||
833 | /* | 841 | /* |
834 | * command filter functions | 842 | * command filter functions |
835 | */ | 843 | */ |
836 | extern int blk_verify_command(struct file *file, unsigned char *cmd); | 844 | extern int blk_verify_command(struct blk_cmd_filter *filter, |
837 | extern int blk_cmd_filter_verify_command(struct blk_scsi_cmd_filter *filter, | 845 | unsigned char *cmd, int has_write_perm); |
838 | unsigned char *cmd, mode_t *f_mode); | ||
839 | extern int blk_register_filter(struct gendisk *disk); | 846 | extern int blk_register_filter(struct gendisk *disk); |
840 | extern void blk_unregister_filter(struct gendisk *disk); | 847 | extern void blk_unregister_filter(struct gendisk *disk); |
848 | extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter); | ||
841 | 849 | ||
842 | #define MAX_PHYS_SEGMENTS 128 | 850 | #define MAX_PHYS_SEGMENTS 128 |
843 | #define MAX_HW_SEGMENTS 128 | 851 | #define MAX_HW_SEGMENTS 128 |
diff --git a/include/linux/dcache.h b/include/linux/dcache.h index 07aa198f19ed..efba1de629ac 100644 --- a/include/linux/dcache.h +++ b/include/linux/dcache.h | |||
@@ -230,7 +230,7 @@ extern void d_delete(struct dentry *); | |||
230 | extern struct dentry * d_alloc(struct dentry *, const struct qstr *); | 230 | extern struct dentry * d_alloc(struct dentry *, const struct qstr *); |
231 | extern struct dentry * d_alloc_anon(struct inode *); | 231 | extern struct dentry * d_alloc_anon(struct inode *); |
232 | extern struct dentry * d_splice_alias(struct inode *, struct dentry *); | 232 | extern struct dentry * d_splice_alias(struct inode *, struct dentry *); |
233 | extern struct dentry * d_add_ci(struct inode *, struct dentry *, struct qstr *); | 233 | extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *); |
234 | extern void shrink_dcache_sb(struct super_block *); | 234 | extern void shrink_dcache_sb(struct super_block *); |
235 | extern void shrink_dcache_parent(struct dentry *); | 235 | extern void shrink_dcache_parent(struct dentry *); |
236 | extern void shrink_dcache_for_umount(struct super_block *); | 236 | extern void shrink_dcache_for_umount(struct super_block *); |
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 118216f1bd3c..be4f5e5bfe06 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
@@ -110,15 +110,6 @@ struct hd_struct { | |||
110 | #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 | 110 | #define GENHD_FL_SUPPRESS_PARTITION_INFO 32 |
111 | #define GENHD_FL_FAIL 64 | 111 | #define GENHD_FL_FAIL 64 |
112 | 112 | ||
113 | #define BLK_SCSI_MAX_CMDS (256) | ||
114 | #define BLK_SCSI_CMD_PER_LONG (BLK_SCSI_MAX_CMDS / (sizeof(long) * 8)) | ||
115 | |||
116 | struct blk_scsi_cmd_filter { | ||
117 | unsigned long read_ok[BLK_SCSI_CMD_PER_LONG]; | ||
118 | unsigned long write_ok[BLK_SCSI_CMD_PER_LONG]; | ||
119 | struct kobject kobj; | ||
120 | }; | ||
121 | |||
122 | struct gendisk { | 113 | struct gendisk { |
123 | int major; /* major number of driver */ | 114 | int major; /* major number of driver */ |
124 | int first_minor; | 115 | int first_minor; |
@@ -128,7 +119,6 @@ struct gendisk { | |||
128 | struct hd_struct **part; /* [indexed by minor] */ | 119 | struct hd_struct **part; /* [indexed by minor] */ |
129 | struct block_device_operations *fops; | 120 | struct block_device_operations *fops; |
130 | struct request_queue *queue; | 121 | struct request_queue *queue; |
131 | struct blk_scsi_cmd_filter cmd_filter; | ||
132 | void *private_data; | 122 | void *private_data; |
133 | sector_t capacity; | 123 | sector_t capacity; |
134 | 124 | ||
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 08be0d21864c..06115128047f 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -97,7 +97,19 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client, | |||
97 | 97 | ||
98 | /** | 98 | /** |
99 | * struct i2c_driver - represent an I2C device driver | 99 | * struct i2c_driver - represent an I2C device driver |
100 | * @id: Unique driver ID (optional) | ||
100 | * @class: What kind of i2c device we instantiate (for detect) | 101 | * @class: What kind of i2c device we instantiate (for detect) |
102 | * @attach_adapter: Callback for bus addition (for legacy drivers) | ||
103 | * @detach_adapter: Callback for bus removal (for legacy drivers) | ||
104 | * @detach_client: Callback for device removal (for legacy drivers) | ||
105 | * @probe: Callback for device binding (new-style drivers) | ||
106 | * @remove: Callback for device unbinding (new-style drivers) | ||
107 | * @shutdown: Callback for device shutdown | ||
108 | * @suspend: Callback for device suspend | ||
109 | * @resume: Callback for device resume | ||
110 | * @command: Callback for bus-wide signaling (optional) | ||
111 | * @driver: Device driver model driver | ||
112 | * @id_table: List of I2C devices supported by this driver | ||
101 | * @detect: Callback for device detection | 113 | * @detect: Callback for device detection |
102 | * @address_data: The I2C addresses to probe, ignore or force (for detect) | 114 | * @address_data: The I2C addresses to probe, ignore or force (for detect) |
103 | * @clients: List of detected clients we created (for i2c-core use only) | 115 | * @clients: List of detected clients we created (for i2c-core use only) |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 87c12ed96954..1524829f73f2 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -1111,7 +1111,6 @@ void ide_setup_pci_noise(struct pci_dev *, const struct ide_port_info *); | |||
1111 | #ifdef CONFIG_BLK_DEV_IDEDMA_PCI | 1111 | #ifdef CONFIG_BLK_DEV_IDEDMA_PCI |
1112 | int ide_pci_set_master(struct pci_dev *, const char *); | 1112 | int ide_pci_set_master(struct pci_dev *, const char *); |
1113 | unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *); | 1113 | unsigned long ide_pci_dma_base(ide_hwif_t *, const struct ide_port_info *); |
1114 | extern const struct ide_dma_ops sff_dma_ops; | ||
1115 | int ide_pci_check_simplex(ide_hwif_t *, const struct ide_port_info *); | 1114 | int ide_pci_check_simplex(ide_hwif_t *, const struct ide_port_info *); |
1116 | int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *); | 1115 | int ide_hwif_setup_dma(ide_hwif_t *, const struct ide_port_info *); |
1117 | #else | 1116 | #else |
@@ -1275,6 +1274,7 @@ extern int __ide_dma_end(ide_drive_t *); | |||
1275 | int ide_dma_test_irq(ide_drive_t *); | 1274 | int ide_dma_test_irq(ide_drive_t *); |
1276 | extern void ide_dma_lost_irq(ide_drive_t *); | 1275 | extern void ide_dma_lost_irq(ide_drive_t *); |
1277 | extern void ide_dma_timeout(ide_drive_t *); | 1276 | extern void ide_dma_timeout(ide_drive_t *); |
1277 | extern const struct ide_dma_ops sff_dma_ops; | ||
1278 | #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */ | 1278 | #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */ |
1279 | 1279 | ||
1280 | #else | 1280 | #else |
@@ -1448,8 +1448,7 @@ static inline void ide_dump_identify(u8 *id) | |||
1448 | 1448 | ||
1449 | static inline int hwif_to_node(ide_hwif_t *hwif) | 1449 | static inline int hwif_to_node(ide_hwif_t *hwif) |
1450 | { | 1450 | { |
1451 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 1451 | return hwif->dev ? dev_to_node(hwif->dev) : -1; |
1452 | return hwif->dev ? pcibus_to_node(dev->bus) : -1; | ||
1453 | } | 1452 | } |
1454 | 1453 | ||
1455 | static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive) | 1454 | static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive) |
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 22d2115458c6..8d3b7a9afd17 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
@@ -109,6 +109,7 @@ extern struct resource iomem_resource; | |||
109 | extern int request_resource(struct resource *root, struct resource *new); | 109 | extern int request_resource(struct resource *root, struct resource *new); |
110 | extern int release_resource(struct resource *new); | 110 | extern int release_resource(struct resource *new); |
111 | extern int insert_resource(struct resource *parent, struct resource *new); | 111 | extern int insert_resource(struct resource *parent, struct resource *new); |
112 | extern void insert_resource_expand_to_fit(struct resource *root, struct resource *new); | ||
112 | extern int allocate_resource(struct resource *root, struct resource *new, | 113 | extern int allocate_resource(struct resource *root, struct resource *new, |
113 | resource_size_t size, resource_size_t min, | 114 | resource_size_t size, resource_size_t min, |
114 | resource_size_t max, resource_size_t align, | 115 | resource_size_t max, resource_size_t align, |
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 07112ee9293a..8a455694d682 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h | |||
@@ -6,7 +6,6 @@ | |||
6 | #ifdef __KERNEL__ | 6 | #ifdef __KERNEL__ |
7 | #include <linux/in.h> | 7 | #include <linux/in.h> |
8 | #endif | 8 | #endif |
9 | #include <linux/pim.h> | ||
10 | 9 | ||
11 | /* | 10 | /* |
12 | * Based on the MROUTING 3.5 defines primarily to keep | 11 | * Based on the MROUTING 3.5 defines primarily to keep |
@@ -130,6 +129,7 @@ struct igmpmsg | |||
130 | */ | 129 | */ |
131 | 130 | ||
132 | #ifdef __KERNEL__ | 131 | #ifdef __KERNEL__ |
132 | #include <linux/pim.h> | ||
133 | #include <net/sock.h> | 133 | #include <net/sock.h> |
134 | 134 | ||
135 | #ifdef CONFIG_IP_MROUTE | 135 | #ifdef CONFIG_IP_MROUTE |
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h index 5cf50473a10f..6f4c180179e2 100644 --- a/include/linux/mroute6.h +++ b/include/linux/mroute6.h | |||
@@ -115,6 +115,7 @@ struct sioc_mif_req6 | |||
115 | 115 | ||
116 | #ifdef __KERNEL__ | 116 | #ifdef __KERNEL__ |
117 | 117 | ||
118 | #include <linux/pim.h> | ||
118 | #include <linux/skbuff.h> /* for struct sk_buff_head */ | 119 | #include <linux/skbuff.h> /* for struct sk_buff_head */ |
119 | 120 | ||
120 | #ifdef CONFIG_IPV6_MROUTE | 121 | #ifdef CONFIG_IPV6_MROUTE |
diff --git a/include/linux/net.h b/include/linux/net.h index 4a9a30f2d68f..6dc14a240042 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
@@ -18,16 +18,9 @@ | |||
18 | #ifndef _LINUX_NET_H | 18 | #ifndef _LINUX_NET_H |
19 | #define _LINUX_NET_H | 19 | #define _LINUX_NET_H |
20 | 20 | ||
21 | #include <linux/wait.h> | ||
22 | #include <linux/socket.h> | 21 | #include <linux/socket.h> |
23 | #include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ | ||
24 | #include <asm/socket.h> | 22 | #include <asm/socket.h> |
25 | 23 | ||
26 | struct poll_table_struct; | ||
27 | struct pipe_inode_info; | ||
28 | struct inode; | ||
29 | struct net; | ||
30 | |||
31 | #define NPROTO AF_MAX | 24 | #define NPROTO AF_MAX |
32 | 25 | ||
33 | #define SYS_SOCKET 1 /* sys_socket(2) */ | 26 | #define SYS_SOCKET 1 /* sys_socket(2) */ |
@@ -62,6 +55,13 @@ typedef enum { | |||
62 | #ifdef __KERNEL__ | 55 | #ifdef __KERNEL__ |
63 | #include <linux/stringify.h> | 56 | #include <linux/stringify.h> |
64 | #include <linux/random.h> | 57 | #include <linux/random.h> |
58 | #include <linux/wait.h> | ||
59 | #include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ | ||
60 | |||
61 | struct poll_table_struct; | ||
62 | struct pipe_inode_info; | ||
63 | struct inode; | ||
64 | struct net; | ||
65 | 65 | ||
66 | #define SOCK_ASYNC_NOSPACE 0 | 66 | #define SOCK_ASYNC_NOSPACE 0 |
67 | #define SOCK_ASYNC_WAITDATA 1 | 67 | #define SOCK_ASYNC_WAITDATA 1 |
diff --git a/include/linux/pim.h b/include/linux/pim.h index 236ffd317394..1ba0661561a4 100644 --- a/include/linux/pim.h +++ b/include/linux/pim.h | |||
@@ -3,22 +3,6 @@ | |||
3 | 3 | ||
4 | #include <asm/byteorder.h> | 4 | #include <asm/byteorder.h> |
5 | 5 | ||
6 | #ifndef __KERNEL__ | ||
7 | struct pim { | ||
8 | #if defined(__LITTLE_ENDIAN_BITFIELD) | ||
9 | __u8 pim_type:4, /* PIM message type */ | ||
10 | pim_ver:4; /* PIM version */ | ||
11 | #elif defined(__BIG_ENDIAN_BITFIELD) | ||
12 | __u8 pim_ver:4; /* PIM version */ | ||
13 | pim_type:4; /* PIM message type */ | ||
14 | #endif | ||
15 | __u8 pim_rsv; /* Reserved */ | ||
16 | __be16 pim_cksum; /* Checksum */ | ||
17 | }; | ||
18 | |||
19 | #define PIM_MINLEN 8 | ||
20 | #endif | ||
21 | |||
22 | /* Message types - V1 */ | 6 | /* Message types - V1 */ |
23 | #define PIM_V1_VERSION __constant_htonl(0x10000000) | 7 | #define PIM_V1_VERSION __constant_htonl(0x10000000) |
24 | #define PIM_V1_REGISTER 1 | 8 | #define PIM_V1_REGISTER 1 |
@@ -27,7 +11,6 @@ struct pim { | |||
27 | #define PIM_VERSION 2 | 11 | #define PIM_VERSION 2 |
28 | #define PIM_REGISTER 1 | 12 | #define PIM_REGISTER 1 |
29 | 13 | ||
30 | #if defined(__KERNEL__) | ||
31 | #define PIM_NULL_REGISTER __constant_htonl(0x40000000) | 14 | #define PIM_NULL_REGISTER __constant_htonl(0x40000000) |
32 | 15 | ||
33 | /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ | 16 | /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ |
@@ -42,4 +25,3 @@ struct pimreghdr | |||
42 | struct sk_buff; | 25 | struct sk_buff; |
43 | extern int pim_rcv_v1(struct sk_buff *); | 26 | extern int pim_rcv_v1(struct sk_buff *); |
44 | #endif | 27 | #endif |
45 | #endif | ||
diff --git a/include/linux/quicklist.h b/include/linux/quicklist.h index 39b66713a0bb..bd466439c588 100644 --- a/include/linux/quicklist.h +++ b/include/linux/quicklist.h | |||
@@ -80,6 +80,13 @@ void quicklist_trim(int nr, void (*dtor)(void *), | |||
80 | 80 | ||
81 | unsigned long quicklist_total_size(void); | 81 | unsigned long quicklist_total_size(void); |
82 | 82 | ||
83 | #else | ||
84 | |||
85 | static inline unsigned long quicklist_total_size(void) | ||
86 | { | ||
87 | return 0; | ||
88 | } | ||
89 | |||
83 | #endif | 90 | #endif |
84 | 91 | ||
85 | #endif /* LINUX_QUICKLIST_H */ | 92 | #endif /* LINUX_QUICKLIST_H */ |
diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h index ef2e3a20bf3b..dc05b54bd3a3 100644 --- a/include/linux/sunrpc/svc_rdma.h +++ b/include/linux/sunrpc/svc_rdma.h | |||
@@ -143,7 +143,6 @@ struct svcxprt_rdma { | |||
143 | unsigned long sc_flags; | 143 | unsigned long sc_flags; |
144 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ | 144 | struct list_head sc_dto_q; /* DTO tasklet I/O pending Q */ |
145 | struct list_head sc_read_complete_q; | 145 | struct list_head sc_read_complete_q; |
146 | spinlock_t sc_read_complete_lock; | ||
147 | struct work_struct sc_work; | 146 | struct work_struct sc_work; |
148 | }; | 147 | }; |
149 | /* sc_flags */ | 148 | /* sc_flags */ |
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index b1d2cfea89c5..e5569625d2a5 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -217,6 +217,14 @@ static inline spinlock_t *qdisc_root_lock(struct Qdisc *qdisc) | |||
217 | return qdisc_lock(root); | 217 | return qdisc_lock(root); |
218 | } | 218 | } |
219 | 219 | ||
220 | static inline spinlock_t *qdisc_root_sleeping_lock(struct Qdisc *qdisc) | ||
221 | { | ||
222 | struct Qdisc *root = qdisc_root_sleeping(qdisc); | ||
223 | |||
224 | ASSERT_RTNL(); | ||
225 | return qdisc_lock(root); | ||
226 | } | ||
227 | |||
220 | static inline struct net_device *qdisc_dev(struct Qdisc *qdisc) | 228 | static inline struct net_device *qdisc_dev(struct Qdisc *qdisc) |
221 | { | 229 | { |
222 | return qdisc->dev_queue->dev; | 230 | return qdisc->dev_queue->dev; |
@@ -224,12 +232,12 @@ static inline struct net_device *qdisc_dev(struct Qdisc *qdisc) | |||
224 | 232 | ||
225 | static inline void sch_tree_lock(struct Qdisc *q) | 233 | static inline void sch_tree_lock(struct Qdisc *q) |
226 | { | 234 | { |
227 | spin_lock_bh(qdisc_root_lock(q)); | 235 | spin_lock_bh(qdisc_root_sleeping_lock(q)); |
228 | } | 236 | } |
229 | 237 | ||
230 | static inline void sch_tree_unlock(struct Qdisc *q) | 238 | static inline void sch_tree_unlock(struct Qdisc *q) |
231 | { | 239 | { |
232 | spin_unlock_bh(qdisc_root_lock(q)); | 240 | spin_unlock_bh(qdisc_root_sleeping_lock(q)); |
233 | } | 241 | } |
234 | 242 | ||
235 | #define tcf_tree_lock(tp) sch_tree_lock((tp)->q) | 243 | #define tcf_tree_lock(tp) sch_tree_lock((tp)->q) |
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 972f8e61d36a..59cedfb040e7 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -243,10 +243,11 @@ static inline int open_arg(int flags, int mask) | |||
243 | 243 | ||
244 | static int audit_match_perm(struct audit_context *ctx, int mask) | 244 | static int audit_match_perm(struct audit_context *ctx, int mask) |
245 | { | 245 | { |
246 | unsigned n; | ||
246 | if (unlikely(!ctx)) | 247 | if (unlikely(!ctx)) |
247 | return 0; | 248 | return 0; |
248 | 249 | ||
249 | unsigned n = ctx->major; | 250 | n = ctx->major; |
250 | switch (audit_classify_syscall(ctx->arch, n)) { | 251 | switch (audit_classify_syscall(ctx->arch, n)) { |
251 | case 0: /* native */ | 252 | case 0: /* native */ |
252 | if ((mask & AUDIT_PERM_WRITE) && | 253 | if ((mask & AUDIT_PERM_WRITE) && |
diff --git a/kernel/exit.c b/kernel/exit.c index 38ec40630149..25ed2ad986df 100644 --- a/kernel/exit.c +++ b/kernel/exit.c | |||
@@ -831,26 +831,50 @@ static void reparent_thread(struct task_struct *p, struct task_struct *father) | |||
831 | * the child reaper process (ie "init") in our pid | 831 | * the child reaper process (ie "init") in our pid |
832 | * space. | 832 | * space. |
833 | */ | 833 | */ |
834 | static struct task_struct *find_new_reaper(struct task_struct *father) | ||
835 | { | ||
836 | struct pid_namespace *pid_ns = task_active_pid_ns(father); | ||
837 | struct task_struct *thread; | ||
838 | |||
839 | thread = father; | ||
840 | while_each_thread(father, thread) { | ||
841 | if (thread->flags & PF_EXITING) | ||
842 | continue; | ||
843 | if (unlikely(pid_ns->child_reaper == father)) | ||
844 | pid_ns->child_reaper = thread; | ||
845 | return thread; | ||
846 | } | ||
847 | |||
848 | if (unlikely(pid_ns->child_reaper == father)) { | ||
849 | write_unlock_irq(&tasklist_lock); | ||
850 | if (unlikely(pid_ns == &init_pid_ns)) | ||
851 | panic("Attempted to kill init!"); | ||
852 | |||
853 | zap_pid_ns_processes(pid_ns); | ||
854 | write_lock_irq(&tasklist_lock); | ||
855 | /* | ||
856 | * We can not clear ->child_reaper or leave it alone. | ||
857 | * There may by stealth EXIT_DEAD tasks on ->children, | ||
858 | * forget_original_parent() must move them somewhere. | ||
859 | */ | ||
860 | pid_ns->child_reaper = init_pid_ns.child_reaper; | ||
861 | } | ||
862 | |||
863 | return pid_ns->child_reaper; | ||
864 | } | ||
865 | |||
834 | static void forget_original_parent(struct task_struct *father) | 866 | static void forget_original_parent(struct task_struct *father) |
835 | { | 867 | { |
836 | struct task_struct *p, *n, *reaper = father; | 868 | struct task_struct *p, *n, *reaper; |
837 | LIST_HEAD(ptrace_dead); | 869 | LIST_HEAD(ptrace_dead); |
838 | 870 | ||
839 | write_lock_irq(&tasklist_lock); | 871 | write_lock_irq(&tasklist_lock); |
840 | 872 | reaper = find_new_reaper(father); | |
841 | /* | 873 | /* |
842 | * First clean up ptrace if we were using it. | 874 | * First clean up ptrace if we were using it. |
843 | */ | 875 | */ |
844 | ptrace_exit(father, &ptrace_dead); | 876 | ptrace_exit(father, &ptrace_dead); |
845 | 877 | ||
846 | do { | ||
847 | reaper = next_thread(reaper); | ||
848 | if (reaper == father) { | ||
849 | reaper = task_child_reaper(father); | ||
850 | break; | ||
851 | } | ||
852 | } while (reaper->flags & PF_EXITING); | ||
853 | |||
854 | list_for_each_entry_safe(p, n, &father->children, sibling) { | 878 | list_for_each_entry_safe(p, n, &father->children, sibling) { |
855 | p->real_parent = reaper; | 879 | p->real_parent = reaper; |
856 | if (p->parent == father) { | 880 | if (p->parent == father) { |
@@ -918,8 +942,8 @@ static void exit_notify(struct task_struct *tsk, int group_dead) | |||
918 | 942 | ||
919 | /* mt-exec, de_thread() is waiting for us */ | 943 | /* mt-exec, de_thread() is waiting for us */ |
920 | if (thread_group_leader(tsk) && | 944 | if (thread_group_leader(tsk) && |
921 | tsk->signal->notify_count < 0 && | 945 | tsk->signal->group_exit_task && |
922 | tsk->signal->group_exit_task) | 946 | tsk->signal->notify_count < 0) |
923 | wake_up_process(tsk->signal->group_exit_task); | 947 | wake_up_process(tsk->signal->group_exit_task); |
924 | 948 | ||
925 | write_unlock_irq(&tasklist_lock); | 949 | write_unlock_irq(&tasklist_lock); |
@@ -959,39 +983,6 @@ static void check_stack_usage(void) | |||
959 | static inline void check_stack_usage(void) {} | 983 | static inline void check_stack_usage(void) {} |
960 | #endif | 984 | #endif |
961 | 985 | ||
962 | static inline void exit_child_reaper(struct task_struct *tsk) | ||
963 | { | ||
964 | if (likely(tsk->group_leader != task_child_reaper(tsk))) | ||
965 | return; | ||
966 | |||
967 | if (tsk->nsproxy->pid_ns == &init_pid_ns) | ||
968 | panic("Attempted to kill init!"); | ||
969 | |||
970 | /* | ||
971 | * @tsk is the last thread in the 'cgroup-init' and is exiting. | ||
972 | * Terminate all remaining processes in the namespace and reap them | ||
973 | * before exiting @tsk. | ||
974 | * | ||
975 | * Note that @tsk (last thread of cgroup-init) may not necessarily | ||
976 | * be the child-reaper (i.e main thread of cgroup-init) of the | ||
977 | * namespace i.e the child_reaper may have already exited. | ||
978 | * | ||
979 | * Even after a child_reaper exits, we let it inherit orphaned children, | ||
980 | * because, pid_ns->child_reaper remains valid as long as there is | ||
981 | * at least one living sub-thread in the cgroup init. | ||
982 | |||
983 | * This living sub-thread of the cgroup-init will be notified when | ||
984 | * a child inherited by the 'child-reaper' exits (do_notify_parent() | ||
985 | * uses __group_send_sig_info()). Further, when reaping child processes, | ||
986 | * do_wait() iterates over children of all living sub threads. | ||
987 | |||
988 | * i.e even though 'child_reaper' thread is listed as the parent of the | ||
989 | * orphaned children, any living sub-thread in the cgroup-init can | ||
990 | * perform the role of the child_reaper. | ||
991 | */ | ||
992 | zap_pid_ns_processes(tsk->nsproxy->pid_ns); | ||
993 | } | ||
994 | |||
995 | NORET_TYPE void do_exit(long code) | 986 | NORET_TYPE void do_exit(long code) |
996 | { | 987 | { |
997 | struct task_struct *tsk = current; | 988 | struct task_struct *tsk = current; |
@@ -1051,7 +1042,6 @@ NORET_TYPE void do_exit(long code) | |||
1051 | } | 1042 | } |
1052 | group_dead = atomic_dec_and_test(&tsk->signal->live); | 1043 | group_dead = atomic_dec_and_test(&tsk->signal->live); |
1053 | if (group_dead) { | 1044 | if (group_dead) { |
1054 | exit_child_reaper(tsk); | ||
1055 | hrtimer_cancel(&tsk->signal->real_timer); | 1045 | hrtimer_cancel(&tsk->signal->real_timer); |
1056 | exit_itimers(tsk->signal); | 1046 | exit_itimers(tsk->signal); |
1057 | } | 1047 | } |
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 3bfb1877a003..dbda475b13bd 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c | |||
@@ -875,11 +875,11 @@ static int add_lock_to_list(struct lock_class *class, struct lock_class *this, | |||
875 | if (!entry) | 875 | if (!entry) |
876 | return 0; | 876 | return 0; |
877 | 877 | ||
878 | entry->class = this; | ||
879 | entry->distance = distance; | ||
880 | if (!save_trace(&entry->trace)) | 878 | if (!save_trace(&entry->trace)) |
881 | return 0; | 879 | return 0; |
882 | 880 | ||
881 | entry->class = this; | ||
882 | entry->distance = distance; | ||
883 | /* | 883 | /* |
884 | * Since we never remove from the dependency list, the list can | 884 | * Since we never remove from the dependency list, the list can |
885 | * be walked lockless by other CPUs, it's only allocation | 885 | * be walked lockless by other CPUs, it's only allocation |
@@ -3029,7 +3029,7 @@ found_it: | |||
3029 | 3029 | ||
3030 | stats = get_lock_stats(hlock_class(hlock)); | 3030 | stats = get_lock_stats(hlock_class(hlock)); |
3031 | if (point < ARRAY_SIZE(stats->contention_point)) | 3031 | if (point < ARRAY_SIZE(stats->contention_point)) |
3032 | stats->contention_point[i]++; | 3032 | stats->contention_point[point]++; |
3033 | if (lock->cpu != smp_processor_id()) | 3033 | if (lock->cpu != smp_processor_id()) |
3034 | stats->bounces[bounce_contended + !!hlock->read]++; | 3034 | stats->bounces[bounce_contended + !!hlock->read]++; |
3035 | put_lock_stats(stats); | 3035 | put_lock_stats(stats); |
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c index 4b194d34d77f..20dbcbf9c7dd 100644 --- a/kernel/lockdep_proc.c +++ b/kernel/lockdep_proc.c | |||
@@ -472,8 +472,9 @@ static void snprint_time(char *buf, size_t bufsiz, s64 nr) | |||
472 | { | 472 | { |
473 | unsigned long rem; | 473 | unsigned long rem; |
474 | 474 | ||
475 | nr += 5; /* for display rounding */ | ||
475 | rem = do_div(nr, 1000); /* XXX: do_div_signed */ | 476 | rem = do_div(nr, 1000); /* XXX: do_div_signed */ |
476 | snprintf(buf, bufsiz, "%lld.%02d", (long long)nr, ((int)rem+5)/10); | 477 | snprintf(buf, bufsiz, "%lld.%02d", (long long)nr, (int)rem/10); |
477 | } | 478 | } |
478 | 479 | ||
479 | static void seq_time(struct seq_file *m, s64 time) | 480 | static void seq_time(struct seq_file *m, s64 time) |
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index ea567b78d1aa..fab8ea86fac3 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c | |||
@@ -179,9 +179,6 @@ void zap_pid_ns_processes(struct pid_namespace *pid_ns) | |||
179 | rc = sys_wait4(-1, NULL, __WALL, NULL); | 179 | rc = sys_wait4(-1, NULL, __WALL, NULL); |
180 | } while (rc != -ECHILD); | 180 | } while (rc != -ECHILD); |
181 | 181 | ||
182 | |||
183 | /* Child reaper for the pid namespace is going away */ | ||
184 | pid_ns->child_reaper = NULL; | ||
185 | acct_exit_ns(pid_ns); | 182 | acct_exit_ns(pid_ns); |
186 | return; | 183 | return; |
187 | } | 184 | } |
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c index da9c2dda6a4e..dfdec524d1b7 100644 --- a/kernel/pm_qos_params.c +++ b/kernel/pm_qos_params.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include <linux/uaccess.h> | 43 | #include <linux/uaccess.h> |
44 | 44 | ||
45 | /* | 45 | /* |
46 | * locking rule: all changes to target_value or requirements or notifiers lists | 46 | * locking rule: all changes to requirements or notifiers lists |
47 | * or pm_qos_object list and pm_qos_objects need to happen with pm_qos_lock | 47 | * or pm_qos_object list and pm_qos_objects need to happen with pm_qos_lock |
48 | * held, taken with _irqsave. One lock to rule them all | 48 | * held, taken with _irqsave. One lock to rule them all |
49 | */ | 49 | */ |
@@ -66,7 +66,7 @@ struct pm_qos_object { | |||
66 | struct miscdevice pm_qos_power_miscdev; | 66 | struct miscdevice pm_qos_power_miscdev; |
67 | char *name; | 67 | char *name; |
68 | s32 default_value; | 68 | s32 default_value; |
69 | s32 target_value; | 69 | atomic_t target_value; |
70 | s32 (*comparitor)(s32, s32); | 70 | s32 (*comparitor)(s32, s32); |
71 | }; | 71 | }; |
72 | 72 | ||
@@ -77,7 +77,7 @@ static struct pm_qos_object cpu_dma_pm_qos = { | |||
77 | .notifiers = &cpu_dma_lat_notifier, | 77 | .notifiers = &cpu_dma_lat_notifier, |
78 | .name = "cpu_dma_latency", | 78 | .name = "cpu_dma_latency", |
79 | .default_value = 2000 * USEC_PER_SEC, | 79 | .default_value = 2000 * USEC_PER_SEC, |
80 | .target_value = 2000 * USEC_PER_SEC, | 80 | .target_value = ATOMIC_INIT(2000 * USEC_PER_SEC), |
81 | .comparitor = min_compare | 81 | .comparitor = min_compare |
82 | }; | 82 | }; |
83 | 83 | ||
@@ -87,7 +87,7 @@ static struct pm_qos_object network_lat_pm_qos = { | |||
87 | .notifiers = &network_lat_notifier, | 87 | .notifiers = &network_lat_notifier, |
88 | .name = "network_latency", | 88 | .name = "network_latency", |
89 | .default_value = 2000 * USEC_PER_SEC, | 89 | .default_value = 2000 * USEC_PER_SEC, |
90 | .target_value = 2000 * USEC_PER_SEC, | 90 | .target_value = ATOMIC_INIT(2000 * USEC_PER_SEC), |
91 | .comparitor = min_compare | 91 | .comparitor = min_compare |
92 | }; | 92 | }; |
93 | 93 | ||
@@ -99,7 +99,7 @@ static struct pm_qos_object network_throughput_pm_qos = { | |||
99 | .notifiers = &network_throughput_notifier, | 99 | .notifiers = &network_throughput_notifier, |
100 | .name = "network_throughput", | 100 | .name = "network_throughput", |
101 | .default_value = 0, | 101 | .default_value = 0, |
102 | .target_value = 0, | 102 | .target_value = ATOMIC_INIT(0), |
103 | .comparitor = max_compare | 103 | .comparitor = max_compare |
104 | }; | 104 | }; |
105 | 105 | ||
@@ -150,11 +150,11 @@ static void update_target(int target) | |||
150 | extreme_value = pm_qos_array[target]->comparitor( | 150 | extreme_value = pm_qos_array[target]->comparitor( |
151 | extreme_value, node->value); | 151 | extreme_value, node->value); |
152 | } | 152 | } |
153 | if (pm_qos_array[target]->target_value != extreme_value) { | 153 | if (atomic_read(&pm_qos_array[target]->target_value) != extreme_value) { |
154 | call_notifier = 1; | 154 | call_notifier = 1; |
155 | pm_qos_array[target]->target_value = extreme_value; | 155 | atomic_set(&pm_qos_array[target]->target_value, extreme_value); |
156 | pr_debug(KERN_ERR "new target for qos %d is %d\n", target, | 156 | pr_debug(KERN_ERR "new target for qos %d is %d\n", target, |
157 | pm_qos_array[target]->target_value); | 157 | atomic_read(&pm_qos_array[target]->target_value)); |
158 | } | 158 | } |
159 | spin_unlock_irqrestore(&pm_qos_lock, flags); | 159 | spin_unlock_irqrestore(&pm_qos_lock, flags); |
160 | 160 | ||
@@ -193,14 +193,7 @@ static int find_pm_qos_object_by_minor(int minor) | |||
193 | */ | 193 | */ |
194 | int pm_qos_requirement(int pm_qos_class) | 194 | int pm_qos_requirement(int pm_qos_class) |
195 | { | 195 | { |
196 | int ret_val; | 196 | return atomic_read(&pm_qos_array[pm_qos_class]->target_value); |
197 | unsigned long flags; | ||
198 | |||
199 | spin_lock_irqsave(&pm_qos_lock, flags); | ||
200 | ret_val = pm_qos_array[pm_qos_class]->target_value; | ||
201 | spin_unlock_irqrestore(&pm_qos_lock, flags); | ||
202 | |||
203 | return ret_val; | ||
204 | } | 197 | } |
205 | EXPORT_SYMBOL_GPL(pm_qos_requirement); | 198 | EXPORT_SYMBOL_GPL(pm_qos_requirement); |
206 | 199 | ||
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index f011e0870b52..bbd85c60f741 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/console.h> | 21 | #include <linux/console.h> |
22 | #include <linux/cpu.h> | 22 | #include <linux/cpu.h> |
23 | #include <linux/freezer.h> | 23 | #include <linux/freezer.h> |
24 | #include <linux/ftrace.h> | ||
24 | 25 | ||
25 | #include "power.h" | 26 | #include "power.h" |
26 | 27 | ||
@@ -255,7 +256,7 @@ static int create_image(int platform_mode) | |||
255 | 256 | ||
256 | int hibernation_snapshot(int platform_mode) | 257 | int hibernation_snapshot(int platform_mode) |
257 | { | 258 | { |
258 | int error; | 259 | int error, ftrace_save; |
259 | 260 | ||
260 | /* Free memory before shutting down devices. */ | 261 | /* Free memory before shutting down devices. */ |
261 | error = swsusp_shrink_memory(); | 262 | error = swsusp_shrink_memory(); |
@@ -267,6 +268,7 @@ int hibernation_snapshot(int platform_mode) | |||
267 | goto Close; | 268 | goto Close; |
268 | 269 | ||
269 | suspend_console(); | 270 | suspend_console(); |
271 | ftrace_save = __ftrace_enabled_save(); | ||
270 | error = device_suspend(PMSG_FREEZE); | 272 | error = device_suspend(PMSG_FREEZE); |
271 | if (error) | 273 | if (error) |
272 | goto Recover_platform; | 274 | goto Recover_platform; |
@@ -296,6 +298,7 @@ int hibernation_snapshot(int platform_mode) | |||
296 | Resume_devices: | 298 | Resume_devices: |
297 | device_resume(in_suspend ? | 299 | device_resume(in_suspend ? |
298 | (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE); | 300 | (error ? PMSG_RECOVER : PMSG_THAW) : PMSG_RESTORE); |
301 | __ftrace_enabled_restore(ftrace_save); | ||
299 | resume_console(); | 302 | resume_console(); |
300 | Close: | 303 | Close: |
301 | platform_end(platform_mode); | 304 | platform_end(platform_mode); |
@@ -366,10 +369,11 @@ static int resume_target_kernel(void) | |||
366 | 369 | ||
367 | int hibernation_restore(int platform_mode) | 370 | int hibernation_restore(int platform_mode) |
368 | { | 371 | { |
369 | int error; | 372 | int error, ftrace_save; |
370 | 373 | ||
371 | pm_prepare_console(); | 374 | pm_prepare_console(); |
372 | suspend_console(); | 375 | suspend_console(); |
376 | ftrace_save = __ftrace_enabled_save(); | ||
373 | error = device_suspend(PMSG_QUIESCE); | 377 | error = device_suspend(PMSG_QUIESCE); |
374 | if (error) | 378 | if (error) |
375 | goto Finish; | 379 | goto Finish; |
@@ -384,6 +388,7 @@ int hibernation_restore(int platform_mode) | |||
384 | platform_restore_cleanup(platform_mode); | 388 | platform_restore_cleanup(platform_mode); |
385 | device_resume(PMSG_RECOVER); | 389 | device_resume(PMSG_RECOVER); |
386 | Finish: | 390 | Finish: |
391 | __ftrace_enabled_restore(ftrace_save); | ||
387 | resume_console(); | 392 | resume_console(); |
388 | pm_restore_console(); | 393 | pm_restore_console(); |
389 | return error; | 394 | return error; |
@@ -396,7 +401,7 @@ int hibernation_restore(int platform_mode) | |||
396 | 401 | ||
397 | int hibernation_platform_enter(void) | 402 | int hibernation_platform_enter(void) |
398 | { | 403 | { |
399 | int error; | 404 | int error, ftrace_save; |
400 | 405 | ||
401 | if (!hibernation_ops) | 406 | if (!hibernation_ops) |
402 | return -ENOSYS; | 407 | return -ENOSYS; |
@@ -411,6 +416,7 @@ int hibernation_platform_enter(void) | |||
411 | goto Close; | 416 | goto Close; |
412 | 417 | ||
413 | suspend_console(); | 418 | suspend_console(); |
419 | ftrace_save = __ftrace_enabled_save(); | ||
414 | error = device_suspend(PMSG_HIBERNATE); | 420 | error = device_suspend(PMSG_HIBERNATE); |
415 | if (error) { | 421 | if (error) { |
416 | if (hibernation_ops->recover) | 422 | if (hibernation_ops->recover) |
@@ -445,6 +451,7 @@ int hibernation_platform_enter(void) | |||
445 | hibernation_ops->finish(); | 451 | hibernation_ops->finish(); |
446 | Resume_devices: | 452 | Resume_devices: |
447 | device_resume(PMSG_RESTORE); | 453 | device_resume(PMSG_RESTORE); |
454 | __ftrace_enabled_restore(ftrace_save); | ||
448 | resume_console(); | 455 | resume_console(); |
449 | Close: | 456 | Close: |
450 | hibernation_ops->end(); | 457 | hibernation_ops->end(); |
diff --git a/kernel/power/main.c b/kernel/power/main.c index 0b7476f5d2a6..540b16b68565 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/freezer.h> | 21 | #include <linux/freezer.h> |
22 | #include <linux/vmstat.h> | 22 | #include <linux/vmstat.h> |
23 | #include <linux/syscalls.h> | 23 | #include <linux/syscalls.h> |
24 | #include <linux/ftrace.h> | ||
24 | 25 | ||
25 | #include "power.h" | 26 | #include "power.h" |
26 | 27 | ||
@@ -310,7 +311,7 @@ static int suspend_enter(suspend_state_t state) | |||
310 | */ | 311 | */ |
311 | int suspend_devices_and_enter(suspend_state_t state) | 312 | int suspend_devices_and_enter(suspend_state_t state) |
312 | { | 313 | { |
313 | int error; | 314 | int error, ftrace_save; |
314 | 315 | ||
315 | if (!suspend_ops) | 316 | if (!suspend_ops) |
316 | return -ENOSYS; | 317 | return -ENOSYS; |
@@ -321,6 +322,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
321 | goto Close; | 322 | goto Close; |
322 | } | 323 | } |
323 | suspend_console(); | 324 | suspend_console(); |
325 | ftrace_save = __ftrace_enabled_save(); | ||
324 | suspend_test_start(); | 326 | suspend_test_start(); |
325 | error = device_suspend(PMSG_SUSPEND); | 327 | error = device_suspend(PMSG_SUSPEND); |
326 | if (error) { | 328 | if (error) { |
@@ -352,6 +354,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
352 | suspend_test_start(); | 354 | suspend_test_start(); |
353 | device_resume(PMSG_RESUME); | 355 | device_resume(PMSG_RESUME); |
354 | suspend_test_finish("resume devices"); | 356 | suspend_test_finish("resume devices"); |
357 | __ftrace_enabled_restore(ftrace_save); | ||
355 | resume_console(); | 358 | resume_console(); |
356 | Close: | 359 | Close: |
357 | if (suspend_ops->end) | 360 | if (suspend_ops->end) |
diff --git a/kernel/resource.c b/kernel/resource.c index f5b518eabefe..03d796c1b2e9 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
@@ -362,35 +362,21 @@ int allocate_resource(struct resource *root, struct resource *new, | |||
362 | 362 | ||
363 | EXPORT_SYMBOL(allocate_resource); | 363 | EXPORT_SYMBOL(allocate_resource); |
364 | 364 | ||
365 | /** | 365 | /* |
366 | * insert_resource - Inserts a resource in the resource tree | 366 | * Insert a resource into the resource tree. If successful, return NULL, |
367 | * @parent: parent of the new resource | 367 | * otherwise return the conflicting resource (compare to __request_resource()) |
368 | * @new: new resource to insert | ||
369 | * | ||
370 | * Returns 0 on success, -EBUSY if the resource can't be inserted. | ||
371 | * | ||
372 | * This function is equivalent to request_resource when no conflict | ||
373 | * happens. If a conflict happens, and the conflicting resources | ||
374 | * entirely fit within the range of the new resource, then the new | ||
375 | * resource is inserted and the conflicting resources become children of | ||
376 | * the new resource. | ||
377 | */ | 368 | */ |
378 | int insert_resource(struct resource *parent, struct resource *new) | 369 | static struct resource * __insert_resource(struct resource *parent, struct resource *new) |
379 | { | 370 | { |
380 | int result; | ||
381 | struct resource *first, *next; | 371 | struct resource *first, *next; |
382 | 372 | ||
383 | write_lock(&resource_lock); | ||
384 | |||
385 | for (;; parent = first) { | 373 | for (;; parent = first) { |
386 | result = 0; | ||
387 | first = __request_resource(parent, new); | 374 | first = __request_resource(parent, new); |
388 | if (!first) | 375 | if (!first) |
389 | goto out; | 376 | return first; |
390 | 377 | ||
391 | result = -EBUSY; | ||
392 | if (first == parent) | 378 | if (first == parent) |
393 | goto out; | 379 | return first; |
394 | 380 | ||
395 | if ((first->start > new->start) || (first->end < new->end)) | 381 | if ((first->start > new->start) || (first->end < new->end)) |
396 | break; | 382 | break; |
@@ -401,15 +387,13 @@ int insert_resource(struct resource *parent, struct resource *new) | |||
401 | for (next = first; ; next = next->sibling) { | 387 | for (next = first; ; next = next->sibling) { |
402 | /* Partial overlap? Bad, and unfixable */ | 388 | /* Partial overlap? Bad, and unfixable */ |
403 | if (next->start < new->start || next->end > new->end) | 389 | if (next->start < new->start || next->end > new->end) |
404 | goto out; | 390 | return next; |
405 | if (!next->sibling) | 391 | if (!next->sibling) |
406 | break; | 392 | break; |
407 | if (next->sibling->start > new->end) | 393 | if (next->sibling->start > new->end) |
408 | break; | 394 | break; |
409 | } | 395 | } |
410 | 396 | ||
411 | result = 0; | ||
412 | |||
413 | new->parent = parent; | 397 | new->parent = parent; |
414 | new->sibling = next->sibling; | 398 | new->sibling = next->sibling; |
415 | new->child = first; | 399 | new->child = first; |
@@ -426,10 +410,64 @@ int insert_resource(struct resource *parent, struct resource *new) | |||
426 | next = next->sibling; | 410 | next = next->sibling; |
427 | next->sibling = new; | 411 | next->sibling = new; |
428 | } | 412 | } |
413 | return NULL; | ||
414 | } | ||
429 | 415 | ||
430 | out: | 416 | /** |
417 | * insert_resource - Inserts a resource in the resource tree | ||
418 | * @parent: parent of the new resource | ||
419 | * @new: new resource to insert | ||
420 | * | ||
421 | * Returns 0 on success, -EBUSY if the resource can't be inserted. | ||
422 | * | ||
423 | * This function is equivalent to request_resource when no conflict | ||
424 | * happens. If a conflict happens, and the conflicting resources | ||
425 | * entirely fit within the range of the new resource, then the new | ||
426 | * resource is inserted and the conflicting resources become children of | ||
427 | * the new resource. | ||
428 | */ | ||
429 | int insert_resource(struct resource *parent, struct resource *new) | ||
430 | { | ||
431 | struct resource *conflict; | ||
432 | |||
433 | write_lock(&resource_lock); | ||
434 | conflict = __insert_resource(parent, new); | ||
435 | write_unlock(&resource_lock); | ||
436 | return conflict ? -EBUSY : 0; | ||
437 | } | ||
438 | |||
439 | /** | ||
440 | * insert_resource_expand_to_fit - Insert a resource into the resource tree | ||
441 | * @root: root resource descriptor | ||
442 | * @new: new resource to insert | ||
443 | * | ||
444 | * Insert a resource into the resource tree, possibly expanding it in order | ||
445 | * to make it encompass any conflicting resources. | ||
446 | */ | ||
447 | void insert_resource_expand_to_fit(struct resource *root, struct resource *new) | ||
448 | { | ||
449 | if (new->parent) | ||
450 | return; | ||
451 | |||
452 | write_lock(&resource_lock); | ||
453 | for (;;) { | ||
454 | struct resource *conflict; | ||
455 | |||
456 | conflict = __insert_resource(root, new); | ||
457 | if (!conflict) | ||
458 | break; | ||
459 | if (conflict == root) | ||
460 | break; | ||
461 | |||
462 | /* Ok, expand resource to cover the conflict, then try again .. */ | ||
463 | if (conflict->start < new->start) | ||
464 | new->start = conflict->start; | ||
465 | if (conflict->end > new->end) | ||
466 | new->end = conflict->end; | ||
467 | |||
468 | printk("Expanded resource %s due to conflict with %s\n", new->name, conflict->name); | ||
469 | } | ||
431 | write_unlock(&resource_lock); | 470 | write_unlock(&resource_lock); |
432 | return result; | ||
433 | } | 471 | } |
434 | 472 | ||
435 | /** | 473 | /** |
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 998ba54b4543..552310798dad 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -199,6 +199,8 @@ static inline struct rt_rq *group_rt_rq(struct sched_rt_entity *rt_se) | |||
199 | 199 | ||
200 | static inline void sched_rt_rq_enqueue(struct rt_rq *rt_rq) | 200 | static inline void sched_rt_rq_enqueue(struct rt_rq *rt_rq) |
201 | { | 201 | { |
202 | if (rt_rq->rt_nr_running) | ||
203 | resched_task(rq_of_rt_rq(rt_rq)->curr); | ||
202 | } | 204 | } |
203 | 205 | ||
204 | static inline void sched_rt_rq_dequeue(struct rt_rq *rt_rq) | 206 | static inline void sched_rt_rq_dequeue(struct rt_rq *rt_rq) |
@@ -438,9 +440,6 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq) | |||
438 | { | 440 | { |
439 | u64 runtime = sched_rt_runtime(rt_rq); | 441 | u64 runtime = sched_rt_runtime(rt_rq); |
440 | 442 | ||
441 | if (runtime == RUNTIME_INF) | ||
442 | return 0; | ||
443 | |||
444 | if (rt_rq->rt_throttled) | 443 | if (rt_rq->rt_throttled) |
445 | return rt_rq_throttled(rt_rq); | 444 | return rt_rq_throttled(rt_rq); |
446 | 445 | ||
@@ -491,9 +490,11 @@ static void update_curr_rt(struct rq *rq) | |||
491 | rt_rq = rt_rq_of_se(rt_se); | 490 | rt_rq = rt_rq_of_se(rt_se); |
492 | 491 | ||
493 | spin_lock(&rt_rq->rt_runtime_lock); | 492 | spin_lock(&rt_rq->rt_runtime_lock); |
494 | rt_rq->rt_time += delta_exec; | 493 | if (sched_rt_runtime(rt_rq) != RUNTIME_INF) { |
495 | if (sched_rt_runtime_exceeded(rt_rq)) | 494 | rt_rq->rt_time += delta_exec; |
496 | resched_task(curr); | 495 | if (sched_rt_runtime_exceeded(rt_rq)) |
496 | resched_task(curr); | ||
497 | } | ||
497 | spin_unlock(&rt_rq->rt_runtime_lock); | 498 | spin_unlock(&rt_rq->rt_runtime_lock); |
498 | } | 499 | } |
499 | } | 500 | } |
diff --git a/kernel/smp.c b/kernel/smp.c index 782e2b93e465..f362a8553777 100644 --- a/kernel/smp.c +++ b/kernel/smp.c | |||
@@ -210,8 +210,10 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
210 | { | 210 | { |
211 | struct call_single_data d; | 211 | struct call_single_data d; |
212 | unsigned long flags; | 212 | unsigned long flags; |
213 | /* prevent preemption and reschedule on another processor */ | 213 | /* prevent preemption and reschedule on another processor, |
214 | as well as CPU removal */ | ||
214 | int me = get_cpu(); | 215 | int me = get_cpu(); |
216 | int err = 0; | ||
215 | 217 | ||
216 | /* Can deadlock when called with interrupts disabled */ | 218 | /* Can deadlock when called with interrupts disabled */ |
217 | WARN_ON(irqs_disabled()); | 219 | WARN_ON(irqs_disabled()); |
@@ -220,7 +222,7 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
220 | local_irq_save(flags); | 222 | local_irq_save(flags); |
221 | func(info); | 223 | func(info); |
222 | local_irq_restore(flags); | 224 | local_irq_restore(flags); |
223 | } else { | 225 | } else if ((unsigned)cpu < NR_CPUS && cpu_online(cpu)) { |
224 | struct call_single_data *data = NULL; | 226 | struct call_single_data *data = NULL; |
225 | 227 | ||
226 | if (!wait) { | 228 | if (!wait) { |
@@ -236,10 +238,12 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
236 | data->func = func; | 238 | data->func = func; |
237 | data->info = info; | 239 | data->info = info; |
238 | generic_exec_single(cpu, data); | 240 | generic_exec_single(cpu, data); |
241 | } else { | ||
242 | err = -ENXIO; /* CPU not online */ | ||
239 | } | 243 | } |
240 | 244 | ||
241 | put_cpu(); | 245 | put_cpu(); |
242 | return 0; | 246 | return err; |
243 | } | 247 | } |
244 | EXPORT_SYMBOL(smp_call_function_single); | 248 | EXPORT_SYMBOL(smp_call_function_single); |
245 | 249 | ||
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index b75b492fbfcf..cb838ee93a82 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c | |||
@@ -233,7 +233,8 @@ static void check_hung_uninterruptible_tasks(int this_cpu) | |||
233 | do_each_thread(g, t) { | 233 | do_each_thread(g, t) { |
234 | if (!--max_count) | 234 | if (!--max_count) |
235 | goto unlock; | 235 | goto unlock; |
236 | if (t->state & TASK_UNINTERRUPTIBLE) | 236 | /* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */ |
237 | if (t->state == TASK_UNINTERRUPTIBLE) | ||
237 | check_hung_task(t, now); | 238 | check_hung_task(t, now); |
238 | } while_each_thread(g, t); | 239 | } while_each_thread(g, t); |
239 | unlock: | 240 | unlock: |
diff --git a/mm/filemap.c b/mm/filemap.c index 54e968650855..876bc595d0f8 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -2129,13 +2129,20 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, | |||
2129 | * After a write we want buffered reads to be sure to go to disk to get | 2129 | * After a write we want buffered reads to be sure to go to disk to get |
2130 | * the new data. We invalidate clean cached page from the region we're | 2130 | * the new data. We invalidate clean cached page from the region we're |
2131 | * about to write. We do this *before* the write so that we can return | 2131 | * about to write. We do this *before* the write so that we can return |
2132 | * -EIO without clobbering -EIOCBQUEUED from ->direct_IO(). | 2132 | * without clobbering -EIOCBQUEUED from ->direct_IO(). |
2133 | */ | 2133 | */ |
2134 | if (mapping->nrpages) { | 2134 | if (mapping->nrpages) { |
2135 | written = invalidate_inode_pages2_range(mapping, | 2135 | written = invalidate_inode_pages2_range(mapping, |
2136 | pos >> PAGE_CACHE_SHIFT, end); | 2136 | pos >> PAGE_CACHE_SHIFT, end); |
2137 | if (written) | 2137 | /* |
2138 | * If a page can not be invalidated, return 0 to fall back | ||
2139 | * to buffered write. | ||
2140 | */ | ||
2141 | if (written) { | ||
2142 | if (written == -EBUSY) | ||
2143 | return 0; | ||
2138 | goto out; | 2144 | goto out; |
2145 | } | ||
2139 | } | 2146 | } |
2140 | 2147 | ||
2141 | written = mapping->a_ops->direct_IO(WRITE, iocb, iov, pos, *nr_segs); | 2148 | written = mapping->a_ops->direct_IO(WRITE, iocb, iov, pos, *nr_segs); |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index af982f7cdb2a..e293c58bea58 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -694,6 +694,9 @@ static int move_freepages(struct zone *zone, | |||
694 | #endif | 694 | #endif |
695 | 695 | ||
696 | for (page = start_page; page <= end_page;) { | 696 | for (page = start_page; page <= end_page;) { |
697 | /* Make sure we are not inadvertently changing nodes */ | ||
698 | VM_BUG_ON(page_to_nid(page) != zone_to_nid(zone)); | ||
699 | |||
697 | if (!pfn_valid_within(page_to_pfn(page))) { | 700 | if (!pfn_valid_within(page_to_pfn(page))) { |
698 | page++; | 701 | page++; |
699 | continue; | 702 | continue; |
@@ -2516,6 +2519,10 @@ static void setup_zone_migrate_reserve(struct zone *zone) | |||
2516 | continue; | 2519 | continue; |
2517 | page = pfn_to_page(pfn); | 2520 | page = pfn_to_page(pfn); |
2518 | 2521 | ||
2522 | /* Watch out for overlapping nodes */ | ||
2523 | if (page_to_nid(page) != zone_to_nid(zone)) | ||
2524 | continue; | ||
2525 | |||
2519 | /* Blocks with reserved pages will never free, skip them. */ | 2526 | /* Blocks with reserved pages will never free, skip them. */ |
2520 | if (PageReserved(page)) | 2527 | if (PageReserved(page)) |
2521 | continue; | 2528 | continue; |
@@ -4064,7 +4071,7 @@ void __init set_dma_reserve(unsigned long new_dma_reserve) | |||
4064 | } | 4071 | } |
4065 | 4072 | ||
4066 | #ifndef CONFIG_NEED_MULTIPLE_NODES | 4073 | #ifndef CONFIG_NEED_MULTIPLE_NODES |
4067 | struct pglist_data contig_page_data = { .bdata = &bootmem_node_data[0] }; | 4074 | struct pglist_data __refdata contig_page_data = { .bdata = &bootmem_node_data[0] }; |
4068 | EXPORT_SYMBOL(contig_page_data); | 4075 | EXPORT_SYMBOL(contig_page_data); |
4069 | #endif | 4076 | #endif |
4070 | 4077 | ||
diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 3444b58033c8..c69f84fe038d 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c | |||
@@ -2,7 +2,6 @@ | |||
2 | * linux/mm/page_isolation.c | 2 | * linux/mm/page_isolation.c |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #include <stddef.h> | ||
6 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
7 | #include <linux/page-isolation.h> | 6 | #include <linux/page-isolation.h> |
8 | #include <linux/pageblock-flags.h> | 7 | #include <linux/pageblock-flags.h> |
diff --git a/mm/quicklist.c b/mm/quicklist.c index 3f703f7cb398..8dbb6805ef35 100644 --- a/mm/quicklist.c +++ b/mm/quicklist.c | |||
@@ -26,7 +26,10 @@ DEFINE_PER_CPU(struct quicklist, quicklist)[CONFIG_NR_QUICK]; | |||
26 | static unsigned long max_pages(unsigned long min_pages) | 26 | static unsigned long max_pages(unsigned long min_pages) |
27 | { | 27 | { |
28 | unsigned long node_free_pages, max; | 28 | unsigned long node_free_pages, max; |
29 | struct zone *zones = NODE_DATA(numa_node_id())->node_zones; | 29 | int node = numa_node_id(); |
30 | struct zone *zones = NODE_DATA(node)->node_zones; | ||
31 | int num_cpus_on_node; | ||
32 | node_to_cpumask_ptr(cpumask_on_node, node); | ||
30 | 33 | ||
31 | node_free_pages = | 34 | node_free_pages = |
32 | #ifdef CONFIG_ZONE_DMA | 35 | #ifdef CONFIG_ZONE_DMA |
@@ -38,6 +41,10 @@ static unsigned long max_pages(unsigned long min_pages) | |||
38 | zone_page_state(&zones[ZONE_NORMAL], NR_FREE_PAGES); | 41 | zone_page_state(&zones[ZONE_NORMAL], NR_FREE_PAGES); |
39 | 42 | ||
40 | max = node_free_pages / FRACTION_OF_NODE_MEM; | 43 | max = node_free_pages / FRACTION_OF_NODE_MEM; |
44 | |||
45 | num_cpus_on_node = cpus_weight_nr(*cpumask_on_node); | ||
46 | max /= num_cpus_on_node; | ||
47 | |||
41 | return max(max, min_pages); | 48 | return max(max, min_pages); |
42 | } | 49 | } |
43 | 50 | ||
@@ -2312,7 +2312,7 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags, | |||
2312 | 2312 | ||
2313 | s->refcount = 1; | 2313 | s->refcount = 1; |
2314 | #ifdef CONFIG_NUMA | 2314 | #ifdef CONFIG_NUMA |
2315 | s->remote_node_defrag_ratio = 100; | 2315 | s->remote_node_defrag_ratio = 1000; |
2316 | #endif | 2316 | #endif |
2317 | if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA)) | 2317 | if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA)) |
2318 | goto error; | 2318 | goto error; |
@@ -4058,7 +4058,7 @@ static ssize_t remote_node_defrag_ratio_store(struct kmem_cache *s, | |||
4058 | if (err) | 4058 | if (err) |
4059 | return err; | 4059 | return err; |
4060 | 4060 | ||
4061 | if (ratio < 100) | 4061 | if (ratio <= 100) |
4062 | s->remote_node_defrag_ratio = ratio * 10; | 4062 | s->remote_node_defrag_ratio = ratio * 10; |
4063 | 4063 | ||
4064 | return length; | 4064 | return length; |
diff --git a/mm/truncate.c b/mm/truncate.c index 250505091d37..6650c1d878b4 100644 --- a/mm/truncate.c +++ b/mm/truncate.c | |||
@@ -380,7 +380,7 @@ static int do_launder_page(struct address_space *mapping, struct page *page) | |||
380 | * Any pages which are found to be mapped into pagetables are unmapped prior to | 380 | * Any pages which are found to be mapped into pagetables are unmapped prior to |
381 | * invalidation. | 381 | * invalidation. |
382 | * | 382 | * |
383 | * Returns -EIO if any pages could not be invalidated. | 383 | * Returns -EBUSY if any pages could not be invalidated. |
384 | */ | 384 | */ |
385 | int invalidate_inode_pages2_range(struct address_space *mapping, | 385 | int invalidate_inode_pages2_range(struct address_space *mapping, |
386 | pgoff_t start, pgoff_t end) | 386 | pgoff_t start, pgoff_t end) |
@@ -440,7 +440,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping, | |||
440 | ret2 = do_launder_page(mapping, page); | 440 | ret2 = do_launder_page(mapping, page); |
441 | if (ret2 == 0) { | 441 | if (ret2 == 0) { |
442 | if (!invalidate_complete_page2(mapping, page)) | 442 | if (!invalidate_complete_page2(mapping, page)) |
443 | ret2 = -EIO; | 443 | ret2 = -EBUSY; |
444 | } | 444 | } |
445 | if (ret2 < 0) | 445 | if (ret2 < 0) |
446 | ret = ret2; | 446 | ret = ret2; |
diff --git a/mm/vmstat.c b/mm/vmstat.c index b0d08e667ece..d7826af2fb07 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
@@ -516,9 +516,26 @@ static void pagetypeinfo_showblockcount_print(struct seq_file *m, | |||
516 | continue; | 516 | continue; |
517 | 517 | ||
518 | page = pfn_to_page(pfn); | 518 | page = pfn_to_page(pfn); |
519 | #ifdef CONFIG_ARCH_FLATMEM_HAS_HOLES | ||
520 | /* | ||
521 | * Ordinarily, memory holes in flatmem still have a valid | ||
522 | * memmap for the PFN range. However, an architecture for | ||
523 | * embedded systems (e.g. ARM) can free up the memmap backing | ||
524 | * holes to save memory on the assumption the memmap is | ||
525 | * never used. The page_zone linkages are then broken even | ||
526 | * though pfn_valid() returns true. Skip the page if the | ||
527 | * linkages are broken. Even if this test passed, the impact | ||
528 | * is that the counters for the movable type are off but | ||
529 | * fragmentation monitoring is likely meaningless on small | ||
530 | * systems. | ||
531 | */ | ||
532 | if (page_zone(page) != zone) | ||
533 | continue; | ||
534 | #endif | ||
519 | mtype = get_pageblock_migratetype(page); | 535 | mtype = get_pageblock_migratetype(page); |
520 | 536 | ||
521 | count[mtype]++; | 537 | if (mtype < MIGRATE_TYPES) |
538 | count[mtype]++; | ||
522 | } | 539 | } |
523 | 540 | ||
524 | /* Print counts */ | 541 | /* Print counts */ |
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 91d3d96805d0..b12dae2b0b2d 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
@@ -1029,6 +1029,11 @@ skip: | |||
1029 | } | 1029 | } |
1030 | } | 1030 | } |
1031 | 1031 | ||
1032 | static inline bool inetdev_valid_mtu(unsigned mtu) | ||
1033 | { | ||
1034 | return mtu >= 68; | ||
1035 | } | ||
1036 | |||
1032 | /* Called only under RTNL semaphore */ | 1037 | /* Called only under RTNL semaphore */ |
1033 | 1038 | ||
1034 | static int inetdev_event(struct notifier_block *this, unsigned long event, | 1039 | static int inetdev_event(struct notifier_block *this, unsigned long event, |
@@ -1048,6 +1053,10 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, | |||
1048 | IN_DEV_CONF_SET(in_dev, NOXFRM, 1); | 1053 | IN_DEV_CONF_SET(in_dev, NOXFRM, 1); |
1049 | IN_DEV_CONF_SET(in_dev, NOPOLICY, 1); | 1054 | IN_DEV_CONF_SET(in_dev, NOPOLICY, 1); |
1050 | } | 1055 | } |
1056 | } else if (event == NETDEV_CHANGEMTU) { | ||
1057 | /* Re-enabling IP */ | ||
1058 | if (inetdev_valid_mtu(dev->mtu)) | ||
1059 | in_dev = inetdev_init(dev); | ||
1051 | } | 1060 | } |
1052 | goto out; | 1061 | goto out; |
1053 | } | 1062 | } |
@@ -1058,7 +1067,7 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, | |||
1058 | dev->ip_ptr = NULL; | 1067 | dev->ip_ptr = NULL; |
1059 | break; | 1068 | break; |
1060 | case NETDEV_UP: | 1069 | case NETDEV_UP: |
1061 | if (dev->mtu < 68) | 1070 | if (!inetdev_valid_mtu(dev->mtu)) |
1062 | break; | 1071 | break; |
1063 | if (dev->flags & IFF_LOOPBACK) { | 1072 | if (dev->flags & IFF_LOOPBACK) { |
1064 | struct in_ifaddr *ifa; | 1073 | struct in_ifaddr *ifa; |
@@ -1080,9 +1089,9 @@ static int inetdev_event(struct notifier_block *this, unsigned long event, | |||
1080 | ip_mc_down(in_dev); | 1089 | ip_mc_down(in_dev); |
1081 | break; | 1090 | break; |
1082 | case NETDEV_CHANGEMTU: | 1091 | case NETDEV_CHANGEMTU: |
1083 | if (dev->mtu >= 68) | 1092 | if (inetdev_valid_mtu(dev->mtu)) |
1084 | break; | 1093 | break; |
1085 | /* MTU falled under 68, disable IP */ | 1094 | /* disable IP when MTU is not enough */ |
1086 | case NETDEV_UNREGISTER: | 1095 | case NETDEV_UNREGISTER: |
1087 | inetdev_destroy(in_dev); | 1096 | inetdev_destroy(in_dev); |
1088 | break; | 1097 | break; |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index e91bafeb32f4..6ee5354c9aa1 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -3121,9 +3121,9 @@ static struct ctl_table empty[1]; | |||
3121 | static struct ctl_table ipv4_skeleton[] = | 3121 | static struct ctl_table ipv4_skeleton[] = |
3122 | { | 3122 | { |
3123 | { .procname = "route", .ctl_name = NET_IPV4_ROUTE, | 3123 | { .procname = "route", .ctl_name = NET_IPV4_ROUTE, |
3124 | .child = ipv4_route_table}, | 3124 | .mode = 0555, .child = ipv4_route_table}, |
3125 | { .procname = "neigh", .ctl_name = NET_IPV4_NEIGH, | 3125 | { .procname = "neigh", .ctl_name = NET_IPV4_NEIGH, |
3126 | .child = empty}, | 3126 | .mode = 0555, .child = empty}, |
3127 | { } | 3127 | { } |
3128 | }; | 3128 | }; |
3129 | 3129 | ||
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index a00532de2a8c..8165f5aa8c71 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -468,7 +468,8 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb, | |||
468 | } | 468 | } |
469 | if (likely(sysctl_tcp_window_scaling)) { | 469 | if (likely(sysctl_tcp_window_scaling)) { |
470 | opts->ws = tp->rx_opt.rcv_wscale; | 470 | opts->ws = tp->rx_opt.rcv_wscale; |
471 | size += TCPOLEN_WSCALE_ALIGNED; | 471 | if(likely(opts->ws)) |
472 | size += TCPOLEN_WSCALE_ALIGNED; | ||
472 | } | 473 | } |
473 | if (likely(sysctl_tcp_sack)) { | 474 | if (likely(sysctl_tcp_sack)) { |
474 | opts->options |= OPTION_SACK_ADVERTISE; | 475 | opts->options |= OPTION_SACK_ADVERTISE; |
@@ -509,7 +510,8 @@ static unsigned tcp_synack_options(struct sock *sk, | |||
509 | 510 | ||
510 | if (likely(ireq->wscale_ok)) { | 511 | if (likely(ireq->wscale_ok)) { |
511 | opts->ws = ireq->rcv_wscale; | 512 | opts->ws = ireq->rcv_wscale; |
512 | size += TCPOLEN_WSCALE_ALIGNED; | 513 | if(likely(opts->ws)) |
514 | size += TCPOLEN_WSCALE_ALIGNED; | ||
513 | } | 515 | } |
514 | if (likely(doing_ts)) { | 516 | if (likely(doing_ts)) { |
515 | opts->options |= OPTION_TS; | 517 | opts->options |= OPTION_TS; |
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 01d47674f7e5..e53e493606c5 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -377,14 +377,14 @@ static inline int rawv6_rcv_skb(struct sock * sk, struct sk_buff * skb) | |||
377 | skb_checksum_complete(skb)) { | 377 | skb_checksum_complete(skb)) { |
378 | atomic_inc(&sk->sk_drops); | 378 | atomic_inc(&sk->sk_drops); |
379 | kfree_skb(skb); | 379 | kfree_skb(skb); |
380 | return 0; | 380 | return NET_RX_DROP; |
381 | } | 381 | } |
382 | 382 | ||
383 | /* Charge it to the socket. */ | 383 | /* Charge it to the socket. */ |
384 | if (sock_queue_rcv_skb(sk,skb)<0) { | 384 | if (sock_queue_rcv_skb(sk,skb)<0) { |
385 | atomic_inc(&sk->sk_drops); | 385 | atomic_inc(&sk->sk_drops); |
386 | kfree_skb(skb); | 386 | kfree_skb(skb); |
387 | return 0; | 387 | return NET_RX_DROP; |
388 | } | 388 | } |
389 | 389 | ||
390 | return 0; | 390 | return 0; |
@@ -429,7 +429,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) | |||
429 | if (skb_checksum_complete(skb)) { | 429 | if (skb_checksum_complete(skb)) { |
430 | atomic_inc(&sk->sk_drops); | 430 | atomic_inc(&sk->sk_drops); |
431 | kfree_skb(skb); | 431 | kfree_skb(skb); |
432 | return 0; | 432 | return NET_RX_DROP; |
433 | } | 433 | } |
434 | } | 434 | } |
435 | 435 | ||
diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c index 7439b63df5d0..cf82acec913a 100644 --- a/net/mac80211/debugfs_key.c +++ b/net/mac80211/debugfs_key.c | |||
@@ -265,7 +265,7 @@ void ieee80211_debugfs_key_add_default(struct ieee80211_sub_if_data *sdata) | |||
265 | key = sdata->default_key; | 265 | key = sdata->default_key; |
266 | if (key) { | 266 | if (key) { |
267 | sprintf(buf, "../keys/%d", key->debugfs.cnt); | 267 | sprintf(buf, "../keys/%d", key->debugfs.cnt); |
268 | sdata->debugfs.default_key = | 268 | sdata->common_debugfs.default_key = |
269 | debugfs_create_symlink("default_key", | 269 | debugfs_create_symlink("default_key", |
270 | sdata->debugfsdir, buf); | 270 | sdata->debugfsdir, buf); |
271 | } else | 271 | } else |
@@ -277,8 +277,8 @@ void ieee80211_debugfs_key_remove_default(struct ieee80211_sub_if_data *sdata) | |||
277 | if (!sdata) | 277 | if (!sdata) |
278 | return; | 278 | return; |
279 | 279 | ||
280 | debugfs_remove(sdata->debugfs.default_key); | 280 | debugfs_remove(sdata->common_debugfs.default_key); |
281 | sdata->debugfs.default_key = NULL; | 281 | sdata->common_debugfs.default_key = NULL; |
282 | } | 282 | } |
283 | 283 | ||
284 | void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, | 284 | void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, |
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 475f89a8aee1..8165df578c92 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c | |||
@@ -248,8 +248,8 @@ IEEE80211_IF_WFILE(min_discovery_timeout, | |||
248 | static void add_sta_files(struct ieee80211_sub_if_data *sdata) | 248 | static void add_sta_files(struct ieee80211_sub_if_data *sdata) |
249 | { | 249 | { |
250 | DEBUGFS_ADD(drop_unencrypted, sta); | 250 | DEBUGFS_ADD(drop_unencrypted, sta); |
251 | DEBUGFS_ADD(force_unicast_rateidx, ap); | 251 | DEBUGFS_ADD(force_unicast_rateidx, sta); |
252 | DEBUGFS_ADD(max_ratectrl_rateidx, ap); | 252 | DEBUGFS_ADD(max_ratectrl_rateidx, sta); |
253 | 253 | ||
254 | DEBUGFS_ADD(state, sta); | 254 | DEBUGFS_ADD(state, sta); |
255 | DEBUGFS_ADD(bssid, sta); | 255 | DEBUGFS_ADD(bssid, sta); |
@@ -283,8 +283,8 @@ static void add_ap_files(struct ieee80211_sub_if_data *sdata) | |||
283 | static void add_wds_files(struct ieee80211_sub_if_data *sdata) | 283 | static void add_wds_files(struct ieee80211_sub_if_data *sdata) |
284 | { | 284 | { |
285 | DEBUGFS_ADD(drop_unencrypted, wds); | 285 | DEBUGFS_ADD(drop_unencrypted, wds); |
286 | DEBUGFS_ADD(force_unicast_rateidx, ap); | 286 | DEBUGFS_ADD(force_unicast_rateidx, wds); |
287 | DEBUGFS_ADD(max_ratectrl_rateidx, ap); | 287 | DEBUGFS_ADD(max_ratectrl_rateidx, wds); |
288 | 288 | ||
289 | DEBUGFS_ADD(peer, wds); | 289 | DEBUGFS_ADD(peer, wds); |
290 | } | 290 | } |
@@ -292,8 +292,8 @@ static void add_wds_files(struct ieee80211_sub_if_data *sdata) | |||
292 | static void add_vlan_files(struct ieee80211_sub_if_data *sdata) | 292 | static void add_vlan_files(struct ieee80211_sub_if_data *sdata) |
293 | { | 293 | { |
294 | DEBUGFS_ADD(drop_unencrypted, vlan); | 294 | DEBUGFS_ADD(drop_unencrypted, vlan); |
295 | DEBUGFS_ADD(force_unicast_rateidx, ap); | 295 | DEBUGFS_ADD(force_unicast_rateidx, vlan); |
296 | DEBUGFS_ADD(max_ratectrl_rateidx, ap); | 296 | DEBUGFS_ADD(max_ratectrl_rateidx, vlan); |
297 | } | 297 | } |
298 | 298 | ||
299 | static void add_monitor_files(struct ieee80211_sub_if_data *sdata) | 299 | static void add_monitor_files(struct ieee80211_sub_if_data *sdata) |
@@ -381,8 +381,8 @@ static void add_files(struct ieee80211_sub_if_data *sdata) | |||
381 | static void del_sta_files(struct ieee80211_sub_if_data *sdata) | 381 | static void del_sta_files(struct ieee80211_sub_if_data *sdata) |
382 | { | 382 | { |
383 | DEBUGFS_DEL(drop_unencrypted, sta); | 383 | DEBUGFS_DEL(drop_unencrypted, sta); |
384 | DEBUGFS_DEL(force_unicast_rateidx, ap); | 384 | DEBUGFS_DEL(force_unicast_rateidx, sta); |
385 | DEBUGFS_DEL(max_ratectrl_rateidx, ap); | 385 | DEBUGFS_DEL(max_ratectrl_rateidx, sta); |
386 | 386 | ||
387 | DEBUGFS_DEL(state, sta); | 387 | DEBUGFS_DEL(state, sta); |
388 | DEBUGFS_DEL(bssid, sta); | 388 | DEBUGFS_DEL(bssid, sta); |
@@ -416,8 +416,8 @@ static void del_ap_files(struct ieee80211_sub_if_data *sdata) | |||
416 | static void del_wds_files(struct ieee80211_sub_if_data *sdata) | 416 | static void del_wds_files(struct ieee80211_sub_if_data *sdata) |
417 | { | 417 | { |
418 | DEBUGFS_DEL(drop_unencrypted, wds); | 418 | DEBUGFS_DEL(drop_unencrypted, wds); |
419 | DEBUGFS_DEL(force_unicast_rateidx, ap); | 419 | DEBUGFS_DEL(force_unicast_rateidx, wds); |
420 | DEBUGFS_DEL(max_ratectrl_rateidx, ap); | 420 | DEBUGFS_DEL(max_ratectrl_rateidx, wds); |
421 | 421 | ||
422 | DEBUGFS_DEL(peer, wds); | 422 | DEBUGFS_DEL(peer, wds); |
423 | } | 423 | } |
@@ -425,8 +425,8 @@ static void del_wds_files(struct ieee80211_sub_if_data *sdata) | |||
425 | static void del_vlan_files(struct ieee80211_sub_if_data *sdata) | 425 | static void del_vlan_files(struct ieee80211_sub_if_data *sdata) |
426 | { | 426 | { |
427 | DEBUGFS_DEL(drop_unencrypted, vlan); | 427 | DEBUGFS_DEL(drop_unencrypted, vlan); |
428 | DEBUGFS_DEL(force_unicast_rateidx, ap); | 428 | DEBUGFS_DEL(force_unicast_rateidx, vlan); |
429 | DEBUGFS_DEL(max_ratectrl_rateidx, ap); | 429 | DEBUGFS_DEL(max_ratectrl_rateidx, vlan); |
430 | } | 430 | } |
431 | 431 | ||
432 | static void del_monitor_files(struct ieee80211_sub_if_data *sdata) | 432 | static void del_monitor_files(struct ieee80211_sub_if_data *sdata) |
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index ec59345af65b..4498d8713652 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -470,6 +470,8 @@ struct ieee80211_sub_if_data { | |||
470 | struct dentry *auth_transaction; | 470 | struct dentry *auth_transaction; |
471 | struct dentry *flags; | 471 | struct dentry *flags; |
472 | struct dentry *num_beacons_sta; | 472 | struct dentry *num_beacons_sta; |
473 | struct dentry *force_unicast_rateidx; | ||
474 | struct dentry *max_ratectrl_rateidx; | ||
473 | } sta; | 475 | } sta; |
474 | struct { | 476 | struct { |
475 | struct dentry *drop_unencrypted; | 477 | struct dentry *drop_unencrypted; |
@@ -483,15 +485,21 @@ struct ieee80211_sub_if_data { | |||
483 | struct { | 485 | struct { |
484 | struct dentry *drop_unencrypted; | 486 | struct dentry *drop_unencrypted; |
485 | struct dentry *peer; | 487 | struct dentry *peer; |
488 | struct dentry *force_unicast_rateidx; | ||
489 | struct dentry *max_ratectrl_rateidx; | ||
486 | } wds; | 490 | } wds; |
487 | struct { | 491 | struct { |
488 | struct dentry *drop_unencrypted; | 492 | struct dentry *drop_unencrypted; |
493 | struct dentry *force_unicast_rateidx; | ||
494 | struct dentry *max_ratectrl_rateidx; | ||
489 | } vlan; | 495 | } vlan; |
490 | struct { | 496 | struct { |
491 | struct dentry *mode; | 497 | struct dentry *mode; |
492 | } monitor; | 498 | } monitor; |
493 | struct dentry *default_key; | ||
494 | } debugfs; | 499 | } debugfs; |
500 | struct { | ||
501 | struct dentry *default_key; | ||
502 | } common_debugfs; | ||
495 | 503 | ||
496 | #ifdef CONFIG_MAC80211_MESH | 504 | #ifdef CONFIG_MAC80211_MESH |
497 | struct dentry *mesh_stats_dir; | 505 | struct dentry *mesh_stats_dir; |
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index b5933b271491..35f2f95f2fa7 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
@@ -383,7 +383,7 @@ errcopy: | |||
383 | hlist_for_each_safe(p, q, &newtbl->hash_buckets[i]) | 383 | hlist_for_each_safe(p, q, &newtbl->hash_buckets[i]) |
384 | tbl->free_node(p, 0); | 384 | tbl->free_node(p, 0); |
385 | } | 385 | } |
386 | __mesh_table_free(tbl); | 386 | __mesh_table_free(newtbl); |
387 | endgrow: | 387 | endgrow: |
388 | return NULL; | 388 | return NULL; |
389 | } | 389 | } |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 1e97fb9fb34b..9bb68c6a8f44 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -478,51 +478,21 @@ int ieee80211_ht_addt_info_ie_to_ht_bss_info( | |||
478 | static void ieee80211_sta_send_associnfo(struct net_device *dev, | 478 | static void ieee80211_sta_send_associnfo(struct net_device *dev, |
479 | struct ieee80211_if_sta *ifsta) | 479 | struct ieee80211_if_sta *ifsta) |
480 | { | 480 | { |
481 | char *buf; | ||
482 | size_t len; | ||
483 | int i; | ||
484 | union iwreq_data wrqu; | 481 | union iwreq_data wrqu; |
485 | 482 | ||
486 | if (!ifsta->assocreq_ies && !ifsta->assocresp_ies) | ||
487 | return; | ||
488 | |||
489 | buf = kmalloc(50 + 2 * (ifsta->assocreq_ies_len + | ||
490 | ifsta->assocresp_ies_len), GFP_KERNEL); | ||
491 | if (!buf) | ||
492 | return; | ||
493 | |||
494 | len = sprintf(buf, "ASSOCINFO("); | ||
495 | if (ifsta->assocreq_ies) { | 483 | if (ifsta->assocreq_ies) { |
496 | len += sprintf(buf + len, "ReqIEs="); | 484 | memset(&wrqu, 0, sizeof(wrqu)); |
497 | for (i = 0; i < ifsta->assocreq_ies_len; i++) { | 485 | wrqu.data.length = ifsta->assocreq_ies_len; |
498 | len += sprintf(buf + len, "%02x", | 486 | wireless_send_event(dev, IWEVASSOCREQIE, &wrqu, |
499 | ifsta->assocreq_ies[i]); | 487 | ifsta->assocreq_ies); |
500 | } | ||
501 | } | 488 | } |
502 | if (ifsta->assocresp_ies) { | ||
503 | if (ifsta->assocreq_ies) | ||
504 | len += sprintf(buf + len, " "); | ||
505 | len += sprintf(buf + len, "RespIEs="); | ||
506 | for (i = 0; i < ifsta->assocresp_ies_len; i++) { | ||
507 | len += sprintf(buf + len, "%02x", | ||
508 | ifsta->assocresp_ies[i]); | ||
509 | } | ||
510 | } | ||
511 | len += sprintf(buf + len, ")"); | ||
512 | 489 | ||
513 | if (len > IW_CUSTOM_MAX) { | 490 | if (ifsta->assocresp_ies) { |
514 | len = sprintf(buf, "ASSOCRESPIE="); | 491 | memset(&wrqu, 0, sizeof(wrqu)); |
515 | for (i = 0; i < ifsta->assocresp_ies_len; i++) { | 492 | wrqu.data.length = ifsta->assocresp_ies_len; |
516 | len += sprintf(buf + len, "%02x", | 493 | wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu, |
517 | ifsta->assocresp_ies[i]); | 494 | ifsta->assocresp_ies); |
518 | } | ||
519 | } | 495 | } |
520 | |||
521 | memset(&wrqu, 0, sizeof(wrqu)); | ||
522 | wrqu.data.length = len; | ||
523 | wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); | ||
524 | |||
525 | kfree(buf); | ||
526 | } | 496 | } |
527 | 497 | ||
528 | 498 | ||
@@ -813,7 +783,7 @@ static void ieee80211_send_assoc(struct net_device *dev, | |||
813 | } | 783 | } |
814 | } | 784 | } |
815 | 785 | ||
816 | if (count == 8) { | 786 | if (rates_len > count) { |
817 | pos = skb_put(skb, rates_len - count + 2); | 787 | pos = skb_put(skb, rates_len - count + 2); |
818 | *pos++ = WLAN_EID_EXT_SUPP_RATES; | 788 | *pos++ = WLAN_EID_EXT_SUPP_RATES; |
819 | *pos++ = rates_len - count; | 789 | *pos++ = rates_len - count; |
@@ -2868,7 +2838,7 @@ static void ieee80211_rx_bss_info(struct net_device *dev, | |||
2868 | jiffies); | 2838 | jiffies); |
2869 | #endif /* CONFIG_MAC80211_IBSS_DEBUG */ | 2839 | #endif /* CONFIG_MAC80211_IBSS_DEBUG */ |
2870 | if (beacon_timestamp > rx_timestamp) { | 2840 | if (beacon_timestamp > rx_timestamp) { |
2871 | #ifndef CONFIG_MAC80211_IBSS_DEBUG | 2841 | #ifdef CONFIG_MAC80211_IBSS_DEBUG |
2872 | printk(KERN_DEBUG "%s: beacon TSF higher than " | 2842 | printk(KERN_DEBUG "%s: beacon TSF higher than " |
2873 | "local TSF - IBSS merge with BSSID %s\n", | 2843 | "local TSF - IBSS merge with BSSID %s\n", |
2874 | dev->name, print_mac(mac, mgmt->bssid)); | 2844 | dev->name, print_mac(mac, mgmt->bssid)); |
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 35a9994e2339..74aecc098bad 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
@@ -377,7 +377,7 @@ static ssize_t rfkill_claim_show(struct device *dev, | |||
377 | { | 377 | { |
378 | struct rfkill *rfkill = to_rfkill(dev); | 378 | struct rfkill *rfkill = to_rfkill(dev); |
379 | 379 | ||
380 | return sprintf(buf, "%d", rfkill->user_claim); | 380 | return sprintf(buf, "%d\n", rfkill->user_claim); |
381 | } | 381 | } |
382 | 382 | ||
383 | static ssize_t rfkill_claim_store(struct device *dev, | 383 | static ssize_t rfkill_claim_store(struct device *dev, |
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 5cafdd4c8018..8eb79e92e94c 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
@@ -205,7 +205,7 @@ replay: | |||
205 | } | 205 | } |
206 | } | 206 | } |
207 | 207 | ||
208 | root_lock = qdisc_root_lock(q); | 208 | root_lock = qdisc_root_sleeping_lock(q); |
209 | 209 | ||
210 | if (tp == NULL) { | 210 | if (tp == NULL) { |
211 | /* Proto-tcf does not exist, create new one */ | 211 | /* Proto-tcf does not exist, create new one */ |
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index 481260a4f10f..e3d8455eebc2 100644 --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c | |||
@@ -75,7 +75,7 @@ static __inline__ int route4_fastmap_hash(u32 id, int iif) | |||
75 | static inline | 75 | static inline |
76 | void route4_reset_fastmap(struct Qdisc *q, struct route4_head *head, u32 id) | 76 | void route4_reset_fastmap(struct Qdisc *q, struct route4_head *head, u32 id) |
77 | { | 77 | { |
78 | spinlock_t *root_lock = qdisc_root_lock(q); | 78 | spinlock_t *root_lock = qdisc_root_sleeping_lock(q); |
79 | 79 | ||
80 | spin_lock_bh(root_lock); | 80 | spin_lock_bh(root_lock); |
81 | memset(head->fastmap, 0, sizeof(head->fastmap)); | 81 | memset(head->fastmap, 0, sizeof(head->fastmap)); |
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index e7fb9e0d21b4..1122c952aa99 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -624,7 +624,7 @@ static struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue, | |||
624 | struct Qdisc *oqdisc = dev_queue->qdisc_sleeping; | 624 | struct Qdisc *oqdisc = dev_queue->qdisc_sleeping; |
625 | spinlock_t *root_lock; | 625 | spinlock_t *root_lock; |
626 | 626 | ||
627 | root_lock = qdisc_root_lock(oqdisc); | 627 | root_lock = qdisc_lock(oqdisc); |
628 | spin_lock_bh(root_lock); | 628 | spin_lock_bh(root_lock); |
629 | 629 | ||
630 | /* Prune old scheduler */ | 630 | /* Prune old scheduler */ |
@@ -635,7 +635,7 @@ static struct Qdisc *dev_graft_qdisc(struct netdev_queue *dev_queue, | |||
635 | if (qdisc == NULL) | 635 | if (qdisc == NULL) |
636 | qdisc = &noop_qdisc; | 636 | qdisc = &noop_qdisc; |
637 | dev_queue->qdisc_sleeping = qdisc; | 637 | dev_queue->qdisc_sleeping = qdisc; |
638 | dev_queue->qdisc = &noop_qdisc; | 638 | rcu_assign_pointer(dev_queue->qdisc, &noop_qdisc); |
639 | 639 | ||
640 | spin_unlock_bh(root_lock); | 640 | spin_unlock_bh(root_lock); |
641 | 641 | ||
@@ -830,9 +830,16 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, | |||
830 | sch->stab = stab; | 830 | sch->stab = stab; |
831 | } | 831 | } |
832 | if (tca[TCA_RATE]) { | 832 | if (tca[TCA_RATE]) { |
833 | spinlock_t *root_lock; | ||
834 | |||
835 | if ((sch->parent != TC_H_ROOT) && | ||
836 | !(sch->flags & TCQ_F_INGRESS)) | ||
837 | root_lock = qdisc_root_sleeping_lock(sch); | ||
838 | else | ||
839 | root_lock = qdisc_lock(sch); | ||
840 | |||
833 | err = gen_new_estimator(&sch->bstats, &sch->rate_est, | 841 | err = gen_new_estimator(&sch->bstats, &sch->rate_est, |
834 | qdisc_root_lock(sch), | 842 | root_lock, tca[TCA_RATE]); |
835 | tca[TCA_RATE]); | ||
836 | if (err) { | 843 | if (err) { |
837 | /* | 844 | /* |
838 | * Any broken qdiscs that would require | 845 | * Any broken qdiscs that would require |
@@ -884,7 +891,8 @@ static int qdisc_change(struct Qdisc *sch, struct nlattr **tca) | |||
884 | 891 | ||
885 | if (tca[TCA_RATE]) | 892 | if (tca[TCA_RATE]) |
886 | gen_replace_estimator(&sch->bstats, &sch->rate_est, | 893 | gen_replace_estimator(&sch->bstats, &sch->rate_est, |
887 | qdisc_root_lock(sch), tca[TCA_RATE]); | 894 | qdisc_root_sleeping_lock(sch), |
895 | tca[TCA_RATE]); | ||
888 | return 0; | 896 | return 0; |
889 | } | 897 | } |
890 | 898 | ||
@@ -1161,8 +1169,8 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, | |||
1161 | if (q->stab && qdisc_dump_stab(skb, q->stab) < 0) | 1169 | if (q->stab && qdisc_dump_stab(skb, q->stab) < 0) |
1162 | goto nla_put_failure; | 1170 | goto nla_put_failure; |
1163 | 1171 | ||
1164 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, | 1172 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, TCA_XSTATS, |
1165 | TCA_XSTATS, qdisc_root_lock(q), &d) < 0) | 1173 | qdisc_root_sleeping_lock(q), &d) < 0) |
1166 | goto nla_put_failure; | 1174 | goto nla_put_failure; |
1167 | 1175 | ||
1168 | if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0) | 1176 | if (q->ops->dump_stats && q->ops->dump_stats(q, &d) < 0) |
@@ -1453,8 +1461,8 @@ static int tc_fill_tclass(struct sk_buff *skb, struct Qdisc *q, | |||
1453 | if (cl_ops->dump && cl_ops->dump(q, cl, skb, tcm) < 0) | 1461 | if (cl_ops->dump && cl_ops->dump(q, cl, skb, tcm) < 0) |
1454 | goto nla_put_failure; | 1462 | goto nla_put_failure; |
1455 | 1463 | ||
1456 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, | 1464 | if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS, TCA_XSTATS, |
1457 | TCA_XSTATS, qdisc_root_lock(q), &d) < 0) | 1465 | qdisc_root_sleeping_lock(q), &d) < 0) |
1458 | goto nla_put_failure; | 1466 | goto nla_put_failure; |
1459 | 1467 | ||
1460 | if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0) | 1468 | if (cl_ops->dump_stats && cl_ops->dump_stats(q, cl, &d) < 0) |
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 8fa90d68ec6d..8b06fa900482 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c | |||
@@ -1754,7 +1754,7 @@ static void cbq_put(struct Qdisc *sch, unsigned long arg) | |||
1754 | 1754 | ||
1755 | if (--cl->refcnt == 0) { | 1755 | if (--cl->refcnt == 0) { |
1756 | #ifdef CONFIG_NET_CLS_ACT | 1756 | #ifdef CONFIG_NET_CLS_ACT |
1757 | spinlock_t *root_lock = qdisc_root_lock(sch); | 1757 | spinlock_t *root_lock = qdisc_root_sleeping_lock(sch); |
1758 | struct cbq_sched_data *q = qdisc_priv(sch); | 1758 | struct cbq_sched_data *q = qdisc_priv(sch); |
1759 | 1759 | ||
1760 | spin_lock_bh(root_lock); | 1760 | spin_lock_bh(root_lock); |
@@ -1839,7 +1839,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t | |||
1839 | 1839 | ||
1840 | if (tca[TCA_RATE]) | 1840 | if (tca[TCA_RATE]) |
1841 | gen_replace_estimator(&cl->bstats, &cl->rate_est, | 1841 | gen_replace_estimator(&cl->bstats, &cl->rate_est, |
1842 | qdisc_root_lock(sch), | 1842 | qdisc_root_sleeping_lock(sch), |
1843 | tca[TCA_RATE]); | 1843 | tca[TCA_RATE]); |
1844 | return 0; | 1844 | return 0; |
1845 | } | 1845 | } |
@@ -1930,7 +1930,7 @@ cbq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, struct nlattr **t | |||
1930 | 1930 | ||
1931 | if (tca[TCA_RATE]) | 1931 | if (tca[TCA_RATE]) |
1932 | gen_new_estimator(&cl->bstats, &cl->rate_est, | 1932 | gen_new_estimator(&cl->bstats, &cl->rate_est, |
1933 | qdisc_root_lock(sch), tca[TCA_RATE]); | 1933 | qdisc_root_sleeping_lock(sch), tca[TCA_RATE]); |
1934 | 1934 | ||
1935 | *arg = (unsigned long)cl; | 1935 | *arg = (unsigned long)cl; |
1936 | return 0; | 1936 | return 0; |
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 5f0ade7806a7..9634091ee2f0 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
@@ -634,7 +634,7 @@ static void dev_deactivate_queue(struct net_device *dev, | |||
634 | if (!(qdisc->flags & TCQ_F_BUILTIN)) | 634 | if (!(qdisc->flags & TCQ_F_BUILTIN)) |
635 | set_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state); | 635 | set_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state); |
636 | 636 | ||
637 | dev_queue->qdisc = qdisc_default; | 637 | rcu_assign_pointer(dev_queue->qdisc, qdisc_default); |
638 | qdisc_reset(qdisc); | 638 | qdisc_reset(qdisc); |
639 | 639 | ||
640 | spin_unlock_bh(qdisc_lock(qdisc)); | 640 | spin_unlock_bh(qdisc_lock(qdisc)); |
@@ -709,7 +709,7 @@ static void shutdown_scheduler_queue(struct net_device *dev, | |||
709 | struct Qdisc *qdisc_default = _qdisc_default; | 709 | struct Qdisc *qdisc_default = _qdisc_default; |
710 | 710 | ||
711 | if (qdisc) { | 711 | if (qdisc) { |
712 | dev_queue->qdisc = qdisc_default; | 712 | rcu_assign_pointer(dev_queue->qdisc, qdisc_default); |
713 | dev_queue->qdisc_sleeping = qdisc_default; | 713 | dev_queue->qdisc_sleeping = qdisc_default; |
714 | 714 | ||
715 | qdisc_destroy(qdisc); | 715 | qdisc_destroy(qdisc); |
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index c2b8d9cce3d2..c1e77da8cd09 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c | |||
@@ -1045,7 +1045,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid, | |||
1045 | 1045 | ||
1046 | if (tca[TCA_RATE]) | 1046 | if (tca[TCA_RATE]) |
1047 | gen_replace_estimator(&cl->bstats, &cl->rate_est, | 1047 | gen_replace_estimator(&cl->bstats, &cl->rate_est, |
1048 | qdisc_root_lock(sch), | 1048 | qdisc_root_sleeping_lock(sch), |
1049 | tca[TCA_RATE]); | 1049 | tca[TCA_RATE]); |
1050 | return 0; | 1050 | return 0; |
1051 | } | 1051 | } |
@@ -1104,7 +1104,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid, | |||
1104 | 1104 | ||
1105 | if (tca[TCA_RATE]) | 1105 | if (tca[TCA_RATE]) |
1106 | gen_new_estimator(&cl->bstats, &cl->rate_est, | 1106 | gen_new_estimator(&cl->bstats, &cl->rate_est, |
1107 | qdisc_root_lock(sch), tca[TCA_RATE]); | 1107 | qdisc_root_sleeping_lock(sch), tca[TCA_RATE]); |
1108 | *arg = (unsigned long)cl; | 1108 | *arg = (unsigned long)cl; |
1109 | return 0; | 1109 | return 0; |
1110 | } | 1110 | } |
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 0df0df202ed0..d14f02056ae6 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -1043,7 +1043,7 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt) | |||
1043 | 1043 | ||
1044 | static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) | 1044 | static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) |
1045 | { | 1045 | { |
1046 | spinlock_t *root_lock = qdisc_root_lock(sch); | 1046 | spinlock_t *root_lock = qdisc_root_sleeping_lock(sch); |
1047 | struct htb_sched *q = qdisc_priv(sch); | 1047 | struct htb_sched *q = qdisc_priv(sch); |
1048 | struct nlattr *nest; | 1048 | struct nlattr *nest; |
1049 | struct tc_htb_glob gopt; | 1049 | struct tc_htb_glob gopt; |
@@ -1075,7 +1075,7 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg, | |||
1075 | struct sk_buff *skb, struct tcmsg *tcm) | 1075 | struct sk_buff *skb, struct tcmsg *tcm) |
1076 | { | 1076 | { |
1077 | struct htb_class *cl = (struct htb_class *)arg; | 1077 | struct htb_class *cl = (struct htb_class *)arg; |
1078 | spinlock_t *root_lock = qdisc_root_lock(sch); | 1078 | spinlock_t *root_lock = qdisc_root_sleeping_lock(sch); |
1079 | struct nlattr *nest; | 1079 | struct nlattr *nest; |
1080 | struct tc_htb_opt opt; | 1080 | struct tc_htb_opt opt; |
1081 | 1081 | ||
@@ -1372,7 +1372,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, | |||
1372 | goto failure; | 1372 | goto failure; |
1373 | 1373 | ||
1374 | gen_new_estimator(&cl->bstats, &cl->rate_est, | 1374 | gen_new_estimator(&cl->bstats, &cl->rate_est, |
1375 | qdisc_root_lock(sch), | 1375 | qdisc_root_sleeping_lock(sch), |
1376 | tca[TCA_RATE] ? : &est.nla); | 1376 | tca[TCA_RATE] ? : &est.nla); |
1377 | cl->refcnt = 1; | 1377 | cl->refcnt = 1; |
1378 | cl->children = 0; | 1378 | cl->children = 0; |
@@ -1427,7 +1427,7 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, | |||
1427 | } else { | 1427 | } else { |
1428 | if (tca[TCA_RATE]) | 1428 | if (tca[TCA_RATE]) |
1429 | gen_replace_estimator(&cl->bstats, &cl->rate_est, | 1429 | gen_replace_estimator(&cl->bstats, &cl->rate_est, |
1430 | qdisc_root_lock(sch), | 1430 | qdisc_root_sleeping_lock(sch), |
1431 | tca[TCA_RATE]); | 1431 | tca[TCA_RATE]); |
1432 | sch_tree_lock(sch); | 1432 | sch_tree_lock(sch); |
1433 | } | 1433 | } |
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index fb0294d0b55e..3781e55046d0 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c | |||
@@ -341,7 +341,7 @@ static int get_dist_table(struct Qdisc *sch, const struct nlattr *attr) | |||
341 | for (i = 0; i < n; i++) | 341 | for (i = 0; i < n; i++) |
342 | d->table[i] = data[i]; | 342 | d->table[i] = data[i]; |
343 | 343 | ||
344 | root_lock = qdisc_root_lock(sch); | 344 | root_lock = qdisc_root_sleeping_lock(sch); |
345 | 345 | ||
346 | spin_lock_bh(root_lock); | 346 | spin_lock_bh(root_lock); |
347 | d = xchg(&q->delay_dist, d); | 347 | d = xchg(&q->delay_dist, d); |
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 2c35c678563b..d35ef059abb1 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
@@ -161,7 +161,7 @@ teql_destroy(struct Qdisc* sch) | |||
161 | txq = netdev_get_tx_queue(master->dev, 0); | 161 | txq = netdev_get_tx_queue(master->dev, 0); |
162 | master->slaves = NULL; | 162 | master->slaves = NULL; |
163 | 163 | ||
164 | root_lock = qdisc_root_lock(txq->qdisc); | 164 | root_lock = qdisc_root_sleeping_lock(txq->qdisc); |
165 | spin_lock_bh(root_lock); | 165 | spin_lock_bh(root_lock); |
166 | qdisc_reset(txq->qdisc); | 166 | qdisc_reset(txq->qdisc); |
167 | spin_unlock_bh(root_lock); | 167 | spin_unlock_bh(root_lock); |
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 1fcb4cf2f4c9..52db5f60daa0 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c | |||
@@ -786,6 +786,9 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep, | |||
786 | for (i = 0; i < hmacs->shmac_num_idents; i++) { | 786 | for (i = 0; i < hmacs->shmac_num_idents; i++) { |
787 | id = hmacs->shmac_idents[i]; | 787 | id = hmacs->shmac_idents[i]; |
788 | 788 | ||
789 | if (id > SCTP_AUTH_HMAC_ID_MAX) | ||
790 | return -EOPNOTSUPP; | ||
791 | |||
789 | if (SCTP_AUTH_HMAC_ID_SHA1 == id) | 792 | if (SCTP_AUTH_HMAC_ID_SHA1 == id) |
790 | has_sha1 = 1; | 793 | has_sha1 = 1; |
791 | 794 | ||
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index afa952e726d7..5ffb9dec1c3f 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -3086,6 +3086,7 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk, | |||
3086 | int optlen) | 3086 | int optlen) |
3087 | { | 3087 | { |
3088 | struct sctp_hmacalgo *hmacs; | 3088 | struct sctp_hmacalgo *hmacs; |
3089 | u32 idents; | ||
3089 | int err; | 3090 | int err; |
3090 | 3091 | ||
3091 | if (!sctp_auth_enable) | 3092 | if (!sctp_auth_enable) |
@@ -3103,8 +3104,9 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk, | |||
3103 | goto out; | 3104 | goto out; |
3104 | } | 3105 | } |
3105 | 3106 | ||
3106 | if (hmacs->shmac_num_idents == 0 || | 3107 | idents = hmacs->shmac_num_idents; |
3107 | hmacs->shmac_num_idents > SCTP_AUTH_NUM_HMACS) { | 3108 | if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS || |
3109 | (idents * sizeof(u16)) > (optlen - sizeof(struct sctp_hmacalgo))) { | ||
3108 | err = -EINVAL; | 3110 | err = -EINVAL; |
3109 | goto out; | 3111 | goto out; |
3110 | } | 3112 | } |
@@ -3144,7 +3146,7 @@ static int sctp_setsockopt_auth_key(struct sock *sk, | |||
3144 | goto out; | 3146 | goto out; |
3145 | } | 3147 | } |
3146 | 3148 | ||
3147 | if (authkey->sca_keylength > optlen) { | 3149 | if (authkey->sca_keylength > optlen - sizeof(struct sctp_authkey)) { |
3148 | ret = -EINVAL; | 3150 | ret = -EINVAL; |
3149 | goto out; | 3151 | goto out; |
3150 | } | 3152 | } |
diff --git a/net/sunrpc/sysctl.c b/net/sunrpc/sysctl.c index 0f8c439b848a..5231f7aaac0e 100644 --- a/net/sunrpc/sysctl.c +++ b/net/sunrpc/sysctl.c | |||
@@ -60,24 +60,14 @@ static int proc_do_xprt(ctl_table *table, int write, struct file *file, | |||
60 | void __user *buffer, size_t *lenp, loff_t *ppos) | 60 | void __user *buffer, size_t *lenp, loff_t *ppos) |
61 | { | 61 | { |
62 | char tmpbuf[256]; | 62 | char tmpbuf[256]; |
63 | int len; | 63 | size_t len; |
64 | |||
64 | if ((*ppos && !write) || !*lenp) { | 65 | if ((*ppos && !write) || !*lenp) { |
65 | *lenp = 0; | 66 | *lenp = 0; |
66 | return 0; | 67 | return 0; |
67 | } | 68 | } |
68 | if (write) | 69 | len = svc_print_xprts(tmpbuf, sizeof(tmpbuf)); |
69 | return -EINVAL; | 70 | return simple_read_from_buffer(buffer, *lenp, ppos, tmpbuf, len); |
70 | else { | ||
71 | len = svc_print_xprts(tmpbuf, sizeof(tmpbuf)); | ||
72 | if (!access_ok(VERIFY_WRITE, buffer, len)) | ||
73 | return -EFAULT; | ||
74 | |||
75 | if (__copy_to_user(buffer, tmpbuf, len)) | ||
76 | return -EFAULT; | ||
77 | } | ||
78 | *lenp -= len; | ||
79 | *ppos += len; | ||
80 | return 0; | ||
81 | } | 71 | } |
82 | 72 | ||
83 | static int | 73 | static int |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index b4b17f44cb29..74de31a06616 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | |||
@@ -443,18 +443,18 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp) | |||
443 | 443 | ||
444 | dprintk("svcrdma: rqstp=%p\n", rqstp); | 444 | dprintk("svcrdma: rqstp=%p\n", rqstp); |
445 | 445 | ||
446 | spin_lock_bh(&rdma_xprt->sc_read_complete_lock); | 446 | spin_lock_bh(&rdma_xprt->sc_rq_dto_lock); |
447 | if (!list_empty(&rdma_xprt->sc_read_complete_q)) { | 447 | if (!list_empty(&rdma_xprt->sc_read_complete_q)) { |
448 | ctxt = list_entry(rdma_xprt->sc_read_complete_q.next, | 448 | ctxt = list_entry(rdma_xprt->sc_read_complete_q.next, |
449 | struct svc_rdma_op_ctxt, | 449 | struct svc_rdma_op_ctxt, |
450 | dto_q); | 450 | dto_q); |
451 | list_del_init(&ctxt->dto_q); | 451 | list_del_init(&ctxt->dto_q); |
452 | } | 452 | } |
453 | spin_unlock_bh(&rdma_xprt->sc_read_complete_lock); | 453 | if (ctxt) { |
454 | if (ctxt) | 454 | spin_unlock_bh(&rdma_xprt->sc_rq_dto_lock); |
455 | return rdma_read_complete(rqstp, ctxt); | 455 | return rdma_read_complete(rqstp, ctxt); |
456 | } | ||
456 | 457 | ||
457 | spin_lock_bh(&rdma_xprt->sc_rq_dto_lock); | ||
458 | if (!list_empty(&rdma_xprt->sc_rq_dto_q)) { | 458 | if (!list_empty(&rdma_xprt->sc_rq_dto_q)) { |
459 | ctxt = list_entry(rdma_xprt->sc_rq_dto_q.next, | 459 | ctxt = list_entry(rdma_xprt->sc_rq_dto_q.next, |
460 | struct svc_rdma_op_ctxt, | 460 | struct svc_rdma_op_ctxt, |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 19ddc382b777..900cb69728c6 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c | |||
@@ -359,11 +359,11 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt) | |||
359 | if (test_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags)) { | 359 | if (test_bit(RDMACTXT_F_LAST_CTXT, &ctxt->flags)) { |
360 | struct svc_rdma_op_ctxt *read_hdr = ctxt->read_hdr; | 360 | struct svc_rdma_op_ctxt *read_hdr = ctxt->read_hdr; |
361 | BUG_ON(!read_hdr); | 361 | BUG_ON(!read_hdr); |
362 | spin_lock_bh(&xprt->sc_rq_dto_lock); | ||
362 | set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); | 363 | set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags); |
363 | spin_lock_bh(&xprt->sc_read_complete_lock); | ||
364 | list_add_tail(&read_hdr->dto_q, | 364 | list_add_tail(&read_hdr->dto_q, |
365 | &xprt->sc_read_complete_q); | 365 | &xprt->sc_read_complete_q); |
366 | spin_unlock_bh(&xprt->sc_read_complete_lock); | 366 | spin_unlock_bh(&xprt->sc_rq_dto_lock); |
367 | svc_xprt_enqueue(&xprt->sc_xprt); | 367 | svc_xprt_enqueue(&xprt->sc_xprt); |
368 | } | 368 | } |
369 | svc_rdma_put_context(ctxt, 0); | 369 | svc_rdma_put_context(ctxt, 0); |
@@ -428,7 +428,6 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv, | |||
428 | init_waitqueue_head(&cma_xprt->sc_send_wait); | 428 | init_waitqueue_head(&cma_xprt->sc_send_wait); |
429 | 429 | ||
430 | spin_lock_init(&cma_xprt->sc_lock); | 430 | spin_lock_init(&cma_xprt->sc_lock); |
431 | spin_lock_init(&cma_xprt->sc_read_complete_lock); | ||
432 | spin_lock_init(&cma_xprt->sc_rq_dto_lock); | 431 | spin_lock_init(&cma_xprt->sc_rq_dto_lock); |
433 | 432 | ||
434 | cma_xprt->sc_ord = svcrdma_ord; | 433 | cma_xprt->sc_ord = svcrdma_ord; |
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig index ab015c62d561..833b024f8f66 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig | |||
@@ -39,4 +39,5 @@ config WIRELESS_EXT_SYSFS | |||
39 | files in /sys/class/net/*/wireless/. The same information | 39 | files in /sys/class/net/*/wireless/. The same information |
40 | is available via the ioctls as well. | 40 | is available via the ioctls as well. |
41 | 41 | ||
42 | Say Y if you have programs using it (we don't know of any). | 42 | Say Y if you have programs using it, like old versions of |
43 | hal. | ||
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 841b32a2e680..46914b79d850 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -1731,8 +1731,7 @@ restart: | |||
1731 | * We can't enlist stable bundles either. | 1731 | * We can't enlist stable bundles either. |
1732 | */ | 1732 | */ |
1733 | write_unlock_bh(&policy->lock); | 1733 | write_unlock_bh(&policy->lock); |
1734 | if (dst) | 1734 | dst_free(dst); |
1735 | dst_free(dst); | ||
1736 | 1735 | ||
1737 | if (pol_dead) | 1736 | if (pol_dead) |
1738 | XFRM_INC_STATS(LINUX_MIB_XFRMOUTPOLDEAD); | 1737 | XFRM_INC_STATS(LINUX_MIB_XFRMOUTPOLDEAD); |
@@ -1748,8 +1747,7 @@ restart: | |||
1748 | err = xfrm_dst_update_origin(dst, fl); | 1747 | err = xfrm_dst_update_origin(dst, fl); |
1749 | if (unlikely(err)) { | 1748 | if (unlikely(err)) { |
1750 | write_unlock_bh(&policy->lock); | 1749 | write_unlock_bh(&policy->lock); |
1751 | if (dst) | 1750 | dst_free(dst); |
1752 | dst_free(dst); | ||
1753 | XFRM_INC_STATS(LINUX_MIB_XFRMOUTBUNDLECHECKERROR); | 1751 | XFRM_INC_STATS(LINUX_MIB_XFRMOUTBUNDLECHECKERROR); |
1754 | goto error; | 1752 | goto error; |
1755 | } | 1753 | } |
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 4c6914ef7d92..7bd62f61593f 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -780,11 +780,13 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
780 | { | 780 | { |
781 | unsigned int h; | 781 | unsigned int h; |
782 | struct hlist_node *entry; | 782 | struct hlist_node *entry; |
783 | struct xfrm_state *x, *x0; | 783 | struct xfrm_state *x, *x0, *to_put; |
784 | int acquire_in_progress = 0; | 784 | int acquire_in_progress = 0; |
785 | int error = 0; | 785 | int error = 0; |
786 | struct xfrm_state *best = NULL; | 786 | struct xfrm_state *best = NULL; |
787 | 787 | ||
788 | to_put = NULL; | ||
789 | |||
788 | spin_lock_bh(&xfrm_state_lock); | 790 | spin_lock_bh(&xfrm_state_lock); |
789 | h = xfrm_dst_hash(daddr, saddr, tmpl->reqid, family); | 791 | h = xfrm_dst_hash(daddr, saddr, tmpl->reqid, family); |
790 | hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) { | 792 | hlist_for_each_entry(x, entry, xfrm_state_bydst+h, bydst) { |
@@ -833,7 +835,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
833 | if (tmpl->id.spi && | 835 | if (tmpl->id.spi && |
834 | (x0 = __xfrm_state_lookup(daddr, tmpl->id.spi, | 836 | (x0 = __xfrm_state_lookup(daddr, tmpl->id.spi, |
835 | tmpl->id.proto, family)) != NULL) { | 837 | tmpl->id.proto, family)) != NULL) { |
836 | xfrm_state_put(x0); | 838 | to_put = x0; |
837 | error = -EEXIST; | 839 | error = -EEXIST; |
838 | goto out; | 840 | goto out; |
839 | } | 841 | } |
@@ -849,7 +851,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
849 | error = security_xfrm_state_alloc_acquire(x, pol->security, fl->secid); | 851 | error = security_xfrm_state_alloc_acquire(x, pol->security, fl->secid); |
850 | if (error) { | 852 | if (error) { |
851 | x->km.state = XFRM_STATE_DEAD; | 853 | x->km.state = XFRM_STATE_DEAD; |
852 | xfrm_state_put(x); | 854 | to_put = x; |
853 | x = NULL; | 855 | x = NULL; |
854 | goto out; | 856 | goto out; |
855 | } | 857 | } |
@@ -870,7 +872,7 @@ xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, | |||
870 | xfrm_hash_grow_check(x->bydst.next != NULL); | 872 | xfrm_hash_grow_check(x->bydst.next != NULL); |
871 | } else { | 873 | } else { |
872 | x->km.state = XFRM_STATE_DEAD; | 874 | x->km.state = XFRM_STATE_DEAD; |
873 | xfrm_state_put(x); | 875 | to_put = x; |
874 | x = NULL; | 876 | x = NULL; |
875 | error = -ESRCH; | 877 | error = -ESRCH; |
876 | } | 878 | } |
@@ -881,6 +883,8 @@ out: | |||
881 | else | 883 | else |
882 | *err = acquire_in_progress ? -EAGAIN : error; | 884 | *err = acquire_in_progress ? -EAGAIN : error; |
883 | spin_unlock_bh(&xfrm_state_lock); | 885 | spin_unlock_bh(&xfrm_state_lock); |
886 | if (to_put) | ||
887 | xfrm_state_put(to_put); | ||
884 | return x; | 888 | return x; |
885 | } | 889 | } |
886 | 890 | ||
@@ -1067,18 +1071,20 @@ static struct xfrm_state *__xfrm_find_acq_byseq(u32 seq); | |||
1067 | 1071 | ||
1068 | int xfrm_state_add(struct xfrm_state *x) | 1072 | int xfrm_state_add(struct xfrm_state *x) |
1069 | { | 1073 | { |
1070 | struct xfrm_state *x1; | 1074 | struct xfrm_state *x1, *to_put; |
1071 | int family; | 1075 | int family; |
1072 | int err; | 1076 | int err; |
1073 | int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY); | 1077 | int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY); |
1074 | 1078 | ||
1075 | family = x->props.family; | 1079 | family = x->props.family; |
1076 | 1080 | ||
1081 | to_put = NULL; | ||
1082 | |||
1077 | spin_lock_bh(&xfrm_state_lock); | 1083 | spin_lock_bh(&xfrm_state_lock); |
1078 | 1084 | ||
1079 | x1 = __xfrm_state_locate(x, use_spi, family); | 1085 | x1 = __xfrm_state_locate(x, use_spi, family); |
1080 | if (x1) { | 1086 | if (x1) { |
1081 | xfrm_state_put(x1); | 1087 | to_put = x1; |
1082 | x1 = NULL; | 1088 | x1 = NULL; |
1083 | err = -EEXIST; | 1089 | err = -EEXIST; |
1084 | goto out; | 1090 | goto out; |
@@ -1088,7 +1094,7 @@ int xfrm_state_add(struct xfrm_state *x) | |||
1088 | x1 = __xfrm_find_acq_byseq(x->km.seq); | 1094 | x1 = __xfrm_find_acq_byseq(x->km.seq); |
1089 | if (x1 && ((x1->id.proto != x->id.proto) || | 1095 | if (x1 && ((x1->id.proto != x->id.proto) || |
1090 | xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) { | 1096 | xfrm_addr_cmp(&x1->id.daddr, &x->id.daddr, family))) { |
1091 | xfrm_state_put(x1); | 1097 | to_put = x1; |
1092 | x1 = NULL; | 1098 | x1 = NULL; |
1093 | } | 1099 | } |
1094 | } | 1100 | } |
@@ -1110,6 +1116,9 @@ out: | |||
1110 | xfrm_state_put(x1); | 1116 | xfrm_state_put(x1); |
1111 | } | 1117 | } |
1112 | 1118 | ||
1119 | if (to_put) | ||
1120 | xfrm_state_put(to_put); | ||
1121 | |||
1113 | return err; | 1122 | return err; |
1114 | } | 1123 | } |
1115 | EXPORT_SYMBOL(xfrm_state_add); | 1124 | EXPORT_SYMBOL(xfrm_state_add); |
@@ -1269,10 +1278,12 @@ EXPORT_SYMBOL(xfrm_state_migrate); | |||
1269 | 1278 | ||
1270 | int xfrm_state_update(struct xfrm_state *x) | 1279 | int xfrm_state_update(struct xfrm_state *x) |
1271 | { | 1280 | { |
1272 | struct xfrm_state *x1; | 1281 | struct xfrm_state *x1, *to_put; |
1273 | int err; | 1282 | int err; |
1274 | int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY); | 1283 | int use_spi = xfrm_id_proto_match(x->id.proto, IPSEC_PROTO_ANY); |
1275 | 1284 | ||
1285 | to_put = NULL; | ||
1286 | |||
1276 | spin_lock_bh(&xfrm_state_lock); | 1287 | spin_lock_bh(&xfrm_state_lock); |
1277 | x1 = __xfrm_state_locate(x, use_spi, x->props.family); | 1288 | x1 = __xfrm_state_locate(x, use_spi, x->props.family); |
1278 | 1289 | ||
@@ -1281,7 +1292,7 @@ int xfrm_state_update(struct xfrm_state *x) | |||
1281 | goto out; | 1292 | goto out; |
1282 | 1293 | ||
1283 | if (xfrm_state_kern(x1)) { | 1294 | if (xfrm_state_kern(x1)) { |
1284 | xfrm_state_put(x1); | 1295 | to_put = x1; |
1285 | err = -EEXIST; | 1296 | err = -EEXIST; |
1286 | goto out; | 1297 | goto out; |
1287 | } | 1298 | } |
@@ -1295,6 +1306,9 @@ int xfrm_state_update(struct xfrm_state *x) | |||
1295 | out: | 1306 | out: |
1296 | spin_unlock_bh(&xfrm_state_lock); | 1307 | spin_unlock_bh(&xfrm_state_lock); |
1297 | 1308 | ||
1309 | if (to_put) | ||
1310 | xfrm_state_put(to_put); | ||
1311 | |||
1298 | if (err) | 1312 | if (err) |
1299 | return err; | 1313 | return err; |
1300 | 1314 | ||
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 7bd296cca041..46f23971f7e4 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
@@ -508,12 +508,11 @@ int devcgroup_inode_permission(struct inode *inode, int mask) | |||
508 | return 0; | 508 | return 0; |
509 | if (!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode)) | 509 | if (!S_ISBLK(inode->i_mode) && !S_ISCHR(inode->i_mode)) |
510 | return 0; | 510 | return 0; |
511 | dev_cgroup = css_to_devcgroup(task_subsys_state(current, | ||
512 | devices_subsys_id)); | ||
513 | if (!dev_cgroup) | ||
514 | return 0; | ||
515 | 511 | ||
516 | rcu_read_lock(); | 512 | rcu_read_lock(); |
513 | |||
514 | dev_cgroup = task_devcgroup(current); | ||
515 | |||
517 | list_for_each_entry_rcu(wh, &dev_cgroup->whitelist, list) { | 516 | list_for_each_entry_rcu(wh, &dev_cgroup->whitelist, list) { |
518 | if (wh->type & DEV_ALL) | 517 | if (wh->type & DEV_ALL) |
519 | goto acc_check; | 518 | goto acc_check; |
@@ -533,6 +532,7 @@ acc_check: | |||
533 | rcu_read_unlock(); | 532 | rcu_read_unlock(); |
534 | return 0; | 533 | return 0; |
535 | } | 534 | } |
535 | |||
536 | rcu_read_unlock(); | 536 | rcu_read_unlock(); |
537 | 537 | ||
538 | return -EPERM; | 538 | return -EPERM; |
@@ -543,12 +543,10 @@ int devcgroup_inode_mknod(int mode, dev_t dev) | |||
543 | struct dev_cgroup *dev_cgroup; | 543 | struct dev_cgroup *dev_cgroup; |
544 | struct dev_whitelist_item *wh; | 544 | struct dev_whitelist_item *wh; |
545 | 545 | ||
546 | dev_cgroup = css_to_devcgroup(task_subsys_state(current, | ||
547 | devices_subsys_id)); | ||
548 | if (!dev_cgroup) | ||
549 | return 0; | ||
550 | |||
551 | rcu_read_lock(); | 546 | rcu_read_lock(); |
547 | |||
548 | dev_cgroup = task_devcgroup(current); | ||
549 | |||
552 | list_for_each_entry(wh, &dev_cgroup->whitelist, list) { | 550 | list_for_each_entry(wh, &dev_cgroup->whitelist, list) { |
553 | if (wh->type & DEV_ALL) | 551 | if (wh->type & DEV_ALL) |
554 | goto acc_check; | 552 | goto acc_check; |
@@ -566,6 +564,8 @@ acc_check: | |||
566 | rcu_read_unlock(); | 564 | rcu_read_unlock(); |
567 | return 0; | 565 | return 0; |
568 | } | 566 | } |
567 | |||
569 | rcu_read_unlock(); | 568 | rcu_read_unlock(); |
569 | |||
570 | return -EPERM; | 570 | return -EPERM; |
571 | } | 571 | } |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 909f1c101c95..66025161bd69 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -6197,7 +6197,6 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = { | |||
6197 | SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG), | 6197 | SND_PCI_QUIRK(0x1043, 0x817f, "Asus P5LD2", ALC882_6ST_DIG), |
6198 | SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG), | 6198 | SND_PCI_QUIRK(0x1043, 0x81d8, "Asus P5WD", ALC882_6ST_DIG), |
6199 | SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG), | 6199 | SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC882_6ST_DIG), |
6200 | SND_PCI_QUIRK(0x106b, 0x00a0, "Apple iMac 24''", ALC885_IMAC24), | ||
6201 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG), | 6200 | SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte P35 DS3R", ALC882_6ST_DIG), |
6202 | SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */ | 6201 | SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */ |
6203 | SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG), | 6202 | SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG), |
@@ -14067,6 +14066,13 @@ static struct hda_verb alc662_auto_init_verbs[] = { | |||
14067 | { } | 14066 | { } |
14068 | }; | 14067 | }; |
14069 | 14068 | ||
14069 | /* additional verbs for ALC663 */ | ||
14070 | static struct hda_verb alc663_auto_init_verbs[] = { | ||
14071 | {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | ||
14072 | {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, | ||
14073 | { } | ||
14074 | }; | ||
14075 | |||
14070 | static struct hda_verb alc663_m51va_init_verbs[] = { | 14076 | static struct hda_verb alc663_m51va_init_verbs[] = { |
14071 | {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, | 14077 | {0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, |
14072 | {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, | 14078 | {0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, |
@@ -14595,6 +14601,14 @@ static int alc662_auto_create_extra_out(struct alc_spec *spec, hda_nid_t pin, | |||
14595 | if (!pin) | 14601 | if (!pin) |
14596 | return 0; | 14602 | return 0; |
14597 | 14603 | ||
14604 | if (pin == 0x17) { | ||
14605 | /* ALC663 has a mono output pin on 0x17 */ | ||
14606 | sprintf(name, "%s Playback Switch", pfx); | ||
14607 | err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, | ||
14608 | HDA_COMPOSE_AMP_VAL(pin, 2, 0, HDA_OUTPUT)); | ||
14609 | return err; | ||
14610 | } | ||
14611 | |||
14598 | if (alc880_is_fixed_pin(pin)) { | 14612 | if (alc880_is_fixed_pin(pin)) { |
14599 | nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin)); | 14613 | nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin)); |
14600 | /* printk("DAC nid=%x\n",nid); */ | 14614 | /* printk("DAC nid=%x\n",nid); */ |
@@ -14765,6 +14779,14 @@ static int alc662_parse_auto_config(struct hda_codec *codec) | |||
14765 | spec->input_mux = &spec->private_imux; | 14779 | spec->input_mux = &spec->private_imux; |
14766 | 14780 | ||
14767 | spec->init_verbs[spec->num_init_verbs++] = alc662_auto_init_verbs; | 14781 | spec->init_verbs[spec->num_init_verbs++] = alc662_auto_init_verbs; |
14782 | if (codec->vendor_id == 0x10ec0663) | ||
14783 | spec->init_verbs[spec->num_init_verbs++] = | ||
14784 | alc663_auto_init_verbs; | ||
14785 | |||
14786 | err = alc_auto_add_mic_boost(codec); | ||
14787 | if (err < 0) | ||
14788 | return err; | ||
14789 | |||
14768 | spec->mixers[spec->num_mixers] = alc662_capture_mixer; | 14790 | spec->mixers[spec->num_mixers] = alc662_capture_mixer; |
14769 | spec->num_mixers++; | 14791 | spec->num_mixers++; |
14770 | return 1; | 14792 | return 1; |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 7fdafcb0015d..ad994fcab725 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -560,8 +560,9 @@ static struct hda_verb dell_eq_core_init[] = { | |||
560 | }; | 560 | }; |
561 | 561 | ||
562 | static struct hda_verb dell_m6_core_init[] = { | 562 | static struct hda_verb dell_m6_core_init[] = { |
563 | /* set master volume and direct control */ | 563 | /* set master volume to max value without distortion |
564 | { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, | 564 | * and direct control */ |
565 | { 0x1f, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xec}, | ||
565 | /* setup audio connections */ | 566 | /* setup audio connections */ |
566 | { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00}, | 567 | { 0x0d, AC_VERB_SET_CONNECT_SEL, 0x00}, |
567 | { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, | 568 | { 0x0a, AC_VERB_SET_CONNECT_SEL, 0x01}, |
diff --git a/sound/pci/oxygen/hifier.c b/sound/pci/oxygen/hifier.c index 7442460583dd..dad393ae040a 100644 --- a/sound/pci/oxygen/hifier.c +++ b/sound/pci/oxygen/hifier.c | |||
@@ -17,6 +17,7 @@ | |||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include <linux/delay.h> | ||
20 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
21 | #include <sound/control.h> | 22 | #include <sound/control.h> |
22 | #include <sound/core.h> | 23 | #include <sound/core.h> |
@@ -107,6 +108,9 @@ static void set_ak4396_params(struct oxygen *chip, | |||
107 | else | 108 | else |
108 | value |= AK4396_DFS_QUAD; | 109 | value |= AK4396_DFS_QUAD; |
109 | data->ak4396_ctl2 = value; | 110 | data->ak4396_ctl2 = value; |
111 | |||
112 | msleep(1); /* wait for the new MCLK to become stable */ | ||
113 | |||
110 | ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB); | 114 | ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB); |
111 | ak4396_write(chip, AK4396_CONTROL_2, value); | 115 | ak4396_write(chip, AK4396_CONTROL_2, value); |
112 | ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN); | 116 | ak4396_write(chip, AK4396_CONTROL_1, AK4396_DIF_24_MSB | AK4396_RSTN); |
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 7c8ae31eb468..c5829d30ef86 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -28,6 +28,7 @@ | |||
28 | * GPIO 1 -> DFS1 of AK5385 | 28 | * GPIO 1 -> DFS1 of AK5385 |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <linux/delay.h> | ||
31 | #include <linux/mutex.h> | 32 | #include <linux/mutex.h> |
32 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
33 | #include <sound/ac97_codec.h> | 34 | #include <sound/ac97_codec.h> |
@@ -213,6 +214,9 @@ static void set_ak4396_params(struct oxygen *chip, | |||
213 | else | 214 | else |
214 | value |= AK4396_DFS_QUAD; | 215 | value |= AK4396_DFS_QUAD; |
215 | data->ak4396_ctl2 = value; | 216 | data->ak4396_ctl2 = value; |
217 | |||
218 | msleep(1); /* wait for the new MCLK to become stable */ | ||
219 | |||
216 | for (i = 0; i < 4; ++i) { | 220 | for (i = 0; i < 4; ++i) { |
217 | ak4396_write(chip, i, | 221 | ak4396_write(chip, i, |
218 | AK4396_CONTROL_1, AK4396_DIF_24_MSB); | 222 | AK4396_CONTROL_1, AK4396_DIF_24_MSB); |
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 6facac5aed90..05eb8994c141 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c | |||
@@ -512,9 +512,12 @@ static int ac97_switch_get(struct snd_kcontrol *ctl, | |||
512 | 512 | ||
513 | static void mute_ac97_ctl(struct oxygen *chip, unsigned int control) | 513 | static void mute_ac97_ctl(struct oxygen *chip, unsigned int control) |
514 | { | 514 | { |
515 | unsigned int priv_idx = chip->controls[control]->private_value & 0xff; | 515 | unsigned int priv_idx; |
516 | u16 value; | 516 | u16 value; |
517 | 517 | ||
518 | if (!chip->controls[control]) | ||
519 | return; | ||
520 | priv_idx = chip->controls[control]->private_value & 0xff; | ||
518 | value = oxygen_read_ac97(chip, 0, priv_idx); | 521 | value = oxygen_read_ac97(chip, 0, priv_idx); |
519 | if (!(value & 0x8000)) { | 522 | if (!(value & 0x8000)) { |
520 | oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000); | 523 | oxygen_write_ac97(chip, 0, priv_idx, value | 0x8000); |
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 7694621ec40b..87d0ed01f65a 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
@@ -329,12 +329,14 @@ static int __init n810_soc_init(void) | |||
329 | sys_clkout2_src = clk_get(dev, "sys_clkout2_src"); | 329 | sys_clkout2_src = clk_get(dev, "sys_clkout2_src"); |
330 | if (IS_ERR(sys_clkout2_src)) { | 330 | if (IS_ERR(sys_clkout2_src)) { |
331 | dev_err(dev, "Could not get sys_clkout2_src clock\n"); | 331 | dev_err(dev, "Could not get sys_clkout2_src clock\n"); |
332 | return -ENODEV; | 332 | err = PTR_ERR(sys_clkout2_src); |
333 | goto err2; | ||
333 | } | 334 | } |
334 | sys_clkout2 = clk_get(dev, "sys_clkout2"); | 335 | sys_clkout2 = clk_get(dev, "sys_clkout2"); |
335 | if (IS_ERR(sys_clkout2)) { | 336 | if (IS_ERR(sys_clkout2)) { |
336 | dev_err(dev, "Could not get sys_clkout2\n"); | 337 | dev_err(dev, "Could not get sys_clkout2\n"); |
337 | goto err1; | 338 | err = PTR_ERR(sys_clkout2); |
339 | goto err3; | ||
338 | } | 340 | } |
339 | /* | 341 | /* |
340 | * Configure 12 MHz output on SYS_CLKOUT2. Therefore we must use | 342 | * Configure 12 MHz output on SYS_CLKOUT2. Therefore we must use |
@@ -343,7 +345,8 @@ static int __init n810_soc_init(void) | |||
343 | func96m_clk = clk_get(dev, "func_96m_ck"); | 345 | func96m_clk = clk_get(dev, "func_96m_ck"); |
344 | if (IS_ERR(func96m_clk)) { | 346 | if (IS_ERR(func96m_clk)) { |
345 | dev_err(dev, "Could not get func 96M clock\n"); | 347 | dev_err(dev, "Could not get func 96M clock\n"); |
346 | goto err2; | 348 | err = PTR_ERR(func96m_clk); |
349 | goto err4; | ||
347 | } | 350 | } |
348 | clk_set_parent(sys_clkout2_src, func96m_clk); | 351 | clk_set_parent(sys_clkout2_src, func96m_clk); |
349 | clk_set_rate(sys_clkout2, 12000000); | 352 | clk_set_rate(sys_clkout2, 12000000); |
@@ -356,20 +359,25 @@ static int __init n810_soc_init(void) | |||
356 | gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); | 359 | gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); |
357 | 360 | ||
358 | return 0; | 361 | return 0; |
359 | err2: | 362 | err4: |
360 | clk_put(sys_clkout2); | 363 | clk_put(sys_clkout2); |
364 | err3: | ||
365 | clk_put(sys_clkout2_src); | ||
366 | err2: | ||
361 | platform_device_del(n810_snd_device); | 367 | platform_device_del(n810_snd_device); |
362 | err1: | 368 | err1: |
363 | platform_device_put(n810_snd_device); | 369 | platform_device_put(n810_snd_device); |
364 | 370 | ||
365 | return err; | 371 | return err; |
366 | |||
367 | } | 372 | } |
368 | 373 | ||
369 | static void __exit n810_soc_exit(void) | 374 | static void __exit n810_soc_exit(void) |
370 | { | 375 | { |
371 | gpio_free(N810_SPEAKER_AMP_GPIO); | 376 | gpio_free(N810_SPEAKER_AMP_GPIO); |
372 | gpio_free(N810_HEADSET_AMP_GPIO); | 377 | gpio_free(N810_HEADSET_AMP_GPIO); |
378 | clk_put(sys_clkout2_src); | ||
379 | clk_put(sys_clkout2); | ||
380 | clk_put(func96m_clk); | ||
373 | 381 | ||
374 | platform_device_unregister(n810_snd_device); | 382 | platform_device_unregister(n810_snd_device); |
375 | } | 383 | } |
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 8548818eea08..c796b1882776 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
18 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
19 | #include <linux/platform_device.h> | ||
19 | #include <sound/core.h> | 20 | #include <sound/core.h> |
20 | #include <sound/pcm.h> | 21 | #include <sound/pcm.h> |
21 | #include <sound/initval.h> | 22 | #include <sound/initval.h> |
@@ -81,7 +82,6 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream) | |||
81 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 82 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
82 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; | 83 | struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; |
83 | 84 | ||
84 | clk_i2s = clk_get(NULL, "I2SCLK"); | ||
85 | if (IS_ERR(clk_i2s)) | 85 | if (IS_ERR(clk_i2s)) |
86 | return PTR_ERR(clk_i2s); | 86 | return PTR_ERR(clk_i2s); |
87 | 87 | ||
@@ -152,6 +152,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, | |||
152 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].tx); | 152 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].tx); |
153 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].frm); | 153 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].frm); |
154 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].clk); | 154 | pxa_gpio_mode(gpio_bus[pxa_i2s.master].clk); |
155 | BUG_ON(IS_ERR(clk_i2s)); | ||
155 | clk_enable(clk_i2s); | 156 | clk_enable(clk_i2s); |
156 | pxa_i2s_wait(); | 157 | pxa_i2s_wait(); |
157 | 158 | ||
@@ -317,6 +318,43 @@ struct snd_soc_dai pxa_i2s_dai = { | |||
317 | 318 | ||
318 | EXPORT_SYMBOL_GPL(pxa_i2s_dai); | 319 | EXPORT_SYMBOL_GPL(pxa_i2s_dai); |
319 | 320 | ||
321 | static int pxa2xx_i2s_probe(struct platform_device *dev) | ||
322 | { | ||
323 | clk_i2s = clk_get(&dev->dev, "I2SCLK"); | ||
324 | return IS_ERR(clk_i2s) ? PTR_ERR(clk_i2s) : 0; | ||
325 | } | ||
326 | |||
327 | static int __devexit pxa2xx_i2s_remove(struct platform_device *dev) | ||
328 | { | ||
329 | clk_put(clk_i2s); | ||
330 | clk_i2s = ERR_PTR(-ENOENT); | ||
331 | return 0; | ||
332 | } | ||
333 | |||
334 | static struct platform_driver pxa2xx_i2s_driver = { | ||
335 | .probe = pxa2xx_i2s_probe, | ||
336 | .remove = __devexit_p(pxa2xx_i2s_remove), | ||
337 | |||
338 | .driver = { | ||
339 | .name = "pxa2xx-i2s", | ||
340 | .owner = THIS_MODULE, | ||
341 | }, | ||
342 | }; | ||
343 | |||
344 | static int __init pxa2xx_i2s_init(void) | ||
345 | { | ||
346 | clk_i2s = ERR_PTR(-ENOENT); | ||
347 | return platform_driver_register(&pxa2xx_i2s_driver); | ||
348 | } | ||
349 | |||
350 | static void __exit pxa2xx_i2s_exit(void) | ||
351 | { | ||
352 | platform_driver_unregister(&pxa2xx_i2s_driver); | ||
353 | } | ||
354 | |||
355 | module_init(pxa2xx_i2s_init); | ||
356 | module_exit(pxa2xx_i2s_exit); | ||
357 | |||
320 | /* Module information */ | 358 | /* Module information */ |
321 | MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com"); | 359 | MODULE_AUTHOR("Liam Girdwood, liam.girdwood@wolfsonmicro.com, www.wolfsonmicro.com"); |
322 | MODULE_DESCRIPTION("pxa2xx I2S SoC Interface"); | 360 | MODULE_DESCRIPTION("pxa2xx I2S SoC Interface"); |