aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@insightbb.com>2007-05-01 00:24:54 -0400
committerDmitry Torokhov <dtor@insightbb.com>2007-05-01 00:24:54 -0400
commitbc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch)
tree427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /arch/mips
parent3d29cdff999c37b3876082278a8134a0642a02cd (diff)
parentdc87c3985e9b442c60994308a96f887579addc39 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/usb/input/Makefile drivers/usb/input/gtco.c
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig131
-rw-r--r--arch/mips/Kconfig.debug14
-rw-r--r--arch/mips/Makefile8
-rw-r--r--arch/mips/arc/console.c32
-rw-r--r--arch/mips/arc/init.c9
-rw-r--r--arch/mips/arc/memory.c6
-rw-r--r--arch/mips/arc/tree.c10
-rw-r--r--arch/mips/au1000/mtx-1/board_setup.c33
-rw-r--r--arch/mips/au1000/mtx-1/irqmap.c2
-rw-r--r--arch/mips/basler/excite/excite_setup.c4
-rw-r--r--arch/mips/cobalt/Kconfig7
-rw-r--r--arch/mips/cobalt/Makefile4
-rw-r--r--arch/mips/cobalt/console.c39
-rw-r--r--arch/mips/cobalt/irq.c2
-rw-r--r--arch/mips/cobalt/mtd.c61
-rw-r--r--arch/mips/cobalt/pci.c47
-rw-r--r--arch/mips/cobalt/reset.c11
-rw-r--r--arch/mips/cobalt/setup.c97
-rw-r--r--arch/mips/configs/atlas_defconfig236
-rw-r--r--arch/mips/configs/bigsur_defconfig88
-rw-r--r--arch/mips/configs/capcella_defconfig163
-rw-r--r--arch/mips/configs/cobalt_defconfig215
-rw-r--r--arch/mips/configs/db1000_defconfig159
-rw-r--r--arch/mips/configs/db1100_defconfig159
-rw-r--r--arch/mips/configs/db1200_defconfig190
-rw-r--r--arch/mips/configs/db1500_defconfig199
-rw-r--r--arch/mips/configs/db1550_defconfig173
-rw-r--r--arch/mips/configs/ddb5477_defconfig130
-rw-r--r--arch/mips/configs/decstation_defconfig95
-rw-r--r--arch/mips/configs/e55_defconfig93
-rw-r--r--arch/mips/configs/emma2rh_defconfig280
-rw-r--r--arch/mips/configs/ev64120_defconfig129
-rw-r--r--arch/mips/configs/excite_defconfig179
-rw-r--r--arch/mips/configs/ip22_defconfig211
-rw-r--r--arch/mips/configs/ip27_defconfig141
-rw-r--r--arch/mips/configs/ip32_defconfig148
-rw-r--r--arch/mips/configs/jaguar-atx_defconfig110
-rw-r--r--arch/mips/configs/jazz_defconfig154
-rw-r--r--arch/mips/configs/jmr3927_defconfig320
-rw-r--r--arch/mips/configs/lasat200_defconfig138
-rw-r--r--arch/mips/configs/malta_defconfig175
-rw-r--r--arch/mips/configs/mipssim_defconfig117
-rw-r--r--arch/mips/configs/mpc30x_defconfig141
-rw-r--r--arch/mips/configs/ocelot_3_defconfig197
-rw-r--r--arch/mips/configs/ocelot_c_defconfig131
-rw-r--r--arch/mips/configs/ocelot_defconfig127
-rw-r--r--arch/mips/configs/ocelot_g_defconfig145
-rw-r--r--arch/mips/configs/pb1100_defconfig159
-rw-r--r--arch/mips/configs/pb1500_defconfig172
-rw-r--r--arch/mips/configs/pb1550_defconfig172
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig115
-rw-r--r--arch/mips/configs/pnx8550-stb810_defconfig85
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig1447
-rw-r--r--arch/mips/configs/qemu_defconfig97
-rw-r--r--arch/mips/configs/rbhma4500_defconfig203
-rw-r--r--arch/mips/configs/rm200_defconfig266
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig127
-rw-r--r--arch/mips/configs/sead_defconfig84
-rw-r--r--arch/mips/configs/tb0226_defconfig197
-rw-r--r--arch/mips/configs/tb0229_defconfig181
-rw-r--r--arch/mips/configs/tb0287_defconfig159
-rw-r--r--arch/mips/configs/workpad_defconfig151
-rw-r--r--arch/mips/configs/wrppmc_defconfig154
-rw-r--r--arch/mips/configs/yosemite_defconfig114
-rw-r--r--arch/mips/ddb5xxx/ddb5477/Makefile2
-rw-r--r--arch/mips/ddb5xxx/ddb5477/irq.c2
-rw-r--r--arch/mips/dec/Makefile2
-rw-r--r--arch/mips/dec/prom/Makefile2
-rw-r--r--arch/mips/dec/prom/console.c38
-rw-r--r--arch/mips/dec/prom/identify.c3
-rw-r--r--arch/mips/dec/prom/init.c3
-rw-r--r--arch/mips/defconfig211
-rw-r--r--arch/mips/emma2rh/common/irq.c1
-rw-r--r--arch/mips/emma2rh/markeins/irq.c3
-rw-r--r--arch/mips/gt64120/ev64120/Makefile2
-rw-r--r--arch/mips/gt64120/ev64120/irq.c2
-rw-r--r--arch/mips/gt64120/ev64120/promcon.c5
-rw-r--r--arch/mips/gt64120/momenco_ocelot/Makefile2
-rw-r--r--arch/mips/gt64120/momenco_ocelot/prom.c1
-rw-r--r--arch/mips/gt64120/momenco_ocelot/setup.c2
-rw-r--r--arch/mips/gt64120/wrppmc/Makefile2
-rw-r--r--arch/mips/gt64120/wrppmc/irq.c2
-rw-r--r--arch/mips/gt64120/wrppmc/pci.c4
-rw-r--r--arch/mips/jazz/Makefile2
-rw-r--r--arch/mips/jazz/irq.c2
-rw-r--r--arch/mips/jazz/jazzdma.c3
-rw-r--r--arch/mips/jmr3927/common/Makefile2
-rw-r--r--arch/mips/jmr3927/common/prom.c12
-rw-r--r--arch/mips/jmr3927/common/puts.c122
-rw-r--r--arch/mips/jmr3927/common/rtc_ds1742.c171
-rw-r--r--arch/mips/jmr3927/rbhma3100/Makefile3
-rw-r--r--arch/mips/jmr3927/rbhma3100/init.c16
-rw-r--r--arch/mips/jmr3927/rbhma3100/irq.c312
-rw-r--r--arch/mips/jmr3927/rbhma3100/kgdb_io.c54
-rw-r--r--arch/mips/jmr3927/rbhma3100/setup.c196
-rw-r--r--arch/mips/kernel/Makefile7
-rw-r--r--arch/mips/kernel/asm-offsets.c5
-rw-r--r--arch/mips/kernel/cpu-probe.c3
-rw-r--r--arch/mips/kernel/early_printk.c40
-rw-r--r--arch/mips/kernel/entry.S6
-rw-r--r--arch/mips/kernel/genex.S47
-rw-r--r--arch/mips/kernel/i8259.c17
-rw-r--r--arch/mips/kernel/kspd.c27
-rw-r--r--arch/mips/kernel/linux32.c231
-rw-r--r--arch/mips/kernel/machine_kexec.c4
-rw-r--r--arch/mips/kernel/mips_ksyms.c1
-rw-r--r--arch/mips/kernel/process.c39
-rw-r--r--arch/mips/kernel/ptrace.c10
-rw-r--r--arch/mips/kernel/r4k_fpu.S16
-rw-r--r--arch/mips/kernel/rtlx.c253
-rw-r--r--arch/mips/kernel/scall32-o32.S2
-rw-r--r--arch/mips/kernel/scall64-64.S5
-rw-r--r--arch/mips/kernel/scall64-n32.S9
-rw-r--r--arch/mips/kernel/scall64-o32.S8
-rw-r--r--arch/mips/kernel/setup.c12
-rw-r--r--arch/mips/kernel/signal-common.h12
-rw-r--r--arch/mips/kernel/signal.c136
-rw-r--r--arch/mips/kernel/signal32.c225
-rw-r--r--arch/mips/kernel/signal_n32.c14
-rw-r--r--arch/mips/kernel/smp.c25
-rw-r--r--arch/mips/kernel/smtc.c84
-rw-r--r--arch/mips/kernel/traps.c88
-rw-r--r--arch/mips/kernel/unaligned.c2
-rw-r--r--arch/mips/kernel/vpe.c7
-rw-r--r--arch/mips/lasat/lasat_board.c13
-rw-r--r--arch/mips/lasat/prom.c47
-rw-r--r--arch/mips/lasat/prom.h1
-rw-r--r--arch/mips/lasat/setup.c3
-rw-r--r--arch/mips/lib-32/Makefile2
-rw-r--r--arch/mips/lib-64/Makefile2
-rw-r--r--arch/mips/lib/Makefile9
-rw-r--r--arch/mips/lib/iomap-pci.c74
-rw-r--r--arch/mips/lib/iomap.c253
-rw-r--r--arch/mips/lib/memcpy-inatomic.S436
-rw-r--r--arch/mips/lib/promlib.c24
-rw-r--r--arch/mips/math-emu/kernel_linkage.c8
-rw-r--r--arch/mips/mips-boards/generic/Makefile6
-rw-r--r--arch/mips/mips-boards/generic/console.c (renamed from arch/mips/mips-boards/generic/printf.c)12
-rw-r--r--arch/mips/mips-boards/generic/display.c8
-rw-r--r--arch/mips/mips-boards/generic/init.c15
-rw-r--r--arch/mips/mips-boards/generic/memory.c11
-rw-r--r--arch/mips/mips-boards/generic/pci.c4
-rw-r--r--arch/mips/mips-boards/generic/reset.c12
-rw-r--r--arch/mips/mips-boards/generic/time.c3
-rw-r--r--arch/mips/mips-boards/malta/Makefile2
-rw-r--r--arch/mips/mips-boards/malta/malta_int.c4
-rw-r--r--arch/mips/mips-boards/malta/malta_setup.c4
-rw-r--r--arch/mips/mips-boards/malta/malta_smtc.c (renamed from arch/mips/mips-boards/malta/malta_smp.c)31
-rw-r--r--arch/mips/mips-boards/sim/Makefile7
-rw-r--r--arch/mips/mips-boards/sim/sim_console.c (renamed from arch/mips/mips-boards/sim/sim_printf.c)44
-rw-r--r--arch/mips/mips-boards/sim/sim_mem.c2
-rw-r--r--arch/mips/mips-boards/sim/sim_platform.c35
-rw-r--r--arch/mips/mips-boards/sim/sim_setup.c6
-rw-r--r--arch/mips/mips-boards/sim/sim_time.c3
-rw-r--r--arch/mips/mm/Makefile2
-rw-r--r--arch/mips/mm/c-r3k.c2
-rw-r--r--arch/mips/mm/c-tx39.c18
-rw-r--r--arch/mips/mm/cache.c16
-rw-r--r--arch/mips/mm/cerr-sb1.c133
-rw-r--r--arch/mips/mm/dma-default.c23
-rw-r--r--arch/mips/mm/fault.c6
-rw-r--r--arch/mips/mm/init.c35
-rw-r--r--arch/mips/mm/ioremap.c96
-rw-r--r--arch/mips/mm/pg-sb1.c3
-rw-r--r--arch/mips/mm/pgtable-32.c1
-rw-r--r--arch/mips/mm/pgtable-64.c1
-rw-r--r--arch/mips/momentum/jaguar_atx/ja-console.c5
-rw-r--r--arch/mips/momentum/jaguar_atx/platform.c39
-rw-r--r--arch/mips/momentum/ocelot_3/platform.c39
-rw-r--r--arch/mips/momentum/ocelot_c/irq.c2
-rw-r--r--arch/mips/momentum/ocelot_c/platform.c26
-rw-r--r--arch/mips/momentum/ocelot_g/Makefile2
-rw-r--r--arch/mips/oprofile/Kconfig2
-rw-r--r--arch/mips/oprofile/op_model_mipsxx.c26
-rw-r--r--arch/mips/pci/Makefile3
-rw-r--r--arch/mips/pci/fixup-jmr3927.c25
-rw-r--r--arch/mips/pci/fixup-sni.c68
-rw-r--r--arch/mips/pci/ops-au1000.c6
-rw-r--r--arch/mips/pci/ops-gt64111.c100
-rw-r--r--arch/mips/pci/ops-gt64xxx_pci0.c (renamed from arch/mips/pci/ops-gt64120.c)30
-rw-r--r--arch/mips/pci/ops-sni.c77
-rw-r--r--arch/mips/pci/ops-tx3927.c232
-rw-r--r--arch/mips/pci/pci-bcm1480.c2
-rw-r--r--arch/mips/pci/pci-ev64120.c1
-rw-r--r--arch/mips/pci/pci-lasat.c4
-rw-r--r--arch/mips/pci/pci-ocelot.c2
-rw-r--r--arch/mips/pci/pci-sb1250.c2
-rw-r--r--arch/mips/pci/pci.c35
-rw-r--r--arch/mips/philips/pnx8550/common/int.c21
-rw-r--r--arch/mips/philips/pnx8550/common/prom.c2
-rw-r--r--arch/mips/philips/pnx8550/common/setup.c9
-rw-r--r--arch/mips/pmc-sierra/yosemite/py-console.c5
-rw-r--r--arch/mips/qemu/q-smp.c7
-rw-r--r--arch/mips/sgi-ip22/Makefile2
-rw-r--r--arch/mips/sgi-ip22/ip22-int.c2
-rw-r--r--arch/mips/sgi-ip22/ip22-nvram.c24
-rw-r--r--arch/mips/sgi-ip22/ip22-time.c14
-rw-r--r--arch/mips/sgi-ip27/Makefile2
-rw-r--r--arch/mips/sgi-ip27/ip27-console.c35
-rw-r--r--arch/mips/sgi-ip27/ip27-init.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-memory.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-timer.c2
-rw-r--r--arch/mips/sgi-ip32/Makefile2
-rw-r--r--arch/mips/sgi-ip32/ip32-irq.c2
-rw-r--r--arch/mips/sibyte/Kconfig26
-rw-r--r--arch/mips/sibyte/bcm1480/Makefile2
-rw-r--r--arch/mips/sibyte/bcm1480/irq.c6
-rw-r--r--arch/mips/sibyte/bcm1480/setup.c10
-rw-r--r--arch/mips/sibyte/bcm1480/smp.c6
-rw-r--r--arch/mips/sibyte/cfe/setup.c8
-rw-r--r--arch/mips/sibyte/common/Makefile5
-rw-r--r--arch/mips/sibyte/common/sb_tbprof.c (renamed from arch/mips/sibyte/sb1250/bcm1250_tbprof.c)407
-rw-r--r--arch/mips/sibyte/sb1250/Makefile3
-rw-r--r--arch/mips/sibyte/sb1250/irq.c2
-rw-r--r--arch/mips/sibyte/sb1250/setup.c38
-rw-r--r--arch/mips/sibyte/swarm/setup.c18
-rw-r--r--arch/mips/sni/Makefile4
-rw-r--r--arch/mips/sni/a20r.c227
-rw-r--r--arch/mips/sni/ds1216.c81
-rw-r--r--arch/mips/sni/irq.c188
-rw-r--r--arch/mips/sni/pcimt.c305
-rw-r--r--arch/mips/sni/pcit.c273
-rw-r--r--arch/mips/sni/reset.c9
-rw-r--r--arch/mips/sni/rm200.c186
-rw-r--r--arch/mips/sni/setup.c242
-rw-r--r--arch/mips/sni/sniprom.c172
-rw-r--r--arch/mips/sni/time.c148
-rw-r--r--arch/mips/tx4927/common/tx4927_irq.c2
-rw-r--r--arch/mips/tx4927/common/tx4927_setup.c10
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/Makefile2
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c3
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c76
-rw-r--r--arch/mips/tx4938/common/setup.c9
-rw-r--r--arch/mips/vr41xx/Kconfig92
-rw-r--r--arch/mips/vr41xx/common/Makefile2
235 files changed, 9995 insertions, 6507 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a92ce6bd7cf1..130d825e5438 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -10,7 +10,6 @@ menu "Machine selection"
10 10
11config ZONE_DMA 11config ZONE_DMA
12 bool 12 bool
13 default y
14 13
15choice 14choice
16 prompt "System type" 15 prompt "System type"
@@ -133,7 +132,7 @@ config MIPS_MIRAGE
133 select SYS_SUPPORTS_LITTLE_ENDIAN 132 select SYS_SUPPORTS_LITTLE_ENDIAN
134 133
135config BASLER_EXCITE 134config BASLER_EXCITE
136 bool "Basler eXcite smart camera support" 135 bool "Basler eXcite smart camera"
137 select DMA_COHERENT 136 select DMA_COHERENT
138 select HW_HAS_PCI 137 select HW_HAS_PCI
139 select IRQ_CPU 138 select IRQ_CPU
@@ -144,9 +143,10 @@ config BASLER_EXCITE
144 select SYS_SUPPORTS_32BIT_KERNEL 143 select SYS_SUPPORTS_32BIT_KERNEL
145 select SYS_SUPPORTS_64BIT_KERNEL 144 select SYS_SUPPORTS_64BIT_KERNEL
146 select SYS_SUPPORTS_BIG_ENDIAN 145 select SYS_SUPPORTS_BIG_ENDIAN
146 select SYS_SUPPORTS_KGDB
147 help 147 help
148 The eXcite is a smart camera platform manufactured by 148 The eXcite is a smart camera platform manufactured by
149 Basler Vision Technologies AG 149 Basler Vision Technologies AG.
150 150
151config BASLER_EXCITE_PROTOTYPE 151config BASLER_EXCITE_PROTOTYPE
152 bool "Support for pre-release units" 152 bool "Support for pre-release units"
@@ -164,8 +164,9 @@ config MIPS_COBALT
164 select HW_HAS_PCI 164 select HW_HAS_PCI
165 select I8259 165 select I8259
166 select IRQ_CPU 166 select IRQ_CPU
167 select MIPS_GT64111 167 select PCI_GT64XXX_PCI0
168 select SYS_HAS_CPU_NEVADA 168 select SYS_HAS_CPU_NEVADA
169 select SYS_HAS_EARLY_PRINTK
169 select SYS_SUPPORTS_32BIT_KERNEL 170 select SYS_SUPPORTS_32BIT_KERNEL
170 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL 171 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
171 select SYS_SUPPORTS_LITTLE_ENDIAN 172 select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -175,7 +176,7 @@ config MACH_DECSTATION
175 bool "DECstations" 176 bool "DECstations"
176 select BOOT_ELF32 177 select BOOT_ELF32
177 select DMA_NONCOHERENT 178 select DMA_NONCOHERENT
178 select EARLY_PRINTK 179 select SYS_HAS_EARLY_PRINTK
179 select IRQ_CPU 180 select IRQ_CPU
180 select SYS_HAS_CPU_R3000 181 select SYS_HAS_CPU_R3000
181 select SYS_HAS_CPU_R4X00 182 select SYS_HAS_CPU_R4X00
@@ -205,11 +206,12 @@ config MIPS_EV64120
205 depends on EXPERIMENTAL 206 depends on EXPERIMENTAL
206 select DMA_NONCOHERENT 207 select DMA_NONCOHERENT
207 select HW_HAS_PCI 208 select HW_HAS_PCI
208 select MIPS_GT64120 209 select PCI_GT64XXX_PCI0
209 select SYS_HAS_CPU_R5000 210 select SYS_HAS_CPU_R5000
210 select SYS_SUPPORTS_32BIT_KERNEL 211 select SYS_SUPPORTS_32BIT_KERNEL
211 select SYS_SUPPORTS_64BIT_KERNEL 212 select SYS_SUPPORTS_64BIT_KERNEL
212 select SYS_SUPPORTS_BIG_ENDIAN 213 select SYS_SUPPORTS_BIG_ENDIAN
214 select SYS_SUPPORTS_KGDB
213 help 215 help
214 This is an evaluation board based on the Galileo GT-64120 216 This is an evaluation board based on the Galileo GT-64120
215 single-chip system controller that contains a MIPS R5000 compatible 217 single-chip system controller that contains a MIPS R5000 compatible
@@ -240,13 +242,14 @@ config MACH_JAZZ
240config LASAT 242config LASAT
241 bool "LASAT Networks platforms" 243 bool "LASAT Networks platforms"
242 select DMA_NONCOHERENT 244 select DMA_NONCOHERENT
245 select SYS_HAS_EARLY_PRINTK
243 select HW_HAS_PCI 246 select HW_HAS_PCI
244 select MIPS_GT64120 247 select PCI_GT64XXX_PCI0
245 select MIPS_NILE4 248 select MIPS_NILE4
246 select R5000_CPU_SCACHE 249 select R5000_CPU_SCACHE
247 select SYS_HAS_CPU_R5000 250 select SYS_HAS_CPU_R5000
248 select SYS_SUPPORTS_32BIT_KERNEL 251 select SYS_SUPPORTS_32BIT_KERNEL
249 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL 252 select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
250 select SYS_SUPPORTS_LITTLE_ENDIAN 253 select SYS_SUPPORTS_LITTLE_ENDIAN
251 select GENERIC_HARDIRQS_NO__DO_IRQ 254 select GENERIC_HARDIRQS_NO__DO_IRQ
252 255
@@ -254,11 +257,12 @@ config MIPS_ATLAS
254 bool "MIPS Atlas board" 257 bool "MIPS Atlas board"
255 select BOOT_ELF32 258 select BOOT_ELF32
256 select DMA_NONCOHERENT 259 select DMA_NONCOHERENT
260 select SYS_HAS_EARLY_PRINTK
257 select IRQ_CPU 261 select IRQ_CPU
258 select HW_HAS_PCI 262 select HW_HAS_PCI
259 select MIPS_BOARDS_GEN 263 select MIPS_BOARDS_GEN
260 select MIPS_BONITO64 264 select MIPS_BONITO64
261 select MIPS_GT64120 265 select PCI_GT64XXX_PCI0
262 select MIPS_MSC 266 select MIPS_MSC
263 select RM7000_CPU_SCACHE 267 select RM7000_CPU_SCACHE
264 select SWAP_IO_SPACE 268 select SWAP_IO_SPACE
@@ -272,6 +276,7 @@ config MIPS_ATLAS
272 select SYS_SUPPORTS_BIG_ENDIAN 276 select SYS_SUPPORTS_BIG_ENDIAN
273 select SYS_SUPPORTS_LITTLE_ENDIAN 277 select SYS_SUPPORTS_LITTLE_ENDIAN
274 select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL 278 select SYS_SUPPORTS_MULTITHREADING if EXPERIMENTAL
279 select SYS_SUPPORTS_SMARTMIPS
275 select GENERIC_HARDIRQS_NO__DO_IRQ 280 select GENERIC_HARDIRQS_NO__DO_IRQ
276 help 281 help
277 This enables support for the MIPS Technologies Atlas evaluation 282 This enables support for the MIPS Technologies Atlas evaluation
@@ -290,7 +295,7 @@ config MIPS_MALTA
290 select MIPS_BOARDS_GEN 295 select MIPS_BOARDS_GEN
291 select MIPS_BONITO64 296 select MIPS_BONITO64
292 select MIPS_CPU_SCACHE 297 select MIPS_CPU_SCACHE
293 select MIPS_GT64120 298 select PCI_GT64XXX_PCI0
294 select MIPS_MSC 299 select MIPS_MSC
295 select SWAP_IO_SPACE 300 select SWAP_IO_SPACE
296 select SYS_HAS_CPU_MIPS32_R1 301 select SYS_HAS_CPU_MIPS32_R1
@@ -298,11 +303,13 @@ config MIPS_MALTA
298 select SYS_HAS_CPU_MIPS64_R1 303 select SYS_HAS_CPU_MIPS64_R1
299 select SYS_HAS_CPU_NEVADA 304 select SYS_HAS_CPU_NEVADA
300 select SYS_HAS_CPU_RM7000 305 select SYS_HAS_CPU_RM7000
306 select SYS_HAS_EARLY_PRINTK
301 select SYS_SUPPORTS_32BIT_KERNEL 307 select SYS_SUPPORTS_32BIT_KERNEL
302 select SYS_SUPPORTS_64BIT_KERNEL 308 select SYS_SUPPORTS_64BIT_KERNEL
303 select SYS_SUPPORTS_BIG_ENDIAN 309 select SYS_SUPPORTS_BIG_ENDIAN
304 select SYS_SUPPORTS_LITTLE_ENDIAN 310 select SYS_SUPPORTS_LITTLE_ENDIAN
305 select SYS_SUPPORTS_MULTITHREADING 311 select SYS_SUPPORTS_MULTITHREADING
312 select SYS_SUPPORTS_SMARTMIPS
306 help 313 help
307 This enables support for the MIPS Technologies Malta evaluation 314 This enables support for the MIPS Technologies Malta evaluation
308 board. 315 board.
@@ -312,6 +319,7 @@ config MIPS_SEAD
312 depends on EXPERIMENTAL 319 depends on EXPERIMENTAL
313 select IRQ_CPU 320 select IRQ_CPU
314 select DMA_NONCOHERENT 321 select DMA_NONCOHERENT
322 select SYS_HAS_EARLY_PRINTK
315 select MIPS_BOARDS_GEN 323 select MIPS_BOARDS_GEN
316 select SYS_HAS_CPU_MIPS32_R1 324 select SYS_HAS_CPU_MIPS32_R1
317 select SYS_HAS_CPU_MIPS32_R2 325 select SYS_HAS_CPU_MIPS32_R2
@@ -320,6 +328,7 @@ config MIPS_SEAD
320 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL 328 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
321 select SYS_SUPPORTS_BIG_ENDIAN 329 select SYS_SUPPORTS_BIG_ENDIAN
322 select SYS_SUPPORTS_LITTLE_ENDIAN 330 select SYS_SUPPORTS_LITTLE_ENDIAN
331 select SYS_SUPPORTS_SMARTMIPS
323 help 332 help
324 This enables support for the MIPS Technologies SEAD evaluation 333 This enables support for the MIPS Technologies SEAD evaluation
325 board. 334 board.
@@ -330,7 +339,7 @@ config WR_PPMC
330 select BOOT_ELF32 339 select BOOT_ELF32
331 select DMA_NONCOHERENT 340 select DMA_NONCOHERENT
332 select HW_HAS_PCI 341 select HW_HAS_PCI
333 select MIPS_GT64120 342 select PCI_GT64XXX_PCI0
334 select SWAP_IO_SPACE 343 select SWAP_IO_SPACE
335 select SYS_HAS_CPU_MIPS32_R1 344 select SYS_HAS_CPU_MIPS32_R1
336 select SYS_HAS_CPU_MIPS32_R2 345 select SYS_HAS_CPU_MIPS32_R2
@@ -348,9 +357,11 @@ config WR_PPMC
348config MIPS_SIM 357config MIPS_SIM
349 bool 'MIPS simulator (MIPSsim)' 358 bool 'MIPS simulator (MIPSsim)'
350 select DMA_NONCOHERENT 359 select DMA_NONCOHERENT
360 select SYS_HAS_EARLY_PRINTK
351 select IRQ_CPU 361 select IRQ_CPU
352 select SYS_HAS_CPU_MIPS32_R1 362 select SYS_HAS_CPU_MIPS32_R1
353 select SYS_HAS_CPU_MIPS32_R2 363 select SYS_HAS_CPU_MIPS32_R2
364 select SYS_HAS_EARLY_PRINTK
354 select SYS_SUPPORTS_32BIT_KERNEL 365 select SYS_SUPPORTS_32BIT_KERNEL
355 select SYS_SUPPORTS_BIG_ENDIAN 366 select SYS_SUPPORTS_BIG_ENDIAN
356 select SYS_SUPPORTS_LITTLE_ENDIAN 367 select SYS_SUPPORTS_LITTLE_ENDIAN
@@ -371,9 +382,11 @@ config MOMENCO_JAGUAR_ATX
371 select RM7000_CPU_SCACHE 382 select RM7000_CPU_SCACHE
372 select SWAP_IO_SPACE 383 select SWAP_IO_SPACE
373 select SYS_HAS_CPU_RM9000 384 select SYS_HAS_CPU_RM9000
385 select SYS_HAS_EARLY_PRINTK
374 select SYS_SUPPORTS_32BIT_KERNEL 386 select SYS_SUPPORTS_32BIT_KERNEL
375 select SYS_SUPPORTS_64BIT_KERNEL 387 select SYS_SUPPORTS_64BIT_KERNEL
376 select SYS_SUPPORTS_BIG_ENDIAN 388 select SYS_SUPPORTS_BIG_ENDIAN
389 select SYS_SUPPORTS_KGDB
377 help 390 help
378 The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by 391 The Jaguar ATX is a MIPS-based Single Board Computer (SBC) made by
379 Momentum Computer <http://www.momenco.com/>. 392 Momentum Computer <http://www.momenco.com/>.
@@ -384,13 +397,14 @@ config MOMENCO_OCELOT
384 select HW_HAS_PCI 397 select HW_HAS_PCI
385 select IRQ_CPU 398 select IRQ_CPU
386 select IRQ_CPU_RM7K 399 select IRQ_CPU_RM7K
387 select MIPS_GT64120 400 select PCI_GT64XXX_PCI0
388 select RM7000_CPU_SCACHE 401 select RM7000_CPU_SCACHE
389 select SWAP_IO_SPACE 402 select SWAP_IO_SPACE
390 select SYS_HAS_CPU_RM7000 403 select SYS_HAS_CPU_RM7000
391 select SYS_SUPPORTS_32BIT_KERNEL 404 select SYS_SUPPORTS_32BIT_KERNEL
392 select SYS_SUPPORTS_64BIT_KERNEL 405 select SYS_SUPPORTS_64BIT_KERNEL
393 select SYS_SUPPORTS_BIG_ENDIAN 406 select SYS_SUPPORTS_BIG_ENDIAN
407 select SYS_SUPPORTS_KGDB
394 help 408 help
395 The Ocelot is a MIPS-based Single Board Computer (SBC) made by 409 The Ocelot is a MIPS-based Single Board Computer (SBC) made by
396 Momentum Computer <http://www.momenco.com/>. 410 Momentum Computer <http://www.momenco.com/>.
@@ -455,11 +469,6 @@ config MIPS_XXS1500
455 select SOC_AU1500 469 select SOC_AU1500
456 select SYS_SUPPORTS_LITTLE_ENDIAN 470 select SYS_SUPPORTS_LITTLE_ENDIAN
457 471
458config PNX8550_V2PCI
459 bool "Philips PNX8550 based Viper2-PCI board"
460 select PNX8550
461 select SYS_SUPPORTS_LITTLE_ENDIAN
462
463config PNX8550_JBS 472config PNX8550_JBS
464 bool "Philips PNX8550 based JBS board" 473 bool "Philips PNX8550 based JBS board"
465 select PNX8550 474 select PNX8550
@@ -480,6 +489,8 @@ config DDB5477
480 select SYS_HAS_CPU_R5432 489 select SYS_HAS_CPU_R5432
481 select SYS_SUPPORTS_32BIT_KERNEL 490 select SYS_SUPPORTS_32BIT_KERNEL
482 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL 491 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
492 select SYS_SUPPORTS_KGDB
493 select SYS_SUPPORTS_KGDB
483 select SYS_SUPPORTS_LITTLE_ENDIAN 494 select SYS_SUPPORTS_LITTLE_ENDIAN
484 help 495 help
485 This enables support for the R5432-based NEC DDB Vrc-5477, 496 This enables support for the R5432-based NEC DDB Vrc-5477,
@@ -489,10 +500,8 @@ config DDB5477
489 ether port USB, AC97, PCI, etc. 500 ether port USB, AC97, PCI, etc.
490 501
491config MACH_VR41XX 502config MACH_VR41XX
492 bool "NEC VR41XX-based machines" 503 bool "NEC VR4100 series based machines"
493 select SYS_HAS_CPU_VR41XX 504 select SYS_HAS_CPU_VR41XX
494 select SYS_SUPPORTS_32BIT_KERNEL
495 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
496 select GENERIC_HARDIRQS_NO__DO_IRQ 505 select GENERIC_HARDIRQS_NO__DO_IRQ
497 506
498config PMC_YOSEMITE 507config PMC_YOSEMITE
@@ -504,10 +513,12 @@ config PMC_YOSEMITE
504 select IRQ_CPU_RM9K 513 select IRQ_CPU_RM9K
505 select SWAP_IO_SPACE 514 select SWAP_IO_SPACE
506 select SYS_HAS_CPU_RM9000 515 select SYS_HAS_CPU_RM9000
516 select SYS_HAS_EARLY_PRINTK
507 select SYS_SUPPORTS_32BIT_KERNEL 517 select SYS_SUPPORTS_32BIT_KERNEL
508 select SYS_SUPPORTS_64BIT_KERNEL 518 select SYS_SUPPORTS_64BIT_KERNEL
509 select SYS_SUPPORTS_BIG_ENDIAN 519 select SYS_SUPPORTS_BIG_ENDIAN
510 select SYS_SUPPORTS_HIGHMEM 520 select SYS_SUPPORTS_HIGHMEM
521 select SYS_SUPPORTS_KGDB
511 select SYS_SUPPORTS_SMP 522 select SYS_SUPPORTS_SMP
512 help 523 help
513 Yosemite is an evaluation board for the RM9000x2 processor 524 Yosemite is an evaluation board for the RM9000x2 processor
@@ -528,6 +539,8 @@ config QEMU
528 select SYS_SUPPORTS_LITTLE_ENDIAN 539 select SYS_SUPPORTS_LITTLE_ENDIAN
529 select ARCH_SPARSEMEM_ENABLE 540 select ARCH_SPARSEMEM_ENABLE
530 select GENERIC_HARDIRQS_NO__DO_IRQ 541 select GENERIC_HARDIRQS_NO__DO_IRQ
542 select NR_CPUS_DEFAULT_1
543 select SYS_SUPPORTS_SMP
531 help 544 help
532 Qemu is a software emulator which among other architectures also 545 Qemu is a software emulator which among other architectures also
533 can simulate a MIPS32 4Kc system. This patch adds support for the 546 can simulate a MIPS32 4Kc system. This patch adds support for the
@@ -563,6 +576,7 @@ config SGI_IP22
563 select SWAP_IO_SPACE 576 select SWAP_IO_SPACE
564 select SYS_HAS_CPU_R4X00 577 select SYS_HAS_CPU_R4X00
565 select SYS_HAS_CPU_R5000 578 select SYS_HAS_CPU_R5000
579 select SYS_HAS_EARLY_PRINTK
566 select SYS_SUPPORTS_32BIT_KERNEL 580 select SYS_SUPPORTS_32BIT_KERNEL
567 select SYS_SUPPORTS_64BIT_KERNEL 581 select SYS_SUPPORTS_64BIT_KERNEL
568 select SYS_SUPPORTS_BIG_ENDIAN 582 select SYS_SUPPORTS_BIG_ENDIAN
@@ -577,13 +591,14 @@ config SGI_IP27
577 select ARC64 591 select ARC64
578 select BOOT_ELF64 592 select BOOT_ELF64
579 select DMA_IP27 593 select DMA_IP27
580 select EARLY_PRINTK 594 select SYS_HAS_EARLY_PRINTK
581 select HW_HAS_PCI 595 select HW_HAS_PCI
582 select NR_CPUS_DEFAULT_64 596 select NR_CPUS_DEFAULT_64
583 select PCI_DOMAINS 597 select PCI_DOMAINS
584 select SYS_HAS_CPU_R10000 598 select SYS_HAS_CPU_R10000
585 select SYS_SUPPORTS_64BIT_KERNEL 599 select SYS_SUPPORTS_64BIT_KERNEL
586 select SYS_SUPPORTS_BIG_ENDIAN 600 select SYS_SUPPORTS_BIG_ENDIAN
601 select SYS_SUPPORTS_KGDB
587 select SYS_SUPPORTS_NUMA 602 select SYS_SUPPORTS_NUMA
588 select SYS_SUPPORTS_SMP 603 select SYS_SUPPORTS_SMP
589 select GENERIC_HARDIRQS_NO__DO_IRQ 604 select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -633,6 +648,7 @@ config SIBYTE_SWARM
633 select SYS_HAS_CPU_SB1 648 select SYS_HAS_CPU_SB1
634 select SYS_SUPPORTS_BIG_ENDIAN 649 select SYS_SUPPORTS_BIG_ENDIAN
635 select SYS_SUPPORTS_HIGHMEM 650 select SYS_SUPPORTS_HIGHMEM
651 select SYS_SUPPORTS_KGDB
636 select SYS_SUPPORTS_LITTLE_ENDIAN 652 select SYS_SUPPORTS_LITTLE_ENDIAN
637 653
638config SIBYTE_SENTOSA 654config SIBYTE_SENTOSA
@@ -726,16 +742,18 @@ config SNI_RM
726 select BOOT_ELF32 742 select BOOT_ELF32
727 select DMA_NONCOHERENT 743 select DMA_NONCOHERENT
728 select GENERIC_ISA_DMA 744 select GENERIC_ISA_DMA
729 select HAVE_STD_PC_SERIAL_PORT
730 select HW_HAS_EISA 745 select HW_HAS_EISA
731 select HW_HAS_PCI 746 select HW_HAS_PCI
747 select IRQ_CPU
732 select I8253 748 select I8253
733 select I8259 749 select I8259
734 select ISA 750 select ISA
735 select SWAP_IO_SPACE if CPU_BIG_ENDIAN 751 select SWAP_IO_SPACE if CPU_BIG_ENDIAN
736 select SYS_HAS_CPU_R4X00 752 select SYS_HAS_CPU_R4X00
737 select SYS_HAS_CPU_R5000 753 select SYS_HAS_CPU_R5000
754 select SYS_HAS_CPU_R10000
738 select R5000_CPU_SCACHE 755 select R5000_CPU_SCACHE
756 select SYS_HAS_EARLY_PRINTK
739 select SYS_SUPPORTS_32BIT_KERNEL 757 select SYS_SUPPORTS_32BIT_KERNEL
740 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL 758 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
741 select SYS_SUPPORTS_BIG_ENDIAN 759 select SYS_SUPPORTS_BIG_ENDIAN
@@ -758,6 +776,7 @@ config TOSHIBA_JMR3927
758 select SYS_SUPPORTS_LITTLE_ENDIAN 776 select SYS_SUPPORTS_LITTLE_ENDIAN
759 select SYS_SUPPORTS_BIG_ENDIAN 777 select SYS_SUPPORTS_BIG_ENDIAN
760 select TOSHIBA_BOARDS 778 select TOSHIBA_BOARDS
779 select GENERIC_HARDIRQS_NO__DO_IRQ
761 780
762config TOSHIBA_RBTX4927 781config TOSHIBA_RBTX4927
763 bool "Toshiba TBTX49[23]7 board" 782 bool "Toshiba TBTX49[23]7 board"
@@ -772,6 +791,7 @@ config TOSHIBA_RBTX4927
772 select SYS_SUPPORTS_64BIT_KERNEL 791 select SYS_SUPPORTS_64BIT_KERNEL
773 select SYS_SUPPORTS_LITTLE_ENDIAN 792 select SYS_SUPPORTS_LITTLE_ENDIAN
774 select SYS_SUPPORTS_BIG_ENDIAN 793 select SYS_SUPPORTS_BIG_ENDIAN
794 select SYS_SUPPORTS_KGDB
775 select TOSHIBA_BOARDS 795 select TOSHIBA_BOARDS
776 select GENERIC_HARDIRQS_NO__DO_IRQ 796 select GENERIC_HARDIRQS_NO__DO_IRQ
777 help 797 help
@@ -792,6 +812,7 @@ config TOSHIBA_RBTX4938
792 select SYS_SUPPORTS_32BIT_KERNEL 812 select SYS_SUPPORTS_32BIT_KERNEL
793 select SYS_SUPPORTS_LITTLE_ENDIAN 813 select SYS_SUPPORTS_LITTLE_ENDIAN
794 select SYS_SUPPORTS_BIG_ENDIAN 814 select SYS_SUPPORTS_BIG_ENDIAN
815 select SYS_SUPPORTS_KGDB
795 select TOSHIBA_BOARDS 816 select TOSHIBA_BOARDS
796 select GENERIC_HARDIRQS_NO__DO_IRQ 817 select GENERIC_HARDIRQS_NO__DO_IRQ
797 help 818 help
@@ -812,7 +833,6 @@ source "arch/mips/tx4927/Kconfig"
812source "arch/mips/tx4938/Kconfig" 833source "arch/mips/tx4938/Kconfig"
813source "arch/mips/vr41xx/Kconfig" 834source "arch/mips/vr41xx/Kconfig"
814source "arch/mips/philips/pnx8550/common/Kconfig" 835source "arch/mips/philips/pnx8550/common/Kconfig"
815source "arch/mips/cobalt/Kconfig"
816 836
817endmenu 837endmenu
818 838
@@ -882,10 +902,25 @@ config DMA_NEED_PCI_MAP_STATE
882 bool 902 bool
883 903
884config EARLY_PRINTK 904config EARLY_PRINTK
905 bool "Early printk" if EMBEDDED && DEBUG_KERNEL
906 depends on SYS_HAS_EARLY_PRINTK
907 default y
908 help
909 This option enables special console drivers which allow the kernel
910 to print messages very early in the bootup process.
911
912 This is useful for kernel debugging when your machine crashes very
913 early before the console code is initialized. For normal operation
914 it is not recommended because it looks on some machines ugly and
915 oesn't cooperate with an X server. You should normally N here,
916 unless you want to debug such a crash.
917
918config SYS_HAS_EARLY_PRINTK
885 bool 919 bool
886 920
887config GENERIC_ISA_DMA 921config GENERIC_ISA_DMA
888 bool 922 bool
923 select ZONE_DMA
889 924
890config I8259 925config I8259
891 bool 926 bool
@@ -909,6 +944,7 @@ config MIPS_DISABLE_OBSOLETE_IDE
909 944
910config GENERIC_ISA_DMA_SUPPORT_BROKEN 945config GENERIC_ISA_DMA_SUPPORT_BROKEN
911 bool 946 bool
947 select ZONE_DMA
912 948
913# 949#
914# Endianess selection. Sufficiently obscure so many users don't know what to 950# Endianess selection. Sufficiently obscure so many users don't know what to
@@ -958,14 +994,12 @@ config IRQ_MV64340
958 994
959config DDB5XXX_COMMON 995config DDB5XXX_COMMON
960 bool 996 bool
997 select SYS_SUPPORTS_KGDB
961 998
962config MIPS_BOARDS_GEN 999config MIPS_BOARDS_GEN
963 bool 1000 bool
964 1001
965config MIPS_GT64111 1002config PCI_GT64XXX_PCI0
966 bool
967
968config MIPS_GT64120
969 bool 1003 bool
970 1004
971config MIPS_TX3927 1005config MIPS_TX3927
@@ -1006,6 +1040,7 @@ config SOC_AU1X00
1006 select SYS_HAS_CPU_MIPS32_R1 1040 select SYS_HAS_CPU_MIPS32_R1
1007 select SYS_SUPPORTS_32BIT_KERNEL 1041 select SYS_SUPPORTS_32BIT_KERNEL
1008 select SYS_SUPPORTS_APM_EMULATION 1042 select SYS_SUPPORTS_APM_EMULATION
1043 select SYS_SUPPORTS_KGDB
1009 1044
1010config PNX8550 1045config PNX8550
1011 bool 1046 bool
@@ -1016,8 +1051,10 @@ config SOC_PNX8550
1016 select DMA_NONCOHERENT 1051 select DMA_NONCOHERENT
1017 select HW_HAS_PCI 1052 select HW_HAS_PCI
1018 select SYS_HAS_CPU_MIPS32_R1 1053 select SYS_HAS_CPU_MIPS32_R1
1054 select SYS_HAS_EARLY_PRINTK
1019 select SYS_SUPPORTS_32BIT_KERNEL 1055 select SYS_SUPPORTS_32BIT_KERNEL
1020 select GENERIC_HARDIRQS_NO__DO_IRQ 1056 select GENERIC_HARDIRQS_NO__DO_IRQ
1057 select SYS_SUPPORTS_KGDB
1021 1058
1022config SWAP_IO_SPACE 1059config SWAP_IO_SPACE
1023 bool 1060 bool
@@ -1066,7 +1103,7 @@ config BOOT_ELF32
1066 1103
1067config MIPS_L1_CACHE_SHIFT 1104config MIPS_L1_CACHE_SHIFT
1068 int 1105 int
1069 default "4" if MACH_DECSTATION 1106 default "4" if MACH_DECSTATION || SNI_RM
1070 default "7" if SGI_IP27 1107 default "7" if SGI_IP27
1071 default "5" 1108 default "5"
1072 1109
@@ -1075,7 +1112,7 @@ config HAVE_STD_PC_SERIAL_PORT
1075 1112
1076config ARC_CONSOLE 1113config ARC_CONSOLE
1077 bool "ARC console support" 1114 bool "ARC console support"
1078 depends on SGI_IP22 || SNI_RM 1115 depends on SGI_IP22 || (SNI_RM && CPU_LITTLE_ENDIAN)
1079 1116
1080config ARC_MEMORY 1117config ARC_MEMORY
1081 bool 1118 bool
@@ -1521,6 +1558,7 @@ config MIPS_MT_SMP
1521 select CPU_MIPSR2_IRQ_VI 1558 select CPU_MIPSR2_IRQ_VI
1522 select CPU_MIPSR2_SRS 1559 select CPU_MIPSR2_SRS
1523 select MIPS_MT 1560 select MIPS_MT
1561 select NR_CPUS_DEFAULT_2
1524 select SMP 1562 select SMP
1525 select SYS_SUPPORTS_SMP 1563 select SYS_SUPPORTS_SMP
1526 help 1564 help
@@ -1535,7 +1573,6 @@ config MIPS_MT_SMTC
1535 select CPU_MIPSR2_IRQ_VI 1573 select CPU_MIPSR2_IRQ_VI
1536 select CPU_MIPSR2_SRS 1574 select CPU_MIPSR2_SRS
1537 select MIPS_MT 1575 select MIPS_MT
1538 select NR_CPUS_DEFAULT_2
1539 select NR_CPUS_DEFAULT_8 1576 select NR_CPUS_DEFAULT_8
1540 select SMP 1577 select SMP
1541 select SYS_SUPPORTS_SMP 1578 select SYS_SUPPORTS_SMP
@@ -1566,7 +1603,7 @@ config MIPS_MT_FPAFF
1566 1603
1567config MIPS_MT_SMTC_INSTANT_REPLAY 1604config MIPS_MT_SMTC_INSTANT_REPLAY
1568 bool "Low-latency Dispatch of Deferred SMTC IPIs" 1605 bool "Low-latency Dispatch of Deferred SMTC IPIs"
1569 depends on MIPS_MT_SMTC 1606 depends on MIPS_MT_SMTC && !PREEMPT
1570 default y 1607 default y
1571 help 1608 help
1572 SMTC pseudo-interrupts between TCs are deferred and queued 1609 SMTC pseudo-interrupts between TCs are deferred and queued
@@ -1626,6 +1663,18 @@ config 64BIT_PHYS_ADDR
1626config CPU_HAS_LLSC 1663config CPU_HAS_LLSC
1627 bool 1664 bool
1628 1665
1666config CPU_HAS_SMARTMIPS
1667 depends on SYS_SUPPORTS_SMARTMIPS
1668 bool "Support for the SmartMIPS ASE"
1669 help
1670 SmartMIPS is a extension of the MIPS32 architecture aimed at
1671 increased security at both hardware and software level for
1672 smartcards. Enabling this option will allow proper use of the
1673 SmartMIPS instructions by Linux applications. However a kernel with
1674 this option will not work on a MIPS core without SmartMIPS core. If
1675 you don't know you probably don't have SmartMIPS and should say N
1676 here.
1677
1629config CPU_HAS_WB 1678config CPU_HAS_WB
1630 bool 1679 bool
1631 1680
@@ -1689,6 +1738,9 @@ config CPU_SUPPORTS_HIGHMEM
1689config SYS_SUPPORTS_HIGHMEM 1738config SYS_SUPPORTS_HIGHMEM
1690 bool 1739 bool
1691 1740
1741config SYS_SUPPORTS_SMARTMIPS
1742 bool
1743
1692config ARCH_FLATMEM_ENABLE 1744config ARCH_FLATMEM_ENABLE
1693 def_bool y 1745 def_bool y
1694 depends on !NUMA 1746 depends on !NUMA
@@ -1752,6 +1804,9 @@ config SMP
1752config SYS_SUPPORTS_SMP 1804config SYS_SUPPORTS_SMP
1753 bool 1805 bool
1754 1806
1807config NR_CPUS_DEFAULT_1
1808 bool
1809
1755config NR_CPUS_DEFAULT_2 1810config NR_CPUS_DEFAULT_2
1756 bool 1811 bool
1757 1812
@@ -1772,8 +1827,9 @@ config NR_CPUS_DEFAULT_64
1772 1827
1773config NR_CPUS 1828config NR_CPUS
1774 int "Maximum number of CPUs (2-64)" 1829 int "Maximum number of CPUs (2-64)"
1775 range 2 64 1830 range 1 64 if NR_CPUS_DEFAULT_1
1776 depends on SMP 1831 depends on SMP
1832 default "1" if NR_CPUS_DEFAULT_1
1777 default "2" if NR_CPUS_DEFAULT_2 1833 default "2" if NR_CPUS_DEFAULT_2
1778 default "4" if NR_CPUS_DEFAULT_4 1834 default "4" if NR_CPUS_DEFAULT_4
1779 default "8" if NR_CPUS_DEFAULT_8 1835 default "8" if NR_CPUS_DEFAULT_8
@@ -1784,10 +1840,13 @@ config NR_CPUS
1784 This allows you to specify the maximum number of CPUs which this 1840 This allows you to specify the maximum number of CPUs which this
1785 kernel will support. The maximum supported value is 32 for 32-bit 1841 kernel will support. The maximum supported value is 32 for 32-bit
1786 kernel and 64 for 64-bit kernels; the minimum value which makes 1842 kernel and 64 for 64-bit kernels; the minimum value which makes
1787 sense is 2. 1843 sense is 1 for Qemu (useful only for kernel debugging purposes)
1844 and 2 for all others.
1788 1845
1789 This is purely to save memory - each supported CPU adds 1846 This is purely to save memory - each supported CPU adds
1790 approximately eight kilobytes to the kernel image. 1847 approximately eight kilobytes to the kernel image. For best
1848 performance should round up your number of processors to the next
1849 power of two.
1791 1850
1792# 1851#
1793# Timer Interrupt Frequency Configuration 1852# Timer Interrupt Frequency Configuration
@@ -1862,10 +1921,6 @@ config HZ
1862 1921
1863source "kernel/Kconfig.preempt" 1922source "kernel/Kconfig.preempt"
1864 1923
1865config RTC_DS1742
1866 bool "DS1742 BRAM/RTC support"
1867 depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
1868
1869config MIPS_INSANE_LARGE 1924config MIPS_INSANE_LARGE
1870 bool "Support for large 64-bit configurations" 1925 bool "Support for large 64-bit configurations"
1871 depends on CPU_R10000 && 64BIT 1926 depends on CPU_R10000 && 64BIT
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 9351f1c04a9d..72d5c198e790 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -37,9 +37,18 @@ config DEBUG_STACK_USAGE
37 37
38 This option will slow down process creation somewhat. 38 This option will slow down process creation somewhat.
39 39
40config CONFIG_SMTC_IDLE_HOOK_DEBUG
41 bool "Enable additional debug checks before going into CPU idle loop"
42 depends on DEBUG_KERNEL && MIPS_MT_SMTC
43 help
44 This option enables Enable additional debug checks before going into
45 CPU idle loop. For details on these checks, see
46 arch/mips/kernel/smtc.c. This debugging option result in significant
47 overhead so should be disabled in production kernels.
48
40config KGDB 49config KGDB
41 bool "Remote GDB kernel debugging" 50 bool "Remote GDB kernel debugging"
42 depends on DEBUG_KERNEL 51 depends on DEBUG_KERNEL && SYS_SUPPORTS_KGDB
43 select DEBUG_INFO 52 select DEBUG_INFO
44 help 53 help
45 If you say Y here, it will be possible to remotely debug the MIPS 54 If you say Y here, it will be possible to remotely debug the MIPS
@@ -48,6 +57,9 @@ config KGDB
48 better 32 MB RAM to avoid excessive linking time. This is only 57 better 32 MB RAM to avoid excessive linking time. This is only
49 useful for kernel hackers. If unsure, say N. 58 useful for kernel hackers. If unsure, say N.
50 59
60config SYS_SUPPORTS_KGDB
61 bool
62
51config GDB_CONSOLE 63config GDB_CONSOLE
52 bool "Console output to GDB" 64 bool "Console output to GDB"
53 depends on KGDB 65 depends on KGDB
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index c68b5d3e5d18..f2f742df32c7 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -103,6 +103,8 @@ predef-le += -DMIPSEL -D_MIPSEL -D__MIPSEL -D__MIPSEL__
103cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB $(undef-all) $(predef-be)) 103cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB $(undef-all) $(predef-be))
104cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le)) 104cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le))
105 105
106cflags-$(CONFIG_CPU_HAS_SMARTMIPS) += $(call cc-option,-msmartmips)
107
106cflags-$(CONFIG_SB1XXX_CORELIS) += $(call cc-option,-mno-sched-prolog) \ 108cflags-$(CONFIG_SB1XXX_CORELIS) += $(call cc-option,-mno-sched-prolog) \
107 -fno-omit-frame-pointer 109 -fno-omit-frame-pointer
108 110
@@ -528,25 +530,29 @@ cflags-$(CONFIG_SGI_IP32) += -Iinclude/asm-mips/mach-ip32
528load-$(CONFIG_SGI_IP32) += 0xffffffff80004000 530load-$(CONFIG_SGI_IP32) += 0xffffffff80004000
529 531
530# 532#
531# Sibyte SB1250 SOC 533# Sibyte SB1250/BCM1480 SOC
532# 534#
533# This is a LIB so that it links at the end, and initcalls are later 535# This is a LIB so that it links at the end, and initcalls are later
534# the sequence; but it is built as an object so that modules don't get 536# the sequence; but it is built as an object so that modules don't get
535# removed (as happens, even if they have __initcall/module_init) 537# removed (as happens, even if they have __initcall/module_init)
536# 538#
537core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/sb1250/ 539core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/sb1250/
540core-$(CONFIG_SIBYTE_BCM112X) += arch/mips/sibyte/common/
538cflags-$(CONFIG_SIBYTE_BCM112X) += -Iinclude/asm-mips/mach-sibyte \ 541cflags-$(CONFIG_SIBYTE_BCM112X) += -Iinclude/asm-mips/mach-sibyte \
539 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL 542 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
540 543
541core-$(CONFIG_SIBYTE_SB1250) += arch/mips/sibyte/sb1250/ 544core-$(CONFIG_SIBYTE_SB1250) += arch/mips/sibyte/sb1250/
545core-$(CONFIG_SIBYTE_SB1250) += arch/mips/sibyte/common/
542cflags-$(CONFIG_SIBYTE_SB1250) += -Iinclude/asm-mips/mach-sibyte \ 546cflags-$(CONFIG_SIBYTE_SB1250) += -Iinclude/asm-mips/mach-sibyte \
543 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL 547 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1250_112x_ALL
544 548
545core-$(CONFIG_SIBYTE_BCM1x55) += arch/mips/sibyte/bcm1480/ 549core-$(CONFIG_SIBYTE_BCM1x55) += arch/mips/sibyte/bcm1480/
550core-$(CONFIG_SIBYTE_BCM1x55) += arch/mips/sibyte/common/
546cflags-$(CONFIG_SIBYTE_BCM1x55) += -Iinclude/asm-mips/mach-sibyte \ 551cflags-$(CONFIG_SIBYTE_BCM1x55) += -Iinclude/asm-mips/mach-sibyte \
547 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL 552 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
548 553
549core-$(CONFIG_SIBYTE_BCM1x80) += arch/mips/sibyte/bcm1480/ 554core-$(CONFIG_SIBYTE_BCM1x80) += arch/mips/sibyte/bcm1480/
555core-$(CONFIG_SIBYTE_BCM1x80) += arch/mips/sibyte/common/
550cflags-$(CONFIG_SIBYTE_BCM1x80) += -Iinclude/asm-mips/mach-sibyte \ 556cflags-$(CONFIG_SIBYTE_BCM1x80) += -Iinclude/asm-mips/mach-sibyte \
551 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL 557 -DSIBYTE_HDR_FEATURES=SIBYTE_HDR_FMASK_1480_ALL
552 558
diff --git a/arch/mips/arc/console.c b/arch/mips/arc/console.c
index 6a9d144512c0..0fe6032999cb 100644
--- a/arch/mips/arc/console.c
+++ b/arch/mips/arc/console.c
@@ -29,35 +29,3 @@ void prom_putchar(char c)
29 ArcWrite(1, &it, 1, &cnt); 29 ArcWrite(1, &it, 1, &cnt);
30 bc_enable(); 30 bc_enable();
31} 31}
32
33char prom_getchar(void)
34{
35 ULONG cnt;
36 CHAR c;
37
38 bc_disable();
39 ArcRead(0, &c, 1, &cnt);
40 bc_enable();
41
42 return c;
43}
44
45void prom_printf(char *fmt, ...)
46{
47 va_list args;
48 char ppbuf[1024];
49 char *bptr;
50
51 va_start(args, fmt);
52 vsprintf(ppbuf, fmt, args);
53
54 bptr = ppbuf;
55
56 while (*bptr != 0) {
57 if (*bptr == '\n')
58 prom_putchar('\r');
59
60 prom_putchar(*bptr++);
61 }
62 va_end(args);
63}
diff --git a/arch/mips/arc/init.c b/arch/mips/arc/init.c
index 76ab505ca693..e2f75b13312f 100644
--- a/arch/mips/arc/init.c
+++ b/arch/mips/arc/init.c
@@ -23,13 +23,16 @@ LONG *_prom_argv, *_prom_envp;
23void __init prom_init(void) 23void __init prom_init(void)
24{ 24{
25 PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK; 25 PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK;
26
26 romvec = ROMVECTOR; 27 romvec = ROMVECTOR;
28
27 prom_argc = fw_arg0; 29 prom_argc = fw_arg0;
28 _prom_argv = (LONG *) fw_arg1; 30 _prom_argv = (LONG *) fw_arg1;
29 _prom_envp = (LONG *) fw_arg2; 31 _prom_envp = (LONG *) fw_arg2;
30 32
31 if (pb->magic != 0x53435241) { 33 if (pb->magic != 0x53435241) {
32 prom_printf("Aieee, bad prom vector magic %08lx\n", pb->magic); 34 printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n",
35 (unsigned long) pb->magic);
33 while(1) 36 while(1)
34 ; 37 ;
35 } 38 }
@@ -41,8 +44,8 @@ void __init prom_init(void)
41 prom_meminit(); 44 prom_meminit();
42 45
43#ifdef DEBUG_PROM_INIT 46#ifdef DEBUG_PROM_INIT
44 prom_printf("Press a key to reboot\n"); 47 pr_info("Press a key to reboot\n");
45 prom_getchar(); 48 ArcRead(0, &c, 1, &cnt);
46 ArcEnterInteractiveMode(); 49 ArcEnterInteractiveMode();
47#endif 50#endif
48} 51}
diff --git a/arch/mips/arc/memory.c b/arch/mips/arc/memory.c
index 456cb81a32d9..83d15791ef6a 100644
--- a/arch/mips/arc/memory.c
+++ b/arch/mips/arc/memory.c
@@ -118,11 +118,11 @@ void __init prom_meminit(void)
118#ifdef DEBUG 118#ifdef DEBUG
119 int i = 0; 119 int i = 0;
120 120
121 prom_printf("ARCS MEMORY DESCRIPTOR dump:\n"); 121 printk("ARCS MEMORY DESCRIPTOR dump:\n");
122 p = ArcGetMemoryDescriptor(PROM_NULL_MDESC); 122 p = ArcGetMemoryDescriptor(PROM_NULL_MDESC);
123 while(p) { 123 while(p) {
124 prom_printf("[%d,%p]: base<%08lx> pages<%08lx> type<%s>\n", 124 printk("[%d,%p]: base<%08lx> pages<%08lx> type<%s>\n",
125 i, p, p->base, p->pages, mtypes(p->type)); 125 i, p, p->base, p->pages, mtypes(p->type));
126 p = ArcGetMemoryDescriptor(p); 126 p = ArcGetMemoryDescriptor(p);
127 i++; 127 i++;
128 } 128 }
diff --git a/arch/mips/arc/tree.c b/arch/mips/arc/tree.c
index 2aedd4f52839..abd1786ea09b 100644
--- a/arch/mips/arc/tree.c
+++ b/arch/mips/arc/tree.c
@@ -93,11 +93,11 @@ static char *iflags[] = {
93static void __init 93static void __init
94dump_component(pcomponent *p) 94dump_component(pcomponent *p)
95{ 95{
96 prom_printf("[%p]:class<%s>type<%s>flags<%s>ver<%d>rev<%d>", 96 printk("[%p]:class<%s>type<%s>flags<%s>ver<%d>rev<%d>",
97 p, classes[p->class], types[p->type], 97 p, classes[p->class], types[p->type],
98 iflags[p->iflags], p->vers, p->rev); 98 iflags[p->iflags], p->vers, p->rev);
99 prom_printf("key<%08lx>\n\tamask<%08lx>cdsize<%d>ilen<%d>iname<%s>\n", 99 printk("key<%08lx>\n\tamask<%08lx>cdsize<%d>ilen<%d>iname<%s>\n",
100 p->key, p->amask, (int)p->cdsize, (int)p->ilen, p->iname); 100 p->key, p->amask, (int)p->cdsize, (int)p->ilen, p->iname);
101} 101}
102 102
103static void __init 103static void __init
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c
index 13f9bf5f91a6..7bc5af8917da 100644
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
@@ -43,6 +43,9 @@
43#include <asm/pgtable.h> 43#include <asm/pgtable.h>
44#include <asm/mach-au1x00/au1000.h> 44#include <asm/mach-au1x00/au1000.h>
45 45
46extern int (*board_pci_idsel)(unsigned int devsel, int assert);
47int mtx1_pci_idsel(unsigned int devsel, int assert);
48
46void board_reset (void) 49void board_reset (void)
47{ 50{
48 /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ 51 /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
@@ -66,19 +69,43 @@ void __init board_setup(void)
66#endif 69#endif
67 70
68 // initialize sys_pinfunc: 71 // initialize sys_pinfunc:
69 // disable second ethernet port (SYS_PF_NI2) 72 au_writel( SYS_PF_NI2, SYS_PINFUNC );
70 // set U3/GPIO23 to GPIO23 (SYS_PF_U3)
71 au_writel( SYS_PF_NI2 | SYS_PF_U3, SYS_PINFUNC );
72 73
73 // initialize GPIO 74 // initialize GPIO
74 au_writel( 0xFFFFFFFF, SYS_TRIOUTCLR ); 75 au_writel( 0xFFFFFFFF, SYS_TRIOUTCLR );
75 au_writel( 0x00000001, SYS_OUTPUTCLR ); // set M66EN (PCI 66MHz) to OFF 76 au_writel( 0x00000001, SYS_OUTPUTCLR ); // set M66EN (PCI 66MHz) to OFF
76 au_writel( 0x00000008, SYS_OUTPUTSET ); // set PCI CLKRUN# to OFF 77 au_writel( 0x00000008, SYS_OUTPUTSET ); // set PCI CLKRUN# to OFF
78 au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON
77 au_writel( 0x00000020, SYS_OUTPUTCLR ); // set eth PHY TX_ER to OFF 79 au_writel( 0x00000020, SYS_OUTPUTCLR ); // set eth PHY TX_ER to OFF
78 80
79 // enable LED and set it to green 81 // enable LED and set it to green
80 au_writel( au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR ); 82 au_writel( au_readl(GPIO2_DIR) | 0x1800, GPIO2_DIR );
81 au_writel( 0x18000800, GPIO2_OUTPUT ); 83 au_writel( 0x18000800, GPIO2_OUTPUT );
82 84
85 board_pci_idsel = mtx1_pci_idsel;
86
83 printk("4G Systems MTX-1 Board\n"); 87 printk("4G Systems MTX-1 Board\n");
84} 88}
89
90int
91mtx1_pci_idsel(unsigned int devsel, int assert)
92{
93#define MTX_IDSEL_ONLY_0_AND_3 0
94#if MTX_IDSEL_ONLY_0_AND_3
95 if (devsel != 0 && devsel != 3) {
96 printk("*** not 0 or 3\n");
97 return 0;
98 }
99#endif
100
101 if (assert && devsel != 0) {
102 // supress signal to cardbus
103 au_writel( 0x00000002, SYS_OUTPUTCLR ); // set EXT_IO3 OFF
104 }
105 else {
106 au_writel( 0x00000002, SYS_OUTPUTSET ); // set EXT_IO3 ON
107 }
108 au_sync_udelay(1);
109 return 1;
110}
111
diff --git a/arch/mips/au1000/mtx-1/irqmap.c b/arch/mips/au1000/mtx-1/irqmap.c
index 4693a4eb2b82..a4fa0f227e42 100644
--- a/arch/mips/au1000/mtx-1/irqmap.c
+++ b/arch/mips/au1000/mtx-1/irqmap.c
@@ -48,7 +48,7 @@
48#include <asm/mach-au1x00/au1000.h> 48#include <asm/mach-au1x00/au1000.h>
49 49
50char irq_tab_alchemy[][5] __initdata = { 50char irq_tab_alchemy[][5] __initdata = {
51 [0] = { -1, INTA, INTB, INTX, INTX}, /* IDSEL 00 - AdapterA-Slot0 (top) */ 51 [0] = { -1, INTA, INTA, INTX, INTX}, /* IDSEL 00 - AdapterA-Slot0 (top) */
52 [1] = { -1, INTB, INTA, INTX, INTX}, /* IDSEL 01 - AdapterA-Slot1 (bottom) */ 52 [1] = { -1, INTB, INTA, INTX, INTX}, /* IDSEL 01 - AdapterA-Slot1 (bottom) */
53 [2] = { -1, INTC, INTD, INTX, INTX}, /* IDSEL 02 - AdapterB-Slot0 (top) */ 53 [2] = { -1, INTC, INTD, INTX, INTX}, /* IDSEL 02 - AdapterB-Slot0 (top) */
54 [3] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 03 - AdapterB-Slot1 (bottom) */ 54 [3] = { -1, INTD, INTC, INTX, INTX}, /* IDSEL 03 - AdapterB-Slot1 (bottom) */
diff --git a/arch/mips/basler/excite/excite_setup.c b/arch/mips/basler/excite/excite_setup.c
index a1ce4580058d..2f0e4c08eb04 100644
--- a/arch/mips/basler/excite/excite_setup.c
+++ b/arch/mips/basler/excite/excite_setup.c
@@ -63,7 +63,7 @@ volatile void __iomem * const ocd_base = (void *) (EXCITE_ADDR_OCD);
63volatile void __iomem * const titan_base = (void *) (EXCITE_ADDR_TITAN); 63volatile void __iomem * const titan_base = (void *) (EXCITE_ADDR_TITAN);
64 64
65/* Protect access to shared GPI registers */ 65/* Protect access to shared GPI registers */
66spinlock_t titan_lock = SPIN_LOCK_UNLOCKED; 66DEFINE_SPINLOCK(titan_lock);
67int titan_irqflags; 67int titan_irqflags;
68 68
69 69
@@ -112,7 +112,7 @@ static int __init excite_init_console(void)
112 up.irq = TITAN_IRQ; 112 up.irq = TITAN_IRQ;
113 up.uartclk = TITAN_UART_CLK; 113 up.uartclk = TITAN_UART_CLK;
114 up.regshift = 0; 114 up.regshift = 0;
115 up.iotype = UPIO_MEM32; 115 up.iotype = UPIO_RM9000;
116 up.type = PORT_RM9000; 116 up.type = PORT_RM9000;
117 up.flags = UPF_SHARE_IRQ; 117 up.flags = UPF_SHARE_IRQ;
118 up.line = 0; 118 up.line = 0;
diff --git a/arch/mips/cobalt/Kconfig b/arch/mips/cobalt/Kconfig
deleted file mode 100644
index 7c42b088d16c..000000000000
--- a/arch/mips/cobalt/Kconfig
+++ /dev/null
@@ -1,7 +0,0 @@
1config EARLY_PRINTK
2 bool "Early console support"
3 depends on MIPS_COBALT
4 help
5 Provide early console support by direct access to the
6 on board UART. The UART must have been previously
7 initialised by the boot loader.
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index c35ee25e5578..9565b2104dcd 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -4,6 +4,6 @@
4 4
5obj-y := irq.o reset.o setup.o buttons.o 5obj-y := irq.o reset.o setup.o buttons.o
6 6
7obj-$(CONFIG_PCI) += pci.o
7obj-$(CONFIG_EARLY_PRINTK) += console.o 8obj-$(CONFIG_EARLY_PRINTK) += console.o
8 9obj-$(CONFIG_MTD_PHYSMAP) += mtd.o
9EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index 46c23b66bc17..0485d51f7216 100644
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,47 +1,16 @@
1/* 1/*
2 * (C) P. Horton 2006 2 * (C) P. Horton 2006
3 */ 3 */
4
5#include <linux/init.h>
6#include <linux/kernel.h>
7#include <linux/console.h>
8#include <linux/serial_reg.h> 4#include <linux/serial_reg.h>
5
9#include <asm/addrspace.h> 6#include <asm/addrspace.h>
10#include <asm/mach-cobalt/cobalt.h>
11 7
12static void putchar(int c) 8#include <cobalt.h>
13{
14 if(c == '\n')
15 putchar('\r');
16 9
10void prom_putchar(char c)
11{
17 while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE)) 12 while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
18 ; 13 ;
19 14
20 COBALT_UART[UART_TX] = c; 15 COBALT_UART[UART_TX] = c;
21} 16}
22
23static void cons_write(struct console *c, const char *s, unsigned n)
24{
25 while(n-- && *s)
26 putchar(*s++);
27}
28
29static struct console cons_info =
30{
31 .name = "uart",
32 .write = cons_write,
33 .flags = CON_PRINTBUFFER | CON_BOOT,
34 .index = -1,
35};
36
37void __init cobalt_early_console(void)
38{
39 register_console(&cons_info);
40
41 printk("Cobalt: early console registered\n");
42}
43
44void __init disable_early_printk(void)
45{
46 unregister_console(&cons_info);
47}
diff --git a/arch/mips/cobalt/irq.c b/arch/mips/cobalt/irq.c
index fe93b846923b..950ad1e8be44 100644
--- a/arch/mips/cobalt/irq.c
+++ b/arch/mips/cobalt/irq.c
@@ -17,7 +17,7 @@
17#include <asm/irq_cpu.h> 17#include <asm/irq_cpu.h>
18#include <asm/gt64120.h> 18#include <asm/gt64120.h>
19 19
20#include <asm/mach-cobalt/cobalt.h> 20#include <cobalt.h>
21 21
22/* 22/*
23 * We have two types of interrupts that we handle, ones that come in through 23 * We have two types of interrupts that we handle, ones that come in through
diff --git a/arch/mips/cobalt/mtd.c b/arch/mips/cobalt/mtd.c
new file mode 100644
index 000000000000..2b088ef3839a
--- /dev/null
+++ b/arch/mips/cobalt/mtd.c
@@ -0,0 +1,61 @@
1/*
2 * Registration of Cobalt MTD device.
3 *
4 * Copyright (C) 2006 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 */
20#include <linux/init.h>
21#include <linux/platform_device.h>
22#include <linux/mtd/partitions.h>
23#include <linux/mtd/physmap.h>
24
25static struct mtd_partition cobalt_mtd_partitions[] = {
26 {
27 .name = "firmware",
28 .offset = 0x0,
29 .size = 0x80000,
30 },
31};
32
33static struct physmap_flash_data cobalt_flash_data = {
34 .width = 1,
35 .nr_parts = 1,
36 .parts = cobalt_mtd_partitions,
37};
38
39static struct resource cobalt_mtd_resource = {
40 .start = 0x1fc00000,
41 .end = 0x1fc7ffff,
42 .flags = IORESOURCE_MEM,
43};
44
45static struct platform_device cobalt_mtd = {
46 .name = "physmap-flash",
47 .dev = {
48 .platform_data = &cobalt_flash_data,
49 },
50 .num_resources = 1,
51 .resource = &cobalt_mtd_resource,
52};
53
54static int __init cobalt_mtd_init(void)
55{
56 platform_device_register(&cobalt_mtd);
57
58 return 0;
59}
60
61module_init(cobalt_mtd_init);
diff --git a/arch/mips/cobalt/pci.c b/arch/mips/cobalt/pci.c
new file mode 100644
index 000000000000..d91027f43de6
--- /dev/null
+++ b/arch/mips/cobalt/pci.c
@@ -0,0 +1,47 @@
1/*
2 * Register PCI controller.
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 1996, 1997, 2004, 05 by Ralf Baechle (ralf@linux-mips.org)
9 * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
10 *
11 */
12#include <linux/init.h>
13#include <linux/pci.h>
14
15#include <asm/gt64120.h>
16
17extern struct pci_ops gt64xxx_pci0_ops;
18
19static struct resource cobalt_mem_resource = {
20 .start = GT_DEF_PCI0_MEM0_BASE,
21 .end = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1,
22 .name = "PCI memory",
23 .flags = IORESOURCE_MEM,
24};
25
26static struct resource cobalt_io_resource = {
27 .start = 0x1000,
28 .end = GT_DEF_PCI0_IO_SIZE - 1,
29 .name = "PCI I/O",
30 .flags = IORESOURCE_IO,
31};
32
33static struct pci_controller cobalt_pci_controller = {
34 .pci_ops = &gt64xxx_pci0_ops,
35 .mem_resource = &cobalt_mem_resource,
36 .io_resource = &cobalt_io_resource,
37 .io_offset = 0 - GT_DEF_PCI0_IO_BASE,
38};
39
40static int __init cobalt_pci_init(void)
41{
42 register_pci_controller(&cobalt_pci_controller);
43
44 return 0;
45}
46
47arch_initcall(cobalt_pci_init);
diff --git a/arch/mips/cobalt/reset.c b/arch/mips/cobalt/reset.c
index 753dfccae6fa..43cca21fdbc0 100644
--- a/arch/mips/cobalt/reset.c
+++ b/arch/mips/cobalt/reset.c
@@ -8,15 +8,12 @@
8 * Copyright (C) 1995, 1996, 1997 by Ralf Baechle 8 * Copyright (C) 1995, 1996, 1997 by Ralf Baechle
9 * Copyright (C) 2001 by Liam Davies (ldavies@agile.tv) 9 * Copyright (C) 2001 by Liam Davies (ldavies@agile.tv)
10 */ 10 */
11#include <linux/sched.h> 11#include <linux/jiffies.h>
12#include <linux/mm.h> 12
13#include <asm/cacheflush.h>
14#include <asm/io.h> 13#include <asm/io.h>
15#include <asm/processor.h>
16#include <asm/reboot.h> 14#include <asm/reboot.h>
17#include <asm/system.h> 15
18#include <asm/mipsregs.h> 16#include <cobalt.h>
19#include <asm/mach-cobalt/cobalt.h>
20 17
21void cobalt_machine_halt(void) 18void cobalt_machine_halt(void)
22{ 19{
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index a4b69b543bd9..d0dd81790f74 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -19,12 +19,10 @@
19#include <asm/bootinfo.h> 19#include <asm/bootinfo.h>
20#include <asm/time.h> 20#include <asm/time.h>
21#include <asm/io.h> 21#include <asm/io.h>
22#include <asm/irq.h>
23#include <asm/processor.h>
24#include <asm/reboot.h> 22#include <asm/reboot.h>
25#include <asm/gt64120.h> 23#include <asm/gt64120.h>
26 24
27#include <asm/mach-cobalt/cobalt.h> 25#include <cobalt.h>
28 26
29extern void cobalt_machine_restart(char *command); 27extern void cobalt_machine_restart(char *command);
30extern void cobalt_machine_halt(void); 28extern void cobalt_machine_halt(void);
@@ -63,61 +61,38 @@ void __init plat_timer_setup(struct irqaction *irq)
63 GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS)); 61 GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS));
64} 62}
65 63
66extern struct pci_ops gt64111_pci_ops; 64/*
67 65 * Cobalt doesn't have PS/2 keyboard/mouse interfaces,
68static struct resource cobalt_mem_resource = { 66 * keyboard conntroller is never used.
69 .start = GT_DEF_PCI0_MEM0_BASE, 67 * Also PCI-ISA bridge DMA contoroller is never used.
70 .end = GT_DEF_PCI0_MEM0_BASE + GT_DEF_PCI0_MEM0_SIZE - 1, 68 */
71 .name = "PCI memory", 69static struct resource cobalt_reserved_resources[] = {
72 .flags = IORESOURCE_MEM 70 { /* dma1 */
73};
74
75static struct resource cobalt_io_resource = {
76 .start = 0x1000,
77 .end = 0xffff,
78 .name = "PCI I/O",
79 .flags = IORESOURCE_IO
80};
81
82static struct resource cobalt_io_resources[] = {
83 {
84 .start = 0x00, 71 .start = 0x00,
85 .end = 0x1f, 72 .end = 0x1f,
86 .name = "dma1", 73 .name = "reserved",
87 .flags = IORESOURCE_BUSY 74 .flags = IORESOURCE_BUSY | IORESOURCE_IO,
88 }, { 75 },
89 .start = 0x40, 76 { /* keyboard */
90 .end = 0x5f,
91 .name = "timer",
92 .flags = IORESOURCE_BUSY
93 }, {
94 .start = 0x60, 77 .start = 0x60,
95 .end = 0x6f, 78 .end = 0x6f,
96 .name = "keyboard", 79 .name = "reserved",
97 .flags = IORESOURCE_BUSY 80 .flags = IORESOURCE_BUSY | IORESOURCE_IO,
98 }, { 81 },
82 { /* dma page reg */
99 .start = 0x80, 83 .start = 0x80,
100 .end = 0x8f, 84 .end = 0x8f,
101 .name = "dma page reg", 85 .name = "reserved",
102 .flags = IORESOURCE_BUSY 86 .flags = IORESOURCE_BUSY | IORESOURCE_IO,
103 }, { 87 },
88 { /* dma2 */
104 .start = 0xc0, 89 .start = 0xc0,
105 .end = 0xdf, 90 .end = 0xdf,
106 .name = "dma2", 91 .name = "reserved",
107 .flags = IORESOURCE_BUSY 92 .flags = IORESOURCE_BUSY | IORESOURCE_IO,
108 }, 93 },
109}; 94};
110 95
111#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))
112
113static struct pci_controller cobalt_pci_controller = {
114 .pci_ops = &gt64111_pci_ops,
115 .mem_resource = &cobalt_mem_resource,
116 .mem_offset = 0,
117 .io_resource = &cobalt_io_resource,
118 .io_offset = 0 - GT_DEF_PCI0_IO_BASE,
119};
120
121void __init plat_mem_setup(void) 96void __init plat_mem_setup(void)
122{ 97{
123 static struct uart_port uart; 98 static struct uart_port uart;
@@ -130,12 +105,12 @@ void __init plat_mem_setup(void)
130 105
131 set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE)); 106 set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
132 107
133 /* I/O port resource must include UART and LCD/buttons */ 108 /* I/O port resource must include LCD/buttons */
134 ioport_resource.end = 0x0fffffff; 109 ioport_resource.end = 0x0fffffff;
135 110
136 /* request I/O space for devices used on all i[345]86 PCs */ 111 /* These resources have been reserved by VIA SuperI/O chip. */
137 for (i = 0; i < COBALT_IO_RESOURCES; i++) 112 for (i = 0; i < ARRAY_SIZE(cobalt_reserved_resources); i++)
138 request_resource(&ioport_resource, cobalt_io_resources + i); 113 request_resource(&ioport_resource, cobalt_reserved_resources + i);
139 114
140 /* Read the cobalt id register out of the PCI config space */ 115 /* Read the cobalt id register out of the PCI config space */
141 PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3)); 116 PCI_CFG_SET(devfn, (VIA_COBALT_BRD_ID_REG & ~0x3));
@@ -145,28 +120,20 @@ void __init plat_mem_setup(void)
145 120
146 printk("Cobalt board ID: %d\n", cobalt_board_id); 121 printk("Cobalt board ID: %d\n", cobalt_board_id);
147 122
148#ifdef CONFIG_PCI
149 register_pci_controller(&cobalt_pci_controller);
150#endif
151
152#ifdef CONFIG_SERIAL_8250
153 if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { 123 if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
154 124#ifdef CONFIG_SERIAL_8250
155#ifdef CONFIG_EARLY_PRINTK
156 cobalt_early_console();
157#endif
158
159 uart.line = 0; 125 uart.line = 0;
160 uart.type = PORT_UNKNOWN; 126 uart.type = PORT_UNKNOWN;
161 uart.uartclk = 18432000; 127 uart.uartclk = 18432000;
162 uart.irq = COBALT_SERIAL_IRQ; 128 uart.irq = COBALT_SERIAL_IRQ;
163 uart.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST; 129 uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF |
164 uart.iobase = 0xc800000; 130 UPF_SKIP_TEST;
165 uart.iotype = UPIO_PORT; 131 uart.iotype = UPIO_MEM;
132 uart.mapbase = 0x1c800000;
166 133
167 early_serial_setup(&uart); 134 early_serial_setup(&uart);
168 }
169#endif 135#endif
136 }
170} 137}
171 138
172/* 139/*
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index ac1891687520..39e251300c64 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 09:59:39 2006 4# Sun Feb 18 21:27:35 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32CONFIG_MIPS_ATLAS=y 31CONFIG_MIPS_ATLAS=y
@@ -40,8 +39,8 @@ CONFIG_MIPS_ATLAS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_MIPS_ATLAS=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_MIPS_BONITO64=y 76CONFIG_MIPS_BONITO64=y
@@ -129,16 +132,18 @@ CONFIG_BOARD_SCACHE=y
129CONFIG_RM7000_CPU_SCACHE=y 132CONFIG_RM7000_CPU_SCACHE=y
130CONFIG_CPU_HAS_PREFETCH=y 133CONFIG_CPU_HAS_PREFETCH=y
131CONFIG_MIPS_MT_DISABLED=y 134CONFIG_MIPS_MT_DISABLED=y
132# CONFIG_MIPS_MT_SMTC is not set
133# CONFIG_MIPS_MT_SMP is not set 135# CONFIG_MIPS_MT_SMP is not set
136# CONFIG_MIPS_MT_SMTC is not set
134# CONFIG_MIPS_VPE_LOADER is not set 137# CONFIG_MIPS_VPE_LOADER is not set
135CONFIG_SYS_SUPPORTS_MULTITHREADING=y 138CONFIG_SYS_SUPPORTS_MULTITHREADING=y
136# CONFIG_64BIT_PHYS_ADDR is not set 139# CONFIG_64BIT_PHYS_ADDR is not set
137CONFIG_CPU_HAS_LLSC=y 140CONFIG_CPU_HAS_LLSC=y
141# CONFIG_CPU_HAS_SMARTMIPS is not set
138CONFIG_CPU_HAS_SYNC=y 142CONFIG_CPU_HAS_SYNC=y
139CONFIG_GENERIC_HARDIRQS=y 143CONFIG_GENERIC_HARDIRQS=y
140CONFIG_GENERIC_IRQ_PROBE=y 144CONFIG_GENERIC_IRQ_PROBE=y
141CONFIG_CPU_SUPPORTS_HIGHMEM=y 145CONFIG_CPU_SUPPORTS_HIGHMEM=y
146CONFIG_SYS_SUPPORTS_SMARTMIPS=y
142CONFIG_ARCH_FLATMEM_ENABLE=y 147CONFIG_ARCH_FLATMEM_ENABLE=y
143CONFIG_SELECT_MEMORY_MODEL=y 148CONFIG_SELECT_MEMORY_MODEL=y
144CONFIG_FLATMEM_MANUAL=y 149CONFIG_FLATMEM_MANUAL=y
@@ -149,6 +154,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
149# CONFIG_SPARSEMEM_STATIC is not set 154# CONFIG_SPARSEMEM_STATIC is not set
150CONFIG_SPLIT_PTLOCK_CPUS=4 155CONFIG_SPLIT_PTLOCK_CPUS=4
151# CONFIG_RESOURCES_64BIT is not set 156# CONFIG_RESOURCES_64BIT is not set
157CONFIG_ZONE_DMA_FLAG=1
152# CONFIG_HZ_48 is not set 158# CONFIG_HZ_48 is not set
153CONFIG_HZ_100=y 159CONFIG_HZ_100=y
154# CONFIG_HZ_128 is not set 160# CONFIG_HZ_128 is not set
@@ -161,6 +167,7 @@ CONFIG_HZ=100
161CONFIG_PREEMPT_NONE=y 167CONFIG_PREEMPT_NONE=y
162# CONFIG_PREEMPT_VOLUNTARY is not set 168# CONFIG_PREEMPT_VOLUNTARY is not set
163# CONFIG_PREEMPT is not set 169# CONFIG_PREEMPT is not set
170# CONFIG_KEXEC is not set
164CONFIG_LOCKDEP_SUPPORT=y 171CONFIG_LOCKDEP_SUPPORT=y
165CONFIG_STACKTRACE_SUPPORT=y 172CONFIG_STACKTRACE_SUPPORT=y
166CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 173CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -179,15 +186,20 @@ CONFIG_LOCALVERSION=""
179CONFIG_LOCALVERSION_AUTO=y 186CONFIG_LOCALVERSION_AUTO=y
180CONFIG_SWAP=y 187CONFIG_SWAP=y
181CONFIG_SYSVIPC=y 188CONFIG_SYSVIPC=y
189# CONFIG_IPC_NS is not set
190CONFIG_SYSVIPC_SYSCTL=y
182# CONFIG_POSIX_MQUEUE is not set 191# CONFIG_POSIX_MQUEUE is not set
183# CONFIG_BSD_PROCESS_ACCT is not set 192# CONFIG_BSD_PROCESS_ACCT is not set
184CONFIG_SYSCTL=y 193# CONFIG_TASKSTATS is not set
194# CONFIG_UTS_NS is not set
185# CONFIG_AUDIT is not set 195# CONFIG_AUDIT is not set
186# CONFIG_IKCONFIG is not set 196# CONFIG_IKCONFIG is not set
197CONFIG_SYSFS_DEPRECATED=y
187CONFIG_RELAY=y 198CONFIG_RELAY=y
188CONFIG_INITRAMFS_SOURCE=""
189# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 199# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
200CONFIG_SYSCTL=y
190CONFIG_EMBEDDED=y 201CONFIG_EMBEDDED=y
202CONFIG_SYSCTL_SYSCALL=y
191CONFIG_KALLSYMS=y 203CONFIG_KALLSYMS=y
192# CONFIG_KALLSYMS_EXTRA_PASS is not set 204# CONFIG_KALLSYMS_EXTRA_PASS is not set
193CONFIG_HOTPLUG=y 205CONFIG_HOTPLUG=y
@@ -195,12 +207,12 @@ CONFIG_PRINTK=y
195CONFIG_BUG=y 207CONFIG_BUG=y
196CONFIG_ELF_CORE=y 208CONFIG_ELF_CORE=y
197CONFIG_BASE_FULL=y 209CONFIG_BASE_FULL=y
198CONFIG_RT_MUTEXES=y
199CONFIG_FUTEX=y 210CONFIG_FUTEX=y
200CONFIG_EPOLL=y 211CONFIG_EPOLL=y
201CONFIG_SHMEM=y 212CONFIG_SHMEM=y
202CONFIG_SLAB=y 213CONFIG_SLAB=y
203CONFIG_VM_EVENT_COUNTERS=y 214CONFIG_VM_EVENT_COUNTERS=y
215CONFIG_RT_MUTEXES=y
204# CONFIG_TINY_SHMEM is not set 216# CONFIG_TINY_SHMEM is not set
205CONFIG_BASE_SMALL=0 217CONFIG_BASE_SMALL=0
206# CONFIG_SLOB is not set 218# CONFIG_SLOB is not set
@@ -218,6 +230,7 @@ CONFIG_KMOD=y
218# 230#
219# Block layer 231# Block layer
220# 232#
233CONFIG_BLOCK=y
221# CONFIG_LBD is not set 234# CONFIG_LBD is not set
222# CONFIG_BLK_DEV_IO_TRACE is not set 235# CONFIG_BLK_DEV_IO_TRACE is not set
223# CONFIG_LSF is not set 236# CONFIG_LSF is not set
@@ -260,6 +273,14 @@ CONFIG_BINFMT_ELF=y
260CONFIG_TRAD_SIGNALS=y 273CONFIG_TRAD_SIGNALS=y
261 274
262# 275#
276# Power management options
277#
278CONFIG_PM=y
279# CONFIG_PM_LEGACY is not set
280# CONFIG_PM_DEBUG is not set
281# CONFIG_PM_SYSFS_DEPRECATED is not set
282
283#
263# Networking 284# Networking
264# 285#
265CONFIG_NET=y 286CONFIG_NET=y
@@ -273,7 +294,10 @@ CONFIG_PACKET_MMAP=y
273CONFIG_UNIX=y 294CONFIG_UNIX=y
274CONFIG_XFRM=y 295CONFIG_XFRM=y
275CONFIG_XFRM_USER=m 296CONFIG_XFRM_USER=m
297# CONFIG_XFRM_SUB_POLICY is not set
298CONFIG_XFRM_MIGRATE=y
276CONFIG_NET_KEY=y 299CONFIG_NET_KEY=y
300CONFIG_NET_KEY_MIGRATE=y
277CONFIG_INET=y 301CONFIG_INET=y
278CONFIG_IP_MULTICAST=y 302CONFIG_IP_MULTICAST=y
279CONFIG_IP_ADVANCED_ROUTER=y 303CONFIG_IP_ADVANCED_ROUTER=y
@@ -281,7 +305,6 @@ CONFIG_ASK_IP_FIB_HASH=y
281# CONFIG_IP_FIB_TRIE is not set 305# CONFIG_IP_FIB_TRIE is not set
282CONFIG_IP_FIB_HASH=y 306CONFIG_IP_FIB_HASH=y
283CONFIG_IP_MULTIPLE_TABLES=y 307CONFIG_IP_MULTIPLE_TABLES=y
284CONFIG_IP_ROUTE_FWMARK=y
285CONFIG_IP_ROUTE_MULTIPATH=y 308CONFIG_IP_ROUTE_MULTIPATH=y
286# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set 309# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
287CONFIG_IP_ROUTE_VERBOSE=y 310CONFIG_IP_ROUTE_VERBOSE=y
@@ -304,10 +327,13 @@ CONFIG_INET_XFRM_TUNNEL=m
304CONFIG_INET_TUNNEL=m 327CONFIG_INET_TUNNEL=m
305CONFIG_INET_XFRM_MODE_TRANSPORT=m 328CONFIG_INET_XFRM_MODE_TRANSPORT=m
306CONFIG_INET_XFRM_MODE_TUNNEL=m 329CONFIG_INET_XFRM_MODE_TUNNEL=m
330CONFIG_INET_XFRM_MODE_BEET=m
307CONFIG_INET_DIAG=y 331CONFIG_INET_DIAG=y
308CONFIG_INET_TCP_DIAG=y 332CONFIG_INET_TCP_DIAG=y
309# CONFIG_TCP_CONG_ADVANCED is not set 333# CONFIG_TCP_CONG_ADVANCED is not set
310CONFIG_TCP_CONG_BIC=y 334CONFIG_TCP_CONG_CUBIC=y
335CONFIG_DEFAULT_TCP_CONG="cubic"
336CONFIG_TCP_MD5SIG=y
311 337
312# 338#
313# IP: Virtual Server Configuration 339# IP: Virtual Server Configuration
@@ -349,11 +375,17 @@ CONFIG_IPV6_ROUTE_INFO=y
349CONFIG_INET6_AH=m 375CONFIG_INET6_AH=m
350CONFIG_INET6_ESP=m 376CONFIG_INET6_ESP=m
351CONFIG_INET6_IPCOMP=m 377CONFIG_INET6_IPCOMP=m
378CONFIG_IPV6_MIP6=y
352CONFIG_INET6_XFRM_TUNNEL=m 379CONFIG_INET6_XFRM_TUNNEL=m
353CONFIG_INET6_TUNNEL=m 380CONFIG_INET6_TUNNEL=m
354CONFIG_INET6_XFRM_MODE_TRANSPORT=m 381CONFIG_INET6_XFRM_MODE_TRANSPORT=m
355CONFIG_INET6_XFRM_MODE_TUNNEL=m 382CONFIG_INET6_XFRM_MODE_TUNNEL=m
383CONFIG_INET6_XFRM_MODE_BEET=m
384CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
385CONFIG_IPV6_SIT=m
356CONFIG_IPV6_TUNNEL=m 386CONFIG_IPV6_TUNNEL=m
387CONFIG_IPV6_MULTIPLE_TABLES=y
388CONFIG_IPV6_SUBTREES=y
357CONFIG_NETWORK_SECMARK=y 389CONFIG_NETWORK_SECMARK=y
358CONFIG_NETFILTER=y 390CONFIG_NETFILTER=y
359# CONFIG_NETFILTER_DEBUG is not set 391# CONFIG_NETFILTER_DEBUG is not set
@@ -365,19 +397,43 @@ CONFIG_BRIDGE_NETFILTER=y
365CONFIG_NETFILTER_NETLINK=m 397CONFIG_NETFILTER_NETLINK=m
366CONFIG_NETFILTER_NETLINK_QUEUE=m 398CONFIG_NETFILTER_NETLINK_QUEUE=m
367CONFIG_NETFILTER_NETLINK_LOG=m 399CONFIG_NETFILTER_NETLINK_LOG=m
400CONFIG_NF_CONNTRACK_ENABLED=m
401CONFIG_NF_CONNTRACK_SUPPORT=y
402# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
403CONFIG_NF_CONNTRACK=m
404CONFIG_NF_CT_ACCT=y
405CONFIG_NF_CONNTRACK_MARK=y
406CONFIG_NF_CONNTRACK_SECMARK=y
407CONFIG_NF_CONNTRACK_EVENTS=y
408CONFIG_NF_CT_PROTO_GRE=m
409CONFIG_NF_CT_PROTO_SCTP=m
410CONFIG_NF_CONNTRACK_AMANDA=m
411CONFIG_NF_CONNTRACK_FTP=m
412CONFIG_NF_CONNTRACK_H323=m
413CONFIG_NF_CONNTRACK_IRC=m
414# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
415CONFIG_NF_CONNTRACK_PPTP=m
416CONFIG_NF_CONNTRACK_SANE=m
417CONFIG_NF_CONNTRACK_SIP=m
418CONFIG_NF_CONNTRACK_TFTP=m
419CONFIG_NF_CT_NETLINK=m
368CONFIG_NETFILTER_XTABLES=m 420CONFIG_NETFILTER_XTABLES=m
369CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 421CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
370CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 422CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
423CONFIG_NETFILTER_XT_TARGET_DSCP=m
371CONFIG_NETFILTER_XT_TARGET_MARK=m 424CONFIG_NETFILTER_XT_TARGET_MARK=m
372CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 425CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
426CONFIG_NETFILTER_XT_TARGET_NFLOG=m
373CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 427CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
374CONFIG_NETFILTER_XT_TARGET_SECMARK=m 428CONFIG_NETFILTER_XT_TARGET_SECMARK=m
375CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 429CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
430CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
376CONFIG_NETFILTER_XT_MATCH_COMMENT=m 431CONFIG_NETFILTER_XT_MATCH_COMMENT=m
377CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 432CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
378CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 433CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
379CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 434CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
380CONFIG_NETFILTER_XT_MATCH_DCCP=m 435CONFIG_NETFILTER_XT_MATCH_DCCP=m
436CONFIG_NETFILTER_XT_MATCH_DSCP=m
381CONFIG_NETFILTER_XT_MATCH_ESP=m 437CONFIG_NETFILTER_XT_MATCH_ESP=m
382CONFIG_NETFILTER_XT_MATCH_HELPER=m 438CONFIG_NETFILTER_XT_MATCH_HELPER=m
383CONFIG_NETFILTER_XT_MATCH_LENGTH=m 439CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -395,60 +451,45 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
395CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 451CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
396CONFIG_NETFILTER_XT_MATCH_STRING=m 452CONFIG_NETFILTER_XT_MATCH_STRING=m
397CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 453CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
454CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
398 455
399# 456#
400# IP: Netfilter Configuration 457# IP: Netfilter Configuration
401# 458#
402CONFIG_IP_NF_CONNTRACK=m 459CONFIG_NF_CONNTRACK_IPV4=m
403CONFIG_IP_NF_CT_ACCT=y 460CONFIG_NF_CONNTRACK_PROC_COMPAT=y
404CONFIG_IP_NF_CONNTRACK_MARK=y
405CONFIG_IP_NF_CONNTRACK_SECMARK=y
406CONFIG_IP_NF_CONNTRACK_EVENTS=y
407CONFIG_IP_NF_CONNTRACK_NETLINK=m
408CONFIG_IP_NF_CT_PROTO_SCTP=m
409CONFIG_IP_NF_FTP=m
410CONFIG_IP_NF_IRC=m
411# CONFIG_IP_NF_NETBIOS_NS is not set
412CONFIG_IP_NF_TFTP=m
413CONFIG_IP_NF_AMANDA=m
414CONFIG_IP_NF_PPTP=m
415CONFIG_IP_NF_H323=m
416CONFIG_IP_NF_SIP=m
417CONFIG_IP_NF_QUEUE=m 461CONFIG_IP_NF_QUEUE=m
418CONFIG_IP_NF_IPTABLES=m 462CONFIG_IP_NF_IPTABLES=m
419CONFIG_IP_NF_MATCH_IPRANGE=m 463CONFIG_IP_NF_MATCH_IPRANGE=m
420CONFIG_IP_NF_MATCH_TOS=m 464CONFIG_IP_NF_MATCH_TOS=m
421CONFIG_IP_NF_MATCH_RECENT=m 465CONFIG_IP_NF_MATCH_RECENT=m
422CONFIG_IP_NF_MATCH_ECN=m 466CONFIG_IP_NF_MATCH_ECN=m
423CONFIG_IP_NF_MATCH_DSCP=m
424CONFIG_IP_NF_MATCH_AH=m 467CONFIG_IP_NF_MATCH_AH=m
425CONFIG_IP_NF_MATCH_TTL=m 468CONFIG_IP_NF_MATCH_TTL=m
426CONFIG_IP_NF_MATCH_OWNER=m 469CONFIG_IP_NF_MATCH_OWNER=m
427CONFIG_IP_NF_MATCH_ADDRTYPE=m 470CONFIG_IP_NF_MATCH_ADDRTYPE=m
428CONFIG_IP_NF_MATCH_HASHLIMIT=m
429CONFIG_IP_NF_FILTER=m 471CONFIG_IP_NF_FILTER=m
430CONFIG_IP_NF_TARGET_REJECT=m 472CONFIG_IP_NF_TARGET_REJECT=m
431CONFIG_IP_NF_TARGET_LOG=m 473CONFIG_IP_NF_TARGET_LOG=m
432CONFIG_IP_NF_TARGET_ULOG=m 474CONFIG_IP_NF_TARGET_ULOG=m
433CONFIG_IP_NF_TARGET_TCPMSS=m 475CONFIG_NF_NAT=m
434CONFIG_IP_NF_NAT=m 476CONFIG_NF_NAT_NEEDED=y
435CONFIG_IP_NF_NAT_NEEDED=y
436CONFIG_IP_NF_TARGET_MASQUERADE=m 477CONFIG_IP_NF_TARGET_MASQUERADE=m
437CONFIG_IP_NF_TARGET_REDIRECT=m 478CONFIG_IP_NF_TARGET_REDIRECT=m
438CONFIG_IP_NF_TARGET_NETMAP=m 479CONFIG_IP_NF_TARGET_NETMAP=m
439CONFIG_IP_NF_TARGET_SAME=m 480CONFIG_IP_NF_TARGET_SAME=m
440# CONFIG_IP_NF_NAT_SNMP_BASIC is not set 481CONFIG_NF_NAT_SNMP_BASIC=m
441CONFIG_IP_NF_NAT_IRC=m 482CONFIG_NF_NAT_PROTO_GRE=m
442CONFIG_IP_NF_NAT_FTP=m 483CONFIG_NF_NAT_FTP=m
443CONFIG_IP_NF_NAT_TFTP=m 484CONFIG_NF_NAT_IRC=m
444CONFIG_IP_NF_NAT_AMANDA=m 485CONFIG_NF_NAT_TFTP=m
445CONFIG_IP_NF_NAT_PPTP=m 486CONFIG_NF_NAT_AMANDA=m
446CONFIG_IP_NF_NAT_H323=m 487CONFIG_NF_NAT_PPTP=m
447CONFIG_IP_NF_NAT_SIP=m 488CONFIG_NF_NAT_H323=m
489CONFIG_NF_NAT_SIP=m
448CONFIG_IP_NF_MANGLE=m 490CONFIG_IP_NF_MANGLE=m
449CONFIG_IP_NF_TARGET_TOS=m 491CONFIG_IP_NF_TARGET_TOS=m
450CONFIG_IP_NF_TARGET_ECN=m 492CONFIG_IP_NF_TARGET_ECN=m
451CONFIG_IP_NF_TARGET_DSCP=m
452CONFIG_IP_NF_TARGET_TTL=m 493CONFIG_IP_NF_TARGET_TTL=m
453# CONFIG_IP_NF_TARGET_CLUSTERIP is not set 494# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
454CONFIG_IP_NF_RAW=m 495CONFIG_IP_NF_RAW=m
@@ -459,6 +500,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
459# 500#
460# IPv6: Netfilter Configuration (EXPERIMENTAL) 501# IPv6: Netfilter Configuration (EXPERIMENTAL)
461# 502#
503CONFIG_NF_CONNTRACK_IPV6=m
462CONFIG_IP6_NF_QUEUE=m 504CONFIG_IP6_NF_QUEUE=m
463CONFIG_IP6_NF_IPTABLES=m 505CONFIG_IP6_NF_IPTABLES=m
464CONFIG_IP6_NF_MATCH_RT=m 506CONFIG_IP6_NF_MATCH_RT=m
@@ -468,6 +510,7 @@ CONFIG_IP6_NF_MATCH_HL=m
468CONFIG_IP6_NF_MATCH_OWNER=m 510CONFIG_IP6_NF_MATCH_OWNER=m
469CONFIG_IP6_NF_MATCH_IPV6HEADER=m 511CONFIG_IP6_NF_MATCH_IPV6HEADER=m
470CONFIG_IP6_NF_MATCH_AH=m 512CONFIG_IP6_NF_MATCH_AH=m
513CONFIG_IP6_NF_MATCH_MH=m
471CONFIG_IP6_NF_MATCH_EUI64=m 514CONFIG_IP6_NF_MATCH_EUI64=m
472CONFIG_IP6_NF_FILTER=m 515CONFIG_IP6_NF_FILTER=m
473CONFIG_IP6_NF_TARGET_LOG=m 516CONFIG_IP6_NF_TARGET_LOG=m
@@ -527,13 +570,12 @@ CONFIG_LLC=m
527# CONFIG_LLC2 is not set 570# CONFIG_LLC2 is not set
528# CONFIG_IPX is not set 571# CONFIG_IPX is not set
529CONFIG_ATALK=m 572CONFIG_ATALK=m
530CONFIG_DEV_APPLETALK=y 573CONFIG_DEV_APPLETALK=m
531CONFIG_IPDDP=m 574CONFIG_IPDDP=m
532CONFIG_IPDDP_ENCAP=y 575CONFIG_IPDDP_ENCAP=y
533CONFIG_IPDDP_DECAP=y 576CONFIG_IPDDP_DECAP=y
534# CONFIG_X25 is not set 577# CONFIG_X25 is not set
535# CONFIG_LAPB is not set 578# CONFIG_LAPB is not set
536CONFIG_NET_DIVERT=y
537# CONFIG_ECONET is not set 579# CONFIG_ECONET is not set
538# CONFIG_WAN_ROUTER is not set 580# CONFIG_WAN_ROUTER is not set
539 581
@@ -541,6 +583,7 @@ CONFIG_NET_DIVERT=y
541# QoS and/or fair queueing 583# QoS and/or fair queueing
542# 584#
543CONFIG_NET_SCHED=y 585CONFIG_NET_SCHED=y
586CONFIG_NET_SCH_FIFO=y
544CONFIG_NET_SCH_CLK_JIFFIES=y 587CONFIG_NET_SCH_CLK_JIFFIES=y
545# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 588# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
546# CONFIG_NET_SCH_CLK_CPU is not set 589# CONFIG_NET_SCH_CLK_CPU is not set
@@ -595,6 +638,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
595CONFIG_IEEE80211_SOFTMAC=m 638CONFIG_IEEE80211_SOFTMAC=m
596# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 639# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
597CONFIG_WIRELESS_EXT=y 640CONFIG_WIRELESS_EXT=y
641CONFIG_FIB_RULES=y
598 642
599# 643#
600# Device Drivers 644# Device Drivers
@@ -642,6 +686,7 @@ CONFIG_BLK_DEV_NBD=m
642CONFIG_BLK_DEV_RAM=y 686CONFIG_BLK_DEV_RAM=y
643CONFIG_BLK_DEV_RAM_COUNT=16 687CONFIG_BLK_DEV_RAM_COUNT=16
644CONFIG_BLK_DEV_RAM_SIZE=4096 688CONFIG_BLK_DEV_RAM_SIZE=4096
689CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
645# CONFIG_BLK_DEV_INITRD is not set 690# CONFIG_BLK_DEV_INITRD is not set
646CONFIG_CDROM_PKTCDVD=m 691CONFIG_CDROM_PKTCDVD=m
647CONFIG_CDROM_PKTCDVD_BUFFERS=8 692CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -649,9 +694,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
649CONFIG_ATA_OVER_ETH=m 694CONFIG_ATA_OVER_ETH=m
650 695
651# 696#
697# Misc devices
698#
699CONFIG_SGI_IOC4=m
700# CONFIG_TIFM_CORE is not set
701
702#
652# ATA/ATAPI/MFM/RLL support 703# ATA/ATAPI/MFM/RLL support
653# 704#
654CONFIG_IDE=y 705CONFIG_IDE=y
706CONFIG_IDE_MAX_HWIFS=4
655CONFIG_BLK_DEV_IDE=y 707CONFIG_BLK_DEV_IDE=y
656 708
657# 709#
@@ -681,6 +733,8 @@ CONFIG_IDE_GENERIC=y
681# 733#
682CONFIG_RAID_ATTRS=m 734CONFIG_RAID_ATTRS=m
683CONFIG_SCSI=y 735CONFIG_SCSI=y
736CONFIG_SCSI_TGT=m
737CONFIG_SCSI_NETLINK=y
684CONFIG_SCSI_PROC_FS=y 738CONFIG_SCSI_PROC_FS=y
685 739
686# 740#
@@ -700,14 +754,17 @@ CONFIG_CHR_DEV_SCH=m
700CONFIG_SCSI_MULTI_LUN=y 754CONFIG_SCSI_MULTI_LUN=y
701CONFIG_SCSI_CONSTANTS=y 755CONFIG_SCSI_CONSTANTS=y
702CONFIG_SCSI_LOGGING=y 756CONFIG_SCSI_LOGGING=y
757CONFIG_SCSI_SCAN_ASYNC=y
703 758
704# 759#
705# SCSI Transport Attributes 760# SCSI Transports
706# 761#
707CONFIG_SCSI_SPI_ATTRS=y 762CONFIG_SCSI_SPI_ATTRS=y
708CONFIG_SCSI_FC_ATTRS=y 763CONFIG_SCSI_FC_ATTRS=y
709CONFIG_SCSI_ISCSI_ATTRS=m 764CONFIG_SCSI_ISCSI_ATTRS=m
710CONFIG_SCSI_SAS_ATTRS=m 765CONFIG_SCSI_SAS_ATTRS=m
766CONFIG_SCSI_SAS_LIBSAS=m
767CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
711 768
712# 769#
713# SCSI low-level drivers 770# SCSI low-level drivers
@@ -720,30 +777,39 @@ CONFIG_ISCSI_TCP=m
720# CONFIG_SCSI_AIC7XXX is not set 777# CONFIG_SCSI_AIC7XXX is not set
721# CONFIG_SCSI_AIC7XXX_OLD is not set 778# CONFIG_SCSI_AIC7XXX_OLD is not set
722# CONFIG_SCSI_AIC79XX is not set 779# CONFIG_SCSI_AIC79XX is not set
780CONFIG_SCSI_AIC94XX=m
781# CONFIG_AIC94XX_DEBUG is not set
723# CONFIG_SCSI_DPT_I2O is not set 782# CONFIG_SCSI_DPT_I2O is not set
783# CONFIG_SCSI_ARCMSR is not set
724# CONFIG_MEGARAID_NEWGEN is not set 784# CONFIG_MEGARAID_NEWGEN is not set
725# CONFIG_MEGARAID_LEGACY is not set 785# CONFIG_MEGARAID_LEGACY is not set
726# CONFIG_MEGARAID_SAS is not set 786# CONFIG_MEGARAID_SAS is not set
727# CONFIG_SCSI_SATA is not set
728# CONFIG_SCSI_HPTIOP is not set 787# CONFIG_SCSI_HPTIOP is not set
729# CONFIG_SCSI_DMX3191D is not set 788# CONFIG_SCSI_DMX3191D is not set
730# CONFIG_SCSI_FUTURE_DOMAIN is not set 789# CONFIG_SCSI_FUTURE_DOMAIN is not set
731# CONFIG_SCSI_IPS is not set 790# CONFIG_SCSI_IPS is not set
732# CONFIG_SCSI_INITIO is not set 791# CONFIG_SCSI_INITIO is not set
733# CONFIG_SCSI_INIA100 is not set 792# CONFIG_SCSI_INIA100 is not set
793# CONFIG_SCSI_STEX is not set
734CONFIG_SCSI_SYM53C8XX_2=y 794CONFIG_SCSI_SYM53C8XX_2=y
735CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 795CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
736CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 796CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
737CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 797CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
738CONFIG_SCSI_SYM53C8XX_MMIO=y 798CONFIG_SCSI_SYM53C8XX_MMIO=y
739# CONFIG_SCSI_IPR is not set
740# CONFIG_SCSI_QLOGIC_1280 is not set 799# CONFIG_SCSI_QLOGIC_1280 is not set
741# CONFIG_SCSI_QLA_FC is not set 800# CONFIG_SCSI_QLA_FC is not set
801# CONFIG_SCSI_QLA_ISCSI is not set
742# CONFIG_SCSI_LPFC is not set 802# CONFIG_SCSI_LPFC is not set
743# CONFIG_SCSI_DC395x is not set 803# CONFIG_SCSI_DC395x is not set
744# CONFIG_SCSI_DC390T is not set 804# CONFIG_SCSI_DC390T is not set
745# CONFIG_SCSI_NSP32 is not set 805# CONFIG_SCSI_NSP32 is not set
746# CONFIG_SCSI_DEBUG is not set 806# CONFIG_SCSI_DEBUG is not set
807# CONFIG_SCSI_SRP is not set
808
809#
810# Serial ATA (prod) and Parallel ATA (experimental) drivers
811#
812# CONFIG_ATA is not set
747 813
748# 814#
749# Multi-device support (RAID and LVM) 815# Multi-device support (RAID and LVM)
@@ -759,6 +825,7 @@ CONFIG_MD_RAID5_RESHAPE=y
759CONFIG_MD_MULTIPATH=m 825CONFIG_MD_MULTIPATH=m
760CONFIG_MD_FAULTY=m 826CONFIG_MD_FAULTY=m
761CONFIG_BLK_DEV_DM=m 827CONFIG_BLK_DEV_DM=m
828# CONFIG_DM_DEBUG is not set
762CONFIG_DM_CRYPT=m 829CONFIG_DM_CRYPT=m
763CONFIG_DM_SNAPSHOT=m 830CONFIG_DM_SNAPSHOT=m
764CONFIG_DM_MIRROR=m 831CONFIG_DM_MIRROR=m
@@ -813,6 +880,8 @@ CONFIG_LXT_PHY=m
813CONFIG_CICADA_PHY=m 880CONFIG_CICADA_PHY=m
814CONFIG_VITESSE_PHY=m 881CONFIG_VITESSE_PHY=m
815CONFIG_SMSC_PHY=m 882CONFIG_SMSC_PHY=m
883# CONFIG_BROADCOM_PHY is not set
884# CONFIG_FIXED_PHY is not set
816 885
817# 886#
818# Ethernet (10 or 100Mbit) 887# Ethernet (10 or 100Mbit)
@@ -832,6 +901,7 @@ CONFIG_MII=y
832# CONFIG_HP100 is not set 901# CONFIG_HP100 is not set
833CONFIG_NET_PCI=y 902CONFIG_NET_PCI=y
834CONFIG_PCNET32=y 903CONFIG_PCNET32=y
904# CONFIG_PCNET32_NAPI is not set
835# CONFIG_AMD8111_ETH is not set 905# CONFIG_AMD8111_ETH is not set
836# CONFIG_ADAPTEC_STARFIRE is not set 906# CONFIG_ADAPTEC_STARFIRE is not set
837# CONFIG_B44 is not set 907# CONFIG_B44 is not set
@@ -850,6 +920,7 @@ CONFIG_PCNET32=y
850# CONFIG_TLAN is not set 920# CONFIG_TLAN is not set
851# CONFIG_VIA_RHINE is not set 921# CONFIG_VIA_RHINE is not set
852CONFIG_LAN_SAA9730=y 922CONFIG_LAN_SAA9730=y
923# CONFIG_SC92031 is not set
853 924
854# 925#
855# Ethernet (1000 Mbit) 926# Ethernet (1000 Mbit)
@@ -868,14 +939,18 @@ CONFIG_LAN_SAA9730=y
868# CONFIG_VIA_VELOCITY is not set 939# CONFIG_VIA_VELOCITY is not set
869# CONFIG_TIGON3 is not set 940# CONFIG_TIGON3 is not set
870# CONFIG_BNX2 is not set 941# CONFIG_BNX2 is not set
942CONFIG_QLA3XXX=m
943# CONFIG_ATL1 is not set
871 944
872# 945#
873# Ethernet (10000 Mbit) 946# Ethernet (10000 Mbit)
874# 947#
875# CONFIG_CHELSIO_T1 is not set 948# CONFIG_CHELSIO_T1 is not set
949CONFIG_CHELSIO_T3=m
876# CONFIG_IXGB is not set 950# CONFIG_IXGB is not set
877# CONFIG_S2IO is not set 951# CONFIG_S2IO is not set
878# CONFIG_MYRI10GE is not set 952# CONFIG_MYRI10GE is not set
953CONFIG_NETXEN_NIC=m
879 954
880# 955#
881# Token Ring devices 956# Token Ring devices
@@ -915,6 +990,7 @@ CONFIG_LAN_SAA9730=y
915# Input device support 990# Input device support
916# 991#
917CONFIG_INPUT=y 992CONFIG_INPUT=y
993# CONFIG_INPUT_FF_MEMLESS is not set
918 994
919# 995#
920# Userland interfaces 996# Userland interfaces
@@ -995,10 +1071,6 @@ CONFIG_LEGACY_PTY_COUNT=256
995# CONFIG_DTLK is not set 1071# CONFIG_DTLK is not set
996# CONFIG_R3964 is not set 1072# CONFIG_R3964 is not set
997# CONFIG_APPLICOM is not set 1073# CONFIG_APPLICOM is not set
998
999#
1000# Ftape, the floppy tape device driver
1001#
1002# CONFIG_DRM is not set 1074# CONFIG_DRM is not set
1003# CONFIG_RAW_DRIVER is not set 1075# CONFIG_RAW_DRIVER is not set
1004 1076
@@ -1006,7 +1078,6 @@ CONFIG_LEGACY_PTY_COUNT=256
1006# TPM devices 1078# TPM devices
1007# 1079#
1008# CONFIG_TCG_TPM is not set 1080# CONFIG_TCG_TPM is not set
1009# CONFIG_TELCLOCK is not set
1010 1081
1011# 1082#
1012# I2C support 1083# I2C support
@@ -1031,14 +1102,9 @@ CONFIG_LEGACY_PTY_COUNT=256
1031# CONFIG_HWMON_VID is not set 1102# CONFIG_HWMON_VID is not set
1032 1103
1033# 1104#
1034# Misc devices
1035#
1036
1037#
1038# Multimedia devices 1105# Multimedia devices
1039# 1106#
1040# CONFIG_VIDEO_DEV is not set 1107# CONFIG_VIDEO_DEV is not set
1041CONFIG_VIDEO_V4L2=y
1042 1108
1043# 1109#
1044# Digital Video Broadcasting Devices 1110# Digital Video Broadcasting Devices
@@ -1056,6 +1122,7 @@ CONFIG_VIDEO_V4L2=y
1056# 1122#
1057# CONFIG_VGA_CONSOLE is not set 1123# CONFIG_VGA_CONSOLE is not set
1058CONFIG_DUMMY_CONSOLE=y 1124CONFIG_DUMMY_CONSOLE=y
1125# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1059 1126
1060# 1127#
1061# Sound 1128# Sound
@@ -1063,6 +1130,12 @@ CONFIG_DUMMY_CONSOLE=y
1063# CONFIG_SOUND is not set 1130# CONFIG_SOUND is not set
1064 1131
1065# 1132#
1133# HID Devices
1134#
1135CONFIG_HID=y
1136# CONFIG_HID_DEBUG is not set
1137
1138#
1066# USB support 1139# USB support
1067# 1140#
1068CONFIG_USB_ARCH_HAS_HCD=y 1141CONFIG_USB_ARCH_HAS_HCD=y
@@ -1125,6 +1198,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1125# 1198#
1126 1199
1127# 1200#
1201# Auxiliary Display support
1202#
1203
1204#
1205# Virtualization
1206#
1207
1208#
1128# File systems 1209# File systems
1129# 1210#
1130CONFIG_EXT2_FS=y 1211CONFIG_EXT2_FS=y
@@ -1134,6 +1215,7 @@ CONFIG_EXT3_FS=y
1134CONFIG_EXT3_FS_XATTR=y 1215CONFIG_EXT3_FS_XATTR=y
1135# CONFIG_EXT3_FS_POSIX_ACL is not set 1216# CONFIG_EXT3_FS_POSIX_ACL is not set
1136# CONFIG_EXT3_FS_SECURITY is not set 1217# CONFIG_EXT3_FS_SECURITY is not set
1218# CONFIG_EXT4DEV_FS is not set
1137CONFIG_JBD=y 1219CONFIG_JBD=y
1138# CONFIG_JBD_DEBUG is not set 1220# CONFIG_JBD_DEBUG is not set
1139CONFIG_FS_MBCACHE=y 1221CONFIG_FS_MBCACHE=y
@@ -1154,6 +1236,7 @@ CONFIG_XFS_QUOTA=y
1154CONFIG_XFS_SECURITY=y 1236CONFIG_XFS_SECURITY=y
1155CONFIG_XFS_POSIX_ACL=y 1237CONFIG_XFS_POSIX_ACL=y
1156# CONFIG_XFS_RT is not set 1238# CONFIG_XFS_RT is not set
1239# CONFIG_GFS2_FS is not set
1157# CONFIG_OCFS2_FS is not set 1240# CONFIG_OCFS2_FS is not set
1158CONFIG_MINIX_FS=m 1241CONFIG_MINIX_FS=m
1159CONFIG_ROMFS_FS=m 1242CONFIG_ROMFS_FS=m
@@ -1167,6 +1250,7 @@ CONFIG_DNOTIFY=y
1167CONFIG_AUTOFS_FS=y 1250CONFIG_AUTOFS_FS=y
1168# CONFIG_AUTOFS4_FS is not set 1251# CONFIG_AUTOFS4_FS is not set
1169CONFIG_FUSE_FS=m 1252CONFIG_FUSE_FS=m
1253CONFIG_GENERIC_ACL=y
1170 1254
1171# 1255#
1172# CD-ROM/DVD Filesystems 1256# CD-ROM/DVD Filesystems
@@ -1174,7 +1258,6 @@ CONFIG_FUSE_FS=m
1174CONFIG_ISO9660_FS=m 1258CONFIG_ISO9660_FS=m
1175CONFIG_JOLIET=y 1259CONFIG_JOLIET=y
1176CONFIG_ZISOFS=y 1260CONFIG_ZISOFS=y
1177CONFIG_ZISOFS_FS=m
1178CONFIG_UDF_FS=m 1261CONFIG_UDF_FS=m
1179CONFIG_UDF_NLS=y 1262CONFIG_UDF_NLS=y
1180 1263
@@ -1193,11 +1276,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1193# 1276#
1194CONFIG_PROC_FS=y 1277CONFIG_PROC_FS=y
1195CONFIG_PROC_KCORE=y 1278CONFIG_PROC_KCORE=y
1279CONFIG_PROC_SYSCTL=y
1196CONFIG_SYSFS=y 1280CONFIG_SYSFS=y
1197CONFIG_TMPFS=y 1281CONFIG_TMPFS=y
1282CONFIG_TMPFS_POSIX_ACL=y
1198# CONFIG_HUGETLB_PAGE is not set 1283# CONFIG_HUGETLB_PAGE is not set
1199CONFIG_RAMFS=y 1284CONFIG_RAMFS=y
1200# CONFIG_CONFIGFS_FS is not set 1285CONFIG_CONFIGFS_FS=m
1201 1286
1202# 1287#
1203# Miscellaneous filesystems 1288# Miscellaneous filesystems
@@ -1242,7 +1327,6 @@ CONFIG_SUNRPC=y
1242# CONFIG_RPCSEC_GSS_SPKM3 is not set 1327# CONFIG_RPCSEC_GSS_SPKM3 is not set
1243# CONFIG_SMB_FS is not set 1328# CONFIG_SMB_FS is not set
1244# CONFIG_CIFS is not set 1329# CONFIG_CIFS is not set
1245# CONFIG_CIFS_DEBUG2 is not set
1246# CONFIG_NCP_FS is not set 1330# CONFIG_NCP_FS is not set
1247# CONFIG_CODA_FS is not set 1331# CONFIG_CODA_FS is not set
1248# CONFIG_AFS_FS is not set 1332# CONFIG_AFS_FS is not set
@@ -1299,6 +1383,14 @@ CONFIG_NLS_KOI8_U=m
1299CONFIG_NLS_UTF8=m 1383CONFIG_NLS_UTF8=m
1300 1384
1301# 1385#
1386# Distributed Lock Manager
1387#
1388CONFIG_DLM=m
1389CONFIG_DLM_TCP=y
1390# CONFIG_DLM_SCTP is not set
1391# CONFIG_DLM_DEBUG is not set
1392
1393#
1302# Profiling support 1394# Profiling support
1303# 1395#
1304# CONFIG_PROFILING is not set 1396# CONFIG_PROFILING is not set
@@ -1308,11 +1400,13 @@ CONFIG_NLS_UTF8=m
1308# 1400#
1309CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1401CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1310# CONFIG_PRINTK_TIME is not set 1402# CONFIG_PRINTK_TIME is not set
1403CONFIG_ENABLE_MUST_CHECK=y
1311# CONFIG_MAGIC_SYSRQ is not set 1404# CONFIG_MAGIC_SYSRQ is not set
1312# CONFIG_UNUSED_SYMBOLS is not set 1405# CONFIG_UNUSED_SYMBOLS is not set
1406# CONFIG_DEBUG_FS is not set
1407# CONFIG_HEADERS_CHECK is not set
1313# CONFIG_DEBUG_KERNEL is not set 1408# CONFIG_DEBUG_KERNEL is not set
1314CONFIG_LOG_BUF_SHIFT=14 1409CONFIG_LOG_BUF_SHIFT=14
1315# CONFIG_DEBUG_FS is not set
1316CONFIG_CROSSCOMPILE=y 1410CONFIG_CROSSCOMPILE=y
1317CONFIG_CMDLINE="" 1411CONFIG_CMDLINE=""
1318 1412
@@ -1326,18 +1420,30 @@ CONFIG_CMDLINE=""
1326# Cryptographic options 1420# Cryptographic options
1327# 1421#
1328CONFIG_CRYPTO=y 1422CONFIG_CRYPTO=y
1423CONFIG_CRYPTO_ALGAPI=y
1424CONFIG_CRYPTO_BLKCIPHER=m
1425CONFIG_CRYPTO_HASH=y
1426CONFIG_CRYPTO_MANAGER=y
1329CONFIG_CRYPTO_HMAC=y 1427CONFIG_CRYPTO_HMAC=y
1428CONFIG_CRYPTO_XCBC=m
1330CONFIG_CRYPTO_NULL=m 1429CONFIG_CRYPTO_NULL=m
1331CONFIG_CRYPTO_MD4=m 1430CONFIG_CRYPTO_MD4=m
1332CONFIG_CRYPTO_MD5=m 1431CONFIG_CRYPTO_MD5=y
1333CONFIG_CRYPTO_SHA1=m 1432CONFIG_CRYPTO_SHA1=m
1334CONFIG_CRYPTO_SHA256=m 1433CONFIG_CRYPTO_SHA256=m
1335CONFIG_CRYPTO_SHA512=m 1434CONFIG_CRYPTO_SHA512=m
1336CONFIG_CRYPTO_WP512=m 1435CONFIG_CRYPTO_WP512=m
1337CONFIG_CRYPTO_TGR192=m 1436CONFIG_CRYPTO_TGR192=m
1437CONFIG_CRYPTO_GF128MUL=m
1438CONFIG_CRYPTO_ECB=m
1439CONFIG_CRYPTO_CBC=m
1440CONFIG_CRYPTO_PCBC=m
1441CONFIG_CRYPTO_LRW=m
1338CONFIG_CRYPTO_DES=m 1442CONFIG_CRYPTO_DES=m
1443CONFIG_CRYPTO_FCRYPT=m
1339CONFIG_CRYPTO_BLOWFISH=m 1444CONFIG_CRYPTO_BLOWFISH=m
1340CONFIG_CRYPTO_TWOFISH=m 1445CONFIG_CRYPTO_TWOFISH=m
1446CONFIG_CRYPTO_TWOFISH_COMMON=m
1341CONFIG_CRYPTO_SERPENT=m 1447CONFIG_CRYPTO_SERPENT=m
1342CONFIG_CRYPTO_AES=m 1448CONFIG_CRYPTO_AES=m
1343CONFIG_CRYPTO_CAST5=m 1449CONFIG_CRYPTO_CAST5=m
@@ -1349,6 +1455,7 @@ CONFIG_CRYPTO_ANUBIS=m
1349CONFIG_CRYPTO_DEFLATE=m 1455CONFIG_CRYPTO_DEFLATE=m
1350CONFIG_CRYPTO_MICHAEL_MIC=m 1456CONFIG_CRYPTO_MICHAEL_MIC=m
1351CONFIG_CRYPTO_CRC32C=m 1457CONFIG_CRYPTO_CRC32C=m
1458CONFIG_CRYPTO_CAMELLIA=m
1352# CONFIG_CRYPTO_TEST is not set 1459# CONFIG_CRYPTO_TEST is not set
1353 1460
1354# 1461#
@@ -1358,6 +1465,7 @@ CONFIG_CRYPTO_CRC32C=m
1358# 1465#
1359# Library routines 1466# Library routines
1360# 1467#
1468CONFIG_BITREVERSE=y
1361# CONFIG_CRC_CCITT is not set 1469# CONFIG_CRC_CCITT is not set
1362CONFIG_CRC16=m 1470CONFIG_CRC16=m
1363CONFIG_CRC32=y 1471CONFIG_CRC32=y
@@ -1369,9 +1477,5 @@ CONFIG_TEXTSEARCH_KMP=m
1369CONFIG_TEXTSEARCH_BM=m 1477CONFIG_TEXTSEARCH_BM=m
1370CONFIG_TEXTSEARCH_FSM=m 1478CONFIG_TEXTSEARCH_FSM=m
1371CONFIG_PLIST=y 1479CONFIG_PLIST=y
1372CONFIG_RIO=n 1480CONFIG_HAS_IOMEM=y
1373CONFIG_I2C_OCORES=n 1481CONFIG_HAS_IOPORT=y
1374CONFIG_DEBUG_RT_MUTEXES=n
1375CONFIG_RT_MUTEX_TESTER=n
1376CONFIG_DEBUG_RWSEMS=n
1377CONFIG_DEBUG_LOCKING_API_SELFTESTS=n
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 9554257c6f3a..4713a13211ce 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc1 3# Linux kernel version: 2.6.20
4# Wed Oct 11 01:41:41 2006 4# Tue Feb 20 21:47:22 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -38,8 +39,8 @@ CONFIG_MIPS=y
38# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
39# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -78,11 +79,14 @@ CONFIG_SIBYTE_CFE=y
78# CONFIG_SIBYTE_SB1250_PROF is not set 79# CONFIG_SIBYTE_SB1250_PROF is not set
79# CONFIG_SIBYTE_TBPROF is not set 80# CONFIG_SIBYTE_TBPROF is not set
80CONFIG_RWSEM_GENERIC_SPINLOCK=y 81CONFIG_RWSEM_GENERIC_SPINLOCK=y
82# CONFIG_ARCH_HAS_ILOG2_U32 is not set
83# CONFIG_ARCH_HAS_ILOG2_U64 is not set
81CONFIG_GENERIC_FIND_NEXT_BIT=y 84CONFIG_GENERIC_FIND_NEXT_BIT=y
82CONFIG_GENERIC_HWEIGHT=y 85CONFIG_GENERIC_HWEIGHT=y
83CONFIG_GENERIC_CALIBRATE_DELAY=y 86CONFIG_GENERIC_CALIBRATE_DELAY=y
84CONFIG_GENERIC_TIME=y 87CONFIG_GENERIC_TIME=y
85CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 88CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
89# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
86CONFIG_DMA_COHERENT=y 90CONFIG_DMA_COHERENT=y
87CONFIG_CPU_BIG_ENDIAN=y 91CONFIG_CPU_BIG_ENDIAN=y
88# CONFIG_CPU_LITTLE_ENDIAN is not set 92# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -115,6 +119,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
115# CONFIG_CPU_RM9000 is not set 119# CONFIG_CPU_RM9000 is not set
116CONFIG_CPU_SB1=y 120CONFIG_CPU_SB1=y
117CONFIG_SYS_HAS_CPU_SB1=y 121CONFIG_SYS_HAS_CPU_SB1=y
122CONFIG_WEAK_ORDERING=y
118CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 123CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
119CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 124CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
120CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 125CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -150,8 +155,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y
150# CONFIG_SPARSEMEM_STATIC is not set 155# CONFIG_SPARSEMEM_STATIC is not set
151CONFIG_SPLIT_PTLOCK_CPUS=4 156CONFIG_SPLIT_PTLOCK_CPUS=4
152CONFIG_RESOURCES_64BIT=y 157CONFIG_RESOURCES_64BIT=y
158CONFIG_ZONE_DMA_FLAG=1
153CONFIG_SMP=y 159CONFIG_SMP=y
154CONFIG_SYS_SUPPORTS_SMP=y 160CONFIG_SYS_SUPPORTS_SMP=y
161CONFIG_NR_CPUS_DEFAULT_4=y
155CONFIG_NR_CPUS=4 162CONFIG_NR_CPUS=4
156# CONFIG_HZ_48 is not set 163# CONFIG_HZ_48 is not set
157# CONFIG_HZ_100 is not set 164# CONFIG_HZ_100 is not set
@@ -166,6 +173,7 @@ CONFIG_PREEMPT_NONE=y
166# CONFIG_PREEMPT_VOLUNTARY is not set 173# CONFIG_PREEMPT_VOLUNTARY is not set
167# CONFIG_PREEMPT is not set 174# CONFIG_PREEMPT is not set
168# CONFIG_PREEMPT_BKL is not set 175# CONFIG_PREEMPT_BKL is not set
176# CONFIG_KEXEC is not set
169CONFIG_LOCKDEP_SUPPORT=y 177CONFIG_LOCKDEP_SUPPORT=y
170CONFIG_STACKTRACE_SUPPORT=y 178CONFIG_STACKTRACE_SUPPORT=y
171CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 179CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -185,6 +193,7 @@ CONFIG_LOCALVERSION_AUTO=y
185CONFIG_SWAP=y 193CONFIG_SWAP=y
186CONFIG_SYSVIPC=y 194CONFIG_SYSVIPC=y
187# CONFIG_IPC_NS is not set 195# CONFIG_IPC_NS is not set
196CONFIG_SYSVIPC_SYSCTL=y
188# CONFIG_POSIX_MQUEUE is not set 197# CONFIG_POSIX_MQUEUE is not set
189# CONFIG_BSD_PROCESS_ACCT is not set 198# CONFIG_BSD_PROCESS_ACCT is not set
190# CONFIG_TASKSTATS is not set 199# CONFIG_TASKSTATS is not set
@@ -193,6 +202,7 @@ CONFIG_SYSVIPC=y
193CONFIG_IKCONFIG=y 202CONFIG_IKCONFIG=y
194CONFIG_IKCONFIG_PROC=y 203CONFIG_IKCONFIG_PROC=y
195# CONFIG_CPUSETS is not set 204# CONFIG_CPUSETS is not set
205CONFIG_SYSFS_DEPRECATED=y
196# CONFIG_RELAY is not set 206# CONFIG_RELAY is not set
197CONFIG_INITRAMFS_SOURCE="" 207CONFIG_INITRAMFS_SOURCE=""
198# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 208# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -253,7 +263,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
253CONFIG_HW_HAS_PCI=y 263CONFIG_HW_HAS_PCI=y
254CONFIG_PCI=y 264CONFIG_PCI=y
255CONFIG_PCI_DOMAINS=y 265CONFIG_PCI_DOMAINS=y
256# CONFIG_PCI_MULTITHREAD_PROBE is not set
257CONFIG_PCI_DEBUG=y 266CONFIG_PCI_DEBUG=y
258CONFIG_MMU=y 267CONFIG_MMU=y
259 268
@@ -273,11 +282,20 @@ CONFIG_BINFMT_ELF=y
273# CONFIG_BUILD_ELF64 is not set 282# CONFIG_BUILD_ELF64 is not set
274CONFIG_MIPS32_COMPAT=y 283CONFIG_MIPS32_COMPAT=y
275CONFIG_COMPAT=y 284CONFIG_COMPAT=y
285CONFIG_SYSVIPC_COMPAT=y
276CONFIG_MIPS32_O32=y 286CONFIG_MIPS32_O32=y
277CONFIG_MIPS32_N32=y 287CONFIG_MIPS32_N32=y
278CONFIG_BINFMT_ELF32=y 288CONFIG_BINFMT_ELF32=y
279 289
280# 290#
291# Power management options
292#
293CONFIG_PM=y
294# CONFIG_PM_LEGACY is not set
295# CONFIG_PM_DEBUG is not set
296# CONFIG_PM_SYSFS_DEPRECATED is not set
297
298#
281# Networking 299# Networking
282# 300#
283CONFIG_NET=y 301CONFIG_NET=y
@@ -292,7 +310,9 @@ CONFIG_UNIX=y
292CONFIG_XFRM=y 310CONFIG_XFRM=y
293CONFIG_XFRM_USER=m 311CONFIG_XFRM_USER=m
294# CONFIG_XFRM_SUB_POLICY is not set 312# CONFIG_XFRM_SUB_POLICY is not set
313CONFIG_XFRM_MIGRATE=y
295CONFIG_NET_KEY=y 314CONFIG_NET_KEY=y
315CONFIG_NET_KEY_MIGRATE=y
296CONFIG_INET=y 316CONFIG_INET=y
297# CONFIG_IP_MULTICAST is not set 317# CONFIG_IP_MULTICAST is not set
298# CONFIG_IP_ADVANCED_ROUTER is not set 318# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -318,6 +338,7 @@ CONFIG_INET_TCP_DIAG=y
318# CONFIG_TCP_CONG_ADVANCED is not set 338# CONFIG_TCP_CONG_ADVANCED is not set
319CONFIG_TCP_CONG_CUBIC=y 339CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic" 340CONFIG_DEFAULT_TCP_CONG="cubic"
341CONFIG_TCP_MD5SIG=y
321# CONFIG_IPV6 is not set 342# CONFIG_IPV6 is not set
322# CONFIG_INET6_XFRM_TUNNEL is not set 343# CONFIG_INET6_XFRM_TUNNEL is not set
323# CONFIG_INET6_TUNNEL is not set 344# CONFIG_INET6_TUNNEL is not set
@@ -374,6 +395,7 @@ CONFIG_NETWORK_SECMARK=y
374CONFIG_STANDALONE=y 395CONFIG_STANDALONE=y
375CONFIG_PREVENT_FIRMWARE_BUILD=y 396CONFIG_PREVENT_FIRMWARE_BUILD=y
376# CONFIG_DEBUG_DRIVER is not set 397# CONFIG_DEBUG_DRIVER is not set
398# CONFIG_DEBUG_DEVRES is not set
377# CONFIG_SYS_HYPERVISOR is not set 399# CONFIG_SYS_HYPERVISOR is not set
378 400
379# 401#
@@ -394,6 +416,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
394# 416#
395# Plug and Play support 417# Plug and Play support
396# 418#
419# CONFIG_PNPACPI is not set
397 420
398# 421#
399# Block devices 422# Block devices
@@ -413,6 +436,12 @@ CONFIG_BLK_DEV_INITRD=y
413# CONFIG_ATA_OVER_ETH is not set 436# CONFIG_ATA_OVER_ETH is not set
414 437
415# 438#
439# Misc devices
440#
441CONFIG_SGI_IOC4=m
442# CONFIG_TIFM_CORE is not set
443
444#
416# ATA/ATAPI/MFM/RLL support 445# ATA/ATAPI/MFM/RLL support
417# 446#
418CONFIG_IDE=y 447CONFIG_IDE=y
@@ -455,6 +484,7 @@ CONFIG_BLK_DEV_CMD64X=y
455# CONFIG_BLK_DEV_JMICRON is not set 484# CONFIG_BLK_DEV_JMICRON is not set
456# CONFIG_BLK_DEV_SC1200 is not set 485# CONFIG_BLK_DEV_SC1200 is not set
457# CONFIG_BLK_DEV_PIIX is not set 486# CONFIG_BLK_DEV_PIIX is not set
487CONFIG_BLK_DEV_IT8213=m
458# CONFIG_BLK_DEV_IT821X is not set 488# CONFIG_BLK_DEV_IT821X is not set
459# CONFIG_BLK_DEV_NS87415 is not set 489# CONFIG_BLK_DEV_NS87415 is not set
460# CONFIG_BLK_DEV_PDC202XX_OLD is not set 490# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -464,6 +494,7 @@ CONFIG_BLK_DEV_CMD64X=y
464# CONFIG_BLK_DEV_SLC90E66 is not set 494# CONFIG_BLK_DEV_SLC90E66 is not set
465# CONFIG_BLK_DEV_TRM290 is not set 495# CONFIG_BLK_DEV_TRM290 is not set
466# CONFIG_BLK_DEV_VIA82CXXX is not set 496# CONFIG_BLK_DEV_VIA82CXXX is not set
497CONFIG_BLK_DEV_TC86C001=m
467# CONFIG_BLK_DEV_IDE_SWARM is not set 498# CONFIG_BLK_DEV_IDE_SWARM is not set
468# CONFIG_IDE_ARM is not set 499# CONFIG_IDE_ARM is not set
469CONFIG_BLK_DEV_IDEDMA=y 500CONFIG_BLK_DEV_IDEDMA=y
@@ -558,14 +589,17 @@ CONFIG_NET_SB1250_MAC=y
558# CONFIG_TIGON3 is not set 589# CONFIG_TIGON3 is not set
559# CONFIG_BNX2 is not set 590# CONFIG_BNX2 is not set
560# CONFIG_QLA3XXX is not set 591# CONFIG_QLA3XXX is not set
592# CONFIG_ATL1 is not set
561 593
562# 594#
563# Ethernet (10000 Mbit) 595# Ethernet (10000 Mbit)
564# 596#
565# CONFIG_CHELSIO_T1 is not set 597# CONFIG_CHELSIO_T1 is not set
598CONFIG_CHELSIO_T3=m
566# CONFIG_IXGB is not set 599# CONFIG_IXGB is not set
567# CONFIG_S2IO is not set 600# CONFIG_S2IO is not set
568# CONFIG_MYRI10GE is not set 601# CONFIG_MYRI10GE is not set
602CONFIG_NETXEN_NIC=m
569 603
570# 604#
571# Token Ring devices 605# Token Ring devices
@@ -627,6 +661,7 @@ CONFIG_SERIAL_NONSTANDARD=y
627# CONFIG_DIGIEPCA is not set 661# CONFIG_DIGIEPCA is not set
628# CONFIG_MOXA_INTELLIO is not set 662# CONFIG_MOXA_INTELLIO is not set
629# CONFIG_MOXA_SMARTIO is not set 663# CONFIG_MOXA_SMARTIO is not set
664CONFIG_MOXA_SMARTIO_NEW=m
630# CONFIG_ISI is not set 665# CONFIG_ISI is not set
631# CONFIG_SYNCLINKMP is not set 666# CONFIG_SYNCLINKMP is not set
632# CONFIG_SYNCLINK_GT is not set 667# CONFIG_SYNCLINK_GT is not set
@@ -667,10 +702,6 @@ CONFIG_GEN_RTC=y
667# CONFIG_DTLK is not set 702# CONFIG_DTLK is not set
668# CONFIG_R3964 is not set 703# CONFIG_R3964 is not set
669# CONFIG_APPLICOM is not set 704# CONFIG_APPLICOM is not set
670
671#
672# Ftape, the floppy tape device driver
673#
674# CONFIG_DRM is not set 705# CONFIG_DRM is not set
675# CONFIG_RAW_DRIVER is not set 706# CONFIG_RAW_DRIVER is not set
676 707
@@ -678,7 +709,6 @@ CONFIG_GEN_RTC=y
678# TPM devices 709# TPM devices
679# 710#
680# CONFIG_TCG_TPM is not set 711# CONFIG_TCG_TPM is not set
681# CONFIG_TELCLOCK is not set
682 712
683# 713#
684# I2C support 714# I2C support
@@ -707,6 +737,7 @@ CONFIG_I2C_CHARDEV=y
707# CONFIG_I2C_NFORCE2 is not set 737# CONFIG_I2C_NFORCE2 is not set
708# CONFIG_I2C_OCORES is not set 738# CONFIG_I2C_OCORES is not set
709# CONFIG_I2C_PARPORT_LIGHT is not set 739# CONFIG_I2C_PARPORT_LIGHT is not set
740# CONFIG_I2C_PASEMI is not set
710# CONFIG_I2C_PROSAVAGE is not set 741# CONFIG_I2C_PROSAVAGE is not set
711# CONFIG_I2C_SAVAGE4 is not set 742# CONFIG_I2C_SAVAGE4 is not set
712CONFIG_I2C_SIBYTE=y 743CONFIG_I2C_SIBYTE=y
@@ -743,6 +774,7 @@ CONFIG_I2C_DEBUG_CHIP=y
743# 774#
744# Dallas's 1-wire bus 775# Dallas's 1-wire bus
745# 776#
777# CONFIG_W1 is not set
746 778
747# 779#
748# Hardware Monitoring support 780# Hardware Monitoring support
@@ -751,11 +783,6 @@ CONFIG_I2C_DEBUG_CHIP=y
751# CONFIG_HWMON_VID is not set 783# CONFIG_HWMON_VID is not set
752 784
753# 785#
754# Misc devices
755#
756# CONFIG_TIFM_CORE is not set
757
758#
759# Multimedia devices 786# Multimedia devices
760# 787#
761# CONFIG_VIDEO_DEV is not set 788# CONFIG_VIDEO_DEV is not set
@@ -840,6 +867,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
840# 867#
841 868
842# 869#
870# Auxiliary Display support
871#
872
873#
874# Virtualization
875#
876
877#
843# File systems 878# File systems
844# 879#
845CONFIG_EXT2_FS=y 880CONFIG_EXT2_FS=y
@@ -848,6 +883,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
848CONFIG_EXT2_FS_SECURITY=y 883CONFIG_EXT2_FS_SECURITY=y
849# CONFIG_EXT2_FS_XIP is not set 884# CONFIG_EXT2_FS_XIP is not set
850# CONFIG_EXT3_FS is not set 885# CONFIG_EXT3_FS is not set
886# CONFIG_EXT4DEV_FS is not set
851CONFIG_FS_MBCACHE=y 887CONFIG_FS_MBCACHE=y
852# CONFIG_REISERFS_FS is not set 888# CONFIG_REISERFS_FS is not set
853# CONFIG_JFS_FS is not set 889# CONFIG_JFS_FS is not set
@@ -889,7 +925,7 @@ CONFIG_TMPFS=y
889# CONFIG_TMPFS_POSIX_ACL is not set 925# CONFIG_TMPFS_POSIX_ACL is not set
890# CONFIG_HUGETLB_PAGE is not set 926# CONFIG_HUGETLB_PAGE is not set
891CONFIG_RAMFS=y 927CONFIG_RAMFS=y
892# CONFIG_CONFIGFS_FS is not set 928CONFIG_CONFIGFS_FS=m
893 929
894# 930#
895# Miscellaneous filesystems 931# Miscellaneous filesystems
@@ -946,6 +982,10 @@ CONFIG_MSDOS_PARTITION=y
946# 982#
947# Distributed Lock Manager 983# Distributed Lock Manager
948# 984#
985CONFIG_DLM=m
986CONFIG_DLM_TCP=y
987# CONFIG_DLM_SCTP is not set
988# CONFIG_DLM_DEBUG is not set
949 989
950# 990#
951# Profiling support 991# Profiling support
@@ -960,23 +1000,25 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
960CONFIG_ENABLE_MUST_CHECK=y 1000CONFIG_ENABLE_MUST_CHECK=y
961CONFIG_MAGIC_SYSRQ=y 1001CONFIG_MAGIC_SYSRQ=y
962# CONFIG_UNUSED_SYMBOLS is not set 1002# CONFIG_UNUSED_SYMBOLS is not set
1003# CONFIG_DEBUG_FS is not set
1004# CONFIG_HEADERS_CHECK is not set
963CONFIG_DEBUG_KERNEL=y 1005CONFIG_DEBUG_KERNEL=y
1006# CONFIG_DEBUG_SHIRQ is not set
964CONFIG_LOG_BUF_SHIFT=16 1007CONFIG_LOG_BUF_SHIFT=16
965CONFIG_DETECT_SOFTLOCKUP=y 1008CONFIG_DETECT_SOFTLOCKUP=y
966# CONFIG_SCHEDSTATS is not set 1009# CONFIG_SCHEDSTATS is not set
1010# CONFIG_TIMER_STATS is not set
967# CONFIG_DEBUG_SLAB is not set 1011# CONFIG_DEBUG_SLAB is not set
968# CONFIG_DEBUG_RT_MUTEXES is not set 1012# CONFIG_DEBUG_RT_MUTEXES is not set
969# CONFIG_RT_MUTEX_TESTER is not set 1013# CONFIG_RT_MUTEX_TESTER is not set
970# CONFIG_DEBUG_SPINLOCK is not set 1014# CONFIG_DEBUG_SPINLOCK is not set
971CONFIG_DEBUG_MUTEXES=y 1015CONFIG_DEBUG_MUTEXES=y
972# CONFIG_DEBUG_RWSEMS is not set
973# CONFIG_DEBUG_LOCK_ALLOC is not set 1016# CONFIG_DEBUG_LOCK_ALLOC is not set
974# CONFIG_PROVE_LOCKING is not set 1017# CONFIG_PROVE_LOCKING is not set
975# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1018# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
976# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1019# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
977# CONFIG_DEBUG_KOBJECT is not set 1020# CONFIG_DEBUG_KOBJECT is not set
978# CONFIG_DEBUG_INFO is not set 1021# CONFIG_DEBUG_INFO is not set
979# CONFIG_DEBUG_FS is not set
980# CONFIG_DEBUG_VM is not set 1022# CONFIG_DEBUG_VM is not set
981# CONFIG_DEBUG_LIST is not set 1023# CONFIG_DEBUG_LIST is not set
982CONFIG_FORCED_INLINING=y 1024CONFIG_FORCED_INLINING=y
@@ -984,7 +1026,6 @@ CONFIG_FORCED_INLINING=y
984CONFIG_CROSSCOMPILE=y 1026CONFIG_CROSSCOMPILE=y
985CONFIG_CMDLINE="" 1027CONFIG_CMDLINE=""
986# CONFIG_DEBUG_STACK_USAGE is not set 1028# CONFIG_DEBUG_STACK_USAGE is not set
987# CONFIG_KGDB is not set
988# CONFIG_SB1XXX_CORELIS is not set 1029# CONFIG_SB1XXX_CORELIS is not set
989# CONFIG_RUNTIME_DEBUG is not set 1030# CONFIG_RUNTIME_DEBUG is not set
990 1031
@@ -1002,8 +1043,9 @@ CONFIG_CRYPTO=y
1002CONFIG_CRYPTO_ALGAPI=y 1043CONFIG_CRYPTO_ALGAPI=y
1003CONFIG_CRYPTO_BLKCIPHER=m 1044CONFIG_CRYPTO_BLKCIPHER=m
1004CONFIG_CRYPTO_HASH=y 1045CONFIG_CRYPTO_HASH=y
1005CONFIG_CRYPTO_MANAGER=m 1046CONFIG_CRYPTO_MANAGER=y
1006CONFIG_CRYPTO_HMAC=y 1047CONFIG_CRYPTO_HMAC=y
1048CONFIG_CRYPTO_XCBC=m
1007CONFIG_CRYPTO_NULL=y 1049CONFIG_CRYPTO_NULL=y
1008CONFIG_CRYPTO_MD4=y 1050CONFIG_CRYPTO_MD4=y
1009CONFIG_CRYPTO_MD5=y 1051CONFIG_CRYPTO_MD5=y
@@ -1012,9 +1054,13 @@ CONFIG_CRYPTO_SHA256=y
1012CONFIG_CRYPTO_SHA512=y 1054CONFIG_CRYPTO_SHA512=y
1013CONFIG_CRYPTO_WP512=m 1055CONFIG_CRYPTO_WP512=m
1014CONFIG_CRYPTO_TGR192=m 1056CONFIG_CRYPTO_TGR192=m
1057CONFIG_CRYPTO_GF128MUL=m
1015CONFIG_CRYPTO_ECB=m 1058CONFIG_CRYPTO_ECB=m
1016CONFIG_CRYPTO_CBC=m 1059CONFIG_CRYPTO_CBC=m
1060CONFIG_CRYPTO_PCBC=m
1061CONFIG_CRYPTO_LRW=m
1017CONFIG_CRYPTO_DES=y 1062CONFIG_CRYPTO_DES=y
1063CONFIG_CRYPTO_FCRYPT=m
1018CONFIG_CRYPTO_BLOWFISH=y 1064CONFIG_CRYPTO_BLOWFISH=y
1019CONFIG_CRYPTO_TWOFISH=y 1065CONFIG_CRYPTO_TWOFISH=y
1020CONFIG_CRYPTO_TWOFISH_COMMON=y 1066CONFIG_CRYPTO_TWOFISH_COMMON=y
@@ -1029,6 +1075,7 @@ CONFIG_CRYPTO_ANUBIS=m
1029CONFIG_CRYPTO_DEFLATE=y 1075CONFIG_CRYPTO_DEFLATE=y
1030CONFIG_CRYPTO_MICHAEL_MIC=y 1076CONFIG_CRYPTO_MICHAEL_MIC=y
1031# CONFIG_CRYPTO_CRC32C is not set 1077# CONFIG_CRYPTO_CRC32C is not set
1078CONFIG_CRYPTO_CAMELLIA=m
1032# CONFIG_CRYPTO_TEST is not set 1079# CONFIG_CRYPTO_TEST is not set
1033 1080
1034# 1081#
@@ -1038,6 +1085,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=y
1038# 1085#
1039# Library routines 1086# Library routines
1040# 1087#
1088CONFIG_BITREVERSE=y
1041# CONFIG_CRC_CCITT is not set 1089# CONFIG_CRC_CCITT is not set
1042# CONFIG_CRC16 is not set 1090# CONFIG_CRC16 is not set
1043CONFIG_CRC32=y 1091CONFIG_CRC32=y
@@ -1045,3 +1093,5 @@ CONFIG_CRC32=y
1045CONFIG_ZLIB_INFLATE=y 1093CONFIG_ZLIB_INFLATE=y
1046CONFIG_ZLIB_DEFLATE=y 1094CONFIG_ZLIB_DEFLATE=y
1047CONFIG_PLIST=y 1095CONFIG_PLIST=y
1096CONFIG_HAS_IOMEM=y
1097CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index 49590d443712..5e7ae56b1f3c 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:24 2006 4# Tue Feb 20 21:47:22 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 45CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -70,12 +69,15 @@ CONFIG_MACH_VR41XX=y
70# CONFIG_VICTOR_MPC30X is not set 69# CONFIG_VICTOR_MPC30X is not set
71CONFIG_ZAO_CAPCELLA=y 70CONFIG_ZAO_CAPCELLA=y
72CONFIG_PCI_VR41XX=y 71CONFIG_PCI_VR41XX=y
73# CONFIG_VRC4173 is not set
74CONFIG_RWSEM_GENERIC_SPINLOCK=y 72CONFIG_RWSEM_GENERIC_SPINLOCK=y
73# CONFIG_ARCH_HAS_ILOG2_U32 is not set
74# CONFIG_ARCH_HAS_ILOG2_U64 is not set
75CONFIG_GENERIC_FIND_NEXT_BIT=y 75CONFIG_GENERIC_FIND_NEXT_BIT=y
76CONFIG_GENERIC_HWEIGHT=y 76CONFIG_GENERIC_HWEIGHT=y
77CONFIG_GENERIC_CALIBRATE_DELAY=y 77CONFIG_GENERIC_CALIBRATE_DELAY=y
78CONFIG_GENERIC_TIME=y
78CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 79CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
80CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
79CONFIG_DMA_NONCOHERENT=y 81CONFIG_DMA_NONCOHERENT=y
80CONFIG_DMA_NEED_PCI_MAP_STATE=y 82CONFIG_DMA_NEED_PCI_MAP_STATE=y
81# CONFIG_CPU_BIG_ENDIAN is not set 83# CONFIG_CPU_BIG_ENDIAN is not set
@@ -108,6 +110,7 @@ CONFIG_CPU_VR41XX=y
108# CONFIG_CPU_SB1 is not set 110# CONFIG_CPU_SB1 is not set
109CONFIG_SYS_HAS_CPU_VR41XX=y 111CONFIG_SYS_HAS_CPU_VR41XX=y
110CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
113CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
112CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 115CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
113 116
@@ -121,8 +124,8 @@ CONFIG_PAGE_SIZE_4KB=y
121# CONFIG_PAGE_SIZE_16KB is not set 124# CONFIG_PAGE_SIZE_16KB is not set
122# CONFIG_PAGE_SIZE_64KB is not set 125# CONFIG_PAGE_SIZE_64KB is not set
123CONFIG_MIPS_MT_DISABLED=y 126CONFIG_MIPS_MT_DISABLED=y
124# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_MT_SMP is not set 127# CONFIG_MIPS_MT_SMP is not set
128# CONFIG_MIPS_MT_SMTC is not set
126# CONFIG_MIPS_VPE_LOADER is not set 129# CONFIG_MIPS_VPE_LOADER is not set
127CONFIG_CPU_HAS_SYNC=y 130CONFIG_CPU_HAS_SYNC=y
128CONFIG_GENERIC_HARDIRQS=y 131CONFIG_GENERIC_HARDIRQS=y
@@ -137,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
137# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
139# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
140# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
141# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
142# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -149,6 +153,7 @@ CONFIG_HZ=1000
149CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
150# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
151# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
152CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -167,15 +172,20 @@ CONFIG_LOCALVERSION=""
167CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
168CONFIG_SWAP=y 173CONFIG_SWAP=y
169CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
170# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
171# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
172CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
173# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
174# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
175# CONFIG_RELAY is not set 184# CONFIG_RELAY is not set
176CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
178CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
179CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
181CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -183,12 +193,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 193CONFIG_BUG=y
184CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 196CONFIG_FUTEX=y
188CONFIG_EPOLL=y 197CONFIG_EPOLL=y
189CONFIG_SHMEM=y 198CONFIG_SHMEM=y
190CONFIG_SLAB=y 199CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -206,6 +216,7 @@ CONFIG_KMOD=y
206# 216#
207# Block layer 217# Block layer
208# 218#
219CONFIG_BLOCK=y
209# CONFIG_LBD is not set 220# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -248,6 +259,14 @@ CONFIG_BINFMT_ELF=y
248CONFIG_TRAD_SIGNALS=y 259CONFIG_TRAD_SIGNALS=y
249 260
250# 261#
262# Power management options
263#
264CONFIG_PM=y
265# CONFIG_PM_LEGACY is not set
266# CONFIG_PM_DEBUG is not set
267# CONFIG_PM_SYSFS_DEPRECATED is not set
268
269#
251# Networking 270# Networking
252# 271#
253CONFIG_NET=y 272CONFIG_NET=y
@@ -261,7 +280,10 @@ CONFIG_PACKET_MMAP=y
261CONFIG_UNIX=y 280CONFIG_UNIX=y
262CONFIG_XFRM=y 281CONFIG_XFRM=y
263CONFIG_XFRM_USER=m 282CONFIG_XFRM_USER=m
283# CONFIG_XFRM_SUB_POLICY is not set
284CONFIG_XFRM_MIGRATE=y
264CONFIG_NET_KEY=y 285CONFIG_NET_KEY=y
286CONFIG_NET_KEY_MIGRATE=y
265CONFIG_INET=y 287CONFIG_INET=y
266CONFIG_IP_MULTICAST=y 288CONFIG_IP_MULTICAST=y
267# CONFIG_IP_ADVANCED_ROUTER is not set 289# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -282,10 +304,13 @@ CONFIG_IP_PNP_BOOTP=y
282# CONFIG_INET_TUNNEL is not set 304# CONFIG_INET_TUNNEL is not set
283CONFIG_INET_XFRM_MODE_TRANSPORT=m 305CONFIG_INET_XFRM_MODE_TRANSPORT=m
284CONFIG_INET_XFRM_MODE_TUNNEL=m 306CONFIG_INET_XFRM_MODE_TUNNEL=m
307CONFIG_INET_XFRM_MODE_BEET=m
285CONFIG_INET_DIAG=y 308CONFIG_INET_DIAG=y
286CONFIG_INET_TCP_DIAG=y 309CONFIG_INET_TCP_DIAG=y
287# CONFIG_TCP_CONG_ADVANCED is not set 310# CONFIG_TCP_CONG_ADVANCED is not set
288CONFIG_TCP_CONG_BIC=y 311CONFIG_TCP_CONG_CUBIC=y
312CONFIG_DEFAULT_TCP_CONG="cubic"
313CONFIG_TCP_MD5SIG=y
289# CONFIG_IPV6 is not set 314# CONFIG_IPV6 is not set
290# CONFIG_INET6_XFRM_TUNNEL is not set 315# CONFIG_INET6_XFRM_TUNNEL is not set
291# CONFIG_INET6_TUNNEL is not set 316# CONFIG_INET6_TUNNEL is not set
@@ -315,7 +340,6 @@ CONFIG_NETWORK_SECMARK=y
315# CONFIG_ATALK is not set 340# CONFIG_ATALK is not set
316# CONFIG_X25 is not set 341# CONFIG_X25 is not set
317# CONFIG_LAPB is not set 342# CONFIG_LAPB is not set
318# CONFIG_NET_DIVERT is not set
319# CONFIG_ECONET is not set 343# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 344# CONFIG_WAN_ROUTER is not set
321 345
@@ -363,6 +387,7 @@ CONFIG_CONNECTOR=m
363# 387#
364# Plug and Play support 388# Plug and Play support
365# 389#
390# CONFIG_PNPACPI is not set
366 391
367# 392#
368# Block devices 393# Block devices
@@ -378,14 +403,22 @@ CONFIG_CONNECTOR=m
378CONFIG_BLK_DEV_RAM=y 403CONFIG_BLK_DEV_RAM=y
379CONFIG_BLK_DEV_RAM_COUNT=16 404CONFIG_BLK_DEV_RAM_COUNT=16
380CONFIG_BLK_DEV_RAM_SIZE=4096 405CONFIG_BLK_DEV_RAM_SIZE=4096
406CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
381# CONFIG_BLK_DEV_INITRD is not set 407# CONFIG_BLK_DEV_INITRD is not set
382# CONFIG_CDROM_PKTCDVD is not set 408# CONFIG_CDROM_PKTCDVD is not set
383# CONFIG_ATA_OVER_ETH is not set 409# CONFIG_ATA_OVER_ETH is not set
384 410
385# 411#
412# Misc devices
413#
414CONFIG_SGI_IOC4=m
415# CONFIG_TIFM_CORE is not set
416
417#
386# ATA/ATAPI/MFM/RLL support 418# ATA/ATAPI/MFM/RLL support
387# 419#
388CONFIG_IDE=y 420CONFIG_IDE=y
421CONFIG_IDE_MAX_HWIFS=4
389CONFIG_BLK_DEV_IDE=y 422CONFIG_BLK_DEV_IDE=y
390 423
391# 424#
@@ -414,6 +447,12 @@ CONFIG_IDE_GENERIC=y
414# 447#
415# CONFIG_RAID_ATTRS is not set 448# CONFIG_RAID_ATTRS is not set
416# CONFIG_SCSI is not set 449# CONFIG_SCSI is not set
450# CONFIG_SCSI_NETLINK is not set
451
452#
453# Serial ATA (prod) and Parallel ATA (experimental) drivers
454#
455# CONFIG_ATA is not set
417 456
418# 457#
419# Multi-device support (RAID and LVM) 458# Multi-device support (RAID and LVM)
@@ -464,6 +503,8 @@ CONFIG_LXT_PHY=m
464CONFIG_CICADA_PHY=m 503CONFIG_CICADA_PHY=m
465CONFIG_VITESSE_PHY=m 504CONFIG_VITESSE_PHY=m
466CONFIG_SMSC_PHY=m 505CONFIG_SMSC_PHY=m
506# CONFIG_BROADCOM_PHY is not set
507# CONFIG_FIXED_PHY is not set
467 508
468# 509#
469# Ethernet (10 or 100Mbit) 510# Ethernet (10 or 100Mbit)
@@ -504,7 +545,7 @@ CONFIG_8139TOO_PIO=y
504# CONFIG_SUNDANCE is not set 545# CONFIG_SUNDANCE is not set
505# CONFIG_TLAN is not set 546# CONFIG_TLAN is not set
506# CONFIG_VIA_RHINE is not set 547# CONFIG_VIA_RHINE is not set
507# CONFIG_LAN_SAA9730 is not set 548# CONFIG_SC92031 is not set
508 549
509# 550#
510# Ethernet (1000 Mbit) 551# Ethernet (1000 Mbit)
@@ -523,14 +564,18 @@ CONFIG_8139TOO_PIO=y
523# CONFIG_VIA_VELOCITY is not set 564# CONFIG_VIA_VELOCITY is not set
524# CONFIG_TIGON3 is not set 565# CONFIG_TIGON3 is not set
525# CONFIG_BNX2 is not set 566# CONFIG_BNX2 is not set
567CONFIG_QLA3XXX=m
568# CONFIG_ATL1 is not set
526 569
527# 570#
528# Ethernet (10000 Mbit) 571# Ethernet (10000 Mbit)
529# 572#
530# CONFIG_CHELSIO_T1 is not set 573# CONFIG_CHELSIO_T1 is not set
574CONFIG_CHELSIO_T3=m
531# CONFIG_IXGB is not set 575# CONFIG_IXGB is not set
532# CONFIG_S2IO is not set 576# CONFIG_S2IO is not set
533# CONFIG_MYRI10GE is not set 577# CONFIG_MYRI10GE is not set
578CONFIG_NETXEN_NIC=m
534 579
535# 580#
536# Token Ring devices 581# Token Ring devices
@@ -569,6 +614,7 @@ CONFIG_8139TOO_PIO=y
569# Input device support 614# Input device support
570# 615#
571CONFIG_INPUT=y 616CONFIG_INPUT=y
617# CONFIG_INPUT_FF_MEMLESS is not set
572 618
573# 619#
574# Userland interfaces 620# Userland interfaces
@@ -635,10 +681,6 @@ CONFIG_LEGACY_PTY_COUNT=256
635# CONFIG_DTLK is not set 681# CONFIG_DTLK is not set
636# CONFIG_R3964 is not set 682# CONFIG_R3964 is not set
637# CONFIG_APPLICOM is not set 683# CONFIG_APPLICOM is not set
638
639#
640# Ftape, the floppy tape device driver
641#
642# CONFIG_DRM is not set 684# CONFIG_DRM is not set
643CONFIG_GPIO_VR41XX=y 685CONFIG_GPIO_VR41XX=y
644# CONFIG_RAW_DRIVER is not set 686# CONFIG_RAW_DRIVER is not set
@@ -647,7 +689,6 @@ CONFIG_GPIO_VR41XX=y
647# TPM devices 689# TPM devices
648# 690#
649# CONFIG_TCG_TPM is not set 691# CONFIG_TCG_TPM is not set
650# CONFIG_TELCLOCK is not set
651 692
652# 693#
653# I2C support 694# I2C support
@@ -672,14 +713,9 @@ CONFIG_GPIO_VR41XX=y
672# CONFIG_HWMON_VID is not set 713# CONFIG_HWMON_VID is not set
673 714
674# 715#
675# Misc devices
676#
677
678#
679# Multimedia devices 716# Multimedia devices
680# 717#
681# CONFIG_VIDEO_DEV is not set 718# CONFIG_VIDEO_DEV is not set
682CONFIG_VIDEO_V4L2=y
683 719
684# 720#
685# Digital Video Broadcasting Devices 721# Digital Video Broadcasting Devices
@@ -697,6 +733,7 @@ CONFIG_VIDEO_V4L2=y
697# 733#
698# CONFIG_VGA_CONSOLE is not set 734# CONFIG_VGA_CONSOLE is not set
699CONFIG_DUMMY_CONSOLE=y 735CONFIG_DUMMY_CONSOLE=y
736# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
700 737
701# 738#
702# Sound 739# Sound
@@ -704,6 +741,11 @@ CONFIG_DUMMY_CONSOLE=y
704# CONFIG_SOUND is not set 741# CONFIG_SOUND is not set
705 742
706# 743#
744# HID Devices
745#
746# CONFIG_HID is not set
747
748#
707# USB support 749# USB support
708# 750#
709CONFIG_USB_ARCH_HAS_HCD=y 751CONFIG_USB_ARCH_HAS_HCD=y
@@ -754,6 +796,7 @@ CONFIG_RTC_LIB=y
754CONFIG_RTC_CLASS=y 796CONFIG_RTC_CLASS=y
755CONFIG_RTC_HCTOSYS=y 797CONFIG_RTC_HCTOSYS=y
756CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 798CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
799# CONFIG_RTC_DEBUG is not set
757 800
758# 801#
759# RTC interfaces 802# RTC interfaces
@@ -787,16 +830,26 @@ CONFIG_RTC_DRV_VR41XX=y
787# 830#
788 831
789# 832#
833# Auxiliary Display support
834#
835
836#
837# Virtualization
838#
839
840#
790# File systems 841# File systems
791# 842#
792CONFIG_EXT2_FS=y 843CONFIG_EXT2_FS=y
793# CONFIG_EXT2_FS_XATTR is not set 844# CONFIG_EXT2_FS_XATTR is not set
794# CONFIG_EXT2_FS_XIP is not set 845# CONFIG_EXT2_FS_XIP is not set
795# CONFIG_EXT3_FS is not set 846# CONFIG_EXT3_FS is not set
847# CONFIG_EXT4DEV_FS is not set
796# CONFIG_REISERFS_FS is not set 848# CONFIG_REISERFS_FS is not set
797# CONFIG_JFS_FS is not set 849# CONFIG_JFS_FS is not set
798# CONFIG_FS_POSIX_ACL is not set 850CONFIG_FS_POSIX_ACL=y
799# CONFIG_XFS_FS is not set 851# CONFIG_XFS_FS is not set
852# CONFIG_GFS2_FS is not set
800# CONFIG_OCFS2_FS is not set 853# CONFIG_OCFS2_FS is not set
801# CONFIG_MINIX_FS is not set 854# CONFIG_MINIX_FS is not set
802# CONFIG_ROMFS_FS is not set 855# CONFIG_ROMFS_FS is not set
@@ -807,6 +860,7 @@ CONFIG_DNOTIFY=y
807# CONFIG_AUTOFS_FS is not set 860# CONFIG_AUTOFS_FS is not set
808CONFIG_AUTOFS4_FS=y 861CONFIG_AUTOFS4_FS=y
809CONFIG_FUSE_FS=m 862CONFIG_FUSE_FS=m
863CONFIG_GENERIC_ACL=y
810 864
811# 865#
812# CD-ROM/DVD Filesystems 866# CD-ROM/DVD Filesystems
@@ -826,11 +880,13 @@ CONFIG_FUSE_FS=m
826# 880#
827CONFIG_PROC_FS=y 881CONFIG_PROC_FS=y
828CONFIG_PROC_KCORE=y 882CONFIG_PROC_KCORE=y
883CONFIG_PROC_SYSCTL=y
829CONFIG_SYSFS=y 884CONFIG_SYSFS=y
830CONFIG_TMPFS=y 885CONFIG_TMPFS=y
886CONFIG_TMPFS_POSIX_ACL=y
831# CONFIG_HUGETLB_PAGE is not set 887# CONFIG_HUGETLB_PAGE is not set
832CONFIG_RAMFS=y 888CONFIG_RAMFS=y
833# CONFIG_CONFIGFS_FS is not set 889CONFIG_CONFIGFS_FS=m
834 890
835# 891#
836# Miscellaneous filesystems 892# Miscellaneous filesystems
@@ -868,7 +924,6 @@ CONFIG_SUNRPC=y
868# CONFIG_RPCSEC_GSS_SPKM3 is not set 924# CONFIG_RPCSEC_GSS_SPKM3 is not set
869# CONFIG_SMB_FS is not set 925# CONFIG_SMB_FS is not set
870# CONFIG_CIFS is not set 926# CONFIG_CIFS is not set
871# CONFIG_CIFS_DEBUG2 is not set
872# CONFIG_NCP_FS is not set 927# CONFIG_NCP_FS is not set
873# CONFIG_CODA_FS is not set 928# CONFIG_CODA_FS is not set
874# CONFIG_AFS_FS is not set 929# CONFIG_AFS_FS is not set
@@ -886,6 +941,14 @@ CONFIG_MSDOS_PARTITION=y
886# CONFIG_NLS is not set 941# CONFIG_NLS is not set
887 942
888# 943#
944# Distributed Lock Manager
945#
946CONFIG_DLM=m
947CONFIG_DLM_TCP=y
948# CONFIG_DLM_SCTP is not set
949# CONFIG_DLM_DEBUG is not set
950
951#
889# Profiling support 952# Profiling support
890# 953#
891# CONFIG_PROFILING is not set 954# CONFIG_PROFILING is not set
@@ -895,11 +958,13 @@ CONFIG_MSDOS_PARTITION=y
895# 958#
896CONFIG_TRACE_IRQFLAGS_SUPPORT=y 959CONFIG_TRACE_IRQFLAGS_SUPPORT=y
897# CONFIG_PRINTK_TIME is not set 960# CONFIG_PRINTK_TIME is not set
961CONFIG_ENABLE_MUST_CHECK=y
898# CONFIG_MAGIC_SYSRQ is not set 962# CONFIG_MAGIC_SYSRQ is not set
899# CONFIG_UNUSED_SYMBOLS is not set 963# CONFIG_UNUSED_SYMBOLS is not set
964# CONFIG_DEBUG_FS is not set
965# CONFIG_HEADERS_CHECK is not set
900# CONFIG_DEBUG_KERNEL is not set 966# CONFIG_DEBUG_KERNEL is not set
901CONFIG_LOG_BUF_SHIFT=14 967CONFIG_LOG_BUF_SHIFT=14
902# CONFIG_DEBUG_FS is not set
903CONFIG_CROSSCOMPILE=y 968CONFIG_CROSSCOMPILE=y
904CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" 969CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
905 970
@@ -912,7 +977,44 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
912# 977#
913# Cryptographic options 978# Cryptographic options
914# 979#
915# CONFIG_CRYPTO is not set 980CONFIG_CRYPTO=y
981CONFIG_CRYPTO_ALGAPI=y
982CONFIG_CRYPTO_BLKCIPHER=m
983CONFIG_CRYPTO_HASH=m
984CONFIG_CRYPTO_MANAGER=m
985CONFIG_CRYPTO_HMAC=m
986CONFIG_CRYPTO_XCBC=m
987CONFIG_CRYPTO_NULL=m
988CONFIG_CRYPTO_MD4=m
989CONFIG_CRYPTO_MD5=y
990CONFIG_CRYPTO_SHA1=m
991CONFIG_CRYPTO_SHA256=m
992CONFIG_CRYPTO_SHA512=m
993CONFIG_CRYPTO_WP512=m
994CONFIG_CRYPTO_TGR192=m
995CONFIG_CRYPTO_GF128MUL=m
996CONFIG_CRYPTO_ECB=m
997CONFIG_CRYPTO_CBC=m
998CONFIG_CRYPTO_PCBC=m
999CONFIG_CRYPTO_LRW=m
1000CONFIG_CRYPTO_DES=m
1001CONFIG_CRYPTO_FCRYPT=m
1002CONFIG_CRYPTO_BLOWFISH=m
1003CONFIG_CRYPTO_TWOFISH=m
1004CONFIG_CRYPTO_TWOFISH_COMMON=m
1005CONFIG_CRYPTO_SERPENT=m
1006CONFIG_CRYPTO_AES=m
1007CONFIG_CRYPTO_CAST5=m
1008CONFIG_CRYPTO_CAST6=m
1009CONFIG_CRYPTO_TEA=m
1010CONFIG_CRYPTO_ARC4=m
1011CONFIG_CRYPTO_KHAZAD=m
1012CONFIG_CRYPTO_ANUBIS=m
1013CONFIG_CRYPTO_DEFLATE=m
1014CONFIG_CRYPTO_MICHAEL_MIC=m
1015# CONFIG_CRYPTO_CRC32C is not set
1016CONFIG_CRYPTO_CAMELLIA=m
1017# CONFIG_CRYPTO_TEST is not set
916 1018
917# 1019#
918# Hardware crypto devices 1020# Hardware crypto devices
@@ -921,8 +1023,13 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
921# 1023#
922# Library routines 1024# Library routines
923# 1025#
1026CONFIG_BITREVERSE=y
924# CONFIG_CRC_CCITT is not set 1027# CONFIG_CRC_CCITT is not set
925# CONFIG_CRC16 is not set 1028# CONFIG_CRC16 is not set
926CONFIG_CRC32=y 1029CONFIG_CRC32=y
927# CONFIG_LIBCRC32C is not set 1030# CONFIG_LIBCRC32C is not set
1031CONFIG_ZLIB_INFLATE=m
1032CONFIG_ZLIB_DEFLATE=m
928CONFIG_PLIST=y 1033CONFIG_PLIST=y
1034CONFIG_HAS_IOMEM=y
1035CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 0607fc239087..ba593b510b76 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:25 2006 4# Tue Feb 20 21:47:24 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25CONFIG_MIPS_COBALT=y 26CONFIG_MIPS_COBALT=y
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_COBALT=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +64,14 @@ CONFIG_MIPS_COBALT=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_EARLY_PRINTK=y 65CONFIG_EARLY_PRINTK=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
72CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
74CONFIG_I8259=y 77CONFIG_I8259=y
@@ -117,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_16KB is not set 120# CONFIG_PAGE_SIZE_16KB is not set
118# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
119CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 127CONFIG_CPU_HAS_SYNC=y
@@ -134,6 +137,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 137# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 138CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 139# CONFIG_RESOURCES_64BIT is not set
140CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 141# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 142# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 143# CONFIG_HZ_128 is not set
@@ -146,6 +150,7 @@ CONFIG_HZ=1000
146CONFIG_PREEMPT_NONE=y 150CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 151# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 152# CONFIG_PREEMPT is not set
153# CONFIG_KEXEC is not set
149CONFIG_LOCKDEP_SUPPORT=y 154CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 155CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -164,15 +169,20 @@ CONFIG_LOCALVERSION=""
164CONFIG_LOCALVERSION_AUTO=y 169CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 170CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 171CONFIG_SYSVIPC=y
172# CONFIG_IPC_NS is not set
173CONFIG_SYSVIPC_SYSCTL=y
167# CONFIG_POSIX_MQUEUE is not set 174# CONFIG_POSIX_MQUEUE is not set
168# CONFIG_BSD_PROCESS_ACCT is not set 175# CONFIG_BSD_PROCESS_ACCT is not set
169CONFIG_SYSCTL=y 176# CONFIG_TASKSTATS is not set
177# CONFIG_UTS_NS is not set
170# CONFIG_AUDIT is not set 178# CONFIG_AUDIT is not set
171# CONFIG_IKCONFIG is not set 179# CONFIG_IKCONFIG is not set
180CONFIG_SYSFS_DEPRECATED=y
172CONFIG_RELAY=y 181CONFIG_RELAY=y
173CONFIG_INITRAMFS_SOURCE=""
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
183CONFIG_SYSCTL=y
175CONFIG_EMBEDDED=y 184CONFIG_EMBEDDED=y
185CONFIG_SYSCTL_SYSCALL=y
176CONFIG_KALLSYMS=y 186CONFIG_KALLSYMS=y
177# CONFIG_KALLSYMS_EXTRA_PASS is not set 187# CONFIG_KALLSYMS_EXTRA_PASS is not set
178CONFIG_HOTPLUG=y 188CONFIG_HOTPLUG=y
@@ -180,12 +190,12 @@ CONFIG_PRINTK=y
180CONFIG_BUG=y 190CONFIG_BUG=y
181CONFIG_ELF_CORE=y 191CONFIG_ELF_CORE=y
182CONFIG_BASE_FULL=y 192CONFIG_BASE_FULL=y
183CONFIG_RT_MUTEXES=y
184CONFIG_FUTEX=y 193CONFIG_FUTEX=y
185CONFIG_EPOLL=y 194CONFIG_EPOLL=y
186CONFIG_SHMEM=y 195CONFIG_SHMEM=y
187CONFIG_SLAB=y 196CONFIG_SLAB=y
188CONFIG_VM_EVENT_COUNTERS=y 197CONFIG_VM_EVENT_COUNTERS=y
198CONFIG_RT_MUTEXES=y
189# CONFIG_TINY_SHMEM is not set 199# CONFIG_TINY_SHMEM is not set
190CONFIG_BASE_SMALL=0 200CONFIG_BASE_SMALL=0
191# CONFIG_SLOB is not set 201# CONFIG_SLOB is not set
@@ -198,6 +208,7 @@ CONFIG_BASE_SMALL=0
198# 208#
199# Block layer 209# Block layer
200# 210#
211CONFIG_BLOCK=y
201# CONFIG_LBD is not set 212# CONFIG_LBD is not set
202# CONFIG_BLK_DEV_IO_TRACE is not set 213# CONFIG_BLK_DEV_IO_TRACE is not set
203# CONFIG_LSF is not set 214# CONFIG_LSF is not set
@@ -240,6 +251,14 @@ CONFIG_BINFMT_ELF=y
240CONFIG_TRAD_SIGNALS=y 251CONFIG_TRAD_SIGNALS=y
241 252
242# 253#
254# Power management options
255#
256CONFIG_PM=y
257# CONFIG_PM_LEGACY is not set
258# CONFIG_PM_DEBUG is not set
259# CONFIG_PM_SYSFS_DEPRECATED is not set
260
261#
243# Networking 262# Networking
244# 263#
245CONFIG_NET=y 264CONFIG_NET=y
@@ -253,7 +272,10 @@ CONFIG_PACKET=y
253CONFIG_UNIX=y 272CONFIG_UNIX=y
254CONFIG_XFRM=y 273CONFIG_XFRM=y
255CONFIG_XFRM_USER=y 274CONFIG_XFRM_USER=y
275# CONFIG_XFRM_SUB_POLICY is not set
276CONFIG_XFRM_MIGRATE=y
256CONFIG_NET_KEY=y 277CONFIG_NET_KEY=y
278CONFIG_NET_KEY_MIGRATE=y
257CONFIG_INET=y 279CONFIG_INET=y
258# CONFIG_IP_MULTICAST is not set 280# CONFIG_IP_MULTICAST is not set
259# CONFIG_IP_ADVANCED_ROUTER is not set 281# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -270,10 +292,13 @@ CONFIG_IP_FIB_HASH=y
270# CONFIG_INET_TUNNEL is not set 292# CONFIG_INET_TUNNEL is not set
271CONFIG_INET_XFRM_MODE_TRANSPORT=y 293CONFIG_INET_XFRM_MODE_TRANSPORT=y
272CONFIG_INET_XFRM_MODE_TUNNEL=y 294CONFIG_INET_XFRM_MODE_TUNNEL=y
295CONFIG_INET_XFRM_MODE_BEET=y
273CONFIG_INET_DIAG=y 296CONFIG_INET_DIAG=y
274CONFIG_INET_TCP_DIAG=y 297CONFIG_INET_TCP_DIAG=y
275# CONFIG_TCP_CONG_ADVANCED is not set 298# CONFIG_TCP_CONG_ADVANCED is not set
276CONFIG_TCP_CONG_BIC=y 299CONFIG_TCP_CONG_CUBIC=y
300CONFIG_DEFAULT_TCP_CONG="cubic"
301CONFIG_TCP_MD5SIG=y
277# CONFIG_IPV6 is not set 302# CONFIG_IPV6 is not set
278# CONFIG_INET6_XFRM_TUNNEL is not set 303# CONFIG_INET6_XFRM_TUNNEL is not set
279# CONFIG_INET6_TUNNEL is not set 304# CONFIG_INET6_TUNNEL is not set
@@ -303,7 +328,6 @@ CONFIG_NETWORK_SECMARK=y
303# CONFIG_ATALK is not set 328# CONFIG_ATALK is not set
304# CONFIG_X25 is not set 329# CONFIG_X25 is not set
305# CONFIG_LAPB is not set 330# CONFIG_LAPB is not set
306# CONFIG_NET_DIVERT is not set
307# CONFIG_ECONET is not set 331# CONFIG_ECONET is not set
308# CONFIG_WAN_ROUTER is not set 332# CONFIG_WAN_ROUTER is not set
309 333
@@ -348,7 +372,87 @@ CONFIG_PROC_EVENTS=y
348# 372#
349# Memory Technology Devices (MTD) 373# Memory Technology Devices (MTD)
350# 374#
351# CONFIG_MTD is not set 375CONFIG_MTD=y
376# CONFIG_MTD_DEBUG is not set
377# CONFIG_MTD_CONCAT is not set
378CONFIG_MTD_PARTITIONS=y
379# CONFIG_MTD_REDBOOT_PARTS is not set
380# CONFIG_MTD_CMDLINE_PARTS is not set
381
382#
383# User Modules And Translation Layers
384#
385CONFIG_MTD_CHAR=y
386CONFIG_MTD_BLKDEVS=y
387# CONFIG_MTD_BLOCK is not set
388# CONFIG_MTD_BLOCK_RO is not set
389# CONFIG_FTL is not set
390# CONFIG_NFTL is not set
391# CONFIG_INFTL is not set
392# CONFIG_RFD_FTL is not set
393# CONFIG_SSFDC is not set
394
395#
396# RAM/ROM/Flash chip drivers
397#
398# CONFIG_MTD_CFI is not set
399CONFIG_MTD_JEDECPROBE=y
400CONFIG_MTD_GEN_PROBE=y
401# CONFIG_MTD_CFI_ADV_OPTIONS is not set
402CONFIG_MTD_MAP_BANK_WIDTH_1=y
403CONFIG_MTD_MAP_BANK_WIDTH_2=y
404CONFIG_MTD_MAP_BANK_WIDTH_4=y
405# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
406# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
407# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
408CONFIG_MTD_CFI_I1=y
409CONFIG_MTD_CFI_I2=y
410# CONFIG_MTD_CFI_I4 is not set
411# CONFIG_MTD_CFI_I8 is not set
412# CONFIG_MTD_CFI_INTELEXT is not set
413CONFIG_MTD_CFI_AMDSTD=y
414# CONFIG_MTD_CFI_STAA is not set
415CONFIG_MTD_CFI_UTIL=y
416# CONFIG_MTD_RAM is not set
417# CONFIG_MTD_ROM is not set
418# CONFIG_MTD_ABSENT is not set
419# CONFIG_MTD_OBSOLETE_CHIPS is not set
420
421#
422# Mapping drivers for chip access
423#
424# CONFIG_MTD_COMPLEX_MAPPINGS is not set
425CONFIG_MTD_PHYSMAP=y
426CONFIG_MTD_PHYSMAP_START=0x0
427CONFIG_MTD_PHYSMAP_LEN=0x0
428CONFIG_MTD_PHYSMAP_BANKWIDTH=0
429# CONFIG_MTD_PLATRAM is not set
430
431#
432# Self-contained MTD device drivers
433#
434# CONFIG_MTD_PMC551 is not set
435# CONFIG_MTD_SLRAM is not set
436# CONFIG_MTD_PHRAM is not set
437# CONFIG_MTD_MTDRAM is not set
438# CONFIG_MTD_BLOCK2MTD is not set
439
440#
441# Disk-On-Chip Device Drivers
442#
443# CONFIG_MTD_DOC2000 is not set
444# CONFIG_MTD_DOC2001 is not set
445# CONFIG_MTD_DOC2001PLUS is not set
446
447#
448# NAND Flash Device Drivers
449#
450# CONFIG_MTD_NAND is not set
451
452#
453# OneNAND Flash Device Drivers
454#
455# CONFIG_MTD_ONENAND is not set
352 456
353# 457#
354# Parallel port support 458# Parallel port support
@@ -358,6 +462,7 @@ CONFIG_PROC_EVENTS=y
358# 462#
359# Plug and Play support 463# Plug and Play support
360# 464#
465# CONFIG_PNPACPI is not set
361 466
362# 467#
363# Block devices 468# Block devices
@@ -379,9 +484,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
379CONFIG_ATA_OVER_ETH=y 484CONFIG_ATA_OVER_ETH=y
380 485
381# 486#
487# Misc devices
488#
489CONFIG_SGI_IOC4=y
490# CONFIG_TIFM_CORE is not set
491
492#
382# ATA/ATAPI/MFM/RLL support 493# ATA/ATAPI/MFM/RLL support
383# 494#
384CONFIG_IDE=y 495CONFIG_IDE=y
496CONFIG_IDE_MAX_HWIFS=4
385CONFIG_BLK_DEV_IDE=y 497CONFIG_BLK_DEV_IDE=y
386 498
387# 499#
@@ -417,8 +529,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
417# CONFIG_BLK_DEV_CS5530 is not set 529# CONFIG_BLK_DEV_CS5530 is not set
418# CONFIG_BLK_DEV_HPT34X is not set 530# CONFIG_BLK_DEV_HPT34X is not set
419# CONFIG_BLK_DEV_HPT366 is not set 531# CONFIG_BLK_DEV_HPT366 is not set
532# CONFIG_BLK_DEV_JMICRON is not set
420# CONFIG_BLK_DEV_SC1200 is not set 533# CONFIG_BLK_DEV_SC1200 is not set
421# CONFIG_BLK_DEV_PIIX is not set 534# CONFIG_BLK_DEV_PIIX is not set
535CONFIG_BLK_DEV_IT8213=y
422# CONFIG_BLK_DEV_IT821X is not set 536# CONFIG_BLK_DEV_IT821X is not set
423# CONFIG_BLK_DEV_NS87415 is not set 537# CONFIG_BLK_DEV_NS87415 is not set
424# CONFIG_BLK_DEV_PDC202XX_OLD is not set 538# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -428,6 +542,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
428# CONFIG_BLK_DEV_SLC90E66 is not set 542# CONFIG_BLK_DEV_SLC90E66 is not set
429# CONFIG_BLK_DEV_TRM290 is not set 543# CONFIG_BLK_DEV_TRM290 is not set
430CONFIG_BLK_DEV_VIA82CXXX=y 544CONFIG_BLK_DEV_VIA82CXXX=y
545CONFIG_BLK_DEV_TC86C001=y
431# CONFIG_IDE_ARM is not set 546# CONFIG_IDE_ARM is not set
432CONFIG_BLK_DEV_IDEDMA=y 547CONFIG_BLK_DEV_IDEDMA=y
433# CONFIG_IDEDMA_IVB is not set 548# CONFIG_IDEDMA_IVB is not set
@@ -439,6 +554,12 @@ CONFIG_BLK_DEV_IDEDMA=y
439# 554#
440CONFIG_RAID_ATTRS=y 555CONFIG_RAID_ATTRS=y
441# CONFIG_SCSI is not set 556# CONFIG_SCSI is not set
557# CONFIG_SCSI_NETLINK is not set
558
559#
560# Serial ATA (prod) and Parallel ATA (experimental) drivers
561#
562# CONFIG_ATA is not set
442 563
443# 564#
444# Multi-device support (RAID and LVM) 565# Multi-device support (RAID and LVM)
@@ -489,6 +610,8 @@ CONFIG_LXT_PHY=y
489CONFIG_CICADA_PHY=y 610CONFIG_CICADA_PHY=y
490CONFIG_VITESSE_PHY=y 611CONFIG_VITESSE_PHY=y
491CONFIG_SMSC_PHY=y 612CONFIG_SMSC_PHY=y
613# CONFIG_BROADCOM_PHY is not set
614# CONFIG_FIXED_PHY is not set
492 615
493# 616#
494# Ethernet (10 or 100Mbit) 617# Ethernet (10 or 100Mbit)
@@ -533,14 +656,18 @@ CONFIG_TULIP=y
533# CONFIG_SK98LIN is not set 656# CONFIG_SK98LIN is not set
534# CONFIG_TIGON3 is not set 657# CONFIG_TIGON3 is not set
535# CONFIG_BNX2 is not set 658# CONFIG_BNX2 is not set
659CONFIG_QLA3XXX=y
660# CONFIG_ATL1 is not set
536 661
537# 662#
538# Ethernet (10000 Mbit) 663# Ethernet (10000 Mbit)
539# 664#
540# CONFIG_CHELSIO_T1 is not set 665# CONFIG_CHELSIO_T1 is not set
666CONFIG_CHELSIO_T3=y
541# CONFIG_IXGB is not set 667# CONFIG_IXGB is not set
542# CONFIG_S2IO is not set 668# CONFIG_S2IO is not set
543# CONFIG_MYRI10GE is not set 669# CONFIG_MYRI10GE is not set
670CONFIG_NETXEN_NIC=y
544 671
545# 672#
546# Token Ring devices 673# Token Ring devices
@@ -579,6 +706,7 @@ CONFIG_TULIP=y
579# Input device support 706# Input device support
580# 707#
581CONFIG_INPUT=y 708CONFIG_INPUT=y
709# CONFIG_INPUT_FF_MEMLESS is not set
582 710
583# 711#
584# Userland interfaces 712# Userland interfaces
@@ -656,10 +784,6 @@ CONFIG_COBALT_LCD=y
656# CONFIG_DTLK is not set 784# CONFIG_DTLK is not set
657# CONFIG_R3964 is not set 785# CONFIG_R3964 is not set
658# CONFIG_APPLICOM is not set 786# CONFIG_APPLICOM is not set
659
660#
661# Ftape, the floppy tape device driver
662#
663# CONFIG_DRM is not set 787# CONFIG_DRM is not set
664# CONFIG_RAW_DRIVER is not set 788# CONFIG_RAW_DRIVER is not set
665 789
@@ -667,7 +791,6 @@ CONFIG_COBALT_LCD=y
667# TPM devices 791# TPM devices
668# 792#
669# CONFIG_TCG_TPM is not set 793# CONFIG_TCG_TPM is not set
670# CONFIG_TELCLOCK is not set
671 794
672# 795#
673# I2C support 796# I2C support
@@ -692,14 +815,9 @@ CONFIG_COBALT_LCD=y
692# CONFIG_HWMON_VID is not set 815# CONFIG_HWMON_VID is not set
693 816
694# 817#
695# Misc devices
696#
697
698#
699# Multimedia devices 818# Multimedia devices
700# 819#
701# CONFIG_VIDEO_DEV is not set 820# CONFIG_VIDEO_DEV is not set
702CONFIG_VIDEO_V4L2=y
703 821
704# 822#
705# Digital Video Broadcasting Devices 823# Digital Video Broadcasting Devices
@@ -717,6 +835,7 @@ CONFIG_VIDEO_V4L2=y
717# 835#
718# CONFIG_VGA_CONSOLE is not set 836# CONFIG_VGA_CONSOLE is not set
719CONFIG_DUMMY_CONSOLE=y 837CONFIG_DUMMY_CONSOLE=y
838# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
720 839
721# 840#
722# Sound 841# Sound
@@ -724,6 +843,11 @@ CONFIG_DUMMY_CONSOLE=y
724# CONFIG_SOUND is not set 843# CONFIG_SOUND is not set
725 844
726# 845#
846# HID Devices
847#
848# CONFIG_HID is not set
849
850#
727# USB support 851# USB support
728# 852#
729CONFIG_USB_ARCH_HAS_HCD=y 853CONFIG_USB_ARCH_HAS_HCD=y
@@ -786,6 +910,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
786# 910#
787 911
788# 912#
913# Auxiliary Display support
914#
915
916#
917# Virtualization
918#
919
920#
789# File systems 921# File systems
790# 922#
791CONFIG_EXT2_FS=y 923CONFIG_EXT2_FS=y
@@ -794,11 +926,13 @@ CONFIG_EXT2_FS_POSIX_ACL=y
794CONFIG_EXT2_FS_SECURITY=y 926CONFIG_EXT2_FS_SECURITY=y
795# CONFIG_EXT2_FS_XIP is not set 927# CONFIG_EXT2_FS_XIP is not set
796# CONFIG_EXT3_FS is not set 928# CONFIG_EXT3_FS is not set
929# CONFIG_EXT4DEV_FS is not set
797CONFIG_FS_MBCACHE=y 930CONFIG_FS_MBCACHE=y
798# CONFIG_REISERFS_FS is not set 931# CONFIG_REISERFS_FS is not set
799# CONFIG_JFS_FS is not set 932# CONFIG_JFS_FS is not set
800CONFIG_FS_POSIX_ACL=y 933CONFIG_FS_POSIX_ACL=y
801# CONFIG_XFS_FS is not set 934# CONFIG_XFS_FS is not set
935# CONFIG_GFS2_FS is not set
802# CONFIG_OCFS2_FS is not set 936# CONFIG_OCFS2_FS is not set
803# CONFIG_MINIX_FS is not set 937# CONFIG_MINIX_FS is not set
804# CONFIG_ROMFS_FS is not set 938# CONFIG_ROMFS_FS is not set
@@ -809,6 +943,7 @@ CONFIG_DNOTIFY=y
809# CONFIG_AUTOFS_FS is not set 943# CONFIG_AUTOFS_FS is not set
810# CONFIG_AUTOFS4_FS is not set 944# CONFIG_AUTOFS4_FS is not set
811CONFIG_FUSE_FS=y 945CONFIG_FUSE_FS=y
946CONFIG_GENERIC_ACL=y
812 947
813# 948#
814# CD-ROM/DVD Filesystems 949# CD-ROM/DVD Filesystems
@@ -828,22 +963,26 @@ CONFIG_FUSE_FS=y
828# 963#
829CONFIG_PROC_FS=y 964CONFIG_PROC_FS=y
830CONFIG_PROC_KCORE=y 965CONFIG_PROC_KCORE=y
966CONFIG_PROC_SYSCTL=y
831CONFIG_SYSFS=y 967CONFIG_SYSFS=y
832CONFIG_TMPFS=y 968CONFIG_TMPFS=y
969CONFIG_TMPFS_POSIX_ACL=y
833# CONFIG_HUGETLB_PAGE is not set 970# CONFIG_HUGETLB_PAGE is not set
834CONFIG_RAMFS=y 971CONFIG_RAMFS=y
835# CONFIG_CONFIGFS_FS is not set 972CONFIG_CONFIGFS_FS=y
836 973
837# 974#
838# Miscellaneous filesystems 975# Miscellaneous filesystems
839# 976#
840# CONFIG_ADFS_FS is not set 977# CONFIG_ADFS_FS is not set
841# CONFIG_AFFS_FS is not set 978# CONFIG_AFFS_FS is not set
979# CONFIG_ECRYPT_FS is not set
842# CONFIG_HFS_FS is not set 980# CONFIG_HFS_FS is not set
843# CONFIG_HFSPLUS_FS is not set 981# CONFIG_HFSPLUS_FS is not set
844# CONFIG_BEFS_FS is not set 982# CONFIG_BEFS_FS is not set
845# CONFIG_BFS_FS is not set 983# CONFIG_BFS_FS is not set
846# CONFIG_EFS_FS is not set 984# CONFIG_EFS_FS is not set
985# CONFIG_JFFS2_FS is not set
847# CONFIG_CRAMFS is not set 986# CONFIG_CRAMFS is not set
848# CONFIG_VXFS_FS is not set 987# CONFIG_VXFS_FS is not set
849# CONFIG_HPFS_FS is not set 988# CONFIG_HPFS_FS is not set
@@ -866,7 +1005,6 @@ CONFIG_SUNRPC=y
866# CONFIG_RPCSEC_GSS_SPKM3 is not set 1005# CONFIG_RPCSEC_GSS_SPKM3 is not set
867# CONFIG_SMB_FS is not set 1006# CONFIG_SMB_FS is not set
868# CONFIG_CIFS is not set 1007# CONFIG_CIFS is not set
869# CONFIG_CIFS_DEBUG2 is not set
870# CONFIG_NCP_FS is not set 1008# CONFIG_NCP_FS is not set
871# CONFIG_CODA_FS is not set 1009# CONFIG_CODA_FS is not set
872# CONFIG_AFS_FS is not set 1010# CONFIG_AFS_FS is not set
@@ -884,6 +1022,14 @@ CONFIG_MSDOS_PARTITION=y
884# CONFIG_NLS is not set 1022# CONFIG_NLS is not set
885 1023
886# 1024#
1025# Distributed Lock Manager
1026#
1027CONFIG_DLM=y
1028CONFIG_DLM_TCP=y
1029# CONFIG_DLM_SCTP is not set
1030# CONFIG_DLM_DEBUG is not set
1031
1032#
887# Profiling support 1033# Profiling support
888# 1034#
889# CONFIG_PROFILING is not set 1035# CONFIG_PROFILING is not set
@@ -893,12 +1039,13 @@ CONFIG_MSDOS_PARTITION=y
893# 1039#
894CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1040CONFIG_TRACE_IRQFLAGS_SUPPORT=y
895# CONFIG_PRINTK_TIME is not set 1041# CONFIG_PRINTK_TIME is not set
1042CONFIG_ENABLE_MUST_CHECK=y
896# CONFIG_MAGIC_SYSRQ is not set 1043# CONFIG_MAGIC_SYSRQ is not set
897# CONFIG_UNUSED_SYMBOLS is not set 1044# CONFIG_UNUSED_SYMBOLS is not set
1045# CONFIG_DEBUG_FS is not set
1046# CONFIG_HEADERS_CHECK is not set
898# CONFIG_DEBUG_KERNEL is not set 1047# CONFIG_DEBUG_KERNEL is not set
899CONFIG_LOG_BUF_SHIFT=14 1048CONFIG_LOG_BUF_SHIFT=14
900# CONFIG_DEBUG_FS is not set
901# CONFIG_UNWIND_INFO is not set
902CONFIG_CROSSCOMPILE=y 1049CONFIG_CROSSCOMPILE=y
903CONFIG_CMDLINE="" 1050CONFIG_CMDLINE=""
904 1051
@@ -913,7 +1060,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
913# Cryptographic options 1060# Cryptographic options
914# 1061#
915CONFIG_CRYPTO=y 1062CONFIG_CRYPTO=y
1063CONFIG_CRYPTO_ALGAPI=y
1064CONFIG_CRYPTO_BLKCIPHER=y
1065CONFIG_CRYPTO_HASH=y
1066CONFIG_CRYPTO_MANAGER=y
916CONFIG_CRYPTO_HMAC=y 1067CONFIG_CRYPTO_HMAC=y
1068CONFIG_CRYPTO_XCBC=y
917CONFIG_CRYPTO_NULL=y 1069CONFIG_CRYPTO_NULL=y
918CONFIG_CRYPTO_MD4=y 1070CONFIG_CRYPTO_MD4=y
919CONFIG_CRYPTO_MD5=y 1071CONFIG_CRYPTO_MD5=y
@@ -922,9 +1074,16 @@ CONFIG_CRYPTO_SHA256=y
922CONFIG_CRYPTO_SHA512=y 1074CONFIG_CRYPTO_SHA512=y
923CONFIG_CRYPTO_WP512=y 1075CONFIG_CRYPTO_WP512=y
924CONFIG_CRYPTO_TGR192=y 1076CONFIG_CRYPTO_TGR192=y
1077CONFIG_CRYPTO_GF128MUL=y
1078CONFIG_CRYPTO_ECB=y
1079CONFIG_CRYPTO_CBC=y
1080CONFIG_CRYPTO_PCBC=y
1081CONFIG_CRYPTO_LRW=y
925CONFIG_CRYPTO_DES=y 1082CONFIG_CRYPTO_DES=y
1083CONFIG_CRYPTO_FCRYPT=y
926CONFIG_CRYPTO_BLOWFISH=y 1084CONFIG_CRYPTO_BLOWFISH=y
927CONFIG_CRYPTO_TWOFISH=y 1085CONFIG_CRYPTO_TWOFISH=y
1086CONFIG_CRYPTO_TWOFISH_COMMON=y
928CONFIG_CRYPTO_SERPENT=y 1087CONFIG_CRYPTO_SERPENT=y
929CONFIG_CRYPTO_AES=y 1088CONFIG_CRYPTO_AES=y
930CONFIG_CRYPTO_CAST5=y 1089CONFIG_CRYPTO_CAST5=y
@@ -936,6 +1095,7 @@ CONFIG_CRYPTO_ANUBIS=y
936CONFIG_CRYPTO_DEFLATE=y 1095CONFIG_CRYPTO_DEFLATE=y
937CONFIG_CRYPTO_MICHAEL_MIC=y 1096CONFIG_CRYPTO_MICHAEL_MIC=y
938CONFIG_CRYPTO_CRC32C=y 1097CONFIG_CRYPTO_CRC32C=y
1098CONFIG_CRYPTO_CAMELLIA=y
939 1099
940# 1100#
941# Hardware crypto devices 1101# Hardware crypto devices
@@ -944,6 +1104,7 @@ CONFIG_CRYPTO_CRC32C=y
944# 1104#
945# Library routines 1105# Library routines
946# 1106#
1107CONFIG_BITREVERSE=y
947# CONFIG_CRC_CCITT is not set 1108# CONFIG_CRC_CCITT is not set
948CONFIG_CRC16=y 1109CONFIG_CRC16=y
949CONFIG_CRC32=y 1110CONFIG_CRC32=y
@@ -951,3 +1112,5 @@ CONFIG_LIBCRC32C=y
951CONFIG_ZLIB_INFLATE=y 1112CONFIG_ZLIB_INFLATE=y
952CONFIG_ZLIB_DEFLATE=y 1113CONFIG_ZLIB_DEFLATE=y
953CONFIG_PLIST=y 1114CONFIG_PLIST=y
1115CONFIG_HAS_IOMEM=y
1116CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 1a57b3375483..0db6a8b37301 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:33 2006 4# Tue Feb 20 21:47:24 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1000=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_DB1000=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +63,19 @@ CONFIG_MIPS_DB1000=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 77CONFIG_CPU_LITTLE_ENDIAN=y
78CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 79CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1000=y 80CONFIG_SOC_AU1000=y
77CONFIG_SOC_AU1X00=y 81CONFIG_SOC_AU1X00=y
@@ -116,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 120# CONFIG_PAGE_SIZE_64KB is not set
117CONFIG_CPU_HAS_PREFETCH=y 121CONFIG_CPU_HAS_PREFETCH=y
118CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_64BIT_PHYS_ADDR=y 126CONFIG_64BIT_PHYS_ADDR=y
123CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
@@ -135,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -147,6 +152,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,15 +171,20 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 172CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 178# CONFIG_TASKSTATS is not set
179# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
172# CONFIG_IKCONFIG is not set 181# CONFIG_IKCONFIG is not set
182CONFIG_SYSFS_DEPRECATED=y
173CONFIG_RELAY=y 183CONFIG_RELAY=y
174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y
176CONFIG_EMBEDDED=y 186CONFIG_EMBEDDED=y
187CONFIG_SYSCTL_SYSCALL=y
177CONFIG_KALLSYMS=y 188CONFIG_KALLSYMS=y
178# CONFIG_KALLSYMS_EXTRA_PASS is not set 189# CONFIG_KALLSYMS_EXTRA_PASS is not set
179CONFIG_HOTPLUG=y 190CONFIG_HOTPLUG=y
@@ -181,12 +192,12 @@ CONFIG_PRINTK=y
181CONFIG_BUG=y 192CONFIG_BUG=y
182CONFIG_ELF_CORE=y 193CONFIG_ELF_CORE=y
183CONFIG_BASE_FULL=y 194CONFIG_BASE_FULL=y
184CONFIG_RT_MUTEXES=y
185CONFIG_FUTEX=y 195CONFIG_FUTEX=y
186CONFIG_EPOLL=y 196CONFIG_EPOLL=y
187CONFIG_SHMEM=y 197CONFIG_SHMEM=y
188CONFIG_SLAB=y 198CONFIG_SLAB=y
189CONFIG_VM_EVENT_COUNTERS=y 199CONFIG_VM_EVENT_COUNTERS=y
200CONFIG_RT_MUTEXES=y
190# CONFIG_TINY_SHMEM is not set 201# CONFIG_TINY_SHMEM is not set
191CONFIG_BASE_SMALL=0 202CONFIG_BASE_SMALL=0
192# CONFIG_SLOB is not set 203# CONFIG_SLOB is not set
@@ -204,6 +215,7 @@ CONFIG_KMOD=y
204# 215#
205# Block layer 216# Block layer
206# 217#
218CONFIG_BLOCK=y
207# CONFIG_LBD is not set 219# CONFIG_LBD is not set
208# CONFIG_BLK_DEV_IO_TRACE is not set 220# CONFIG_BLK_DEV_IO_TRACE is not set
209# CONFIG_LSF is not set 221# CONFIG_LSF is not set
@@ -252,6 +264,10 @@ CONFIG_PCMCIA_IOCTL=y
252CONFIG_BINFMT_ELF=y 264CONFIG_BINFMT_ELF=y
253# CONFIG_BINFMT_MISC is not set 265# CONFIG_BINFMT_MISC is not set
254CONFIG_TRAD_SIGNALS=y 266CONFIG_TRAD_SIGNALS=y
267
268#
269# Power management options
270#
255# CONFIG_PM is not set 271# CONFIG_PM is not set
256 272
257# 273#
@@ -268,7 +284,10 @@ CONFIG_PACKET=y
268CONFIG_UNIX=y 284CONFIG_UNIX=y
269CONFIG_XFRM=y 285CONFIG_XFRM=y
270CONFIG_XFRM_USER=m 286CONFIG_XFRM_USER=m
287# CONFIG_XFRM_SUB_POLICY is not set
288CONFIG_XFRM_MIGRATE=y
271CONFIG_NET_KEY=y 289CONFIG_NET_KEY=y
290CONFIG_NET_KEY_MIGRATE=y
272CONFIG_INET=y 291CONFIG_INET=y
273CONFIG_IP_MULTICAST=y 292CONFIG_IP_MULTICAST=y
274# CONFIG_IP_ADVANCED_ROUTER is not set 293# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -289,10 +308,13 @@ CONFIG_IP_PNP_BOOTP=y
289# CONFIG_INET_TUNNEL is not set 308# CONFIG_INET_TUNNEL is not set
290CONFIG_INET_XFRM_MODE_TRANSPORT=m 309CONFIG_INET_XFRM_MODE_TRANSPORT=m
291CONFIG_INET_XFRM_MODE_TUNNEL=m 310CONFIG_INET_XFRM_MODE_TUNNEL=m
311CONFIG_INET_XFRM_MODE_BEET=m
292CONFIG_INET_DIAG=y 312CONFIG_INET_DIAG=y
293CONFIG_INET_TCP_DIAG=y 313CONFIG_INET_TCP_DIAG=y
294# CONFIG_TCP_CONG_ADVANCED is not set 314# CONFIG_TCP_CONG_ADVANCED is not set
295CONFIG_TCP_CONG_BIC=y 315CONFIG_TCP_CONG_CUBIC=y
316CONFIG_DEFAULT_TCP_CONG="cubic"
317CONFIG_TCP_MD5SIG=y
296 318
297# 319#
298# IP: Virtual Server Configuration 320# IP: Virtual Server Configuration
@@ -311,15 +333,42 @@ CONFIG_NETFILTER=y
311CONFIG_NETFILTER_NETLINK=m 333CONFIG_NETFILTER_NETLINK=m
312CONFIG_NETFILTER_NETLINK_QUEUE=m 334CONFIG_NETFILTER_NETLINK_QUEUE=m
313CONFIG_NETFILTER_NETLINK_LOG=m 335CONFIG_NETFILTER_NETLINK_LOG=m
314# CONFIG_NF_CONNTRACK is not set 336CONFIG_NF_CONNTRACK_ENABLED=m
337CONFIG_NF_CONNTRACK_SUPPORT=y
338# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
339CONFIG_NF_CONNTRACK=m
340CONFIG_NF_CT_ACCT=y
341CONFIG_NF_CONNTRACK_MARK=y
342CONFIG_NF_CONNTRACK_SECMARK=y
343CONFIG_NF_CONNTRACK_EVENTS=y
344CONFIG_NF_CT_PROTO_GRE=m
345CONFIG_NF_CT_PROTO_SCTP=m
346CONFIG_NF_CONNTRACK_AMANDA=m
347CONFIG_NF_CONNTRACK_FTP=m
348CONFIG_NF_CONNTRACK_H323=m
349CONFIG_NF_CONNTRACK_IRC=m
350# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
351CONFIG_NF_CONNTRACK_PPTP=m
352CONFIG_NF_CONNTRACK_SANE=m
353CONFIG_NF_CONNTRACK_SIP=m
354CONFIG_NF_CONNTRACK_TFTP=m
355CONFIG_NF_CT_NETLINK=m
315CONFIG_NETFILTER_XTABLES=m 356CONFIG_NETFILTER_XTABLES=m
316CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 357CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
317CONFIG_NETFILTER_XT_TARGET_MARK=m 358CONFIG_NETFILTER_XT_TARGET_MARK=m
318CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 359CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
360CONFIG_NETFILTER_XT_TARGET_NFLOG=m
319CONFIG_NETFILTER_XT_TARGET_SECMARK=m 361CONFIG_NETFILTER_XT_TARGET_SECMARK=m
362CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
363CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
320CONFIG_NETFILTER_XT_MATCH_COMMENT=m 364CONFIG_NETFILTER_XT_MATCH_COMMENT=m
365CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
366CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
367CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
321CONFIG_NETFILTER_XT_MATCH_DCCP=m 368CONFIG_NETFILTER_XT_MATCH_DCCP=m
369CONFIG_NETFILTER_XT_MATCH_DSCP=m
322CONFIG_NETFILTER_XT_MATCH_ESP=m 370CONFIG_NETFILTER_XT_MATCH_ESP=m
371CONFIG_NETFILTER_XT_MATCH_HELPER=m
323CONFIG_NETFILTER_XT_MATCH_LENGTH=m 372CONFIG_NETFILTER_XT_MATCH_LENGTH=m
324CONFIG_NETFILTER_XT_MATCH_LIMIT=m 373CONFIG_NETFILTER_XT_MATCH_LIMIT=m
325CONFIG_NETFILTER_XT_MATCH_MAC=m 374CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -330,14 +379,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
330CONFIG_NETFILTER_XT_MATCH_QUOTA=m 379CONFIG_NETFILTER_XT_MATCH_QUOTA=m
331CONFIG_NETFILTER_XT_MATCH_REALM=m 380CONFIG_NETFILTER_XT_MATCH_REALM=m
332CONFIG_NETFILTER_XT_MATCH_SCTP=m 381CONFIG_NETFILTER_XT_MATCH_SCTP=m
382CONFIG_NETFILTER_XT_MATCH_STATE=m
333CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 383CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
334CONFIG_NETFILTER_XT_MATCH_STRING=m 384CONFIG_NETFILTER_XT_MATCH_STRING=m
335CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 385CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
386CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
336 387
337# 388#
338# IP: Netfilter Configuration 389# IP: Netfilter Configuration
339# 390#
340# CONFIG_IP_NF_CONNTRACK is not set 391CONFIG_NF_CONNTRACK_IPV4=m
392CONFIG_NF_CONNTRACK_PROC_COMPAT=y
341# CONFIG_IP_NF_QUEUE is not set 393# CONFIG_IP_NF_QUEUE is not set
342# CONFIG_IP_NF_IPTABLES is not set 394# CONFIG_IP_NF_IPTABLES is not set
343# CONFIG_IP_NF_ARPTABLES is not set 395# CONFIG_IP_NF_ARPTABLES is not set
@@ -365,7 +417,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
365# CONFIG_ATALK is not set 417# CONFIG_ATALK is not set
366# CONFIG_X25 is not set 418# CONFIG_X25 is not set
367# CONFIG_LAPB is not set 419# CONFIG_LAPB is not set
368# CONFIG_NET_DIVERT is not set
369# CONFIG_ECONET is not set 420# CONFIG_ECONET is not set
370# CONFIG_WAN_ROUTER is not set 421# CONFIG_WAN_ROUTER is not set
371 422
@@ -421,11 +472,13 @@ CONFIG_MTD_PARTITIONS=y
421# User Modules And Translation Layers 472# User Modules And Translation Layers
422# 473#
423CONFIG_MTD_CHAR=y 474CONFIG_MTD_CHAR=y
475CONFIG_MTD_BLKDEVS=y
424CONFIG_MTD_BLOCK=y 476CONFIG_MTD_BLOCK=y
425# CONFIG_FTL is not set 477# CONFIG_FTL is not set
426# CONFIG_NFTL is not set 478# CONFIG_NFTL is not set
427# CONFIG_INFTL is not set 479# CONFIG_INFTL is not set
428# CONFIG_RFD_FTL is not set 480# CONFIG_RFD_FTL is not set
481# CONFIG_SSFDC is not set
429 482
430# 483#
431# RAM/ROM/Flash chip drivers 484# RAM/ROM/Flash chip drivers
@@ -494,6 +547,7 @@ CONFIG_MTD_ALCHEMY=y
494# 547#
495# Plug and Play support 548# Plug and Play support
496# 549#
550# CONFIG_PNPACPI is not set
497 551
498# 552#
499# Block devices 553# Block devices
@@ -510,6 +564,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
510CONFIG_ATA_OVER_ETH=m 564CONFIG_ATA_OVER_ETH=m
511 565
512# 566#
567# Misc devices
568#
569
570#
513# ATA/ATAPI/MFM/RLL support 571# ATA/ATAPI/MFM/RLL support
514# 572#
515# CONFIG_IDE is not set 573# CONFIG_IDE is not set
@@ -519,6 +577,12 @@ CONFIG_ATA_OVER_ETH=m
519# 577#
520CONFIG_RAID_ATTRS=m 578CONFIG_RAID_ATTRS=m
521# CONFIG_SCSI is not set 579# CONFIG_SCSI is not set
580# CONFIG_SCSI_NETLINK is not set
581
582#
583# Serial ATA (prod) and Parallel ATA (experimental) drivers
584#
585# CONFIG_ATA is not set
522 586
523# 587#
524# Multi-device support (RAID and LVM) 588# Multi-device support (RAID and LVM)
@@ -562,6 +626,8 @@ CONFIG_LXT_PHY=m
562CONFIG_CICADA_PHY=m 626CONFIG_CICADA_PHY=m
563CONFIG_VITESSE_PHY=m 627CONFIG_VITESSE_PHY=m
564CONFIG_SMSC_PHY=m 628CONFIG_SMSC_PHY=m
629# CONFIG_BROADCOM_PHY is not set
630# CONFIG_FIXED_PHY is not set
565 631
566# 632#
567# Ethernet (10 or 100Mbit) 633# Ethernet (10 or 100Mbit)
@@ -616,6 +682,7 @@ CONFIG_PPP_DEFLATE=m
616CONFIG_PPP_MPPE=m 682CONFIG_PPP_MPPE=m
617CONFIG_PPPOE=m 683CONFIG_PPPOE=m
618# CONFIG_SLIP is not set 684# CONFIG_SLIP is not set
685CONFIG_SLHC=m
619# CONFIG_SHAPER is not set 686# CONFIG_SHAPER is not set
620# CONFIG_NETCONSOLE is not set 687# CONFIG_NETCONSOLE is not set
621# CONFIG_NETPOLL is not set 688# CONFIG_NETPOLL is not set
@@ -635,6 +702,7 @@ CONFIG_PPPOE=m
635# Input device support 702# Input device support
636# 703#
637CONFIG_INPUT=y 704CONFIG_INPUT=y
705# CONFIG_INPUT_FF_MEMLESS is not set
638 706
639# 707#
640# Userland interfaces 708# Userland interfaces
@@ -714,10 +782,6 @@ CONFIG_LEGACY_PTY_COUNT=256
714# CONFIG_R3964 is not set 782# CONFIG_R3964 is not set
715 783
716# 784#
717# Ftape, the floppy tape device driver
718#
719
720#
721# PCMCIA character devices 785# PCMCIA character devices
722# 786#
723CONFIG_SYNCLINK_CS=m 787CONFIG_SYNCLINK_CS=m
@@ -729,7 +793,6 @@ CONFIG_SYNCLINK_CS=m
729# TPM devices 793# TPM devices
730# 794#
731# CONFIG_TCG_TPM is not set 795# CONFIG_TCG_TPM is not set
732# CONFIG_TELCLOCK is not set
733 796
734# 797#
735# I2C support 798# I2C support
@@ -754,14 +817,9 @@ CONFIG_SYNCLINK_CS=m
754# CONFIG_HWMON_VID is not set 817# CONFIG_HWMON_VID is not set
755 818
756# 819#
757# Misc devices
758#
759
760#
761# Multimedia devices 820# Multimedia devices
762# 821#
763# CONFIG_VIDEO_DEV is not set 822# CONFIG_VIDEO_DEV is not set
764CONFIG_VIDEO_V4L2=y
765 823
766# 824#
767# Digital Video Broadcasting Devices 825# Digital Video Broadcasting Devices
@@ -779,6 +837,7 @@ CONFIG_VIDEO_V4L2=y
779# 837#
780# CONFIG_VGA_CONSOLE is not set 838# CONFIG_VGA_CONSOLE is not set
781CONFIG_DUMMY_CONSOLE=y 839CONFIG_DUMMY_CONSOLE=y
840# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
782 841
783# 842#
784# Sound 843# Sound
@@ -786,6 +845,11 @@ CONFIG_DUMMY_CONSOLE=y
786# CONFIG_SOUND is not set 845# CONFIG_SOUND is not set
787 846
788# 847#
848# HID Devices
849#
850# CONFIG_HID is not set
851
852#
789# USB support 853# USB support
790# 854#
791CONFIG_USB_ARCH_HAS_HCD=y 855CONFIG_USB_ARCH_HAS_HCD=y
@@ -847,6 +911,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y
847# 911#
848 912
849# 913#
914# Auxiliary Display support
915#
916
917#
918# Virtualization
919#
920
921#
850# File systems 922# File systems
851# 923#
852CONFIG_EXT2_FS=y 924CONFIG_EXT2_FS=y
@@ -858,6 +930,7 @@ CONFIG_EXT3_FS=y
858CONFIG_EXT3_FS_XATTR=y 930CONFIG_EXT3_FS_XATTR=y
859CONFIG_EXT3_FS_POSIX_ACL=y 931CONFIG_EXT3_FS_POSIX_ACL=y
860CONFIG_EXT3_FS_SECURITY=y 932CONFIG_EXT3_FS_SECURITY=y
933# CONFIG_EXT4DEV_FS is not set
861CONFIG_JBD=y 934CONFIG_JBD=y
862# CONFIG_JBD_DEBUG is not set 935# CONFIG_JBD_DEBUG is not set
863CONFIG_FS_MBCACHE=y 936CONFIG_FS_MBCACHE=y
@@ -870,6 +943,7 @@ CONFIG_REISERFS_FS_SECURITY=y
870# CONFIG_JFS_FS is not set 943# CONFIG_JFS_FS is not set
871CONFIG_FS_POSIX_ACL=y 944CONFIG_FS_POSIX_ACL=y
872# CONFIG_XFS_FS is not set 945# CONFIG_XFS_FS is not set
946# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 947# CONFIG_OCFS2_FS is not set
874# CONFIG_MINIX_FS is not set 948# CONFIG_MINIX_FS is not set
875# CONFIG_ROMFS_FS is not set 949# CONFIG_ROMFS_FS is not set
@@ -880,6 +954,7 @@ CONFIG_DNOTIFY=y
880CONFIG_AUTOFS_FS=m 954CONFIG_AUTOFS_FS=m
881CONFIG_AUTOFS4_FS=m 955CONFIG_AUTOFS4_FS=m
882CONFIG_FUSE_FS=m 956CONFIG_FUSE_FS=m
957CONFIG_GENERIC_ACL=y
883 958
884# 959#
885# CD-ROM/DVD Filesystems 960# CD-ROM/DVD Filesystems
@@ -899,23 +974,25 @@ CONFIG_FUSE_FS=m
899# 974#
900CONFIG_PROC_FS=y 975CONFIG_PROC_FS=y
901CONFIG_PROC_KCORE=y 976CONFIG_PROC_KCORE=y
977CONFIG_PROC_SYSCTL=y
902CONFIG_SYSFS=y 978CONFIG_SYSFS=y
903CONFIG_TMPFS=y 979CONFIG_TMPFS=y
980CONFIG_TMPFS_POSIX_ACL=y
904# CONFIG_HUGETLB_PAGE is not set 981# CONFIG_HUGETLB_PAGE is not set
905CONFIG_RAMFS=y 982CONFIG_RAMFS=y
906# CONFIG_CONFIGFS_FS is not set 983CONFIG_CONFIGFS_FS=m
907 984
908# 985#
909# Miscellaneous filesystems 986# Miscellaneous filesystems
910# 987#
911# CONFIG_ADFS_FS is not set 988# CONFIG_ADFS_FS is not set
912# CONFIG_AFFS_FS is not set 989# CONFIG_AFFS_FS is not set
990# CONFIG_ECRYPT_FS is not set
913# CONFIG_HFS_FS is not set 991# CONFIG_HFS_FS is not set
914# CONFIG_HFSPLUS_FS is not set 992# CONFIG_HFSPLUS_FS is not set
915# CONFIG_BEFS_FS is not set 993# CONFIG_BEFS_FS is not set
916# CONFIG_BFS_FS is not set 994# CONFIG_BFS_FS is not set
917# CONFIG_EFS_FS is not set 995# CONFIG_EFS_FS is not set
918# CONFIG_JFFS_FS is not set
919# CONFIG_JFFS2_FS is not set 996# CONFIG_JFFS2_FS is not set
920CONFIG_CRAMFS=m 997CONFIG_CRAMFS=m
921# CONFIG_VXFS_FS is not set 998# CONFIG_VXFS_FS is not set
@@ -944,7 +1021,6 @@ CONFIG_SUNRPC=y
944CONFIG_SMB_FS=m 1021CONFIG_SMB_FS=m
945# CONFIG_SMB_NLS_DEFAULT is not set 1022# CONFIG_SMB_NLS_DEFAULT is not set
946# CONFIG_CIFS is not set 1023# CONFIG_CIFS is not set
947# CONFIG_CIFS_DEBUG2 is not set
948# CONFIG_NCP_FS is not set 1024# CONFIG_NCP_FS is not set
949# CONFIG_CODA_FS is not set 1025# CONFIG_CODA_FS is not set
950# CONFIG_AFS_FS is not set 1026# CONFIG_AFS_FS is not set
@@ -1001,6 +1077,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1001# CONFIG_NLS_UTF8 is not set 1077# CONFIG_NLS_UTF8 is not set
1002 1078
1003# 1079#
1080# Distributed Lock Manager
1081#
1082CONFIG_DLM=m
1083CONFIG_DLM_TCP=y
1084# CONFIG_DLM_SCTP is not set
1085# CONFIG_DLM_DEBUG is not set
1086
1087#
1004# Profiling support 1088# Profiling support
1005# 1089#
1006# CONFIG_PROFILING is not set 1090# CONFIG_PROFILING is not set
@@ -1010,13 +1094,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1010# 1094#
1011CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1095CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1012# CONFIG_PRINTK_TIME is not set 1096# CONFIG_PRINTK_TIME is not set
1097CONFIG_ENABLE_MUST_CHECK=y
1013# CONFIG_MAGIC_SYSRQ is not set 1098# CONFIG_MAGIC_SYSRQ is not set
1014# CONFIG_UNUSED_SYMBOLS is not set 1099# CONFIG_UNUSED_SYMBOLS is not set
1100# CONFIG_DEBUG_FS is not set
1101# CONFIG_HEADERS_CHECK is not set
1015# CONFIG_DEBUG_KERNEL is not set 1102# CONFIG_DEBUG_KERNEL is not set
1016CONFIG_LOG_BUF_SHIFT=14 1103CONFIG_LOG_BUF_SHIFT=14
1017# CONFIG_DEBUG_FS is not set
1018CONFIG_CROSSCOMPILE=y 1104CONFIG_CROSSCOMPILE=y
1019CONFIG_CMDLINE="" 1105CONFIG_CMDLINE=""
1106CONFIG_SYS_SUPPORTS_KGDB=y
1020 1107
1021# 1108#
1022# Security options 1109# Security options
@@ -1029,18 +1116,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1029# Cryptographic options 1116# Cryptographic options
1030# 1117#
1031CONFIG_CRYPTO=y 1118CONFIG_CRYPTO=y
1119CONFIG_CRYPTO_ALGAPI=y
1120CONFIG_CRYPTO_BLKCIPHER=m
1121CONFIG_CRYPTO_HASH=y
1122CONFIG_CRYPTO_MANAGER=y
1032CONFIG_CRYPTO_HMAC=y 1123CONFIG_CRYPTO_HMAC=y
1124CONFIG_CRYPTO_XCBC=m
1033CONFIG_CRYPTO_NULL=m 1125CONFIG_CRYPTO_NULL=m
1034CONFIG_CRYPTO_MD4=m 1126CONFIG_CRYPTO_MD4=m
1035CONFIG_CRYPTO_MD5=m 1127CONFIG_CRYPTO_MD5=y
1036CONFIG_CRYPTO_SHA1=m 1128CONFIG_CRYPTO_SHA1=m
1037CONFIG_CRYPTO_SHA256=m 1129CONFIG_CRYPTO_SHA256=m
1038CONFIG_CRYPTO_SHA512=m 1130CONFIG_CRYPTO_SHA512=m
1039CONFIG_CRYPTO_WP512=m 1131CONFIG_CRYPTO_WP512=m
1040CONFIG_CRYPTO_TGR192=m 1132CONFIG_CRYPTO_TGR192=m
1133CONFIG_CRYPTO_GF128MUL=m
1134CONFIG_CRYPTO_ECB=m
1135CONFIG_CRYPTO_CBC=m
1136CONFIG_CRYPTO_PCBC=m
1137CONFIG_CRYPTO_LRW=m
1041CONFIG_CRYPTO_DES=m 1138CONFIG_CRYPTO_DES=m
1139CONFIG_CRYPTO_FCRYPT=m
1042CONFIG_CRYPTO_BLOWFISH=m 1140CONFIG_CRYPTO_BLOWFISH=m
1043CONFIG_CRYPTO_TWOFISH=m 1141CONFIG_CRYPTO_TWOFISH=m
1142CONFIG_CRYPTO_TWOFISH_COMMON=m
1044CONFIG_CRYPTO_SERPENT=m 1143CONFIG_CRYPTO_SERPENT=m
1045CONFIG_CRYPTO_AES=m 1144CONFIG_CRYPTO_AES=m
1046CONFIG_CRYPTO_CAST5=m 1145CONFIG_CRYPTO_CAST5=m
@@ -1052,6 +1151,7 @@ CONFIG_CRYPTO_ANUBIS=m
1052CONFIG_CRYPTO_DEFLATE=m 1151CONFIG_CRYPTO_DEFLATE=m
1053CONFIG_CRYPTO_MICHAEL_MIC=m 1152CONFIG_CRYPTO_MICHAEL_MIC=m
1054CONFIG_CRYPTO_CRC32C=m 1153CONFIG_CRYPTO_CRC32C=m
1154CONFIG_CRYPTO_CAMELLIA=m
1055# CONFIG_CRYPTO_TEST is not set 1155# CONFIG_CRYPTO_TEST is not set
1056 1156
1057# 1157#
@@ -1061,6 +1161,7 @@ CONFIG_CRYPTO_CRC32C=m
1061# 1161#
1062# Library routines 1162# Library routines
1063# 1163#
1164CONFIG_BITREVERSE=y
1064CONFIG_CRC_CCITT=m 1165CONFIG_CRC_CCITT=m
1065CONFIG_CRC16=m 1166CONFIG_CRC16=m
1066CONFIG_CRC32=y 1167CONFIG_CRC32=y
@@ -1072,3 +1173,5 @@ CONFIG_TEXTSEARCH_KMP=m
1072CONFIG_TEXTSEARCH_BM=m 1173CONFIG_TEXTSEARCH_BM=m
1073CONFIG_TEXTSEARCH_FSM=m 1174CONFIG_TEXTSEARCH_FSM=m
1074CONFIG_PLIST=y 1175CONFIG_PLIST=y
1176CONFIG_HAS_IOMEM=y
1177CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index 0055ec41f207..162add97c5ef 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:34 2006 4# Tue Feb 20 21:47:24 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1100=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_DB1100=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +63,19 @@ CONFIG_MIPS_DB1100=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 77CONFIG_CPU_LITTLE_ENDIAN=y
78CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 79CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1100=y 80CONFIG_SOC_AU1100=y
77CONFIG_SOC_AU1X00=y 81CONFIG_SOC_AU1X00=y
@@ -116,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 120# CONFIG_PAGE_SIZE_64KB is not set
117CONFIG_CPU_HAS_PREFETCH=y 121CONFIG_CPU_HAS_PREFETCH=y
118CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_64BIT_PHYS_ADDR=y 126CONFIG_64BIT_PHYS_ADDR=y
123CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
@@ -135,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -147,6 +152,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,15 +171,20 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 172CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 178# CONFIG_TASKSTATS is not set
179# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
172# CONFIG_IKCONFIG is not set 181# CONFIG_IKCONFIG is not set
182CONFIG_SYSFS_DEPRECATED=y
173CONFIG_RELAY=y 183CONFIG_RELAY=y
174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y
176CONFIG_EMBEDDED=y 186CONFIG_EMBEDDED=y
187CONFIG_SYSCTL_SYSCALL=y
177CONFIG_KALLSYMS=y 188CONFIG_KALLSYMS=y
178# CONFIG_KALLSYMS_EXTRA_PASS is not set 189# CONFIG_KALLSYMS_EXTRA_PASS is not set
179CONFIG_HOTPLUG=y 190CONFIG_HOTPLUG=y
@@ -181,12 +192,12 @@ CONFIG_PRINTK=y
181CONFIG_BUG=y 192CONFIG_BUG=y
182CONFIG_ELF_CORE=y 193CONFIG_ELF_CORE=y
183CONFIG_BASE_FULL=y 194CONFIG_BASE_FULL=y
184CONFIG_RT_MUTEXES=y
185CONFIG_FUTEX=y 195CONFIG_FUTEX=y
186CONFIG_EPOLL=y 196CONFIG_EPOLL=y
187CONFIG_SHMEM=y 197CONFIG_SHMEM=y
188CONFIG_SLAB=y 198CONFIG_SLAB=y
189CONFIG_VM_EVENT_COUNTERS=y 199CONFIG_VM_EVENT_COUNTERS=y
200CONFIG_RT_MUTEXES=y
190# CONFIG_TINY_SHMEM is not set 201# CONFIG_TINY_SHMEM is not set
191CONFIG_BASE_SMALL=0 202CONFIG_BASE_SMALL=0
192# CONFIG_SLOB is not set 203# CONFIG_SLOB is not set
@@ -204,6 +215,7 @@ CONFIG_KMOD=y
204# 215#
205# Block layer 216# Block layer
206# 217#
218CONFIG_BLOCK=y
207# CONFIG_LBD is not set 219# CONFIG_LBD is not set
208# CONFIG_BLK_DEV_IO_TRACE is not set 220# CONFIG_BLK_DEV_IO_TRACE is not set
209# CONFIG_LSF is not set 221# CONFIG_LSF is not set
@@ -241,6 +253,10 @@ CONFIG_MMU=y
241CONFIG_BINFMT_ELF=y 253CONFIG_BINFMT_ELF=y
242# CONFIG_BINFMT_MISC is not set 254# CONFIG_BINFMT_MISC is not set
243CONFIG_TRAD_SIGNALS=y 255CONFIG_TRAD_SIGNALS=y
256
257#
258# Power management options
259#
244# CONFIG_PM is not set 260# CONFIG_PM is not set
245 261
246# 262#
@@ -257,7 +273,10 @@ CONFIG_PACKET=y
257CONFIG_UNIX=y 273CONFIG_UNIX=y
258CONFIG_XFRM=y 274CONFIG_XFRM=y
259CONFIG_XFRM_USER=m 275CONFIG_XFRM_USER=m
276# CONFIG_XFRM_SUB_POLICY is not set
277CONFIG_XFRM_MIGRATE=y
260CONFIG_NET_KEY=y 278CONFIG_NET_KEY=y
279CONFIG_NET_KEY_MIGRATE=y
261CONFIG_INET=y 280CONFIG_INET=y
262CONFIG_IP_MULTICAST=y 281CONFIG_IP_MULTICAST=y
263# CONFIG_IP_ADVANCED_ROUTER is not set 282# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -278,10 +297,13 @@ CONFIG_IP_PNP_BOOTP=y
278# CONFIG_INET_TUNNEL is not set 297# CONFIG_INET_TUNNEL is not set
279CONFIG_INET_XFRM_MODE_TRANSPORT=m 298CONFIG_INET_XFRM_MODE_TRANSPORT=m
280CONFIG_INET_XFRM_MODE_TUNNEL=m 299CONFIG_INET_XFRM_MODE_TUNNEL=m
300CONFIG_INET_XFRM_MODE_BEET=m
281CONFIG_INET_DIAG=y 301CONFIG_INET_DIAG=y
282CONFIG_INET_TCP_DIAG=y 302CONFIG_INET_TCP_DIAG=y
283# CONFIG_TCP_CONG_ADVANCED is not set 303# CONFIG_TCP_CONG_ADVANCED is not set
284CONFIG_TCP_CONG_BIC=y 304CONFIG_TCP_CONG_CUBIC=y
305CONFIG_DEFAULT_TCP_CONG="cubic"
306CONFIG_TCP_MD5SIG=y
285 307
286# 308#
287# IP: Virtual Server Configuration 309# IP: Virtual Server Configuration
@@ -300,15 +322,42 @@ CONFIG_NETFILTER=y
300CONFIG_NETFILTER_NETLINK=m 322CONFIG_NETFILTER_NETLINK=m
301CONFIG_NETFILTER_NETLINK_QUEUE=m 323CONFIG_NETFILTER_NETLINK_QUEUE=m
302CONFIG_NETFILTER_NETLINK_LOG=m 324CONFIG_NETFILTER_NETLINK_LOG=m
303# CONFIG_NF_CONNTRACK is not set 325CONFIG_NF_CONNTRACK_ENABLED=m
326CONFIG_NF_CONNTRACK_SUPPORT=y
327# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
328CONFIG_NF_CONNTRACK=m
329CONFIG_NF_CT_ACCT=y
330CONFIG_NF_CONNTRACK_MARK=y
331CONFIG_NF_CONNTRACK_SECMARK=y
332CONFIG_NF_CONNTRACK_EVENTS=y
333CONFIG_NF_CT_PROTO_GRE=m
334CONFIG_NF_CT_PROTO_SCTP=m
335CONFIG_NF_CONNTRACK_AMANDA=m
336CONFIG_NF_CONNTRACK_FTP=m
337CONFIG_NF_CONNTRACK_H323=m
338CONFIG_NF_CONNTRACK_IRC=m
339# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
340CONFIG_NF_CONNTRACK_PPTP=m
341CONFIG_NF_CONNTRACK_SANE=m
342CONFIG_NF_CONNTRACK_SIP=m
343CONFIG_NF_CONNTRACK_TFTP=m
344CONFIG_NF_CT_NETLINK=m
304CONFIG_NETFILTER_XTABLES=m 345CONFIG_NETFILTER_XTABLES=m
305CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 346CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
306CONFIG_NETFILTER_XT_TARGET_MARK=m 347CONFIG_NETFILTER_XT_TARGET_MARK=m
307CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 348CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
349CONFIG_NETFILTER_XT_TARGET_NFLOG=m
308CONFIG_NETFILTER_XT_TARGET_SECMARK=m 350CONFIG_NETFILTER_XT_TARGET_SECMARK=m
351CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
352CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
309CONFIG_NETFILTER_XT_MATCH_COMMENT=m 353CONFIG_NETFILTER_XT_MATCH_COMMENT=m
354CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
355CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
356CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
310CONFIG_NETFILTER_XT_MATCH_DCCP=m 357CONFIG_NETFILTER_XT_MATCH_DCCP=m
358CONFIG_NETFILTER_XT_MATCH_DSCP=m
311CONFIG_NETFILTER_XT_MATCH_ESP=m 359CONFIG_NETFILTER_XT_MATCH_ESP=m
360CONFIG_NETFILTER_XT_MATCH_HELPER=m
312CONFIG_NETFILTER_XT_MATCH_LENGTH=m 361CONFIG_NETFILTER_XT_MATCH_LENGTH=m
313CONFIG_NETFILTER_XT_MATCH_LIMIT=m 362CONFIG_NETFILTER_XT_MATCH_LIMIT=m
314CONFIG_NETFILTER_XT_MATCH_MAC=m 363CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -319,14 +368,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
319CONFIG_NETFILTER_XT_MATCH_QUOTA=m 368CONFIG_NETFILTER_XT_MATCH_QUOTA=m
320CONFIG_NETFILTER_XT_MATCH_REALM=m 369CONFIG_NETFILTER_XT_MATCH_REALM=m
321CONFIG_NETFILTER_XT_MATCH_SCTP=m 370CONFIG_NETFILTER_XT_MATCH_SCTP=m
371CONFIG_NETFILTER_XT_MATCH_STATE=m
322CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 372CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
323CONFIG_NETFILTER_XT_MATCH_STRING=m 373CONFIG_NETFILTER_XT_MATCH_STRING=m
324CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 374CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
375CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
325 376
326# 377#
327# IP: Netfilter Configuration 378# IP: Netfilter Configuration
328# 379#
329# CONFIG_IP_NF_CONNTRACK is not set 380CONFIG_NF_CONNTRACK_IPV4=m
381CONFIG_NF_CONNTRACK_PROC_COMPAT=y
330# CONFIG_IP_NF_QUEUE is not set 382# CONFIG_IP_NF_QUEUE is not set
331# CONFIG_IP_NF_IPTABLES is not set 383# CONFIG_IP_NF_IPTABLES is not set
332# CONFIG_IP_NF_ARPTABLES is not set 384# CONFIG_IP_NF_ARPTABLES is not set
@@ -354,7 +406,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
354# CONFIG_ATALK is not set 406# CONFIG_ATALK is not set
355# CONFIG_X25 is not set 407# CONFIG_X25 is not set
356# CONFIG_LAPB is not set 408# CONFIG_LAPB is not set
357# CONFIG_NET_DIVERT is not set
358# CONFIG_ECONET is not set 409# CONFIG_ECONET is not set
359# CONFIG_WAN_ROUTER is not set 410# CONFIG_WAN_ROUTER is not set
360 411
@@ -410,11 +461,13 @@ CONFIG_MTD_PARTITIONS=y
410# User Modules And Translation Layers 461# User Modules And Translation Layers
411# 462#
412CONFIG_MTD_CHAR=y 463CONFIG_MTD_CHAR=y
464CONFIG_MTD_BLKDEVS=y
413CONFIG_MTD_BLOCK=y 465CONFIG_MTD_BLOCK=y
414# CONFIG_FTL is not set 466# CONFIG_FTL is not set
415# CONFIG_NFTL is not set 467# CONFIG_NFTL is not set
416# CONFIG_INFTL is not set 468# CONFIG_INFTL is not set
417# CONFIG_RFD_FTL is not set 469# CONFIG_RFD_FTL is not set
470# CONFIG_SSFDC is not set
418 471
419# 472#
420# RAM/ROM/Flash chip drivers 473# RAM/ROM/Flash chip drivers
@@ -483,6 +536,7 @@ CONFIG_MTD_ALCHEMY=y
483# 536#
484# Plug and Play support 537# Plug and Play support
485# 538#
539# CONFIG_PNPACPI is not set
486 540
487# 541#
488# Block devices 542# Block devices
@@ -499,6 +553,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
499CONFIG_ATA_OVER_ETH=m 553CONFIG_ATA_OVER_ETH=m
500 554
501# 555#
556# Misc devices
557#
558
559#
502# ATA/ATAPI/MFM/RLL support 560# ATA/ATAPI/MFM/RLL support
503# 561#
504# CONFIG_IDE is not set 562# CONFIG_IDE is not set
@@ -508,6 +566,12 @@ CONFIG_ATA_OVER_ETH=m
508# 566#
509CONFIG_RAID_ATTRS=m 567CONFIG_RAID_ATTRS=m
510# CONFIG_SCSI is not set 568# CONFIG_SCSI is not set
569# CONFIG_SCSI_NETLINK is not set
570
571#
572# Serial ATA (prod) and Parallel ATA (experimental) drivers
573#
574# CONFIG_ATA is not set
511 575
512# 576#
513# Multi-device support (RAID and LVM) 577# Multi-device support (RAID and LVM)
@@ -551,6 +615,8 @@ CONFIG_LXT_PHY=m
551CONFIG_CICADA_PHY=m 615CONFIG_CICADA_PHY=m
552CONFIG_VITESSE_PHY=m 616CONFIG_VITESSE_PHY=m
553CONFIG_SMSC_PHY=m 617CONFIG_SMSC_PHY=m
618# CONFIG_BROADCOM_PHY is not set
619# CONFIG_FIXED_PHY is not set
554 620
555# 621#
556# Ethernet (10 or 100Mbit) 622# Ethernet (10 or 100Mbit)
@@ -592,6 +658,7 @@ CONFIG_PPP_DEFLATE=m
592CONFIG_PPP_MPPE=m 658CONFIG_PPP_MPPE=m
593CONFIG_PPPOE=m 659CONFIG_PPPOE=m
594# CONFIG_SLIP is not set 660# CONFIG_SLIP is not set
661CONFIG_SLHC=m
595# CONFIG_SHAPER is not set 662# CONFIG_SHAPER is not set
596# CONFIG_NETCONSOLE is not set 663# CONFIG_NETCONSOLE is not set
597# CONFIG_NETPOLL is not set 664# CONFIG_NETPOLL is not set
@@ -611,6 +678,7 @@ CONFIG_PPPOE=m
611# Input device support 678# Input device support
612# 679#
613CONFIG_INPUT=y 680CONFIG_INPUT=y
681# CONFIG_INPUT_FF_MEMLESS is not set
614 682
615# 683#
616# Userland interfaces 684# Userland interfaces
@@ -687,17 +755,12 @@ CONFIG_LEGACY_PTY_COUNT=256
687# CONFIG_GEN_RTC is not set 755# CONFIG_GEN_RTC is not set
688# CONFIG_DTLK is not set 756# CONFIG_DTLK is not set
689# CONFIG_R3964 is not set 757# CONFIG_R3964 is not set
690
691#
692# Ftape, the floppy tape device driver
693#
694# CONFIG_RAW_DRIVER is not set 758# CONFIG_RAW_DRIVER is not set
695 759
696# 760#
697# TPM devices 761# TPM devices
698# 762#
699# CONFIG_TCG_TPM is not set 763# CONFIG_TCG_TPM is not set
700# CONFIG_TELCLOCK is not set
701 764
702# 765#
703# I2C support 766# I2C support
@@ -722,14 +785,9 @@ CONFIG_LEGACY_PTY_COUNT=256
722# CONFIG_HWMON_VID is not set 785# CONFIG_HWMON_VID is not set
723 786
724# 787#
725# Misc devices
726#
727
728#
729# Multimedia devices 788# Multimedia devices
730# 789#
731# CONFIG_VIDEO_DEV is not set 790# CONFIG_VIDEO_DEV is not set
732CONFIG_VIDEO_V4L2=y
733 791
734# 792#
735# Digital Video Broadcasting Devices 793# Digital Video Broadcasting Devices
@@ -744,6 +802,7 @@ CONFIG_FB=y
744CONFIG_FB_CFB_FILLRECT=y 802CONFIG_FB_CFB_FILLRECT=y
745CONFIG_FB_CFB_COPYAREA=y 803CONFIG_FB_CFB_COPYAREA=y
746CONFIG_FB_CFB_IMAGEBLIT=y 804CONFIG_FB_CFB_IMAGEBLIT=y
805# CONFIG_FB_SVGALIB is not set
747# CONFIG_FB_MACMODES is not set 806# CONFIG_FB_MACMODES is not set
748# CONFIG_FB_BACKLIGHT is not set 807# CONFIG_FB_BACKLIGHT is not set
749# CONFIG_FB_MODE_HELPERS is not set 808# CONFIG_FB_MODE_HELPERS is not set
@@ -786,6 +845,11 @@ CONFIG_LOGO_LINUX_CLUT224=y
786# CONFIG_SOUND is not set 845# CONFIG_SOUND is not set
787 846
788# 847#
848# HID Devices
849#
850# CONFIG_HID is not set
851
852#
789# USB support 853# USB support
790# 854#
791CONFIG_USB_ARCH_HAS_HCD=y 855CONFIG_USB_ARCH_HAS_HCD=y
@@ -847,6 +911,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y
847# 911#
848 912
849# 913#
914# Auxiliary Display support
915#
916
917#
918# Virtualization
919#
920
921#
850# File systems 922# File systems
851# 923#
852CONFIG_EXT2_FS=y 924CONFIG_EXT2_FS=y
@@ -858,6 +930,7 @@ CONFIG_EXT3_FS=y
858CONFIG_EXT3_FS_XATTR=y 930CONFIG_EXT3_FS_XATTR=y
859CONFIG_EXT3_FS_POSIX_ACL=y 931CONFIG_EXT3_FS_POSIX_ACL=y
860CONFIG_EXT3_FS_SECURITY=y 932CONFIG_EXT3_FS_SECURITY=y
933# CONFIG_EXT4DEV_FS is not set
861CONFIG_JBD=y 934CONFIG_JBD=y
862# CONFIG_JBD_DEBUG is not set 935# CONFIG_JBD_DEBUG is not set
863CONFIG_FS_MBCACHE=y 936CONFIG_FS_MBCACHE=y
@@ -870,6 +943,7 @@ CONFIG_REISERFS_FS_SECURITY=y
870# CONFIG_JFS_FS is not set 943# CONFIG_JFS_FS is not set
871CONFIG_FS_POSIX_ACL=y 944CONFIG_FS_POSIX_ACL=y
872# CONFIG_XFS_FS is not set 945# CONFIG_XFS_FS is not set
946# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 947# CONFIG_OCFS2_FS is not set
874# CONFIG_MINIX_FS is not set 948# CONFIG_MINIX_FS is not set
875# CONFIG_ROMFS_FS is not set 949# CONFIG_ROMFS_FS is not set
@@ -880,6 +954,7 @@ CONFIG_DNOTIFY=y
880CONFIG_AUTOFS_FS=m 954CONFIG_AUTOFS_FS=m
881CONFIG_AUTOFS4_FS=m 955CONFIG_AUTOFS4_FS=m
882CONFIG_FUSE_FS=m 956CONFIG_FUSE_FS=m
957CONFIG_GENERIC_ACL=y
883 958
884# 959#
885# CD-ROM/DVD Filesystems 960# CD-ROM/DVD Filesystems
@@ -899,23 +974,25 @@ CONFIG_FUSE_FS=m
899# 974#
900CONFIG_PROC_FS=y 975CONFIG_PROC_FS=y
901CONFIG_PROC_KCORE=y 976CONFIG_PROC_KCORE=y
977CONFIG_PROC_SYSCTL=y
902CONFIG_SYSFS=y 978CONFIG_SYSFS=y
903CONFIG_TMPFS=y 979CONFIG_TMPFS=y
980CONFIG_TMPFS_POSIX_ACL=y
904# CONFIG_HUGETLB_PAGE is not set 981# CONFIG_HUGETLB_PAGE is not set
905CONFIG_RAMFS=y 982CONFIG_RAMFS=y
906# CONFIG_CONFIGFS_FS is not set 983CONFIG_CONFIGFS_FS=m
907 984
908# 985#
909# Miscellaneous filesystems 986# Miscellaneous filesystems
910# 987#
911# CONFIG_ADFS_FS is not set 988# CONFIG_ADFS_FS is not set
912# CONFIG_AFFS_FS is not set 989# CONFIG_AFFS_FS is not set
990# CONFIG_ECRYPT_FS is not set
913# CONFIG_HFS_FS is not set 991# CONFIG_HFS_FS is not set
914# CONFIG_HFSPLUS_FS is not set 992# CONFIG_HFSPLUS_FS is not set
915# CONFIG_BEFS_FS is not set 993# CONFIG_BEFS_FS is not set
916# CONFIG_BFS_FS is not set 994# CONFIG_BFS_FS is not set
917# CONFIG_EFS_FS is not set 995# CONFIG_EFS_FS is not set
918# CONFIG_JFFS_FS is not set
919# CONFIG_JFFS2_FS is not set 996# CONFIG_JFFS2_FS is not set
920CONFIG_CRAMFS=m 997CONFIG_CRAMFS=m
921# CONFIG_VXFS_FS is not set 998# CONFIG_VXFS_FS is not set
@@ -944,7 +1021,6 @@ CONFIG_SUNRPC=y
944CONFIG_SMB_FS=m 1021CONFIG_SMB_FS=m
945# CONFIG_SMB_NLS_DEFAULT is not set 1022# CONFIG_SMB_NLS_DEFAULT is not set
946# CONFIG_CIFS is not set 1023# CONFIG_CIFS is not set
947# CONFIG_CIFS_DEBUG2 is not set
948# CONFIG_NCP_FS is not set 1024# CONFIG_NCP_FS is not set
949# CONFIG_CODA_FS is not set 1025# CONFIG_CODA_FS is not set
950# CONFIG_AFS_FS is not set 1026# CONFIG_AFS_FS is not set
@@ -1001,6 +1077,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1001# CONFIG_NLS_UTF8 is not set 1077# CONFIG_NLS_UTF8 is not set
1002 1078
1003# 1079#
1080# Distributed Lock Manager
1081#
1082CONFIG_DLM=m
1083CONFIG_DLM_TCP=y
1084# CONFIG_DLM_SCTP is not set
1085# CONFIG_DLM_DEBUG is not set
1086
1087#
1004# Profiling support 1088# Profiling support
1005# 1089#
1006# CONFIG_PROFILING is not set 1090# CONFIG_PROFILING is not set
@@ -1010,13 +1094,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1010# 1094#
1011CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1095CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1012# CONFIG_PRINTK_TIME is not set 1096# CONFIG_PRINTK_TIME is not set
1097CONFIG_ENABLE_MUST_CHECK=y
1013# CONFIG_MAGIC_SYSRQ is not set 1098# CONFIG_MAGIC_SYSRQ is not set
1014# CONFIG_UNUSED_SYMBOLS is not set 1099# CONFIG_UNUSED_SYMBOLS is not set
1100# CONFIG_DEBUG_FS is not set
1101# CONFIG_HEADERS_CHECK is not set
1015# CONFIG_DEBUG_KERNEL is not set 1102# CONFIG_DEBUG_KERNEL is not set
1016CONFIG_LOG_BUF_SHIFT=14 1103CONFIG_LOG_BUF_SHIFT=14
1017# CONFIG_DEBUG_FS is not set
1018CONFIG_CROSSCOMPILE=y 1104CONFIG_CROSSCOMPILE=y
1019CONFIG_CMDLINE="" 1105CONFIG_CMDLINE=""
1106CONFIG_SYS_SUPPORTS_KGDB=y
1020 1107
1021# 1108#
1022# Security options 1109# Security options
@@ -1029,18 +1116,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1029# Cryptographic options 1116# Cryptographic options
1030# 1117#
1031CONFIG_CRYPTO=y 1118CONFIG_CRYPTO=y
1119CONFIG_CRYPTO_ALGAPI=y
1120CONFIG_CRYPTO_BLKCIPHER=m
1121CONFIG_CRYPTO_HASH=y
1122CONFIG_CRYPTO_MANAGER=y
1032CONFIG_CRYPTO_HMAC=y 1123CONFIG_CRYPTO_HMAC=y
1124CONFIG_CRYPTO_XCBC=m
1033CONFIG_CRYPTO_NULL=m 1125CONFIG_CRYPTO_NULL=m
1034CONFIG_CRYPTO_MD4=m 1126CONFIG_CRYPTO_MD4=m
1035CONFIG_CRYPTO_MD5=m 1127CONFIG_CRYPTO_MD5=y
1036CONFIG_CRYPTO_SHA1=m 1128CONFIG_CRYPTO_SHA1=m
1037CONFIG_CRYPTO_SHA256=m 1129CONFIG_CRYPTO_SHA256=m
1038CONFIG_CRYPTO_SHA512=m 1130CONFIG_CRYPTO_SHA512=m
1039CONFIG_CRYPTO_WP512=m 1131CONFIG_CRYPTO_WP512=m
1040CONFIG_CRYPTO_TGR192=m 1132CONFIG_CRYPTO_TGR192=m
1133CONFIG_CRYPTO_GF128MUL=m
1134CONFIG_CRYPTO_ECB=m
1135CONFIG_CRYPTO_CBC=m
1136CONFIG_CRYPTO_PCBC=m
1137CONFIG_CRYPTO_LRW=m
1041CONFIG_CRYPTO_DES=m 1138CONFIG_CRYPTO_DES=m
1139CONFIG_CRYPTO_FCRYPT=m
1042CONFIG_CRYPTO_BLOWFISH=m 1140CONFIG_CRYPTO_BLOWFISH=m
1043CONFIG_CRYPTO_TWOFISH=m 1141CONFIG_CRYPTO_TWOFISH=m
1142CONFIG_CRYPTO_TWOFISH_COMMON=m
1044CONFIG_CRYPTO_SERPENT=m 1143CONFIG_CRYPTO_SERPENT=m
1045CONFIG_CRYPTO_AES=m 1144CONFIG_CRYPTO_AES=m
1046CONFIG_CRYPTO_CAST5=m 1145CONFIG_CRYPTO_CAST5=m
@@ -1052,6 +1151,7 @@ CONFIG_CRYPTO_ANUBIS=m
1052CONFIG_CRYPTO_DEFLATE=m 1151CONFIG_CRYPTO_DEFLATE=m
1053CONFIG_CRYPTO_MICHAEL_MIC=m 1152CONFIG_CRYPTO_MICHAEL_MIC=m
1054CONFIG_CRYPTO_CRC32C=m 1153CONFIG_CRYPTO_CRC32C=m
1154CONFIG_CRYPTO_CAMELLIA=m
1055# CONFIG_CRYPTO_TEST is not set 1155# CONFIG_CRYPTO_TEST is not set
1056 1156
1057# 1157#
@@ -1061,6 +1161,7 @@ CONFIG_CRYPTO_CRC32C=m
1061# 1161#
1062# Library routines 1162# Library routines
1063# 1163#
1164CONFIG_BITREVERSE=y
1064CONFIG_CRC_CCITT=m 1165CONFIG_CRC_CCITT=m
1065CONFIG_CRC16=m 1166CONFIG_CRC16=m
1066CONFIG_CRC32=y 1167CONFIG_CRC32=y
@@ -1072,3 +1173,5 @@ CONFIG_TEXTSEARCH_KMP=m
1072CONFIG_TEXTSEARCH_BM=m 1173CONFIG_TEXTSEARCH_BM=m
1073CONFIG_TEXTSEARCH_FSM=m 1174CONFIG_TEXTSEARCH_FSM=m
1074CONFIG_PLIST=y 1175CONFIG_PLIST=y
1176CONFIG_HAS_IOMEM=y
1177CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index c41823b81be0..82801ec43e6a 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:43 2006 4# Tue Feb 20 21:47:25 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1200=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_DB1200=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +63,19 @@ CONFIG_MIPS_DB1200=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_COHERENT=y 74CONFIG_DMA_COHERENT=y
72CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 75CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 77CONFIG_CPU_LITTLE_ENDIAN=y
78CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 79CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1200=y 80CONFIG_SOC_AU1200=y
77CONFIG_SOC_AU1X00=y 81CONFIG_SOC_AU1X00=y
@@ -116,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 120# CONFIG_PAGE_SIZE_64KB is not set
117CONFIG_CPU_HAS_PREFETCH=y 121CONFIG_CPU_HAS_PREFETCH=y
118CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_64BIT_PHYS_ADDR=y 126CONFIG_64BIT_PHYS_ADDR=y
123CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
@@ -135,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -147,6 +152,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,16 +171,21 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 172CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 178# CONFIG_TASKSTATS is not set
179# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
172CONFIG_IKCONFIG=y 181CONFIG_IKCONFIG=y
173CONFIG_IKCONFIG_PROC=y 182CONFIG_IKCONFIG_PROC=y
183CONFIG_SYSFS_DEPRECATED=y
174# CONFIG_RELAY is not set 184# CONFIG_RELAY is not set
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -182,12 +193,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 193CONFIG_BUG=y
183CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 196CONFIG_FUTEX=y
187CONFIG_EPOLL=y 197CONFIG_EPOLL=y
188CONFIG_SHMEM=y 198CONFIG_SHMEM=y
189CONFIG_SLAB=y 199CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -205,6 +216,7 @@ CONFIG_KMOD=y
205# 216#
206# Block layer 217# Block layer
207# 218#
219CONFIG_BLOCK=y
208# CONFIG_LBD is not set 220# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -251,6 +263,10 @@ CONFIG_PCMCIA_AU1X00=m
251CONFIG_BINFMT_ELF=y 263CONFIG_BINFMT_ELF=y
252# CONFIG_BINFMT_MISC is not set 264# CONFIG_BINFMT_MISC is not set
253CONFIG_TRAD_SIGNALS=y 265CONFIG_TRAD_SIGNALS=y
266
267#
268# Power management options
269#
254# CONFIG_PM is not set 270# CONFIG_PM is not set
255 271
256# 272#
@@ -267,7 +283,10 @@ CONFIG_PACKET=y
267CONFIG_UNIX=y 283CONFIG_UNIX=y
268CONFIG_XFRM=y 284CONFIG_XFRM=y
269CONFIG_XFRM_USER=m 285CONFIG_XFRM_USER=m
286# CONFIG_XFRM_SUB_POLICY is not set
287CONFIG_XFRM_MIGRATE=y
270CONFIG_NET_KEY=y 288CONFIG_NET_KEY=y
289CONFIG_NET_KEY_MIGRATE=y
271CONFIG_INET=y 290CONFIG_INET=y
272CONFIG_IP_MULTICAST=y 291CONFIG_IP_MULTICAST=y
273# CONFIG_IP_ADVANCED_ROUTER is not set 292# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -285,10 +304,13 @@ CONFIG_IP_FIB_HASH=y
285# CONFIG_INET_TUNNEL is not set 304# CONFIG_INET_TUNNEL is not set
286CONFIG_INET_XFRM_MODE_TRANSPORT=m 305CONFIG_INET_XFRM_MODE_TRANSPORT=m
287CONFIG_INET_XFRM_MODE_TUNNEL=m 306CONFIG_INET_XFRM_MODE_TUNNEL=m
307CONFIG_INET_XFRM_MODE_BEET=m
288CONFIG_INET_DIAG=y 308CONFIG_INET_DIAG=y
289CONFIG_INET_TCP_DIAG=y 309CONFIG_INET_TCP_DIAG=y
290# CONFIG_TCP_CONG_ADVANCED is not set 310# CONFIG_TCP_CONG_ADVANCED is not set
291CONFIG_TCP_CONG_BIC=y 311CONFIG_TCP_CONG_CUBIC=y
312CONFIG_DEFAULT_TCP_CONG="cubic"
313CONFIG_TCP_MD5SIG=y
292 314
293# 315#
294# IP: Virtual Server Configuration 316# IP: Virtual Server Configuration
@@ -305,15 +327,41 @@ CONFIG_NETFILTER=y
305# Core Netfilter Configuration 327# Core Netfilter Configuration
306# 328#
307# CONFIG_NETFILTER_NETLINK is not set 329# CONFIG_NETFILTER_NETLINK is not set
308# CONFIG_NF_CONNTRACK is not set 330CONFIG_NF_CONNTRACK_ENABLED=m
331CONFIG_NF_CONNTRACK_SUPPORT=y
332# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
333CONFIG_NF_CONNTRACK=m
334CONFIG_NF_CT_ACCT=y
335CONFIG_NF_CONNTRACK_MARK=y
336CONFIG_NF_CONNTRACK_SECMARK=y
337CONFIG_NF_CONNTRACK_EVENTS=y
338CONFIG_NF_CT_PROTO_GRE=m
339CONFIG_NF_CT_PROTO_SCTP=m
340CONFIG_NF_CONNTRACK_AMANDA=m
341CONFIG_NF_CONNTRACK_FTP=m
342CONFIG_NF_CONNTRACK_H323=m
343CONFIG_NF_CONNTRACK_IRC=m
344# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
345CONFIG_NF_CONNTRACK_PPTP=m
346CONFIG_NF_CONNTRACK_SANE=m
347CONFIG_NF_CONNTRACK_SIP=m
348CONFIG_NF_CONNTRACK_TFTP=m
309CONFIG_NETFILTER_XTABLES=m 349CONFIG_NETFILTER_XTABLES=m
310CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 350CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
311CONFIG_NETFILTER_XT_TARGET_MARK=m 351CONFIG_NETFILTER_XT_TARGET_MARK=m
312CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 352CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
353CONFIG_NETFILTER_XT_TARGET_NFLOG=m
313CONFIG_NETFILTER_XT_TARGET_SECMARK=m 354CONFIG_NETFILTER_XT_TARGET_SECMARK=m
355CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
356CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
314CONFIG_NETFILTER_XT_MATCH_COMMENT=m 357CONFIG_NETFILTER_XT_MATCH_COMMENT=m
358CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
359CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
360CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
315CONFIG_NETFILTER_XT_MATCH_DCCP=m 361CONFIG_NETFILTER_XT_MATCH_DCCP=m
362CONFIG_NETFILTER_XT_MATCH_DSCP=m
316CONFIG_NETFILTER_XT_MATCH_ESP=m 363CONFIG_NETFILTER_XT_MATCH_ESP=m
364CONFIG_NETFILTER_XT_MATCH_HELPER=m
317CONFIG_NETFILTER_XT_MATCH_LENGTH=m 365CONFIG_NETFILTER_XT_MATCH_LENGTH=m
318CONFIG_NETFILTER_XT_MATCH_LIMIT=m 366CONFIG_NETFILTER_XT_MATCH_LIMIT=m
319CONFIG_NETFILTER_XT_MATCH_MAC=m 367CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -324,14 +372,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
324CONFIG_NETFILTER_XT_MATCH_QUOTA=m 372CONFIG_NETFILTER_XT_MATCH_QUOTA=m
325CONFIG_NETFILTER_XT_MATCH_REALM=m 373CONFIG_NETFILTER_XT_MATCH_REALM=m
326CONFIG_NETFILTER_XT_MATCH_SCTP=m 374CONFIG_NETFILTER_XT_MATCH_SCTP=m
375CONFIG_NETFILTER_XT_MATCH_STATE=m
327CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 376CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
328CONFIG_NETFILTER_XT_MATCH_STRING=m 377CONFIG_NETFILTER_XT_MATCH_STRING=m
329CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 378CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
379CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
330 380
331# 381#
332# IP: Netfilter Configuration 382# IP: Netfilter Configuration
333# 383#
334# CONFIG_IP_NF_CONNTRACK is not set 384CONFIG_NF_CONNTRACK_IPV4=m
385CONFIG_NF_CONNTRACK_PROC_COMPAT=y
335# CONFIG_IP_NF_QUEUE is not set 386# CONFIG_IP_NF_QUEUE is not set
336# CONFIG_IP_NF_IPTABLES is not set 387# CONFIG_IP_NF_IPTABLES is not set
337# CONFIG_IP_NF_ARPTABLES is not set 388# CONFIG_IP_NF_ARPTABLES is not set
@@ -359,7 +410,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
359# CONFIG_ATALK is not set 410# CONFIG_ATALK is not set
360# CONFIG_X25 is not set 411# CONFIG_X25 is not set
361# CONFIG_LAPB is not set 412# CONFIG_LAPB is not set
362# CONFIG_NET_DIVERT is not set
363# CONFIG_ECONET is not set 413# CONFIG_ECONET is not set
364# CONFIG_WAN_ROUTER is not set 414# CONFIG_WAN_ROUTER is not set
365 415
@@ -409,11 +459,13 @@ CONFIG_MTD_PARTITIONS=y
409# User Modules And Translation Layers 459# User Modules And Translation Layers
410# 460#
411CONFIG_MTD_CHAR=y 461CONFIG_MTD_CHAR=y
462CONFIG_MTD_BLKDEVS=y
412CONFIG_MTD_BLOCK=y 463CONFIG_MTD_BLOCK=y
413# CONFIG_FTL is not set 464# CONFIG_FTL is not set
414# CONFIG_NFTL is not set 465# CONFIG_NFTL is not set
415# CONFIG_INFTL is not set 466# CONFIG_INFTL is not set
416# CONFIG_RFD_FTL is not set 467# CONFIG_RFD_FTL is not set
468# CONFIG_SSFDC is not set
417 469
418# 470#
419# RAM/ROM/Flash chip drivers 471# RAM/ROM/Flash chip drivers
@@ -488,6 +540,7 @@ CONFIG_MTD_NAND_IDS=y
488# 540#
489# Plug and Play support 541# Plug and Play support
490# 542#
543# CONFIG_PNPACPI is not set
491 544
492# 545#
493# Block devices 546# Block devices
@@ -499,14 +552,20 @@ CONFIG_BLK_DEV_LOOP=y
499CONFIG_BLK_DEV_RAM=y 552CONFIG_BLK_DEV_RAM=y
500CONFIG_BLK_DEV_RAM_COUNT=16 553CONFIG_BLK_DEV_RAM_COUNT=16
501CONFIG_BLK_DEV_RAM_SIZE=4096 554CONFIG_BLK_DEV_RAM_SIZE=4096
555CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
502# CONFIG_BLK_DEV_INITRD is not set 556# CONFIG_BLK_DEV_INITRD is not set
503# CONFIG_CDROM_PKTCDVD is not set 557# CONFIG_CDROM_PKTCDVD is not set
504# CONFIG_ATA_OVER_ETH is not set 558# CONFIG_ATA_OVER_ETH is not set
505 559
506# 560#
561# Misc devices
562#
563
564#
507# ATA/ATAPI/MFM/RLL support 565# ATA/ATAPI/MFM/RLL support
508# 566#
509CONFIG_IDE=y 567CONFIG_IDE=y
568CONFIG_IDE_MAX_HWIFS=4
510CONFIG_BLK_DEV_IDE=y 569CONFIG_BLK_DEV_IDE=y
511 570
512# 571#
@@ -540,6 +599,8 @@ CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128
540# 599#
541# CONFIG_RAID_ATTRS is not set 600# CONFIG_RAID_ATTRS is not set
542CONFIG_SCSI=y 601CONFIG_SCSI=y
602CONFIG_SCSI_TGT=m
603# CONFIG_SCSI_NETLINK is not set
543CONFIG_SCSI_PROC_FS=y 604CONFIG_SCSI_PROC_FS=y
544 605
545# 606#
@@ -559,20 +620,21 @@ CONFIG_CHR_DEV_SG=y
559CONFIG_SCSI_MULTI_LUN=y 620CONFIG_SCSI_MULTI_LUN=y
560# CONFIG_SCSI_CONSTANTS is not set 621# CONFIG_SCSI_CONSTANTS is not set
561# CONFIG_SCSI_LOGGING is not set 622# CONFIG_SCSI_LOGGING is not set
623CONFIG_SCSI_SCAN_ASYNC=y
562 624
563# 625#
564# SCSI Transport Attributes 626# SCSI Transports
565# 627#
566# CONFIG_SCSI_SPI_ATTRS is not set 628# CONFIG_SCSI_SPI_ATTRS is not set
567# CONFIG_SCSI_FC_ATTRS is not set 629# CONFIG_SCSI_FC_ATTRS is not set
568# CONFIG_SCSI_ISCSI_ATTRS is not set 630# CONFIG_SCSI_ISCSI_ATTRS is not set
569# CONFIG_SCSI_SAS_ATTRS is not set 631# CONFIG_SCSI_SAS_ATTRS is not set
632# CONFIG_SCSI_SAS_LIBSAS is not set
570 633
571# 634#
572# SCSI low-level drivers 635# SCSI low-level drivers
573# 636#
574# CONFIG_ISCSI_TCP is not set 637# CONFIG_ISCSI_TCP is not set
575# CONFIG_SCSI_SATA is not set
576# CONFIG_SCSI_DEBUG is not set 638# CONFIG_SCSI_DEBUG is not set
577 639
578# 640#
@@ -585,6 +647,11 @@ CONFIG_SCSI_MULTI_LUN=y
585# CONFIG_PCMCIA_SYM53C500 is not set 647# CONFIG_PCMCIA_SYM53C500 is not set
586 648
587# 649#
650# Serial ATA (prod) and Parallel ATA (experimental) drivers
651#
652# CONFIG_ATA is not set
653
654#
588# Multi-device support (RAID and LVM) 655# Multi-device support (RAID and LVM)
589# 656#
590# CONFIG_MD is not set 657# CONFIG_MD is not set
@@ -672,6 +739,7 @@ CONFIG_MII=m
672# Input device support 739# Input device support
673# 740#
674CONFIG_INPUT=y 741CONFIG_INPUT=y
742# CONFIG_INPUT_FF_MEMLESS is not set
675 743
676# 744#
677# Userland interfaces 745# Userland interfaces
@@ -751,10 +819,6 @@ CONFIG_LEGACY_PTY_COUNT=256
751# CONFIG_R3964 is not set 819# CONFIG_R3964 is not set
752 820
753# 821#
754# Ftape, the floppy tape device driver
755#
756
757#
758# PCMCIA character devices 822# PCMCIA character devices
759# 823#
760# CONFIG_SYNCLINK_CS is not set 824# CONFIG_SYNCLINK_CS is not set
@@ -766,7 +830,6 @@ CONFIG_LEGACY_PTY_COUNT=256
766# TPM devices 830# TPM devices
767# 831#
768# CONFIG_TCG_TPM is not set 832# CONFIG_TCG_TPM is not set
769# CONFIG_TELCLOCK is not set
770 833
771# 834#
772# I2C support 835# I2C support
@@ -782,6 +845,7 @@ CONFIG_LEGACY_PTY_COUNT=256
782# 845#
783# Dallas's 1-wire bus 846# Dallas's 1-wire bus
784# 847#
848# CONFIG_W1 is not set
785 849
786# 850#
787# Hardware Monitoring support 851# Hardware Monitoring support
@@ -790,14 +854,9 @@ CONFIG_LEGACY_PTY_COUNT=256
790# CONFIG_HWMON_VID is not set 854# CONFIG_HWMON_VID is not set
791 855
792# 856#
793# Misc devices
794#
795
796#
797# Multimedia devices 857# Multimedia devices
798# 858#
799# CONFIG_VIDEO_DEV is not set 859# CONFIG_VIDEO_DEV is not set
800CONFIG_VIDEO_V4L2=y
801 860
802# 861#
803# Digital Video Broadcasting Devices 862# Digital Video Broadcasting Devices
@@ -812,6 +871,7 @@ CONFIG_FB=y
812CONFIG_FB_CFB_FILLRECT=y 871CONFIG_FB_CFB_FILLRECT=y
813CONFIG_FB_CFB_COPYAREA=y 872CONFIG_FB_CFB_COPYAREA=y
814CONFIG_FB_CFB_IMAGEBLIT=y 873CONFIG_FB_CFB_IMAGEBLIT=y
874# CONFIG_FB_SVGALIB is not set
815# CONFIG_FB_MACMODES is not set 875# CONFIG_FB_MACMODES is not set
816# CONFIG_FB_BACKLIGHT is not set 876# CONFIG_FB_BACKLIGHT is not set
817# CONFIG_FB_MODE_HELPERS is not set 877# CONFIG_FB_MODE_HELPERS is not set
@@ -843,6 +903,12 @@ CONFIG_LOGO_LINUX_CLUT224=y
843# CONFIG_SOUND is not set 903# CONFIG_SOUND is not set
844 904
845# 905#
906# HID Devices
907#
908CONFIG_HID=y
909# CONFIG_HID_DEBUG is not set
910
911#
846# USB support 912# USB support
847# 913#
848CONFIG_USB_ARCH_HAS_HCD=y 914CONFIG_USB_ARCH_HAS_HCD=y
@@ -916,6 +982,14 @@ CONFIG_MMC_AU1X=y
916# 982#
917 983
918# 984#
985# Auxiliary Display support
986#
987
988#
989# Virtualization
990#
991
992#
919# File systems 993# File systems
920# 994#
921CONFIG_EXT2_FS=y 995CONFIG_EXT2_FS=y
@@ -927,6 +1001,7 @@ CONFIG_EXT3_FS=y
927CONFIG_EXT3_FS_XATTR=y 1001CONFIG_EXT3_FS_XATTR=y
928CONFIG_EXT3_FS_POSIX_ACL=y 1002CONFIG_EXT3_FS_POSIX_ACL=y
929CONFIG_EXT3_FS_SECURITY=y 1003CONFIG_EXT3_FS_SECURITY=y
1004# CONFIG_EXT4DEV_FS is not set
930CONFIG_JBD=y 1005CONFIG_JBD=y
931# CONFIG_JBD_DEBUG is not set 1006# CONFIG_JBD_DEBUG is not set
932CONFIG_FS_MBCACHE=y 1007CONFIG_FS_MBCACHE=y
@@ -938,6 +1013,7 @@ CONFIG_JFS_FS=y
938# CONFIG_JFS_STATISTICS is not set 1013# CONFIG_JFS_STATISTICS is not set
939CONFIG_FS_POSIX_ACL=y 1014CONFIG_FS_POSIX_ACL=y
940# CONFIG_XFS_FS is not set 1015# CONFIG_XFS_FS is not set
1016# CONFIG_GFS2_FS is not set
941# CONFIG_OCFS2_FS is not set 1017# CONFIG_OCFS2_FS is not set
942# CONFIG_MINIX_FS is not set 1018# CONFIG_MINIX_FS is not set
943# CONFIG_ROMFS_FS is not set 1019# CONFIG_ROMFS_FS is not set
@@ -948,6 +1024,7 @@ CONFIG_DNOTIFY=y
948# CONFIG_AUTOFS_FS is not set 1024# CONFIG_AUTOFS_FS is not set
949# CONFIG_AUTOFS4_FS is not set 1025# CONFIG_AUTOFS4_FS is not set
950# CONFIG_FUSE_FS is not set 1026# CONFIG_FUSE_FS is not set
1027CONFIG_GENERIC_ACL=y
951 1028
952# 1029#
953# CD-ROM/DVD Filesystems 1030# CD-ROM/DVD Filesystems
@@ -955,7 +1032,6 @@ CONFIG_DNOTIFY=y
955CONFIG_ISO9660_FS=m 1032CONFIG_ISO9660_FS=m
956CONFIG_JOLIET=y 1033CONFIG_JOLIET=y
957CONFIG_ZISOFS=y 1034CONFIG_ZISOFS=y
958CONFIG_ZISOFS_FS=m
959CONFIG_UDF_FS=m 1035CONFIG_UDF_FS=m
960CONFIG_UDF_NLS=y 1036CONFIG_UDF_NLS=y
961 1037
@@ -974,23 +1050,25 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
974# 1050#
975CONFIG_PROC_FS=y 1051CONFIG_PROC_FS=y
976CONFIG_PROC_KCORE=y 1052CONFIG_PROC_KCORE=y
1053CONFIG_PROC_SYSCTL=y
977CONFIG_SYSFS=y 1054CONFIG_SYSFS=y
978CONFIG_TMPFS=y 1055CONFIG_TMPFS=y
1056CONFIG_TMPFS_POSIX_ACL=y
979# CONFIG_HUGETLB_PAGE is not set 1057# CONFIG_HUGETLB_PAGE is not set
980CONFIG_RAMFS=y 1058CONFIG_RAMFS=y
981# CONFIG_CONFIGFS_FS is not set 1059CONFIG_CONFIGFS_FS=m
982 1060
983# 1061#
984# Miscellaneous filesystems 1062# Miscellaneous filesystems
985# 1063#
986# CONFIG_ADFS_FS is not set 1064# CONFIG_ADFS_FS is not set
987# CONFIG_AFFS_FS is not set 1065# CONFIG_AFFS_FS is not set
1066# CONFIG_ECRYPT_FS is not set
988# CONFIG_HFS_FS is not set 1067# CONFIG_HFS_FS is not set
989# CONFIG_HFSPLUS_FS is not set 1068# CONFIG_HFSPLUS_FS is not set
990# CONFIG_BEFS_FS is not set 1069# CONFIG_BEFS_FS is not set
991# CONFIG_BFS_FS is not set 1070# CONFIG_BFS_FS is not set
992# CONFIG_EFS_FS is not set 1071# CONFIG_EFS_FS is not set
993# CONFIG_JFFS_FS is not set
994CONFIG_JFFS2_FS=y 1072CONFIG_JFFS2_FS=y
995CONFIG_JFFS2_FS_DEBUG=0 1073CONFIG_JFFS2_FS_DEBUG=0
996CONFIG_JFFS2_FS_WRITEBUFFER=y 1074CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1025,7 +1103,6 @@ CONFIG_SUNRPC=y
1025CONFIG_SMB_FS=y 1103CONFIG_SMB_FS=y
1026# CONFIG_SMB_NLS_DEFAULT is not set 1104# CONFIG_SMB_NLS_DEFAULT is not set
1027# CONFIG_CIFS is not set 1105# CONFIG_CIFS is not set
1028# CONFIG_CIFS_DEBUG2 is not set
1029# CONFIG_NCP_FS is not set 1106# CONFIG_NCP_FS is not set
1030# CONFIG_CODA_FS is not set 1107# CONFIG_CODA_FS is not set
1031# CONFIG_AFS_FS is not set 1108# CONFIG_AFS_FS is not set
@@ -1082,6 +1159,14 @@ CONFIG_NLS_KOI8_U=m
1082CONFIG_NLS_UTF8=m 1159CONFIG_NLS_UTF8=m
1083 1160
1084# 1161#
1162# Distributed Lock Manager
1163#
1164CONFIG_DLM=m
1165CONFIG_DLM_TCP=y
1166# CONFIG_DLM_SCTP is not set
1167# CONFIG_DLM_DEBUG is not set
1168
1169#
1085# Profiling support 1170# Profiling support
1086# 1171#
1087# CONFIG_PROFILING is not set 1172# CONFIG_PROFILING is not set
@@ -1091,13 +1176,16 @@ CONFIG_NLS_UTF8=m
1091# 1176#
1092CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1177CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1093# CONFIG_PRINTK_TIME is not set 1178# CONFIG_PRINTK_TIME is not set
1179CONFIG_ENABLE_MUST_CHECK=y
1094# CONFIG_MAGIC_SYSRQ is not set 1180# CONFIG_MAGIC_SYSRQ is not set
1095# CONFIG_UNUSED_SYMBOLS is not set 1181# CONFIG_UNUSED_SYMBOLS is not set
1182# CONFIG_DEBUG_FS is not set
1183# CONFIG_HEADERS_CHECK is not set
1096# CONFIG_DEBUG_KERNEL is not set 1184# CONFIG_DEBUG_KERNEL is not set
1097CONFIG_LOG_BUF_SHIFT=14 1185CONFIG_LOG_BUF_SHIFT=14
1098# CONFIG_DEBUG_FS is not set
1099CONFIG_CROSSCOMPILE=y 1186CONFIG_CROSSCOMPILE=y
1100CONFIG_CMDLINE="mem=48M" 1187CONFIG_CMDLINE="mem=48M"
1188CONFIG_SYS_SUPPORTS_KGDB=y
1101 1189
1102# 1190#
1103# Security options 1191# Security options
@@ -1109,7 +1197,44 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1109# 1197#
1110# Cryptographic options 1198# Cryptographic options
1111# 1199#
1112# CONFIG_CRYPTO is not set 1200CONFIG_CRYPTO=y
1201CONFIG_CRYPTO_ALGAPI=y
1202CONFIG_CRYPTO_BLKCIPHER=m
1203CONFIG_CRYPTO_HASH=m
1204CONFIG_CRYPTO_MANAGER=m
1205CONFIG_CRYPTO_HMAC=m
1206CONFIG_CRYPTO_XCBC=m
1207CONFIG_CRYPTO_NULL=m
1208CONFIG_CRYPTO_MD4=m
1209CONFIG_CRYPTO_MD5=y
1210CONFIG_CRYPTO_SHA1=m
1211CONFIG_CRYPTO_SHA256=m
1212CONFIG_CRYPTO_SHA512=m
1213CONFIG_CRYPTO_WP512=m
1214CONFIG_CRYPTO_TGR192=m
1215CONFIG_CRYPTO_GF128MUL=m
1216CONFIG_CRYPTO_ECB=m
1217CONFIG_CRYPTO_CBC=m
1218CONFIG_CRYPTO_PCBC=m
1219CONFIG_CRYPTO_LRW=m
1220CONFIG_CRYPTO_DES=m
1221CONFIG_CRYPTO_FCRYPT=m
1222CONFIG_CRYPTO_BLOWFISH=m
1223CONFIG_CRYPTO_TWOFISH=m
1224CONFIG_CRYPTO_TWOFISH_COMMON=m
1225CONFIG_CRYPTO_SERPENT=m
1226CONFIG_CRYPTO_AES=m
1227CONFIG_CRYPTO_CAST5=m
1228CONFIG_CRYPTO_CAST6=m
1229CONFIG_CRYPTO_TEA=m
1230CONFIG_CRYPTO_ARC4=m
1231CONFIG_CRYPTO_KHAZAD=m
1232CONFIG_CRYPTO_ANUBIS=m
1233CONFIG_CRYPTO_DEFLATE=m
1234CONFIG_CRYPTO_MICHAEL_MIC=m
1235CONFIG_CRYPTO_CRC32C=m
1236CONFIG_CRYPTO_CAMELLIA=m
1237# CONFIG_CRYPTO_TEST is not set
1113 1238
1114# 1239#
1115# Hardware crypto devices 1240# Hardware crypto devices
@@ -1118,6 +1243,7 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1118# 1243#
1119# Library routines 1244# Library routines
1120# 1245#
1246CONFIG_BITREVERSE=y
1121CONFIG_CRC_CCITT=y 1247CONFIG_CRC_CCITT=y
1122# CONFIG_CRC16 is not set 1248# CONFIG_CRC16 is not set
1123CONFIG_CRC32=y 1249CONFIG_CRC32=y
@@ -1129,3 +1255,5 @@ CONFIG_TEXTSEARCH_KMP=m
1129CONFIG_TEXTSEARCH_BM=m 1255CONFIG_TEXTSEARCH_BM=m
1130CONFIG_TEXTSEARCH_FSM=m 1256CONFIG_TEXTSEARCH_FSM=m
1131CONFIG_PLIST=y 1257CONFIG_PLIST=y
1258CONFIG_HAS_IOMEM=y
1259CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 7d6d92187880..545f23094e13 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:56 2006 4# Tue Feb 20 21:47:26 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1500=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_DB1500=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +63,20 @@ CONFIG_MIPS_DB1500=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 76CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
75CONFIG_CPU_LITTLE_ENDIAN=y 78CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_APM_EMULATION=y
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 80CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
77CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 81CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
78CONFIG_SOC_AU1500=y 82CONFIG_SOC_AU1500=y
@@ -118,8 +122,8 @@ CONFIG_PAGE_SIZE_4KB=y
118# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
119CONFIG_CPU_HAS_PREFETCH=y 123CONFIG_CPU_HAS_PREFETCH=y
120CONFIG_MIPS_MT_DISABLED=y 124CONFIG_MIPS_MT_DISABLED=y
121# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_MT_SMP is not set 125# CONFIG_MIPS_MT_SMP is not set
126# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_VPE_LOADER is not set 127# CONFIG_MIPS_VPE_LOADER is not set
124CONFIG_64BIT_PHYS_ADDR=y 128CONFIG_64BIT_PHYS_ADDR=y
125CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
@@ -136,7 +140,8 @@ CONFIG_FLATMEM=y
136CONFIG_FLAT_NODE_MEM_MAP=y 140CONFIG_FLAT_NODE_MEM_MAP=y
137# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
139# CONFIG_RESOURCES_64BIT is not set 143CONFIG_RESOURCES_64BIT=y
144CONFIG_ZONE_DMA_FLAG=1
140# CONFIG_HZ_48 is not set 145# CONFIG_HZ_48 is not set
141# CONFIG_HZ_100 is not set 146# CONFIG_HZ_100 is not set
142# CONFIG_HZ_128 is not set 147# CONFIG_HZ_128 is not set
@@ -149,6 +154,7 @@ CONFIG_HZ=1000
149CONFIG_PREEMPT_NONE=y 154CONFIG_PREEMPT_NONE=y
150# CONFIG_PREEMPT_VOLUNTARY is not set 155# CONFIG_PREEMPT_VOLUNTARY is not set
151# CONFIG_PREEMPT is not set 156# CONFIG_PREEMPT is not set
157# CONFIG_KEXEC is not set
152CONFIG_LOCKDEP_SUPPORT=y 158CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 159CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -167,15 +173,20 @@ CONFIG_LOCALVERSION=""
167CONFIG_LOCALVERSION_AUTO=y 173CONFIG_LOCALVERSION_AUTO=y
168CONFIG_SWAP=y 174CONFIG_SWAP=y
169CONFIG_SYSVIPC=y 175CONFIG_SYSVIPC=y
176# CONFIG_IPC_NS is not set
177CONFIG_SYSVIPC_SYSCTL=y
170# CONFIG_POSIX_MQUEUE is not set 178# CONFIG_POSIX_MQUEUE is not set
171# CONFIG_BSD_PROCESS_ACCT is not set 179# CONFIG_BSD_PROCESS_ACCT is not set
172CONFIG_SYSCTL=y 180# CONFIG_TASKSTATS is not set
181# CONFIG_UTS_NS is not set
173# CONFIG_AUDIT is not set 182# CONFIG_AUDIT is not set
174# CONFIG_IKCONFIG is not set 183# CONFIG_IKCONFIG is not set
184CONFIG_SYSFS_DEPRECATED=y
175CONFIG_RELAY=y 185CONFIG_RELAY=y
176CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
178CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
179CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
181CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -183,12 +194,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 194CONFIG_BUG=y
184CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 197CONFIG_FUTEX=y
188CONFIG_EPOLL=y 198CONFIG_EPOLL=y
189CONFIG_SHMEM=y 199CONFIG_SHMEM=y
190CONFIG_SLAB=y 200CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -206,6 +217,7 @@ CONFIG_KMOD=y
206# 217#
207# Block layer 218# Block layer
208# 219#
220CONFIG_BLOCK=y
209# CONFIG_LBD is not set 221# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -259,6 +271,10 @@ CONFIG_PCMCIA_AU1X00=m
259CONFIG_BINFMT_ELF=y 271CONFIG_BINFMT_ELF=y
260# CONFIG_BINFMT_MISC is not set 272# CONFIG_BINFMT_MISC is not set
261CONFIG_TRAD_SIGNALS=y 273CONFIG_TRAD_SIGNALS=y
274
275#
276# Power management options
277#
262# CONFIG_PM is not set 278# CONFIG_PM is not set
263 279
264# 280#
@@ -275,7 +291,10 @@ CONFIG_PACKET=y
275CONFIG_UNIX=y 291CONFIG_UNIX=y
276CONFIG_XFRM=y 292CONFIG_XFRM=y
277CONFIG_XFRM_USER=m 293CONFIG_XFRM_USER=m
294# CONFIG_XFRM_SUB_POLICY is not set
295CONFIG_XFRM_MIGRATE=y
278CONFIG_NET_KEY=y 296CONFIG_NET_KEY=y
297CONFIG_NET_KEY_MIGRATE=y
279CONFIG_INET=y 298CONFIG_INET=y
280CONFIG_IP_MULTICAST=y 299CONFIG_IP_MULTICAST=y
281# CONFIG_IP_ADVANCED_ROUTER is not set 300# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -296,10 +315,13 @@ CONFIG_IP_PNP_BOOTP=y
296# CONFIG_INET_TUNNEL is not set 315# CONFIG_INET_TUNNEL is not set
297CONFIG_INET_XFRM_MODE_TRANSPORT=m 316CONFIG_INET_XFRM_MODE_TRANSPORT=m
298CONFIG_INET_XFRM_MODE_TUNNEL=m 317CONFIG_INET_XFRM_MODE_TUNNEL=m
318CONFIG_INET_XFRM_MODE_BEET=m
299CONFIG_INET_DIAG=y 319CONFIG_INET_DIAG=y
300CONFIG_INET_TCP_DIAG=y 320CONFIG_INET_TCP_DIAG=y
301# CONFIG_TCP_CONG_ADVANCED is not set 321# CONFIG_TCP_CONG_ADVANCED is not set
302CONFIG_TCP_CONG_BIC=y 322CONFIG_TCP_CONG_CUBIC=y
323CONFIG_DEFAULT_TCP_CONG="cubic"
324CONFIG_TCP_MD5SIG=y
303 325
304# 326#
305# IP: Virtual Server Configuration 327# IP: Virtual Server Configuration
@@ -318,15 +340,42 @@ CONFIG_NETFILTER=y
318CONFIG_NETFILTER_NETLINK=m 340CONFIG_NETFILTER_NETLINK=m
319CONFIG_NETFILTER_NETLINK_QUEUE=m 341CONFIG_NETFILTER_NETLINK_QUEUE=m
320CONFIG_NETFILTER_NETLINK_LOG=m 342CONFIG_NETFILTER_NETLINK_LOG=m
321# CONFIG_NF_CONNTRACK is not set 343CONFIG_NF_CONNTRACK_ENABLED=m
344CONFIG_NF_CONNTRACK_SUPPORT=y
345# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
346CONFIG_NF_CONNTRACK=m
347CONFIG_NF_CT_ACCT=y
348CONFIG_NF_CONNTRACK_MARK=y
349CONFIG_NF_CONNTRACK_SECMARK=y
350CONFIG_NF_CONNTRACK_EVENTS=y
351CONFIG_NF_CT_PROTO_GRE=m
352CONFIG_NF_CT_PROTO_SCTP=m
353CONFIG_NF_CONNTRACK_AMANDA=m
354CONFIG_NF_CONNTRACK_FTP=m
355CONFIG_NF_CONNTRACK_H323=m
356CONFIG_NF_CONNTRACK_IRC=m
357# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
358CONFIG_NF_CONNTRACK_PPTP=m
359CONFIG_NF_CONNTRACK_SANE=m
360CONFIG_NF_CONNTRACK_SIP=m
361CONFIG_NF_CONNTRACK_TFTP=m
362CONFIG_NF_CT_NETLINK=m
322CONFIG_NETFILTER_XTABLES=m 363CONFIG_NETFILTER_XTABLES=m
323CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 364CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
324CONFIG_NETFILTER_XT_TARGET_MARK=m 365CONFIG_NETFILTER_XT_TARGET_MARK=m
325CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 366CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
367CONFIG_NETFILTER_XT_TARGET_NFLOG=m
326CONFIG_NETFILTER_XT_TARGET_SECMARK=m 368CONFIG_NETFILTER_XT_TARGET_SECMARK=m
369CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
370CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
327CONFIG_NETFILTER_XT_MATCH_COMMENT=m 371CONFIG_NETFILTER_XT_MATCH_COMMENT=m
372CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
373CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
374CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
328CONFIG_NETFILTER_XT_MATCH_DCCP=m 375CONFIG_NETFILTER_XT_MATCH_DCCP=m
376CONFIG_NETFILTER_XT_MATCH_DSCP=m
329CONFIG_NETFILTER_XT_MATCH_ESP=m 377CONFIG_NETFILTER_XT_MATCH_ESP=m
378CONFIG_NETFILTER_XT_MATCH_HELPER=m
330CONFIG_NETFILTER_XT_MATCH_LENGTH=m 379CONFIG_NETFILTER_XT_MATCH_LENGTH=m
331CONFIG_NETFILTER_XT_MATCH_LIMIT=m 380CONFIG_NETFILTER_XT_MATCH_LIMIT=m
332CONFIG_NETFILTER_XT_MATCH_MAC=m 381CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -337,14 +386,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
337CONFIG_NETFILTER_XT_MATCH_QUOTA=m 386CONFIG_NETFILTER_XT_MATCH_QUOTA=m
338CONFIG_NETFILTER_XT_MATCH_REALM=m 387CONFIG_NETFILTER_XT_MATCH_REALM=m
339CONFIG_NETFILTER_XT_MATCH_SCTP=m 388CONFIG_NETFILTER_XT_MATCH_SCTP=m
389CONFIG_NETFILTER_XT_MATCH_STATE=m
340CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 390CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
341CONFIG_NETFILTER_XT_MATCH_STRING=m 391CONFIG_NETFILTER_XT_MATCH_STRING=m
342CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 392CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
393CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
343 394
344# 395#
345# IP: Netfilter Configuration 396# IP: Netfilter Configuration
346# 397#
347# CONFIG_IP_NF_CONNTRACK is not set 398CONFIG_NF_CONNTRACK_IPV4=m
399CONFIG_NF_CONNTRACK_PROC_COMPAT=y
348# CONFIG_IP_NF_QUEUE is not set 400# CONFIG_IP_NF_QUEUE is not set
349# CONFIG_IP_NF_IPTABLES is not set 401# CONFIG_IP_NF_IPTABLES is not set
350# CONFIG_IP_NF_ARPTABLES is not set 402# CONFIG_IP_NF_ARPTABLES is not set
@@ -372,7 +424,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
372# CONFIG_ATALK is not set 424# CONFIG_ATALK is not set
373# CONFIG_X25 is not set 425# CONFIG_X25 is not set
374# CONFIG_LAPB is not set 426# CONFIG_LAPB is not set
375# CONFIG_NET_DIVERT is not set
376# CONFIG_ECONET is not set 427# CONFIG_ECONET is not set
377# CONFIG_WAN_ROUTER is not set 428# CONFIG_WAN_ROUTER is not set
378 429
@@ -428,11 +479,13 @@ CONFIG_MTD_PARTITIONS=y
428# User Modules And Translation Layers 479# User Modules And Translation Layers
429# 480#
430CONFIG_MTD_CHAR=y 481CONFIG_MTD_CHAR=y
482CONFIG_MTD_BLKDEVS=y
431CONFIG_MTD_BLOCK=y 483CONFIG_MTD_BLOCK=y
432# CONFIG_FTL is not set 484# CONFIG_FTL is not set
433# CONFIG_NFTL is not set 485# CONFIG_NFTL is not set
434# CONFIG_INFTL is not set 486# CONFIG_INFTL is not set
435# CONFIG_RFD_FTL is not set 487# CONFIG_RFD_FTL is not set
488# CONFIG_SSFDC is not set
436 489
437# 490#
438# RAM/ROM/Flash chip drivers 491# RAM/ROM/Flash chip drivers
@@ -502,6 +555,7 @@ CONFIG_MTD_ALCHEMY=y
502# 555#
503# Plug and Play support 556# Plug and Play support
504# 557#
558# CONFIG_PNPACPI is not set
505 559
506# 560#
507# Block devices 561# Block devices
@@ -524,9 +578,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
524CONFIG_ATA_OVER_ETH=m 578CONFIG_ATA_OVER_ETH=m
525 579
526# 580#
581# Misc devices
582#
583CONFIG_SGI_IOC4=m
584# CONFIG_TIFM_CORE is not set
585
586#
527# ATA/ATAPI/MFM/RLL support 587# ATA/ATAPI/MFM/RLL support
528# 588#
529CONFIG_IDE=y 589CONFIG_IDE=y
590CONFIG_IDE_MAX_HWIFS=4
530CONFIG_BLK_DEV_IDE=y 591CONFIG_BLK_DEV_IDE=y
531 592
532# 593#
@@ -536,6 +597,7 @@ CONFIG_BLK_DEV_IDE=y
536CONFIG_BLK_DEV_IDEDISK=y 597CONFIG_BLK_DEV_IDEDISK=y
537# CONFIG_IDEDISK_MULTI_MODE is not set 598# CONFIG_IDEDISK_MULTI_MODE is not set
538CONFIG_BLK_DEV_IDECS=m 599CONFIG_BLK_DEV_IDECS=m
600# CONFIG_BLK_DEV_DELKIN is not set
539# CONFIG_BLK_DEV_IDECD is not set 601# CONFIG_BLK_DEV_IDECD is not set
540# CONFIG_BLK_DEV_IDETAPE is not set 602# CONFIG_BLK_DEV_IDETAPE is not set
541# CONFIG_BLK_DEV_IDEFLOPPY is not set 603# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -556,6 +618,12 @@ CONFIG_BLK_DEV_IDECS=m
556# 618#
557CONFIG_RAID_ATTRS=m 619CONFIG_RAID_ATTRS=m
558# CONFIG_SCSI is not set 620# CONFIG_SCSI is not set
621# CONFIG_SCSI_NETLINK is not set
622
623#
624# Serial ATA (prod) and Parallel ATA (experimental) drivers
625#
626# CONFIG_ATA is not set
559 627
560# 628#
561# Multi-device support (RAID and LVM) 629# Multi-device support (RAID and LVM)
@@ -606,6 +674,8 @@ CONFIG_LXT_PHY=m
606CONFIG_CICADA_PHY=m 674CONFIG_CICADA_PHY=m
607CONFIG_VITESSE_PHY=m 675CONFIG_VITESSE_PHY=m
608CONFIG_SMSC_PHY=m 676CONFIG_SMSC_PHY=m
677# CONFIG_BROADCOM_PHY is not set
678# CONFIG_FIXED_PHY is not set
609 679
610# 680#
611# Ethernet (10 or 100Mbit) 681# Ethernet (10 or 100Mbit)
@@ -643,14 +713,18 @@ CONFIG_MIPS_AU1X00_ENET=y
643# CONFIG_SK98LIN is not set 713# CONFIG_SK98LIN is not set
644# CONFIG_TIGON3 is not set 714# CONFIG_TIGON3 is not set
645# CONFIG_BNX2 is not set 715# CONFIG_BNX2 is not set
716CONFIG_QLA3XXX=m
717# CONFIG_ATL1 is not set
646 718
647# 719#
648# Ethernet (10000 Mbit) 720# Ethernet (10000 Mbit)
649# 721#
650# CONFIG_CHELSIO_T1 is not set 722# CONFIG_CHELSIO_T1 is not set
723CONFIG_CHELSIO_T3=m
651# CONFIG_IXGB is not set 724# CONFIG_IXGB is not set
652# CONFIG_S2IO is not set 725# CONFIG_S2IO is not set
653# CONFIG_MYRI10GE is not set 726# CONFIG_MYRI10GE is not set
727CONFIG_NETXEN_NIC=m
654 728
655# 729#
656# Token Ring devices 730# Token Ring devices
@@ -683,6 +757,7 @@ CONFIG_PPP_DEFLATE=m
683CONFIG_PPP_MPPE=m 757CONFIG_PPP_MPPE=m
684CONFIG_PPPOE=m 758CONFIG_PPPOE=m
685# CONFIG_SLIP is not set 759# CONFIG_SLIP is not set
760CONFIG_SLHC=m
686# CONFIG_SHAPER is not set 761# CONFIG_SHAPER is not set
687# CONFIG_NETCONSOLE is not set 762# CONFIG_NETCONSOLE is not set
688# CONFIG_NETPOLL is not set 763# CONFIG_NETPOLL is not set
@@ -702,6 +777,7 @@ CONFIG_PPPOE=m
702# Input device support 777# Input device support
703# 778#
704CONFIG_INPUT=y 779CONFIG_INPUT=y
780# CONFIG_INPUT_FF_MEMLESS is not set
705 781
706# 782#
707# Userland interfaces 783# Userland interfaces
@@ -780,10 +856,6 @@ CONFIG_LEGACY_PTY_COUNT=256
780# CONFIG_DTLK is not set 856# CONFIG_DTLK is not set
781# CONFIG_R3964 is not set 857# CONFIG_R3964 is not set
782# CONFIG_APPLICOM is not set 858# CONFIG_APPLICOM is not set
783
784#
785# Ftape, the floppy tape device driver
786#
787# CONFIG_DRM is not set 859# CONFIG_DRM is not set
788 860
789# 861#
@@ -798,7 +870,6 @@ CONFIG_SYNCLINK_CS=m
798# TPM devices 870# TPM devices
799# 871#
800# CONFIG_TCG_TPM is not set 872# CONFIG_TCG_TPM is not set
801# CONFIG_TELCLOCK is not set
802 873
803# 874#
804# I2C support 875# I2C support
@@ -823,14 +894,9 @@ CONFIG_SYNCLINK_CS=m
823# CONFIG_HWMON_VID is not set 894# CONFIG_HWMON_VID is not set
824 895
825# 896#
826# Misc devices
827#
828
829#
830# Multimedia devices 897# Multimedia devices
831# 898#
832# CONFIG_VIDEO_DEV is not set 899# CONFIG_VIDEO_DEV is not set
833CONFIG_VIDEO_V4L2=y
834 900
835# 901#
836# Digital Video Broadcasting Devices 902# Digital Video Broadcasting Devices
@@ -843,6 +909,7 @@ CONFIG_VIDEO_V4L2=y
843# 909#
844# CONFIG_FIRMWARE_EDID is not set 910# CONFIG_FIRMWARE_EDID is not set
845# CONFIG_FB is not set 911# CONFIG_FB is not set
912# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
846 913
847# 914#
848# Sound 915# Sound
@@ -873,7 +940,6 @@ CONFIG_SND_VERBOSE_PROCFS=y
873# Generic devices 940# Generic devices
874# 941#
875CONFIG_SND_AC97_CODEC=m 942CONFIG_SND_AC97_CODEC=m
876CONFIG_SND_AC97_BUS=m
877# CONFIG_SND_DUMMY is not set 943# CONFIG_SND_DUMMY is not set
878CONFIG_SND_VIRMIDI=m 944CONFIG_SND_VIRMIDI=m
879CONFIG_SND_MTPAV=m 945CONFIG_SND_MTPAV=m
@@ -938,6 +1004,7 @@ CONFIG_SND_MTPAV=m
938# CONFIG_SND_VIA82XX_MODEM is not set 1004# CONFIG_SND_VIA82XX_MODEM is not set
939# CONFIG_SND_VX222 is not set 1005# CONFIG_SND_VX222 is not set
940# CONFIG_SND_YMFPCI is not set 1006# CONFIG_SND_YMFPCI is not set
1007# CONFIG_SND_AC97_POWER_SAVE is not set
941 1008
942# 1009#
943# ALSA MIPS devices 1010# ALSA MIPS devices
@@ -956,18 +1023,28 @@ CONFIG_SND_AU1X00=m
956# CONFIG_SND_PDAUDIOCF is not set 1023# CONFIG_SND_PDAUDIOCF is not set
957 1024
958# 1025#
1026# SoC audio support
1027#
1028# CONFIG_SND_SOC is not set
1029
1030#
959# Open Sound System 1031# Open Sound System
960# 1032#
961CONFIG_SOUND_PRIME=y 1033CONFIG_SOUND_PRIME=y
1034# CONFIG_OBSOLETE_OSS is not set
962# CONFIG_SOUND_BT878 is not set 1035# CONFIG_SOUND_BT878 is not set
963# CONFIG_SOUND_EMU10K1 is not set
964# CONFIG_SOUND_FUSION is not set
965# CONFIG_SOUND_ES1371 is not set
966# CONFIG_SOUND_ICH is not set 1036# CONFIG_SOUND_ICH is not set
967# CONFIG_SOUND_TRIDENT is not set 1037# CONFIG_SOUND_TRIDENT is not set
968# CONFIG_SOUND_MSNDCLAS is not set 1038# CONFIG_SOUND_MSNDCLAS is not set
969# CONFIG_SOUND_MSNDPIN is not set 1039# CONFIG_SOUND_MSNDPIN is not set
970# CONFIG_SOUND_VIA82CXXX is not set 1040# CONFIG_SOUND_VIA82CXXX is not set
1041CONFIG_AC97_BUS=m
1042
1043#
1044# HID Devices
1045#
1046CONFIG_HID=y
1047# CONFIG_HID_DEBUG is not set
971 1048
972# 1049#
973# USB support 1050# USB support
@@ -982,7 +1059,6 @@ CONFIG_USB=y
982# Miscellaneous USB options 1059# Miscellaneous USB options
983# 1060#
984# CONFIG_USB_DEVICEFS is not set 1061# CONFIG_USB_DEVICEFS is not set
985# CONFIG_USB_BANDWIDTH is not set
986# CONFIG_USB_DYNAMIC_MINORS is not set 1062# CONFIG_USB_DYNAMIC_MINORS is not set
987# CONFIG_USB_OTG is not set 1063# CONFIG_USB_OTG is not set
988 1064
@@ -992,7 +1068,8 @@ CONFIG_USB=y
992# CONFIG_USB_EHCI_HCD is not set 1068# CONFIG_USB_EHCI_HCD is not set
993# CONFIG_USB_ISP116X_HCD is not set 1069# CONFIG_USB_ISP116X_HCD is not set
994CONFIG_USB_OHCI_HCD=y 1070CONFIG_USB_OHCI_HCD=y
995# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1071# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1072# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
996CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1073CONFIG_USB_OHCI_LITTLE_ENDIAN=y
997# CONFIG_USB_UHCI_HCD is not set 1074# CONFIG_USB_UHCI_HCD is not set
998# CONFIG_USB_SL811_HCD is not set 1075# CONFIG_USB_SL811_HCD is not set
@@ -1010,14 +1087,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1010# 1087#
1011# may also be needed; see USB_STORAGE Help for more information 1088# may also be needed; see USB_STORAGE Help for more information
1012# 1089#
1013# CONFIG_USB_STORAGE is not set
1014# CONFIG_USB_LIBUSUAL is not set 1090# CONFIG_USB_LIBUSUAL is not set
1015 1091
1016# 1092#
1017# USB Input Devices 1093# USB Input Devices
1018# 1094#
1019CONFIG_USB_HID=y 1095CONFIG_USB_HID=y
1020CONFIG_USB_HIDINPUT=y
1021# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1096# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1022# CONFIG_HID_FF is not set 1097# CONFIG_HID_FF is not set
1023# CONFIG_USB_HIDDEV is not set 1098# CONFIG_USB_HIDDEV is not set
@@ -1033,6 +1108,7 @@ CONFIG_USB_YEALINK=m
1033# CONFIG_USB_ATI_REMOTE2 is not set 1108# CONFIG_USB_ATI_REMOTE2 is not set
1034# CONFIG_USB_KEYSPAN_REMOTE is not set 1109# CONFIG_USB_KEYSPAN_REMOTE is not set
1035# CONFIG_USB_APPLETOUCH is not set 1110# CONFIG_USB_APPLETOUCH is not set
1111# CONFIG_USB_GTCO is not set
1036 1112
1037# 1113#
1038# USB Imaging devices 1114# USB Imaging devices
@@ -1046,6 +1122,7 @@ CONFIG_USB_YEALINK=m
1046# CONFIG_USB_KAWETH is not set 1122# CONFIG_USB_KAWETH is not set
1047# CONFIG_USB_PEGASUS is not set 1123# CONFIG_USB_PEGASUS is not set
1048# CONFIG_USB_RTL8150 is not set 1124# CONFIG_USB_RTL8150 is not set
1125# CONFIG_USB_USBNET_MII is not set
1049# CONFIG_USB_USBNET is not set 1126# CONFIG_USB_USBNET is not set
1050CONFIG_USB_MON=y 1127CONFIG_USB_MON=y
1051 1128
@@ -1063,18 +1140,21 @@ CONFIG_USB_MON=y
1063# 1140#
1064# CONFIG_USB_EMI62 is not set 1141# CONFIG_USB_EMI62 is not set
1065# CONFIG_USB_EMI26 is not set 1142# CONFIG_USB_EMI26 is not set
1143# CONFIG_USB_ADUTUX is not set
1066# CONFIG_USB_AUERSWALD is not set 1144# CONFIG_USB_AUERSWALD is not set
1067# CONFIG_USB_RIO500 is not set 1145# CONFIG_USB_RIO500 is not set
1068# CONFIG_USB_LEGOTOWER is not set 1146# CONFIG_USB_LEGOTOWER is not set
1069# CONFIG_USB_LCD is not set 1147# CONFIG_USB_LCD is not set
1148# CONFIG_USB_BERRY_CHARGE is not set
1070# CONFIG_USB_LED is not set 1149# CONFIG_USB_LED is not set
1071# CONFIG_USB_CY7C63 is not set 1150# CONFIG_USB_CYPRESS_CY7C63 is not set
1072# CONFIG_USB_CYTHERM is not set 1151# CONFIG_USB_CYTHERM is not set
1073# CONFIG_USB_PHIDGETKIT is not set 1152# CONFIG_USB_PHIDGET is not set
1074# CONFIG_USB_PHIDGETSERVO is not set
1075# CONFIG_USB_IDMOUSE is not set 1153# CONFIG_USB_IDMOUSE is not set
1154# CONFIG_USB_FTDI_ELAN is not set
1076# CONFIG_USB_APPLEDISPLAY is not set 1155# CONFIG_USB_APPLEDISPLAY is not set
1077CONFIG_USB_LD=m 1156CONFIG_USB_LD=m
1157# CONFIG_USB_TRANCEVIBRATOR is not set
1078 1158
1079# 1159#
1080# USB DSL modem support 1160# USB DSL modem support
@@ -1131,6 +1211,14 @@ CONFIG_USB_LD=m
1131# 1211#
1132 1212
1133# 1213#
1214# Auxiliary Display support
1215#
1216
1217#
1218# Virtualization
1219#
1220
1221#
1134# File systems 1222# File systems
1135# 1223#
1136CONFIG_EXT2_FS=y 1224CONFIG_EXT2_FS=y
@@ -1142,6 +1230,7 @@ CONFIG_EXT3_FS=y
1142CONFIG_EXT3_FS_XATTR=y 1230CONFIG_EXT3_FS_XATTR=y
1143CONFIG_EXT3_FS_POSIX_ACL=y 1231CONFIG_EXT3_FS_POSIX_ACL=y
1144CONFIG_EXT3_FS_SECURITY=y 1232CONFIG_EXT3_FS_SECURITY=y
1233# CONFIG_EXT4DEV_FS is not set
1145CONFIG_JBD=y 1234CONFIG_JBD=y
1146# CONFIG_JBD_DEBUG is not set 1235# CONFIG_JBD_DEBUG is not set
1147CONFIG_FS_MBCACHE=y 1236CONFIG_FS_MBCACHE=y
@@ -1154,6 +1243,7 @@ CONFIG_REISERFS_FS_SECURITY=y
1154# CONFIG_JFS_FS is not set 1243# CONFIG_JFS_FS is not set
1155CONFIG_FS_POSIX_ACL=y 1244CONFIG_FS_POSIX_ACL=y
1156# CONFIG_XFS_FS is not set 1245# CONFIG_XFS_FS is not set
1246# CONFIG_GFS2_FS is not set
1157# CONFIG_OCFS2_FS is not set 1247# CONFIG_OCFS2_FS is not set
1158# CONFIG_MINIX_FS is not set 1248# CONFIG_MINIX_FS is not set
1159# CONFIG_ROMFS_FS is not set 1249# CONFIG_ROMFS_FS is not set
@@ -1164,6 +1254,7 @@ CONFIG_DNOTIFY=y
1164CONFIG_AUTOFS_FS=m 1254CONFIG_AUTOFS_FS=m
1165CONFIG_AUTOFS4_FS=m 1255CONFIG_AUTOFS4_FS=m
1166CONFIG_FUSE_FS=m 1256CONFIG_FUSE_FS=m
1257CONFIG_GENERIC_ACL=y
1167 1258
1168# 1259#
1169# CD-ROM/DVD Filesystems 1260# CD-ROM/DVD Filesystems
@@ -1183,23 +1274,25 @@ CONFIG_FUSE_FS=m
1183# 1274#
1184CONFIG_PROC_FS=y 1275CONFIG_PROC_FS=y
1185CONFIG_PROC_KCORE=y 1276CONFIG_PROC_KCORE=y
1277CONFIG_PROC_SYSCTL=y
1186CONFIG_SYSFS=y 1278CONFIG_SYSFS=y
1187CONFIG_TMPFS=y 1279CONFIG_TMPFS=y
1280CONFIG_TMPFS_POSIX_ACL=y
1188# CONFIG_HUGETLB_PAGE is not set 1281# CONFIG_HUGETLB_PAGE is not set
1189CONFIG_RAMFS=y 1282CONFIG_RAMFS=y
1190# CONFIG_CONFIGFS_FS is not set 1283CONFIG_CONFIGFS_FS=m
1191 1284
1192# 1285#
1193# Miscellaneous filesystems 1286# Miscellaneous filesystems
1194# 1287#
1195# CONFIG_ADFS_FS is not set 1288# CONFIG_ADFS_FS is not set
1196# CONFIG_AFFS_FS is not set 1289# CONFIG_AFFS_FS is not set
1290# CONFIG_ECRYPT_FS is not set
1197# CONFIG_HFS_FS is not set 1291# CONFIG_HFS_FS is not set
1198# CONFIG_HFSPLUS_FS is not set 1292# CONFIG_HFSPLUS_FS is not set
1199# CONFIG_BEFS_FS is not set 1293# CONFIG_BEFS_FS is not set
1200# CONFIG_BFS_FS is not set 1294# CONFIG_BFS_FS is not set
1201# CONFIG_EFS_FS is not set 1295# CONFIG_EFS_FS is not set
1202# CONFIG_JFFS_FS is not set
1203# CONFIG_JFFS2_FS is not set 1296# CONFIG_JFFS2_FS is not set
1204CONFIG_CRAMFS=m 1297CONFIG_CRAMFS=m
1205# CONFIG_VXFS_FS is not set 1298# CONFIG_VXFS_FS is not set
@@ -1228,7 +1321,6 @@ CONFIG_SUNRPC=y
1228CONFIG_SMB_FS=m 1321CONFIG_SMB_FS=m
1229# CONFIG_SMB_NLS_DEFAULT is not set 1322# CONFIG_SMB_NLS_DEFAULT is not set
1230# CONFIG_CIFS is not set 1323# CONFIG_CIFS is not set
1231# CONFIG_CIFS_DEBUG2 is not set
1232# CONFIG_NCP_FS is not set 1324# CONFIG_NCP_FS is not set
1233# CONFIG_CODA_FS is not set 1325# CONFIG_CODA_FS is not set
1234# CONFIG_AFS_FS is not set 1326# CONFIG_AFS_FS is not set
@@ -1285,6 +1377,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1285# CONFIG_NLS_UTF8 is not set 1377# CONFIG_NLS_UTF8 is not set
1286 1378
1287# 1379#
1380# Distributed Lock Manager
1381#
1382CONFIG_DLM=m
1383CONFIG_DLM_TCP=y
1384# CONFIG_DLM_SCTP is not set
1385# CONFIG_DLM_DEBUG is not set
1386
1387#
1288# Profiling support 1388# Profiling support
1289# 1389#
1290# CONFIG_PROFILING is not set 1390# CONFIG_PROFILING is not set
@@ -1294,13 +1394,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1294# 1394#
1295CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1395CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1296# CONFIG_PRINTK_TIME is not set 1396# CONFIG_PRINTK_TIME is not set
1397CONFIG_ENABLE_MUST_CHECK=y
1297# CONFIG_MAGIC_SYSRQ is not set 1398# CONFIG_MAGIC_SYSRQ is not set
1298# CONFIG_UNUSED_SYMBOLS is not set 1399# CONFIG_UNUSED_SYMBOLS is not set
1400# CONFIG_DEBUG_FS is not set
1401# CONFIG_HEADERS_CHECK is not set
1299# CONFIG_DEBUG_KERNEL is not set 1402# CONFIG_DEBUG_KERNEL is not set
1300CONFIG_LOG_BUF_SHIFT=14 1403CONFIG_LOG_BUF_SHIFT=14
1301# CONFIG_DEBUG_FS is not set
1302CONFIG_CROSSCOMPILE=y 1404CONFIG_CROSSCOMPILE=y
1303CONFIG_CMDLINE="" 1405CONFIG_CMDLINE=""
1406CONFIG_SYS_SUPPORTS_KGDB=y
1304 1407
1305# 1408#
1306# Security options 1409# Security options
@@ -1313,18 +1416,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1313# Cryptographic options 1416# Cryptographic options
1314# 1417#
1315CONFIG_CRYPTO=y 1418CONFIG_CRYPTO=y
1419CONFIG_CRYPTO_ALGAPI=y
1420CONFIG_CRYPTO_BLKCIPHER=m
1421CONFIG_CRYPTO_HASH=y
1422CONFIG_CRYPTO_MANAGER=y
1316CONFIG_CRYPTO_HMAC=y 1423CONFIG_CRYPTO_HMAC=y
1424CONFIG_CRYPTO_XCBC=m
1317CONFIG_CRYPTO_NULL=m 1425CONFIG_CRYPTO_NULL=m
1318CONFIG_CRYPTO_MD4=m 1426CONFIG_CRYPTO_MD4=m
1319CONFIG_CRYPTO_MD5=m 1427CONFIG_CRYPTO_MD5=y
1320CONFIG_CRYPTO_SHA1=m 1428CONFIG_CRYPTO_SHA1=m
1321CONFIG_CRYPTO_SHA256=m 1429CONFIG_CRYPTO_SHA256=m
1322CONFIG_CRYPTO_SHA512=m 1430CONFIG_CRYPTO_SHA512=m
1323CONFIG_CRYPTO_WP512=m 1431CONFIG_CRYPTO_WP512=m
1324CONFIG_CRYPTO_TGR192=m 1432CONFIG_CRYPTO_TGR192=m
1433CONFIG_CRYPTO_GF128MUL=m
1434CONFIG_CRYPTO_ECB=m
1435CONFIG_CRYPTO_CBC=m
1436CONFIG_CRYPTO_PCBC=m
1437CONFIG_CRYPTO_LRW=m
1325CONFIG_CRYPTO_DES=m 1438CONFIG_CRYPTO_DES=m
1439CONFIG_CRYPTO_FCRYPT=m
1326CONFIG_CRYPTO_BLOWFISH=m 1440CONFIG_CRYPTO_BLOWFISH=m
1327CONFIG_CRYPTO_TWOFISH=m 1441CONFIG_CRYPTO_TWOFISH=m
1442CONFIG_CRYPTO_TWOFISH_COMMON=m
1328CONFIG_CRYPTO_SERPENT=m 1443CONFIG_CRYPTO_SERPENT=m
1329CONFIG_CRYPTO_AES=m 1444CONFIG_CRYPTO_AES=m
1330CONFIG_CRYPTO_CAST5=m 1445CONFIG_CRYPTO_CAST5=m
@@ -1336,6 +1451,7 @@ CONFIG_CRYPTO_ANUBIS=m
1336CONFIG_CRYPTO_DEFLATE=m 1451CONFIG_CRYPTO_DEFLATE=m
1337CONFIG_CRYPTO_MICHAEL_MIC=m 1452CONFIG_CRYPTO_MICHAEL_MIC=m
1338CONFIG_CRYPTO_CRC32C=m 1453CONFIG_CRYPTO_CRC32C=m
1454CONFIG_CRYPTO_CAMELLIA=m
1339# CONFIG_CRYPTO_TEST is not set 1455# CONFIG_CRYPTO_TEST is not set
1340 1456
1341# 1457#
@@ -1345,6 +1461,7 @@ CONFIG_CRYPTO_CRC32C=m
1345# 1461#
1346# Library routines 1462# Library routines
1347# 1463#
1464CONFIG_BITREVERSE=y
1348CONFIG_CRC_CCITT=m 1465CONFIG_CRC_CCITT=m
1349CONFIG_CRC16=m 1466CONFIG_CRC16=m
1350CONFIG_CRC32=y 1467CONFIG_CRC32=y
@@ -1356,3 +1473,5 @@ CONFIG_TEXTSEARCH_KMP=m
1356CONFIG_TEXTSEARCH_BM=m 1473CONFIG_TEXTSEARCH_BM=m
1357CONFIG_TEXTSEARCH_FSM=m 1474CONFIG_TEXTSEARCH_FSM=m
1358CONFIG_PLIST=y 1475CONFIG_PLIST=y
1476CONFIG_HAS_IOMEM=y
1477CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index c681c91763aa..5bd3b4328e57 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:59 2006 4# Tue Feb 20 21:47:27 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1550=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_DB1550=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +63,20 @@ CONFIG_MIPS_DB1550=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 76CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
75CONFIG_CPU_LITTLE_ENDIAN=y 78CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_APM_EMULATION=y
76CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
77CONFIG_SOC_AU1550=y 81CONFIG_SOC_AU1550=y
78CONFIG_SOC_AU1X00=y 82CONFIG_SOC_AU1X00=y
@@ -117,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_64BIT_PHYS_ADDR=y 127CONFIG_64BIT_PHYS_ADDR=y
124CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -135,7 +139,8 @@ CONFIG_FLATMEM=y
135CONFIG_FLAT_NODE_MEM_MAP=y 139CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 142CONFIG_RESOURCES_64BIT=y
143CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -148,6 +153,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +172,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 173CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
174CONFIG_RELAY=y 184CONFIG_RELAY=y
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -182,12 +193,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 193CONFIG_BUG=y
183CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 196CONFIG_FUTEX=y
187CONFIG_EPOLL=y 197CONFIG_EPOLL=y
188CONFIG_SHMEM=y 198CONFIG_SHMEM=y
189CONFIG_SLAB=y 199CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -205,6 +216,7 @@ CONFIG_KMOD=y
205# 216#
206# Block layer 217# Block layer
207# 218#
219CONFIG_BLOCK=y
208# CONFIG_LBD is not set 220# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -258,6 +270,10 @@ CONFIG_PCMCIA_AU1X00=m
258CONFIG_BINFMT_ELF=y 270CONFIG_BINFMT_ELF=y
259# CONFIG_BINFMT_MISC is not set 271# CONFIG_BINFMT_MISC is not set
260CONFIG_TRAD_SIGNALS=y 272CONFIG_TRAD_SIGNALS=y
273
274#
275# Power management options
276#
261# CONFIG_PM is not set 277# CONFIG_PM is not set
262 278
263# 279#
@@ -274,7 +290,10 @@ CONFIG_PACKET=y
274CONFIG_UNIX=y 290CONFIG_UNIX=y
275CONFIG_XFRM=y 291CONFIG_XFRM=y
276CONFIG_XFRM_USER=m 292CONFIG_XFRM_USER=m
293# CONFIG_XFRM_SUB_POLICY is not set
294CONFIG_XFRM_MIGRATE=y
277CONFIG_NET_KEY=y 295CONFIG_NET_KEY=y
296CONFIG_NET_KEY_MIGRATE=y
278CONFIG_INET=y 297CONFIG_INET=y
279CONFIG_IP_MULTICAST=y 298CONFIG_IP_MULTICAST=y
280# CONFIG_IP_ADVANCED_ROUTER is not set 299# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -295,10 +314,13 @@ CONFIG_IP_PNP_BOOTP=y
295# CONFIG_INET_TUNNEL is not set 314# CONFIG_INET_TUNNEL is not set
296CONFIG_INET_XFRM_MODE_TRANSPORT=m 315CONFIG_INET_XFRM_MODE_TRANSPORT=m
297CONFIG_INET_XFRM_MODE_TUNNEL=m 316CONFIG_INET_XFRM_MODE_TUNNEL=m
317CONFIG_INET_XFRM_MODE_BEET=m
298CONFIG_INET_DIAG=y 318CONFIG_INET_DIAG=y
299CONFIG_INET_TCP_DIAG=y 319CONFIG_INET_TCP_DIAG=y
300# CONFIG_TCP_CONG_ADVANCED is not set 320# CONFIG_TCP_CONG_ADVANCED is not set
301CONFIG_TCP_CONG_BIC=y 321CONFIG_TCP_CONG_CUBIC=y
322CONFIG_DEFAULT_TCP_CONG="cubic"
323CONFIG_TCP_MD5SIG=y
302 324
303# 325#
304# IP: Virtual Server Configuration 326# IP: Virtual Server Configuration
@@ -317,15 +339,42 @@ CONFIG_NETFILTER=y
317CONFIG_NETFILTER_NETLINK=m 339CONFIG_NETFILTER_NETLINK=m
318CONFIG_NETFILTER_NETLINK_QUEUE=m 340CONFIG_NETFILTER_NETLINK_QUEUE=m
319CONFIG_NETFILTER_NETLINK_LOG=m 341CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_NF_CONNTRACK is not set 342CONFIG_NF_CONNTRACK_ENABLED=m
343CONFIG_NF_CONNTRACK_SUPPORT=y
344# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
345CONFIG_NF_CONNTRACK=m
346CONFIG_NF_CT_ACCT=y
347CONFIG_NF_CONNTRACK_MARK=y
348CONFIG_NF_CONNTRACK_SECMARK=y
349CONFIG_NF_CONNTRACK_EVENTS=y
350CONFIG_NF_CT_PROTO_GRE=m
351CONFIG_NF_CT_PROTO_SCTP=m
352CONFIG_NF_CONNTRACK_AMANDA=m
353CONFIG_NF_CONNTRACK_FTP=m
354CONFIG_NF_CONNTRACK_H323=m
355CONFIG_NF_CONNTRACK_IRC=m
356# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
357CONFIG_NF_CONNTRACK_PPTP=m
358CONFIG_NF_CONNTRACK_SANE=m
359CONFIG_NF_CONNTRACK_SIP=m
360CONFIG_NF_CONNTRACK_TFTP=m
361CONFIG_NF_CT_NETLINK=m
321CONFIG_NETFILTER_XTABLES=m 362CONFIG_NETFILTER_XTABLES=m
322CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 363CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
323CONFIG_NETFILTER_XT_TARGET_MARK=m 364CONFIG_NETFILTER_XT_TARGET_MARK=m
324CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 365CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
366CONFIG_NETFILTER_XT_TARGET_NFLOG=m
325CONFIG_NETFILTER_XT_TARGET_SECMARK=m 367CONFIG_NETFILTER_XT_TARGET_SECMARK=m
368CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
369CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
326CONFIG_NETFILTER_XT_MATCH_COMMENT=m 370CONFIG_NETFILTER_XT_MATCH_COMMENT=m
371CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
372CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
373CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
327CONFIG_NETFILTER_XT_MATCH_DCCP=m 374CONFIG_NETFILTER_XT_MATCH_DCCP=m
375CONFIG_NETFILTER_XT_MATCH_DSCP=m
328CONFIG_NETFILTER_XT_MATCH_ESP=m 376CONFIG_NETFILTER_XT_MATCH_ESP=m
377CONFIG_NETFILTER_XT_MATCH_HELPER=m
329CONFIG_NETFILTER_XT_MATCH_LENGTH=m 378CONFIG_NETFILTER_XT_MATCH_LENGTH=m
330CONFIG_NETFILTER_XT_MATCH_LIMIT=m 379CONFIG_NETFILTER_XT_MATCH_LIMIT=m
331CONFIG_NETFILTER_XT_MATCH_MAC=m 380CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -336,14 +385,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
336CONFIG_NETFILTER_XT_MATCH_QUOTA=m 385CONFIG_NETFILTER_XT_MATCH_QUOTA=m
337CONFIG_NETFILTER_XT_MATCH_REALM=m 386CONFIG_NETFILTER_XT_MATCH_REALM=m
338CONFIG_NETFILTER_XT_MATCH_SCTP=m 387CONFIG_NETFILTER_XT_MATCH_SCTP=m
388CONFIG_NETFILTER_XT_MATCH_STATE=m
339CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 389CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
340CONFIG_NETFILTER_XT_MATCH_STRING=m 390CONFIG_NETFILTER_XT_MATCH_STRING=m
341CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 391CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
392CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
342 393
343# 394#
344# IP: Netfilter Configuration 395# IP: Netfilter Configuration
345# 396#
346# CONFIG_IP_NF_CONNTRACK is not set 397CONFIG_NF_CONNTRACK_IPV4=m
398CONFIG_NF_CONNTRACK_PROC_COMPAT=y
347# CONFIG_IP_NF_QUEUE is not set 399# CONFIG_IP_NF_QUEUE is not set
348# CONFIG_IP_NF_IPTABLES is not set 400# CONFIG_IP_NF_IPTABLES is not set
349# CONFIG_IP_NF_ARPTABLES is not set 401# CONFIG_IP_NF_ARPTABLES is not set
@@ -371,7 +423,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
371# CONFIG_ATALK is not set 423# CONFIG_ATALK is not set
372# CONFIG_X25 is not set 424# CONFIG_X25 is not set
373# CONFIG_LAPB is not set 425# CONFIG_LAPB is not set
374# CONFIG_NET_DIVERT is not set
375# CONFIG_ECONET is not set 426# CONFIG_ECONET is not set
376# CONFIG_WAN_ROUTER is not set 427# CONFIG_WAN_ROUTER is not set
377 428
@@ -427,11 +478,13 @@ CONFIG_MTD_PARTITIONS=y
427# User Modules And Translation Layers 478# User Modules And Translation Layers
428# 479#
429CONFIG_MTD_CHAR=y 480CONFIG_MTD_CHAR=y
481CONFIG_MTD_BLKDEVS=y
430CONFIG_MTD_BLOCK=y 482CONFIG_MTD_BLOCK=y
431# CONFIG_FTL is not set 483# CONFIG_FTL is not set
432# CONFIG_NFTL is not set 484# CONFIG_NFTL is not set
433# CONFIG_INFTL is not set 485# CONFIG_INFTL is not set
434# CONFIG_RFD_FTL is not set 486# CONFIG_RFD_FTL is not set
487# CONFIG_SSFDC is not set
435 488
436# 489#
437# RAM/ROM/Flash chip drivers 490# RAM/ROM/Flash chip drivers
@@ -492,6 +545,7 @@ CONFIG_MTD_NAND=m
492CONFIG_MTD_NAND_IDS=m 545CONFIG_MTD_NAND_IDS=m
493CONFIG_MTD_NAND_AU1550=m 546CONFIG_MTD_NAND_AU1550=m
494# CONFIG_MTD_NAND_DISKONCHIP is not set 547# CONFIG_MTD_NAND_DISKONCHIP is not set
548# CONFIG_MTD_NAND_CAFE is not set
495# CONFIG_MTD_NAND_NANDSIM is not set 549# CONFIG_MTD_NAND_NANDSIM is not set
496 550
497# 551#
@@ -507,6 +561,7 @@ CONFIG_MTD_NAND_AU1550=m
507# 561#
508# Plug and Play support 562# Plug and Play support
509# 563#
564# CONFIG_PNPACPI is not set
510 565
511# 566#
512# Block devices 567# Block devices
@@ -528,9 +583,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
528CONFIG_ATA_OVER_ETH=m 583CONFIG_ATA_OVER_ETH=m
529 584
530# 585#
586# Misc devices
587#
588CONFIG_SGI_IOC4=m
589# CONFIG_TIFM_CORE is not set
590
591#
531# ATA/ATAPI/MFM/RLL support 592# ATA/ATAPI/MFM/RLL support
532# 593#
533CONFIG_IDE=y 594CONFIG_IDE=y
595CONFIG_IDE_MAX_HWIFS=4
534CONFIG_BLK_DEV_IDE=y 596CONFIG_BLK_DEV_IDE=y
535 597
536# 598#
@@ -540,6 +602,7 @@ CONFIG_BLK_DEV_IDE=y
540CONFIG_BLK_DEV_IDEDISK=y 602CONFIG_BLK_DEV_IDEDISK=y
541# CONFIG_IDEDISK_MULTI_MODE is not set 603# CONFIG_IDEDISK_MULTI_MODE is not set
542CONFIG_BLK_DEV_IDECS=m 604CONFIG_BLK_DEV_IDECS=m
605# CONFIG_BLK_DEV_DELKIN is not set
543# CONFIG_BLK_DEV_IDECD is not set 606# CONFIG_BLK_DEV_IDECD is not set
544# CONFIG_BLK_DEV_IDETAPE is not set 607# CONFIG_BLK_DEV_IDETAPE is not set
545# CONFIG_BLK_DEV_IDEFLOPPY is not set 608# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -567,8 +630,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
567# CONFIG_BLK_DEV_CS5530 is not set 630# CONFIG_BLK_DEV_CS5530 is not set
568# CONFIG_BLK_DEV_HPT34X is not set 631# CONFIG_BLK_DEV_HPT34X is not set
569# CONFIG_BLK_DEV_HPT366 is not set 632# CONFIG_BLK_DEV_HPT366 is not set
633# CONFIG_BLK_DEV_JMICRON is not set
570# CONFIG_BLK_DEV_SC1200 is not set 634# CONFIG_BLK_DEV_SC1200 is not set
571# CONFIG_BLK_DEV_PIIX is not set 635# CONFIG_BLK_DEV_PIIX is not set
636CONFIG_BLK_DEV_IT8213=m
572# CONFIG_BLK_DEV_IT821X is not set 637# CONFIG_BLK_DEV_IT821X is not set
573# CONFIG_BLK_DEV_NS87415 is not set 638# CONFIG_BLK_DEV_NS87415 is not set
574# CONFIG_BLK_DEV_PDC202XX_OLD is not set 639# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -578,6 +643,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
578# CONFIG_BLK_DEV_SLC90E66 is not set 643# CONFIG_BLK_DEV_SLC90E66 is not set
579# CONFIG_BLK_DEV_TRM290 is not set 644# CONFIG_BLK_DEV_TRM290 is not set
580# CONFIG_BLK_DEV_VIA82CXXX is not set 645# CONFIG_BLK_DEV_VIA82CXXX is not set
646CONFIG_BLK_DEV_TC86C001=m
581# CONFIG_IDE_ARM is not set 647# CONFIG_IDE_ARM is not set
582CONFIG_BLK_DEV_IDEDMA=y 648CONFIG_BLK_DEV_IDEDMA=y
583# CONFIG_IDEDMA_IVB is not set 649# CONFIG_IDEDMA_IVB is not set
@@ -589,6 +655,12 @@ CONFIG_BLK_DEV_IDEDMA=y
589# 655#
590CONFIG_RAID_ATTRS=m 656CONFIG_RAID_ATTRS=m
591# CONFIG_SCSI is not set 657# CONFIG_SCSI is not set
658# CONFIG_SCSI_NETLINK is not set
659
660#
661# Serial ATA (prod) and Parallel ATA (experimental) drivers
662#
663# CONFIG_ATA is not set
592 664
593# 665#
594# Multi-device support (RAID and LVM) 666# Multi-device support (RAID and LVM)
@@ -639,6 +711,8 @@ CONFIG_LXT_PHY=m
639CONFIG_CICADA_PHY=m 711CONFIG_CICADA_PHY=m
640CONFIG_VITESSE_PHY=m 712CONFIG_VITESSE_PHY=m
641CONFIG_SMSC_PHY=m 713CONFIG_SMSC_PHY=m
714# CONFIG_BROADCOM_PHY is not set
715# CONFIG_FIXED_PHY is not set
642 716
643# 717#
644# Ethernet (10 or 100Mbit) 718# Ethernet (10 or 100Mbit)
@@ -676,14 +750,18 @@ CONFIG_MIPS_AU1X00_ENET=y
676# CONFIG_SK98LIN is not set 750# CONFIG_SK98LIN is not set
677# CONFIG_TIGON3 is not set 751# CONFIG_TIGON3 is not set
678# CONFIG_BNX2 is not set 752# CONFIG_BNX2 is not set
753CONFIG_QLA3XXX=m
754# CONFIG_ATL1 is not set
679 755
680# 756#
681# Ethernet (10000 Mbit) 757# Ethernet (10000 Mbit)
682# 758#
683# CONFIG_CHELSIO_T1 is not set 759# CONFIG_CHELSIO_T1 is not set
760CONFIG_CHELSIO_T3=m
684# CONFIG_IXGB is not set 761# CONFIG_IXGB is not set
685# CONFIG_S2IO is not set 762# CONFIG_S2IO is not set
686# CONFIG_MYRI10GE is not set 763# CONFIG_MYRI10GE is not set
764CONFIG_NETXEN_NIC=m
687 765
688# 766#
689# Token Ring devices 767# Token Ring devices
@@ -724,6 +802,7 @@ CONFIG_PPP_DEFLATE=m
724CONFIG_PPP_MPPE=m 802CONFIG_PPP_MPPE=m
725CONFIG_PPPOE=m 803CONFIG_PPPOE=m
726# CONFIG_SLIP is not set 804# CONFIG_SLIP is not set
805CONFIG_SLHC=m
727# CONFIG_SHAPER is not set 806# CONFIG_SHAPER is not set
728# CONFIG_NETCONSOLE is not set 807# CONFIG_NETCONSOLE is not set
729# CONFIG_NETPOLL is not set 808# CONFIG_NETPOLL is not set
@@ -743,6 +822,7 @@ CONFIG_PPPOE=m
743# Input device support 822# Input device support
744# 823#
745CONFIG_INPUT=y 824CONFIG_INPUT=y
825# CONFIG_INPUT_FF_MEMLESS is not set
746 826
747# 827#
748# Userland interfaces 828# Userland interfaces
@@ -821,10 +901,6 @@ CONFIG_LEGACY_PTY_COUNT=256
821# CONFIG_DTLK is not set 901# CONFIG_DTLK is not set
822# CONFIG_R3964 is not set 902# CONFIG_R3964 is not set
823# CONFIG_APPLICOM is not set 903# CONFIG_APPLICOM is not set
824
825#
826# Ftape, the floppy tape device driver
827#
828# CONFIG_DRM is not set 904# CONFIG_DRM is not set
829 905
830# 906#
@@ -839,7 +915,6 @@ CONFIG_SYNCLINK_CS=m
839# TPM devices 915# TPM devices
840# 916#
841# CONFIG_TCG_TPM is not set 917# CONFIG_TCG_TPM is not set
842# CONFIG_TELCLOCK is not set
843 918
844# 919#
845# I2C support 920# I2C support
@@ -864,14 +939,9 @@ CONFIG_SYNCLINK_CS=m
864# CONFIG_HWMON_VID is not set 939# CONFIG_HWMON_VID is not set
865 940
866# 941#
867# Misc devices
868#
869
870#
871# Multimedia devices 942# Multimedia devices
872# 943#
873# CONFIG_VIDEO_DEV is not set 944# CONFIG_VIDEO_DEV is not set
874CONFIG_VIDEO_V4L2=y
875 945
876# 946#
877# Digital Video Broadcasting Devices 947# Digital Video Broadcasting Devices
@@ -883,6 +953,7 @@ CONFIG_VIDEO_V4L2=y
883# 953#
884# CONFIG_FIRMWARE_EDID is not set 954# CONFIG_FIRMWARE_EDID is not set
885# CONFIG_FB is not set 955# CONFIG_FB is not set
956# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
886 957
887# 958#
888# Sound 959# Sound
@@ -890,6 +961,11 @@ CONFIG_VIDEO_V4L2=y
890# CONFIG_SOUND is not set 961# CONFIG_SOUND is not set
891 962
892# 963#
964# HID Devices
965#
966# CONFIG_HID is not set
967
968#
893# USB support 969# USB support
894# 970#
895CONFIG_USB_ARCH_HAS_HCD=y 971CONFIG_USB_ARCH_HAS_HCD=y
@@ -952,6 +1028,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
952# 1028#
953 1029
954# 1030#
1031# Auxiliary Display support
1032#
1033
1034#
1035# Virtualization
1036#
1037
1038#
955# File systems 1039# File systems
956# 1040#
957CONFIG_EXT2_FS=y 1041CONFIG_EXT2_FS=y
@@ -963,6 +1047,7 @@ CONFIG_EXT3_FS=y
963CONFIG_EXT3_FS_XATTR=y 1047CONFIG_EXT3_FS_XATTR=y
964CONFIG_EXT3_FS_POSIX_ACL=y 1048CONFIG_EXT3_FS_POSIX_ACL=y
965CONFIG_EXT3_FS_SECURITY=y 1049CONFIG_EXT3_FS_SECURITY=y
1050# CONFIG_EXT4DEV_FS is not set
966CONFIG_JBD=y 1051CONFIG_JBD=y
967# CONFIG_JBD_DEBUG is not set 1052# CONFIG_JBD_DEBUG is not set
968CONFIG_FS_MBCACHE=y 1053CONFIG_FS_MBCACHE=y
@@ -975,6 +1060,7 @@ CONFIG_REISERFS_FS_SECURITY=y
975# CONFIG_JFS_FS is not set 1060# CONFIG_JFS_FS is not set
976CONFIG_FS_POSIX_ACL=y 1061CONFIG_FS_POSIX_ACL=y
977# CONFIG_XFS_FS is not set 1062# CONFIG_XFS_FS is not set
1063# CONFIG_GFS2_FS is not set
978# CONFIG_OCFS2_FS is not set 1064# CONFIG_OCFS2_FS is not set
979# CONFIG_MINIX_FS is not set 1065# CONFIG_MINIX_FS is not set
980# CONFIG_ROMFS_FS is not set 1066# CONFIG_ROMFS_FS is not set
@@ -985,6 +1071,7 @@ CONFIG_DNOTIFY=y
985CONFIG_AUTOFS_FS=m 1071CONFIG_AUTOFS_FS=m
986CONFIG_AUTOFS4_FS=m 1072CONFIG_AUTOFS4_FS=m
987CONFIG_FUSE_FS=m 1073CONFIG_FUSE_FS=m
1074CONFIG_GENERIC_ACL=y
988 1075
989# 1076#
990# CD-ROM/DVD Filesystems 1077# CD-ROM/DVD Filesystems
@@ -1004,23 +1091,25 @@ CONFIG_FUSE_FS=m
1004# 1091#
1005CONFIG_PROC_FS=y 1092CONFIG_PROC_FS=y
1006CONFIG_PROC_KCORE=y 1093CONFIG_PROC_KCORE=y
1094CONFIG_PROC_SYSCTL=y
1007CONFIG_SYSFS=y 1095CONFIG_SYSFS=y
1008CONFIG_TMPFS=y 1096CONFIG_TMPFS=y
1097CONFIG_TMPFS_POSIX_ACL=y
1009# CONFIG_HUGETLB_PAGE is not set 1098# CONFIG_HUGETLB_PAGE is not set
1010CONFIG_RAMFS=y 1099CONFIG_RAMFS=y
1011# CONFIG_CONFIGFS_FS is not set 1100CONFIG_CONFIGFS_FS=m
1012 1101
1013# 1102#
1014# Miscellaneous filesystems 1103# Miscellaneous filesystems
1015# 1104#
1016# CONFIG_ADFS_FS is not set 1105# CONFIG_ADFS_FS is not set
1017# CONFIG_AFFS_FS is not set 1106# CONFIG_AFFS_FS is not set
1107# CONFIG_ECRYPT_FS is not set
1018# CONFIG_HFS_FS is not set 1108# CONFIG_HFS_FS is not set
1019# CONFIG_HFSPLUS_FS is not set 1109# CONFIG_HFSPLUS_FS is not set
1020# CONFIG_BEFS_FS is not set 1110# CONFIG_BEFS_FS is not set
1021# CONFIG_BFS_FS is not set 1111# CONFIG_BFS_FS is not set
1022# CONFIG_EFS_FS is not set 1112# CONFIG_EFS_FS is not set
1023# CONFIG_JFFS_FS is not set
1024# CONFIG_JFFS2_FS is not set 1113# CONFIG_JFFS2_FS is not set
1025CONFIG_CRAMFS=m 1114CONFIG_CRAMFS=m
1026# CONFIG_VXFS_FS is not set 1115# CONFIG_VXFS_FS is not set
@@ -1049,7 +1138,6 @@ CONFIG_SUNRPC=y
1049CONFIG_SMB_FS=m 1138CONFIG_SMB_FS=m
1050# CONFIG_SMB_NLS_DEFAULT is not set 1139# CONFIG_SMB_NLS_DEFAULT is not set
1051# CONFIG_CIFS is not set 1140# CONFIG_CIFS is not set
1052# CONFIG_CIFS_DEBUG2 is not set
1053# CONFIG_NCP_FS is not set 1141# CONFIG_NCP_FS is not set
1054# CONFIG_CODA_FS is not set 1142# CONFIG_CODA_FS is not set
1055# CONFIG_AFS_FS is not set 1143# CONFIG_AFS_FS is not set
@@ -1106,6 +1194,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1106# CONFIG_NLS_UTF8 is not set 1194# CONFIG_NLS_UTF8 is not set
1107 1195
1108# 1196#
1197# Distributed Lock Manager
1198#
1199CONFIG_DLM=m
1200CONFIG_DLM_TCP=y
1201# CONFIG_DLM_SCTP is not set
1202# CONFIG_DLM_DEBUG is not set
1203
1204#
1109# Profiling support 1205# Profiling support
1110# 1206#
1111# CONFIG_PROFILING is not set 1207# CONFIG_PROFILING is not set
@@ -1115,13 +1211,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1115# 1211#
1116CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1212CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1117# CONFIG_PRINTK_TIME is not set 1213# CONFIG_PRINTK_TIME is not set
1214CONFIG_ENABLE_MUST_CHECK=y
1118# CONFIG_MAGIC_SYSRQ is not set 1215# CONFIG_MAGIC_SYSRQ is not set
1119# CONFIG_UNUSED_SYMBOLS is not set 1216# CONFIG_UNUSED_SYMBOLS is not set
1217# CONFIG_DEBUG_FS is not set
1218# CONFIG_HEADERS_CHECK is not set
1120# CONFIG_DEBUG_KERNEL is not set 1219# CONFIG_DEBUG_KERNEL is not set
1121CONFIG_LOG_BUF_SHIFT=14 1220CONFIG_LOG_BUF_SHIFT=14
1122# CONFIG_DEBUG_FS is not set
1123CONFIG_CROSSCOMPILE=y 1221CONFIG_CROSSCOMPILE=y
1124CONFIG_CMDLINE="" 1222CONFIG_CMDLINE=""
1223CONFIG_SYS_SUPPORTS_KGDB=y
1125 1224
1126# 1225#
1127# Security options 1226# Security options
@@ -1134,18 +1233,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1134# Cryptographic options 1233# Cryptographic options
1135# 1234#
1136CONFIG_CRYPTO=y 1235CONFIG_CRYPTO=y
1236CONFIG_CRYPTO_ALGAPI=y
1237CONFIG_CRYPTO_BLKCIPHER=m
1238CONFIG_CRYPTO_HASH=y
1239CONFIG_CRYPTO_MANAGER=y
1137CONFIG_CRYPTO_HMAC=y 1240CONFIG_CRYPTO_HMAC=y
1241CONFIG_CRYPTO_XCBC=m
1138CONFIG_CRYPTO_NULL=m 1242CONFIG_CRYPTO_NULL=m
1139CONFIG_CRYPTO_MD4=m 1243CONFIG_CRYPTO_MD4=m
1140CONFIG_CRYPTO_MD5=m 1244CONFIG_CRYPTO_MD5=y
1141CONFIG_CRYPTO_SHA1=m 1245CONFIG_CRYPTO_SHA1=m
1142CONFIG_CRYPTO_SHA256=m 1246CONFIG_CRYPTO_SHA256=m
1143CONFIG_CRYPTO_SHA512=m 1247CONFIG_CRYPTO_SHA512=m
1144CONFIG_CRYPTO_WP512=m 1248CONFIG_CRYPTO_WP512=m
1145CONFIG_CRYPTO_TGR192=m 1249CONFIG_CRYPTO_TGR192=m
1250CONFIG_CRYPTO_GF128MUL=m
1251CONFIG_CRYPTO_ECB=m
1252CONFIG_CRYPTO_CBC=m
1253CONFIG_CRYPTO_PCBC=m
1254CONFIG_CRYPTO_LRW=m
1146CONFIG_CRYPTO_DES=m 1255CONFIG_CRYPTO_DES=m
1256CONFIG_CRYPTO_FCRYPT=m
1147CONFIG_CRYPTO_BLOWFISH=m 1257CONFIG_CRYPTO_BLOWFISH=m
1148CONFIG_CRYPTO_TWOFISH=m 1258CONFIG_CRYPTO_TWOFISH=m
1259CONFIG_CRYPTO_TWOFISH_COMMON=m
1149CONFIG_CRYPTO_SERPENT=m 1260CONFIG_CRYPTO_SERPENT=m
1150CONFIG_CRYPTO_AES=m 1261CONFIG_CRYPTO_AES=m
1151CONFIG_CRYPTO_CAST5=m 1262CONFIG_CRYPTO_CAST5=m
@@ -1157,6 +1268,7 @@ CONFIG_CRYPTO_ANUBIS=m
1157CONFIG_CRYPTO_DEFLATE=m 1268CONFIG_CRYPTO_DEFLATE=m
1158CONFIG_CRYPTO_MICHAEL_MIC=m 1269CONFIG_CRYPTO_MICHAEL_MIC=m
1159CONFIG_CRYPTO_CRC32C=m 1270CONFIG_CRYPTO_CRC32C=m
1271CONFIG_CRYPTO_CAMELLIA=m
1160# CONFIG_CRYPTO_TEST is not set 1272# CONFIG_CRYPTO_TEST is not set
1161 1273
1162# 1274#
@@ -1166,6 +1278,7 @@ CONFIG_CRYPTO_CRC32C=m
1166# 1278#
1167# Library routines 1279# Library routines
1168# 1280#
1281CONFIG_BITREVERSE=y
1169CONFIG_CRC_CCITT=m 1282CONFIG_CRC_CCITT=m
1170CONFIG_CRC16=m 1283CONFIG_CRC16=m
1171CONFIG_CRC32=y 1284CONFIG_CRC32=y
@@ -1177,3 +1290,5 @@ CONFIG_TEXTSEARCH_KMP=m
1177CONFIG_TEXTSEARCH_BM=m 1290CONFIG_TEXTSEARCH_BM=m
1178CONFIG_TEXTSEARCH_FSM=m 1291CONFIG_TEXTSEARCH_FSM=m
1179CONFIG_PLIST=y 1292CONFIG_PLIST=y
1293CONFIG_HAS_IOMEM=y
1294CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index dd4bb0080211..5b502a2013fb 100644
--- a/arch/mips/configs/ddb5477_defconfig
+++ b/arch/mips/configs/ddb5477_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:00 2006 4# Tue Feb 20 21:47:28 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45CONFIG_DDB5477=y 44CONFIG_DDB5477=y
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +64,14 @@ CONFIG_DDB5477=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_DDB5477_BUS_FREQUENCY=0 65CONFIG_DDB5477_BUS_FREQUENCY=0
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
74CONFIG_I8259=y 77CONFIG_I8259=y
@@ -117,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_16KB is not set 120# CONFIG_PAGE_SIZE_16KB is not set
118# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
119CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 127CONFIG_CPU_HAS_SYNC=y
@@ -134,6 +137,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 137# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 138CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 139# CONFIG_RESOURCES_64BIT is not set
140CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 141# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 142# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 143# CONFIG_HZ_128 is not set
@@ -146,6 +150,7 @@ CONFIG_HZ=1000
146CONFIG_PREEMPT_NONE=y 150CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 151# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 152# CONFIG_PREEMPT is not set
153# CONFIG_KEXEC is not set
149CONFIG_LOCKDEP_SUPPORT=y 154CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 155CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -164,15 +169,20 @@ CONFIG_LOCALVERSION=""
164CONFIG_LOCALVERSION_AUTO=y 169CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 170CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 171CONFIG_SYSVIPC=y
172# CONFIG_IPC_NS is not set
173CONFIG_SYSVIPC_SYSCTL=y
167# CONFIG_POSIX_MQUEUE is not set 174# CONFIG_POSIX_MQUEUE is not set
168# CONFIG_BSD_PROCESS_ACCT is not set 175# CONFIG_BSD_PROCESS_ACCT is not set
169CONFIG_SYSCTL=y 176# CONFIG_TASKSTATS is not set
177# CONFIG_UTS_NS is not set
170# CONFIG_AUDIT is not set 178# CONFIG_AUDIT is not set
171# CONFIG_IKCONFIG is not set 179# CONFIG_IKCONFIG is not set
180CONFIG_SYSFS_DEPRECATED=y
172CONFIG_RELAY=y 181CONFIG_RELAY=y
173CONFIG_INITRAMFS_SOURCE=""
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
183CONFIG_SYSCTL=y
175CONFIG_EMBEDDED=y 184CONFIG_EMBEDDED=y
185CONFIG_SYSCTL_SYSCALL=y
176CONFIG_KALLSYMS=y 186CONFIG_KALLSYMS=y
177# CONFIG_KALLSYMS_EXTRA_PASS is not set 187# CONFIG_KALLSYMS_EXTRA_PASS is not set
178CONFIG_HOTPLUG=y 188CONFIG_HOTPLUG=y
@@ -180,12 +190,12 @@ CONFIG_PRINTK=y
180CONFIG_BUG=y 190CONFIG_BUG=y
181CONFIG_ELF_CORE=y 191CONFIG_ELF_CORE=y
182CONFIG_BASE_FULL=y 192CONFIG_BASE_FULL=y
183CONFIG_RT_MUTEXES=y
184CONFIG_FUTEX=y 193CONFIG_FUTEX=y
185CONFIG_EPOLL=y 194CONFIG_EPOLL=y
186CONFIG_SHMEM=y 195CONFIG_SHMEM=y
187CONFIG_SLAB=y 196CONFIG_SLAB=y
188CONFIG_VM_EVENT_COUNTERS=y 197CONFIG_VM_EVENT_COUNTERS=y
198CONFIG_RT_MUTEXES=y
189# CONFIG_TINY_SHMEM is not set 199# CONFIG_TINY_SHMEM is not set
190CONFIG_BASE_SMALL=0 200CONFIG_BASE_SMALL=0
191# CONFIG_SLOB is not set 201# CONFIG_SLOB is not set
@@ -198,6 +208,7 @@ CONFIG_BASE_SMALL=0
198# 208#
199# Block layer 209# Block layer
200# 210#
211CONFIG_BLOCK=y
201# CONFIG_LBD is not set 212# CONFIG_LBD is not set
202# CONFIG_BLK_DEV_IO_TRACE is not set 213# CONFIG_BLK_DEV_IO_TRACE is not set
203# CONFIG_LSF is not set 214# CONFIG_LSF is not set
@@ -240,6 +251,14 @@ CONFIG_BINFMT_ELF=y
240CONFIG_TRAD_SIGNALS=y 251CONFIG_TRAD_SIGNALS=y
241 252
242# 253#
254# Power management options
255#
256CONFIG_PM=y
257# CONFIG_PM_LEGACY is not set
258# CONFIG_PM_DEBUG is not set
259# CONFIG_PM_SYSFS_DEPRECATED is not set
260
261#
243# Networking 262# Networking
244# 263#
245CONFIG_NET=y 264CONFIG_NET=y
@@ -253,7 +272,10 @@ CONFIG_PACKET=y
253CONFIG_UNIX=y 272CONFIG_UNIX=y
254CONFIG_XFRM=y 273CONFIG_XFRM=y
255CONFIG_XFRM_USER=y 274CONFIG_XFRM_USER=y
275# CONFIG_XFRM_SUB_POLICY is not set
276CONFIG_XFRM_MIGRATE=y
256CONFIG_NET_KEY=y 277CONFIG_NET_KEY=y
278CONFIG_NET_KEY_MIGRATE=y
257CONFIG_INET=y 279CONFIG_INET=y
258# CONFIG_IP_MULTICAST is not set 280# CONFIG_IP_MULTICAST is not set
259# CONFIG_IP_ADVANCED_ROUTER is not set 281# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -273,10 +295,13 @@ CONFIG_IP_PNP_BOOTP=y
273# CONFIG_INET_TUNNEL is not set 295# CONFIG_INET_TUNNEL is not set
274CONFIG_INET_XFRM_MODE_TRANSPORT=y 296CONFIG_INET_XFRM_MODE_TRANSPORT=y
275CONFIG_INET_XFRM_MODE_TUNNEL=y 297CONFIG_INET_XFRM_MODE_TUNNEL=y
298CONFIG_INET_XFRM_MODE_BEET=y
276CONFIG_INET_DIAG=y 299CONFIG_INET_DIAG=y
277CONFIG_INET_TCP_DIAG=y 300CONFIG_INET_TCP_DIAG=y
278# CONFIG_TCP_CONG_ADVANCED is not set 301# CONFIG_TCP_CONG_ADVANCED is not set
279CONFIG_TCP_CONG_BIC=y 302CONFIG_TCP_CONG_CUBIC=y
303CONFIG_DEFAULT_TCP_CONG="cubic"
304CONFIG_TCP_MD5SIG=y
280# CONFIG_IPV6 is not set 305# CONFIG_IPV6 is not set
281# CONFIG_INET6_XFRM_TUNNEL is not set 306# CONFIG_INET6_XFRM_TUNNEL is not set
282# CONFIG_INET6_TUNNEL is not set 307# CONFIG_INET6_TUNNEL is not set
@@ -306,7 +331,6 @@ CONFIG_NETWORK_SECMARK=y
306# CONFIG_ATALK is not set 331# CONFIG_ATALK is not set
307# CONFIG_X25 is not set 332# CONFIG_X25 is not set
308# CONFIG_LAPB is not set 333# CONFIG_LAPB is not set
309# CONFIG_NET_DIVERT is not set
310# CONFIG_ECONET is not set 334# CONFIG_ECONET is not set
311# CONFIG_WAN_ROUTER is not set 335# CONFIG_WAN_ROUTER is not set
312 336
@@ -361,6 +385,7 @@ CONFIG_PROC_EVENTS=y
361# 385#
362# Plug and Play support 386# Plug and Play support
363# 387#
388# CONFIG_PNPACPI is not set
364 389
365# 390#
366# Block devices 391# Block devices
@@ -381,6 +406,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
381CONFIG_ATA_OVER_ETH=y 406CONFIG_ATA_OVER_ETH=y
382 407
383# 408#
409# Misc devices
410#
411CONFIG_SGI_IOC4=y
412# CONFIG_TIFM_CORE is not set
413
414#
384# ATA/ATAPI/MFM/RLL support 415# ATA/ATAPI/MFM/RLL support
385# 416#
386# CONFIG_IDE is not set 417# CONFIG_IDE is not set
@@ -390,6 +421,12 @@ CONFIG_ATA_OVER_ETH=y
390# 421#
391CONFIG_RAID_ATTRS=y 422CONFIG_RAID_ATTRS=y
392# CONFIG_SCSI is not set 423# CONFIG_SCSI is not set
424# CONFIG_SCSI_NETLINK is not set
425
426#
427# Serial ATA (prod) and Parallel ATA (experimental) drivers
428#
429# CONFIG_ATA is not set
393 430
394# 431#
395# Multi-device support (RAID and LVM) 432# Multi-device support (RAID and LVM)
@@ -440,6 +477,8 @@ CONFIG_LXT_PHY=y
440CONFIG_CICADA_PHY=y 477CONFIG_CICADA_PHY=y
441CONFIG_VITESSE_PHY=y 478CONFIG_VITESSE_PHY=y
442CONFIG_SMSC_PHY=y 479CONFIG_SMSC_PHY=y
480# CONFIG_BROADCOM_PHY is not set
481# CONFIG_FIXED_PHY is not set
443 482
444# 483#
445# Ethernet (10 or 100Mbit) 484# Ethernet (10 or 100Mbit)
@@ -459,6 +498,7 @@ CONFIG_MII=y
459# CONFIG_HP100 is not set 498# CONFIG_HP100 is not set
460CONFIG_NET_PCI=y 499CONFIG_NET_PCI=y
461CONFIG_PCNET32=y 500CONFIG_PCNET32=y
501# CONFIG_PCNET32_NAPI is not set
462# CONFIG_AMD8111_ETH is not set 502# CONFIG_AMD8111_ETH is not set
463# CONFIG_ADAPTEC_STARFIRE is not set 503# CONFIG_ADAPTEC_STARFIRE is not set
464# CONFIG_B44 is not set 504# CONFIG_B44 is not set
@@ -476,7 +516,7 @@ CONFIG_PCNET32=y
476# CONFIG_SUNDANCE is not set 516# CONFIG_SUNDANCE is not set
477# CONFIG_TLAN is not set 517# CONFIG_TLAN is not set
478# CONFIG_VIA_RHINE is not set 518# CONFIG_VIA_RHINE is not set
479# CONFIG_LAN_SAA9730 is not set 519# CONFIG_SC92031 is not set
480 520
481# 521#
482# Ethernet (1000 Mbit) 522# Ethernet (1000 Mbit)
@@ -495,14 +535,18 @@ CONFIG_PCNET32=y
495# CONFIG_VIA_VELOCITY is not set 535# CONFIG_VIA_VELOCITY is not set
496# CONFIG_TIGON3 is not set 536# CONFIG_TIGON3 is not set
497# CONFIG_BNX2 is not set 537# CONFIG_BNX2 is not set
538CONFIG_QLA3XXX=y
539# CONFIG_ATL1 is not set
498 540
499# 541#
500# Ethernet (10000 Mbit) 542# Ethernet (10000 Mbit)
501# 543#
502# CONFIG_CHELSIO_T1 is not set 544# CONFIG_CHELSIO_T1 is not set
545CONFIG_CHELSIO_T3=y
503# CONFIG_IXGB is not set 546# CONFIG_IXGB is not set
504# CONFIG_S2IO is not set 547# CONFIG_S2IO is not set
505# CONFIG_MYRI10GE is not set 548# CONFIG_MYRI10GE is not set
549CONFIG_NETXEN_NIC=y
506 550
507# 551#
508# Token Ring devices 552# Token Ring devices
@@ -541,6 +585,7 @@ CONFIG_PCNET32=y
541# Input device support 585# Input device support
542# 586#
543CONFIG_INPUT=y 587CONFIG_INPUT=y
588# CONFIG_INPUT_FF_MEMLESS is not set
544 589
545# 590#
546# Userland interfaces 591# Userland interfaces
@@ -618,10 +663,6 @@ CONFIG_LEGACY_PTY_COUNT=256
618# CONFIG_DTLK is not set 663# CONFIG_DTLK is not set
619# CONFIG_R3964 is not set 664# CONFIG_R3964 is not set
620# CONFIG_APPLICOM is not set 665# CONFIG_APPLICOM is not set
621
622#
623# Ftape, the floppy tape device driver
624#
625# CONFIG_DRM is not set 666# CONFIG_DRM is not set
626# CONFIG_RAW_DRIVER is not set 667# CONFIG_RAW_DRIVER is not set
627 668
@@ -629,7 +670,6 @@ CONFIG_LEGACY_PTY_COUNT=256
629# TPM devices 670# TPM devices
630# 671#
631# CONFIG_TCG_TPM is not set 672# CONFIG_TCG_TPM is not set
632# CONFIG_TELCLOCK is not set
633 673
634# 674#
635# I2C support 675# I2C support
@@ -654,14 +694,9 @@ CONFIG_LEGACY_PTY_COUNT=256
654# CONFIG_HWMON_VID is not set 694# CONFIG_HWMON_VID is not set
655 695
656# 696#
657# Misc devices
658#
659
660#
661# Multimedia devices 697# Multimedia devices
662# 698#
663# CONFIG_VIDEO_DEV is not set 699# CONFIG_VIDEO_DEV is not set
664CONFIG_VIDEO_V4L2=y
665 700
666# 701#
667# Digital Video Broadcasting Devices 702# Digital Video Broadcasting Devices
@@ -679,6 +714,7 @@ CONFIG_VIDEO_V4L2=y
679# 714#
680# CONFIG_VGA_CONSOLE is not set 715# CONFIG_VGA_CONSOLE is not set
681CONFIG_DUMMY_CONSOLE=y 716CONFIG_DUMMY_CONSOLE=y
717# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
682 718
683# 719#
684# Sound 720# Sound
@@ -686,6 +722,11 @@ CONFIG_DUMMY_CONSOLE=y
686# CONFIG_SOUND is not set 722# CONFIG_SOUND is not set
687 723
688# 724#
725# HID Devices
726#
727# CONFIG_HID is not set
728
729#
689# USB support 730# USB support
690# 731#
691CONFIG_USB_ARCH_HAS_HCD=y 732CONFIG_USB_ARCH_HAS_HCD=y
@@ -748,16 +789,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
748# 789#
749 790
750# 791#
792# Auxiliary Display support
793#
794
795#
796# Virtualization
797#
798
799#
751# File systems 800# File systems
752# 801#
753CONFIG_EXT2_FS=y 802CONFIG_EXT2_FS=y
754# CONFIG_EXT2_FS_XATTR is not set 803# CONFIG_EXT2_FS_XATTR is not set
755# CONFIG_EXT2_FS_XIP is not set 804# CONFIG_EXT2_FS_XIP is not set
756# CONFIG_EXT3_FS is not set 805# CONFIG_EXT3_FS is not set
806# CONFIG_EXT4DEV_FS is not set
757# CONFIG_REISERFS_FS is not set 807# CONFIG_REISERFS_FS is not set
758# CONFIG_JFS_FS is not set 808# CONFIG_JFS_FS is not set
759# CONFIG_FS_POSIX_ACL is not set 809# CONFIG_FS_POSIX_ACL is not set
760# CONFIG_XFS_FS is not set 810# CONFIG_XFS_FS is not set
811# CONFIG_GFS2_FS is not set
761# CONFIG_OCFS2_FS is not set 812# CONFIG_OCFS2_FS is not set
762# CONFIG_MINIX_FS is not set 813# CONFIG_MINIX_FS is not set
763# CONFIG_ROMFS_FS is not set 814# CONFIG_ROMFS_FS is not set
@@ -787,17 +838,19 @@ CONFIG_FUSE_FS=y
787# 838#
788CONFIG_PROC_FS=y 839CONFIG_PROC_FS=y
789CONFIG_PROC_KCORE=y 840CONFIG_PROC_KCORE=y
841CONFIG_PROC_SYSCTL=y
790CONFIG_SYSFS=y 842CONFIG_SYSFS=y
791# CONFIG_TMPFS is not set 843# CONFIG_TMPFS is not set
792# CONFIG_HUGETLB_PAGE is not set 844# CONFIG_HUGETLB_PAGE is not set
793CONFIG_RAMFS=y 845CONFIG_RAMFS=y
794# CONFIG_CONFIGFS_FS is not set 846CONFIG_CONFIGFS_FS=y
795 847
796# 848#
797# Miscellaneous filesystems 849# Miscellaneous filesystems
798# 850#
799# CONFIG_ADFS_FS is not set 851# CONFIG_ADFS_FS is not set
800# CONFIG_AFFS_FS is not set 852# CONFIG_AFFS_FS is not set
853# CONFIG_ECRYPT_FS is not set
801# CONFIG_HFS_FS is not set 854# CONFIG_HFS_FS is not set
802# CONFIG_HFSPLUS_FS is not set 855# CONFIG_HFSPLUS_FS is not set
803# CONFIG_BEFS_FS is not set 856# CONFIG_BEFS_FS is not set
@@ -829,7 +882,6 @@ CONFIG_SUNRPC=y
829# CONFIG_RPCSEC_GSS_SPKM3 is not set 882# CONFIG_RPCSEC_GSS_SPKM3 is not set
830# CONFIG_SMB_FS is not set 883# CONFIG_SMB_FS is not set
831# CONFIG_CIFS is not set 884# CONFIG_CIFS is not set
832# CONFIG_CIFS_DEBUG2 is not set
833# CONFIG_NCP_FS is not set 885# CONFIG_NCP_FS is not set
834# CONFIG_CODA_FS is not set 886# CONFIG_CODA_FS is not set
835# CONFIG_AFS_FS is not set 887# CONFIG_AFS_FS is not set
@@ -847,6 +899,14 @@ CONFIG_MSDOS_PARTITION=y
847# CONFIG_NLS is not set 899# CONFIG_NLS is not set
848 900
849# 901#
902# Distributed Lock Manager
903#
904CONFIG_DLM=y
905CONFIG_DLM_TCP=y
906# CONFIG_DLM_SCTP is not set
907# CONFIG_DLM_DEBUG is not set
908
909#
850# Profiling support 910# Profiling support
851# 911#
852# CONFIG_PROFILING is not set 912# CONFIG_PROFILING is not set
@@ -856,14 +916,16 @@ CONFIG_MSDOS_PARTITION=y
856# 916#
857CONFIG_TRACE_IRQFLAGS_SUPPORT=y 917CONFIG_TRACE_IRQFLAGS_SUPPORT=y
858# CONFIG_PRINTK_TIME is not set 918# CONFIG_PRINTK_TIME is not set
919CONFIG_ENABLE_MUST_CHECK=y
859# CONFIG_MAGIC_SYSRQ is not set 920# CONFIG_MAGIC_SYSRQ is not set
860# CONFIG_UNUSED_SYMBOLS is not set 921# CONFIG_UNUSED_SYMBOLS is not set
922# CONFIG_DEBUG_FS is not set
923# CONFIG_HEADERS_CHECK is not set
861# CONFIG_DEBUG_KERNEL is not set 924# CONFIG_DEBUG_KERNEL is not set
862CONFIG_LOG_BUF_SHIFT=14 925CONFIG_LOG_BUF_SHIFT=14
863# CONFIG_DEBUG_FS is not set
864# CONFIG_UNWIND_INFO is not set
865CONFIG_CROSSCOMPILE=y 926CONFIG_CROSSCOMPILE=y
866CONFIG_CMDLINE="ip=any" 927CONFIG_CMDLINE="ip=any"
928CONFIG_SYS_SUPPORTS_KGDB=y
867 929
868# 930#
869# Security options 931# Security options
@@ -876,7 +938,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
876# Cryptographic options 938# Cryptographic options
877# 939#
878CONFIG_CRYPTO=y 940CONFIG_CRYPTO=y
941CONFIG_CRYPTO_ALGAPI=y
942CONFIG_CRYPTO_BLKCIPHER=y
943CONFIG_CRYPTO_HASH=y
944CONFIG_CRYPTO_MANAGER=y
879CONFIG_CRYPTO_HMAC=y 945CONFIG_CRYPTO_HMAC=y
946CONFIG_CRYPTO_XCBC=y
880CONFIG_CRYPTO_NULL=y 947CONFIG_CRYPTO_NULL=y
881CONFIG_CRYPTO_MD4=y 948CONFIG_CRYPTO_MD4=y
882CONFIG_CRYPTO_MD5=y 949CONFIG_CRYPTO_MD5=y
@@ -885,9 +952,16 @@ CONFIG_CRYPTO_SHA256=y
885CONFIG_CRYPTO_SHA512=y 952CONFIG_CRYPTO_SHA512=y
886CONFIG_CRYPTO_WP512=y 953CONFIG_CRYPTO_WP512=y
887CONFIG_CRYPTO_TGR192=y 954CONFIG_CRYPTO_TGR192=y
955CONFIG_CRYPTO_GF128MUL=y
956CONFIG_CRYPTO_ECB=y
957CONFIG_CRYPTO_CBC=y
958CONFIG_CRYPTO_PCBC=y
959CONFIG_CRYPTO_LRW=y
888CONFIG_CRYPTO_DES=y 960CONFIG_CRYPTO_DES=y
961CONFIG_CRYPTO_FCRYPT=y
889CONFIG_CRYPTO_BLOWFISH=y 962CONFIG_CRYPTO_BLOWFISH=y
890CONFIG_CRYPTO_TWOFISH=y 963CONFIG_CRYPTO_TWOFISH=y
964CONFIG_CRYPTO_TWOFISH_COMMON=y
891CONFIG_CRYPTO_SERPENT=y 965CONFIG_CRYPTO_SERPENT=y
892CONFIG_CRYPTO_AES=y 966CONFIG_CRYPTO_AES=y
893CONFIG_CRYPTO_CAST5=y 967CONFIG_CRYPTO_CAST5=y
@@ -899,6 +973,7 @@ CONFIG_CRYPTO_ANUBIS=y
899CONFIG_CRYPTO_DEFLATE=y 973CONFIG_CRYPTO_DEFLATE=y
900CONFIG_CRYPTO_MICHAEL_MIC=y 974CONFIG_CRYPTO_MICHAEL_MIC=y
901CONFIG_CRYPTO_CRC32C=y 975CONFIG_CRYPTO_CRC32C=y
976CONFIG_CRYPTO_CAMELLIA=y
902 977
903# 978#
904# Hardware crypto devices 979# Hardware crypto devices
@@ -907,6 +982,7 @@ CONFIG_CRYPTO_CRC32C=y
907# 982#
908# Library routines 983# Library routines
909# 984#
985CONFIG_BITREVERSE=y
910# CONFIG_CRC_CCITT is not set 986# CONFIG_CRC_CCITT is not set
911CONFIG_CRC16=y 987CONFIG_CRC16=y
912CONFIG_CRC32=y 988CONFIG_CRC32=y
@@ -914,3 +990,5 @@ CONFIG_LIBCRC32C=y
914CONFIG_ZLIB_INFLATE=y 990CONFIG_ZLIB_INFLATE=y
915CONFIG_ZLIB_DEFLATE=y 991CONFIG_ZLIB_DEFLATE=y
916CONFIG_PLIST=y 992CONFIG_PLIST=y
993CONFIG_HAS_IOMEM=y
994CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 8a31ce4be12c..4bbdab078ff1 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18 3# Linux kernel version: 2.6.20
4# Tue Oct 3 11:57:53 2006 4# Tue Feb 20 21:47:28 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26CONFIG_MACH_DECSTATION=y 27CONFIG_MACH_DECSTATION=y
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MACH_DECSTATION=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +64,14 @@ CONFIG_MACH_DECSTATION=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_EARLY_PRINTK=y 65CONFIG_EARLY_PRINTK=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
@@ -116,8 +119,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_16KB is not set 119# CONFIG_PAGE_SIZE_16KB is not set
117# CONFIG_PAGE_SIZE_64KB is not set 120# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_MIPS_MT_DISABLED=y 121CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 122# CONFIG_MIPS_MT_SMP is not set
123# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 124# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_CPU_HAS_WB=y 125CONFIG_CPU_HAS_WB=y
123CONFIG_GENERIC_HARDIRQS=y 126CONFIG_GENERIC_HARDIRQS=y
@@ -133,6 +136,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
133# CONFIG_SPARSEMEM_STATIC is not set 136# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4 137CONFIG_SPLIT_PTLOCK_CPUS=4
135# CONFIG_RESOURCES_64BIT is not set 138# CONFIG_RESOURCES_64BIT is not set
139CONFIG_ZONE_DMA_FLAG=1
136# CONFIG_HZ_48 is not set 140# CONFIG_HZ_48 is not set
137# CONFIG_HZ_100 is not set 141# CONFIG_HZ_100 is not set
138CONFIG_HZ_128=y 142CONFIG_HZ_128=y
@@ -147,6 +151,7 @@ CONFIG_HZ=128
147CONFIG_PREEMPT_NONE=y 151CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 152# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 153# CONFIG_PREEMPT is not set
154# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 155CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 156CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,13 +170,16 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 170CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 171CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 172CONFIG_SYSVIPC=y
173# CONFIG_IPC_NS is not set
174CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 175# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 176# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_TASKSTATS is not set 177# CONFIG_TASKSTATS is not set
178# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 179# CONFIG_AUDIT is not set
172# CONFIG_IKCONFIG is not set 180# CONFIG_IKCONFIG is not set
181CONFIG_SYSFS_DEPRECATED=y
173# CONFIG_RELAY is not set 182# CONFIG_RELAY is not set
174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 183# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
176CONFIG_SYSCTL=y 184CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 185CONFIG_EMBEDDED=y
@@ -246,6 +254,14 @@ CONFIG_BINFMT_ELF=y
246CONFIG_TRAD_SIGNALS=y 254CONFIG_TRAD_SIGNALS=y
247 255
248# 256#
257# Power management options
258#
259CONFIG_PM=y
260# CONFIG_PM_LEGACY is not set
261# CONFIG_PM_DEBUG is not set
262# CONFIG_PM_SYSFS_DEPRECATED is not set
263
264#
249# Networking 265# Networking
250# 266#
251CONFIG_NET=y 267CONFIG_NET=y
@@ -260,7 +276,9 @@ CONFIG_UNIX=y
260CONFIG_XFRM=y 276CONFIG_XFRM=y
261# CONFIG_XFRM_USER is not set 277# CONFIG_XFRM_USER is not set
262# CONFIG_XFRM_SUB_POLICY is not set 278# CONFIG_XFRM_SUB_POLICY is not set
279CONFIG_XFRM_MIGRATE=y
263CONFIG_NET_KEY=m 280CONFIG_NET_KEY=m
281CONFIG_NET_KEY_MIGRATE=y
264CONFIG_INET=y 282CONFIG_INET=y
265CONFIG_IP_MULTICAST=y 283CONFIG_IP_MULTICAST=y
266# CONFIG_IP_ADVANCED_ROUTER is not set 284# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -281,11 +299,13 @@ CONFIG_INET_XFRM_TUNNEL=m
281CONFIG_INET_TUNNEL=m 299CONFIG_INET_TUNNEL=m
282CONFIG_INET_XFRM_MODE_TRANSPORT=m 300CONFIG_INET_XFRM_MODE_TRANSPORT=m
283CONFIG_INET_XFRM_MODE_TUNNEL=m 301CONFIG_INET_XFRM_MODE_TUNNEL=m
302CONFIG_INET_XFRM_MODE_BEET=m
284CONFIG_INET_DIAG=y 303CONFIG_INET_DIAG=y
285CONFIG_INET_TCP_DIAG=y 304CONFIG_INET_TCP_DIAG=y
286# CONFIG_TCP_CONG_ADVANCED is not set 305# CONFIG_TCP_CONG_ADVANCED is not set
287CONFIG_TCP_CONG_CUBIC=y 306CONFIG_TCP_CONG_CUBIC=y
288CONFIG_DEFAULT_TCP_CONG="cubic" 307CONFIG_DEFAULT_TCP_CONG="cubic"
308CONFIG_TCP_MD5SIG=y
289CONFIG_IPV6=m 309CONFIG_IPV6=m
290CONFIG_IPV6_PRIVACY=y 310CONFIG_IPV6_PRIVACY=y
291CONFIG_IPV6_ROUTER_PREF=y 311CONFIG_IPV6_ROUTER_PREF=y
@@ -298,10 +318,12 @@ CONFIG_INET6_XFRM_TUNNEL=m
298CONFIG_INET6_TUNNEL=m 318CONFIG_INET6_TUNNEL=m
299CONFIG_INET6_XFRM_MODE_TRANSPORT=m 319CONFIG_INET6_XFRM_MODE_TRANSPORT=m
300CONFIG_INET6_XFRM_MODE_TUNNEL=m 320CONFIG_INET6_XFRM_MODE_TUNNEL=m
321CONFIG_INET6_XFRM_MODE_BEET=m
301CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 322CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
323CONFIG_IPV6_SIT=m
302# CONFIG_IPV6_TUNNEL is not set 324# CONFIG_IPV6_TUNNEL is not set
303CONFIG_IPV6_SUBTREES=y
304CONFIG_IPV6_MULTIPLE_TABLES=y 325CONFIG_IPV6_MULTIPLE_TABLES=y
326CONFIG_IPV6_SUBTREES=y
305CONFIG_NETWORK_SECMARK=y 327CONFIG_NETWORK_SECMARK=y
306# CONFIG_NETFILTER is not set 328# CONFIG_NETFILTER is not set
307 329
@@ -375,6 +397,7 @@ CONFIG_CONNECTOR=m
375# 397#
376# Plug and Play support 398# Plug and Play support
377# 399#
400# CONFIG_PNPACPI is not set
378 401
379# 402#
380# Block devices 403# Block devices
@@ -389,6 +412,10 @@ CONFIG_BLK_DEV_LOOP=m
389# CONFIG_ATA_OVER_ETH is not set 412# CONFIG_ATA_OVER_ETH is not set
390 413
391# 414#
415# Misc devices
416#
417
418#
392# ATA/ATAPI/MFM/RLL support 419# ATA/ATAPI/MFM/RLL support
393# 420#
394# CONFIG_IDE is not set 421# CONFIG_IDE is not set
@@ -398,6 +425,7 @@ CONFIG_BLK_DEV_LOOP=m
398# 425#
399# CONFIG_RAID_ATTRS is not set 426# CONFIG_RAID_ATTRS is not set
400CONFIG_SCSI=y 427CONFIG_SCSI=y
428CONFIG_SCSI_TGT=m
401# CONFIG_SCSI_NETLINK is not set 429# CONFIG_SCSI_NETLINK is not set
402CONFIG_SCSI_PROC_FS=y 430CONFIG_SCSI_PROC_FS=y
403 431
@@ -418,6 +446,7 @@ CONFIG_CHR_DEV_SG=m
418# CONFIG_SCSI_MULTI_LUN is not set 446# CONFIG_SCSI_MULTI_LUN is not set
419CONFIG_SCSI_CONSTANTS=y 447CONFIG_SCSI_CONSTANTS=y
420# CONFIG_SCSI_LOGGING is not set 448# CONFIG_SCSI_LOGGING is not set
449CONFIG_SCSI_SCAN_ASYNC=y
421 450
422# 451#
423# SCSI Transports 452# SCSI Transports
@@ -502,6 +531,9 @@ CONFIG_DECLANCE=y
502# Wan interfaces 531# Wan interfaces
503# 532#
504# CONFIG_WAN is not set 533# CONFIG_WAN is not set
534CONFIG_FDDI=y
535CONFIG_DEFXX=m
536CONFIG_DEFXX_MMIO=y
505# CONFIG_PPP is not set 537# CONFIG_PPP is not set
506# CONFIG_SLIP is not set 538# CONFIG_SLIP is not set
507# CONFIG_SHAPER is not set 539# CONFIG_SHAPER is not set
@@ -565,17 +597,12 @@ CONFIG_LEGACY_PTY_COUNT=256
565CONFIG_RTC=y 597CONFIG_RTC=y
566# CONFIG_DTLK is not set 598# CONFIG_DTLK is not set
567# CONFIG_R3964 is not set 599# CONFIG_R3964 is not set
568
569#
570# Ftape, the floppy tape device driver
571#
572# CONFIG_RAW_DRIVER is not set 600# CONFIG_RAW_DRIVER is not set
573 601
574# 602#
575# TPM devices 603# TPM devices
576# 604#
577# CONFIG_TCG_TPM is not set 605# CONFIG_TCG_TPM is not set
578# CONFIG_TELCLOCK is not set
579 606
580# 607#
581# I2C support 608# I2C support
@@ -600,14 +627,9 @@ CONFIG_RTC=y
600# CONFIG_HWMON_VID is not set 627# CONFIG_HWMON_VID is not set
601 628
602# 629#
603# Misc devices
604#
605
606#
607# Multimedia devices 630# Multimedia devices
608# 631#
609# CONFIG_VIDEO_DEV is not set 632# CONFIG_VIDEO_DEV is not set
610CONFIG_VIDEO_V4L2=y
611 633
612# 634#
613# Digital Video Broadcasting Devices 635# Digital Video Broadcasting Devices
@@ -622,6 +644,7 @@ CONFIG_FB=y
622CONFIG_FB_CFB_FILLRECT=y 644CONFIG_FB_CFB_FILLRECT=y
623CONFIG_FB_CFB_COPYAREA=y 645CONFIG_FB_CFB_COPYAREA=y
624CONFIG_FB_CFB_IMAGEBLIT=y 646CONFIG_FB_CFB_IMAGEBLIT=y
647# CONFIG_FB_SVGALIB is not set
625# CONFIG_FB_MACMODES is not set 648# CONFIG_FB_MACMODES is not set
626# CONFIG_FB_BACKLIGHT is not set 649# CONFIG_FB_BACKLIGHT is not set
627# CONFIG_FB_MODE_HELPERS is not set 650# CONFIG_FB_MODE_HELPERS is not set
@@ -709,6 +732,14 @@ CONFIG_LOGO_DEC_CLUT224=y
709# 732#
710 733
711# 734#
735# Auxiliary Display support
736#
737
738#
739# Virtualization
740#
741
742#
712# File systems 743# File systems
713# 744#
714CONFIG_EXT2_FS=y 745CONFIG_EXT2_FS=y
@@ -720,6 +751,7 @@ CONFIG_EXT3_FS=y
720CONFIG_EXT3_FS_XATTR=y 751CONFIG_EXT3_FS_XATTR=y
721CONFIG_EXT3_FS_POSIX_ACL=y 752CONFIG_EXT3_FS_POSIX_ACL=y
722CONFIG_EXT3_FS_SECURITY=y 753CONFIG_EXT3_FS_SECURITY=y
754# CONFIG_EXT4DEV_FS is not set
723CONFIG_JBD=y 755CONFIG_JBD=y
724# CONFIG_JBD_DEBUG is not set 756# CONFIG_JBD_DEBUG is not set
725CONFIG_FS_MBCACHE=y 757CONFIG_FS_MBCACHE=y
@@ -727,6 +759,7 @@ CONFIG_FS_MBCACHE=y
727# CONFIG_JFS_FS is not set 759# CONFIG_JFS_FS is not set
728CONFIG_FS_POSIX_ACL=y 760CONFIG_FS_POSIX_ACL=y
729# CONFIG_XFS_FS is not set 761# CONFIG_XFS_FS is not set
762# CONFIG_GFS2_FS is not set
730# CONFIG_OCFS2_FS is not set 763# CONFIG_OCFS2_FS is not set
731# CONFIG_MINIX_FS is not set 764# CONFIG_MINIX_FS is not set
732# CONFIG_ROMFS_FS is not set 765# CONFIG_ROMFS_FS is not set
@@ -737,6 +770,7 @@ CONFIG_DNOTIFY=y
737# CONFIG_AUTOFS_FS is not set 770# CONFIG_AUTOFS_FS is not set
738# CONFIG_AUTOFS4_FS is not set 771# CONFIG_AUTOFS4_FS is not set
739CONFIG_FUSE_FS=m 772CONFIG_FUSE_FS=m
773CONFIG_GENERIC_ACL=y
740 774
741# 775#
742# CD-ROM/DVD Filesystems 776# CD-ROM/DVD Filesystems
@@ -806,7 +840,6 @@ CONFIG_SUNRPC=y
806# CONFIG_CODA_FS is not set 840# CONFIG_CODA_FS is not set
807# CONFIG_AFS_FS is not set 841# CONFIG_AFS_FS is not set
808# CONFIG_9P_FS is not set 842# CONFIG_9P_FS is not set
809CONFIG_GENERIC_ACL=y
810 843
811# 844#
812# Partition Types 845# Partition Types
@@ -835,6 +868,14 @@ CONFIG_ULTRIX_PARTITION=y
835# CONFIG_NLS is not set 868# CONFIG_NLS is not set
836 869
837# 870#
871# Distributed Lock Manager
872#
873CONFIG_DLM=m
874CONFIG_DLM_TCP=y
875# CONFIG_DLM_SCTP is not set
876# CONFIG_DLM_DEBUG is not set
877
878#
838# Profiling support 879# Profiling support
839# 880#
840# CONFIG_PROFILING is not set 881# CONFIG_PROFILING is not set
@@ -847,9 +888,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
847CONFIG_ENABLE_MUST_CHECK=y 888CONFIG_ENABLE_MUST_CHECK=y
848CONFIG_MAGIC_SYSRQ=y 889CONFIG_MAGIC_SYSRQ=y
849# CONFIG_UNUSED_SYMBOLS is not set 890# CONFIG_UNUSED_SYMBOLS is not set
891# CONFIG_DEBUG_FS is not set
892# CONFIG_HEADERS_CHECK is not set
850# CONFIG_DEBUG_KERNEL is not set 893# CONFIG_DEBUG_KERNEL is not set
851CONFIG_LOG_BUF_SHIFT=14 894CONFIG_LOG_BUF_SHIFT=14
852# CONFIG_DEBUG_FS is not set
853CONFIG_CROSSCOMPILE=y 895CONFIG_CROSSCOMPILE=y
854CONFIG_CMDLINE="" 896CONFIG_CMDLINE=""
855 897
@@ -866,19 +908,24 @@ CONFIG_CRYPTO=y
866CONFIG_CRYPTO_ALGAPI=y 908CONFIG_CRYPTO_ALGAPI=y
867CONFIG_CRYPTO_BLKCIPHER=m 909CONFIG_CRYPTO_BLKCIPHER=m
868CONFIG_CRYPTO_HASH=y 910CONFIG_CRYPTO_HASH=y
869CONFIG_CRYPTO_MANAGER=m 911CONFIG_CRYPTO_MANAGER=y
870CONFIG_CRYPTO_HMAC=y 912CONFIG_CRYPTO_HMAC=y
913CONFIG_CRYPTO_XCBC=m
871CONFIG_CRYPTO_NULL=m 914CONFIG_CRYPTO_NULL=m
872CONFIG_CRYPTO_MD4=m 915CONFIG_CRYPTO_MD4=m
873CONFIG_CRYPTO_MD5=m 916CONFIG_CRYPTO_MD5=y
874CONFIG_CRYPTO_SHA1=m 917CONFIG_CRYPTO_SHA1=m
875CONFIG_CRYPTO_SHA256=m 918CONFIG_CRYPTO_SHA256=m
876CONFIG_CRYPTO_SHA512=m 919CONFIG_CRYPTO_SHA512=m
877CONFIG_CRYPTO_WP512=m 920CONFIG_CRYPTO_WP512=m
878CONFIG_CRYPTO_TGR192=m 921CONFIG_CRYPTO_TGR192=m
922CONFIG_CRYPTO_GF128MUL=m
879CONFIG_CRYPTO_ECB=m 923CONFIG_CRYPTO_ECB=m
880CONFIG_CRYPTO_CBC=m 924CONFIG_CRYPTO_CBC=m
925CONFIG_CRYPTO_PCBC=m
926CONFIG_CRYPTO_LRW=m
881CONFIG_CRYPTO_DES=m 927CONFIG_CRYPTO_DES=m
928CONFIG_CRYPTO_FCRYPT=m
882CONFIG_CRYPTO_BLOWFISH=m 929CONFIG_CRYPTO_BLOWFISH=m
883CONFIG_CRYPTO_TWOFISH=m 930CONFIG_CRYPTO_TWOFISH=m
884CONFIG_CRYPTO_TWOFISH_COMMON=m 931CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -893,6 +940,7 @@ CONFIG_CRYPTO_ANUBIS=m
893CONFIG_CRYPTO_DEFLATE=m 940CONFIG_CRYPTO_DEFLATE=m
894CONFIG_CRYPTO_MICHAEL_MIC=m 941CONFIG_CRYPTO_MICHAEL_MIC=m
895CONFIG_CRYPTO_CRC32C=m 942CONFIG_CRYPTO_CRC32C=m
943CONFIG_CRYPTO_CAMELLIA=m
896# CONFIG_CRYPTO_TEST is not set 944# CONFIG_CRYPTO_TEST is not set
897 945
898# 946#
@@ -902,6 +950,7 @@ CONFIG_CRYPTO_CRC32C=m
902# 950#
903# Library routines 951# Library routines
904# 952#
953CONFIG_BITREVERSE=y
905# CONFIG_CRC_CCITT is not set 954# CONFIG_CRC_CCITT is not set
906# CONFIG_CRC16 is not set 955# CONFIG_CRC16 is not set
907CONFIG_CRC32=y 956CONFIG_CRC32=y
@@ -909,3 +958,5 @@ CONFIG_LIBCRC32C=m
909CONFIG_ZLIB_INFLATE=m 958CONFIG_ZLIB_INFLATE=m
910CONFIG_ZLIB_DEFLATE=m 959CONFIG_ZLIB_DEFLATE=m
911CONFIG_PLIST=y 960CONFIG_PLIST=y
961CONFIG_HAS_IOMEM=y
962CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 6fa4f914f6e4..b5714a6a5398 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc2 3# Linux kernel version: 2.6.20
4# Tue Jul 25 23:15:03 2006 4# Tue Feb 20 21:47:28 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 45CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -70,10 +69,14 @@ CONFIG_CASIO_E55=y
70# CONFIG_VICTOR_MPC30X is not set 69# CONFIG_VICTOR_MPC30X is not set
71# CONFIG_ZAO_CAPCELLA is not set 70# CONFIG_ZAO_CAPCELLA is not set
72CONFIG_RWSEM_GENERIC_SPINLOCK=y 71CONFIG_RWSEM_GENERIC_SPINLOCK=y
72# CONFIG_ARCH_HAS_ILOG2_U32 is not set
73# CONFIG_ARCH_HAS_ILOG2_U64 is not set
73CONFIG_GENERIC_FIND_NEXT_BIT=y 74CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y 75CONFIG_GENERIC_HWEIGHT=y
75CONFIG_GENERIC_CALIBRATE_DELAY=y 76CONFIG_GENERIC_CALIBRATE_DELAY=y
77CONFIG_GENERIC_TIME=y
76CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 78CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
79CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
77CONFIG_DMA_NONCOHERENT=y 80CONFIG_DMA_NONCOHERENT=y
78CONFIG_DMA_NEED_PCI_MAP_STATE=y 81CONFIG_DMA_NEED_PCI_MAP_STATE=y
79# CONFIG_CPU_BIG_ENDIAN is not set 82# CONFIG_CPU_BIG_ENDIAN is not set
@@ -106,6 +109,7 @@ CONFIG_CPU_VR41XX=y
106# CONFIG_CPU_SB1 is not set 109# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_VR41XX=y 110CONFIG_SYS_HAS_CPU_VR41XX=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 111CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
112CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
111 115
@@ -119,8 +123,8 @@ CONFIG_PAGE_SIZE_4KB=y
119# CONFIG_PAGE_SIZE_16KB is not set 123# CONFIG_PAGE_SIZE_16KB is not set
120# CONFIG_PAGE_SIZE_64KB is not set 124# CONFIG_PAGE_SIZE_64KB is not set
121CONFIG_MIPS_MT_DISABLED=y 125CONFIG_MIPS_MT_DISABLED=y
122# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_MT_SMP is not set 126# CONFIG_MIPS_MT_SMP is not set
127# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_VPE_LOADER is not set 128# CONFIG_MIPS_VPE_LOADER is not set
125CONFIG_CPU_HAS_SYNC=y 129CONFIG_CPU_HAS_SYNC=y
126CONFIG_GENERIC_HARDIRQS=y 130CONFIG_GENERIC_HARDIRQS=y
@@ -135,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -147,6 +152,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,13 +171,17 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 172CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_BSD_PROCESS_ACCT is not set 176# CONFIG_BSD_PROCESS_ACCT is not set
169CONFIG_SYSCTL=y 177# CONFIG_UTS_NS is not set
170# CONFIG_IKCONFIG is not set 178# CONFIG_IKCONFIG is not set
179CONFIG_SYSFS_DEPRECATED=y
171# CONFIG_RELAY is not set 180# CONFIG_RELAY is not set
172CONFIG_INITRAMFS_SOURCE=""
173# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 181# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
182CONFIG_SYSCTL=y
174CONFIG_EMBEDDED=y 183CONFIG_EMBEDDED=y
184CONFIG_SYSCTL_SYSCALL=y
175CONFIG_KALLSYMS=y 185CONFIG_KALLSYMS=y
176# CONFIG_KALLSYMS_EXTRA_PASS is not set 186# CONFIG_KALLSYMS_EXTRA_PASS is not set
177# CONFIG_HOTPLUG is not set 187# CONFIG_HOTPLUG is not set
@@ -179,12 +189,12 @@ CONFIG_PRINTK=y
179CONFIG_BUG=y 189CONFIG_BUG=y
180CONFIG_ELF_CORE=y 190CONFIG_ELF_CORE=y
181CONFIG_BASE_FULL=y 191CONFIG_BASE_FULL=y
182CONFIG_RT_MUTEXES=y
183CONFIG_FUTEX=y 192CONFIG_FUTEX=y
184CONFIG_EPOLL=y 193CONFIG_EPOLL=y
185CONFIG_SHMEM=y 194CONFIG_SHMEM=y
186CONFIG_SLAB=y 195CONFIG_SLAB=y
187CONFIG_VM_EVENT_COUNTERS=y 196CONFIG_VM_EVENT_COUNTERS=y
197CONFIG_RT_MUTEXES=y
188# CONFIG_TINY_SHMEM is not set 198# CONFIG_TINY_SHMEM is not set
189CONFIG_BASE_SMALL=0 199CONFIG_BASE_SMALL=0
190# CONFIG_SLOB is not set 200# CONFIG_SLOB is not set
@@ -202,6 +212,7 @@ CONFIG_KMOD=y
202# 212#
203# Block layer 213# Block layer
204# 214#
215CONFIG_BLOCK=y
205# CONFIG_LBD is not set 216# CONFIG_LBD is not set
206# CONFIG_BLK_DEV_IO_TRACE is not set 217# CONFIG_BLK_DEV_IO_TRACE is not set
207# CONFIG_LSF is not set 218# CONFIG_LSF is not set
@@ -241,6 +252,14 @@ CONFIG_BINFMT_ELF=y
241CONFIG_TRAD_SIGNALS=y 252CONFIG_TRAD_SIGNALS=y
242 253
243# 254#
255# Power management options
256#
257CONFIG_PM=y
258# CONFIG_PM_LEGACY is not set
259# CONFIG_PM_DEBUG is not set
260# CONFIG_PM_SYSFS_DEPRECATED is not set
261
262#
244# Networking 263# Networking
245# 264#
246# CONFIG_NET is not set 265# CONFIG_NET is not set
@@ -274,6 +293,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
274# Plug and Play support 293# Plug and Play support
275# 294#
276# CONFIG_PNP is not set 295# CONFIG_PNP is not set
296# CONFIG_PNPACPI is not set
277 297
278# 298#
279# Block devices 299# Block devices
@@ -288,9 +308,14 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
288# CONFIG_CDROM_PKTCDVD is not set 308# CONFIG_CDROM_PKTCDVD is not set
289 309
290# 310#
311# Misc devices
312#
313
314#
291# ATA/ATAPI/MFM/RLL support 315# ATA/ATAPI/MFM/RLL support
292# 316#
293CONFIG_IDE=y 317CONFIG_IDE=y
318CONFIG_IDE_MAX_HWIFS=4
294CONFIG_BLK_DEV_IDE=y 319CONFIG_BLK_DEV_IDE=y
295 320
296# 321#
@@ -319,6 +344,12 @@ CONFIG_IDE_GENERIC=y
319# 344#
320# CONFIG_RAID_ATTRS is not set 345# CONFIG_RAID_ATTRS is not set
321# CONFIG_SCSI is not set 346# CONFIG_SCSI is not set
347# CONFIG_SCSI_NETLINK is not set
348
349#
350# Serial ATA (prod) and Parallel ATA (experimental) drivers
351#
352# CONFIG_ATA is not set
322 353
323# 354#
324# Old CD-ROM drivers (not SCSI, not IDE) 355# Old CD-ROM drivers (not SCSI, not IDE)
@@ -356,6 +387,7 @@ CONFIG_IDE_GENERIC=y
356# Input device support 387# Input device support
357# 388#
358CONFIG_INPUT=y 389CONFIG_INPUT=y
390# CONFIG_INPUT_FF_MEMLESS is not set
359 391
360# 392#
361# Userland interfaces 393# Userland interfaces
@@ -436,10 +468,6 @@ CONFIG_WATCHDOG=y
436# CONFIG_GEN_RTC is not set 468# CONFIG_GEN_RTC is not set
437# CONFIG_DTLK is not set 469# CONFIG_DTLK is not set
438# CONFIG_R3964 is not set 470# CONFIG_R3964 is not set
439
440#
441# Ftape, the floppy tape device driver
442#
443CONFIG_GPIO_VR41XX=y 471CONFIG_GPIO_VR41XX=y
444# CONFIG_RAW_DRIVER is not set 472# CONFIG_RAW_DRIVER is not set
445 473
@@ -447,7 +475,6 @@ CONFIG_GPIO_VR41XX=y
447# TPM devices 475# TPM devices
448# 476#
449# CONFIG_TCG_TPM is not set 477# CONFIG_TCG_TPM is not set
450# CONFIG_TELCLOCK is not set
451 478
452# 479#
453# I2C support 480# I2C support
@@ -463,6 +490,7 @@ CONFIG_GPIO_VR41XX=y
463# 490#
464# Dallas's 1-wire bus 491# Dallas's 1-wire bus
465# 492#
493# CONFIG_W1 is not set
466 494
467# 495#
468# Hardware Monitoring support 496# Hardware Monitoring support
@@ -471,14 +499,9 @@ CONFIG_GPIO_VR41XX=y
471# CONFIG_HWMON_VID is not set 499# CONFIG_HWMON_VID is not set
472 500
473# 501#
474# Misc devices
475#
476
477#
478# Multimedia devices 502# Multimedia devices
479# 503#
480# CONFIG_VIDEO_DEV is not set 504# CONFIG_VIDEO_DEV is not set
481CONFIG_VIDEO_V4L2=y
482 505
483# 506#
484# Digital Video Broadcasting Devices 507# Digital Video Broadcasting Devices
@@ -496,6 +519,7 @@ CONFIG_VIDEO_V4L2=y
496# CONFIG_VGA_CONSOLE is not set 519# CONFIG_VGA_CONSOLE is not set
497# CONFIG_MDA_CONSOLE is not set 520# CONFIG_MDA_CONSOLE is not set
498CONFIG_DUMMY_CONSOLE=y 521CONFIG_DUMMY_CONSOLE=y
522# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
499 523
500# 524#
501# Sound 525# Sound
@@ -503,6 +527,12 @@ CONFIG_DUMMY_CONSOLE=y
503# CONFIG_SOUND is not set 527# CONFIG_SOUND is not set
504 528
505# 529#
530# HID Devices
531#
532CONFIG_HID=y
533# CONFIG_HID_DEBUG is not set
534
535#
506# USB support 536# USB support
507# 537#
508# CONFIG_USB_ARCH_HAS_HCD is not set 538# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -563,16 +593,26 @@ CONFIG_DUMMY_CONSOLE=y
563# 593#
564 594
565# 595#
596# Auxiliary Display support
597#
598
599#
600# Virtualization
601#
602
603#
566# File systems 604# File systems
567# 605#
568CONFIG_EXT2_FS=y 606CONFIG_EXT2_FS=y
569# CONFIG_EXT2_FS_XATTR is not set 607# CONFIG_EXT2_FS_XATTR is not set
570# CONFIG_EXT2_FS_XIP is not set 608# CONFIG_EXT2_FS_XIP is not set
571# CONFIG_EXT3_FS is not set 609# CONFIG_EXT3_FS is not set
610# CONFIG_EXT4DEV_FS is not set
572# CONFIG_REISERFS_FS is not set 611# CONFIG_REISERFS_FS is not set
573# CONFIG_JFS_FS is not set 612# CONFIG_JFS_FS is not set
574# CONFIG_FS_POSIX_ACL is not set 613CONFIG_FS_POSIX_ACL=y
575# CONFIG_XFS_FS is not set 614# CONFIG_XFS_FS is not set
615# CONFIG_GFS2_FS is not set
576# CONFIG_MINIX_FS is not set 616# CONFIG_MINIX_FS is not set
577# CONFIG_ROMFS_FS is not set 617# CONFIG_ROMFS_FS is not set
578CONFIG_INOTIFY=y 618CONFIG_INOTIFY=y
@@ -582,6 +622,7 @@ CONFIG_DNOTIFY=y
582# CONFIG_AUTOFS_FS is not set 622# CONFIG_AUTOFS_FS is not set
583CONFIG_AUTOFS4_FS=y 623CONFIG_AUTOFS4_FS=y
584CONFIG_FUSE_FS=m 624CONFIG_FUSE_FS=m
625CONFIG_GENERIC_ACL=y
585 626
586# 627#
587# CD-ROM/DVD Filesystems 628# CD-ROM/DVD Filesystems
@@ -601,8 +642,10 @@ CONFIG_FUSE_FS=m
601# 642#
602CONFIG_PROC_FS=y 643CONFIG_PROC_FS=y
603CONFIG_PROC_KCORE=y 644CONFIG_PROC_KCORE=y
645CONFIG_PROC_SYSCTL=y
604CONFIG_SYSFS=y 646CONFIG_SYSFS=y
605CONFIG_TMPFS=y 647CONFIG_TMPFS=y
648CONFIG_TMPFS_POSIX_ACL=y
606# CONFIG_HUGETLB_PAGE is not set 649# CONFIG_HUGETLB_PAGE is not set
607CONFIG_RAMFS=y 650CONFIG_RAMFS=y
608# CONFIG_CONFIGFS_FS is not set 651# CONFIG_CONFIGFS_FS is not set
@@ -645,11 +688,13 @@ CONFIG_MSDOS_PARTITION=y
645# 688#
646CONFIG_TRACE_IRQFLAGS_SUPPORT=y 689CONFIG_TRACE_IRQFLAGS_SUPPORT=y
647# CONFIG_PRINTK_TIME is not set 690# CONFIG_PRINTK_TIME is not set
691CONFIG_ENABLE_MUST_CHECK=y
648# CONFIG_MAGIC_SYSRQ is not set 692# CONFIG_MAGIC_SYSRQ is not set
649# CONFIG_UNUSED_SYMBOLS is not set 693# CONFIG_UNUSED_SYMBOLS is not set
694# CONFIG_DEBUG_FS is not set
695# CONFIG_HEADERS_CHECK is not set
650# CONFIG_DEBUG_KERNEL is not set 696# CONFIG_DEBUG_KERNEL is not set
651CONFIG_LOG_BUF_SHIFT=14 697CONFIG_LOG_BUF_SHIFT=14
652# CONFIG_DEBUG_FS is not set
653CONFIG_CROSSCOMPILE=y 698CONFIG_CROSSCOMPILE=y
654CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" 699CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
655 700
@@ -665,10 +710,6 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
665# CONFIG_CRYPTO is not set 710# CONFIG_CRYPTO is not set
666 711
667# 712#
668# Hardware crypto devices
669#
670
671#
672# Library routines 713# Library routines
673# 714#
674# CONFIG_CRC_CCITT is not set 715# CONFIG_CRC_CCITT is not set
@@ -676,3 +717,5 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
676# CONFIG_CRC32 is not set 717# CONFIG_CRC32 is not set
677# CONFIG_LIBCRC32C is not set 718# CONFIG_LIBCRC32C is not set
678CONFIG_PLIST=y 719CONFIG_PLIST=y
720CONFIG_HAS_IOMEM=y
721CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig
index 4c9d0405a5df..3044579f171a 100644
--- a/arch/mips/configs/emma2rh_defconfig
+++ b/arch/mips/configs/emma2rh_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:05 2006 4# Tue Feb 20 21:47:29 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_MARKEINS=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
@@ -116,8 +119,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_16KB is not set 119# CONFIG_PAGE_SIZE_16KB is not set
117# CONFIG_PAGE_SIZE_64KB is not set 120# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_MIPS_MT_DISABLED=y 121CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 122# CONFIG_MIPS_MT_SMP is not set
123# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 124# CONFIG_MIPS_VPE_LOADER is not set
122# CONFIG_64BIT_PHYS_ADDR is not set 125# CONFIG_64BIT_PHYS_ADDR is not set
123CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
@@ -134,6 +137,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 137# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 138CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 139# CONFIG_RESOURCES_64BIT is not set
140CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 141# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 142# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 143# CONFIG_HZ_128 is not set
@@ -147,6 +151,7 @@ CONFIG_HZ=1000
147# CONFIG_PREEMPT_VOLUNTARY is not set 151# CONFIG_PREEMPT_VOLUNTARY is not set
148CONFIG_PREEMPT=y 152CONFIG_PREEMPT=y
149CONFIG_PREEMPT_BKL=y 153CONFIG_PREEMPT_BKL=y
154# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 155CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 156CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,17 +171,22 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 172CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
169CONFIG_POSIX_MQUEUE=y 176CONFIG_POSIX_MQUEUE=y
170CONFIG_BSD_PROCESS_ACCT=y 177CONFIG_BSD_PROCESS_ACCT=y
171# CONFIG_BSD_PROCESS_ACCT_V3 is not set 178# CONFIG_BSD_PROCESS_ACCT_V3 is not set
172CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
173# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
174CONFIG_IKCONFIG=y 182CONFIG_IKCONFIG=y
175CONFIG_IKCONFIG_PROC=y 183CONFIG_IKCONFIG_PROC=y
184CONFIG_SYSFS_DEPRECATED=y
176# CONFIG_RELAY is not set 185# CONFIG_RELAY is not set
177CONFIG_INITRAMFS_SOURCE=""
178# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
179CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
180CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
181# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
182CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -184,12 +194,12 @@ CONFIG_PRINTK=y
184CONFIG_BUG=y 194CONFIG_BUG=y
185CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
186CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
187CONFIG_RT_MUTEXES=y
188CONFIG_FUTEX=y 197CONFIG_FUTEX=y
189CONFIG_EPOLL=y 198CONFIG_EPOLL=y
190CONFIG_SHMEM=y 199CONFIG_SHMEM=y
191CONFIG_SLAB=y 200CONFIG_SLAB=y
192CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
193# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
195# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -207,6 +217,7 @@ CONFIG_KMOD=y
207# 217#
208# Block layer 218# Block layer
209# 219#
220CONFIG_BLOCK=y
210CONFIG_LBD=y 221CONFIG_LBD=y
211# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
212# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -249,6 +260,14 @@ CONFIG_BINFMT_ELF=y
249CONFIG_TRAD_SIGNALS=y 260CONFIG_TRAD_SIGNALS=y
250 261
251# 262#
263# Power management options
264#
265CONFIG_PM=y
266# CONFIG_PM_LEGACY is not set
267# CONFIG_PM_DEBUG is not set
268# CONFIG_PM_SYSFS_DEPRECATED is not set
269
270#
252# Networking 271# Networking
253# 272#
254CONFIG_NET=y 273CONFIG_NET=y
@@ -262,7 +281,10 @@ CONFIG_PACKET_MMAP=y
262CONFIG_UNIX=y 281CONFIG_UNIX=y
263CONFIG_XFRM=y 282CONFIG_XFRM=y
264# CONFIG_XFRM_USER is not set 283# CONFIG_XFRM_USER is not set
284# CONFIG_XFRM_SUB_POLICY is not set
285CONFIG_XFRM_MIGRATE=y
265CONFIG_NET_KEY=y 286CONFIG_NET_KEY=y
287CONFIG_NET_KEY_MIGRATE=y
266CONFIG_INET=y 288CONFIG_INET=y
267CONFIG_IP_MULTICAST=y 289CONFIG_IP_MULTICAST=y
268CONFIG_IP_ADVANCED_ROUTER=y 290CONFIG_IP_ADVANCED_ROUTER=y
@@ -270,7 +292,6 @@ CONFIG_ASK_IP_FIB_HASH=y
270# CONFIG_IP_FIB_TRIE is not set 292# CONFIG_IP_FIB_TRIE is not set
271CONFIG_IP_FIB_HASH=y 293CONFIG_IP_FIB_HASH=y
272CONFIG_IP_MULTIPLE_TABLES=y 294CONFIG_IP_MULTIPLE_TABLES=y
273# CONFIG_IP_ROUTE_FWMARK is not set
274CONFIG_IP_ROUTE_MULTIPATH=y 295CONFIG_IP_ROUTE_MULTIPATH=y
275# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set 296# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
276CONFIG_IP_ROUTE_VERBOSE=y 297CONFIG_IP_ROUTE_VERBOSE=y
@@ -287,13 +308,16 @@ CONFIG_SYN_COOKIES=y
287# CONFIG_INET_ESP is not set 308# CONFIG_INET_ESP is not set
288# CONFIG_INET_IPCOMP is not set 309# CONFIG_INET_IPCOMP is not set
289# CONFIG_INET_XFRM_TUNNEL is not set 310# CONFIG_INET_XFRM_TUNNEL is not set
290# CONFIG_INET_TUNNEL is not set 311CONFIG_INET_TUNNEL=m
291CONFIG_INET_XFRM_MODE_TRANSPORT=m 312CONFIG_INET_XFRM_MODE_TRANSPORT=m
292CONFIG_INET_XFRM_MODE_TUNNEL=m 313CONFIG_INET_XFRM_MODE_TUNNEL=m
314CONFIG_INET_XFRM_MODE_BEET=m
293CONFIG_INET_DIAG=y 315CONFIG_INET_DIAG=y
294CONFIG_INET_TCP_DIAG=y 316CONFIG_INET_TCP_DIAG=y
295# CONFIG_TCP_CONG_ADVANCED is not set 317# CONFIG_TCP_CONG_ADVANCED is not set
296CONFIG_TCP_CONG_BIC=y 318CONFIG_TCP_CONG_CUBIC=y
319CONFIG_DEFAULT_TCP_CONG="cubic"
320CONFIG_TCP_MD5SIG=y
297 321
298# 322#
299# IP: Virtual Server Configuration 323# IP: Virtual Server Configuration
@@ -305,11 +329,17 @@ CONFIG_IPV6=m
305# CONFIG_INET6_AH is not set 329# CONFIG_INET6_AH is not set
306# CONFIG_INET6_ESP is not set 330# CONFIG_INET6_ESP is not set
307# CONFIG_INET6_IPCOMP is not set 331# CONFIG_INET6_IPCOMP is not set
332CONFIG_IPV6_MIP6=y
308# CONFIG_INET6_XFRM_TUNNEL is not set 333# CONFIG_INET6_XFRM_TUNNEL is not set
309# CONFIG_INET6_TUNNEL is not set 334# CONFIG_INET6_TUNNEL is not set
310CONFIG_INET6_XFRM_MODE_TRANSPORT=m 335CONFIG_INET6_XFRM_MODE_TRANSPORT=m
311CONFIG_INET6_XFRM_MODE_TUNNEL=m 336CONFIG_INET6_XFRM_MODE_TUNNEL=m
337CONFIG_INET6_XFRM_MODE_BEET=m
338CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
339CONFIG_IPV6_SIT=m
312# CONFIG_IPV6_TUNNEL is not set 340# CONFIG_IPV6_TUNNEL is not set
341CONFIG_IPV6_MULTIPLE_TABLES=y
342CONFIG_IPV6_SUBTREES=y
313CONFIG_NETWORK_SECMARK=y 343CONFIG_NETWORK_SECMARK=y
314CONFIG_NETFILTER=y 344CONFIG_NETFILTER=y
315# CONFIG_NETFILTER_DEBUG is not set 345# CONFIG_NETFILTER_DEBUG is not set
@@ -318,19 +348,125 @@ CONFIG_NETFILTER=y
318# Core Netfilter Configuration 348# Core Netfilter Configuration
319# 349#
320# CONFIG_NETFILTER_NETLINK is not set 350# CONFIG_NETFILTER_NETLINK is not set
321# CONFIG_NF_CONNTRACK is not set 351CONFIG_NF_CONNTRACK_ENABLED=m
322# CONFIG_NETFILTER_XTABLES is not set 352CONFIG_NF_CONNTRACK_SUPPORT=y
353# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
354CONFIG_NF_CONNTRACK=m
355CONFIG_NF_CT_ACCT=y
356CONFIG_NF_CONNTRACK_MARK=y
357CONFIG_NF_CONNTRACK_SECMARK=y
358CONFIG_NF_CONNTRACK_EVENTS=y
359CONFIG_NF_CT_PROTO_GRE=m
360CONFIG_NF_CT_PROTO_SCTP=m
361CONFIG_NF_CONNTRACK_AMANDA=m
362CONFIG_NF_CONNTRACK_FTP=m
363CONFIG_NF_CONNTRACK_H323=m
364CONFIG_NF_CONNTRACK_IRC=m
365# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
366CONFIG_NF_CONNTRACK_PPTP=m
367CONFIG_NF_CONNTRACK_SANE=m
368CONFIG_NF_CONNTRACK_SIP=m
369CONFIG_NF_CONNTRACK_TFTP=m
370CONFIG_NETFILTER_XTABLES=m
371CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
372CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
373CONFIG_NETFILTER_XT_TARGET_DSCP=m
374CONFIG_NETFILTER_XT_TARGET_MARK=m
375CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
376CONFIG_NETFILTER_XT_TARGET_NFLOG=m
377CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
378CONFIG_NETFILTER_XT_TARGET_SECMARK=m
379CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
380CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
381CONFIG_NETFILTER_XT_MATCH_COMMENT=m
382CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
383CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
384CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
385CONFIG_NETFILTER_XT_MATCH_DCCP=m
386CONFIG_NETFILTER_XT_MATCH_DSCP=m
387CONFIG_NETFILTER_XT_MATCH_ESP=m
388CONFIG_NETFILTER_XT_MATCH_HELPER=m
389CONFIG_NETFILTER_XT_MATCH_LENGTH=m
390CONFIG_NETFILTER_XT_MATCH_LIMIT=m
391CONFIG_NETFILTER_XT_MATCH_MAC=m
392CONFIG_NETFILTER_XT_MATCH_MARK=m
393CONFIG_NETFILTER_XT_MATCH_POLICY=m
394CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
395CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
396CONFIG_NETFILTER_XT_MATCH_QUOTA=m
397CONFIG_NETFILTER_XT_MATCH_REALM=m
398CONFIG_NETFILTER_XT_MATCH_SCTP=m
399CONFIG_NETFILTER_XT_MATCH_STATE=m
400CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
401CONFIG_NETFILTER_XT_MATCH_STRING=m
402CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
403CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
323 404
324# 405#
325# IP: Netfilter Configuration 406# IP: Netfilter Configuration
326# 407#
327# CONFIG_IP_NF_CONNTRACK is not set 408CONFIG_NF_CONNTRACK_IPV4=m
409CONFIG_NF_CONNTRACK_PROC_COMPAT=y
328# CONFIG_IP_NF_QUEUE is not set 410# CONFIG_IP_NF_QUEUE is not set
411CONFIG_IP_NF_IPTABLES=m
412CONFIG_IP_NF_MATCH_IPRANGE=m
413CONFIG_IP_NF_MATCH_TOS=m
414CONFIG_IP_NF_MATCH_RECENT=m
415CONFIG_IP_NF_MATCH_ECN=m
416CONFIG_IP_NF_MATCH_AH=m
417CONFIG_IP_NF_MATCH_TTL=m
418CONFIG_IP_NF_MATCH_OWNER=m
419CONFIG_IP_NF_MATCH_ADDRTYPE=m
420CONFIG_IP_NF_FILTER=m
421CONFIG_IP_NF_TARGET_REJECT=m
422CONFIG_IP_NF_TARGET_LOG=m
423CONFIG_IP_NF_TARGET_ULOG=m
424CONFIG_NF_NAT=m
425CONFIG_NF_NAT_NEEDED=y
426CONFIG_IP_NF_TARGET_MASQUERADE=m
427CONFIG_IP_NF_TARGET_REDIRECT=m
428CONFIG_IP_NF_TARGET_NETMAP=m
429CONFIG_IP_NF_TARGET_SAME=m
430CONFIG_NF_NAT_SNMP_BASIC=m
431CONFIG_NF_NAT_PROTO_GRE=m
432CONFIG_NF_NAT_FTP=m
433CONFIG_NF_NAT_IRC=m
434CONFIG_NF_NAT_TFTP=m
435CONFIG_NF_NAT_AMANDA=m
436CONFIG_NF_NAT_PPTP=m
437CONFIG_NF_NAT_H323=m
438CONFIG_NF_NAT_SIP=m
439CONFIG_IP_NF_MANGLE=m
440CONFIG_IP_NF_TARGET_TOS=m
441CONFIG_IP_NF_TARGET_ECN=m
442CONFIG_IP_NF_TARGET_TTL=m
443CONFIG_IP_NF_TARGET_CLUSTERIP=m
444CONFIG_IP_NF_RAW=m
445CONFIG_IP_NF_ARPTABLES=m
446CONFIG_IP_NF_ARPFILTER=m
447CONFIG_IP_NF_ARP_MANGLE=m
329 448
330# 449#
331# IPv6: Netfilter Configuration (EXPERIMENTAL) 450# IPv6: Netfilter Configuration (EXPERIMENTAL)
332# 451#
452CONFIG_NF_CONNTRACK_IPV6=m
333# CONFIG_IP6_NF_QUEUE is not set 453# CONFIG_IP6_NF_QUEUE is not set
454CONFIG_IP6_NF_IPTABLES=m
455CONFIG_IP6_NF_MATCH_RT=m
456CONFIG_IP6_NF_MATCH_OPTS=m
457CONFIG_IP6_NF_MATCH_FRAG=m
458CONFIG_IP6_NF_MATCH_HL=m
459CONFIG_IP6_NF_MATCH_OWNER=m
460CONFIG_IP6_NF_MATCH_IPV6HEADER=m
461CONFIG_IP6_NF_MATCH_AH=m
462CONFIG_IP6_NF_MATCH_MH=m
463CONFIG_IP6_NF_MATCH_EUI64=m
464CONFIG_IP6_NF_FILTER=m
465CONFIG_IP6_NF_TARGET_LOG=m
466CONFIG_IP6_NF_TARGET_REJECT=m
467CONFIG_IP6_NF_MANGLE=m
468CONFIG_IP6_NF_TARGET_HL=m
469CONFIG_IP6_NF_RAW=m
334 470
335# 471#
336# DCCP Configuration (EXPERIMENTAL) 472# DCCP Configuration (EXPERIMENTAL)
@@ -360,7 +496,6 @@ CONFIG_SCTP_HMAC_MD5=y
360# CONFIG_ATALK is not set 496# CONFIG_ATALK is not set
361# CONFIG_X25 is not set 497# CONFIG_X25 is not set
362# CONFIG_LAPB is not set 498# CONFIG_LAPB is not set
363# CONFIG_NET_DIVERT is not set
364# CONFIG_ECONET is not set 499# CONFIG_ECONET is not set
365# CONFIG_WAN_ROUTER is not set 500# CONFIG_WAN_ROUTER is not set
366 501
@@ -368,6 +503,7 @@ CONFIG_SCTP_HMAC_MD5=y
368# QoS and/or fair queueing 503# QoS and/or fair queueing
369# 504#
370# CONFIG_NET_SCHED is not set 505# CONFIG_NET_SCHED is not set
506CONFIG_NET_CLS_ROUTE=y
371 507
372# 508#
373# Network testing 509# Network testing
@@ -377,6 +513,7 @@ CONFIG_SCTP_HMAC_MD5=y
377# CONFIG_IRDA is not set 513# CONFIG_IRDA is not set
378# CONFIG_BT is not set 514# CONFIG_BT is not set
379# CONFIG_IEEE80211 is not set 515# CONFIG_IEEE80211 is not set
516CONFIG_FIB_RULES=y
380 517
381# 518#
382# Device Drivers 519# Device Drivers
@@ -387,7 +524,7 @@ CONFIG_SCTP_HMAC_MD5=y
387# 524#
388CONFIG_STANDALONE=y 525CONFIG_STANDALONE=y
389CONFIG_PREVENT_FIRMWARE_BUILD=y 526CONFIG_PREVENT_FIRMWARE_BUILD=y
390# CONFIG_FW_LOADER is not set 527CONFIG_FW_LOADER=m
391# CONFIG_SYS_HYPERVISOR is not set 528# CONFIG_SYS_HYPERVISOR is not set
392 529
393# 530#
@@ -409,11 +546,13 @@ CONFIG_MTD_CMDLINE_PARTS=y
409# User Modules And Translation Layers 546# User Modules And Translation Layers
410# 547#
411CONFIG_MTD_CHAR=y 548CONFIG_MTD_CHAR=y
549CONFIG_MTD_BLKDEVS=y
412CONFIG_MTD_BLOCK=y 550CONFIG_MTD_BLOCK=y
413# CONFIG_FTL is not set 551# CONFIG_FTL is not set
414# CONFIG_NFTL is not set 552# CONFIG_NFTL is not set
415# CONFIG_INFTL is not set 553# CONFIG_INFTL is not set
416# CONFIG_RFD_FTL is not set 554# CONFIG_RFD_FTL is not set
555# CONFIG_SSFDC is not set
417 556
418# 557#
419# RAM/ROM/Flash chip drivers 558# RAM/ROM/Flash chip drivers
@@ -485,6 +624,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
485# 624#
486# Plug and Play support 625# Plug and Play support
487# 626#
627# CONFIG_PNPACPI is not set
488 628
489# 629#
490# Block devices 630# Block devices
@@ -504,6 +644,12 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
504# CONFIG_ATA_OVER_ETH is not set 644# CONFIG_ATA_OVER_ETH is not set
505 645
506# 646#
647# Misc devices
648#
649CONFIG_SGI_IOC4=m
650# CONFIG_TIFM_CORE is not set
651
652#
507# ATA/ATAPI/MFM/RLL support 653# ATA/ATAPI/MFM/RLL support
508# 654#
509# CONFIG_IDE is not set 655# CONFIG_IDE is not set
@@ -513,6 +659,8 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
513# 659#
514# CONFIG_RAID_ATTRS is not set 660# CONFIG_RAID_ATTRS is not set
515CONFIG_SCSI=m 661CONFIG_SCSI=m
662CONFIG_SCSI_TGT=m
663# CONFIG_SCSI_NETLINK is not set
516# CONFIG_SCSI_PROC_FS is not set 664# CONFIG_SCSI_PROC_FS is not set
517 665
518# 666#
@@ -531,14 +679,17 @@ CONFIG_CHR_DEV_SG=m
531# CONFIG_SCSI_MULTI_LUN is not set 679# CONFIG_SCSI_MULTI_LUN is not set
532# CONFIG_SCSI_CONSTANTS is not set 680# CONFIG_SCSI_CONSTANTS is not set
533# CONFIG_SCSI_LOGGING is not set 681# CONFIG_SCSI_LOGGING is not set
682CONFIG_SCSI_SCAN_ASYNC=y
534 683
535# 684#
536# SCSI Transport Attributes 685# SCSI Transports
537# 686#
538# CONFIG_SCSI_SPI_ATTRS is not set 687# CONFIG_SCSI_SPI_ATTRS is not set
539# CONFIG_SCSI_FC_ATTRS is not set 688# CONFIG_SCSI_FC_ATTRS is not set
540# CONFIG_SCSI_ISCSI_ATTRS is not set 689# CONFIG_SCSI_ISCSI_ATTRS is not set
541# CONFIG_SCSI_SAS_ATTRS is not set 690CONFIG_SCSI_SAS_ATTRS=m
691CONFIG_SCSI_SAS_LIBSAS=m
692# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
542 693
543# 694#
544# SCSI low-level drivers 695# SCSI low-level drivers
@@ -551,26 +702,35 @@ CONFIG_CHR_DEV_SG=m
551# CONFIG_SCSI_AIC7XXX is not set 702# CONFIG_SCSI_AIC7XXX is not set
552# CONFIG_SCSI_AIC7XXX_OLD is not set 703# CONFIG_SCSI_AIC7XXX_OLD is not set
553# CONFIG_SCSI_AIC79XX is not set 704# CONFIG_SCSI_AIC79XX is not set
705CONFIG_SCSI_AIC94XX=m
706# CONFIG_AIC94XX_DEBUG is not set
554# CONFIG_SCSI_DPT_I2O is not set 707# CONFIG_SCSI_DPT_I2O is not set
708# CONFIG_SCSI_ARCMSR is not set
555# CONFIG_MEGARAID_NEWGEN is not set 709# CONFIG_MEGARAID_NEWGEN is not set
556# CONFIG_MEGARAID_LEGACY is not set 710# CONFIG_MEGARAID_LEGACY is not set
557# CONFIG_MEGARAID_SAS is not set 711# CONFIG_MEGARAID_SAS is not set
558# CONFIG_SCSI_SATA is not set
559# CONFIG_SCSI_HPTIOP is not set 712# CONFIG_SCSI_HPTIOP is not set
560# CONFIG_SCSI_DMX3191D is not set 713# CONFIG_SCSI_DMX3191D is not set
561# CONFIG_SCSI_FUTURE_DOMAIN is not set 714# CONFIG_SCSI_FUTURE_DOMAIN is not set
562# CONFIG_SCSI_IPS is not set 715# CONFIG_SCSI_IPS is not set
563# CONFIG_SCSI_INITIO is not set 716# CONFIG_SCSI_INITIO is not set
564# CONFIG_SCSI_INIA100 is not set 717# CONFIG_SCSI_INIA100 is not set
718# CONFIG_SCSI_STEX is not set
565# CONFIG_SCSI_SYM53C8XX_2 is not set 719# CONFIG_SCSI_SYM53C8XX_2 is not set
566# CONFIG_SCSI_IPR is not set
567# CONFIG_SCSI_QLOGIC_1280 is not set 720# CONFIG_SCSI_QLOGIC_1280 is not set
568# CONFIG_SCSI_QLA_FC is not set 721# CONFIG_SCSI_QLA_FC is not set
722# CONFIG_SCSI_QLA_ISCSI is not set
569# CONFIG_SCSI_LPFC is not set 723# CONFIG_SCSI_LPFC is not set
570# CONFIG_SCSI_DC395x is not set 724# CONFIG_SCSI_DC395x is not set
571# CONFIG_SCSI_DC390T is not set 725# CONFIG_SCSI_DC390T is not set
572# CONFIG_SCSI_NSP32 is not set 726# CONFIG_SCSI_NSP32 is not set
573# CONFIG_SCSI_DEBUG is not set 727# CONFIG_SCSI_DEBUG is not set
728# CONFIG_SCSI_SRP is not set
729
730#
731# Serial ATA (prod) and Parallel ATA (experimental) drivers
732#
733# CONFIG_ATA is not set
574 734
575# 735#
576# Multi-device support (RAID and LVM) 736# Multi-device support (RAID and LVM)
@@ -649,7 +809,7 @@ CONFIG_NATSEMI=y
649# CONFIG_SUNDANCE is not set 809# CONFIG_SUNDANCE is not set
650# CONFIG_TLAN is not set 810# CONFIG_TLAN is not set
651# CONFIG_VIA_RHINE is not set 811# CONFIG_VIA_RHINE is not set
652# CONFIG_LAN_SAA9730 is not set 812# CONFIG_SC92031 is not set
653 813
654# 814#
655# Ethernet (1000 Mbit) 815# Ethernet (1000 Mbit)
@@ -668,14 +828,18 @@ CONFIG_NATSEMI=y
668# CONFIG_VIA_VELOCITY is not set 828# CONFIG_VIA_VELOCITY is not set
669# CONFIG_TIGON3 is not set 829# CONFIG_TIGON3 is not set
670# CONFIG_BNX2 is not set 830# CONFIG_BNX2 is not set
831CONFIG_QLA3XXX=m
832# CONFIG_ATL1 is not set
671 833
672# 834#
673# Ethernet (10000 Mbit) 835# Ethernet (10000 Mbit)
674# 836#
675# CONFIG_CHELSIO_T1 is not set 837# CONFIG_CHELSIO_T1 is not set
838CONFIG_CHELSIO_T3=m
676# CONFIG_IXGB is not set 839# CONFIG_IXGB is not set
677# CONFIG_S2IO is not set 840# CONFIG_S2IO is not set
678# CONFIG_MYRI10GE is not set 841# CONFIG_MYRI10GE is not set
842CONFIG_NETXEN_NIC=m
679 843
680# 844#
681# Token Ring devices 845# Token Ring devices
@@ -703,6 +867,7 @@ CONFIG_PPP_DEFLATE=m
703# CONFIG_PPP_MPPE is not set 867# CONFIG_PPP_MPPE is not set
704# CONFIG_PPPOE is not set 868# CONFIG_PPPOE is not set
705# CONFIG_SLIP is not set 869# CONFIG_SLIP is not set
870CONFIG_SLHC=m
706# CONFIG_NET_FC is not set 871# CONFIG_NET_FC is not set
707# CONFIG_SHAPER is not set 872# CONFIG_SHAPER is not set
708# CONFIG_NETCONSOLE is not set 873# CONFIG_NETCONSOLE is not set
@@ -723,6 +888,7 @@ CONFIG_PPP_DEFLATE=m
723# Input device support 888# Input device support
724# 889#
725CONFIG_INPUT=y 890CONFIG_INPUT=y
891# CONFIG_INPUT_FF_MEMLESS is not set
726 892
727# 893#
728# Userland interfaces 894# Userland interfaces
@@ -790,10 +956,6 @@ CONFIG_GEN_RTC_X=y
790# CONFIG_DTLK is not set 956# CONFIG_DTLK is not set
791# CONFIG_R3964 is not set 957# CONFIG_R3964 is not set
792# CONFIG_APPLICOM is not set 958# CONFIG_APPLICOM is not set
793
794#
795# Ftape, the floppy tape device driver
796#
797# CONFIG_DRM is not set 959# CONFIG_DRM is not set
798# CONFIG_RAW_DRIVER is not set 960# CONFIG_RAW_DRIVER is not set
799 961
@@ -801,7 +963,6 @@ CONFIG_GEN_RTC_X=y
801# TPM devices 963# TPM devices
802# 964#
803# CONFIG_TCG_TPM is not set 965# CONFIG_TCG_TPM is not set
804# CONFIG_TELCLOCK is not set
805 966
806# 967#
807# I2C support 968# I2C support
@@ -830,6 +991,7 @@ CONFIG_I2C_CHARDEV=y
830# CONFIG_I2C_NFORCE2 is not set 991# CONFIG_I2C_NFORCE2 is not set
831# CONFIG_I2C_OCORES is not set 992# CONFIG_I2C_OCORES is not set
832# CONFIG_I2C_PARPORT_LIGHT is not set 993# CONFIG_I2C_PARPORT_LIGHT is not set
994# CONFIG_I2C_PASEMI is not set
833# CONFIG_I2C_PROSAVAGE is not set 995# CONFIG_I2C_PROSAVAGE is not set
834# CONFIG_I2C_SAVAGE4 is not set 996# CONFIG_I2C_SAVAGE4 is not set
835# CONFIG_I2C_SIS5595 is not set 997# CONFIG_I2C_SIS5595 is not set
@@ -865,6 +1027,7 @@ CONFIG_I2C_DEBUG_BUS=y
865# 1027#
866# Dallas's 1-wire bus 1028# Dallas's 1-wire bus
867# 1029#
1030# CONFIG_W1 is not set
868 1031
869# 1032#
870# Hardware Monitoring support 1033# Hardware Monitoring support
@@ -875,6 +1038,7 @@ CONFIG_HWMON=y
875# CONFIG_SENSORS_ADM1021 is not set 1038# CONFIG_SENSORS_ADM1021 is not set
876# CONFIG_SENSORS_ADM1025 is not set 1039# CONFIG_SENSORS_ADM1025 is not set
877# CONFIG_SENSORS_ADM1026 is not set 1040# CONFIG_SENSORS_ADM1026 is not set
1041# CONFIG_SENSORS_ADM1029 is not set
878# CONFIG_SENSORS_ADM1031 is not set 1042# CONFIG_SENSORS_ADM1031 is not set
879# CONFIG_SENSORS_ADM9240 is not set 1043# CONFIG_SENSORS_ADM9240 is not set
880# CONFIG_SENSORS_ASB100 is not set 1044# CONFIG_SENSORS_ASB100 is not set
@@ -898,29 +1062,27 @@ CONFIG_HWMON=y
898# CONFIG_SENSORS_LM92 is not set 1062# CONFIG_SENSORS_LM92 is not set
899# CONFIG_SENSORS_MAX1619 is not set 1063# CONFIG_SENSORS_MAX1619 is not set
900# CONFIG_SENSORS_PC87360 is not set 1064# CONFIG_SENSORS_PC87360 is not set
1065# CONFIG_SENSORS_PC87427 is not set
901# CONFIG_SENSORS_SIS5595 is not set 1066# CONFIG_SENSORS_SIS5595 is not set
902# CONFIG_SENSORS_SMSC47M1 is not set 1067# CONFIG_SENSORS_SMSC47M1 is not set
903# CONFIG_SENSORS_SMSC47M192 is not set 1068# CONFIG_SENSORS_SMSC47M192 is not set
904# CONFIG_SENSORS_SMSC47B397 is not set 1069# CONFIG_SENSORS_SMSC47B397 is not set
905# CONFIG_SENSORS_VIA686A is not set 1070# CONFIG_SENSORS_VIA686A is not set
1071# CONFIG_SENSORS_VT1211 is not set
906# CONFIG_SENSORS_VT8231 is not set 1072# CONFIG_SENSORS_VT8231 is not set
907# CONFIG_SENSORS_W83781D is not set 1073# CONFIG_SENSORS_W83781D is not set
908# CONFIG_SENSORS_W83791D is not set 1074# CONFIG_SENSORS_W83791D is not set
909# CONFIG_SENSORS_W83792D is not set 1075# CONFIG_SENSORS_W83792D is not set
1076# CONFIG_SENSORS_W83793 is not set
910# CONFIG_SENSORS_W83L785TS is not set 1077# CONFIG_SENSORS_W83L785TS is not set
911# CONFIG_SENSORS_W83627HF is not set 1078# CONFIG_SENSORS_W83627HF is not set
912# CONFIG_SENSORS_W83627EHF is not set 1079# CONFIG_SENSORS_W83627EHF is not set
913# CONFIG_HWMON_DEBUG_CHIP is not set 1080# CONFIG_HWMON_DEBUG_CHIP is not set
914 1081
915# 1082#
916# Misc devices
917#
918
919#
920# Multimedia devices 1083# Multimedia devices
921# 1084#
922# CONFIG_VIDEO_DEV is not set 1085# CONFIG_VIDEO_DEV is not set
923CONFIG_VIDEO_V4L2=y
924 1086
925# 1087#
926# Digital Video Broadcasting Devices 1088# Digital Video Broadcasting Devices
@@ -932,6 +1094,7 @@ CONFIG_VIDEO_V4L2=y
932# 1094#
933# CONFIG_FIRMWARE_EDID is not set 1095# CONFIG_FIRMWARE_EDID is not set
934# CONFIG_FB is not set 1096# CONFIG_FB is not set
1097# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
935 1098
936# 1099#
937# Sound 1100# Sound
@@ -939,6 +1102,11 @@ CONFIG_VIDEO_V4L2=y
939# CONFIG_SOUND is not set 1102# CONFIG_SOUND is not set
940 1103
941# 1104#
1105# HID Devices
1106#
1107# CONFIG_HID is not set
1108
1109#
942# USB support 1110# USB support
943# 1111#
944CONFIG_USB_ARCH_HAS_HCD=y 1112CONFIG_USB_ARCH_HAS_HCD=y
@@ -1001,6 +1169,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1001# 1169#
1002 1170
1003# 1171#
1172# Auxiliary Display support
1173#
1174
1175#
1176# Virtualization
1177#
1178
1179#
1004# File systems 1180# File systems
1005# 1181#
1006CONFIG_EXT2_FS=y 1182CONFIG_EXT2_FS=y
@@ -1012,6 +1188,7 @@ CONFIG_EXT3_FS=m
1012CONFIG_EXT3_FS_XATTR=y 1188CONFIG_EXT3_FS_XATTR=y
1013# CONFIG_EXT3_FS_POSIX_ACL is not set 1189# CONFIG_EXT3_FS_POSIX_ACL is not set
1014# CONFIG_EXT3_FS_SECURITY is not set 1190# CONFIG_EXT3_FS_SECURITY is not set
1191# CONFIG_EXT4DEV_FS is not set
1015CONFIG_JBD=m 1192CONFIG_JBD=m
1016# CONFIG_JBD_DEBUG is not set 1193# CONFIG_JBD_DEBUG is not set
1017CONFIG_FS_MBCACHE=y 1194CONFIG_FS_MBCACHE=y
@@ -1023,6 +1200,7 @@ CONFIG_XFS_FS=m
1023# CONFIG_XFS_SECURITY is not set 1200# CONFIG_XFS_SECURITY is not set
1024# CONFIG_XFS_POSIX_ACL is not set 1201# CONFIG_XFS_POSIX_ACL is not set
1025# CONFIG_XFS_RT is not set 1202# CONFIG_XFS_RT is not set
1203# CONFIG_GFS2_FS is not set
1026# CONFIG_OCFS2_FS is not set 1204# CONFIG_OCFS2_FS is not set
1027# CONFIG_MINIX_FS is not set 1205# CONFIG_MINIX_FS is not set
1028# CONFIG_ROMFS_FS is not set 1206# CONFIG_ROMFS_FS is not set
@@ -1033,6 +1211,7 @@ CONFIG_INOTIFY_USER=y
1033# CONFIG_AUTOFS_FS is not set 1211# CONFIG_AUTOFS_FS is not set
1034CONFIG_AUTOFS4_FS=m 1212CONFIG_AUTOFS4_FS=m
1035# CONFIG_FUSE_FS is not set 1213# CONFIG_FUSE_FS is not set
1214CONFIG_GENERIC_ACL=y
1036 1215
1037# 1216#
1038# CD-ROM/DVD Filesystems 1217# CD-ROM/DVD Filesystems
@@ -1057,11 +1236,13 @@ CONFIG_NTFS_FS=m
1057# 1236#
1058CONFIG_PROC_FS=y 1237CONFIG_PROC_FS=y
1059CONFIG_PROC_KCORE=y 1238CONFIG_PROC_KCORE=y
1239CONFIG_PROC_SYSCTL=y
1060CONFIG_SYSFS=y 1240CONFIG_SYSFS=y
1061CONFIG_TMPFS=y 1241CONFIG_TMPFS=y
1242CONFIG_TMPFS_POSIX_ACL=y
1062# CONFIG_HUGETLB_PAGE is not set 1243# CONFIG_HUGETLB_PAGE is not set
1063CONFIG_RAMFS=y 1244CONFIG_RAMFS=y
1064# CONFIG_CONFIGFS_FS is not set 1245CONFIG_CONFIGFS_FS=m
1065 1246
1066# 1247#
1067# Miscellaneous filesystems 1248# Miscellaneous filesystems
@@ -1073,7 +1254,6 @@ CONFIG_RAMFS=y
1073# CONFIG_BEFS_FS is not set 1254# CONFIG_BEFS_FS is not set
1074# CONFIG_BFS_FS is not set 1255# CONFIG_BFS_FS is not set
1075# CONFIG_EFS_FS is not set 1256# CONFIG_EFS_FS is not set
1076# CONFIG_JFFS_FS is not set
1077CONFIG_JFFS2_FS=y 1257CONFIG_JFFS2_FS=y
1078CONFIG_JFFS2_FS_DEBUG=0 1258CONFIG_JFFS2_FS_DEBUG=0
1079CONFIG_JFFS2_FS_WRITEBUFFER=y 1259CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1118,7 +1298,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1118CONFIG_SMB_FS=m 1298CONFIG_SMB_FS=m
1119# CONFIG_SMB_NLS_DEFAULT is not set 1299# CONFIG_SMB_NLS_DEFAULT is not set
1120# CONFIG_CIFS is not set 1300# CONFIG_CIFS is not set
1121# CONFIG_CIFS_DEBUG2 is not set
1122# CONFIG_NCP_FS is not set 1301# CONFIG_NCP_FS is not set
1123# CONFIG_CODA_FS is not set 1302# CONFIG_CODA_FS is not set
1124# CONFIG_AFS_FS is not set 1303# CONFIG_AFS_FS is not set
@@ -1175,6 +1354,14 @@ CONFIG_NLS_ISO8859_1=m
1175CONFIG_NLS_UTF8=m 1354CONFIG_NLS_UTF8=m
1176 1355
1177# 1356#
1357# Distributed Lock Manager
1358#
1359CONFIG_DLM=m
1360CONFIG_DLM_TCP=y
1361# CONFIG_DLM_SCTP is not set
1362# CONFIG_DLM_DEBUG is not set
1363
1364#
1178# Profiling support 1365# Profiling support
1179# 1366#
1180# CONFIG_PROFILING is not set 1367# CONFIG_PROFILING is not set
@@ -1184,11 +1371,13 @@ CONFIG_NLS_UTF8=m
1184# 1371#
1185CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1372CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1186# CONFIG_PRINTK_TIME is not set 1373# CONFIG_PRINTK_TIME is not set
1374CONFIG_ENABLE_MUST_CHECK=y
1187# CONFIG_MAGIC_SYSRQ is not set 1375# CONFIG_MAGIC_SYSRQ is not set
1188# CONFIG_UNUSED_SYMBOLS is not set 1376# CONFIG_UNUSED_SYMBOLS is not set
1377# CONFIG_DEBUG_FS is not set
1378# CONFIG_HEADERS_CHECK is not set
1189# CONFIG_DEBUG_KERNEL is not set 1379# CONFIG_DEBUG_KERNEL is not set
1190CONFIG_LOG_BUF_SHIFT=14 1380CONFIG_LOG_BUF_SHIFT=14
1191# CONFIG_DEBUG_FS is not set
1192CONFIG_CROSSCOMPILE=y 1381CONFIG_CROSSCOMPILE=y
1193CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw" 1382CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw"
1194 1383
@@ -1202,7 +1391,12 @@ CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw"
1202# Cryptographic options 1391# Cryptographic options
1203# 1392#
1204CONFIG_CRYPTO=y 1393CONFIG_CRYPTO=y
1394CONFIG_CRYPTO_ALGAPI=y
1395CONFIG_CRYPTO_BLKCIPHER=y
1396CONFIG_CRYPTO_HASH=y
1397CONFIG_CRYPTO_MANAGER=y
1205CONFIG_CRYPTO_HMAC=y 1398CONFIG_CRYPTO_HMAC=y
1399CONFIG_CRYPTO_XCBC=m
1206# CONFIG_CRYPTO_NULL is not set 1400# CONFIG_CRYPTO_NULL is not set
1207# CONFIG_CRYPTO_MD4 is not set 1401# CONFIG_CRYPTO_MD4 is not set
1208CONFIG_CRYPTO_MD5=y 1402CONFIG_CRYPTO_MD5=y
@@ -1211,7 +1405,13 @@ CONFIG_CRYPTO_MD5=y
1211# CONFIG_CRYPTO_SHA512 is not set 1405# CONFIG_CRYPTO_SHA512 is not set
1212# CONFIG_CRYPTO_WP512 is not set 1406# CONFIG_CRYPTO_WP512 is not set
1213# CONFIG_CRYPTO_TGR192 is not set 1407# CONFIG_CRYPTO_TGR192 is not set
1408CONFIG_CRYPTO_GF128MUL=m
1409CONFIG_CRYPTO_ECB=m
1410CONFIG_CRYPTO_CBC=y
1411CONFIG_CRYPTO_PCBC=m
1412CONFIG_CRYPTO_LRW=m
1214CONFIG_CRYPTO_DES=y 1413CONFIG_CRYPTO_DES=y
1414CONFIG_CRYPTO_FCRYPT=m
1215# CONFIG_CRYPTO_BLOWFISH is not set 1415# CONFIG_CRYPTO_BLOWFISH is not set
1216# CONFIG_CRYPTO_TWOFISH is not set 1416# CONFIG_CRYPTO_TWOFISH is not set
1217# CONFIG_CRYPTO_SERPENT is not set 1417# CONFIG_CRYPTO_SERPENT is not set
@@ -1225,6 +1425,7 @@ CONFIG_CRYPTO_DES=y
1225# CONFIG_CRYPTO_DEFLATE is not set 1425# CONFIG_CRYPTO_DEFLATE is not set
1226# CONFIG_CRYPTO_MICHAEL_MIC is not set 1426# CONFIG_CRYPTO_MICHAEL_MIC is not set
1227# CONFIG_CRYPTO_CRC32C is not set 1427# CONFIG_CRYPTO_CRC32C is not set
1428CONFIG_CRYPTO_CAMELLIA=m
1228# CONFIG_CRYPTO_TEST is not set 1429# CONFIG_CRYPTO_TEST is not set
1229 1430
1230# 1431#
@@ -1234,10 +1435,17 @@ CONFIG_CRYPTO_DES=y
1234# 1435#
1235# Library routines 1436# Library routines
1236# 1437#
1438CONFIG_BITREVERSE=y
1237CONFIG_CRC_CCITT=m 1439CONFIG_CRC_CCITT=m
1238# CONFIG_CRC16 is not set 1440# CONFIG_CRC16 is not set
1239CONFIG_CRC32=y 1441CONFIG_CRC32=y
1240# CONFIG_LIBCRC32C is not set 1442# CONFIG_LIBCRC32C is not set
1241CONFIG_ZLIB_INFLATE=y 1443CONFIG_ZLIB_INFLATE=y
1242CONFIG_ZLIB_DEFLATE=y 1444CONFIG_ZLIB_DEFLATE=y
1445CONFIG_TEXTSEARCH=y
1446CONFIG_TEXTSEARCH_KMP=m
1447CONFIG_TEXTSEARCH_BM=m
1448CONFIG_TEXTSEARCH_FSM=m
1243CONFIG_PLIST=y 1449CONFIG_PLIST=y
1450CONFIG_HAS_IOMEM=y
1451CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig
index d5b49735683b..c10e4e063226 100644
--- a/arch/mips/configs/ev64120_defconfig
+++ b/arch/mips/configs/ev64120_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:05 2006 4# Tue Feb 20 21:47:30 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27CONFIG_MIPS_EV64120=y 28CONFIG_MIPS_EV64120=y
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_EV64120=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +64,14 @@ CONFIG_MIPS_EV64120=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_EVB_PCI1 is not set 65# CONFIG_EVB_PCI1 is not set
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
74CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
@@ -118,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
118# CONFIG_PAGE_SIZE_16KB is not set 121# CONFIG_PAGE_SIZE_16KB is not set
119# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
120CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
121# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
124# CONFIG_64BIT_PHYS_ADDR is not set 127# CONFIG_64BIT_PHYS_ADDR is not set
125CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -148,6 +152,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +171,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 172CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 178# CONFIG_TASKSTATS is not set
179# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 181# CONFIG_IKCONFIG is not set
182CONFIG_SYSFS_DEPRECATED=y
174CONFIG_RELAY=y 183CONFIG_RELAY=y
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 186CONFIG_EMBEDDED=y
187CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 188CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 189# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 190CONFIG_HOTPLUG=y
@@ -182,12 +192,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 192CONFIG_BUG=y
183CONFIG_ELF_CORE=y 193CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 194CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 195CONFIG_FUTEX=y
187CONFIG_EPOLL=y 196CONFIG_EPOLL=y
188CONFIG_SHMEM=y 197CONFIG_SHMEM=y
189CONFIG_SLAB=y 198CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 199CONFIG_VM_EVENT_COUNTERS=y
200CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 201# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 202CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 203# CONFIG_SLOB is not set
@@ -205,6 +215,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
205# 215#
206# Block layer 216# Block layer
207# 217#
218CONFIG_BLOCK=y
208# CONFIG_LBD is not set 219# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 220# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 221# CONFIG_LSF is not set
@@ -247,6 +258,14 @@ CONFIG_BINFMT_ELF=y
247CONFIG_TRAD_SIGNALS=y 258CONFIG_TRAD_SIGNALS=y
248 259
249# 260#
261# Power management options
262#
263CONFIG_PM=y
264# CONFIG_PM_LEGACY is not set
265# CONFIG_PM_DEBUG is not set
266# CONFIG_PM_SYSFS_DEPRECATED is not set
267
268#
250# Networking 269# Networking
251# 270#
252CONFIG_NET=y 271CONFIG_NET=y
@@ -259,7 +278,10 @@ CONFIG_NET=y
259CONFIG_UNIX=y 278CONFIG_UNIX=y
260CONFIG_XFRM=y 279CONFIG_XFRM=y
261CONFIG_XFRM_USER=m 280CONFIG_XFRM_USER=m
281# CONFIG_XFRM_SUB_POLICY is not set
282CONFIG_XFRM_MIGRATE=y
262CONFIG_NET_KEY=y 283CONFIG_NET_KEY=y
284CONFIG_NET_KEY_MIGRATE=y
263CONFIG_INET=y 285CONFIG_INET=y
264# CONFIG_IP_MULTICAST is not set 286# CONFIG_IP_MULTICAST is not set
265# CONFIG_IP_ADVANCED_ROUTER is not set 287# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +301,13 @@ CONFIG_IP_PNP=y
279# CONFIG_INET_TUNNEL is not set 301# CONFIG_INET_TUNNEL is not set
280CONFIG_INET_XFRM_MODE_TRANSPORT=m 302CONFIG_INET_XFRM_MODE_TRANSPORT=m
281CONFIG_INET_XFRM_MODE_TUNNEL=m 303CONFIG_INET_XFRM_MODE_TUNNEL=m
304CONFIG_INET_XFRM_MODE_BEET=m
282CONFIG_INET_DIAG=y 305CONFIG_INET_DIAG=y
283CONFIG_INET_TCP_DIAG=y 306CONFIG_INET_TCP_DIAG=y
284# CONFIG_TCP_CONG_ADVANCED is not set 307# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_BIC=y 308CONFIG_TCP_CONG_CUBIC=y
309CONFIG_DEFAULT_TCP_CONG="cubic"
310CONFIG_TCP_MD5SIG=y
286# CONFIG_IPV6 is not set 311# CONFIG_IPV6 is not set
287# CONFIG_INET6_XFRM_TUNNEL is not set 312# CONFIG_INET6_XFRM_TUNNEL is not set
288# CONFIG_INET6_TUNNEL is not set 313# CONFIG_INET6_TUNNEL is not set
@@ -312,7 +337,6 @@ CONFIG_NETWORK_SECMARK=y
312# CONFIG_ATALK is not set 337# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 338# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 339# CONFIG_LAPB is not set
315# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
318 342
@@ -366,6 +390,7 @@ CONFIG_CONNECTOR=m
366# 390#
367# Plug and Play support 391# Plug and Play support
368# 392#
393# CONFIG_PNPACPI is not set
369 394
370# 395#
371# Block devices 396# Block devices
@@ -386,6 +411,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
386CONFIG_ATA_OVER_ETH=m 411CONFIG_ATA_OVER_ETH=m
387 412
388# 413#
414# Misc devices
415#
416CONFIG_SGI_IOC4=m
417# CONFIG_TIFM_CORE is not set
418
419#
389# ATA/ATAPI/MFM/RLL support 420# ATA/ATAPI/MFM/RLL support
390# 421#
391# CONFIG_IDE is not set 422# CONFIG_IDE is not set
@@ -395,6 +426,12 @@ CONFIG_ATA_OVER_ETH=m
395# 426#
396CONFIG_RAID_ATTRS=m 427CONFIG_RAID_ATTRS=m
397# CONFIG_SCSI is not set 428# CONFIG_SCSI is not set
429# CONFIG_SCSI_NETLINK is not set
430
431#
432# Serial ATA (prod) and Parallel ATA (experimental) drivers
433#
434# CONFIG_ATA is not set
398 435
399# 436#
400# Multi-device support (RAID and LVM) 437# Multi-device support (RAID and LVM)
@@ -445,6 +482,8 @@ CONFIG_LXT_PHY=m
445CONFIG_CICADA_PHY=m 482CONFIG_CICADA_PHY=m
446CONFIG_VITESSE_PHY=m 483CONFIG_VITESSE_PHY=m
447CONFIG_SMSC_PHY=m 484CONFIG_SMSC_PHY=m
485# CONFIG_BROADCOM_PHY is not set
486# CONFIG_FIXED_PHY is not set
448 487
449# 488#
450# Ethernet (10 or 100Mbit) 489# Ethernet (10 or 100Mbit)
@@ -480,14 +519,18 @@ CONFIG_NET_ETHERNET=y
480# CONFIG_SK98LIN is not set 519# CONFIG_SK98LIN is not set
481# CONFIG_TIGON3 is not set 520# CONFIG_TIGON3 is not set
482# CONFIG_BNX2 is not set 521# CONFIG_BNX2 is not set
522CONFIG_QLA3XXX=m
523# CONFIG_ATL1 is not set
483 524
484# 525#
485# Ethernet (10000 Mbit) 526# Ethernet (10000 Mbit)
486# 527#
487# CONFIG_CHELSIO_T1 is not set 528# CONFIG_CHELSIO_T1 is not set
529CONFIG_CHELSIO_T3=m
488# CONFIG_IXGB is not set 530# CONFIG_IXGB is not set
489# CONFIG_S2IO is not set 531# CONFIG_S2IO is not set
490# CONFIG_MYRI10GE is not set 532# CONFIG_MYRI10GE is not set
533CONFIG_NETXEN_NIC=m
491 534
492# 535#
493# Token Ring devices 536# Token Ring devices
@@ -515,6 +558,7 @@ CONFIG_PPP_ASYNC=y
515CONFIG_PPP_MPPE=m 558CONFIG_PPP_MPPE=m
516# CONFIG_PPPOE is not set 559# CONFIG_PPPOE is not set
517# CONFIG_SLIP is not set 560# CONFIG_SLIP is not set
561CONFIG_SLHC=y
518# CONFIG_SHAPER is not set 562# CONFIG_SHAPER is not set
519# CONFIG_NETCONSOLE is not set 563# CONFIG_NETCONSOLE is not set
520# CONFIG_NETPOLL is not set 564# CONFIG_NETPOLL is not set
@@ -534,6 +578,7 @@ CONFIG_PPP_MPPE=m
534# Input device support 578# Input device support
535# 579#
536CONFIG_INPUT=y 580CONFIG_INPUT=y
581# CONFIG_INPUT_FF_MEMLESS is not set
537 582
538# 583#
539# Userland interfaces 584# Userland interfaces
@@ -611,10 +656,6 @@ CONFIG_LEGACY_PTY_COUNT=256
611# CONFIG_DTLK is not set 656# CONFIG_DTLK is not set
612# CONFIG_R3964 is not set 657# CONFIG_R3964 is not set
613# CONFIG_APPLICOM is not set 658# CONFIG_APPLICOM is not set
614
615#
616# Ftape, the floppy tape device driver
617#
618# CONFIG_DRM is not set 659# CONFIG_DRM is not set
619# CONFIG_RAW_DRIVER is not set 660# CONFIG_RAW_DRIVER is not set
620 661
@@ -622,7 +663,6 @@ CONFIG_LEGACY_PTY_COUNT=256
622# TPM devices 663# TPM devices
623# 664#
624# CONFIG_TCG_TPM is not set 665# CONFIG_TCG_TPM is not set
625# CONFIG_TELCLOCK is not set
626 666
627# 667#
628# I2C support 668# I2C support
@@ -647,14 +687,9 @@ CONFIG_LEGACY_PTY_COUNT=256
647# CONFIG_HWMON_VID is not set 687# CONFIG_HWMON_VID is not set
648 688
649# 689#
650# Misc devices
651#
652
653#
654# Multimedia devices 690# Multimedia devices
655# 691#
656# CONFIG_VIDEO_DEV is not set 692# CONFIG_VIDEO_DEV is not set
657CONFIG_VIDEO_V4L2=y
658 693
659# 694#
660# Digital Video Broadcasting Devices 695# Digital Video Broadcasting Devices
@@ -672,6 +707,7 @@ CONFIG_VIDEO_V4L2=y
672# 707#
673# CONFIG_VGA_CONSOLE is not set 708# CONFIG_VGA_CONSOLE is not set
674CONFIG_DUMMY_CONSOLE=y 709CONFIG_DUMMY_CONSOLE=y
710# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
675 711
676# 712#
677# Sound 713# Sound
@@ -679,6 +715,11 @@ CONFIG_DUMMY_CONSOLE=y
679# CONFIG_SOUND is not set 715# CONFIG_SOUND is not set
680 716
681# 717#
718# HID Devices
719#
720# CONFIG_HID is not set
721
722#
682# USB support 723# USB support
683# 724#
684CONFIG_USB_ARCH_HAS_HCD=y 725CONFIG_USB_ARCH_HAS_HCD=y
@@ -741,16 +782,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
741# 782#
742 783
743# 784#
785# Auxiliary Display support
786#
787
788#
789# Virtualization
790#
791
792#
744# File systems 793# File systems
745# 794#
746CONFIG_EXT2_FS=y 795CONFIG_EXT2_FS=y
747# CONFIG_EXT2_FS_XATTR is not set 796# CONFIG_EXT2_FS_XATTR is not set
748# CONFIG_EXT2_FS_XIP is not set 797# CONFIG_EXT2_FS_XIP is not set
749# CONFIG_EXT3_FS is not set 798# CONFIG_EXT3_FS is not set
799# CONFIG_EXT4DEV_FS is not set
750# CONFIG_REISERFS_FS is not set 800# CONFIG_REISERFS_FS is not set
751# CONFIG_JFS_FS is not set 801# CONFIG_JFS_FS is not set
752# CONFIG_FS_POSIX_ACL is not set 802# CONFIG_FS_POSIX_ACL is not set
753# CONFIG_XFS_FS is not set 803# CONFIG_XFS_FS is not set
804# CONFIG_GFS2_FS is not set
754# CONFIG_OCFS2_FS is not set 805# CONFIG_OCFS2_FS is not set
755# CONFIG_MINIX_FS is not set 806# CONFIG_MINIX_FS is not set
756# CONFIG_ROMFS_FS is not set 807# CONFIG_ROMFS_FS is not set
@@ -780,17 +831,19 @@ CONFIG_FUSE_FS=m
780# 831#
781CONFIG_PROC_FS=y 832CONFIG_PROC_FS=y
782CONFIG_PROC_KCORE=y 833CONFIG_PROC_KCORE=y
834CONFIG_PROC_SYSCTL=y
783CONFIG_SYSFS=y 835CONFIG_SYSFS=y
784# CONFIG_TMPFS is not set 836# CONFIG_TMPFS is not set
785# CONFIG_HUGETLB_PAGE is not set 837# CONFIG_HUGETLB_PAGE is not set
786CONFIG_RAMFS=y 838CONFIG_RAMFS=y
787# CONFIG_CONFIGFS_FS is not set 839CONFIG_CONFIGFS_FS=m
788 840
789# 841#
790# Miscellaneous filesystems 842# Miscellaneous filesystems
791# 843#
792# CONFIG_ADFS_FS is not set 844# CONFIG_ADFS_FS is not set
793# CONFIG_AFFS_FS is not set 845# CONFIG_AFFS_FS is not set
846# CONFIG_ECRYPT_FS is not set
794# CONFIG_HFS_FS is not set 847# CONFIG_HFS_FS is not set
795# CONFIG_HFSPLUS_FS is not set 848# CONFIG_HFSPLUS_FS is not set
796# CONFIG_BEFS_FS is not set 849# CONFIG_BEFS_FS is not set
@@ -819,7 +872,6 @@ CONFIG_SUNRPC=y
819# CONFIG_RPCSEC_GSS_SPKM3 is not set 872# CONFIG_RPCSEC_GSS_SPKM3 is not set
820# CONFIG_SMB_FS is not set 873# CONFIG_SMB_FS is not set
821# CONFIG_CIFS is not set 874# CONFIG_CIFS is not set
822# CONFIG_CIFS_DEBUG2 is not set
823# CONFIG_NCP_FS is not set 875# CONFIG_NCP_FS is not set
824# CONFIG_CODA_FS is not set 876# CONFIG_CODA_FS is not set
825# CONFIG_AFS_FS is not set 877# CONFIG_AFS_FS is not set
@@ -837,6 +889,14 @@ CONFIG_MSDOS_PARTITION=y
837# CONFIG_NLS is not set 889# CONFIG_NLS is not set
838 890
839# 891#
892# Distributed Lock Manager
893#
894CONFIG_DLM=m
895CONFIG_DLM_TCP=y
896# CONFIG_DLM_SCTP is not set
897# CONFIG_DLM_DEBUG is not set
898
899#
840# Profiling support 900# Profiling support
841# 901#
842# CONFIG_PROFILING is not set 902# CONFIG_PROFILING is not set
@@ -846,13 +906,16 @@ CONFIG_MSDOS_PARTITION=y
846# 906#
847CONFIG_TRACE_IRQFLAGS_SUPPORT=y 907CONFIG_TRACE_IRQFLAGS_SUPPORT=y
848# CONFIG_PRINTK_TIME is not set 908# CONFIG_PRINTK_TIME is not set
909CONFIG_ENABLE_MUST_CHECK=y
849# CONFIG_MAGIC_SYSRQ is not set 910# CONFIG_MAGIC_SYSRQ is not set
850# CONFIG_UNUSED_SYMBOLS is not set 911# CONFIG_UNUSED_SYMBOLS is not set
912# CONFIG_DEBUG_FS is not set
913# CONFIG_HEADERS_CHECK is not set
851# CONFIG_DEBUG_KERNEL is not set 914# CONFIG_DEBUG_KERNEL is not set
852CONFIG_LOG_BUF_SHIFT=14 915CONFIG_LOG_BUF_SHIFT=14
853# CONFIG_DEBUG_FS is not set
854CONFIG_CROSSCOMPILE=y 916CONFIG_CROSSCOMPILE=y
855CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal ip=192.168.1.211:192.168.1.1:::gt::" 917CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal ip=192.168.1.211:192.168.1.1:::gt::"
918CONFIG_SYS_SUPPORTS_KGDB=y
856 919
857# 920#
858# Security options 921# Security options
@@ -865,18 +928,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
865# Cryptographic options 928# Cryptographic options
866# 929#
867CONFIG_CRYPTO=y 930CONFIG_CRYPTO=y
931CONFIG_CRYPTO_ALGAPI=y
932CONFIG_CRYPTO_BLKCIPHER=m
933CONFIG_CRYPTO_HASH=y
934CONFIG_CRYPTO_MANAGER=y
868CONFIG_CRYPTO_HMAC=y 935CONFIG_CRYPTO_HMAC=y
936CONFIG_CRYPTO_XCBC=m
869CONFIG_CRYPTO_NULL=m 937CONFIG_CRYPTO_NULL=m
870CONFIG_CRYPTO_MD4=m 938CONFIG_CRYPTO_MD4=m
871CONFIG_CRYPTO_MD5=m 939CONFIG_CRYPTO_MD5=y
872CONFIG_CRYPTO_SHA1=m 940CONFIG_CRYPTO_SHA1=m
873CONFIG_CRYPTO_SHA256=m 941CONFIG_CRYPTO_SHA256=m
874CONFIG_CRYPTO_SHA512=m 942CONFIG_CRYPTO_SHA512=m
875CONFIG_CRYPTO_WP512=m 943CONFIG_CRYPTO_WP512=m
876CONFIG_CRYPTO_TGR192=m 944CONFIG_CRYPTO_TGR192=m
945CONFIG_CRYPTO_GF128MUL=m
946CONFIG_CRYPTO_ECB=m
947CONFIG_CRYPTO_CBC=m
948CONFIG_CRYPTO_PCBC=m
949CONFIG_CRYPTO_LRW=m
877CONFIG_CRYPTO_DES=m 950CONFIG_CRYPTO_DES=m
951CONFIG_CRYPTO_FCRYPT=m
878CONFIG_CRYPTO_BLOWFISH=m 952CONFIG_CRYPTO_BLOWFISH=m
879CONFIG_CRYPTO_TWOFISH=m 953CONFIG_CRYPTO_TWOFISH=m
954CONFIG_CRYPTO_TWOFISH_COMMON=m
880CONFIG_CRYPTO_SERPENT=m 955CONFIG_CRYPTO_SERPENT=m
881CONFIG_CRYPTO_AES=m 956CONFIG_CRYPTO_AES=m
882CONFIG_CRYPTO_CAST5=m 957CONFIG_CRYPTO_CAST5=m
@@ -888,6 +963,7 @@ CONFIG_CRYPTO_ANUBIS=m
888CONFIG_CRYPTO_DEFLATE=m 963CONFIG_CRYPTO_DEFLATE=m
889CONFIG_CRYPTO_MICHAEL_MIC=m 964CONFIG_CRYPTO_MICHAEL_MIC=m
890CONFIG_CRYPTO_CRC32C=m 965CONFIG_CRYPTO_CRC32C=m
966CONFIG_CRYPTO_CAMELLIA=m
891# CONFIG_CRYPTO_TEST is not set 967# CONFIG_CRYPTO_TEST is not set
892 968
893# 969#
@@ -897,6 +973,7 @@ CONFIG_CRYPTO_CRC32C=m
897# 973#
898# Library routines 974# Library routines
899# 975#
976CONFIG_BITREVERSE=m
900CONFIG_CRC_CCITT=y 977CONFIG_CRC_CCITT=y
901CONFIG_CRC16=m 978CONFIG_CRC16=m
902CONFIG_CRC32=m 979CONFIG_CRC32=m
@@ -904,3 +981,5 @@ CONFIG_LIBCRC32C=m
904CONFIG_ZLIB_INFLATE=m 981CONFIG_ZLIB_INFLATE=m
905CONFIG_ZLIB_DEFLATE=m 982CONFIG_ZLIB_DEFLATE=m
906CONFIG_PLIST=y 983CONFIG_PLIST=y
984CONFIG_HAS_IOMEM=y
985CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig
index 697140c6562f..460d7a26a8ba 100644
--- a/arch/mips/configs/excite_defconfig
+++ b/arch/mips/configs/excite_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:09 2006 4# Tue Feb 20 21:47:31 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -26,8 +27,6 @@ CONFIG_BASLER_EXCITE=y
26# CONFIG_MIPS_COBALT is not set 27# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 28# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MIPS_EV64120 is not set 29# CONFIG_MIPS_EV64120 is not set
29# CONFIG_MIPS_IVR is not set
30# CONFIG_MIPS_ITE8172 is not set
31# CONFIG_MACH_JAZZ is not set 30# CONFIG_MACH_JAZZ is not set
32# CONFIG_LASAT is not set 31# CONFIG_LASAT is not set
33# CONFIG_MIPS_ATLAS is not set 32# CONFIG_MIPS_ATLAS is not set
@@ -41,8 +40,8 @@ CONFIG_BASLER_EXCITE=y
41# CONFIG_MOMENCO_OCELOT_C is not set 40# CONFIG_MOMENCO_OCELOT_C is not set
42# CONFIG_MOMENCO_OCELOT_G is not set 41# CONFIG_MOMENCO_OCELOT_G is not set
43# CONFIG_MIPS_XXS1500 is not set 42# CONFIG_MIPS_XXS1500 is not set
44# CONFIG_PNX8550_V2PCI is not set
45# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
46# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
47# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
48# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +64,14 @@ CONFIG_BASLER_EXCITE=y
65# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
66# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_COHERENT=y 75CONFIG_DMA_COHERENT=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
74# CONFIG_CPU_LITTLE_ENDIAN is not set 77# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -76,6 +79,10 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
76CONFIG_IRQ_CPU=y 79CONFIG_IRQ_CPU=y
77CONFIG_IRQ_CPU_RM7K=y 80CONFIG_IRQ_CPU_RM7K=y
78CONFIG_IRQ_CPU_RM9K=y 81CONFIG_IRQ_CPU_RM9K=y
82CONFIG_MIPS_RM9122=y
83CONFIG_SERIAL_RM9000=y
84CONFIG_GPI_RM9000=y
85CONFIG_WDT_RM9000=y
79CONFIG_MIPS_L1_CACHE_SHIFT=5 86CONFIG_MIPS_L1_CACHE_SHIFT=5
80 87
81# 88#
@@ -101,6 +108,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
101CONFIG_CPU_RM9000=y 108CONFIG_CPU_RM9000=y
102# CONFIG_CPU_SB1 is not set 109# CONFIG_CPU_SB1 is not set
103CONFIG_SYS_HAS_CPU_RM9000=y 110CONFIG_SYS_HAS_CPU_RM9000=y
111CONFIG_WEAK_ORDERING=y
104CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
105CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 113CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
106CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -117,8 +125,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 125# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 126CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 127CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 128# CONFIG_MIPS_MT_SMP is not set
129# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 130# CONFIG_MIPS_VPE_LOADER is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 131# CONFIG_64BIT_PHYS_ADDR is not set
124CONFIG_CPU_HAS_LLSC=y 132CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 144# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 145CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 146# CONFIG_RESOURCES_64BIT is not set
147CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 148# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 149# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 150# CONFIG_HZ_128 is not set
@@ -149,6 +158,7 @@ CONFIG_HZ=1000
149# CONFIG_PREEMPT_VOLUNTARY is not set 158# CONFIG_PREEMPT_VOLUNTARY is not set
150CONFIG_PREEMPT=y 159CONFIG_PREEMPT=y
151CONFIG_PREEMPT_BKL=y 160CONFIG_PREEMPT_BKL=y
161# CONFIG_KEXEC is not set
152CONFIG_LOCKDEP_SUPPORT=y 162CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 163CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 164CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -168,15 +178,20 @@ CONFIG_LOCALVERSION=""
168# CONFIG_LOCALVERSION_AUTO is not set 178# CONFIG_LOCALVERSION_AUTO is not set
169CONFIG_SWAP=y 179CONFIG_SWAP=y
170CONFIG_SYSVIPC=y 180CONFIG_SYSVIPC=y
181# CONFIG_IPC_NS is not set
182CONFIG_SYSVIPC_SYSCTL=y
171CONFIG_POSIX_MQUEUE=y 183CONFIG_POSIX_MQUEUE=y
172# CONFIG_BSD_PROCESS_ACCT is not set 184# CONFIG_BSD_PROCESS_ACCT is not set
173CONFIG_SYSCTL=y 185# CONFIG_TASKSTATS is not set
186# CONFIG_UTS_NS is not set
174# CONFIG_AUDIT is not set 187# CONFIG_AUDIT is not set
175# CONFIG_IKCONFIG is not set 188# CONFIG_IKCONFIG is not set
189CONFIG_SYSFS_DEPRECATED=y
176# CONFIG_RELAY is not set 190# CONFIG_RELAY is not set
177CONFIG_INITRAMFS_SOURCE=""
178CONFIG_CC_OPTIMIZE_FOR_SIZE=y 191CONFIG_CC_OPTIMIZE_FOR_SIZE=y
192CONFIG_SYSCTL=y
179CONFIG_EMBEDDED=y 193CONFIG_EMBEDDED=y
194CONFIG_SYSCTL_SYSCALL=y
180CONFIG_KALLSYMS=y 195CONFIG_KALLSYMS=y
181# CONFIG_KALLSYMS_EXTRA_PASS is not set 196# CONFIG_KALLSYMS_EXTRA_PASS is not set
182CONFIG_HOTPLUG=y 197CONFIG_HOTPLUG=y
@@ -184,12 +199,12 @@ CONFIG_PRINTK=y
184CONFIG_BUG=y 199CONFIG_BUG=y
185CONFIG_ELF_CORE=y 200CONFIG_ELF_CORE=y
186CONFIG_BASE_FULL=y 201CONFIG_BASE_FULL=y
187CONFIG_RT_MUTEXES=y
188CONFIG_FUTEX=y 202CONFIG_FUTEX=y
189CONFIG_EPOLL=y 203CONFIG_EPOLL=y
190CONFIG_SHMEM=y 204CONFIG_SHMEM=y
191CONFIG_SLAB=y 205CONFIG_SLAB=y
192CONFIG_VM_EVENT_COUNTERS=y 206CONFIG_VM_EVENT_COUNTERS=y
207CONFIG_RT_MUTEXES=y
193# CONFIG_TINY_SHMEM is not set 208# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0 209CONFIG_BASE_SMALL=0
195# CONFIG_SLOB is not set 210# CONFIG_SLOB is not set
@@ -207,6 +222,7 @@ CONFIG_KMOD=y
207# 222#
208# Block layer 223# Block layer
209# 224#
225CONFIG_BLOCK=y
210# CONFIG_LBD is not set 226# CONFIG_LBD is not set
211# CONFIG_BLK_DEV_IO_TRACE is not set 227# CONFIG_BLK_DEV_IO_TRACE is not set
212# CONFIG_LSF is not set 228# CONFIG_LSF is not set
@@ -249,6 +265,14 @@ CONFIG_BINFMT_ELF=y
249CONFIG_TRAD_SIGNALS=y 265CONFIG_TRAD_SIGNALS=y
250 266
251# 267#
268# Power management options
269#
270CONFIG_PM=y
271# CONFIG_PM_LEGACY is not set
272# CONFIG_PM_DEBUG is not set
273# CONFIG_PM_SYSFS_DEPRECATED is not set
274
275#
252# Networking 276# Networking
253# 277#
254CONFIG_NET=y 278CONFIG_NET=y
@@ -262,6 +286,8 @@ CONFIG_PACKET_MMAP=y
262CONFIG_UNIX=y 286CONFIG_UNIX=y
263CONFIG_XFRM=y 287CONFIG_XFRM=y
264# CONFIG_XFRM_USER is not set 288# CONFIG_XFRM_USER is not set
289# CONFIG_XFRM_SUB_POLICY is not set
290CONFIG_XFRM_MIGRATE=y
265# CONFIG_NET_KEY is not set 291# CONFIG_NET_KEY is not set
266CONFIG_INET=y 292CONFIG_INET=y
267# CONFIG_IP_MULTICAST is not set 293# CONFIG_IP_MULTICAST is not set
@@ -282,10 +308,13 @@ CONFIG_IP_PNP_DHCP=y
282# CONFIG_INET_TUNNEL is not set 308# CONFIG_INET_TUNNEL is not set
283CONFIG_INET_XFRM_MODE_TRANSPORT=m 309CONFIG_INET_XFRM_MODE_TRANSPORT=m
284CONFIG_INET_XFRM_MODE_TUNNEL=m 310CONFIG_INET_XFRM_MODE_TUNNEL=m
311CONFIG_INET_XFRM_MODE_BEET=m
285CONFIG_INET_DIAG=y 312CONFIG_INET_DIAG=y
286CONFIG_INET_TCP_DIAG=y 313CONFIG_INET_TCP_DIAG=y
287# CONFIG_TCP_CONG_ADVANCED is not set 314# CONFIG_TCP_CONG_ADVANCED is not set
288CONFIG_TCP_CONG_BIC=y 315CONFIG_TCP_CONG_CUBIC=y
316CONFIG_DEFAULT_TCP_CONG="cubic"
317CONFIG_TCP_MD5SIG=y
289# CONFIG_IPV6 is not set 318# CONFIG_IPV6 is not set
290# CONFIG_INET6_XFRM_TUNNEL is not set 319# CONFIG_INET6_XFRM_TUNNEL is not set
291# CONFIG_INET6_TUNNEL is not set 320# CONFIG_INET6_TUNNEL is not set
@@ -315,7 +344,6 @@ CONFIG_NETWORK_SECMARK=y
315# CONFIG_ATALK is not set 344# CONFIG_ATALK is not set
316# CONFIG_X25 is not set 345# CONFIG_X25 is not set
317# CONFIG_LAPB is not set 346# CONFIG_LAPB is not set
318# CONFIG_NET_DIVERT is not set
319# CONFIG_ECONET is not set 347# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 348# CONFIG_WAN_ROUTER is not set
321 349
@@ -342,7 +370,7 @@ CONFIG_NETWORK_SECMARK=y
342# 370#
343CONFIG_STANDALONE=y 371CONFIG_STANDALONE=y
344CONFIG_PREVENT_FIRMWARE_BUILD=y 372CONFIG_PREVENT_FIRMWARE_BUILD=y
345# CONFIG_FW_LOADER is not set 373CONFIG_FW_LOADER=m
346# CONFIG_SYS_HYPERVISOR is not set 374# CONFIG_SYS_HYPERVISOR is not set
347 375
348# 376#
@@ -364,11 +392,13 @@ CONFIG_MTD_PARTITIONS=y
364# User Modules And Translation Layers 392# User Modules And Translation Layers
365# 393#
366CONFIG_MTD_CHAR=y 394CONFIG_MTD_CHAR=y
395CONFIG_MTD_BLKDEVS=y
367CONFIG_MTD_BLOCK=y 396CONFIG_MTD_BLOCK=y
368# CONFIG_FTL is not set 397# CONFIG_FTL is not set
369# CONFIG_NFTL is not set 398# CONFIG_NFTL is not set
370# CONFIG_INFTL is not set 399# CONFIG_INFTL is not set
371# CONFIG_RFD_FTL is not set 400# CONFIG_RFD_FTL is not set
401# CONFIG_SSFDC is not set
372 402
373# 403#
374# RAM/ROM/Flash chip drivers 404# RAM/ROM/Flash chip drivers
@@ -420,6 +450,8 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
420# CONFIG_MTD_NAND_ECC_SMC is not set 450# CONFIG_MTD_NAND_ECC_SMC is not set
421CONFIG_MTD_NAND_IDS=y 451CONFIG_MTD_NAND_IDS=y
422# CONFIG_MTD_NAND_DISKONCHIP is not set 452# CONFIG_MTD_NAND_DISKONCHIP is not set
453# CONFIG_MTD_NAND_BASLER_EXCITE is not set
454# CONFIG_MTD_NAND_CAFE is not set
423# CONFIG_MTD_NAND_NANDSIM is not set 455# CONFIG_MTD_NAND_NANDSIM is not set
424 456
425# 457#
@@ -435,6 +467,7 @@ CONFIG_MTD_NAND_IDS=y
435# 467#
436# Plug and Play support 468# Plug and Play support
437# 469#
470# CONFIG_PNPACPI is not set
438 471
439# 472#
440# Block devices 473# Block devices
@@ -455,6 +488,12 @@ CONFIG_BLK_DEV_LOOP=m
455# CONFIG_ATA_OVER_ETH is not set 488# CONFIG_ATA_OVER_ETH is not set
456 489
457# 490#
491# Misc devices
492#
493CONFIG_SGI_IOC4=m
494# CONFIG_TIFM_CORE is not set
495
496#
458# ATA/ATAPI/MFM/RLL support 497# ATA/ATAPI/MFM/RLL support
459# 498#
460# CONFIG_IDE is not set 499# CONFIG_IDE is not set
@@ -464,6 +503,8 @@ CONFIG_BLK_DEV_LOOP=m
464# 503#
465# CONFIG_RAID_ATTRS is not set 504# CONFIG_RAID_ATTRS is not set
466CONFIG_SCSI=y 505CONFIG_SCSI=y
506CONFIG_SCSI_TGT=m
507# CONFIG_SCSI_NETLINK is not set
467# CONFIG_SCSI_PROC_FS is not set 508# CONFIG_SCSI_PROC_FS is not set
468 509
469# 510#
@@ -482,14 +523,17 @@ CONFIG_BLK_DEV_SD=y
482# CONFIG_SCSI_MULTI_LUN is not set 523# CONFIG_SCSI_MULTI_LUN is not set
483# CONFIG_SCSI_CONSTANTS is not set 524# CONFIG_SCSI_CONSTANTS is not set
484# CONFIG_SCSI_LOGGING is not set 525# CONFIG_SCSI_LOGGING is not set
526CONFIG_SCSI_SCAN_ASYNC=y
485 527
486# 528#
487# SCSI Transport Attributes 529# SCSI Transports
488# 530#
489# CONFIG_SCSI_SPI_ATTRS is not set 531# CONFIG_SCSI_SPI_ATTRS is not set
490# CONFIG_SCSI_FC_ATTRS is not set 532# CONFIG_SCSI_FC_ATTRS is not set
491# CONFIG_SCSI_ISCSI_ATTRS is not set 533# CONFIG_SCSI_ISCSI_ATTRS is not set
492# CONFIG_SCSI_SAS_ATTRS is not set 534CONFIG_SCSI_SAS_ATTRS=m
535CONFIG_SCSI_SAS_LIBSAS=m
536# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
493 537
494# 538#
495# SCSI low-level drivers 539# SCSI low-level drivers
@@ -502,26 +546,35 @@ CONFIG_BLK_DEV_SD=y
502# CONFIG_SCSI_AIC7XXX is not set 546# CONFIG_SCSI_AIC7XXX is not set
503# CONFIG_SCSI_AIC7XXX_OLD is not set 547# CONFIG_SCSI_AIC7XXX_OLD is not set
504# CONFIG_SCSI_AIC79XX is not set 548# CONFIG_SCSI_AIC79XX is not set
549CONFIG_SCSI_AIC94XX=m
550# CONFIG_AIC94XX_DEBUG is not set
505# CONFIG_SCSI_DPT_I2O is not set 551# CONFIG_SCSI_DPT_I2O is not set
552# CONFIG_SCSI_ARCMSR is not set
506# CONFIG_MEGARAID_NEWGEN is not set 553# CONFIG_MEGARAID_NEWGEN is not set
507# CONFIG_MEGARAID_LEGACY is not set 554# CONFIG_MEGARAID_LEGACY is not set
508# CONFIG_MEGARAID_SAS is not set 555# CONFIG_MEGARAID_SAS is not set
509# CONFIG_SCSI_SATA is not set
510# CONFIG_SCSI_HPTIOP is not set 556# CONFIG_SCSI_HPTIOP is not set
511# CONFIG_SCSI_DMX3191D is not set 557# CONFIG_SCSI_DMX3191D is not set
512# CONFIG_SCSI_FUTURE_DOMAIN is not set 558# CONFIG_SCSI_FUTURE_DOMAIN is not set
513# CONFIG_SCSI_IPS is not set 559# CONFIG_SCSI_IPS is not set
514# CONFIG_SCSI_INITIO is not set 560# CONFIG_SCSI_INITIO is not set
515# CONFIG_SCSI_INIA100 is not set 561# CONFIG_SCSI_INIA100 is not set
562# CONFIG_SCSI_STEX is not set
516# CONFIG_SCSI_SYM53C8XX_2 is not set 563# CONFIG_SCSI_SYM53C8XX_2 is not set
517# CONFIG_SCSI_IPR is not set
518# CONFIG_SCSI_QLOGIC_1280 is not set 564# CONFIG_SCSI_QLOGIC_1280 is not set
519# CONFIG_SCSI_QLA_FC is not set 565# CONFIG_SCSI_QLA_FC is not set
566# CONFIG_SCSI_QLA_ISCSI is not set
520# CONFIG_SCSI_LPFC is not set 567# CONFIG_SCSI_LPFC is not set
521# CONFIG_SCSI_DC395x is not set 568# CONFIG_SCSI_DC395x is not set
522# CONFIG_SCSI_DC390T is not set 569# CONFIG_SCSI_DC390T is not set
523# CONFIG_SCSI_NSP32 is not set 570# CONFIG_SCSI_NSP32 is not set
524# CONFIG_SCSI_DEBUG is not set 571# CONFIG_SCSI_DEBUG is not set
572# CONFIG_SCSI_SRP is not set
573
574#
575# Serial ATA (prod) and Parallel ATA (experimental) drivers
576#
577# CONFIG_ATA is not set
525 578
526# 579#
527# Multi-device support (RAID and LVM) 580# Multi-device support (RAID and LVM)
@@ -585,14 +638,18 @@ CONFIG_NETDEVICES=y
585# CONFIG_SK98LIN is not set 638# CONFIG_SK98LIN is not set
586# CONFIG_TIGON3 is not set 639# CONFIG_TIGON3 is not set
587# CONFIG_BNX2 is not set 640# CONFIG_BNX2 is not set
641CONFIG_QLA3XXX=m
642# CONFIG_ATL1 is not set
588 643
589# 644#
590# Ethernet (10000 Mbit) 645# Ethernet (10000 Mbit)
591# 646#
592# CONFIG_CHELSIO_T1 is not set 647# CONFIG_CHELSIO_T1 is not set
648CONFIG_CHELSIO_T3=m
593# CONFIG_IXGB is not set 649# CONFIG_IXGB is not set
594# CONFIG_S2IO is not set 650# CONFIG_S2IO is not set
595# CONFIG_MYRI10GE is not set 651# CONFIG_MYRI10GE is not set
652CONFIG_NETXEN_NIC=m
596 653
597# 654#
598# Token Ring devices 655# Token Ring devices
@@ -632,6 +689,7 @@ CONFIG_NETDEVICES=y
632# Input device support 689# Input device support
633# 690#
634CONFIG_INPUT=y 691CONFIG_INPUT=y
692# CONFIG_INPUT_FF_MEMLESS is not set
635 693
636# 694#
637# Userland interfaces 695# Userland interfaces
@@ -707,6 +765,7 @@ CONFIG_WATCHDOG=y
707# Watchdog Device Drivers 765# Watchdog Device Drivers
708# 766#
709# CONFIG_SOFT_WATCHDOG is not set 767# CONFIG_SOFT_WATCHDOG is not set
768CONFIG_WDT_RM9K_GPI=m
710 769
711# 770#
712# PCI-based Watchdog Cards 771# PCI-based Watchdog Cards
@@ -724,10 +783,6 @@ CONFIG_WATCHDOG=y
724# CONFIG_DTLK is not set 783# CONFIG_DTLK is not set
725# CONFIG_R3964 is not set 784# CONFIG_R3964 is not set
726# CONFIG_APPLICOM is not set 785# CONFIG_APPLICOM is not set
727
728#
729# Ftape, the floppy tape device driver
730#
731# CONFIG_DRM is not set 786# CONFIG_DRM is not set
732# CONFIG_RAW_DRIVER is not set 787# CONFIG_RAW_DRIVER is not set
733 788
@@ -735,7 +790,6 @@ CONFIG_WATCHDOG=y
735# TPM devices 790# TPM devices
736# 791#
737# CONFIG_TCG_TPM is not set 792# CONFIG_TCG_TPM is not set
738# CONFIG_TELCLOCK is not set
739 793
740# 794#
741# I2C support 795# I2C support
@@ -751,6 +805,7 @@ CONFIG_WATCHDOG=y
751# 805#
752# Dallas's 1-wire bus 806# Dallas's 1-wire bus
753# 807#
808# CONFIG_W1 is not set
754 809
755# 810#
756# Hardware Monitoring support 811# Hardware Monitoring support
@@ -759,14 +814,9 @@ CONFIG_WATCHDOG=y
759# CONFIG_HWMON_VID is not set 814# CONFIG_HWMON_VID is not set
760 815
761# 816#
762# Misc devices
763#
764
765#
766# Multimedia devices 817# Multimedia devices
767# 818#
768# CONFIG_VIDEO_DEV is not set 819# CONFIG_VIDEO_DEV is not set
769CONFIG_VIDEO_V4L2=y
770 820
771# 821#
772# Digital Video Broadcasting Devices 822# Digital Video Broadcasting Devices
@@ -782,6 +832,7 @@ CONFIG_FB=y
782# CONFIG_FB_CFB_FILLRECT is not set 832# CONFIG_FB_CFB_FILLRECT is not set
783# CONFIG_FB_CFB_COPYAREA is not set 833# CONFIG_FB_CFB_COPYAREA is not set
784# CONFIG_FB_CFB_IMAGEBLIT is not set 834# CONFIG_FB_CFB_IMAGEBLIT is not set
835# CONFIG_FB_SVGALIB is not set
785# CONFIG_FB_MACMODES is not set 836# CONFIG_FB_MACMODES is not set
786# CONFIG_FB_BACKLIGHT is not set 837# CONFIG_FB_BACKLIGHT is not set
787# CONFIG_FB_MODE_HELPERS is not set 838# CONFIG_FB_MODE_HELPERS is not set
@@ -798,6 +849,7 @@ CONFIG_FB=y
798# CONFIG_FB_RADEON is not set 849# CONFIG_FB_RADEON is not set
799# CONFIG_FB_ATY128 is not set 850# CONFIG_FB_ATY128 is not set
800# CONFIG_FB_ATY is not set 851# CONFIG_FB_ATY is not set
852# CONFIG_FB_S3 is not set
801# CONFIG_FB_SAVAGE is not set 853# CONFIG_FB_SAVAGE is not set
802# CONFIG_FB_SIS is not set 854# CONFIG_FB_SIS is not set
803# CONFIG_FB_NEOMAGIC is not set 855# CONFIG_FB_NEOMAGIC is not set
@@ -831,6 +883,12 @@ CONFIG_FONT_8x16=y
831# CONFIG_SOUND is not set 883# CONFIG_SOUND is not set
832 884
833# 885#
886# HID Devices
887#
888CONFIG_HID=y
889# CONFIG_HID_DEBUG is not set
890
891#
834# USB support 892# USB support
835# 893#
836CONFIG_USB_ARCH_HAS_HCD=y 894CONFIG_USB_ARCH_HAS_HCD=y
@@ -843,8 +901,8 @@ CONFIG_USB=y
843# Miscellaneous USB options 901# Miscellaneous USB options
844# 902#
845CONFIG_USB_DEVICEFS=y 903CONFIG_USB_DEVICEFS=y
846# CONFIG_USB_BANDWIDTH is not set
847# CONFIG_USB_DYNAMIC_MINORS is not set 904# CONFIG_USB_DYNAMIC_MINORS is not set
905# CONFIG_USB_SUSPEND is not set
848# CONFIG_USB_OTG is not set 906# CONFIG_USB_OTG is not set
849 907
850# 908#
@@ -854,9 +912,11 @@ CONFIG_USB_EHCI_HCD=y
854# CONFIG_USB_EHCI_SPLIT_ISO is not set 912# CONFIG_USB_EHCI_SPLIT_ISO is not set
855# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 913# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
856# CONFIG_USB_EHCI_TT_NEWSCHED is not set 914# CONFIG_USB_EHCI_TT_NEWSCHED is not set
915# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
857# CONFIG_USB_ISP116X_HCD is not set 916# CONFIG_USB_ISP116X_HCD is not set
858CONFIG_USB_OHCI_HCD=y 917CONFIG_USB_OHCI_HCD=y
859# CONFIG_USB_OHCI_BIG_ENDIAN is not set 918# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
919# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
860CONFIG_USB_OHCI_LITTLE_ENDIAN=y 920CONFIG_USB_OHCI_LITTLE_ENDIAN=y
861# CONFIG_USB_UHCI_HCD is not set 921# CONFIG_USB_UHCI_HCD is not set
862# CONFIG_USB_SL811_HCD is not set 922# CONFIG_USB_SL811_HCD is not set
@@ -884,14 +944,13 @@ CONFIG_USB_STORAGE=y
884# CONFIG_USB_STORAGE_SDDR55 is not set 944# CONFIG_USB_STORAGE_SDDR55 is not set
885# CONFIG_USB_STORAGE_JUMPSHOT is not set 945# CONFIG_USB_STORAGE_JUMPSHOT is not set
886# CONFIG_USB_STORAGE_ALAUDA is not set 946# CONFIG_USB_STORAGE_ALAUDA is not set
887# CONFIG_USB_STORAGE_ONETOUCH is not set 947# CONFIG_USB_STORAGE_KARMA is not set
888# CONFIG_USB_LIBUSUAL is not set 948# CONFIG_USB_LIBUSUAL is not set
889 949
890# 950#
891# USB Input Devices 951# USB Input Devices
892# 952#
893CONFIG_USB_HID=m 953CONFIG_USB_HID=m
894CONFIG_USB_HIDINPUT=y
895# CONFIG_USB_HIDINPUT_POWERBOOK is not set 954# CONFIG_USB_HIDINPUT_POWERBOOK is not set
896# CONFIG_HID_FF is not set 955# CONFIG_HID_FF is not set
897# CONFIG_USB_HIDDEV is not set 956# CONFIG_USB_HIDDEV is not set
@@ -913,6 +972,7 @@ CONFIG_USB_HIDINPUT=y
913# CONFIG_USB_ATI_REMOTE2 is not set 972# CONFIG_USB_ATI_REMOTE2 is not set
914# CONFIG_USB_KEYSPAN_REMOTE is not set 973# CONFIG_USB_KEYSPAN_REMOTE is not set
915# CONFIG_USB_APPLETOUCH is not set 974# CONFIG_USB_APPLETOUCH is not set
975# CONFIG_USB_GTCO is not set
916 976
917# 977#
918# USB Imaging devices 978# USB Imaging devices
@@ -927,6 +987,7 @@ CONFIG_USB_HIDINPUT=y
927# CONFIG_USB_KAWETH is not set 987# CONFIG_USB_KAWETH is not set
928# CONFIG_USB_PEGASUS is not set 988# CONFIG_USB_PEGASUS is not set
929# CONFIG_USB_RTL8150 is not set 989# CONFIG_USB_RTL8150 is not set
990# CONFIG_USB_USBNET_MII is not set
930# CONFIG_USB_USBNET is not set 991# CONFIG_USB_USBNET is not set
931# CONFIG_USB_MON is not set 992# CONFIG_USB_MON is not set
932 993
@@ -944,19 +1005,22 @@ CONFIG_USB_HIDINPUT=y
944# 1005#
945# CONFIG_USB_EMI62 is not set 1006# CONFIG_USB_EMI62 is not set
946# CONFIG_USB_EMI26 is not set 1007# CONFIG_USB_EMI26 is not set
1008# CONFIG_USB_ADUTUX is not set
947# CONFIG_USB_AUERSWALD is not set 1009# CONFIG_USB_AUERSWALD is not set
948# CONFIG_USB_RIO500 is not set 1010# CONFIG_USB_RIO500 is not set
949# CONFIG_USB_LEGOTOWER is not set 1011# CONFIG_USB_LEGOTOWER is not set
950# CONFIG_USB_LCD is not set 1012# CONFIG_USB_LCD is not set
1013# CONFIG_USB_BERRY_CHARGE is not set
951# CONFIG_USB_LED is not set 1014# CONFIG_USB_LED is not set
952# CONFIG_USB_CY7C63 is not set 1015# CONFIG_USB_CYPRESS_CY7C63 is not set
953# CONFIG_USB_CYTHERM is not set 1016# CONFIG_USB_CYTHERM is not set
954# CONFIG_USB_PHIDGETKIT is not set 1017# CONFIG_USB_PHIDGET is not set
955# CONFIG_USB_PHIDGETSERVO is not set
956# CONFIG_USB_IDMOUSE is not set 1018# CONFIG_USB_IDMOUSE is not set
1019# CONFIG_USB_FTDI_ELAN is not set
957# CONFIG_USB_APPLEDISPLAY is not set 1020# CONFIG_USB_APPLEDISPLAY is not set
958# CONFIG_USB_SISUSBVGA is not set 1021# CONFIG_USB_SISUSBVGA is not set
959# CONFIG_USB_LD is not set 1022# CONFIG_USB_LD is not set
1023# CONFIG_USB_TRANCEVIBRATOR is not set
960# CONFIG_USB_TEST is not set 1024# CONFIG_USB_TEST is not set
961 1025
962# 1026#
@@ -1014,16 +1078,26 @@ CONFIG_USB_HIDINPUT=y
1014# 1078#
1015 1079
1016# 1080#
1081# Auxiliary Display support
1082#
1083
1084#
1085# Virtualization
1086#
1087
1088#
1017# File systems 1089# File systems
1018# 1090#
1019CONFIG_EXT2_FS=y 1091CONFIG_EXT2_FS=y
1020# CONFIG_EXT2_FS_XATTR is not set 1092# CONFIG_EXT2_FS_XATTR is not set
1021# CONFIG_EXT2_FS_XIP is not set 1093# CONFIG_EXT2_FS_XIP is not set
1022# CONFIG_EXT3_FS is not set 1094# CONFIG_EXT3_FS is not set
1095# CONFIG_EXT4DEV_FS is not set
1023# CONFIG_REISERFS_FS is not set 1096# CONFIG_REISERFS_FS is not set
1024# CONFIG_JFS_FS is not set 1097# CONFIG_JFS_FS is not set
1025# CONFIG_FS_POSIX_ACL is not set 1098CONFIG_FS_POSIX_ACL=y
1026# CONFIG_XFS_FS is not set 1099# CONFIG_XFS_FS is not set
1100# CONFIG_GFS2_FS is not set
1027# CONFIG_OCFS2_FS is not set 1101# CONFIG_OCFS2_FS is not set
1028# CONFIG_MINIX_FS is not set 1102# CONFIG_MINIX_FS is not set
1029# CONFIG_ROMFS_FS is not set 1103# CONFIG_ROMFS_FS is not set
@@ -1034,6 +1108,7 @@ CONFIG_INOTIFY_USER=y
1034# CONFIG_AUTOFS_FS is not set 1108# CONFIG_AUTOFS_FS is not set
1035# CONFIG_AUTOFS4_FS is not set 1109# CONFIG_AUTOFS4_FS is not set
1036# CONFIG_FUSE_FS is not set 1110# CONFIG_FUSE_FS is not set
1111CONFIG_GENERIC_ACL=y
1037 1112
1038# 1113#
1039# CD-ROM/DVD Filesystems 1114# CD-ROM/DVD Filesystems
@@ -1056,11 +1131,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1056# 1131#
1057CONFIG_PROC_FS=y 1132CONFIG_PROC_FS=y
1058CONFIG_PROC_KCORE=y 1133CONFIG_PROC_KCORE=y
1134CONFIG_PROC_SYSCTL=y
1059CONFIG_SYSFS=y 1135CONFIG_SYSFS=y
1060CONFIG_TMPFS=y 1136CONFIG_TMPFS=y
1137CONFIG_TMPFS_POSIX_ACL=y
1061# CONFIG_HUGETLB_PAGE is not set 1138# CONFIG_HUGETLB_PAGE is not set
1062CONFIG_RAMFS=y 1139CONFIG_RAMFS=y
1063# CONFIG_CONFIGFS_FS is not set 1140CONFIG_CONFIGFS_FS=m
1064 1141
1065# 1142#
1066# Miscellaneous filesystems 1143# Miscellaneous filesystems
@@ -1072,7 +1149,6 @@ CONFIG_RAMFS=y
1072# CONFIG_BEFS_FS is not set 1149# CONFIG_BEFS_FS is not set
1073# CONFIG_BFS_FS is not set 1150# CONFIG_BFS_FS is not set
1074# CONFIG_EFS_FS is not set 1151# CONFIG_EFS_FS is not set
1075# CONFIG_JFFS_FS is not set
1076CONFIG_JFFS2_FS=y 1152CONFIG_JFFS2_FS=y
1077CONFIG_JFFS2_FS_DEBUG=0 1153CONFIG_JFFS2_FS_DEBUG=0
1078CONFIG_JFFS2_FS_WRITEBUFFER=y 1154CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1107,7 +1183,6 @@ CONFIG_SUNRPC=y
1107# CONFIG_RPCSEC_GSS_SPKM3 is not set 1183# CONFIG_RPCSEC_GSS_SPKM3 is not set
1108# CONFIG_SMB_FS is not set 1184# CONFIG_SMB_FS is not set
1109# CONFIG_CIFS is not set 1185# CONFIG_CIFS is not set
1110# CONFIG_CIFS_DEBUG2 is not set
1111# CONFIG_NCP_FS is not set 1186# CONFIG_NCP_FS is not set
1112# CONFIG_CODA_FS is not set 1187# CONFIG_CODA_FS is not set
1113# CONFIG_AFS_FS is not set 1188# CONFIG_AFS_FS is not set
@@ -1179,6 +1254,14 @@ CONFIG_NLS_ISO8859_1=m
1179# CONFIG_NLS_UTF8 is not set 1254# CONFIG_NLS_UTF8 is not set
1180 1255
1181# 1256#
1257# Distributed Lock Manager
1258#
1259CONFIG_DLM=m
1260CONFIG_DLM_TCP=y
1261# CONFIG_DLM_SCTP is not set
1262# CONFIG_DLM_DEBUG is not set
1263
1264#
1182# Profiling support 1265# Profiling support
1183# 1266#
1184# CONFIG_PROFILING is not set 1267# CONFIG_PROFILING is not set
@@ -1188,13 +1271,16 @@ CONFIG_NLS_ISO8859_1=m
1188# 1271#
1189CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1272CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1190# CONFIG_PRINTK_TIME is not set 1273# CONFIG_PRINTK_TIME is not set
1274CONFIG_ENABLE_MUST_CHECK=y
1191# CONFIG_MAGIC_SYSRQ is not set 1275# CONFIG_MAGIC_SYSRQ is not set
1192# CONFIG_UNUSED_SYMBOLS is not set 1276# CONFIG_UNUSED_SYMBOLS is not set
1277# CONFIG_DEBUG_FS is not set
1278# CONFIG_HEADERS_CHECK is not set
1193# CONFIG_DEBUG_KERNEL is not set 1279# CONFIG_DEBUG_KERNEL is not set
1194CONFIG_LOG_BUF_SHIFT=14 1280CONFIG_LOG_BUF_SHIFT=14
1195# CONFIG_DEBUG_FS is not set
1196CONFIG_CROSSCOMPILE=y 1281CONFIG_CROSSCOMPILE=y
1197CONFIG_CMDLINE="" 1282CONFIG_CMDLINE=""
1283CONFIG_SYS_SUPPORTS_KGDB=y
1198 1284
1199# 1285#
1200# Security options 1286# Security options
@@ -1206,16 +1292,27 @@ CONFIG_CMDLINE=""
1206# Cryptographic options 1292# Cryptographic options
1207# 1293#
1208CONFIG_CRYPTO=y 1294CONFIG_CRYPTO=y
1295CONFIG_CRYPTO_ALGAPI=y
1296CONFIG_CRYPTO_BLKCIPHER=m
1297CONFIG_CRYPTO_HASH=m
1298CONFIG_CRYPTO_MANAGER=m
1209# CONFIG_CRYPTO_HMAC is not set 1299# CONFIG_CRYPTO_HMAC is not set
1300CONFIG_CRYPTO_XCBC=m
1210# CONFIG_CRYPTO_NULL is not set 1301# CONFIG_CRYPTO_NULL is not set
1211# CONFIG_CRYPTO_MD4 is not set 1302# CONFIG_CRYPTO_MD4 is not set
1212# CONFIG_CRYPTO_MD5 is not set 1303CONFIG_CRYPTO_MD5=y
1213# CONFIG_CRYPTO_SHA1 is not set 1304# CONFIG_CRYPTO_SHA1 is not set
1214# CONFIG_CRYPTO_SHA256 is not set 1305# CONFIG_CRYPTO_SHA256 is not set
1215# CONFIG_CRYPTO_SHA512 is not set 1306# CONFIG_CRYPTO_SHA512 is not set
1216# CONFIG_CRYPTO_WP512 is not set 1307# CONFIG_CRYPTO_WP512 is not set
1217# CONFIG_CRYPTO_TGR192 is not set 1308# CONFIG_CRYPTO_TGR192 is not set
1309CONFIG_CRYPTO_GF128MUL=m
1310CONFIG_CRYPTO_ECB=m
1311CONFIG_CRYPTO_CBC=m
1312CONFIG_CRYPTO_PCBC=m
1313CONFIG_CRYPTO_LRW=m
1218# CONFIG_CRYPTO_DES is not set 1314# CONFIG_CRYPTO_DES is not set
1315CONFIG_CRYPTO_FCRYPT=m
1219# CONFIG_CRYPTO_BLOWFISH is not set 1316# CONFIG_CRYPTO_BLOWFISH is not set
1220# CONFIG_CRYPTO_TWOFISH is not set 1317# CONFIG_CRYPTO_TWOFISH is not set
1221# CONFIG_CRYPTO_SERPENT is not set 1318# CONFIG_CRYPTO_SERPENT is not set
@@ -1229,6 +1326,7 @@ CONFIG_CRYPTO=y
1229# CONFIG_CRYPTO_DEFLATE is not set 1326# CONFIG_CRYPTO_DEFLATE is not set
1230# CONFIG_CRYPTO_MICHAEL_MIC is not set 1327# CONFIG_CRYPTO_MICHAEL_MIC is not set
1231# CONFIG_CRYPTO_CRC32C is not set 1328# CONFIG_CRYPTO_CRC32C is not set
1329CONFIG_CRYPTO_CAMELLIA=m
1232# CONFIG_CRYPTO_TEST is not set 1330# CONFIG_CRYPTO_TEST is not set
1233 1331
1234# 1332#
@@ -1238,6 +1336,7 @@ CONFIG_CRYPTO=y
1238# 1336#
1239# Library routines 1337# Library routines
1240# 1338#
1339CONFIG_BITREVERSE=y
1241# CONFIG_CRC_CCITT is not set 1340# CONFIG_CRC_CCITT is not set
1242# CONFIG_CRC16 is not set 1341# CONFIG_CRC16 is not set
1243CONFIG_CRC32=y 1342CONFIG_CRC32=y
@@ -1245,3 +1344,5 @@ CONFIG_CRC32=y
1245CONFIG_ZLIB_INFLATE=y 1344CONFIG_ZLIB_INFLATE=y
1246CONFIG_ZLIB_DEFLATE=y 1345CONFIG_ZLIB_DEFLATE=y
1247CONFIG_PLIST=y 1346CONFIG_PLIST=y
1347CONFIG_HAS_IOMEM=y
1348CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index f9812d1e4579..7ec618f3c8b9 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:10 2006 4# Tue Feb 20 21:47:32 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,13 +63,18 @@ CONFIG_SGI_IP22=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_ARC=y 74CONFIG_ARC=y
72CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
77CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
74CONFIG_CPU_BIG_ENDIAN=y 78CONFIG_CPU_BIG_ENDIAN=y
75# CONFIG_CPU_LITTLE_ENDIAN is not set 79# CONFIG_CPU_LITTLE_ENDIAN is not set
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 80CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -123,8 +127,8 @@ CONFIG_PAGE_SIZE_4KB=y
123CONFIG_BOARD_SCACHE=y 127CONFIG_BOARD_SCACHE=y
124CONFIG_IP22_CPU_SCACHE=y 128CONFIG_IP22_CPU_SCACHE=y
125CONFIG_MIPS_MT_DISABLED=y 129CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 130# CONFIG_MIPS_MT_SMP is not set
131# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 132# CONFIG_MIPS_VPE_LOADER is not set
129# CONFIG_64BIT_PHYS_ADDR is not set 133# CONFIG_64BIT_PHYS_ADDR is not set
130CONFIG_CPU_HAS_LLSC=y 134CONFIG_CPU_HAS_LLSC=y
@@ -141,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set 147# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 149# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 150# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 151# CONFIG_HZ_128 is not set
@@ -153,6 +158,7 @@ CONFIG_HZ=1000
153# CONFIG_PREEMPT_NONE is not set 158# CONFIG_PREEMPT_NONE is not set
154CONFIG_PREEMPT_VOLUNTARY=y 159CONFIG_PREEMPT_VOLUNTARY=y
155# CONFIG_PREEMPT is not set 160# CONFIG_PREEMPT is not set
161# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 162CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 163CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 164CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,16 +177,21 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 177CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 178CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 179CONFIG_SYSVIPC=y
180# CONFIG_IPC_NS is not set
181CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 182# CONFIG_POSIX_MQUEUE is not set
175# CONFIG_BSD_PROCESS_ACCT is not set 183# CONFIG_BSD_PROCESS_ACCT is not set
176CONFIG_SYSCTL=y 184# CONFIG_TASKSTATS is not set
185# CONFIG_UTS_NS is not set
177# CONFIG_AUDIT is not set 186# CONFIG_AUDIT is not set
178CONFIG_IKCONFIG=y 187CONFIG_IKCONFIG=y
179CONFIG_IKCONFIG_PROC=y 188CONFIG_IKCONFIG_PROC=y
189CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 190CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 191# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
192CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 193CONFIG_EMBEDDED=y
194CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 195CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 196# CONFIG_KALLSYMS_EXTRA_PASS is not set
186# CONFIG_HOTPLUG is not set 197# CONFIG_HOTPLUG is not set
@@ -188,12 +199,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 199CONFIG_BUG=y
189CONFIG_ELF_CORE=y 200CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 201CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 202CONFIG_FUTEX=y
193CONFIG_EPOLL=y 203CONFIG_EPOLL=y
194CONFIG_SHMEM=y 204CONFIG_SHMEM=y
195CONFIG_SLAB=y 205CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 206CONFIG_VM_EVENT_COUNTERS=y
207CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 208# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 209CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 210# CONFIG_SLOB is not set
@@ -211,6 +222,7 @@ CONFIG_KMOD=y
211# 222#
212# Block layer 223# Block layer
213# 224#
225CONFIG_BLOCK=y
214# CONFIG_LBD is not set 226# CONFIG_LBD is not set
215# CONFIG_BLK_DEV_IO_TRACE is not set 227# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_LSF is not set 228# CONFIG_LSF is not set
@@ -238,7 +250,6 @@ CONFIG_MMU=y
238# 250#
239# PCCARD (PCMCIA/CardBus) support 251# PCCARD (PCMCIA/CardBus) support
240# 252#
241# CONFIG_PCCARD is not set
242 253
243# 254#
244# PCI Hotplug Support 255# PCI Hotplug Support
@@ -252,6 +263,14 @@ CONFIG_BINFMT_MISC=m
252CONFIG_TRAD_SIGNALS=y 263CONFIG_TRAD_SIGNALS=y
253 264
254# 265#
266# Power management options
267#
268CONFIG_PM=y
269# CONFIG_PM_LEGACY is not set
270# CONFIG_PM_DEBUG is not set
271# CONFIG_PM_SYSFS_DEPRECATED is not set
272
273#
255# Networking 274# Networking
256# 275#
257CONFIG_NET=y 276CONFIG_NET=y
@@ -265,7 +284,10 @@ CONFIG_PACKET_MMAP=y
265CONFIG_UNIX=y 284CONFIG_UNIX=y
266CONFIG_XFRM=y 285CONFIG_XFRM=y
267CONFIG_XFRM_USER=m 286CONFIG_XFRM_USER=m
287# CONFIG_XFRM_SUB_POLICY is not set
288CONFIG_XFRM_MIGRATE=y
268CONFIG_NET_KEY=y 289CONFIG_NET_KEY=y
290CONFIG_NET_KEY_MIGRATE=y
269CONFIG_INET=y 291CONFIG_INET=y
270CONFIG_IP_MULTICAST=y 292CONFIG_IP_MULTICAST=y
271# CONFIG_IP_ADVANCED_ROUTER is not set 293# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -286,10 +308,13 @@ CONFIG_INET_XFRM_TUNNEL=m
286CONFIG_INET_TUNNEL=m 308CONFIG_INET_TUNNEL=m
287CONFIG_INET_XFRM_MODE_TRANSPORT=m 309CONFIG_INET_XFRM_MODE_TRANSPORT=m
288CONFIG_INET_XFRM_MODE_TUNNEL=m 310CONFIG_INET_XFRM_MODE_TUNNEL=m
311CONFIG_INET_XFRM_MODE_BEET=m
289CONFIG_INET_DIAG=y 312CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y 313CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 314# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_BIC=y 315CONFIG_TCP_CONG_CUBIC=y
316CONFIG_DEFAULT_TCP_CONG="cubic"
317CONFIG_TCP_MD5SIG=y
293 318
294# 319#
295# IP: Virtual Server Configuration 320# IP: Virtual Server Configuration
@@ -331,11 +356,17 @@ CONFIG_IPV6_ROUTE_INFO=y
331CONFIG_INET6_AH=m 356CONFIG_INET6_AH=m
332CONFIG_INET6_ESP=m 357CONFIG_INET6_ESP=m
333CONFIG_INET6_IPCOMP=m 358CONFIG_INET6_IPCOMP=m
359CONFIG_IPV6_MIP6=y
334CONFIG_INET6_XFRM_TUNNEL=m 360CONFIG_INET6_XFRM_TUNNEL=m
335CONFIG_INET6_TUNNEL=m 361CONFIG_INET6_TUNNEL=m
336CONFIG_INET6_XFRM_MODE_TRANSPORT=m 362CONFIG_INET6_XFRM_MODE_TRANSPORT=m
337CONFIG_INET6_XFRM_MODE_TUNNEL=m 363CONFIG_INET6_XFRM_MODE_TUNNEL=m
364CONFIG_INET6_XFRM_MODE_BEET=m
365CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
366CONFIG_IPV6_SIT=m
338CONFIG_IPV6_TUNNEL=m 367CONFIG_IPV6_TUNNEL=m
368CONFIG_IPV6_MULTIPLE_TABLES=y
369CONFIG_IPV6_SUBTREES=y
339CONFIG_NETWORK_SECMARK=y 370CONFIG_NETWORK_SECMARK=y
340CONFIG_NETFILTER=y 371CONFIG_NETFILTER=y
341# CONFIG_NETFILTER_DEBUG is not set 372# CONFIG_NETFILTER_DEBUG is not set
@@ -346,19 +377,43 @@ CONFIG_NETFILTER=y
346CONFIG_NETFILTER_NETLINK=m 377CONFIG_NETFILTER_NETLINK=m
347CONFIG_NETFILTER_NETLINK_QUEUE=m 378CONFIG_NETFILTER_NETLINK_QUEUE=m
348CONFIG_NETFILTER_NETLINK_LOG=m 379CONFIG_NETFILTER_NETLINK_LOG=m
380CONFIG_NF_CONNTRACK_ENABLED=m
381CONFIG_NF_CONNTRACK_SUPPORT=y
382# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
383CONFIG_NF_CONNTRACK=m
384CONFIG_NF_CT_ACCT=y
385CONFIG_NF_CONNTRACK_MARK=y
386CONFIG_NF_CONNTRACK_SECMARK=y
387CONFIG_NF_CONNTRACK_EVENTS=y
388CONFIG_NF_CT_PROTO_GRE=m
389CONFIG_NF_CT_PROTO_SCTP=m
390CONFIG_NF_CONNTRACK_AMANDA=m
391CONFIG_NF_CONNTRACK_FTP=m
392CONFIG_NF_CONNTRACK_H323=m
393CONFIG_NF_CONNTRACK_IRC=m
394# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
395CONFIG_NF_CONNTRACK_PPTP=m
396CONFIG_NF_CONNTRACK_SANE=m
397CONFIG_NF_CONNTRACK_SIP=m
398CONFIG_NF_CONNTRACK_TFTP=m
399CONFIG_NF_CT_NETLINK=m
349CONFIG_NETFILTER_XTABLES=m 400CONFIG_NETFILTER_XTABLES=m
350CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 401CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
351CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 402CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
403CONFIG_NETFILTER_XT_TARGET_DSCP=m
352CONFIG_NETFILTER_XT_TARGET_MARK=m 404CONFIG_NETFILTER_XT_TARGET_MARK=m
353CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 405CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
406CONFIG_NETFILTER_XT_TARGET_NFLOG=m
354CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 407CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
355CONFIG_NETFILTER_XT_TARGET_SECMARK=m 408CONFIG_NETFILTER_XT_TARGET_SECMARK=m
356CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 409CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
410CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
357CONFIG_NETFILTER_XT_MATCH_COMMENT=m 411CONFIG_NETFILTER_XT_MATCH_COMMENT=m
358CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 412CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
359CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 413CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
360CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 414CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
361CONFIG_NETFILTER_XT_MATCH_DCCP=m 415CONFIG_NETFILTER_XT_MATCH_DCCP=m
416CONFIG_NETFILTER_XT_MATCH_DSCP=m
362CONFIG_NETFILTER_XT_MATCH_ESP=m 417CONFIG_NETFILTER_XT_MATCH_ESP=m
363CONFIG_NETFILTER_XT_MATCH_HELPER=m 418CONFIG_NETFILTER_XT_MATCH_HELPER=m
364CONFIG_NETFILTER_XT_MATCH_LENGTH=m 419CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -375,60 +430,45 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
375CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 430CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
376CONFIG_NETFILTER_XT_MATCH_STRING=m 431CONFIG_NETFILTER_XT_MATCH_STRING=m
377CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 432CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
433CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
378 434
379# 435#
380# IP: Netfilter Configuration 436# IP: Netfilter Configuration
381# 437#
382CONFIG_IP_NF_CONNTRACK=m 438CONFIG_NF_CONNTRACK_IPV4=m
383CONFIG_IP_NF_CT_ACCT=y 439CONFIG_NF_CONNTRACK_PROC_COMPAT=y
384CONFIG_IP_NF_CONNTRACK_MARK=y
385CONFIG_IP_NF_CONNTRACK_SECMARK=y
386CONFIG_IP_NF_CONNTRACK_EVENTS=y
387CONFIG_IP_NF_CONNTRACK_NETLINK=m
388# CONFIG_IP_NF_CT_PROTO_SCTP is not set
389CONFIG_IP_NF_FTP=m
390CONFIG_IP_NF_IRC=m
391# CONFIG_IP_NF_NETBIOS_NS is not set
392CONFIG_IP_NF_TFTP=m
393CONFIG_IP_NF_AMANDA=m
394CONFIG_IP_NF_PPTP=m
395CONFIG_IP_NF_H323=m
396CONFIG_IP_NF_SIP=m
397CONFIG_IP_NF_QUEUE=m 440CONFIG_IP_NF_QUEUE=m
398CONFIG_IP_NF_IPTABLES=m 441CONFIG_IP_NF_IPTABLES=m
399CONFIG_IP_NF_MATCH_IPRANGE=m 442CONFIG_IP_NF_MATCH_IPRANGE=m
400CONFIG_IP_NF_MATCH_TOS=m 443CONFIG_IP_NF_MATCH_TOS=m
401CONFIG_IP_NF_MATCH_RECENT=m 444CONFIG_IP_NF_MATCH_RECENT=m
402CONFIG_IP_NF_MATCH_ECN=m 445CONFIG_IP_NF_MATCH_ECN=m
403CONFIG_IP_NF_MATCH_DSCP=m
404CONFIG_IP_NF_MATCH_AH=m 446CONFIG_IP_NF_MATCH_AH=m
405CONFIG_IP_NF_MATCH_TTL=m 447CONFIG_IP_NF_MATCH_TTL=m
406CONFIG_IP_NF_MATCH_OWNER=m 448CONFIG_IP_NF_MATCH_OWNER=m
407CONFIG_IP_NF_MATCH_ADDRTYPE=m 449CONFIG_IP_NF_MATCH_ADDRTYPE=m
408CONFIG_IP_NF_MATCH_HASHLIMIT=m
409CONFIG_IP_NF_FILTER=m 450CONFIG_IP_NF_FILTER=m
410CONFIG_IP_NF_TARGET_REJECT=m 451CONFIG_IP_NF_TARGET_REJECT=m
411CONFIG_IP_NF_TARGET_LOG=m 452CONFIG_IP_NF_TARGET_LOG=m
412CONFIG_IP_NF_TARGET_ULOG=m 453CONFIG_IP_NF_TARGET_ULOG=m
413CONFIG_IP_NF_TARGET_TCPMSS=m 454CONFIG_NF_NAT=m
414CONFIG_IP_NF_NAT=m 455CONFIG_NF_NAT_NEEDED=y
415CONFIG_IP_NF_NAT_NEEDED=y
416CONFIG_IP_NF_TARGET_MASQUERADE=m 456CONFIG_IP_NF_TARGET_MASQUERADE=m
417CONFIG_IP_NF_TARGET_REDIRECT=m 457CONFIG_IP_NF_TARGET_REDIRECT=m
418CONFIG_IP_NF_TARGET_NETMAP=m 458CONFIG_IP_NF_TARGET_NETMAP=m
419CONFIG_IP_NF_TARGET_SAME=m 459CONFIG_IP_NF_TARGET_SAME=m
420CONFIG_IP_NF_NAT_SNMP_BASIC=m 460CONFIG_NF_NAT_SNMP_BASIC=m
421CONFIG_IP_NF_NAT_IRC=m 461CONFIG_NF_NAT_PROTO_GRE=m
422CONFIG_IP_NF_NAT_FTP=m 462CONFIG_NF_NAT_FTP=m
423CONFIG_IP_NF_NAT_TFTP=m 463CONFIG_NF_NAT_IRC=m
424CONFIG_IP_NF_NAT_AMANDA=m 464CONFIG_NF_NAT_TFTP=m
425CONFIG_IP_NF_NAT_PPTP=m 465CONFIG_NF_NAT_AMANDA=m
426CONFIG_IP_NF_NAT_H323=m 466CONFIG_NF_NAT_PPTP=m
427CONFIG_IP_NF_NAT_SIP=m 467CONFIG_NF_NAT_H323=m
468CONFIG_NF_NAT_SIP=m
428CONFIG_IP_NF_MANGLE=m 469CONFIG_IP_NF_MANGLE=m
429CONFIG_IP_NF_TARGET_TOS=m 470CONFIG_IP_NF_TARGET_TOS=m
430CONFIG_IP_NF_TARGET_ECN=m 471CONFIG_IP_NF_TARGET_ECN=m
431CONFIG_IP_NF_TARGET_DSCP=m
432CONFIG_IP_NF_TARGET_TTL=m 472CONFIG_IP_NF_TARGET_TTL=m
433CONFIG_IP_NF_TARGET_CLUSTERIP=m 473CONFIG_IP_NF_TARGET_CLUSTERIP=m
434CONFIG_IP_NF_RAW=m 474CONFIG_IP_NF_RAW=m
@@ -439,6 +479,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
439# 479#
440# IPv6: Netfilter Configuration (EXPERIMENTAL) 480# IPv6: Netfilter Configuration (EXPERIMENTAL)
441# 481#
482CONFIG_NF_CONNTRACK_IPV6=m
442CONFIG_IP6_NF_QUEUE=m 483CONFIG_IP6_NF_QUEUE=m
443CONFIG_IP6_NF_IPTABLES=m 484CONFIG_IP6_NF_IPTABLES=m
444CONFIG_IP6_NF_MATCH_RT=m 485CONFIG_IP6_NF_MATCH_RT=m
@@ -448,6 +489,7 @@ CONFIG_IP6_NF_MATCH_HL=m
448CONFIG_IP6_NF_MATCH_OWNER=m 489CONFIG_IP6_NF_MATCH_OWNER=m
449CONFIG_IP6_NF_MATCH_IPV6HEADER=m 490CONFIG_IP6_NF_MATCH_IPV6HEADER=m
450CONFIG_IP6_NF_MATCH_AH=m 491CONFIG_IP6_NF_MATCH_AH=m
492CONFIG_IP6_NF_MATCH_MH=m
451CONFIG_IP6_NF_MATCH_EUI64=m 493CONFIG_IP6_NF_MATCH_EUI64=m
452CONFIG_IP6_NF_FILTER=m 494CONFIG_IP6_NF_FILTER=m
453CONFIG_IP6_NF_TARGET_LOG=m 495CONFIG_IP6_NF_TARGET_LOG=m
@@ -484,7 +526,6 @@ CONFIG_SCTP_HMAC_MD5=y
484# CONFIG_ATALK is not set 526# CONFIG_ATALK is not set
485# CONFIG_X25 is not set 527# CONFIG_X25 is not set
486# CONFIG_LAPB is not set 528# CONFIG_LAPB is not set
487CONFIG_NET_DIVERT=y
488# CONFIG_ECONET is not set 529# CONFIG_ECONET is not set
489# CONFIG_WAN_ROUTER is not set 530# CONFIG_WAN_ROUTER is not set
490 531
@@ -492,6 +533,7 @@ CONFIG_NET_DIVERT=y
492# QoS and/or fair queueing 533# QoS and/or fair queueing
493# 534#
494CONFIG_NET_SCHED=y 535CONFIG_NET_SCHED=y
536CONFIG_NET_SCH_FIFO=y
495# CONFIG_NET_SCH_CLK_JIFFIES is not set 537# CONFIG_NET_SCH_CLK_JIFFIES is not set
496CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 538CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
497# CONFIG_NET_SCH_CLK_CPU is not set 539# CONFIG_NET_SCH_CLK_CPU is not set
@@ -546,6 +588,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
546CONFIG_IEEE80211_SOFTMAC=m 588CONFIG_IEEE80211_SOFTMAC=m
547# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 589# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
548CONFIG_WIRELESS_EXT=y 590CONFIG_WIRELESS_EXT=y
591CONFIG_FIB_RULES=y
549 592
550# 593#
551# Device Drivers 594# Device Drivers
@@ -556,7 +599,6 @@ CONFIG_WIRELESS_EXT=y
556# 599#
557CONFIG_STANDALONE=y 600CONFIG_STANDALONE=y
558CONFIG_PREVENT_FIRMWARE_BUILD=y 601CONFIG_PREVENT_FIRMWARE_BUILD=y
559# CONFIG_FW_LOADER is not set
560# CONFIG_SYS_HYPERVISOR is not set 602# CONFIG_SYS_HYPERVISOR is not set
561 603
562# 604#
@@ -577,6 +619,7 @@ CONFIG_CONNECTOR=m
577# 619#
578# Plug and Play support 620# Plug and Play support
579# 621#
622# CONFIG_PNPACPI is not set
580 623
581# 624#
582# Block devices 625# Block devices
@@ -592,6 +635,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
592CONFIG_ATA_OVER_ETH=m 635CONFIG_ATA_OVER_ETH=m
593 636
594# 637#
638# Misc devices
639#
640
641#
595# ATA/ATAPI/MFM/RLL support 642# ATA/ATAPI/MFM/RLL support
596# 643#
597# CONFIG_IDE is not set 644# CONFIG_IDE is not set
@@ -601,6 +648,8 @@ CONFIG_ATA_OVER_ETH=m
601# 648#
602CONFIG_RAID_ATTRS=m 649CONFIG_RAID_ATTRS=m
603CONFIG_SCSI=y 650CONFIG_SCSI=y
651CONFIG_SCSI_TGT=m
652# CONFIG_SCSI_NETLINK is not set
604CONFIG_SCSI_PROC_FS=y 653CONFIG_SCSI_PROC_FS=y
605 654
606# 655#
@@ -620,24 +669,30 @@ CONFIG_CHR_DEV_SCH=m
620# CONFIG_SCSI_MULTI_LUN is not set 669# CONFIG_SCSI_MULTI_LUN is not set
621CONFIG_SCSI_CONSTANTS=y 670CONFIG_SCSI_CONSTANTS=y
622# CONFIG_SCSI_LOGGING is not set 671# CONFIG_SCSI_LOGGING is not set
672CONFIG_SCSI_SCAN_ASYNC=y
623 673
624# 674#
625# SCSI Transport Attributes 675# SCSI Transports
626# 676#
627CONFIG_SCSI_SPI_ATTRS=m 677CONFIG_SCSI_SPI_ATTRS=m
628# CONFIG_SCSI_FC_ATTRS is not set 678# CONFIG_SCSI_FC_ATTRS is not set
629CONFIG_SCSI_ISCSI_ATTRS=m 679CONFIG_SCSI_ISCSI_ATTRS=m
630CONFIG_SCSI_SAS_ATTRS=m 680CONFIG_SCSI_SAS_ATTRS=m
681# CONFIG_SCSI_SAS_LIBSAS is not set
631 682
632# 683#
633# SCSI low-level drivers 684# SCSI low-level drivers
634# 685#
635CONFIG_ISCSI_TCP=m 686CONFIG_ISCSI_TCP=m
636CONFIG_SGIWD93_SCSI=y 687CONFIG_SGIWD93_SCSI=y
637# CONFIG_SCSI_SATA is not set
638# CONFIG_SCSI_DEBUG is not set 688# CONFIG_SCSI_DEBUG is not set
639 689
640# 690#
691# Serial ATA (prod) and Parallel ATA (experimental) drivers
692#
693# CONFIG_ATA is not set
694
695#
641# Multi-device support (RAID and LVM) 696# Multi-device support (RAID and LVM)
642# 697#
643# CONFIG_MD is not set 698# CONFIG_MD is not set
@@ -679,6 +734,8 @@ CONFIG_LXT_PHY=m
679CONFIG_CICADA_PHY=m 734CONFIG_CICADA_PHY=m
680# CONFIG_VITESSE_PHY is not set 735# CONFIG_VITESSE_PHY is not set
681# CONFIG_SMSC_PHY is not set 736# CONFIG_SMSC_PHY is not set
737# CONFIG_BROADCOM_PHY is not set
738# CONFIG_FIXED_PHY is not set
682 739
683# 740#
684# Ethernet (10 or 100Mbit) 741# Ethernet (10 or 100Mbit)
@@ -730,6 +787,7 @@ CONFIG_SGISEEQ=y
730# Input device support 787# Input device support
731# 788#
732CONFIG_INPUT=y 789CONFIG_INPUT=y
790# CONFIG_INPUT_FF_MEMLESS is not set
733 791
734# 792#
735# Userland interfaces 793# Userland interfaces
@@ -752,6 +810,7 @@ CONFIG_KEYBOARD_ATKBD=y
752# CONFIG_KEYBOARD_LKKBD is not set 810# CONFIG_KEYBOARD_LKKBD is not set
753# CONFIG_KEYBOARD_XTKBD is not set 811# CONFIG_KEYBOARD_XTKBD is not set
754# CONFIG_KEYBOARD_NEWTON is not set 812# CONFIG_KEYBOARD_NEWTON is not set
813# CONFIG_KEYBOARD_STOWAWAY is not set
755CONFIG_INPUT_MOUSE=y 814CONFIG_INPUT_MOUSE=y
756CONFIG_MOUSE_PS2=m 815CONFIG_MOUSE_PS2=m
757CONFIG_MOUSE_SERIAL=m 816CONFIG_MOUSE_SERIAL=m
@@ -815,10 +874,6 @@ CONFIG_SGI_DS1286=m
815# CONFIG_GEN_RTC is not set 874# CONFIG_GEN_RTC is not set
816# CONFIG_DTLK is not set 875# CONFIG_DTLK is not set
817# CONFIG_R3964 is not set 876# CONFIG_R3964 is not set
818
819#
820# Ftape, the floppy tape device driver
821#
822CONFIG_RAW_DRIVER=m 877CONFIG_RAW_DRIVER=m
823CONFIG_MAX_RAW_DEVS=256 878CONFIG_MAX_RAW_DEVS=256
824 879
@@ -826,7 +881,6 @@ CONFIG_MAX_RAW_DEVS=256
826# TPM devices 881# TPM devices
827# 882#
828# CONFIG_TCG_TPM is not set 883# CONFIG_TCG_TPM is not set
829# CONFIG_TELCLOCK is not set
830 884
831# 885#
832# I2C support 886# I2C support
@@ -851,14 +905,9 @@ CONFIG_MAX_RAW_DEVS=256
851# CONFIG_HWMON_VID is not set 905# CONFIG_HWMON_VID is not set
852 906
853# 907#
854# Misc devices
855#
856
857#
858# Multimedia devices 908# Multimedia devices
859# 909#
860# CONFIG_VIDEO_DEV is not set 910# CONFIG_VIDEO_DEV is not set
861CONFIG_VIDEO_V4L2=y
862 911
863# 912#
864# Digital Video Broadcasting Devices 913# Digital Video Broadcasting Devices
@@ -887,6 +936,7 @@ CONFIG_LOGO=y
887# CONFIG_LOGO_LINUX_VGA16 is not set 936# CONFIG_LOGO_LINUX_VGA16 is not set
888# CONFIG_LOGO_LINUX_CLUT224 is not set 937# CONFIG_LOGO_LINUX_CLUT224 is not set
889CONFIG_LOGO_SGI_CLUT224=y 938CONFIG_LOGO_SGI_CLUT224=y
939# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
890 940
891# 941#
892# Sound 942# Sound
@@ -894,6 +944,12 @@ CONFIG_LOGO_SGI_CLUT224=y
894# CONFIG_SOUND is not set 944# CONFIG_SOUND is not set
895 945
896# 946#
947# HID Devices
948#
949CONFIG_HID=y
950# CONFIG_HID_DEBUG is not set
951
952#
897# USB support 953# USB support
898# 954#
899# CONFIG_USB_ARCH_HAS_HCD is not set 955# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -954,6 +1010,14 @@ CONFIG_LOGO_SGI_CLUT224=y
954# 1010#
955 1011
956# 1012#
1013# Auxiliary Display support
1014#
1015
1016#
1017# Virtualization
1018#
1019
1020#
957# File systems 1021# File systems
958# 1022#
959CONFIG_EXT2_FS=m 1023CONFIG_EXT2_FS=m
@@ -963,6 +1027,7 @@ CONFIG_EXT3_FS=y
963CONFIG_EXT3_FS_XATTR=y 1027CONFIG_EXT3_FS_XATTR=y
964CONFIG_EXT3_FS_POSIX_ACL=y 1028CONFIG_EXT3_FS_POSIX_ACL=y
965CONFIG_EXT3_FS_SECURITY=y 1029CONFIG_EXT3_FS_SECURITY=y
1030# CONFIG_EXT4DEV_FS is not set
966CONFIG_JBD=y 1031CONFIG_JBD=y
967# CONFIG_JBD_DEBUG is not set 1032# CONFIG_JBD_DEBUG is not set
968CONFIG_FS_MBCACHE=y 1033CONFIG_FS_MBCACHE=y
@@ -974,6 +1039,7 @@ CONFIG_XFS_QUOTA=y
974CONFIG_XFS_SECURITY=y 1039CONFIG_XFS_SECURITY=y
975# CONFIG_XFS_POSIX_ACL is not set 1040# CONFIG_XFS_POSIX_ACL is not set
976# CONFIG_XFS_RT is not set 1041# CONFIG_XFS_RT is not set
1042# CONFIG_GFS2_FS is not set
977# CONFIG_OCFS2_FS is not set 1043# CONFIG_OCFS2_FS is not set
978CONFIG_MINIX_FS=m 1044CONFIG_MINIX_FS=m
979# CONFIG_ROMFS_FS is not set 1045# CONFIG_ROMFS_FS is not set
@@ -987,6 +1053,7 @@ CONFIG_DNOTIFY=y
987CONFIG_AUTOFS_FS=m 1053CONFIG_AUTOFS_FS=m
988CONFIG_AUTOFS4_FS=m 1054CONFIG_AUTOFS4_FS=m
989CONFIG_FUSE_FS=m 1055CONFIG_FUSE_FS=m
1056CONFIG_GENERIC_ACL=y
990 1057
991# 1058#
992# CD-ROM/DVD Filesystems 1059# CD-ROM/DVD Filesystems
@@ -994,7 +1061,6 @@ CONFIG_FUSE_FS=m
994CONFIG_ISO9660_FS=m 1061CONFIG_ISO9660_FS=m
995CONFIG_JOLIET=y 1062CONFIG_JOLIET=y
996CONFIG_ZISOFS=y 1063CONFIG_ZISOFS=y
997CONFIG_ZISOFS_FS=m
998CONFIG_UDF_FS=m 1064CONFIG_UDF_FS=m
999CONFIG_UDF_NLS=y 1065CONFIG_UDF_NLS=y
1000 1066
@@ -1013,17 +1079,20 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1013# 1079#
1014CONFIG_PROC_FS=y 1080CONFIG_PROC_FS=y
1015CONFIG_PROC_KCORE=y 1081CONFIG_PROC_KCORE=y
1082CONFIG_PROC_SYSCTL=y
1016CONFIG_SYSFS=y 1083CONFIG_SYSFS=y
1017CONFIG_TMPFS=y 1084CONFIG_TMPFS=y
1085CONFIG_TMPFS_POSIX_ACL=y
1018# CONFIG_HUGETLB_PAGE is not set 1086# CONFIG_HUGETLB_PAGE is not set
1019CONFIG_RAMFS=y 1087CONFIG_RAMFS=y
1020# CONFIG_CONFIGFS_FS is not set 1088CONFIG_CONFIGFS_FS=m
1021 1089
1022# 1090#
1023# Miscellaneous filesystems 1091# Miscellaneous filesystems
1024# 1092#
1025# CONFIG_ADFS_FS is not set 1093# CONFIG_ADFS_FS is not set
1026# CONFIG_AFFS_FS is not set 1094# CONFIG_AFFS_FS is not set
1095# CONFIG_ECRYPT_FS is not set
1027# CONFIG_HFS_FS is not set 1096# CONFIG_HFS_FS is not set
1028# CONFIG_HFSPLUS_FS is not set 1097# CONFIG_HFSPLUS_FS is not set
1029# CONFIG_BEFS_FS is not set 1098# CONFIG_BEFS_FS is not set
@@ -1142,6 +1211,14 @@ CONFIG_NLS_KOI8_U=m
1142CONFIG_NLS_UTF8=m 1211CONFIG_NLS_UTF8=m
1143 1212
1144# 1213#
1214# Distributed Lock Manager
1215#
1216CONFIG_DLM=m
1217CONFIG_DLM_TCP=y
1218# CONFIG_DLM_SCTP is not set
1219# CONFIG_DLM_DEBUG is not set
1220
1221#
1145# Profiling support 1222# Profiling support
1146# 1223#
1147# CONFIG_PROFILING is not set 1224# CONFIG_PROFILING is not set
@@ -1151,11 +1228,13 @@ CONFIG_NLS_UTF8=m
1151# 1228#
1152CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1229CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1153# CONFIG_PRINTK_TIME is not set 1230# CONFIG_PRINTK_TIME is not set
1231CONFIG_ENABLE_MUST_CHECK=y
1154# CONFIG_MAGIC_SYSRQ is not set 1232# CONFIG_MAGIC_SYSRQ is not set
1155# CONFIG_UNUSED_SYMBOLS is not set 1233# CONFIG_UNUSED_SYMBOLS is not set
1234# CONFIG_DEBUG_FS is not set
1235# CONFIG_HEADERS_CHECK is not set
1156# CONFIG_DEBUG_KERNEL is not set 1236# CONFIG_DEBUG_KERNEL is not set
1157CONFIG_LOG_BUF_SHIFT=14 1237CONFIG_LOG_BUF_SHIFT=14
1158# CONFIG_DEBUG_FS is not set
1159CONFIG_CROSSCOMPILE=y 1238CONFIG_CROSSCOMPILE=y
1160CONFIG_CMDLINE="" 1239CONFIG_CMDLINE=""
1161 1240
@@ -1170,18 +1249,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1170# Cryptographic options 1249# Cryptographic options
1171# 1250#
1172CONFIG_CRYPTO=y 1251CONFIG_CRYPTO=y
1252CONFIG_CRYPTO_ALGAPI=y
1253CONFIG_CRYPTO_BLKCIPHER=m
1254CONFIG_CRYPTO_HASH=y
1255CONFIG_CRYPTO_MANAGER=y
1173CONFIG_CRYPTO_HMAC=y 1256CONFIG_CRYPTO_HMAC=y
1257CONFIG_CRYPTO_XCBC=m
1174CONFIG_CRYPTO_NULL=m 1258CONFIG_CRYPTO_NULL=m
1175CONFIG_CRYPTO_MD4=m 1259CONFIG_CRYPTO_MD4=m
1176CONFIG_CRYPTO_MD5=m 1260CONFIG_CRYPTO_MD5=y
1177CONFIG_CRYPTO_SHA1=m 1261CONFIG_CRYPTO_SHA1=m
1178CONFIG_CRYPTO_SHA256=m 1262CONFIG_CRYPTO_SHA256=m
1179CONFIG_CRYPTO_SHA512=m 1263CONFIG_CRYPTO_SHA512=m
1180CONFIG_CRYPTO_WP512=m 1264CONFIG_CRYPTO_WP512=m
1181CONFIG_CRYPTO_TGR192=m 1265CONFIG_CRYPTO_TGR192=m
1266CONFIG_CRYPTO_GF128MUL=m
1267CONFIG_CRYPTO_ECB=m
1268CONFIG_CRYPTO_CBC=m
1269CONFIG_CRYPTO_PCBC=m
1270CONFIG_CRYPTO_LRW=m
1182CONFIG_CRYPTO_DES=m 1271CONFIG_CRYPTO_DES=m
1272CONFIG_CRYPTO_FCRYPT=m
1183CONFIG_CRYPTO_BLOWFISH=m 1273CONFIG_CRYPTO_BLOWFISH=m
1184CONFIG_CRYPTO_TWOFISH=m 1274CONFIG_CRYPTO_TWOFISH=m
1275CONFIG_CRYPTO_TWOFISH_COMMON=m
1185CONFIG_CRYPTO_SERPENT=m 1276CONFIG_CRYPTO_SERPENT=m
1186CONFIG_CRYPTO_AES=m 1277CONFIG_CRYPTO_AES=m
1187CONFIG_CRYPTO_CAST5=m 1278CONFIG_CRYPTO_CAST5=m
@@ -1193,6 +1284,7 @@ CONFIG_CRYPTO_ANUBIS=m
1193CONFIG_CRYPTO_DEFLATE=m 1284CONFIG_CRYPTO_DEFLATE=m
1194CONFIG_CRYPTO_MICHAEL_MIC=m 1285CONFIG_CRYPTO_MICHAEL_MIC=m
1195CONFIG_CRYPTO_CRC32C=m 1286CONFIG_CRYPTO_CRC32C=m
1287CONFIG_CRYPTO_CAMELLIA=m
1196# CONFIG_CRYPTO_TEST is not set 1288# CONFIG_CRYPTO_TEST is not set
1197 1289
1198# 1290#
@@ -1202,6 +1294,7 @@ CONFIG_CRYPTO_CRC32C=m
1202# 1294#
1203# Library routines 1295# Library routines
1204# 1296#
1297CONFIG_BITREVERSE=m
1205# CONFIG_CRC_CCITT is not set 1298# CONFIG_CRC_CCITT is not set
1206CONFIG_CRC16=m 1299CONFIG_CRC16=m
1207CONFIG_CRC32=m 1300CONFIG_CRC32=m
@@ -1213,3 +1306,5 @@ CONFIG_TEXTSEARCH_KMP=m
1213CONFIG_TEXTSEARCH_BM=m 1306CONFIG_TEXTSEARCH_BM=m
1214CONFIG_TEXTSEARCH_FSM=m 1307CONFIG_TEXTSEARCH_FSM=m
1215CONFIG_PLIST=y 1308CONFIG_PLIST=y
1309CONFIG_HAS_IOMEM=y
1310CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index f21186c12d81..9ddc3eff4793 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:10 2006 4# Tue Feb 20 21:47:32 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -70,10 +69,14 @@ CONFIG_SGI_SN_M_MODE=y
70# CONFIG_REPLICATE_EXHANDLERS is not set 69# CONFIG_REPLICATE_EXHANDLERS is not set
71CONFIG_EARLY_PRINTK=y 70CONFIG_EARLY_PRINTK=y
72CONFIG_RWSEM_GENERIC_SPINLOCK=y 71CONFIG_RWSEM_GENERIC_SPINLOCK=y
72# CONFIG_ARCH_HAS_ILOG2_U32 is not set
73# CONFIG_ARCH_HAS_ILOG2_U64 is not set
73CONFIG_GENERIC_FIND_NEXT_BIT=y 74CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y 75CONFIG_GENERIC_HWEIGHT=y
75CONFIG_GENERIC_CALIBRATE_DELAY=y 76CONFIG_GENERIC_CALIBRATE_DELAY=y
77CONFIG_GENERIC_TIME=y
76CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 78CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
79CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
77CONFIG_ARC=y 80CONFIG_ARC=y
78CONFIG_DMA_IP27=y 81CONFIG_DMA_IP27=y
79CONFIG_CPU_BIG_ENDIAN=y 82CONFIG_CPU_BIG_ENDIAN=y
@@ -121,8 +124,8 @@ CONFIG_PAGE_SIZE_4KB=y
121# CONFIG_PAGE_SIZE_64KB is not set 124# CONFIG_PAGE_SIZE_64KB is not set
122CONFIG_CPU_HAS_PREFETCH=y 125CONFIG_CPU_HAS_PREFETCH=y
123CONFIG_MIPS_MT_DISABLED=y 126CONFIG_MIPS_MT_DISABLED=y
124# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_MT_SMP is not set 127# CONFIG_MIPS_MT_SMP is not set
128# CONFIG_MIPS_MT_SMTC is not set
126# CONFIG_MIPS_VPE_LOADER is not set 129# CONFIG_MIPS_VPE_LOADER is not set
127CONFIG_CPU_HAS_LLSC=y 130CONFIG_CPU_HAS_LLSC=y
128CONFIG_CPU_HAS_SYNC=y 131CONFIG_CPU_HAS_SYNC=y
@@ -145,8 +148,10 @@ CONFIG_NEED_MULTIPLE_NODES=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
146CONFIG_MIGRATION=y 149CONFIG_MIGRATION=y
147CONFIG_RESOURCES_64BIT=y 150CONFIG_RESOURCES_64BIT=y
151CONFIG_ZONE_DMA_FLAG=1
148CONFIG_SMP=y 152CONFIG_SMP=y
149CONFIG_SYS_SUPPORTS_SMP=y 153CONFIG_SYS_SUPPORTS_SMP=y
154CONFIG_NR_CPUS_DEFAULT_64=y
150CONFIG_NR_CPUS=64 155CONFIG_NR_CPUS=64
151# CONFIG_HZ_48 is not set 156# CONFIG_HZ_48 is not set
152# CONFIG_HZ_100 is not set 157# CONFIG_HZ_100 is not set
@@ -162,6 +167,7 @@ CONFIG_PREEMPT_NONE=y
162# CONFIG_PREEMPT is not set 167# CONFIG_PREEMPT is not set
163CONFIG_PREEMPT_BKL=y 168CONFIG_PREEMPT_BKL=y
164# CONFIG_MIPS_INSANE_LARGE is not set 169# CONFIG_MIPS_INSANE_LARGE is not set
170# CONFIG_KEXEC is not set
165CONFIG_LOCKDEP_SUPPORT=y 171CONFIG_LOCKDEP_SUPPORT=y
166CONFIG_STACKTRACE_SUPPORT=y 172CONFIG_STACKTRACE_SUPPORT=y
167CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 173CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -180,17 +186,22 @@ CONFIG_LOCALVERSION=""
180CONFIG_LOCALVERSION_AUTO=y 186CONFIG_LOCALVERSION_AUTO=y
181CONFIG_SWAP=y 187CONFIG_SWAP=y
182CONFIG_SYSVIPC=y 188CONFIG_SYSVIPC=y
189# CONFIG_IPC_NS is not set
190CONFIG_SYSVIPC_SYSCTL=y
183CONFIG_POSIX_MQUEUE=y 191CONFIG_POSIX_MQUEUE=y
184# CONFIG_BSD_PROCESS_ACCT is not set 192# CONFIG_BSD_PROCESS_ACCT is not set
185CONFIG_SYSCTL=y 193# CONFIG_TASKSTATS is not set
194# CONFIG_UTS_NS is not set
186# CONFIG_AUDIT is not set 195# CONFIG_AUDIT is not set
187CONFIG_IKCONFIG=y 196CONFIG_IKCONFIG=y
188CONFIG_IKCONFIG_PROC=y 197CONFIG_IKCONFIG_PROC=y
189CONFIG_CPUSETS=y 198CONFIG_CPUSETS=y
199CONFIG_SYSFS_DEPRECATED=y
190CONFIG_RELAY=y 200CONFIG_RELAY=y
191CONFIG_INITRAMFS_SOURCE=""
192# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 201# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
202CONFIG_SYSCTL=y
193CONFIG_EMBEDDED=y 203CONFIG_EMBEDDED=y
204CONFIG_SYSCTL_SYSCALL=y
194CONFIG_KALLSYMS=y 205CONFIG_KALLSYMS=y
195# CONFIG_KALLSYMS_EXTRA_PASS is not set 206# CONFIG_KALLSYMS_EXTRA_PASS is not set
196CONFIG_HOTPLUG=y 207CONFIG_HOTPLUG=y
@@ -198,12 +209,12 @@ CONFIG_PRINTK=y
198CONFIG_BUG=y 209CONFIG_BUG=y
199CONFIG_ELF_CORE=y 210CONFIG_ELF_CORE=y
200CONFIG_BASE_FULL=y 211CONFIG_BASE_FULL=y
201CONFIG_RT_MUTEXES=y
202CONFIG_FUTEX=y 212CONFIG_FUTEX=y
203CONFIG_EPOLL=y 213CONFIG_EPOLL=y
204CONFIG_SHMEM=y 214CONFIG_SHMEM=y
205CONFIG_SLAB=y 215CONFIG_SLAB=y
206CONFIG_VM_EVENT_COUNTERS=y 216CONFIG_VM_EVENT_COUNTERS=y
217CONFIG_RT_MUTEXES=y
207# CONFIG_TINY_SHMEM is not set 218# CONFIG_TINY_SHMEM is not set
208CONFIG_BASE_SMALL=0 219CONFIG_BASE_SMALL=0
209# CONFIG_SLOB is not set 220# CONFIG_SLOB is not set
@@ -222,6 +233,7 @@ CONFIG_STOP_MACHINE=y
222# 233#
223# Block layer 234# Block layer
224# 235#
236CONFIG_BLOCK=y
225# CONFIG_BLK_DEV_IO_TRACE is not set 237# CONFIG_BLK_DEV_IO_TRACE is not set
226 238
227# 239#
@@ -263,11 +275,20 @@ CONFIG_BINFMT_ELF=y
263# CONFIG_BUILD_ELF64 is not set 275# CONFIG_BUILD_ELF64 is not set
264CONFIG_MIPS32_COMPAT=y 276CONFIG_MIPS32_COMPAT=y
265CONFIG_COMPAT=y 277CONFIG_COMPAT=y
278CONFIG_SYSVIPC_COMPAT=y
266CONFIG_MIPS32_O32=y 279CONFIG_MIPS32_O32=y
267CONFIG_MIPS32_N32=y 280CONFIG_MIPS32_N32=y
268CONFIG_BINFMT_ELF32=y 281CONFIG_BINFMT_ELF32=y
269 282
270# 283#
284# Power management options
285#
286CONFIG_PM=y
287# CONFIG_PM_LEGACY is not set
288# CONFIG_PM_DEBUG is not set
289# CONFIG_PM_SYSFS_DEPRECATED is not set
290
291#
271# Networking 292# Networking
272# 293#
273CONFIG_NET=y 294CONFIG_NET=y
@@ -281,7 +302,10 @@ CONFIG_PACKET_MMAP=y
281CONFIG_UNIX=y 302CONFIG_UNIX=y
282CONFIG_XFRM=y 303CONFIG_XFRM=y
283CONFIG_XFRM_USER=m 304CONFIG_XFRM_USER=m
305# CONFIG_XFRM_SUB_POLICY is not set
306CONFIG_XFRM_MIGRATE=y
284CONFIG_NET_KEY=y 307CONFIG_NET_KEY=y
308CONFIG_NET_KEY_MIGRATE=y
285CONFIG_INET=y 309CONFIG_INET=y
286CONFIG_IP_MULTICAST=y 310CONFIG_IP_MULTICAST=y
287# CONFIG_IP_ADVANCED_ROUTER is not set 311# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -302,10 +326,13 @@ CONFIG_IP_PNP=y
302# CONFIG_INET_TUNNEL is not set 326# CONFIG_INET_TUNNEL is not set
303CONFIG_INET_XFRM_MODE_TRANSPORT=m 327CONFIG_INET_XFRM_MODE_TRANSPORT=m
304CONFIG_INET_XFRM_MODE_TUNNEL=m 328CONFIG_INET_XFRM_MODE_TUNNEL=m
329CONFIG_INET_XFRM_MODE_BEET=m
305CONFIG_INET_DIAG=y 330CONFIG_INET_DIAG=y
306CONFIG_INET_TCP_DIAG=y 331CONFIG_INET_TCP_DIAG=y
307# CONFIG_TCP_CONG_ADVANCED is not set 332# CONFIG_TCP_CONG_ADVANCED is not set
308CONFIG_TCP_CONG_BIC=y 333CONFIG_TCP_CONG_CUBIC=y
334CONFIG_DEFAULT_TCP_CONG="cubic"
335CONFIG_TCP_MD5SIG=y
309# CONFIG_IPV6 is not set 336# CONFIG_IPV6 is not set
310# CONFIG_INET6_XFRM_TUNNEL is not set 337# CONFIG_INET6_XFRM_TUNNEL is not set
311# CONFIG_INET6_TUNNEL is not set 338# CONFIG_INET6_TUNNEL is not set
@@ -335,7 +362,6 @@ CONFIG_NETWORK_SECMARK=y
335# CONFIG_ATALK is not set 362# CONFIG_ATALK is not set
336# CONFIG_X25 is not set 363# CONFIG_X25 is not set
337# CONFIG_LAPB is not set 364# CONFIG_LAPB is not set
338# CONFIG_NET_DIVERT is not set
339# CONFIG_ECONET is not set 365# CONFIG_ECONET is not set
340# CONFIG_WAN_ROUTER is not set 366# CONFIG_WAN_ROUTER is not set
341 367
@@ -343,6 +369,7 @@ CONFIG_NETWORK_SECMARK=y
343# QoS and/or fair queueing 369# QoS and/or fair queueing
344# 370#
345CONFIG_NET_SCHED=y 371CONFIG_NET_SCHED=y
372CONFIG_NET_SCH_FIFO=y
346# CONFIG_NET_SCH_CLK_JIFFIES is not set 373# CONFIG_NET_SCH_CLK_JIFFIES is not set
347CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 374CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
348# CONFIG_NET_SCH_CLK_CPU is not set 375# CONFIG_NET_SCH_CLK_CPU is not set
@@ -374,6 +401,7 @@ CONFIG_NET_CLS_ROUTE=y
374CONFIG_NET_CLS_FW=m 401CONFIG_NET_CLS_FW=m
375CONFIG_NET_CLS_U32=m 402CONFIG_NET_CLS_U32=m
376# CONFIG_CLS_U32_PERF is not set 403# CONFIG_CLS_U32_PERF is not set
404CONFIG_CLS_U32_MARK=y
377CONFIG_NET_CLS_RSVP=m 405CONFIG_NET_CLS_RSVP=m
378CONFIG_NET_CLS_RSVP6=m 406CONFIG_NET_CLS_RSVP6=m
379# CONFIG_NET_EMATCH is not set 407# CONFIG_NET_EMATCH is not set
@@ -427,6 +455,7 @@ CONFIG_CONNECTOR=m
427# 455#
428# Plug and Play support 456# Plug and Play support
429# 457#
458# CONFIG_PNPACPI is not set
430 459
431# 460#
432# Block devices 461# Block devices
@@ -448,6 +477,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
448CONFIG_ATA_OVER_ETH=m 477CONFIG_ATA_OVER_ETH=m
449 478
450# 479#
480# Misc devices
481#
482CONFIG_SGI_IOC4=m
483# CONFIG_TIFM_CORE is not set
484
485#
451# ATA/ATAPI/MFM/RLL support 486# ATA/ATAPI/MFM/RLL support
452# 487#
453# CONFIG_IDE is not set 488# CONFIG_IDE is not set
@@ -457,6 +492,8 @@ CONFIG_ATA_OVER_ETH=m
457# 492#
458CONFIG_RAID_ATTRS=m 493CONFIG_RAID_ATTRS=m
459CONFIG_SCSI=y 494CONFIG_SCSI=y
495CONFIG_SCSI_TGT=m
496CONFIG_SCSI_NETLINK=y
460CONFIG_SCSI_PROC_FS=y 497CONFIG_SCSI_PROC_FS=y
461 498
462# 499#
@@ -476,14 +513,17 @@ CONFIG_CHR_DEV_SCH=m
476# CONFIG_SCSI_MULTI_LUN is not set 513# CONFIG_SCSI_MULTI_LUN is not set
477CONFIG_SCSI_CONSTANTS=y 514CONFIG_SCSI_CONSTANTS=y
478CONFIG_SCSI_LOGGING=y 515CONFIG_SCSI_LOGGING=y
516CONFIG_SCSI_SCAN_ASYNC=y
479 517
480# 518#
481# SCSI Transport Attributes 519# SCSI Transports
482# 520#
483CONFIG_SCSI_SPI_ATTRS=y 521CONFIG_SCSI_SPI_ATTRS=y
484CONFIG_SCSI_FC_ATTRS=y 522CONFIG_SCSI_FC_ATTRS=y
485CONFIG_SCSI_ISCSI_ATTRS=m 523CONFIG_SCSI_ISCSI_ATTRS=m
486CONFIG_SCSI_SAS_ATTRS=m 524CONFIG_SCSI_SAS_ATTRS=m
525CONFIG_SCSI_SAS_LIBSAS=m
526# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
487 527
488# 528#
489# SCSI low-level drivers 529# SCSI low-level drivers
@@ -496,24 +536,33 @@ CONFIG_SCSI_SAS_ATTRS=m
496# CONFIG_SCSI_AIC7XXX is not set 536# CONFIG_SCSI_AIC7XXX is not set
497# CONFIG_SCSI_AIC7XXX_OLD is not set 537# CONFIG_SCSI_AIC7XXX_OLD is not set
498# CONFIG_SCSI_AIC79XX is not set 538# CONFIG_SCSI_AIC79XX is not set
539CONFIG_SCSI_AIC94XX=m
540# CONFIG_AIC94XX_DEBUG is not set
541# CONFIG_SCSI_ARCMSR is not set
499# CONFIG_MEGARAID_NEWGEN is not set 542# CONFIG_MEGARAID_NEWGEN is not set
500# CONFIG_MEGARAID_LEGACY is not set 543# CONFIG_MEGARAID_LEGACY is not set
501# CONFIG_MEGARAID_SAS is not set 544# CONFIG_MEGARAID_SAS is not set
502# CONFIG_SCSI_SATA is not set
503# CONFIG_SCSI_HPTIOP is not set 545# CONFIG_SCSI_HPTIOP is not set
504# CONFIG_SCSI_DMX3191D is not set 546# CONFIG_SCSI_DMX3191D is not set
505# CONFIG_SCSI_FUTURE_DOMAIN is not set 547# CONFIG_SCSI_FUTURE_DOMAIN is not set
506# CONFIG_SCSI_IPS is not set 548# CONFIG_SCSI_IPS is not set
507# CONFIG_SCSI_INITIO is not set 549# CONFIG_SCSI_INITIO is not set
508# CONFIG_SCSI_INIA100 is not set 550# CONFIG_SCSI_INIA100 is not set
551# CONFIG_SCSI_STEX is not set
509# CONFIG_SCSI_SYM53C8XX_2 is not set 552# CONFIG_SCSI_SYM53C8XX_2 is not set
510# CONFIG_SCSI_IPR is not set
511CONFIG_SCSI_QLOGIC_1280=y 553CONFIG_SCSI_QLOGIC_1280=y
512# CONFIG_SCSI_QLA_FC is not set 554# CONFIG_SCSI_QLA_FC is not set
555# CONFIG_SCSI_QLA_ISCSI is not set
513# CONFIG_SCSI_LPFC is not set 556# CONFIG_SCSI_LPFC is not set
514# CONFIG_SCSI_DC395x is not set 557# CONFIG_SCSI_DC395x is not set
515# CONFIG_SCSI_DC390T is not set 558# CONFIG_SCSI_DC390T is not set
516# CONFIG_SCSI_DEBUG is not set 559# CONFIG_SCSI_DEBUG is not set
560# CONFIG_SCSI_SRP is not set
561
562#
563# Serial ATA (prod) and Parallel ATA (experimental) drivers
564#
565# CONFIG_ATA is not set
517 566
518# 567#
519# Multi-device support (RAID and LVM) 568# Multi-device support (RAID and LVM)
@@ -529,6 +578,7 @@ CONFIG_MD_RAID5_RESHAPE=y
529CONFIG_MD_MULTIPATH=m 578CONFIG_MD_MULTIPATH=m
530CONFIG_MD_FAULTY=m 579CONFIG_MD_FAULTY=m
531CONFIG_BLK_DEV_DM=m 580CONFIG_BLK_DEV_DM=m
581# CONFIG_DM_DEBUG is not set
532CONFIG_DM_CRYPT=m 582CONFIG_DM_CRYPT=m
533CONFIG_DM_SNAPSHOT=m 583CONFIG_DM_SNAPSHOT=m
534CONFIG_DM_MIRROR=m 584CONFIG_DM_MIRROR=m
@@ -583,6 +633,8 @@ CONFIG_LXT_PHY=m
583CONFIG_CICADA_PHY=m 633CONFIG_CICADA_PHY=m
584CONFIG_VITESSE_PHY=m 634CONFIG_VITESSE_PHY=m
585CONFIG_SMSC_PHY=m 635CONFIG_SMSC_PHY=m
636# CONFIG_BROADCOM_PHY is not set
637# CONFIG_FIXED_PHY is not set
586 638
587# 639#
588# Ethernet (10 or 100Mbit) 640# Ethernet (10 or 100Mbit)
@@ -619,14 +671,18 @@ CONFIG_SGI_IOC3_ETH=y
619# CONFIG_SK98LIN is not set 671# CONFIG_SK98LIN is not set
620# CONFIG_TIGON3 is not set 672# CONFIG_TIGON3 is not set
621# CONFIG_BNX2 is not set 673# CONFIG_BNX2 is not set
674CONFIG_QLA3XXX=m
675# CONFIG_ATL1 is not set
622 676
623# 677#
624# Ethernet (10000 Mbit) 678# Ethernet (10000 Mbit)
625# 679#
626# CONFIG_CHELSIO_T1 is not set 680# CONFIG_CHELSIO_T1 is not set
681CONFIG_CHELSIO_T3=m
627# CONFIG_IXGB is not set 682# CONFIG_IXGB is not set
628# CONFIG_S2IO is not set 683# CONFIG_S2IO is not set
629# CONFIG_MYRI10GE is not set 684# CONFIG_MYRI10GE is not set
685CONFIG_NETXEN_NIC=m
630 686
631# 687#
632# Token Ring devices 688# Token Ring devices
@@ -724,10 +780,6 @@ CONFIG_SGI_IP27_RTC=y
724# CONFIG_DTLK is not set 780# CONFIG_DTLK is not set
725# CONFIG_R3964 is not set 781# CONFIG_R3964 is not set
726# CONFIG_APPLICOM is not set 782# CONFIG_APPLICOM is not set
727
728#
729# Ftape, the floppy tape device driver
730#
731# CONFIG_DRM is not set 783# CONFIG_DRM is not set
732# CONFIG_RAW_DRIVER is not set 784# CONFIG_RAW_DRIVER is not set
733 785
@@ -735,7 +787,6 @@ CONFIG_SGI_IP27_RTC=y
735# TPM devices 787# TPM devices
736# 788#
737# CONFIG_TCG_TPM is not set 789# CONFIG_TCG_TPM is not set
738# CONFIG_TELCLOCK is not set
739 790
740# 791#
741# I2C support 792# I2C support
@@ -760,14 +811,9 @@ CONFIG_SGI_IP27_RTC=y
760# CONFIG_HWMON_VID is not set 811# CONFIG_HWMON_VID is not set
761 812
762# 813#
763# Misc devices
764#
765
766#
767# Multimedia devices 814# Multimedia devices
768# 815#
769# CONFIG_VIDEO_DEV is not set 816# CONFIG_VIDEO_DEV is not set
770CONFIG_VIDEO_V4L2=y
771 817
772# 818#
773# Digital Video Broadcasting Devices 819# Digital Video Broadcasting Devices
@@ -779,6 +825,7 @@ CONFIG_VIDEO_V4L2=y
779# 825#
780# CONFIG_FIRMWARE_EDID is not set 826# CONFIG_FIRMWARE_EDID is not set
781# CONFIG_FB is not set 827# CONFIG_FB is not set
828# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
782 829
783# 830#
784# Sound 831# Sound
@@ -848,6 +895,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
848# 895#
849 896
850# 897#
898# Auxiliary Display support
899#
900
901#
902# Virtualization
903#
904
905#
851# File systems 906# File systems
852# 907#
853CONFIG_EXT2_FS=y 908CONFIG_EXT2_FS=y
@@ -859,6 +914,7 @@ CONFIG_EXT3_FS=y
859CONFIG_EXT3_FS_XATTR=y 914CONFIG_EXT3_FS_XATTR=y
860CONFIG_EXT3_FS_POSIX_ACL=y 915CONFIG_EXT3_FS_POSIX_ACL=y
861CONFIG_EXT3_FS_SECURITY=y 916CONFIG_EXT3_FS_SECURITY=y
917# CONFIG_EXT4DEV_FS is not set
862CONFIG_JBD=y 918CONFIG_JBD=y
863CONFIG_JBD_DEBUG=y 919CONFIG_JBD_DEBUG=y
864CONFIG_FS_MBCACHE=y 920CONFIG_FS_MBCACHE=y
@@ -870,6 +926,7 @@ CONFIG_XFS_QUOTA=y
870CONFIG_XFS_SECURITY=y 926CONFIG_XFS_SECURITY=y
871CONFIG_XFS_POSIX_ACL=y 927CONFIG_XFS_POSIX_ACL=y
872# CONFIG_XFS_RT is not set 928# CONFIG_XFS_RT is not set
929# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 930# CONFIG_OCFS2_FS is not set
874# CONFIG_MINIX_FS is not set 931# CONFIG_MINIX_FS is not set
875# CONFIG_ROMFS_FS is not set 932# CONFIG_ROMFS_FS is not set
@@ -881,6 +938,7 @@ CONFIG_DNOTIFY=y
881CONFIG_AUTOFS_FS=m 938CONFIG_AUTOFS_FS=m
882# CONFIG_AUTOFS4_FS is not set 939# CONFIG_AUTOFS4_FS is not set
883CONFIG_FUSE_FS=m 940CONFIG_FUSE_FS=m
941CONFIG_GENERIC_ACL=y
884 942
885# 943#
886# CD-ROM/DVD Filesystems 944# CD-ROM/DVD Filesystems
@@ -900,17 +958,20 @@ CONFIG_FUSE_FS=m
900# 958#
901CONFIG_PROC_FS=y 959CONFIG_PROC_FS=y
902CONFIG_PROC_KCORE=y 960CONFIG_PROC_KCORE=y
961CONFIG_PROC_SYSCTL=y
903CONFIG_SYSFS=y 962CONFIG_SYSFS=y
904CONFIG_TMPFS=y 963CONFIG_TMPFS=y
964CONFIG_TMPFS_POSIX_ACL=y
905# CONFIG_HUGETLB_PAGE is not set 965# CONFIG_HUGETLB_PAGE is not set
906CONFIG_RAMFS=y 966CONFIG_RAMFS=y
907# CONFIG_CONFIGFS_FS is not set 967CONFIG_CONFIGFS_FS=m
908 968
909# 969#
910# Miscellaneous filesystems 970# Miscellaneous filesystems
911# 971#
912# CONFIG_ADFS_FS is not set 972# CONFIG_ADFS_FS is not set
913# CONFIG_AFFS_FS is not set 973# CONFIG_AFFS_FS is not set
974# CONFIG_ECRYPT_FS is not set
914# CONFIG_HFS_FS is not set 975# CONFIG_HFS_FS is not set
915# CONFIG_HFSPLUS_FS is not set 976# CONFIG_HFSPLUS_FS is not set
916# CONFIG_BEFS_FS is not set 977# CONFIG_BEFS_FS is not set
@@ -942,7 +1003,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
942# CONFIG_RPCSEC_GSS_SPKM3 is not set 1003# CONFIG_RPCSEC_GSS_SPKM3 is not set
943# CONFIG_SMB_FS is not set 1004# CONFIG_SMB_FS is not set
944# CONFIG_CIFS is not set 1005# CONFIG_CIFS is not set
945# CONFIG_CIFS_DEBUG2 is not set
946# CONFIG_NCP_FS is not set 1006# CONFIG_NCP_FS is not set
947# CONFIG_CODA_FS is not set 1007# CONFIG_CODA_FS is not set
948# CONFIG_AFS_FS is not set 1008# CONFIG_AFS_FS is not set
@@ -975,6 +1035,14 @@ CONFIG_SGI_PARTITION=y
975# CONFIG_NLS is not set 1035# CONFIG_NLS is not set
976 1036
977# 1037#
1038# Distributed Lock Manager
1039#
1040CONFIG_DLM=m
1041CONFIG_DLM_TCP=y
1042# CONFIG_DLM_SCTP is not set
1043# CONFIG_DLM_DEBUG is not set
1044
1045#
978# Profiling support 1046# Profiling support
979# 1047#
980# CONFIG_PROFILING is not set 1048# CONFIG_PROFILING is not set
@@ -984,13 +1052,16 @@ CONFIG_SGI_PARTITION=y
984# 1052#
985CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1053CONFIG_TRACE_IRQFLAGS_SUPPORT=y
986# CONFIG_PRINTK_TIME is not set 1054# CONFIG_PRINTK_TIME is not set
1055CONFIG_ENABLE_MUST_CHECK=y
987# CONFIG_MAGIC_SYSRQ is not set 1056# CONFIG_MAGIC_SYSRQ is not set
988# CONFIG_UNUSED_SYMBOLS is not set 1057# CONFIG_UNUSED_SYMBOLS is not set
1058# CONFIG_DEBUG_FS is not set
1059# CONFIG_HEADERS_CHECK is not set
989# CONFIG_DEBUG_KERNEL is not set 1060# CONFIG_DEBUG_KERNEL is not set
990CONFIG_LOG_BUF_SHIFT=15 1061CONFIG_LOG_BUF_SHIFT=15
991# CONFIG_DEBUG_FS is not set
992CONFIG_CROSSCOMPILE=y 1062CONFIG_CROSSCOMPILE=y
993CONFIG_CMDLINE="" 1063CONFIG_CMDLINE=""
1064CONFIG_SYS_SUPPORTS_KGDB=y
994 1065
995# 1066#
996# Security options 1067# Security options
@@ -1003,7 +1074,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1003# Cryptographic options 1074# Cryptographic options
1004# 1075#
1005CONFIG_CRYPTO=y 1076CONFIG_CRYPTO=y
1077CONFIG_CRYPTO_ALGAPI=y
1078CONFIG_CRYPTO_BLKCIPHER=y
1079CONFIG_CRYPTO_HASH=y
1080CONFIG_CRYPTO_MANAGER=y
1006CONFIG_CRYPTO_HMAC=y 1081CONFIG_CRYPTO_HMAC=y
1082CONFIG_CRYPTO_XCBC=m
1007CONFIG_CRYPTO_NULL=m 1083CONFIG_CRYPTO_NULL=m
1008CONFIG_CRYPTO_MD4=m 1084CONFIG_CRYPTO_MD4=m
1009CONFIG_CRYPTO_MD5=y 1085CONFIG_CRYPTO_MD5=y
@@ -1012,9 +1088,16 @@ CONFIG_CRYPTO_SHA256=m
1012CONFIG_CRYPTO_SHA512=m 1088CONFIG_CRYPTO_SHA512=m
1013CONFIG_CRYPTO_WP512=m 1089CONFIG_CRYPTO_WP512=m
1014CONFIG_CRYPTO_TGR192=m 1090CONFIG_CRYPTO_TGR192=m
1091CONFIG_CRYPTO_GF128MUL=m
1092CONFIG_CRYPTO_ECB=m
1093CONFIG_CRYPTO_CBC=y
1094CONFIG_CRYPTO_PCBC=m
1095CONFIG_CRYPTO_LRW=m
1015CONFIG_CRYPTO_DES=y 1096CONFIG_CRYPTO_DES=y
1097CONFIG_CRYPTO_FCRYPT=m
1016CONFIG_CRYPTO_BLOWFISH=m 1098CONFIG_CRYPTO_BLOWFISH=m
1017CONFIG_CRYPTO_TWOFISH=m 1099CONFIG_CRYPTO_TWOFISH=m
1100CONFIG_CRYPTO_TWOFISH_COMMON=m
1018CONFIG_CRYPTO_SERPENT=m 1101CONFIG_CRYPTO_SERPENT=m
1019CONFIG_CRYPTO_AES=m 1102CONFIG_CRYPTO_AES=m
1020CONFIG_CRYPTO_CAST5=m 1103CONFIG_CRYPTO_CAST5=m
@@ -1026,6 +1109,7 @@ CONFIG_CRYPTO_ANUBIS=m
1026CONFIG_CRYPTO_DEFLATE=m 1109CONFIG_CRYPTO_DEFLATE=m
1027CONFIG_CRYPTO_MICHAEL_MIC=m 1110CONFIG_CRYPTO_MICHAEL_MIC=m
1028CONFIG_CRYPTO_CRC32C=m 1111CONFIG_CRYPTO_CRC32C=m
1112CONFIG_CRYPTO_CAMELLIA=m
1029# CONFIG_CRYPTO_TEST is not set 1113# CONFIG_CRYPTO_TEST is not set
1030 1114
1031# 1115#
@@ -1035,6 +1119,7 @@ CONFIG_CRYPTO_CRC32C=m
1035# 1119#
1036# Library routines 1120# Library routines
1037# 1121#
1122CONFIG_BITREVERSE=y
1038# CONFIG_CRC_CCITT is not set 1123# CONFIG_CRC_CCITT is not set
1039CONFIG_CRC16=m 1124CONFIG_CRC16=m
1040CONFIG_CRC32=y 1125CONFIG_CRC32=y
@@ -1042,3 +1127,5 @@ CONFIG_LIBCRC32C=m
1042CONFIG_ZLIB_INFLATE=m 1127CONFIG_ZLIB_INFLATE=m
1043CONFIG_ZLIB_DEFLATE=m 1128CONFIG_ZLIB_DEFLATE=m
1044CONFIG_PLIST=y 1129CONFIG_PLIST=y
1130CONFIG_HAS_IOMEM=y
1131CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 61e069a0f1aa..8fc18809d5ff 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:11 2006 4# Tue Feb 20 21:47:33 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +63,17 @@ CONFIG_SGI_IP32=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_ARC=y 74CONFIG_ARC=y
72CONFIG_DMA_IP32=y
73CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
74CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
75CONFIG_OWN_DMA=y
76CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
77# CONFIG_CPU_LITTLE_ENDIAN is not set 78# CONFIG_CPU_LITTLE_ENDIAN is not set
78CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 79CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -124,8 +125,8 @@ CONFIG_BOARD_SCACHE=y
124CONFIG_R5000_CPU_SCACHE=y 125CONFIG_R5000_CPU_SCACHE=y
125CONFIG_RM7000_CPU_SCACHE=y 126CONFIG_RM7000_CPU_SCACHE=y
126CONFIG_MIPS_MT_DISABLED=y 127CONFIG_MIPS_MT_DISABLED=y
127# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_MT_SMP is not set 128# CONFIG_MIPS_MT_SMP is not set
129# CONFIG_MIPS_MT_SMTC is not set
129# CONFIG_MIPS_VPE_LOADER is not set 130# CONFIG_MIPS_VPE_LOADER is not set
130CONFIG_CPU_HAS_LLSC=y 131CONFIG_CPU_HAS_LLSC=y
131CONFIG_CPU_HAS_SYNC=y 132CONFIG_CPU_HAS_SYNC=y
@@ -141,6 +142,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 142# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 143CONFIG_SPLIT_PTLOCK_CPUS=4
143CONFIG_RESOURCES_64BIT=y 144CONFIG_RESOURCES_64BIT=y
145CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 146# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 147# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 148# CONFIG_HZ_128 is not set
@@ -153,6 +155,7 @@ CONFIG_HZ=1000
153# CONFIG_PREEMPT_NONE is not set 155# CONFIG_PREEMPT_NONE is not set
154CONFIG_PREEMPT_VOLUNTARY=y 156CONFIG_PREEMPT_VOLUNTARY=y
155# CONFIG_PREEMPT is not set 157# CONFIG_PREEMPT is not set
158# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 159CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 160CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 161CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,16 +174,21 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 174CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 175CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 176CONFIG_SYSVIPC=y
177# CONFIG_IPC_NS is not set
178CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 179# CONFIG_POSIX_MQUEUE is not set
175CONFIG_BSD_PROCESS_ACCT=y 180CONFIG_BSD_PROCESS_ACCT=y
176# CONFIG_BSD_PROCESS_ACCT_V3 is not set 181# CONFIG_BSD_PROCESS_ACCT_V3 is not set
177CONFIG_SYSCTL=y 182# CONFIG_TASKSTATS is not set
183# CONFIG_UTS_NS is not set
178# CONFIG_AUDIT is not set 184# CONFIG_AUDIT is not set
179# CONFIG_IKCONFIG is not set 185# CONFIG_IKCONFIG is not set
186CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 187CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 188# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
189CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 190CONFIG_EMBEDDED=y
191CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 192CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 193# CONFIG_KALLSYMS_EXTRA_PASS is not set
186CONFIG_HOTPLUG=y 194CONFIG_HOTPLUG=y
@@ -188,12 +196,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 196CONFIG_BUG=y
189CONFIG_ELF_CORE=y 197CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 198CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 199CONFIG_FUTEX=y
193CONFIG_EPOLL=y 200CONFIG_EPOLL=y
194CONFIG_SHMEM=y 201CONFIG_SHMEM=y
195CONFIG_SLAB=y 202CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 203CONFIG_VM_EVENT_COUNTERS=y
204CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 205# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 206CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 207# CONFIG_SLOB is not set
@@ -206,6 +214,7 @@ CONFIG_BASE_SMALL=0
206# 214#
207# Block layer 215# Block layer
208# 216#
217CONFIG_BLOCK=y
209# CONFIG_BLK_DEV_IO_TRACE is not set 218# CONFIG_BLK_DEV_IO_TRACE is not set
210 219
211# 220#
@@ -246,11 +255,20 @@ CONFIG_BINFMT_MISC=y
246# CONFIG_BUILD_ELF64 is not set 255# CONFIG_BUILD_ELF64 is not set
247CONFIG_MIPS32_COMPAT=y 256CONFIG_MIPS32_COMPAT=y
248CONFIG_COMPAT=y 257CONFIG_COMPAT=y
258CONFIG_SYSVIPC_COMPAT=y
249CONFIG_MIPS32_O32=y 259CONFIG_MIPS32_O32=y
250# CONFIG_MIPS32_N32 is not set 260# CONFIG_MIPS32_N32 is not set
251CONFIG_BINFMT_ELF32=y 261CONFIG_BINFMT_ELF32=y
252 262
253# 263#
264# Power management options
265#
266CONFIG_PM=y
267# CONFIG_PM_LEGACY is not set
268# CONFIG_PM_DEBUG is not set
269# CONFIG_PM_SYSFS_DEPRECATED is not set
270
271#
254# Networking 272# Networking
255# 273#
256CONFIG_NET=y 274CONFIG_NET=y
@@ -264,7 +282,10 @@ CONFIG_PACKET_MMAP=y
264CONFIG_UNIX=y 282CONFIG_UNIX=y
265CONFIG_XFRM=y 283CONFIG_XFRM=y
266CONFIG_XFRM_USER=y 284CONFIG_XFRM_USER=y
285# CONFIG_XFRM_SUB_POLICY is not set
286CONFIG_XFRM_MIGRATE=y
267CONFIG_NET_KEY=y 287CONFIG_NET_KEY=y
288CONFIG_NET_KEY_MIGRATE=y
268CONFIG_INET=y 289CONFIG_INET=y
269# CONFIG_IP_MULTICAST is not set 290# CONFIG_IP_MULTICAST is not set
270# CONFIG_IP_ADVANCED_ROUTER is not set 291# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -284,10 +305,13 @@ CONFIG_IP_PNP_BOOTP=y
284# CONFIG_INET_TUNNEL is not set 305# CONFIG_INET_TUNNEL is not set
285CONFIG_INET_XFRM_MODE_TRANSPORT=y 306CONFIG_INET_XFRM_MODE_TRANSPORT=y
286CONFIG_INET_XFRM_MODE_TUNNEL=y 307CONFIG_INET_XFRM_MODE_TUNNEL=y
308CONFIG_INET_XFRM_MODE_BEET=y
287CONFIG_INET_DIAG=y 309CONFIG_INET_DIAG=y
288CONFIG_INET_TCP_DIAG=y 310CONFIG_INET_TCP_DIAG=y
289# CONFIG_TCP_CONG_ADVANCED is not set 311# CONFIG_TCP_CONG_ADVANCED is not set
290CONFIG_TCP_CONG_BIC=y 312CONFIG_TCP_CONG_CUBIC=y
313CONFIG_DEFAULT_TCP_CONG="cubic"
314CONFIG_TCP_MD5SIG=y
291# CONFIG_IPV6 is not set 315# CONFIG_IPV6 is not set
292# CONFIG_INET6_XFRM_TUNNEL is not set 316# CONFIG_INET6_XFRM_TUNNEL is not set
293# CONFIG_INET6_TUNNEL is not set 317# CONFIG_INET6_TUNNEL is not set
@@ -317,7 +341,6 @@ CONFIG_NETWORK_SECMARK=y
317# CONFIG_ATALK is not set 341# CONFIG_ATALK is not set
318# CONFIG_X25 is not set 342# CONFIG_X25 is not set
319# CONFIG_LAPB is not set 343# CONFIG_LAPB is not set
320# CONFIG_NET_DIVERT is not set
321# CONFIG_ECONET is not set 344# CONFIG_ECONET is not set
322# CONFIG_WAN_ROUTER is not set 345# CONFIG_WAN_ROUTER is not set
323 346
@@ -372,6 +395,7 @@ CONFIG_PROC_EVENTS=y
372# 395#
373# Plug and Play support 396# Plug and Play support
374# 397#
398# CONFIG_PNPACPI is not set
375 399
376# 400#
377# Block devices 401# Block devices
@@ -393,6 +417,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
393CONFIG_ATA_OVER_ETH=y 417CONFIG_ATA_OVER_ETH=y
394 418
395# 419#
420# Misc devices
421#
422CONFIG_SGI_IOC4=y
423# CONFIG_TIFM_CORE is not set
424
425#
396# ATA/ATAPI/MFM/RLL support 426# ATA/ATAPI/MFM/RLL support
397# 427#
398# CONFIG_IDE is not set 428# CONFIG_IDE is not set
@@ -402,6 +432,8 @@ CONFIG_ATA_OVER_ETH=y
402# 432#
403CONFIG_RAID_ATTRS=y 433CONFIG_RAID_ATTRS=y
404CONFIG_SCSI=y 434CONFIG_SCSI=y
435CONFIG_SCSI_TGT=y
436CONFIG_SCSI_NETLINK=y
405CONFIG_SCSI_PROC_FS=y 437CONFIG_SCSI_PROC_FS=y
406 438
407# 439#
@@ -421,14 +453,17 @@ CONFIG_CHR_DEV_SG=y
421CONFIG_SCSI_MULTI_LUN=y 453CONFIG_SCSI_MULTI_LUN=y
422CONFIG_SCSI_CONSTANTS=y 454CONFIG_SCSI_CONSTANTS=y
423CONFIG_SCSI_LOGGING=y 455CONFIG_SCSI_LOGGING=y
456CONFIG_SCSI_SCAN_ASYNC=y
424 457
425# 458#
426# SCSI Transport Attributes 459# SCSI Transports
427# 460#
428CONFIG_SCSI_SPI_ATTRS=y 461CONFIG_SCSI_SPI_ATTRS=y
429CONFIG_SCSI_FC_ATTRS=y 462CONFIG_SCSI_FC_ATTRS=y
430# CONFIG_SCSI_ISCSI_ATTRS is not set 463# CONFIG_SCSI_ISCSI_ATTRS is not set
431CONFIG_SCSI_SAS_ATTRS=y 464CONFIG_SCSI_SAS_ATTRS=y
465CONFIG_SCSI_SAS_LIBSAS=y
466# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
432 467
433# 468#
434# SCSI low-level drivers 469# SCSI low-level drivers
@@ -446,24 +481,33 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
446CONFIG_AIC7XXX_REG_PRETTY_PRINT=y 481CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
447# CONFIG_SCSI_AIC7XXX_OLD is not set 482# CONFIG_SCSI_AIC7XXX_OLD is not set
448# CONFIG_SCSI_AIC79XX is not set 483# CONFIG_SCSI_AIC79XX is not set
484CONFIG_SCSI_AIC94XX=y
485# CONFIG_AIC94XX_DEBUG is not set
486# CONFIG_SCSI_ARCMSR is not set
449# CONFIG_MEGARAID_NEWGEN is not set 487# CONFIG_MEGARAID_NEWGEN is not set
450# CONFIG_MEGARAID_LEGACY is not set 488# CONFIG_MEGARAID_LEGACY is not set
451# CONFIG_MEGARAID_SAS is not set 489# CONFIG_MEGARAID_SAS is not set
452# CONFIG_SCSI_SATA is not set
453# CONFIG_SCSI_HPTIOP is not set 490# CONFIG_SCSI_HPTIOP is not set
454# CONFIG_SCSI_DMX3191D is not set 491# CONFIG_SCSI_DMX3191D is not set
455# CONFIG_SCSI_FUTURE_DOMAIN is not set 492# CONFIG_SCSI_FUTURE_DOMAIN is not set
456# CONFIG_SCSI_IPS is not set 493# CONFIG_SCSI_IPS is not set
457# CONFIG_SCSI_INITIO is not set 494# CONFIG_SCSI_INITIO is not set
458# CONFIG_SCSI_INIA100 is not set 495# CONFIG_SCSI_INIA100 is not set
496# CONFIG_SCSI_STEX is not set
459# CONFIG_SCSI_SYM53C8XX_2 is not set 497# CONFIG_SCSI_SYM53C8XX_2 is not set
460# CONFIG_SCSI_IPR is not set
461# CONFIG_SCSI_QLOGIC_1280 is not set 498# CONFIG_SCSI_QLOGIC_1280 is not set
462# CONFIG_SCSI_QLA_FC is not set 499# CONFIG_SCSI_QLA_FC is not set
500# CONFIG_SCSI_QLA_ISCSI is not set
463# CONFIG_SCSI_LPFC is not set 501# CONFIG_SCSI_LPFC is not set
464# CONFIG_SCSI_DC395x is not set 502# CONFIG_SCSI_DC395x is not set
465# CONFIG_SCSI_DC390T is not set 503# CONFIG_SCSI_DC390T is not set
466# CONFIG_SCSI_DEBUG is not set 504# CONFIG_SCSI_DEBUG is not set
505# CONFIG_SCSI_SRP is not set
506
507#
508# Serial ATA (prod) and Parallel ATA (experimental) drivers
509#
510# CONFIG_ATA is not set
467 511
468# 512#
469# Multi-device support (RAID and LVM) 513# Multi-device support (RAID and LVM)
@@ -517,6 +561,8 @@ CONFIG_LXT_PHY=y
517CONFIG_CICADA_PHY=y 561CONFIG_CICADA_PHY=y
518CONFIG_VITESSE_PHY=y 562CONFIG_VITESSE_PHY=y
519CONFIG_SMSC_PHY=y 563CONFIG_SMSC_PHY=y
564# CONFIG_BROADCOM_PHY is not set
565# CONFIG_FIXED_PHY is not set
520 566
521# 567#
522# Ethernet (10 or 100Mbit) 568# Ethernet (10 or 100Mbit)
@@ -553,14 +599,18 @@ CONFIG_SGI_O2MACE_ETH=y
553# CONFIG_SK98LIN is not set 599# CONFIG_SK98LIN is not set
554# CONFIG_TIGON3 is not set 600# CONFIG_TIGON3 is not set
555# CONFIG_BNX2 is not set 601# CONFIG_BNX2 is not set
602CONFIG_QLA3XXX=y
603# CONFIG_ATL1 is not set
556 604
557# 605#
558# Ethernet (10000 Mbit) 606# Ethernet (10000 Mbit)
559# 607#
560# CONFIG_CHELSIO_T1 is not set 608# CONFIG_CHELSIO_T1 is not set
609CONFIG_CHELSIO_T3=y
561# CONFIG_IXGB is not set 610# CONFIG_IXGB is not set
562# CONFIG_S2IO is not set 611# CONFIG_S2IO is not set
563# CONFIG_MYRI10GE is not set 612# CONFIG_MYRI10GE is not set
613CONFIG_NETXEN_NIC=y
564 614
565# 615#
566# Token Ring devices 616# Token Ring devices
@@ -600,6 +650,7 @@ CONFIG_SGI_O2MACE_ETH=y
600# Input device support 650# Input device support
601# 651#
602CONFIG_INPUT=y 652CONFIG_INPUT=y
653# CONFIG_INPUT_FF_MEMLESS is not set
603 654
604# 655#
605# Userland interfaces 656# Userland interfaces
@@ -678,10 +729,6 @@ CONFIG_LEGACY_PTY_COUNT=256
678# CONFIG_DTLK is not set 729# CONFIG_DTLK is not set
679# CONFIG_R3964 is not set 730# CONFIG_R3964 is not set
680# CONFIG_APPLICOM is not set 731# CONFIG_APPLICOM is not set
681
682#
683# Ftape, the floppy tape device driver
684#
685# CONFIG_DRM is not set 732# CONFIG_DRM is not set
686# CONFIG_RAW_DRIVER is not set 733# CONFIG_RAW_DRIVER is not set
687 734
@@ -689,7 +736,6 @@ CONFIG_LEGACY_PTY_COUNT=256
689# TPM devices 736# TPM devices
690# 737#
691# CONFIG_TCG_TPM is not set 738# CONFIG_TCG_TPM is not set
692# CONFIG_TELCLOCK is not set
693 739
694# 740#
695# I2C support 741# I2C support
@@ -714,14 +760,9 @@ CONFIG_LEGACY_PTY_COUNT=256
714# CONFIG_HWMON_VID is not set 760# CONFIG_HWMON_VID is not set
715 761
716# 762#
717# Misc devices
718#
719
720#
721# Multimedia devices 763# Multimedia devices
722# 764#
723# CONFIG_VIDEO_DEV is not set 765# CONFIG_VIDEO_DEV is not set
724CONFIG_VIDEO_V4L2=y
725 766
726# 767#
727# Digital Video Broadcasting Devices 768# Digital Video Broadcasting Devices
@@ -739,6 +780,7 @@ CONFIG_VIDEO_V4L2=y
739# 780#
740# CONFIG_VGA_CONSOLE is not set 781# CONFIG_VGA_CONSOLE is not set
741CONFIG_DUMMY_CONSOLE=y 782CONFIG_DUMMY_CONSOLE=y
783# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
742 784
743# 785#
744# Sound 786# Sound
@@ -746,6 +788,12 @@ CONFIG_DUMMY_CONSOLE=y
746# CONFIG_SOUND is not set 788# CONFIG_SOUND is not set
747 789
748# 790#
791# HID Devices
792#
793CONFIG_HID=y
794# CONFIG_HID_DEBUG is not set
795
796#
749# USB support 797# USB support
750# 798#
751CONFIG_USB_ARCH_HAS_HCD=y 799CONFIG_USB_ARCH_HAS_HCD=y
@@ -808,16 +856,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
808# 856#
809 857
810# 858#
859# Auxiliary Display support
860#
861
862#
863# Virtualization
864#
865
866#
811# File systems 867# File systems
812# 868#
813CONFIG_EXT2_FS=y 869CONFIG_EXT2_FS=y
814# CONFIG_EXT2_FS_XATTR is not set 870# CONFIG_EXT2_FS_XATTR is not set
815# CONFIG_EXT2_FS_XIP is not set 871# CONFIG_EXT2_FS_XIP is not set
816# CONFIG_EXT3_FS is not set 872# CONFIG_EXT3_FS is not set
873# CONFIG_EXT4DEV_FS is not set
817# CONFIG_REISERFS_FS is not set 874# CONFIG_REISERFS_FS is not set
818# CONFIG_JFS_FS is not set 875# CONFIG_JFS_FS is not set
819# CONFIG_FS_POSIX_ACL is not set 876CONFIG_FS_POSIX_ACL=y
820# CONFIG_XFS_FS is not set 877# CONFIG_XFS_FS is not set
878# CONFIG_GFS2_FS is not set
821# CONFIG_OCFS2_FS is not set 879# CONFIG_OCFS2_FS is not set
822# CONFIG_MINIX_FS is not set 880# CONFIG_MINIX_FS is not set
823# CONFIG_ROMFS_FS is not set 881# CONFIG_ROMFS_FS is not set
@@ -828,6 +886,7 @@ CONFIG_DNOTIFY=y
828# CONFIG_AUTOFS_FS is not set 886# CONFIG_AUTOFS_FS is not set
829# CONFIG_AUTOFS4_FS is not set 887# CONFIG_AUTOFS4_FS is not set
830CONFIG_FUSE_FS=y 888CONFIG_FUSE_FS=y
889CONFIG_GENERIC_ACL=y
831 890
832# 891#
833# CD-ROM/DVD Filesystems 892# CD-ROM/DVD Filesystems
@@ -847,17 +906,20 @@ CONFIG_FUSE_FS=y
847# 906#
848CONFIG_PROC_FS=y 907CONFIG_PROC_FS=y
849CONFIG_PROC_KCORE=y 908CONFIG_PROC_KCORE=y
909CONFIG_PROC_SYSCTL=y
850CONFIG_SYSFS=y 910CONFIG_SYSFS=y
851CONFIG_TMPFS=y 911CONFIG_TMPFS=y
912CONFIG_TMPFS_POSIX_ACL=y
852# CONFIG_HUGETLB_PAGE is not set 913# CONFIG_HUGETLB_PAGE is not set
853CONFIG_RAMFS=y 914CONFIG_RAMFS=y
854# CONFIG_CONFIGFS_FS is not set 915CONFIG_CONFIGFS_FS=y
855 916
856# 917#
857# Miscellaneous filesystems 918# Miscellaneous filesystems
858# 919#
859# CONFIG_ADFS_FS is not set 920# CONFIG_ADFS_FS is not set
860# CONFIG_AFFS_FS is not set 921# CONFIG_AFFS_FS is not set
922# CONFIG_ECRYPT_FS is not set
861# CONFIG_HFS_FS is not set 923# CONFIG_HFS_FS is not set
862# CONFIG_HFSPLUS_FS is not set 924# CONFIG_HFSPLUS_FS is not set
863# CONFIG_BEFS_FS is not set 925# CONFIG_BEFS_FS is not set
@@ -888,7 +950,6 @@ CONFIG_SUNRPC=y
888# CONFIG_RPCSEC_GSS_SPKM3 is not set 950# CONFIG_RPCSEC_GSS_SPKM3 is not set
889# CONFIG_SMB_FS is not set 951# CONFIG_SMB_FS is not set
890# CONFIG_CIFS is not set 952# CONFIG_CIFS is not set
891# CONFIG_CIFS_DEBUG2 is not set
892# CONFIG_NCP_FS is not set 953# CONFIG_NCP_FS is not set
893# CONFIG_CODA_FS is not set 954# CONFIG_CODA_FS is not set
894# CONFIG_AFS_FS is not set 955# CONFIG_AFS_FS is not set
@@ -917,6 +978,14 @@ CONFIG_SGI_PARTITION=y
917# CONFIG_NLS is not set 978# CONFIG_NLS is not set
918 979
919# 980#
981# Distributed Lock Manager
982#
983CONFIG_DLM=y
984CONFIG_DLM_TCP=y
985# CONFIG_DLM_SCTP is not set
986# CONFIG_DLM_DEBUG is not set
987
988#
920# Profiling support 989# Profiling support
921# 990#
922# CONFIG_PROFILING is not set 991# CONFIG_PROFILING is not set
@@ -926,12 +995,13 @@ CONFIG_SGI_PARTITION=y
926# 995#
927CONFIG_TRACE_IRQFLAGS_SUPPORT=y 996CONFIG_TRACE_IRQFLAGS_SUPPORT=y
928# CONFIG_PRINTK_TIME is not set 997# CONFIG_PRINTK_TIME is not set
998CONFIG_ENABLE_MUST_CHECK=y
929# CONFIG_MAGIC_SYSRQ is not set 999# CONFIG_MAGIC_SYSRQ is not set
930# CONFIG_UNUSED_SYMBOLS is not set 1000# CONFIG_UNUSED_SYMBOLS is not set
1001# CONFIG_DEBUG_FS is not set
1002# CONFIG_HEADERS_CHECK is not set
931# CONFIG_DEBUG_KERNEL is not set 1003# CONFIG_DEBUG_KERNEL is not set
932CONFIG_LOG_BUF_SHIFT=14 1004CONFIG_LOG_BUF_SHIFT=14
933# CONFIG_DEBUG_FS is not set
934# CONFIG_UNWIND_INFO is not set
935CONFIG_CROSSCOMPILE=y 1005CONFIG_CROSSCOMPILE=y
936CONFIG_CMDLINE="" 1006CONFIG_CMDLINE=""
937 1007
@@ -946,7 +1016,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
946# Cryptographic options 1016# Cryptographic options
947# 1017#
948CONFIG_CRYPTO=y 1018CONFIG_CRYPTO=y
1019CONFIG_CRYPTO_ALGAPI=y
1020CONFIG_CRYPTO_BLKCIPHER=y
1021CONFIG_CRYPTO_HASH=y
1022CONFIG_CRYPTO_MANAGER=y
949CONFIG_CRYPTO_HMAC=y 1023CONFIG_CRYPTO_HMAC=y
1024CONFIG_CRYPTO_XCBC=y
950CONFIG_CRYPTO_NULL=y 1025CONFIG_CRYPTO_NULL=y
951CONFIG_CRYPTO_MD4=y 1026CONFIG_CRYPTO_MD4=y
952CONFIG_CRYPTO_MD5=y 1027CONFIG_CRYPTO_MD5=y
@@ -955,9 +1030,16 @@ CONFIG_CRYPTO_SHA256=y
955CONFIG_CRYPTO_SHA512=y 1030CONFIG_CRYPTO_SHA512=y
956CONFIG_CRYPTO_WP512=y 1031CONFIG_CRYPTO_WP512=y
957CONFIG_CRYPTO_TGR192=y 1032CONFIG_CRYPTO_TGR192=y
1033CONFIG_CRYPTO_GF128MUL=y
1034CONFIG_CRYPTO_ECB=y
1035CONFIG_CRYPTO_CBC=y
1036CONFIG_CRYPTO_PCBC=y
1037CONFIG_CRYPTO_LRW=y
958CONFIG_CRYPTO_DES=y 1038CONFIG_CRYPTO_DES=y
1039CONFIG_CRYPTO_FCRYPT=y
959CONFIG_CRYPTO_BLOWFISH=y 1040CONFIG_CRYPTO_BLOWFISH=y
960CONFIG_CRYPTO_TWOFISH=y 1041CONFIG_CRYPTO_TWOFISH=y
1042CONFIG_CRYPTO_TWOFISH_COMMON=y
961CONFIG_CRYPTO_SERPENT=y 1043CONFIG_CRYPTO_SERPENT=y
962CONFIG_CRYPTO_AES=y 1044CONFIG_CRYPTO_AES=y
963CONFIG_CRYPTO_CAST5=y 1045CONFIG_CRYPTO_CAST5=y
@@ -969,6 +1051,7 @@ CONFIG_CRYPTO_ANUBIS=y
969CONFIG_CRYPTO_DEFLATE=y 1051CONFIG_CRYPTO_DEFLATE=y
970CONFIG_CRYPTO_MICHAEL_MIC=y 1052CONFIG_CRYPTO_MICHAEL_MIC=y
971CONFIG_CRYPTO_CRC32C=y 1053CONFIG_CRYPTO_CRC32C=y
1054CONFIG_CRYPTO_CAMELLIA=y
972 1055
973# 1056#
974# Hardware crypto devices 1057# Hardware crypto devices
@@ -977,6 +1060,7 @@ CONFIG_CRYPTO_CRC32C=y
977# 1060#
978# Library routines 1061# Library routines
979# 1062#
1063CONFIG_BITREVERSE=y
980# CONFIG_CRC_CCITT is not set 1064# CONFIG_CRC_CCITT is not set
981CONFIG_CRC16=y 1065CONFIG_CRC16=y
982CONFIG_CRC32=y 1066CONFIG_CRC32=y
@@ -984,3 +1068,5 @@ CONFIG_LIBCRC32C=y
984CONFIG_ZLIB_INFLATE=y 1068CONFIG_ZLIB_INFLATE=y
985CONFIG_ZLIB_DEFLATE=y 1069CONFIG_ZLIB_DEFLATE=y
986CONFIG_PLIST=y 1070CONFIG_PLIST=y
1071CONFIG_HAS_IOMEM=y
1072CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 88966666f4c6..083104daa2ca 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:12 2006 4# Tue Feb 20 21:47:33 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MOMENCO_JAGUAR_ATX=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +64,14 @@ CONFIG_MOMENCO_JAGUAR_ATX=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_JAGUAR_DMALOW=y 65CONFIG_JAGUAR_DMALOW=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
74CONFIG_LIMITED_DMA=y 77CONFIG_LIMITED_DMA=y
@@ -106,6 +109,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
106CONFIG_CPU_RM9000=y 109CONFIG_CPU_RM9000=y
107# CONFIG_CPU_SB1 is not set 110# CONFIG_CPU_SB1 is not set
108CONFIG_SYS_HAS_CPU_RM9000=y 111CONFIG_SYS_HAS_CPU_RM9000=y
112CONFIG_WEAK_ORDERING=y
109CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 113CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
110CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 114CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 115CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -124,8 +128,8 @@ CONFIG_BOARD_SCACHE=y
124CONFIG_RM7000_CPU_SCACHE=y 128CONFIG_RM7000_CPU_SCACHE=y
125CONFIG_CPU_HAS_PREFETCH=y 129CONFIG_CPU_HAS_PREFETCH=y
126CONFIG_MIPS_MT_DISABLED=y 130CONFIG_MIPS_MT_DISABLED=y
127# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_MT_SMP is not set 131# CONFIG_MIPS_MT_SMP is not set
132# CONFIG_MIPS_MT_SMTC is not set
129# CONFIG_MIPS_VPE_LOADER is not set 133# CONFIG_MIPS_VPE_LOADER is not set
130# CONFIG_64BIT_PHYS_ADDR is not set 134# CONFIG_64BIT_PHYS_ADDR is not set
131CONFIG_CPU_HAS_LLSC=y 135CONFIG_CPU_HAS_LLSC=y
@@ -141,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set 147# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 149# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 150# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 151# CONFIG_HZ_128 is not set
@@ -171,14 +176,19 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 176CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 177CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 178CONFIG_SYSVIPC=y
179# CONFIG_IPC_NS is not set
180CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_BSD_PROCESS_ACCT is not set 181# CONFIG_BSD_PROCESS_ACCT is not set
175CONFIG_SYSCTL=y 182# CONFIG_TASKSTATS is not set
183# CONFIG_UTS_NS is not set
176# CONFIG_AUDIT is not set 184# CONFIG_AUDIT is not set
177CONFIG_IKCONFIG=y 185CONFIG_IKCONFIG=y
178CONFIG_IKCONFIG_PROC=y 186CONFIG_IKCONFIG_PROC=y
187CONFIG_SYSFS_DEPRECATED=y
179CONFIG_RELAY=y 188CONFIG_RELAY=y
180CONFIG_INITRAMFS_SOURCE="" 189CONFIG_SYSCTL=y
181CONFIG_EMBEDDED=y 190CONFIG_EMBEDDED=y
191CONFIG_SYSCTL_SYSCALL=y
182CONFIG_KALLSYMS=y 192CONFIG_KALLSYMS=y
183# CONFIG_KALLSYMS_EXTRA_PASS is not set 193# CONFIG_KALLSYMS_EXTRA_PASS is not set
184CONFIG_HOTPLUG=y 194CONFIG_HOTPLUG=y
@@ -186,12 +196,12 @@ CONFIG_PRINTK=y
186CONFIG_BUG=y 196CONFIG_BUG=y
187CONFIG_ELF_CORE=y 197CONFIG_ELF_CORE=y
188CONFIG_BASE_FULL=y 198CONFIG_BASE_FULL=y
189CONFIG_RT_MUTEXES=y
190CONFIG_FUTEX=y 199CONFIG_FUTEX=y
191CONFIG_EPOLL=y 200CONFIG_EPOLL=y
192CONFIG_SHMEM=y 201CONFIG_SHMEM=y
193CONFIG_SLAB=y 202CONFIG_SLAB=y
194CONFIG_VM_EVENT_COUNTERS=y 203CONFIG_VM_EVENT_COUNTERS=y
204CONFIG_RT_MUTEXES=y
195# CONFIG_TINY_SHMEM is not set 205# CONFIG_TINY_SHMEM is not set
196CONFIG_BASE_SMALL=0 206CONFIG_BASE_SMALL=0
197# CONFIG_SLOB is not set 207# CONFIG_SLOB is not set
@@ -208,6 +218,7 @@ CONFIG_KMOD=y
208# 218#
209# Block layer 219# Block layer
210# 220#
221CONFIG_BLOCK=y
211# CONFIG_LBD is not set 222# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set 223# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set 224# CONFIG_LSF is not set
@@ -249,6 +260,14 @@ CONFIG_BINFMT_ELF=y
249CONFIG_TRAD_SIGNALS=y 260CONFIG_TRAD_SIGNALS=y
250 261
251# 262#
263# Power management options
264#
265CONFIG_PM=y
266# CONFIG_PM_LEGACY is not set
267# CONFIG_PM_DEBUG is not set
268# CONFIG_PM_SYSFS_DEPRECATED is not set
269
270#
252# Networking 271# Networking
253# 272#
254CONFIG_NET=y 273CONFIG_NET=y
@@ -277,13 +296,15 @@ CONFIG_IP_PNP_BOOTP=y
277# CONFIG_INET_ESP is not set 296# CONFIG_INET_ESP is not set
278# CONFIG_INET_IPCOMP is not set 297# CONFIG_INET_IPCOMP is not set
279# CONFIG_INET_XFRM_TUNNEL is not set 298# CONFIG_INET_XFRM_TUNNEL is not set
280# CONFIG_INET_TUNNEL is not set 299CONFIG_INET_TUNNEL=m
281CONFIG_INET_XFRM_MODE_TRANSPORT=m 300CONFIG_INET_XFRM_MODE_TRANSPORT=m
282CONFIG_INET_XFRM_MODE_TUNNEL=m 301CONFIG_INET_XFRM_MODE_TUNNEL=m
302CONFIG_INET_XFRM_MODE_BEET=m
283CONFIG_INET_DIAG=y 303CONFIG_INET_DIAG=y
284CONFIG_INET_TCP_DIAG=y 304CONFIG_INET_TCP_DIAG=y
285# CONFIG_TCP_CONG_ADVANCED is not set 305# CONFIG_TCP_CONG_ADVANCED is not set
286CONFIG_TCP_CONG_BIC=y 306CONFIG_TCP_CONG_CUBIC=y
307CONFIG_DEFAULT_TCP_CONG="cubic"
287CONFIG_IPV6=m 308CONFIG_IPV6=m
288CONFIG_IPV6_PRIVACY=y 309CONFIG_IPV6_PRIVACY=y
289CONFIG_IPV6_ROUTER_PREF=y 310CONFIG_IPV6_ROUTER_PREF=y
@@ -294,6 +315,8 @@ CONFIG_INET6_XFRM_TUNNEL=m
294CONFIG_INET6_TUNNEL=m 315CONFIG_INET6_TUNNEL=m
295CONFIG_INET6_XFRM_MODE_TRANSPORT=m 316CONFIG_INET6_XFRM_MODE_TRANSPORT=m
296CONFIG_INET6_XFRM_MODE_TUNNEL=m 317CONFIG_INET6_XFRM_MODE_TUNNEL=m
318CONFIG_INET6_XFRM_MODE_BEET=m
319CONFIG_IPV6_SIT=m
297CONFIG_IPV6_TUNNEL=m 320CONFIG_IPV6_TUNNEL=m
298CONFIG_NETWORK_SECMARK=y 321CONFIG_NETWORK_SECMARK=y
299# CONFIG_NETFILTER is not set 322# CONFIG_NETFILTER is not set
@@ -351,6 +374,7 @@ CONFIG_CONNECTOR=m
351# 374#
352# Plug and Play support 375# Plug and Play support
353# 376#
377# CONFIG_PNPACPI is not set
354 378
355# 379#
356# Block devices 380# Block devices
@@ -369,6 +393,11 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
369CONFIG_ATA_OVER_ETH=m 393CONFIG_ATA_OVER_ETH=m
370 394
371# 395#
396# Misc devices
397#
398CONFIG_SGI_IOC4=m
399
400#
372# ATA/ATAPI/MFM/RLL support 401# ATA/ATAPI/MFM/RLL support
373# 402#
374# CONFIG_IDE is not set 403# CONFIG_IDE is not set
@@ -378,6 +407,12 @@ CONFIG_ATA_OVER_ETH=m
378# 407#
379CONFIG_RAID_ATTRS=m 408CONFIG_RAID_ATTRS=m
380# CONFIG_SCSI is not set 409# CONFIG_SCSI is not set
410# CONFIG_SCSI_NETLINK is not set
411
412#
413# Serial ATA (prod) and Parallel ATA (experimental) drivers
414#
415# CONFIG_ATA is not set
381 416
382# 417#
383# Multi-device support (RAID and LVM) 418# Multi-device support (RAID and LVM)
@@ -428,6 +463,8 @@ CONFIG_LXT_PHY=m
428CONFIG_CICADA_PHY=m 463CONFIG_CICADA_PHY=m
429CONFIG_VITESSE_PHY=m 464CONFIG_VITESSE_PHY=m
430CONFIG_SMSC_PHY=m 465CONFIG_SMSC_PHY=m
466# CONFIG_BROADCOM_PHY is not set
467# CONFIG_FIXED_PHY is not set
431 468
432# 469#
433# Ethernet (10 or 100Mbit) 470# Ethernet (10 or 100Mbit)
@@ -475,22 +512,23 @@ CONFIG_EEPRO100=y
475# CONFIG_R8169 is not set 512# CONFIG_R8169 is not set
476# CONFIG_SIS190 is not set 513# CONFIG_SIS190 is not set
477# CONFIG_SKGE is not set 514# CONFIG_SKGE is not set
515# CONFIG_SKY2 is not set
478# CONFIG_SK98LIN is not set 516# CONFIG_SK98LIN is not set
479# CONFIG_VIA_VELOCITY is not set 517# CONFIG_VIA_VELOCITY is not set
480# CONFIG_TIGON3 is not set 518# CONFIG_TIGON3 is not set
481# CONFIG_BNX2 is not set 519# CONFIG_BNX2 is not set
482CONFIG_MV643XX_ETH=y 520CONFIG_MV643XX_ETH=y
483CONFIG_MV643XX_ETH_0=y 521CONFIG_QLA3XXX=m
484CONFIG_MV643XX_ETH_1=y
485CONFIG_MV643XX_ETH_2=y
486 522
487# 523#
488# Ethernet (10000 Mbit) 524# Ethernet (10000 Mbit)
489# 525#
490# CONFIG_CHELSIO_T1 is not set 526# CONFIG_CHELSIO_T1 is not set
527CONFIG_CHELSIO_T3=m
491# CONFIG_IXGB is not set 528# CONFIG_IXGB is not set
492# CONFIG_S2IO is not set 529# CONFIG_S2IO is not set
493# CONFIG_MYRI10GE is not set 530# CONFIG_MYRI10GE is not set
531CONFIG_NETXEN_NIC=m
494 532
495# 533#
496# Token Ring devices 534# Token Ring devices
@@ -574,10 +612,6 @@ CONFIG_LEGACY_PTY_COUNT=256
574# CONFIG_DTLK is not set 612# CONFIG_DTLK is not set
575# CONFIG_R3964 is not set 613# CONFIG_R3964 is not set
576# CONFIG_APPLICOM is not set 614# CONFIG_APPLICOM is not set
577
578#
579# Ftape, the floppy tape device driver
580#
581# CONFIG_DRM is not set 615# CONFIG_DRM is not set
582# CONFIG_RAW_DRIVER is not set 616# CONFIG_RAW_DRIVER is not set
583 617
@@ -608,14 +642,9 @@ CONFIG_LEGACY_PTY_COUNT=256
608# CONFIG_HWMON_VID is not set 642# CONFIG_HWMON_VID is not set
609 643
610# 644#
611# Misc devices
612#
613
614#
615# Multimedia devices 645# Multimedia devices
616# 646#
617# CONFIG_VIDEO_DEV is not set 647# CONFIG_VIDEO_DEV is not set
618CONFIG_VIDEO_V4L2=y
619 648
620# 649#
621# Digital Video Broadcasting Devices 650# Digital Video Broadcasting Devices
@@ -627,6 +656,7 @@ CONFIG_VIDEO_V4L2=y
627# 656#
628# CONFIG_FIRMWARE_EDID is not set 657# CONFIG_FIRMWARE_EDID is not set
629# CONFIG_FB is not set 658# CONFIG_FB is not set
659# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
630 660
631# 661#
632# Sound 662# Sound
@@ -695,14 +725,23 @@ CONFIG_USB_ARCH_HAS_EHCI=y
695# 725#
696 726
697# 727#
728# Auxiliary Display support
729#
730
731#
732# Virtualization
733#
734
735#
698# File systems 736# File systems
699# 737#
700# CONFIG_EXT2_FS is not set 738# CONFIG_EXT2_FS is not set
701# CONFIG_EXT3_FS is not set 739# CONFIG_EXT3_FS is not set
702# CONFIG_REISERFS_FS is not set 740# CONFIG_REISERFS_FS is not set
703# CONFIG_JFS_FS is not set 741# CONFIG_JFS_FS is not set
704# CONFIG_FS_POSIX_ACL is not set 742CONFIG_FS_POSIX_ACL=y
705# CONFIG_XFS_FS is not set 743# CONFIG_XFS_FS is not set
744# CONFIG_OCFS2_FS is not set
706# CONFIG_MINIX_FS is not set 745# CONFIG_MINIX_FS is not set
707# CONFIG_ROMFS_FS is not set 746# CONFIG_ROMFS_FS is not set
708CONFIG_INOTIFY=y 747CONFIG_INOTIFY=y
@@ -712,6 +751,7 @@ CONFIG_DNOTIFY=y
712# CONFIG_AUTOFS_FS is not set 751# CONFIG_AUTOFS_FS is not set
713# CONFIG_AUTOFS4_FS is not set 752# CONFIG_AUTOFS4_FS is not set
714CONFIG_FUSE_FS=m 753CONFIG_FUSE_FS=m
754CONFIG_GENERIC_ACL=y
715 755
716# 756#
717# CD-ROM/DVD Filesystems 757# CD-ROM/DVD Filesystems
@@ -731,8 +771,10 @@ CONFIG_FUSE_FS=m
731# 771#
732CONFIG_PROC_FS=y 772CONFIG_PROC_FS=y
733CONFIG_PROC_KCORE=y 773CONFIG_PROC_KCORE=y
774CONFIG_PROC_SYSCTL=y
734CONFIG_SYSFS=y 775CONFIG_SYSFS=y
735CONFIG_TMPFS=y 776CONFIG_TMPFS=y
777CONFIG_TMPFS_POSIX_ACL=y
736# CONFIG_HUGETLB_PAGE is not set 778# CONFIG_HUGETLB_PAGE is not set
737CONFIG_RAMFS=y 779CONFIG_RAMFS=y
738 780
@@ -752,6 +794,7 @@ CONFIG_RAMFS=y
752# 794#
753CONFIG_NFS_FS=y 795CONFIG_NFS_FS=y
754# CONFIG_NFS_V3 is not set 796# CONFIG_NFS_V3 is not set
797# CONFIG_NFS_DIRECTIO is not set
755# CONFIG_NFSD is not set 798# CONFIG_NFSD is not set
756CONFIG_ROOT_NFS=y 799CONFIG_ROOT_NFS=y
757CONFIG_LOCKD=y 800CONFIG_LOCKD=y
@@ -759,7 +802,6 @@ CONFIG_NFS_COMMON=y
759CONFIG_SUNRPC=y 802CONFIG_SUNRPC=y
760# CONFIG_SMB_FS is not set 803# CONFIG_SMB_FS is not set
761# CONFIG_CIFS is not set 804# CONFIG_CIFS is not set
762# CONFIG_CIFS_DEBUG2 is not set
763# CONFIG_NCP_FS is not set 805# CONFIG_NCP_FS is not set
764# CONFIG_CODA_FS is not set 806# CONFIG_CODA_FS is not set
765 807
@@ -779,13 +821,16 @@ CONFIG_MSDOS_PARTITION=y
779# 821#
780CONFIG_TRACE_IRQFLAGS_SUPPORT=y 822CONFIG_TRACE_IRQFLAGS_SUPPORT=y
781# CONFIG_PRINTK_TIME is not set 823# CONFIG_PRINTK_TIME is not set
824CONFIG_ENABLE_MUST_CHECK=y
782# CONFIG_MAGIC_SYSRQ is not set 825# CONFIG_MAGIC_SYSRQ is not set
783# CONFIG_UNUSED_SYMBOLS is not set 826# CONFIG_UNUSED_SYMBOLS is not set
827# CONFIG_DEBUG_FS is not set
828# CONFIG_HEADERS_CHECK is not set
784# CONFIG_DEBUG_KERNEL is not set 829# CONFIG_DEBUG_KERNEL is not set
785CONFIG_LOG_BUF_SHIFT=14 830CONFIG_LOG_BUF_SHIFT=14
786# CONFIG_DEBUG_FS is not set
787CONFIG_CROSSCOMPILE=y 831CONFIG_CROSSCOMPILE=y
788CONFIG_CMDLINE="" 832CONFIG_CMDLINE=""
833CONFIG_SYS_SUPPORTS_KGDB=y
789 834
790# 835#
791# Security options 836# Security options
@@ -798,6 +843,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
798# Cryptographic options 843# Cryptographic options
799# 844#
800CONFIG_CRYPTO=y 845CONFIG_CRYPTO=y
846CONFIG_CRYPTO_ALGAPI=y
847CONFIG_CRYPTO_BLKCIPHER=m
848CONFIG_CRYPTO_HASH=y
849CONFIG_CRYPTO_MANAGER=y
801CONFIG_CRYPTO_HMAC=y 850CONFIG_CRYPTO_HMAC=y
802CONFIG_CRYPTO_NULL=m 851CONFIG_CRYPTO_NULL=m
803CONFIG_CRYPTO_MD4=m 852CONFIG_CRYPTO_MD4=m
@@ -807,9 +856,14 @@ CONFIG_CRYPTO_SHA256=m
807CONFIG_CRYPTO_SHA512=m 856CONFIG_CRYPTO_SHA512=m
808CONFIG_CRYPTO_WP512=m 857CONFIG_CRYPTO_WP512=m
809CONFIG_CRYPTO_TGR192=m 858CONFIG_CRYPTO_TGR192=m
859CONFIG_CRYPTO_ECB=m
860CONFIG_CRYPTO_CBC=m
861CONFIG_CRYPTO_PCBC=m
810CONFIG_CRYPTO_DES=m 862CONFIG_CRYPTO_DES=m
863CONFIG_CRYPTO_FCRYPT=m
811CONFIG_CRYPTO_BLOWFISH=m 864CONFIG_CRYPTO_BLOWFISH=m
812CONFIG_CRYPTO_TWOFISH=m 865CONFIG_CRYPTO_TWOFISH=m
866CONFIG_CRYPTO_TWOFISH_COMMON=m
813CONFIG_CRYPTO_SERPENT=m 867CONFIG_CRYPTO_SERPENT=m
814CONFIG_CRYPTO_AES=m 868CONFIG_CRYPTO_AES=m
815CONFIG_CRYPTO_CAST5=m 869CONFIG_CRYPTO_CAST5=m
@@ -821,6 +875,7 @@ CONFIG_CRYPTO_ANUBIS=m
821CONFIG_CRYPTO_DEFLATE=m 875CONFIG_CRYPTO_DEFLATE=m
822CONFIG_CRYPTO_MICHAEL_MIC=m 876CONFIG_CRYPTO_MICHAEL_MIC=m
823CONFIG_CRYPTO_CRC32C=m 877CONFIG_CRYPTO_CRC32C=m
878CONFIG_CRYPTO_CAMELLIA=m
824# CONFIG_CRYPTO_TEST is not set 879# CONFIG_CRYPTO_TEST is not set
825 880
826# 881#
@@ -830,6 +885,7 @@ CONFIG_CRYPTO_CRC32C=m
830# 885#
831# Library routines 886# Library routines
832# 887#
888CONFIG_BITREVERSE=m
833# CONFIG_CRC_CCITT is not set 889# CONFIG_CRC_CCITT is not set
834CONFIG_CRC16=m 890CONFIG_CRC16=m
835CONFIG_CRC32=m 891CONFIG_CRC32=m
@@ -837,3 +893,5 @@ CONFIG_LIBCRC32C=m
837CONFIG_ZLIB_INFLATE=m 893CONFIG_ZLIB_INFLATE=m
838CONFIG_ZLIB_DEFLATE=m 894CONFIG_ZLIB_DEFLATE=m
839CONFIG_PLIST=y 895CONFIG_PLIST=y
896CONFIG_HAS_IOMEM=y
897CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
index 835764d834f7..9331cb0a19b1 100644
--- a/arch/mips/configs/jazz_defconfig
+++ b/arch/mips/configs/jazz_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc1 3# Linux kernel version: 2.6.20
4# Sun Oct 8 19:03:07 2006 4# Tue Feb 20 21:47:33 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -38,8 +39,8 @@ CONFIG_MACH_JAZZ=y
38# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
39# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -65,11 +66,14 @@ CONFIG_MACH_JAZZ=y
65# CONFIG_MIPS_MAGNUM_4000 is not set 66# CONFIG_MIPS_MAGNUM_4000 is not set
66CONFIG_OLIVETTI_M700=y 67CONFIG_OLIVETTI_M700=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 68CONFIG_RWSEM_GENERIC_SPINLOCK=y
69# CONFIG_ARCH_HAS_ILOG2_U32 is not set
70# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 71CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 72CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 73CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y 74CONFIG_GENERIC_TIME=y
72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 75CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
76CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
73CONFIG_ARC=y 77CONFIG_ARC=y
74CONFIG_ARCH_MAY_HAVE_PC_FDC=y 78CONFIG_ARCH_MAY_HAVE_PC_FDC=y
75CONFIG_DMA_NONCOHERENT=y 79CONFIG_DMA_NONCOHERENT=y
@@ -140,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140# CONFIG_SPARSEMEM_STATIC is not set 144# CONFIG_SPARSEMEM_STATIC is not set
141CONFIG_SPLIT_PTLOCK_CPUS=4 145CONFIG_SPLIT_PTLOCK_CPUS=4
142# CONFIG_RESOURCES_64BIT is not set 146# CONFIG_RESOURCES_64BIT is not set
147CONFIG_ZONE_DMA_FLAG=1
143# CONFIG_HZ_48 is not set 148# CONFIG_HZ_48 is not set
144CONFIG_HZ_100=y 149CONFIG_HZ_100=y
145# CONFIG_HZ_128 is not set 150# CONFIG_HZ_128 is not set
@@ -152,6 +157,7 @@ CONFIG_HZ=100
152# CONFIG_PREEMPT_NONE is not set 157# CONFIG_PREEMPT_NONE is not set
153CONFIG_PREEMPT_VOLUNTARY=y 158CONFIG_PREEMPT_VOLUNTARY=y
154# CONFIG_PREEMPT is not set 159# CONFIG_PREEMPT is not set
160# CONFIG_KEXEC is not set
155CONFIG_LOCKDEP_SUPPORT=y 161CONFIG_LOCKDEP_SUPPORT=y
156CONFIG_STACKTRACE_SUPPORT=y 162CONFIG_STACKTRACE_SUPPORT=y
157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 163CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,6 +177,7 @@ CONFIG_LOCALVERSION_AUTO=y
171CONFIG_SWAP=y 177CONFIG_SWAP=y
172CONFIG_SYSVIPC=y 178CONFIG_SYSVIPC=y
173# CONFIG_IPC_NS is not set 179# CONFIG_IPC_NS is not set
180CONFIG_SYSVIPC_SYSCTL=y
174CONFIG_POSIX_MQUEUE=y 181CONFIG_POSIX_MQUEUE=y
175CONFIG_BSD_PROCESS_ACCT=y 182CONFIG_BSD_PROCESS_ACCT=y
176# CONFIG_BSD_PROCESS_ACCT_V3 is not set 183# CONFIG_BSD_PROCESS_ACCT_V3 is not set
@@ -179,8 +186,8 @@ CONFIG_BSD_PROCESS_ACCT=y
179# CONFIG_AUDIT is not set 186# CONFIG_AUDIT is not set
180CONFIG_IKCONFIG=y 187CONFIG_IKCONFIG=y
181CONFIG_IKCONFIG_PROC=y 188CONFIG_IKCONFIG_PROC=y
189CONFIG_SYSFS_DEPRECATED=y
182CONFIG_RELAY=y 190CONFIG_RELAY=y
183CONFIG_INITRAMFS_SOURCE=""
184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 191# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y 192CONFIG_SYSCTL=y
186CONFIG_EMBEDDED=y 193CONFIG_EMBEDDED=y
@@ -257,6 +264,14 @@ CONFIG_BINFMT_MISC=m
257CONFIG_TRAD_SIGNALS=y 264CONFIG_TRAD_SIGNALS=y
258 265
259# 266#
267# Power management options
268#
269CONFIG_PM=y
270# CONFIG_PM_LEGACY is not set
271# CONFIG_PM_DEBUG is not set
272# CONFIG_PM_SYSFS_DEPRECATED is not set
273
274#
260# Networking 275# Networking
261# 276#
262CONFIG_NET=y 277CONFIG_NET=y
@@ -271,7 +286,9 @@ CONFIG_UNIX=y
271CONFIG_XFRM=y 286CONFIG_XFRM=y
272# CONFIG_XFRM_USER is not set 287# CONFIG_XFRM_USER is not set
273# CONFIG_XFRM_SUB_POLICY is not set 288# CONFIG_XFRM_SUB_POLICY is not set
289CONFIG_XFRM_MIGRATE=y
274CONFIG_NET_KEY=m 290CONFIG_NET_KEY=m
291CONFIG_NET_KEY_MIGRATE=y
275CONFIG_INET=y 292CONFIG_INET=y
276CONFIG_IP_MULTICAST=y 293CONFIG_IP_MULTICAST=y
277# CONFIG_IP_ADVANCED_ROUTER is not set 294# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -298,6 +315,7 @@ CONFIG_INET_TCP_DIAG=y
298# CONFIG_TCP_CONG_ADVANCED is not set 315# CONFIG_TCP_CONG_ADVANCED is not set
299CONFIG_TCP_CONG_CUBIC=y 316CONFIG_TCP_CONG_CUBIC=y
300CONFIG_DEFAULT_TCP_CONG="cubic" 317CONFIG_DEFAULT_TCP_CONG="cubic"
318CONFIG_TCP_MD5SIG=y
301 319
302# 320#
303# IP: Virtual Server Configuration 321# IP: Virtual Server Configuration
@@ -317,8 +335,8 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
317CONFIG_INET6_XFRM_MODE_TUNNEL=m 335CONFIG_INET6_XFRM_MODE_TUNNEL=m
318CONFIG_INET6_XFRM_MODE_BEET=m 336CONFIG_INET6_XFRM_MODE_BEET=m
319# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 337# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
338CONFIG_IPV6_SIT=m
320CONFIG_IPV6_TUNNEL=m 339CONFIG_IPV6_TUNNEL=m
321# CONFIG_IPV6_SUBTREES is not set
322# CONFIG_IPV6_MULTIPLE_TABLES is not set 340# CONFIG_IPV6_MULTIPLE_TABLES is not set
323CONFIG_NETWORK_SECMARK=y 341CONFIG_NETWORK_SECMARK=y
324CONFIG_NETFILTER=y 342CONFIG_NETFILTER=y
@@ -331,16 +349,39 @@ CONFIG_BRIDGE_NETFILTER=y
331CONFIG_NETFILTER_NETLINK=m 349CONFIG_NETFILTER_NETLINK=m
332CONFIG_NETFILTER_NETLINK_QUEUE=m 350CONFIG_NETFILTER_NETLINK_QUEUE=m
333CONFIG_NETFILTER_NETLINK_LOG=m 351CONFIG_NETFILTER_NETLINK_LOG=m
352CONFIG_NF_CONNTRACK_ENABLED=m
353CONFIG_NF_CONNTRACK_SUPPORT=y
354# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
355CONFIG_NF_CONNTRACK=m
356CONFIG_NF_CT_ACCT=y
357CONFIG_NF_CONNTRACK_MARK=y
358CONFIG_NF_CONNTRACK_SECMARK=y
359CONFIG_NF_CONNTRACK_EVENTS=y
360CONFIG_NF_CT_PROTO_GRE=m
361CONFIG_NF_CT_PROTO_SCTP=m
362CONFIG_NF_CONNTRACK_AMANDA=m
363CONFIG_NF_CONNTRACK_FTP=m
364CONFIG_NF_CONNTRACK_H323=m
365CONFIG_NF_CONNTRACK_IRC=m
366# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
367CONFIG_NF_CONNTRACK_PPTP=m
368CONFIG_NF_CONNTRACK_SANE=m
369CONFIG_NF_CONNTRACK_SIP=m
370CONFIG_NF_CONNTRACK_TFTP=m
371CONFIG_NF_CT_NETLINK=m
334CONFIG_NETFILTER_XTABLES=m 372CONFIG_NETFILTER_XTABLES=m
335CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 373CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
336CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 374CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
337# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 375# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
338CONFIG_NETFILTER_XT_TARGET_MARK=m 376CONFIG_NETFILTER_XT_TARGET_MARK=m
339CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 377CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
378CONFIG_NETFILTER_XT_TARGET_NFLOG=m
340CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 379CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
341CONFIG_NETFILTER_XT_TARGET_SECMARK=m 380CONFIG_NETFILTER_XT_TARGET_SECMARK=m
342# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set 381# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
382CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
343CONFIG_NETFILTER_XT_MATCH_COMMENT=m 383CONFIG_NETFILTER_XT_MATCH_COMMENT=m
384CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
344CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 385CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
345CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 386CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
346CONFIG_NETFILTER_XT_MATCH_DCCP=m 387CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -362,25 +403,13 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
362CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 403CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
363CONFIG_NETFILTER_XT_MATCH_STRING=m 404CONFIG_NETFILTER_XT_MATCH_STRING=m
364CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 405CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
406CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
365 407
366# 408#
367# IP: Netfilter Configuration 409# IP: Netfilter Configuration
368# 410#
369CONFIG_IP_NF_CONNTRACK=m 411CONFIG_NF_CONNTRACK_IPV4=m
370# CONFIG_IP_NF_CT_ACCT is not set 412CONFIG_NF_CONNTRACK_PROC_COMPAT=y
371CONFIG_IP_NF_CONNTRACK_MARK=y
372CONFIG_IP_NF_CONNTRACK_SECMARK=y
373CONFIG_IP_NF_CONNTRACK_EVENTS=y
374CONFIG_IP_NF_CONNTRACK_NETLINK=m
375CONFIG_IP_NF_CT_PROTO_SCTP=m
376CONFIG_IP_NF_FTP=m
377CONFIG_IP_NF_IRC=m
378# CONFIG_IP_NF_NETBIOS_NS is not set
379CONFIG_IP_NF_TFTP=m
380CONFIG_IP_NF_AMANDA=m
381CONFIG_IP_NF_PPTP=m
382CONFIG_IP_NF_H323=m
383CONFIG_IP_NF_SIP=m
384CONFIG_IP_NF_QUEUE=m 413CONFIG_IP_NF_QUEUE=m
385CONFIG_IP_NF_IPTABLES=m 414CONFIG_IP_NF_IPTABLES=m
386CONFIG_IP_NF_MATCH_IPRANGE=m 415CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -391,26 +420,25 @@ CONFIG_IP_NF_MATCH_AH=m
391CONFIG_IP_NF_MATCH_TTL=m 420CONFIG_IP_NF_MATCH_TTL=m
392CONFIG_IP_NF_MATCH_OWNER=m 421CONFIG_IP_NF_MATCH_OWNER=m
393CONFIG_IP_NF_MATCH_ADDRTYPE=m 422CONFIG_IP_NF_MATCH_ADDRTYPE=m
394CONFIG_IP_NF_MATCH_HASHLIMIT=m
395CONFIG_IP_NF_FILTER=m 423CONFIG_IP_NF_FILTER=m
396CONFIG_IP_NF_TARGET_REJECT=m 424CONFIG_IP_NF_TARGET_REJECT=m
397CONFIG_IP_NF_TARGET_LOG=m 425CONFIG_IP_NF_TARGET_LOG=m
398CONFIG_IP_NF_TARGET_ULOG=m 426CONFIG_IP_NF_TARGET_ULOG=m
399CONFIG_IP_NF_TARGET_TCPMSS=m 427CONFIG_NF_NAT=m
400CONFIG_IP_NF_NAT=m 428CONFIG_NF_NAT_NEEDED=y
401CONFIG_IP_NF_NAT_NEEDED=y
402CONFIG_IP_NF_TARGET_MASQUERADE=m 429CONFIG_IP_NF_TARGET_MASQUERADE=m
403CONFIG_IP_NF_TARGET_REDIRECT=m 430CONFIG_IP_NF_TARGET_REDIRECT=m
404CONFIG_IP_NF_TARGET_NETMAP=m 431CONFIG_IP_NF_TARGET_NETMAP=m
405CONFIG_IP_NF_TARGET_SAME=m 432CONFIG_IP_NF_TARGET_SAME=m
406CONFIG_IP_NF_NAT_SNMP_BASIC=m 433CONFIG_NF_NAT_SNMP_BASIC=m
407CONFIG_IP_NF_NAT_IRC=m 434CONFIG_NF_NAT_PROTO_GRE=m
408CONFIG_IP_NF_NAT_FTP=m 435CONFIG_NF_NAT_FTP=m
409CONFIG_IP_NF_NAT_TFTP=m 436CONFIG_NF_NAT_IRC=m
410CONFIG_IP_NF_NAT_AMANDA=m 437CONFIG_NF_NAT_TFTP=m
411CONFIG_IP_NF_NAT_PPTP=m 438CONFIG_NF_NAT_AMANDA=m
412CONFIG_IP_NF_NAT_H323=m 439CONFIG_NF_NAT_PPTP=m
413CONFIG_IP_NF_NAT_SIP=m 440CONFIG_NF_NAT_H323=m
441CONFIG_NF_NAT_SIP=m
414CONFIG_IP_NF_MANGLE=m 442CONFIG_IP_NF_MANGLE=m
415CONFIG_IP_NF_TARGET_TOS=m 443CONFIG_IP_NF_TARGET_TOS=m
416CONFIG_IP_NF_TARGET_ECN=m 444CONFIG_IP_NF_TARGET_ECN=m
@@ -424,6 +452,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
424# 452#
425# IPv6: Netfilter Configuration (EXPERIMENTAL) 453# IPv6: Netfilter Configuration (EXPERIMENTAL)
426# 454#
455CONFIG_NF_CONNTRACK_IPV6=m
427CONFIG_IP6_NF_QUEUE=m 456CONFIG_IP6_NF_QUEUE=m
428CONFIG_IP6_NF_IPTABLES=m 457CONFIG_IP6_NF_IPTABLES=m
429CONFIG_IP6_NF_MATCH_RT=m 458CONFIG_IP6_NF_MATCH_RT=m
@@ -433,6 +462,7 @@ CONFIG_IP6_NF_MATCH_HL=m
433CONFIG_IP6_NF_MATCH_OWNER=m 462CONFIG_IP6_NF_MATCH_OWNER=m
434CONFIG_IP6_NF_MATCH_IPV6HEADER=m 463CONFIG_IP6_NF_MATCH_IPV6HEADER=m
435CONFIG_IP6_NF_MATCH_AH=m 464CONFIG_IP6_NF_MATCH_AH=m
465CONFIG_IP6_NF_MATCH_MH=m
436CONFIG_IP6_NF_MATCH_EUI64=m 466CONFIG_IP6_NF_MATCH_EUI64=m
437CONFIG_IP6_NF_FILTER=m 467CONFIG_IP6_NF_FILTER=m
438CONFIG_IP6_NF_TARGET_LOG=m 468CONFIG_IP6_NF_TARGET_LOG=m
@@ -502,6 +532,7 @@ CONFIG_LLC=m
502# QoS and/or fair queueing 532# QoS and/or fair queueing
503# 533#
504CONFIG_NET_SCHED=y 534CONFIG_NET_SCHED=y
535CONFIG_NET_SCH_FIFO=y
505CONFIG_NET_SCH_CLK_JIFFIES=y 536CONFIG_NET_SCH_CLK_JIFFIES=y
506# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 537# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
507# CONFIG_NET_SCH_CLK_CPU is not set 538# CONFIG_NET_SCH_CLK_CPU is not set
@@ -614,13 +645,13 @@ CONFIG_PARPORT_1284=y
614# Plug and Play support 645# Plug and Play support
615# 646#
616# CONFIG_PNP is not set 647# CONFIG_PNP is not set
648# CONFIG_PNPACPI is not set
617 649
618# 650#
619# Block devices 651# Block devices
620# 652#
621CONFIG_BLK_DEV_FD=m 653CONFIG_BLK_DEV_FD=m
622CONFIG_PARIDE=m 654CONFIG_PARIDE=m
623CONFIG_PARIDE_PARPORT=m
624 655
625# 656#
626# Parallel IDE high-level drivers 657# Parallel IDE high-level drivers
@@ -665,6 +696,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
665CONFIG_ATA_OVER_ETH=m 696CONFIG_ATA_OVER_ETH=m
666 697
667# 698#
699# Misc devices
700#
701
702#
668# ATA/ATAPI/MFM/RLL support 703# ATA/ATAPI/MFM/RLL support
669# 704#
670# CONFIG_IDE is not set 705# CONFIG_IDE is not set
@@ -674,6 +709,7 @@ CONFIG_ATA_OVER_ETH=m
674# 709#
675CONFIG_RAID_ATTRS=m 710CONFIG_RAID_ATTRS=m
676CONFIG_SCSI=y 711CONFIG_SCSI=y
712CONFIG_SCSI_TGT=m
677CONFIG_SCSI_NETLINK=y 713CONFIG_SCSI_NETLINK=y
678CONFIG_SCSI_PROC_FS=y 714CONFIG_SCSI_PROC_FS=y
679 715
@@ -694,6 +730,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
694# CONFIG_SCSI_MULTI_LUN is not set 730# CONFIG_SCSI_MULTI_LUN is not set
695CONFIG_SCSI_CONSTANTS=y 731CONFIG_SCSI_CONSTANTS=y
696# CONFIG_SCSI_LOGGING is not set 732# CONFIG_SCSI_LOGGING is not set
733CONFIG_SCSI_SCAN_ASYNC=y
697 734
698# 735#
699# SCSI Transports 736# SCSI Transports
@@ -802,6 +839,7 @@ CONFIG_LXT_PHY=m
802CONFIG_CICADA_PHY=m 839CONFIG_CICADA_PHY=m
803CONFIG_VITESSE_PHY=m 840CONFIG_VITESSE_PHY=m
804CONFIG_SMSC_PHY=m 841CONFIG_SMSC_PHY=m
842# CONFIG_BROADCOM_PHY is not set
805# CONFIG_FIXED_PHY is not set 843# CONFIG_FIXED_PHY is not set
806 844
807# 845#
@@ -832,7 +870,6 @@ CONFIG_NET_PCI=y
832# CONFIG_AC3200 is not set 870# CONFIG_AC3200 is not set
833# CONFIG_APRICOT is not set 871# CONFIG_APRICOT is not set
834# CONFIG_CS89x0 is not set 872# CONFIG_CS89x0 is not set
835# CONFIG_LAN_SAA9730 is not set
836# CONFIG_NET_POCKET is not set 873# CONFIG_NET_POCKET is not set
837 874
838# 875#
@@ -972,17 +1009,12 @@ CONFIG_RTC=m
972# CONFIG_GEN_RTC is not set 1009# CONFIG_GEN_RTC is not set
973# CONFIG_DTLK is not set 1010# CONFIG_DTLK is not set
974# CONFIG_R3964 is not set 1011# CONFIG_R3964 is not set
975
976#
977# Ftape, the floppy tape device driver
978#
979# CONFIG_RAW_DRIVER is not set 1012# CONFIG_RAW_DRIVER is not set
980 1013
981# 1014#
982# TPM devices 1015# TPM devices
983# 1016#
984# CONFIG_TCG_TPM is not set 1017# CONFIG_TCG_TPM is not set
985# CONFIG_TELCLOCK is not set
986 1018
987# 1019#
988# I2C support 1020# I2C support
@@ -1019,11 +1051,6 @@ CONFIG_W1_CON=y
1019# CONFIG_HWMON_VID is not set 1051# CONFIG_HWMON_VID is not set
1020 1052
1021# 1053#
1022# Misc devices
1023#
1024# CONFIG_TIFM_CORE is not set
1025
1026#
1027# Multimedia devices 1054# Multimedia devices
1028# 1055#
1029# CONFIG_VIDEO_DEV is not set 1056# CONFIG_VIDEO_DEV is not set
@@ -1054,6 +1081,12 @@ CONFIG_DUMMY_CONSOLE=y
1054# CONFIG_SOUND is not set 1081# CONFIG_SOUND is not set
1055 1082
1056# 1083#
1084# HID Devices
1085#
1086CONFIG_HID=y
1087# CONFIG_HID_DEBUG is not set
1088
1089#
1057# USB support 1090# USB support
1058# 1091#
1059# CONFIG_USB_ARCH_HAS_HCD is not set 1092# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -1114,6 +1147,15 @@ CONFIG_DUMMY_CONSOLE=y
1114# 1147#
1115 1148
1116# 1149#
1150# Auxiliary Display support
1151#
1152# CONFIG_KS0108 is not set
1153
1154#
1155# Virtualization
1156#
1157
1158#
1117# File systems 1159# File systems
1118# 1160#
1119CONFIG_EXT2_FS=m 1161CONFIG_EXT2_FS=m
@@ -1123,6 +1165,7 @@ CONFIG_EXT3_FS=y
1123CONFIG_EXT3_FS_XATTR=y 1165CONFIG_EXT3_FS_XATTR=y
1124# CONFIG_EXT3_FS_POSIX_ACL is not set 1166# CONFIG_EXT3_FS_POSIX_ACL is not set
1125# CONFIG_EXT3_FS_SECURITY is not set 1167# CONFIG_EXT3_FS_SECURITY is not set
1168# CONFIG_EXT4DEV_FS is not set
1126CONFIG_JBD=y 1169CONFIG_JBD=y
1127# CONFIG_JBD_DEBUG is not set 1170# CONFIG_JBD_DEBUG is not set
1128CONFIG_FS_MBCACHE=y 1171CONFIG_FS_MBCACHE=y
@@ -1158,7 +1201,6 @@ CONFIG_FUSE_FS=m
1158CONFIG_ISO9660_FS=m 1201CONFIG_ISO9660_FS=m
1159CONFIG_JOLIET=y 1202CONFIG_JOLIET=y
1160CONFIG_ZISOFS=y 1203CONFIG_ZISOFS=y
1161CONFIG_ZISOFS_FS=m
1162CONFIG_UDF_FS=m 1204CONFIG_UDF_FS=m
1163CONFIG_UDF_NLS=y 1205CONFIG_UDF_NLS=y
1164 1206
@@ -1185,7 +1227,7 @@ CONFIG_TMPFS=y
1185# CONFIG_TMPFS_POSIX_ACL is not set 1227# CONFIG_TMPFS_POSIX_ACL is not set
1186# CONFIG_HUGETLB_PAGE is not set 1228# CONFIG_HUGETLB_PAGE is not set
1187CONFIG_RAMFS=y 1229CONFIG_RAMFS=y
1188# CONFIG_CONFIGFS_FS is not set 1230CONFIG_CONFIGFS_FS=m
1189 1231
1190# 1232#
1191# Miscellaneous filesystems 1233# Miscellaneous filesystems
@@ -1321,6 +1363,10 @@ CONFIG_NLS_UTF8=m
1321# 1363#
1322# Distributed Lock Manager 1364# Distributed Lock Manager
1323# 1365#
1366CONFIG_DLM=m
1367CONFIG_DLM_TCP=y
1368# CONFIG_DLM_SCTP is not set
1369# CONFIG_DLM_DEBUG is not set
1324 1370
1325# 1371#
1326# Profiling support 1372# Profiling support
@@ -1335,9 +1381,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1335CONFIG_ENABLE_MUST_CHECK=y 1381CONFIG_ENABLE_MUST_CHECK=y
1336# CONFIG_MAGIC_SYSRQ is not set 1382# CONFIG_MAGIC_SYSRQ is not set
1337# CONFIG_UNUSED_SYMBOLS is not set 1383# CONFIG_UNUSED_SYMBOLS is not set
1384# CONFIG_DEBUG_FS is not set
1385# CONFIG_HEADERS_CHECK is not set
1338# CONFIG_DEBUG_KERNEL is not set 1386# CONFIG_DEBUG_KERNEL is not set
1339CONFIG_LOG_BUF_SHIFT=14 1387CONFIG_LOG_BUF_SHIFT=14
1340# CONFIG_DEBUG_FS is not set
1341CONFIG_CROSSCOMPILE=y 1388CONFIG_CROSSCOMPILE=y
1342CONFIG_CMDLINE="" 1389CONFIG_CMDLINE=""
1343 1390
@@ -1355,19 +1402,24 @@ CONFIG_CRYPTO=y
1355CONFIG_CRYPTO_ALGAPI=y 1402CONFIG_CRYPTO_ALGAPI=y
1356CONFIG_CRYPTO_BLKCIPHER=m 1403CONFIG_CRYPTO_BLKCIPHER=m
1357CONFIG_CRYPTO_HASH=y 1404CONFIG_CRYPTO_HASH=y
1358CONFIG_CRYPTO_MANAGER=m 1405CONFIG_CRYPTO_MANAGER=y
1359CONFIG_CRYPTO_HMAC=y 1406CONFIG_CRYPTO_HMAC=y
1407CONFIG_CRYPTO_XCBC=m
1360CONFIG_CRYPTO_NULL=m 1408CONFIG_CRYPTO_NULL=m
1361CONFIG_CRYPTO_MD4=m 1409CONFIG_CRYPTO_MD4=m
1362CONFIG_CRYPTO_MD5=m 1410CONFIG_CRYPTO_MD5=y
1363CONFIG_CRYPTO_SHA1=m 1411CONFIG_CRYPTO_SHA1=m
1364CONFIG_CRYPTO_SHA256=m 1412CONFIG_CRYPTO_SHA256=m
1365CONFIG_CRYPTO_SHA512=m 1413CONFIG_CRYPTO_SHA512=m
1366CONFIG_CRYPTO_WP512=m 1414CONFIG_CRYPTO_WP512=m
1367CONFIG_CRYPTO_TGR192=m 1415CONFIG_CRYPTO_TGR192=m
1416CONFIG_CRYPTO_GF128MUL=m
1368CONFIG_CRYPTO_ECB=m 1417CONFIG_CRYPTO_ECB=m
1369CONFIG_CRYPTO_CBC=m 1418CONFIG_CRYPTO_CBC=m
1419CONFIG_CRYPTO_PCBC=m
1420CONFIG_CRYPTO_LRW=m
1370CONFIG_CRYPTO_DES=m 1421CONFIG_CRYPTO_DES=m
1422CONFIG_CRYPTO_FCRYPT=m
1371CONFIG_CRYPTO_BLOWFISH=m 1423CONFIG_CRYPTO_BLOWFISH=m
1372CONFIG_CRYPTO_TWOFISH=m 1424CONFIG_CRYPTO_TWOFISH=m
1373CONFIG_CRYPTO_TWOFISH_COMMON=m 1425CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1382,6 +1434,7 @@ CONFIG_CRYPTO_ANUBIS=m
1382CONFIG_CRYPTO_DEFLATE=m 1434CONFIG_CRYPTO_DEFLATE=m
1383CONFIG_CRYPTO_MICHAEL_MIC=m 1435CONFIG_CRYPTO_MICHAEL_MIC=m
1384CONFIG_CRYPTO_CRC32C=m 1436CONFIG_CRYPTO_CRC32C=m
1437CONFIG_CRYPTO_CAMELLIA=m
1385# CONFIG_CRYPTO_TEST is not set 1438# CONFIG_CRYPTO_TEST is not set
1386 1439
1387# 1440#
@@ -1391,6 +1444,7 @@ CONFIG_CRYPTO_CRC32C=m
1391# 1444#
1392# Library routines 1445# Library routines
1393# 1446#
1447CONFIG_BITREVERSE=y
1394CONFIG_CRC_CCITT=m 1448CONFIG_CRC_CCITT=m
1395CONFIG_CRC16=m 1449CONFIG_CRC16=m
1396CONFIG_CRC32=y 1450CONFIG_CRC32=y
@@ -1402,3 +1456,5 @@ CONFIG_TEXTSEARCH_KMP=m
1402CONFIG_TEXTSEARCH_BM=m 1456CONFIG_TEXTSEARCH_BM=m
1403CONFIG_TEXTSEARCH_FSM=m 1457CONFIG_TEXTSEARCH_FSM=m
1404CONFIG_PLIST=y 1458CONFIG_PLIST=y
1459CONFIG_HAS_IOMEM=y
1460CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 50fd9557e646..068e48ec7093 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.21-rc3
4# Thu Jul 6 10:04:12 2006 4# Thu Mar 15 00:40:40 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +63,20 @@ CONFIG_TOSHIBA_JMR3927=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
74# CONFIG_CPU_LITTLE_ENDIAN is not set 77# CONFIG_CPU_LITTLE_ENDIAN is not set
75CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 78CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
79CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_MIPS_TX3927=y 80CONFIG_MIPS_TX3927=y
77CONFIG_SWAP_IO_SPACE=y 81CONFIG_SWAP_IO_SPACE=y
78CONFIG_MIPS_L1_CACHE_SHIFT=5 82CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -114,8 +118,8 @@ CONFIG_PAGE_SIZE_4KB=y
114# CONFIG_PAGE_SIZE_16KB is not set 118# CONFIG_PAGE_SIZE_16KB is not set
115# CONFIG_PAGE_SIZE_64KB is not set 119# CONFIG_PAGE_SIZE_64KB is not set
116CONFIG_MIPS_MT_DISABLED=y 120CONFIG_MIPS_MT_DISABLED=y
117# CONFIG_MIPS_MT_SMTC is not set
118# CONFIG_MIPS_MT_SMP is not set 121# CONFIG_MIPS_MT_SMP is not set
122# CONFIG_MIPS_MT_SMTC is not set
119# CONFIG_MIPS_VPE_LOADER is not set 123# CONFIG_MIPS_VPE_LOADER is not set
120CONFIG_CPU_HAS_SYNC=y 124CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 125CONFIG_GENERIC_HARDIRQS=y
@@ -130,19 +134,20 @@ CONFIG_FLAT_NODE_MEM_MAP=y
130# CONFIG_SPARSEMEM_STATIC is not set 134# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4 135CONFIG_SPLIT_PTLOCK_CPUS=4
132# CONFIG_RESOURCES_64BIT is not set 136# CONFIG_RESOURCES_64BIT is not set
137CONFIG_ZONE_DMA_FLAG=1
133# CONFIG_HZ_48 is not set 138# CONFIG_HZ_48 is not set
134# CONFIG_HZ_100 is not set 139# CONFIG_HZ_100 is not set
135# CONFIG_HZ_128 is not set 140# CONFIG_HZ_128 is not set
136# CONFIG_HZ_250 is not set 141CONFIG_HZ_250=y
137# CONFIG_HZ_256 is not set 142# CONFIG_HZ_256 is not set
138CONFIG_HZ_1000=y 143# CONFIG_HZ_1000 is not set
139# CONFIG_HZ_1024 is not set 144# CONFIG_HZ_1024 is not set
140CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 145CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
141CONFIG_HZ=1000 146CONFIG_HZ=250
142CONFIG_PREEMPT_NONE=y 147CONFIG_PREEMPT_NONE=y
143# CONFIG_PREEMPT_VOLUNTARY is not set 148# CONFIG_PREEMPT_VOLUNTARY is not set
144# CONFIG_PREEMPT is not set 149# CONFIG_PREEMPT is not set
145CONFIG_RTC_DS1742=y 150# CONFIG_KEXEC is not set
146CONFIG_LOCKDEP_SUPPORT=y 151CONFIG_LOCKDEP_SUPPORT=y
147CONFIG_STACKTRACE_SUPPORT=y 152CONFIG_STACKTRACE_SUPPORT=y
148CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -161,28 +166,34 @@ CONFIG_LOCALVERSION=""
161CONFIG_LOCALVERSION_AUTO=y 166CONFIG_LOCALVERSION_AUTO=y
162CONFIG_SWAP=y 167CONFIG_SWAP=y
163CONFIG_SYSVIPC=y 168CONFIG_SYSVIPC=y
169# CONFIG_IPC_NS is not set
170CONFIG_SYSVIPC_SYSCTL=y
164# CONFIG_POSIX_MQUEUE is not set 171# CONFIG_POSIX_MQUEUE is not set
165# CONFIG_BSD_PROCESS_ACCT is not set 172# CONFIG_BSD_PROCESS_ACCT is not set
166CONFIG_SYSCTL=y 173# CONFIG_TASKSTATS is not set
174# CONFIG_UTS_NS is not set
167# CONFIG_AUDIT is not set 175# CONFIG_AUDIT is not set
168# CONFIG_IKCONFIG is not set 176# CONFIG_IKCONFIG is not set
169CONFIG_RELAY=y 177CONFIG_SYSFS_DEPRECATED=y
170CONFIG_INITRAMFS_SOURCE="" 178# CONFIG_RELAY is not set
179# CONFIG_BLK_DEV_INITRD is not set
171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 180# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
181CONFIG_SYSCTL=y
172CONFIG_EMBEDDED=y 182CONFIG_EMBEDDED=y
183CONFIG_SYSCTL_SYSCALL=y
173CONFIG_KALLSYMS=y 184CONFIG_KALLSYMS=y
174# CONFIG_KALLSYMS_EXTRA_PASS is not set 185# CONFIG_KALLSYMS_EXTRA_PASS is not set
175CONFIG_HOTPLUG=y 186# CONFIG_HOTPLUG is not set
176CONFIG_PRINTK=y 187CONFIG_PRINTK=y
177CONFIG_BUG=y 188CONFIG_BUG=y
178CONFIG_ELF_CORE=y 189CONFIG_ELF_CORE=y
179CONFIG_BASE_FULL=y 190CONFIG_BASE_FULL=y
180CONFIG_RT_MUTEXES=y
181CONFIG_FUTEX=y 191CONFIG_FUTEX=y
182CONFIG_EPOLL=y 192CONFIG_EPOLL=y
183CONFIG_SHMEM=y 193CONFIG_SHMEM=y
184CONFIG_SLAB=y 194CONFIG_SLAB=y
185CONFIG_VM_EVENT_COUNTERS=y 195CONFIG_VM_EVENT_COUNTERS=y
196CONFIG_RT_MUTEXES=y
186# CONFIG_TINY_SHMEM is not set 197# CONFIG_TINY_SHMEM is not set
187CONFIG_BASE_SMALL=0 198CONFIG_BASE_SMALL=0
188# CONFIG_SLOB is not set 199# CONFIG_SLOB is not set
@@ -195,6 +206,7 @@ CONFIG_BASE_SMALL=0
195# 206#
196# Block layer 207# Block layer
197# 208#
209CONFIG_BLOCK=y
198# CONFIG_LBD is not set 210# CONFIG_LBD is not set
199# CONFIG_BLK_DEV_IO_TRACE is not set 211# CONFIG_BLK_DEV_IO_TRACE is not set
200# CONFIG_LSF is not set 212# CONFIG_LSF is not set
@@ -206,11 +218,11 @@ CONFIG_IOSCHED_NOOP=y
206CONFIG_IOSCHED_AS=y 218CONFIG_IOSCHED_AS=y
207CONFIG_IOSCHED_DEADLINE=y 219CONFIG_IOSCHED_DEADLINE=y
208CONFIG_IOSCHED_CFQ=y 220CONFIG_IOSCHED_CFQ=y
209CONFIG_DEFAULT_AS=y 221# CONFIG_DEFAULT_AS is not set
210# CONFIG_DEFAULT_DEADLINE is not set 222# CONFIG_DEFAULT_DEADLINE is not set
211# CONFIG_DEFAULT_CFQ is not set 223CONFIG_DEFAULT_CFQ=y
212# CONFIG_DEFAULT_NOOP is not set 224# CONFIG_DEFAULT_NOOP is not set
213CONFIG_DEFAULT_IOSCHED="anticipatory" 225CONFIG_DEFAULT_IOSCHED="cfq"
214 226
215# 227#
216# Bus options (PCI, PCMCIA, EISA, ISA, TC) 228# Bus options (PCI, PCMCIA, EISA, ISA, TC)
@@ -222,12 +234,10 @@ CONFIG_MMU=y
222# 234#
223# PCCARD (PCMCIA/CardBus) support 235# PCCARD (PCMCIA/CardBus) support
224# 236#
225# CONFIG_PCCARD is not set
226 237
227# 238#
228# PCI Hotplug Support 239# PCI Hotplug Support
229# 240#
230# CONFIG_HOTPLUG_PCI is not set
231 241
232# 242#
233# Executable file formats 243# Executable file formats
@@ -237,6 +247,11 @@ CONFIG_BINFMT_ELF=y
237CONFIG_TRAD_SIGNALS=y 247CONFIG_TRAD_SIGNALS=y
238 248
239# 249#
250# Power management options
251#
252# CONFIG_PM is not set
253
254#
240# Networking 255# Networking
241# 256#
242CONFIG_NET=y 257CONFIG_NET=y
@@ -248,9 +263,7 @@ CONFIG_NET=y
248CONFIG_PACKET=y 263CONFIG_PACKET=y
249# CONFIG_PACKET_MMAP is not set 264# CONFIG_PACKET_MMAP is not set
250CONFIG_UNIX=y 265CONFIG_UNIX=y
251CONFIG_XFRM=y 266# CONFIG_NET_KEY is not set
252CONFIG_XFRM_USER=y
253CONFIG_NET_KEY=y
254CONFIG_INET=y 267CONFIG_INET=y
255# CONFIG_IP_MULTICAST is not set 268# CONFIG_IP_MULTICAST is not set
256# CONFIG_IP_ADVANCED_ROUTER is not set 269# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -268,16 +281,18 @@ CONFIG_IP_PNP_BOOTP=y
268# CONFIG_INET_IPCOMP is not set 281# CONFIG_INET_IPCOMP is not set
269# CONFIG_INET_XFRM_TUNNEL is not set 282# CONFIG_INET_XFRM_TUNNEL is not set
270# CONFIG_INET_TUNNEL is not set 283# CONFIG_INET_TUNNEL is not set
271CONFIG_INET_XFRM_MODE_TRANSPORT=y 284# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
272CONFIG_INET_XFRM_MODE_TUNNEL=y 285# CONFIG_INET_XFRM_MODE_TUNNEL is not set
273CONFIG_INET_DIAG=y 286# CONFIG_INET_XFRM_MODE_BEET is not set
274CONFIG_INET_TCP_DIAG=y 287# CONFIG_INET_DIAG is not set
275# CONFIG_TCP_CONG_ADVANCED is not set 288# CONFIG_TCP_CONG_ADVANCED is not set
276CONFIG_TCP_CONG_BIC=y 289CONFIG_TCP_CONG_CUBIC=y
290CONFIG_DEFAULT_TCP_CONG="cubic"
291# CONFIG_TCP_MD5SIG is not set
277# CONFIG_IPV6 is not set 292# CONFIG_IPV6 is not set
278# CONFIG_INET6_XFRM_TUNNEL is not set 293# CONFIG_INET6_XFRM_TUNNEL is not set
279# CONFIG_INET6_TUNNEL is not set 294# CONFIG_INET6_TUNNEL is not set
280CONFIG_NETWORK_SECMARK=y 295# CONFIG_NETWORK_SECMARK is not set
281# CONFIG_NETFILTER is not set 296# CONFIG_NETFILTER is not set
282 297
283# 298#
@@ -303,7 +318,6 @@ CONFIG_NETWORK_SECMARK=y
303# CONFIG_ATALK is not set 318# CONFIG_ATALK is not set
304# CONFIG_X25 is not set 319# CONFIG_X25 is not set
305# CONFIG_LAPB is not set 320# CONFIG_LAPB is not set
306# CONFIG_NET_DIVERT is not set
307# CONFIG_ECONET is not set 321# CONFIG_ECONET is not set
308# CONFIG_WAN_ROUTER is not set 322# CONFIG_WAN_ROUTER is not set
309 323
@@ -319,13 +333,7 @@ CONFIG_NETWORK_SECMARK=y
319# CONFIG_HAMRADIO is not set 333# CONFIG_HAMRADIO is not set
320# CONFIG_IRDA is not set 334# CONFIG_IRDA is not set
321# CONFIG_BT is not set 335# CONFIG_BT is not set
322CONFIG_IEEE80211=y 336# CONFIG_IEEE80211 is not set
323# CONFIG_IEEE80211_DEBUG is not set
324CONFIG_IEEE80211_CRYPT_WEP=y
325CONFIG_IEEE80211_CRYPT_CCMP=y
326CONFIG_IEEE80211_SOFTMAC=y
327# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
328CONFIG_WIRELESS_EXT=y
329 337
330# 338#
331# Device Drivers 339# Device Drivers
@@ -336,14 +344,12 @@ CONFIG_WIRELESS_EXT=y
336# 344#
337CONFIG_STANDALONE=y 345CONFIG_STANDALONE=y
338CONFIG_PREVENT_FIRMWARE_BUILD=y 346CONFIG_PREVENT_FIRMWARE_BUILD=y
339CONFIG_FW_LOADER=y
340# CONFIG_SYS_HYPERVISOR is not set 347# CONFIG_SYS_HYPERVISOR is not set
341 348
342# 349#
343# Connector - unified userspace <-> kernelspace linker 350# Connector - unified userspace <-> kernelspace linker
344# 351#
345CONFIG_CONNECTOR=y 352# CONFIG_CONNECTOR is not set
346CONFIG_PROC_EVENTS=y
347 353
348# 354#
349# Memory Technology Devices (MTD) 355# Memory Technology Devices (MTD)
@@ -358,6 +364,7 @@ CONFIG_PROC_EVENTS=y
358# 364#
359# Plug and Play support 365# Plug and Play support
360# 366#
367# CONFIG_PNPACPI is not set
361 368
362# 369#
363# Block devices 370# Block devices
@@ -371,11 +378,14 @@ CONFIG_PROC_EVENTS=y
371# CONFIG_BLK_DEV_NBD is not set 378# CONFIG_BLK_DEV_NBD is not set
372# CONFIG_BLK_DEV_SX8 is not set 379# CONFIG_BLK_DEV_SX8 is not set
373# CONFIG_BLK_DEV_RAM is not set 380# CONFIG_BLK_DEV_RAM is not set
374# CONFIG_BLK_DEV_INITRD is not set 381# CONFIG_CDROM_PKTCDVD is not set
375CONFIG_CDROM_PKTCDVD=y 382# CONFIG_ATA_OVER_ETH is not set
376CONFIG_CDROM_PKTCDVD_BUFFERS=8 383
377# CONFIG_CDROM_PKTCDVD_WCACHE is not set 384#
378CONFIG_ATA_OVER_ETH=y 385# Misc devices
386#
387# CONFIG_SGI_IOC4 is not set
388# CONFIG_TIFM_CORE is not set
379 389
380# 390#
381# ATA/ATAPI/MFM/RLL support 391# ATA/ATAPI/MFM/RLL support
@@ -385,8 +395,14 @@ CONFIG_ATA_OVER_ETH=y
385# 395#
386# SCSI device support 396# SCSI device support
387# 397#
388CONFIG_RAID_ATTRS=y 398# CONFIG_RAID_ATTRS is not set
389# CONFIG_SCSI is not set 399# CONFIG_SCSI is not set
400# CONFIG_SCSI_NETLINK is not set
401
402#
403# Serial ATA (prod) and Parallel ATA (experimental) drivers
404#
405# CONFIG_ATA is not set
390 406
391# 407#
392# Multi-device support (RAID and LVM) 408# Multi-device support (RAID and LVM)
@@ -425,24 +441,13 @@ CONFIG_NETDEVICES=y
425# 441#
426# PHY device support 442# PHY device support
427# 443#
428CONFIG_PHYLIB=y 444# CONFIG_PHYLIB is not set
429
430#
431# MII PHY device drivers
432#
433CONFIG_MARVELL_PHY=y
434CONFIG_DAVICOM_PHY=y
435CONFIG_QSEMI_PHY=y
436CONFIG_LXT_PHY=y
437CONFIG_CICADA_PHY=y
438CONFIG_VITESSE_PHY=y
439CONFIG_SMSC_PHY=y
440 445
441# 446#
442# Ethernet (10 or 100Mbit) 447# Ethernet (10 or 100Mbit)
443# 448#
444CONFIG_NET_ETHERNET=y 449CONFIG_NET_ETHERNET=y
445# CONFIG_MII is not set 450CONFIG_MII=y
446# CONFIG_HAPPYMEAL is not set 451# CONFIG_HAPPYMEAL is not set
447# CONFIG_SUNGEM is not set 452# CONFIG_SUNGEM is not set
448# CONFIG_CASSINI is not set 453# CONFIG_CASSINI is not set
@@ -454,7 +459,27 @@ CONFIG_NET_ETHERNET=y
454# 459#
455# CONFIG_NET_TULIP is not set 460# CONFIG_NET_TULIP is not set
456# CONFIG_HP100 is not set 461# CONFIG_HP100 is not set
457# CONFIG_NET_PCI is not set 462CONFIG_NET_PCI=y
463# CONFIG_PCNET32 is not set
464# CONFIG_AMD8111_ETH is not set
465# CONFIG_ADAPTEC_STARFIRE is not set
466# CONFIG_B44 is not set
467# CONFIG_FORCEDETH is not set
468CONFIG_TC35815=y
469# CONFIG_DGRS is not set
470# CONFIG_EEPRO100 is not set
471# CONFIG_E100 is not set
472# CONFIG_FEALNX is not set
473# CONFIG_NATSEMI is not set
474# CONFIG_NE2K_PCI is not set
475# CONFIG_8139CP is not set
476# CONFIG_8139TOO is not set
477# CONFIG_SIS900 is not set
478# CONFIG_EPIC100 is not set
479# CONFIG_SUNDANCE is not set
480# CONFIG_TLAN is not set
481# CONFIG_VIA_RHINE is not set
482# CONFIG_SC92031 is not set
458 483
459# 484#
460# Ethernet (1000 Mbit) 485# Ethernet (1000 Mbit)
@@ -470,16 +495,21 @@ CONFIG_NET_ETHERNET=y
470# CONFIG_SKGE is not set 495# CONFIG_SKGE is not set
471# CONFIG_SKY2 is not set 496# CONFIG_SKY2 is not set
472# CONFIG_SK98LIN is not set 497# CONFIG_SK98LIN is not set
498# CONFIG_VIA_VELOCITY is not set
473# CONFIG_TIGON3 is not set 499# CONFIG_TIGON3 is not set
474# CONFIG_BNX2 is not set 500# CONFIG_BNX2 is not set
501# CONFIG_QLA3XXX is not set
502# CONFIG_ATL1 is not set
475 503
476# 504#
477# Ethernet (10000 Mbit) 505# Ethernet (10000 Mbit)
478# 506#
479# CONFIG_CHELSIO_T1 is not set 507# CONFIG_CHELSIO_T1 is not set
508# CONFIG_CHELSIO_T3 is not set
480# CONFIG_IXGB is not set 509# CONFIG_IXGB is not set
481# CONFIG_S2IO is not set 510# CONFIG_S2IO is not set
482# CONFIG_MYRI10GE is not set 511# CONFIG_MYRI10GE is not set
512# CONFIG_NETXEN_NIC is not set
483 513
484# 514#
485# Token Ring devices 515# Token Ring devices
@@ -518,14 +548,12 @@ CONFIG_NET_ETHERNET=y
518# Input device support 548# Input device support
519# 549#
520CONFIG_INPUT=y 550CONFIG_INPUT=y
551# CONFIG_INPUT_FF_MEMLESS is not set
521 552
522# 553#
523# Userland interfaces 554# Userland interfaces
524# 555#
525CONFIG_INPUT_MOUSEDEV=y 556# CONFIG_INPUT_MOUSEDEV is not set
526CONFIG_INPUT_MOUSEDEV_PSAUX=y
527CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
528CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
529# CONFIG_INPUT_JOYDEV is not set 557# CONFIG_INPUT_JOYDEV is not set
530# CONFIG_INPUT_TSDEV is not set 558# CONFIG_INPUT_TSDEV is not set
531# CONFIG_INPUT_EVDEV is not set 559# CONFIG_INPUT_EVDEV is not set
@@ -543,21 +571,13 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
543# 571#
544# Hardware I/O ports 572# Hardware I/O ports
545# 573#
546CONFIG_SERIO=y 574# CONFIG_SERIO is not set
547# CONFIG_SERIO_I8042 is not set
548CONFIG_SERIO_SERPORT=y
549# CONFIG_SERIO_PCIPS2 is not set
550# CONFIG_SERIO_LIBPS2 is not set
551CONFIG_SERIO_RAW=y
552# CONFIG_GAMEPORT is not set 575# CONFIG_GAMEPORT is not set
553 576
554# 577#
555# Character devices 578# Character devices
556# 579#
557CONFIG_VT=y 580# CONFIG_VT is not set
558CONFIG_VT_CONSOLE=y
559CONFIG_HW_CONSOLE=y
560CONFIG_VT_HW_CONSOLE_BINDING=y
561CONFIG_SERIAL_NONSTANDARD=y 581CONFIG_SERIAL_NONSTANDARD=y
562# CONFIG_COMPUTONE is not set 582# CONFIG_COMPUTONE is not set
563# CONFIG_ROCKETPORT is not set 583# CONFIG_ROCKETPORT is not set
@@ -565,6 +585,7 @@ CONFIG_SERIAL_NONSTANDARD=y
565# CONFIG_DIGIEPCA is not set 585# CONFIG_DIGIEPCA is not set
566# CONFIG_MOXA_INTELLIO is not set 586# CONFIG_MOXA_INTELLIO is not set
567# CONFIG_MOXA_SMARTIO is not set 587# CONFIG_MOXA_SMARTIO is not set
588# CONFIG_MOXA_SMARTIO_NEW is not set
568# CONFIG_ISI is not set 589# CONFIG_ISI is not set
569# CONFIG_SYNCLINKMP is not set 590# CONFIG_SYNCLINKMP is not set
570# CONFIG_SYNCLINK_GT is not set 591# CONFIG_SYNCLINK_GT is not set
@@ -584,10 +605,12 @@ CONFIG_SERIAL_NONSTANDARD=y
584# Non-8250 serial port support 605# Non-8250 serial port support
585# 606#
586CONFIG_SERIAL_CORE=y 607CONFIG_SERIAL_CORE=y
608CONFIG_SERIAL_CORE_CONSOLE=y
587CONFIG_SERIAL_TXX9=y 609CONFIG_SERIAL_TXX9=y
588CONFIG_HAS_TXX9_SERIAL=y 610CONFIG_HAS_TXX9_SERIAL=y
589# CONFIG_SERIAL_TXX9_CONSOLE is not set 611CONFIG_SERIAL_TXX9_NR_UARTS=6
590# CONFIG_SERIAL_TXX9_STDSERIAL is not set 612CONFIG_SERIAL_TXX9_CONSOLE=y
613CONFIG_SERIAL_TXX9_STDSERIAL=y
591# CONFIG_SERIAL_JSM is not set 614# CONFIG_SERIAL_JSM is not set
592# CONFIG_UNIX98_PTYS is not set 615# CONFIG_UNIX98_PTYS is not set
593CONFIG_LEGACY_PTYS=y 616CONFIG_LEGACY_PTYS=y
@@ -608,10 +631,6 @@ CONFIG_LEGACY_PTY_COUNT=256
608# CONFIG_DTLK is not set 631# CONFIG_DTLK is not set
609# CONFIG_R3964 is not set 632# CONFIG_R3964 is not set
610# CONFIG_APPLICOM is not set 633# CONFIG_APPLICOM is not set
611
612#
613# Ftape, the floppy tape device driver
614#
615# CONFIG_DRM is not set 634# CONFIG_DRM is not set
616# CONFIG_RAW_DRIVER is not set 635# CONFIG_RAW_DRIVER is not set
617 636
@@ -619,7 +638,6 @@ CONFIG_LEGACY_PTY_COUNT=256
619# TPM devices 638# TPM devices
620# 639#
621# CONFIG_TCG_TPM is not set 640# CONFIG_TCG_TPM is not set
622# CONFIG_TELCLOCK is not set
623 641
624# 642#
625# I2C support 643# I2C support
@@ -644,14 +662,14 @@ CONFIG_LEGACY_PTY_COUNT=256
644# CONFIG_HWMON_VID is not set 662# CONFIG_HWMON_VID is not set
645 663
646# 664#
647# Misc devices 665# Multifunction device drivers
648# 666#
667# CONFIG_MFD_SM501 is not set
649 668
650# 669#
651# Multimedia devices 670# Multimedia devices
652# 671#
653# CONFIG_VIDEO_DEV is not set 672# CONFIG_VIDEO_DEV is not set
654CONFIG_VIDEO_V4L2=y
655 673
656# 674#
657# Digital Video Broadcasting Devices 675# Digital Video Broadcasting Devices
@@ -661,49 +679,8 @@ CONFIG_VIDEO_V4L2=y
661# 679#
662# Graphics support 680# Graphics support
663# 681#
664# CONFIG_FIRMWARE_EDID is not set
665CONFIG_FB=y
666# CONFIG_FB_CFB_FILLRECT is not set
667# CONFIG_FB_CFB_COPYAREA is not set
668# CONFIG_FB_CFB_IMAGEBLIT is not set
669# CONFIG_FB_MACMODES is not set
670# CONFIG_FB_BACKLIGHT is not set
671# CONFIG_FB_MODE_HELPERS is not set
672# CONFIG_FB_TILEBLITTING is not set
673# CONFIG_FB_CIRRUS is not set
674# CONFIG_FB_PM2 is not set
675# CONFIG_FB_CYBER2000 is not set
676# CONFIG_FB_ASILIANT is not set
677# CONFIG_FB_IMSTT is not set
678# CONFIG_FB_S1D13XXX is not set
679# CONFIG_FB_NVIDIA is not set
680# CONFIG_FB_RIVA is not set
681# CONFIG_FB_MATROX is not set
682# CONFIG_FB_RADEON is not set
683# CONFIG_FB_ATY128 is not set
684# CONFIG_FB_ATY is not set
685# CONFIG_FB_SAVAGE is not set
686# CONFIG_FB_SIS is not set
687# CONFIG_FB_NEOMAGIC is not set
688# CONFIG_FB_KYRO is not set
689# CONFIG_FB_3DFX is not set
690# CONFIG_FB_VOODOO1 is not set
691# CONFIG_FB_SMIVGX is not set
692# CONFIG_FB_TRIDENT is not set
693# CONFIG_FB_VIRTUAL is not set
694
695#
696# Console display driver support
697#
698# CONFIG_VGA_CONSOLE is not set
699CONFIG_DUMMY_CONSOLE=y
700# CONFIG_FRAMEBUFFER_CONSOLE is not set
701
702#
703# Logo configuration
704#
705# CONFIG_LOGO is not set
706# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 682# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
683# CONFIG_FB is not set
707 684
708# 685#
709# Sound 686# Sound
@@ -711,6 +688,11 @@ CONFIG_DUMMY_CONSOLE=y
711# CONFIG_SOUND is not set 688# CONFIG_SOUND is not set
712 689
713# 690#
691# HID Devices
692#
693# CONFIG_HID is not set
694
695#
714# USB support 696# USB support
715# 697#
716CONFIG_USB_ARCH_HAS_HCD=y 698CONFIG_USB_ARCH_HAS_HCD=y
@@ -757,7 +739,28 @@ CONFIG_USB_ARCH_HAS_EHCI=y
757# 739#
758# Real Time Clock 740# Real Time Clock
759# 741#
760# CONFIG_RTC_CLASS is not set 742CONFIG_RTC_LIB=y
743CONFIG_RTC_CLASS=y
744CONFIG_RTC_HCTOSYS=y
745CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
746# CONFIG_RTC_DEBUG is not set
747
748#
749# RTC interfaces
750#
751CONFIG_RTC_INTF_SYSFS=y
752CONFIG_RTC_INTF_PROC=y
753CONFIG_RTC_INTF_DEV=y
754# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
755
756#
757# RTC drivers
758#
759# CONFIG_RTC_DRV_DS1553 is not set
760CONFIG_RTC_DRV_DS1742=y
761# CONFIG_RTC_DRV_M48T86 is not set
762# CONFIG_RTC_DRV_TEST is not set
763# CONFIG_RTC_DRV_V3020 is not set
761 764
762# 765#
763# DMA Engine support 766# DMA Engine support
@@ -773,14 +776,24 @@ CONFIG_USB_ARCH_HAS_EHCI=y
773# 776#
774 777
775# 778#
779# Auxiliary Display support
780#
781
782#
783# Virtualization
784#
785
786#
776# File systems 787# File systems
777# 788#
778# CONFIG_EXT2_FS is not set 789# CONFIG_EXT2_FS is not set
779# CONFIG_EXT3_FS is not set 790# CONFIG_EXT3_FS is not set
791# CONFIG_EXT4DEV_FS is not set
780# CONFIG_REISERFS_FS is not set 792# CONFIG_REISERFS_FS is not set
781# CONFIG_JFS_FS is not set 793# CONFIG_JFS_FS is not set
782# CONFIG_FS_POSIX_ACL is not set 794# CONFIG_FS_POSIX_ACL is not set
783# CONFIG_XFS_FS is not set 795# CONFIG_XFS_FS is not set
796# CONFIG_GFS2_FS is not set
784# CONFIG_OCFS2_FS is not set 797# CONFIG_OCFS2_FS is not set
785# CONFIG_MINIX_FS is not set 798# CONFIG_MINIX_FS is not set
786# CONFIG_ROMFS_FS is not set 799# CONFIG_ROMFS_FS is not set
@@ -790,7 +803,7 @@ CONFIG_INOTIFY_USER=y
790CONFIG_DNOTIFY=y 803CONFIG_DNOTIFY=y
791# CONFIG_AUTOFS_FS is not set 804# CONFIG_AUTOFS_FS is not set
792# CONFIG_AUTOFS4_FS is not set 805# CONFIG_AUTOFS4_FS is not set
793CONFIG_FUSE_FS=y 806# CONFIG_FUSE_FS is not set
794 807
795# 808#
796# CD-ROM/DVD Filesystems 809# CD-ROM/DVD Filesystems
@@ -810,6 +823,7 @@ CONFIG_FUSE_FS=y
810# 823#
811CONFIG_PROC_FS=y 824CONFIG_PROC_FS=y
812CONFIG_PROC_KCORE=y 825CONFIG_PROC_KCORE=y
826CONFIG_PROC_SYSCTL=y
813CONFIG_SYSFS=y 827CONFIG_SYSFS=y
814# CONFIG_TMPFS is not set 828# CONFIG_TMPFS is not set
815# CONFIG_HUGETLB_PAGE is not set 829# CONFIG_HUGETLB_PAGE is not set
@@ -849,7 +863,6 @@ CONFIG_SUNRPC=y
849# CONFIG_RPCSEC_GSS_SPKM3 is not set 863# CONFIG_RPCSEC_GSS_SPKM3 is not set
850# CONFIG_SMB_FS is not set 864# CONFIG_SMB_FS is not set
851# CONFIG_CIFS is not set 865# CONFIG_CIFS is not set
852# CONFIG_CIFS_DEBUG2 is not set
853# CONFIG_NCP_FS is not set 866# CONFIG_NCP_FS is not set
854# CONFIG_CODA_FS is not set 867# CONFIG_CODA_FS is not set
855# CONFIG_AFS_FS is not set 868# CONFIG_AFS_FS is not set
@@ -867,6 +880,11 @@ CONFIG_MSDOS_PARTITION=y
867# CONFIG_NLS is not set 880# CONFIG_NLS is not set
868 881
869# 882#
883# Distributed Lock Manager
884#
885# CONFIG_DLM is not set
886
887#
870# Profiling support 888# Profiling support
871# 889#
872# CONFIG_PROFILING is not set 890# CONFIG_PROFILING is not set
@@ -876,61 +894,35 @@ CONFIG_MSDOS_PARTITION=y
876# 894#
877CONFIG_TRACE_IRQFLAGS_SUPPORT=y 895CONFIG_TRACE_IRQFLAGS_SUPPORT=y
878# CONFIG_PRINTK_TIME is not set 896# CONFIG_PRINTK_TIME is not set
897CONFIG_ENABLE_MUST_CHECK=y
879# CONFIG_MAGIC_SYSRQ is not set 898# CONFIG_MAGIC_SYSRQ is not set
880# CONFIG_UNUSED_SYMBOLS is not set 899# CONFIG_UNUSED_SYMBOLS is not set
900# CONFIG_DEBUG_FS is not set
901# CONFIG_HEADERS_CHECK is not set
881# CONFIG_DEBUG_KERNEL is not set 902# CONFIG_DEBUG_KERNEL is not set
882CONFIG_LOG_BUF_SHIFT=14 903CONFIG_LOG_BUF_SHIFT=14
883# CONFIG_DEBUG_FS is not set
884# CONFIG_UNWIND_INFO is not set
885CONFIG_CROSSCOMPILE=y 904CONFIG_CROSSCOMPILE=y
886CONFIG_CMDLINE="" 905CONFIG_CMDLINE=""
887 906
888# 907#
889# Security options 908# Security options
890# 909#
891CONFIG_KEYS=y 910# CONFIG_KEYS is not set
892CONFIG_KEYS_DEBUG_PROC_KEYS=y
893# CONFIG_SECURITY is not set 911# CONFIG_SECURITY is not set
894 912
895# 913#
896# Cryptographic options 914# Cryptographic options
897# 915#
898CONFIG_CRYPTO=y 916# CONFIG_CRYPTO is not set
899CONFIG_CRYPTO_HMAC=y
900CONFIG_CRYPTO_NULL=y
901CONFIG_CRYPTO_MD4=y
902CONFIG_CRYPTO_MD5=y
903CONFIG_CRYPTO_SHA1=y
904CONFIG_CRYPTO_SHA256=y
905CONFIG_CRYPTO_SHA512=y
906CONFIG_CRYPTO_WP512=y
907CONFIG_CRYPTO_TGR192=y
908CONFIG_CRYPTO_DES=y
909CONFIG_CRYPTO_BLOWFISH=y
910CONFIG_CRYPTO_TWOFISH=y
911CONFIG_CRYPTO_SERPENT=y
912CONFIG_CRYPTO_AES=y
913CONFIG_CRYPTO_CAST5=y
914CONFIG_CRYPTO_CAST6=y
915CONFIG_CRYPTO_TEA=y
916CONFIG_CRYPTO_ARC4=y
917CONFIG_CRYPTO_KHAZAD=y
918CONFIG_CRYPTO_ANUBIS=y
919CONFIG_CRYPTO_DEFLATE=y
920CONFIG_CRYPTO_MICHAEL_MIC=y
921CONFIG_CRYPTO_CRC32C=y
922
923#
924# Hardware crypto devices
925#
926 917
927# 918#
928# Library routines 919# Library routines
929# 920#
921CONFIG_BITREVERSE=y
930# CONFIG_CRC_CCITT is not set 922# CONFIG_CRC_CCITT is not set
931CONFIG_CRC16=y 923# CONFIG_CRC16 is not set
932CONFIG_CRC32=y 924CONFIG_CRC32=y
933CONFIG_LIBCRC32C=y 925# CONFIG_LIBCRC32C is not set
934CONFIG_ZLIB_INFLATE=y
935CONFIG_ZLIB_DEFLATE=y
936CONFIG_PLIST=y 926CONFIG_PLIST=y
927CONFIG_HAS_IOMEM=y
928CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index 05f539f84f58..fd4272c1458a 100644
--- a/arch/mips/configs/lasat200_defconfig
+++ b/arch/mips/configs/lasat200_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:12 2006 4# Tue Feb 20 21:47:34 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31CONFIG_LASAT=y 30CONFIG_LASAT=y
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_LASAT=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -68,10 +67,14 @@ CONFIG_PICVUE_PROC=y
68CONFIG_DS1603=y 67CONFIG_DS1603=y
69CONFIG_LASAT_SYSCTL=y 68CONFIG_LASAT_SYSCTL=y
70CONFIG_RWSEM_GENERIC_SPINLOCK=y 69CONFIG_RWSEM_GENERIC_SPINLOCK=y
70# CONFIG_ARCH_HAS_ILOG2_U32 is not set
71# CONFIG_ARCH_HAS_ILOG2_U64 is not set
71CONFIG_GENERIC_FIND_NEXT_BIT=y 72CONFIG_GENERIC_FIND_NEXT_BIT=y
72CONFIG_GENERIC_HWEIGHT=y 73CONFIG_GENERIC_HWEIGHT=y
73CONFIG_GENERIC_CALIBRATE_DELAY=y 74CONFIG_GENERIC_CALIBRATE_DELAY=y
75CONFIG_GENERIC_TIME=y
74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 76CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
77CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
75CONFIG_DMA_NONCOHERENT=y 78CONFIG_DMA_NONCOHERENT=y
76CONFIG_DMA_NEED_PCI_MAP_STATE=y 79CONFIG_DMA_NEED_PCI_MAP_STATE=y
77CONFIG_MIPS_NILE4=y 80CONFIG_MIPS_NILE4=y
@@ -121,8 +124,8 @@ CONFIG_PAGE_SIZE_4KB=y
121CONFIG_BOARD_SCACHE=y 124CONFIG_BOARD_SCACHE=y
122CONFIG_R5000_CPU_SCACHE=y 125CONFIG_R5000_CPU_SCACHE=y
123CONFIG_MIPS_MT_DISABLED=y 126CONFIG_MIPS_MT_DISABLED=y
124# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_MT_SMP is not set 127# CONFIG_MIPS_MT_SMP is not set
128# CONFIG_MIPS_MT_SMTC is not set
126# CONFIG_MIPS_VPE_LOADER is not set 129# CONFIG_MIPS_VPE_LOADER is not set
127# CONFIG_64BIT_PHYS_ADDR is not set 130# CONFIG_64BIT_PHYS_ADDR is not set
128CONFIG_CPU_HAS_LLSC=y 131CONFIG_CPU_HAS_LLSC=y
@@ -139,6 +142,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 142# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 143CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 144# CONFIG_RESOURCES_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1
142# CONFIG_HZ_48 is not set 146# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 147# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 148# CONFIG_HZ_128 is not set
@@ -151,6 +155,7 @@ CONFIG_HZ=1000
151CONFIG_PREEMPT_NONE=y 155CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set 156# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set 157# CONFIG_PREEMPT is not set
158# CONFIG_KEXEC is not set
154CONFIG_LOCKDEP_SUPPORT=y 159CONFIG_LOCKDEP_SUPPORT=y
155CONFIG_STACKTRACE_SUPPORT=y 160CONFIG_STACKTRACE_SUPPORT=y
156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 161CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -169,15 +174,20 @@ CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y 174CONFIG_LOCALVERSION_AUTO=y
170CONFIG_SWAP=y 175CONFIG_SWAP=y
171CONFIG_SYSVIPC=y 176CONFIG_SYSVIPC=y
177# CONFIG_IPC_NS is not set
178CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_POSIX_MQUEUE is not set 179# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set 180# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 181# CONFIG_TASKSTATS is not set
182# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 183# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 184# CONFIG_IKCONFIG is not set
185CONFIG_SYSFS_DEPRECATED=y
177CONFIG_RELAY=y 186CONFIG_RELAY=y
178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 189CONFIG_EMBEDDED=y
190CONFIG_SYSCTL_SYSCALL=y
181CONFIG_KALLSYMS=y 191CONFIG_KALLSYMS=y
182# CONFIG_KALLSYMS_EXTRA_PASS is not set 192# CONFIG_KALLSYMS_EXTRA_PASS is not set
183CONFIG_HOTPLUG=y 193CONFIG_HOTPLUG=y
@@ -185,12 +195,12 @@ CONFIG_PRINTK=y
185CONFIG_BUG=y 195CONFIG_BUG=y
186CONFIG_ELF_CORE=y 196CONFIG_ELF_CORE=y
187CONFIG_BASE_FULL=y 197CONFIG_BASE_FULL=y
188CONFIG_RT_MUTEXES=y
189CONFIG_FUTEX=y 198CONFIG_FUTEX=y
190CONFIG_EPOLL=y 199CONFIG_EPOLL=y
191CONFIG_SHMEM=y 200CONFIG_SHMEM=y
192CONFIG_SLAB=y 201CONFIG_SLAB=y
193CONFIG_VM_EVENT_COUNTERS=y 202CONFIG_VM_EVENT_COUNTERS=y
203CONFIG_RT_MUTEXES=y
194# CONFIG_TINY_SHMEM is not set 204# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0 205CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set 206# CONFIG_SLOB is not set
@@ -208,6 +218,7 @@ CONFIG_KMOD=y
208# 218#
209# Block layer 219# Block layer
210# 220#
221CONFIG_BLOCK=y
211# CONFIG_LBD is not set 222# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set 223# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set 224# CONFIG_LSF is not set
@@ -250,6 +261,14 @@ CONFIG_BINFMT_ELF=y
250CONFIG_TRAD_SIGNALS=y 261CONFIG_TRAD_SIGNALS=y
251 262
252# 263#
264# Power management options
265#
266CONFIG_PM=y
267# CONFIG_PM_LEGACY is not set
268# CONFIG_PM_DEBUG is not set
269# CONFIG_PM_SYSFS_DEPRECATED is not set
270
271#
253# Networking 272# Networking
254# 273#
255CONFIG_NET=y 274CONFIG_NET=y
@@ -262,7 +281,10 @@ CONFIG_NET=y
262CONFIG_UNIX=y 281CONFIG_UNIX=y
263CONFIG_XFRM=y 282CONFIG_XFRM=y
264CONFIG_XFRM_USER=m 283CONFIG_XFRM_USER=m
284# CONFIG_XFRM_SUB_POLICY is not set
285CONFIG_XFRM_MIGRATE=y
265CONFIG_NET_KEY=y 286CONFIG_NET_KEY=y
287CONFIG_NET_KEY_MIGRATE=y
266CONFIG_INET=y 288CONFIG_INET=y
267# CONFIG_IP_MULTICAST is not set 289# CONFIG_IP_MULTICAST is not set
268# CONFIG_IP_ADVANCED_ROUTER is not set 290# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +301,13 @@ CONFIG_IP_FIB_HASH=y
279# CONFIG_INET_TUNNEL is not set 301# CONFIG_INET_TUNNEL is not set
280CONFIG_INET_XFRM_MODE_TRANSPORT=m 302CONFIG_INET_XFRM_MODE_TRANSPORT=m
281CONFIG_INET_XFRM_MODE_TUNNEL=m 303CONFIG_INET_XFRM_MODE_TUNNEL=m
304CONFIG_INET_XFRM_MODE_BEET=m
282CONFIG_INET_DIAG=y 305CONFIG_INET_DIAG=y
283CONFIG_INET_TCP_DIAG=y 306CONFIG_INET_TCP_DIAG=y
284# CONFIG_TCP_CONG_ADVANCED is not set 307# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_BIC=y 308CONFIG_TCP_CONG_CUBIC=y
309CONFIG_DEFAULT_TCP_CONG="cubic"
310CONFIG_TCP_MD5SIG=y
286# CONFIG_IPV6 is not set 311# CONFIG_IPV6 is not set
287# CONFIG_INET6_XFRM_TUNNEL is not set 312# CONFIG_INET6_XFRM_TUNNEL is not set
288# CONFIG_INET6_TUNNEL is not set 313# CONFIG_INET6_TUNNEL is not set
@@ -312,7 +337,6 @@ CONFIG_NETWORK_SECMARK=y
312# CONFIG_ATALK is not set 337# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 338# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 339# CONFIG_LAPB is not set
315# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
318 342
@@ -367,11 +391,13 @@ CONFIG_MTD_PARTITIONS=y
367# User Modules And Translation Layers 391# User Modules And Translation Layers
368# 392#
369CONFIG_MTD_CHAR=y 393CONFIG_MTD_CHAR=y
394CONFIG_MTD_BLKDEVS=y
370CONFIG_MTD_BLOCK=y 395CONFIG_MTD_BLOCK=y
371# CONFIG_FTL is not set 396# CONFIG_FTL is not set
372# CONFIG_NFTL is not set 397# CONFIG_NFTL is not set
373# CONFIG_INFTL is not set 398# CONFIG_INFTL is not set
374# CONFIG_RFD_FTL is not set 399# CONFIG_RFD_FTL is not set
400# CONFIG_SSFDC is not set
375 401
376# 402#
377# RAM/ROM/Flash chip drivers 403# RAM/ROM/Flash chip drivers
@@ -441,6 +467,7 @@ CONFIG_MTD_LASAT=y
441# 467#
442# Plug and Play support 468# Plug and Play support
443# 469#
470# CONFIG_PNPACPI is not set
444 471
445# 472#
446# Block devices 473# Block devices
@@ -461,9 +488,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
461CONFIG_ATA_OVER_ETH=m 488CONFIG_ATA_OVER_ETH=m
462 489
463# 490#
491# Misc devices
492#
493CONFIG_SGI_IOC4=m
494# CONFIG_TIFM_CORE is not set
495
496#
464# ATA/ATAPI/MFM/RLL support 497# ATA/ATAPI/MFM/RLL support
465# 498#
466CONFIG_IDE=y 499CONFIG_IDE=y
500CONFIG_IDE_MAX_HWIFS=4
467CONFIG_BLK_DEV_IDE=y 501CONFIG_BLK_DEV_IDE=y
468 502
469# 503#
@@ -500,8 +534,10 @@ CONFIG_BLK_DEV_CMD64X=y
500# CONFIG_BLK_DEV_CS5530 is not set 534# CONFIG_BLK_DEV_CS5530 is not set
501# CONFIG_BLK_DEV_HPT34X is not set 535# CONFIG_BLK_DEV_HPT34X is not set
502# CONFIG_BLK_DEV_HPT366 is not set 536# CONFIG_BLK_DEV_HPT366 is not set
537# CONFIG_BLK_DEV_JMICRON is not set
503# CONFIG_BLK_DEV_SC1200 is not set 538# CONFIG_BLK_DEV_SC1200 is not set
504# CONFIG_BLK_DEV_PIIX is not set 539# CONFIG_BLK_DEV_PIIX is not set
540CONFIG_BLK_DEV_IT8213=m
505# CONFIG_BLK_DEV_IT821X is not set 541# CONFIG_BLK_DEV_IT821X is not set
506# CONFIG_BLK_DEV_NS87415 is not set 542# CONFIG_BLK_DEV_NS87415 is not set
507# CONFIG_BLK_DEV_PDC202XX_OLD is not set 543# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -511,6 +547,7 @@ CONFIG_BLK_DEV_CMD64X=y
511# CONFIG_BLK_DEV_SLC90E66 is not set 547# CONFIG_BLK_DEV_SLC90E66 is not set
512# CONFIG_BLK_DEV_TRM290 is not set 548# CONFIG_BLK_DEV_TRM290 is not set
513# CONFIG_BLK_DEV_VIA82CXXX is not set 549# CONFIG_BLK_DEV_VIA82CXXX is not set
550CONFIG_BLK_DEV_TC86C001=m
514# CONFIG_IDE_ARM is not set 551# CONFIG_IDE_ARM is not set
515CONFIG_BLK_DEV_IDEDMA=y 552CONFIG_BLK_DEV_IDEDMA=y
516# CONFIG_IDEDMA_IVB is not set 553# CONFIG_IDEDMA_IVB is not set
@@ -522,6 +559,12 @@ CONFIG_IDEDMA_AUTO=y
522# 559#
523CONFIG_RAID_ATTRS=m 560CONFIG_RAID_ATTRS=m
524# CONFIG_SCSI is not set 561# CONFIG_SCSI is not set
562# CONFIG_SCSI_NETLINK is not set
563
564#
565# Serial ATA (prod) and Parallel ATA (experimental) drivers
566#
567# CONFIG_ATA is not set
525 568
526# 569#
527# Multi-device support (RAID and LVM) 570# Multi-device support (RAID and LVM)
@@ -572,6 +615,8 @@ CONFIG_LXT_PHY=m
572CONFIG_CICADA_PHY=m 615CONFIG_CICADA_PHY=m
573CONFIG_VITESSE_PHY=m 616CONFIG_VITESSE_PHY=m
574CONFIG_SMSC_PHY=m 617CONFIG_SMSC_PHY=m
618# CONFIG_BROADCOM_PHY is not set
619# CONFIG_FIXED_PHY is not set
575 620
576# 621#
577# Ethernet (10 or 100Mbit) 622# Ethernet (10 or 100Mbit)
@@ -607,14 +652,18 @@ CONFIG_NET_ETHERNET=y
607# CONFIG_SK98LIN is not set 652# CONFIG_SK98LIN is not set
608# CONFIG_TIGON3 is not set 653# CONFIG_TIGON3 is not set
609# CONFIG_BNX2 is not set 654# CONFIG_BNX2 is not set
655CONFIG_QLA3XXX=m
656# CONFIG_ATL1 is not set
610 657
611# 658#
612# Ethernet (10000 Mbit) 659# Ethernet (10000 Mbit)
613# 660#
614# CONFIG_CHELSIO_T1 is not set 661# CONFIG_CHELSIO_T1 is not set
662CONFIG_CHELSIO_T3=m
615# CONFIG_IXGB is not set 663# CONFIG_IXGB is not set
616# CONFIG_S2IO is not set 664# CONFIG_S2IO is not set
617# CONFIG_MYRI10GE is not set 665# CONFIG_MYRI10GE is not set
666CONFIG_NETXEN_NIC=m
618 667
619# 668#
620# Token Ring devices 669# Token Ring devices
@@ -653,6 +702,7 @@ CONFIG_NET_ETHERNET=y
653# Input device support 702# Input device support
654# 703#
655CONFIG_INPUT=y 704CONFIG_INPUT=y
705# CONFIG_INPUT_FF_MEMLESS is not set
656 706
657# 707#
658# Userland interfaces 708# Userland interfaces
@@ -730,10 +780,6 @@ CONFIG_LEGACY_PTY_COUNT=256
730# CONFIG_DTLK is not set 780# CONFIG_DTLK is not set
731# CONFIG_R3964 is not set 781# CONFIG_R3964 is not set
732# CONFIG_APPLICOM is not set 782# CONFIG_APPLICOM is not set
733
734#
735# Ftape, the floppy tape device driver
736#
737# CONFIG_DRM is not set 783# CONFIG_DRM is not set
738# CONFIG_RAW_DRIVER is not set 784# CONFIG_RAW_DRIVER is not set
739 785
@@ -741,7 +787,6 @@ CONFIG_LEGACY_PTY_COUNT=256
741# TPM devices 787# TPM devices
742# 788#
743# CONFIG_TCG_TPM is not set 789# CONFIG_TCG_TPM is not set
744# CONFIG_TELCLOCK is not set
745 790
746# 791#
747# I2C support 792# I2C support
@@ -766,14 +811,9 @@ CONFIG_LEGACY_PTY_COUNT=256
766# CONFIG_HWMON_VID is not set 811# CONFIG_HWMON_VID is not set
767 812
768# 813#
769# Misc devices
770#
771
772#
773# Multimedia devices 814# Multimedia devices
774# 815#
775# CONFIG_VIDEO_DEV is not set 816# CONFIG_VIDEO_DEV is not set
776CONFIG_VIDEO_V4L2=y
777 817
778# 818#
779# Digital Video Broadcasting Devices 819# Digital Video Broadcasting Devices
@@ -791,6 +831,7 @@ CONFIG_VIDEO_V4L2=y
791# 831#
792# CONFIG_VGA_CONSOLE is not set 832# CONFIG_VGA_CONSOLE is not set
793CONFIG_DUMMY_CONSOLE=y 833CONFIG_DUMMY_CONSOLE=y
834# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
794 835
795# 836#
796# Sound 837# Sound
@@ -798,6 +839,11 @@ CONFIG_DUMMY_CONSOLE=y
798# CONFIG_SOUND is not set 839# CONFIG_SOUND is not set
799 840
800# 841#
842# HID Devices
843#
844# CONFIG_HID is not set
845
846#
801# USB support 847# USB support
802# 848#
803CONFIG_USB_ARCH_HAS_HCD=y 849CONFIG_USB_ARCH_HAS_HCD=y
@@ -860,6 +906,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
860# 906#
861 907
862# 908#
909# Auxiliary Display support
910#
911
912#
913# Virtualization
914#
915
916#
863# File systems 917# File systems
864# 918#
865CONFIG_EXT2_FS=y 919CONFIG_EXT2_FS=y
@@ -869,13 +923,15 @@ CONFIG_EXT3_FS=y
869CONFIG_EXT3_FS_XATTR=y 923CONFIG_EXT3_FS_XATTR=y
870# CONFIG_EXT3_FS_POSIX_ACL is not set 924# CONFIG_EXT3_FS_POSIX_ACL is not set
871CONFIG_EXT3_FS_SECURITY=y 925CONFIG_EXT3_FS_SECURITY=y
926# CONFIG_EXT4DEV_FS is not set
872CONFIG_JBD=y 927CONFIG_JBD=y
873# CONFIG_JBD_DEBUG is not set 928# CONFIG_JBD_DEBUG is not set
874CONFIG_FS_MBCACHE=y 929CONFIG_FS_MBCACHE=y
875# CONFIG_REISERFS_FS is not set 930# CONFIG_REISERFS_FS is not set
876# CONFIG_JFS_FS is not set 931# CONFIG_JFS_FS is not set
877# CONFIG_FS_POSIX_ACL is not set 932CONFIG_FS_POSIX_ACL=y
878# CONFIG_XFS_FS is not set 933# CONFIG_XFS_FS is not set
934# CONFIG_GFS2_FS is not set
879# CONFIG_OCFS2_FS is not set 935# CONFIG_OCFS2_FS is not set
880# CONFIG_MINIX_FS is not set 936# CONFIG_MINIX_FS is not set
881# CONFIG_ROMFS_FS is not set 937# CONFIG_ROMFS_FS is not set
@@ -886,6 +942,7 @@ CONFIG_DNOTIFY=y
886# CONFIG_AUTOFS_FS is not set 942# CONFIG_AUTOFS_FS is not set
887# CONFIG_AUTOFS4_FS is not set 943# CONFIG_AUTOFS4_FS is not set
888CONFIG_FUSE_FS=m 944CONFIG_FUSE_FS=m
945CONFIG_GENERIC_ACL=y
889 946
890# 947#
891# CD-ROM/DVD Filesystems 948# CD-ROM/DVD Filesystems
@@ -905,23 +962,25 @@ CONFIG_FUSE_FS=m
905# 962#
906CONFIG_PROC_FS=y 963CONFIG_PROC_FS=y
907CONFIG_PROC_KCORE=y 964CONFIG_PROC_KCORE=y
965CONFIG_PROC_SYSCTL=y
908CONFIG_SYSFS=y 966CONFIG_SYSFS=y
909CONFIG_TMPFS=y 967CONFIG_TMPFS=y
968CONFIG_TMPFS_POSIX_ACL=y
910# CONFIG_HUGETLB_PAGE is not set 969# CONFIG_HUGETLB_PAGE is not set
911CONFIG_RAMFS=y 970CONFIG_RAMFS=y
912# CONFIG_CONFIGFS_FS is not set 971CONFIG_CONFIGFS_FS=m
913 972
914# 973#
915# Miscellaneous filesystems 974# Miscellaneous filesystems
916# 975#
917# CONFIG_ADFS_FS is not set 976# CONFIG_ADFS_FS is not set
918# CONFIG_AFFS_FS is not set 977# CONFIG_AFFS_FS is not set
978# CONFIG_ECRYPT_FS is not set
919# CONFIG_HFS_FS is not set 979# CONFIG_HFS_FS is not set
920# CONFIG_HFSPLUS_FS is not set 980# CONFIG_HFSPLUS_FS is not set
921# CONFIG_BEFS_FS is not set 981# CONFIG_BEFS_FS is not set
922# CONFIG_BFS_FS is not set 982# CONFIG_BFS_FS is not set
923# CONFIG_EFS_FS is not set 983# CONFIG_EFS_FS is not set
924# CONFIG_JFFS_FS is not set
925# CONFIG_JFFS2_FS is not set 984# CONFIG_JFFS2_FS is not set
926# CONFIG_CRAMFS is not set 985# CONFIG_CRAMFS is not set
927# CONFIG_VXFS_FS is not set 986# CONFIG_VXFS_FS is not set
@@ -947,7 +1006,6 @@ CONFIG_SUNRPC=y
947# CONFIG_RPCSEC_GSS_SPKM3 is not set 1006# CONFIG_RPCSEC_GSS_SPKM3 is not set
948# CONFIG_SMB_FS is not set 1007# CONFIG_SMB_FS is not set
949# CONFIG_CIFS is not set 1008# CONFIG_CIFS is not set
950# CONFIG_CIFS_DEBUG2 is not set
951# CONFIG_NCP_FS is not set 1009# CONFIG_NCP_FS is not set
952# CONFIG_CODA_FS is not set 1010# CONFIG_CODA_FS is not set
953# CONFIG_AFS_FS is not set 1011# CONFIG_AFS_FS is not set
@@ -965,6 +1023,14 @@ CONFIG_MSDOS_PARTITION=y
965# CONFIG_NLS is not set 1023# CONFIG_NLS is not set
966 1024
967# 1025#
1026# Distributed Lock Manager
1027#
1028CONFIG_DLM=m
1029CONFIG_DLM_TCP=y
1030# CONFIG_DLM_SCTP is not set
1031# CONFIG_DLM_DEBUG is not set
1032
1033#
968# Profiling support 1034# Profiling support
969# 1035#
970# CONFIG_PROFILING is not set 1036# CONFIG_PROFILING is not set
@@ -974,11 +1040,13 @@ CONFIG_MSDOS_PARTITION=y
974# 1040#
975CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1041CONFIG_TRACE_IRQFLAGS_SUPPORT=y
976# CONFIG_PRINTK_TIME is not set 1042# CONFIG_PRINTK_TIME is not set
1043CONFIG_ENABLE_MUST_CHECK=y
977# CONFIG_MAGIC_SYSRQ is not set 1044# CONFIG_MAGIC_SYSRQ is not set
978# CONFIG_UNUSED_SYMBOLS is not set 1045# CONFIG_UNUSED_SYMBOLS is not set
1046# CONFIG_DEBUG_FS is not set
1047# CONFIG_HEADERS_CHECK is not set
979# CONFIG_DEBUG_KERNEL is not set 1048# CONFIG_DEBUG_KERNEL is not set
980CONFIG_LOG_BUF_SHIFT=14 1049CONFIG_LOG_BUF_SHIFT=14
981# CONFIG_DEBUG_FS is not set
982CONFIG_CROSSCOMPILE=y 1050CONFIG_CROSSCOMPILE=y
983CONFIG_CMDLINE="" 1051CONFIG_CMDLINE=""
984 1052
@@ -993,18 +1061,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
993# Cryptographic options 1061# Cryptographic options
994# 1062#
995CONFIG_CRYPTO=y 1063CONFIG_CRYPTO=y
1064CONFIG_CRYPTO_ALGAPI=y
1065CONFIG_CRYPTO_BLKCIPHER=m
1066CONFIG_CRYPTO_HASH=y
1067CONFIG_CRYPTO_MANAGER=y
996CONFIG_CRYPTO_HMAC=y 1068CONFIG_CRYPTO_HMAC=y
1069CONFIG_CRYPTO_XCBC=m
997CONFIG_CRYPTO_NULL=m 1070CONFIG_CRYPTO_NULL=m
998CONFIG_CRYPTO_MD4=m 1071CONFIG_CRYPTO_MD4=m
999CONFIG_CRYPTO_MD5=m 1072CONFIG_CRYPTO_MD5=y
1000CONFIG_CRYPTO_SHA1=m 1073CONFIG_CRYPTO_SHA1=m
1001CONFIG_CRYPTO_SHA256=m 1074CONFIG_CRYPTO_SHA256=m
1002CONFIG_CRYPTO_SHA512=m 1075CONFIG_CRYPTO_SHA512=m
1003CONFIG_CRYPTO_WP512=m 1076CONFIG_CRYPTO_WP512=m
1004CONFIG_CRYPTO_TGR192=m 1077CONFIG_CRYPTO_TGR192=m
1078CONFIG_CRYPTO_GF128MUL=m
1079CONFIG_CRYPTO_ECB=m
1080CONFIG_CRYPTO_CBC=m
1081CONFIG_CRYPTO_PCBC=m
1082CONFIG_CRYPTO_LRW=m
1005CONFIG_CRYPTO_DES=m 1083CONFIG_CRYPTO_DES=m
1084CONFIG_CRYPTO_FCRYPT=m
1006CONFIG_CRYPTO_BLOWFISH=m 1085CONFIG_CRYPTO_BLOWFISH=m
1007CONFIG_CRYPTO_TWOFISH=m 1086CONFIG_CRYPTO_TWOFISH=m
1087CONFIG_CRYPTO_TWOFISH_COMMON=m
1008CONFIG_CRYPTO_SERPENT=m 1088CONFIG_CRYPTO_SERPENT=m
1009CONFIG_CRYPTO_AES=m 1089CONFIG_CRYPTO_AES=m
1010CONFIG_CRYPTO_CAST5=m 1090CONFIG_CRYPTO_CAST5=m
@@ -1016,6 +1096,7 @@ CONFIG_CRYPTO_ANUBIS=m
1016CONFIG_CRYPTO_DEFLATE=m 1096CONFIG_CRYPTO_DEFLATE=m
1017CONFIG_CRYPTO_MICHAEL_MIC=m 1097CONFIG_CRYPTO_MICHAEL_MIC=m
1018CONFIG_CRYPTO_CRC32C=m 1098CONFIG_CRYPTO_CRC32C=m
1099CONFIG_CRYPTO_CAMELLIA=m
1019# CONFIG_CRYPTO_TEST is not set 1100# CONFIG_CRYPTO_TEST is not set
1020 1101
1021# 1102#
@@ -1025,6 +1106,7 @@ CONFIG_CRYPTO_CRC32C=m
1025# 1106#
1026# Library routines 1107# Library routines
1027# 1108#
1109CONFIG_BITREVERSE=y
1028# CONFIG_CRC_CCITT is not set 1110# CONFIG_CRC_CCITT is not set
1029CONFIG_CRC16=m 1111CONFIG_CRC16=m
1030CONFIG_CRC32=y 1112CONFIG_CRC32=y
@@ -1032,3 +1114,5 @@ CONFIG_LIBCRC32C=m
1032CONFIG_ZLIB_INFLATE=m 1114CONFIG_ZLIB_INFLATE=m
1033CONFIG_ZLIB_DEFLATE=m 1115CONFIG_ZLIB_DEFLATE=m
1034CONFIG_PLIST=y 1116CONFIG_PLIST=y
1117CONFIG_HAS_IOMEM=y
1118CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 96e941084c04..1f64d7632a03 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc1 3# Linux kernel version: 2.6.20
4# Fri Oct 6 17:34:55 2006 4# Sun Feb 18 21:27:55 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -38,8 +39,8 @@ CONFIG_MIPS_MALTA=y
38# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
39# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -62,11 +63,14 @@ CONFIG_MIPS_MALTA=y
62# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
63# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
64CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
65CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
66CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_GENERIC_TIME=y 71CONFIG_GENERIC_TIME=y
69CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
70CONFIG_ARCH_MAY_HAVE_PC_FDC=y 74CONFIG_ARCH_MAY_HAVE_PC_FDC=y
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -132,14 +136,15 @@ CONFIG_BOARD_SCACHE=y
132CONFIG_MIPS_CPU_SCACHE=y 136CONFIG_MIPS_CPU_SCACHE=y
133CONFIG_CPU_HAS_PREFETCH=y 137CONFIG_CPU_HAS_PREFETCH=y
134# CONFIG_MIPS_MT_DISABLED is not set 138# CONFIG_MIPS_MT_DISABLED is not set
135# CONFIG_MIPS_MT_SMTC is not set
136CONFIG_MIPS_MT_SMP=y 139CONFIG_MIPS_MT_SMP=y
140# CONFIG_MIPS_MT_SMTC is not set
137# CONFIG_MIPS_VPE_LOADER is not set 141# CONFIG_MIPS_VPE_LOADER is not set
138CONFIG_MIPS_MT=y 142CONFIG_MIPS_MT=y
139CONFIG_SYS_SUPPORTS_MULTITHREADING=y 143CONFIG_SYS_SUPPORTS_MULTITHREADING=y
140CONFIG_MIPS_MT_FPAFF=y 144CONFIG_MIPS_MT_FPAFF=y
141# CONFIG_64BIT_PHYS_ADDR is not set 145# CONFIG_64BIT_PHYS_ADDR is not set
142CONFIG_CPU_HAS_LLSC=y 146CONFIG_CPU_HAS_LLSC=y
147# CONFIG_CPU_HAS_SMARTMIPS is not set
143CONFIG_CPU_MIPSR2_IRQ_VI=y 148CONFIG_CPU_MIPSR2_IRQ_VI=y
144CONFIG_CPU_MIPSR2_SRS=y 149CONFIG_CPU_MIPSR2_SRS=y
145CONFIG_CPU_HAS_SYNC=y 150CONFIG_CPU_HAS_SYNC=y
@@ -147,6 +152,7 @@ CONFIG_GENERIC_HARDIRQS=y
147CONFIG_GENERIC_IRQ_PROBE=y 152CONFIG_GENERIC_IRQ_PROBE=y
148CONFIG_IRQ_PER_CPU=y 153CONFIG_IRQ_PER_CPU=y
149CONFIG_CPU_SUPPORTS_HIGHMEM=y 154CONFIG_CPU_SUPPORTS_HIGHMEM=y
155CONFIG_SYS_SUPPORTS_SMARTMIPS=y
150CONFIG_ARCH_FLATMEM_ENABLE=y 156CONFIG_ARCH_FLATMEM_ENABLE=y
151CONFIG_SELECT_MEMORY_MODEL=y 157CONFIG_SELECT_MEMORY_MODEL=y
152CONFIG_FLATMEM_MANUAL=y 158CONFIG_FLATMEM_MANUAL=y
@@ -157,6 +163,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
157# CONFIG_SPARSEMEM_STATIC is not set 163# CONFIG_SPARSEMEM_STATIC is not set
158CONFIG_SPLIT_PTLOCK_CPUS=4 164CONFIG_SPLIT_PTLOCK_CPUS=4
159# CONFIG_RESOURCES_64BIT is not set 165# CONFIG_RESOURCES_64BIT is not set
166CONFIG_ZONE_DMA_FLAG=1
160CONFIG_SMP=y 167CONFIG_SMP=y
161CONFIG_SYS_SUPPORTS_SMP=y 168CONFIG_SYS_SUPPORTS_SMP=y
162CONFIG_NR_CPUS=2 169CONFIG_NR_CPUS=2
@@ -173,6 +180,7 @@ CONFIG_PREEMPT_NONE=y
173# CONFIG_PREEMPT_VOLUNTARY is not set 180# CONFIG_PREEMPT_VOLUNTARY is not set
174# CONFIG_PREEMPT is not set 181# CONFIG_PREEMPT is not set
175CONFIG_PREEMPT_BKL=y 182CONFIG_PREEMPT_BKL=y
183# CONFIG_KEXEC is not set
176CONFIG_LOCKDEP_SUPPORT=y 184CONFIG_LOCKDEP_SUPPORT=y
177CONFIG_STACKTRACE_SUPPORT=y 185CONFIG_STACKTRACE_SUPPORT=y
178CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 186CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -192,6 +200,7 @@ CONFIG_LOCALVERSION_AUTO=y
192CONFIG_SWAP=y 200CONFIG_SWAP=y
193CONFIG_SYSVIPC=y 201CONFIG_SYSVIPC=y
194# CONFIG_IPC_NS is not set 202# CONFIG_IPC_NS is not set
203CONFIG_SYSVIPC_SYSCTL=y
195# CONFIG_POSIX_MQUEUE is not set 204# CONFIG_POSIX_MQUEUE is not set
196# CONFIG_BSD_PROCESS_ACCT is not set 205# CONFIG_BSD_PROCESS_ACCT is not set
197# CONFIG_TASKSTATS is not set 206# CONFIG_TASKSTATS is not set
@@ -199,8 +208,8 @@ CONFIG_SYSVIPC=y
199# CONFIG_AUDIT is not set 208# CONFIG_AUDIT is not set
200# CONFIG_IKCONFIG is not set 209# CONFIG_IKCONFIG is not set
201# CONFIG_CPUSETS is not set 210# CONFIG_CPUSETS is not set
211CONFIG_SYSFS_DEPRECATED=y
202CONFIG_RELAY=y 212CONFIG_RELAY=y
203CONFIG_INITRAMFS_SOURCE=""
204# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 213# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
205CONFIG_SYSCTL=y 214CONFIG_SYSCTL=y
206CONFIG_EMBEDDED=y 215CONFIG_EMBEDDED=y
@@ -259,7 +268,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
259# 268#
260CONFIG_HW_HAS_PCI=y 269CONFIG_HW_HAS_PCI=y
261CONFIG_PCI=y 270CONFIG_PCI=y
262# CONFIG_PCI_MULTITHREAD_PROBE is not set
263CONFIG_MMU=y 271CONFIG_MMU=y
264 272
265# 273#
@@ -280,6 +288,14 @@ CONFIG_BINFMT_ELF=y
280CONFIG_TRAD_SIGNALS=y 288CONFIG_TRAD_SIGNALS=y
281 289
282# 290#
291# Power management options
292#
293CONFIG_PM=y
294# CONFIG_PM_LEGACY is not set
295# CONFIG_PM_DEBUG is not set
296# CONFIG_PM_SYSFS_DEPRECATED is not set
297
298#
283# Networking 299# Networking
284# 300#
285CONFIG_NET=y 301CONFIG_NET=y
@@ -294,7 +310,9 @@ CONFIG_UNIX=y
294CONFIG_XFRM=y 310CONFIG_XFRM=y
295CONFIG_XFRM_USER=m 311CONFIG_XFRM_USER=m
296# CONFIG_XFRM_SUB_POLICY is not set 312# CONFIG_XFRM_SUB_POLICY is not set
313CONFIG_XFRM_MIGRATE=y
297CONFIG_NET_KEY=y 314CONFIG_NET_KEY=y
315CONFIG_NET_KEY_MIGRATE=y
298CONFIG_INET=y 316CONFIG_INET=y
299CONFIG_IP_MULTICAST=y 317CONFIG_IP_MULTICAST=y
300CONFIG_IP_ADVANCED_ROUTER=y 318CONFIG_IP_ADVANCED_ROUTER=y
@@ -302,7 +320,6 @@ CONFIG_ASK_IP_FIB_HASH=y
302# CONFIG_IP_FIB_TRIE is not set 320# CONFIG_IP_FIB_TRIE is not set
303CONFIG_IP_FIB_HASH=y 321CONFIG_IP_FIB_HASH=y
304CONFIG_IP_MULTIPLE_TABLES=y 322CONFIG_IP_MULTIPLE_TABLES=y
305CONFIG_IP_ROUTE_FWMARK=y
306CONFIG_IP_ROUTE_MULTIPATH=y 323CONFIG_IP_ROUTE_MULTIPATH=y
307# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set 324# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
308CONFIG_IP_ROUTE_VERBOSE=y 325CONFIG_IP_ROUTE_VERBOSE=y
@@ -331,6 +348,7 @@ CONFIG_INET_TCP_DIAG=y
331# CONFIG_TCP_CONG_ADVANCED is not set 348# CONFIG_TCP_CONG_ADVANCED is not set
332CONFIG_TCP_CONG_CUBIC=y 349CONFIG_TCP_CONG_CUBIC=y
333CONFIG_DEFAULT_TCP_CONG="cubic" 350CONFIG_DEFAULT_TCP_CONG="cubic"
351CONFIG_TCP_MD5SIG=y
334 352
335# 353#
336# IP: Virtual Server Configuration 354# IP: Virtual Server Configuration
@@ -379,8 +397,8 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
379CONFIG_INET6_XFRM_MODE_TUNNEL=m 397CONFIG_INET6_XFRM_MODE_TUNNEL=m
380CONFIG_INET6_XFRM_MODE_BEET=m 398CONFIG_INET6_XFRM_MODE_BEET=m
381# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 399# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
400CONFIG_IPV6_SIT=m
382CONFIG_IPV6_TUNNEL=m 401CONFIG_IPV6_TUNNEL=m
383# CONFIG_IPV6_SUBTREES is not set
384# CONFIG_IPV6_MULTIPLE_TABLES is not set 402# CONFIG_IPV6_MULTIPLE_TABLES is not set
385CONFIG_NETWORK_SECMARK=y 403CONFIG_NETWORK_SECMARK=y
386CONFIG_NETFILTER=y 404CONFIG_NETFILTER=y
@@ -393,15 +411,37 @@ CONFIG_BRIDGE_NETFILTER=y
393CONFIG_NETFILTER_NETLINK=m 411CONFIG_NETFILTER_NETLINK=m
394CONFIG_NETFILTER_NETLINK_QUEUE=m 412CONFIG_NETFILTER_NETLINK_QUEUE=m
395CONFIG_NETFILTER_NETLINK_LOG=m 413CONFIG_NETFILTER_NETLINK_LOG=m
414CONFIG_NF_CONNTRACK_ENABLED=m
415CONFIG_NF_CONNTRACK_SUPPORT=y
416# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
417CONFIG_NF_CONNTRACK=m
418CONFIG_NF_CT_ACCT=y
419CONFIG_NF_CONNTRACK_MARK=y
420CONFIG_NF_CONNTRACK_SECMARK=y
421CONFIG_NF_CONNTRACK_EVENTS=y
422CONFIG_NF_CT_PROTO_GRE=m
423CONFIG_NF_CT_PROTO_SCTP=m
424CONFIG_NF_CONNTRACK_AMANDA=m
425CONFIG_NF_CONNTRACK_FTP=m
426CONFIG_NF_CONNTRACK_H323=m
427CONFIG_NF_CONNTRACK_IRC=m
428# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
429CONFIG_NF_CONNTRACK_PPTP=m
430CONFIG_NF_CONNTRACK_SANE=m
431CONFIG_NF_CONNTRACK_SIP=m
432CONFIG_NF_CONNTRACK_TFTP=m
433CONFIG_NF_CT_NETLINK=m
396CONFIG_NETFILTER_XTABLES=m 434CONFIG_NETFILTER_XTABLES=m
397CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 435CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
398CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 436CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
399# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 437# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
400CONFIG_NETFILTER_XT_TARGET_MARK=m 438CONFIG_NETFILTER_XT_TARGET_MARK=m
401CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 439CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
440CONFIG_NETFILTER_XT_TARGET_NFLOG=m
402CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 441CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
403CONFIG_NETFILTER_XT_TARGET_SECMARK=m 442CONFIG_NETFILTER_XT_TARGET_SECMARK=m
404# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set 443# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
444CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
405CONFIG_NETFILTER_XT_MATCH_COMMENT=m 445CONFIG_NETFILTER_XT_MATCH_COMMENT=m
406CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 446CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
407CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 447CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -425,25 +465,13 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
425CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 465CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
426CONFIG_NETFILTER_XT_MATCH_STRING=m 466CONFIG_NETFILTER_XT_MATCH_STRING=m
427CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 467CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
468CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
428 469
429# 470#
430# IP: Netfilter Configuration 471# IP: Netfilter Configuration
431# 472#
432CONFIG_IP_NF_CONNTRACK=m 473CONFIG_NF_CONNTRACK_IPV4=m
433CONFIG_IP_NF_CT_ACCT=y 474CONFIG_NF_CONNTRACK_PROC_COMPAT=y
434CONFIG_IP_NF_CONNTRACK_MARK=y
435CONFIG_IP_NF_CONNTRACK_SECMARK=y
436CONFIG_IP_NF_CONNTRACK_EVENTS=y
437CONFIG_IP_NF_CONNTRACK_NETLINK=m
438CONFIG_IP_NF_CT_PROTO_SCTP=m
439CONFIG_IP_NF_FTP=m
440CONFIG_IP_NF_IRC=m
441# CONFIG_IP_NF_NETBIOS_NS is not set
442CONFIG_IP_NF_TFTP=m
443CONFIG_IP_NF_AMANDA=m
444CONFIG_IP_NF_PPTP=m
445CONFIG_IP_NF_H323=m
446CONFIG_IP_NF_SIP=m
447CONFIG_IP_NF_QUEUE=m 475CONFIG_IP_NF_QUEUE=m
448CONFIG_IP_NF_IPTABLES=m 476CONFIG_IP_NF_IPTABLES=m
449CONFIG_IP_NF_MATCH_IPRANGE=m 477CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -454,26 +482,25 @@ CONFIG_IP_NF_MATCH_AH=m
454CONFIG_IP_NF_MATCH_TTL=m 482CONFIG_IP_NF_MATCH_TTL=m
455CONFIG_IP_NF_MATCH_OWNER=m 483CONFIG_IP_NF_MATCH_OWNER=m
456CONFIG_IP_NF_MATCH_ADDRTYPE=m 484CONFIG_IP_NF_MATCH_ADDRTYPE=m
457CONFIG_IP_NF_MATCH_HASHLIMIT=m
458CONFIG_IP_NF_FILTER=m 485CONFIG_IP_NF_FILTER=m
459CONFIG_IP_NF_TARGET_REJECT=m 486CONFIG_IP_NF_TARGET_REJECT=m
460CONFIG_IP_NF_TARGET_LOG=m 487CONFIG_IP_NF_TARGET_LOG=m
461CONFIG_IP_NF_TARGET_ULOG=m 488CONFIG_IP_NF_TARGET_ULOG=m
462CONFIG_IP_NF_TARGET_TCPMSS=m 489CONFIG_NF_NAT=m
463CONFIG_IP_NF_NAT=m 490CONFIG_NF_NAT_NEEDED=y
464CONFIG_IP_NF_NAT_NEEDED=y
465CONFIG_IP_NF_TARGET_MASQUERADE=m 491CONFIG_IP_NF_TARGET_MASQUERADE=m
466CONFIG_IP_NF_TARGET_REDIRECT=m 492CONFIG_IP_NF_TARGET_REDIRECT=m
467CONFIG_IP_NF_TARGET_NETMAP=m 493CONFIG_IP_NF_TARGET_NETMAP=m
468CONFIG_IP_NF_TARGET_SAME=m 494CONFIG_IP_NF_TARGET_SAME=m
469CONFIG_IP_NF_NAT_SNMP_BASIC=m 495CONFIG_NF_NAT_SNMP_BASIC=m
470CONFIG_IP_NF_NAT_IRC=m 496CONFIG_NF_NAT_PROTO_GRE=m
471CONFIG_IP_NF_NAT_FTP=m 497CONFIG_NF_NAT_FTP=m
472CONFIG_IP_NF_NAT_TFTP=m 498CONFIG_NF_NAT_IRC=m
473CONFIG_IP_NF_NAT_AMANDA=m 499CONFIG_NF_NAT_TFTP=m
474CONFIG_IP_NF_NAT_PPTP=m 500CONFIG_NF_NAT_AMANDA=m
475CONFIG_IP_NF_NAT_H323=m 501CONFIG_NF_NAT_PPTP=m
476CONFIG_IP_NF_NAT_SIP=m 502CONFIG_NF_NAT_H323=m
503CONFIG_NF_NAT_SIP=m
477CONFIG_IP_NF_MANGLE=m 504CONFIG_IP_NF_MANGLE=m
478CONFIG_IP_NF_TARGET_TOS=m 505CONFIG_IP_NF_TARGET_TOS=m
479CONFIG_IP_NF_TARGET_ECN=m 506CONFIG_IP_NF_TARGET_ECN=m
@@ -487,6 +514,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
487# 514#
488# IPv6: Netfilter Configuration (EXPERIMENTAL) 515# IPv6: Netfilter Configuration (EXPERIMENTAL)
489# 516#
517CONFIG_NF_CONNTRACK_IPV6=m
490CONFIG_IP6_NF_QUEUE=m 518CONFIG_IP6_NF_QUEUE=m
491CONFIG_IP6_NF_IPTABLES=m 519CONFIG_IP6_NF_IPTABLES=m
492CONFIG_IP6_NF_MATCH_RT=m 520CONFIG_IP6_NF_MATCH_RT=m
@@ -496,6 +524,7 @@ CONFIG_IP6_NF_MATCH_HL=m
496CONFIG_IP6_NF_MATCH_OWNER=m 524CONFIG_IP6_NF_MATCH_OWNER=m
497CONFIG_IP6_NF_MATCH_IPV6HEADER=m 525CONFIG_IP6_NF_MATCH_IPV6HEADER=m
498CONFIG_IP6_NF_MATCH_AH=m 526CONFIG_IP6_NF_MATCH_AH=m
527CONFIG_IP6_NF_MATCH_MH=m
499CONFIG_IP6_NF_MATCH_EUI64=m 528CONFIG_IP6_NF_MATCH_EUI64=m
500CONFIG_IP6_NF_FILTER=m 529CONFIG_IP6_NF_FILTER=m
501CONFIG_IP6_NF_TARGET_LOG=m 530CONFIG_IP6_NF_TARGET_LOG=m
@@ -568,6 +597,7 @@ CONFIG_IPDDP_DECAP=y
568# QoS and/or fair queueing 597# QoS and/or fair queueing
569# 598#
570CONFIG_NET_SCHED=y 599CONFIG_NET_SCHED=y
600CONFIG_NET_SCH_FIFO=y
571CONFIG_NET_SCH_CLK_JIFFIES=y 601CONFIG_NET_SCH_CLK_JIFFIES=y
572# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 602# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
573# CONFIG_NET_SCH_CLK_CPU is not set 603# CONFIG_NET_SCH_CLK_CPU is not set
@@ -655,6 +685,7 @@ CONFIG_MTD_PARTITIONS=y
655# User Modules And Translation Layers 685# User Modules And Translation Layers
656# 686#
657CONFIG_MTD_CHAR=y 687CONFIG_MTD_CHAR=y
688CONFIG_MTD_BLKDEVS=y
658CONFIG_MTD_BLOCK=y 689CONFIG_MTD_BLOCK=y
659# CONFIG_FTL is not set 690# CONFIG_FTL is not set
660# CONFIG_NFTL is not set 691# CONFIG_NFTL is not set
@@ -718,6 +749,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
718# NAND Flash Device Drivers 749# NAND Flash Device Drivers
719# 750#
720# CONFIG_MTD_NAND is not set 751# CONFIG_MTD_NAND is not set
752# CONFIG_MTD_NAND_CAFE is not set
721 753
722# 754#
723# OneNAND Flash Device Drivers 755# OneNAND Flash Device Drivers
@@ -757,6 +789,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
757CONFIG_ATA_OVER_ETH=m 789CONFIG_ATA_OVER_ETH=m
758 790
759# 791#
792# Misc devices
793#
794CONFIG_SGI_IOC4=m
795# CONFIG_TIFM_CORE is not set
796
797#
760# ATA/ATAPI/MFM/RLL support 798# ATA/ATAPI/MFM/RLL support
761# 799#
762CONFIG_IDE=y 800CONFIG_IDE=y
@@ -801,6 +839,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
801# CONFIG_BLK_DEV_JMICRON is not set 839# CONFIG_BLK_DEV_JMICRON is not set
802# CONFIG_BLK_DEV_SC1200 is not set 840# CONFIG_BLK_DEV_SC1200 is not set
803CONFIG_BLK_DEV_PIIX=y 841CONFIG_BLK_DEV_PIIX=y
842CONFIG_BLK_DEV_IT8213=m
804# CONFIG_BLK_DEV_IT821X is not set 843# CONFIG_BLK_DEV_IT821X is not set
805# CONFIG_BLK_DEV_NS87415 is not set 844# CONFIG_BLK_DEV_NS87415 is not set
806# CONFIG_BLK_DEV_PDC202XX_OLD is not set 845# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -810,6 +849,7 @@ CONFIG_BLK_DEV_PIIX=y
810# CONFIG_BLK_DEV_SLC90E66 is not set 849# CONFIG_BLK_DEV_SLC90E66 is not set
811# CONFIG_BLK_DEV_TRM290 is not set 850# CONFIG_BLK_DEV_TRM290 is not set
812# CONFIG_BLK_DEV_VIA82CXXX is not set 851# CONFIG_BLK_DEV_VIA82CXXX is not set
852CONFIG_BLK_DEV_TC86C001=m
813# CONFIG_IDE_ARM is not set 853# CONFIG_IDE_ARM is not set
814CONFIG_BLK_DEV_IDEDMA=y 854CONFIG_BLK_DEV_IDEDMA=y
815# CONFIG_IDEDMA_IVB is not set 855# CONFIG_IDEDMA_IVB is not set
@@ -821,6 +861,7 @@ CONFIG_IDEDMA_AUTO=y
821# 861#
822CONFIG_RAID_ATTRS=m 862CONFIG_RAID_ATTRS=m
823CONFIG_SCSI=m 863CONFIG_SCSI=m
864CONFIG_SCSI_TGT=m
824CONFIG_SCSI_NETLINK=y 865CONFIG_SCSI_NETLINK=y
825CONFIG_SCSI_PROC_FS=y 866CONFIG_SCSI_PROC_FS=y
826 867
@@ -841,6 +882,7 @@ CONFIG_CHR_DEV_SG=m
841CONFIG_SCSI_MULTI_LUN=y 882CONFIG_SCSI_MULTI_LUN=y
842CONFIG_SCSI_CONSTANTS=y 883CONFIG_SCSI_CONSTANTS=y
843CONFIG_SCSI_LOGGING=y 884CONFIG_SCSI_LOGGING=y
885CONFIG_SCSI_SCAN_ASYNC=y
844 886
845# 887#
846# SCSI Transports 888# SCSI Transports
@@ -889,6 +931,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
889# CONFIG_SCSI_DC390T is not set 931# CONFIG_SCSI_DC390T is not set
890# CONFIG_SCSI_NSP32 is not set 932# CONFIG_SCSI_NSP32 is not set
891# CONFIG_SCSI_DEBUG is not set 933# CONFIG_SCSI_DEBUG is not set
934# CONFIG_SCSI_SRP is not set
892 935
893# 936#
894# Serial ATA (prod) and Parallel ATA (experimental) drivers 937# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -964,6 +1007,7 @@ CONFIG_LXT_PHY=m
964CONFIG_CICADA_PHY=m 1007CONFIG_CICADA_PHY=m
965CONFIG_VITESSE_PHY=m 1008CONFIG_VITESSE_PHY=m
966CONFIG_SMSC_PHY=m 1009CONFIG_SMSC_PHY=m
1010# CONFIG_BROADCOM_PHY is not set
967# CONFIG_FIXED_PHY is not set 1011# CONFIG_FIXED_PHY is not set
968 1012
969# 1013#
@@ -1002,7 +1046,7 @@ CONFIG_PCNET32=y
1002# CONFIG_SUNDANCE is not set 1046# CONFIG_SUNDANCE is not set
1003# CONFIG_TLAN is not set 1047# CONFIG_TLAN is not set
1004# CONFIG_VIA_RHINE is not set 1048# CONFIG_VIA_RHINE is not set
1005# CONFIG_LAN_SAA9730 is not set 1049# CONFIG_SC92031 is not set
1006 1050
1007# 1051#
1008# Ethernet (1000 Mbit) 1052# Ethernet (1000 Mbit)
@@ -1022,14 +1066,17 @@ CONFIG_PCNET32=y
1022# CONFIG_TIGON3 is not set 1066# CONFIG_TIGON3 is not set
1023# CONFIG_BNX2 is not set 1067# CONFIG_BNX2 is not set
1024# CONFIG_QLA3XXX is not set 1068# CONFIG_QLA3XXX is not set
1069# CONFIG_ATL1 is not set
1025 1070
1026# 1071#
1027# Ethernet (10000 Mbit) 1072# Ethernet (10000 Mbit)
1028# 1073#
1029# CONFIG_CHELSIO_T1 is not set 1074# CONFIG_CHELSIO_T1 is not set
1075CONFIG_CHELSIO_T3=m
1030# CONFIG_IXGB is not set 1076# CONFIG_IXGB is not set
1031# CONFIG_S2IO is not set 1077# CONFIG_S2IO is not set
1032# CONFIG_MYRI10GE is not set 1078# CONFIG_MYRI10GE is not set
1079CONFIG_NETXEN_NIC=m
1033 1080
1034# 1081#
1035# Token Ring devices 1082# Token Ring devices
@@ -1146,10 +1193,6 @@ CONFIG_RTC=y
1146# CONFIG_DTLK is not set 1193# CONFIG_DTLK is not set
1147# CONFIG_R3964 is not set 1194# CONFIG_R3964 is not set
1148# CONFIG_APPLICOM is not set 1195# CONFIG_APPLICOM is not set
1149
1150#
1151# Ftape, the floppy tape device driver
1152#
1153# CONFIG_DRM is not set 1196# CONFIG_DRM is not set
1154# CONFIG_RAW_DRIVER is not set 1197# CONFIG_RAW_DRIVER is not set
1155 1198
@@ -1157,7 +1200,6 @@ CONFIG_RTC=y
1157# TPM devices 1200# TPM devices
1158# 1201#
1159# CONFIG_TCG_TPM is not set 1202# CONFIG_TCG_TPM is not set
1160# CONFIG_TELCLOCK is not set
1161 1203
1162# 1204#
1163# I2C support 1205# I2C support
@@ -1182,11 +1224,6 @@ CONFIG_RTC=y
1182# CONFIG_HWMON_VID is not set 1224# CONFIG_HWMON_VID is not set
1183 1225
1184# 1226#
1185# Misc devices
1186#
1187# CONFIG_TIFM_CORE is not set
1188
1189#
1190# Multimedia devices 1227# Multimedia devices
1191# 1228#
1192# CONFIG_VIDEO_DEV is not set 1229# CONFIG_VIDEO_DEV is not set
@@ -1215,6 +1252,12 @@ CONFIG_DUMMY_CONSOLE=y
1215# CONFIG_SOUND is not set 1252# CONFIG_SOUND is not set
1216 1253
1217# 1254#
1255# HID Devices
1256#
1257CONFIG_HID=m
1258# CONFIG_HID_DEBUG is not set
1259
1260#
1218# USB support 1261# USB support
1219# 1262#
1220CONFIG_USB_ARCH_HAS_HCD=y 1263CONFIG_USB_ARCH_HAS_HCD=y
@@ -1277,6 +1320,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1277# 1320#
1278 1321
1279# 1322#
1323# Auxiliary Display support
1324#
1325
1326#
1327# Virtualization
1328#
1329
1330#
1280# File systems 1331# File systems
1281# 1332#
1282CONFIG_EXT2_FS=y 1333CONFIG_EXT2_FS=y
@@ -1286,6 +1337,7 @@ CONFIG_EXT3_FS=y
1286CONFIG_EXT3_FS_XATTR=y 1337CONFIG_EXT3_FS_XATTR=y
1287# CONFIG_EXT3_FS_POSIX_ACL is not set 1338# CONFIG_EXT3_FS_POSIX_ACL is not set
1288# CONFIG_EXT3_FS_SECURITY is not set 1339# CONFIG_EXT3_FS_SECURITY is not set
1340# CONFIG_EXT4DEV_FS is not set
1289CONFIG_JBD=y 1341CONFIG_JBD=y
1290# CONFIG_JBD_DEBUG is not set 1342# CONFIG_JBD_DEBUG is not set
1291CONFIG_FS_MBCACHE=y 1343CONFIG_FS_MBCACHE=y
@@ -1327,7 +1379,6 @@ CONFIG_FUSE_FS=m
1327CONFIG_ISO9660_FS=m 1379CONFIG_ISO9660_FS=m
1328CONFIG_JOLIET=y 1380CONFIG_JOLIET=y
1329CONFIG_ZISOFS=y 1381CONFIG_ZISOFS=y
1330CONFIG_ZISOFS_FS=m
1331CONFIG_UDF_FS=m 1382CONFIG_UDF_FS=m
1332CONFIG_UDF_NLS=y 1383CONFIG_UDF_NLS=y
1333 1384
@@ -1365,6 +1416,20 @@ CONFIG_BEFS_FS=m
1365# CONFIG_BEFS_DEBUG is not set 1416# CONFIG_BEFS_DEBUG is not set
1366CONFIG_BFS_FS=m 1417CONFIG_BFS_FS=m
1367CONFIG_EFS_FS=m 1418CONFIG_EFS_FS=m
1419CONFIG_JFFS2_FS=m
1420CONFIG_JFFS2_FS_DEBUG=0
1421CONFIG_JFFS2_FS_WRITEBUFFER=y
1422# CONFIG_JFFS2_SUMMARY is not set
1423CONFIG_JFFS2_FS_XATTR=y
1424CONFIG_JFFS2_FS_POSIX_ACL=y
1425CONFIG_JFFS2_FS_SECURITY=y
1426CONFIG_JFFS2_COMPRESSION_OPTIONS=y
1427CONFIG_JFFS2_ZLIB=y
1428CONFIG_JFFS2_RTIME=y
1429CONFIG_JFFS2_RUBIN=y
1430# CONFIG_JFFS2_CMODE_NONE is not set
1431CONFIG_JFFS2_CMODE_PRIORITY=y
1432# CONFIG_JFFS2_CMODE_SIZE is not set
1368CONFIG_CRAMFS=m 1433CONFIG_CRAMFS=m
1369CONFIG_VXFS_FS=m 1434CONFIG_VXFS_FS=m
1370# CONFIG_HPFS_FS is not set 1435# CONFIG_HPFS_FS is not set
@@ -1470,9 +1535,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1470CONFIG_ENABLE_MUST_CHECK=y 1535CONFIG_ENABLE_MUST_CHECK=y
1471# CONFIG_MAGIC_SYSRQ is not set 1536# CONFIG_MAGIC_SYSRQ is not set
1472# CONFIG_UNUSED_SYMBOLS is not set 1537# CONFIG_UNUSED_SYMBOLS is not set
1538# CONFIG_DEBUG_FS is not set
1539# CONFIG_HEADERS_CHECK is not set
1473# CONFIG_DEBUG_KERNEL is not set 1540# CONFIG_DEBUG_KERNEL is not set
1474CONFIG_LOG_BUF_SHIFT=15 1541CONFIG_LOG_BUF_SHIFT=15
1475# CONFIG_DEBUG_FS is not set
1476CONFIG_CROSSCOMPILE=y 1542CONFIG_CROSSCOMPILE=y
1477CONFIG_CMDLINE="" 1543CONFIG_CMDLINE=""
1478 1544
@@ -1489,19 +1555,24 @@ CONFIG_CRYPTO=y
1489CONFIG_CRYPTO_ALGAPI=y 1555CONFIG_CRYPTO_ALGAPI=y
1490CONFIG_CRYPTO_BLKCIPHER=m 1556CONFIG_CRYPTO_BLKCIPHER=m
1491CONFIG_CRYPTO_HASH=y 1557CONFIG_CRYPTO_HASH=y
1492CONFIG_CRYPTO_MANAGER=m 1558CONFIG_CRYPTO_MANAGER=y
1493CONFIG_CRYPTO_HMAC=y 1559CONFIG_CRYPTO_HMAC=y
1560CONFIG_CRYPTO_XCBC=m
1494CONFIG_CRYPTO_NULL=m 1561CONFIG_CRYPTO_NULL=m
1495CONFIG_CRYPTO_MD4=m 1562CONFIG_CRYPTO_MD4=m
1496CONFIG_CRYPTO_MD5=m 1563CONFIG_CRYPTO_MD5=y
1497CONFIG_CRYPTO_SHA1=m 1564CONFIG_CRYPTO_SHA1=m
1498CONFIG_CRYPTO_SHA256=m 1565CONFIG_CRYPTO_SHA256=m
1499CONFIG_CRYPTO_SHA512=m 1566CONFIG_CRYPTO_SHA512=m
1500CONFIG_CRYPTO_WP512=m 1567CONFIG_CRYPTO_WP512=m
1501CONFIG_CRYPTO_TGR192=m 1568CONFIG_CRYPTO_TGR192=m
1569CONFIG_CRYPTO_GF128MUL=m
1502CONFIG_CRYPTO_ECB=m 1570CONFIG_CRYPTO_ECB=m
1503CONFIG_CRYPTO_CBC=m 1571CONFIG_CRYPTO_CBC=m
1572CONFIG_CRYPTO_PCBC=m
1573CONFIG_CRYPTO_LRW=m
1504CONFIG_CRYPTO_DES=m 1574CONFIG_CRYPTO_DES=m
1575CONFIG_CRYPTO_FCRYPT=m
1505CONFIG_CRYPTO_BLOWFISH=m 1576CONFIG_CRYPTO_BLOWFISH=m
1506CONFIG_CRYPTO_TWOFISH=m 1577CONFIG_CRYPTO_TWOFISH=m
1507CONFIG_CRYPTO_TWOFISH_COMMON=m 1578CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1516,6 +1587,7 @@ CONFIG_CRYPTO_ANUBIS=m
1516CONFIG_CRYPTO_DEFLATE=m 1587CONFIG_CRYPTO_DEFLATE=m
1517CONFIG_CRYPTO_MICHAEL_MIC=m 1588CONFIG_CRYPTO_MICHAEL_MIC=m
1518CONFIG_CRYPTO_CRC32C=m 1589CONFIG_CRYPTO_CRC32C=m
1590CONFIG_CRYPTO_CAMELLIA=m
1519# CONFIG_CRYPTO_TEST is not set 1591# CONFIG_CRYPTO_TEST is not set
1520 1592
1521# 1593#
@@ -1525,6 +1597,7 @@ CONFIG_CRYPTO_CRC32C=m
1525# 1597#
1526# Library routines 1598# Library routines
1527# 1599#
1600CONFIG_BITREVERSE=y
1528# CONFIG_CRC_CCITT is not set 1601# CONFIG_CRC_CCITT is not set
1529CONFIG_CRC16=m 1602CONFIG_CRC16=m
1530CONFIG_CRC32=y 1603CONFIG_CRC32=y
@@ -1536,3 +1609,5 @@ CONFIG_TEXTSEARCH_KMP=m
1536CONFIG_TEXTSEARCH_BM=m 1609CONFIG_TEXTSEARCH_BM=m
1537CONFIG_TEXTSEARCH_FSM=m 1610CONFIG_TEXTSEARCH_FSM=m
1538CONFIG_PLIST=y 1611CONFIG_PLIST=y
1612CONFIG_HAS_IOMEM=y
1613CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index 03efcfd0503b..a2db5c201216 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:13 2006 4# Tue Feb 20 21:47:35 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_SIM=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_MIPS_SIM=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
@@ -117,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 120# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 121CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 126# CONFIG_64BIT_PHYS_ADDR is not set
124CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -148,6 +152,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +171,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 172CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 178# CONFIG_TASKSTATS is not set
179# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 181# CONFIG_IKCONFIG is not set
182CONFIG_SYSFS_DEPRECATED=y
174# CONFIG_RELAY is not set 183# CONFIG_RELAY is not set
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 186CONFIG_EMBEDDED=y
187CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 188CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_ALL is not set 189# CONFIG_KALLSYMS_ALL is not set
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -183,12 +193,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 193CONFIG_BUG=y
184CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 196CONFIG_FUTEX=y
188CONFIG_EPOLL=y 197CONFIG_EPOLL=y
189CONFIG_SHMEM=y 198CONFIG_SHMEM=y
190CONFIG_SLAB=y 199CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -206,6 +216,7 @@ CONFIG_KMOD=y
206# 216#
207# Block layer 217# Block layer
208# 218#
219CONFIG_BLOCK=y
209# CONFIG_LBD is not set 220# CONFIG_LBD is not set
210# CONFIG_LSF is not set 221# CONFIG_LSF is not set
211 222
@@ -244,6 +255,13 @@ CONFIG_BINFMT_ELF=y
244CONFIG_TRAD_SIGNALS=y 255CONFIG_TRAD_SIGNALS=y
245 256
246# 257#
258# Power management options
259#
260CONFIG_PM=y
261# CONFIG_PM_LEGACY is not set
262# CONFIG_PM_DEBUG is not set
263
264#
247# Networking 265# Networking
248# 266#
249CONFIG_NET=y 267CONFIG_NET=y
@@ -257,7 +275,10 @@ CONFIG_PACKET_MMAP=y
257CONFIG_UNIX=y 275CONFIG_UNIX=y
258CONFIG_XFRM=y 276CONFIG_XFRM=y
259# CONFIG_XFRM_USER is not set 277# CONFIG_XFRM_USER is not set
278# CONFIG_XFRM_SUB_POLICY is not set
279CONFIG_XFRM_MIGRATE=y
260CONFIG_NET_KEY=y 280CONFIG_NET_KEY=y
281CONFIG_NET_KEY_MIGRATE=y
261CONFIG_INET=y 282CONFIG_INET=y
262CONFIG_IP_MULTICAST=y 283CONFIG_IP_MULTICAST=y
263CONFIG_IP_ADVANCED_ROUTER=y 284CONFIG_IP_ADVANCED_ROUTER=y
@@ -286,10 +307,13 @@ CONFIG_SYN_COOKIES=y
286# CONFIG_INET_TUNNEL is not set 307# CONFIG_INET_TUNNEL is not set
287CONFIG_INET_XFRM_MODE_TRANSPORT=m 308CONFIG_INET_XFRM_MODE_TRANSPORT=m
288CONFIG_INET_XFRM_MODE_TUNNEL=m 309CONFIG_INET_XFRM_MODE_TUNNEL=m
310CONFIG_INET_XFRM_MODE_BEET=m
289CONFIG_INET_DIAG=y 311CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y 312CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 313# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_BIC=y 314CONFIG_TCP_CONG_CUBIC=y
315CONFIG_DEFAULT_TCP_CONG="cubic"
316CONFIG_TCP_MD5SIG=y
293# CONFIG_IPV6 is not set 317# CONFIG_IPV6 is not set
294# CONFIG_INET6_XFRM_TUNNEL is not set 318# CONFIG_INET6_XFRM_TUNNEL is not set
295# CONFIG_INET6_TUNNEL is not set 319# CONFIG_INET6_TUNNEL is not set
@@ -324,7 +348,6 @@ CONFIG_SCTP_HMAC_MD5=y
324# CONFIG_ATALK is not set 348# CONFIG_ATALK is not set
325# CONFIG_X25 is not set 349# CONFIG_X25 is not set
326# CONFIG_LAPB is not set 350# CONFIG_LAPB is not set
327CONFIG_NET_DIVERT=y
328# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
329# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
330 353
@@ -332,6 +355,7 @@ CONFIG_NET_DIVERT=y
332# QoS and/or fair queueing 355# QoS and/or fair queueing
333# 356#
334CONFIG_NET_SCHED=y 357CONFIG_NET_SCHED=y
358CONFIG_NET_SCH_FIFO=y
335CONFIG_NET_SCH_CLK_JIFFIES=y 359CONFIG_NET_SCH_CLK_JIFFIES=y
336# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 360# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
337# CONFIG_NET_SCH_CLK_CPU is not set 361# CONFIG_NET_SCH_CLK_CPU is not set
@@ -377,6 +401,7 @@ CONFIG_NET_ESTIMATOR=y
377# CONFIG_IRDA is not set 401# CONFIG_IRDA is not set
378# CONFIG_BT is not set 402# CONFIG_BT is not set
379# CONFIG_IEEE80211 is not set 403# CONFIG_IEEE80211 is not set
404CONFIG_FIB_RULES=y
380 405
381# 406#
382# Device Drivers 407# Device Drivers
@@ -389,6 +414,7 @@ CONFIG_NET_ESTIMATOR=y
389# CONFIG_PREVENT_FIRMWARE_BUILD is not set 414# CONFIG_PREVENT_FIRMWARE_BUILD is not set
390# CONFIG_FW_LOADER is not set 415# CONFIG_FW_LOADER is not set
391# CONFIG_DEBUG_DRIVER is not set 416# CONFIG_DEBUG_DRIVER is not set
417# CONFIG_DEBUG_DEVRES is not set
392# CONFIG_SYS_HYPERVISOR is not set 418# CONFIG_SYS_HYPERVISOR is not set
393 419
394# 420#
@@ -409,6 +435,7 @@ CONFIG_NET_ESTIMATOR=y
409# 435#
410# Plug and Play support 436# Plug and Play support
411# 437#
438# CONFIG_PNPACPI is not set
412 439
413# 440#
414# Block devices 441# Block devices
@@ -423,6 +450,10 @@ CONFIG_BLK_DEV_NBD=y
423# CONFIG_ATA_OVER_ETH is not set 450# CONFIG_ATA_OVER_ETH is not set
424 451
425# 452#
453# Misc devices
454#
455
456#
426# ATA/ATAPI/MFM/RLL support 457# ATA/ATAPI/MFM/RLL support
427# 458#
428# CONFIG_IDE is not set 459# CONFIG_IDE is not set
@@ -432,6 +463,12 @@ CONFIG_BLK_DEV_NBD=y
432# 463#
433# CONFIG_RAID_ATTRS is not set 464# CONFIG_RAID_ATTRS is not set
434# CONFIG_SCSI is not set 465# CONFIG_SCSI is not set
466# CONFIG_SCSI_NETLINK is not set
467
468#
469# Serial ATA (prod) and Parallel ATA (experimental) drivers
470#
471# CONFIG_ATA is not set
435 472
436# 473#
437# Multi-device support (RAID and LVM) 474# Multi-device support (RAID and LVM)
@@ -468,7 +505,6 @@ CONFIG_NETDEVICES=y
468# Ethernet (10 or 100Mbit) 505# Ethernet (10 or 100Mbit)
469# 506#
470# CONFIG_NET_ETHERNET is not set 507# CONFIG_NET_ETHERNET is not set
471# CONFIG_MIPS_SIM_NET is not set
472 508
473# 509#
474# Ethernet (1000 Mbit) 510# Ethernet (1000 Mbit)
@@ -512,6 +548,7 @@ CONFIG_NETDEVICES=y
512# Input device support 548# Input device support
513# 549#
514CONFIG_INPUT=y 550CONFIG_INPUT=y
551# CONFIG_INPUT_FF_MEMLESS is not set
515 552
516# 553#
517# Userland interfaces 554# Userland interfaces
@@ -579,17 +616,12 @@ CONFIG_LEGACY_PTY_COUNT=256
579# CONFIG_GEN_RTC is not set 616# CONFIG_GEN_RTC is not set
580# CONFIG_DTLK is not set 617# CONFIG_DTLK is not set
581# CONFIG_R3964 is not set 618# CONFIG_R3964 is not set
582
583#
584# Ftape, the floppy tape device driver
585#
586# CONFIG_RAW_DRIVER is not set 619# CONFIG_RAW_DRIVER is not set
587 620
588# 621#
589# TPM devices 622# TPM devices
590# 623#
591# CONFIG_TCG_TPM is not set 624# CONFIG_TCG_TPM is not set
592# CONFIG_TELCLOCK is not set
593 625
594# 626#
595# I2C support 627# I2C support
@@ -605,6 +637,7 @@ CONFIG_LEGACY_PTY_COUNT=256
605# 637#
606# Dallas's 1-wire bus 638# Dallas's 1-wire bus
607# 639#
640# CONFIG_W1 is not set
608 641
609# 642#
610# Hardware Monitoring support 643# Hardware Monitoring support
@@ -613,14 +646,9 @@ CONFIG_LEGACY_PTY_COUNT=256
613# CONFIG_HWMON_VID is not set 646# CONFIG_HWMON_VID is not set
614 647
615# 648#
616# Misc devices
617#
618
619#
620# Multimedia devices 649# Multimedia devices
621# 650#
622# CONFIG_VIDEO_DEV is not set 651# CONFIG_VIDEO_DEV is not set
623CONFIG_VIDEO_V4L2=y
624 652
625# 653#
626# Digital Video Broadcasting Devices 654# Digital Video Broadcasting Devices
@@ -639,6 +667,11 @@ CONFIG_VIDEO_V4L2=y
639# CONFIG_SOUND is not set 667# CONFIG_SOUND is not set
640 668
641# 669#
670# HID Devices
671#
672# CONFIG_HID is not set
673
674#
642# USB support 675# USB support
643# 676#
644# CONFIG_USB_ARCH_HAS_HCD is not set 677# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -699,16 +732,26 @@ CONFIG_VIDEO_V4L2=y
699# 732#
700 733
701# 734#
735# Auxiliary Display support
736#
737
738#
739# Virtualization
740#
741
742#
702# File systems 743# File systems
703# 744#
704CONFIG_EXT2_FS=y 745CONFIG_EXT2_FS=y
705# CONFIG_EXT2_FS_XATTR is not set 746# CONFIG_EXT2_FS_XATTR is not set
706# CONFIG_EXT2_FS_XIP is not set 747# CONFIG_EXT2_FS_XIP is not set
707# CONFIG_EXT3_FS is not set 748# CONFIG_EXT3_FS is not set
749# CONFIG_EXT4DEV_FS is not set
708# CONFIG_REISERFS_FS is not set 750# CONFIG_REISERFS_FS is not set
709# CONFIG_JFS_FS is not set 751# CONFIG_JFS_FS is not set
710# CONFIG_FS_POSIX_ACL is not set 752# CONFIG_FS_POSIX_ACL is not set
711# CONFIG_XFS_FS is not set 753# CONFIG_XFS_FS is not set
754# CONFIG_GFS2_FS is not set
712# CONFIG_MINIX_FS is not set 755# CONFIG_MINIX_FS is not set
713CONFIG_ROMFS_FS=y 756CONFIG_ROMFS_FS=y
714# CONFIG_INOTIFY is not set 757# CONFIG_INOTIFY is not set
@@ -736,6 +779,7 @@ CONFIG_ROMFS_FS=y
736# 779#
737CONFIG_PROC_FS=y 780CONFIG_PROC_FS=y
738# CONFIG_PROC_KCORE is not set 781# CONFIG_PROC_KCORE is not set
782CONFIG_PROC_SYSCTL=y
739# CONFIG_SYSFS is not set 783# CONFIG_SYSFS is not set
740# CONFIG_TMPFS is not set 784# CONFIG_TMPFS is not set
741# CONFIG_HUGETLB_PAGE is not set 785# CONFIG_HUGETLB_PAGE is not set
@@ -776,7 +820,6 @@ CONFIG_SUNRPC=y
776# CONFIG_RPCSEC_GSS_SPKM3 is not set 820# CONFIG_RPCSEC_GSS_SPKM3 is not set
777# CONFIG_SMB_FS is not set 821# CONFIG_SMB_FS is not set
778# CONFIG_CIFS is not set 822# CONFIG_CIFS is not set
779# CONFIG_CIFS_DEBUG2 is not set
780# CONFIG_NCP_FS is not set 823# CONFIG_NCP_FS is not set
781# CONFIG_CODA_FS is not set 824# CONFIG_CODA_FS is not set
782# CONFIG_AFS_FS is not set 825# CONFIG_AFS_FS is not set
@@ -794,6 +837,10 @@ CONFIG_MSDOS_PARTITION=y
794# CONFIG_NLS is not set 837# CONFIG_NLS is not set
795 838
796# 839#
840# Distributed Lock Manager
841#
842
843#
797# Profiling support 844# Profiling support
798# 845#
799# CONFIG_PROFILING is not set 846# CONFIG_PROFILING is not set
@@ -803,29 +850,34 @@ CONFIG_MSDOS_PARTITION=y
803# 850#
804CONFIG_TRACE_IRQFLAGS_SUPPORT=y 851CONFIG_TRACE_IRQFLAGS_SUPPORT=y
805# CONFIG_PRINTK_TIME is not set 852# CONFIG_PRINTK_TIME is not set
853CONFIG_ENABLE_MUST_CHECK=y
806# CONFIG_MAGIC_SYSRQ is not set 854# CONFIG_MAGIC_SYSRQ is not set
807# CONFIG_UNUSED_SYMBOLS is not set 855# CONFIG_UNUSED_SYMBOLS is not set
856# CONFIG_HEADERS_CHECK is not set
808CONFIG_DEBUG_KERNEL=y 857CONFIG_DEBUG_KERNEL=y
858# CONFIG_DEBUG_SHIRQ is not set
809CONFIG_LOG_BUF_SHIFT=14 859CONFIG_LOG_BUF_SHIFT=14
810# CONFIG_DETECT_SOFTLOCKUP is not set 860# CONFIG_DETECT_SOFTLOCKUP is not set
811# CONFIG_SCHEDSTATS is not set 861# CONFIG_SCHEDSTATS is not set
862# CONFIG_TIMER_STATS is not set
812# CONFIG_DEBUG_SLAB is not set 863# CONFIG_DEBUG_SLAB is not set
813# CONFIG_DEBUG_RT_MUTEXES is not set 864# CONFIG_DEBUG_RT_MUTEXES is not set
814# CONFIG_RT_MUTEX_TESTER is not set 865# CONFIG_RT_MUTEX_TESTER is not set
815# CONFIG_DEBUG_SPINLOCK is not set 866# CONFIG_DEBUG_SPINLOCK is not set
816CONFIG_DEBUG_MUTEXES=y 867CONFIG_DEBUG_MUTEXES=y
817# CONFIG_DEBUG_RWSEMS is not set 868# CONFIG_DEBUG_LOCK_ALLOC is not set
869# CONFIG_PROVE_LOCKING is not set
818# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 870# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
819# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 871# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
820# CONFIG_DEBUG_KOBJECT is not set 872# CONFIG_DEBUG_KOBJECT is not set
821CONFIG_DEBUG_INFO=y 873CONFIG_DEBUG_INFO=y
822# CONFIG_DEBUG_VM is not set 874# CONFIG_DEBUG_VM is not set
875# CONFIG_DEBUG_LIST is not set
823CONFIG_FORCED_INLINING=y 876CONFIG_FORCED_INLINING=y
824# CONFIG_RCU_TORTURE_TEST is not set 877# CONFIG_RCU_TORTURE_TEST is not set
825CONFIG_CROSSCOMPILE=y 878CONFIG_CROSSCOMPILE=y
826CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" 879CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp"
827# CONFIG_DEBUG_STACK_USAGE is not set 880# CONFIG_DEBUG_STACK_USAGE is not set
828# CONFIG_KGDB is not set
829# CONFIG_RUNTIME_DEBUG is not set 881# CONFIG_RUNTIME_DEBUG is not set
830# CONFIG_MIPS_UNCACHED is not set 882# CONFIG_MIPS_UNCACHED is not set
831 883
@@ -838,7 +890,12 @@ CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp"
838# Cryptographic options 890# Cryptographic options
839# 891#
840CONFIG_CRYPTO=y 892CONFIG_CRYPTO=y
893CONFIG_CRYPTO_ALGAPI=y
894CONFIG_CRYPTO_BLKCIPHER=m
895CONFIG_CRYPTO_HASH=y
896CONFIG_CRYPTO_MANAGER=y
841CONFIG_CRYPTO_HMAC=y 897CONFIG_CRYPTO_HMAC=y
898CONFIG_CRYPTO_XCBC=m
842# CONFIG_CRYPTO_NULL is not set 899# CONFIG_CRYPTO_NULL is not set
843# CONFIG_CRYPTO_MD4 is not set 900# CONFIG_CRYPTO_MD4 is not set
844CONFIG_CRYPTO_MD5=y 901CONFIG_CRYPTO_MD5=y
@@ -847,7 +904,13 @@ CONFIG_CRYPTO_MD5=y
847# CONFIG_CRYPTO_SHA512 is not set 904# CONFIG_CRYPTO_SHA512 is not set
848# CONFIG_CRYPTO_WP512 is not set 905# CONFIG_CRYPTO_WP512 is not set
849# CONFIG_CRYPTO_TGR192 is not set 906# CONFIG_CRYPTO_TGR192 is not set
907CONFIG_CRYPTO_GF128MUL=m
908CONFIG_CRYPTO_ECB=m
909CONFIG_CRYPTO_CBC=m
910CONFIG_CRYPTO_PCBC=m
911CONFIG_CRYPTO_LRW=m
850# CONFIG_CRYPTO_DES is not set 912# CONFIG_CRYPTO_DES is not set
913CONFIG_CRYPTO_FCRYPT=m
851# CONFIG_CRYPTO_BLOWFISH is not set 914# CONFIG_CRYPTO_BLOWFISH is not set
852# CONFIG_CRYPTO_TWOFISH is not set 915# CONFIG_CRYPTO_TWOFISH is not set
853# CONFIG_CRYPTO_SERPENT is not set 916# CONFIG_CRYPTO_SERPENT is not set
@@ -861,6 +924,7 @@ CONFIG_CRYPTO_MD5=y
861# CONFIG_CRYPTO_DEFLATE is not set 924# CONFIG_CRYPTO_DEFLATE is not set
862# CONFIG_CRYPTO_MICHAEL_MIC is not set 925# CONFIG_CRYPTO_MICHAEL_MIC is not set
863# CONFIG_CRYPTO_CRC32C is not set 926# CONFIG_CRYPTO_CRC32C is not set
927CONFIG_CRYPTO_CAMELLIA=m
864# CONFIG_CRYPTO_TEST is not set 928# CONFIG_CRYPTO_TEST is not set
865 929
866# 930#
@@ -870,8 +934,11 @@ CONFIG_CRYPTO_MD5=y
870# 934#
871# Library routines 935# Library routines
872# 936#
937CONFIG_BITREVERSE=y
873# CONFIG_CRC_CCITT is not set 938# CONFIG_CRC_CCITT is not set
874CONFIG_CRC16=y 939CONFIG_CRC16=y
875CONFIG_CRC32=y 940CONFIG_CRC32=y
876# CONFIG_LIBCRC32C is not set 941# CONFIG_LIBCRC32C is not set
877CONFIG_PLIST=y 942CONFIG_PLIST=y
943CONFIG_HAS_IOMEM=y
944CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index e4221aafbc4c..ad5c0bf87b2b 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc2 3# Linux kernel version: 2.6.20
4# Tue Jul 25 23:16:46 2006 4# Tue Feb 20 21:47:35 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 45CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -71,10 +70,14 @@ CONFIG_VICTOR_MPC30X=y
71# CONFIG_ZAO_CAPCELLA is not set 70# CONFIG_ZAO_CAPCELLA is not set
72CONFIG_PCI_VR41XX=y 71CONFIG_PCI_VR41XX=y
73CONFIG_RWSEM_GENERIC_SPINLOCK=y 72CONFIG_RWSEM_GENERIC_SPINLOCK=y
73# CONFIG_ARCH_HAS_ILOG2_U32 is not set
74# CONFIG_ARCH_HAS_ILOG2_U64 is not set
74CONFIG_GENERIC_FIND_NEXT_BIT=y 75CONFIG_GENERIC_FIND_NEXT_BIT=y
75CONFIG_GENERIC_HWEIGHT=y 76CONFIG_GENERIC_HWEIGHT=y
76CONFIG_GENERIC_CALIBRATE_DELAY=y 77CONFIG_GENERIC_CALIBRATE_DELAY=y
78CONFIG_GENERIC_TIME=y
77CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 79CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
80CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
78CONFIG_DMA_NONCOHERENT=y 81CONFIG_DMA_NONCOHERENT=y
79CONFIG_DMA_NEED_PCI_MAP_STATE=y 82CONFIG_DMA_NEED_PCI_MAP_STATE=y
80# CONFIG_CPU_BIG_ENDIAN is not set 83# CONFIG_CPU_BIG_ENDIAN is not set
@@ -107,6 +110,7 @@ CONFIG_CPU_VR41XX=y
107# CONFIG_CPU_SB1 is not set 110# CONFIG_CPU_SB1 is not set
108CONFIG_SYS_HAS_CPU_VR41XX=y 111CONFIG_SYS_HAS_CPU_VR41XX=y
109CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
113CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 115CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
112 116
@@ -120,8 +124,8 @@ CONFIG_PAGE_SIZE_4KB=y
120# CONFIG_PAGE_SIZE_16KB is not set 124# CONFIG_PAGE_SIZE_16KB is not set
121# CONFIG_PAGE_SIZE_64KB is not set 125# CONFIG_PAGE_SIZE_64KB is not set
122CONFIG_MIPS_MT_DISABLED=y 126CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_MT_SMP is not set 127# CONFIG_MIPS_MT_SMP is not set
128# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set 129# CONFIG_MIPS_VPE_LOADER is not set
126CONFIG_CPU_HAS_SYNC=y 130CONFIG_CPU_HAS_SYNC=y
127CONFIG_GENERIC_HARDIRQS=y 131CONFIG_GENERIC_HARDIRQS=y
@@ -136,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -148,6 +153,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,16 +172,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 173CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
171# CONFIG_TASKSTATS is not set 179# CONFIG_TASKSTATS is not set
172CONFIG_SYSCTL=y 180# CONFIG_UTS_NS is not set
173# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
174# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
175CONFIG_RELAY=y 184CONFIG_RELAY=y
176CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
178CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
179CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
181CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -183,12 +193,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 193CONFIG_BUG=y
184CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 196CONFIG_FUTEX=y
188CONFIG_EPOLL=y 197CONFIG_EPOLL=y
189CONFIG_SHMEM=y 198CONFIG_SHMEM=y
190CONFIG_SLAB=y 199CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -206,6 +216,7 @@ CONFIG_KMOD=y
206# 216#
207# Block layer 217# Block layer
208# 218#
219CONFIG_BLOCK=y
209# CONFIG_LBD is not set 220# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -261,6 +272,14 @@ CONFIG_BINFMT_ELF=y
261CONFIG_TRAD_SIGNALS=y 272CONFIG_TRAD_SIGNALS=y
262 273
263# 274#
275# Power management options
276#
277CONFIG_PM=y
278# CONFIG_PM_LEGACY is not set
279# CONFIG_PM_DEBUG is not set
280# CONFIG_PM_SYSFS_DEPRECATED is not set
281
282#
264# Networking 283# Networking
265# 284#
266CONFIG_NET=y 285CONFIG_NET=y
@@ -274,7 +293,10 @@ CONFIG_PACKET_MMAP=y
274CONFIG_UNIX=y 293CONFIG_UNIX=y
275CONFIG_XFRM=y 294CONFIG_XFRM=y
276CONFIG_XFRM_USER=m 295CONFIG_XFRM_USER=m
296# CONFIG_XFRM_SUB_POLICY is not set
297CONFIG_XFRM_MIGRATE=y
277CONFIG_NET_KEY=y 298CONFIG_NET_KEY=y
299CONFIG_NET_KEY_MIGRATE=y
278CONFIG_INET=y 300CONFIG_INET=y
279CONFIG_IP_MULTICAST=y 301CONFIG_IP_MULTICAST=y
280# CONFIG_IP_ADVANCED_ROUTER is not set 302# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -292,10 +314,13 @@ CONFIG_IP_FIB_HASH=y
292# CONFIG_INET_TUNNEL is not set 314# CONFIG_INET_TUNNEL is not set
293CONFIG_INET_XFRM_MODE_TRANSPORT=m 315CONFIG_INET_XFRM_MODE_TRANSPORT=m
294CONFIG_INET_XFRM_MODE_TUNNEL=m 316CONFIG_INET_XFRM_MODE_TUNNEL=m
317CONFIG_INET_XFRM_MODE_BEET=m
295CONFIG_INET_DIAG=y 318CONFIG_INET_DIAG=y
296CONFIG_INET_TCP_DIAG=y 319CONFIG_INET_TCP_DIAG=y
297# CONFIG_TCP_CONG_ADVANCED is not set 320# CONFIG_TCP_CONG_ADVANCED is not set
298CONFIG_TCP_CONG_BIC=y 321CONFIG_TCP_CONG_CUBIC=y
322CONFIG_DEFAULT_TCP_CONG="cubic"
323CONFIG_TCP_MD5SIG=y
299# CONFIG_IPV6 is not set 324# CONFIG_IPV6 is not set
300# CONFIG_INET6_XFRM_TUNNEL is not set 325# CONFIG_INET6_XFRM_TUNNEL is not set
301# CONFIG_INET6_TUNNEL is not set 326# CONFIG_INET6_TUNNEL is not set
@@ -325,7 +350,6 @@ CONFIG_NETWORK_SECMARK=y
325# CONFIG_ATALK is not set 350# CONFIG_ATALK is not set
326# CONFIG_X25 is not set 351# CONFIG_X25 is not set
327# CONFIG_LAPB is not set 352# CONFIG_LAPB is not set
328# CONFIG_NET_DIVERT is not set
329# CONFIG_ECONET is not set 353# CONFIG_ECONET is not set
330# CONFIG_WAN_ROUTER is not set 354# CONFIG_WAN_ROUTER is not set
331 355
@@ -380,6 +404,7 @@ CONFIG_CONNECTOR=m
380# 404#
381# Plug and Play support 405# Plug and Play support
382# 406#
407# CONFIG_PNPACPI is not set
383 408
384# 409#
385# Block devices 410# Block devices
@@ -399,9 +424,16 @@ CONFIG_CONNECTOR=m
399CONFIG_ATA_OVER_ETH=m 424CONFIG_ATA_OVER_ETH=m
400 425
401# 426#
427# Misc devices
428#
429CONFIG_SGI_IOC4=m
430# CONFIG_TIFM_CORE is not set
431
432#
402# ATA/ATAPI/MFM/RLL support 433# ATA/ATAPI/MFM/RLL support
403# 434#
404CONFIG_IDE=y 435CONFIG_IDE=y
436CONFIG_IDE_MAX_HWIFS=4
405CONFIG_BLK_DEV_IDE=y 437CONFIG_BLK_DEV_IDE=y
406 438
407# 439#
@@ -431,6 +463,12 @@ CONFIG_IDE_GENERIC=y
431# 463#
432# CONFIG_RAID_ATTRS is not set 464# CONFIG_RAID_ATTRS is not set
433# CONFIG_SCSI is not set 465# CONFIG_SCSI is not set
466# CONFIG_SCSI_NETLINK is not set
467
468#
469# Serial ATA (prod) and Parallel ATA (experimental) drivers
470#
471# CONFIG_ATA is not set
434 472
435# 473#
436# Multi-device support (RAID and LVM) 474# Multi-device support (RAID and LVM)
@@ -492,14 +530,18 @@ CONFIG_MII=m
492# CONFIG_SK98LIN is not set 530# CONFIG_SK98LIN is not set
493# CONFIG_TIGON3 is not set 531# CONFIG_TIGON3 is not set
494# CONFIG_BNX2 is not set 532# CONFIG_BNX2 is not set
533CONFIG_QLA3XXX=m
534# CONFIG_ATL1 is not set
495 535
496# 536#
497# Ethernet (10000 Mbit) 537# Ethernet (10000 Mbit)
498# 538#
499# CONFIG_CHELSIO_T1 is not set 539# CONFIG_CHELSIO_T1 is not set
540CONFIG_CHELSIO_T3=m
500# CONFIG_IXGB is not set 541# CONFIG_IXGB is not set
501# CONFIG_S2IO is not set 542# CONFIG_S2IO is not set
502# CONFIG_MYRI10GE is not set 543# CONFIG_MYRI10GE is not set
544CONFIG_NETXEN_NIC=m
503 545
504# 546#
505# Token Ring devices 547# Token Ring devices
@@ -594,6 +636,7 @@ CONFIG_PCMCIA_AXNET=m
594# Input device support 636# Input device support
595# 637#
596CONFIG_INPUT=y 638CONFIG_INPUT=y
639# CONFIG_INPUT_FF_MEMLESS is not set
597 640
598# 641#
599# Userland interfaces 642# Userland interfaces
@@ -665,10 +708,6 @@ CONFIG_LEGACY_PTY_COUNT=256
665# CONFIG_DTLK is not set 708# CONFIG_DTLK is not set
666# CONFIG_R3964 is not set 709# CONFIG_R3964 is not set
667# CONFIG_APPLICOM is not set 710# CONFIG_APPLICOM is not set
668
669#
670# Ftape, the floppy tape device driver
671#
672# CONFIG_DRM is not set 711# CONFIG_DRM is not set
673 712
674# 713#
@@ -684,7 +723,6 @@ CONFIG_LEGACY_PTY_COUNT=256
684# TPM devices 723# TPM devices
685# 724#
686# CONFIG_TCG_TPM is not set 725# CONFIG_TCG_TPM is not set
687# CONFIG_TELCLOCK is not set
688 726
689# 727#
690# I2C support 728# I2C support
@@ -709,14 +747,9 @@ CONFIG_LEGACY_PTY_COUNT=256
709# CONFIG_HWMON_VID is not set 747# CONFIG_HWMON_VID is not set
710 748
711# 749#
712# Misc devices
713#
714
715#
716# Multimedia devices 750# Multimedia devices
717# 751#
718# CONFIG_VIDEO_DEV is not set 752# CONFIG_VIDEO_DEV is not set
719CONFIG_VIDEO_V4L2=y
720 753
721# 754#
722# Digital Video Broadcasting Devices 755# Digital Video Broadcasting Devices
@@ -735,6 +768,7 @@ CONFIG_VIDEO_V4L2=y
735# 768#
736# CONFIG_VGA_CONSOLE is not set 769# CONFIG_VGA_CONSOLE is not set
737CONFIG_DUMMY_CONSOLE=y 770CONFIG_DUMMY_CONSOLE=y
771# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
738 772
739# 773#
740# Sound 774# Sound
@@ -742,6 +776,12 @@ CONFIG_DUMMY_CONSOLE=y
742# CONFIG_SOUND is not set 776# CONFIG_SOUND is not set
743 777
744# 778#
779# HID Devices
780#
781CONFIG_HID=y
782# CONFIG_HID_DEBUG is not set
783
784#
745# USB support 785# USB support
746# 786#
747CONFIG_USB_ARCH_HAS_HCD=y 787CONFIG_USB_ARCH_HAS_HCD=y
@@ -754,8 +794,8 @@ CONFIG_USB=m
754# Miscellaneous USB options 794# Miscellaneous USB options
755# 795#
756CONFIG_USB_DEVICEFS=y 796CONFIG_USB_DEVICEFS=y
757# CONFIG_USB_BANDWIDTH is not set
758# CONFIG_USB_DYNAMIC_MINORS is not set 797# CONFIG_USB_DYNAMIC_MINORS is not set
798# CONFIG_USB_SUSPEND is not set
759# CONFIG_USB_OTG is not set 799# CONFIG_USB_OTG is not set
760 800
761# 801#
@@ -764,7 +804,8 @@ CONFIG_USB_DEVICEFS=y
764# CONFIG_USB_EHCI_HCD is not set 804# CONFIG_USB_EHCI_HCD is not set
765# CONFIG_USB_ISP116X_HCD is not set 805# CONFIG_USB_ISP116X_HCD is not set
766CONFIG_USB_OHCI_HCD=m 806CONFIG_USB_OHCI_HCD=m
767# CONFIG_USB_OHCI_BIG_ENDIAN is not set 807# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
808# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
768CONFIG_USB_OHCI_LITTLE_ENDIAN=y 809CONFIG_USB_OHCI_LITTLE_ENDIAN=y
769# CONFIG_USB_UHCI_HCD is not set 810# CONFIG_USB_UHCI_HCD is not set
770# CONFIG_USB_SL811_HCD is not set 811# CONFIG_USB_SL811_HCD is not set
@@ -782,7 +823,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
782# 823#
783# may also be needed; see USB_STORAGE Help for more information 824# may also be needed; see USB_STORAGE Help for more information
784# 825#
785# CONFIG_USB_STORAGE is not set
786# CONFIG_USB_LIBUSUAL is not set 826# CONFIG_USB_LIBUSUAL is not set
787 827
788# 828#
@@ -807,6 +847,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
807# CONFIG_USB_ATI_REMOTE2 is not set 847# CONFIG_USB_ATI_REMOTE2 is not set
808# CONFIG_USB_KEYSPAN_REMOTE is not set 848# CONFIG_USB_KEYSPAN_REMOTE is not set
809# CONFIG_USB_APPLETOUCH is not set 849# CONFIG_USB_APPLETOUCH is not set
850# CONFIG_USB_GTCO is not set
810 851
811# 852#
812# USB Imaging devices 853# USB Imaging devices
@@ -820,6 +861,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
820# CONFIG_USB_KAWETH is not set 861# CONFIG_USB_KAWETH is not set
821CONFIG_USB_PEGASUS=m 862CONFIG_USB_PEGASUS=m
822# CONFIG_USB_RTL8150 is not set 863# CONFIG_USB_RTL8150 is not set
864# CONFIG_USB_USBNET_MII is not set
823# CONFIG_USB_USBNET is not set 865# CONFIG_USB_USBNET is not set
824# CONFIG_USB_MON is not set 866# CONFIG_USB_MON is not set
825 867
@@ -837,18 +879,21 @@ CONFIG_USB_PEGASUS=m
837# 879#
838# CONFIG_USB_EMI62 is not set 880# CONFIG_USB_EMI62 is not set
839# CONFIG_USB_EMI26 is not set 881# CONFIG_USB_EMI26 is not set
882# CONFIG_USB_ADUTUX is not set
840# CONFIG_USB_AUERSWALD is not set 883# CONFIG_USB_AUERSWALD is not set
841# CONFIG_USB_RIO500 is not set 884# CONFIG_USB_RIO500 is not set
842# CONFIG_USB_LEGOTOWER is not set 885# CONFIG_USB_LEGOTOWER is not set
843# CONFIG_USB_LCD is not set 886# CONFIG_USB_LCD is not set
887# CONFIG_USB_BERRY_CHARGE is not set
844# CONFIG_USB_LED is not set 888# CONFIG_USB_LED is not set
845# CONFIG_USB_CYPRESS_CY7C63 is not set 889# CONFIG_USB_CYPRESS_CY7C63 is not set
846# CONFIG_USB_CYTHERM is not set 890# CONFIG_USB_CYTHERM is not set
847# CONFIG_USB_PHIDGETKIT is not set 891# CONFIG_USB_PHIDGET is not set
848# CONFIG_USB_PHIDGETSERVO is not set
849# CONFIG_USB_IDMOUSE is not set 892# CONFIG_USB_IDMOUSE is not set
893# CONFIG_USB_FTDI_ELAN is not set
850# CONFIG_USB_APPLEDISPLAY is not set 894# CONFIG_USB_APPLEDISPLAY is not set
851# CONFIG_USB_LD is not set 895# CONFIG_USB_LD is not set
896# CONFIG_USB_TRANCEVIBRATOR is not set
852# CONFIG_USB_TEST is not set 897# CONFIG_USB_TEST is not set
853 898
854# 899#
@@ -906,16 +951,26 @@ CONFIG_USB_PEGASUS=m
906# 951#
907 952
908# 953#
954# Auxiliary Display support
955#
956
957#
958# Virtualization
959#
960
961#
909# File systems 962# File systems
910# 963#
911CONFIG_EXT2_FS=y 964CONFIG_EXT2_FS=y
912# CONFIG_EXT2_FS_XATTR is not set 965# CONFIG_EXT2_FS_XATTR is not set
913# CONFIG_EXT2_FS_XIP is not set 966# CONFIG_EXT2_FS_XIP is not set
914# CONFIG_EXT3_FS is not set 967# CONFIG_EXT3_FS is not set
968# CONFIG_EXT4DEV_FS is not set
915# CONFIG_REISERFS_FS is not set 969# CONFIG_REISERFS_FS is not set
916# CONFIG_JFS_FS is not set 970# CONFIG_JFS_FS is not set
917# CONFIG_FS_POSIX_ACL is not set 971# CONFIG_FS_POSIX_ACL is not set
918# CONFIG_XFS_FS is not set 972# CONFIG_XFS_FS is not set
973# CONFIG_GFS2_FS is not set
919# CONFIG_OCFS2_FS is not set 974# CONFIG_OCFS2_FS is not set
920# CONFIG_MINIX_FS is not set 975# CONFIG_MINIX_FS is not set
921# CONFIG_ROMFS_FS is not set 976# CONFIG_ROMFS_FS is not set
@@ -945,17 +1000,19 @@ CONFIG_FUSE_FS=m
945# 1000#
946CONFIG_PROC_FS=y 1001CONFIG_PROC_FS=y
947CONFIG_PROC_KCORE=y 1002CONFIG_PROC_KCORE=y
1003CONFIG_PROC_SYSCTL=y
948CONFIG_SYSFS=y 1004CONFIG_SYSFS=y
949# CONFIG_TMPFS is not set 1005# CONFIG_TMPFS is not set
950# CONFIG_HUGETLB_PAGE is not set 1006# CONFIG_HUGETLB_PAGE is not set
951CONFIG_RAMFS=y 1007CONFIG_RAMFS=y
952# CONFIG_CONFIGFS_FS is not set 1008CONFIG_CONFIGFS_FS=m
953 1009
954# 1010#
955# Miscellaneous filesystems 1011# Miscellaneous filesystems
956# 1012#
957# CONFIG_ADFS_FS is not set 1013# CONFIG_ADFS_FS is not set
958# CONFIG_AFFS_FS is not set 1014# CONFIG_AFFS_FS is not set
1015# CONFIG_ECRYPT_FS is not set
959# CONFIG_HFS_FS is not set 1016# CONFIG_HFS_FS is not set
960# CONFIG_HFSPLUS_FS is not set 1017# CONFIG_HFSPLUS_FS is not set
961# CONFIG_BEFS_FS is not set 1018# CONFIG_BEFS_FS is not set
@@ -1000,6 +1057,14 @@ CONFIG_MSDOS_PARTITION=y
1000# CONFIG_NLS is not set 1057# CONFIG_NLS is not set
1001 1058
1002# 1059#
1060# Distributed Lock Manager
1061#
1062CONFIG_DLM=m
1063CONFIG_DLM_TCP=y
1064# CONFIG_DLM_SCTP is not set
1065# CONFIG_DLM_DEBUG is not set
1066
1067#
1003# Profiling support 1068# Profiling support
1004# 1069#
1005# CONFIG_PROFILING is not set 1070# CONFIG_PROFILING is not set
@@ -1009,11 +1074,13 @@ CONFIG_MSDOS_PARTITION=y
1009# 1074#
1010CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1075CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1011# CONFIG_PRINTK_TIME is not set 1076# CONFIG_PRINTK_TIME is not set
1077CONFIG_ENABLE_MUST_CHECK=y
1012# CONFIG_MAGIC_SYSRQ is not set 1078# CONFIG_MAGIC_SYSRQ is not set
1013# CONFIG_UNUSED_SYMBOLS is not set 1079# CONFIG_UNUSED_SYMBOLS is not set
1080# CONFIG_DEBUG_FS is not set
1081# CONFIG_HEADERS_CHECK is not set
1014# CONFIG_DEBUG_KERNEL is not set 1082# CONFIG_DEBUG_KERNEL is not set
1015CONFIG_LOG_BUF_SHIFT=14 1083CONFIG_LOG_BUF_SHIFT=14
1016# CONFIG_DEBUG_FS is not set
1017CONFIG_CROSSCOMPILE=y 1084CONFIG_CROSSCOMPILE=y
1018CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" 1085CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73"
1019 1086
@@ -1028,18 +1095,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1028# Cryptographic options 1095# Cryptographic options
1029# 1096#
1030CONFIG_CRYPTO=y 1097CONFIG_CRYPTO=y
1098CONFIG_CRYPTO_ALGAPI=y
1099CONFIG_CRYPTO_BLKCIPHER=m
1100CONFIG_CRYPTO_HASH=y
1101CONFIG_CRYPTO_MANAGER=y
1031CONFIG_CRYPTO_HMAC=y 1102CONFIG_CRYPTO_HMAC=y
1103CONFIG_CRYPTO_XCBC=m
1032CONFIG_CRYPTO_NULL=m 1104CONFIG_CRYPTO_NULL=m
1033CONFIG_CRYPTO_MD4=m 1105CONFIG_CRYPTO_MD4=m
1034CONFIG_CRYPTO_MD5=m 1106CONFIG_CRYPTO_MD5=y
1035CONFIG_CRYPTO_SHA1=m 1107CONFIG_CRYPTO_SHA1=m
1036CONFIG_CRYPTO_SHA256=m 1108CONFIG_CRYPTO_SHA256=m
1037CONFIG_CRYPTO_SHA512=m 1109CONFIG_CRYPTO_SHA512=m
1038CONFIG_CRYPTO_WP512=m 1110CONFIG_CRYPTO_WP512=m
1039CONFIG_CRYPTO_TGR192=m 1111CONFIG_CRYPTO_TGR192=m
1112CONFIG_CRYPTO_GF128MUL=m
1113CONFIG_CRYPTO_ECB=m
1114CONFIG_CRYPTO_CBC=m
1115CONFIG_CRYPTO_PCBC=m
1116CONFIG_CRYPTO_LRW=m
1040CONFIG_CRYPTO_DES=m 1117CONFIG_CRYPTO_DES=m
1118CONFIG_CRYPTO_FCRYPT=m
1041CONFIG_CRYPTO_BLOWFISH=m 1119CONFIG_CRYPTO_BLOWFISH=m
1042CONFIG_CRYPTO_TWOFISH=m 1120CONFIG_CRYPTO_TWOFISH=m
1121CONFIG_CRYPTO_TWOFISH_COMMON=m
1043CONFIG_CRYPTO_SERPENT=m 1122CONFIG_CRYPTO_SERPENT=m
1044CONFIG_CRYPTO_AES=m 1123CONFIG_CRYPTO_AES=m
1045CONFIG_CRYPTO_CAST5=m 1124CONFIG_CRYPTO_CAST5=m
@@ -1051,6 +1130,7 @@ CONFIG_CRYPTO_ANUBIS=m
1051CONFIG_CRYPTO_DEFLATE=m 1130CONFIG_CRYPTO_DEFLATE=m
1052CONFIG_CRYPTO_MICHAEL_MIC=m 1131CONFIG_CRYPTO_MICHAEL_MIC=m
1053CONFIG_CRYPTO_CRC32C=m 1132CONFIG_CRYPTO_CRC32C=m
1133CONFIG_CRYPTO_CAMELLIA=m
1054# CONFIG_CRYPTO_TEST is not set 1134# CONFIG_CRYPTO_TEST is not set
1055 1135
1056# 1136#
@@ -1060,6 +1140,7 @@ CONFIG_CRYPTO_CRC32C=m
1060# 1140#
1061# Library routines 1141# Library routines
1062# 1142#
1143CONFIG_BITREVERSE=y
1063# CONFIG_CRC_CCITT is not set 1144# CONFIG_CRC_CCITT is not set
1064CONFIG_CRC16=m 1145CONFIG_CRC16=m
1065CONFIG_CRC32=y 1146CONFIG_CRC32=y
@@ -1067,3 +1148,5 @@ CONFIG_LIBCRC32C=m
1067CONFIG_ZLIB_INFLATE=m 1148CONFIG_ZLIB_INFLATE=m
1068CONFIG_ZLIB_DEFLATE=m 1149CONFIG_ZLIB_DEFLATE=m
1069CONFIG_PLIST=y 1150CONFIG_PLIST=y
1151CONFIG_HAS_IOMEM=y
1152CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index 32b1afdd1c20..28547313ce13 100644
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/ocelot_3_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:15 2006 4# Tue Feb 20 21:47:35 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MOMENCO_OCELOT_3=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_MOMENCO_OCELOT_3=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
@@ -104,6 +107,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
104CONFIG_CPU_RM9000=y 107CONFIG_CPU_RM9000=y
105# CONFIG_CPU_SB1 is not set 108# CONFIG_CPU_SB1 is not set
106CONFIG_SYS_HAS_CPU_RM9000=y 109CONFIG_SYS_HAS_CPU_RM9000=y
110CONFIG_WEAK_ORDERING=y
107CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 111CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
108CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -122,8 +126,8 @@ CONFIG_BOARD_SCACHE=y
122CONFIG_RM7000_CPU_SCACHE=y 126CONFIG_RM7000_CPU_SCACHE=y
123CONFIG_CPU_HAS_PREFETCH=y 127CONFIG_CPU_HAS_PREFETCH=y
124CONFIG_MIPS_MT_DISABLED=y 128CONFIG_MIPS_MT_DISABLED=y
125# CONFIG_MIPS_MT_SMTC is not set
126# CONFIG_MIPS_MT_SMP is not set 129# CONFIG_MIPS_MT_SMP is not set
130# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_VPE_LOADER is not set 131# CONFIG_MIPS_VPE_LOADER is not set
128# CONFIG_64BIT_PHYS_ADDR is not set 132# CONFIG_64BIT_PHYS_ADDR is not set
129CONFIG_CPU_HAS_LLSC=y 133CONFIG_CPU_HAS_LLSC=y
@@ -141,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set 147# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 149# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 150# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 151# CONFIG_HZ_128 is not set
@@ -153,6 +158,7 @@ CONFIG_HZ=1000
153CONFIG_PREEMPT_NONE=y 158CONFIG_PREEMPT_NONE=y
154# CONFIG_PREEMPT_VOLUNTARY is not set 159# CONFIG_PREEMPT_VOLUNTARY is not set
155# CONFIG_PREEMPT is not set 160# CONFIG_PREEMPT is not set
161# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 162CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 163CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 164CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,16 +177,21 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 177CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 178CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 179CONFIG_SYSVIPC=y
180# CONFIG_IPC_NS is not set
181CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 182# CONFIG_POSIX_MQUEUE is not set
175# CONFIG_BSD_PROCESS_ACCT is not set 183# CONFIG_BSD_PROCESS_ACCT is not set
176CONFIG_SYSCTL=y 184# CONFIG_TASKSTATS is not set
185# CONFIG_UTS_NS is not set
177# CONFIG_AUDIT is not set 186# CONFIG_AUDIT is not set
178CONFIG_IKCONFIG=y 187CONFIG_IKCONFIG=y
179CONFIG_IKCONFIG_PROC=y 188CONFIG_IKCONFIG_PROC=y
189CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 190CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 191# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
192CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 193CONFIG_EMBEDDED=y
194CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 195CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 196# CONFIG_KALLSYMS_EXTRA_PASS is not set
186CONFIG_HOTPLUG=y 197CONFIG_HOTPLUG=y
@@ -188,12 +199,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 199CONFIG_BUG=y
189CONFIG_ELF_CORE=y 200CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 201CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 202CONFIG_FUTEX=y
193CONFIG_EPOLL=y 203CONFIG_EPOLL=y
194CONFIG_SHMEM=y 204CONFIG_SHMEM=y
195CONFIG_SLAB=y 205CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 206CONFIG_VM_EVENT_COUNTERS=y
207CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 208# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 209CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 210# CONFIG_SLOB is not set
@@ -211,6 +222,7 @@ CONFIG_KMOD=y
211# 222#
212# Block layer 223# Block layer
213# 224#
225CONFIG_BLOCK=y
214# CONFIG_LBD is not set 226# CONFIG_LBD is not set
215# CONFIG_BLK_DEV_IO_TRACE is not set 227# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_LSF is not set 228# CONFIG_LSF is not set
@@ -253,6 +265,14 @@ CONFIG_BINFMT_ELF=y
253CONFIG_TRAD_SIGNALS=y 265CONFIG_TRAD_SIGNALS=y
254 266
255# 267#
268# Power management options
269#
270CONFIG_PM=y
271# CONFIG_PM_LEGACY is not set
272# CONFIG_PM_DEBUG is not set
273# CONFIG_PM_SYSFS_DEPRECATED is not set
274
275#
256# Networking 276# Networking
257# 277#
258CONFIG_NET=y 278CONFIG_NET=y
@@ -266,7 +286,10 @@ CONFIG_PACKET=y
266CONFIG_UNIX=y 286CONFIG_UNIX=y
267CONFIG_XFRM=y 287CONFIG_XFRM=y
268# CONFIG_XFRM_USER is not set 288# CONFIG_XFRM_USER is not set
289# CONFIG_XFRM_SUB_POLICY is not set
290CONFIG_XFRM_MIGRATE=y
269CONFIG_NET_KEY=y 291CONFIG_NET_KEY=y
292CONFIG_NET_KEY_MIGRATE=y
270CONFIG_INET=y 293CONFIG_INET=y
271# CONFIG_IP_MULTICAST is not set 294# CONFIG_IP_MULTICAST is not set
272# CONFIG_IP_ADVANCED_ROUTER is not set 295# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -283,13 +306,16 @@ CONFIG_IP_PNP_BOOTP=y
283# CONFIG_INET_ESP is not set 306# CONFIG_INET_ESP is not set
284# CONFIG_INET_IPCOMP is not set 307# CONFIG_INET_IPCOMP is not set
285# CONFIG_INET_XFRM_TUNNEL is not set 308# CONFIG_INET_XFRM_TUNNEL is not set
286# CONFIG_INET_TUNNEL is not set 309CONFIG_INET_TUNNEL=m
287CONFIG_INET_XFRM_MODE_TRANSPORT=m 310CONFIG_INET_XFRM_MODE_TRANSPORT=m
288CONFIG_INET_XFRM_MODE_TUNNEL=m 311CONFIG_INET_XFRM_MODE_TUNNEL=m
312CONFIG_INET_XFRM_MODE_BEET=m
289CONFIG_INET_DIAG=y 313CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y 314CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 315# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_BIC=y 316CONFIG_TCP_CONG_CUBIC=y
317CONFIG_DEFAULT_TCP_CONG="cubic"
318CONFIG_TCP_MD5SIG=y
293 319
294# 320#
295# IP: Virtual Server Configuration 321# IP: Virtual Server Configuration
@@ -302,11 +328,17 @@ CONFIG_IPV6_ROUTE_INFO=y
302# CONFIG_INET6_AH is not set 328# CONFIG_INET6_AH is not set
303# CONFIG_INET6_ESP is not set 329# CONFIG_INET6_ESP is not set
304# CONFIG_INET6_IPCOMP is not set 330# CONFIG_INET6_IPCOMP is not set
331CONFIG_IPV6_MIP6=y
305# CONFIG_INET6_XFRM_TUNNEL is not set 332# CONFIG_INET6_XFRM_TUNNEL is not set
306# CONFIG_INET6_TUNNEL is not set 333# CONFIG_INET6_TUNNEL is not set
307CONFIG_INET6_XFRM_MODE_TRANSPORT=m 334CONFIG_INET6_XFRM_MODE_TRANSPORT=m
308CONFIG_INET6_XFRM_MODE_TUNNEL=m 335CONFIG_INET6_XFRM_MODE_TUNNEL=m
336CONFIG_INET6_XFRM_MODE_BEET=m
337CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
338CONFIG_IPV6_SIT=m
309# CONFIG_IPV6_TUNNEL is not set 339# CONFIG_IPV6_TUNNEL is not set
340CONFIG_IPV6_MULTIPLE_TABLES=y
341CONFIG_IPV6_SUBTREES=y
310CONFIG_NETWORK_SECMARK=y 342CONFIG_NETWORK_SECMARK=y
311CONFIG_NETFILTER=y 343CONFIG_NETFILTER=y
312# CONFIG_NETFILTER_DEBUG is not set 344# CONFIG_NETFILTER_DEBUG is not set
@@ -317,15 +349,42 @@ CONFIG_NETFILTER=y
317CONFIG_NETFILTER_NETLINK=m 349CONFIG_NETFILTER_NETLINK=m
318CONFIG_NETFILTER_NETLINK_QUEUE=m 350CONFIG_NETFILTER_NETLINK_QUEUE=m
319CONFIG_NETFILTER_NETLINK_LOG=m 351CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_NF_CONNTRACK is not set 352CONFIG_NF_CONNTRACK_ENABLED=m
353CONFIG_NF_CONNTRACK_SUPPORT=y
354# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
355CONFIG_NF_CONNTRACK=m
356CONFIG_NF_CT_ACCT=y
357CONFIG_NF_CONNTRACK_MARK=y
358CONFIG_NF_CONNTRACK_SECMARK=y
359CONFIG_NF_CONNTRACK_EVENTS=y
360CONFIG_NF_CT_PROTO_GRE=m
361CONFIG_NF_CT_PROTO_SCTP=m
362CONFIG_NF_CONNTRACK_AMANDA=m
363CONFIG_NF_CONNTRACK_FTP=m
364CONFIG_NF_CONNTRACK_H323=m
365CONFIG_NF_CONNTRACK_IRC=m
366# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
367CONFIG_NF_CONNTRACK_PPTP=m
368CONFIG_NF_CONNTRACK_SANE=m
369CONFIG_NF_CONNTRACK_SIP=m
370CONFIG_NF_CONNTRACK_TFTP=m
371CONFIG_NF_CT_NETLINK=m
321CONFIG_NETFILTER_XTABLES=m 372CONFIG_NETFILTER_XTABLES=m
322CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 373CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
323CONFIG_NETFILTER_XT_TARGET_MARK=m 374CONFIG_NETFILTER_XT_TARGET_MARK=m
324CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 375CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
376CONFIG_NETFILTER_XT_TARGET_NFLOG=m
325CONFIG_NETFILTER_XT_TARGET_SECMARK=m 377CONFIG_NETFILTER_XT_TARGET_SECMARK=m
378CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
379CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
326CONFIG_NETFILTER_XT_MATCH_COMMENT=m 380CONFIG_NETFILTER_XT_MATCH_COMMENT=m
381CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
382CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
383CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
327CONFIG_NETFILTER_XT_MATCH_DCCP=m 384CONFIG_NETFILTER_XT_MATCH_DCCP=m
385CONFIG_NETFILTER_XT_MATCH_DSCP=m
328CONFIG_NETFILTER_XT_MATCH_ESP=m 386CONFIG_NETFILTER_XT_MATCH_ESP=m
387CONFIG_NETFILTER_XT_MATCH_HELPER=m
329CONFIG_NETFILTER_XT_MATCH_LENGTH=m 388CONFIG_NETFILTER_XT_MATCH_LENGTH=m
330CONFIG_NETFILTER_XT_MATCH_LIMIT=m 389CONFIG_NETFILTER_XT_MATCH_LIMIT=m
331CONFIG_NETFILTER_XT_MATCH_MAC=m 390CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -336,14 +395,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
336CONFIG_NETFILTER_XT_MATCH_QUOTA=m 395CONFIG_NETFILTER_XT_MATCH_QUOTA=m
337CONFIG_NETFILTER_XT_MATCH_REALM=m 396CONFIG_NETFILTER_XT_MATCH_REALM=m
338CONFIG_NETFILTER_XT_MATCH_SCTP=m 397CONFIG_NETFILTER_XT_MATCH_SCTP=m
398CONFIG_NETFILTER_XT_MATCH_STATE=m
339CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 399CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
340CONFIG_NETFILTER_XT_MATCH_STRING=m 400CONFIG_NETFILTER_XT_MATCH_STRING=m
341CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 401CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
402CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
342 403
343# 404#
344# IP: Netfilter Configuration 405# IP: Netfilter Configuration
345# 406#
346# CONFIG_IP_NF_CONNTRACK is not set 407CONFIG_NF_CONNTRACK_IPV4=m
408CONFIG_NF_CONNTRACK_PROC_COMPAT=y
347# CONFIG_IP_NF_QUEUE is not set 409# CONFIG_IP_NF_QUEUE is not set
348# CONFIG_IP_NF_IPTABLES is not set 410# CONFIG_IP_NF_IPTABLES is not set
349# CONFIG_IP_NF_ARPTABLES is not set 411# CONFIG_IP_NF_ARPTABLES is not set
@@ -351,6 +413,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
351# 413#
352# IPv6: Netfilter Configuration (EXPERIMENTAL) 414# IPv6: Netfilter Configuration (EXPERIMENTAL)
353# 415#
416CONFIG_NF_CONNTRACK_IPV6=m
354# CONFIG_IP6_NF_QUEUE is not set 417# CONFIG_IP6_NF_QUEUE is not set
355# CONFIG_IP6_NF_IPTABLES is not set 418# CONFIG_IP6_NF_IPTABLES is not set
356 419
@@ -377,7 +440,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
377# CONFIG_ATALK is not set 440# CONFIG_ATALK is not set
378# CONFIG_X25 is not set 441# CONFIG_X25 is not set
379# CONFIG_LAPB is not set 442# CONFIG_LAPB is not set
380# CONFIG_NET_DIVERT is not set
381# CONFIG_ECONET is not set 443# CONFIG_ECONET is not set
382# CONFIG_WAN_ROUTER is not set 444# CONFIG_WAN_ROUTER is not set
383 445
@@ -401,6 +463,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
401CONFIG_IEEE80211_SOFTMAC=m 463CONFIG_IEEE80211_SOFTMAC=m
402# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 464# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
403CONFIG_WIRELESS_EXT=y 465CONFIG_WIRELESS_EXT=y
466CONFIG_FIB_RULES=y
404 467
405# 468#
406# Device Drivers 469# Device Drivers
@@ -432,6 +495,7 @@ CONFIG_CONNECTOR=m
432# 495#
433# Plug and Play support 496# Plug and Play support
434# 497#
498# CONFIG_PNPACPI is not set
435 499
436# 500#
437# Block devices 501# Block devices
@@ -451,6 +515,12 @@ CONFIG_BLK_DEV_LOOP=y
451CONFIG_ATA_OVER_ETH=m 515CONFIG_ATA_OVER_ETH=m
452 516
453# 517#
518# Misc devices
519#
520CONFIG_SGI_IOC4=m
521# CONFIG_TIFM_CORE is not set
522
523#
454# ATA/ATAPI/MFM/RLL support 524# ATA/ATAPI/MFM/RLL support
455# 525#
456# CONFIG_IDE is not set 526# CONFIG_IDE is not set
@@ -460,6 +530,8 @@ CONFIG_ATA_OVER_ETH=m
460# 530#
461CONFIG_RAID_ATTRS=m 531CONFIG_RAID_ATTRS=m
462CONFIG_SCSI=m 532CONFIG_SCSI=m
533CONFIG_SCSI_TGT=m
534CONFIG_SCSI_NETLINK=y
463CONFIG_SCSI_PROC_FS=y 535CONFIG_SCSI_PROC_FS=y
464 536
465# 537#
@@ -478,14 +550,17 @@ CONFIG_SCSI_PROC_FS=y
478# CONFIG_SCSI_MULTI_LUN is not set 550# CONFIG_SCSI_MULTI_LUN is not set
479# CONFIG_SCSI_CONSTANTS is not set 551# CONFIG_SCSI_CONSTANTS is not set
480# CONFIG_SCSI_LOGGING is not set 552# CONFIG_SCSI_LOGGING is not set
553CONFIG_SCSI_SCAN_ASYNC=y
481 554
482# 555#
483# SCSI Transport Attributes 556# SCSI Transports
484# 557#
485# CONFIG_SCSI_SPI_ATTRS is not set 558# CONFIG_SCSI_SPI_ATTRS is not set
486CONFIG_SCSI_FC_ATTRS=m 559CONFIG_SCSI_FC_ATTRS=m
487CONFIG_SCSI_ISCSI_ATTRS=m 560CONFIG_SCSI_ISCSI_ATTRS=m
488CONFIG_SCSI_SAS_ATTRS=m 561CONFIG_SCSI_SAS_ATTRS=m
562CONFIG_SCSI_SAS_LIBSAS=m
563# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
489 564
490# 565#
491# SCSI low-level drivers 566# SCSI low-level drivers
@@ -498,26 +573,35 @@ CONFIG_ISCSI_TCP=m
498# CONFIG_SCSI_AIC7XXX is not set 573# CONFIG_SCSI_AIC7XXX is not set
499# CONFIG_SCSI_AIC7XXX_OLD is not set 574# CONFIG_SCSI_AIC7XXX_OLD is not set
500# CONFIG_SCSI_AIC79XX is not set 575# CONFIG_SCSI_AIC79XX is not set
576CONFIG_SCSI_AIC94XX=m
577# CONFIG_AIC94XX_DEBUG is not set
501# CONFIG_SCSI_DPT_I2O is not set 578# CONFIG_SCSI_DPT_I2O is not set
579# CONFIG_SCSI_ARCMSR is not set
502# CONFIG_MEGARAID_NEWGEN is not set 580# CONFIG_MEGARAID_NEWGEN is not set
503# CONFIG_MEGARAID_LEGACY is not set 581# CONFIG_MEGARAID_LEGACY is not set
504# CONFIG_MEGARAID_SAS is not set 582# CONFIG_MEGARAID_SAS is not set
505# CONFIG_SCSI_SATA is not set
506# CONFIG_SCSI_HPTIOP is not set 583# CONFIG_SCSI_HPTIOP is not set
507# CONFIG_SCSI_DMX3191D is not set 584# CONFIG_SCSI_DMX3191D is not set
508# CONFIG_SCSI_FUTURE_DOMAIN is not set 585# CONFIG_SCSI_FUTURE_DOMAIN is not set
509# CONFIG_SCSI_IPS is not set 586# CONFIG_SCSI_IPS is not set
510# CONFIG_SCSI_INITIO is not set 587# CONFIG_SCSI_INITIO is not set
511# CONFIG_SCSI_INIA100 is not set 588# CONFIG_SCSI_INIA100 is not set
589# CONFIG_SCSI_STEX is not set
512# CONFIG_SCSI_SYM53C8XX_2 is not set 590# CONFIG_SCSI_SYM53C8XX_2 is not set
513# CONFIG_SCSI_IPR is not set
514# CONFIG_SCSI_QLOGIC_1280 is not set 591# CONFIG_SCSI_QLOGIC_1280 is not set
515# CONFIG_SCSI_QLA_FC is not set 592# CONFIG_SCSI_QLA_FC is not set
593# CONFIG_SCSI_QLA_ISCSI is not set
516# CONFIG_SCSI_LPFC is not set 594# CONFIG_SCSI_LPFC is not set
517# CONFIG_SCSI_DC395x is not set 595# CONFIG_SCSI_DC395x is not set
518# CONFIG_SCSI_DC390T is not set 596# CONFIG_SCSI_DC390T is not set
519# CONFIG_SCSI_NSP32 is not set 597# CONFIG_SCSI_NSP32 is not set
520# CONFIG_SCSI_DEBUG is not set 598# CONFIG_SCSI_DEBUG is not set
599# CONFIG_SCSI_SRP is not set
600
601#
602# Serial ATA (prod) and Parallel ATA (experimental) drivers
603#
604# CONFIG_ATA is not set
521 605
522# 606#
523# Multi-device support (RAID and LVM) 607# Multi-device support (RAID and LVM)
@@ -571,6 +655,8 @@ CONFIG_LXT_PHY=m
571CONFIG_CICADA_PHY=m 655CONFIG_CICADA_PHY=m
572CONFIG_VITESSE_PHY=m 656CONFIG_VITESSE_PHY=m
573CONFIG_SMSC_PHY=m 657CONFIG_SMSC_PHY=m
658# CONFIG_BROADCOM_PHY is not set
659# CONFIG_FIXED_PHY is not set
574 660
575# 661#
576# Ethernet (10 or 100Mbit) 662# Ethernet (10 or 100Mbit)
@@ -607,7 +693,7 @@ CONFIG_E100=y
607# CONFIG_SUNDANCE is not set 693# CONFIG_SUNDANCE is not set
608# CONFIG_TLAN is not set 694# CONFIG_TLAN is not set
609# CONFIG_VIA_RHINE is not set 695# CONFIG_VIA_RHINE is not set
610# CONFIG_LAN_SAA9730 is not set 696# CONFIG_SC92031 is not set
611 697
612# 698#
613# Ethernet (1000 Mbit) 699# Ethernet (1000 Mbit)
@@ -627,17 +713,18 @@ CONFIG_E100=y
627# CONFIG_TIGON3 is not set 713# CONFIG_TIGON3 is not set
628# CONFIG_BNX2 is not set 714# CONFIG_BNX2 is not set
629CONFIG_MV643XX_ETH=y 715CONFIG_MV643XX_ETH=y
630CONFIG_MV643XX_ETH_0=y 716CONFIG_QLA3XXX=m
631CONFIG_MV643XX_ETH_1=y 717# CONFIG_ATL1 is not set
632CONFIG_MV643XX_ETH_2=y
633 718
634# 719#
635# Ethernet (10000 Mbit) 720# Ethernet (10000 Mbit)
636# 721#
637# CONFIG_CHELSIO_T1 is not set 722# CONFIG_CHELSIO_T1 is not set
723CONFIG_CHELSIO_T3=m
638# CONFIG_IXGB is not set 724# CONFIG_IXGB is not set
639# CONFIG_S2IO is not set 725# CONFIG_S2IO is not set
640# CONFIG_MYRI10GE is not set 726# CONFIG_MYRI10GE is not set
727CONFIG_NETXEN_NIC=m
641 728
642# 729#
643# Token Ring devices 730# Token Ring devices
@@ -665,6 +752,7 @@ CONFIG_PPP_DEFLATE=m
665CONFIG_PPP_MPPE=m 752CONFIG_PPP_MPPE=m
666CONFIG_PPPOE=m 753CONFIG_PPPOE=m
667# CONFIG_SLIP is not set 754# CONFIG_SLIP is not set
755CONFIG_SLHC=m
668# CONFIG_NET_FC is not set 756# CONFIG_NET_FC is not set
669# CONFIG_SHAPER is not set 757# CONFIG_SHAPER is not set
670# CONFIG_NETCONSOLE is not set 758# CONFIG_NETCONSOLE is not set
@@ -685,6 +773,7 @@ CONFIG_PPPOE=m
685# Input device support 773# Input device support
686# 774#
687CONFIG_INPUT=y 775CONFIG_INPUT=y
776# CONFIG_INPUT_FF_MEMLESS is not set
688 777
689# 778#
690# Userland interfaces 779# Userland interfaces
@@ -758,10 +847,6 @@ CONFIG_RTC=y
758# CONFIG_DTLK is not set 847# CONFIG_DTLK is not set
759# CONFIG_R3964 is not set 848# CONFIG_R3964 is not set
760# CONFIG_APPLICOM is not set 849# CONFIG_APPLICOM is not set
761
762#
763# Ftape, the floppy tape device driver
764#
765# CONFIG_DRM is not set 850# CONFIG_DRM is not set
766# CONFIG_RAW_DRIVER is not set 851# CONFIG_RAW_DRIVER is not set
767 852
@@ -769,7 +854,6 @@ CONFIG_RTC=y
769# TPM devices 854# TPM devices
770# 855#
771# CONFIG_TCG_TPM is not set 856# CONFIG_TCG_TPM is not set
772# CONFIG_TELCLOCK is not set
773 857
774# 858#
775# I2C support 859# I2C support
@@ -794,14 +878,9 @@ CONFIG_RTC=y
794# CONFIG_HWMON_VID is not set 878# CONFIG_HWMON_VID is not set
795 879
796# 880#
797# Misc devices
798#
799
800#
801# Multimedia devices 881# Multimedia devices
802# 882#
803# CONFIG_VIDEO_DEV is not set 883# CONFIG_VIDEO_DEV is not set
804CONFIG_VIDEO_V4L2=y
805 884
806# 885#
807# Digital Video Broadcasting Devices 886# Digital Video Broadcasting Devices
@@ -816,6 +895,7 @@ CONFIG_FB=y
816# CONFIG_FB_CFB_FILLRECT is not set 895# CONFIG_FB_CFB_FILLRECT is not set
817# CONFIG_FB_CFB_COPYAREA is not set 896# CONFIG_FB_CFB_COPYAREA is not set
818# CONFIG_FB_CFB_IMAGEBLIT is not set 897# CONFIG_FB_CFB_IMAGEBLIT is not set
898# CONFIG_FB_SVGALIB is not set
819# CONFIG_FB_MACMODES is not set 899# CONFIG_FB_MACMODES is not set
820# CONFIG_FB_BACKLIGHT is not set 900# CONFIG_FB_BACKLIGHT is not set
821CONFIG_FB_MODE_HELPERS=y 901CONFIG_FB_MODE_HELPERS=y
@@ -832,6 +912,7 @@ CONFIG_FB_MODE_HELPERS=y
832# CONFIG_FB_RADEON is not set 912# CONFIG_FB_RADEON is not set
833# CONFIG_FB_ATY128 is not set 913# CONFIG_FB_ATY128 is not set
834# CONFIG_FB_ATY is not set 914# CONFIG_FB_ATY is not set
915# CONFIG_FB_S3 is not set
835# CONFIG_FB_SAVAGE is not set 916# CONFIG_FB_SAVAGE is not set
836# CONFIG_FB_SIS is not set 917# CONFIG_FB_SIS is not set
837# CONFIG_FB_NEOMAGIC is not set 918# CONFIG_FB_NEOMAGIC is not set
@@ -868,6 +949,12 @@ CONFIG_LOGO_LINUX_CLUT224=y
868# CONFIG_SOUND is not set 949# CONFIG_SOUND is not set
869 950
870# 951#
952# HID Devices
953#
954CONFIG_HID=y
955# CONFIG_HID_DEBUG is not set
956
957#
871# USB support 958# USB support
872# 959#
873CONFIG_USB_ARCH_HAS_HCD=y 960CONFIG_USB_ARCH_HAS_HCD=y
@@ -930,6 +1017,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
930# 1017#
931 1018
932# 1019#
1020# Auxiliary Display support
1021#
1022
1023#
1024# Virtualization
1025#
1026
1027#
933# File systems 1028# File systems
934# 1029#
935CONFIG_EXT2_FS=y 1030CONFIG_EXT2_FS=y
@@ -939,6 +1034,7 @@ CONFIG_EXT3_FS=m
939CONFIG_EXT3_FS_XATTR=y 1034CONFIG_EXT3_FS_XATTR=y
940# CONFIG_EXT3_FS_POSIX_ACL is not set 1035# CONFIG_EXT3_FS_POSIX_ACL is not set
941# CONFIG_EXT3_FS_SECURITY is not set 1036# CONFIG_EXT3_FS_SECURITY is not set
1037# CONFIG_EXT4DEV_FS is not set
942CONFIG_JBD=m 1038CONFIG_JBD=m
943# CONFIG_JBD_DEBUG is not set 1039# CONFIG_JBD_DEBUG is not set
944CONFIG_FS_MBCACHE=y 1040CONFIG_FS_MBCACHE=y
@@ -947,12 +1043,13 @@ CONFIG_REISERFS_FS=m
947# CONFIG_REISERFS_PROC_INFO is not set 1043# CONFIG_REISERFS_PROC_INFO is not set
948# CONFIG_REISERFS_FS_XATTR is not set 1044# CONFIG_REISERFS_FS_XATTR is not set
949# CONFIG_JFS_FS is not set 1045# CONFIG_JFS_FS is not set
950# CONFIG_FS_POSIX_ACL is not set 1046CONFIG_FS_POSIX_ACL=y
951CONFIG_XFS_FS=m 1047CONFIG_XFS_FS=m
952# CONFIG_XFS_QUOTA is not set 1048# CONFIG_XFS_QUOTA is not set
953# CONFIG_XFS_SECURITY is not set 1049# CONFIG_XFS_SECURITY is not set
954# CONFIG_XFS_POSIX_ACL is not set 1050# CONFIG_XFS_POSIX_ACL is not set
955# CONFIG_XFS_RT is not set 1051# CONFIG_XFS_RT is not set
1052# CONFIG_GFS2_FS is not set
956# CONFIG_OCFS2_FS is not set 1053# CONFIG_OCFS2_FS is not set
957# CONFIG_MINIX_FS is not set 1054# CONFIG_MINIX_FS is not set
958# CONFIG_ROMFS_FS is not set 1055# CONFIG_ROMFS_FS is not set
@@ -963,6 +1060,7 @@ CONFIG_DNOTIFY=y
963CONFIG_AUTOFS_FS=y 1060CONFIG_AUTOFS_FS=y
964CONFIG_AUTOFS4_FS=m 1061CONFIG_AUTOFS4_FS=m
965CONFIG_FUSE_FS=m 1062CONFIG_FUSE_FS=m
1063CONFIG_GENERIC_ACL=y
966 1064
967# 1065#
968# CD-ROM/DVD Filesystems 1066# CD-ROM/DVD Filesystems
@@ -982,11 +1080,13 @@ CONFIG_FUSE_FS=m
982# 1080#
983CONFIG_PROC_FS=y 1081CONFIG_PROC_FS=y
984CONFIG_PROC_KCORE=y 1082CONFIG_PROC_KCORE=y
1083CONFIG_PROC_SYSCTL=y
985CONFIG_SYSFS=y 1084CONFIG_SYSFS=y
986CONFIG_TMPFS=y 1085CONFIG_TMPFS=y
1086CONFIG_TMPFS_POSIX_ACL=y
987# CONFIG_HUGETLB_PAGE is not set 1087# CONFIG_HUGETLB_PAGE is not set
988CONFIG_RAMFS=y 1088CONFIG_RAMFS=y
989# CONFIG_CONFIGFS_FS is not set 1089CONFIG_CONFIGFS_FS=m
990 1090
991# 1091#
992# Miscellaneous filesystems 1092# Miscellaneous filesystems
@@ -1029,7 +1129,6 @@ CONFIG_SUNRPC=y
1029CONFIG_SMB_FS=m 1129CONFIG_SMB_FS=m
1030# CONFIG_SMB_NLS_DEFAULT is not set 1130# CONFIG_SMB_NLS_DEFAULT is not set
1031# CONFIG_CIFS is not set 1131# CONFIG_CIFS is not set
1032# CONFIG_CIFS_DEBUG2 is not set
1033# CONFIG_NCP_FS is not set 1132# CONFIG_NCP_FS is not set
1034# CONFIG_CODA_FS is not set 1133# CONFIG_CODA_FS is not set
1035# CONFIG_AFS_FS is not set 1134# CONFIG_AFS_FS is not set
@@ -1086,6 +1185,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1086# CONFIG_NLS_UTF8 is not set 1185# CONFIG_NLS_UTF8 is not set
1087 1186
1088# 1187#
1188# Distributed Lock Manager
1189#
1190CONFIG_DLM=m
1191CONFIG_DLM_TCP=y
1192# CONFIG_DLM_SCTP is not set
1193# CONFIG_DLM_DEBUG is not set
1194
1195#
1089# Profiling support 1196# Profiling support
1090# 1197#
1091# CONFIG_PROFILING is not set 1198# CONFIG_PROFILING is not set
@@ -1095,11 +1202,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1095# 1202#
1096CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1203CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1097# CONFIG_PRINTK_TIME is not set 1204# CONFIG_PRINTK_TIME is not set
1205CONFIG_ENABLE_MUST_CHECK=y
1098# CONFIG_MAGIC_SYSRQ is not set 1206# CONFIG_MAGIC_SYSRQ is not set
1099# CONFIG_UNUSED_SYMBOLS is not set 1207# CONFIG_UNUSED_SYMBOLS is not set
1208# CONFIG_DEBUG_FS is not set
1209# CONFIG_HEADERS_CHECK is not set
1100# CONFIG_DEBUG_KERNEL is not set 1210# CONFIG_DEBUG_KERNEL is not set
1101CONFIG_LOG_BUF_SHIFT=14 1211CONFIG_LOG_BUF_SHIFT=14
1102# CONFIG_DEBUG_FS is not set
1103CONFIG_CROSSCOMPILE=y 1212CONFIG_CROSSCOMPILE=y
1104CONFIG_CMDLINE="ip=any root=nfs" 1213CONFIG_CMDLINE="ip=any root=nfs"
1105 1214
@@ -1113,18 +1222,30 @@ CONFIG_CMDLINE="ip=any root=nfs"
1113# Cryptographic options 1222# Cryptographic options
1114# 1223#
1115CONFIG_CRYPTO=y 1224CONFIG_CRYPTO=y
1225CONFIG_CRYPTO_ALGAPI=y
1226CONFIG_CRYPTO_BLKCIPHER=m
1227CONFIG_CRYPTO_HASH=y
1228CONFIG_CRYPTO_MANAGER=y
1116CONFIG_CRYPTO_HMAC=y 1229CONFIG_CRYPTO_HMAC=y
1230CONFIG_CRYPTO_XCBC=m
1117CONFIG_CRYPTO_NULL=m 1231CONFIG_CRYPTO_NULL=m
1118CONFIG_CRYPTO_MD4=m 1232CONFIG_CRYPTO_MD4=m
1119CONFIG_CRYPTO_MD5=m 1233CONFIG_CRYPTO_MD5=y
1120CONFIG_CRYPTO_SHA1=m 1234CONFIG_CRYPTO_SHA1=m
1121CONFIG_CRYPTO_SHA256=m 1235CONFIG_CRYPTO_SHA256=m
1122CONFIG_CRYPTO_SHA512=m 1236CONFIG_CRYPTO_SHA512=m
1123CONFIG_CRYPTO_WP512=m 1237CONFIG_CRYPTO_WP512=m
1124CONFIG_CRYPTO_TGR192=m 1238CONFIG_CRYPTO_TGR192=m
1239CONFIG_CRYPTO_GF128MUL=m
1240CONFIG_CRYPTO_ECB=m
1241CONFIG_CRYPTO_CBC=m
1242CONFIG_CRYPTO_PCBC=m
1243CONFIG_CRYPTO_LRW=m
1125CONFIG_CRYPTO_DES=m 1244CONFIG_CRYPTO_DES=m
1245CONFIG_CRYPTO_FCRYPT=m
1126CONFIG_CRYPTO_BLOWFISH=m 1246CONFIG_CRYPTO_BLOWFISH=m
1127CONFIG_CRYPTO_TWOFISH=m 1247CONFIG_CRYPTO_TWOFISH=m
1248CONFIG_CRYPTO_TWOFISH_COMMON=m
1128CONFIG_CRYPTO_SERPENT=m 1249CONFIG_CRYPTO_SERPENT=m
1129CONFIG_CRYPTO_AES=m 1250CONFIG_CRYPTO_AES=m
1130CONFIG_CRYPTO_CAST5=m 1251CONFIG_CRYPTO_CAST5=m
@@ -1136,6 +1257,7 @@ CONFIG_CRYPTO_ANUBIS=m
1136CONFIG_CRYPTO_DEFLATE=m 1257CONFIG_CRYPTO_DEFLATE=m
1137CONFIG_CRYPTO_MICHAEL_MIC=m 1258CONFIG_CRYPTO_MICHAEL_MIC=m
1138CONFIG_CRYPTO_CRC32C=m 1259CONFIG_CRYPTO_CRC32C=m
1260CONFIG_CRYPTO_CAMELLIA=m
1139# CONFIG_CRYPTO_TEST is not set 1261# CONFIG_CRYPTO_TEST is not set
1140 1262
1141# 1263#
@@ -1145,6 +1267,7 @@ CONFIG_CRYPTO_CRC32C=m
1145# 1267#
1146# Library routines 1268# Library routines
1147# 1269#
1270CONFIG_BITREVERSE=y
1148CONFIG_CRC_CCITT=m 1271CONFIG_CRC_CCITT=m
1149CONFIG_CRC16=m 1272CONFIG_CRC16=m
1150CONFIG_CRC32=y 1273CONFIG_CRC32=y
@@ -1156,3 +1279,5 @@ CONFIG_TEXTSEARCH_KMP=m
1156CONFIG_TEXTSEARCH_BM=m 1279CONFIG_TEXTSEARCH_BM=m
1157CONFIG_TEXTSEARCH_FSM=m 1280CONFIG_TEXTSEARCH_FSM=m
1158CONFIG_PLIST=y 1281CONFIG_PLIST=y
1282CONFIG_HAS_IOMEM=y
1283CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index ebe75c1c71af..82ff6fc0cd41 100644
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:16 2006 4# Tue Feb 20 21:47:36 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40CONFIG_MOMENCO_OCELOT_C=y 39CONFIG_MOMENCO_OCELOT_C=y
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_MOMENCO_OCELOT_C=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
@@ -120,8 +123,8 @@ CONFIG_BOARD_SCACHE=y
120CONFIG_RM7000_CPU_SCACHE=y 123CONFIG_RM7000_CPU_SCACHE=y
121CONFIG_CPU_HAS_PREFETCH=y 124CONFIG_CPU_HAS_PREFETCH=y
122CONFIG_MIPS_MT_DISABLED=y 125CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_MT_SMP is not set 126# CONFIG_MIPS_MT_SMP is not set
127# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set 128# CONFIG_MIPS_VPE_LOADER is not set
126CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
127CONFIG_CPU_HAS_SYNC=y 130CONFIG_CPU_HAS_SYNC=y
@@ -138,6 +141,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
138# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
139CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
140CONFIG_RESOURCES_64BIT=y 143CONFIG_RESOURCES_64BIT=y
144CONFIG_ZONE_DMA_FLAG=1
141# CONFIG_HZ_48 is not set 145# CONFIG_HZ_48 is not set
142# CONFIG_HZ_100 is not set 146# CONFIG_HZ_100 is not set
143# CONFIG_HZ_128 is not set 147# CONFIG_HZ_128 is not set
@@ -150,6 +154,7 @@ CONFIG_HZ=1000
150CONFIG_PREEMPT_NONE=y 154CONFIG_PREEMPT_NONE=y
151# CONFIG_PREEMPT_VOLUNTARY is not set 155# CONFIG_PREEMPT_VOLUNTARY is not set
152# CONFIG_PREEMPT is not set 156# CONFIG_PREEMPT is not set
157# CONFIG_KEXEC is not set
153CONFIG_LOCKDEP_SUPPORT=y 158CONFIG_LOCKDEP_SUPPORT=y
154CONFIG_STACKTRACE_SUPPORT=y 159CONFIG_STACKTRACE_SUPPORT=y
155CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -168,15 +173,20 @@ CONFIG_LOCALVERSION=""
168CONFIG_LOCALVERSION_AUTO=y 173CONFIG_LOCALVERSION_AUTO=y
169CONFIG_SWAP=y 174CONFIG_SWAP=y
170CONFIG_SYSVIPC=y 175CONFIG_SYSVIPC=y
176# CONFIG_IPC_NS is not set
177CONFIG_SYSVIPC_SYSCTL=y
171# CONFIG_POSIX_MQUEUE is not set 178# CONFIG_POSIX_MQUEUE is not set
172# CONFIG_BSD_PROCESS_ACCT is not set 179# CONFIG_BSD_PROCESS_ACCT is not set
173CONFIG_SYSCTL=y 180# CONFIG_TASKSTATS is not set
181# CONFIG_UTS_NS is not set
174# CONFIG_AUDIT is not set 182# CONFIG_AUDIT is not set
175# CONFIG_IKCONFIG is not set 183# CONFIG_IKCONFIG is not set
184CONFIG_SYSFS_DEPRECATED=y
176CONFIG_RELAY=y 185CONFIG_RELAY=y
177CONFIG_INITRAMFS_SOURCE=""
178# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
179CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
180CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
181# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
182CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -184,12 +194,12 @@ CONFIG_PRINTK=y
184CONFIG_BUG=y 194CONFIG_BUG=y
185CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
186CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
187CONFIG_RT_MUTEXES=y
188CONFIG_FUTEX=y 197CONFIG_FUTEX=y
189CONFIG_EPOLL=y 198CONFIG_EPOLL=y
190CONFIG_SHMEM=y 199CONFIG_SHMEM=y
191CONFIG_SLAB=y 200CONFIG_SLAB=y
192CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
193# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
195# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -202,6 +212,7 @@ CONFIG_BASE_SMALL=0
202# 212#
203# Block layer 213# Block layer
204# 214#
215CONFIG_BLOCK=y
205# CONFIG_BLK_DEV_IO_TRACE is not set 216# CONFIG_BLK_DEV_IO_TRACE is not set
206 217
207# 218#
@@ -242,11 +253,20 @@ CONFIG_BINFMT_ELF=y
242# CONFIG_BUILD_ELF64 is not set 253# CONFIG_BUILD_ELF64 is not set
243CONFIG_MIPS32_COMPAT=y 254CONFIG_MIPS32_COMPAT=y
244CONFIG_COMPAT=y 255CONFIG_COMPAT=y
256CONFIG_SYSVIPC_COMPAT=y
245CONFIG_MIPS32_O32=y 257CONFIG_MIPS32_O32=y
246CONFIG_MIPS32_N32=y 258CONFIG_MIPS32_N32=y
247CONFIG_BINFMT_ELF32=y 259CONFIG_BINFMT_ELF32=y
248 260
249# 261#
262# Power management options
263#
264CONFIG_PM=y
265# CONFIG_PM_LEGACY is not set
266# CONFIG_PM_DEBUG is not set
267# CONFIG_PM_SYSFS_DEPRECATED is not set
268
269#
250# Networking 270# Networking
251# 271#
252CONFIG_NET=y 272CONFIG_NET=y
@@ -259,7 +279,10 @@ CONFIG_NET=y
259CONFIG_UNIX=y 279CONFIG_UNIX=y
260CONFIG_XFRM=y 280CONFIG_XFRM=y
261CONFIG_XFRM_USER=y 281CONFIG_XFRM_USER=y
282# CONFIG_XFRM_SUB_POLICY is not set
283CONFIG_XFRM_MIGRATE=y
262CONFIG_NET_KEY=y 284CONFIG_NET_KEY=y
285CONFIG_NET_KEY_MIGRATE=y
263CONFIG_INET=y 286CONFIG_INET=y
264# CONFIG_IP_MULTICAST is not set 287# CONFIG_IP_MULTICAST is not set
265# CONFIG_IP_ADVANCED_ROUTER is not set 288# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +302,13 @@ CONFIG_IP_PNP_DHCP=y
279# CONFIG_INET_TUNNEL is not set 302# CONFIG_INET_TUNNEL is not set
280CONFIG_INET_XFRM_MODE_TRANSPORT=y 303CONFIG_INET_XFRM_MODE_TRANSPORT=y
281CONFIG_INET_XFRM_MODE_TUNNEL=y 304CONFIG_INET_XFRM_MODE_TUNNEL=y
305CONFIG_INET_XFRM_MODE_BEET=y
282CONFIG_INET_DIAG=y 306CONFIG_INET_DIAG=y
283CONFIG_INET_TCP_DIAG=y 307CONFIG_INET_TCP_DIAG=y
284# CONFIG_TCP_CONG_ADVANCED is not set 308# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_BIC=y 309CONFIG_TCP_CONG_CUBIC=y
310CONFIG_DEFAULT_TCP_CONG="cubic"
311CONFIG_TCP_MD5SIG=y
286# CONFIG_IPV6 is not set 312# CONFIG_IPV6 is not set
287# CONFIG_INET6_XFRM_TUNNEL is not set 313# CONFIG_INET6_XFRM_TUNNEL is not set
288# CONFIG_INET6_TUNNEL is not set 314# CONFIG_INET6_TUNNEL is not set
@@ -312,7 +338,6 @@ CONFIG_NETWORK_SECMARK=y
312# CONFIG_ATALK is not set 338# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 339# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
315# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 341# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 342# CONFIG_WAN_ROUTER is not set
318 343
@@ -367,6 +392,7 @@ CONFIG_PROC_EVENTS=y
367# 392#
368# Plug and Play support 393# Plug and Play support
369# 394#
395# CONFIG_PNPACPI is not set
370 396
371# 397#
372# Block devices 398# Block devices
@@ -387,6 +413,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
387CONFIG_ATA_OVER_ETH=y 413CONFIG_ATA_OVER_ETH=y
388 414
389# 415#
416# Misc devices
417#
418CONFIG_SGI_IOC4=y
419# CONFIG_TIFM_CORE is not set
420
421#
390# ATA/ATAPI/MFM/RLL support 422# ATA/ATAPI/MFM/RLL support
391# 423#
392# CONFIG_IDE is not set 424# CONFIG_IDE is not set
@@ -396,6 +428,12 @@ CONFIG_ATA_OVER_ETH=y
396# 428#
397CONFIG_RAID_ATTRS=y 429CONFIG_RAID_ATTRS=y
398# CONFIG_SCSI is not set 430# CONFIG_SCSI is not set
431# CONFIG_SCSI_NETLINK is not set
432
433#
434# Serial ATA (prod) and Parallel ATA (experimental) drivers
435#
436# CONFIG_ATA is not set
399 437
400# 438#
401# Multi-device support (RAID and LVM) 439# Multi-device support (RAID and LVM)
@@ -446,6 +484,8 @@ CONFIG_LXT_PHY=y
446CONFIG_CICADA_PHY=y 484CONFIG_CICADA_PHY=y
447CONFIG_VITESSE_PHY=y 485CONFIG_VITESSE_PHY=y
448CONFIG_SMSC_PHY=y 486CONFIG_SMSC_PHY=y
487# CONFIG_BROADCOM_PHY is not set
488# CONFIG_FIXED_PHY is not set
449 489
450# 490#
451# Ethernet (10 or 100Mbit) 491# Ethernet (10 or 100Mbit)
@@ -482,14 +522,18 @@ CONFIG_NET_ETHERNET=y
482# CONFIG_TIGON3 is not set 522# CONFIG_TIGON3 is not set
483# CONFIG_BNX2 is not set 523# CONFIG_BNX2 is not set
484# CONFIG_MV643XX_ETH is not set 524# CONFIG_MV643XX_ETH is not set
525CONFIG_QLA3XXX=y
526# CONFIG_ATL1 is not set
485 527
486# 528#
487# Ethernet (10000 Mbit) 529# Ethernet (10000 Mbit)
488# 530#
489# CONFIG_CHELSIO_T1 is not set 531# CONFIG_CHELSIO_T1 is not set
532CONFIG_CHELSIO_T3=y
490# CONFIG_IXGB is not set 533# CONFIG_IXGB is not set
491# CONFIG_S2IO is not set 534# CONFIG_S2IO is not set
492# CONFIG_MYRI10GE is not set 535# CONFIG_MYRI10GE is not set
536CONFIG_NETXEN_NIC=y
493 537
494# 538#
495# Token Ring devices 539# Token Ring devices
@@ -528,6 +572,7 @@ CONFIG_NET_ETHERNET=y
528# Input device support 572# Input device support
529# 573#
530CONFIG_INPUT=y 574CONFIG_INPUT=y
575# CONFIG_INPUT_FF_MEMLESS is not set
531 576
532# 577#
533# Userland interfaces 578# Userland interfaces
@@ -605,10 +650,6 @@ CONFIG_LEGACY_PTY_COUNT=256
605# CONFIG_DTLK is not set 650# CONFIG_DTLK is not set
606# CONFIG_R3964 is not set 651# CONFIG_R3964 is not set
607# CONFIG_APPLICOM is not set 652# CONFIG_APPLICOM is not set
608
609#
610# Ftape, the floppy tape device driver
611#
612# CONFIG_DRM is not set 653# CONFIG_DRM is not set
613# CONFIG_RAW_DRIVER is not set 654# CONFIG_RAW_DRIVER is not set
614 655
@@ -616,7 +657,6 @@ CONFIG_LEGACY_PTY_COUNT=256
616# TPM devices 657# TPM devices
617# 658#
618# CONFIG_TCG_TPM is not set 659# CONFIG_TCG_TPM is not set
619# CONFIG_TELCLOCK is not set
620 660
621# 661#
622# I2C support 662# I2C support
@@ -641,14 +681,9 @@ CONFIG_LEGACY_PTY_COUNT=256
641# CONFIG_HWMON_VID is not set 681# CONFIG_HWMON_VID is not set
642 682
643# 683#
644# Misc devices
645#
646
647#
648# Multimedia devices 684# Multimedia devices
649# 685#
650# CONFIG_VIDEO_DEV is not set 686# CONFIG_VIDEO_DEV is not set
651CONFIG_VIDEO_V4L2=y
652 687
653# 688#
654# Digital Video Broadcasting Devices 689# Digital Video Broadcasting Devices
@@ -666,6 +701,7 @@ CONFIG_VIDEO_V4L2=y
666# 701#
667# CONFIG_VGA_CONSOLE is not set 702# CONFIG_VGA_CONSOLE is not set
668CONFIG_DUMMY_CONSOLE=y 703CONFIG_DUMMY_CONSOLE=y
704# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
669 705
670# 706#
671# Sound 707# Sound
@@ -673,6 +709,11 @@ CONFIG_DUMMY_CONSOLE=y
673# CONFIG_SOUND is not set 709# CONFIG_SOUND is not set
674 710
675# 711#
712# HID Devices
713#
714# CONFIG_HID is not set
715
716#
676# USB support 717# USB support
677# 718#
678CONFIG_USB_ARCH_HAS_HCD=y 719CONFIG_USB_ARCH_HAS_HCD=y
@@ -735,16 +776,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
735# 776#
736 777
737# 778#
779# Auxiliary Display support
780#
781
782#
783# Virtualization
784#
785
786#
738# File systems 787# File systems
739# 788#
740CONFIG_EXT2_FS=y 789CONFIG_EXT2_FS=y
741# CONFIG_EXT2_FS_XATTR is not set 790# CONFIG_EXT2_FS_XATTR is not set
742# CONFIG_EXT2_FS_XIP is not set 791# CONFIG_EXT2_FS_XIP is not set
743# CONFIG_EXT3_FS is not set 792# CONFIG_EXT3_FS is not set
793# CONFIG_EXT4DEV_FS is not set
744# CONFIG_REISERFS_FS is not set 794# CONFIG_REISERFS_FS is not set
745# CONFIG_JFS_FS is not set 795# CONFIG_JFS_FS is not set
746# CONFIG_FS_POSIX_ACL is not set 796CONFIG_FS_POSIX_ACL=y
747# CONFIG_XFS_FS is not set 797# CONFIG_XFS_FS is not set
798# CONFIG_GFS2_FS is not set
748# CONFIG_OCFS2_FS is not set 799# CONFIG_OCFS2_FS is not set
749# CONFIG_MINIX_FS is not set 800# CONFIG_MINIX_FS is not set
750# CONFIG_ROMFS_FS is not set 801# CONFIG_ROMFS_FS is not set
@@ -755,6 +806,7 @@ CONFIG_DNOTIFY=y
755# CONFIG_AUTOFS_FS is not set 806# CONFIG_AUTOFS_FS is not set
756# CONFIG_AUTOFS4_FS is not set 807# CONFIG_AUTOFS4_FS is not set
757CONFIG_FUSE_FS=y 808CONFIG_FUSE_FS=y
809CONFIG_GENERIC_ACL=y
758 810
759# 811#
760# CD-ROM/DVD Filesystems 812# CD-ROM/DVD Filesystems
@@ -774,17 +826,20 @@ CONFIG_FUSE_FS=y
774# 826#
775CONFIG_PROC_FS=y 827CONFIG_PROC_FS=y
776CONFIG_PROC_KCORE=y 828CONFIG_PROC_KCORE=y
829CONFIG_PROC_SYSCTL=y
777CONFIG_SYSFS=y 830CONFIG_SYSFS=y
778CONFIG_TMPFS=y 831CONFIG_TMPFS=y
832CONFIG_TMPFS_POSIX_ACL=y
779# CONFIG_HUGETLB_PAGE is not set 833# CONFIG_HUGETLB_PAGE is not set
780CONFIG_RAMFS=y 834CONFIG_RAMFS=y
781# CONFIG_CONFIGFS_FS is not set 835CONFIG_CONFIGFS_FS=y
782 836
783# 837#
784# Miscellaneous filesystems 838# Miscellaneous filesystems
785# 839#
786# CONFIG_ADFS_FS is not set 840# CONFIG_ADFS_FS is not set
787# CONFIG_AFFS_FS is not set 841# CONFIG_AFFS_FS is not set
842# CONFIG_ECRYPT_FS is not set
788# CONFIG_HFS_FS is not set 843# CONFIG_HFS_FS is not set
789# CONFIG_HFSPLUS_FS is not set 844# CONFIG_HFSPLUS_FS is not set
790# CONFIG_BEFS_FS is not set 845# CONFIG_BEFS_FS is not set
@@ -816,7 +871,6 @@ CONFIG_SUNRPC=y
816# CONFIG_RPCSEC_GSS_SPKM3 is not set 871# CONFIG_RPCSEC_GSS_SPKM3 is not set
817# CONFIG_SMB_FS is not set 872# CONFIG_SMB_FS is not set
818# CONFIG_CIFS is not set 873# CONFIG_CIFS is not set
819# CONFIG_CIFS_DEBUG2 is not set
820# CONFIG_NCP_FS is not set 874# CONFIG_NCP_FS is not set
821# CONFIG_CODA_FS is not set 875# CONFIG_CODA_FS is not set
822# CONFIG_AFS_FS is not set 876# CONFIG_AFS_FS is not set
@@ -834,6 +888,14 @@ CONFIG_MSDOS_PARTITION=y
834# CONFIG_NLS is not set 888# CONFIG_NLS is not set
835 889
836# 890#
891# Distributed Lock Manager
892#
893CONFIG_DLM=y
894CONFIG_DLM_TCP=y
895# CONFIG_DLM_SCTP is not set
896# CONFIG_DLM_DEBUG is not set
897
898#
837# Profiling support 899# Profiling support
838# 900#
839# CONFIG_PROFILING is not set 901# CONFIG_PROFILING is not set
@@ -843,12 +905,13 @@ CONFIG_MSDOS_PARTITION=y
843# 905#
844CONFIG_TRACE_IRQFLAGS_SUPPORT=y 906CONFIG_TRACE_IRQFLAGS_SUPPORT=y
845# CONFIG_PRINTK_TIME is not set 907# CONFIG_PRINTK_TIME is not set
908CONFIG_ENABLE_MUST_CHECK=y
846# CONFIG_MAGIC_SYSRQ is not set 909# CONFIG_MAGIC_SYSRQ is not set
847# CONFIG_UNUSED_SYMBOLS is not set 910# CONFIG_UNUSED_SYMBOLS is not set
911# CONFIG_DEBUG_FS is not set
912# CONFIG_HEADERS_CHECK is not set
848# CONFIG_DEBUG_KERNEL is not set 913# CONFIG_DEBUG_KERNEL is not set
849CONFIG_LOG_BUF_SHIFT=14 914CONFIG_LOG_BUF_SHIFT=14
850# CONFIG_DEBUG_FS is not set
851# CONFIG_UNWIND_INFO is not set
852CONFIG_CROSSCOMPILE=y 915CONFIG_CROSSCOMPILE=y
853CONFIG_CMDLINE="" 916CONFIG_CMDLINE=""
854 917
@@ -863,7 +926,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
863# Cryptographic options 926# Cryptographic options
864# 927#
865CONFIG_CRYPTO=y 928CONFIG_CRYPTO=y
929CONFIG_CRYPTO_ALGAPI=y
930CONFIG_CRYPTO_BLKCIPHER=y
931CONFIG_CRYPTO_HASH=y
932CONFIG_CRYPTO_MANAGER=y
866CONFIG_CRYPTO_HMAC=y 933CONFIG_CRYPTO_HMAC=y
934CONFIG_CRYPTO_XCBC=y
867CONFIG_CRYPTO_NULL=y 935CONFIG_CRYPTO_NULL=y
868CONFIG_CRYPTO_MD4=y 936CONFIG_CRYPTO_MD4=y
869CONFIG_CRYPTO_MD5=y 937CONFIG_CRYPTO_MD5=y
@@ -872,9 +940,16 @@ CONFIG_CRYPTO_SHA256=y
872CONFIG_CRYPTO_SHA512=y 940CONFIG_CRYPTO_SHA512=y
873CONFIG_CRYPTO_WP512=y 941CONFIG_CRYPTO_WP512=y
874CONFIG_CRYPTO_TGR192=y 942CONFIG_CRYPTO_TGR192=y
943CONFIG_CRYPTO_GF128MUL=y
944CONFIG_CRYPTO_ECB=y
945CONFIG_CRYPTO_CBC=y
946CONFIG_CRYPTO_PCBC=y
947CONFIG_CRYPTO_LRW=y
875CONFIG_CRYPTO_DES=y 948CONFIG_CRYPTO_DES=y
949CONFIG_CRYPTO_FCRYPT=y
876CONFIG_CRYPTO_BLOWFISH=y 950CONFIG_CRYPTO_BLOWFISH=y
877CONFIG_CRYPTO_TWOFISH=y 951CONFIG_CRYPTO_TWOFISH=y
952CONFIG_CRYPTO_TWOFISH_COMMON=y
878CONFIG_CRYPTO_SERPENT=y 953CONFIG_CRYPTO_SERPENT=y
879CONFIG_CRYPTO_AES=y 954CONFIG_CRYPTO_AES=y
880CONFIG_CRYPTO_CAST5=y 955CONFIG_CRYPTO_CAST5=y
@@ -886,6 +961,7 @@ CONFIG_CRYPTO_ANUBIS=y
886CONFIG_CRYPTO_DEFLATE=y 961CONFIG_CRYPTO_DEFLATE=y
887CONFIG_CRYPTO_MICHAEL_MIC=y 962CONFIG_CRYPTO_MICHAEL_MIC=y
888CONFIG_CRYPTO_CRC32C=y 963CONFIG_CRYPTO_CRC32C=y
964CONFIG_CRYPTO_CAMELLIA=y
889 965
890# 966#
891# Hardware crypto devices 967# Hardware crypto devices
@@ -894,6 +970,7 @@ CONFIG_CRYPTO_CRC32C=y
894# 970#
895# Library routines 971# Library routines
896# 972#
973CONFIG_BITREVERSE=y
897# CONFIG_CRC_CCITT is not set 974# CONFIG_CRC_CCITT is not set
898CONFIG_CRC16=y 975CONFIG_CRC16=y
899CONFIG_CRC32=y 976CONFIG_CRC32=y
@@ -901,3 +978,5 @@ CONFIG_LIBCRC32C=y
901CONFIG_ZLIB_INFLATE=y 978CONFIG_ZLIB_INFLATE=y
902CONFIG_ZLIB_DEFLATE=y 979CONFIG_ZLIB_DEFLATE=y
903CONFIG_PLIST=y 980CONFIG_PLIST=y
981CONFIG_HAS_IOMEM=y
982CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index 5a9603c12902..15a027e00eec 100644
--- a/arch/mips/configs/ocelot_defconfig
+++ b/arch/mips/configs/ocelot_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:16 2006 4# Tue Feb 20 21:47:36 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MOMENCO_OCELOT=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_MOMENCO_OCELOT=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
@@ -123,8 +126,8 @@ CONFIG_BOARD_SCACHE=y
123CONFIG_RM7000_CPU_SCACHE=y 126CONFIG_RM7000_CPU_SCACHE=y
124CONFIG_CPU_HAS_PREFETCH=y 127CONFIG_CPU_HAS_PREFETCH=y
125CONFIG_MIPS_MT_DISABLED=y 128CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 129# CONFIG_MIPS_MT_SMP is not set
130# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 131# CONFIG_MIPS_VPE_LOADER is not set
129# CONFIG_64BIT_PHYS_ADDR is not set 132# CONFIG_64BIT_PHYS_ADDR is not set
130CONFIG_CPU_HAS_LLSC=y 133CONFIG_CPU_HAS_LLSC=y
@@ -142,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
142# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
143CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
144# CONFIG_RESOURCES_64BIT is not set 147# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1
145# CONFIG_HZ_48 is not set 149# CONFIG_HZ_48 is not set
146# CONFIG_HZ_100 is not set 150# CONFIG_HZ_100 is not set
147# CONFIG_HZ_128 is not set 151# CONFIG_HZ_128 is not set
@@ -154,6 +158,7 @@ CONFIG_HZ=1000
154CONFIG_PREEMPT_NONE=y 158CONFIG_PREEMPT_NONE=y
155# CONFIG_PREEMPT_VOLUNTARY is not set 159# CONFIG_PREEMPT_VOLUNTARY is not set
156# CONFIG_PREEMPT is not set 160# CONFIG_PREEMPT is not set
161# CONFIG_KEXEC is not set
157CONFIG_LOCKDEP_SUPPORT=y 162CONFIG_LOCKDEP_SUPPORT=y
158CONFIG_STACKTRACE_SUPPORT=y 163CONFIG_STACKTRACE_SUPPORT=y
159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 164CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -172,15 +177,20 @@ CONFIG_LOCALVERSION=""
172CONFIG_LOCALVERSION_AUTO=y 177CONFIG_LOCALVERSION_AUTO=y
173CONFIG_SWAP=y 178CONFIG_SWAP=y
174CONFIG_SYSVIPC=y 179CONFIG_SYSVIPC=y
180# CONFIG_IPC_NS is not set
181CONFIG_SYSVIPC_SYSCTL=y
175# CONFIG_POSIX_MQUEUE is not set 182# CONFIG_POSIX_MQUEUE is not set
176# CONFIG_BSD_PROCESS_ACCT is not set 183# CONFIG_BSD_PROCESS_ACCT is not set
177CONFIG_SYSCTL=y 184# CONFIG_TASKSTATS is not set
185# CONFIG_UTS_NS is not set
178# CONFIG_AUDIT is not set 186# CONFIG_AUDIT is not set
179# CONFIG_IKCONFIG is not set 187# CONFIG_IKCONFIG is not set
188CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 189CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 190# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
191CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 192CONFIG_EMBEDDED=y
193CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 194CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 195# CONFIG_KALLSYMS_EXTRA_PASS is not set
186# CONFIG_HOTPLUG is not set 196# CONFIG_HOTPLUG is not set
@@ -188,12 +198,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 198CONFIG_BUG=y
189CONFIG_ELF_CORE=y 199CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 200CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 201CONFIG_FUTEX=y
193CONFIG_EPOLL=y 202CONFIG_EPOLL=y
194CONFIG_SHMEM=y 203CONFIG_SHMEM=y
195CONFIG_SLAB=y 204CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 205CONFIG_VM_EVENT_COUNTERS=y
206CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 207# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 208CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 209# CONFIG_SLOB is not set
@@ -206,6 +216,7 @@ CONFIG_BASE_SMALL=0
206# 216#
207# Block layer 217# Block layer
208# 218#
219CONFIG_BLOCK=y
209# CONFIG_LBD is not set 220# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -233,7 +244,6 @@ CONFIG_MMU=y
233# 244#
234# PCCARD (PCMCIA/CardBus) support 245# PCCARD (PCMCIA/CardBus) support
235# 246#
236# CONFIG_PCCARD is not set
237 247
238# 248#
239# PCI Hotplug Support 249# PCI Hotplug Support
@@ -247,6 +257,14 @@ CONFIG_BINFMT_ELF=y
247CONFIG_TRAD_SIGNALS=y 257CONFIG_TRAD_SIGNALS=y
248 258
249# 259#
260# Power management options
261#
262CONFIG_PM=y
263# CONFIG_PM_LEGACY is not set
264# CONFIG_PM_DEBUG is not set
265# CONFIG_PM_SYSFS_DEPRECATED is not set
266
267#
250# Networking 268# Networking
251# 269#
252CONFIG_NET=y 270CONFIG_NET=y
@@ -259,7 +277,10 @@ CONFIG_NET=y
259CONFIG_UNIX=y 277CONFIG_UNIX=y
260CONFIG_XFRM=y 278CONFIG_XFRM=y
261CONFIG_XFRM_USER=y 279CONFIG_XFRM_USER=y
280# CONFIG_XFRM_SUB_POLICY is not set
281CONFIG_XFRM_MIGRATE=y
262CONFIG_NET_KEY=y 282CONFIG_NET_KEY=y
283CONFIG_NET_KEY_MIGRATE=y
263CONFIG_INET=y 284CONFIG_INET=y
264# CONFIG_IP_MULTICAST is not set 285# CONFIG_IP_MULTICAST is not set
265# CONFIG_IP_ADVANCED_ROUTER is not set 286# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +300,13 @@ CONFIG_IP_PNP_BOOTP=y
279# CONFIG_INET_TUNNEL is not set 300# CONFIG_INET_TUNNEL is not set
280CONFIG_INET_XFRM_MODE_TRANSPORT=y 301CONFIG_INET_XFRM_MODE_TRANSPORT=y
281CONFIG_INET_XFRM_MODE_TUNNEL=y 302CONFIG_INET_XFRM_MODE_TUNNEL=y
303CONFIG_INET_XFRM_MODE_BEET=y
282CONFIG_INET_DIAG=y 304CONFIG_INET_DIAG=y
283CONFIG_INET_TCP_DIAG=y 305CONFIG_INET_TCP_DIAG=y
284# CONFIG_TCP_CONG_ADVANCED is not set 306# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_BIC=y 307CONFIG_TCP_CONG_CUBIC=y
308CONFIG_DEFAULT_TCP_CONG="cubic"
309CONFIG_TCP_MD5SIG=y
286# CONFIG_IPV6 is not set 310# CONFIG_IPV6 is not set
287# CONFIG_INET6_XFRM_TUNNEL is not set 311# CONFIG_INET6_XFRM_TUNNEL is not set
288# CONFIG_INET6_TUNNEL is not set 312# CONFIG_INET6_TUNNEL is not set
@@ -312,7 +336,6 @@ CONFIG_NETWORK_SECMARK=y
312# CONFIG_ATALK is not set 336# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 337# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 338# CONFIG_LAPB is not set
315# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 339# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 340# CONFIG_WAN_ROUTER is not set
318 341
@@ -345,7 +368,6 @@ CONFIG_WIRELESS_EXT=y
345# 368#
346CONFIG_STANDALONE=y 369CONFIG_STANDALONE=y
347CONFIG_PREVENT_FIRMWARE_BUILD=y 370CONFIG_PREVENT_FIRMWARE_BUILD=y
348# CONFIG_FW_LOADER is not set
349# CONFIG_SYS_HYPERVISOR is not set 371# CONFIG_SYS_HYPERVISOR is not set
350 372
351# 373#
@@ -367,6 +389,7 @@ CONFIG_PROC_EVENTS=y
367# 389#
368# Plug and Play support 390# Plug and Play support
369# 391#
392# CONFIG_PNPACPI is not set
370 393
371# 394#
372# Block devices 395# Block devices
@@ -382,6 +405,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
382CONFIG_ATA_OVER_ETH=y 405CONFIG_ATA_OVER_ETH=y
383 406
384# 407#
408# Misc devices
409#
410
411#
385# ATA/ATAPI/MFM/RLL support 412# ATA/ATAPI/MFM/RLL support
386# 413#
387# CONFIG_IDE is not set 414# CONFIG_IDE is not set
@@ -391,6 +418,12 @@ CONFIG_ATA_OVER_ETH=y
391# 418#
392CONFIG_RAID_ATTRS=y 419CONFIG_RAID_ATTRS=y
393# CONFIG_SCSI is not set 420# CONFIG_SCSI is not set
421# CONFIG_SCSI_NETLINK is not set
422
423#
424# Serial ATA (prod) and Parallel ATA (experimental) drivers
425#
426# CONFIG_ATA is not set
394 427
395# 428#
396# Multi-device support (RAID and LVM) 429# Multi-device support (RAID and LVM)
@@ -434,6 +467,8 @@ CONFIG_LXT_PHY=y
434CONFIG_CICADA_PHY=y 467CONFIG_CICADA_PHY=y
435CONFIG_VITESSE_PHY=y 468CONFIG_VITESSE_PHY=y
436CONFIG_SMSC_PHY=y 469CONFIG_SMSC_PHY=y
470# CONFIG_BROADCOM_PHY is not set
471# CONFIG_FIXED_PHY is not set
437 472
438# 473#
439# Ethernet (10 or 100Mbit) 474# Ethernet (10 or 100Mbit)
@@ -484,6 +519,7 @@ CONFIG_NET_ETHERNET=y
484# Input device support 519# Input device support
485# 520#
486CONFIG_INPUT=y 521CONFIG_INPUT=y
522# CONFIG_INPUT_FF_MEMLESS is not set
487 523
488# 524#
489# Userland interfaces 525# Userland interfaces
@@ -557,17 +593,12 @@ CONFIG_LEGACY_PTY_COUNT=256
557# CONFIG_GEN_RTC is not set 593# CONFIG_GEN_RTC is not set
558# CONFIG_DTLK is not set 594# CONFIG_DTLK is not set
559# CONFIG_R3964 is not set 595# CONFIG_R3964 is not set
560
561#
562# Ftape, the floppy tape device driver
563#
564# CONFIG_RAW_DRIVER is not set 596# CONFIG_RAW_DRIVER is not set
565 597
566# 598#
567# TPM devices 599# TPM devices
568# 600#
569# CONFIG_TCG_TPM is not set 601# CONFIG_TCG_TPM is not set
570# CONFIG_TELCLOCK is not set
571 602
572# 603#
573# I2C support 604# I2C support
@@ -592,14 +623,9 @@ CONFIG_LEGACY_PTY_COUNT=256
592# CONFIG_HWMON_VID is not set 623# CONFIG_HWMON_VID is not set
593 624
594# 625#
595# Misc devices
596#
597
598#
599# Multimedia devices 626# Multimedia devices
600# 627#
601# CONFIG_VIDEO_DEV is not set 628# CONFIG_VIDEO_DEV is not set
602CONFIG_VIDEO_V4L2=y
603 629
604# 630#
605# Digital Video Broadcasting Devices 631# Digital Video Broadcasting Devices
@@ -617,6 +643,7 @@ CONFIG_VIDEO_V4L2=y
617# 643#
618# CONFIG_VGA_CONSOLE is not set 644# CONFIG_VGA_CONSOLE is not set
619CONFIG_DUMMY_CONSOLE=y 645CONFIG_DUMMY_CONSOLE=y
646# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
620 647
621# 648#
622# Sound 649# Sound
@@ -624,6 +651,11 @@ CONFIG_DUMMY_CONSOLE=y
624# CONFIG_SOUND is not set 651# CONFIG_SOUND is not set
625 652
626# 653#
654# HID Devices
655#
656# CONFIG_HID is not set
657
658#
627# USB support 659# USB support
628# 660#
629# CONFIG_USB_ARCH_HAS_HCD is not set 661# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -684,16 +716,26 @@ CONFIG_DUMMY_CONSOLE=y
684# 716#
685 717
686# 718#
719# Auxiliary Display support
720#
721
722#
723# Virtualization
724#
725
726#
687# File systems 727# File systems
688# 728#
689CONFIG_EXT2_FS=y 729CONFIG_EXT2_FS=y
690# CONFIG_EXT2_FS_XATTR is not set 730# CONFIG_EXT2_FS_XATTR is not set
691# CONFIG_EXT2_FS_XIP is not set 731# CONFIG_EXT2_FS_XIP is not set
692# CONFIG_EXT3_FS is not set 732# CONFIG_EXT3_FS is not set
733# CONFIG_EXT4DEV_FS is not set
693# CONFIG_REISERFS_FS is not set 734# CONFIG_REISERFS_FS is not set
694# CONFIG_JFS_FS is not set 735# CONFIG_JFS_FS is not set
695# CONFIG_FS_POSIX_ACL is not set 736CONFIG_FS_POSIX_ACL=y
696# CONFIG_XFS_FS is not set 737# CONFIG_XFS_FS is not set
738# CONFIG_GFS2_FS is not set
697# CONFIG_OCFS2_FS is not set 739# CONFIG_OCFS2_FS is not set
698# CONFIG_MINIX_FS is not set 740# CONFIG_MINIX_FS is not set
699# CONFIG_ROMFS_FS is not set 741# CONFIG_ROMFS_FS is not set
@@ -704,6 +746,7 @@ CONFIG_DNOTIFY=y
704# CONFIG_AUTOFS_FS is not set 746# CONFIG_AUTOFS_FS is not set
705# CONFIG_AUTOFS4_FS is not set 747# CONFIG_AUTOFS4_FS is not set
706CONFIG_FUSE_FS=y 748CONFIG_FUSE_FS=y
749CONFIG_GENERIC_ACL=y
707 750
708# 751#
709# CD-ROM/DVD Filesystems 752# CD-ROM/DVD Filesystems
@@ -723,17 +766,20 @@ CONFIG_FUSE_FS=y
723# 766#
724CONFIG_PROC_FS=y 767CONFIG_PROC_FS=y
725CONFIG_PROC_KCORE=y 768CONFIG_PROC_KCORE=y
769CONFIG_PROC_SYSCTL=y
726CONFIG_SYSFS=y 770CONFIG_SYSFS=y
727CONFIG_TMPFS=y 771CONFIG_TMPFS=y
772CONFIG_TMPFS_POSIX_ACL=y
728# CONFIG_HUGETLB_PAGE is not set 773# CONFIG_HUGETLB_PAGE is not set
729CONFIG_RAMFS=y 774CONFIG_RAMFS=y
730# CONFIG_CONFIGFS_FS is not set 775CONFIG_CONFIGFS_FS=y
731 776
732# 777#
733# Miscellaneous filesystems 778# Miscellaneous filesystems
734# 779#
735# CONFIG_ADFS_FS is not set 780# CONFIG_ADFS_FS is not set
736# CONFIG_AFFS_FS is not set 781# CONFIG_AFFS_FS is not set
782# CONFIG_ECRYPT_FS is not set
737# CONFIG_HFS_FS is not set 783# CONFIG_HFS_FS is not set
738# CONFIG_HFSPLUS_FS is not set 784# CONFIG_HFSPLUS_FS is not set
739# CONFIG_BEFS_FS is not set 785# CONFIG_BEFS_FS is not set
@@ -765,7 +811,6 @@ CONFIG_SUNRPC=y
765# CONFIG_RPCSEC_GSS_SPKM3 is not set 811# CONFIG_RPCSEC_GSS_SPKM3 is not set
766# CONFIG_SMB_FS is not set 812# CONFIG_SMB_FS is not set
767# CONFIG_CIFS is not set 813# CONFIG_CIFS is not set
768# CONFIG_CIFS_DEBUG2 is not set
769# CONFIG_NCP_FS is not set 814# CONFIG_NCP_FS is not set
770# CONFIG_CODA_FS is not set 815# CONFIG_CODA_FS is not set
771# CONFIG_AFS_FS is not set 816# CONFIG_AFS_FS is not set
@@ -783,6 +828,14 @@ CONFIG_MSDOS_PARTITION=y
783# CONFIG_NLS is not set 828# CONFIG_NLS is not set
784 829
785# 830#
831# Distributed Lock Manager
832#
833CONFIG_DLM=y
834CONFIG_DLM_TCP=y
835# CONFIG_DLM_SCTP is not set
836# CONFIG_DLM_DEBUG is not set
837
838#
786# Profiling support 839# Profiling support
787# 840#
788# CONFIG_PROFILING is not set 841# CONFIG_PROFILING is not set
@@ -792,14 +845,16 @@ CONFIG_MSDOS_PARTITION=y
792# 845#
793CONFIG_TRACE_IRQFLAGS_SUPPORT=y 846CONFIG_TRACE_IRQFLAGS_SUPPORT=y
794# CONFIG_PRINTK_TIME is not set 847# CONFIG_PRINTK_TIME is not set
848CONFIG_ENABLE_MUST_CHECK=y
795# CONFIG_MAGIC_SYSRQ is not set 849# CONFIG_MAGIC_SYSRQ is not set
796# CONFIG_UNUSED_SYMBOLS is not set 850# CONFIG_UNUSED_SYMBOLS is not set
851# CONFIG_DEBUG_FS is not set
852# CONFIG_HEADERS_CHECK is not set
797# CONFIG_DEBUG_KERNEL is not set 853# CONFIG_DEBUG_KERNEL is not set
798CONFIG_LOG_BUF_SHIFT=14 854CONFIG_LOG_BUF_SHIFT=14
799# CONFIG_DEBUG_FS is not set
800# CONFIG_UNWIND_INFO is not set
801CONFIG_CROSSCOMPILE=y 855CONFIG_CROSSCOMPILE=y
802CONFIG_CMDLINE="" 856CONFIG_CMDLINE=""
857CONFIG_SYS_SUPPORTS_KGDB=y
803 858
804# 859#
805# Security options 860# Security options
@@ -812,7 +867,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
812# Cryptographic options 867# Cryptographic options
813# 868#
814CONFIG_CRYPTO=y 869CONFIG_CRYPTO=y
870CONFIG_CRYPTO_ALGAPI=y
871CONFIG_CRYPTO_BLKCIPHER=y
872CONFIG_CRYPTO_HASH=y
873CONFIG_CRYPTO_MANAGER=y
815CONFIG_CRYPTO_HMAC=y 874CONFIG_CRYPTO_HMAC=y
875CONFIG_CRYPTO_XCBC=y
816CONFIG_CRYPTO_NULL=y 876CONFIG_CRYPTO_NULL=y
817CONFIG_CRYPTO_MD4=y 877CONFIG_CRYPTO_MD4=y
818CONFIG_CRYPTO_MD5=y 878CONFIG_CRYPTO_MD5=y
@@ -821,9 +881,16 @@ CONFIG_CRYPTO_SHA256=y
821CONFIG_CRYPTO_SHA512=y 881CONFIG_CRYPTO_SHA512=y
822CONFIG_CRYPTO_WP512=y 882CONFIG_CRYPTO_WP512=y
823CONFIG_CRYPTO_TGR192=y 883CONFIG_CRYPTO_TGR192=y
884CONFIG_CRYPTO_GF128MUL=y
885CONFIG_CRYPTO_ECB=y
886CONFIG_CRYPTO_CBC=y
887CONFIG_CRYPTO_PCBC=y
888CONFIG_CRYPTO_LRW=y
824CONFIG_CRYPTO_DES=y 889CONFIG_CRYPTO_DES=y
890CONFIG_CRYPTO_FCRYPT=y
825CONFIG_CRYPTO_BLOWFISH=y 891CONFIG_CRYPTO_BLOWFISH=y
826CONFIG_CRYPTO_TWOFISH=y 892CONFIG_CRYPTO_TWOFISH=y
893CONFIG_CRYPTO_TWOFISH_COMMON=y
827CONFIG_CRYPTO_SERPENT=y 894CONFIG_CRYPTO_SERPENT=y
828CONFIG_CRYPTO_AES=y 895CONFIG_CRYPTO_AES=y
829CONFIG_CRYPTO_CAST5=y 896CONFIG_CRYPTO_CAST5=y
@@ -835,6 +902,7 @@ CONFIG_CRYPTO_ANUBIS=y
835CONFIG_CRYPTO_DEFLATE=y 902CONFIG_CRYPTO_DEFLATE=y
836CONFIG_CRYPTO_MICHAEL_MIC=y 903CONFIG_CRYPTO_MICHAEL_MIC=y
837CONFIG_CRYPTO_CRC32C=y 904CONFIG_CRYPTO_CRC32C=y
905CONFIG_CRYPTO_CAMELLIA=y
838 906
839# 907#
840# Hardware crypto devices 908# Hardware crypto devices
@@ -843,6 +911,7 @@ CONFIG_CRYPTO_CRC32C=y
843# 911#
844# Library routines 912# Library routines
845# 913#
914CONFIG_BITREVERSE=y
846# CONFIG_CRC_CCITT is not set 915# CONFIG_CRC_CCITT is not set
847CONFIG_CRC16=y 916CONFIG_CRC16=y
848CONFIG_CRC32=y 917CONFIG_CRC32=y
@@ -850,3 +919,5 @@ CONFIG_LIBCRC32C=y
850CONFIG_ZLIB_INFLATE=y 919CONFIG_ZLIB_INFLATE=y
851CONFIG_ZLIB_DEFLATE=y 920CONFIG_ZLIB_DEFLATE=y
852CONFIG_PLIST=y 921CONFIG_PLIST=y
922CONFIG_HAS_IOMEM=y
923CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index 46a942c253cf..7078e6b3ea11 100644
--- a/arch/mips/configs/ocelot_g_defconfig
+++ b/arch/mips/configs/ocelot_g_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:16 2006 4# Tue Feb 20 21:47:36 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41CONFIG_MOMENCO_OCELOT_G=y 40CONFIG_MOMENCO_OCELOT_G=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_MOMENCO_OCELOT_G=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
@@ -106,15 +109,14 @@ CONFIG_CPU_RM7000=y
106# CONFIG_CPU_SB1 is not set 109# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_RM7000=y 110CONFIG_SYS_HAS_CPU_RM7000=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 111CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
109CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 112CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 113CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
112 114
113# 115#
114# Kernel type 116# Kernel type
115# 117#
116# CONFIG_32BIT is not set 118CONFIG_32BIT=y
117CONFIG_64BIT=y 119# CONFIG_64BIT is not set
118CONFIG_PAGE_SIZE_4KB=y 120CONFIG_PAGE_SIZE_4KB=y
119# CONFIG_PAGE_SIZE_8KB is not set 121# CONFIG_PAGE_SIZE_8KB is not set
120# CONFIG_PAGE_SIZE_16KB is not set 122# CONFIG_PAGE_SIZE_16KB is not set
@@ -123,9 +125,10 @@ CONFIG_BOARD_SCACHE=y
123CONFIG_RM7000_CPU_SCACHE=y 125CONFIG_RM7000_CPU_SCACHE=y
124CONFIG_CPU_HAS_PREFETCH=y 126CONFIG_CPU_HAS_PREFETCH=y
125CONFIG_MIPS_MT_DISABLED=y 127CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 128# CONFIG_MIPS_MT_SMP is not set
129# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 130# CONFIG_MIPS_VPE_LOADER is not set
131# CONFIG_64BIT_PHYS_ADDR is not set
129CONFIG_CPU_HAS_LLSC=y 132CONFIG_CPU_HAS_LLSC=y
130CONFIG_CPU_HAS_SYNC=y 133CONFIG_CPU_HAS_SYNC=y
131CONFIG_GENERIC_HARDIRQS=y 134CONFIG_GENERIC_HARDIRQS=y
@@ -141,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 144# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 145CONFIG_SPLIT_PTLOCK_CPUS=4
143CONFIG_RESOURCES_64BIT=y 146CONFIG_RESOURCES_64BIT=y
147CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 148# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 149# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 150# CONFIG_HZ_128 is not set
@@ -153,6 +157,7 @@ CONFIG_HZ=1000
153CONFIG_PREEMPT_NONE=y 157CONFIG_PREEMPT_NONE=y
154# CONFIG_PREEMPT_VOLUNTARY is not set 158# CONFIG_PREEMPT_VOLUNTARY is not set
155# CONFIG_PREEMPT is not set 159# CONFIG_PREEMPT is not set
160# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 161CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 162CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 163CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,15 +176,20 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 176CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 177CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 178CONFIG_SYSVIPC=y
179# CONFIG_IPC_NS is not set
180CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 181# CONFIG_POSIX_MQUEUE is not set
175# CONFIG_BSD_PROCESS_ACCT is not set 182# CONFIG_BSD_PROCESS_ACCT is not set
176CONFIG_SYSCTL=y 183# CONFIG_TASKSTATS is not set
184# CONFIG_UTS_NS is not set
177# CONFIG_AUDIT is not set 185# CONFIG_AUDIT is not set
178# CONFIG_IKCONFIG is not set 186# CONFIG_IKCONFIG is not set
187CONFIG_SYSFS_DEPRECATED=y
179CONFIG_RELAY=y 188CONFIG_RELAY=y
180CONFIG_INITRAMFS_SOURCE=""
181# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 189# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
190CONFIG_SYSCTL=y
182CONFIG_EMBEDDED=y 191CONFIG_EMBEDDED=y
192CONFIG_SYSCTL_SYSCALL=y
183CONFIG_KALLSYMS=y 193CONFIG_KALLSYMS=y
184# CONFIG_KALLSYMS_EXTRA_PASS is not set 194# CONFIG_KALLSYMS_EXTRA_PASS is not set
185CONFIG_HOTPLUG=y 195CONFIG_HOTPLUG=y
@@ -187,12 +197,12 @@ CONFIG_PRINTK=y
187CONFIG_BUG=y 197CONFIG_BUG=y
188CONFIG_ELF_CORE=y 198CONFIG_ELF_CORE=y
189CONFIG_BASE_FULL=y 199CONFIG_BASE_FULL=y
190CONFIG_RT_MUTEXES=y
191CONFIG_FUTEX=y 200CONFIG_FUTEX=y
192CONFIG_EPOLL=y 201CONFIG_EPOLL=y
193CONFIG_SHMEM=y 202CONFIG_SHMEM=y
194CONFIG_SLAB=y 203CONFIG_SLAB=y
195CONFIG_VM_EVENT_COUNTERS=y 204CONFIG_VM_EVENT_COUNTERS=y
205CONFIG_RT_MUTEXES=y
196# CONFIG_TINY_SHMEM is not set 206# CONFIG_TINY_SHMEM is not set
197CONFIG_BASE_SMALL=0 207CONFIG_BASE_SMALL=0
198# CONFIG_SLOB is not set 208# CONFIG_SLOB is not set
@@ -205,7 +215,10 @@ CONFIG_BASE_SMALL=0
205# 215#
206# Block layer 216# Block layer
207# 217#
218CONFIG_BLOCK=y
219# CONFIG_LBD is not set
208# CONFIG_BLK_DEV_IO_TRACE is not set 220# CONFIG_BLK_DEV_IO_TRACE is not set
221CONFIG_LSF=y
209 222
210# 223#
211# IO Schedulers 224# IO Schedulers
@@ -242,12 +255,15 @@ CONFIG_MMU=y
242# 255#
243CONFIG_BINFMT_ELF=y 256CONFIG_BINFMT_ELF=y
244# CONFIG_BINFMT_MISC is not set 257# CONFIG_BINFMT_MISC is not set
245# CONFIG_BUILD_ELF64 is not set 258CONFIG_TRAD_SIGNALS=y
246CONFIG_MIPS32_COMPAT=y 259
247CONFIG_COMPAT=y 260#
248CONFIG_MIPS32_O32=y 261# Power management options
249CONFIG_MIPS32_N32=y 262#
250CONFIG_BINFMT_ELF32=y 263CONFIG_PM=y
264# CONFIG_PM_LEGACY is not set
265# CONFIG_PM_DEBUG is not set
266# CONFIG_PM_SYSFS_DEPRECATED is not set
251 267
252# 268#
253# Networking 269# Networking
@@ -262,7 +278,10 @@ CONFIG_NET=y
262CONFIG_UNIX=y 278CONFIG_UNIX=y
263CONFIG_XFRM=y 279CONFIG_XFRM=y
264CONFIG_XFRM_USER=y 280CONFIG_XFRM_USER=y
281# CONFIG_XFRM_SUB_POLICY is not set
282CONFIG_XFRM_MIGRATE=y
265CONFIG_NET_KEY=y 283CONFIG_NET_KEY=y
284CONFIG_NET_KEY_MIGRATE=y
266CONFIG_INET=y 285CONFIG_INET=y
267# CONFIG_IP_MULTICAST is not set 286# CONFIG_IP_MULTICAST is not set
268# CONFIG_IP_ADVANCED_ROUTER is not set 287# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -282,10 +301,13 @@ CONFIG_IP_PNP_DHCP=y
282# CONFIG_INET_TUNNEL is not set 301# CONFIG_INET_TUNNEL is not set
283CONFIG_INET_XFRM_MODE_TRANSPORT=y 302CONFIG_INET_XFRM_MODE_TRANSPORT=y
284CONFIG_INET_XFRM_MODE_TUNNEL=y 303CONFIG_INET_XFRM_MODE_TUNNEL=y
304CONFIG_INET_XFRM_MODE_BEET=y
285CONFIG_INET_DIAG=y 305CONFIG_INET_DIAG=y
286CONFIG_INET_TCP_DIAG=y 306CONFIG_INET_TCP_DIAG=y
287# CONFIG_TCP_CONG_ADVANCED is not set 307# CONFIG_TCP_CONG_ADVANCED is not set
288CONFIG_TCP_CONG_BIC=y 308CONFIG_TCP_CONG_CUBIC=y
309CONFIG_DEFAULT_TCP_CONG="cubic"
310CONFIG_TCP_MD5SIG=y
289# CONFIG_IPV6 is not set 311# CONFIG_IPV6 is not set
290# CONFIG_INET6_XFRM_TUNNEL is not set 312# CONFIG_INET6_XFRM_TUNNEL is not set
291# CONFIG_INET6_TUNNEL is not set 313# CONFIG_INET6_TUNNEL is not set
@@ -315,7 +337,6 @@ CONFIG_NETWORK_SECMARK=y
315# CONFIG_ATALK is not set 337# CONFIG_ATALK is not set
316# CONFIG_X25 is not set 338# CONFIG_X25 is not set
317# CONFIG_LAPB is not set 339# CONFIG_LAPB is not set
318# CONFIG_NET_DIVERT is not set
319# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
321 342
@@ -370,6 +391,7 @@ CONFIG_PROC_EVENTS=y
370# 391#
371# Plug and Play support 392# Plug and Play support
372# 393#
394# CONFIG_PNPACPI is not set
373 395
374# 396#
375# Block devices 397# Block devices
@@ -390,6 +412,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
390CONFIG_ATA_OVER_ETH=y 412CONFIG_ATA_OVER_ETH=y
391 413
392# 414#
415# Misc devices
416#
417CONFIG_SGI_IOC4=y
418# CONFIG_TIFM_CORE is not set
419
420#
393# ATA/ATAPI/MFM/RLL support 421# ATA/ATAPI/MFM/RLL support
394# 422#
395# CONFIG_IDE is not set 423# CONFIG_IDE is not set
@@ -399,6 +427,12 @@ CONFIG_ATA_OVER_ETH=y
399# 427#
400CONFIG_RAID_ATTRS=y 428CONFIG_RAID_ATTRS=y
401# CONFIG_SCSI is not set 429# CONFIG_SCSI is not set
430# CONFIG_SCSI_NETLINK is not set
431
432#
433# Serial ATA (prod) and Parallel ATA (experimental) drivers
434#
435# CONFIG_ATA is not set
402 436
403# 437#
404# Multi-device support (RAID and LVM) 438# Multi-device support (RAID and LVM)
@@ -449,6 +483,8 @@ CONFIG_LXT_PHY=y
449CONFIG_CICADA_PHY=y 483CONFIG_CICADA_PHY=y
450CONFIG_VITESSE_PHY=y 484CONFIG_VITESSE_PHY=y
451CONFIG_SMSC_PHY=y 485CONFIG_SMSC_PHY=y
486# CONFIG_BROADCOM_PHY is not set
487# CONFIG_FIXED_PHY is not set
452 488
453# 489#
454# Ethernet (10 or 100Mbit) 490# Ethernet (10 or 100Mbit)
@@ -485,14 +521,18 @@ CONFIG_GALILEO_64240_ETH=y
485# CONFIG_SK98LIN is not set 521# CONFIG_SK98LIN is not set
486# CONFIG_TIGON3 is not set 522# CONFIG_TIGON3 is not set
487# CONFIG_BNX2 is not set 523# CONFIG_BNX2 is not set
524CONFIG_QLA3XXX=y
525# CONFIG_ATL1 is not set
488 526
489# 527#
490# Ethernet (10000 Mbit) 528# Ethernet (10000 Mbit)
491# 529#
492# CONFIG_CHELSIO_T1 is not set 530# CONFIG_CHELSIO_T1 is not set
531CONFIG_CHELSIO_T3=y
493# CONFIG_IXGB is not set 532# CONFIG_IXGB is not set
494# CONFIG_S2IO is not set 533# CONFIG_S2IO is not set
495# CONFIG_MYRI10GE is not set 534# CONFIG_MYRI10GE is not set
535CONFIG_NETXEN_NIC=y
496 536
497# 537#
498# Token Ring devices 538# Token Ring devices
@@ -531,6 +571,7 @@ CONFIG_GALILEO_64240_ETH=y
531# Input device support 571# Input device support
532# 572#
533CONFIG_INPUT=y 573CONFIG_INPUT=y
574# CONFIG_INPUT_FF_MEMLESS is not set
534 575
535# 576#
536# Userland interfaces 577# Userland interfaces
@@ -608,10 +649,6 @@ CONFIG_LEGACY_PTY_COUNT=256
608# CONFIG_DTLK is not set 649# CONFIG_DTLK is not set
609# CONFIG_R3964 is not set 650# CONFIG_R3964 is not set
610# CONFIG_APPLICOM is not set 651# CONFIG_APPLICOM is not set
611
612#
613# Ftape, the floppy tape device driver
614#
615# CONFIG_DRM is not set 652# CONFIG_DRM is not set
616# CONFIG_RAW_DRIVER is not set 653# CONFIG_RAW_DRIVER is not set
617 654
@@ -619,7 +656,6 @@ CONFIG_LEGACY_PTY_COUNT=256
619# TPM devices 656# TPM devices
620# 657#
621# CONFIG_TCG_TPM is not set 658# CONFIG_TCG_TPM is not set
622# CONFIG_TELCLOCK is not set
623 659
624# 660#
625# I2C support 661# I2C support
@@ -644,14 +680,9 @@ CONFIG_LEGACY_PTY_COUNT=256
644# CONFIG_HWMON_VID is not set 680# CONFIG_HWMON_VID is not set
645 681
646# 682#
647# Misc devices
648#
649
650#
651# Multimedia devices 683# Multimedia devices
652# 684#
653# CONFIG_VIDEO_DEV is not set 685# CONFIG_VIDEO_DEV is not set
654CONFIG_VIDEO_V4L2=y
655 686
656# 687#
657# Digital Video Broadcasting Devices 688# Digital Video Broadcasting Devices
@@ -669,6 +700,7 @@ CONFIG_VIDEO_V4L2=y
669# 700#
670# CONFIG_VGA_CONSOLE is not set 701# CONFIG_VGA_CONSOLE is not set
671CONFIG_DUMMY_CONSOLE=y 702CONFIG_DUMMY_CONSOLE=y
703# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
672 704
673# 705#
674# Sound 706# Sound
@@ -676,6 +708,11 @@ CONFIG_DUMMY_CONSOLE=y
676# CONFIG_SOUND is not set 708# CONFIG_SOUND is not set
677 709
678# 710#
711# HID Devices
712#
713# CONFIG_HID is not set
714
715#
679# USB support 716# USB support
680# 717#
681CONFIG_USB_ARCH_HAS_HCD=y 718CONFIG_USB_ARCH_HAS_HCD=y
@@ -738,16 +775,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
738# 775#
739 776
740# 777#
778# Auxiliary Display support
779#
780
781#
782# Virtualization
783#
784
785#
741# File systems 786# File systems
742# 787#
743CONFIG_EXT2_FS=y 788CONFIG_EXT2_FS=y
744# CONFIG_EXT2_FS_XATTR is not set 789# CONFIG_EXT2_FS_XATTR is not set
745# CONFIG_EXT2_FS_XIP is not set 790# CONFIG_EXT2_FS_XIP is not set
746# CONFIG_EXT3_FS is not set 791# CONFIG_EXT3_FS is not set
792# CONFIG_EXT4DEV_FS is not set
747# CONFIG_REISERFS_FS is not set 793# CONFIG_REISERFS_FS is not set
748# CONFIG_JFS_FS is not set 794# CONFIG_JFS_FS is not set
749# CONFIG_FS_POSIX_ACL is not set 795CONFIG_FS_POSIX_ACL=y
750# CONFIG_XFS_FS is not set 796# CONFIG_XFS_FS is not set
797# CONFIG_GFS2_FS is not set
751# CONFIG_OCFS2_FS is not set 798# CONFIG_OCFS2_FS is not set
752# CONFIG_MINIX_FS is not set 799# CONFIG_MINIX_FS is not set
753# CONFIG_ROMFS_FS is not set 800# CONFIG_ROMFS_FS is not set
@@ -758,6 +805,7 @@ CONFIG_DNOTIFY=y
758# CONFIG_AUTOFS_FS is not set 805# CONFIG_AUTOFS_FS is not set
759# CONFIG_AUTOFS4_FS is not set 806# CONFIG_AUTOFS4_FS is not set
760CONFIG_FUSE_FS=y 807CONFIG_FUSE_FS=y
808CONFIG_GENERIC_ACL=y
761 809
762# 810#
763# CD-ROM/DVD Filesystems 811# CD-ROM/DVD Filesystems
@@ -777,17 +825,20 @@ CONFIG_FUSE_FS=y
777# 825#
778CONFIG_PROC_FS=y 826CONFIG_PROC_FS=y
779CONFIG_PROC_KCORE=y 827CONFIG_PROC_KCORE=y
828CONFIG_PROC_SYSCTL=y
780CONFIG_SYSFS=y 829CONFIG_SYSFS=y
781CONFIG_TMPFS=y 830CONFIG_TMPFS=y
831CONFIG_TMPFS_POSIX_ACL=y
782# CONFIG_HUGETLB_PAGE is not set 832# CONFIG_HUGETLB_PAGE is not set
783CONFIG_RAMFS=y 833CONFIG_RAMFS=y
784# CONFIG_CONFIGFS_FS is not set 834CONFIG_CONFIGFS_FS=y
785 835
786# 836#
787# Miscellaneous filesystems 837# Miscellaneous filesystems
788# 838#
789# CONFIG_ADFS_FS is not set 839# CONFIG_ADFS_FS is not set
790# CONFIG_AFFS_FS is not set 840# CONFIG_AFFS_FS is not set
841# CONFIG_ECRYPT_FS is not set
791# CONFIG_HFS_FS is not set 842# CONFIG_HFS_FS is not set
792# CONFIG_HFSPLUS_FS is not set 843# CONFIG_HFSPLUS_FS is not set
793# CONFIG_BEFS_FS is not set 844# CONFIG_BEFS_FS is not set
@@ -819,7 +870,6 @@ CONFIG_SUNRPC=y
819# CONFIG_RPCSEC_GSS_SPKM3 is not set 870# CONFIG_RPCSEC_GSS_SPKM3 is not set
820# CONFIG_SMB_FS is not set 871# CONFIG_SMB_FS is not set
821# CONFIG_CIFS is not set 872# CONFIG_CIFS is not set
822# CONFIG_CIFS_DEBUG2 is not set
823# CONFIG_NCP_FS is not set 873# CONFIG_NCP_FS is not set
824# CONFIG_CODA_FS is not set 874# CONFIG_CODA_FS is not set
825# CONFIG_AFS_FS is not set 875# CONFIG_AFS_FS is not set
@@ -837,6 +887,14 @@ CONFIG_MSDOS_PARTITION=y
837# CONFIG_NLS is not set 887# CONFIG_NLS is not set
838 888
839# 889#
890# Distributed Lock Manager
891#
892CONFIG_DLM=y
893CONFIG_DLM_TCP=y
894# CONFIG_DLM_SCTP is not set
895# CONFIG_DLM_DEBUG is not set
896
897#
840# Profiling support 898# Profiling support
841# 899#
842# CONFIG_PROFILING is not set 900# CONFIG_PROFILING is not set
@@ -846,12 +904,13 @@ CONFIG_MSDOS_PARTITION=y
846# 904#
847CONFIG_TRACE_IRQFLAGS_SUPPORT=y 905CONFIG_TRACE_IRQFLAGS_SUPPORT=y
848# CONFIG_PRINTK_TIME is not set 906# CONFIG_PRINTK_TIME is not set
907CONFIG_ENABLE_MUST_CHECK=y
849# CONFIG_MAGIC_SYSRQ is not set 908# CONFIG_MAGIC_SYSRQ is not set
850# CONFIG_UNUSED_SYMBOLS is not set 909# CONFIG_UNUSED_SYMBOLS is not set
910# CONFIG_DEBUG_FS is not set
911# CONFIG_HEADERS_CHECK is not set
851# CONFIG_DEBUG_KERNEL is not set 912# CONFIG_DEBUG_KERNEL is not set
852CONFIG_LOG_BUF_SHIFT=14 913CONFIG_LOG_BUF_SHIFT=14
853# CONFIG_DEBUG_FS is not set
854# CONFIG_UNWIND_INFO is not set
855CONFIG_CROSSCOMPILE=y 914CONFIG_CROSSCOMPILE=y
856CONFIG_CMDLINE="" 915CONFIG_CMDLINE=""
857 916
@@ -866,7 +925,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
866# Cryptographic options 925# Cryptographic options
867# 926#
868CONFIG_CRYPTO=y 927CONFIG_CRYPTO=y
928CONFIG_CRYPTO_ALGAPI=y
929CONFIG_CRYPTO_BLKCIPHER=y
930CONFIG_CRYPTO_HASH=y
931CONFIG_CRYPTO_MANAGER=y
869CONFIG_CRYPTO_HMAC=y 932CONFIG_CRYPTO_HMAC=y
933CONFIG_CRYPTO_XCBC=y
870CONFIG_CRYPTO_NULL=y 934CONFIG_CRYPTO_NULL=y
871CONFIG_CRYPTO_MD4=y 935CONFIG_CRYPTO_MD4=y
872CONFIG_CRYPTO_MD5=y 936CONFIG_CRYPTO_MD5=y
@@ -875,9 +939,16 @@ CONFIG_CRYPTO_SHA256=y
875CONFIG_CRYPTO_SHA512=y 939CONFIG_CRYPTO_SHA512=y
876CONFIG_CRYPTO_WP512=y 940CONFIG_CRYPTO_WP512=y
877CONFIG_CRYPTO_TGR192=y 941CONFIG_CRYPTO_TGR192=y
942CONFIG_CRYPTO_GF128MUL=y
943CONFIG_CRYPTO_ECB=y
944CONFIG_CRYPTO_CBC=y
945CONFIG_CRYPTO_PCBC=y
946CONFIG_CRYPTO_LRW=y
878CONFIG_CRYPTO_DES=y 947CONFIG_CRYPTO_DES=y
948CONFIG_CRYPTO_FCRYPT=y
879CONFIG_CRYPTO_BLOWFISH=y 949CONFIG_CRYPTO_BLOWFISH=y
880CONFIG_CRYPTO_TWOFISH=y 950CONFIG_CRYPTO_TWOFISH=y
951CONFIG_CRYPTO_TWOFISH_COMMON=y
881CONFIG_CRYPTO_SERPENT=y 952CONFIG_CRYPTO_SERPENT=y
882CONFIG_CRYPTO_AES=y 953CONFIG_CRYPTO_AES=y
883CONFIG_CRYPTO_CAST5=y 954CONFIG_CRYPTO_CAST5=y
@@ -889,6 +960,7 @@ CONFIG_CRYPTO_ANUBIS=y
889CONFIG_CRYPTO_DEFLATE=y 960CONFIG_CRYPTO_DEFLATE=y
890CONFIG_CRYPTO_MICHAEL_MIC=y 961CONFIG_CRYPTO_MICHAEL_MIC=y
891CONFIG_CRYPTO_CRC32C=y 962CONFIG_CRYPTO_CRC32C=y
963CONFIG_CRYPTO_CAMELLIA=y
892 964
893# 965#
894# Hardware crypto devices 966# Hardware crypto devices
@@ -897,6 +969,7 @@ CONFIG_CRYPTO_CRC32C=y
897# 969#
898# Library routines 970# Library routines
899# 971#
972CONFIG_BITREVERSE=y
900# CONFIG_CRC_CCITT is not set 973# CONFIG_CRC_CCITT is not set
901CONFIG_CRC16=y 974CONFIG_CRC16=y
902CONFIG_CRC32=y 975CONFIG_CRC32=y
@@ -904,3 +977,5 @@ CONFIG_LIBCRC32C=y
904CONFIG_ZLIB_INFLATE=y 977CONFIG_ZLIB_INFLATE=y
905CONFIG_ZLIB_DEFLATE=y 978CONFIG_ZLIB_DEFLATE=y
906CONFIG_PLIST=y 979CONFIG_PLIST=y
980CONFIG_HAS_IOMEM=y
981CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 7d3c688181d5..69678d99ae61 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:17 2006 4# Tue Feb 20 21:47:37 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_PB1100=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_PB1100=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +63,19 @@ CONFIG_MIPS_PB1100=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 77CONFIG_CPU_LITTLE_ENDIAN=y
78CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 79CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1100=y 80CONFIG_SOC_AU1100=y
77CONFIG_SOC_AU1X00=y 81CONFIG_SOC_AU1X00=y
@@ -117,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_64BIT_PHYS_ADDR=y 127CONFIG_64BIT_PHYS_ADDR=y
124CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -148,6 +153,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +172,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 173CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
174CONFIG_RELAY=y 184CONFIG_RELAY=y
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -182,12 +193,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 193CONFIG_BUG=y
183CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 196CONFIG_FUTEX=y
187CONFIG_EPOLL=y 197CONFIG_EPOLL=y
188CONFIG_SHMEM=y 198CONFIG_SHMEM=y
189CONFIG_SLAB=y 199CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -205,6 +216,7 @@ CONFIG_KMOD=y
205# 216#
206# Block layer 217# Block layer
207# 218#
219CONFIG_BLOCK=y
208# CONFIG_LBD is not set 220# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -253,6 +265,10 @@ CONFIG_PCMCIA_IOCTL=y
253CONFIG_BINFMT_ELF=y 265CONFIG_BINFMT_ELF=y
254# CONFIG_BINFMT_MISC is not set 266# CONFIG_BINFMT_MISC is not set
255CONFIG_TRAD_SIGNALS=y 267CONFIG_TRAD_SIGNALS=y
268
269#
270# Power management options
271#
256# CONFIG_PM is not set 272# CONFIG_PM is not set
257 273
258# 274#
@@ -269,7 +285,10 @@ CONFIG_PACKET=y
269CONFIG_UNIX=y 285CONFIG_UNIX=y
270CONFIG_XFRM=y 286CONFIG_XFRM=y
271CONFIG_XFRM_USER=m 287CONFIG_XFRM_USER=m
288# CONFIG_XFRM_SUB_POLICY is not set
289CONFIG_XFRM_MIGRATE=y
272CONFIG_NET_KEY=y 290CONFIG_NET_KEY=y
291CONFIG_NET_KEY_MIGRATE=y
273CONFIG_INET=y 292CONFIG_INET=y
274CONFIG_IP_MULTICAST=y 293CONFIG_IP_MULTICAST=y
275# CONFIG_IP_ADVANCED_ROUTER is not set 294# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -290,10 +309,13 @@ CONFIG_IP_PNP_BOOTP=y
290# CONFIG_INET_TUNNEL is not set 309# CONFIG_INET_TUNNEL is not set
291CONFIG_INET_XFRM_MODE_TRANSPORT=m 310CONFIG_INET_XFRM_MODE_TRANSPORT=m
292CONFIG_INET_XFRM_MODE_TUNNEL=m 311CONFIG_INET_XFRM_MODE_TUNNEL=m
312CONFIG_INET_XFRM_MODE_BEET=m
293CONFIG_INET_DIAG=y 313CONFIG_INET_DIAG=y
294CONFIG_INET_TCP_DIAG=y 314CONFIG_INET_TCP_DIAG=y
295# CONFIG_TCP_CONG_ADVANCED is not set 315# CONFIG_TCP_CONG_ADVANCED is not set
296CONFIG_TCP_CONG_BIC=y 316CONFIG_TCP_CONG_CUBIC=y
317CONFIG_DEFAULT_TCP_CONG="cubic"
318CONFIG_TCP_MD5SIG=y
297 319
298# 320#
299# IP: Virtual Server Configuration 321# IP: Virtual Server Configuration
@@ -312,15 +334,42 @@ CONFIG_NETFILTER=y
312CONFIG_NETFILTER_NETLINK=m 334CONFIG_NETFILTER_NETLINK=m
313CONFIG_NETFILTER_NETLINK_QUEUE=m 335CONFIG_NETFILTER_NETLINK_QUEUE=m
314CONFIG_NETFILTER_NETLINK_LOG=m 336CONFIG_NETFILTER_NETLINK_LOG=m
315# CONFIG_NF_CONNTRACK is not set 337CONFIG_NF_CONNTRACK_ENABLED=m
338CONFIG_NF_CONNTRACK_SUPPORT=y
339# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
340CONFIG_NF_CONNTRACK=m
341CONFIG_NF_CT_ACCT=y
342CONFIG_NF_CONNTRACK_MARK=y
343CONFIG_NF_CONNTRACK_SECMARK=y
344CONFIG_NF_CONNTRACK_EVENTS=y
345CONFIG_NF_CT_PROTO_GRE=m
346CONFIG_NF_CT_PROTO_SCTP=m
347CONFIG_NF_CONNTRACK_AMANDA=m
348CONFIG_NF_CONNTRACK_FTP=m
349CONFIG_NF_CONNTRACK_H323=m
350CONFIG_NF_CONNTRACK_IRC=m
351# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
352CONFIG_NF_CONNTRACK_PPTP=m
353CONFIG_NF_CONNTRACK_SANE=m
354CONFIG_NF_CONNTRACK_SIP=m
355CONFIG_NF_CONNTRACK_TFTP=m
356CONFIG_NF_CT_NETLINK=m
316CONFIG_NETFILTER_XTABLES=m 357CONFIG_NETFILTER_XTABLES=m
317CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 358CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
318CONFIG_NETFILTER_XT_TARGET_MARK=m 359CONFIG_NETFILTER_XT_TARGET_MARK=m
319CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 360CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
361CONFIG_NETFILTER_XT_TARGET_NFLOG=m
320CONFIG_NETFILTER_XT_TARGET_SECMARK=m 362CONFIG_NETFILTER_XT_TARGET_SECMARK=m
363CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
364CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
321CONFIG_NETFILTER_XT_MATCH_COMMENT=m 365CONFIG_NETFILTER_XT_MATCH_COMMENT=m
366CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
367CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
368CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
322CONFIG_NETFILTER_XT_MATCH_DCCP=m 369CONFIG_NETFILTER_XT_MATCH_DCCP=m
370CONFIG_NETFILTER_XT_MATCH_DSCP=m
323CONFIG_NETFILTER_XT_MATCH_ESP=m 371CONFIG_NETFILTER_XT_MATCH_ESP=m
372CONFIG_NETFILTER_XT_MATCH_HELPER=m
324CONFIG_NETFILTER_XT_MATCH_LENGTH=m 373CONFIG_NETFILTER_XT_MATCH_LENGTH=m
325CONFIG_NETFILTER_XT_MATCH_LIMIT=m 374CONFIG_NETFILTER_XT_MATCH_LIMIT=m
326CONFIG_NETFILTER_XT_MATCH_MAC=m 375CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -331,14 +380,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
331CONFIG_NETFILTER_XT_MATCH_QUOTA=m 380CONFIG_NETFILTER_XT_MATCH_QUOTA=m
332CONFIG_NETFILTER_XT_MATCH_REALM=m 381CONFIG_NETFILTER_XT_MATCH_REALM=m
333CONFIG_NETFILTER_XT_MATCH_SCTP=m 382CONFIG_NETFILTER_XT_MATCH_SCTP=m
383CONFIG_NETFILTER_XT_MATCH_STATE=m
334CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 384CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
335CONFIG_NETFILTER_XT_MATCH_STRING=m 385CONFIG_NETFILTER_XT_MATCH_STRING=m
336CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 386CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
387CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
337 388
338# 389#
339# IP: Netfilter Configuration 390# IP: Netfilter Configuration
340# 391#
341# CONFIG_IP_NF_CONNTRACK is not set 392CONFIG_NF_CONNTRACK_IPV4=m
393CONFIG_NF_CONNTRACK_PROC_COMPAT=y
342# CONFIG_IP_NF_QUEUE is not set 394# CONFIG_IP_NF_QUEUE is not set
343# CONFIG_IP_NF_IPTABLES is not set 395# CONFIG_IP_NF_IPTABLES is not set
344# CONFIG_IP_NF_ARPTABLES is not set 396# CONFIG_IP_NF_ARPTABLES is not set
@@ -366,7 +418,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
366# CONFIG_ATALK is not set 418# CONFIG_ATALK is not set
367# CONFIG_X25 is not set 419# CONFIG_X25 is not set
368# CONFIG_LAPB is not set 420# CONFIG_LAPB is not set
369# CONFIG_NET_DIVERT is not set
370# CONFIG_ECONET is not set 421# CONFIG_ECONET is not set
371# CONFIG_WAN_ROUTER is not set 422# CONFIG_WAN_ROUTER is not set
372 423
@@ -422,11 +473,13 @@ CONFIG_MTD_PARTITIONS=y
422# User Modules And Translation Layers 473# User Modules And Translation Layers
423# 474#
424CONFIG_MTD_CHAR=y 475CONFIG_MTD_CHAR=y
476CONFIG_MTD_BLKDEVS=y
425CONFIG_MTD_BLOCK=y 477CONFIG_MTD_BLOCK=y
426# CONFIG_FTL is not set 478# CONFIG_FTL is not set
427# CONFIG_NFTL is not set 479# CONFIG_NFTL is not set
428# CONFIG_INFTL is not set 480# CONFIG_INFTL is not set
429# CONFIG_RFD_FTL is not set 481# CONFIG_RFD_FTL is not set
482# CONFIG_SSFDC is not set
430 483
431# 484#
432# RAM/ROM/Flash chip drivers 485# RAM/ROM/Flash chip drivers
@@ -495,6 +548,7 @@ CONFIG_MTD_ALCHEMY=y
495# 548#
496# Plug and Play support 549# Plug and Play support
497# 550#
551# CONFIG_PNPACPI is not set
498 552
499# 553#
500# Block devices 554# Block devices
@@ -511,6 +565,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
511CONFIG_ATA_OVER_ETH=m 565CONFIG_ATA_OVER_ETH=m
512 566
513# 567#
568# Misc devices
569#
570
571#
514# ATA/ATAPI/MFM/RLL support 572# ATA/ATAPI/MFM/RLL support
515# 573#
516# CONFIG_IDE is not set 574# CONFIG_IDE is not set
@@ -520,6 +578,12 @@ CONFIG_ATA_OVER_ETH=m
520# 578#
521CONFIG_RAID_ATTRS=m 579CONFIG_RAID_ATTRS=m
522# CONFIG_SCSI is not set 580# CONFIG_SCSI is not set
581# CONFIG_SCSI_NETLINK is not set
582
583#
584# Serial ATA (prod) and Parallel ATA (experimental) drivers
585#
586# CONFIG_ATA is not set
523 587
524# 588#
525# Multi-device support (RAID and LVM) 589# Multi-device support (RAID and LVM)
@@ -563,6 +627,8 @@ CONFIG_LXT_PHY=m
563CONFIG_CICADA_PHY=m 627CONFIG_CICADA_PHY=m
564CONFIG_VITESSE_PHY=m 628CONFIG_VITESSE_PHY=m
565CONFIG_SMSC_PHY=m 629CONFIG_SMSC_PHY=m
630# CONFIG_BROADCOM_PHY is not set
631# CONFIG_FIXED_PHY is not set
566 632
567# 633#
568# Ethernet (10 or 100Mbit) 634# Ethernet (10 or 100Mbit)
@@ -609,6 +675,7 @@ CONFIG_PPP_DEFLATE=m
609CONFIG_PPP_MPPE=m 675CONFIG_PPP_MPPE=m
610CONFIG_PPPOE=m 676CONFIG_PPPOE=m
611# CONFIG_SLIP is not set 677# CONFIG_SLIP is not set
678CONFIG_SLHC=m
612# CONFIG_SHAPER is not set 679# CONFIG_SHAPER is not set
613# CONFIG_NETCONSOLE is not set 680# CONFIG_NETCONSOLE is not set
614# CONFIG_NETPOLL is not set 681# CONFIG_NETPOLL is not set
@@ -628,6 +695,7 @@ CONFIG_PPPOE=m
628# Input device support 695# Input device support
629# 696#
630CONFIG_INPUT=y 697CONFIG_INPUT=y
698# CONFIG_INPUT_FF_MEMLESS is not set
631 699
632# 700#
633# Userland interfaces 701# Userland interfaces
@@ -707,10 +775,6 @@ CONFIG_LEGACY_PTY_COUNT=256
707# CONFIG_R3964 is not set 775# CONFIG_R3964 is not set
708 776
709# 777#
710# Ftape, the floppy tape device driver
711#
712
713#
714# PCMCIA character devices 778# PCMCIA character devices
715# 779#
716CONFIG_SYNCLINK_CS=m 780CONFIG_SYNCLINK_CS=m
@@ -722,7 +786,6 @@ CONFIG_SYNCLINK_CS=m
722# TPM devices 786# TPM devices
723# 787#
724# CONFIG_TCG_TPM is not set 788# CONFIG_TCG_TPM is not set
725# CONFIG_TELCLOCK is not set
726 789
727# 790#
728# I2C support 791# I2C support
@@ -747,14 +810,9 @@ CONFIG_SYNCLINK_CS=m
747# CONFIG_HWMON_VID is not set 810# CONFIG_HWMON_VID is not set
748 811
749# 812#
750# Misc devices
751#
752
753#
754# Multimedia devices 813# Multimedia devices
755# 814#
756# CONFIG_VIDEO_DEV is not set 815# CONFIG_VIDEO_DEV is not set
757CONFIG_VIDEO_V4L2=y
758 816
759# 817#
760# Digital Video Broadcasting Devices 818# Digital Video Broadcasting Devices
@@ -772,6 +830,7 @@ CONFIG_VIDEO_V4L2=y
772# 830#
773# CONFIG_VGA_CONSOLE is not set 831# CONFIG_VGA_CONSOLE is not set
774CONFIG_DUMMY_CONSOLE=y 832CONFIG_DUMMY_CONSOLE=y
833# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
775 834
776# 835#
777# Sound 836# Sound
@@ -779,6 +838,11 @@ CONFIG_DUMMY_CONSOLE=y
779# CONFIG_SOUND is not set 838# CONFIG_SOUND is not set
780 839
781# 840#
841# HID Devices
842#
843# CONFIG_HID is not set
844
845#
782# USB support 846# USB support
783# 847#
784CONFIG_USB_ARCH_HAS_HCD=y 848CONFIG_USB_ARCH_HAS_HCD=y
@@ -840,6 +904,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y
840# 904#
841 905
842# 906#
907# Auxiliary Display support
908#
909
910#
911# Virtualization
912#
913
914#
843# File systems 915# File systems
844# 916#
845CONFIG_EXT2_FS=y 917CONFIG_EXT2_FS=y
@@ -851,6 +923,7 @@ CONFIG_EXT3_FS=y
851CONFIG_EXT3_FS_XATTR=y 923CONFIG_EXT3_FS_XATTR=y
852CONFIG_EXT3_FS_POSIX_ACL=y 924CONFIG_EXT3_FS_POSIX_ACL=y
853CONFIG_EXT3_FS_SECURITY=y 925CONFIG_EXT3_FS_SECURITY=y
926# CONFIG_EXT4DEV_FS is not set
854CONFIG_JBD=y 927CONFIG_JBD=y
855# CONFIG_JBD_DEBUG is not set 928# CONFIG_JBD_DEBUG is not set
856CONFIG_FS_MBCACHE=y 929CONFIG_FS_MBCACHE=y
@@ -863,6 +936,7 @@ CONFIG_REISERFS_FS_SECURITY=y
863# CONFIG_JFS_FS is not set 936# CONFIG_JFS_FS is not set
864CONFIG_FS_POSIX_ACL=y 937CONFIG_FS_POSIX_ACL=y
865# CONFIG_XFS_FS is not set 938# CONFIG_XFS_FS is not set
939# CONFIG_GFS2_FS is not set
866# CONFIG_OCFS2_FS is not set 940# CONFIG_OCFS2_FS is not set
867# CONFIG_MINIX_FS is not set 941# CONFIG_MINIX_FS is not set
868# CONFIG_ROMFS_FS is not set 942# CONFIG_ROMFS_FS is not set
@@ -873,6 +947,7 @@ CONFIG_DNOTIFY=y
873CONFIG_AUTOFS_FS=m 947CONFIG_AUTOFS_FS=m
874CONFIG_AUTOFS4_FS=m 948CONFIG_AUTOFS4_FS=m
875CONFIG_FUSE_FS=m 949CONFIG_FUSE_FS=m
950CONFIG_GENERIC_ACL=y
876 951
877# 952#
878# CD-ROM/DVD Filesystems 953# CD-ROM/DVD Filesystems
@@ -892,23 +967,25 @@ CONFIG_FUSE_FS=m
892# 967#
893CONFIG_PROC_FS=y 968CONFIG_PROC_FS=y
894CONFIG_PROC_KCORE=y 969CONFIG_PROC_KCORE=y
970CONFIG_PROC_SYSCTL=y
895CONFIG_SYSFS=y 971CONFIG_SYSFS=y
896CONFIG_TMPFS=y 972CONFIG_TMPFS=y
973CONFIG_TMPFS_POSIX_ACL=y
897# CONFIG_HUGETLB_PAGE is not set 974# CONFIG_HUGETLB_PAGE is not set
898CONFIG_RAMFS=y 975CONFIG_RAMFS=y
899# CONFIG_CONFIGFS_FS is not set 976CONFIG_CONFIGFS_FS=m
900 977
901# 978#
902# Miscellaneous filesystems 979# Miscellaneous filesystems
903# 980#
904# CONFIG_ADFS_FS is not set 981# CONFIG_ADFS_FS is not set
905# CONFIG_AFFS_FS is not set 982# CONFIG_AFFS_FS is not set
983# CONFIG_ECRYPT_FS is not set
906# CONFIG_HFS_FS is not set 984# CONFIG_HFS_FS is not set
907# CONFIG_HFSPLUS_FS is not set 985# CONFIG_HFSPLUS_FS is not set
908# CONFIG_BEFS_FS is not set 986# CONFIG_BEFS_FS is not set
909# CONFIG_BFS_FS is not set 987# CONFIG_BFS_FS is not set
910# CONFIG_EFS_FS is not set 988# CONFIG_EFS_FS is not set
911# CONFIG_JFFS_FS is not set
912# CONFIG_JFFS2_FS is not set 989# CONFIG_JFFS2_FS is not set
913CONFIG_CRAMFS=m 990CONFIG_CRAMFS=m
914# CONFIG_VXFS_FS is not set 991# CONFIG_VXFS_FS is not set
@@ -937,7 +1014,6 @@ CONFIG_SUNRPC=y
937CONFIG_SMB_FS=m 1014CONFIG_SMB_FS=m
938# CONFIG_SMB_NLS_DEFAULT is not set 1015# CONFIG_SMB_NLS_DEFAULT is not set
939# CONFIG_CIFS is not set 1016# CONFIG_CIFS is not set
940# CONFIG_CIFS_DEBUG2 is not set
941# CONFIG_NCP_FS is not set 1017# CONFIG_NCP_FS is not set
942# CONFIG_CODA_FS is not set 1018# CONFIG_CODA_FS is not set
943# CONFIG_AFS_FS is not set 1019# CONFIG_AFS_FS is not set
@@ -994,6 +1070,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
994# CONFIG_NLS_UTF8 is not set 1070# CONFIG_NLS_UTF8 is not set
995 1071
996# 1072#
1073# Distributed Lock Manager
1074#
1075CONFIG_DLM=m
1076CONFIG_DLM_TCP=y
1077# CONFIG_DLM_SCTP is not set
1078# CONFIG_DLM_DEBUG is not set
1079
1080#
997# Profiling support 1081# Profiling support
998# 1082#
999# CONFIG_PROFILING is not set 1083# CONFIG_PROFILING is not set
@@ -1003,13 +1087,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1003# 1087#
1004CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1088CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1005# CONFIG_PRINTK_TIME is not set 1089# CONFIG_PRINTK_TIME is not set
1090CONFIG_ENABLE_MUST_CHECK=y
1006# CONFIG_MAGIC_SYSRQ is not set 1091# CONFIG_MAGIC_SYSRQ is not set
1007# CONFIG_UNUSED_SYMBOLS is not set 1092# CONFIG_UNUSED_SYMBOLS is not set
1093# CONFIG_DEBUG_FS is not set
1094# CONFIG_HEADERS_CHECK is not set
1008# CONFIG_DEBUG_KERNEL is not set 1095# CONFIG_DEBUG_KERNEL is not set
1009CONFIG_LOG_BUF_SHIFT=14 1096CONFIG_LOG_BUF_SHIFT=14
1010# CONFIG_DEBUG_FS is not set
1011CONFIG_CROSSCOMPILE=y 1097CONFIG_CROSSCOMPILE=y
1012CONFIG_CMDLINE="" 1098CONFIG_CMDLINE=""
1099CONFIG_SYS_SUPPORTS_KGDB=y
1013 1100
1014# 1101#
1015# Security options 1102# Security options
@@ -1022,18 +1109,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1022# Cryptographic options 1109# Cryptographic options
1023# 1110#
1024CONFIG_CRYPTO=y 1111CONFIG_CRYPTO=y
1112CONFIG_CRYPTO_ALGAPI=y
1113CONFIG_CRYPTO_BLKCIPHER=m
1114CONFIG_CRYPTO_HASH=y
1115CONFIG_CRYPTO_MANAGER=y
1025CONFIG_CRYPTO_HMAC=y 1116CONFIG_CRYPTO_HMAC=y
1117CONFIG_CRYPTO_XCBC=m
1026CONFIG_CRYPTO_NULL=m 1118CONFIG_CRYPTO_NULL=m
1027CONFIG_CRYPTO_MD4=m 1119CONFIG_CRYPTO_MD4=m
1028CONFIG_CRYPTO_MD5=m 1120CONFIG_CRYPTO_MD5=y
1029CONFIG_CRYPTO_SHA1=m 1121CONFIG_CRYPTO_SHA1=m
1030CONFIG_CRYPTO_SHA256=m 1122CONFIG_CRYPTO_SHA256=m
1031CONFIG_CRYPTO_SHA512=m 1123CONFIG_CRYPTO_SHA512=m
1032CONFIG_CRYPTO_WP512=m 1124CONFIG_CRYPTO_WP512=m
1033CONFIG_CRYPTO_TGR192=m 1125CONFIG_CRYPTO_TGR192=m
1126CONFIG_CRYPTO_GF128MUL=m
1127CONFIG_CRYPTO_ECB=m
1128CONFIG_CRYPTO_CBC=m
1129CONFIG_CRYPTO_PCBC=m
1130CONFIG_CRYPTO_LRW=m
1034CONFIG_CRYPTO_DES=m 1131CONFIG_CRYPTO_DES=m
1132CONFIG_CRYPTO_FCRYPT=m
1035CONFIG_CRYPTO_BLOWFISH=m 1133CONFIG_CRYPTO_BLOWFISH=m
1036CONFIG_CRYPTO_TWOFISH=m 1134CONFIG_CRYPTO_TWOFISH=m
1135CONFIG_CRYPTO_TWOFISH_COMMON=m
1037CONFIG_CRYPTO_SERPENT=m 1136CONFIG_CRYPTO_SERPENT=m
1038CONFIG_CRYPTO_AES=m 1137CONFIG_CRYPTO_AES=m
1039CONFIG_CRYPTO_CAST5=m 1138CONFIG_CRYPTO_CAST5=m
@@ -1045,6 +1144,7 @@ CONFIG_CRYPTO_ANUBIS=m
1045CONFIG_CRYPTO_DEFLATE=m 1144CONFIG_CRYPTO_DEFLATE=m
1046CONFIG_CRYPTO_MICHAEL_MIC=m 1145CONFIG_CRYPTO_MICHAEL_MIC=m
1047CONFIG_CRYPTO_CRC32C=m 1146CONFIG_CRYPTO_CRC32C=m
1147CONFIG_CRYPTO_CAMELLIA=m
1048# CONFIG_CRYPTO_TEST is not set 1148# CONFIG_CRYPTO_TEST is not set
1049 1149
1050# 1150#
@@ -1054,6 +1154,7 @@ CONFIG_CRYPTO_CRC32C=m
1054# 1154#
1055# Library routines 1155# Library routines
1056# 1156#
1157CONFIG_BITREVERSE=y
1057CONFIG_CRC_CCITT=m 1158CONFIG_CRC_CCITT=m
1058CONFIG_CRC16=m 1159CONFIG_CRC16=m
1059CONFIG_CRC32=y 1160CONFIG_CRC32=y
@@ -1065,3 +1166,5 @@ CONFIG_TEXTSEARCH_KMP=m
1065CONFIG_TEXTSEARCH_BM=m 1166CONFIG_TEXTSEARCH_BM=m
1066CONFIG_TEXTSEARCH_FSM=m 1167CONFIG_TEXTSEARCH_FSM=m
1067CONFIG_PLIST=y 1168CONFIG_PLIST=y
1169CONFIG_HAS_IOMEM=y
1170CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index a77805af0819..070672799dac 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:17 2006 4# Tue Feb 20 21:47:37 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_PB1500=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_PB1500=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +63,19 @@ CONFIG_MIPS_PB1500=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 77CONFIG_CPU_LITTLE_ENDIAN=y
78CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 79CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1500=y 80CONFIG_SOC_AU1500=y
77CONFIG_SOC_AU1X00=y 81CONFIG_SOC_AU1X00=y
@@ -116,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 120# CONFIG_PAGE_SIZE_64KB is not set
117CONFIG_CPU_HAS_PREFETCH=y 121CONFIG_CPU_HAS_PREFETCH=y
118CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_64BIT_PHYS_ADDR=y 126CONFIG_64BIT_PHYS_ADDR=y
123CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
@@ -134,7 +138,8 @@ CONFIG_FLATMEM=y
134CONFIG_FLAT_NODE_MEM_MAP=y 138CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 141CONFIG_RESOURCES_64BIT=y
142CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -147,6 +152,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,15 +171,20 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 172CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 178# CONFIG_TASKSTATS is not set
179# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
172# CONFIG_IKCONFIG is not set 181# CONFIG_IKCONFIG is not set
182CONFIG_SYSFS_DEPRECATED=y
173CONFIG_RELAY=y 183CONFIG_RELAY=y
174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y
176CONFIG_EMBEDDED=y 186CONFIG_EMBEDDED=y
187CONFIG_SYSCTL_SYSCALL=y
177CONFIG_KALLSYMS=y 188CONFIG_KALLSYMS=y
178# CONFIG_KALLSYMS_EXTRA_PASS is not set 189# CONFIG_KALLSYMS_EXTRA_PASS is not set
179CONFIG_HOTPLUG=y 190CONFIG_HOTPLUG=y
@@ -181,12 +192,12 @@ CONFIG_PRINTK=y
181CONFIG_BUG=y 192CONFIG_BUG=y
182CONFIG_ELF_CORE=y 193CONFIG_ELF_CORE=y
183CONFIG_BASE_FULL=y 194CONFIG_BASE_FULL=y
184CONFIG_RT_MUTEXES=y
185CONFIG_FUTEX=y 195CONFIG_FUTEX=y
186CONFIG_EPOLL=y 196CONFIG_EPOLL=y
187CONFIG_SHMEM=y 197CONFIG_SHMEM=y
188CONFIG_SLAB=y 198CONFIG_SLAB=y
189CONFIG_VM_EVENT_COUNTERS=y 199CONFIG_VM_EVENT_COUNTERS=y
200CONFIG_RT_MUTEXES=y
190# CONFIG_TINY_SHMEM is not set 201# CONFIG_TINY_SHMEM is not set
191CONFIG_BASE_SMALL=0 202CONFIG_BASE_SMALL=0
192# CONFIG_SLOB is not set 203# CONFIG_SLOB is not set
@@ -204,6 +215,7 @@ CONFIG_KMOD=y
204# 215#
205# Block layer 216# Block layer
206# 217#
218CONFIG_BLOCK=y
207# CONFIG_LBD is not set 219# CONFIG_LBD is not set
208# CONFIG_BLK_DEV_IO_TRACE is not set 220# CONFIG_BLK_DEV_IO_TRACE is not set
209# CONFIG_LSF is not set 221# CONFIG_LSF is not set
@@ -258,6 +270,10 @@ CONFIG_PCCARD_NONSTATIC=m
258CONFIG_BINFMT_ELF=y 270CONFIG_BINFMT_ELF=y
259# CONFIG_BINFMT_MISC is not set 271# CONFIG_BINFMT_MISC is not set
260CONFIG_TRAD_SIGNALS=y 272CONFIG_TRAD_SIGNALS=y
273
274#
275# Power management options
276#
261# CONFIG_PM is not set 277# CONFIG_PM is not set
262 278
263# 279#
@@ -274,7 +290,10 @@ CONFIG_PACKET=y
274CONFIG_UNIX=y 290CONFIG_UNIX=y
275CONFIG_XFRM=y 291CONFIG_XFRM=y
276CONFIG_XFRM_USER=m 292CONFIG_XFRM_USER=m
293# CONFIG_XFRM_SUB_POLICY is not set
294CONFIG_XFRM_MIGRATE=y
277CONFIG_NET_KEY=y 295CONFIG_NET_KEY=y
296CONFIG_NET_KEY_MIGRATE=y
278CONFIG_INET=y 297CONFIG_INET=y
279CONFIG_IP_MULTICAST=y 298CONFIG_IP_MULTICAST=y
280# CONFIG_IP_ADVANCED_ROUTER is not set 299# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -295,10 +314,13 @@ CONFIG_IP_PNP_BOOTP=y
295# CONFIG_INET_TUNNEL is not set 314# CONFIG_INET_TUNNEL is not set
296CONFIG_INET_XFRM_MODE_TRANSPORT=m 315CONFIG_INET_XFRM_MODE_TRANSPORT=m
297CONFIG_INET_XFRM_MODE_TUNNEL=m 316CONFIG_INET_XFRM_MODE_TUNNEL=m
317CONFIG_INET_XFRM_MODE_BEET=m
298CONFIG_INET_DIAG=y 318CONFIG_INET_DIAG=y
299CONFIG_INET_TCP_DIAG=y 319CONFIG_INET_TCP_DIAG=y
300# CONFIG_TCP_CONG_ADVANCED is not set 320# CONFIG_TCP_CONG_ADVANCED is not set
301CONFIG_TCP_CONG_BIC=y 321CONFIG_TCP_CONG_CUBIC=y
322CONFIG_DEFAULT_TCP_CONG="cubic"
323CONFIG_TCP_MD5SIG=y
302 324
303# 325#
304# IP: Virtual Server Configuration 326# IP: Virtual Server Configuration
@@ -317,15 +339,42 @@ CONFIG_NETFILTER=y
317CONFIG_NETFILTER_NETLINK=m 339CONFIG_NETFILTER_NETLINK=m
318CONFIG_NETFILTER_NETLINK_QUEUE=m 340CONFIG_NETFILTER_NETLINK_QUEUE=m
319CONFIG_NETFILTER_NETLINK_LOG=m 341CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_NF_CONNTRACK is not set 342CONFIG_NF_CONNTRACK_ENABLED=m
343CONFIG_NF_CONNTRACK_SUPPORT=y
344# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
345CONFIG_NF_CONNTRACK=m
346CONFIG_NF_CT_ACCT=y
347CONFIG_NF_CONNTRACK_MARK=y
348CONFIG_NF_CONNTRACK_SECMARK=y
349CONFIG_NF_CONNTRACK_EVENTS=y
350CONFIG_NF_CT_PROTO_GRE=m
351CONFIG_NF_CT_PROTO_SCTP=m
352CONFIG_NF_CONNTRACK_AMANDA=m
353CONFIG_NF_CONNTRACK_FTP=m
354CONFIG_NF_CONNTRACK_H323=m
355CONFIG_NF_CONNTRACK_IRC=m
356# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
357CONFIG_NF_CONNTRACK_PPTP=m
358CONFIG_NF_CONNTRACK_SANE=m
359CONFIG_NF_CONNTRACK_SIP=m
360CONFIG_NF_CONNTRACK_TFTP=m
361CONFIG_NF_CT_NETLINK=m
321CONFIG_NETFILTER_XTABLES=m 362CONFIG_NETFILTER_XTABLES=m
322CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 363CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
323CONFIG_NETFILTER_XT_TARGET_MARK=m 364CONFIG_NETFILTER_XT_TARGET_MARK=m
324CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 365CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
366CONFIG_NETFILTER_XT_TARGET_NFLOG=m
325CONFIG_NETFILTER_XT_TARGET_SECMARK=m 367CONFIG_NETFILTER_XT_TARGET_SECMARK=m
368CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
369CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
326CONFIG_NETFILTER_XT_MATCH_COMMENT=m 370CONFIG_NETFILTER_XT_MATCH_COMMENT=m
371CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
372CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
373CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
327CONFIG_NETFILTER_XT_MATCH_DCCP=m 374CONFIG_NETFILTER_XT_MATCH_DCCP=m
375CONFIG_NETFILTER_XT_MATCH_DSCP=m
328CONFIG_NETFILTER_XT_MATCH_ESP=m 376CONFIG_NETFILTER_XT_MATCH_ESP=m
377CONFIG_NETFILTER_XT_MATCH_HELPER=m
329CONFIG_NETFILTER_XT_MATCH_LENGTH=m 378CONFIG_NETFILTER_XT_MATCH_LENGTH=m
330CONFIG_NETFILTER_XT_MATCH_LIMIT=m 379CONFIG_NETFILTER_XT_MATCH_LIMIT=m
331CONFIG_NETFILTER_XT_MATCH_MAC=m 380CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -336,14 +385,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
336CONFIG_NETFILTER_XT_MATCH_QUOTA=m 385CONFIG_NETFILTER_XT_MATCH_QUOTA=m
337CONFIG_NETFILTER_XT_MATCH_REALM=m 386CONFIG_NETFILTER_XT_MATCH_REALM=m
338CONFIG_NETFILTER_XT_MATCH_SCTP=m 387CONFIG_NETFILTER_XT_MATCH_SCTP=m
388CONFIG_NETFILTER_XT_MATCH_STATE=m
339CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 389CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
340CONFIG_NETFILTER_XT_MATCH_STRING=m 390CONFIG_NETFILTER_XT_MATCH_STRING=m
341CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 391CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
392CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
342 393
343# 394#
344# IP: Netfilter Configuration 395# IP: Netfilter Configuration
345# 396#
346# CONFIG_IP_NF_CONNTRACK is not set 397CONFIG_NF_CONNTRACK_IPV4=m
398CONFIG_NF_CONNTRACK_PROC_COMPAT=y
347# CONFIG_IP_NF_QUEUE is not set 399# CONFIG_IP_NF_QUEUE is not set
348# CONFIG_IP_NF_IPTABLES is not set 400# CONFIG_IP_NF_IPTABLES is not set
349# CONFIG_IP_NF_ARPTABLES is not set 401# CONFIG_IP_NF_ARPTABLES is not set
@@ -371,7 +423,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
371# CONFIG_ATALK is not set 423# CONFIG_ATALK is not set
372# CONFIG_X25 is not set 424# CONFIG_X25 is not set
373# CONFIG_LAPB is not set 425# CONFIG_LAPB is not set
374# CONFIG_NET_DIVERT is not set
375# CONFIG_ECONET is not set 426# CONFIG_ECONET is not set
376# CONFIG_WAN_ROUTER is not set 427# CONFIG_WAN_ROUTER is not set
377 428
@@ -427,11 +478,13 @@ CONFIG_MTD_PARTITIONS=y
427# User Modules And Translation Layers 478# User Modules And Translation Layers
428# 479#
429CONFIG_MTD_CHAR=y 480CONFIG_MTD_CHAR=y
481CONFIG_MTD_BLKDEVS=y
430CONFIG_MTD_BLOCK=y 482CONFIG_MTD_BLOCK=y
431# CONFIG_FTL is not set 483# CONFIG_FTL is not set
432# CONFIG_NFTL is not set 484# CONFIG_NFTL is not set
433# CONFIG_INFTL is not set 485# CONFIG_INFTL is not set
434# CONFIG_RFD_FTL is not set 486# CONFIG_RFD_FTL is not set
487# CONFIG_SSFDC is not set
435 488
436# 489#
437# RAM/ROM/Flash chip drivers 490# RAM/ROM/Flash chip drivers
@@ -501,6 +554,7 @@ CONFIG_MTD_ALCHEMY=y
501# 554#
502# Plug and Play support 555# Plug and Play support
503# 556#
557# CONFIG_PNPACPI is not set
504 558
505# 559#
506# Block devices 560# Block devices
@@ -522,9 +576,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
522CONFIG_ATA_OVER_ETH=m 576CONFIG_ATA_OVER_ETH=m
523 577
524# 578#
579# Misc devices
580#
581CONFIG_SGI_IOC4=m
582# CONFIG_TIFM_CORE is not set
583
584#
525# ATA/ATAPI/MFM/RLL support 585# ATA/ATAPI/MFM/RLL support
526# 586#
527CONFIG_IDE=y 587CONFIG_IDE=y
588CONFIG_IDE_MAX_HWIFS=4
528CONFIG_BLK_DEV_IDE=y 589CONFIG_BLK_DEV_IDE=y
529 590
530# 591#
@@ -534,6 +595,7 @@ CONFIG_BLK_DEV_IDE=y
534CONFIG_BLK_DEV_IDEDISK=y 595CONFIG_BLK_DEV_IDEDISK=y
535# CONFIG_IDEDISK_MULTI_MODE is not set 596# CONFIG_IDEDISK_MULTI_MODE is not set
536CONFIG_BLK_DEV_IDECS=m 597CONFIG_BLK_DEV_IDECS=m
598# CONFIG_BLK_DEV_DELKIN is not set
537# CONFIG_BLK_DEV_IDECD is not set 599# CONFIG_BLK_DEV_IDECD is not set
538# CONFIG_BLK_DEV_IDETAPE is not set 600# CONFIG_BLK_DEV_IDETAPE is not set
539# CONFIG_BLK_DEV_IDEFLOPPY is not set 601# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -561,8 +623,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
561# CONFIG_BLK_DEV_CS5530 is not set 623# CONFIG_BLK_DEV_CS5530 is not set
562# CONFIG_BLK_DEV_HPT34X is not set 624# CONFIG_BLK_DEV_HPT34X is not set
563CONFIG_BLK_DEV_HPT366=y 625CONFIG_BLK_DEV_HPT366=y
626# CONFIG_BLK_DEV_JMICRON is not set
564# CONFIG_BLK_DEV_SC1200 is not set 627# CONFIG_BLK_DEV_SC1200 is not set
565# CONFIG_BLK_DEV_PIIX is not set 628# CONFIG_BLK_DEV_PIIX is not set
629CONFIG_BLK_DEV_IT8213=m
566# CONFIG_BLK_DEV_IT821X is not set 630# CONFIG_BLK_DEV_IT821X is not set
567# CONFIG_BLK_DEV_NS87415 is not set 631# CONFIG_BLK_DEV_NS87415 is not set
568# CONFIG_BLK_DEV_PDC202XX_OLD is not set 632# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -572,6 +636,7 @@ CONFIG_BLK_DEV_HPT366=y
572# CONFIG_BLK_DEV_SLC90E66 is not set 636# CONFIG_BLK_DEV_SLC90E66 is not set
573# CONFIG_BLK_DEV_TRM290 is not set 637# CONFIG_BLK_DEV_TRM290 is not set
574# CONFIG_BLK_DEV_VIA82CXXX is not set 638# CONFIG_BLK_DEV_VIA82CXXX is not set
639CONFIG_BLK_DEV_TC86C001=m
575# CONFIG_IDE_ARM is not set 640# CONFIG_IDE_ARM is not set
576CONFIG_BLK_DEV_IDEDMA=y 641CONFIG_BLK_DEV_IDEDMA=y
577# CONFIG_IDEDMA_IVB is not set 642# CONFIG_IDEDMA_IVB is not set
@@ -583,6 +648,12 @@ CONFIG_BLK_DEV_IDEDMA=y
583# 648#
584CONFIG_RAID_ATTRS=m 649CONFIG_RAID_ATTRS=m
585# CONFIG_SCSI is not set 650# CONFIG_SCSI is not set
651# CONFIG_SCSI_NETLINK is not set
652
653#
654# Serial ATA (prod) and Parallel ATA (experimental) drivers
655#
656# CONFIG_ATA is not set
586 657
587# 658#
588# Multi-device support (RAID and LVM) 659# Multi-device support (RAID and LVM)
@@ -633,6 +704,8 @@ CONFIG_LXT_PHY=m
633CONFIG_CICADA_PHY=m 704CONFIG_CICADA_PHY=m
634CONFIG_VITESSE_PHY=m 705CONFIG_VITESSE_PHY=m
635CONFIG_SMSC_PHY=m 706CONFIG_SMSC_PHY=m
707# CONFIG_BROADCOM_PHY is not set
708# CONFIG_FIXED_PHY is not set
636 709
637# 710#
638# Ethernet (10 or 100Mbit) 711# Ethernet (10 or 100Mbit)
@@ -670,14 +743,18 @@ CONFIG_MIPS_AU1X00_ENET=y
670# CONFIG_SK98LIN is not set 743# CONFIG_SK98LIN is not set
671# CONFIG_TIGON3 is not set 744# CONFIG_TIGON3 is not set
672# CONFIG_BNX2 is not set 745# CONFIG_BNX2 is not set
746CONFIG_QLA3XXX=m
747# CONFIG_ATL1 is not set
673 748
674# 749#
675# Ethernet (10000 Mbit) 750# Ethernet (10000 Mbit)
676# 751#
677# CONFIG_CHELSIO_T1 is not set 752# CONFIG_CHELSIO_T1 is not set
753CONFIG_CHELSIO_T3=m
678# CONFIG_IXGB is not set 754# CONFIG_IXGB is not set
679# CONFIG_S2IO is not set 755# CONFIG_S2IO is not set
680# CONFIG_MYRI10GE is not set 756# CONFIG_MYRI10GE is not set
757CONFIG_NETXEN_NIC=m
681 758
682# 759#
683# Token Ring devices 760# Token Ring devices
@@ -718,6 +795,7 @@ CONFIG_PPP_DEFLATE=m
718CONFIG_PPP_MPPE=m 795CONFIG_PPP_MPPE=m
719CONFIG_PPPOE=m 796CONFIG_PPPOE=m
720# CONFIG_SLIP is not set 797# CONFIG_SLIP is not set
798CONFIG_SLHC=m
721# CONFIG_SHAPER is not set 799# CONFIG_SHAPER is not set
722# CONFIG_NETCONSOLE is not set 800# CONFIG_NETCONSOLE is not set
723# CONFIG_NETPOLL is not set 801# CONFIG_NETPOLL is not set
@@ -737,6 +815,7 @@ CONFIG_PPPOE=m
737# Input device support 815# Input device support
738# 816#
739CONFIG_INPUT=y 817CONFIG_INPUT=y
818# CONFIG_INPUT_FF_MEMLESS is not set
740 819
741# 820#
742# Userland interfaces 821# Userland interfaces
@@ -815,10 +894,6 @@ CONFIG_LEGACY_PTY_COUNT=256
815# CONFIG_DTLK is not set 894# CONFIG_DTLK is not set
816# CONFIG_R3964 is not set 895# CONFIG_R3964 is not set
817# CONFIG_APPLICOM is not set 896# CONFIG_APPLICOM is not set
818
819#
820# Ftape, the floppy tape device driver
821#
822# CONFIG_DRM is not set 897# CONFIG_DRM is not set
823 898
824# 899#
@@ -833,7 +908,6 @@ CONFIG_SYNCLINK_CS=m
833# TPM devices 908# TPM devices
834# 909#
835# CONFIG_TCG_TPM is not set 910# CONFIG_TCG_TPM is not set
836# CONFIG_TELCLOCK is not set
837 911
838# 912#
839# I2C support 913# I2C support
@@ -858,14 +932,9 @@ CONFIG_SYNCLINK_CS=m
858# CONFIG_HWMON_VID is not set 932# CONFIG_HWMON_VID is not set
859 933
860# 934#
861# Misc devices
862#
863
864#
865# Multimedia devices 935# Multimedia devices
866# 936#
867# CONFIG_VIDEO_DEV is not set 937# CONFIG_VIDEO_DEV is not set
868CONFIG_VIDEO_V4L2=y
869 938
870# 939#
871# Digital Video Broadcasting Devices 940# Digital Video Broadcasting Devices
@@ -877,6 +946,7 @@ CONFIG_VIDEO_V4L2=y
877# 946#
878# CONFIG_FIRMWARE_EDID is not set 947# CONFIG_FIRMWARE_EDID is not set
879# CONFIG_FB is not set 948# CONFIG_FB is not set
949# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
880 950
881# 951#
882# Sound 952# Sound
@@ -884,6 +954,11 @@ CONFIG_VIDEO_V4L2=y
884# CONFIG_SOUND is not set 954# CONFIG_SOUND is not set
885 955
886# 956#
957# HID Devices
958#
959# CONFIG_HID is not set
960
961#
887# USB support 962# USB support
888# 963#
889CONFIG_USB_ARCH_HAS_HCD=y 964CONFIG_USB_ARCH_HAS_HCD=y
@@ -946,6 +1021,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
946# 1021#
947 1022
948# 1023#
1024# Auxiliary Display support
1025#
1026
1027#
1028# Virtualization
1029#
1030
1031#
949# File systems 1032# File systems
950# 1033#
951CONFIG_EXT2_FS=y 1034CONFIG_EXT2_FS=y
@@ -957,6 +1040,7 @@ CONFIG_EXT3_FS=y
957CONFIG_EXT3_FS_XATTR=y 1040CONFIG_EXT3_FS_XATTR=y
958CONFIG_EXT3_FS_POSIX_ACL=y 1041CONFIG_EXT3_FS_POSIX_ACL=y
959CONFIG_EXT3_FS_SECURITY=y 1042CONFIG_EXT3_FS_SECURITY=y
1043# CONFIG_EXT4DEV_FS is not set
960CONFIG_JBD=y 1044CONFIG_JBD=y
961# CONFIG_JBD_DEBUG is not set 1045# CONFIG_JBD_DEBUG is not set
962CONFIG_FS_MBCACHE=y 1046CONFIG_FS_MBCACHE=y
@@ -969,6 +1053,7 @@ CONFIG_REISERFS_FS_SECURITY=y
969# CONFIG_JFS_FS is not set 1053# CONFIG_JFS_FS is not set
970CONFIG_FS_POSIX_ACL=y 1054CONFIG_FS_POSIX_ACL=y
971# CONFIG_XFS_FS is not set 1055# CONFIG_XFS_FS is not set
1056# CONFIG_GFS2_FS is not set
972# CONFIG_OCFS2_FS is not set 1057# CONFIG_OCFS2_FS is not set
973# CONFIG_MINIX_FS is not set 1058# CONFIG_MINIX_FS is not set
974# CONFIG_ROMFS_FS is not set 1059# CONFIG_ROMFS_FS is not set
@@ -979,6 +1064,7 @@ CONFIG_DNOTIFY=y
979CONFIG_AUTOFS_FS=m 1064CONFIG_AUTOFS_FS=m
980CONFIG_AUTOFS4_FS=m 1065CONFIG_AUTOFS4_FS=m
981CONFIG_FUSE_FS=m 1066CONFIG_FUSE_FS=m
1067CONFIG_GENERIC_ACL=y
982 1068
983# 1069#
984# CD-ROM/DVD Filesystems 1070# CD-ROM/DVD Filesystems
@@ -998,23 +1084,25 @@ CONFIG_FUSE_FS=m
998# 1084#
999CONFIG_PROC_FS=y 1085CONFIG_PROC_FS=y
1000CONFIG_PROC_KCORE=y 1086CONFIG_PROC_KCORE=y
1087CONFIG_PROC_SYSCTL=y
1001CONFIG_SYSFS=y 1088CONFIG_SYSFS=y
1002CONFIG_TMPFS=y 1089CONFIG_TMPFS=y
1090CONFIG_TMPFS_POSIX_ACL=y
1003# CONFIG_HUGETLB_PAGE is not set 1091# CONFIG_HUGETLB_PAGE is not set
1004CONFIG_RAMFS=y 1092CONFIG_RAMFS=y
1005# CONFIG_CONFIGFS_FS is not set 1093CONFIG_CONFIGFS_FS=m
1006 1094
1007# 1095#
1008# Miscellaneous filesystems 1096# Miscellaneous filesystems
1009# 1097#
1010# CONFIG_ADFS_FS is not set 1098# CONFIG_ADFS_FS is not set
1011# CONFIG_AFFS_FS is not set 1099# CONFIG_AFFS_FS is not set
1100# CONFIG_ECRYPT_FS is not set
1012# CONFIG_HFS_FS is not set 1101# CONFIG_HFS_FS is not set
1013# CONFIG_HFSPLUS_FS is not set 1102# CONFIG_HFSPLUS_FS is not set
1014# CONFIG_BEFS_FS is not set 1103# CONFIG_BEFS_FS is not set
1015# CONFIG_BFS_FS is not set 1104# CONFIG_BFS_FS is not set
1016# CONFIG_EFS_FS is not set 1105# CONFIG_EFS_FS is not set
1017# CONFIG_JFFS_FS is not set
1018# CONFIG_JFFS2_FS is not set 1106# CONFIG_JFFS2_FS is not set
1019CONFIG_CRAMFS=m 1107CONFIG_CRAMFS=m
1020# CONFIG_VXFS_FS is not set 1108# CONFIG_VXFS_FS is not set
@@ -1043,7 +1131,6 @@ CONFIG_SUNRPC=y
1043CONFIG_SMB_FS=m 1131CONFIG_SMB_FS=m
1044# CONFIG_SMB_NLS_DEFAULT is not set 1132# CONFIG_SMB_NLS_DEFAULT is not set
1045# CONFIG_CIFS is not set 1133# CONFIG_CIFS is not set
1046# CONFIG_CIFS_DEBUG2 is not set
1047# CONFIG_NCP_FS is not set 1134# CONFIG_NCP_FS is not set
1048# CONFIG_CODA_FS is not set 1135# CONFIG_CODA_FS is not set
1049# CONFIG_AFS_FS is not set 1136# CONFIG_AFS_FS is not set
@@ -1100,6 +1187,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1100# CONFIG_NLS_UTF8 is not set 1187# CONFIG_NLS_UTF8 is not set
1101 1188
1102# 1189#
1190# Distributed Lock Manager
1191#
1192CONFIG_DLM=m
1193CONFIG_DLM_TCP=y
1194# CONFIG_DLM_SCTP is not set
1195# CONFIG_DLM_DEBUG is not set
1196
1197#
1103# Profiling support 1198# Profiling support
1104# 1199#
1105# CONFIG_PROFILING is not set 1200# CONFIG_PROFILING is not set
@@ -1109,13 +1204,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1109# 1204#
1110CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1205CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1111# CONFIG_PRINTK_TIME is not set 1206# CONFIG_PRINTK_TIME is not set
1207CONFIG_ENABLE_MUST_CHECK=y
1112# CONFIG_MAGIC_SYSRQ is not set 1208# CONFIG_MAGIC_SYSRQ is not set
1113# CONFIG_UNUSED_SYMBOLS is not set 1209# CONFIG_UNUSED_SYMBOLS is not set
1210# CONFIG_DEBUG_FS is not set
1211# CONFIG_HEADERS_CHECK is not set
1114# CONFIG_DEBUG_KERNEL is not set 1212# CONFIG_DEBUG_KERNEL is not set
1115CONFIG_LOG_BUF_SHIFT=14 1213CONFIG_LOG_BUF_SHIFT=14
1116# CONFIG_DEBUG_FS is not set
1117CONFIG_CROSSCOMPILE=y 1214CONFIG_CROSSCOMPILE=y
1118CONFIG_CMDLINE="" 1215CONFIG_CMDLINE=""
1216CONFIG_SYS_SUPPORTS_KGDB=y
1119 1217
1120# 1218#
1121# Security options 1219# Security options
@@ -1128,18 +1226,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1128# Cryptographic options 1226# Cryptographic options
1129# 1227#
1130CONFIG_CRYPTO=y 1228CONFIG_CRYPTO=y
1229CONFIG_CRYPTO_ALGAPI=y
1230CONFIG_CRYPTO_BLKCIPHER=m
1231CONFIG_CRYPTO_HASH=y
1232CONFIG_CRYPTO_MANAGER=y
1131CONFIG_CRYPTO_HMAC=y 1233CONFIG_CRYPTO_HMAC=y
1234CONFIG_CRYPTO_XCBC=m
1132CONFIG_CRYPTO_NULL=m 1235CONFIG_CRYPTO_NULL=m
1133CONFIG_CRYPTO_MD4=m 1236CONFIG_CRYPTO_MD4=m
1134CONFIG_CRYPTO_MD5=m 1237CONFIG_CRYPTO_MD5=y
1135CONFIG_CRYPTO_SHA1=m 1238CONFIG_CRYPTO_SHA1=m
1136CONFIG_CRYPTO_SHA256=m 1239CONFIG_CRYPTO_SHA256=m
1137CONFIG_CRYPTO_SHA512=m 1240CONFIG_CRYPTO_SHA512=m
1138CONFIG_CRYPTO_WP512=m 1241CONFIG_CRYPTO_WP512=m
1139CONFIG_CRYPTO_TGR192=m 1242CONFIG_CRYPTO_TGR192=m
1243CONFIG_CRYPTO_GF128MUL=m
1244CONFIG_CRYPTO_ECB=m
1245CONFIG_CRYPTO_CBC=m
1246CONFIG_CRYPTO_PCBC=m
1247CONFIG_CRYPTO_LRW=m
1140CONFIG_CRYPTO_DES=m 1248CONFIG_CRYPTO_DES=m
1249CONFIG_CRYPTO_FCRYPT=m
1141CONFIG_CRYPTO_BLOWFISH=m 1250CONFIG_CRYPTO_BLOWFISH=m
1142CONFIG_CRYPTO_TWOFISH=m 1251CONFIG_CRYPTO_TWOFISH=m
1252CONFIG_CRYPTO_TWOFISH_COMMON=m
1143CONFIG_CRYPTO_SERPENT=m 1253CONFIG_CRYPTO_SERPENT=m
1144CONFIG_CRYPTO_AES=m 1254CONFIG_CRYPTO_AES=m
1145CONFIG_CRYPTO_CAST5=m 1255CONFIG_CRYPTO_CAST5=m
@@ -1151,6 +1261,7 @@ CONFIG_CRYPTO_ANUBIS=m
1151CONFIG_CRYPTO_DEFLATE=m 1261CONFIG_CRYPTO_DEFLATE=m
1152CONFIG_CRYPTO_MICHAEL_MIC=m 1262CONFIG_CRYPTO_MICHAEL_MIC=m
1153CONFIG_CRYPTO_CRC32C=m 1263CONFIG_CRYPTO_CRC32C=m
1264CONFIG_CRYPTO_CAMELLIA=m
1154# CONFIG_CRYPTO_TEST is not set 1265# CONFIG_CRYPTO_TEST is not set
1155 1266
1156# 1267#
@@ -1160,6 +1271,7 @@ CONFIG_CRYPTO_CRC32C=m
1160# 1271#
1161# Library routines 1272# Library routines
1162# 1273#
1274CONFIG_BITREVERSE=y
1163CONFIG_CRC_CCITT=m 1275CONFIG_CRC_CCITT=m
1164CONFIG_CRC16=m 1276CONFIG_CRC16=m
1165CONFIG_CRC32=y 1277CONFIG_CRC32=y
@@ -1171,3 +1283,5 @@ CONFIG_TEXTSEARCH_KMP=m
1171CONFIG_TEXTSEARCH_BM=m 1283CONFIG_TEXTSEARCH_BM=m
1172CONFIG_TEXTSEARCH_FSM=m 1284CONFIG_TEXTSEARCH_FSM=m
1173CONFIG_PLIST=y 1285CONFIG_PLIST=y
1286CONFIG_HAS_IOMEM=y
1287CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index 8318d74d6adb..354e49b7a5f1 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:17 2006 4# Tue Feb 20 21:47:37 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_PB1550=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_PB1550=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +63,20 @@ CONFIG_MIPS_PB1550=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 76CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
75CONFIG_CPU_LITTLE_ENDIAN=y 78CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_APM_EMULATION=y
76CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
77CONFIG_SOC_AU1550=y 81CONFIG_SOC_AU1550=y
78CONFIG_SOC_AU1X00=y 82CONFIG_SOC_AU1X00=y
@@ -117,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_64BIT_PHYS_ADDR=y 127CONFIG_64BIT_PHYS_ADDR=y
124CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -135,7 +139,8 @@ CONFIG_FLATMEM=y
135CONFIG_FLAT_NODE_MEM_MAP=y 139CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 142CONFIG_RESOURCES_64BIT=y
143CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -148,6 +153,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +172,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 173CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
174CONFIG_RELAY=y 184CONFIG_RELAY=y
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -182,12 +193,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 193CONFIG_BUG=y
183CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 196CONFIG_FUTEX=y
187CONFIG_EPOLL=y 197CONFIG_EPOLL=y
188CONFIG_SHMEM=y 198CONFIG_SHMEM=y
189CONFIG_SLAB=y 199CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -205,6 +216,7 @@ CONFIG_KMOD=y
205# 216#
206# Block layer 217# Block layer
207# 218#
219CONFIG_BLOCK=y
208# CONFIG_LBD is not set 220# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -259,6 +271,10 @@ CONFIG_PCCARD_NONSTATIC=m
259CONFIG_BINFMT_ELF=y 271CONFIG_BINFMT_ELF=y
260# CONFIG_BINFMT_MISC is not set 272# CONFIG_BINFMT_MISC is not set
261CONFIG_TRAD_SIGNALS=y 273CONFIG_TRAD_SIGNALS=y
274
275#
276# Power management options
277#
262# CONFIG_PM is not set 278# CONFIG_PM is not set
263 279
264# 280#
@@ -275,7 +291,10 @@ CONFIG_PACKET=y
275CONFIG_UNIX=y 291CONFIG_UNIX=y
276CONFIG_XFRM=y 292CONFIG_XFRM=y
277CONFIG_XFRM_USER=m 293CONFIG_XFRM_USER=m
294# CONFIG_XFRM_SUB_POLICY is not set
295CONFIG_XFRM_MIGRATE=y
278CONFIG_NET_KEY=y 296CONFIG_NET_KEY=y
297CONFIG_NET_KEY_MIGRATE=y
279CONFIG_INET=y 298CONFIG_INET=y
280CONFIG_IP_MULTICAST=y 299CONFIG_IP_MULTICAST=y
281# CONFIG_IP_ADVANCED_ROUTER is not set 300# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -296,10 +315,13 @@ CONFIG_IP_PNP_BOOTP=y
296# CONFIG_INET_TUNNEL is not set 315# CONFIG_INET_TUNNEL is not set
297CONFIG_INET_XFRM_MODE_TRANSPORT=m 316CONFIG_INET_XFRM_MODE_TRANSPORT=m
298CONFIG_INET_XFRM_MODE_TUNNEL=m 317CONFIG_INET_XFRM_MODE_TUNNEL=m
318CONFIG_INET_XFRM_MODE_BEET=m
299CONFIG_INET_DIAG=y 319CONFIG_INET_DIAG=y
300CONFIG_INET_TCP_DIAG=y 320CONFIG_INET_TCP_DIAG=y
301# CONFIG_TCP_CONG_ADVANCED is not set 321# CONFIG_TCP_CONG_ADVANCED is not set
302CONFIG_TCP_CONG_BIC=y 322CONFIG_TCP_CONG_CUBIC=y
323CONFIG_DEFAULT_TCP_CONG="cubic"
324CONFIG_TCP_MD5SIG=y
303 325
304# 326#
305# IP: Virtual Server Configuration 327# IP: Virtual Server Configuration
@@ -318,15 +340,42 @@ CONFIG_NETFILTER=y
318CONFIG_NETFILTER_NETLINK=m 340CONFIG_NETFILTER_NETLINK=m
319CONFIG_NETFILTER_NETLINK_QUEUE=m 341CONFIG_NETFILTER_NETLINK_QUEUE=m
320CONFIG_NETFILTER_NETLINK_LOG=m 342CONFIG_NETFILTER_NETLINK_LOG=m
321# CONFIG_NF_CONNTRACK is not set 343CONFIG_NF_CONNTRACK_ENABLED=m
344CONFIG_NF_CONNTRACK_SUPPORT=y
345# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
346CONFIG_NF_CONNTRACK=m
347CONFIG_NF_CT_ACCT=y
348CONFIG_NF_CONNTRACK_MARK=y
349CONFIG_NF_CONNTRACK_SECMARK=y
350CONFIG_NF_CONNTRACK_EVENTS=y
351CONFIG_NF_CT_PROTO_GRE=m
352CONFIG_NF_CT_PROTO_SCTP=m
353CONFIG_NF_CONNTRACK_AMANDA=m
354CONFIG_NF_CONNTRACK_FTP=m
355CONFIG_NF_CONNTRACK_H323=m
356CONFIG_NF_CONNTRACK_IRC=m
357# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
358CONFIG_NF_CONNTRACK_PPTP=m
359CONFIG_NF_CONNTRACK_SANE=m
360CONFIG_NF_CONNTRACK_SIP=m
361CONFIG_NF_CONNTRACK_TFTP=m
362CONFIG_NF_CT_NETLINK=m
322CONFIG_NETFILTER_XTABLES=m 363CONFIG_NETFILTER_XTABLES=m
323CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 364CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
324CONFIG_NETFILTER_XT_TARGET_MARK=m 365CONFIG_NETFILTER_XT_TARGET_MARK=m
325CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 366CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
367CONFIG_NETFILTER_XT_TARGET_NFLOG=m
326CONFIG_NETFILTER_XT_TARGET_SECMARK=m 368CONFIG_NETFILTER_XT_TARGET_SECMARK=m
369CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
370CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
327CONFIG_NETFILTER_XT_MATCH_COMMENT=m 371CONFIG_NETFILTER_XT_MATCH_COMMENT=m
372CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
373CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
374CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
328CONFIG_NETFILTER_XT_MATCH_DCCP=m 375CONFIG_NETFILTER_XT_MATCH_DCCP=m
376CONFIG_NETFILTER_XT_MATCH_DSCP=m
329CONFIG_NETFILTER_XT_MATCH_ESP=m 377CONFIG_NETFILTER_XT_MATCH_ESP=m
378CONFIG_NETFILTER_XT_MATCH_HELPER=m
330CONFIG_NETFILTER_XT_MATCH_LENGTH=m 379CONFIG_NETFILTER_XT_MATCH_LENGTH=m
331CONFIG_NETFILTER_XT_MATCH_LIMIT=m 380CONFIG_NETFILTER_XT_MATCH_LIMIT=m
332CONFIG_NETFILTER_XT_MATCH_MAC=m 381CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -337,14 +386,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
337CONFIG_NETFILTER_XT_MATCH_QUOTA=m 386CONFIG_NETFILTER_XT_MATCH_QUOTA=m
338CONFIG_NETFILTER_XT_MATCH_REALM=m 387CONFIG_NETFILTER_XT_MATCH_REALM=m
339CONFIG_NETFILTER_XT_MATCH_SCTP=m 388CONFIG_NETFILTER_XT_MATCH_SCTP=m
389CONFIG_NETFILTER_XT_MATCH_STATE=m
340CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 390CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
341CONFIG_NETFILTER_XT_MATCH_STRING=m 391CONFIG_NETFILTER_XT_MATCH_STRING=m
342CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 392CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
393CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
343 394
344# 395#
345# IP: Netfilter Configuration 396# IP: Netfilter Configuration
346# 397#
347# CONFIG_IP_NF_CONNTRACK is not set 398CONFIG_NF_CONNTRACK_IPV4=m
399CONFIG_NF_CONNTRACK_PROC_COMPAT=y
348# CONFIG_IP_NF_QUEUE is not set 400# CONFIG_IP_NF_QUEUE is not set
349# CONFIG_IP_NF_IPTABLES is not set 401# CONFIG_IP_NF_IPTABLES is not set
350# CONFIG_IP_NF_ARPTABLES is not set 402# CONFIG_IP_NF_ARPTABLES is not set
@@ -372,7 +424,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
372# CONFIG_ATALK is not set 424# CONFIG_ATALK is not set
373# CONFIG_X25 is not set 425# CONFIG_X25 is not set
374# CONFIG_LAPB is not set 426# CONFIG_LAPB is not set
375# CONFIG_NET_DIVERT is not set
376# CONFIG_ECONET is not set 427# CONFIG_ECONET is not set
377# CONFIG_WAN_ROUTER is not set 428# CONFIG_WAN_ROUTER is not set
378 429
@@ -428,11 +479,13 @@ CONFIG_MTD_PARTITIONS=y
428# User Modules And Translation Layers 479# User Modules And Translation Layers
429# 480#
430CONFIG_MTD_CHAR=y 481CONFIG_MTD_CHAR=y
482CONFIG_MTD_BLKDEVS=y
431CONFIG_MTD_BLOCK=y 483CONFIG_MTD_BLOCK=y
432# CONFIG_FTL is not set 484# CONFIG_FTL is not set
433# CONFIG_NFTL is not set 485# CONFIG_NFTL is not set
434# CONFIG_INFTL is not set 486# CONFIG_INFTL is not set
435# CONFIG_RFD_FTL is not set 487# CONFIG_RFD_FTL is not set
488# CONFIG_SSFDC is not set
436 489
437# 490#
438# RAM/ROM/Flash chip drivers 491# RAM/ROM/Flash chip drivers
@@ -502,6 +555,7 @@ CONFIG_MTD_ALCHEMY=y
502# 555#
503# Plug and Play support 556# Plug and Play support
504# 557#
558# CONFIG_PNPACPI is not set
505 559
506# 560#
507# Block devices 561# Block devices
@@ -523,9 +577,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
523CONFIG_ATA_OVER_ETH=m 577CONFIG_ATA_OVER_ETH=m
524 578
525# 579#
580# Misc devices
581#
582CONFIG_SGI_IOC4=m
583# CONFIG_TIFM_CORE is not set
584
585#
526# ATA/ATAPI/MFM/RLL support 586# ATA/ATAPI/MFM/RLL support
527# 587#
528CONFIG_IDE=y 588CONFIG_IDE=y
589CONFIG_IDE_MAX_HWIFS=4
529CONFIG_BLK_DEV_IDE=y 590CONFIG_BLK_DEV_IDE=y
530 591
531# 592#
@@ -535,6 +596,7 @@ CONFIG_BLK_DEV_IDE=y
535CONFIG_BLK_DEV_IDEDISK=y 596CONFIG_BLK_DEV_IDEDISK=y
536# CONFIG_IDEDISK_MULTI_MODE is not set 597# CONFIG_IDEDISK_MULTI_MODE is not set
537CONFIG_BLK_DEV_IDECS=m 598CONFIG_BLK_DEV_IDECS=m
599# CONFIG_BLK_DEV_DELKIN is not set
538# CONFIG_BLK_DEV_IDECD is not set 600# CONFIG_BLK_DEV_IDECD is not set
539# CONFIG_BLK_DEV_IDETAPE is not set 601# CONFIG_BLK_DEV_IDETAPE is not set
540# CONFIG_BLK_DEV_IDEFLOPPY is not set 602# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -562,8 +624,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
562# CONFIG_BLK_DEV_CS5530 is not set 624# CONFIG_BLK_DEV_CS5530 is not set
563# CONFIG_BLK_DEV_HPT34X is not set 625# CONFIG_BLK_DEV_HPT34X is not set
564CONFIG_BLK_DEV_HPT366=y 626CONFIG_BLK_DEV_HPT366=y
627# CONFIG_BLK_DEV_JMICRON is not set
565# CONFIG_BLK_DEV_SC1200 is not set 628# CONFIG_BLK_DEV_SC1200 is not set
566# CONFIG_BLK_DEV_PIIX is not set 629# CONFIG_BLK_DEV_PIIX is not set
630CONFIG_BLK_DEV_IT8213=m
567# CONFIG_BLK_DEV_IT821X is not set 631# CONFIG_BLK_DEV_IT821X is not set
568# CONFIG_BLK_DEV_NS87415 is not set 632# CONFIG_BLK_DEV_NS87415 is not set
569# CONFIG_BLK_DEV_PDC202XX_OLD is not set 633# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -573,6 +637,7 @@ CONFIG_BLK_DEV_HPT366=y
573# CONFIG_BLK_DEV_SLC90E66 is not set 637# CONFIG_BLK_DEV_SLC90E66 is not set
574# CONFIG_BLK_DEV_TRM290 is not set 638# CONFIG_BLK_DEV_TRM290 is not set
575# CONFIG_BLK_DEV_VIA82CXXX is not set 639# CONFIG_BLK_DEV_VIA82CXXX is not set
640CONFIG_BLK_DEV_TC86C001=m
576# CONFIG_IDE_ARM is not set 641# CONFIG_IDE_ARM is not set
577CONFIG_BLK_DEV_IDEDMA=y 642CONFIG_BLK_DEV_IDEDMA=y
578# CONFIG_IDEDMA_IVB is not set 643# CONFIG_IDEDMA_IVB is not set
@@ -584,6 +649,12 @@ CONFIG_BLK_DEV_IDEDMA=y
584# 649#
585CONFIG_RAID_ATTRS=m 650CONFIG_RAID_ATTRS=m
586# CONFIG_SCSI is not set 651# CONFIG_SCSI is not set
652# CONFIG_SCSI_NETLINK is not set
653
654#
655# Serial ATA (prod) and Parallel ATA (experimental) drivers
656#
657# CONFIG_ATA is not set
587 658
588# 659#
589# Multi-device support (RAID and LVM) 660# Multi-device support (RAID and LVM)
@@ -634,6 +705,8 @@ CONFIG_LXT_PHY=m
634CONFIG_CICADA_PHY=m 705CONFIG_CICADA_PHY=m
635CONFIG_VITESSE_PHY=m 706CONFIG_VITESSE_PHY=m
636CONFIG_SMSC_PHY=m 707CONFIG_SMSC_PHY=m
708# CONFIG_BROADCOM_PHY is not set
709# CONFIG_FIXED_PHY is not set
637 710
638# 711#
639# Ethernet (10 or 100Mbit) 712# Ethernet (10 or 100Mbit)
@@ -671,14 +744,18 @@ CONFIG_MIPS_AU1X00_ENET=y
671# CONFIG_SK98LIN is not set 744# CONFIG_SK98LIN is not set
672# CONFIG_TIGON3 is not set 745# CONFIG_TIGON3 is not set
673# CONFIG_BNX2 is not set 746# CONFIG_BNX2 is not set
747CONFIG_QLA3XXX=m
748# CONFIG_ATL1 is not set
674 749
675# 750#
676# Ethernet (10000 Mbit) 751# Ethernet (10000 Mbit)
677# 752#
678# CONFIG_CHELSIO_T1 is not set 753# CONFIG_CHELSIO_T1 is not set
754CONFIG_CHELSIO_T3=m
679# CONFIG_IXGB is not set 755# CONFIG_IXGB is not set
680# CONFIG_S2IO is not set 756# CONFIG_S2IO is not set
681# CONFIG_MYRI10GE is not set 757# CONFIG_MYRI10GE is not set
758CONFIG_NETXEN_NIC=m
682 759
683# 760#
684# Token Ring devices 761# Token Ring devices
@@ -711,6 +788,7 @@ CONFIG_PPP_DEFLATE=m
711CONFIG_PPP_MPPE=m 788CONFIG_PPP_MPPE=m
712CONFIG_PPPOE=m 789CONFIG_PPPOE=m
713# CONFIG_SLIP is not set 790# CONFIG_SLIP is not set
791CONFIG_SLHC=m
714# CONFIG_SHAPER is not set 792# CONFIG_SHAPER is not set
715# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
716# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
@@ -730,6 +808,7 @@ CONFIG_PPPOE=m
730# Input device support 808# Input device support
731# 809#
732CONFIG_INPUT=y 810CONFIG_INPUT=y
811# CONFIG_INPUT_FF_MEMLESS is not set
733 812
734# 813#
735# Userland interfaces 814# Userland interfaces
@@ -808,10 +887,6 @@ CONFIG_LEGACY_PTY_COUNT=256
808# CONFIG_DTLK is not set 887# CONFIG_DTLK is not set
809# CONFIG_R3964 is not set 888# CONFIG_R3964 is not set
810# CONFIG_APPLICOM is not set 889# CONFIG_APPLICOM is not set
811
812#
813# Ftape, the floppy tape device driver
814#
815# CONFIG_DRM is not set 890# CONFIG_DRM is not set
816 891
817# 892#
@@ -826,7 +901,6 @@ CONFIG_SYNCLINK_CS=m
826# TPM devices 901# TPM devices
827# 902#
828# CONFIG_TCG_TPM is not set 903# CONFIG_TCG_TPM is not set
829# CONFIG_TELCLOCK is not set
830 904
831# 905#
832# I2C support 906# I2C support
@@ -851,14 +925,9 @@ CONFIG_SYNCLINK_CS=m
851# CONFIG_HWMON_VID is not set 925# CONFIG_HWMON_VID is not set
852 926
853# 927#
854# Misc devices
855#
856
857#
858# Multimedia devices 928# Multimedia devices
859# 929#
860# CONFIG_VIDEO_DEV is not set 930# CONFIG_VIDEO_DEV is not set
861CONFIG_VIDEO_V4L2=y
862 931
863# 932#
864# Digital Video Broadcasting Devices 933# Digital Video Broadcasting Devices
@@ -870,6 +939,7 @@ CONFIG_VIDEO_V4L2=y
870# 939#
871# CONFIG_FIRMWARE_EDID is not set 940# CONFIG_FIRMWARE_EDID is not set
872# CONFIG_FB is not set 941# CONFIG_FB is not set
942# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
873 943
874# 944#
875# Sound 945# Sound
@@ -877,6 +947,11 @@ CONFIG_VIDEO_V4L2=y
877# CONFIG_SOUND is not set 947# CONFIG_SOUND is not set
878 948
879# 949#
950# HID Devices
951#
952# CONFIG_HID is not set
953
954#
880# USB support 955# USB support
881# 956#
882CONFIG_USB_ARCH_HAS_HCD=y 957CONFIG_USB_ARCH_HAS_HCD=y
@@ -939,6 +1014,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
939# 1014#
940 1015
941# 1016#
1017# Auxiliary Display support
1018#
1019
1020#
1021# Virtualization
1022#
1023
1024#
942# File systems 1025# File systems
943# 1026#
944CONFIG_EXT2_FS=y 1027CONFIG_EXT2_FS=y
@@ -950,6 +1033,7 @@ CONFIG_EXT3_FS=y
950CONFIG_EXT3_FS_XATTR=y 1033CONFIG_EXT3_FS_XATTR=y
951CONFIG_EXT3_FS_POSIX_ACL=y 1034CONFIG_EXT3_FS_POSIX_ACL=y
952CONFIG_EXT3_FS_SECURITY=y 1035CONFIG_EXT3_FS_SECURITY=y
1036# CONFIG_EXT4DEV_FS is not set
953CONFIG_JBD=y 1037CONFIG_JBD=y
954# CONFIG_JBD_DEBUG is not set 1038# CONFIG_JBD_DEBUG is not set
955CONFIG_FS_MBCACHE=y 1039CONFIG_FS_MBCACHE=y
@@ -962,6 +1046,7 @@ CONFIG_REISERFS_FS_SECURITY=y
962# CONFIG_JFS_FS is not set 1046# CONFIG_JFS_FS is not set
963CONFIG_FS_POSIX_ACL=y 1047CONFIG_FS_POSIX_ACL=y
964# CONFIG_XFS_FS is not set 1048# CONFIG_XFS_FS is not set
1049# CONFIG_GFS2_FS is not set
965# CONFIG_OCFS2_FS is not set 1050# CONFIG_OCFS2_FS is not set
966# CONFIG_MINIX_FS is not set 1051# CONFIG_MINIX_FS is not set
967# CONFIG_ROMFS_FS is not set 1052# CONFIG_ROMFS_FS is not set
@@ -972,6 +1057,7 @@ CONFIG_DNOTIFY=y
972CONFIG_AUTOFS_FS=m 1057CONFIG_AUTOFS_FS=m
973CONFIG_AUTOFS4_FS=m 1058CONFIG_AUTOFS4_FS=m
974CONFIG_FUSE_FS=m 1059CONFIG_FUSE_FS=m
1060CONFIG_GENERIC_ACL=y
975 1061
976# 1062#
977# CD-ROM/DVD Filesystems 1063# CD-ROM/DVD Filesystems
@@ -991,23 +1077,25 @@ CONFIG_FUSE_FS=m
991# 1077#
992CONFIG_PROC_FS=y 1078CONFIG_PROC_FS=y
993CONFIG_PROC_KCORE=y 1079CONFIG_PROC_KCORE=y
1080CONFIG_PROC_SYSCTL=y
994CONFIG_SYSFS=y 1081CONFIG_SYSFS=y
995CONFIG_TMPFS=y 1082CONFIG_TMPFS=y
1083CONFIG_TMPFS_POSIX_ACL=y
996# CONFIG_HUGETLB_PAGE is not set 1084# CONFIG_HUGETLB_PAGE is not set
997CONFIG_RAMFS=y 1085CONFIG_RAMFS=y
998# CONFIG_CONFIGFS_FS is not set 1086CONFIG_CONFIGFS_FS=m
999 1087
1000# 1088#
1001# Miscellaneous filesystems 1089# Miscellaneous filesystems
1002# 1090#
1003# CONFIG_ADFS_FS is not set 1091# CONFIG_ADFS_FS is not set
1004# CONFIG_AFFS_FS is not set 1092# CONFIG_AFFS_FS is not set
1093# CONFIG_ECRYPT_FS is not set
1005# CONFIG_HFS_FS is not set 1094# CONFIG_HFS_FS is not set
1006# CONFIG_HFSPLUS_FS is not set 1095# CONFIG_HFSPLUS_FS is not set
1007# CONFIG_BEFS_FS is not set 1096# CONFIG_BEFS_FS is not set
1008# CONFIG_BFS_FS is not set 1097# CONFIG_BFS_FS is not set
1009# CONFIG_EFS_FS is not set 1098# CONFIG_EFS_FS is not set
1010# CONFIG_JFFS_FS is not set
1011# CONFIG_JFFS2_FS is not set 1099# CONFIG_JFFS2_FS is not set
1012CONFIG_CRAMFS=m 1100CONFIG_CRAMFS=m
1013# CONFIG_VXFS_FS is not set 1101# CONFIG_VXFS_FS is not set
@@ -1036,7 +1124,6 @@ CONFIG_SUNRPC=y
1036CONFIG_SMB_FS=m 1124CONFIG_SMB_FS=m
1037# CONFIG_SMB_NLS_DEFAULT is not set 1125# CONFIG_SMB_NLS_DEFAULT is not set
1038# CONFIG_CIFS is not set 1126# CONFIG_CIFS is not set
1039# CONFIG_CIFS_DEBUG2 is not set
1040# CONFIG_NCP_FS is not set 1127# CONFIG_NCP_FS is not set
1041# CONFIG_CODA_FS is not set 1128# CONFIG_CODA_FS is not set
1042# CONFIG_AFS_FS is not set 1129# CONFIG_AFS_FS is not set
@@ -1093,6 +1180,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1093# CONFIG_NLS_UTF8 is not set 1180# CONFIG_NLS_UTF8 is not set
1094 1181
1095# 1182#
1183# Distributed Lock Manager
1184#
1185CONFIG_DLM=m
1186CONFIG_DLM_TCP=y
1187# CONFIG_DLM_SCTP is not set
1188# CONFIG_DLM_DEBUG is not set
1189
1190#
1096# Profiling support 1191# Profiling support
1097# 1192#
1098# CONFIG_PROFILING is not set 1193# CONFIG_PROFILING is not set
@@ -1102,13 +1197,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1102# 1197#
1103CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1198CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1104# CONFIG_PRINTK_TIME is not set 1199# CONFIG_PRINTK_TIME is not set
1200CONFIG_ENABLE_MUST_CHECK=y
1105# CONFIG_MAGIC_SYSRQ is not set 1201# CONFIG_MAGIC_SYSRQ is not set
1106# CONFIG_UNUSED_SYMBOLS is not set 1202# CONFIG_UNUSED_SYMBOLS is not set
1203# CONFIG_DEBUG_FS is not set
1204# CONFIG_HEADERS_CHECK is not set
1107# CONFIG_DEBUG_KERNEL is not set 1205# CONFIG_DEBUG_KERNEL is not set
1108CONFIG_LOG_BUF_SHIFT=14 1206CONFIG_LOG_BUF_SHIFT=14
1109# CONFIG_DEBUG_FS is not set
1110CONFIG_CROSSCOMPILE=y 1207CONFIG_CROSSCOMPILE=y
1111CONFIG_CMDLINE="" 1208CONFIG_CMDLINE=""
1209CONFIG_SYS_SUPPORTS_KGDB=y
1112 1210
1113# 1211#
1114# Security options 1212# Security options
@@ -1121,18 +1219,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1121# Cryptographic options 1219# Cryptographic options
1122# 1220#
1123CONFIG_CRYPTO=y 1221CONFIG_CRYPTO=y
1222CONFIG_CRYPTO_ALGAPI=y
1223CONFIG_CRYPTO_BLKCIPHER=m
1224CONFIG_CRYPTO_HASH=y
1225CONFIG_CRYPTO_MANAGER=y
1124CONFIG_CRYPTO_HMAC=y 1226CONFIG_CRYPTO_HMAC=y
1227CONFIG_CRYPTO_XCBC=m
1125CONFIG_CRYPTO_NULL=m 1228CONFIG_CRYPTO_NULL=m
1126CONFIG_CRYPTO_MD4=m 1229CONFIG_CRYPTO_MD4=m
1127CONFIG_CRYPTO_MD5=m 1230CONFIG_CRYPTO_MD5=y
1128CONFIG_CRYPTO_SHA1=m 1231CONFIG_CRYPTO_SHA1=m
1129CONFIG_CRYPTO_SHA256=m 1232CONFIG_CRYPTO_SHA256=m
1130CONFIG_CRYPTO_SHA512=m 1233CONFIG_CRYPTO_SHA512=m
1131CONFIG_CRYPTO_WP512=m 1234CONFIG_CRYPTO_WP512=m
1132CONFIG_CRYPTO_TGR192=m 1235CONFIG_CRYPTO_TGR192=m
1236CONFIG_CRYPTO_GF128MUL=m
1237CONFIG_CRYPTO_ECB=m
1238CONFIG_CRYPTO_CBC=m
1239CONFIG_CRYPTO_PCBC=m
1240CONFIG_CRYPTO_LRW=m
1133CONFIG_CRYPTO_DES=m 1241CONFIG_CRYPTO_DES=m
1242CONFIG_CRYPTO_FCRYPT=m
1134CONFIG_CRYPTO_BLOWFISH=m 1243CONFIG_CRYPTO_BLOWFISH=m
1135CONFIG_CRYPTO_TWOFISH=m 1244CONFIG_CRYPTO_TWOFISH=m
1245CONFIG_CRYPTO_TWOFISH_COMMON=m
1136CONFIG_CRYPTO_SERPENT=m 1246CONFIG_CRYPTO_SERPENT=m
1137CONFIG_CRYPTO_AES=m 1247CONFIG_CRYPTO_AES=m
1138CONFIG_CRYPTO_CAST5=m 1248CONFIG_CRYPTO_CAST5=m
@@ -1144,6 +1254,7 @@ CONFIG_CRYPTO_ANUBIS=m
1144CONFIG_CRYPTO_DEFLATE=m 1254CONFIG_CRYPTO_DEFLATE=m
1145CONFIG_CRYPTO_MICHAEL_MIC=m 1255CONFIG_CRYPTO_MICHAEL_MIC=m
1146CONFIG_CRYPTO_CRC32C=m 1256CONFIG_CRYPTO_CRC32C=m
1257CONFIG_CRYPTO_CAMELLIA=m
1147# CONFIG_CRYPTO_TEST is not set 1258# CONFIG_CRYPTO_TEST is not set
1148 1259
1149# 1260#
@@ -1153,6 +1264,7 @@ CONFIG_CRYPTO_CRC32C=m
1153# 1264#
1154# Library routines 1265# Library routines
1155# 1266#
1267CONFIG_BITREVERSE=y
1156CONFIG_CRC_CCITT=m 1268CONFIG_CRC_CCITT=m
1157CONFIG_CRC16=m 1269CONFIG_CRC16=m
1158CONFIG_CRC32=y 1270CONFIG_CRC32=y
@@ -1164,3 +1276,5 @@ CONFIG_TEXTSEARCH_KMP=m
1164CONFIG_TEXTSEARCH_BM=m 1276CONFIG_TEXTSEARCH_BM=m
1165CONFIG_TEXTSEARCH_FSM=m 1277CONFIG_TEXTSEARCH_FSM=m
1166CONFIG_PLIST=y 1278CONFIG_PLIST=y
1279CONFIG_HAS_IOMEM=y
1280CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index fcb8fea3052c..fae16c5ec521 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc2 3# Linux kernel version: 2.6.20
4# Sat Oct 14 23:01:16 2006 4# Tue Feb 20 21:47:38 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -38,8 +39,8 @@ CONFIG_MIPS=y
38# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
39# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set
42CONFIG_PNX8550_JBS=y 42CONFIG_PNX8550_JBS=y
43# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -62,11 +63,14 @@ CONFIG_PNX8550_JBS=y
62# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
63# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
64CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
65CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
66CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_GENERIC_TIME=y 71CONFIG_GENERIC_TIME=y
69CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
70CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
71CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
72# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
@@ -134,6 +138,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 138# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 139CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 140# CONFIG_RESOURCES_64BIT is not set
141CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 142# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 143# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 144# CONFIG_HZ_128 is not set
@@ -146,6 +151,7 @@ CONFIG_HZ=250
146CONFIG_PREEMPT_NONE=y 151CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 152# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 153# CONFIG_PREEMPT is not set
154# CONFIG_KEXEC is not set
149CONFIG_LOCKDEP_SUPPORT=y 155CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 156CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,6 +171,7 @@ CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 171CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 172CONFIG_SYSVIPC=y
167# CONFIG_IPC_NS is not set 173# CONFIG_IPC_NS is not set
174CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 175# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 176# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_TASKSTATS is not set 177# CONFIG_TASKSTATS is not set
@@ -172,6 +179,7 @@ CONFIG_SYSVIPC=y
172# CONFIG_AUDIT is not set 179# CONFIG_AUDIT is not set
173CONFIG_IKCONFIG=y 180CONFIG_IKCONFIG=y
174CONFIG_IKCONFIG_PROC=y 181CONFIG_IKCONFIG_PROC=y
182CONFIG_SYSFS_DEPRECATED=y
175# CONFIG_RELAY is not set 183# CONFIG_RELAY is not set
176CONFIG_INITRAMFS_SOURCE="" 184CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -231,7 +239,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
231# 239#
232CONFIG_HW_HAS_PCI=y 240CONFIG_HW_HAS_PCI=y
233CONFIG_PCI=y 241CONFIG_PCI=y
234# CONFIG_PCI_MULTITHREAD_PROBE is not set
235# CONFIG_PCI_DEBUG is not set 242# CONFIG_PCI_DEBUG is not set
236CONFIG_MMU=y 243CONFIG_MMU=y
237 244
@@ -253,6 +260,14 @@ CONFIG_BINFMT_ELF=y
253CONFIG_TRAD_SIGNALS=y 260CONFIG_TRAD_SIGNALS=y
254 261
255# 262#
263# Power management options
264#
265CONFIG_PM=y
266# CONFIG_PM_LEGACY is not set
267# CONFIG_PM_DEBUG is not set
268# CONFIG_PM_SYSFS_DEPRECATED is not set
269
270#
256# Networking 271# Networking
257# 272#
258CONFIG_NET=y 273CONFIG_NET=y
@@ -267,6 +282,7 @@ CONFIG_UNIX=y
267CONFIG_XFRM=y 282CONFIG_XFRM=y
268# CONFIG_XFRM_USER is not set 283# CONFIG_XFRM_USER is not set
269# CONFIG_XFRM_SUB_POLICY is not set 284# CONFIG_XFRM_SUB_POLICY is not set
285CONFIG_XFRM_MIGRATE=y
270# CONFIG_NET_KEY is not set 286# CONFIG_NET_KEY is not set
271CONFIG_INET=y 287CONFIG_INET=y
272# CONFIG_IP_MULTICAST is not set 288# CONFIG_IP_MULTICAST is not set
@@ -293,6 +309,7 @@ CONFIG_INET_TCP_DIAG=y
293# CONFIG_TCP_CONG_ADVANCED is not set 309# CONFIG_TCP_CONG_ADVANCED is not set
294CONFIG_TCP_CONG_CUBIC=y 310CONFIG_TCP_CONG_CUBIC=y
295CONFIG_DEFAULT_TCP_CONG="cubic" 311CONFIG_DEFAULT_TCP_CONG="cubic"
312CONFIG_TCP_MD5SIG=y
296# CONFIG_IPV6 is not set 313# CONFIG_IPV6 is not set
297# CONFIG_INET6_XFRM_TUNNEL is not set 314# CONFIG_INET6_XFRM_TUNNEL is not set
298# CONFIG_INET6_TUNNEL is not set 315# CONFIG_INET6_TUNNEL is not set
@@ -350,6 +367,7 @@ CONFIG_STANDALONE=y
350CONFIG_PREVENT_FIRMWARE_BUILD=y 367CONFIG_PREVENT_FIRMWARE_BUILD=y
351CONFIG_FW_LOADER=y 368CONFIG_FW_LOADER=y
352# CONFIG_DEBUG_DRIVER is not set 369# CONFIG_DEBUG_DRIVER is not set
370# CONFIG_DEBUG_DEVRES is not set
353# CONFIG_SYS_HYPERVISOR is not set 371# CONFIG_SYS_HYPERVISOR is not set
354 372
355# 373#
@@ -370,6 +388,7 @@ CONFIG_FW_LOADER=y
370# 388#
371# Plug and Play support 389# Plug and Play support
372# 390#
391# CONFIG_PNPACPI is not set
373 392
374# 393#
375# Block devices 394# Block devices
@@ -393,6 +412,12 @@ CONFIG_BLK_DEV_INITRD=y
393# CONFIG_ATA_OVER_ETH is not set 412# CONFIG_ATA_OVER_ETH is not set
394 413
395# 414#
415# Misc devices
416#
417CONFIG_SGI_IOC4=m
418# CONFIG_TIFM_CORE is not set
419
420#
396# ATA/ATAPI/MFM/RLL support 421# ATA/ATAPI/MFM/RLL support
397# 422#
398CONFIG_IDE=y 423CONFIG_IDE=y
@@ -436,6 +461,7 @@ CONFIG_BLK_DEV_HPT366=y
436# CONFIG_BLK_DEV_JMICRON is not set 461# CONFIG_BLK_DEV_JMICRON is not set
437# CONFIG_BLK_DEV_SC1200 is not set 462# CONFIG_BLK_DEV_SC1200 is not set
438# CONFIG_BLK_DEV_PIIX is not set 463# CONFIG_BLK_DEV_PIIX is not set
464CONFIG_BLK_DEV_IT8213=m
439# CONFIG_BLK_DEV_IT821X is not set 465# CONFIG_BLK_DEV_IT821X is not set
440# CONFIG_BLK_DEV_NS87415 is not set 466# CONFIG_BLK_DEV_NS87415 is not set
441# CONFIG_BLK_DEV_PDC202XX_OLD is not set 467# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -445,6 +471,7 @@ CONFIG_BLK_DEV_HPT366=y
445# CONFIG_BLK_DEV_SLC90E66 is not set 471# CONFIG_BLK_DEV_SLC90E66 is not set
446# CONFIG_BLK_DEV_TRM290 is not set 472# CONFIG_BLK_DEV_TRM290 is not set
447# CONFIG_BLK_DEV_VIA82CXXX is not set 473# CONFIG_BLK_DEV_VIA82CXXX is not set
474CONFIG_BLK_DEV_TC86C001=m
448# CONFIG_IDE_ARM is not set 475# CONFIG_IDE_ARM is not set
449CONFIG_BLK_DEV_IDEDMA=y 476CONFIG_BLK_DEV_IDEDMA=y
450# CONFIG_IDEDMA_IVB is not set 477# CONFIG_IDEDMA_IVB is not set
@@ -456,6 +483,7 @@ CONFIG_BLK_DEV_IDEDMA=y
456# 483#
457# CONFIG_RAID_ATTRS is not set 484# CONFIG_RAID_ATTRS is not set
458CONFIG_SCSI=y 485CONFIG_SCSI=y
486CONFIG_SCSI_TGT=m
459CONFIG_SCSI_NETLINK=y 487CONFIG_SCSI_NETLINK=y
460CONFIG_SCSI_PROC_FS=y 488CONFIG_SCSI_PROC_FS=y
461 489
@@ -475,6 +503,7 @@ CONFIG_BLK_DEV_SD=y
475# CONFIG_SCSI_MULTI_LUN is not set 503# CONFIG_SCSI_MULTI_LUN is not set
476CONFIG_SCSI_CONSTANTS=y 504CONFIG_SCSI_CONSTANTS=y
477# CONFIG_SCSI_LOGGING is not set 505# CONFIG_SCSI_LOGGING is not set
506CONFIG_SCSI_SCAN_ASYNC=y
478 507
479# 508#
480# SCSI Transports 509# SCSI Transports
@@ -518,6 +547,7 @@ CONFIG_ISCSI_TCP=m
518# CONFIG_SCSI_DC390T is not set 547# CONFIG_SCSI_DC390T is not set
519# CONFIG_SCSI_NSP32 is not set 548# CONFIG_SCSI_NSP32 is not set
520# CONFIG_SCSI_DEBUG is not set 549# CONFIG_SCSI_DEBUG is not set
550# CONFIG_SCSI_SRP is not set
521 551
522# 552#
523# Serial ATA (prod) and Parallel ATA (experimental) drivers 553# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -605,7 +635,7 @@ CONFIG_8139TOO_8129=y
605# CONFIG_SUNDANCE is not set 635# CONFIG_SUNDANCE is not set
606# CONFIG_TLAN is not set 636# CONFIG_TLAN is not set
607# CONFIG_VIA_RHINE is not set 637# CONFIG_VIA_RHINE is not set
608# CONFIG_LAN_SAA9730 is not set 638# CONFIG_SC92031 is not set
609 639
610# 640#
611# Ethernet (1000 Mbit) 641# Ethernet (1000 Mbit)
@@ -625,14 +655,17 @@ CONFIG_8139TOO_8129=y
625# CONFIG_TIGON3 is not set 655# CONFIG_TIGON3 is not set
626# CONFIG_BNX2 is not set 656# CONFIG_BNX2 is not set
627# CONFIG_QLA3XXX is not set 657# CONFIG_QLA3XXX is not set
658# CONFIG_ATL1 is not set
628 659
629# 660#
630# Ethernet (10000 Mbit) 661# Ethernet (10000 Mbit)
631# 662#
632# CONFIG_CHELSIO_T1 is not set 663# CONFIG_CHELSIO_T1 is not set
664CONFIG_CHELSIO_T3=m
633# CONFIG_IXGB is not set 665# CONFIG_IXGB is not set
634# CONFIG_S2IO is not set 666# CONFIG_S2IO is not set
635# CONFIG_MYRI10GE is not set 667# CONFIG_MYRI10GE is not set
668CONFIG_NETXEN_NIC=m
636 669
637# 670#
638# Token Ring devices 671# Token Ring devices
@@ -720,7 +753,10 @@ CONFIG_HW_CONSOLE=y
720# 753#
721# Non-8250 serial port support 754# Non-8250 serial port support
722# 755#
723# CONFIG_SERIAL_IP3106 is not set 756CONFIG_SERIAL_PNX8XXX=y
757CONFIG_SERIAL_PNX8XXX_CONSOLE=y
758CONFIG_SERIAL_CORE=y
759CONFIG_SERIAL_CORE_CONSOLE=y
724# CONFIG_SERIAL_JSM is not set 760# CONFIG_SERIAL_JSM is not set
725CONFIG_UNIX98_PTYS=y 761CONFIG_UNIX98_PTYS=y
726CONFIG_LEGACY_PTYS=y 762CONFIG_LEGACY_PTYS=y
@@ -741,10 +777,6 @@ CONFIG_HW_RANDOM=y
741# CONFIG_DTLK is not set 777# CONFIG_DTLK is not set
742# CONFIG_R3964 is not set 778# CONFIG_R3964 is not set
743# CONFIG_APPLICOM is not set 779# CONFIG_APPLICOM is not set
744
745#
746# Ftape, the floppy tape device driver
747#
748# CONFIG_DRM is not set 780# CONFIG_DRM is not set
749# CONFIG_RAW_DRIVER is not set 781# CONFIG_RAW_DRIVER is not set
750 782
@@ -752,7 +784,6 @@ CONFIG_HW_RANDOM=y
752# TPM devices 784# TPM devices
753# 785#
754# CONFIG_TCG_TPM is not set 786# CONFIG_TCG_TPM is not set
755# CONFIG_TELCLOCK is not set
756 787
757# 788#
758# I2C support 789# I2C support
@@ -768,6 +799,7 @@ CONFIG_HW_RANDOM=y
768# 799#
769# Dallas's 1-wire bus 800# Dallas's 1-wire bus
770# 801#
802# CONFIG_W1 is not set
771 803
772# 804#
773# Hardware Monitoring support 805# Hardware Monitoring support
@@ -776,15 +808,11 @@ CONFIG_HWMON=y
776# CONFIG_HWMON_VID is not set 808# CONFIG_HWMON_VID is not set
777# CONFIG_SENSORS_ABITUGURU is not set 809# CONFIG_SENSORS_ABITUGURU is not set
778# CONFIG_SENSORS_F71805F is not set 810# CONFIG_SENSORS_F71805F is not set
811# CONFIG_SENSORS_PC87427 is not set
779# CONFIG_SENSORS_VT1211 is not set 812# CONFIG_SENSORS_VT1211 is not set
780# CONFIG_HWMON_DEBUG_CHIP is not set 813# CONFIG_HWMON_DEBUG_CHIP is not set
781 814
782# 815#
783# Misc devices
784#
785# CONFIG_TIFM_CORE is not set
786
787#
788# Multimedia devices 816# Multimedia devices
789# 817#
790# CONFIG_VIDEO_DEV is not set 818# CONFIG_VIDEO_DEV is not set
@@ -814,6 +842,11 @@ CONFIG_DUMMY_CONSOLE=y
814# CONFIG_SOUND is not set 842# CONFIG_SOUND is not set
815 843
816# 844#
845# HID Devices
846#
847# CONFIG_HID is not set
848
849#
817# USB support 850# USB support
818# 851#
819CONFIG_USB_ARCH_HAS_HCD=y 852CONFIG_USB_ARCH_HAS_HCD=y
@@ -826,8 +859,8 @@ CONFIG_USB=y
826# Miscellaneous USB options 859# Miscellaneous USB options
827# 860#
828# CONFIG_USB_DEVICEFS is not set 861# CONFIG_USB_DEVICEFS is not set
829# CONFIG_USB_BANDWIDTH is not set
830# CONFIG_USB_DYNAMIC_MINORS is not set 862# CONFIG_USB_DYNAMIC_MINORS is not set
863# CONFIG_USB_SUSPEND is not set
831# CONFIG_USB_OTG is not set 864# CONFIG_USB_OTG is not set
832 865
833# 866#
@@ -836,7 +869,8 @@ CONFIG_USB=y
836# CONFIG_USB_EHCI_HCD is not set 869# CONFIG_USB_EHCI_HCD is not set
837# CONFIG_USB_ISP116X_HCD is not set 870# CONFIG_USB_ISP116X_HCD is not set
838CONFIG_USB_OHCI_HCD=y 871CONFIG_USB_OHCI_HCD=y
839# CONFIG_USB_OHCI_BIG_ENDIAN is not set 872# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
873# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
840CONFIG_USB_OHCI_LITTLE_ENDIAN=y 874CONFIG_USB_OHCI_LITTLE_ENDIAN=y
841# CONFIG_USB_UHCI_HCD is not set 875# CONFIG_USB_UHCI_HCD is not set
842# CONFIG_USB_SL811_HCD is not set 876# CONFIG_USB_SL811_HCD is not set
@@ -890,7 +924,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
890# CONFIG_USB_ATI_REMOTE2 is not set 924# CONFIG_USB_ATI_REMOTE2 is not set
891# CONFIG_USB_KEYSPAN_REMOTE is not set 925# CONFIG_USB_KEYSPAN_REMOTE is not set
892# CONFIG_USB_APPLETOUCH is not set 926# CONFIG_USB_APPLETOUCH is not set
893# CONFIG_USB_TRANCEVIBRATOR is not set 927# CONFIG_USB_GTCO is not set
894 928
895# 929#
896# USB Imaging devices 930# USB Imaging devices
@@ -905,6 +939,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
905# CONFIG_USB_KAWETH is not set 939# CONFIG_USB_KAWETH is not set
906# CONFIG_USB_PEGASUS is not set 940# CONFIG_USB_PEGASUS is not set
907# CONFIG_USB_RTL8150 is not set 941# CONFIG_USB_RTL8150 is not set
942# CONFIG_USB_USBNET_MII is not set
908# CONFIG_USB_USBNET is not set 943# CONFIG_USB_USBNET is not set
909CONFIG_USB_MON=y 944CONFIG_USB_MON=y
910 945
@@ -927,6 +962,7 @@ CONFIG_USB_MON=y
927# CONFIG_USB_RIO500 is not set 962# CONFIG_USB_RIO500 is not set
928# CONFIG_USB_LEGOTOWER is not set 963# CONFIG_USB_LEGOTOWER is not set
929# CONFIG_USB_LCD is not set 964# CONFIG_USB_LCD is not set
965# CONFIG_USB_BERRY_CHARGE is not set
930# CONFIG_USB_LED is not set 966# CONFIG_USB_LED is not set
931# CONFIG_USB_CYPRESS_CY7C63 is not set 967# CONFIG_USB_CYPRESS_CY7C63 is not set
932# CONFIG_USB_CYTHERM is not set 968# CONFIG_USB_CYTHERM is not set
@@ -935,6 +971,7 @@ CONFIG_USB_MON=y
935# CONFIG_USB_FTDI_ELAN is not set 971# CONFIG_USB_FTDI_ELAN is not set
936# CONFIG_USB_APPLEDISPLAY is not set 972# CONFIG_USB_APPLEDISPLAY is not set
937# CONFIG_USB_LD is not set 973# CONFIG_USB_LD is not set
974# CONFIG_USB_TRANCEVIBRATOR is not set
938 975
939# 976#
940# USB DSL modem support 977# USB DSL modem support
@@ -991,6 +1028,14 @@ CONFIG_USB_MON=y
991# 1028#
992 1029
993# 1030#
1031# Auxiliary Display support
1032#
1033
1034#
1035# Virtualization
1036#
1037
1038#
994# File systems 1039# File systems
995# 1040#
996CONFIG_EXT2_FS=y 1041CONFIG_EXT2_FS=y
@@ -1041,7 +1086,7 @@ CONFIG_TMPFS=y
1041# CONFIG_TMPFS_POSIX_ACL is not set 1086# CONFIG_TMPFS_POSIX_ACL is not set
1042# CONFIG_HUGETLB_PAGE is not set 1087# CONFIG_HUGETLB_PAGE is not set
1043CONFIG_RAMFS=y 1088CONFIG_RAMFS=y
1044# CONFIG_CONFIGFS_FS is not set 1089CONFIG_CONFIGFS_FS=m
1045 1090
1046# 1091#
1047# Miscellaneous filesystems 1092# Miscellaneous filesystems
@@ -1137,6 +1182,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1137# CONFIG_NLS_UTF8 is not set 1182# CONFIG_NLS_UTF8 is not set
1138 1183
1139# 1184#
1185# Distributed Lock Manager
1186#
1187CONFIG_DLM=m
1188CONFIG_DLM_TCP=y
1189# CONFIG_DLM_SCTP is not set
1190# CONFIG_DLM_DEBUG is not set
1191
1192#
1140# Profiling support 1193# Profiling support
1141# 1194#
1142# CONFIG_PROFILING is not set 1195# CONFIG_PROFILING is not set
@@ -1149,33 +1202,35 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1149CONFIG_ENABLE_MUST_CHECK=y 1202CONFIG_ENABLE_MUST_CHECK=y
1150CONFIG_MAGIC_SYSRQ=y 1203CONFIG_MAGIC_SYSRQ=y
1151# CONFIG_UNUSED_SYMBOLS is not set 1204# CONFIG_UNUSED_SYMBOLS is not set
1205# CONFIG_DEBUG_FS is not set
1206# CONFIG_HEADERS_CHECK is not set
1152CONFIG_DEBUG_KERNEL=y 1207CONFIG_DEBUG_KERNEL=y
1208# CONFIG_DEBUG_SHIRQ is not set
1153CONFIG_LOG_BUF_SHIFT=14 1209CONFIG_LOG_BUF_SHIFT=14
1154CONFIG_DETECT_SOFTLOCKUP=y 1210CONFIG_DETECT_SOFTLOCKUP=y
1155# CONFIG_SCHEDSTATS is not set 1211# CONFIG_SCHEDSTATS is not set
1212# CONFIG_TIMER_STATS is not set
1156CONFIG_DEBUG_SLAB=y 1213CONFIG_DEBUG_SLAB=y
1157# CONFIG_DEBUG_SLAB_LEAK is not set 1214# CONFIG_DEBUG_SLAB_LEAK is not set
1158# CONFIG_DEBUG_RT_MUTEXES is not set 1215# CONFIG_DEBUG_RT_MUTEXES is not set
1159# CONFIG_RT_MUTEX_TESTER is not set 1216# CONFIG_RT_MUTEX_TESTER is not set
1160# CONFIG_DEBUG_SPINLOCK is not set 1217# CONFIG_DEBUG_SPINLOCK is not set
1161CONFIG_DEBUG_MUTEXES=y 1218CONFIG_DEBUG_MUTEXES=y
1162# CONFIG_DEBUG_RWSEMS is not set
1163# CONFIG_DEBUG_LOCK_ALLOC is not set 1219# CONFIG_DEBUG_LOCK_ALLOC is not set
1164# CONFIG_PROVE_LOCKING is not set 1220# CONFIG_PROVE_LOCKING is not set
1165# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1221# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1166# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1222# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1167# CONFIG_DEBUG_KOBJECT is not set 1223# CONFIG_DEBUG_KOBJECT is not set
1168# CONFIG_DEBUG_INFO is not set 1224# CONFIG_DEBUG_INFO is not set
1169# CONFIG_DEBUG_FS is not set
1170# CONFIG_DEBUG_VM is not set 1225# CONFIG_DEBUG_VM is not set
1171# CONFIG_DEBUG_LIST is not set 1226# CONFIG_DEBUG_LIST is not set
1172CONFIG_FORCED_INLINING=y 1227CONFIG_FORCED_INLINING=y
1173# CONFIG_HEADERS_CHECK is not set
1174# CONFIG_RCU_TORTURE_TEST is not set 1228# CONFIG_RCU_TORTURE_TEST is not set
1175CONFIG_CROSSCOMPILE=y 1229CONFIG_CROSSCOMPILE=y
1176CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" 1230CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1177# CONFIG_DEBUG_STACK_USAGE is not set 1231# CONFIG_DEBUG_STACK_USAGE is not set
1178# CONFIG_KGDB is not set 1232# CONFIG_KGDB is not set
1233CONFIG_SYS_SUPPORTS_KGDB=y
1179# CONFIG_RUNTIME_DEBUG is not set 1234# CONFIG_RUNTIME_DEBUG is not set
1180# CONFIG_MIPS_UNCACHED is not set 1235# CONFIG_MIPS_UNCACHED is not set
1181 1236
@@ -1189,21 +1244,27 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1189# Cryptographic options 1244# Cryptographic options
1190# 1245#
1191CONFIG_CRYPTO=y 1246CONFIG_CRYPTO=y
1192CONFIG_CRYPTO_ALGAPI=m 1247CONFIG_CRYPTO_ALGAPI=y
1193CONFIG_CRYPTO_BLKCIPHER=m 1248CONFIG_CRYPTO_BLKCIPHER=m
1249CONFIG_CRYPTO_HASH=m
1194CONFIG_CRYPTO_MANAGER=m 1250CONFIG_CRYPTO_MANAGER=m
1195# CONFIG_CRYPTO_HMAC is not set 1251# CONFIG_CRYPTO_HMAC is not set
1252CONFIG_CRYPTO_XCBC=m
1196# CONFIG_CRYPTO_NULL is not set 1253# CONFIG_CRYPTO_NULL is not set
1197# CONFIG_CRYPTO_MD4 is not set 1254# CONFIG_CRYPTO_MD4 is not set
1198CONFIG_CRYPTO_MD5=m 1255CONFIG_CRYPTO_MD5=y
1199# CONFIG_CRYPTO_SHA1 is not set 1256# CONFIG_CRYPTO_SHA1 is not set
1200# CONFIG_CRYPTO_SHA256 is not set 1257# CONFIG_CRYPTO_SHA256 is not set
1201# CONFIG_CRYPTO_SHA512 is not set 1258# CONFIG_CRYPTO_SHA512 is not set
1202# CONFIG_CRYPTO_WP512 is not set 1259# CONFIG_CRYPTO_WP512 is not set
1203# CONFIG_CRYPTO_TGR192 is not set 1260# CONFIG_CRYPTO_TGR192 is not set
1261CONFIG_CRYPTO_GF128MUL=m
1204CONFIG_CRYPTO_ECB=m 1262CONFIG_CRYPTO_ECB=m
1205CONFIG_CRYPTO_CBC=m 1263CONFIG_CRYPTO_CBC=m
1264CONFIG_CRYPTO_PCBC=m
1265CONFIG_CRYPTO_LRW=m
1206# CONFIG_CRYPTO_DES is not set 1266# CONFIG_CRYPTO_DES is not set
1267CONFIG_CRYPTO_FCRYPT=m
1207# CONFIG_CRYPTO_BLOWFISH is not set 1268# CONFIG_CRYPTO_BLOWFISH is not set
1208# CONFIG_CRYPTO_TWOFISH is not set 1269# CONFIG_CRYPTO_TWOFISH is not set
1209# CONFIG_CRYPTO_SERPENT is not set 1270# CONFIG_CRYPTO_SERPENT is not set
@@ -1217,6 +1278,7 @@ CONFIG_CRYPTO_CBC=m
1217# CONFIG_CRYPTO_DEFLATE is not set 1278# CONFIG_CRYPTO_DEFLATE is not set
1218# CONFIG_CRYPTO_MICHAEL_MIC is not set 1279# CONFIG_CRYPTO_MICHAEL_MIC is not set
1219CONFIG_CRYPTO_CRC32C=m 1280CONFIG_CRYPTO_CRC32C=m
1281CONFIG_CRYPTO_CAMELLIA=m
1220# CONFIG_CRYPTO_TEST is not set 1282# CONFIG_CRYPTO_TEST is not set
1221 1283
1222# 1284#
@@ -1226,8 +1288,11 @@ CONFIG_CRYPTO_CRC32C=m
1226# 1288#
1227# Library routines 1289# Library routines
1228# 1290#
1291CONFIG_BITREVERSE=y
1229CONFIG_CRC_CCITT=m 1292CONFIG_CRC_CCITT=m
1230# CONFIG_CRC16 is not set 1293# CONFIG_CRC16 is not set
1231CONFIG_CRC32=y 1294CONFIG_CRC32=y
1232CONFIG_LIBCRC32C=m 1295CONFIG_LIBCRC32C=m
1233CONFIG_PLIST=y 1296CONFIG_PLIST=y
1297CONFIG_HAS_IOMEM=y
1298CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig
index f38a2c123037..cd821e52181d 100644
--- a/arch/mips/configs/pnx8550-stb810_defconfig
+++ b/arch/mips/configs/pnx8550-stb810_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.20
4# Thu Dec 7 16:35:12 2006 4# Tue Feb 20 21:47:38 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -38,7 +39,6 @@ CONFIG_MIPS=y
38# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
39# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43CONFIG_PNX8550_STB810=y 43CONFIG_PNX8550_STB810=y
44# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
@@ -58,17 +58,19 @@ CONFIG_PNX8550_STB810=y
58# CONFIG_SIBYTE_LITTLESUR is not set 58# CONFIG_SIBYTE_LITTLESUR is not set
59# CONFIG_SIBYTE_CRHINE is not set 59# CONFIG_SIBYTE_CRHINE is not set
60# CONFIG_SIBYTE_CRHONE is not set 60# CONFIG_SIBYTE_CRHONE is not set
61# CONFIG_SNI_RM200_PCI is not set 61# CONFIG_SNI_RM is not set
62# CONFIG_TOSHIBA_JMR3927 is not set 62# CONFIG_TOSHIBA_JMR3927 is not set
63# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
64# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
65# CONFIG_KEXEC is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
70CONFIG_GENERIC_TIME=y 71CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
72CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
@@ -136,6 +138,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 138# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 139CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 140# CONFIG_RESOURCES_64BIT is not set
141CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 142# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 143# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 144# CONFIG_HZ_128 is not set
@@ -148,6 +151,7 @@ CONFIG_HZ=250
148CONFIG_PREEMPT_NONE=y 151CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 152# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 153# CONFIG_PREEMPT is not set
154# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 155CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 156CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -167,6 +171,7 @@ CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 171CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 172CONFIG_SYSVIPC=y
169# CONFIG_IPC_NS is not set 173# CONFIG_IPC_NS is not set
174CONFIG_SYSVIPC_SYSCTL=y
170# CONFIG_POSIX_MQUEUE is not set 175# CONFIG_POSIX_MQUEUE is not set
171# CONFIG_BSD_PROCESS_ACCT is not set 176# CONFIG_BSD_PROCESS_ACCT is not set
172# CONFIG_TASKSTATS is not set 177# CONFIG_TASKSTATS is not set
@@ -234,7 +239,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
234# 239#
235CONFIG_HW_HAS_PCI=y 240CONFIG_HW_HAS_PCI=y
236CONFIG_PCI=y 241CONFIG_PCI=y
237# CONFIG_PCI_MULTITHREAD_PROBE is not set
238# CONFIG_PCI_DEBUG is not set 242# CONFIG_PCI_DEBUG is not set
239CONFIG_MMU=y 243CONFIG_MMU=y
240 244
@@ -254,6 +258,14 @@ CONFIG_BINFMT_ELF=y
254CONFIG_TRAD_SIGNALS=y 258CONFIG_TRAD_SIGNALS=y
255 259
256# 260#
261# Power management options
262#
263CONFIG_PM=y
264# CONFIG_PM_LEGACY is not set
265# CONFIG_PM_DEBUG is not set
266# CONFIG_PM_SYSFS_DEPRECATED is not set
267
268#
257# Networking 269# Networking
258# 270#
259CONFIG_NET=y 271CONFIG_NET=y
@@ -268,6 +280,7 @@ CONFIG_UNIX=y
268CONFIG_XFRM=y 280CONFIG_XFRM=y
269# CONFIG_XFRM_USER is not set 281# CONFIG_XFRM_USER is not set
270# CONFIG_XFRM_SUB_POLICY is not set 282# CONFIG_XFRM_SUB_POLICY is not set
283CONFIG_XFRM_MIGRATE=y
271# CONFIG_NET_KEY is not set 284# CONFIG_NET_KEY is not set
272CONFIG_INET=y 285CONFIG_INET=y
273# CONFIG_IP_MULTICAST is not set 286# CONFIG_IP_MULTICAST is not set
@@ -351,6 +364,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
351CONFIG_STANDALONE=y 364CONFIG_STANDALONE=y
352CONFIG_PREVENT_FIRMWARE_BUILD=y 365CONFIG_PREVENT_FIRMWARE_BUILD=y
353# CONFIG_DEBUG_DRIVER is not set 366# CONFIG_DEBUG_DRIVER is not set
367# CONFIG_DEBUG_DEVRES is not set
354# CONFIG_SYS_HYPERVISOR is not set 368# CONFIG_SYS_HYPERVISOR is not set
355 369
356# 370#
@@ -371,6 +385,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
371# 385#
372# Plug and Play support 386# Plug and Play support
373# 387#
388# CONFIG_PNPACPI is not set
374 389
375# 390#
376# Block devices 391# Block devices
@@ -443,6 +458,7 @@ CONFIG_BLK_DEV_HPT366=y
443# CONFIG_BLK_DEV_JMICRON is not set 458# CONFIG_BLK_DEV_JMICRON is not set
444# CONFIG_BLK_DEV_SC1200 is not set 459# CONFIG_BLK_DEV_SC1200 is not set
445# CONFIG_BLK_DEV_PIIX is not set 460# CONFIG_BLK_DEV_PIIX is not set
461CONFIG_BLK_DEV_IT8213=m
446# CONFIG_BLK_DEV_IT821X is not set 462# CONFIG_BLK_DEV_IT821X is not set
447# CONFIG_BLK_DEV_NS87415 is not set 463# CONFIG_BLK_DEV_NS87415 is not set
448# CONFIG_BLK_DEV_PDC202XX_OLD is not set 464# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -452,6 +468,7 @@ CONFIG_BLK_DEV_HPT366=y
452# CONFIG_BLK_DEV_SLC90E66 is not set 468# CONFIG_BLK_DEV_SLC90E66 is not set
453# CONFIG_BLK_DEV_TRM290 is not set 469# CONFIG_BLK_DEV_TRM290 is not set
454# CONFIG_BLK_DEV_VIA82CXXX is not set 470# CONFIG_BLK_DEV_VIA82CXXX is not set
471CONFIG_BLK_DEV_TC86C001=m
455# CONFIG_IDE_ARM is not set 472# CONFIG_IDE_ARM is not set
456CONFIG_BLK_DEV_IDEDMA=y 473CONFIG_BLK_DEV_IDEDMA=y
457# CONFIG_IDEDMA_IVB is not set 474# CONFIG_IDEDMA_IVB is not set
@@ -463,6 +480,7 @@ CONFIG_BLK_DEV_IDEDMA=y
463# 480#
464# CONFIG_RAID_ATTRS is not set 481# CONFIG_RAID_ATTRS is not set
465CONFIG_SCSI=y 482CONFIG_SCSI=y
483CONFIG_SCSI_TGT=m
466# CONFIG_SCSI_NETLINK is not set 484# CONFIG_SCSI_NETLINK is not set
467CONFIG_SCSI_PROC_FS=y 485CONFIG_SCSI_PROC_FS=y
468 486
@@ -482,6 +500,7 @@ CONFIG_BLK_DEV_SD=y
482# CONFIG_SCSI_MULTI_LUN is not set 500# CONFIG_SCSI_MULTI_LUN is not set
483CONFIG_SCSI_CONSTANTS=y 501CONFIG_SCSI_CONSTANTS=y
484# CONFIG_SCSI_LOGGING is not set 502# CONFIG_SCSI_LOGGING is not set
503CONFIG_SCSI_SCAN_ASYNC=y
485 504
486# 505#
487# SCSI Transports 506# SCSI Transports
@@ -525,6 +544,7 @@ CONFIG_ISCSI_TCP=m
525# CONFIG_SCSI_DC390T is not set 544# CONFIG_SCSI_DC390T is not set
526# CONFIG_SCSI_NSP32 is not set 545# CONFIG_SCSI_NSP32 is not set
527# CONFIG_SCSI_DEBUG is not set 546# CONFIG_SCSI_DEBUG is not set
547# CONFIG_SCSI_SRP is not set
528 548
529# 549#
530# Serial ATA (prod) and Parallel ATA (experimental) drivers 550# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -608,6 +628,7 @@ CONFIG_NATSEMI=y
608# CONFIG_SUNDANCE is not set 628# CONFIG_SUNDANCE is not set
609# CONFIG_TLAN is not set 629# CONFIG_TLAN is not set
610# CONFIG_VIA_RHINE is not set 630# CONFIG_VIA_RHINE is not set
631# CONFIG_SC92031 is not set
611 632
612# 633#
613# Ethernet (1000 Mbit) 634# Ethernet (1000 Mbit)
@@ -627,11 +648,13 @@ CONFIG_NATSEMI=y
627# CONFIG_TIGON3 is not set 648# CONFIG_TIGON3 is not set
628# CONFIG_BNX2 is not set 649# CONFIG_BNX2 is not set
629# CONFIG_QLA3XXX is not set 650# CONFIG_QLA3XXX is not set
651# CONFIG_ATL1 is not set
630 652
631# 653#
632# Ethernet (10000 Mbit) 654# Ethernet (10000 Mbit)
633# 655#
634# CONFIG_CHELSIO_T1 is not set 656# CONFIG_CHELSIO_T1 is not set
657CONFIG_CHELSIO_T3=m
635# CONFIG_IXGB is not set 658# CONFIG_IXGB is not set
636# CONFIG_S2IO is not set 659# CONFIG_S2IO is not set
637# CONFIG_MYRI10GE is not set 660# CONFIG_MYRI10GE is not set
@@ -775,6 +798,7 @@ CONFIG_HWMON=y
775# CONFIG_HWMON_VID is not set 798# CONFIG_HWMON_VID is not set
776# CONFIG_SENSORS_ABITUGURU is not set 799# CONFIG_SENSORS_ABITUGURU is not set
777# CONFIG_SENSORS_F71805F is not set 800# CONFIG_SENSORS_F71805F is not set
801# CONFIG_SENSORS_PC87427 is not set
778# CONFIG_SENSORS_VT1211 is not set 802# CONFIG_SENSORS_VT1211 is not set
779# CONFIG_HWMON_DEBUG_CHIP is not set 803# CONFIG_HWMON_DEBUG_CHIP is not set
780 804
@@ -808,6 +832,11 @@ CONFIG_DUMMY_CONSOLE=y
808# CONFIG_SOUND is not set 832# CONFIG_SOUND is not set
809 833
810# 834#
835# HID Devices
836#
837# CONFIG_HID is not set
838
839#
811# USB support 840# USB support
812# 841#
813CONFIG_USB_ARCH_HAS_HCD=y 842CONFIG_USB_ARCH_HAS_HCD=y
@@ -820,9 +849,8 @@ CONFIG_USB=y
820# Miscellaneous USB options 849# Miscellaneous USB options
821# 850#
822# CONFIG_USB_DEVICEFS is not set 851# CONFIG_USB_DEVICEFS is not set
823# CONFIG_USB_BANDWIDTH is not set
824# CONFIG_USB_DYNAMIC_MINORS is not set 852# CONFIG_USB_DYNAMIC_MINORS is not set
825# CONFIG_USB_MULTITHREAD_PROBE is not set 853# CONFIG_USB_SUSPEND is not set
826# CONFIG_USB_OTG is not set 854# CONFIG_USB_OTG is not set
827 855
828# 856#
@@ -831,7 +859,8 @@ CONFIG_USB=y
831# CONFIG_USB_EHCI_HCD is not set 859# CONFIG_USB_EHCI_HCD is not set
832# CONFIG_USB_ISP116X_HCD is not set 860# CONFIG_USB_ISP116X_HCD is not set
833CONFIG_USB_OHCI_HCD=y 861CONFIG_USB_OHCI_HCD=y
834# CONFIG_USB_OHCI_BIG_ENDIAN is not set 862# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
863# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
835CONFIG_USB_OHCI_LITTLE_ENDIAN=y 864CONFIG_USB_OHCI_LITTLE_ENDIAN=y
836# CONFIG_USB_UHCI_HCD is not set 865# CONFIG_USB_UHCI_HCD is not set
837# CONFIG_USB_SL811_HCD is not set 866# CONFIG_USB_SL811_HCD is not set
@@ -885,6 +914,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
885# CONFIG_USB_ATI_REMOTE2 is not set 914# CONFIG_USB_ATI_REMOTE2 is not set
886# CONFIG_USB_KEYSPAN_REMOTE is not set 915# CONFIG_USB_KEYSPAN_REMOTE is not set
887# CONFIG_USB_APPLETOUCH is not set 916# CONFIG_USB_APPLETOUCH is not set
917# CONFIG_USB_GTCO is not set
888 918
889# 919#
890# USB Imaging devices 920# USB Imaging devices
@@ -922,6 +952,7 @@ CONFIG_USB_MON=y
922# CONFIG_USB_RIO500 is not set 952# CONFIG_USB_RIO500 is not set
923# CONFIG_USB_LEGOTOWER is not set 953# CONFIG_USB_LEGOTOWER is not set
924# CONFIG_USB_LCD is not set 954# CONFIG_USB_LCD is not set
955# CONFIG_USB_BERRY_CHARGE is not set
925# CONFIG_USB_LED is not set 956# CONFIG_USB_LED is not set
926# CONFIG_USB_CYPRESS_CY7C63 is not set 957# CONFIG_USB_CYPRESS_CY7C63 is not set
927# CONFIG_USB_CYTHERM is not set 958# CONFIG_USB_CYTHERM is not set
@@ -987,6 +1018,14 @@ CONFIG_USB_MON=y
987# 1018#
988 1019
989# 1020#
1021# Auxiliary Display support
1022#
1023
1024#
1025# Virtualization
1026#
1027
1028#
990# File systems 1029# File systems
991# 1030#
992CONFIG_EXT2_FS=y 1031CONFIG_EXT2_FS=y
@@ -1037,7 +1076,7 @@ CONFIG_TMPFS=y
1037# CONFIG_TMPFS_POSIX_ACL is not set 1076# CONFIG_TMPFS_POSIX_ACL is not set
1038# CONFIG_HUGETLB_PAGE is not set 1077# CONFIG_HUGETLB_PAGE is not set
1039CONFIG_RAMFS=y 1078CONFIG_RAMFS=y
1040# CONFIG_CONFIGFS_FS is not set 1079CONFIG_CONFIGFS_FS=m
1041 1080
1042# 1081#
1043# Miscellaneous filesystems 1082# Miscellaneous filesystems
@@ -1133,6 +1172,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1133# CONFIG_NLS_UTF8 is not set 1172# CONFIG_NLS_UTF8 is not set
1134 1173
1135# 1174#
1175# Distributed Lock Manager
1176#
1177CONFIG_DLM=m
1178CONFIG_DLM_TCP=y
1179# CONFIG_DLM_SCTP is not set
1180# CONFIG_DLM_DEBUG is not set
1181
1182#
1136# Profiling support 1183# Profiling support
1137# 1184#
1138# CONFIG_PROFILING is not set 1185# CONFIG_PROFILING is not set
@@ -1145,33 +1192,35 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1145CONFIG_ENABLE_MUST_CHECK=y 1192CONFIG_ENABLE_MUST_CHECK=y
1146CONFIG_MAGIC_SYSRQ=y 1193CONFIG_MAGIC_SYSRQ=y
1147# CONFIG_UNUSED_SYMBOLS is not set 1194# CONFIG_UNUSED_SYMBOLS is not set
1195# CONFIG_DEBUG_FS is not set
1196CONFIG_HEADERS_CHECK=y
1148CONFIG_DEBUG_KERNEL=y 1197CONFIG_DEBUG_KERNEL=y
1198# CONFIG_DEBUG_SHIRQ is not set
1149CONFIG_LOG_BUF_SHIFT=14 1199CONFIG_LOG_BUF_SHIFT=14
1150CONFIG_DETECT_SOFTLOCKUP=y 1200CONFIG_DETECT_SOFTLOCKUP=y
1151# CONFIG_SCHEDSTATS is not set 1201# CONFIG_SCHEDSTATS is not set
1202# CONFIG_TIMER_STATS is not set
1152CONFIG_DEBUG_SLAB=y 1203CONFIG_DEBUG_SLAB=y
1153# CONFIG_DEBUG_SLAB_LEAK is not set 1204# CONFIG_DEBUG_SLAB_LEAK is not set
1154# CONFIG_DEBUG_RT_MUTEXES is not set 1205# CONFIG_DEBUG_RT_MUTEXES is not set
1155# CONFIG_RT_MUTEX_TESTER is not set 1206# CONFIG_RT_MUTEX_TESTER is not set
1156# CONFIG_DEBUG_SPINLOCK is not set 1207# CONFIG_DEBUG_SPINLOCK is not set
1157# CONFIG_DEBUG_MUTEXES is not set 1208# CONFIG_DEBUG_MUTEXES is not set
1158# CONFIG_DEBUG_RWSEMS is not set
1159# CONFIG_DEBUG_LOCK_ALLOC is not set 1209# CONFIG_DEBUG_LOCK_ALLOC is not set
1160# CONFIG_PROVE_LOCKING is not set 1210# CONFIG_PROVE_LOCKING is not set
1161# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1211# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1162# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1212# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1163# CONFIG_DEBUG_KOBJECT is not set 1213# CONFIG_DEBUG_KOBJECT is not set
1164# CONFIG_DEBUG_INFO is not set 1214# CONFIG_DEBUG_INFO is not set
1165# CONFIG_DEBUG_FS is not set
1166# CONFIG_DEBUG_VM is not set 1215# CONFIG_DEBUG_VM is not set
1167# CONFIG_DEBUG_LIST is not set 1216# CONFIG_DEBUG_LIST is not set
1168CONFIG_FORCED_INLINING=y 1217CONFIG_FORCED_INLINING=y
1169CONFIG_HEADERS_CHECK=y
1170# CONFIG_RCU_TORTURE_TEST is not set 1218# CONFIG_RCU_TORTURE_TEST is not set
1171CONFIG_CROSSCOMPILE=y 1219CONFIG_CROSSCOMPILE=y
1172CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" 1220CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1173# CONFIG_DEBUG_STACK_USAGE is not set 1221# CONFIG_DEBUG_STACK_USAGE is not set
1174# CONFIG_KGDB is not set 1222# CONFIG_KGDB is not set
1223CONFIG_SYS_SUPPORTS_KGDB=y
1175# CONFIG_RUNTIME_DEBUG is not set 1224# CONFIG_RUNTIME_DEBUG is not set
1176# CONFIG_MIPS_UNCACHED is not set 1225# CONFIG_MIPS_UNCACHED is not set
1177 1226
@@ -1187,8 +1236,10 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1187CONFIG_CRYPTO=y 1236CONFIG_CRYPTO=y
1188CONFIG_CRYPTO_ALGAPI=m 1237CONFIG_CRYPTO_ALGAPI=m
1189CONFIG_CRYPTO_BLKCIPHER=m 1238CONFIG_CRYPTO_BLKCIPHER=m
1239CONFIG_CRYPTO_HASH=m
1190CONFIG_CRYPTO_MANAGER=m 1240CONFIG_CRYPTO_MANAGER=m
1191# CONFIG_CRYPTO_HMAC is not set 1241# CONFIG_CRYPTO_HMAC is not set
1242CONFIG_CRYPTO_XCBC=m
1192# CONFIG_CRYPTO_NULL is not set 1243# CONFIG_CRYPTO_NULL is not set
1193# CONFIG_CRYPTO_MD4 is not set 1244# CONFIG_CRYPTO_MD4 is not set
1194CONFIG_CRYPTO_MD5=m 1245CONFIG_CRYPTO_MD5=m
@@ -1197,9 +1248,13 @@ CONFIG_CRYPTO_MD5=m
1197# CONFIG_CRYPTO_SHA512 is not set 1248# CONFIG_CRYPTO_SHA512 is not set
1198# CONFIG_CRYPTO_WP512 is not set 1249# CONFIG_CRYPTO_WP512 is not set
1199# CONFIG_CRYPTO_TGR192 is not set 1250# CONFIG_CRYPTO_TGR192 is not set
1251CONFIG_CRYPTO_GF128MUL=m
1200CONFIG_CRYPTO_ECB=m 1252CONFIG_CRYPTO_ECB=m
1201CONFIG_CRYPTO_CBC=m 1253CONFIG_CRYPTO_CBC=m
1254CONFIG_CRYPTO_PCBC=m
1255CONFIG_CRYPTO_LRW=m
1202# CONFIG_CRYPTO_DES is not set 1256# CONFIG_CRYPTO_DES is not set
1257CONFIG_CRYPTO_FCRYPT=m
1203# CONFIG_CRYPTO_BLOWFISH is not set 1258# CONFIG_CRYPTO_BLOWFISH is not set
1204# CONFIG_CRYPTO_TWOFISH is not set 1259# CONFIG_CRYPTO_TWOFISH is not set
1205# CONFIG_CRYPTO_SERPENT is not set 1260# CONFIG_CRYPTO_SERPENT is not set
@@ -1213,6 +1268,7 @@ CONFIG_CRYPTO_CBC=m
1213# CONFIG_CRYPTO_DEFLATE is not set 1268# CONFIG_CRYPTO_DEFLATE is not set
1214# CONFIG_CRYPTO_MICHAEL_MIC is not set 1269# CONFIG_CRYPTO_MICHAEL_MIC is not set
1215CONFIG_CRYPTO_CRC32C=m 1270CONFIG_CRYPTO_CRC32C=m
1271CONFIG_CRYPTO_CAMELLIA=m
1216# CONFIG_CRYPTO_TEST is not set 1272# CONFIG_CRYPTO_TEST is not set
1217 1273
1218# 1274#
@@ -1222,8 +1278,11 @@ CONFIG_CRYPTO_CRC32C=m
1222# 1278#
1223# Library routines 1279# Library routines
1224# 1280#
1281CONFIG_BITREVERSE=y
1225CONFIG_CRC_CCITT=m 1282CONFIG_CRC_CCITT=m
1226# CONFIG_CRC16 is not set 1283# CONFIG_CRC16 is not set
1227CONFIG_CRC32=y 1284CONFIG_CRC32=y
1228CONFIG_LIBCRC32C=m 1285CONFIG_LIBCRC32C=m
1229CONFIG_PLIST=y 1286CONFIG_PLIST=y
1287CONFIG_HAS_IOMEM=y
1288CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
deleted file mode 100644
index 5bc3248e50e4..000000000000
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ /dev/null
@@ -1,1447 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc2
4# Sat Oct 14 23:12:15 2006
5#
6CONFIG_MIPS=y
7
8#
9# Machine selection
10#
11# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set
14# CONFIG_MIPS_PB1100 is not set
15# CONFIG_MIPS_PB1500 is not set
16# CONFIG_MIPS_PB1550 is not set
17# CONFIG_MIPS_PB1200 is not set
18# CONFIG_MIPS_DB1000 is not set
19# CONFIG_MIPS_DB1100 is not set
20# CONFIG_MIPS_DB1500 is not set
21# CONFIG_MIPS_DB1550 is not set
22# CONFIG_MIPS_DB1200 is not set
23# CONFIG_MIPS_MIRAGE is not set
24# CONFIG_BASLER_EXCITE is not set
25# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MACH_JAZZ is not set
29# CONFIG_LASAT is not set
30# CONFIG_MIPS_ATLAS is not set
31# CONFIG_MIPS_MALTA is not set
32# CONFIG_MIPS_SEAD is not set
33# CONFIG_WR_PPMC is not set
34# CONFIG_MIPS_SIM is not set
35# CONFIG_MOMENCO_JAGUAR_ATX is not set
36# CONFIG_MOMENCO_OCELOT is not set
37# CONFIG_MOMENCO_OCELOT_3 is not set
38# CONFIG_MOMENCO_OCELOT_C is not set
39# CONFIG_MOMENCO_OCELOT_G is not set
40# CONFIG_MIPS_XXS1500 is not set
41CONFIG_PNX8550_V2PCI=y
42# CONFIG_PNX8550_JBS is not set
43# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set
46# CONFIG_QEMU is not set
47# CONFIG_MARKEINS is not set
48# CONFIG_SGI_IP22 is not set
49# CONFIG_SGI_IP27 is not set
50# CONFIG_SGI_IP32 is not set
51# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_SWARM is not set
53# CONFIG_SIBYTE_SENTOSA is not set
54# CONFIG_SIBYTE_RHONE is not set
55# CONFIG_SIBYTE_CARMEL is not set
56# CONFIG_SIBYTE_PTSWARM is not set
57# CONFIG_SIBYTE_LITTLESUR is not set
58# CONFIG_SIBYTE_CRHINE is not set
59# CONFIG_SIBYTE_CRHONE is not set
60# CONFIG_SNI_RM is not set
61# CONFIG_TOSHIBA_JMR3927 is not set
62# CONFIG_TOSHIBA_RBTX4927 is not set
63# CONFIG_TOSHIBA_RBTX4938 is not set
64CONFIG_RWSEM_GENERIC_SPINLOCK=y
65CONFIG_GENERIC_FIND_NEXT_BIT=y
66CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_GENERIC_TIME=y
69CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
70CONFIG_DMA_NONCOHERENT=y
71CONFIG_DMA_NEED_PCI_MAP_STATE=y
72# CONFIG_CPU_BIG_ENDIAN is not set
73CONFIG_CPU_LITTLE_ENDIAN=y
74CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
75CONFIG_PNX8550=y
76CONFIG_SOC_PNX8550=y
77CONFIG_MIPS_L1_CACHE_SHIFT=5
78
79#
80# CPU selection
81#
82CONFIG_CPU_MIPS32_R1=y
83# CONFIG_CPU_MIPS32_R2 is not set
84# CONFIG_CPU_MIPS64_R1 is not set
85# CONFIG_CPU_MIPS64_R2 is not set
86# CONFIG_CPU_R3000 is not set
87# CONFIG_CPU_TX39XX is not set
88# CONFIG_CPU_VR41XX is not set
89# CONFIG_CPU_R4300 is not set
90# CONFIG_CPU_R4X00 is not set
91# CONFIG_CPU_TX49XX is not set
92# CONFIG_CPU_R5000 is not set
93# CONFIG_CPU_R5432 is not set
94# CONFIG_CPU_R6000 is not set
95# CONFIG_CPU_NEVADA is not set
96# CONFIG_CPU_R8000 is not set
97# CONFIG_CPU_R10000 is not set
98# CONFIG_CPU_RM7000 is not set
99# CONFIG_CPU_RM9000 is not set
100# CONFIG_CPU_SB1 is not set
101CONFIG_SYS_HAS_CPU_MIPS32_R1=y
102CONFIG_CPU_MIPS32=y
103CONFIG_CPU_MIPSR1=y
104CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
105CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
106
107#
108# Kernel type
109#
110CONFIG_32BIT=y
111# CONFIG_64BIT is not set
112CONFIG_PAGE_SIZE_4KB=y
113# CONFIG_PAGE_SIZE_8KB is not set
114# CONFIG_PAGE_SIZE_16KB is not set
115# CONFIG_PAGE_SIZE_64KB is not set
116CONFIG_CPU_HAS_PREFETCH=y
117CONFIG_MIPS_MT_DISABLED=y
118# CONFIG_MIPS_MT_SMP is not set
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_VPE_LOADER is not set
121# CONFIG_64BIT_PHYS_ADDR is not set
122CONFIG_CPU_HAS_LLSC=y
123CONFIG_CPU_HAS_SYNC=y
124CONFIG_GENERIC_HARDIRQS=y
125CONFIG_GENERIC_IRQ_PROBE=y
126CONFIG_CPU_SUPPORTS_HIGHMEM=y
127CONFIG_ARCH_FLATMEM_ENABLE=y
128CONFIG_SELECT_MEMORY_MODEL=y
129CONFIG_FLATMEM_MANUAL=y
130# CONFIG_DISCONTIGMEM_MANUAL is not set
131# CONFIG_SPARSEMEM_MANUAL is not set
132CONFIG_FLATMEM=y
133CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set
137# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set
140CONFIG_HZ_250=y
141# CONFIG_HZ_256 is not set
142# CONFIG_HZ_1000 is not set
143# CONFIG_HZ_1024 is not set
144CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
145CONFIG_HZ=250
146CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set
149CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
152
153#
154# Code maturity level options
155#
156CONFIG_EXPERIMENTAL=y
157CONFIG_BROKEN_ON_SMP=y
158CONFIG_INIT_ENV_ARG_LIMIT=32
159
160#
161# General setup
162#
163CONFIG_LOCALVERSION=""
164CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y
166CONFIG_SYSVIPC=y
167# CONFIG_IPC_NS is not set
168# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_TASKSTATS is not set
171# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set
173CONFIG_IKCONFIG=y
174CONFIG_IKCONFIG_PROC=y
175# CONFIG_RELAY is not set
176CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
178CONFIG_SYSCTL=y
179CONFIG_EMBEDDED=y
180# CONFIG_SYSCTL_SYSCALL is not set
181CONFIG_KALLSYMS=y
182# CONFIG_KALLSYMS_EXTRA_PASS is not set
183CONFIG_HOTPLUG=y
184CONFIG_PRINTK=y
185CONFIG_BUG=y
186CONFIG_ELF_CORE=y
187CONFIG_BASE_FULL=y
188CONFIG_FUTEX=y
189CONFIG_EPOLL=y
190CONFIG_SHMEM=y
191CONFIG_SLAB=y
192CONFIG_VM_EVENT_COUNTERS=y
193CONFIG_RT_MUTEXES=y
194# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set
197
198#
199# Loadable module support
200#
201CONFIG_MODULES=y
202# CONFIG_MODULE_UNLOAD is not set
203# CONFIG_MODVERSIONS is not set
204# CONFIG_MODULE_SRCVERSION_ALL is not set
205CONFIG_KMOD=y
206
207#
208# Block layer
209#
210CONFIG_BLOCK=y
211# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set
214
215#
216# IO Schedulers
217#
218CONFIG_IOSCHED_NOOP=y
219CONFIG_IOSCHED_AS=y
220CONFIG_IOSCHED_DEADLINE=y
221CONFIG_IOSCHED_CFQ=y
222CONFIG_DEFAULT_AS=y
223# CONFIG_DEFAULT_DEADLINE is not set
224# CONFIG_DEFAULT_CFQ is not set
225# CONFIG_DEFAULT_NOOP is not set
226CONFIG_DEFAULT_IOSCHED="anticipatory"
227
228#
229# Bus options (PCI, PCMCIA, EISA, ISA, TC)
230#
231CONFIG_HW_HAS_PCI=y
232CONFIG_PCI=y
233# CONFIG_PCI_MULTITHREAD_PROBE is not set
234CONFIG_MMU=y
235
236#
237# PCCARD (PCMCIA/CardBus) support
238#
239# CONFIG_PCCARD is not set
240
241#
242# PCI Hotplug Support
243#
244# CONFIG_HOTPLUG_PCI is not set
245
246#
247# Executable file formats
248#
249CONFIG_BINFMT_ELF=y
250# CONFIG_BINFMT_MISC is not set
251CONFIG_TRAD_SIGNALS=y
252
253#
254# Networking
255#
256CONFIG_NET=y
257
258#
259# Networking options
260#
261# CONFIG_NETDEBUG is not set
262CONFIG_PACKET=y
263# CONFIG_PACKET_MMAP is not set
264CONFIG_UNIX=y
265CONFIG_XFRM=y
266# CONFIG_XFRM_USER is not set
267# CONFIG_XFRM_SUB_POLICY is not set
268# CONFIG_NET_KEY is not set
269CONFIG_INET=y
270# CONFIG_IP_MULTICAST is not set
271# CONFIG_IP_ADVANCED_ROUTER is not set
272CONFIG_IP_FIB_HASH=y
273CONFIG_IP_PNP=y
274# CONFIG_IP_PNP_DHCP is not set
275# CONFIG_IP_PNP_BOOTP is not set
276# CONFIG_IP_PNP_RARP is not set
277# CONFIG_NET_IPIP is not set
278# CONFIG_NET_IPGRE is not set
279# CONFIG_ARPD is not set
280# CONFIG_SYN_COOKIES is not set
281# CONFIG_INET_AH is not set
282# CONFIG_INET_ESP is not set
283# CONFIG_INET_IPCOMP is not set
284# CONFIG_INET_XFRM_TUNNEL is not set
285# CONFIG_INET_TUNNEL is not set
286CONFIG_INET_XFRM_MODE_TRANSPORT=y
287CONFIG_INET_XFRM_MODE_TUNNEL=y
288CONFIG_INET_XFRM_MODE_BEET=y
289CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_CUBIC=y
293CONFIG_DEFAULT_TCP_CONG="cubic"
294
295#
296# IP: Virtual Server Configuration
297#
298# CONFIG_IP_VS is not set
299CONFIG_IPV6=m
300# CONFIG_IPV6_PRIVACY is not set
301CONFIG_IPV6_ROUTER_PREF=y
302CONFIG_IPV6_ROUTE_INFO=y
303# CONFIG_INET6_AH is not set
304# CONFIG_INET6_ESP is not set
305# CONFIG_INET6_IPCOMP is not set
306# CONFIG_IPV6_MIP6 is not set
307# CONFIG_INET6_XFRM_TUNNEL is not set
308# CONFIG_INET6_TUNNEL is not set
309CONFIG_INET6_XFRM_MODE_TRANSPORT=m
310CONFIG_INET6_XFRM_MODE_TUNNEL=m
311CONFIG_INET6_XFRM_MODE_BEET=m
312# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
313CONFIG_IPV6_SIT=m
314# CONFIG_IPV6_TUNNEL is not set
315# CONFIG_IPV6_SUBTREES is not set
316# CONFIG_IPV6_MULTIPLE_TABLES is not set
317# CONFIG_NETWORK_SECMARK is not set
318CONFIG_NETFILTER=y
319# CONFIG_NETFILTER_DEBUG is not set
320
321#
322# Core Netfilter Configuration
323#
324# CONFIG_NETFILTER_NETLINK is not set
325# CONFIG_NF_CONNTRACK is not set
326CONFIG_NETFILTER_XTABLES=m
327CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
328CONFIG_NETFILTER_XT_TARGET_MARK=m
329CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
330CONFIG_NETFILTER_XT_MATCH_COMMENT=m
331CONFIG_NETFILTER_XT_MATCH_DCCP=m
332# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
333CONFIG_NETFILTER_XT_MATCH_ESP=m
334CONFIG_NETFILTER_XT_MATCH_LENGTH=m
335CONFIG_NETFILTER_XT_MATCH_LIMIT=m
336CONFIG_NETFILTER_XT_MATCH_MAC=m
337CONFIG_NETFILTER_XT_MATCH_MARK=m
338# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
339CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
340CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
341# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
342CONFIG_NETFILTER_XT_MATCH_REALM=m
343CONFIG_NETFILTER_XT_MATCH_SCTP=m
344# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
345CONFIG_NETFILTER_XT_MATCH_STRING=m
346CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
347
348#
349# IP: Netfilter Configuration
350#
351# CONFIG_IP_NF_CONNTRACK is not set
352# CONFIG_IP_NF_QUEUE is not set
353# CONFIG_IP_NF_IPTABLES is not set
354# CONFIG_IP_NF_ARPTABLES is not set
355
356#
357# IPv6: Netfilter Configuration (EXPERIMENTAL)
358#
359# CONFIG_IP6_NF_QUEUE is not set
360# CONFIG_IP6_NF_IPTABLES is not set
361
362#
363# DCCP Configuration (EXPERIMENTAL)
364#
365# CONFIG_IP_DCCP is not set
366
367#
368# SCTP Configuration (EXPERIMENTAL)
369#
370# CONFIG_IP_SCTP is not set
371
372#
373# TIPC Configuration (EXPERIMENTAL)
374#
375# CONFIG_TIPC is not set
376# CONFIG_ATM is not set
377# CONFIG_BRIDGE is not set
378# CONFIG_VLAN_8021Q is not set
379# CONFIG_DECNET is not set
380# CONFIG_LLC2 is not set
381# CONFIG_IPX is not set
382# CONFIG_ATALK is not set
383# CONFIG_X25 is not set
384# CONFIG_LAPB is not set
385# CONFIG_ECONET is not set
386# CONFIG_WAN_ROUTER is not set
387
388#
389# QoS and/or fair queueing
390#
391# CONFIG_NET_SCHED is not set
392CONFIG_NET_CLS_ROUTE=y
393
394#
395# Network testing
396#
397# CONFIG_NET_PKTGEN is not set
398# CONFIG_HAMRADIO is not set
399# CONFIG_IRDA is not set
400# CONFIG_BT is not set
401# CONFIG_IEEE80211 is not set
402
403#
404# Device Drivers
405#
406
407#
408# Generic Driver Options
409#
410CONFIG_STANDALONE=y
411CONFIG_PREVENT_FIRMWARE_BUILD=y
412CONFIG_FW_LOADER=y
413# CONFIG_SYS_HYPERVISOR is not set
414
415#
416# Connector - unified userspace <-> kernelspace linker
417#
418# CONFIG_CONNECTOR is not set
419
420#
421# Memory Technology Devices (MTD)
422#
423# CONFIG_MTD is not set
424
425#
426# Parallel port support
427#
428# CONFIG_PARPORT is not set
429
430#
431# Plug and Play support
432#
433
434#
435# Block devices
436#
437# CONFIG_BLK_CPQ_DA is not set
438# CONFIG_BLK_CPQ_CISS_DA is not set
439# CONFIG_BLK_DEV_DAC960 is not set
440# CONFIG_BLK_DEV_UMEM is not set
441# CONFIG_BLK_DEV_COW_COMMON is not set
442CONFIG_BLK_DEV_LOOP=y
443# CONFIG_BLK_DEV_CRYPTOLOOP is not set
444# CONFIG_BLK_DEV_NBD is not set
445# CONFIG_BLK_DEV_SX8 is not set
446# CONFIG_BLK_DEV_UB is not set
447CONFIG_BLK_DEV_RAM=y
448CONFIG_BLK_DEV_RAM_COUNT=16
449CONFIG_BLK_DEV_RAM_SIZE=8192
450CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
451CONFIG_BLK_DEV_INITRD=y
452# CONFIG_CDROM_PKTCDVD is not set
453# CONFIG_ATA_OVER_ETH is not set
454
455#
456# ATA/ATAPI/MFM/RLL support
457#
458CONFIG_IDE=y
459CONFIG_IDE_MAX_HWIFS=4
460CONFIG_BLK_DEV_IDE=y
461
462#
463# Please see Documentation/ide.txt for help/info on IDE drives
464#
465# CONFIG_BLK_DEV_IDE_SATA is not set
466CONFIG_BLK_DEV_IDEDISK=y
467CONFIG_IDEDISK_MULTI_MODE=y
468# CONFIG_BLK_DEV_IDECD is not set
469# CONFIG_BLK_DEV_IDETAPE is not set
470# CONFIG_BLK_DEV_IDEFLOPPY is not set
471# CONFIG_BLK_DEV_IDESCSI is not set
472# CONFIG_IDE_TASK_IOCTL is not set
473
474#
475# IDE chipset support/bugfixes
476#
477CONFIG_IDE_GENERIC=y
478CONFIG_BLK_DEV_IDEPCI=y
479CONFIG_IDEPCI_SHARE_IRQ=y
480# CONFIG_BLK_DEV_OFFBOARD is not set
481# CONFIG_BLK_DEV_GENERIC is not set
482# CONFIG_BLK_DEV_OPTI621 is not set
483CONFIG_BLK_DEV_IDEDMA_PCI=y
484# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
485CONFIG_IDEDMA_PCI_AUTO=y
486# CONFIG_IDEDMA_ONLYDISK is not set
487# CONFIG_BLK_DEV_AEC62XX is not set
488# CONFIG_BLK_DEV_ALI15X3 is not set
489# CONFIG_BLK_DEV_AMD74XX is not set
490CONFIG_BLK_DEV_CMD64X=y
491# CONFIG_BLK_DEV_TRIFLEX is not set
492# CONFIG_BLK_DEV_CY82C693 is not set
493# CONFIG_BLK_DEV_CS5520 is not set
494# CONFIG_BLK_DEV_CS5530 is not set
495# CONFIG_BLK_DEV_HPT34X is not set
496# CONFIG_BLK_DEV_HPT366 is not set
497# CONFIG_BLK_DEV_JMICRON is not set
498# CONFIG_BLK_DEV_SC1200 is not set
499# CONFIG_BLK_DEV_PIIX is not set
500# CONFIG_BLK_DEV_IT821X is not set
501# CONFIG_BLK_DEV_NS87415 is not set
502# CONFIG_BLK_DEV_PDC202XX_OLD is not set
503# CONFIG_BLK_DEV_PDC202XX_NEW is not set
504# CONFIG_BLK_DEV_SVWKS is not set
505# CONFIG_BLK_DEV_SIIMAGE is not set
506# CONFIG_BLK_DEV_SLC90E66 is not set
507# CONFIG_BLK_DEV_TRM290 is not set
508# CONFIG_BLK_DEV_VIA82CXXX is not set
509# CONFIG_IDE_ARM is not set
510CONFIG_BLK_DEV_IDEDMA=y
511# CONFIG_IDEDMA_IVB is not set
512CONFIG_IDEDMA_AUTO=y
513# CONFIG_BLK_DEV_HD is not set
514
515#
516# SCSI device support
517#
518# CONFIG_RAID_ATTRS is not set
519CONFIG_SCSI=y
520CONFIG_SCSI_NETLINK=y
521CONFIG_SCSI_PROC_FS=y
522
523#
524# SCSI support type (disk, tape, CD-ROM)
525#
526CONFIG_BLK_DEV_SD=y
527# CONFIG_CHR_DEV_ST is not set
528# CONFIG_CHR_DEV_OSST is not set
529# CONFIG_BLK_DEV_SR is not set
530# CONFIG_CHR_DEV_SG is not set
531# CONFIG_CHR_DEV_SCH is not set
532
533#
534# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
535#
536# CONFIG_SCSI_MULTI_LUN is not set
537# CONFIG_SCSI_CONSTANTS is not set
538# CONFIG_SCSI_LOGGING is not set
539
540#
541# SCSI Transports
542#
543CONFIG_SCSI_SPI_ATTRS=m
544CONFIG_SCSI_FC_ATTRS=y
545CONFIG_SCSI_ISCSI_ATTRS=m
546# CONFIG_SCSI_SAS_ATTRS is not set
547# CONFIG_SCSI_SAS_LIBSAS is not set
548
549#
550# SCSI low-level drivers
551#
552CONFIG_ISCSI_TCP=m
553# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
554# CONFIG_SCSI_3W_9XXX is not set
555# CONFIG_SCSI_ACARD is not set
556# CONFIG_SCSI_AACRAID is not set
557CONFIG_SCSI_AIC7XXX=m
558CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
559CONFIG_AIC7XXX_RESET_DELAY_MS=15000
560# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
561CONFIG_AIC7XXX_DEBUG_MASK=0
562# CONFIG_AIC7XXX_REG_PRETTY_PRINT 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_ARCMSR is not set
568# CONFIG_MEGARAID_NEWGEN is not set
569# CONFIG_MEGARAID_LEGACY is not set
570# CONFIG_MEGARAID_SAS is not set
571# CONFIG_SCSI_HPTIOP is not set
572# CONFIG_SCSI_DMX3191D is not set
573# CONFIG_SCSI_FUTURE_DOMAIN is not set
574# CONFIG_SCSI_IPS is not set
575# CONFIG_SCSI_INITIO is not set
576# CONFIG_SCSI_INIA100 is not set
577# CONFIG_SCSI_STEX is not set
578# CONFIG_SCSI_SYM53C8XX_2 is not set
579# CONFIG_SCSI_QLOGIC_1280 is not set
580# CONFIG_SCSI_QLA_FC is not set
581# CONFIG_SCSI_QLA_ISCSI is not set
582# CONFIG_SCSI_LPFC is not set
583# CONFIG_SCSI_DC395x is not set
584# CONFIG_SCSI_DC390T is not set
585# CONFIG_SCSI_NSP32 is not set
586# CONFIG_SCSI_DEBUG is not set
587
588#
589# Serial ATA (prod) and Parallel ATA (experimental) drivers
590#
591# CONFIG_ATA is not set
592
593#
594# Multi-device support (RAID and LVM)
595#
596# CONFIG_MD is not set
597
598#
599# Fusion MPT device support
600#
601# CONFIG_FUSION is not set
602# CONFIG_FUSION_SPI is not set
603# CONFIG_FUSION_FC is not set
604# CONFIG_FUSION_SAS is not set
605
606#
607# IEEE 1394 (FireWire) support
608#
609# CONFIG_IEEE1394 is not set
610
611#
612# I2O device support
613#
614# CONFIG_I2O is not set
615
616#
617# Network device support
618#
619CONFIG_NETDEVICES=y
620# CONFIG_DUMMY is not set
621# CONFIG_BONDING is not set
622# CONFIG_EQUALIZER is not set
623CONFIG_TUN=m
624
625#
626# ARCnet devices
627#
628# CONFIG_ARCNET is not set
629
630#
631# PHY device support
632#
633# CONFIG_PHYLIB is not set
634
635#
636# Ethernet (10 or 100Mbit)
637#
638CONFIG_NET_ETHERNET=y
639CONFIG_MII=y
640# CONFIG_HAPPYMEAL is not set
641# CONFIG_SUNGEM is not set
642# CONFIG_CASSINI is not set
643# CONFIG_NET_VENDOR_3COM is not set
644# CONFIG_DM9000 is not set
645
646#
647# Tulip family network device support
648#
649# CONFIG_NET_TULIP is not set
650# CONFIG_HP100 is not set
651CONFIG_NET_PCI=y
652# CONFIG_PCNET32 is not set
653# CONFIG_AMD8111_ETH is not set
654# CONFIG_ADAPTEC_STARFIRE is not set
655# CONFIG_B44 is not set
656# CONFIG_FORCEDETH is not set
657# CONFIG_DGRS is not set
658# CONFIG_EEPRO100 is not set
659# CONFIG_E100 is not set
660# CONFIG_FEALNX is not set
661CONFIG_NATSEMI=y
662# CONFIG_NE2K_PCI is not set
663# CONFIG_8139CP is not set
664CONFIG_8139TOO=y
665# CONFIG_8139TOO_PIO is not set
666# CONFIG_8139TOO_TUNE_TWISTER is not set
667# CONFIG_8139TOO_8129 is not set
668# CONFIG_8139_OLD_RX_RESET is not set
669# CONFIG_SIS900 is not set
670# CONFIG_EPIC100 is not set
671# CONFIG_SUNDANCE is not set
672# CONFIG_TLAN is not set
673# CONFIG_VIA_RHINE is not set
674# CONFIG_LAN_SAA9730 is not set
675
676#
677# Ethernet (1000 Mbit)
678#
679# CONFIG_ACENIC is not set
680# CONFIG_DL2K is not set
681# CONFIG_E1000 is not set
682# CONFIG_NS83820 is not set
683# CONFIG_HAMACHI is not set
684# CONFIG_YELLOWFIN is not set
685# CONFIG_R8169 is not set
686# CONFIG_SIS190 is not set
687# CONFIG_SKGE is not set
688# CONFIG_SKY2 is not set
689# CONFIG_SK98LIN is not set
690# CONFIG_VIA_VELOCITY is not set
691# CONFIG_TIGON3 is not set
692# CONFIG_BNX2 is not set
693# CONFIG_QLA3XXX is not set
694
695#
696# Ethernet (10000 Mbit)
697#
698# CONFIG_CHELSIO_T1 is not set
699# CONFIG_IXGB is not set
700# CONFIG_S2IO is not set
701# CONFIG_MYRI10GE is not set
702
703#
704# Token Ring devices
705#
706# CONFIG_TR is not set
707
708#
709# Wireless LAN (non-hamradio)
710#
711# CONFIG_NET_RADIO is not set
712
713#
714# Wan interfaces
715#
716# CONFIG_WAN is not set
717# CONFIG_FDDI is not set
718# CONFIG_HIPPI is not set
719CONFIG_PPP=m
720# CONFIG_PPP_MULTILINK is not set
721# CONFIG_PPP_FILTER is not set
722CONFIG_PPP_ASYNC=m
723CONFIG_PPP_SYNC_TTY=m
724CONFIG_PPP_DEFLATE=m
725# CONFIG_PPP_BSDCOMP is not set
726CONFIG_PPP_MPPE=m
727# CONFIG_PPPOE is not set
728# CONFIG_SLIP is not set
729CONFIG_SLHC=m
730# CONFIG_NET_FC is not set
731# CONFIG_SHAPER is not set
732# CONFIG_NETCONSOLE is not set
733# CONFIG_NETPOLL is not set
734# CONFIG_NET_POLL_CONTROLLER is not set
735
736#
737# ISDN subsystem
738#
739# CONFIG_ISDN is not set
740
741#
742# Telephony Support
743#
744# CONFIG_PHONE is not set
745
746#
747# Input device support
748#
749CONFIG_INPUT=y
750# CONFIG_INPUT_FF_MEMLESS is not set
751
752#
753# Userland interfaces
754#
755CONFIG_INPUT_MOUSEDEV=y
756CONFIG_INPUT_MOUSEDEV_PSAUX=y
757CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
758CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
759# CONFIG_INPUT_JOYDEV is not set
760# CONFIG_INPUT_TSDEV is not set
761CONFIG_INPUT_EVDEV=m
762# CONFIG_INPUT_EVBUG is not set
763
764#
765# Input Device Drivers
766#
767CONFIG_INPUT_KEYBOARD=y
768CONFIG_KEYBOARD_ATKBD=y
769# CONFIG_KEYBOARD_SUNKBD is not set
770# CONFIG_KEYBOARD_LKKBD is not set
771# CONFIG_KEYBOARD_XTKBD is not set
772# CONFIG_KEYBOARD_NEWTON is not set
773# CONFIG_KEYBOARD_STOWAWAY is not set
774CONFIG_INPUT_MOUSE=y
775CONFIG_MOUSE_PS2=y
776# CONFIG_MOUSE_SERIAL is not set
777# CONFIG_MOUSE_VSXXXAA is not set
778# CONFIG_INPUT_JOYSTICK is not set
779# CONFIG_INPUT_TOUCHSCREEN is not set
780# CONFIG_INPUT_MISC is not set
781
782#
783# Hardware I/O ports
784#
785CONFIG_SERIO=y
786CONFIG_SERIO_I8042=y
787CONFIG_SERIO_SERPORT=y
788# CONFIG_SERIO_PCIPS2 is not set
789CONFIG_SERIO_LIBPS2=y
790# CONFIG_SERIO_RAW is not set
791# CONFIG_GAMEPORT is not set
792
793#
794# Character devices
795#
796CONFIG_VT=y
797# CONFIG_VT_CONSOLE is not set
798CONFIG_HW_CONSOLE=y
799# CONFIG_VT_HW_CONSOLE_BINDING is not set
800CONFIG_SERIAL_NONSTANDARD=y
801# CONFIG_COMPUTONE is not set
802# CONFIG_ROCKETPORT is not set
803# CONFIG_CYCLADES is not set
804# CONFIG_DIGIEPCA is not set
805# CONFIG_MOXA_INTELLIO is not set
806# CONFIG_MOXA_SMARTIO is not set
807# CONFIG_ISI is not set
808# CONFIG_SYNCLINKMP is not set
809# CONFIG_SYNCLINK_GT is not set
810# CONFIG_N_HDLC is not set
811# CONFIG_RISCOM8 is not set
812# CONFIG_SPECIALIX is not set
813# CONFIG_SX is not set
814# CONFIG_RIO is not set
815# CONFIG_STALDRV is not set
816
817#
818# Serial drivers
819#
820# CONFIG_SERIAL_8250 is not set
821
822#
823# Non-8250 serial port support
824#
825# CONFIG_SERIAL_IP3106 is not set
826# CONFIG_SERIAL_JSM is not set
827CONFIG_UNIX98_PTYS=y
828CONFIG_LEGACY_PTYS=y
829CONFIG_LEGACY_PTY_COUNT=256
830
831#
832# IPMI
833#
834# CONFIG_IPMI_HANDLER is not set
835
836#
837# Watchdog Cards
838#
839# CONFIG_WATCHDOG is not set
840CONFIG_HW_RANDOM=y
841# CONFIG_RTC is not set
842# CONFIG_GEN_RTC is not set
843# CONFIG_DTLK is not set
844# CONFIG_R3964 is not set
845# CONFIG_APPLICOM is not set
846
847#
848# Ftape, the floppy tape device driver
849#
850# CONFIG_DRM is not set
851# CONFIG_RAW_DRIVER is not set
852
853#
854# TPM devices
855#
856# CONFIG_TCG_TPM is not set
857# CONFIG_TELCLOCK is not set
858
859#
860# I2C support
861#
862CONFIG_I2C=m
863CONFIG_I2C_CHARDEV=m
864
865#
866# I2C Algorithms
867#
868CONFIG_I2C_ALGOBIT=m
869# CONFIG_I2C_ALGOPCF is not set
870# CONFIG_I2C_ALGOPCA is not set
871
872#
873# I2C Hardware Bus support
874#
875# CONFIG_I2C_ALI1535 is not set
876# CONFIG_I2C_ALI1563 is not set
877# CONFIG_I2C_ALI15X3 is not set
878# CONFIG_I2C_AMD756 is not set
879# CONFIG_I2C_AMD8111 is not set
880# CONFIG_I2C_I801 is not set
881# CONFIG_I2C_I810 is not set
882# CONFIG_I2C_PIIX4 is not set
883# CONFIG_I2C_NFORCE2 is not set
884# CONFIG_I2C_OCORES is not set
885# CONFIG_I2C_PARPORT_LIGHT is not set
886# CONFIG_I2C_PROSAVAGE is not set
887# CONFIG_I2C_SAVAGE4 is not set
888# CONFIG_I2C_SIS5595 is not set
889# CONFIG_I2C_SIS630 is not set
890# CONFIG_I2C_SIS96X is not set
891# CONFIG_I2C_STUB is not set
892# CONFIG_I2C_VIA is not set
893# CONFIG_I2C_VIAPRO is not set
894# CONFIG_I2C_VOODOO3 is not set
895# CONFIG_I2C_PCA_ISA is not set
896
897#
898# Miscellaneous I2C Chip support
899#
900# CONFIG_SENSORS_DS1337 is not set
901# CONFIG_SENSORS_DS1374 is not set
902# CONFIG_SENSORS_EEPROM is not set
903# CONFIG_SENSORS_PCF8574 is not set
904# CONFIG_SENSORS_PCA9539 is not set
905# CONFIG_SENSORS_PCF8591 is not set
906# CONFIG_SENSORS_MAX6875 is not set
907# CONFIG_I2C_DEBUG_CORE is not set
908# CONFIG_I2C_DEBUG_ALGO is not set
909# CONFIG_I2C_DEBUG_BUS is not set
910# CONFIG_I2C_DEBUG_CHIP is not set
911
912#
913# SPI support
914#
915# CONFIG_SPI is not set
916# CONFIG_SPI_MASTER is not set
917
918#
919# Dallas's 1-wire bus
920#
921
922#
923# Hardware Monitoring support
924#
925CONFIG_HWMON=y
926# CONFIG_HWMON_VID is not set
927# CONFIG_SENSORS_ABITUGURU is not set
928# CONFIG_SENSORS_ADM1021 is not set
929# CONFIG_SENSORS_ADM1025 is not set
930# CONFIG_SENSORS_ADM1026 is not set
931# CONFIG_SENSORS_ADM1031 is not set
932# CONFIG_SENSORS_ADM9240 is not set
933# CONFIG_SENSORS_ASB100 is not set
934# CONFIG_SENSORS_ATXP1 is not set
935# CONFIG_SENSORS_DS1621 is not set
936# CONFIG_SENSORS_F71805F is not set
937# CONFIG_SENSORS_FSCHER is not set
938# CONFIG_SENSORS_FSCPOS is not set
939# CONFIG_SENSORS_GL518SM is not set
940# CONFIG_SENSORS_GL520SM is not set
941# CONFIG_SENSORS_IT87 is not set
942# CONFIG_SENSORS_LM63 is not set
943# CONFIG_SENSORS_LM75 is not set
944# CONFIG_SENSORS_LM77 is not set
945# CONFIG_SENSORS_LM78 is not set
946# CONFIG_SENSORS_LM80 is not set
947# CONFIG_SENSORS_LM83 is not set
948# CONFIG_SENSORS_LM85 is not set
949# CONFIG_SENSORS_LM87 is not set
950# CONFIG_SENSORS_LM90 is not set
951# CONFIG_SENSORS_LM92 is not set
952# CONFIG_SENSORS_MAX1619 is not set
953# CONFIG_SENSORS_PC87360 is not set
954# CONFIG_SENSORS_SIS5595 is not set
955# CONFIG_SENSORS_SMSC47M1 is not set
956# CONFIG_SENSORS_SMSC47M192 is not set
957# CONFIG_SENSORS_SMSC47B397 is not set
958# CONFIG_SENSORS_VIA686A is not set
959# CONFIG_SENSORS_VT1211 is not set
960# CONFIG_SENSORS_VT8231 is not set
961# CONFIG_SENSORS_W83781D is not set
962# CONFIG_SENSORS_W83791D is not set
963# CONFIG_SENSORS_W83792D is not set
964# CONFIG_SENSORS_W83L785TS is not set
965# CONFIG_SENSORS_W83627HF is not set
966# CONFIG_SENSORS_W83627EHF is not set
967# CONFIG_HWMON_DEBUG_CHIP is not set
968
969#
970# Misc devices
971#
972# CONFIG_TIFM_CORE is not set
973
974#
975# Multimedia devices
976#
977# CONFIG_VIDEO_DEV is not set
978
979#
980# Digital Video Broadcasting Devices
981#
982# CONFIG_DVB is not set
983# CONFIG_USB_DABUSB is not set
984
985#
986# Graphics support
987#
988CONFIG_FIRMWARE_EDID=y
989CONFIG_FB=y
990# CONFIG_FB_DDC is not set
991# CONFIG_FB_CFB_FILLRECT is not set
992# CONFIG_FB_CFB_COPYAREA is not set
993# CONFIG_FB_CFB_IMAGEBLIT is not set
994# CONFIG_FB_MACMODES is not set
995# CONFIG_FB_BACKLIGHT is not set
996# CONFIG_FB_MODE_HELPERS is not set
997# CONFIG_FB_TILEBLITTING is not set
998# CONFIG_FB_CIRRUS is not set
999# CONFIG_FB_PM2 is not set
1000# CONFIG_FB_CYBER2000 is not set
1001# CONFIG_FB_ASILIANT is not set
1002# CONFIG_FB_IMSTT is not set
1003# CONFIG_FB_S1D13XXX is not set
1004# CONFIG_FB_NVIDIA is not set
1005# CONFIG_FB_RIVA is not set
1006# CONFIG_FB_MATROX is not set
1007# CONFIG_FB_RADEON is not set
1008# CONFIG_FB_ATY128 is not set
1009# CONFIG_FB_ATY is not set
1010# CONFIG_FB_SAVAGE is not set
1011# CONFIG_FB_SIS is not set
1012# CONFIG_FB_NEOMAGIC is not set
1013# CONFIG_FB_KYRO is not set
1014# CONFIG_FB_3DFX is not set
1015# CONFIG_FB_VOODOO1 is not set
1016# CONFIG_FB_SMIVGX is not set
1017# CONFIG_FB_TRIDENT is not set
1018# CONFIG_FB_VIRTUAL is not set
1019
1020#
1021# Console display driver support
1022#
1023# CONFIG_VGA_CONSOLE is not set
1024CONFIG_DUMMY_CONSOLE=y
1025# CONFIG_FRAMEBUFFER_CONSOLE is not set
1026
1027#
1028# Logo configuration
1029#
1030# CONFIG_LOGO is not set
1031# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1032
1033#
1034# Sound
1035#
1036# CONFIG_SOUND is not set
1037
1038#
1039# USB support
1040#
1041CONFIG_USB_ARCH_HAS_HCD=y
1042CONFIG_USB_ARCH_HAS_OHCI=y
1043CONFIG_USB_ARCH_HAS_EHCI=y
1044CONFIG_USB=y
1045# CONFIG_USB_DEBUG is not set
1046
1047#
1048# Miscellaneous USB options
1049#
1050CONFIG_USB_DEVICEFS=y
1051# CONFIG_USB_BANDWIDTH is not set
1052# CONFIG_USB_DYNAMIC_MINORS is not set
1053# CONFIG_USB_OTG is not set
1054
1055#
1056# USB Host Controller Drivers
1057#
1058# CONFIG_USB_EHCI_HCD is not set
1059# CONFIG_USB_ISP116X_HCD is not set
1060# CONFIG_USB_OHCI_HCD is not set
1061# CONFIG_USB_UHCI_HCD is not set
1062# CONFIG_USB_SL811_HCD is not set
1063
1064#
1065# USB Device Class drivers
1066#
1067# CONFIG_USB_ACM is not set
1068# CONFIG_USB_PRINTER is not set
1069
1070#
1071# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1072#
1073
1074#
1075# may also be needed; see USB_STORAGE Help for more information
1076#
1077CONFIG_USB_STORAGE=y
1078# CONFIG_USB_STORAGE_DEBUG is not set
1079# CONFIG_USB_STORAGE_DATAFAB is not set
1080# CONFIG_USB_STORAGE_FREECOM is not set
1081# CONFIG_USB_STORAGE_ISD200 is not set
1082# CONFIG_USB_STORAGE_DPCM is not set
1083# CONFIG_USB_STORAGE_USBAT is not set
1084# CONFIG_USB_STORAGE_SDDR09 is not set
1085# CONFIG_USB_STORAGE_SDDR55 is not set
1086# CONFIG_USB_STORAGE_JUMPSHOT is not set
1087# CONFIG_USB_STORAGE_ALAUDA is not set
1088# CONFIG_USB_STORAGE_ONETOUCH is not set
1089# CONFIG_USB_STORAGE_KARMA is not set
1090# CONFIG_USB_LIBUSUAL is not set
1091
1092#
1093# USB Input Devices
1094#
1095CONFIG_USB_HID=y
1096CONFIG_USB_HIDINPUT=y
1097# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1098# CONFIG_HID_FF is not set
1099CONFIG_USB_HIDDEV=y
1100# CONFIG_USB_AIPTEK is not set
1101# CONFIG_USB_WACOM is not set
1102# CONFIG_USB_ACECAD is not set
1103# CONFIG_USB_KBTAB is not set
1104# CONFIG_USB_POWERMATE is not set
1105# CONFIG_USB_TOUCHSCREEN is not set
1106# CONFIG_USB_YEALINK is not set
1107# CONFIG_USB_XPAD is not set
1108# CONFIG_USB_ATI_REMOTE is not set
1109# CONFIG_USB_ATI_REMOTE2 is not set
1110# CONFIG_USB_KEYSPAN_REMOTE is not set
1111# CONFIG_USB_APPLETOUCH is not set
1112# CONFIG_USB_TRANCEVIBRATOR is not set
1113
1114#
1115# USB Imaging devices
1116#
1117# CONFIG_USB_MDC800 is not set
1118# CONFIG_USB_MICROTEK is not set
1119
1120#
1121# USB Network Adapters
1122#
1123# CONFIG_USB_CATC is not set
1124# CONFIG_USB_KAWETH is not set
1125# CONFIG_USB_PEGASUS is not set
1126# CONFIG_USB_RTL8150 is not set
1127# CONFIG_USB_USBNET is not set
1128CONFIG_USB_MON=y
1129
1130#
1131# USB port drivers
1132#
1133
1134#
1135# USB Serial Converter support
1136#
1137# CONFIG_USB_SERIAL is not set
1138
1139#
1140# USB Miscellaneous drivers
1141#
1142# CONFIG_USB_EMI62 is not set
1143# CONFIG_USB_EMI26 is not set
1144# CONFIG_USB_ADUTUX is not set
1145# CONFIG_USB_AUERSWALD is not set
1146# CONFIG_USB_RIO500 is not set
1147# CONFIG_USB_LEGOTOWER is not set
1148# CONFIG_USB_LCD is not set
1149# CONFIG_USB_LED is not set
1150# CONFIG_USB_CYPRESS_CY7C63 is not set
1151# CONFIG_USB_CYTHERM is not set
1152# CONFIG_USB_PHIDGET is not set
1153# CONFIG_USB_IDMOUSE is not set
1154# CONFIG_USB_FTDI_ELAN is not set
1155# CONFIG_USB_APPLEDISPLAY is not set
1156# CONFIG_USB_LD is not set
1157# CONFIG_USB_TEST is not set
1158
1159#
1160# USB DSL modem support
1161#
1162
1163#
1164# USB Gadget Support
1165#
1166# CONFIG_USB_GADGET is not set
1167
1168#
1169# MMC/SD Card support
1170#
1171# CONFIG_MMC is not set
1172
1173#
1174# LED devices
1175#
1176# CONFIG_NEW_LEDS is not set
1177
1178#
1179# LED drivers
1180#
1181
1182#
1183# LED Triggers
1184#
1185
1186#
1187# InfiniBand support
1188#
1189# CONFIG_INFINIBAND is not set
1190
1191#
1192# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1193#
1194
1195#
1196# Real Time Clock
1197#
1198# CONFIG_RTC_CLASS is not set
1199
1200#
1201# DMA Engine support
1202#
1203# CONFIG_DMA_ENGINE is not set
1204
1205#
1206# DMA Clients
1207#
1208
1209#
1210# DMA Devices
1211#
1212
1213#
1214# File systems
1215#
1216CONFIG_EXT2_FS=y
1217# CONFIG_EXT2_FS_XATTR is not set
1218# CONFIG_EXT2_FS_XIP is not set
1219CONFIG_EXT3_FS=y
1220CONFIG_EXT3_FS_XATTR=y
1221# CONFIG_EXT3_FS_POSIX_ACL is not set
1222# CONFIG_EXT3_FS_SECURITY is not set
1223# CONFIG_EXT4DEV_FS is not set
1224CONFIG_JBD=y
1225# CONFIG_JBD_DEBUG is not set
1226CONFIG_FS_MBCACHE=y
1227# CONFIG_REISERFS_FS is not set
1228# CONFIG_JFS_FS is not set
1229# CONFIG_FS_POSIX_ACL is not set
1230CONFIG_XFS_FS=m
1231# CONFIG_XFS_QUOTA is not set
1232# CONFIG_XFS_SECURITY is not set
1233# CONFIG_XFS_POSIX_ACL is not set
1234# CONFIG_XFS_RT is not set
1235# CONFIG_GFS2_FS is not set
1236# CONFIG_OCFS2_FS is not set
1237# CONFIG_MINIX_FS is not set
1238# CONFIG_ROMFS_FS is not set
1239CONFIG_INOTIFY=y
1240CONFIG_INOTIFY_USER=y
1241# CONFIG_QUOTA is not set
1242CONFIG_DNOTIFY=y
1243CONFIG_AUTOFS_FS=y
1244CONFIG_AUTOFS4_FS=y
1245# CONFIG_FUSE_FS is not set
1246
1247#
1248# CD-ROM/DVD Filesystems
1249#
1250# CONFIG_ISO9660_FS is not set
1251# CONFIG_UDF_FS is not set
1252
1253#
1254# DOS/FAT/NT Filesystems
1255#
1256CONFIG_FAT_FS=y
1257CONFIG_MSDOS_FS=y
1258CONFIG_VFAT_FS=y
1259CONFIG_FAT_DEFAULT_CODEPAGE=437
1260CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1261# CONFIG_NTFS_FS is not set
1262
1263#
1264# Pseudo filesystems
1265#
1266CONFIG_PROC_FS=y
1267# CONFIG_PROC_KCORE is not set
1268CONFIG_PROC_SYSCTL=y
1269CONFIG_SYSFS=y
1270CONFIG_TMPFS=y
1271# CONFIG_TMPFS_POSIX_ACL is not set
1272# CONFIG_HUGETLB_PAGE is not set
1273CONFIG_RAMFS=y
1274# CONFIG_CONFIGFS_FS is not set
1275
1276#
1277# Miscellaneous filesystems
1278#
1279# CONFIG_ADFS_FS is not set
1280# CONFIG_AFFS_FS is not set
1281# CONFIG_HFS_FS is not set
1282# CONFIG_HFSPLUS_FS is not set
1283# CONFIG_BEFS_FS is not set
1284# CONFIG_BFS_FS is not set
1285# CONFIG_EFS_FS is not set
1286CONFIG_CRAMFS=y
1287# CONFIG_VXFS_FS is not set
1288# CONFIG_HPFS_FS is not set
1289# CONFIG_QNX4FS_FS is not set
1290# CONFIG_SYSV_FS is not set
1291# CONFIG_UFS_FS is not set
1292
1293#
1294# Network File Systems
1295#
1296CONFIG_NFS_FS=y
1297CONFIG_NFS_V3=y
1298# CONFIG_NFS_V3_ACL is not set
1299# CONFIG_NFS_V4 is not set
1300# CONFIG_NFS_DIRECTIO is not set
1301CONFIG_NFSD=m
1302# CONFIG_NFSD_V3 is not set
1303# CONFIG_NFSD_TCP is not set
1304CONFIG_ROOT_NFS=y
1305CONFIG_LOCKD=y
1306CONFIG_LOCKD_V4=y
1307CONFIG_EXPORTFS=m
1308CONFIG_NFS_COMMON=y
1309CONFIG_SUNRPC=y
1310# CONFIG_RPCSEC_GSS_KRB5 is not set
1311# CONFIG_RPCSEC_GSS_SPKM3 is not set
1312CONFIG_SMB_FS=m
1313# CONFIG_SMB_NLS_DEFAULT is not set
1314# CONFIG_CIFS is not set
1315# CONFIG_NCP_FS is not set
1316# CONFIG_CODA_FS is not set
1317# CONFIG_AFS_FS is not set
1318# CONFIG_9P_FS is not set
1319
1320#
1321# Partition Types
1322#
1323# CONFIG_PARTITION_ADVANCED is not set
1324CONFIG_MSDOS_PARTITION=y
1325
1326#
1327# Native Language Support
1328#
1329CONFIG_NLS=y
1330CONFIG_NLS_DEFAULT="iso8859-1"
1331# CONFIG_NLS_CODEPAGE_437 is not set
1332# CONFIG_NLS_CODEPAGE_737 is not set
1333# CONFIG_NLS_CODEPAGE_775 is not set
1334# CONFIG_NLS_CODEPAGE_850 is not set
1335# CONFIG_NLS_CODEPAGE_852 is not set
1336# CONFIG_NLS_CODEPAGE_855 is not set
1337# CONFIG_NLS_CODEPAGE_857 is not set
1338# CONFIG_NLS_CODEPAGE_860 is not set
1339# CONFIG_NLS_CODEPAGE_861 is not set
1340# CONFIG_NLS_CODEPAGE_862 is not set
1341# CONFIG_NLS_CODEPAGE_863 is not set
1342# CONFIG_NLS_CODEPAGE_864 is not set
1343# CONFIG_NLS_CODEPAGE_865 is not set
1344# CONFIG_NLS_CODEPAGE_866 is not set
1345# CONFIG_NLS_CODEPAGE_869 is not set
1346# CONFIG_NLS_CODEPAGE_936 is not set
1347# CONFIG_NLS_CODEPAGE_950 is not set
1348# CONFIG_NLS_CODEPAGE_932 is not set
1349# CONFIG_NLS_CODEPAGE_949 is not set
1350# CONFIG_NLS_CODEPAGE_874 is not set
1351# CONFIG_NLS_ISO8859_8 is not set
1352# CONFIG_NLS_CODEPAGE_1250 is not set
1353# CONFIG_NLS_CODEPAGE_1251 is not set
1354# CONFIG_NLS_ASCII is not set
1355# CONFIG_NLS_ISO8859_1 is not set
1356# CONFIG_NLS_ISO8859_2 is not set
1357# CONFIG_NLS_ISO8859_3 is not set
1358# CONFIG_NLS_ISO8859_4 is not set
1359# CONFIG_NLS_ISO8859_5 is not set
1360# CONFIG_NLS_ISO8859_6 is not set
1361# CONFIG_NLS_ISO8859_7 is not set
1362# CONFIG_NLS_ISO8859_9 is not set
1363# CONFIG_NLS_ISO8859_13 is not set
1364# CONFIG_NLS_ISO8859_14 is not set
1365# CONFIG_NLS_ISO8859_15 is not set
1366# CONFIG_NLS_KOI8_R is not set
1367# CONFIG_NLS_KOI8_U is not set
1368# CONFIG_NLS_UTF8 is not set
1369
1370#
1371# Profiling support
1372#
1373# CONFIG_PROFILING is not set
1374
1375#
1376# Kernel hacking
1377#
1378CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1379# CONFIG_PRINTK_TIME is not set
1380CONFIG_ENABLE_MUST_CHECK=y
1381# CONFIG_MAGIC_SYSRQ is not set
1382# CONFIG_UNUSED_SYMBOLS is not set
1383# CONFIG_DEBUG_KERNEL is not set
1384CONFIG_LOG_BUF_SHIFT=14
1385# CONFIG_DEBUG_FS is not set
1386# CONFIG_HEADERS_CHECK is not set
1387CONFIG_CROSSCOMPILE=y
1388CONFIG_CMDLINE=""
1389
1390#
1391# Security options
1392#
1393# CONFIG_KEYS is not set
1394# CONFIG_SECURITY is not set
1395
1396#
1397# Cryptographic options
1398#
1399CONFIG_CRYPTO=y
1400CONFIG_CRYPTO_ALGAPI=m
1401CONFIG_CRYPTO_BLKCIPHER=m
1402CONFIG_CRYPTO_MANAGER=m
1403# CONFIG_CRYPTO_HMAC is not set
1404# CONFIG_CRYPTO_NULL is not set
1405# CONFIG_CRYPTO_MD4 is not set
1406CONFIG_CRYPTO_MD5=m
1407CONFIG_CRYPTO_SHA1=m
1408# CONFIG_CRYPTO_SHA256 is not set
1409# CONFIG_CRYPTO_SHA512 is not set
1410# CONFIG_CRYPTO_WP512 is not set
1411# CONFIG_CRYPTO_TGR192 is not set
1412CONFIG_CRYPTO_ECB=m
1413CONFIG_CRYPTO_CBC=m
1414# CONFIG_CRYPTO_DES is not set
1415# CONFIG_CRYPTO_BLOWFISH is not set
1416# CONFIG_CRYPTO_TWOFISH is not set
1417# CONFIG_CRYPTO_SERPENT is not set
1418# CONFIG_CRYPTO_AES is not set
1419# CONFIG_CRYPTO_CAST5 is not set
1420# CONFIG_CRYPTO_CAST6 is not set
1421# CONFIG_CRYPTO_TEA is not set
1422CONFIG_CRYPTO_ARC4=m
1423# CONFIG_CRYPTO_KHAZAD is not set
1424# CONFIG_CRYPTO_ANUBIS is not set
1425# CONFIG_CRYPTO_DEFLATE is not set
1426# CONFIG_CRYPTO_MICHAEL_MIC is not set
1427CONFIG_CRYPTO_CRC32C=m
1428# CONFIG_CRYPTO_TEST is not set
1429
1430#
1431# Hardware crypto devices
1432#
1433
1434#
1435# Library routines
1436#
1437CONFIG_CRC_CCITT=m
1438# CONFIG_CRC16 is not set
1439CONFIG_CRC32=y
1440CONFIG_LIBCRC32C=m
1441CONFIG_ZLIB_INFLATE=y
1442CONFIG_ZLIB_DEFLATE=m
1443CONFIG_TEXTSEARCH=y
1444CONFIG_TEXTSEARCH_KMP=m
1445CONFIG_TEXTSEARCH_BM=m
1446CONFIG_TEXTSEARCH_FSM=m
1447CONFIG_PLIST=y
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index aa61f0f030a5..8e8d03157954 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:18 2006 4# Tue Feb 20 21:47:39 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,16 +63,21 @@ CONFIG_QEMU=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
71CONFIG_DMA_COHERENT=y 74CONFIG_DMA_COHERENT=y
72CONFIG_GENERIC_ISA_DMA=y 75CONFIG_GENERIC_ISA_DMA=y
73CONFIG_I8259=y 76CONFIG_I8259=y
74CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
75# CONFIG_CPU_LITTLE_ENDIAN is not set 78# CONFIG_CPU_LITTLE_ENDIAN is not set
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 79CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
77CONFIG_SWAP_IO_SPACE=y 81CONFIG_SWAP_IO_SPACE=y
78CONFIG_MIPS_L1_CACHE_SHIFT=5 82CONFIG_MIPS_L1_CACHE_SHIFT=5
79CONFIG_HAVE_STD_PC_SERIAL_PORT=y 83CONFIG_HAVE_STD_PC_SERIAL_PORT=y
@@ -117,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 127# CONFIG_64BIT_PHYS_ADDR is not set
124CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -130,9 +134,10 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
130CONFIG_ARCH_SPARSEMEM_ENABLE=y 134CONFIG_ARCH_SPARSEMEM_ENABLE=y
131CONFIG_FLATMEM=y 135CONFIG_FLATMEM=y
132CONFIG_FLAT_NODE_MEM_MAP=y 136CONFIG_FLAT_NODE_MEM_MAP=y
133# CONFIG_SPARSEMEM_STATIC is not set 137CONFIG_SPARSEMEM_STATIC=y
134CONFIG_SPLIT_PTLOCK_CPUS=4 138CONFIG_SPLIT_PTLOCK_CPUS=4
135# CONFIG_RESOURCES_64BIT is not set 139# CONFIG_RESOURCES_64BIT is not set
140CONFIG_ZONE_DMA_FLAG=1
136# CONFIG_HZ_48 is not set 141# CONFIG_HZ_48 is not set
137CONFIG_HZ_100=y 142CONFIG_HZ_100=y
138# CONFIG_HZ_128 is not set 143# CONFIG_HZ_128 is not set
@@ -164,12 +169,15 @@ CONFIG_LOCALVERSION_AUTO=y
164# CONFIG_SWAP is not set 169# CONFIG_SWAP is not set
165# CONFIG_SYSVIPC is not set 170# CONFIG_SYSVIPC is not set
166# CONFIG_BSD_PROCESS_ACCT is not set 171# CONFIG_BSD_PROCESS_ACCT is not set
167CONFIG_SYSCTL=y 172# CONFIG_TASKSTATS is not set
173# CONFIG_UTS_NS is not set
168# CONFIG_AUDIT is not set 174# CONFIG_AUDIT is not set
169# CONFIG_IKCONFIG is not set 175# CONFIG_IKCONFIG is not set
176CONFIG_SYSFS_DEPRECATED=y
170CONFIG_RELAY=y 177CONFIG_RELAY=y
171CONFIG_INITRAMFS_SOURCE="" 178CONFIG_SYSCTL=y
172CONFIG_EMBEDDED=y 179CONFIG_EMBEDDED=y
180CONFIG_SYSCTL_SYSCALL=y
173CONFIG_KALLSYMS=y 181CONFIG_KALLSYMS=y
174# CONFIG_KALLSYMS_EXTRA_PASS is not set 182# CONFIG_KALLSYMS_EXTRA_PASS is not set
175# CONFIG_HOTPLUG is not set 183# CONFIG_HOTPLUG is not set
@@ -194,6 +202,7 @@ CONFIG_BASE_SMALL=1
194# 202#
195# Block layer 203# Block layer
196# 204#
205CONFIG_BLOCK=y
197# CONFIG_LBD is not set 206# CONFIG_LBD is not set
198# CONFIG_BLK_DEV_IO_TRACE is not set 207# CONFIG_BLK_DEV_IO_TRACE is not set
199# CONFIG_LSF is not set 208# CONFIG_LSF is not set
@@ -221,7 +230,6 @@ CONFIG_I8253=y
221# 230#
222# PCCARD (PCMCIA/CardBus) support 231# PCCARD (PCMCIA/CardBus) support
223# 232#
224# CONFIG_PCCARD is not set
225 233
226# 234#
227# PCI Hotplug Support 235# PCI Hotplug Support
@@ -235,6 +243,14 @@ CONFIG_BINFMT_ELF=y
235CONFIG_TRAD_SIGNALS=y 243CONFIG_TRAD_SIGNALS=y
236 244
237# 245#
246# Power management options
247#
248CONFIG_PM=y
249# CONFIG_PM_LEGACY is not set
250# CONFIG_PM_DEBUG is not set
251# CONFIG_PM_SYSFS_DEPRECATED is not set
252
253#
238# Networking 254# Networking
239# 255#
240CONFIG_NET=y 256CONFIG_NET=y
@@ -268,10 +284,12 @@ CONFIG_IP_PNP_BOOTP=y
268# CONFIG_INET_TUNNEL is not set 284# CONFIG_INET_TUNNEL is not set
269CONFIG_INET_XFRM_MODE_TRANSPORT=y 285CONFIG_INET_XFRM_MODE_TRANSPORT=y
270CONFIG_INET_XFRM_MODE_TUNNEL=y 286CONFIG_INET_XFRM_MODE_TUNNEL=y
287CONFIG_INET_XFRM_MODE_BEET=y
271CONFIG_INET_DIAG=y 288CONFIG_INET_DIAG=y
272CONFIG_INET_TCP_DIAG=y 289CONFIG_INET_TCP_DIAG=y
273# CONFIG_TCP_CONG_ADVANCED is not set 290# CONFIG_TCP_CONG_ADVANCED is not set
274CONFIG_TCP_CONG_BIC=y 291CONFIG_TCP_CONG_CUBIC=y
292CONFIG_DEFAULT_TCP_CONG="cubic"
275# CONFIG_IPV6 is not set 293# CONFIG_IPV6 is not set
276# CONFIG_INET6_XFRM_TUNNEL is not set 294# CONFIG_INET6_XFRM_TUNNEL is not set
277# CONFIG_INET6_TUNNEL is not set 295# CONFIG_INET6_TUNNEL is not set
@@ -307,7 +325,6 @@ CONFIG_NETWORK_SECMARK=y
307# 325#
308CONFIG_STANDALONE=y 326CONFIG_STANDALONE=y
309# CONFIG_PREVENT_FIRMWARE_BUILD is not set 327# CONFIG_PREVENT_FIRMWARE_BUILD is not set
310# CONFIG_FW_LOADER is not set
311# CONFIG_SYS_HYPERVISOR is not set 328# CONFIG_SYS_HYPERVISOR is not set
312 329
313# 330#
@@ -330,6 +347,7 @@ CONFIG_PROC_EVENTS=y
330# Plug and Play support 347# Plug and Play support
331# 348#
332# CONFIG_PNP is not set 349# CONFIG_PNP is not set
350# CONFIG_PNPACPI is not set
333 351
334# 352#
335# Block devices 353# Block devices
@@ -343,6 +361,10 @@ CONFIG_PROC_EVENTS=y
343# CONFIG_ATA_OVER_ETH is not set 361# CONFIG_ATA_OVER_ETH is not set
344 362
345# 363#
364# Misc devices
365#
366
367#
346# ATA/ATAPI/MFM/RLL support 368# ATA/ATAPI/MFM/RLL support
347# 369#
348# CONFIG_IDE is not set 370# CONFIG_IDE is not set
@@ -352,6 +374,12 @@ CONFIG_PROC_EVENTS=y
352# 374#
353# CONFIG_RAID_ATTRS is not set 375# CONFIG_RAID_ATTRS is not set
354# CONFIG_SCSI is not set 376# CONFIG_SCSI is not set
377# CONFIG_SCSI_NETLINK is not set
378
379#
380# Serial ATA (prod) and Parallel ATA (experimental) drivers
381#
382# CONFIG_ATA is not set
355 383
356# 384#
357# Old CD-ROM drivers (not SCSI, not IDE) 385# Old CD-ROM drivers (not SCSI, not IDE)
@@ -459,6 +487,7 @@ CONFIG_NE2000=y
459# Input device support 487# Input device support
460# 488#
461CONFIG_INPUT=y 489CONFIG_INPUT=y
490# CONFIG_INPUT_FF_MEMLESS is not set
462 491
463# 492#
464# Userland interfaces 493# Userland interfaces
@@ -525,10 +554,6 @@ CONFIG_LEGACY_PTY_COUNT=256
525# CONFIG_GEN_RTC is not set 554# CONFIG_GEN_RTC is not set
526# CONFIG_DTLK is not set 555# CONFIG_DTLK is not set
527# CONFIG_R3964 is not set 556# CONFIG_R3964 is not set
528
529#
530# Ftape, the floppy tape device driver
531#
532# CONFIG_RAW_DRIVER is not set 557# CONFIG_RAW_DRIVER is not set
533 558
534# 559#
@@ -558,14 +583,9 @@ CONFIG_LEGACY_PTY_COUNT=256
558# CONFIG_HWMON_VID is not set 583# CONFIG_HWMON_VID is not set
559 584
560# 585#
561# Misc devices
562#
563
564#
565# Multimedia devices 586# Multimedia devices
566# 587#
567# CONFIG_VIDEO_DEV is not set 588# CONFIG_VIDEO_DEV is not set
568CONFIG_VIDEO_V4L2=y
569 589
570# 590#
571# Digital Video Broadcasting Devices 591# Digital Video Broadcasting Devices
@@ -585,6 +605,7 @@ CONFIG_VGA_CONSOLE=y
585# CONFIG_VGACON_SOFT_SCROLLBACK is not set 605# CONFIG_VGACON_SOFT_SCROLLBACK is not set
586# CONFIG_MDA_CONSOLE is not set 606# CONFIG_MDA_CONSOLE is not set
587CONFIG_DUMMY_CONSOLE=y 607CONFIG_DUMMY_CONSOLE=y
608# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
588 609
589# 610#
590# Sound 611# Sound
@@ -592,6 +613,12 @@ CONFIG_DUMMY_CONSOLE=y
592# CONFIG_SOUND is not set 613# CONFIG_SOUND is not set
593 614
594# 615#
616# HID Devices
617#
618CONFIG_HID=y
619# CONFIG_HID_DEBUG is not set
620
621#
595# USB support 622# USB support
596# 623#
597# CONFIG_USB_ARCH_HAS_HCD is not set 624# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -651,14 +678,23 @@ CONFIG_DUMMY_CONSOLE=y
651# 678#
652 679
653# 680#
681# Auxiliary Display support
682#
683
684#
685# Virtualization
686#
687
688#
654# File systems 689# File systems
655# 690#
656# CONFIG_EXT2_FS is not set 691# CONFIG_EXT2_FS is not set
657# CONFIG_EXT3_FS is not set 692# CONFIG_EXT3_FS is not set
658# CONFIG_REISERFS_FS is not set 693# CONFIG_REISERFS_FS is not set
659# CONFIG_JFS_FS is not set 694# CONFIG_JFS_FS is not set
660# CONFIG_FS_POSIX_ACL is not set 695CONFIG_FS_POSIX_ACL=y
661# CONFIG_XFS_FS is not set 696# CONFIG_XFS_FS is not set
697# CONFIG_OCFS2_FS is not set
662# CONFIG_MINIX_FS is not set 698# CONFIG_MINIX_FS is not set
663# CONFIG_ROMFS_FS is not set 699# CONFIG_ROMFS_FS is not set
664CONFIG_INOTIFY=y 700CONFIG_INOTIFY=y
@@ -668,6 +704,7 @@ CONFIG_INOTIFY_USER=y
668# CONFIG_AUTOFS_FS is not set 704# CONFIG_AUTOFS_FS is not set
669# CONFIG_AUTOFS4_FS is not set 705# CONFIG_AUTOFS4_FS is not set
670CONFIG_FUSE_FS=y 706CONFIG_FUSE_FS=y
707CONFIG_GENERIC_ACL=y
671 708
672# 709#
673# CD-ROM/DVD Filesystems 710# CD-ROM/DVD Filesystems
@@ -687,8 +724,10 @@ CONFIG_FUSE_FS=y
687# 724#
688CONFIG_PROC_FS=y 725CONFIG_PROC_FS=y
689CONFIG_PROC_KCORE=y 726CONFIG_PROC_KCORE=y
727CONFIG_PROC_SYSCTL=y
690CONFIG_SYSFS=y 728CONFIG_SYSFS=y
691CONFIG_TMPFS=y 729CONFIG_TMPFS=y
730CONFIG_TMPFS_POSIX_ACL=y
692# CONFIG_HUGETLB_PAGE is not set 731# CONFIG_HUGETLB_PAGE is not set
693CONFIG_RAMFS=y 732CONFIG_RAMFS=y
694 733
@@ -709,6 +748,7 @@ CONFIG_RAMFS=y
709CONFIG_NFS_FS=y 748CONFIG_NFS_FS=y
710CONFIG_NFS_V3=y 749CONFIG_NFS_V3=y
711# CONFIG_NFS_V3_ACL is not set 750# CONFIG_NFS_V3_ACL is not set
751CONFIG_NFS_DIRECTIO=y
712# CONFIG_NFSD is not set 752# CONFIG_NFSD is not set
713CONFIG_ROOT_NFS=y 753CONFIG_ROOT_NFS=y
714CONFIG_LOCKD=y 754CONFIG_LOCKD=y
@@ -717,7 +757,6 @@ CONFIG_NFS_COMMON=y
717CONFIG_SUNRPC=y 757CONFIG_SUNRPC=y
718# CONFIG_SMB_FS is not set 758# CONFIG_SMB_FS is not set
719# CONFIG_CIFS is not set 759# CONFIG_CIFS is not set
720# CONFIG_CIFS_DEBUG2 is not set
721# CONFIG_NCP_FS is not set 760# CONFIG_NCP_FS is not set
722# CONFIG_CODA_FS is not set 761# CONFIG_CODA_FS is not set
723 762
@@ -737,12 +776,13 @@ CONFIG_MSDOS_PARTITION=y
737# 776#
738CONFIG_TRACE_IRQFLAGS_SUPPORT=y 777CONFIG_TRACE_IRQFLAGS_SUPPORT=y
739# CONFIG_PRINTK_TIME is not set 778# CONFIG_PRINTK_TIME is not set
779CONFIG_ENABLE_MUST_CHECK=y
740# CONFIG_MAGIC_SYSRQ is not set 780# CONFIG_MAGIC_SYSRQ is not set
741# CONFIG_UNUSED_SYMBOLS is not set 781# CONFIG_UNUSED_SYMBOLS is not set
782# CONFIG_DEBUG_FS is not set
783# CONFIG_HEADERS_CHECK is not set
742# CONFIG_DEBUG_KERNEL is not set 784# CONFIG_DEBUG_KERNEL is not set
743CONFIG_LOG_BUF_SHIFT=14 785CONFIG_LOG_BUF_SHIFT=14
744# CONFIG_DEBUG_FS is not set
745# CONFIG_UNWIND_INFO is not set
746CONFIG_CROSSCOMPILE=y 786CONFIG_CROSSCOMPILE=y
747CONFIG_CMDLINE="" 787CONFIG_CMDLINE=""
748 788
@@ -758,13 +798,12 @@ CONFIG_CMDLINE=""
758# CONFIG_CRYPTO is not set 798# CONFIG_CRYPTO is not set
759 799
760# 800#
761# Hardware crypto devices
762#
763
764#
765# Library routines 801# Library routines
766# 802#
803CONFIG_BITREVERSE=y
767# CONFIG_CRC_CCITT is not set 804# CONFIG_CRC_CCITT is not set
768# CONFIG_CRC16 is not set 805# CONFIG_CRC16 is not set
769CONFIG_CRC32=y 806CONFIG_CRC32=y
770# CONFIG_LIBCRC32C is not set 807# CONFIG_LIBCRC32C is not set
808CONFIG_HAS_IOMEM=y
809CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index f9e8f41d17f2..29e0df9f4be0 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:19 2006 4# Tue Feb 20 21:47:39 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -71,10 +70,14 @@ CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61=y
71# CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND is not set 70# CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND is not set
72# CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA is not set 71# CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA is not set
73CONFIG_RWSEM_GENERIC_SPINLOCK=y 72CONFIG_RWSEM_GENERIC_SPINLOCK=y
73# CONFIG_ARCH_HAS_ILOG2_U32 is not set
74# CONFIG_ARCH_HAS_ILOG2_U64 is not set
74CONFIG_GENERIC_FIND_NEXT_BIT=y 75CONFIG_GENERIC_FIND_NEXT_BIT=y
75CONFIG_GENERIC_HWEIGHT=y 76CONFIG_GENERIC_HWEIGHT=y
76CONFIG_GENERIC_CALIBRATE_DELAY=y 77CONFIG_GENERIC_CALIBRATE_DELAY=y
78CONFIG_GENERIC_TIME=y
77CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 79CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
80CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
78CONFIG_DMA_NONCOHERENT=y 81CONFIG_DMA_NONCOHERENT=y
79CONFIG_DMA_NEED_PCI_MAP_STATE=y 82CONFIG_DMA_NEED_PCI_MAP_STATE=y
80CONFIG_GENERIC_ISA_DMA=y 83CONFIG_GENERIC_ISA_DMA=y
@@ -126,8 +129,8 @@ CONFIG_PAGE_SIZE_4KB=y
126# CONFIG_PAGE_SIZE_64KB is not set 129# CONFIG_PAGE_SIZE_64KB is not set
127CONFIG_CPU_HAS_PREFETCH=y 130CONFIG_CPU_HAS_PREFETCH=y
128CONFIG_MIPS_MT_DISABLED=y 131CONFIG_MIPS_MT_DISABLED=y
129# CONFIG_MIPS_MT_SMTC is not set
130# CONFIG_MIPS_MT_SMP is not set 132# CONFIG_MIPS_MT_SMP is not set
133# CONFIG_MIPS_MT_SMTC is not set
131# CONFIG_MIPS_VPE_LOADER is not set 134# CONFIG_MIPS_VPE_LOADER is not set
132CONFIG_CPU_HAS_LLSC=y 135CONFIG_CPU_HAS_LLSC=y
133CONFIG_CPU_HAS_SYNC=y 136CONFIG_CPU_HAS_SYNC=y
@@ -143,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
144CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set 148# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1
146# CONFIG_HZ_48 is not set 150# CONFIG_HZ_48 is not set
147# CONFIG_HZ_100 is not set 151# CONFIG_HZ_100 is not set
148# CONFIG_HZ_128 is not set 152# CONFIG_HZ_128 is not set
@@ -155,6 +159,7 @@ CONFIG_HZ=1000
155CONFIG_PREEMPT_NONE=y 159CONFIG_PREEMPT_NONE=y
156# CONFIG_PREEMPT_VOLUNTARY is not set 160# CONFIG_PREEMPT_VOLUNTARY is not set
157# CONFIG_PREEMPT is not set 161# CONFIG_PREEMPT is not set
162# CONFIG_KEXEC is not set
158CONFIG_LOCKDEP_SUPPORT=y 163CONFIG_LOCKDEP_SUPPORT=y
159CONFIG_STACKTRACE_SUPPORT=y 164CONFIG_STACKTRACE_SUPPORT=y
160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 165CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -173,16 +178,22 @@ CONFIG_LOCALVERSION=""
173CONFIG_LOCALVERSION_AUTO=y 178CONFIG_LOCALVERSION_AUTO=y
174CONFIG_SWAP=y 179CONFIG_SWAP=y
175CONFIG_SYSVIPC=y 180CONFIG_SYSVIPC=y
181# CONFIG_IPC_NS is not set
182CONFIG_SYSVIPC_SYSCTL=y
176# CONFIG_POSIX_MQUEUE is not set 183# CONFIG_POSIX_MQUEUE is not set
177# CONFIG_BSD_PROCESS_ACCT is not set 184# CONFIG_BSD_PROCESS_ACCT is not set
178CONFIG_SYSCTL=y 185# CONFIG_TASKSTATS is not set
186# CONFIG_UTS_NS is not set
179# CONFIG_AUDIT is not set 187# CONFIG_AUDIT is not set
180CONFIG_IKCONFIG=y 188CONFIG_IKCONFIG=y
181CONFIG_IKCONFIG_PROC=y 189CONFIG_IKCONFIG_PROC=y
190CONFIG_SYSFS_DEPRECATED=y
182CONFIG_RELAY=y 191CONFIG_RELAY=y
183CONFIG_INITRAMFS_SOURCE="" 192CONFIG_INITRAMFS_SOURCE=""
184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 193# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
194CONFIG_SYSCTL=y
185CONFIG_EMBEDDED=y 195CONFIG_EMBEDDED=y
196CONFIG_SYSCTL_SYSCALL=y
186CONFIG_KALLSYMS=y 197CONFIG_KALLSYMS=y
187# CONFIG_KALLSYMS_EXTRA_PASS is not set 198# CONFIG_KALLSYMS_EXTRA_PASS is not set
188CONFIG_HOTPLUG=y 199CONFIG_HOTPLUG=y
@@ -211,6 +222,7 @@ CONFIG_KMOD=y
211# 222#
212# Block layer 223# Block layer
213# 224#
225CONFIG_BLOCK=y
214# CONFIG_LBD is not set 226# CONFIG_LBD is not set
215# CONFIG_BLK_DEV_IO_TRACE is not set 227# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_LSF is not set 228# CONFIG_LSF is not set
@@ -254,6 +266,14 @@ CONFIG_BINFMT_ELF=y
254CONFIG_TRAD_SIGNALS=y 266CONFIG_TRAD_SIGNALS=y
255 267
256# 268#
269# Power management options
270#
271CONFIG_PM=y
272# CONFIG_PM_LEGACY is not set
273# CONFIG_PM_DEBUG is not set
274# CONFIG_PM_SYSFS_DEPRECATED is not set
275
276#
257# Networking 277# Networking
258# 278#
259CONFIG_NET=y 279CONFIG_NET=y
@@ -267,6 +287,8 @@ CONFIG_PACKET=y
267CONFIG_UNIX=y 287CONFIG_UNIX=y
268CONFIG_XFRM=y 288CONFIG_XFRM=y
269# CONFIG_XFRM_USER is not set 289# CONFIG_XFRM_USER is not set
290# CONFIG_XFRM_SUB_POLICY is not set
291CONFIG_XFRM_MIGRATE=y
270# CONFIG_NET_KEY is not set 292# CONFIG_NET_KEY is not set
271CONFIG_INET=y 293CONFIG_INET=y
272CONFIG_IP_MULTICAST=y 294CONFIG_IP_MULTICAST=y
@@ -285,13 +307,16 @@ CONFIG_IP_PNP_BOOTP=y
285# CONFIG_INET_ESP is not set 307# CONFIG_INET_ESP is not set
286# CONFIG_INET_IPCOMP is not set 308# CONFIG_INET_IPCOMP is not set
287# CONFIG_INET_XFRM_TUNNEL is not set 309# CONFIG_INET_XFRM_TUNNEL is not set
288# CONFIG_INET_TUNNEL is not set 310CONFIG_INET_TUNNEL=m
289CONFIG_INET_XFRM_MODE_TRANSPORT=m 311CONFIG_INET_XFRM_MODE_TRANSPORT=m
290CONFIG_INET_XFRM_MODE_TUNNEL=m 312CONFIG_INET_XFRM_MODE_TUNNEL=m
313CONFIG_INET_XFRM_MODE_BEET=m
291CONFIG_INET_DIAG=y 314CONFIG_INET_DIAG=y
292CONFIG_INET_TCP_DIAG=y 315CONFIG_INET_TCP_DIAG=y
293# CONFIG_TCP_CONG_ADVANCED is not set 316# CONFIG_TCP_CONG_ADVANCED is not set
294CONFIG_TCP_CONG_BIC=y 317CONFIG_TCP_CONG_CUBIC=y
318CONFIG_DEFAULT_TCP_CONG="cubic"
319CONFIG_TCP_MD5SIG=y
295 320
296# 321#
297# IP: Virtual Server Configuration 322# IP: Virtual Server Configuration
@@ -304,11 +329,17 @@ CONFIG_IPV6_ROUTE_INFO=y
304# CONFIG_INET6_AH is not set 329# CONFIG_INET6_AH is not set
305# CONFIG_INET6_ESP is not set 330# CONFIG_INET6_ESP is not set
306# CONFIG_INET6_IPCOMP is not set 331# CONFIG_INET6_IPCOMP is not set
332CONFIG_IPV6_MIP6=y
307# CONFIG_INET6_XFRM_TUNNEL is not set 333# CONFIG_INET6_XFRM_TUNNEL is not set
308# CONFIG_INET6_TUNNEL is not set 334# CONFIG_INET6_TUNNEL is not set
309CONFIG_INET6_XFRM_MODE_TRANSPORT=m 335CONFIG_INET6_XFRM_MODE_TRANSPORT=m
310CONFIG_INET6_XFRM_MODE_TUNNEL=m 336CONFIG_INET6_XFRM_MODE_TUNNEL=m
337CONFIG_INET6_XFRM_MODE_BEET=m
338CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
339CONFIG_IPV6_SIT=m
311# CONFIG_IPV6_TUNNEL is not set 340# CONFIG_IPV6_TUNNEL is not set
341CONFIG_IPV6_MULTIPLE_TABLES=y
342CONFIG_IPV6_SUBTREES=y
312CONFIG_NETWORK_SECMARK=y 343CONFIG_NETWORK_SECMARK=y
313CONFIG_NETFILTER=y 344CONFIG_NETFILTER=y
314# CONFIG_NETFILTER_DEBUG is not set 345# CONFIG_NETFILTER_DEBUG is not set
@@ -319,15 +350,42 @@ CONFIG_NETFILTER=y
319CONFIG_NETFILTER_NETLINK=m 350CONFIG_NETFILTER_NETLINK=m
320CONFIG_NETFILTER_NETLINK_QUEUE=m 351CONFIG_NETFILTER_NETLINK_QUEUE=m
321CONFIG_NETFILTER_NETLINK_LOG=m 352CONFIG_NETFILTER_NETLINK_LOG=m
322# CONFIG_NF_CONNTRACK is not set 353CONFIG_NF_CONNTRACK_ENABLED=m
354CONFIG_NF_CONNTRACK_SUPPORT=y
355# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
356CONFIG_NF_CONNTRACK=m
357CONFIG_NF_CT_ACCT=y
358CONFIG_NF_CONNTRACK_MARK=y
359CONFIG_NF_CONNTRACK_SECMARK=y
360CONFIG_NF_CONNTRACK_EVENTS=y
361CONFIG_NF_CT_PROTO_GRE=m
362CONFIG_NF_CT_PROTO_SCTP=m
363CONFIG_NF_CONNTRACK_AMANDA=m
364CONFIG_NF_CONNTRACK_FTP=m
365CONFIG_NF_CONNTRACK_H323=m
366CONFIG_NF_CONNTRACK_IRC=m
367# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
368CONFIG_NF_CONNTRACK_PPTP=m
369CONFIG_NF_CONNTRACK_SANE=m
370CONFIG_NF_CONNTRACK_SIP=m
371CONFIG_NF_CONNTRACK_TFTP=m
372CONFIG_NF_CT_NETLINK=m
323CONFIG_NETFILTER_XTABLES=m 373CONFIG_NETFILTER_XTABLES=m
324CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 374CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
325CONFIG_NETFILTER_XT_TARGET_MARK=m 375CONFIG_NETFILTER_XT_TARGET_MARK=m
326CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 376CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
377CONFIG_NETFILTER_XT_TARGET_NFLOG=m
327CONFIG_NETFILTER_XT_TARGET_SECMARK=m 378CONFIG_NETFILTER_XT_TARGET_SECMARK=m
379CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
380CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
328CONFIG_NETFILTER_XT_MATCH_COMMENT=m 381CONFIG_NETFILTER_XT_MATCH_COMMENT=m
382CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
383CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
384CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
329CONFIG_NETFILTER_XT_MATCH_DCCP=m 385CONFIG_NETFILTER_XT_MATCH_DCCP=m
386CONFIG_NETFILTER_XT_MATCH_DSCP=m
330CONFIG_NETFILTER_XT_MATCH_ESP=m 387CONFIG_NETFILTER_XT_MATCH_ESP=m
388CONFIG_NETFILTER_XT_MATCH_HELPER=m
331CONFIG_NETFILTER_XT_MATCH_LENGTH=m 389CONFIG_NETFILTER_XT_MATCH_LENGTH=m
332CONFIG_NETFILTER_XT_MATCH_LIMIT=m 390CONFIG_NETFILTER_XT_MATCH_LIMIT=m
333CONFIG_NETFILTER_XT_MATCH_MAC=m 391CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -338,14 +396,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
338CONFIG_NETFILTER_XT_MATCH_QUOTA=m 396CONFIG_NETFILTER_XT_MATCH_QUOTA=m
339CONFIG_NETFILTER_XT_MATCH_REALM=m 397CONFIG_NETFILTER_XT_MATCH_REALM=m
340CONFIG_NETFILTER_XT_MATCH_SCTP=m 398CONFIG_NETFILTER_XT_MATCH_SCTP=m
399CONFIG_NETFILTER_XT_MATCH_STATE=m
341CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 400CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
342CONFIG_NETFILTER_XT_MATCH_STRING=m 401CONFIG_NETFILTER_XT_MATCH_STRING=m
343CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 402CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
403CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
344 404
345# 405#
346# IP: Netfilter Configuration 406# IP: Netfilter Configuration
347# 407#
348# CONFIG_IP_NF_CONNTRACK is not set 408CONFIG_NF_CONNTRACK_IPV4=m
409CONFIG_NF_CONNTRACK_PROC_COMPAT=y
349# CONFIG_IP_NF_QUEUE is not set 410# CONFIG_IP_NF_QUEUE is not set
350# CONFIG_IP_NF_IPTABLES is not set 411# CONFIG_IP_NF_IPTABLES is not set
351# CONFIG_IP_NF_ARPTABLES is not set 412# CONFIG_IP_NF_ARPTABLES is not set
@@ -353,6 +414,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
353# 414#
354# IPv6: Netfilter Configuration (EXPERIMENTAL) 415# IPv6: Netfilter Configuration (EXPERIMENTAL)
355# 416#
417CONFIG_NF_CONNTRACK_IPV6=m
356# CONFIG_IP6_NF_QUEUE is not set 418# CONFIG_IP6_NF_QUEUE is not set
357# CONFIG_IP6_NF_IPTABLES is not set 419# CONFIG_IP6_NF_IPTABLES is not set
358 420
@@ -379,7 +441,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
379# CONFIG_ATALK is not set 441# CONFIG_ATALK is not set
380# CONFIG_X25 is not set 442# CONFIG_X25 is not set
381# CONFIG_LAPB is not set 443# CONFIG_LAPB is not set
382# CONFIG_NET_DIVERT is not set
383# CONFIG_ECONET is not set 444# CONFIG_ECONET is not set
384# CONFIG_WAN_ROUTER is not set 445# CONFIG_WAN_ROUTER is not set
385 446
@@ -404,6 +465,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
404CONFIG_IEEE80211_SOFTMAC=m 465CONFIG_IEEE80211_SOFTMAC=m
405# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 466# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
406CONFIG_WIRELESS_EXT=y 467CONFIG_WIRELESS_EXT=y
468CONFIG_FIB_RULES=y
407 469
408# 470#
409# Device Drivers 471# Device Drivers
@@ -436,11 +498,13 @@ CONFIG_MTD_PARTITIONS=y
436# User Modules And Translation Layers 498# User Modules And Translation Layers
437# 499#
438CONFIG_MTD_CHAR=y 500CONFIG_MTD_CHAR=y
501CONFIG_MTD_BLKDEVS=y
439CONFIG_MTD_BLOCK=y 502CONFIG_MTD_BLOCK=y
440# CONFIG_FTL is not set 503# CONFIG_FTL is not set
441# CONFIG_NFTL is not set 504# CONFIG_NFTL is not set
442# CONFIG_INFTL is not set 505# CONFIG_INFTL is not set
443# CONFIG_RFD_FTL is not set 506# CONFIG_RFD_FTL is not set
507# CONFIG_SSFDC is not set
444 508
445# 509#
446# RAM/ROM/Flash chip drivers 510# RAM/ROM/Flash chip drivers
@@ -510,6 +574,7 @@ CONFIG_MTD_CFI_UTIL=y
510# Plug and Play support 574# Plug and Play support
511# 575#
512# CONFIG_PNP is not set 576# CONFIG_PNP is not set
577# CONFIG_PNPACPI is not set
513 578
514# 579#
515# Block devices 580# Block devices
@@ -527,14 +592,22 @@ CONFIG_BLK_DEV_NBD=m
527CONFIG_BLK_DEV_RAM=y 592CONFIG_BLK_DEV_RAM=y
528CONFIG_BLK_DEV_RAM_COUNT=16 593CONFIG_BLK_DEV_RAM_COUNT=16
529CONFIG_BLK_DEV_RAM_SIZE=8192 594CONFIG_BLK_DEV_RAM_SIZE=8192
595CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
530CONFIG_BLK_DEV_INITRD=y 596CONFIG_BLK_DEV_INITRD=y
531# CONFIG_CDROM_PKTCDVD is not set 597# CONFIG_CDROM_PKTCDVD is not set
532# CONFIG_ATA_OVER_ETH is not set 598# CONFIG_ATA_OVER_ETH is not set
533 599
534# 600#
601# Misc devices
602#
603CONFIG_SGI_IOC4=m
604# CONFIG_TIFM_CORE is not set
605
606#
535# ATA/ATAPI/MFM/RLL support 607# ATA/ATAPI/MFM/RLL support
536# 608#
537CONFIG_IDE=y 609CONFIG_IDE=y
610CONFIG_IDE_MAX_HWIFS=4
538CONFIG_BLK_DEV_IDE=y 611CONFIG_BLK_DEV_IDE=y
539 612
540# 613#
@@ -570,8 +643,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
570# CONFIG_BLK_DEV_CS5530 is not set 643# CONFIG_BLK_DEV_CS5530 is not set
571# CONFIG_BLK_DEV_HPT34X is not set 644# CONFIG_BLK_DEV_HPT34X is not set
572# CONFIG_BLK_DEV_HPT366 is not set 645# CONFIG_BLK_DEV_HPT366 is not set
646# CONFIG_BLK_DEV_JMICRON is not set
573# CONFIG_BLK_DEV_SC1200 is not set 647# CONFIG_BLK_DEV_SC1200 is not set
574# CONFIG_BLK_DEV_PIIX is not set 648# CONFIG_BLK_DEV_PIIX is not set
649CONFIG_BLK_DEV_IT8213=m
575# CONFIG_BLK_DEV_IT821X is not set 650# CONFIG_BLK_DEV_IT821X is not set
576# CONFIG_BLK_DEV_NS87415 is not set 651# CONFIG_BLK_DEV_NS87415 is not set
577# CONFIG_BLK_DEV_PDC202XX_OLD is not set 652# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -581,6 +656,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
581# CONFIG_BLK_DEV_SLC90E66 is not set 656# CONFIG_BLK_DEV_SLC90E66 is not set
582# CONFIG_BLK_DEV_TRM290 is not set 657# CONFIG_BLK_DEV_TRM290 is not set
583# CONFIG_BLK_DEV_VIA82CXXX is not set 658# CONFIG_BLK_DEV_VIA82CXXX is not set
659CONFIG_BLK_DEV_TC86C001=m
584# CONFIG_IDE_ARM is not set 660# CONFIG_IDE_ARM is not set
585# CONFIG_IDE_CHIPSETS is not set 661# CONFIG_IDE_CHIPSETS is not set
586CONFIG_BLK_DEV_IDEDMA=y 662CONFIG_BLK_DEV_IDEDMA=y
@@ -593,6 +669,12 @@ CONFIG_BLK_DEV_IDEDMA=y
593# 669#
594CONFIG_RAID_ATTRS=m 670CONFIG_RAID_ATTRS=m
595# CONFIG_SCSI is not set 671# CONFIG_SCSI is not set
672# CONFIG_SCSI_NETLINK is not set
673
674#
675# Serial ATA (prod) and Parallel ATA (experimental) drivers
676#
677# CONFIG_ATA is not set
596 678
597# 679#
598# Old CD-ROM drivers (not SCSI, not IDE) 680# Old CD-ROM drivers (not SCSI, not IDE)
@@ -648,6 +730,8 @@ CONFIG_LXT_PHY=m
648CONFIG_CICADA_PHY=m 730CONFIG_CICADA_PHY=m
649CONFIG_VITESSE_PHY=m 731CONFIG_VITESSE_PHY=m
650CONFIG_SMSC_PHY=m 732CONFIG_SMSC_PHY=m
733# CONFIG_BROADCOM_PHY is not set
734# CONFIG_FIXED_PHY is not set
651 735
652# 736#
653# Ethernet (10 or 100Mbit) 737# Ethernet (10 or 100Mbit)
@@ -702,7 +786,7 @@ CONFIG_NET_PCI=y
702# CONFIG_SUNDANCE is not set 786# CONFIG_SUNDANCE is not set
703# CONFIG_TLAN is not set 787# CONFIG_TLAN is not set
704# CONFIG_VIA_RHINE is not set 788# CONFIG_VIA_RHINE is not set
705# CONFIG_LAN_SAA9730 is not set 789# CONFIG_SC92031 is not set
706 790
707# 791#
708# Ethernet (1000 Mbit) 792# Ethernet (1000 Mbit)
@@ -721,14 +805,18 @@ CONFIG_NET_PCI=y
721# CONFIG_VIA_VELOCITY is not set 805# CONFIG_VIA_VELOCITY is not set
722# CONFIG_TIGON3 is not set 806# CONFIG_TIGON3 is not set
723# CONFIG_BNX2 is not set 807# CONFIG_BNX2 is not set
808CONFIG_QLA3XXX=m
809# CONFIG_ATL1 is not set
724 810
725# 811#
726# Ethernet (10000 Mbit) 812# Ethernet (10000 Mbit)
727# 813#
728# CONFIG_CHELSIO_T1 is not set 814# CONFIG_CHELSIO_T1 is not set
815CONFIG_CHELSIO_T3=m
729# CONFIG_IXGB is not set 816# CONFIG_IXGB is not set
730# CONFIG_S2IO is not set 817# CONFIG_S2IO is not set
731# CONFIG_MYRI10GE is not set 818# CONFIG_MYRI10GE is not set
819CONFIG_NETXEN_NIC=m
732 820
733# 821#
734# Token Ring devices 822# Token Ring devices
@@ -785,6 +873,7 @@ CONFIG_PPP_DEFLATE=m
785CONFIG_PPP_MPPE=m 873CONFIG_PPP_MPPE=m
786CONFIG_PPPOE=m 874CONFIG_PPPOE=m
787# CONFIG_SLIP is not set 875# CONFIG_SLIP is not set
876CONFIG_SLHC=m
788# CONFIG_SHAPER is not set 877# CONFIG_SHAPER is not set
789# CONFIG_NETCONSOLE is not set 878# CONFIG_NETCONSOLE is not set
790# CONFIG_NETPOLL is not set 879# CONFIG_NETPOLL is not set
@@ -804,6 +893,7 @@ CONFIG_PPPOE=m
804# Input device support 893# Input device support
805# 894#
806CONFIG_INPUT=y 895CONFIG_INPUT=y
896# CONFIG_INPUT_FF_MEMLESS is not set
807 897
808# 898#
809# Userland interfaces 899# Userland interfaces
@@ -826,6 +916,7 @@ CONFIG_KEYBOARD_ATKBD=y
826# CONFIG_KEYBOARD_LKKBD is not set 916# CONFIG_KEYBOARD_LKKBD is not set
827# CONFIG_KEYBOARD_XTKBD is not set 917# CONFIG_KEYBOARD_XTKBD is not set
828# CONFIG_KEYBOARD_NEWTON is not set 918# CONFIG_KEYBOARD_NEWTON is not set
919# CONFIG_KEYBOARD_STOWAWAY is not set
829CONFIG_INPUT_MOUSE=y 920CONFIG_INPUT_MOUSE=y
830CONFIG_MOUSE_PS2=y 921CONFIG_MOUSE_PS2=y
831# CONFIG_MOUSE_SERIAL is not set 922# CONFIG_MOUSE_SERIAL is not set
@@ -868,6 +959,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
868CONFIG_SERIAL_CORE=y 959CONFIG_SERIAL_CORE=y
869CONFIG_SERIAL_TXX9=y 960CONFIG_SERIAL_TXX9=y
870CONFIG_HAS_TXX9_SERIAL=y 961CONFIG_HAS_TXX9_SERIAL=y
962CONFIG_SERIAL_TXX9_NR_UARTS=6
871# CONFIG_SERIAL_TXX9_CONSOLE is not set 963# CONFIG_SERIAL_TXX9_CONSOLE is not set
872# CONFIG_SERIAL_TXX9_STDSERIAL is not set 964# CONFIG_SERIAL_TXX9_STDSERIAL is not set
873# CONFIG_SERIAL_JSM is not set 965# CONFIG_SERIAL_JSM is not set
@@ -890,10 +982,6 @@ CONFIG_LEGACY_PTY_COUNT=256
890# CONFIG_DTLK is not set 982# CONFIG_DTLK is not set
891# CONFIG_R3964 is not set 983# CONFIG_R3964 is not set
892# CONFIG_APPLICOM is not set 984# CONFIG_APPLICOM is not set
893
894#
895# Ftape, the floppy tape device driver
896#
897# CONFIG_DRM is not set 985# CONFIG_DRM is not set
898# CONFIG_RAW_DRIVER is not set 986# CONFIG_RAW_DRIVER is not set
899 987
@@ -901,7 +989,6 @@ CONFIG_LEGACY_PTY_COUNT=256
901# TPM devices 989# TPM devices
902# 990#
903# CONFIG_TCG_TPM is not set 991# CONFIG_TCG_TPM is not set
904# CONFIG_TELCLOCK is not set
905 992
906# 993#
907# I2C support 994# I2C support
@@ -926,17 +1013,14 @@ CONFIG_HWMON=y
926# CONFIG_HWMON_VID is not set 1013# CONFIG_HWMON_VID is not set
927# CONFIG_SENSORS_ABITUGURU is not set 1014# CONFIG_SENSORS_ABITUGURU is not set
928# CONFIG_SENSORS_F71805F is not set 1015# CONFIG_SENSORS_F71805F is not set
1016# CONFIG_SENSORS_PC87427 is not set
1017# CONFIG_SENSORS_VT1211 is not set
929# CONFIG_HWMON_DEBUG_CHIP is not set 1018# CONFIG_HWMON_DEBUG_CHIP is not set
930 1019
931# 1020#
932# Misc devices
933#
934
935#
936# Multimedia devices 1021# Multimedia devices
937# 1022#
938# CONFIG_VIDEO_DEV is not set 1023# CONFIG_VIDEO_DEV is not set
939CONFIG_VIDEO_V4L2=y
940 1024
941# 1025#
942# Digital Video Broadcasting Devices 1026# Digital Video Broadcasting Devices
@@ -952,6 +1036,7 @@ CONFIG_FB=y
952CONFIG_FB_CFB_FILLRECT=y 1036CONFIG_FB_CFB_FILLRECT=y
953CONFIG_FB_CFB_COPYAREA=y 1037CONFIG_FB_CFB_COPYAREA=y
954CONFIG_FB_CFB_IMAGEBLIT=y 1038CONFIG_FB_CFB_IMAGEBLIT=y
1039# CONFIG_FB_SVGALIB is not set
955# CONFIG_FB_MACMODES is not set 1040# CONFIG_FB_MACMODES is not set
956# CONFIG_FB_BACKLIGHT is not set 1041# CONFIG_FB_BACKLIGHT is not set
957# CONFIG_FB_MODE_HELPERS is not set 1042# CONFIG_FB_MODE_HELPERS is not set
@@ -971,6 +1056,7 @@ CONFIG_FB_ATY=y
971CONFIG_FB_ATY_CT=y 1056CONFIG_FB_ATY_CT=y
972# CONFIG_FB_ATY_GENERIC_LCD is not set 1057# CONFIG_FB_ATY_GENERIC_LCD is not set
973# CONFIG_FB_ATY_GX is not set 1058# CONFIG_FB_ATY_GX is not set
1059# CONFIG_FB_S3 is not set
974# CONFIG_FB_SAVAGE is not set 1060# CONFIG_FB_SAVAGE is not set
975# CONFIG_FB_SIS is not set 1061# CONFIG_FB_SIS is not set
976# CONFIG_FB_NEOMAGIC is not set 1062# CONFIG_FB_NEOMAGIC is not set
@@ -1002,6 +1088,12 @@ CONFIG_DUMMY_CONSOLE=y
1002# CONFIG_SOUND is not set 1088# CONFIG_SOUND is not set
1003 1089
1004# 1090#
1091# HID Devices
1092#
1093CONFIG_HID=y
1094# CONFIG_HID_DEBUG is not set
1095
1096#
1005# USB support 1097# USB support
1006# 1098#
1007CONFIG_USB_ARCH_HAS_HCD=y 1099CONFIG_USB_ARCH_HAS_HCD=y
@@ -1014,8 +1106,8 @@ CONFIG_USB=y
1014# Miscellaneous USB options 1106# Miscellaneous USB options
1015# 1107#
1016# CONFIG_USB_DEVICEFS is not set 1108# CONFIG_USB_DEVICEFS is not set
1017# CONFIG_USB_BANDWIDTH is not set
1018# CONFIG_USB_DYNAMIC_MINORS is not set 1109# CONFIG_USB_DYNAMIC_MINORS is not set
1110# CONFIG_USB_SUSPEND is not set
1019# CONFIG_USB_OTG is not set 1111# CONFIG_USB_OTG is not set
1020 1112
1021# 1113#
@@ -1040,14 +1132,12 @@ CONFIG_USB=y
1040# 1132#
1041# may also be needed; see USB_STORAGE Help for more information 1133# may also be needed; see USB_STORAGE Help for more information
1042# 1134#
1043# CONFIG_USB_STORAGE is not set
1044# CONFIG_USB_LIBUSUAL is not set 1135# CONFIG_USB_LIBUSUAL is not set
1045 1136
1046# 1137#
1047# USB Input Devices 1138# USB Input Devices
1048# 1139#
1049CONFIG_USB_HID=y 1140CONFIG_USB_HID=y
1050CONFIG_USB_HIDINPUT=y
1051# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1141# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1052# CONFIG_HID_FF is not set 1142# CONFIG_HID_FF is not set
1053CONFIG_USB_HIDDEV=y 1143CONFIG_USB_HIDDEV=y
@@ -1063,6 +1153,7 @@ CONFIG_USB_YEALINK=m
1063# CONFIG_USB_ATI_REMOTE2 is not set 1153# CONFIG_USB_ATI_REMOTE2 is not set
1064# CONFIG_USB_KEYSPAN_REMOTE is not set 1154# CONFIG_USB_KEYSPAN_REMOTE is not set
1065# CONFIG_USB_APPLETOUCH is not set 1155# CONFIG_USB_APPLETOUCH is not set
1156# CONFIG_USB_GTCO is not set
1066 1157
1067# 1158#
1068# USB Imaging devices 1159# USB Imaging devices
@@ -1076,6 +1167,7 @@ CONFIG_USB_YEALINK=m
1076# CONFIG_USB_KAWETH is not set 1167# CONFIG_USB_KAWETH is not set
1077# CONFIG_USB_PEGASUS is not set 1168# CONFIG_USB_PEGASUS is not set
1078# CONFIG_USB_RTL8150 is not set 1169# CONFIG_USB_RTL8150 is not set
1170# CONFIG_USB_USBNET_MII is not set
1079# CONFIG_USB_USBNET is not set 1171# CONFIG_USB_USBNET is not set
1080CONFIG_USB_MON=y 1172CONFIG_USB_MON=y
1081 1173
@@ -1093,18 +1185,21 @@ CONFIG_USB_MON=y
1093# 1185#
1094# CONFIG_USB_EMI62 is not set 1186# CONFIG_USB_EMI62 is not set
1095# CONFIG_USB_EMI26 is not set 1187# CONFIG_USB_EMI26 is not set
1188# CONFIG_USB_ADUTUX is not set
1096# CONFIG_USB_AUERSWALD is not set 1189# CONFIG_USB_AUERSWALD is not set
1097# CONFIG_USB_RIO500 is not set 1190# CONFIG_USB_RIO500 is not set
1098# CONFIG_USB_LEGOTOWER is not set 1191# CONFIG_USB_LEGOTOWER is not set
1099# CONFIG_USB_LCD is not set 1192# CONFIG_USB_LCD is not set
1193# CONFIG_USB_BERRY_CHARGE is not set
1100# CONFIG_USB_LED is not set 1194# CONFIG_USB_LED is not set
1101# CONFIG_USB_CY7C63 is not set 1195# CONFIG_USB_CYPRESS_CY7C63 is not set
1102# CONFIG_USB_CYTHERM is not set 1196# CONFIG_USB_CYTHERM is not set
1103# CONFIG_USB_PHIDGETKIT is not set 1197# CONFIG_USB_PHIDGET is not set
1104# CONFIG_USB_PHIDGETSERVO is not set
1105# CONFIG_USB_IDMOUSE is not set 1198# CONFIG_USB_IDMOUSE is not set
1199# CONFIG_USB_FTDI_ELAN is not set
1106# CONFIG_USB_APPLEDISPLAY is not set 1200# CONFIG_USB_APPLEDISPLAY is not set
1107# CONFIG_USB_LD is not set 1201# CONFIG_USB_LD is not set
1202# CONFIG_USB_TRANCEVIBRATOR is not set
1108 1203
1109# 1204#
1110# USB DSL modem support 1205# USB DSL modem support
@@ -1161,6 +1256,14 @@ CONFIG_USB_MON=y
1161# 1256#
1162 1257
1163# 1258#
1259# Auxiliary Display support
1260#
1261
1262#
1263# Virtualization
1264#
1265
1266#
1164# File systems 1267# File systems
1165# 1268#
1166CONFIG_EXT2_FS=y 1269CONFIG_EXT2_FS=y
@@ -1170,6 +1273,7 @@ CONFIG_EXT3_FS=m
1170CONFIG_EXT3_FS_XATTR=y 1273CONFIG_EXT3_FS_XATTR=y
1171# CONFIG_EXT3_FS_POSIX_ACL is not set 1274# CONFIG_EXT3_FS_POSIX_ACL is not set
1172# CONFIG_EXT3_FS_SECURITY is not set 1275# CONFIG_EXT3_FS_SECURITY is not set
1276# CONFIG_EXT4DEV_FS is not set
1173CONFIG_JBD=m 1277CONFIG_JBD=m
1174# CONFIG_JBD_DEBUG is not set 1278# CONFIG_JBD_DEBUG is not set
1175CONFIG_FS_MBCACHE=y 1279CONFIG_FS_MBCACHE=y
@@ -1178,12 +1282,13 @@ CONFIG_REISERFS_FS=m
1178# CONFIG_REISERFS_PROC_INFO is not set 1282# CONFIG_REISERFS_PROC_INFO is not set
1179# CONFIG_REISERFS_FS_XATTR is not set 1283# CONFIG_REISERFS_FS_XATTR is not set
1180# CONFIG_JFS_FS is not set 1284# CONFIG_JFS_FS is not set
1181# CONFIG_FS_POSIX_ACL is not set 1285CONFIG_FS_POSIX_ACL=y
1182CONFIG_XFS_FS=m 1286CONFIG_XFS_FS=m
1183# CONFIG_XFS_QUOTA is not set 1287# CONFIG_XFS_QUOTA is not set
1184# CONFIG_XFS_SECURITY is not set 1288# CONFIG_XFS_SECURITY is not set
1185# CONFIG_XFS_POSIX_ACL is not set 1289# CONFIG_XFS_POSIX_ACL is not set
1186# CONFIG_XFS_RT is not set 1290# CONFIG_XFS_RT is not set
1291# CONFIG_GFS2_FS is not set
1187# CONFIG_OCFS2_FS is not set 1292# CONFIG_OCFS2_FS is not set
1188# CONFIG_MINIX_FS is not set 1293# CONFIG_MINIX_FS is not set
1189# CONFIG_ROMFS_FS is not set 1294# CONFIG_ROMFS_FS is not set
@@ -1194,6 +1299,7 @@ CONFIG_INOTIFY_USER=y
1194# CONFIG_AUTOFS_FS is not set 1299# CONFIG_AUTOFS_FS is not set
1195CONFIG_AUTOFS4_FS=m 1300CONFIG_AUTOFS4_FS=m
1196CONFIG_FUSE_FS=m 1301CONFIG_FUSE_FS=m
1302CONFIG_GENERIC_ACL=y
1197 1303
1198# 1304#
1199# CD-ROM/DVD Filesystems 1305# CD-ROM/DVD Filesystems
@@ -1218,11 +1324,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1218# 1324#
1219CONFIG_PROC_FS=y 1325CONFIG_PROC_FS=y
1220# CONFIG_PROC_KCORE is not set 1326# CONFIG_PROC_KCORE is not set
1327CONFIG_PROC_SYSCTL=y
1221CONFIG_SYSFS=y 1328CONFIG_SYSFS=y
1222CONFIG_TMPFS=y 1329CONFIG_TMPFS=y
1330CONFIG_TMPFS_POSIX_ACL=y
1223# CONFIG_HUGETLB_PAGE is not set 1331# CONFIG_HUGETLB_PAGE is not set
1224CONFIG_RAMFS=y 1332CONFIG_RAMFS=y
1225# CONFIG_CONFIGFS_FS is not set 1333CONFIG_CONFIGFS_FS=m
1226 1334
1227# 1335#
1228# Miscellaneous filesystems 1336# Miscellaneous filesystems
@@ -1234,7 +1342,6 @@ CONFIG_RAMFS=y
1234# CONFIG_BEFS_FS is not set 1342# CONFIG_BEFS_FS is not set
1235# CONFIG_BFS_FS is not set 1343# CONFIG_BFS_FS is not set
1236# CONFIG_EFS_FS is not set 1344# CONFIG_EFS_FS is not set
1237# CONFIG_JFFS_FS is not set
1238CONFIG_JFFS2_FS=y 1345CONFIG_JFFS2_FS=y
1239CONFIG_JFFS2_FS_DEBUG=0 1346CONFIG_JFFS2_FS_DEBUG=0
1240CONFIG_JFFS2_FS_WRITEBUFFER=y 1347CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1273,7 +1380,6 @@ CONFIG_SUNRPC=y
1273CONFIG_SMB_FS=m 1380CONFIG_SMB_FS=m
1274# CONFIG_SMB_NLS_DEFAULT is not set 1381# CONFIG_SMB_NLS_DEFAULT is not set
1275# CONFIG_CIFS is not set 1382# CONFIG_CIFS is not set
1276# CONFIG_CIFS_DEBUG2 is not set
1277# CONFIG_NCP_FS is not set 1383# CONFIG_NCP_FS is not set
1278# CONFIG_CODA_FS is not set 1384# CONFIG_CODA_FS is not set
1279# CONFIG_AFS_FS is not set 1385# CONFIG_AFS_FS is not set
@@ -1330,6 +1436,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1330# CONFIG_NLS_UTF8 is not set 1436# CONFIG_NLS_UTF8 is not set
1331 1437
1332# 1438#
1439# Distributed Lock Manager
1440#
1441CONFIG_DLM=m
1442CONFIG_DLM_TCP=y
1443# CONFIG_DLM_SCTP is not set
1444# CONFIG_DLM_DEBUG is not set
1445
1446#
1333# Profiling support 1447# Profiling support
1334# 1448#
1335# CONFIG_PROFILING is not set 1449# CONFIG_PROFILING is not set
@@ -1339,13 +1453,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1339# 1453#
1340CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1454CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1341# CONFIG_PRINTK_TIME is not set 1455# CONFIG_PRINTK_TIME is not set
1456CONFIG_ENABLE_MUST_CHECK=y
1342# CONFIG_MAGIC_SYSRQ is not set 1457# CONFIG_MAGIC_SYSRQ is not set
1343# CONFIG_UNUSED_SYMBOLS is not set 1458# CONFIG_UNUSED_SYMBOLS is not set
1459# CONFIG_DEBUG_FS is not set
1460# CONFIG_HEADERS_CHECK is not set
1344# CONFIG_DEBUG_KERNEL is not set 1461# CONFIG_DEBUG_KERNEL is not set
1345CONFIG_LOG_BUF_SHIFT=14 1462CONFIG_LOG_BUF_SHIFT=14
1346# CONFIG_DEBUG_FS is not set
1347CONFIG_CROSSCOMPILE=y 1463CONFIG_CROSSCOMPILE=y
1348CONFIG_CMDLINE="" 1464CONFIG_CMDLINE=""
1465CONFIG_SYS_SUPPORTS_KGDB=y
1349 1466
1350# 1467#
1351# Security options 1468# Security options
@@ -1357,18 +1474,30 @@ CONFIG_CMDLINE=""
1357# Cryptographic options 1474# Cryptographic options
1358# 1475#
1359CONFIG_CRYPTO=y 1476CONFIG_CRYPTO=y
1477CONFIG_CRYPTO_ALGAPI=y
1478CONFIG_CRYPTO_BLKCIPHER=m
1479CONFIG_CRYPTO_HASH=y
1480CONFIG_CRYPTO_MANAGER=y
1360CONFIG_CRYPTO_HMAC=y 1481CONFIG_CRYPTO_HMAC=y
1482CONFIG_CRYPTO_XCBC=m
1361CONFIG_CRYPTO_NULL=m 1483CONFIG_CRYPTO_NULL=m
1362CONFIG_CRYPTO_MD4=m 1484CONFIG_CRYPTO_MD4=m
1363CONFIG_CRYPTO_MD5=m 1485CONFIG_CRYPTO_MD5=y
1364CONFIG_CRYPTO_SHA1=m 1486CONFIG_CRYPTO_SHA1=m
1365CONFIG_CRYPTO_SHA256=m 1487CONFIG_CRYPTO_SHA256=m
1366CONFIG_CRYPTO_SHA512=m 1488CONFIG_CRYPTO_SHA512=m
1367CONFIG_CRYPTO_WP512=m 1489CONFIG_CRYPTO_WP512=m
1368CONFIG_CRYPTO_TGR192=m 1490CONFIG_CRYPTO_TGR192=m
1491CONFIG_CRYPTO_GF128MUL=m
1492CONFIG_CRYPTO_ECB=m
1493CONFIG_CRYPTO_CBC=m
1494CONFIG_CRYPTO_PCBC=m
1495CONFIG_CRYPTO_LRW=m
1369CONFIG_CRYPTO_DES=m 1496CONFIG_CRYPTO_DES=m
1497CONFIG_CRYPTO_FCRYPT=m
1370CONFIG_CRYPTO_BLOWFISH=m 1498CONFIG_CRYPTO_BLOWFISH=m
1371CONFIG_CRYPTO_TWOFISH=m 1499CONFIG_CRYPTO_TWOFISH=m
1500CONFIG_CRYPTO_TWOFISH_COMMON=m
1372CONFIG_CRYPTO_SERPENT=m 1501CONFIG_CRYPTO_SERPENT=m
1373CONFIG_CRYPTO_AES=m 1502CONFIG_CRYPTO_AES=m
1374CONFIG_CRYPTO_CAST5=m 1503CONFIG_CRYPTO_CAST5=m
@@ -1380,6 +1509,7 @@ CONFIG_CRYPTO_ANUBIS=m
1380CONFIG_CRYPTO_DEFLATE=m 1509CONFIG_CRYPTO_DEFLATE=m
1381CONFIG_CRYPTO_MICHAEL_MIC=m 1510CONFIG_CRYPTO_MICHAEL_MIC=m
1382CONFIG_CRYPTO_CRC32C=m 1511CONFIG_CRYPTO_CRC32C=m
1512CONFIG_CRYPTO_CAMELLIA=m
1383# CONFIG_CRYPTO_TEST is not set 1513# CONFIG_CRYPTO_TEST is not set
1384 1514
1385# 1515#
@@ -1389,6 +1519,7 @@ CONFIG_CRYPTO_CRC32C=m
1389# 1519#
1390# Library routines 1520# Library routines
1391# 1521#
1522CONFIG_BITREVERSE=y
1392CONFIG_CRC_CCITT=m 1523CONFIG_CRC_CCITT=m
1393CONFIG_CRC16=m 1524CONFIG_CRC16=m
1394CONFIG_CRC32=y 1525CONFIG_CRC32=y
@@ -1399,3 +1530,5 @@ CONFIG_TEXTSEARCH=y
1399CONFIG_TEXTSEARCH_KMP=m 1530CONFIG_TEXTSEARCH_KMP=m
1400CONFIG_TEXTSEARCH_BM=m 1531CONFIG_TEXTSEARCH_BM=m
1401CONFIG_TEXTSEARCH_FSM=m 1532CONFIG_TEXTSEARCH_FSM=m
1533CONFIG_HAS_IOMEM=y
1534CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 496aa67b9f82..5593cde9f74c 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:19 2006 4# Tue Feb 20 21:47:40 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_SNI_RM=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_ARC=y 74CONFIG_ARC=y
72CONFIG_ARCH_MAY_HAVE_PC_FDC=y 75CONFIG_ARCH_MAY_HAVE_PC_FDC=y
73CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
@@ -78,10 +81,10 @@ CONFIG_I8259=y
78CONFIG_CPU_LITTLE_ENDIAN=y 81CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 82CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 83CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
84CONFIG_IRQ_CPU=y
81CONFIG_ARC32=y 85CONFIG_ARC32=y
82CONFIG_BOOT_ELF32=y 86CONFIG_BOOT_ELF32=y
83CONFIG_MIPS_L1_CACHE_SHIFT=5 87CONFIG_MIPS_L1_CACHE_SHIFT=4
84CONFIG_HAVE_STD_PC_SERIAL_PORT=y
85CONFIG_ARC_CONSOLE=y 88CONFIG_ARC_CONSOLE=y
86CONFIG_ARC_MEMORY=y 89CONFIG_ARC_MEMORY=y
87CONFIG_ARC_PROMLIB=y 90CONFIG_ARC_PROMLIB=y
@@ -110,6 +113,7 @@ CONFIG_CPU_R4X00=y
110# CONFIG_CPU_SB1 is not set 113# CONFIG_CPU_SB1 is not set
111CONFIG_SYS_HAS_CPU_R4X00=y 114CONFIG_SYS_HAS_CPU_R4X00=y
112CONFIG_SYS_HAS_CPU_R5000=y 115CONFIG_SYS_HAS_CPU_R5000=y
116CONFIG_SYS_HAS_CPU_R10000=y
113CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 117CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
114CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 118CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
115CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 119CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -127,8 +131,8 @@ CONFIG_PAGE_SIZE_4KB=y
127CONFIG_BOARD_SCACHE=y 131CONFIG_BOARD_SCACHE=y
128CONFIG_R5000_CPU_SCACHE=y 132CONFIG_R5000_CPU_SCACHE=y
129CONFIG_MIPS_MT_DISABLED=y 133CONFIG_MIPS_MT_DISABLED=y
130# CONFIG_MIPS_MT_SMTC is not set
131# CONFIG_MIPS_MT_SMP is not set 134# CONFIG_MIPS_MT_SMP is not set
135# CONFIG_MIPS_MT_SMTC is not set
132# CONFIG_MIPS_VPE_LOADER is not set 136# CONFIG_MIPS_VPE_LOADER is not set
133# CONFIG_64BIT_PHYS_ADDR is not set 137# CONFIG_64BIT_PHYS_ADDR is not set
134CONFIG_CPU_HAS_LLSC=y 138CONFIG_CPU_HAS_LLSC=y
@@ -146,6 +150,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
146# CONFIG_SPARSEMEM_STATIC is not set 150# CONFIG_SPARSEMEM_STATIC is not set
147CONFIG_SPLIT_PTLOCK_CPUS=4 151CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set 152# CONFIG_RESOURCES_64BIT is not set
153CONFIG_ZONE_DMA_FLAG=1
149# CONFIG_HZ_48 is not set 154# CONFIG_HZ_48 is not set
150# CONFIG_HZ_100 is not set 155# CONFIG_HZ_100 is not set
151# CONFIG_HZ_128 is not set 156# CONFIG_HZ_128 is not set
@@ -158,6 +163,7 @@ CONFIG_HZ=1000
158# CONFIG_PREEMPT_NONE is not set 163# CONFIG_PREEMPT_NONE is not set
159CONFIG_PREEMPT_VOLUNTARY=y 164CONFIG_PREEMPT_VOLUNTARY=y
160# CONFIG_PREEMPT is not set 165# CONFIG_PREEMPT is not set
166# CONFIG_KEXEC is not set
161CONFIG_LOCKDEP_SUPPORT=y 167CONFIG_LOCKDEP_SUPPORT=y
162CONFIG_STACKTRACE_SUPPORT=y 168CONFIG_STACKTRACE_SUPPORT=y
163CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 169CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -176,17 +182,22 @@ CONFIG_LOCALVERSION=""
176CONFIG_LOCALVERSION_AUTO=y 182CONFIG_LOCALVERSION_AUTO=y
177CONFIG_SWAP=y 183CONFIG_SWAP=y
178CONFIG_SYSVIPC=y 184CONFIG_SYSVIPC=y
185# CONFIG_IPC_NS is not set
186CONFIG_SYSVIPC_SYSCTL=y
179CONFIG_POSIX_MQUEUE=y 187CONFIG_POSIX_MQUEUE=y
180CONFIG_BSD_PROCESS_ACCT=y 188CONFIG_BSD_PROCESS_ACCT=y
181# CONFIG_BSD_PROCESS_ACCT_V3 is not set 189# CONFIG_BSD_PROCESS_ACCT_V3 is not set
182CONFIG_SYSCTL=y 190# CONFIG_TASKSTATS is not set
191# CONFIG_UTS_NS is not set
183# CONFIG_AUDIT is not set 192# CONFIG_AUDIT is not set
184CONFIG_IKCONFIG=y 193CONFIG_IKCONFIG=y
185CONFIG_IKCONFIG_PROC=y 194CONFIG_IKCONFIG_PROC=y
195CONFIG_SYSFS_DEPRECATED=y
186CONFIG_RELAY=y 196CONFIG_RELAY=y
187CONFIG_INITRAMFS_SOURCE=""
188# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 197# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
198CONFIG_SYSCTL=y
189CONFIG_EMBEDDED=y 199CONFIG_EMBEDDED=y
200CONFIG_SYSCTL_SYSCALL=y
190CONFIG_KALLSYMS=y 201CONFIG_KALLSYMS=y
191# CONFIG_KALLSYMS_EXTRA_PASS is not set 202# CONFIG_KALLSYMS_EXTRA_PASS is not set
192CONFIG_HOTPLUG=y 203CONFIG_HOTPLUG=y
@@ -194,12 +205,12 @@ CONFIG_PRINTK=y
194CONFIG_BUG=y 205CONFIG_BUG=y
195CONFIG_ELF_CORE=y 206CONFIG_ELF_CORE=y
196CONFIG_BASE_FULL=y 207CONFIG_BASE_FULL=y
197CONFIG_RT_MUTEXES=y
198CONFIG_FUTEX=y 208CONFIG_FUTEX=y
199CONFIG_EPOLL=y 209CONFIG_EPOLL=y
200CONFIG_SHMEM=y 210CONFIG_SHMEM=y
201CONFIG_SLAB=y 211CONFIG_SLAB=y
202CONFIG_VM_EVENT_COUNTERS=y 212CONFIG_VM_EVENT_COUNTERS=y
213CONFIG_RT_MUTEXES=y
203# CONFIG_TINY_SHMEM is not set 214# CONFIG_TINY_SHMEM is not set
204CONFIG_BASE_SMALL=0 215CONFIG_BASE_SMALL=0
205# CONFIG_SLOB is not set 216# CONFIG_SLOB is not set
@@ -217,6 +228,7 @@ CONFIG_KMOD=y
217# 228#
218# Block layer 229# Block layer
219# 230#
231CONFIG_BLOCK=y
220# CONFIG_LBD is not set 232# CONFIG_LBD is not set
221# CONFIG_BLK_DEV_IO_TRACE is not set 233# CONFIG_BLK_DEV_IO_TRACE is not set
222# CONFIG_LSF is not set 234# CONFIG_LSF is not set
@@ -263,6 +275,14 @@ CONFIG_BINFMT_MISC=m
263CONFIG_TRAD_SIGNALS=y 275CONFIG_TRAD_SIGNALS=y
264 276
265# 277#
278# Power management options
279#
280CONFIG_PM=y
281# CONFIG_PM_LEGACY is not set
282# CONFIG_PM_DEBUG is not set
283# CONFIG_PM_SYSFS_DEPRECATED is not set
284
285#
266# Networking 286# Networking
267# 287#
268CONFIG_NET=y 288CONFIG_NET=y
@@ -276,7 +296,10 @@ CONFIG_PACKET_MMAP=y
276CONFIG_UNIX=y 296CONFIG_UNIX=y
277CONFIG_XFRM=y 297CONFIG_XFRM=y
278# CONFIG_XFRM_USER is not set 298# CONFIG_XFRM_USER is not set
299# CONFIG_XFRM_SUB_POLICY is not set
300CONFIG_XFRM_MIGRATE=y
279CONFIG_NET_KEY=m 301CONFIG_NET_KEY=m
302CONFIG_NET_KEY_MIGRATE=y
280CONFIG_INET=y 303CONFIG_INET=y
281CONFIG_IP_MULTICAST=y 304CONFIG_IP_MULTICAST=y
282# CONFIG_IP_ADVANCED_ROUTER is not set 305# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -297,10 +320,13 @@ CONFIG_IP_PIMSM_V2=y
297CONFIG_INET_TUNNEL=m 320CONFIG_INET_TUNNEL=m
298CONFIG_INET_XFRM_MODE_TRANSPORT=m 321CONFIG_INET_XFRM_MODE_TRANSPORT=m
299CONFIG_INET_XFRM_MODE_TUNNEL=m 322CONFIG_INET_XFRM_MODE_TUNNEL=m
323CONFIG_INET_XFRM_MODE_BEET=m
300CONFIG_INET_DIAG=y 324CONFIG_INET_DIAG=y
301CONFIG_INET_TCP_DIAG=y 325CONFIG_INET_TCP_DIAG=y
302# CONFIG_TCP_CONG_ADVANCED is not set 326# CONFIG_TCP_CONG_ADVANCED is not set
303CONFIG_TCP_CONG_BIC=y 327CONFIG_TCP_CONG_CUBIC=y
328CONFIG_DEFAULT_TCP_CONG="cubic"
329CONFIG_TCP_MD5SIG=y
304 330
305# 331#
306# IP: Virtual Server Configuration 332# IP: Virtual Server Configuration
@@ -313,11 +339,17 @@ CONFIG_IPV6_ROUTE_INFO=y
313CONFIG_INET6_AH=m 339CONFIG_INET6_AH=m
314CONFIG_INET6_ESP=m 340CONFIG_INET6_ESP=m
315CONFIG_INET6_IPCOMP=m 341CONFIG_INET6_IPCOMP=m
342CONFIG_IPV6_MIP6=y
316CONFIG_INET6_XFRM_TUNNEL=m 343CONFIG_INET6_XFRM_TUNNEL=m
317CONFIG_INET6_TUNNEL=m 344CONFIG_INET6_TUNNEL=m
318CONFIG_INET6_XFRM_MODE_TRANSPORT=m 345CONFIG_INET6_XFRM_MODE_TRANSPORT=m
319CONFIG_INET6_XFRM_MODE_TUNNEL=m 346CONFIG_INET6_XFRM_MODE_TUNNEL=m
347CONFIG_INET6_XFRM_MODE_BEET=m
348CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
349CONFIG_IPV6_SIT=m
320CONFIG_IPV6_TUNNEL=m 350CONFIG_IPV6_TUNNEL=m
351CONFIG_IPV6_MULTIPLE_TABLES=y
352CONFIG_IPV6_SUBTREES=y
321CONFIG_NETWORK_SECMARK=y 353CONFIG_NETWORK_SECMARK=y
322CONFIG_NETFILTER=y 354CONFIG_NETFILTER=y
323# CONFIG_NETFILTER_DEBUG is not set 355# CONFIG_NETFILTER_DEBUG is not set
@@ -329,18 +361,43 @@ CONFIG_BRIDGE_NETFILTER=y
329CONFIG_NETFILTER_NETLINK=m 361CONFIG_NETFILTER_NETLINK=m
330CONFIG_NETFILTER_NETLINK_QUEUE=m 362CONFIG_NETFILTER_NETLINK_QUEUE=m
331CONFIG_NETFILTER_NETLINK_LOG=m 363CONFIG_NETFILTER_NETLINK_LOG=m
364CONFIG_NF_CONNTRACK_ENABLED=m
365CONFIG_NF_CONNTRACK_SUPPORT=y
366# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
367CONFIG_NF_CONNTRACK=m
368CONFIG_NF_CT_ACCT=y
369CONFIG_NF_CONNTRACK_MARK=y
370CONFIG_NF_CONNTRACK_SECMARK=y
371CONFIG_NF_CONNTRACK_EVENTS=y
372CONFIG_NF_CT_PROTO_GRE=m
373CONFIG_NF_CT_PROTO_SCTP=m
374CONFIG_NF_CONNTRACK_AMANDA=m
375CONFIG_NF_CONNTRACK_FTP=m
376CONFIG_NF_CONNTRACK_H323=m
377CONFIG_NF_CONNTRACK_IRC=m
378# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
379CONFIG_NF_CONNTRACK_PPTP=m
380CONFIG_NF_CONNTRACK_SANE=m
381CONFIG_NF_CONNTRACK_SIP=m
382CONFIG_NF_CONNTRACK_TFTP=m
383CONFIG_NF_CT_NETLINK=m
332CONFIG_NETFILTER_XTABLES=m 384CONFIG_NETFILTER_XTABLES=m
333CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 385CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
334CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 386CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
387CONFIG_NETFILTER_XT_TARGET_DSCP=m
335CONFIG_NETFILTER_XT_TARGET_MARK=m 388CONFIG_NETFILTER_XT_TARGET_MARK=m
336CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 389CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
390CONFIG_NETFILTER_XT_TARGET_NFLOG=m
337CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 391CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
338CONFIG_NETFILTER_XT_TARGET_SECMARK=m 392CONFIG_NETFILTER_XT_TARGET_SECMARK=m
339# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set 393# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
394CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
340CONFIG_NETFILTER_XT_MATCH_COMMENT=m 395CONFIG_NETFILTER_XT_MATCH_COMMENT=m
396CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
341CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 397CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
342CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 398CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
343CONFIG_NETFILTER_XT_MATCH_DCCP=m 399CONFIG_NETFILTER_XT_MATCH_DCCP=m
400CONFIG_NETFILTER_XT_MATCH_DSCP=m
344CONFIG_NETFILTER_XT_MATCH_ESP=m 401CONFIG_NETFILTER_XT_MATCH_ESP=m
345CONFIG_NETFILTER_XT_MATCH_HELPER=m 402CONFIG_NETFILTER_XT_MATCH_HELPER=m
346CONFIG_NETFILTER_XT_MATCH_LENGTH=m 403CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -358,60 +415,45 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
358CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 415CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
359CONFIG_NETFILTER_XT_MATCH_STRING=m 416CONFIG_NETFILTER_XT_MATCH_STRING=m
360CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 417CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
418CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
361 419
362# 420#
363# IP: Netfilter Configuration 421# IP: Netfilter Configuration
364# 422#
365CONFIG_IP_NF_CONNTRACK=m 423CONFIG_NF_CONNTRACK_IPV4=m
366# CONFIG_IP_NF_CT_ACCT is not set 424CONFIG_NF_CONNTRACK_PROC_COMPAT=y
367CONFIG_IP_NF_CONNTRACK_MARK=y
368CONFIG_IP_NF_CONNTRACK_SECMARK=y
369CONFIG_IP_NF_CONNTRACK_EVENTS=y
370CONFIG_IP_NF_CONNTRACK_NETLINK=m
371CONFIG_IP_NF_CT_PROTO_SCTP=m
372CONFIG_IP_NF_FTP=m
373CONFIG_IP_NF_IRC=m
374# CONFIG_IP_NF_NETBIOS_NS is not set
375CONFIG_IP_NF_TFTP=m
376CONFIG_IP_NF_AMANDA=m
377CONFIG_IP_NF_PPTP=m
378CONFIG_IP_NF_H323=m
379CONFIG_IP_NF_SIP=m
380CONFIG_IP_NF_QUEUE=m 425CONFIG_IP_NF_QUEUE=m
381CONFIG_IP_NF_IPTABLES=m 426CONFIG_IP_NF_IPTABLES=m
382CONFIG_IP_NF_MATCH_IPRANGE=m 427CONFIG_IP_NF_MATCH_IPRANGE=m
383CONFIG_IP_NF_MATCH_TOS=m 428CONFIG_IP_NF_MATCH_TOS=m
384CONFIG_IP_NF_MATCH_RECENT=m 429CONFIG_IP_NF_MATCH_RECENT=m
385CONFIG_IP_NF_MATCH_ECN=m 430CONFIG_IP_NF_MATCH_ECN=m
386CONFIG_IP_NF_MATCH_DSCP=m
387CONFIG_IP_NF_MATCH_AH=m 431CONFIG_IP_NF_MATCH_AH=m
388CONFIG_IP_NF_MATCH_TTL=m 432CONFIG_IP_NF_MATCH_TTL=m
389CONFIG_IP_NF_MATCH_OWNER=m 433CONFIG_IP_NF_MATCH_OWNER=m
390CONFIG_IP_NF_MATCH_ADDRTYPE=m 434CONFIG_IP_NF_MATCH_ADDRTYPE=m
391CONFIG_IP_NF_MATCH_HASHLIMIT=m
392CONFIG_IP_NF_FILTER=m 435CONFIG_IP_NF_FILTER=m
393CONFIG_IP_NF_TARGET_REJECT=m 436CONFIG_IP_NF_TARGET_REJECT=m
394CONFIG_IP_NF_TARGET_LOG=m 437CONFIG_IP_NF_TARGET_LOG=m
395CONFIG_IP_NF_TARGET_ULOG=m 438CONFIG_IP_NF_TARGET_ULOG=m
396CONFIG_IP_NF_TARGET_TCPMSS=m 439CONFIG_NF_NAT=m
397CONFIG_IP_NF_NAT=m 440CONFIG_NF_NAT_NEEDED=y
398CONFIG_IP_NF_NAT_NEEDED=y
399CONFIG_IP_NF_TARGET_MASQUERADE=m 441CONFIG_IP_NF_TARGET_MASQUERADE=m
400CONFIG_IP_NF_TARGET_REDIRECT=m 442CONFIG_IP_NF_TARGET_REDIRECT=m
401CONFIG_IP_NF_TARGET_NETMAP=m 443CONFIG_IP_NF_TARGET_NETMAP=m
402CONFIG_IP_NF_TARGET_SAME=m 444CONFIG_IP_NF_TARGET_SAME=m
403CONFIG_IP_NF_NAT_SNMP_BASIC=m 445CONFIG_NF_NAT_SNMP_BASIC=m
404CONFIG_IP_NF_NAT_IRC=m 446CONFIG_NF_NAT_PROTO_GRE=m
405CONFIG_IP_NF_NAT_FTP=m 447CONFIG_NF_NAT_FTP=m
406CONFIG_IP_NF_NAT_TFTP=m 448CONFIG_NF_NAT_IRC=m
407CONFIG_IP_NF_NAT_AMANDA=m 449CONFIG_NF_NAT_TFTP=m
408CONFIG_IP_NF_NAT_PPTP=m 450CONFIG_NF_NAT_AMANDA=m
409CONFIG_IP_NF_NAT_H323=m 451CONFIG_NF_NAT_PPTP=m
410CONFIG_IP_NF_NAT_SIP=m 452CONFIG_NF_NAT_H323=m
453CONFIG_NF_NAT_SIP=m
411CONFIG_IP_NF_MANGLE=m 454CONFIG_IP_NF_MANGLE=m
412CONFIG_IP_NF_TARGET_TOS=m 455CONFIG_IP_NF_TARGET_TOS=m
413CONFIG_IP_NF_TARGET_ECN=m 456CONFIG_IP_NF_TARGET_ECN=m
414CONFIG_IP_NF_TARGET_DSCP=m
415CONFIG_IP_NF_TARGET_TTL=m 457CONFIG_IP_NF_TARGET_TTL=m
416CONFIG_IP_NF_TARGET_CLUSTERIP=m 458CONFIG_IP_NF_TARGET_CLUSTERIP=m
417CONFIG_IP_NF_RAW=m 459CONFIG_IP_NF_RAW=m
@@ -422,6 +464,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
422# 464#
423# IPv6: Netfilter Configuration (EXPERIMENTAL) 465# IPv6: Netfilter Configuration (EXPERIMENTAL)
424# 466#
467CONFIG_NF_CONNTRACK_IPV6=m
425CONFIG_IP6_NF_QUEUE=m 468CONFIG_IP6_NF_QUEUE=m
426CONFIG_IP6_NF_IPTABLES=m 469CONFIG_IP6_NF_IPTABLES=m
427CONFIG_IP6_NF_MATCH_RT=m 470CONFIG_IP6_NF_MATCH_RT=m
@@ -431,6 +474,7 @@ CONFIG_IP6_NF_MATCH_HL=m
431CONFIG_IP6_NF_MATCH_OWNER=m 474CONFIG_IP6_NF_MATCH_OWNER=m
432CONFIG_IP6_NF_MATCH_IPV6HEADER=m 475CONFIG_IP6_NF_MATCH_IPV6HEADER=m
433CONFIG_IP6_NF_MATCH_AH=m 476CONFIG_IP6_NF_MATCH_AH=m
477CONFIG_IP6_NF_MATCH_MH=m
434CONFIG_IP6_NF_MATCH_EUI64=m 478CONFIG_IP6_NF_MATCH_EUI64=m
435CONFIG_IP6_NF_FILTER=m 479CONFIG_IP6_NF_FILTER=m
436CONFIG_IP6_NF_TARGET_LOG=m 480CONFIG_IP6_NF_TARGET_LOG=m
@@ -493,7 +537,6 @@ CONFIG_LLC=m
493# CONFIG_ATALK is not set 537# CONFIG_ATALK is not set
494# CONFIG_X25 is not set 538# CONFIG_X25 is not set
495# CONFIG_LAPB is not set 539# CONFIG_LAPB is not set
496# CONFIG_NET_DIVERT is not set
497# CONFIG_ECONET is not set 540# CONFIG_ECONET is not set
498# CONFIG_WAN_ROUTER is not set 541# CONFIG_WAN_ROUTER is not set
499 542
@@ -501,6 +544,7 @@ CONFIG_LLC=m
501# QoS and/or fair queueing 544# QoS and/or fair queueing
502# 545#
503CONFIG_NET_SCHED=y 546CONFIG_NET_SCHED=y
547CONFIG_NET_SCH_FIFO=y
504CONFIG_NET_SCH_CLK_JIFFIES=y 548CONFIG_NET_SCH_CLK_JIFFIES=y
505# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 549# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
506# CONFIG_NET_SCH_CLK_CPU is not set 550# CONFIG_NET_SCH_CLK_CPU is not set
@@ -575,6 +619,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
575CONFIG_IEEE80211_SOFTMAC=m 619CONFIG_IEEE80211_SOFTMAC=m
576# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 620# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
577CONFIG_WIRELESS_EXT=y 621CONFIG_WIRELESS_EXT=y
622CONFIG_FIB_RULES=y
578 623
579# 624#
580# Device Drivers 625# Device Drivers
@@ -606,22 +651,22 @@ CONFIG_PARPORT_PC=m
606CONFIG_PARPORT_SERIAL=m 651CONFIG_PARPORT_SERIAL=m
607# CONFIG_PARPORT_PC_FIFO is not set 652# CONFIG_PARPORT_PC_FIFO is not set
608# CONFIG_PARPORT_PC_SUPERIO is not set 653# CONFIG_PARPORT_PC_SUPERIO is not set
609CONFIG_PARPORT_NOT_PC=y
610# CONFIG_PARPORT_GSC is not set 654# CONFIG_PARPORT_GSC is not set
611# CONFIG_PARPORT_AX88796 is not set 655# CONFIG_PARPORT_AX88796 is not set
612CONFIG_PARPORT_1284=y 656CONFIG_PARPORT_1284=y
657CONFIG_PARPORT_NOT_PC=y
613 658
614# 659#
615# Plug and Play support 660# Plug and Play support
616# 661#
617# CONFIG_PNP is not set 662# CONFIG_PNP is not set
663# CONFIG_PNPACPI is not set
618 664
619# 665#
620# Block devices 666# Block devices
621# 667#
622CONFIG_BLK_DEV_FD=m 668CONFIG_BLK_DEV_FD=m
623CONFIG_PARIDE=m 669CONFIG_PARIDE=m
624CONFIG_PARIDE_PARPORT=m
625 670
626# 671#
627# Parallel IDE high-level drivers 672# Parallel IDE high-level drivers
@@ -664,6 +709,7 @@ CONFIG_BLK_DEV_UB=m
664CONFIG_BLK_DEV_RAM=m 709CONFIG_BLK_DEV_RAM=m
665CONFIG_BLK_DEV_RAM_COUNT=16 710CONFIG_BLK_DEV_RAM_COUNT=16
666CONFIG_BLK_DEV_RAM_SIZE=4096 711CONFIG_BLK_DEV_RAM_SIZE=4096
712CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
667# CONFIG_BLK_DEV_INITRD is not set 713# CONFIG_BLK_DEV_INITRD is not set
668CONFIG_CDROM_PKTCDVD=m 714CONFIG_CDROM_PKTCDVD=m
669CONFIG_CDROM_PKTCDVD_BUFFERS=8 715CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -671,6 +717,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
671CONFIG_ATA_OVER_ETH=m 717CONFIG_ATA_OVER_ETH=m
672 718
673# 719#
720# Misc devices
721#
722CONFIG_SGI_IOC4=m
723# CONFIG_TIFM_CORE is not set
724
725#
674# ATA/ATAPI/MFM/RLL support 726# ATA/ATAPI/MFM/RLL support
675# 727#
676# CONFIG_IDE is not set 728# CONFIG_IDE is not set
@@ -680,6 +732,8 @@ CONFIG_ATA_OVER_ETH=m
680# 732#
681CONFIG_RAID_ATTRS=m 733CONFIG_RAID_ATTRS=m
682CONFIG_SCSI=y 734CONFIG_SCSI=y
735CONFIG_SCSI_TGT=m
736CONFIG_SCSI_NETLINK=y
683CONFIG_SCSI_PROC_FS=y 737CONFIG_SCSI_PROC_FS=y
684 738
685# 739#
@@ -699,14 +753,17 @@ CONFIG_BLK_DEV_SR_VENDOR=y
699# CONFIG_SCSI_MULTI_LUN is not set 753# CONFIG_SCSI_MULTI_LUN is not set
700CONFIG_SCSI_CONSTANTS=y 754CONFIG_SCSI_CONSTANTS=y
701# CONFIG_SCSI_LOGGING is not set 755# CONFIG_SCSI_LOGGING is not set
756CONFIG_SCSI_SCAN_ASYNC=y
702 757
703# 758#
704# SCSI Transport Attributes 759# SCSI Transports
705# 760#
706CONFIG_SCSI_SPI_ATTRS=y 761CONFIG_SCSI_SPI_ATTRS=y
707CONFIG_SCSI_FC_ATTRS=y 762CONFIG_SCSI_FC_ATTRS=y
708CONFIG_SCSI_ISCSI_ATTRS=m 763CONFIG_SCSI_ISCSI_ATTRS=m
709CONFIG_SCSI_SAS_ATTRS=m 764CONFIG_SCSI_SAS_ATTRS=m
765CONFIG_SCSI_SAS_LIBSAS=m
766# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
710 767
711# 768#
712# SCSI low-level drivers 769# SCSI low-level drivers
@@ -720,14 +777,16 @@ CONFIG_ISCSI_TCP=m
720# CONFIG_SCSI_AIC7XXX is not set 777# CONFIG_SCSI_AIC7XXX is not set
721# CONFIG_SCSI_AIC7XXX_OLD is not set 778# CONFIG_SCSI_AIC7XXX_OLD is not set
722# CONFIG_SCSI_AIC79XX is not set 779# CONFIG_SCSI_AIC79XX is not set
780CONFIG_SCSI_AIC94XX=m
781# CONFIG_AIC94XX_DEBUG is not set
723# CONFIG_SCSI_DPT_I2O is not set 782# CONFIG_SCSI_DPT_I2O is not set
724# CONFIG_SCSI_IN2000 is not set 783# CONFIG_SCSI_IN2000 is not set
784# CONFIG_SCSI_ARCMSR is not set
725CONFIG_MEGARAID_NEWGEN=y 785CONFIG_MEGARAID_NEWGEN=y
726CONFIG_MEGARAID_MM=m 786CONFIG_MEGARAID_MM=m
727CONFIG_MEGARAID_MAILBOX=m 787CONFIG_MEGARAID_MAILBOX=m
728# CONFIG_MEGARAID_LEGACY is not set 788# CONFIG_MEGARAID_LEGACY is not set
729# CONFIG_MEGARAID_SAS is not set 789# CONFIG_MEGARAID_SAS is not set
730# CONFIG_SCSI_SATA is not set
731# CONFIG_SCSI_HPTIOP is not set 790# CONFIG_SCSI_HPTIOP is not set
732# CONFIG_SCSI_DMX3191D is not set 791# CONFIG_SCSI_DMX3191D is not set
733# CONFIG_SCSI_DTC3280 is not set 792# CONFIG_SCSI_DTC3280 is not set
@@ -742,17 +801,19 @@ CONFIG_SCSI_IMM=m
742# CONFIG_SCSI_IZIP_EPP16 is not set 801# CONFIG_SCSI_IZIP_EPP16 is not set
743# CONFIG_SCSI_IZIP_SLOW_CTR is not set 802# CONFIG_SCSI_IZIP_SLOW_CTR is not set
744# CONFIG_SCSI_NCR53C406A is not set 803# CONFIG_SCSI_NCR53C406A is not set
804# CONFIG_SCSI_SNI_53C710 is not set
805# CONFIG_SCSI_STEX is not set
745CONFIG_SCSI_SYM53C8XX_2=y 806CONFIG_SCSI_SYM53C8XX_2=y
746CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 807CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
747CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 808CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
748CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 809CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
749CONFIG_SCSI_SYM53C8XX_MMIO=y 810CONFIG_SCSI_SYM53C8XX_MMIO=y
750# CONFIG_SCSI_IPR is not set
751# CONFIG_SCSI_PAS16 is not set 811# CONFIG_SCSI_PAS16 is not set
752# CONFIG_SCSI_PSI240I is not set 812# CONFIG_SCSI_PSI240I is not set
753# CONFIG_SCSI_QLOGIC_FAS is not set 813# CONFIG_SCSI_QLOGIC_FAS is not set
754# CONFIG_SCSI_QLOGIC_1280 is not set 814# CONFIG_SCSI_QLOGIC_1280 is not set
755# CONFIG_SCSI_QLA_FC is not set 815# CONFIG_SCSI_QLA_FC is not set
816# CONFIG_SCSI_QLA_ISCSI is not set
756# CONFIG_SCSI_LPFC is not set 817# CONFIG_SCSI_LPFC is not set
757# CONFIG_SCSI_SYM53C416 is not set 818# CONFIG_SCSI_SYM53C416 is not set
758# CONFIG_SCSI_DC395x is not set 819# CONFIG_SCSI_DC395x is not set
@@ -760,6 +821,12 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
760# CONFIG_SCSI_T128 is not set 821# CONFIG_SCSI_T128 is not set
761# CONFIG_SCSI_NSP32 is not set 822# CONFIG_SCSI_NSP32 is not set
762# CONFIG_SCSI_DEBUG is not set 823# CONFIG_SCSI_DEBUG is not set
824# CONFIG_SCSI_SRP is not set
825
826#
827# Serial ATA (prod) and Parallel ATA (experimental) drivers
828#
829# CONFIG_ATA is not set
763 830
764# 831#
765# Old CD-ROM drivers (not SCSI, not IDE) 832# Old CD-ROM drivers (not SCSI, not IDE)
@@ -780,6 +847,7 @@ CONFIG_MD_RAID5_RESHAPE=y
780CONFIG_MD_MULTIPATH=m 847CONFIG_MD_MULTIPATH=m
781CONFIG_MD_FAULTY=m 848CONFIG_MD_FAULTY=m
782CONFIG_BLK_DEV_DM=m 849CONFIG_BLK_DEV_DM=m
850# CONFIG_DM_DEBUG is not set
783# CONFIG_DM_CRYPT is not set 851# CONFIG_DM_CRYPT is not set
784CONFIG_DM_SNAPSHOT=m 852CONFIG_DM_SNAPSHOT=m
785CONFIG_DM_MIRROR=m 853CONFIG_DM_MIRROR=m
@@ -834,6 +902,8 @@ CONFIG_LXT_PHY=m
834CONFIG_CICADA_PHY=m 902CONFIG_CICADA_PHY=m
835CONFIG_VITESSE_PHY=m 903CONFIG_VITESSE_PHY=m
836CONFIG_SMSC_PHY=m 904CONFIG_SMSC_PHY=m
905# CONFIG_BROADCOM_PHY is not set
906# CONFIG_FIXED_PHY is not set
837 907
838# 908#
839# Ethernet (10 or 100Mbit) 909# Ethernet (10 or 100Mbit)
@@ -868,6 +938,7 @@ CONFIG_NE2000=m
868# CONFIG_SEEQ8005 is not set 938# CONFIG_SEEQ8005 is not set
869CONFIG_NET_PCI=y 939CONFIG_NET_PCI=y
870CONFIG_PCNET32=y 940CONFIG_PCNET32=y
941# CONFIG_PCNET32_NAPI is not set
871# CONFIG_AMD8111_ETH is not set 942# CONFIG_AMD8111_ETH is not set
872# CONFIG_ADAPTEC_STARFIRE is not set 943# CONFIG_ADAPTEC_STARFIRE is not set
873# CONFIG_AC3200 is not set 944# CONFIG_AC3200 is not set
@@ -888,7 +959,7 @@ CONFIG_EEPRO100=m
888# CONFIG_SUNDANCE is not set 959# CONFIG_SUNDANCE is not set
889# CONFIG_TLAN is not set 960# CONFIG_TLAN is not set
890# CONFIG_VIA_RHINE is not set 961# CONFIG_VIA_RHINE is not set
891# CONFIG_LAN_SAA9730 is not set 962# CONFIG_SC92031 is not set
892# CONFIG_NET_POCKET is not set 963# CONFIG_NET_POCKET is not set
893 964
894# 965#
@@ -908,14 +979,18 @@ CONFIG_EEPRO100=m
908CONFIG_VIA_VELOCITY=m 979CONFIG_VIA_VELOCITY=m
909# CONFIG_TIGON3 is not set 980# CONFIG_TIGON3 is not set
910# CONFIG_BNX2 is not set 981# CONFIG_BNX2 is not set
982CONFIG_QLA3XXX=m
983# CONFIG_ATL1 is not set
911 984
912# 985#
913# Ethernet (10000 Mbit) 986# Ethernet (10000 Mbit)
914# 987#
915# CONFIG_CHELSIO_T1 is not set 988# CONFIG_CHELSIO_T1 is not set
989CONFIG_CHELSIO_T3=m
916# CONFIG_IXGB is not set 990# CONFIG_IXGB is not set
917# CONFIG_S2IO is not set 991# CONFIG_S2IO is not set
918# CONFIG_MYRI10GE is not set 992# CONFIG_MYRI10GE is not set
993CONFIG_NETXEN_NIC=m
919 994
920# 995#
921# Token Ring devices 996# Token Ring devices
@@ -956,6 +1031,7 @@ CONFIG_PLIP=m
956# Input device support 1031# Input device support
957# 1032#
958CONFIG_INPUT=y 1033CONFIG_INPUT=y
1034CONFIG_INPUT_FF_MEMLESS=m
959 1035
960# 1036#
961# Userland interfaces 1037# Userland interfaces
@@ -978,6 +1054,7 @@ CONFIG_KEYBOARD_ATKBD=y
978# CONFIG_KEYBOARD_LKKBD is not set 1054# CONFIG_KEYBOARD_LKKBD is not set
979# CONFIG_KEYBOARD_XTKBD is not set 1055# CONFIG_KEYBOARD_XTKBD is not set
980# CONFIG_KEYBOARD_NEWTON is not set 1056# CONFIG_KEYBOARD_NEWTON is not set
1057# CONFIG_KEYBOARD_STOWAWAY is not set
981CONFIG_INPUT_MOUSE=y 1058CONFIG_INPUT_MOUSE=y
982CONFIG_MOUSE_PS2=y 1059CONFIG_MOUSE_PS2=y
983# CONFIG_MOUSE_SERIAL is not set 1060# CONFIG_MOUSE_SERIAL is not set
@@ -1051,10 +1128,6 @@ CONFIG_RTC=m
1051# CONFIG_DTLK is not set 1128# CONFIG_DTLK is not set
1052# CONFIG_R3964 is not set 1129# CONFIG_R3964 is not set
1053# CONFIG_APPLICOM is not set 1130# CONFIG_APPLICOM is not set
1054
1055#
1056# Ftape, the floppy tape device driver
1057#
1058# CONFIG_DRM is not set 1131# CONFIG_DRM is not set
1059# CONFIG_RAW_DRIVER is not set 1132# CONFIG_RAW_DRIVER is not set
1060 1133
@@ -1062,7 +1135,6 @@ CONFIG_RTC=m
1062# TPM devices 1135# TPM devices
1063# 1136#
1064# CONFIG_TCG_TPM is not set 1137# CONFIG_TCG_TPM is not set
1065# CONFIG_TELCLOCK is not set
1066 1138
1067# 1139#
1068# I2C support 1140# I2C support
@@ -1101,14 +1173,9 @@ CONFIG_W1_CON=y
1101# CONFIG_HWMON_VID is not set 1173# CONFIG_HWMON_VID is not set
1102 1174
1103# 1175#
1104# Misc devices
1105#
1106
1107#
1108# Multimedia devices 1176# Multimedia devices
1109# 1177#
1110# CONFIG_VIDEO_DEV is not set 1178# CONFIG_VIDEO_DEV is not set
1111CONFIG_VIDEO_V4L2=y
1112 1179
1113# 1180#
1114# Digital Video Broadcasting Devices 1181# Digital Video Broadcasting Devices
@@ -1129,6 +1196,7 @@ CONFIG_VGA_CONSOLE=y
1129# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1196# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1130# CONFIG_MDA_CONSOLE is not set 1197# CONFIG_MDA_CONSOLE is not set
1131CONFIG_DUMMY_CONSOLE=y 1198CONFIG_DUMMY_CONSOLE=y
1199# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1132 1200
1133# 1201#
1134# Sound 1202# Sound
@@ -1136,6 +1204,12 @@ CONFIG_DUMMY_CONSOLE=y
1136# CONFIG_SOUND is not set 1204# CONFIG_SOUND is not set
1137 1205
1138# 1206#
1207# HID Devices
1208#
1209CONFIG_HID=y
1210# CONFIG_HID_DEBUG is not set
1211
1212#
1139# USB support 1213# USB support
1140# 1214#
1141CONFIG_USB_ARCH_HAS_HCD=y 1215CONFIG_USB_ARCH_HAS_HCD=y
@@ -1148,8 +1222,8 @@ CONFIG_USB=m
1148# Miscellaneous USB options 1222# Miscellaneous USB options
1149# 1223#
1150CONFIG_USB_DEVICEFS=y 1224CONFIG_USB_DEVICEFS=y
1151# CONFIG_USB_BANDWIDTH is not set
1152# CONFIG_USB_DYNAMIC_MINORS is not set 1225# CONFIG_USB_DYNAMIC_MINORS is not set
1226# CONFIG_USB_SUSPEND is not set
1153# CONFIG_USB_OTG is not set 1227# CONFIG_USB_OTG is not set
1154 1228
1155# 1229#
@@ -1159,9 +1233,11 @@ CONFIG_USB_EHCI_HCD=m
1159# CONFIG_USB_EHCI_SPLIT_ISO is not set 1233# CONFIG_USB_EHCI_SPLIT_ISO is not set
1160# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1234# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1161# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1235# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1236# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1162# CONFIG_USB_ISP116X_HCD is not set 1237# CONFIG_USB_ISP116X_HCD is not set
1163CONFIG_USB_OHCI_HCD=m 1238CONFIG_USB_OHCI_HCD=m
1164# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1239# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1240# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1165CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1241CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1166CONFIG_USB_UHCI_HCD=m 1242CONFIG_USB_UHCI_HCD=m
1167# CONFIG_USB_SL811_HCD is not set 1243# CONFIG_USB_SL811_HCD is not set
@@ -1189,18 +1265,20 @@ CONFIG_USB_STORAGE_SDDR09=y
1189CONFIG_USB_STORAGE_SDDR55=y 1265CONFIG_USB_STORAGE_SDDR55=y
1190CONFIG_USB_STORAGE_JUMPSHOT=y 1266CONFIG_USB_STORAGE_JUMPSHOT=y
1191# CONFIG_USB_STORAGE_ALAUDA is not set 1267# CONFIG_USB_STORAGE_ALAUDA is not set
1268# CONFIG_USB_STORAGE_KARMA is not set
1192# CONFIG_USB_LIBUSUAL is not set 1269# CONFIG_USB_LIBUSUAL is not set
1193 1270
1194# 1271#
1195# USB Input Devices 1272# USB Input Devices
1196# 1273#
1197CONFIG_USB_HID=m 1274CONFIG_USB_HID=m
1198CONFIG_USB_HIDINPUT=y
1199# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1275# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1200CONFIG_HID_FF=y 1276CONFIG_HID_FF=y
1201CONFIG_HID_PID=y 1277CONFIG_HID_PID=y
1202CONFIG_LOGITECH_FF=y 1278CONFIG_LOGITECH_FF=y
1279# CONFIG_PANTHERLORD_FF is not set
1203CONFIG_THRUSTMASTER_FF=y 1280CONFIG_THRUSTMASTER_FF=y
1281# CONFIG_ZEROPLUS_FF is not set
1204CONFIG_USB_HIDDEV=y 1282CONFIG_USB_HIDDEV=y
1205 1283
1206# 1284#
@@ -1220,6 +1298,7 @@ CONFIG_USB_XPAD=m
1220# CONFIG_USB_ATI_REMOTE2 is not set 1298# CONFIG_USB_ATI_REMOTE2 is not set
1221# CONFIG_USB_KEYSPAN_REMOTE is not set 1299# CONFIG_USB_KEYSPAN_REMOTE is not set
1222# CONFIG_USB_APPLETOUCH is not set 1300# CONFIG_USB_APPLETOUCH is not set
1301# CONFIG_USB_GTCO is not set
1223 1302
1224# 1303#
1225# USB Imaging devices 1304# USB Imaging devices
@@ -1234,12 +1313,14 @@ CONFIG_USB_CATC=m
1234CONFIG_USB_KAWETH=m 1313CONFIG_USB_KAWETH=m
1235CONFIG_USB_PEGASUS=m 1314CONFIG_USB_PEGASUS=m
1236CONFIG_USB_RTL8150=m 1315CONFIG_USB_RTL8150=m
1316CONFIG_USB_USBNET_MII=m
1237CONFIG_USB_USBNET=m 1317CONFIG_USB_USBNET=m
1238CONFIG_USB_NET_AX8817X=m 1318CONFIG_USB_NET_AX8817X=m
1239CONFIG_USB_NET_CDCETHER=m 1319CONFIG_USB_NET_CDCETHER=m
1240# CONFIG_USB_NET_GL620A is not set 1320# CONFIG_USB_NET_GL620A is not set
1241CONFIG_USB_NET_NET1080=m 1321CONFIG_USB_NET_NET1080=m
1242# CONFIG_USB_NET_PLUSB is not set 1322# CONFIG_USB_NET_PLUSB is not set
1323# CONFIG_USB_NET_MCS7830 is not set
1243# CONFIG_USB_NET_RNDIS_HOST is not set 1324# CONFIG_USB_NET_RNDIS_HOST is not set
1244# CONFIG_USB_NET_CDC_SUBSET is not set 1325# CONFIG_USB_NET_CDC_SUBSET is not set
1245CONFIG_USB_NET_ZAURUS=m 1326CONFIG_USB_NET_ZAURUS=m
@@ -1255,8 +1336,8 @@ CONFIG_USB_USS720=m
1255# 1336#
1256CONFIG_USB_SERIAL=m 1337CONFIG_USB_SERIAL=m
1257CONFIG_USB_SERIAL_GENERIC=y 1338CONFIG_USB_SERIAL_GENERIC=y
1339# CONFIG_USB_SERIAL_AIRCABLE is not set
1258CONFIG_USB_SERIAL_AIRPRIME=m 1340CONFIG_USB_SERIAL_AIRPRIME=m
1259CONFIG_USB_SERIAL_ANYDATA=m
1260# CONFIG_USB_SERIAL_ARK3116 is not set 1341# CONFIG_USB_SERIAL_ARK3116 is not set
1261CONFIG_USB_SERIAL_BELKIN=m 1342CONFIG_USB_SERIAL_BELKIN=m
1262CONFIG_USB_SERIAL_WHITEHEAT=m 1343CONFIG_USB_SERIAL_WHITEHEAT=m
@@ -1290,16 +1371,20 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1290CONFIG_USB_SERIAL_KLSI=m 1371CONFIG_USB_SERIAL_KLSI=m
1291CONFIG_USB_SERIAL_KOBIL_SCT=m 1372CONFIG_USB_SERIAL_KOBIL_SCT=m
1292CONFIG_USB_SERIAL_MCT_U232=m 1373CONFIG_USB_SERIAL_MCT_U232=m
1374# CONFIG_USB_SERIAL_MOS7720 is not set
1375# CONFIG_USB_SERIAL_MOS7840 is not set
1293# CONFIG_USB_SERIAL_NAVMAN is not set 1376# CONFIG_USB_SERIAL_NAVMAN is not set
1294CONFIG_USB_SERIAL_PL2303=m 1377CONFIG_USB_SERIAL_PL2303=m
1295CONFIG_USB_SERIAL_HP4X=m 1378CONFIG_USB_SERIAL_HP4X=m
1296CONFIG_USB_SERIAL_SAFE=m 1379CONFIG_USB_SERIAL_SAFE=m
1297CONFIG_USB_SERIAL_SAFE_PADDED=y 1380CONFIG_USB_SERIAL_SAFE_PADDED=y
1381# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1298# CONFIG_USB_SERIAL_TI is not set 1382# CONFIG_USB_SERIAL_TI is not set
1299CONFIG_USB_SERIAL_CYBERJACK=m 1383CONFIG_USB_SERIAL_CYBERJACK=m
1300CONFIG_USB_SERIAL_XIRCOM=m 1384CONFIG_USB_SERIAL_XIRCOM=m
1301# CONFIG_USB_SERIAL_OPTION is not set 1385# CONFIG_USB_SERIAL_OPTION is not set
1302CONFIG_USB_SERIAL_OMNINET=m 1386CONFIG_USB_SERIAL_OMNINET=m
1387# CONFIG_USB_SERIAL_DEBUG is not set
1303CONFIG_USB_EZUSB=y 1388CONFIG_USB_EZUSB=y
1304 1389
1305# 1390#
@@ -1307,20 +1392,23 @@ CONFIG_USB_EZUSB=y
1307# 1392#
1308# CONFIG_USB_EMI62 is not set 1393# CONFIG_USB_EMI62 is not set
1309# CONFIG_USB_EMI26 is not set 1394# CONFIG_USB_EMI26 is not set
1395# CONFIG_USB_ADUTUX is not set
1310CONFIG_USB_AUERSWALD=m 1396CONFIG_USB_AUERSWALD=m
1311CONFIG_USB_RIO500=m 1397CONFIG_USB_RIO500=m
1312CONFIG_USB_LEGOTOWER=m 1398CONFIG_USB_LEGOTOWER=m
1313CONFIG_USB_LCD=m 1399CONFIG_USB_LCD=m
1400# CONFIG_USB_BERRY_CHARGE is not set
1314CONFIG_USB_LED=m 1401CONFIG_USB_LED=m
1315# CONFIG_USB_CY7C63 is not set 1402# CONFIG_USB_CYPRESS_CY7C63 is not set
1316CONFIG_USB_CYTHERM=m 1403CONFIG_USB_CYTHERM=m
1317CONFIG_USB_PHIDGETKIT=m 1404# CONFIG_USB_PHIDGET is not set
1318CONFIG_USB_PHIDGETSERVO=m
1319# CONFIG_USB_IDMOUSE is not set 1405# CONFIG_USB_IDMOUSE is not set
1406# CONFIG_USB_FTDI_ELAN is not set
1320# CONFIG_USB_APPLEDISPLAY is not set 1407# CONFIG_USB_APPLEDISPLAY is not set
1321CONFIG_USB_SISUSBVGA=m 1408CONFIG_USB_SISUSBVGA=m
1322# CONFIG_USB_SISUSBVGA_CON is not set 1409# CONFIG_USB_SISUSBVGA_CON is not set
1323CONFIG_USB_LD=m 1410CONFIG_USB_LD=m
1411# CONFIG_USB_TRANCEVIBRATOR is not set
1324CONFIG_USB_TEST=m 1412CONFIG_USB_TEST=m
1325 1413
1326# 1414#
@@ -1378,6 +1466,15 @@ CONFIG_USB_TEST=m
1378# 1466#
1379 1467
1380# 1468#
1469# Auxiliary Display support
1470#
1471# CONFIG_KS0108 is not set
1472
1473#
1474# Virtualization
1475#
1476
1477#
1381# File systems 1478# File systems
1382# 1479#
1383CONFIG_EXT2_FS=m 1480CONFIG_EXT2_FS=m
@@ -1387,6 +1484,7 @@ CONFIG_EXT3_FS=y
1387CONFIG_EXT3_FS_XATTR=y 1484CONFIG_EXT3_FS_XATTR=y
1388# CONFIG_EXT3_FS_POSIX_ACL is not set 1485# CONFIG_EXT3_FS_POSIX_ACL is not set
1389# CONFIG_EXT3_FS_SECURITY is not set 1486# CONFIG_EXT3_FS_SECURITY is not set
1487# CONFIG_EXT4DEV_FS is not set
1390CONFIG_JBD=y 1488CONFIG_JBD=y
1391# CONFIG_JBD_DEBUG is not set 1489# CONFIG_JBD_DEBUG is not set
1392CONFIG_FS_MBCACHE=y 1490CONFIG_FS_MBCACHE=y
@@ -1403,6 +1501,7 @@ CONFIG_XFS_QUOTA=y
1403CONFIG_XFS_SECURITY=y 1501CONFIG_XFS_SECURITY=y
1404# CONFIG_XFS_POSIX_ACL is not set 1502# CONFIG_XFS_POSIX_ACL is not set
1405# CONFIG_XFS_RT is not set 1503# CONFIG_XFS_RT is not set
1504# CONFIG_GFS2_FS is not set
1406# CONFIG_OCFS2_FS is not set 1505# CONFIG_OCFS2_FS is not set
1407CONFIG_MINIX_FS=m 1506CONFIG_MINIX_FS=m
1408CONFIG_ROMFS_FS=m 1507CONFIG_ROMFS_FS=m
@@ -1414,6 +1513,7 @@ CONFIG_DNOTIFY=y
1414CONFIG_AUTOFS_FS=m 1513CONFIG_AUTOFS_FS=m
1415CONFIG_AUTOFS4_FS=m 1514CONFIG_AUTOFS4_FS=m
1416CONFIG_FUSE_FS=m 1515CONFIG_FUSE_FS=m
1516CONFIG_GENERIC_ACL=y
1417 1517
1418# 1518#
1419# CD-ROM/DVD Filesystems 1519# CD-ROM/DVD Filesystems
@@ -1421,7 +1521,6 @@ CONFIG_FUSE_FS=m
1421CONFIG_ISO9660_FS=m 1521CONFIG_ISO9660_FS=m
1422CONFIG_JOLIET=y 1522CONFIG_JOLIET=y
1423CONFIG_ZISOFS=y 1523CONFIG_ZISOFS=y
1424CONFIG_ZISOFS_FS=m
1425CONFIG_UDF_FS=m 1524CONFIG_UDF_FS=m
1426CONFIG_UDF_NLS=y 1525CONFIG_UDF_NLS=y
1427 1526
@@ -1442,11 +1541,13 @@ CONFIG_NTFS_FS=m
1442# 1541#
1443CONFIG_PROC_FS=y 1542CONFIG_PROC_FS=y
1444CONFIG_PROC_KCORE=y 1543CONFIG_PROC_KCORE=y
1544CONFIG_PROC_SYSCTL=y
1445CONFIG_SYSFS=y 1545CONFIG_SYSFS=y
1446CONFIG_TMPFS=y 1546CONFIG_TMPFS=y
1547CONFIG_TMPFS_POSIX_ACL=y
1447# CONFIG_HUGETLB_PAGE is not set 1548# CONFIG_HUGETLB_PAGE is not set
1448CONFIG_RAMFS=y 1549CONFIG_RAMFS=y
1449# CONFIG_CONFIGFS_FS is not set 1550CONFIG_CONFIGFS_FS=m
1450 1551
1451# 1552#
1452# Miscellaneous filesystems 1553# Miscellaneous filesystems
@@ -1454,6 +1555,7 @@ CONFIG_RAMFS=y
1454CONFIG_ADFS_FS=m 1555CONFIG_ADFS_FS=m
1455# CONFIG_ADFS_FS_RW is not set 1556# CONFIG_ADFS_FS_RW is not set
1456CONFIG_AFFS_FS=m 1557CONFIG_AFFS_FS=m
1558# CONFIG_ECRYPT_FS is not set
1457CONFIG_HFS_FS=m 1559CONFIG_HFS_FS=m
1458# CONFIG_HFSPLUS_FS is not set 1560# CONFIG_HFSPLUS_FS is not set
1459CONFIG_BEFS_FS=m 1561CONFIG_BEFS_FS=m
@@ -1579,6 +1681,14 @@ CONFIG_NLS_KOI8_U=m
1579CONFIG_NLS_UTF8=m 1681CONFIG_NLS_UTF8=m
1580 1682
1581# 1683#
1684# Distributed Lock Manager
1685#
1686CONFIG_DLM=m
1687CONFIG_DLM_TCP=y
1688# CONFIG_DLM_SCTP is not set
1689# CONFIG_DLM_DEBUG is not set
1690
1691#
1582# Profiling support 1692# Profiling support
1583# 1693#
1584# CONFIG_PROFILING is not set 1694# CONFIG_PROFILING is not set
@@ -1588,11 +1698,13 @@ CONFIG_NLS_UTF8=m
1588# 1698#
1589CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1699CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1590# CONFIG_PRINTK_TIME is not set 1700# CONFIG_PRINTK_TIME is not set
1701CONFIG_ENABLE_MUST_CHECK=y
1591# CONFIG_MAGIC_SYSRQ is not set 1702# CONFIG_MAGIC_SYSRQ is not set
1592# CONFIG_UNUSED_SYMBOLS is not set 1703# CONFIG_UNUSED_SYMBOLS is not set
1704# CONFIG_DEBUG_FS is not set
1705# CONFIG_HEADERS_CHECK is not set
1593# CONFIG_DEBUG_KERNEL is not set 1706# CONFIG_DEBUG_KERNEL is not set
1594CONFIG_LOG_BUF_SHIFT=14 1707CONFIG_LOG_BUF_SHIFT=14
1595# CONFIG_DEBUG_FS is not set
1596CONFIG_CROSSCOMPILE=y 1708CONFIG_CROSSCOMPILE=y
1597CONFIG_CMDLINE="" 1709CONFIG_CMDLINE=""
1598 1710
@@ -1607,18 +1719,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1607# Cryptographic options 1719# Cryptographic options
1608# 1720#
1609CONFIG_CRYPTO=y 1721CONFIG_CRYPTO=y
1722CONFIG_CRYPTO_ALGAPI=y
1723CONFIG_CRYPTO_BLKCIPHER=m
1724CONFIG_CRYPTO_HASH=y
1725CONFIG_CRYPTO_MANAGER=y
1610CONFIG_CRYPTO_HMAC=y 1726CONFIG_CRYPTO_HMAC=y
1727CONFIG_CRYPTO_XCBC=m
1611CONFIG_CRYPTO_NULL=m 1728CONFIG_CRYPTO_NULL=m
1612CONFIG_CRYPTO_MD4=m 1729CONFIG_CRYPTO_MD4=m
1613CONFIG_CRYPTO_MD5=m 1730CONFIG_CRYPTO_MD5=y
1614CONFIG_CRYPTO_SHA1=m 1731CONFIG_CRYPTO_SHA1=m
1615CONFIG_CRYPTO_SHA256=m 1732CONFIG_CRYPTO_SHA256=m
1616CONFIG_CRYPTO_SHA512=m 1733CONFIG_CRYPTO_SHA512=m
1617CONFIG_CRYPTO_WP512=m 1734CONFIG_CRYPTO_WP512=m
1618CONFIG_CRYPTO_TGR192=m 1735CONFIG_CRYPTO_TGR192=m
1736CONFIG_CRYPTO_GF128MUL=m
1737CONFIG_CRYPTO_ECB=m
1738CONFIG_CRYPTO_CBC=m
1739CONFIG_CRYPTO_PCBC=m
1740CONFIG_CRYPTO_LRW=m
1619CONFIG_CRYPTO_DES=m 1741CONFIG_CRYPTO_DES=m
1742CONFIG_CRYPTO_FCRYPT=m
1620CONFIG_CRYPTO_BLOWFISH=m 1743CONFIG_CRYPTO_BLOWFISH=m
1621CONFIG_CRYPTO_TWOFISH=m 1744CONFIG_CRYPTO_TWOFISH=m
1745CONFIG_CRYPTO_TWOFISH_COMMON=m
1622CONFIG_CRYPTO_SERPENT=m 1746CONFIG_CRYPTO_SERPENT=m
1623CONFIG_CRYPTO_AES=m 1747CONFIG_CRYPTO_AES=m
1624CONFIG_CRYPTO_CAST5=m 1748CONFIG_CRYPTO_CAST5=m
@@ -1630,6 +1754,7 @@ CONFIG_CRYPTO_ANUBIS=m
1630CONFIG_CRYPTO_DEFLATE=m 1754CONFIG_CRYPTO_DEFLATE=m
1631CONFIG_CRYPTO_MICHAEL_MIC=m 1755CONFIG_CRYPTO_MICHAEL_MIC=m
1632CONFIG_CRYPTO_CRC32C=m 1756CONFIG_CRYPTO_CRC32C=m
1757CONFIG_CRYPTO_CAMELLIA=m
1633# CONFIG_CRYPTO_TEST is not set 1758# CONFIG_CRYPTO_TEST is not set
1634 1759
1635# 1760#
@@ -1639,6 +1764,7 @@ CONFIG_CRYPTO_CRC32C=m
1639# 1764#
1640# Library routines 1765# Library routines
1641# 1766#
1767CONFIG_BITREVERSE=y
1642CONFIG_CRC_CCITT=m 1768CONFIG_CRC_CCITT=m
1643CONFIG_CRC16=m 1769CONFIG_CRC16=m
1644CONFIG_CRC32=y 1770CONFIG_CRC32=y
@@ -1650,3 +1776,5 @@ CONFIG_TEXTSEARCH_KMP=m
1650CONFIG_TEXTSEARCH_BM=m 1776CONFIG_TEXTSEARCH_BM=m
1651CONFIG_TEXTSEARCH_FSM=m 1777CONFIG_TEXTSEARCH_FSM=m
1652CONFIG_PLIST=y 1778CONFIG_PLIST=y
1779CONFIG_HAS_IOMEM=y
1780CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index e33c17200b39..6c4f09a381e2 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:19 2006 4# Tue Feb 20 21:47:40 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -81,10 +80,14 @@ CONFIG_SIBYTE_CFE=y
81# CONFIG_SIBYTE_SB1250_PROF is not set 80# CONFIG_SIBYTE_SB1250_PROF is not set
82# CONFIG_SIBYTE_TBPROF is not set 81# CONFIG_SIBYTE_TBPROF is not set
83CONFIG_RWSEM_GENERIC_SPINLOCK=y 82CONFIG_RWSEM_GENERIC_SPINLOCK=y
83# CONFIG_ARCH_HAS_ILOG2_U32 is not set
84# CONFIG_ARCH_HAS_ILOG2_U64 is not set
84CONFIG_GENERIC_FIND_NEXT_BIT=y 85CONFIG_GENERIC_FIND_NEXT_BIT=y
85CONFIG_GENERIC_HWEIGHT=y 86CONFIG_GENERIC_HWEIGHT=y
86CONFIG_GENERIC_CALIBRATE_DELAY=y 87CONFIG_GENERIC_CALIBRATE_DELAY=y
88CONFIG_GENERIC_TIME=y
87CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 89CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
90# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
88CONFIG_DMA_COHERENT=y 91CONFIG_DMA_COHERENT=y
89CONFIG_CPU_BIG_ENDIAN=y 92CONFIG_CPU_BIG_ENDIAN=y
90# CONFIG_CPU_LITTLE_ENDIAN is not set 93# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -117,6 +120,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
117# CONFIG_CPU_RM9000 is not set 120# CONFIG_CPU_RM9000 is not set
118CONFIG_CPU_SB1=y 121CONFIG_CPU_SB1=y
119CONFIG_SYS_HAS_CPU_SB1=y 122CONFIG_SYS_HAS_CPU_SB1=y
123CONFIG_WEAK_ORDERING=y
120CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 124CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
121CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 125CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
122CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 126CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -134,8 +138,8 @@ CONFIG_PAGE_SIZE_4KB=y
134# CONFIG_SIBYTE_DMA_PAGEOPS is not set 138# CONFIG_SIBYTE_DMA_PAGEOPS is not set
135CONFIG_CPU_HAS_PREFETCH=y 139CONFIG_CPU_HAS_PREFETCH=y
136CONFIG_MIPS_MT_DISABLED=y 140CONFIG_MIPS_MT_DISABLED=y
137# CONFIG_MIPS_MT_SMTC is not set
138# CONFIG_MIPS_MT_SMP is not set 141# CONFIG_MIPS_MT_SMP is not set
142# CONFIG_MIPS_MT_SMTC is not set
139# CONFIG_MIPS_VPE_LOADER is not set 143# CONFIG_MIPS_VPE_LOADER is not set
140CONFIG_SB1_PASS_1_WORKAROUNDS=y 144CONFIG_SB1_PASS_1_WORKAROUNDS=y
141CONFIG_CPU_HAS_LLSC=y 145CONFIG_CPU_HAS_LLSC=y
@@ -155,8 +159,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y
155# CONFIG_SPARSEMEM_STATIC is not set 159# CONFIG_SPARSEMEM_STATIC is not set
156CONFIG_SPLIT_PTLOCK_CPUS=4 160CONFIG_SPLIT_PTLOCK_CPUS=4
157CONFIG_RESOURCES_64BIT=y 161CONFIG_RESOURCES_64BIT=y
162CONFIG_ZONE_DMA_FLAG=1
158CONFIG_SMP=y 163CONFIG_SMP=y
159CONFIG_SYS_SUPPORTS_SMP=y 164CONFIG_SYS_SUPPORTS_SMP=y
165CONFIG_NR_CPUS_DEFAULT_2=y
160CONFIG_NR_CPUS=2 166CONFIG_NR_CPUS=2
161# CONFIG_HZ_48 is not set 167# CONFIG_HZ_48 is not set
162# CONFIG_HZ_100 is not set 168# CONFIG_HZ_100 is not set
@@ -171,6 +177,7 @@ CONFIG_PREEMPT_NONE=y
171# CONFIG_PREEMPT_VOLUNTARY is not set 177# CONFIG_PREEMPT_VOLUNTARY is not set
172# CONFIG_PREEMPT is not set 178# CONFIG_PREEMPT is not set
173CONFIG_PREEMPT_BKL=y 179CONFIG_PREEMPT_BKL=y
180# CONFIG_KEXEC is not set
174CONFIG_LOCKDEP_SUPPORT=y 181CONFIG_LOCKDEP_SUPPORT=y
175CONFIG_STACKTRACE_SUPPORT=y 182CONFIG_STACKTRACE_SUPPORT=y
176CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 183CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -189,16 +196,22 @@ CONFIG_LOCALVERSION=""
189CONFIG_LOCALVERSION_AUTO=y 196CONFIG_LOCALVERSION_AUTO=y
190CONFIG_SWAP=y 197CONFIG_SWAP=y
191CONFIG_SYSVIPC=y 198CONFIG_SYSVIPC=y
199# CONFIG_IPC_NS is not set
200CONFIG_SYSVIPC_SYSCTL=y
192# CONFIG_POSIX_MQUEUE is not set 201# CONFIG_POSIX_MQUEUE is not set
193# CONFIG_BSD_PROCESS_ACCT is not set 202# CONFIG_BSD_PROCESS_ACCT is not set
194CONFIG_SYSCTL=y 203# CONFIG_TASKSTATS is not set
204# CONFIG_UTS_NS is not set
195# CONFIG_AUDIT is not set 205# CONFIG_AUDIT is not set
196# CONFIG_IKCONFIG is not set 206# CONFIG_IKCONFIG is not set
197CONFIG_CPUSETS=y 207CONFIG_CPUSETS=y
208CONFIG_SYSFS_DEPRECATED=y
198CONFIG_RELAY=y 209CONFIG_RELAY=y
199CONFIG_INITRAMFS_SOURCE="" 210CONFIG_INITRAMFS_SOURCE=""
200# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 211# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
212CONFIG_SYSCTL=y
201CONFIG_EMBEDDED=y 213CONFIG_EMBEDDED=y
214CONFIG_SYSCTL_SYSCALL=y
202CONFIG_KALLSYMS=y 215CONFIG_KALLSYMS=y
203# CONFIG_KALLSYMS_EXTRA_PASS is not set 216# CONFIG_KALLSYMS_EXTRA_PASS is not set
204CONFIG_HOTPLUG=y 217CONFIG_HOTPLUG=y
@@ -206,12 +219,12 @@ CONFIG_PRINTK=y
206CONFIG_BUG=y 219CONFIG_BUG=y
207CONFIG_ELF_CORE=y 220CONFIG_ELF_CORE=y
208CONFIG_BASE_FULL=y 221CONFIG_BASE_FULL=y
209CONFIG_RT_MUTEXES=y
210CONFIG_FUTEX=y 222CONFIG_FUTEX=y
211CONFIG_EPOLL=y 223CONFIG_EPOLL=y
212CONFIG_SHMEM=y 224CONFIG_SHMEM=y
213CONFIG_SLAB=y 225CONFIG_SLAB=y
214CONFIG_VM_EVENT_COUNTERS=y 226CONFIG_VM_EVENT_COUNTERS=y
227CONFIG_RT_MUTEXES=y
215# CONFIG_TINY_SHMEM is not set 228# CONFIG_TINY_SHMEM is not set
216CONFIG_BASE_SMALL=0 229CONFIG_BASE_SMALL=0
217# CONFIG_SLOB is not set 230# CONFIG_SLOB is not set
@@ -230,6 +243,7 @@ CONFIG_STOP_MACHINE=y
230# 243#
231# Block layer 244# Block layer
232# 245#
246CONFIG_BLOCK=y
233# CONFIG_BLK_DEV_IO_TRACE is not set 247# CONFIG_BLK_DEV_IO_TRACE is not set
234 248
235# 249#
@@ -270,11 +284,20 @@ CONFIG_BINFMT_ELF=y
270# CONFIG_BUILD_ELF64 is not set 284# CONFIG_BUILD_ELF64 is not set
271CONFIG_MIPS32_COMPAT=y 285CONFIG_MIPS32_COMPAT=y
272CONFIG_COMPAT=y 286CONFIG_COMPAT=y
287CONFIG_SYSVIPC_COMPAT=y
273CONFIG_MIPS32_O32=y 288CONFIG_MIPS32_O32=y
274# CONFIG_MIPS32_N32 is not set 289# CONFIG_MIPS32_N32 is not set
275CONFIG_BINFMT_ELF32=y 290CONFIG_BINFMT_ELF32=y
276 291
277# 292#
293# Power management options
294#
295CONFIG_PM=y
296# CONFIG_PM_LEGACY is not set
297# CONFIG_PM_DEBUG is not set
298# CONFIG_PM_SYSFS_DEPRECATED is not set
299
300#
278# Networking 301# Networking
279# 302#
280CONFIG_NET=y 303CONFIG_NET=y
@@ -288,7 +311,10 @@ CONFIG_PACKET_MMAP=y
288CONFIG_UNIX=y 311CONFIG_UNIX=y
289CONFIG_XFRM=y 312CONFIG_XFRM=y
290CONFIG_XFRM_USER=m 313CONFIG_XFRM_USER=m
314# CONFIG_XFRM_SUB_POLICY is not set
315CONFIG_XFRM_MIGRATE=y
291CONFIG_NET_KEY=y 316CONFIG_NET_KEY=y
317CONFIG_NET_KEY_MIGRATE=y
292CONFIG_INET=y 318CONFIG_INET=y
293# CONFIG_IP_MULTICAST is not set 319# CONFIG_IP_MULTICAST is not set
294# CONFIG_IP_ADVANCED_ROUTER is not set 320# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -308,10 +334,13 @@ CONFIG_IP_PNP_BOOTP=y
308# CONFIG_INET_TUNNEL is not set 334# CONFIG_INET_TUNNEL is not set
309CONFIG_INET_XFRM_MODE_TRANSPORT=m 335CONFIG_INET_XFRM_MODE_TRANSPORT=m
310CONFIG_INET_XFRM_MODE_TUNNEL=m 336CONFIG_INET_XFRM_MODE_TUNNEL=m
337CONFIG_INET_XFRM_MODE_BEET=m
311CONFIG_INET_DIAG=y 338CONFIG_INET_DIAG=y
312CONFIG_INET_TCP_DIAG=y 339CONFIG_INET_TCP_DIAG=y
313# CONFIG_TCP_CONG_ADVANCED is not set 340# CONFIG_TCP_CONG_ADVANCED is not set
314CONFIG_TCP_CONG_BIC=y 341CONFIG_TCP_CONG_CUBIC=y
342CONFIG_DEFAULT_TCP_CONG="cubic"
343CONFIG_TCP_MD5SIG=y
315# CONFIG_IPV6 is not set 344# CONFIG_IPV6 is not set
316# CONFIG_INET6_XFRM_TUNNEL is not set 345# CONFIG_INET6_XFRM_TUNNEL is not set
317# CONFIG_INET6_TUNNEL is not set 346# CONFIG_INET6_TUNNEL is not set
@@ -341,7 +370,6 @@ CONFIG_NETWORK_SECMARK=y
341# CONFIG_ATALK is not set 370# CONFIG_ATALK is not set
342# CONFIG_X25 is not set 371# CONFIG_X25 is not set
343# CONFIG_LAPB is not set 372# CONFIG_LAPB is not set
344# CONFIG_NET_DIVERT is not set
345# CONFIG_ECONET is not set 373# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 374# CONFIG_WAN_ROUTER is not set
347 375
@@ -395,6 +423,7 @@ CONFIG_CONNECTOR=m
395# 423#
396# Plug and Play support 424# Plug and Play support
397# 425#
426# CONFIG_PNPACPI is not set
398 427
399# 428#
400# Block devices 429# Block devices
@@ -410,6 +439,7 @@ CONFIG_CONNECTOR=m
410CONFIG_BLK_DEV_RAM=y 439CONFIG_BLK_DEV_RAM=y
411CONFIG_BLK_DEV_RAM_COUNT=16 440CONFIG_BLK_DEV_RAM_COUNT=16
412CONFIG_BLK_DEV_RAM_SIZE=9220 441CONFIG_BLK_DEV_RAM_SIZE=9220
442CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
413CONFIG_BLK_DEV_INITRD=y 443CONFIG_BLK_DEV_INITRD=y
414CONFIG_CDROM_PKTCDVD=m 444CONFIG_CDROM_PKTCDVD=m
415CONFIG_CDROM_PKTCDVD_BUFFERS=8 445CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -417,9 +447,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
417CONFIG_ATA_OVER_ETH=m 447CONFIG_ATA_OVER_ETH=m
418 448
419# 449#
450# Misc devices
451#
452CONFIG_SGI_IOC4=m
453# CONFIG_TIFM_CORE is not set
454
455#
420# ATA/ATAPI/MFM/RLL support 456# ATA/ATAPI/MFM/RLL support
421# 457#
422CONFIG_IDE=y 458CONFIG_IDE=y
459CONFIG_IDE_MAX_HWIFS=4
423CONFIG_BLK_DEV_IDE=y 460CONFIG_BLK_DEV_IDE=y
424 461
425# 462#
@@ -449,6 +486,12 @@ CONFIG_IDE_GENERIC=y
449# 486#
450CONFIG_RAID_ATTRS=m 487CONFIG_RAID_ATTRS=m
451# CONFIG_SCSI is not set 488# CONFIG_SCSI is not set
489# CONFIG_SCSI_NETLINK is not set
490
491#
492# Serial ATA (prod) and Parallel ATA (experimental) drivers
493#
494# CONFIG_ATA is not set
452 495
453# 496#
454# Multi-device support (RAID and LVM) 497# Multi-device support (RAID and LVM)
@@ -499,6 +542,8 @@ CONFIG_LXT_PHY=m
499CONFIG_CICADA_PHY=m 542CONFIG_CICADA_PHY=m
500CONFIG_VITESSE_PHY=m 543CONFIG_VITESSE_PHY=m
501CONFIG_SMSC_PHY=m 544CONFIG_SMSC_PHY=m
545# CONFIG_BROADCOM_PHY is not set
546# CONFIG_FIXED_PHY is not set
502 547
503# 548#
504# Ethernet (10 or 100Mbit) 549# Ethernet (10 or 100Mbit)
@@ -535,14 +580,18 @@ CONFIG_NET_SB1250_MAC=y
535# CONFIG_SK98LIN is not set 580# CONFIG_SK98LIN is not set
536# CONFIG_TIGON3 is not set 581# CONFIG_TIGON3 is not set
537# CONFIG_BNX2 is not set 582# CONFIG_BNX2 is not set
583CONFIG_QLA3XXX=m
584# CONFIG_ATL1 is not set
538 585
539# 586#
540# Ethernet (10000 Mbit) 587# Ethernet (10000 Mbit)
541# 588#
542# CONFIG_CHELSIO_T1 is not set 589# CONFIG_CHELSIO_T1 is not set
590CONFIG_CHELSIO_T3=m
543# CONFIG_IXGB is not set 591# CONFIG_IXGB is not set
544# CONFIG_S2IO is not set 592# CONFIG_S2IO is not set
545# CONFIG_MYRI10GE is not set 593# CONFIG_MYRI10GE is not set
594CONFIG_NETXEN_NIC=m
546 595
547# 596#
548# Token Ring devices 597# Token Ring devices
@@ -604,6 +653,7 @@ CONFIG_SERIAL_NONSTANDARD=y
604# CONFIG_DIGIEPCA is not set 653# CONFIG_DIGIEPCA is not set
605# CONFIG_MOXA_INTELLIO is not set 654# CONFIG_MOXA_INTELLIO is not set
606# CONFIG_MOXA_SMARTIO is not set 655# CONFIG_MOXA_SMARTIO is not set
656CONFIG_MOXA_SMARTIO_NEW=m
607# CONFIG_ISI is not set 657# CONFIG_ISI is not set
608# CONFIG_SYNCLINKMP is not set 658# CONFIG_SYNCLINKMP is not set
609# CONFIG_SYNCLINK_GT is not set 659# CONFIG_SYNCLINK_GT is not set
@@ -643,10 +693,6 @@ CONFIG_LEGACY_PTY_COUNT=256
643# CONFIG_DTLK is not set 693# CONFIG_DTLK is not set
644# CONFIG_R3964 is not set 694# CONFIG_R3964 is not set
645# CONFIG_APPLICOM is not set 695# CONFIG_APPLICOM is not set
646
647#
648# Ftape, the floppy tape device driver
649#
650# CONFIG_DRM is not set 696# CONFIG_DRM is not set
651# CONFIG_RAW_DRIVER is not set 697# CONFIG_RAW_DRIVER is not set
652 698
@@ -654,7 +700,6 @@ CONFIG_LEGACY_PTY_COUNT=256
654# TPM devices 700# TPM devices
655# 701#
656# CONFIG_TCG_TPM is not set 702# CONFIG_TCG_TPM is not set
657# CONFIG_TELCLOCK is not set
658 703
659# 704#
660# I2C support 705# I2C support
@@ -679,14 +724,9 @@ CONFIG_LEGACY_PTY_COUNT=256
679# CONFIG_HWMON_VID is not set 724# CONFIG_HWMON_VID is not set
680 725
681# 726#
682# Misc devices
683#
684
685#
686# Multimedia devices 727# Multimedia devices
687# 728#
688# CONFIG_VIDEO_DEV is not set 729# CONFIG_VIDEO_DEV is not set
689CONFIG_VIDEO_V4L2=y
690 730
691# 731#
692# Digital Video Broadcasting Devices 732# Digital Video Broadcasting Devices
@@ -698,6 +738,7 @@ CONFIG_VIDEO_V4L2=y
698# 738#
699# CONFIG_FIRMWARE_EDID is not set 739# CONFIG_FIRMWARE_EDID is not set
700# CONFIG_FB is not set 740# CONFIG_FB is not set
741# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
701 742
702# 743#
703# Sound 744# Sound
@@ -767,6 +808,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
767# 808#
768 809
769# 810#
811# Auxiliary Display support
812#
813
814#
815# Virtualization
816#
817
818#
770# File systems 819# File systems
771# 820#
772CONFIG_EXT2_FS=y 821CONFIG_EXT2_FS=y
@@ -775,11 +824,13 @@ CONFIG_EXT2_FS_POSIX_ACL=y
775CONFIG_EXT2_FS_SECURITY=y 824CONFIG_EXT2_FS_SECURITY=y
776# CONFIG_EXT2_FS_XIP is not set 825# CONFIG_EXT2_FS_XIP is not set
777# CONFIG_EXT3_FS is not set 826# CONFIG_EXT3_FS is not set
827# CONFIG_EXT4DEV_FS is not set
778CONFIG_FS_MBCACHE=y 828CONFIG_FS_MBCACHE=y
779# CONFIG_REISERFS_FS is not set 829# CONFIG_REISERFS_FS is not set
780# CONFIG_JFS_FS is not set 830# CONFIG_JFS_FS is not set
781CONFIG_FS_POSIX_ACL=y 831CONFIG_FS_POSIX_ACL=y
782# CONFIG_XFS_FS is not set 832# CONFIG_XFS_FS is not set
833# CONFIG_GFS2_FS is not set
783# CONFIG_OCFS2_FS is not set 834# CONFIG_OCFS2_FS is not set
784# CONFIG_MINIX_FS is not set 835# CONFIG_MINIX_FS is not set
785# CONFIG_ROMFS_FS is not set 836# CONFIG_ROMFS_FS is not set
@@ -809,17 +860,19 @@ CONFIG_FUSE_FS=m
809# 860#
810CONFIG_PROC_FS=y 861CONFIG_PROC_FS=y
811CONFIG_PROC_KCORE=y 862CONFIG_PROC_KCORE=y
863CONFIG_PROC_SYSCTL=y
812CONFIG_SYSFS=y 864CONFIG_SYSFS=y
813# CONFIG_TMPFS is not set 865# CONFIG_TMPFS is not set
814# CONFIG_HUGETLB_PAGE is not set 866# CONFIG_HUGETLB_PAGE is not set
815CONFIG_RAMFS=y 867CONFIG_RAMFS=y
816# CONFIG_CONFIGFS_FS is not set 868CONFIG_CONFIGFS_FS=m
817 869
818# 870#
819# Miscellaneous filesystems 871# Miscellaneous filesystems
820# 872#
821# CONFIG_ADFS_FS is not set 873# CONFIG_ADFS_FS is not set
822# CONFIG_AFFS_FS is not set 874# CONFIG_AFFS_FS is not set
875# CONFIG_ECRYPT_FS is not set
823# CONFIG_HFS_FS is not set 876# CONFIG_HFS_FS is not set
824# CONFIG_HFSPLUS_FS is not set 877# CONFIG_HFSPLUS_FS is not set
825# CONFIG_BEFS_FS is not set 878# CONFIG_BEFS_FS is not set
@@ -850,7 +903,6 @@ CONFIG_SUNRPC=y
850# CONFIG_RPCSEC_GSS_SPKM3 is not set 903# CONFIG_RPCSEC_GSS_SPKM3 is not set
851# CONFIG_SMB_FS is not set 904# CONFIG_SMB_FS is not set
852# CONFIG_CIFS is not set 905# CONFIG_CIFS is not set
853# CONFIG_CIFS_DEBUG2 is not set
854# CONFIG_NCP_FS is not set 906# CONFIG_NCP_FS is not set
855# CONFIG_CODA_FS is not set 907# CONFIG_CODA_FS is not set
856# CONFIG_AFS_FS is not set 908# CONFIG_AFS_FS is not set
@@ -868,6 +920,14 @@ CONFIG_MSDOS_PARTITION=y
868# CONFIG_NLS is not set 920# CONFIG_NLS is not set
869 921
870# 922#
923# Distributed Lock Manager
924#
925CONFIG_DLM=m
926CONFIG_DLM_TCP=y
927# CONFIG_DLM_SCTP is not set
928# CONFIG_DLM_DEBUG is not set
929
930#
871# Profiling support 931# Profiling support
872# 932#
873# CONFIG_PROFILING is not set 933# CONFIG_PROFILING is not set
@@ -877,13 +937,16 @@ CONFIG_MSDOS_PARTITION=y
877# 937#
878CONFIG_TRACE_IRQFLAGS_SUPPORT=y 938CONFIG_TRACE_IRQFLAGS_SUPPORT=y
879# CONFIG_PRINTK_TIME is not set 939# CONFIG_PRINTK_TIME is not set
940CONFIG_ENABLE_MUST_CHECK=y
880# CONFIG_MAGIC_SYSRQ is not set 941# CONFIG_MAGIC_SYSRQ is not set
881# CONFIG_UNUSED_SYMBOLS is not set 942# CONFIG_UNUSED_SYMBOLS is not set
943# CONFIG_DEBUG_FS is not set
944# CONFIG_HEADERS_CHECK is not set
882# CONFIG_DEBUG_KERNEL is not set 945# CONFIG_DEBUG_KERNEL is not set
883CONFIG_LOG_BUF_SHIFT=15 946CONFIG_LOG_BUF_SHIFT=15
884# CONFIG_DEBUG_FS is not set
885CONFIG_CROSSCOMPILE=y 947CONFIG_CROSSCOMPILE=y
886CONFIG_CMDLINE="" 948CONFIG_CMDLINE=""
949CONFIG_SYS_SUPPORTS_KGDB=y
887# CONFIG_SB1XXX_CORELIS is not set 950# CONFIG_SB1XXX_CORELIS is not set
888 951
889# 952#
@@ -897,18 +960,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
897# Cryptographic options 960# Cryptographic options
898# 961#
899CONFIG_CRYPTO=y 962CONFIG_CRYPTO=y
963CONFIG_CRYPTO_ALGAPI=y
964CONFIG_CRYPTO_BLKCIPHER=m
965CONFIG_CRYPTO_HASH=y
966CONFIG_CRYPTO_MANAGER=y
900CONFIG_CRYPTO_HMAC=y 967CONFIG_CRYPTO_HMAC=y
968CONFIG_CRYPTO_XCBC=m
901CONFIG_CRYPTO_NULL=m 969CONFIG_CRYPTO_NULL=m
902CONFIG_CRYPTO_MD4=m 970CONFIG_CRYPTO_MD4=m
903CONFIG_CRYPTO_MD5=m 971CONFIG_CRYPTO_MD5=y
904CONFIG_CRYPTO_SHA1=m 972CONFIG_CRYPTO_SHA1=m
905CONFIG_CRYPTO_SHA256=m 973CONFIG_CRYPTO_SHA256=m
906CONFIG_CRYPTO_SHA512=m 974CONFIG_CRYPTO_SHA512=m
907CONFIG_CRYPTO_WP512=m 975CONFIG_CRYPTO_WP512=m
908CONFIG_CRYPTO_TGR192=m 976CONFIG_CRYPTO_TGR192=m
977CONFIG_CRYPTO_GF128MUL=m
978CONFIG_CRYPTO_ECB=m
979CONFIG_CRYPTO_CBC=m
980CONFIG_CRYPTO_PCBC=m
981CONFIG_CRYPTO_LRW=m
909CONFIG_CRYPTO_DES=m 982CONFIG_CRYPTO_DES=m
983CONFIG_CRYPTO_FCRYPT=m
910CONFIG_CRYPTO_BLOWFISH=m 984CONFIG_CRYPTO_BLOWFISH=m
911CONFIG_CRYPTO_TWOFISH=m 985CONFIG_CRYPTO_TWOFISH=m
986CONFIG_CRYPTO_TWOFISH_COMMON=m
912CONFIG_CRYPTO_SERPENT=m 987CONFIG_CRYPTO_SERPENT=m
913CONFIG_CRYPTO_AES=m 988CONFIG_CRYPTO_AES=m
914CONFIG_CRYPTO_CAST5=m 989CONFIG_CRYPTO_CAST5=m
@@ -920,6 +995,7 @@ CONFIG_CRYPTO_ANUBIS=m
920CONFIG_CRYPTO_DEFLATE=m 995CONFIG_CRYPTO_DEFLATE=m
921CONFIG_CRYPTO_MICHAEL_MIC=m 996CONFIG_CRYPTO_MICHAEL_MIC=m
922CONFIG_CRYPTO_CRC32C=m 997CONFIG_CRYPTO_CRC32C=m
998CONFIG_CRYPTO_CAMELLIA=m
923# CONFIG_CRYPTO_TEST is not set 999# CONFIG_CRYPTO_TEST is not set
924 1000
925# 1001#
@@ -929,6 +1005,7 @@ CONFIG_CRYPTO_CRC32C=m
929# 1005#
930# Library routines 1006# Library routines
931# 1007#
1008CONFIG_BITREVERSE=y
932# CONFIG_CRC_CCITT is not set 1009# CONFIG_CRC_CCITT is not set
933CONFIG_CRC16=m 1010CONFIG_CRC16=m
934CONFIG_CRC32=y 1011CONFIG_CRC32=y
@@ -936,3 +1013,5 @@ CONFIG_LIBCRC32C=m
936CONFIG_ZLIB_INFLATE=m 1013CONFIG_ZLIB_INFLATE=m
937CONFIG_ZLIB_DEFLATE=m 1014CONFIG_ZLIB_DEFLATE=m
938CONFIG_PLIST=y 1015CONFIG_PLIST=y
1016CONFIG_HAS_IOMEM=y
1017CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index 83fb932f9d4b..988b9cdef01f 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:20 2006 4# Sun Feb 18 21:28:10 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS_SEAD=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_MIPS_SEAD=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 76# CONFIG_CPU_BIG_ENDIAN is not set
@@ -120,15 +123,17 @@ CONFIG_PAGE_SIZE_4KB=y
120# CONFIG_PAGE_SIZE_64KB is not set 123# CONFIG_PAGE_SIZE_64KB is not set
121CONFIG_CPU_HAS_PREFETCH=y 124CONFIG_CPU_HAS_PREFETCH=y
122CONFIG_MIPS_MT_DISABLED=y 125CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_MT_SMP is not set 126# CONFIG_MIPS_MT_SMP is not set
127# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set 128# CONFIG_MIPS_VPE_LOADER is not set
126# CONFIG_64BIT_PHYS_ADDR is not set 129# CONFIG_64BIT_PHYS_ADDR is not set
127CONFIG_CPU_HAS_LLSC=y 130CONFIG_CPU_HAS_LLSC=y
131# CONFIG_CPU_HAS_SMARTMIPS is not set
128CONFIG_CPU_HAS_SYNC=y 132CONFIG_CPU_HAS_SYNC=y
129CONFIG_GENERIC_HARDIRQS=y 133CONFIG_GENERIC_HARDIRQS=y
130CONFIG_GENERIC_IRQ_PROBE=y 134CONFIG_GENERIC_IRQ_PROBE=y
131CONFIG_CPU_SUPPORTS_HIGHMEM=y 135CONFIG_CPU_SUPPORTS_HIGHMEM=y
136CONFIG_SYS_SUPPORTS_SMARTMIPS=y
132CONFIG_ARCH_FLATMEM_ENABLE=y 137CONFIG_ARCH_FLATMEM_ENABLE=y
133CONFIG_SELECT_MEMORY_MODEL=y 138CONFIG_SELECT_MEMORY_MODEL=y
134CONFIG_FLATMEM_MANUAL=y 139CONFIG_FLATMEM_MANUAL=y
@@ -139,6 +144,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 144# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 145CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 146# CONFIG_RESOURCES_64BIT is not set
147CONFIG_ZONE_DMA_FLAG=1
142# CONFIG_HZ_48 is not set 148# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 149# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 150# CONFIG_HZ_128 is not set
@@ -151,6 +157,7 @@ CONFIG_HZ=1000
151CONFIG_PREEMPT_NONE=y 157CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set 158# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set 159# CONFIG_PREEMPT is not set
160# CONFIG_KEXEC is not set
154CONFIG_LOCKDEP_SUPPORT=y 161CONFIG_LOCKDEP_SUPPORT=y
155CONFIG_STACKTRACE_SUPPORT=y 162CONFIG_STACKTRACE_SUPPORT=y
156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 163CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -169,13 +176,18 @@ CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y 176CONFIG_LOCALVERSION_AUTO=y
170# CONFIG_SWAP is not set 177# CONFIG_SWAP is not set
171CONFIG_SYSVIPC=y 178CONFIG_SYSVIPC=y
179# CONFIG_IPC_NS is not set
180CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_BSD_PROCESS_ACCT is not set 181# CONFIG_BSD_PROCESS_ACCT is not set
173CONFIG_SYSCTL=y 182# CONFIG_UTS_NS is not set
174# CONFIG_IKCONFIG is not set 183# CONFIG_IKCONFIG is not set
184CONFIG_SYSFS_DEPRECATED=y
175CONFIG_RELAY=y 185CONFIG_RELAY=y
176CONFIG_INITRAMFS_SOURCE="" 186CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SYSCTL=y
178CONFIG_EMBEDDED=y 189CONFIG_EMBEDDED=y
190CONFIG_SYSCTL_SYSCALL=y
179CONFIG_KALLSYMS=y 191CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 192# CONFIG_KALLSYMS_EXTRA_PASS is not set
181# CONFIG_HOTPLUG is not set 193# CONFIG_HOTPLUG is not set
@@ -183,12 +195,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 195CONFIG_BUG=y
184CONFIG_ELF_CORE=y 196CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 197CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 198CONFIG_FUTEX=y
188CONFIG_EPOLL=y 199CONFIG_EPOLL=y
189CONFIG_SHMEM=y 200CONFIG_SHMEM=y
190CONFIG_SLAB=y 201CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 202CONFIG_VM_EVENT_COUNTERS=y
203CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 204# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 205CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 206# CONFIG_SLOB is not set
@@ -201,6 +213,7 @@ CONFIG_BASE_SMALL=0
201# 213#
202# Block layer 214# Block layer
203# 215#
216CONFIG_BLOCK=y
204# CONFIG_LBD is not set 217# CONFIG_LBD is not set
205# CONFIG_BLK_DEV_IO_TRACE is not set 218# CONFIG_BLK_DEV_IO_TRACE is not set
206# CONFIG_LSF is not set 219# CONFIG_LSF is not set
@@ -226,7 +239,6 @@ CONFIG_MMU=y
226# 239#
227# PCCARD (PCMCIA/CardBus) support 240# PCCARD (PCMCIA/CardBus) support
228# 241#
229# CONFIG_PCCARD is not set
230 242
231# 243#
232# PCI Hotplug Support 244# PCI Hotplug Support
@@ -240,6 +252,14 @@ CONFIG_BINFMT_ELF=y
240CONFIG_TRAD_SIGNALS=y 252CONFIG_TRAD_SIGNALS=y
241 253
242# 254#
255# Power management options
256#
257CONFIG_PM=y
258# CONFIG_PM_LEGACY is not set
259# CONFIG_PM_DEBUG is not set
260# CONFIG_PM_SYSFS_DEPRECATED is not set
261
262#
243# Networking 263# Networking
244# 264#
245# CONFIG_NET is not set 265# CONFIG_NET is not set
@@ -253,7 +273,6 @@ CONFIG_TRAD_SIGNALS=y
253# 273#
254CONFIG_STANDALONE=y 274CONFIG_STANDALONE=y
255CONFIG_PREVENT_FIRMWARE_BUILD=y 275CONFIG_PREVENT_FIRMWARE_BUILD=y
256# CONFIG_FW_LOADER is not set
257# CONFIG_SYS_HYPERVISOR is not set 276# CONFIG_SYS_HYPERVISOR is not set
258 277
259# 278#
@@ -283,10 +302,15 @@ CONFIG_BLK_DEV_LOOP=y
283CONFIG_BLK_DEV_RAM=y 302CONFIG_BLK_DEV_RAM=y
284CONFIG_BLK_DEV_RAM_COUNT=16 303CONFIG_BLK_DEV_RAM_COUNT=16
285CONFIG_BLK_DEV_RAM_SIZE=18432 304CONFIG_BLK_DEV_RAM_SIZE=18432
305CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
286CONFIG_BLK_DEV_INITRD=y 306CONFIG_BLK_DEV_INITRD=y
287# CONFIG_CDROM_PKTCDVD is not set 307# CONFIG_CDROM_PKTCDVD is not set
288 308
289# 309#
310# Misc devices
311#
312
313#
290# ATA/ATAPI/MFM/RLL support 314# ATA/ATAPI/MFM/RLL support
291# 315#
292# CONFIG_IDE is not set 316# CONFIG_IDE is not set
@@ -296,6 +320,12 @@ CONFIG_BLK_DEV_INITRD=y
296# 320#
297CONFIG_RAID_ATTRS=y 321CONFIG_RAID_ATTRS=y
298# CONFIG_SCSI is not set 322# CONFIG_SCSI is not set
323# CONFIG_SCSI_NETLINK is not set
324
325#
326# Serial ATA (prod) and Parallel ATA (experimental) drivers
327#
328# CONFIG_ATA is not set
299 329
300# 330#
301# Multi-device support (RAID and LVM) 331# Multi-device support (RAID and LVM)
@@ -373,17 +403,12 @@ CONFIG_LEGACY_PTY_COUNT=256
373# CONFIG_GEN_RTC is not set 403# CONFIG_GEN_RTC is not set
374# CONFIG_DTLK is not set 404# CONFIG_DTLK is not set
375# CONFIG_R3964 is not set 405# CONFIG_R3964 is not set
376
377#
378# Ftape, the floppy tape device driver
379#
380# CONFIG_RAW_DRIVER is not set 406# CONFIG_RAW_DRIVER is not set
381 407
382# 408#
383# TPM devices 409# TPM devices
384# 410#
385# CONFIG_TCG_TPM is not set 411# CONFIG_TCG_TPM is not set
386# CONFIG_TELCLOCK is not set
387 412
388# 413#
389# I2C support 414# I2C support
@@ -399,6 +424,7 @@ CONFIG_LEGACY_PTY_COUNT=256
399# 424#
400# Dallas's 1-wire bus 425# Dallas's 1-wire bus
401# 426#
427# CONFIG_W1 is not set
402 428
403# 429#
404# Hardware Monitoring support 430# Hardware Monitoring support
@@ -407,14 +433,9 @@ CONFIG_LEGACY_PTY_COUNT=256
407# CONFIG_HWMON_VID is not set 433# CONFIG_HWMON_VID is not set
408 434
409# 435#
410# Misc devices
411#
412
413#
414# Multimedia devices 436# Multimedia devices
415# 437#
416# CONFIG_VIDEO_DEV is not set 438# CONFIG_VIDEO_DEV is not set
417CONFIG_VIDEO_V4L2=y
418 439
419# 440#
420# Digital Video Broadcasting Devices 441# Digital Video Broadcasting Devices
@@ -425,6 +446,7 @@ CONFIG_VIDEO_V4L2=y
425# 446#
426# CONFIG_FIRMWARE_EDID is not set 447# CONFIG_FIRMWARE_EDID is not set
427# CONFIG_FB is not set 448# CONFIG_FB is not set
449# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
428 450
429# 451#
430# Sound 452# Sound
@@ -492,16 +514,26 @@ CONFIG_VIDEO_V4L2=y
492# 514#
493 515
494# 516#
517# Auxiliary Display support
518#
519
520#
521# Virtualization
522#
523
524#
495# File systems 525# File systems
496# 526#
497CONFIG_EXT2_FS=y 527CONFIG_EXT2_FS=y
498# CONFIG_EXT2_FS_XATTR is not set 528# CONFIG_EXT2_FS_XATTR is not set
499# CONFIG_EXT2_FS_XIP is not set 529# CONFIG_EXT2_FS_XIP is not set
500# CONFIG_EXT3_FS is not set 530# CONFIG_EXT3_FS is not set
531# CONFIG_EXT4DEV_FS is not set
501# CONFIG_REISERFS_FS is not set 532# CONFIG_REISERFS_FS is not set
502# CONFIG_JFS_FS is not set 533# CONFIG_JFS_FS is not set
503# CONFIG_FS_POSIX_ACL is not set 534# CONFIG_FS_POSIX_ACL is not set
504# CONFIG_XFS_FS is not set 535# CONFIG_XFS_FS is not set
536# CONFIG_GFS2_FS is not set
505# CONFIG_MINIX_FS is not set 537# CONFIG_MINIX_FS is not set
506# CONFIG_ROMFS_FS is not set 538# CONFIG_ROMFS_FS is not set
507CONFIG_INOTIFY=y 539CONFIG_INOTIFY=y
@@ -530,6 +562,7 @@ CONFIG_FUSE_FS=y
530# 562#
531CONFIG_PROC_FS=y 563CONFIG_PROC_FS=y
532CONFIG_PROC_KCORE=y 564CONFIG_PROC_KCORE=y
565CONFIG_PROC_SYSCTL=y
533CONFIG_SYSFS=y 566CONFIG_SYSFS=y
534# CONFIG_TMPFS is not set 567# CONFIG_TMPFS is not set
535# CONFIG_HUGETLB_PAGE is not set 568# CONFIG_HUGETLB_PAGE is not set
@@ -585,12 +618,13 @@ CONFIG_PARTITION_ADVANCED=y
585# 618#
586CONFIG_TRACE_IRQFLAGS_SUPPORT=y 619CONFIG_TRACE_IRQFLAGS_SUPPORT=y
587# CONFIG_PRINTK_TIME is not set 620# CONFIG_PRINTK_TIME is not set
621CONFIG_ENABLE_MUST_CHECK=y
588# CONFIG_MAGIC_SYSRQ is not set 622# CONFIG_MAGIC_SYSRQ is not set
589# CONFIG_UNUSED_SYMBOLS is not set 623# CONFIG_UNUSED_SYMBOLS is not set
624# CONFIG_DEBUG_FS is not set
625# CONFIG_HEADERS_CHECK is not set
590# CONFIG_DEBUG_KERNEL is not set 626# CONFIG_DEBUG_KERNEL is not set
591CONFIG_LOG_BUF_SHIFT=14 627CONFIG_LOG_BUF_SHIFT=14
592# CONFIG_DEBUG_FS is not set
593# CONFIG_UNWIND_INFO is not set
594CONFIG_CROSSCOMPILE=y 628CONFIG_CROSSCOMPILE=y
595CONFIG_CMDLINE="" 629CONFIG_CMDLINE=""
596 630
@@ -606,10 +640,6 @@ CONFIG_CMDLINE=""
606# CONFIG_CRYPTO is not set 640# CONFIG_CRYPTO is not set
607 641
608# 642#
609# Hardware crypto devices
610#
611
612#
613# Library routines 643# Library routines
614# 644#
615# CONFIG_CRC_CCITT is not set 645# CONFIG_CRC_CCITT is not set
@@ -617,3 +647,5 @@ CONFIG_CRC16=y
617# CONFIG_CRC32 is not set 647# CONFIG_CRC32 is not set
618# CONFIG_LIBCRC32C is not set 648# CONFIG_LIBCRC32C is not set
619CONFIG_PLIST=y 649CONFIG_PLIST=y
650CONFIG_HAS_IOMEM=y
651CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index e9d4eae45bfa..b5be8b74d896 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:20 2006 4# Tue Feb 20 21:47:41 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 45CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -72,12 +71,15 @@ CONFIG_TANBAC_TB0226=y
72# CONFIG_VICTOR_MPC30X is not set 71# CONFIG_VICTOR_MPC30X is not set
73# CONFIG_ZAO_CAPCELLA is not set 72# CONFIG_ZAO_CAPCELLA is not set
74CONFIG_PCI_VR41XX=y 73CONFIG_PCI_VR41XX=y
75# CONFIG_VRC4173 is not set
76CONFIG_RWSEM_GENERIC_SPINLOCK=y 74CONFIG_RWSEM_GENERIC_SPINLOCK=y
75# CONFIG_ARCH_HAS_ILOG2_U32 is not set
76# CONFIG_ARCH_HAS_ILOG2_U64 is not set
77CONFIG_GENERIC_FIND_NEXT_BIT=y 77CONFIG_GENERIC_FIND_NEXT_BIT=y
78CONFIG_GENERIC_HWEIGHT=y 78CONFIG_GENERIC_HWEIGHT=y
79CONFIG_GENERIC_CALIBRATE_DELAY=y 79CONFIG_GENERIC_CALIBRATE_DELAY=y
80CONFIG_GENERIC_TIME=y
80CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 81CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
82CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
81CONFIG_DMA_NONCOHERENT=y 83CONFIG_DMA_NONCOHERENT=y
82CONFIG_DMA_NEED_PCI_MAP_STATE=y 84CONFIG_DMA_NEED_PCI_MAP_STATE=y
83# CONFIG_CPU_BIG_ENDIAN is not set 85# CONFIG_CPU_BIG_ENDIAN is not set
@@ -110,6 +112,7 @@ CONFIG_CPU_VR41XX=y
110# CONFIG_CPU_SB1 is not set 112# CONFIG_CPU_SB1 is not set
111CONFIG_SYS_HAS_CPU_VR41XX=y 113CONFIG_SYS_HAS_CPU_VR41XX=y
112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 114CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
115CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 116CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
114CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 117CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
115 118
@@ -123,8 +126,8 @@ CONFIG_PAGE_SIZE_4KB=y
123# CONFIG_PAGE_SIZE_16KB is not set 126# CONFIG_PAGE_SIZE_16KB is not set
124# CONFIG_PAGE_SIZE_64KB is not set 127# CONFIG_PAGE_SIZE_64KB is not set
125CONFIG_MIPS_MT_DISABLED=y 128CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 129# CONFIG_MIPS_MT_SMP is not set
130# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 131# CONFIG_MIPS_VPE_LOADER is not set
129CONFIG_CPU_HAS_SYNC=y 132CONFIG_CPU_HAS_SYNC=y
130CONFIG_GENERIC_HARDIRQS=y 133CONFIG_GENERIC_HARDIRQS=y
@@ -139,6 +142,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 142# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 143CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 144# CONFIG_RESOURCES_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1
142# CONFIG_HZ_48 is not set 146# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 147# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 148# CONFIG_HZ_128 is not set
@@ -151,6 +155,7 @@ CONFIG_HZ=1000
151CONFIG_PREEMPT_NONE=y 155CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set 156# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set 157# CONFIG_PREEMPT is not set
158# CONFIG_KEXEC is not set
154CONFIG_LOCKDEP_SUPPORT=y 159CONFIG_LOCKDEP_SUPPORT=y
155CONFIG_STACKTRACE_SUPPORT=y 160CONFIG_STACKTRACE_SUPPORT=y
156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 161CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -169,15 +174,20 @@ CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y 174CONFIG_LOCALVERSION_AUTO=y
170CONFIG_SWAP=y 175CONFIG_SWAP=y
171CONFIG_SYSVIPC=y 176CONFIG_SYSVIPC=y
177# CONFIG_IPC_NS is not set
178CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_POSIX_MQUEUE is not set 179# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set 180# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 181# CONFIG_TASKSTATS is not set
182# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 183# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 184# CONFIG_IKCONFIG is not set
185CONFIG_SYSFS_DEPRECATED=y
177# CONFIG_RELAY is not set 186# CONFIG_RELAY is not set
178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 189CONFIG_EMBEDDED=y
190CONFIG_SYSCTL_SYSCALL=y
181CONFIG_KALLSYMS=y 191CONFIG_KALLSYMS=y
182# CONFIG_KALLSYMS_EXTRA_PASS is not set 192# CONFIG_KALLSYMS_EXTRA_PASS is not set
183CONFIG_HOTPLUG=y 193CONFIG_HOTPLUG=y
@@ -185,12 +195,12 @@ CONFIG_PRINTK=y
185CONFIG_BUG=y 195CONFIG_BUG=y
186CONFIG_ELF_CORE=y 196CONFIG_ELF_CORE=y
187CONFIG_BASE_FULL=y 197CONFIG_BASE_FULL=y
188CONFIG_RT_MUTEXES=y
189CONFIG_FUTEX=y 198CONFIG_FUTEX=y
190CONFIG_EPOLL=y 199CONFIG_EPOLL=y
191CONFIG_SHMEM=y 200CONFIG_SHMEM=y
192CONFIG_SLAB=y 201CONFIG_SLAB=y
193CONFIG_VM_EVENT_COUNTERS=y 202CONFIG_VM_EVENT_COUNTERS=y
203CONFIG_RT_MUTEXES=y
194# CONFIG_TINY_SHMEM is not set 204# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0 205CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set 206# CONFIG_SLOB is not set
@@ -208,6 +218,7 @@ CONFIG_KMOD=y
208# 218#
209# Block layer 219# Block layer
210# 220#
221CONFIG_BLOCK=y
211# CONFIG_LBD is not set 222# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set 223# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set 224# CONFIG_LSF is not set
@@ -250,6 +261,14 @@ CONFIG_BINFMT_ELF=y
250CONFIG_TRAD_SIGNALS=y 261CONFIG_TRAD_SIGNALS=y
251 262
252# 263#
264# Power management options
265#
266CONFIG_PM=y
267# CONFIG_PM_LEGACY is not set
268# CONFIG_PM_DEBUG is not set
269# CONFIG_PM_SYSFS_DEPRECATED is not set
270
271#
253# Networking 272# Networking
254# 273#
255CONFIG_NET=y 274CONFIG_NET=y
@@ -263,6 +282,8 @@ CONFIG_PACKET=y
263CONFIG_UNIX=y 282CONFIG_UNIX=y
264CONFIG_XFRM=y 283CONFIG_XFRM=y
265# CONFIG_XFRM_USER is not set 284# CONFIG_XFRM_USER is not set
285# CONFIG_XFRM_SUB_POLICY is not set
286CONFIG_XFRM_MIGRATE=y
266# CONFIG_NET_KEY is not set 287# CONFIG_NET_KEY is not set
267CONFIG_INET=y 288CONFIG_INET=y
268CONFIG_IP_MULTICAST=y 289CONFIG_IP_MULTICAST=y
@@ -290,10 +311,13 @@ CONFIG_SYN_COOKIES=y
290# CONFIG_INET_TUNNEL is not set 311# CONFIG_INET_TUNNEL is not set
291CONFIG_INET_XFRM_MODE_TRANSPORT=m 312CONFIG_INET_XFRM_MODE_TRANSPORT=m
292CONFIG_INET_XFRM_MODE_TUNNEL=m 313CONFIG_INET_XFRM_MODE_TUNNEL=m
314CONFIG_INET_XFRM_MODE_BEET=m
293CONFIG_INET_DIAG=y 315CONFIG_INET_DIAG=y
294CONFIG_INET_TCP_DIAG=y 316CONFIG_INET_TCP_DIAG=y
295# CONFIG_TCP_CONG_ADVANCED is not set 317# CONFIG_TCP_CONG_ADVANCED is not set
296CONFIG_TCP_CONG_BIC=y 318CONFIG_TCP_CONG_CUBIC=y
319CONFIG_DEFAULT_TCP_CONG="cubic"
320CONFIG_TCP_MD5SIG=y
297# CONFIG_IPV6 is not set 321# CONFIG_IPV6 is not set
298# CONFIG_INET6_XFRM_TUNNEL is not set 322# CONFIG_INET6_XFRM_TUNNEL is not set
299# CONFIG_INET6_TUNNEL is not set 323# CONFIG_INET6_TUNNEL is not set
@@ -323,7 +347,6 @@ CONFIG_NETWORK_SECMARK=y
323# CONFIG_ATALK is not set 347# CONFIG_ATALK is not set
324# CONFIG_X25 is not set 348# CONFIG_X25 is not set
325# CONFIG_LAPB is not set 349# CONFIG_LAPB is not set
326# CONFIG_NET_DIVERT is not set
327# CONFIG_ECONET is not set 350# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set 351# CONFIG_WAN_ROUTER is not set
329 352
@@ -340,6 +363,7 @@ CONFIG_NETWORK_SECMARK=y
340# CONFIG_IRDA is not set 363# CONFIG_IRDA is not set
341# CONFIG_BT is not set 364# CONFIG_BT is not set
342# CONFIG_IEEE80211 is not set 365# CONFIG_IEEE80211 is not set
366CONFIG_FIB_RULES=y
343 367
344# 368#
345# Device Drivers 369# Device Drivers
@@ -371,6 +395,7 @@ CONFIG_CONNECTOR=m
371# 395#
372# Plug and Play support 396# Plug and Play support
373# 397#
398# CONFIG_PNPACPI is not set
374 399
375# 400#
376# Block devices 401# Block devices
@@ -388,11 +413,18 @@ CONFIG_BLK_DEV_NBD=m
388CONFIG_BLK_DEV_RAM=y 413CONFIG_BLK_DEV_RAM=y
389CONFIG_BLK_DEV_RAM_COUNT=16 414CONFIG_BLK_DEV_RAM_COUNT=16
390CONFIG_BLK_DEV_RAM_SIZE=4096 415CONFIG_BLK_DEV_RAM_SIZE=4096
416CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
391# CONFIG_BLK_DEV_INITRD is not set 417# CONFIG_BLK_DEV_INITRD is not set
392# CONFIG_CDROM_PKTCDVD is not set 418# CONFIG_CDROM_PKTCDVD is not set
393# CONFIG_ATA_OVER_ETH is not set 419# CONFIG_ATA_OVER_ETH is not set
394 420
395# 421#
422# Misc devices
423#
424CONFIG_SGI_IOC4=m
425# CONFIG_TIFM_CORE is not set
426
427#
396# ATA/ATAPI/MFM/RLL support 428# ATA/ATAPI/MFM/RLL support
397# 429#
398# CONFIG_IDE is not set 430# CONFIG_IDE is not set
@@ -402,6 +434,8 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
402# 434#
403# CONFIG_RAID_ATTRS is not set 435# CONFIG_RAID_ATTRS is not set
404CONFIG_SCSI=y 436CONFIG_SCSI=y
437CONFIG_SCSI_TGT=m
438# CONFIG_SCSI_NETLINK is not set
405CONFIG_SCSI_PROC_FS=y 439CONFIG_SCSI_PROC_FS=y
406 440
407# 441#
@@ -420,14 +454,17 @@ CONFIG_BLK_DEV_SD=y
420CONFIG_SCSI_MULTI_LUN=y 454CONFIG_SCSI_MULTI_LUN=y
421# CONFIG_SCSI_CONSTANTS is not set 455# CONFIG_SCSI_CONSTANTS is not set
422# CONFIG_SCSI_LOGGING is not set 456# CONFIG_SCSI_LOGGING is not set
457CONFIG_SCSI_SCAN_ASYNC=y
423 458
424# 459#
425# SCSI Transport Attributes 460# SCSI Transports
426# 461#
427# CONFIG_SCSI_SPI_ATTRS is not set 462# CONFIG_SCSI_SPI_ATTRS is not set
428# CONFIG_SCSI_FC_ATTRS is not set 463# CONFIG_SCSI_FC_ATTRS is not set
429# CONFIG_SCSI_ISCSI_ATTRS is not set 464# CONFIG_SCSI_ISCSI_ATTRS is not set
430# CONFIG_SCSI_SAS_ATTRS is not set 465CONFIG_SCSI_SAS_ATTRS=m
466CONFIG_SCSI_SAS_LIBSAS=m
467# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
431 468
432# 469#
433# SCSI low-level drivers 470# SCSI low-level drivers
@@ -440,26 +477,35 @@ CONFIG_SCSI_MULTI_LUN=y
440# CONFIG_SCSI_AIC7XXX is not set 477# CONFIG_SCSI_AIC7XXX is not set
441# CONFIG_SCSI_AIC7XXX_OLD is not set 478# CONFIG_SCSI_AIC7XXX_OLD is not set
442# CONFIG_SCSI_AIC79XX is not set 479# CONFIG_SCSI_AIC79XX is not set
480CONFIG_SCSI_AIC94XX=m
481# CONFIG_AIC94XX_DEBUG is not set
443# CONFIG_SCSI_DPT_I2O is not set 482# CONFIG_SCSI_DPT_I2O is not set
483# CONFIG_SCSI_ARCMSR is not set
444# CONFIG_MEGARAID_NEWGEN is not set 484# CONFIG_MEGARAID_NEWGEN is not set
445# CONFIG_MEGARAID_LEGACY is not set 485# CONFIG_MEGARAID_LEGACY is not set
446# CONFIG_MEGARAID_SAS is not set 486# CONFIG_MEGARAID_SAS is not set
447# CONFIG_SCSI_SATA is not set
448# CONFIG_SCSI_HPTIOP is not set 487# CONFIG_SCSI_HPTIOP is not set
449# CONFIG_SCSI_DMX3191D is not set 488# CONFIG_SCSI_DMX3191D is not set
450# CONFIG_SCSI_FUTURE_DOMAIN is not set 489# CONFIG_SCSI_FUTURE_DOMAIN is not set
451# CONFIG_SCSI_IPS is not set 490# CONFIG_SCSI_IPS is not set
452# CONFIG_SCSI_INITIO is not set 491# CONFIG_SCSI_INITIO is not set
453# CONFIG_SCSI_INIA100 is not set 492# CONFIG_SCSI_INIA100 is not set
493# CONFIG_SCSI_STEX is not set
454# CONFIG_SCSI_SYM53C8XX_2 is not set 494# CONFIG_SCSI_SYM53C8XX_2 is not set
455# CONFIG_SCSI_IPR is not set
456# CONFIG_SCSI_QLOGIC_1280 is not set 495# CONFIG_SCSI_QLOGIC_1280 is not set
457# CONFIG_SCSI_QLA_FC is not set 496# CONFIG_SCSI_QLA_FC is not set
497# CONFIG_SCSI_QLA_ISCSI is not set
458# CONFIG_SCSI_LPFC is not set 498# CONFIG_SCSI_LPFC is not set
459# CONFIG_SCSI_DC395x is not set 499# CONFIG_SCSI_DC395x is not set
460# CONFIG_SCSI_DC390T is not set 500# CONFIG_SCSI_DC390T is not set
461# CONFIG_SCSI_NSP32 is not set 501# CONFIG_SCSI_NSP32 is not set
462# CONFIG_SCSI_DEBUG is not set 502# CONFIG_SCSI_DEBUG is not set
503# CONFIG_SCSI_SRP is not set
504
505#
506# Serial ATA (prod) and Parallel ATA (experimental) drivers
507#
508# CONFIG_ATA is not set
463 509
464# 510#
465# Multi-device support (RAID and LVM) 511# Multi-device support (RAID and LVM)
@@ -513,6 +559,8 @@ CONFIG_LXT_PHY=m
513CONFIG_CICADA_PHY=m 559CONFIG_CICADA_PHY=m
514CONFIG_VITESSE_PHY=m 560CONFIG_VITESSE_PHY=m
515CONFIG_SMSC_PHY=m 561CONFIG_SMSC_PHY=m
562# CONFIG_BROADCOM_PHY is not set
563# CONFIG_FIXED_PHY is not set
516 564
517# 565#
518# Ethernet (10 or 100Mbit) 566# Ethernet (10 or 100Mbit)
@@ -549,7 +597,7 @@ CONFIG_E100=y
549# CONFIG_SUNDANCE is not set 597# CONFIG_SUNDANCE is not set
550# CONFIG_TLAN is not set 598# CONFIG_TLAN is not set
551# CONFIG_VIA_RHINE is not set 599# CONFIG_VIA_RHINE is not set
552# CONFIG_LAN_SAA9730 is not set 600# CONFIG_SC92031 is not set
553 601
554# 602#
555# Ethernet (1000 Mbit) 603# Ethernet (1000 Mbit)
@@ -568,14 +616,18 @@ CONFIG_E100=y
568# CONFIG_VIA_VELOCITY is not set 616# CONFIG_VIA_VELOCITY is not set
569# CONFIG_TIGON3 is not set 617# CONFIG_TIGON3 is not set
570# CONFIG_BNX2 is not set 618# CONFIG_BNX2 is not set
619CONFIG_QLA3XXX=m
620# CONFIG_ATL1 is not set
571 621
572# 622#
573# Ethernet (10000 Mbit) 623# Ethernet (10000 Mbit)
574# 624#
575# CONFIG_CHELSIO_T1 is not set 625# CONFIG_CHELSIO_T1 is not set
626CONFIG_CHELSIO_T3=m
576# CONFIG_IXGB is not set 627# CONFIG_IXGB is not set
577# CONFIG_S2IO is not set 628# CONFIG_S2IO is not set
578# CONFIG_MYRI10GE is not set 629# CONFIG_MYRI10GE is not set
630CONFIG_NETXEN_NIC=m
579 631
580# 632#
581# Token Ring devices 633# Token Ring devices
@@ -615,6 +667,7 @@ CONFIG_E100=y
615# Input device support 667# Input device support
616# 668#
617CONFIG_INPUT=y 669CONFIG_INPUT=y
670# CONFIG_INPUT_FF_MEMLESS is not set
618 671
619# 672#
620# Userland interfaces 673# Userland interfaces
@@ -682,10 +735,6 @@ CONFIG_LEGACY_PTY_COUNT=256
682# CONFIG_R3964 is not set 735# CONFIG_R3964 is not set
683# CONFIG_APPLICOM is not set 736# CONFIG_APPLICOM is not set
684# CONFIG_TANBAC_TB0219 is not set 737# CONFIG_TANBAC_TB0219 is not set
685
686#
687# Ftape, the floppy tape device driver
688#
689# CONFIG_DRM is not set 738# CONFIG_DRM is not set
690CONFIG_GPIO_VR41XX=y 739CONFIG_GPIO_VR41XX=y
691# CONFIG_RAW_DRIVER is not set 740# CONFIG_RAW_DRIVER is not set
@@ -694,7 +743,6 @@ CONFIG_GPIO_VR41XX=y
694# TPM devices 743# TPM devices
695# 744#
696# CONFIG_TCG_TPM is not set 745# CONFIG_TCG_TPM is not set
697# CONFIG_TELCLOCK is not set
698 746
699# 747#
700# I2C support 748# I2C support
@@ -719,14 +767,9 @@ CONFIG_GPIO_VR41XX=y
719# CONFIG_HWMON_VID is not set 767# CONFIG_HWMON_VID is not set
720 768
721# 769#
722# Misc devices
723#
724
725#
726# Multimedia devices 770# Multimedia devices
727# 771#
728# CONFIG_VIDEO_DEV is not set 772# CONFIG_VIDEO_DEV is not set
729CONFIG_VIDEO_V4L2=y
730 773
731# 774#
732# Digital Video Broadcasting Devices 775# Digital Video Broadcasting Devices
@@ -745,6 +788,7 @@ CONFIG_VIDEO_V4L2=y
745# 788#
746# CONFIG_VGA_CONSOLE is not set 789# CONFIG_VGA_CONSOLE is not set
747CONFIG_DUMMY_CONSOLE=y 790CONFIG_DUMMY_CONSOLE=y
791# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
748 792
749# 793#
750# Sound 794# Sound
@@ -752,6 +796,12 @@ CONFIG_DUMMY_CONSOLE=y
752# CONFIG_SOUND is not set 796# CONFIG_SOUND is not set
753 797
754# 798#
799# HID Devices
800#
801CONFIG_HID=y
802# CONFIG_HID_DEBUG is not set
803
804#
755# USB support 805# USB support
756# 806#
757CONFIG_USB_ARCH_HAS_HCD=y 807CONFIG_USB_ARCH_HAS_HCD=y
@@ -764,8 +814,8 @@ CONFIG_USB=y
764# Miscellaneous USB options 814# Miscellaneous USB options
765# 815#
766CONFIG_USB_DEVICEFS=y 816CONFIG_USB_DEVICEFS=y
767# CONFIG_USB_BANDWIDTH is not set
768# CONFIG_USB_DYNAMIC_MINORS is not set 817# CONFIG_USB_DYNAMIC_MINORS is not set
818# CONFIG_USB_SUSPEND is not set
769# CONFIG_USB_OTG is not set 819# CONFIG_USB_OTG is not set
770 820
771# 821#
@@ -775,9 +825,11 @@ CONFIG_USB_EHCI_HCD=y
775# CONFIG_USB_EHCI_SPLIT_ISO is not set 825# CONFIG_USB_EHCI_SPLIT_ISO is not set
776# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 826# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
777# CONFIG_USB_EHCI_TT_NEWSCHED is not set 827# CONFIG_USB_EHCI_TT_NEWSCHED is not set
828# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
778# CONFIG_USB_ISP116X_HCD is not set 829# CONFIG_USB_ISP116X_HCD is not set
779CONFIG_USB_OHCI_HCD=y 830CONFIG_USB_OHCI_HCD=y
780# CONFIG_USB_OHCI_BIG_ENDIAN is not set 831# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
832# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
781CONFIG_USB_OHCI_LITTLE_ENDIAN=y 833CONFIG_USB_OHCI_LITTLE_ENDIAN=y
782# CONFIG_USB_UHCI_HCD is not set 834# CONFIG_USB_UHCI_HCD is not set
783# CONFIG_USB_SL811_HCD is not set 835# CONFIG_USB_SL811_HCD is not set
@@ -805,6 +857,7 @@ CONFIG_USB_STORAGE=y
805# CONFIG_USB_STORAGE_SDDR55 is not set 857# CONFIG_USB_STORAGE_SDDR55 is not set
806# CONFIG_USB_STORAGE_JUMPSHOT is not set 858# CONFIG_USB_STORAGE_JUMPSHOT is not set
807# CONFIG_USB_STORAGE_ALAUDA is not set 859# CONFIG_USB_STORAGE_ALAUDA is not set
860# CONFIG_USB_STORAGE_KARMA is not set
808# CONFIG_USB_LIBUSUAL is not set 861# CONFIG_USB_LIBUSUAL is not set
809 862
810# 863#
@@ -829,6 +882,7 @@ CONFIG_USB_STORAGE=y
829# CONFIG_USB_ATI_REMOTE2 is not set 882# CONFIG_USB_ATI_REMOTE2 is not set
830# CONFIG_USB_KEYSPAN_REMOTE is not set 883# CONFIG_USB_KEYSPAN_REMOTE is not set
831# CONFIG_USB_APPLETOUCH is not set 884# CONFIG_USB_APPLETOUCH is not set
885# CONFIG_USB_GTCO is not set
832 886
833# 887#
834# USB Imaging devices 888# USB Imaging devices
@@ -843,6 +897,7 @@ CONFIG_USB_STORAGE=y
843# CONFIG_USB_KAWETH is not set 897# CONFIG_USB_KAWETH is not set
844# CONFIG_USB_PEGASUS is not set 898# CONFIG_USB_PEGASUS is not set
845# CONFIG_USB_RTL8150 is not set 899# CONFIG_USB_RTL8150 is not set
900# CONFIG_USB_USBNET_MII is not set
846# CONFIG_USB_USBNET is not set 901# CONFIG_USB_USBNET is not set
847# CONFIG_USB_MON is not set 902# CONFIG_USB_MON is not set
848 903
@@ -860,19 +915,22 @@ CONFIG_USB_STORAGE=y
860# 915#
861# CONFIG_USB_EMI62 is not set 916# CONFIG_USB_EMI62 is not set
862# CONFIG_USB_EMI26 is not set 917# CONFIG_USB_EMI26 is not set
918# CONFIG_USB_ADUTUX is not set
863# CONFIG_USB_AUERSWALD is not set 919# CONFIG_USB_AUERSWALD is not set
864# CONFIG_USB_RIO500 is not set 920# CONFIG_USB_RIO500 is not set
865# CONFIG_USB_LEGOTOWER is not set 921# CONFIG_USB_LEGOTOWER is not set
866# CONFIG_USB_LCD is not set 922# CONFIG_USB_LCD is not set
923# CONFIG_USB_BERRY_CHARGE is not set
867# CONFIG_USB_LED is not set 924# CONFIG_USB_LED is not set
868# CONFIG_USB_CY7C63 is not set 925# CONFIG_USB_CYPRESS_CY7C63 is not set
869# CONFIG_USB_CYTHERM is not set 926# CONFIG_USB_CYTHERM is not set
870# CONFIG_USB_PHIDGETKIT is not set 927# CONFIG_USB_PHIDGET is not set
871# CONFIG_USB_PHIDGETSERVO is not set
872# CONFIG_USB_IDMOUSE is not set 928# CONFIG_USB_IDMOUSE is not set
929# CONFIG_USB_FTDI_ELAN is not set
873# CONFIG_USB_APPLEDISPLAY is not set 930# CONFIG_USB_APPLEDISPLAY is not set
874# CONFIG_USB_SISUSBVGA is not set 931# CONFIG_USB_SISUSBVGA is not set
875# CONFIG_USB_LD is not set 932# CONFIG_USB_LD is not set
933# CONFIG_USB_TRANCEVIBRATOR is not set
876# CONFIG_USB_TEST is not set 934# CONFIG_USB_TEST is not set
877 935
878# 936#
@@ -918,6 +976,7 @@ CONFIG_RTC_LIB=y
918CONFIG_RTC_CLASS=y 976CONFIG_RTC_CLASS=y
919CONFIG_RTC_HCTOSYS=y 977CONFIG_RTC_HCTOSYS=y
920CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 978CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
979# CONFIG_RTC_DEBUG is not set
921 980
922# 981#
923# RTC interfaces 982# RTC interfaces
@@ -951,16 +1010,26 @@ CONFIG_RTC_DRV_VR41XX=y
951# 1010#
952 1011
953# 1012#
1013# Auxiliary Display support
1014#
1015
1016#
1017# Virtualization
1018#
1019
1020#
954# File systems 1021# File systems
955# 1022#
956CONFIG_EXT2_FS=y 1023CONFIG_EXT2_FS=y
957# CONFIG_EXT2_FS_XATTR is not set 1024# CONFIG_EXT2_FS_XATTR is not set
958# CONFIG_EXT2_FS_XIP is not set 1025# CONFIG_EXT2_FS_XIP is not set
959# CONFIG_EXT3_FS is not set 1026# CONFIG_EXT3_FS is not set
1027# CONFIG_EXT4DEV_FS is not set
960# CONFIG_REISERFS_FS is not set 1028# CONFIG_REISERFS_FS is not set
961# CONFIG_JFS_FS is not set 1029# CONFIG_JFS_FS is not set
962# CONFIG_FS_POSIX_ACL is not set 1030CONFIG_FS_POSIX_ACL=y
963# CONFIG_XFS_FS is not set 1031# CONFIG_XFS_FS is not set
1032# CONFIG_GFS2_FS is not set
964# CONFIG_OCFS2_FS is not set 1033# CONFIG_OCFS2_FS is not set
965# CONFIG_MINIX_FS is not set 1034# CONFIG_MINIX_FS is not set
966CONFIG_ROMFS_FS=m 1035CONFIG_ROMFS_FS=m
@@ -971,6 +1040,7 @@ CONFIG_DNOTIFY=y
971# CONFIG_AUTOFS_FS is not set 1040# CONFIG_AUTOFS_FS is not set
972CONFIG_AUTOFS4_FS=y 1041CONFIG_AUTOFS4_FS=y
973CONFIG_FUSE_FS=m 1042CONFIG_FUSE_FS=m
1043CONFIG_GENERIC_ACL=y
974 1044
975# 1045#
976# CD-ROM/DVD Filesystems 1046# CD-ROM/DVD Filesystems
@@ -990,11 +1060,13 @@ CONFIG_FUSE_FS=m
990# 1060#
991CONFIG_PROC_FS=y 1061CONFIG_PROC_FS=y
992CONFIG_PROC_KCORE=y 1062CONFIG_PROC_KCORE=y
1063CONFIG_PROC_SYSCTL=y
993CONFIG_SYSFS=y 1064CONFIG_SYSFS=y
994CONFIG_TMPFS=y 1065CONFIG_TMPFS=y
1066CONFIG_TMPFS_POSIX_ACL=y
995# CONFIG_HUGETLB_PAGE is not set 1067# CONFIG_HUGETLB_PAGE is not set
996CONFIG_RAMFS=y 1068CONFIG_RAMFS=y
997# CONFIG_CONFIGFS_FS is not set 1069CONFIG_CONFIGFS_FS=m
998 1070
999# 1071#
1000# Miscellaneous filesystems 1072# Miscellaneous filesystems
@@ -1036,7 +1108,6 @@ CONFIG_SUNRPC=y
1036# CONFIG_RPCSEC_GSS_SPKM3 is not set 1108# CONFIG_RPCSEC_GSS_SPKM3 is not set
1037# CONFIG_SMB_FS is not set 1109# CONFIG_SMB_FS is not set
1038# CONFIG_CIFS is not set 1110# CONFIG_CIFS is not set
1039# CONFIG_CIFS_DEBUG2 is not set
1040# CONFIG_NCP_FS is not set 1111# CONFIG_NCP_FS is not set
1041# CONFIG_CODA_FS is not set 1112# CONFIG_CODA_FS is not set
1042# CONFIG_AFS_FS is not set 1113# CONFIG_AFS_FS is not set
@@ -1054,6 +1125,14 @@ CONFIG_MSDOS_PARTITION=y
1054# CONFIG_NLS is not set 1125# CONFIG_NLS is not set
1055 1126
1056# 1127#
1128# Distributed Lock Manager
1129#
1130CONFIG_DLM=m
1131CONFIG_DLM_TCP=y
1132# CONFIG_DLM_SCTP is not set
1133# CONFIG_DLM_DEBUG is not set
1134
1135#
1057# Profiling support 1136# Profiling support
1058# 1137#
1059# CONFIG_PROFILING is not set 1138# CONFIG_PROFILING is not set
@@ -1063,11 +1142,13 @@ CONFIG_MSDOS_PARTITION=y
1063# 1142#
1064CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1143CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1065# CONFIG_PRINTK_TIME is not set 1144# CONFIG_PRINTK_TIME is not set
1145CONFIG_ENABLE_MUST_CHECK=y
1066# CONFIG_MAGIC_SYSRQ is not set 1146# CONFIG_MAGIC_SYSRQ is not set
1067# CONFIG_UNUSED_SYMBOLS is not set 1147# CONFIG_UNUSED_SYMBOLS is not set
1148# CONFIG_DEBUG_FS is not set
1149# CONFIG_HEADERS_CHECK is not set
1068# CONFIG_DEBUG_KERNEL is not set 1150# CONFIG_DEBUG_KERNEL is not set
1069CONFIG_LOG_BUF_SHIFT=14 1151CONFIG_LOG_BUF_SHIFT=14
1070# CONFIG_DEBUG_FS is not set
1071CONFIG_CROSSCOMPILE=y 1152CONFIG_CROSSCOMPILE=y
1072CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" 1153CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1073 1154
@@ -1080,7 +1161,44 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1080# 1161#
1081# Cryptographic options 1162# Cryptographic options
1082# 1163#
1083# CONFIG_CRYPTO is not set 1164CONFIG_CRYPTO=y
1165CONFIG_CRYPTO_ALGAPI=y
1166CONFIG_CRYPTO_BLKCIPHER=m
1167CONFIG_CRYPTO_HASH=m
1168CONFIG_CRYPTO_MANAGER=m
1169CONFIG_CRYPTO_HMAC=m
1170CONFIG_CRYPTO_XCBC=m
1171CONFIG_CRYPTO_NULL=m
1172CONFIG_CRYPTO_MD4=m
1173CONFIG_CRYPTO_MD5=y
1174CONFIG_CRYPTO_SHA1=m
1175CONFIG_CRYPTO_SHA256=m
1176CONFIG_CRYPTO_SHA512=m
1177CONFIG_CRYPTO_WP512=m
1178CONFIG_CRYPTO_TGR192=m
1179CONFIG_CRYPTO_GF128MUL=m
1180CONFIG_CRYPTO_ECB=m
1181CONFIG_CRYPTO_CBC=m
1182CONFIG_CRYPTO_PCBC=m
1183CONFIG_CRYPTO_LRW=m
1184CONFIG_CRYPTO_DES=m
1185CONFIG_CRYPTO_FCRYPT=m
1186CONFIG_CRYPTO_BLOWFISH=m
1187CONFIG_CRYPTO_TWOFISH=m
1188CONFIG_CRYPTO_TWOFISH_COMMON=m
1189CONFIG_CRYPTO_SERPENT=m
1190CONFIG_CRYPTO_AES=m
1191CONFIG_CRYPTO_CAST5=m
1192CONFIG_CRYPTO_CAST6=m
1193CONFIG_CRYPTO_TEA=m
1194CONFIG_CRYPTO_ARC4=m
1195CONFIG_CRYPTO_KHAZAD=m
1196CONFIG_CRYPTO_ANUBIS=m
1197CONFIG_CRYPTO_DEFLATE=m
1198CONFIG_CRYPTO_MICHAEL_MIC=m
1199CONFIG_CRYPTO_CRC32C=m
1200CONFIG_CRYPTO_CAMELLIA=m
1201# CONFIG_CRYPTO_TEST is not set
1084 1202
1085# 1203#
1086# Hardware crypto devices 1204# Hardware crypto devices
@@ -1092,6 +1210,9 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1092# CONFIG_CRC_CCITT is not set 1210# CONFIG_CRC_CCITT is not set
1093# CONFIG_CRC16 is not set 1211# CONFIG_CRC16 is not set
1094# CONFIG_CRC32 is not set 1212# CONFIG_CRC32 is not set
1095# CONFIG_LIBCRC32C is not set 1213CONFIG_LIBCRC32C=m
1096CONFIG_ZLIB_INFLATE=m 1214CONFIG_ZLIB_INFLATE=m
1215CONFIG_ZLIB_DEFLATE=m
1097CONFIG_PLIST=y 1216CONFIG_PLIST=y
1217CONFIG_HAS_IOMEM=y
1218CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index c19597fb0c32..1756d2bdf6b8 100644
--- a/arch/mips/configs/tb0229_defconfig
+++ b/arch/mips/configs/tb0229_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:20 2006 4# Tue Feb 20 21:47:41 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 45CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -72,12 +71,15 @@ CONFIG_TANBAC_TB022X=y
72# CONFIG_VICTOR_MPC30X is not set 71# CONFIG_VICTOR_MPC30X is not set
73# CONFIG_ZAO_CAPCELLA is not set 72# CONFIG_ZAO_CAPCELLA is not set
74CONFIG_PCI_VR41XX=y 73CONFIG_PCI_VR41XX=y
75# CONFIG_VRC4173 is not set
76CONFIG_RWSEM_GENERIC_SPINLOCK=y 74CONFIG_RWSEM_GENERIC_SPINLOCK=y
75# CONFIG_ARCH_HAS_ILOG2_U32 is not set
76# CONFIG_ARCH_HAS_ILOG2_U64 is not set
77CONFIG_GENERIC_FIND_NEXT_BIT=y 77CONFIG_GENERIC_FIND_NEXT_BIT=y
78CONFIG_GENERIC_HWEIGHT=y 78CONFIG_GENERIC_HWEIGHT=y
79CONFIG_GENERIC_CALIBRATE_DELAY=y 79CONFIG_GENERIC_CALIBRATE_DELAY=y
80CONFIG_GENERIC_TIME=y
80CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 81CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
82CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
81CONFIG_DMA_NONCOHERENT=y 83CONFIG_DMA_NONCOHERENT=y
82CONFIG_DMA_NEED_PCI_MAP_STATE=y 84CONFIG_DMA_NEED_PCI_MAP_STATE=y
83# CONFIG_CPU_BIG_ENDIAN is not set 85# CONFIG_CPU_BIG_ENDIAN is not set
@@ -110,6 +112,7 @@ CONFIG_CPU_VR41XX=y
110# CONFIG_CPU_SB1 is not set 112# CONFIG_CPU_SB1 is not set
111CONFIG_SYS_HAS_CPU_VR41XX=y 113CONFIG_SYS_HAS_CPU_VR41XX=y
112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 114CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
115CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 116CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
114CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 117CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
115 118
@@ -123,8 +126,8 @@ CONFIG_PAGE_SIZE_4KB=y
123# CONFIG_PAGE_SIZE_16KB is not set 126# CONFIG_PAGE_SIZE_16KB is not set
124# CONFIG_PAGE_SIZE_64KB is not set 127# CONFIG_PAGE_SIZE_64KB is not set
125CONFIG_MIPS_MT_DISABLED=y 128CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 129# CONFIG_MIPS_MT_SMP is not set
130# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 131# CONFIG_MIPS_VPE_LOADER is not set
129CONFIG_CPU_HAS_SYNC=y 132CONFIG_CPU_HAS_SYNC=y
130CONFIG_GENERIC_HARDIRQS=y 133CONFIG_GENERIC_HARDIRQS=y
@@ -139,6 +142,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 142# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 143CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 144# CONFIG_RESOURCES_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1
142# CONFIG_HZ_48 is not set 146# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 147# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 148# CONFIG_HZ_128 is not set
@@ -151,6 +155,7 @@ CONFIG_HZ=1000
151CONFIG_PREEMPT_NONE=y 155CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set 156# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set 157# CONFIG_PREEMPT is not set
158# CONFIG_KEXEC is not set
154CONFIG_LOCKDEP_SUPPORT=y 159CONFIG_LOCKDEP_SUPPORT=y
155CONFIG_STACKTRACE_SUPPORT=y 160CONFIG_STACKTRACE_SUPPORT=y
156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 161CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -169,15 +174,20 @@ CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y 174CONFIG_LOCALVERSION_AUTO=y
170CONFIG_SWAP=y 175CONFIG_SWAP=y
171CONFIG_SYSVIPC=y 176CONFIG_SYSVIPC=y
177# CONFIG_IPC_NS is not set
178CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_POSIX_MQUEUE is not set 179# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set 180# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 181# CONFIG_TASKSTATS is not set
182# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 183# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 184# CONFIG_IKCONFIG is not set
185CONFIG_SYSFS_DEPRECATED=y
177# CONFIG_RELAY is not set 186# CONFIG_RELAY is not set
178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 189CONFIG_EMBEDDED=y
190CONFIG_SYSCTL_SYSCALL=y
181CONFIG_KALLSYMS=y 191CONFIG_KALLSYMS=y
182# CONFIG_KALLSYMS_EXTRA_PASS is not set 192# CONFIG_KALLSYMS_EXTRA_PASS is not set
183CONFIG_HOTPLUG=y 193CONFIG_HOTPLUG=y
@@ -185,12 +195,12 @@ CONFIG_PRINTK=y
185CONFIG_BUG=y 195CONFIG_BUG=y
186CONFIG_ELF_CORE=y 196CONFIG_ELF_CORE=y
187CONFIG_BASE_FULL=y 197CONFIG_BASE_FULL=y
188CONFIG_RT_MUTEXES=y
189CONFIG_FUTEX=y 198CONFIG_FUTEX=y
190CONFIG_EPOLL=y 199CONFIG_EPOLL=y
191CONFIG_SHMEM=y 200CONFIG_SHMEM=y
192CONFIG_SLAB=y 201CONFIG_SLAB=y
193CONFIG_VM_EVENT_COUNTERS=y 202CONFIG_VM_EVENT_COUNTERS=y
203CONFIG_RT_MUTEXES=y
194# CONFIG_TINY_SHMEM is not set 204# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0 205CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set 206# CONFIG_SLOB is not set
@@ -208,6 +218,7 @@ CONFIG_KMOD=y
208# 218#
209# Block layer 219# Block layer
210# 220#
221CONFIG_BLOCK=y
211# CONFIG_LBD is not set 222# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set 223# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set 224# CONFIG_LSF is not set
@@ -250,6 +261,14 @@ CONFIG_BINFMT_ELF=y
250CONFIG_TRAD_SIGNALS=y 261CONFIG_TRAD_SIGNALS=y
251 262
252# 263#
264# Power management options
265#
266CONFIG_PM=y
267# CONFIG_PM_LEGACY is not set
268# CONFIG_PM_DEBUG is not set
269# CONFIG_PM_SYSFS_DEPRECATED is not set
270
271#
253# Networking 272# Networking
254# 273#
255CONFIG_NET=y 274CONFIG_NET=y
@@ -263,6 +282,8 @@ CONFIG_PACKET=y
263CONFIG_UNIX=y 282CONFIG_UNIX=y
264CONFIG_XFRM=y 283CONFIG_XFRM=y
265# CONFIG_XFRM_USER is not set 284# CONFIG_XFRM_USER is not set
285# CONFIG_XFRM_SUB_POLICY is not set
286CONFIG_XFRM_MIGRATE=y
266# CONFIG_NET_KEY is not set 287# CONFIG_NET_KEY is not set
267CONFIG_INET=y 288CONFIG_INET=y
268CONFIG_IP_MULTICAST=y 289CONFIG_IP_MULTICAST=y
@@ -291,10 +312,13 @@ CONFIG_SYN_COOKIES=y
291CONFIG_INET_TUNNEL=m 312CONFIG_INET_TUNNEL=m
292CONFIG_INET_XFRM_MODE_TRANSPORT=m 313CONFIG_INET_XFRM_MODE_TRANSPORT=m
293CONFIG_INET_XFRM_MODE_TUNNEL=m 314CONFIG_INET_XFRM_MODE_TUNNEL=m
315CONFIG_INET_XFRM_MODE_BEET=m
294CONFIG_INET_DIAG=y 316CONFIG_INET_DIAG=y
295CONFIG_INET_TCP_DIAG=y 317CONFIG_INET_TCP_DIAG=y
296# CONFIG_TCP_CONG_ADVANCED is not set 318# CONFIG_TCP_CONG_ADVANCED is not set
297CONFIG_TCP_CONG_BIC=y 319CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic"
321CONFIG_TCP_MD5SIG=y
298# CONFIG_IPV6 is not set 322# CONFIG_IPV6 is not set
299# CONFIG_INET6_XFRM_TUNNEL is not set 323# CONFIG_INET6_XFRM_TUNNEL is not set
300# CONFIG_INET6_TUNNEL is not set 324# CONFIG_INET6_TUNNEL is not set
@@ -324,7 +348,6 @@ CONFIG_NETWORK_SECMARK=y
324# CONFIG_ATALK is not set 348# CONFIG_ATALK is not set
325# CONFIG_X25 is not set 349# CONFIG_X25 is not set
326# CONFIG_LAPB is not set 350# CONFIG_LAPB is not set
327# CONFIG_NET_DIVERT is not set
328# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
329# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
330 353
@@ -341,6 +364,7 @@ CONFIG_NETWORK_SECMARK=y
341# CONFIG_IRDA is not set 364# CONFIG_IRDA is not set
342# CONFIG_BT is not set 365# CONFIG_BT is not set
343# CONFIG_IEEE80211 is not set 366# CONFIG_IEEE80211 is not set
367CONFIG_FIB_RULES=y
344 368
345# 369#
346# Device Drivers 370# Device Drivers
@@ -372,6 +396,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
372# 396#
373# Plug and Play support 397# Plug and Play support
374# 398#
399# CONFIG_PNPACPI is not set
375 400
376# 401#
377# Block devices 402# Block devices
@@ -389,11 +414,18 @@ CONFIG_BLK_DEV_NBD=m
389CONFIG_BLK_DEV_RAM=y 414CONFIG_BLK_DEV_RAM=y
390CONFIG_BLK_DEV_RAM_COUNT=16 415CONFIG_BLK_DEV_RAM_COUNT=16
391CONFIG_BLK_DEV_RAM_SIZE=4096 416CONFIG_BLK_DEV_RAM_SIZE=4096
417CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
392# CONFIG_BLK_DEV_INITRD is not set 418# CONFIG_BLK_DEV_INITRD is not set
393# CONFIG_CDROM_PKTCDVD is not set 419# CONFIG_CDROM_PKTCDVD is not set
394# CONFIG_ATA_OVER_ETH is not set 420# CONFIG_ATA_OVER_ETH is not set
395 421
396# 422#
423# Misc devices
424#
425CONFIG_SGI_IOC4=m
426# CONFIG_TIFM_CORE is not set
427
428#
397# ATA/ATAPI/MFM/RLL support 429# ATA/ATAPI/MFM/RLL support
398# 430#
399# CONFIG_IDE is not set 431# CONFIG_IDE is not set
@@ -403,6 +435,12 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
403# 435#
404# CONFIG_RAID_ATTRS is not set 436# CONFIG_RAID_ATTRS is not set
405# CONFIG_SCSI is not set 437# CONFIG_SCSI is not set
438# CONFIG_SCSI_NETLINK is not set
439
440#
441# Serial ATA (prod) and Parallel ATA (experimental) drivers
442#
443# CONFIG_ATA is not set
406 444
407# 445#
408# Multi-device support (RAID and LVM) 446# Multi-device support (RAID and LVM)
@@ -453,6 +491,8 @@ CONFIG_LXT_PHY=m
453CONFIG_CICADA_PHY=m 491CONFIG_CICADA_PHY=m
454CONFIG_VITESSE_PHY=m 492CONFIG_VITESSE_PHY=m
455CONFIG_SMSC_PHY=m 493CONFIG_SMSC_PHY=m
494# CONFIG_BROADCOM_PHY is not set
495# CONFIG_FIXED_PHY is not set
456 496
457# 497#
458# Ethernet (10 or 100Mbit) 498# Ethernet (10 or 100Mbit)
@@ -489,14 +529,18 @@ CONFIG_R8169=y
489# CONFIG_SK98LIN is not set 529# CONFIG_SK98LIN is not set
490# CONFIG_TIGON3 is not set 530# CONFIG_TIGON3 is not set
491# CONFIG_BNX2 is not set 531# CONFIG_BNX2 is not set
532CONFIG_QLA3XXX=m
533# CONFIG_ATL1 is not set
492 534
493# 535#
494# Ethernet (10000 Mbit) 536# Ethernet (10000 Mbit)
495# 537#
496# CONFIG_CHELSIO_T1 is not set 538# CONFIG_CHELSIO_T1 is not set
539CONFIG_CHELSIO_T3=m
497# CONFIG_IXGB is not set 540# CONFIG_IXGB is not set
498# CONFIG_S2IO is not set 541# CONFIG_S2IO is not set
499# CONFIG_MYRI10GE is not set 542# CONFIG_MYRI10GE is not set
543CONFIG_NETXEN_NIC=m
500 544
501# 545#
502# Token Ring devices 546# Token Ring devices
@@ -535,6 +579,7 @@ CONFIG_R8169=y
535# Input device support 579# Input device support
536# 580#
537CONFIG_INPUT=y 581CONFIG_INPUT=y
582# CONFIG_INPUT_FF_MEMLESS is not set
538 583
539# 584#
540# Userland interfaces 585# Userland interfaces
@@ -602,10 +647,6 @@ CONFIG_LEGACY_PTY_COUNT=256
602# CONFIG_R3964 is not set 647# CONFIG_R3964 is not set
603# CONFIG_APPLICOM is not set 648# CONFIG_APPLICOM is not set
604CONFIG_TANBAC_TB0219=y 649CONFIG_TANBAC_TB0219=y
605
606#
607# Ftape, the floppy tape device driver
608#
609# CONFIG_DRM is not set 650# CONFIG_DRM is not set
610CONFIG_GPIO_VR41XX=y 651CONFIG_GPIO_VR41XX=y
611# CONFIG_RAW_DRIVER is not set 652# CONFIG_RAW_DRIVER is not set
@@ -614,7 +655,6 @@ CONFIG_GPIO_VR41XX=y
614# TPM devices 655# TPM devices
615# 656#
616# CONFIG_TCG_TPM is not set 657# CONFIG_TCG_TPM is not set
617# CONFIG_TELCLOCK is not set
618 658
619# 659#
620# I2C support 660# I2C support
@@ -630,6 +670,7 @@ CONFIG_GPIO_VR41XX=y
630# 670#
631# Dallas's 1-wire bus 671# Dallas's 1-wire bus
632# 672#
673# CONFIG_W1 is not set
633 674
634# 675#
635# Hardware Monitoring support 676# Hardware Monitoring support
@@ -638,14 +679,9 @@ CONFIG_GPIO_VR41XX=y
638# CONFIG_HWMON_VID is not set 679# CONFIG_HWMON_VID is not set
639 680
640# 681#
641# Misc devices
642#
643
644#
645# Multimedia devices 682# Multimedia devices
646# 683#
647# CONFIG_VIDEO_DEV is not set 684# CONFIG_VIDEO_DEV is not set
648CONFIG_VIDEO_V4L2=y
649 685
650# 686#
651# Digital Video Broadcasting Devices 687# Digital Video Broadcasting Devices
@@ -664,6 +700,7 @@ CONFIG_VIDEO_V4L2=y
664# 700#
665# CONFIG_VGA_CONSOLE is not set 701# CONFIG_VGA_CONSOLE is not set
666CONFIG_DUMMY_CONSOLE=y 702CONFIG_DUMMY_CONSOLE=y
703# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
667 704
668# 705#
669# Sound 706# Sound
@@ -671,6 +708,12 @@ CONFIG_DUMMY_CONSOLE=y
671# CONFIG_SOUND is not set 708# CONFIG_SOUND is not set
672 709
673# 710#
711# HID Devices
712#
713CONFIG_HID=y
714# CONFIG_HID_DEBUG is not set
715
716#
674# USB support 717# USB support
675# 718#
676CONFIG_USB_ARCH_HAS_HCD=y 719CONFIG_USB_ARCH_HAS_HCD=y
@@ -683,8 +726,8 @@ CONFIG_USB=m
683# Miscellaneous USB options 726# Miscellaneous USB options
684# 727#
685CONFIG_USB_DEVICEFS=y 728CONFIG_USB_DEVICEFS=y
686# CONFIG_USB_BANDWIDTH is not set
687# CONFIG_USB_DYNAMIC_MINORS is not set 729# CONFIG_USB_DYNAMIC_MINORS is not set
730# CONFIG_USB_SUSPEND is not set
688# CONFIG_USB_OTG is not set 731# CONFIG_USB_OTG is not set
689 732
690# 733#
@@ -694,9 +737,11 @@ CONFIG_USB_EHCI_HCD=m
694# CONFIG_USB_EHCI_SPLIT_ISO is not set 737# CONFIG_USB_EHCI_SPLIT_ISO is not set
695# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 738# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
696# CONFIG_USB_EHCI_TT_NEWSCHED is not set 739# CONFIG_USB_EHCI_TT_NEWSCHED is not set
740# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
697# CONFIG_USB_ISP116X_HCD is not set 741# CONFIG_USB_ISP116X_HCD is not set
698CONFIG_USB_OHCI_HCD=m 742CONFIG_USB_OHCI_HCD=m
699# CONFIG_USB_OHCI_BIG_ENDIAN is not set 743# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
744# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
700CONFIG_USB_OHCI_LITTLE_ENDIAN=y 745CONFIG_USB_OHCI_LITTLE_ENDIAN=y
701# CONFIG_USB_UHCI_HCD is not set 746# CONFIG_USB_UHCI_HCD is not set
702# CONFIG_USB_SL811_HCD is not set 747# CONFIG_USB_SL811_HCD is not set
@@ -714,7 +759,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
714# 759#
715# may also be needed; see USB_STORAGE Help for more information 760# may also be needed; see USB_STORAGE Help for more information
716# 761#
717# CONFIG_USB_STORAGE is not set
718# CONFIG_USB_LIBUSUAL is not set 762# CONFIG_USB_LIBUSUAL is not set
719 763
720# 764#
@@ -739,6 +783,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
739# CONFIG_USB_ATI_REMOTE2 is not set 783# CONFIG_USB_ATI_REMOTE2 is not set
740# CONFIG_USB_KEYSPAN_REMOTE is not set 784# CONFIG_USB_KEYSPAN_REMOTE is not set
741# CONFIG_USB_APPLETOUCH is not set 785# CONFIG_USB_APPLETOUCH is not set
786# CONFIG_USB_GTCO is not set
742 787
743# 788#
744# USB Imaging devices 789# USB Imaging devices
@@ -752,6 +797,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
752# CONFIG_USB_KAWETH is not set 797# CONFIG_USB_KAWETH is not set
753# CONFIG_USB_PEGASUS is not set 798# CONFIG_USB_PEGASUS is not set
754# CONFIG_USB_RTL8150 is not set 799# CONFIG_USB_RTL8150 is not set
800# CONFIG_USB_USBNET_MII is not set
755# CONFIG_USB_USBNET is not set 801# CONFIG_USB_USBNET is not set
756CONFIG_USB_MON=y 802CONFIG_USB_MON=y
757 803
@@ -769,19 +815,22 @@ CONFIG_USB_MON=y
769# 815#
770# CONFIG_USB_EMI62 is not set 816# CONFIG_USB_EMI62 is not set
771# CONFIG_USB_EMI26 is not set 817# CONFIG_USB_EMI26 is not set
818# CONFIG_USB_ADUTUX is not set
772# CONFIG_USB_AUERSWALD is not set 819# CONFIG_USB_AUERSWALD is not set
773# CONFIG_USB_RIO500 is not set 820# CONFIG_USB_RIO500 is not set
774# CONFIG_USB_LEGOTOWER is not set 821# CONFIG_USB_LEGOTOWER is not set
775# CONFIG_USB_LCD is not set 822# CONFIG_USB_LCD is not set
823# CONFIG_USB_BERRY_CHARGE is not set
776# CONFIG_USB_LED is not set 824# CONFIG_USB_LED is not set
777# CONFIG_USB_CY7C63 is not set 825# CONFIG_USB_CYPRESS_CY7C63 is not set
778# CONFIG_USB_CYTHERM is not set 826# CONFIG_USB_CYTHERM is not set
779# CONFIG_USB_PHIDGETKIT is not set 827# CONFIG_USB_PHIDGET is not set
780# CONFIG_USB_PHIDGETSERVO is not set
781# CONFIG_USB_IDMOUSE is not set 828# CONFIG_USB_IDMOUSE is not set
829# CONFIG_USB_FTDI_ELAN is not set
782# CONFIG_USB_APPLEDISPLAY is not set 830# CONFIG_USB_APPLEDISPLAY is not set
783# CONFIG_USB_SISUSBVGA is not set 831# CONFIG_USB_SISUSBVGA is not set
784# CONFIG_USB_LD is not set 832# CONFIG_USB_LD is not set
833# CONFIG_USB_TRANCEVIBRATOR is not set
785# CONFIG_USB_TEST is not set 834# CONFIG_USB_TEST is not set
786 835
787# 836#
@@ -827,6 +876,7 @@ CONFIG_RTC_LIB=y
827CONFIG_RTC_CLASS=y 876CONFIG_RTC_CLASS=y
828CONFIG_RTC_HCTOSYS=y 877CONFIG_RTC_HCTOSYS=y
829CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 878CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
879# CONFIG_RTC_DEBUG is not set
830 880
831# 881#
832# RTC interfaces 882# RTC interfaces
@@ -860,16 +910,26 @@ CONFIG_RTC_DRV_VR41XX=y
860# 910#
861 911
862# 912#
913# Auxiliary Display support
914#
915
916#
917# Virtualization
918#
919
920#
863# File systems 921# File systems
864# 922#
865CONFIG_EXT2_FS=y 923CONFIG_EXT2_FS=y
866# CONFIG_EXT2_FS_XATTR is not set 924# CONFIG_EXT2_FS_XATTR is not set
867# CONFIG_EXT2_FS_XIP is not set 925# CONFIG_EXT2_FS_XIP is not set
868# CONFIG_EXT3_FS is not set 926# CONFIG_EXT3_FS is not set
927# CONFIG_EXT4DEV_FS is not set
869# CONFIG_REISERFS_FS is not set 928# CONFIG_REISERFS_FS is not set
870# CONFIG_JFS_FS is not set 929# CONFIG_JFS_FS is not set
871# CONFIG_FS_POSIX_ACL is not set 930CONFIG_FS_POSIX_ACL=y
872# CONFIG_XFS_FS is not set 931# CONFIG_XFS_FS is not set
932# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 933# CONFIG_OCFS2_FS is not set
874# CONFIG_MINIX_FS is not set 934# CONFIG_MINIX_FS is not set
875CONFIG_ROMFS_FS=m 935CONFIG_ROMFS_FS=m
@@ -880,6 +940,7 @@ CONFIG_DNOTIFY=y
880# CONFIG_AUTOFS_FS is not set 940# CONFIG_AUTOFS_FS is not set
881CONFIG_AUTOFS4_FS=y 941CONFIG_AUTOFS4_FS=y
882CONFIG_FUSE_FS=m 942CONFIG_FUSE_FS=m
943CONFIG_GENERIC_ACL=y
883 944
884# 945#
885# CD-ROM/DVD Filesystems 946# CD-ROM/DVD Filesystems
@@ -899,11 +960,13 @@ CONFIG_FUSE_FS=m
899# 960#
900CONFIG_PROC_FS=y 961CONFIG_PROC_FS=y
901CONFIG_PROC_KCORE=y 962CONFIG_PROC_KCORE=y
963CONFIG_PROC_SYSCTL=y
902CONFIG_SYSFS=y 964CONFIG_SYSFS=y
903CONFIG_TMPFS=y 965CONFIG_TMPFS=y
966CONFIG_TMPFS_POSIX_ACL=y
904# CONFIG_HUGETLB_PAGE is not set 967# CONFIG_HUGETLB_PAGE is not set
905CONFIG_RAMFS=y 968CONFIG_RAMFS=y
906# CONFIG_CONFIGFS_FS is not set 969CONFIG_CONFIGFS_FS=m
907 970
908# 971#
909# Miscellaneous filesystems 972# Miscellaneous filesystems
@@ -945,7 +1008,6 @@ CONFIG_SUNRPC=y
945# CONFIG_RPCSEC_GSS_SPKM3 is not set 1008# CONFIG_RPCSEC_GSS_SPKM3 is not set
946# CONFIG_SMB_FS is not set 1009# CONFIG_SMB_FS is not set
947# CONFIG_CIFS is not set 1010# CONFIG_CIFS is not set
948# CONFIG_CIFS_DEBUG2 is not set
949# CONFIG_NCP_FS is not set 1011# CONFIG_NCP_FS is not set
950# CONFIG_CODA_FS is not set 1012# CONFIG_CODA_FS is not set
951# CONFIG_AFS_FS is not set 1013# CONFIG_AFS_FS is not set
@@ -963,6 +1025,14 @@ CONFIG_MSDOS_PARTITION=y
963# CONFIG_NLS is not set 1025# CONFIG_NLS is not set
964 1026
965# 1027#
1028# Distributed Lock Manager
1029#
1030CONFIG_DLM=m
1031CONFIG_DLM_TCP=y
1032# CONFIG_DLM_SCTP is not set
1033# CONFIG_DLM_DEBUG is not set
1034
1035#
966# Profiling support 1036# Profiling support
967# 1037#
968# CONFIG_PROFILING is not set 1038# CONFIG_PROFILING is not set
@@ -972,11 +1042,13 @@ CONFIG_MSDOS_PARTITION=y
972# 1042#
973CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1043CONFIG_TRACE_IRQFLAGS_SUPPORT=y
974# CONFIG_PRINTK_TIME is not set 1044# CONFIG_PRINTK_TIME is not set
1045CONFIG_ENABLE_MUST_CHECK=y
975# CONFIG_MAGIC_SYSRQ is not set 1046# CONFIG_MAGIC_SYSRQ is not set
976# CONFIG_UNUSED_SYMBOLS is not set 1047# CONFIG_UNUSED_SYMBOLS is not set
1048# CONFIG_DEBUG_FS is not set
1049# CONFIG_HEADERS_CHECK is not set
977# CONFIG_DEBUG_KERNEL is not set 1050# CONFIG_DEBUG_KERNEL is not set
978CONFIG_LOG_BUF_SHIFT=14 1051CONFIG_LOG_BUF_SHIFT=14
979# CONFIG_DEBUG_FS is not set
980CONFIG_CROSSCOMPILE=y 1052CONFIG_CROSSCOMPILE=y
981CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" 1053CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
982 1054
@@ -989,7 +1061,44 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
989# 1061#
990# Cryptographic options 1062# Cryptographic options
991# 1063#
992# CONFIG_CRYPTO is not set 1064CONFIG_CRYPTO=y
1065CONFIG_CRYPTO_ALGAPI=y
1066CONFIG_CRYPTO_BLKCIPHER=m
1067CONFIG_CRYPTO_HASH=m
1068CONFIG_CRYPTO_MANAGER=m
1069CONFIG_CRYPTO_HMAC=m
1070CONFIG_CRYPTO_XCBC=m
1071CONFIG_CRYPTO_NULL=m
1072CONFIG_CRYPTO_MD4=m
1073CONFIG_CRYPTO_MD5=y
1074CONFIG_CRYPTO_SHA1=m
1075CONFIG_CRYPTO_SHA256=m
1076CONFIG_CRYPTO_SHA512=m
1077CONFIG_CRYPTO_WP512=m
1078CONFIG_CRYPTO_TGR192=m
1079CONFIG_CRYPTO_GF128MUL=m
1080CONFIG_CRYPTO_ECB=m
1081CONFIG_CRYPTO_CBC=m
1082CONFIG_CRYPTO_PCBC=m
1083CONFIG_CRYPTO_LRW=m
1084CONFIG_CRYPTO_DES=m
1085CONFIG_CRYPTO_FCRYPT=m
1086CONFIG_CRYPTO_BLOWFISH=m
1087CONFIG_CRYPTO_TWOFISH=m
1088CONFIG_CRYPTO_TWOFISH_COMMON=m
1089CONFIG_CRYPTO_SERPENT=m
1090CONFIG_CRYPTO_AES=m
1091CONFIG_CRYPTO_CAST5=m
1092CONFIG_CRYPTO_CAST6=m
1093CONFIG_CRYPTO_TEA=m
1094CONFIG_CRYPTO_ARC4=m
1095CONFIG_CRYPTO_KHAZAD=m
1096CONFIG_CRYPTO_ANUBIS=m
1097CONFIG_CRYPTO_DEFLATE=m
1098CONFIG_CRYPTO_MICHAEL_MIC=m
1099CONFIG_CRYPTO_CRC32C=m
1100CONFIG_CRYPTO_CAMELLIA=m
1101# CONFIG_CRYPTO_TEST is not set
993 1102
994# 1103#
995# Hardware crypto devices 1104# Hardware crypto devices
@@ -998,9 +1107,13 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
998# 1107#
999# Library routines 1108# Library routines
1000# 1109#
1110CONFIG_BITREVERSE=y
1001# CONFIG_CRC_CCITT is not set 1111# CONFIG_CRC_CCITT is not set
1002# CONFIG_CRC16 is not set 1112# CONFIG_CRC16 is not set
1003CONFIG_CRC32=y 1113CONFIG_CRC32=y
1004# CONFIG_LIBCRC32C is not set 1114CONFIG_LIBCRC32C=m
1005CONFIG_ZLIB_INFLATE=m 1115CONFIG_ZLIB_INFLATE=m
1116CONFIG_ZLIB_DEFLATE=m
1006CONFIG_PLIST=y 1117CONFIG_PLIST=y
1118CONFIG_HAS_IOMEM=y
1119CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index 97d94f96990f..8bb6be4342b6 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc2 3# Linux kernel version: 2.6.21-rc1
4# Wed Oct 18 12:57:11 2006 4# Thu Feb 22 10:38:09 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -38,8 +39,8 @@ CONFIG_MIPS=y
38# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
39# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
44CONFIG_MACH_VR41XX=y 45CONFIG_MACH_VR41XX=y
45# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -71,11 +72,14 @@ CONFIG_TANBAC_TB0287=y
71# CONFIG_ZAO_CAPCELLA is not set 72# CONFIG_ZAO_CAPCELLA is not set
72CONFIG_PCI_VR41XX=y 73CONFIG_PCI_VR41XX=y
73CONFIG_RWSEM_GENERIC_SPINLOCK=y 74CONFIG_RWSEM_GENERIC_SPINLOCK=y
75# CONFIG_ARCH_HAS_ILOG2_U32 is not set
76# CONFIG_ARCH_HAS_ILOG2_U64 is not set
74CONFIG_GENERIC_FIND_NEXT_BIT=y 77CONFIG_GENERIC_FIND_NEXT_BIT=y
75CONFIG_GENERIC_HWEIGHT=y 78CONFIG_GENERIC_HWEIGHT=y
76CONFIG_GENERIC_CALIBRATE_DELAY=y 79CONFIG_GENERIC_CALIBRATE_DELAY=y
77CONFIG_GENERIC_TIME=y 80CONFIG_GENERIC_TIME=y
78CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 81CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
82CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
79CONFIG_DMA_NONCOHERENT=y 83CONFIG_DMA_NONCOHERENT=y
80CONFIG_DMA_NEED_PCI_MAP_STATE=y 84CONFIG_DMA_NEED_PCI_MAP_STATE=y
81# CONFIG_CPU_BIG_ENDIAN is not set 85# CONFIG_CPU_BIG_ENDIAN is not set
@@ -108,6 +112,7 @@ CONFIG_CPU_VR41XX=y
108# CONFIG_CPU_SB1 is not set 112# CONFIG_CPU_SB1 is not set
109CONFIG_SYS_HAS_CPU_VR41XX=y 113CONFIG_SYS_HAS_CPU_VR41XX=y
110CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 114CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
115CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 116CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
112CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 117CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
113 118
@@ -137,6 +142,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
137# CONFIG_SPARSEMEM_STATIC is not set 142# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4 143CONFIG_SPLIT_PTLOCK_CPUS=4
139# CONFIG_RESOURCES_64BIT is not set 144# CONFIG_RESOURCES_64BIT is not set
145CONFIG_ZONE_DMA_FLAG=1
140# CONFIG_HZ_48 is not set 146# CONFIG_HZ_48 is not set
141# CONFIG_HZ_100 is not set 147# CONFIG_HZ_100 is not set
142# CONFIG_HZ_128 is not set 148# CONFIG_HZ_128 is not set
@@ -149,6 +155,7 @@ CONFIG_HZ=1000
149CONFIG_PREEMPT_NONE=y 155CONFIG_PREEMPT_NONE=y
150# CONFIG_PREEMPT_VOLUNTARY is not set 156# CONFIG_PREEMPT_VOLUNTARY is not set
151# CONFIG_PREEMPT is not set 157# CONFIG_PREEMPT is not set
158# CONFIG_KEXEC is not set
152CONFIG_LOCKDEP_SUPPORT=y 159CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 160CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 161CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -168,14 +175,15 @@ CONFIG_LOCALVERSION_AUTO=y
168CONFIG_SWAP=y 175CONFIG_SWAP=y
169CONFIG_SYSVIPC=y 176CONFIG_SYSVIPC=y
170# CONFIG_IPC_NS is not set 177# CONFIG_IPC_NS is not set
178CONFIG_SYSVIPC_SYSCTL=y
171# CONFIG_POSIX_MQUEUE is not set 179# CONFIG_POSIX_MQUEUE is not set
172# CONFIG_BSD_PROCESS_ACCT is not set 180# CONFIG_BSD_PROCESS_ACCT is not set
173# CONFIG_TASKSTATS is not set 181# CONFIG_TASKSTATS is not set
174# CONFIG_UTS_NS is not set 182# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 183# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 184# CONFIG_IKCONFIG is not set
185CONFIG_SYSFS_DEPRECATED=y
177# CONFIG_RELAY is not set 186# CONFIG_RELAY is not set
178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
180CONFIG_SYSCTL=y 188CONFIG_SYSCTL=y
181CONFIG_EMBEDDED=y 189CONFIG_EMBEDDED=y
@@ -233,7 +241,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
233# 241#
234CONFIG_HW_HAS_PCI=y 242CONFIG_HW_HAS_PCI=y
235CONFIG_PCI=y 243CONFIG_PCI=y
236# CONFIG_PCI_MULTITHREAD_PROBE is not set
237CONFIG_MMU=y 244CONFIG_MMU=y
238 245
239# 246#
@@ -252,6 +259,14 @@ CONFIG_BINFMT_ELF=y
252CONFIG_TRAD_SIGNALS=y 259CONFIG_TRAD_SIGNALS=y
253 260
254# 261#
262# Power management options
263#
264CONFIG_PM=y
265# CONFIG_PM_LEGACY is not set
266# CONFIG_PM_DEBUG is not set
267# CONFIG_PM_SYSFS_DEPRECATED is not set
268
269#
255# Networking 270# Networking
256# 271#
257CONFIG_NET=y 272CONFIG_NET=y
@@ -266,6 +281,7 @@ CONFIG_UNIX=y
266CONFIG_XFRM=y 281CONFIG_XFRM=y
267# CONFIG_XFRM_USER is not set 282# CONFIG_XFRM_USER is not set
268# CONFIG_XFRM_SUB_POLICY is not set 283# CONFIG_XFRM_SUB_POLICY is not set
284CONFIG_XFRM_MIGRATE=y
269# CONFIG_NET_KEY is not set 285# CONFIG_NET_KEY is not set
270CONFIG_INET=y 286CONFIG_INET=y
271CONFIG_IP_MULTICAST=y 287CONFIG_IP_MULTICAST=y
@@ -315,6 +331,7 @@ CONFIG_DEFAULT_BIC=y
315# CONFIG_DEFAULT_WESTWOOD is not set 331# CONFIG_DEFAULT_WESTWOOD is not set
316# CONFIG_DEFAULT_RENO is not set 332# CONFIG_DEFAULT_RENO is not set
317CONFIG_DEFAULT_TCP_CONG="bic" 333CONFIG_DEFAULT_TCP_CONG="bic"
334CONFIG_TCP_MD5SIG=y
318# CONFIG_IPV6 is not set 335# CONFIG_IPV6 is not set
319# CONFIG_INET6_XFRM_TUNNEL is not set 336# CONFIG_INET6_XFRM_TUNNEL is not set
320# CONFIG_INET6_TUNNEL is not set 337# CONFIG_INET6_TUNNEL is not set
@@ -391,6 +408,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
391# 408#
392# Plug and Play support 409# Plug and Play support
393# 410#
411# CONFIG_PNPACPI is not set
394 412
395# 413#
396# Block devices 414# Block devices
@@ -414,6 +432,12 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
414# CONFIG_ATA_OVER_ETH is not set 432# CONFIG_ATA_OVER_ETH is not set
415 433
416# 434#
435# Misc devices
436#
437CONFIG_SGI_IOC4=m
438# CONFIG_TIFM_CORE is not set
439
440#
417# ATA/ATAPI/MFM/RLL support 441# ATA/ATAPI/MFM/RLL support
418# 442#
419# CONFIG_IDE is not set 443# CONFIG_IDE is not set
@@ -423,6 +447,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
423# 447#
424# CONFIG_RAID_ATTRS is not set 448# CONFIG_RAID_ATTRS is not set
425CONFIG_SCSI=y 449CONFIG_SCSI=y
450CONFIG_SCSI_TGT=m
426# CONFIG_SCSI_NETLINK is not set 451# CONFIG_SCSI_NETLINK is not set
427CONFIG_SCSI_PROC_FS=y 452CONFIG_SCSI_PROC_FS=y
428 453
@@ -442,6 +467,7 @@ CONFIG_BLK_DEV_SD=y
442# CONFIG_SCSI_MULTI_LUN is not set 467# CONFIG_SCSI_MULTI_LUN is not set
443# CONFIG_SCSI_CONSTANTS is not set 468# CONFIG_SCSI_CONSTANTS is not set
444# CONFIG_SCSI_LOGGING is not set 469# CONFIG_SCSI_LOGGING is not set
470CONFIG_SCSI_SCAN_ASYNC=y
445 471
446# 472#
447# SCSI Transports 473# SCSI Transports
@@ -486,11 +512,13 @@ CONFIG_BLK_DEV_SD=y
486# CONFIG_SCSI_DC390T is not set 512# CONFIG_SCSI_DC390T is not set
487# CONFIG_SCSI_NSP32 is not set 513# CONFIG_SCSI_NSP32 is not set
488# CONFIG_SCSI_DEBUG is not set 514# CONFIG_SCSI_DEBUG is not set
515# CONFIG_SCSI_SRP is not set
489 516
490# 517#
491# Serial ATA (prod) and Parallel ATA (experimental) drivers 518# Serial ATA (prod) and Parallel ATA (experimental) drivers
492# 519#
493CONFIG_ATA=y 520CONFIG_ATA=y
521# CONFIG_ATA_NONSTANDARD is not set
494# CONFIG_SATA_AHCI is not set 522# CONFIG_SATA_AHCI is not set
495# CONFIG_SATA_SVW is not set 523# CONFIG_SATA_SVW is not set
496# CONFIG_ATA_PIIX is not set 524# CONFIG_ATA_PIIX is not set
@@ -506,6 +534,7 @@ CONFIG_ATA=y
506# CONFIG_SATA_ULI is not set 534# CONFIG_SATA_ULI is not set
507# CONFIG_SATA_VIA is not set 535# CONFIG_SATA_VIA is not set
508# CONFIG_SATA_VITESSE is not set 536# CONFIG_SATA_VITESSE is not set
537# CONFIG_SATA_INIC162X is not set
509# CONFIG_PATA_ALI is not set 538# CONFIG_PATA_ALI is not set
510# CONFIG_PATA_AMD is not set 539# CONFIG_PATA_AMD is not set
511# CONFIG_PATA_ARTOP is not set 540# CONFIG_PATA_ARTOP is not set
@@ -521,8 +550,10 @@ CONFIG_ATA=y
521# CONFIG_PATA_HPT3X2N is not set 550# CONFIG_PATA_HPT3X2N is not set
522# CONFIG_PATA_HPT3X3 is not set 551# CONFIG_PATA_HPT3X3 is not set
523# CONFIG_PATA_IT821X is not set 552# CONFIG_PATA_IT821X is not set
553# CONFIG_PATA_IT8213 is not set
524# CONFIG_PATA_JMICRON is not set 554# CONFIG_PATA_JMICRON is not set
525# CONFIG_PATA_TRIFLEX is not set 555# CONFIG_PATA_TRIFLEX is not set
556# CONFIG_PATA_MARVELL is not set
526# CONFIG_PATA_MPIIX is not set 557# CONFIG_PATA_MPIIX is not set
527# CONFIG_PATA_OLDPIIX is not set 558# CONFIG_PATA_OLDPIIX is not set
528# CONFIG_PATA_NETCELL is not set 559# CONFIG_PATA_NETCELL is not set
@@ -539,6 +570,7 @@ CONFIG_PATA_SIL680=y
539# CONFIG_PATA_SIS is not set 570# CONFIG_PATA_SIS is not set
540# CONFIG_PATA_VIA is not set 571# CONFIG_PATA_VIA is not set
541# CONFIG_PATA_WINBOND is not set 572# CONFIG_PATA_WINBOND is not set
573# CONFIG_PATA_PLATFORM is not set
542 574
543# 575#
544# Multi-device support (RAID and LVM) 576# Multi-device support (RAID and LVM)
@@ -562,10 +594,8 @@ CONFIG_IEEE1394=m
562# Subsystem Options 594# Subsystem Options
563# 595#
564# CONFIG_IEEE1394_VERBOSEDEBUG is not set 596# CONFIG_IEEE1394_VERBOSEDEBUG is not set
565# CONFIG_IEEE1394_OUI_DB is not set
566CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y 597CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
567CONFIG_IEEE1394_CONFIG_ROM_IP1394=y 598CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
568# CONFIG_IEEE1394_EXPORT_FULL_API is not set
569 599
570# 600#
571# Device Drivers 601# Device Drivers
@@ -645,14 +675,17 @@ CONFIG_R8169=y
645# CONFIG_TIGON3 is not set 675# CONFIG_TIGON3 is not set
646# CONFIG_BNX2 is not set 676# CONFIG_BNX2 is not set
647# CONFIG_QLA3XXX is not set 677# CONFIG_QLA3XXX is not set
678# CONFIG_ATL1 is not set
648 679
649# 680#
650# Ethernet (10000 Mbit) 681# Ethernet (10000 Mbit)
651# 682#
652# CONFIG_CHELSIO_T1 is not set 683# CONFIG_CHELSIO_T1 is not set
684CONFIG_CHELSIO_T3=m
653# CONFIG_IXGB is not set 685# CONFIG_IXGB is not set
654# CONFIG_S2IO is not set 686# CONFIG_S2IO is not set
655# CONFIG_MYRI10GE is not set 687# CONFIG_MYRI10GE is not set
688CONFIG_NETXEN_NIC=m
656 689
657# 690#
658# Token Ring devices 691# Token Ring devices
@@ -760,10 +793,6 @@ CONFIG_LEGACY_PTY_COUNT=256
760# CONFIG_R3964 is not set 793# CONFIG_R3964 is not set
761# CONFIG_APPLICOM is not set 794# CONFIG_APPLICOM is not set
762# CONFIG_TANBAC_TB0219 is not set 795# CONFIG_TANBAC_TB0219 is not set
763
764#
765# Ftape, the floppy tape device driver
766#
767# CONFIG_DRM is not set 796# CONFIG_DRM is not set
768CONFIG_GPIO_VR41XX=y 797CONFIG_GPIO_VR41XX=y
769# CONFIG_RAW_DRIVER is not set 798# CONFIG_RAW_DRIVER is not set
@@ -787,6 +816,7 @@ CONFIG_GPIO_VR41XX=y
787# 816#
788# Dallas's 1-wire bus 817# Dallas's 1-wire bus
789# 818#
819# CONFIG_W1 is not set
790 820
791# 821#
792# Hardware Monitoring support 822# Hardware Monitoring support
@@ -795,9 +825,9 @@ CONFIG_GPIO_VR41XX=y
795# CONFIG_HWMON_VID is not set 825# CONFIG_HWMON_VID is not set
796 826
797# 827#
798# Misc devices 828# Multifunction device drivers
799# 829#
800# CONFIG_TIFM_CORE is not set 830CONFIG_MFD_SM501=y
801 831
802# 832#
803# Multimedia devices 833# Multimedia devices
@@ -813,15 +843,22 @@ CONFIG_GPIO_VR41XX=y
813# 843#
814# Graphics support 844# Graphics support
815# 845#
816# CONFIG_FIRMWARE_EDID is not set 846# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
817CONFIG_FB=y 847CONFIG_FB=y
848# CONFIG_FIRMWARE_EDID is not set
849# CONFIG_FB_DDC is not set
818CONFIG_FB_CFB_FILLRECT=y 850CONFIG_FB_CFB_FILLRECT=y
819CONFIG_FB_CFB_COPYAREA=y 851CONFIG_FB_CFB_COPYAREA=y
820CONFIG_FB_CFB_IMAGEBLIT=y 852CONFIG_FB_CFB_IMAGEBLIT=y
853# CONFIG_FB_SVGALIB is not set
821# CONFIG_FB_MACMODES is not set 854# CONFIG_FB_MACMODES is not set
822# CONFIG_FB_BACKLIGHT is not set 855# CONFIG_FB_BACKLIGHT is not set
823# CONFIG_FB_MODE_HELPERS is not set 856# CONFIG_FB_MODE_HELPERS is not set
824# CONFIG_FB_TILEBLITTING is not set 857# CONFIG_FB_TILEBLITTING is not set
858
859#
860# Frambuffer hardware drivers
861#
825# CONFIG_FB_CIRRUS is not set 862# CONFIG_FB_CIRRUS is not set
826# CONFIG_FB_PM2 is not set 863# CONFIG_FB_PM2 is not set
827# CONFIG_FB_CYBER2000 is not set 864# CONFIG_FB_CYBER2000 is not set
@@ -834,14 +871,16 @@ CONFIG_FB_CFB_IMAGEBLIT=y
834# CONFIG_FB_RADEON is not set 871# CONFIG_FB_RADEON is not set
835# CONFIG_FB_ATY128 is not set 872# CONFIG_FB_ATY128 is not set
836# CONFIG_FB_ATY is not set 873# CONFIG_FB_ATY is not set
874# CONFIG_FB_S3 is not set
837# CONFIG_FB_SAVAGE is not set 875# CONFIG_FB_SAVAGE is not set
838# CONFIG_FB_SIS is not set 876# CONFIG_FB_SIS is not set
839# CONFIG_FB_NEOMAGIC is not set 877# CONFIG_FB_NEOMAGIC is not set
840# CONFIG_FB_KYRO is not set 878# CONFIG_FB_KYRO is not set
841# CONFIG_FB_3DFX is not set 879# CONFIG_FB_3DFX is not set
842# CONFIG_FB_VOODOO1 is not set 880# CONFIG_FB_VOODOO1 is not set
843CONFIG_FB_SMIVGX=y 881# CONFIG_FB_SMIVGX is not set
844# CONFIG_FB_TRIDENT is not set 882# CONFIG_FB_TRIDENT is not set
883CONFIG_FB_SM501=y
845# CONFIG_FB_VIRTUAL is not set 884# CONFIG_FB_VIRTUAL is not set
846 885
847# 886#
@@ -855,7 +894,6 @@ CONFIG_DUMMY_CONSOLE=y
855# Logo configuration 894# Logo configuration
856# 895#
857# CONFIG_LOGO is not set 896# CONFIG_LOGO is not set
858# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
859 897
860# 898#
861# Sound 899# Sound
@@ -863,6 +901,12 @@ CONFIG_DUMMY_CONSOLE=y
863# CONFIG_SOUND is not set 901# CONFIG_SOUND is not set
864 902
865# 903#
904# HID Devices
905#
906CONFIG_HID=y
907# CONFIG_HID_DEBUG is not set
908
909#
866# USB support 910# USB support
867# 911#
868CONFIG_USB_ARCH_HAS_HCD=y 912CONFIG_USB_ARCH_HAS_HCD=y
@@ -875,8 +919,8 @@ CONFIG_USB=m
875# Miscellaneous USB options 919# Miscellaneous USB options
876# 920#
877# CONFIG_USB_DEVICEFS is not set 921# CONFIG_USB_DEVICEFS is not set
878# CONFIG_USB_BANDWIDTH is not set
879# CONFIG_USB_DYNAMIC_MINORS is not set 922# CONFIG_USB_DYNAMIC_MINORS is not set
923# CONFIG_USB_SUSPEND is not set
880# CONFIG_USB_OTG is not set 924# CONFIG_USB_OTG is not set
881 925
882# 926#
@@ -886,9 +930,11 @@ CONFIG_USB_EHCI_HCD=m
886# CONFIG_USB_EHCI_SPLIT_ISO is not set 930# CONFIG_USB_EHCI_SPLIT_ISO is not set
887# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 931# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
888# CONFIG_USB_EHCI_TT_NEWSCHED is not set 932# CONFIG_USB_EHCI_TT_NEWSCHED is not set
933# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
889# CONFIG_USB_ISP116X_HCD is not set 934# CONFIG_USB_ISP116X_HCD is not set
890CONFIG_USB_OHCI_HCD=m 935CONFIG_USB_OHCI_HCD=m
891# CONFIG_USB_OHCI_BIG_ENDIAN is not set 936# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
937# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
892CONFIG_USB_OHCI_LITTLE_ENDIAN=y 938CONFIG_USB_OHCI_LITTLE_ENDIAN=y
893# CONFIG_USB_UHCI_HCD is not set 939# CONFIG_USB_UHCI_HCD is not set
894# CONFIG_USB_SL811_HCD is not set 940# CONFIG_USB_SL811_HCD is not set
@@ -923,7 +969,6 @@ CONFIG_USB_STORAGE=m
923# USB Input Devices 969# USB Input Devices
924# 970#
925CONFIG_USB_HID=m 971CONFIG_USB_HID=m
926CONFIG_USB_HIDINPUT=y
927# CONFIG_USB_HIDINPUT_POWERBOOK is not set 972# CONFIG_USB_HIDINPUT_POWERBOOK is not set
928# CONFIG_HID_FF is not set 973# CONFIG_HID_FF is not set
929# CONFIG_USB_HIDDEV is not set 974# CONFIG_USB_HIDDEV is not set
@@ -945,7 +990,7 @@ CONFIG_USB_HIDINPUT=y
945# CONFIG_USB_ATI_REMOTE2 is not set 990# CONFIG_USB_ATI_REMOTE2 is not set
946# CONFIG_USB_KEYSPAN_REMOTE is not set 991# CONFIG_USB_KEYSPAN_REMOTE is not set
947# CONFIG_USB_APPLETOUCH is not set 992# CONFIG_USB_APPLETOUCH is not set
948# CONFIG_USB_TRANCEVIBRATOR is not set 993# CONFIG_USB_GTCO is not set
949 994
950# 995#
951# USB Imaging devices 996# USB Imaging devices
@@ -960,6 +1005,7 @@ CONFIG_USB_HIDINPUT=y
960# CONFIG_USB_KAWETH is not set 1005# CONFIG_USB_KAWETH is not set
961# CONFIG_USB_PEGASUS is not set 1006# CONFIG_USB_PEGASUS is not set
962# CONFIG_USB_RTL8150 is not set 1007# CONFIG_USB_RTL8150 is not set
1008# CONFIG_USB_USBNET_MII is not set
963# CONFIG_USB_USBNET is not set 1009# CONFIG_USB_USBNET is not set
964CONFIG_USB_MON=y 1010CONFIG_USB_MON=y
965 1011
@@ -982,6 +1028,7 @@ CONFIG_USB_MON=y
982# CONFIG_USB_RIO500 is not set 1028# CONFIG_USB_RIO500 is not set
983# CONFIG_USB_LEGOTOWER is not set 1029# CONFIG_USB_LEGOTOWER is not set
984# CONFIG_USB_LCD is not set 1030# CONFIG_USB_LCD is not set
1031# CONFIG_USB_BERRY_CHARGE is not set
985# CONFIG_USB_LED is not set 1032# CONFIG_USB_LED is not set
986# CONFIG_USB_CYPRESS_CY7C63 is not set 1033# CONFIG_USB_CYPRESS_CY7C63 is not set
987# CONFIG_USB_CYTHERM is not set 1034# CONFIG_USB_CYTHERM is not set
@@ -991,6 +1038,7 @@ CONFIG_USB_MON=y
991# CONFIG_USB_APPLEDISPLAY is not set 1038# CONFIG_USB_APPLEDISPLAY is not set
992# CONFIG_USB_SISUSBVGA is not set 1039# CONFIG_USB_SISUSBVGA is not set
993# CONFIG_USB_LD is not set 1040# CONFIG_USB_LD is not set
1041# CONFIG_USB_TRANCEVIBRATOR is not set
994 1042
995# 1043#
996# USB DSL modem support 1044# USB DSL modem support
@@ -1047,6 +1095,14 @@ CONFIG_USB_MON=y
1047# 1095#
1048 1096
1049# 1097#
1098# Auxiliary Display support
1099#
1100
1101#
1102# Virtualization
1103#
1104
1105#
1050# File systems 1106# File systems
1051# 1107#
1052CONFIG_EXT2_FS=y 1108CONFIG_EXT2_FS=y
@@ -1105,7 +1161,7 @@ CONFIG_TMPFS=y
1105# CONFIG_TMPFS_POSIX_ACL is not set 1161# CONFIG_TMPFS_POSIX_ACL is not set
1106# CONFIG_HUGETLB_PAGE is not set 1162# CONFIG_HUGETLB_PAGE is not set
1107CONFIG_RAMFS=y 1163CONFIG_RAMFS=y
1108# CONFIG_CONFIGFS_FS is not set 1164CONFIG_CONFIGFS_FS=m
1109 1165
1110# 1166#
1111# Miscellaneous filesystems 1167# Miscellaneous filesystems
@@ -1159,6 +1215,14 @@ CONFIG_MSDOS_PARTITION=y
1159# CONFIG_NLS is not set 1215# CONFIG_NLS is not set
1160 1216
1161# 1217#
1218# Distributed Lock Manager
1219#
1220CONFIG_DLM=m
1221CONFIG_DLM_TCP=y
1222# CONFIG_DLM_SCTP is not set
1223# CONFIG_DLM_DEBUG is not set
1224
1225#
1162# Profiling support 1226# Profiling support
1163# 1227#
1164# CONFIG_PROFILING is not set 1228# CONFIG_PROFILING is not set
@@ -1171,10 +1235,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1171CONFIG_ENABLE_MUST_CHECK=y 1235CONFIG_ENABLE_MUST_CHECK=y
1172# CONFIG_MAGIC_SYSRQ is not set 1236# CONFIG_MAGIC_SYSRQ is not set
1173# CONFIG_UNUSED_SYMBOLS is not set 1237# CONFIG_UNUSED_SYMBOLS is not set
1174# CONFIG_DEBUG_KERNEL is not set
1175CONFIG_LOG_BUF_SHIFT=14
1176# CONFIG_DEBUG_FS is not set 1238# CONFIG_DEBUG_FS is not set
1177# CONFIG_HEADERS_CHECK is not set 1239# CONFIG_HEADERS_CHECK is not set
1240# CONFIG_DEBUG_KERNEL is not set
1241CONFIG_LOG_BUF_SHIFT=14
1178CONFIG_CROSSCOMPILE=y 1242CONFIG_CROSSCOMPILE=y
1179CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" 1243CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1180 1244
@@ -1187,14 +1251,59 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1187# 1251#
1188# Cryptographic options 1252# Cryptographic options
1189# 1253#
1190# CONFIG_CRYPTO is not set 1254CONFIG_CRYPTO=y
1255CONFIG_CRYPTO_ALGAPI=y
1256CONFIG_CRYPTO_BLKCIPHER=m
1257CONFIG_CRYPTO_HASH=m
1258CONFIG_CRYPTO_MANAGER=m
1259CONFIG_CRYPTO_HMAC=m
1260CONFIG_CRYPTO_XCBC=m
1261CONFIG_CRYPTO_NULL=m
1262CONFIG_CRYPTO_MD4=m
1263CONFIG_CRYPTO_MD5=y
1264CONFIG_CRYPTO_SHA1=m
1265CONFIG_CRYPTO_SHA256=m
1266CONFIG_CRYPTO_SHA512=m
1267CONFIG_CRYPTO_WP512=m
1268CONFIG_CRYPTO_TGR192=m
1269CONFIG_CRYPTO_GF128MUL=m
1270CONFIG_CRYPTO_ECB=m
1271CONFIG_CRYPTO_CBC=m
1272CONFIG_CRYPTO_PCBC=m
1273CONFIG_CRYPTO_LRW=m
1274CONFIG_CRYPTO_DES=m
1275CONFIG_CRYPTO_FCRYPT=m
1276CONFIG_CRYPTO_BLOWFISH=m
1277CONFIG_CRYPTO_TWOFISH=m
1278CONFIG_CRYPTO_TWOFISH_COMMON=m
1279CONFIG_CRYPTO_SERPENT=m
1280CONFIG_CRYPTO_AES=m
1281CONFIG_CRYPTO_CAST5=m
1282CONFIG_CRYPTO_CAST6=m
1283CONFIG_CRYPTO_TEA=m
1284CONFIG_CRYPTO_ARC4=m
1285CONFIG_CRYPTO_KHAZAD=m
1286CONFIG_CRYPTO_ANUBIS=m
1287CONFIG_CRYPTO_DEFLATE=m
1288CONFIG_CRYPTO_MICHAEL_MIC=m
1289CONFIG_CRYPTO_CRC32C=m
1290CONFIG_CRYPTO_CAMELLIA=m
1291# CONFIG_CRYPTO_TEST is not set
1292
1293#
1294# Hardware crypto devices
1295#
1191 1296
1192# 1297#
1193# Library routines 1298# Library routines
1194# 1299#
1300CONFIG_BITREVERSE=y
1195# CONFIG_CRC_CCITT is not set 1301# CONFIG_CRC_CCITT is not set
1196# CONFIG_CRC16 is not set 1302# CONFIG_CRC16 is not set
1197CONFIG_CRC32=y 1303CONFIG_CRC32=y
1198# CONFIG_LIBCRC32C is not set 1304CONFIG_LIBCRC32C=m
1199CONFIG_ZLIB_INFLATE=m 1305CONFIG_ZLIB_INFLATE=m
1306CONFIG_ZLIB_DEFLATE=m
1200CONFIG_PLIST=y 1307CONFIG_PLIST=y
1308CONFIG_HAS_IOMEM=y
1309CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 553734a47b62..8f019ffcc71b 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc2 3# Linux kernel version: 2.6.20
4# Tue Jul 25 23:13:04 2006 4# Tue Feb 20 21:47:42 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 45CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -70,10 +69,14 @@ CONFIG_IBM_WORKPAD=y
70# CONFIG_VICTOR_MPC30X is not set 69# CONFIG_VICTOR_MPC30X is not set
71# CONFIG_ZAO_CAPCELLA is not set 70# CONFIG_ZAO_CAPCELLA is not set
72CONFIG_RWSEM_GENERIC_SPINLOCK=y 71CONFIG_RWSEM_GENERIC_SPINLOCK=y
72# CONFIG_ARCH_HAS_ILOG2_U32 is not set
73# CONFIG_ARCH_HAS_ILOG2_U64 is not set
73CONFIG_GENERIC_FIND_NEXT_BIT=y 74CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y 75CONFIG_GENERIC_HWEIGHT=y
75CONFIG_GENERIC_CALIBRATE_DELAY=y 76CONFIG_GENERIC_CALIBRATE_DELAY=y
77CONFIG_GENERIC_TIME=y
76CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 78CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
79CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
77CONFIG_DMA_NONCOHERENT=y 80CONFIG_DMA_NONCOHERENT=y
78CONFIG_DMA_NEED_PCI_MAP_STATE=y 81CONFIG_DMA_NEED_PCI_MAP_STATE=y
79# CONFIG_CPU_BIG_ENDIAN is not set 82# CONFIG_CPU_BIG_ENDIAN is not set
@@ -106,6 +109,7 @@ CONFIG_CPU_VR41XX=y
106# CONFIG_CPU_SB1 is not set 109# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_VR41XX=y 110CONFIG_SYS_HAS_CPU_VR41XX=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 111CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
112CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
111 115
@@ -119,8 +123,8 @@ CONFIG_PAGE_SIZE_4KB=y
119# CONFIG_PAGE_SIZE_16KB is not set 123# CONFIG_PAGE_SIZE_16KB is not set
120# CONFIG_PAGE_SIZE_64KB is not set 124# CONFIG_PAGE_SIZE_64KB is not set
121CONFIG_MIPS_MT_DISABLED=y 125CONFIG_MIPS_MT_DISABLED=y
122# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_MT_SMP is not set 126# CONFIG_MIPS_MT_SMP is not set
127# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_VPE_LOADER is not set 128# CONFIG_MIPS_VPE_LOADER is not set
125CONFIG_CPU_HAS_SYNC=y 129CONFIG_CPU_HAS_SYNC=y
126CONFIG_GENERIC_HARDIRQS=y 130CONFIG_GENERIC_HARDIRQS=y
@@ -135,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -147,6 +152,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,16 +171,20 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 172CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_TASKSTATS is not set 178# CONFIG_TASKSTATS is not set
171CONFIG_SYSCTL=y 179# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 181# CONFIG_IKCONFIG is not set
182CONFIG_SYSFS_DEPRECATED=y
174# CONFIG_RELAY is not set 183# CONFIG_RELAY is not set
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 186CONFIG_EMBEDDED=y
187CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 188CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 189# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 190CONFIG_HOTPLUG=y
@@ -182,12 +192,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 192CONFIG_BUG=y
183CONFIG_ELF_CORE=y 193CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 194CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 195CONFIG_FUTEX=y
187CONFIG_EPOLL=y 196CONFIG_EPOLL=y
188CONFIG_SHMEM=y 197CONFIG_SHMEM=y
189CONFIG_SLAB=y 198CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 199CONFIG_VM_EVENT_COUNTERS=y
200CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 201# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 202CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 203# CONFIG_SLOB is not set
@@ -205,6 +215,7 @@ CONFIG_KMOD=y
205# 215#
206# Block layer 216# Block layer
207# 217#
218CONFIG_BLOCK=y
208# CONFIG_LBD is not set 219# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 220# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 221# CONFIG_LSF is not set
@@ -257,6 +268,14 @@ CONFIG_BINFMT_ELF=y
257CONFIG_TRAD_SIGNALS=y 268CONFIG_TRAD_SIGNALS=y
258 269
259# 270#
271# Power management options
272#
273CONFIG_PM=y
274# CONFIG_PM_LEGACY is not set
275# CONFIG_PM_DEBUG is not set
276# CONFIG_PM_SYSFS_DEPRECATED is not set
277
278#
260# Networking 279# Networking
261# 280#
262CONFIG_NET=y 281CONFIG_NET=y
@@ -270,7 +289,10 @@ CONFIG_PACKET_MMAP=y
270CONFIG_UNIX=y 289CONFIG_UNIX=y
271CONFIG_XFRM=y 290CONFIG_XFRM=y
272CONFIG_XFRM_USER=m 291CONFIG_XFRM_USER=m
292# CONFIG_XFRM_SUB_POLICY is not set
293CONFIG_XFRM_MIGRATE=y
273CONFIG_NET_KEY=y 294CONFIG_NET_KEY=y
295CONFIG_NET_KEY_MIGRATE=y
274CONFIG_INET=y 296CONFIG_INET=y
275CONFIG_IP_MULTICAST=y 297CONFIG_IP_MULTICAST=y
276# CONFIG_IP_ADVANCED_ROUTER is not set 298# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -288,10 +310,13 @@ CONFIG_IP_FIB_HASH=y
288# CONFIG_INET_TUNNEL is not set 310# CONFIG_INET_TUNNEL is not set
289CONFIG_INET_XFRM_MODE_TRANSPORT=m 311CONFIG_INET_XFRM_MODE_TRANSPORT=m
290CONFIG_INET_XFRM_MODE_TUNNEL=m 312CONFIG_INET_XFRM_MODE_TUNNEL=m
313CONFIG_INET_XFRM_MODE_BEET=m
291CONFIG_INET_DIAG=y 314CONFIG_INET_DIAG=y
292CONFIG_INET_TCP_DIAG=y 315CONFIG_INET_TCP_DIAG=y
293# CONFIG_TCP_CONG_ADVANCED is not set 316# CONFIG_TCP_CONG_ADVANCED is not set
294CONFIG_TCP_CONG_BIC=y 317CONFIG_TCP_CONG_CUBIC=y
318CONFIG_DEFAULT_TCP_CONG="cubic"
319CONFIG_TCP_MD5SIG=y
295# CONFIG_IPV6 is not set 320# CONFIG_IPV6 is not set
296# CONFIG_INET6_XFRM_TUNNEL is not set 321# CONFIG_INET6_XFRM_TUNNEL is not set
297# CONFIG_INET6_TUNNEL is not set 322# CONFIG_INET6_TUNNEL is not set
@@ -321,7 +346,6 @@ CONFIG_NETWORK_SECMARK=y
321# CONFIG_ATALK is not set 346# CONFIG_ATALK is not set
322# CONFIG_X25 is not set 347# CONFIG_X25 is not set
323# CONFIG_LAPB is not set 348# CONFIG_LAPB is not set
324# CONFIG_NET_DIVERT is not set
325# CONFIG_ECONET is not set 349# CONFIG_ECONET is not set
326# CONFIG_WAN_ROUTER is not set 350# CONFIG_WAN_ROUTER is not set
327 351
@@ -371,6 +395,7 @@ CONFIG_CONNECTOR=m
371# Plug and Play support 395# Plug and Play support
372# 396#
373# CONFIG_PNP is not set 397# CONFIG_PNP is not set
398# CONFIG_PNPACPI is not set
374 399
375# 400#
376# Block devices 401# Block devices
@@ -387,9 +412,14 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
387# CONFIG_ATA_OVER_ETH is not set 412# CONFIG_ATA_OVER_ETH is not set
388 413
389# 414#
415# Misc devices
416#
417
418#
390# ATA/ATAPI/MFM/RLL support 419# ATA/ATAPI/MFM/RLL support
391# 420#
392CONFIG_IDE=y 421CONFIG_IDE=y
422CONFIG_IDE_MAX_HWIFS=4
393CONFIG_BLK_DEV_IDE=y 423CONFIG_BLK_DEV_IDE=y
394 424
395# 425#
@@ -419,6 +449,12 @@ CONFIG_IDE_GENERIC=y
419# 449#
420# CONFIG_RAID_ATTRS is not set 450# CONFIG_RAID_ATTRS is not set
421# CONFIG_SCSI is not set 451# CONFIG_SCSI is not set
452# CONFIG_SCSI_NETLINK is not set
453
454#
455# Serial ATA (prod) and Parallel ATA (experimental) drivers
456#
457# CONFIG_ATA is not set
422 458
423# 459#
424# Old CD-ROM drivers (not SCSI, not IDE) 460# Old CD-ROM drivers (not SCSI, not IDE)
@@ -472,6 +508,8 @@ CONFIG_LXT_PHY=m
472CONFIG_CICADA_PHY=m 508CONFIG_CICADA_PHY=m
473CONFIG_VITESSE_PHY=m 509CONFIG_VITESSE_PHY=m
474CONFIG_SMSC_PHY=m 510CONFIG_SMSC_PHY=m
511# CONFIG_BROADCOM_PHY is not set
512# CONFIG_FIXED_PHY is not set
475 513
476# 514#
477# Ethernet (10 or 100Mbit) 515# Ethernet (10 or 100Mbit)
@@ -575,6 +613,7 @@ CONFIG_PCMCIA_AXNET=m
575# Input device support 613# Input device support
576# 614#
577CONFIG_INPUT=y 615CONFIG_INPUT=y
616# CONFIG_INPUT_FF_MEMLESS is not set
578 617
579# 618#
580# Userland interfaces 619# Userland interfaces
@@ -641,10 +680,6 @@ CONFIG_LEGACY_PTY_COUNT=256
641# CONFIG_R3964 is not set 680# CONFIG_R3964 is not set
642 681
643# 682#
644# Ftape, the floppy tape device driver
645#
646
647#
648# PCMCIA character devices 683# PCMCIA character devices
649# 684#
650# CONFIG_SYNCLINK_CS is not set 685# CONFIG_SYNCLINK_CS is not set
@@ -657,7 +692,6 @@ CONFIG_LEGACY_PTY_COUNT=256
657# TPM devices 692# TPM devices
658# 693#
659# CONFIG_TCG_TPM is not set 694# CONFIG_TCG_TPM is not set
660# CONFIG_TELCLOCK is not set
661 695
662# 696#
663# I2C support 697# I2C support
@@ -682,14 +716,9 @@ CONFIG_LEGACY_PTY_COUNT=256
682# CONFIG_HWMON_VID is not set 716# CONFIG_HWMON_VID is not set
683 717
684# 718#
685# Misc devices
686#
687
688#
689# Multimedia devices 719# Multimedia devices
690# 720#
691# CONFIG_VIDEO_DEV is not set 721# CONFIG_VIDEO_DEV is not set
692CONFIG_VIDEO_V4L2=y
693 722
694# 723#
695# Digital Video Broadcasting Devices 724# Digital Video Broadcasting Devices
@@ -708,6 +737,7 @@ CONFIG_VIDEO_V4L2=y
708# CONFIG_VGA_CONSOLE is not set 737# CONFIG_VGA_CONSOLE is not set
709# CONFIG_MDA_CONSOLE is not set 738# CONFIG_MDA_CONSOLE is not set
710CONFIG_DUMMY_CONSOLE=y 739CONFIG_DUMMY_CONSOLE=y
740# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
711 741
712# 742#
713# Sound 743# Sound
@@ -715,6 +745,12 @@ CONFIG_DUMMY_CONSOLE=y
715# CONFIG_SOUND is not set 745# CONFIG_SOUND is not set
716 746
717# 747#
748# HID Devices
749#
750CONFIG_HID=y
751# CONFIG_HID_DEBUG is not set
752
753#
718# USB support 754# USB support
719# 755#
720# CONFIG_USB_ARCH_HAS_HCD is not set 756# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -775,6 +811,14 @@ CONFIG_DUMMY_CONSOLE=y
775# 811#
776 812
777# 813#
814# Auxiliary Display support
815#
816
817#
818# Virtualization
819#
820
821#
778# File systems 822# File systems
779# 823#
780CONFIG_EXT2_FS=y 824CONFIG_EXT2_FS=y
@@ -783,11 +827,13 @@ CONFIG_EXT2_FS_POSIX_ACL=y
783CONFIG_EXT2_FS_SECURITY=y 827CONFIG_EXT2_FS_SECURITY=y
784# CONFIG_EXT2_FS_XIP is not set 828# CONFIG_EXT2_FS_XIP is not set
785# CONFIG_EXT3_FS is not set 829# CONFIG_EXT3_FS is not set
830# CONFIG_EXT4DEV_FS is not set
786CONFIG_FS_MBCACHE=y 831CONFIG_FS_MBCACHE=y
787# CONFIG_REISERFS_FS is not set 832# CONFIG_REISERFS_FS is not set
788# CONFIG_JFS_FS is not set 833# CONFIG_JFS_FS is not set
789CONFIG_FS_POSIX_ACL=y 834CONFIG_FS_POSIX_ACL=y
790# CONFIG_XFS_FS is not set 835# CONFIG_XFS_FS is not set
836# CONFIG_GFS2_FS is not set
791# CONFIG_OCFS2_FS is not set 837# CONFIG_OCFS2_FS is not set
792# CONFIG_MINIX_FS is not set 838# CONFIG_MINIX_FS is not set
793# CONFIG_ROMFS_FS is not set 839# CONFIG_ROMFS_FS is not set
@@ -798,6 +844,7 @@ CONFIG_DNOTIFY=y
798# CONFIG_AUTOFS_FS is not set 844# CONFIG_AUTOFS_FS is not set
799CONFIG_AUTOFS4_FS=y 845CONFIG_AUTOFS4_FS=y
800CONFIG_FUSE_FS=m 846CONFIG_FUSE_FS=m
847CONFIG_GENERIC_ACL=y
801 848
802# 849#
803# CD-ROM/DVD Filesystems 850# CD-ROM/DVD Filesystems
@@ -817,11 +864,13 @@ CONFIG_FUSE_FS=m
817# 864#
818CONFIG_PROC_FS=y 865CONFIG_PROC_FS=y
819CONFIG_PROC_KCORE=y 866CONFIG_PROC_KCORE=y
867CONFIG_PROC_SYSCTL=y
820CONFIG_SYSFS=y 868CONFIG_SYSFS=y
821CONFIG_TMPFS=y 869CONFIG_TMPFS=y
870CONFIG_TMPFS_POSIX_ACL=y
822# CONFIG_HUGETLB_PAGE is not set 871# CONFIG_HUGETLB_PAGE is not set
823CONFIG_RAMFS=y 872CONFIG_RAMFS=y
824# CONFIG_CONFIGFS_FS is not set 873CONFIG_CONFIGFS_FS=m
825 874
826# 875#
827# Miscellaneous filesystems 876# Miscellaneous filesystems
@@ -875,6 +924,14 @@ CONFIG_MSDOS_PARTITION=y
875# CONFIG_NLS is not set 924# CONFIG_NLS is not set
876 925
877# 926#
927# Distributed Lock Manager
928#
929CONFIG_DLM=m
930CONFIG_DLM_TCP=y
931# CONFIG_DLM_SCTP is not set
932# CONFIG_DLM_DEBUG is not set
933
934#
878# Profiling support 935# Profiling support
879# 936#
880# CONFIG_PROFILING is not set 937# CONFIG_PROFILING is not set
@@ -884,11 +941,13 @@ CONFIG_MSDOS_PARTITION=y
884# 941#
885CONFIG_TRACE_IRQFLAGS_SUPPORT=y 942CONFIG_TRACE_IRQFLAGS_SUPPORT=y
886# CONFIG_PRINTK_TIME is not set 943# CONFIG_PRINTK_TIME is not set
944CONFIG_ENABLE_MUST_CHECK=y
887# CONFIG_MAGIC_SYSRQ is not set 945# CONFIG_MAGIC_SYSRQ is not set
888# CONFIG_UNUSED_SYMBOLS is not set 946# CONFIG_UNUSED_SYMBOLS is not set
947# CONFIG_DEBUG_FS is not set
948# CONFIG_HEADERS_CHECK is not set
889# CONFIG_DEBUG_KERNEL is not set 949# CONFIG_DEBUG_KERNEL is not set
890CONFIG_LOG_BUF_SHIFT=14 950CONFIG_LOG_BUF_SHIFT=14
891# CONFIG_DEBUG_FS is not set
892CONFIG_CROSSCOMPILE=y 951CONFIG_CROSSCOMPILE=y
893CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M" 952CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
894 953
@@ -901,7 +960,44 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
901# 960#
902# Cryptographic options 961# Cryptographic options
903# 962#
904# CONFIG_CRYPTO is not set 963CONFIG_CRYPTO=y
964CONFIG_CRYPTO_ALGAPI=y
965CONFIG_CRYPTO_BLKCIPHER=m
966CONFIG_CRYPTO_HASH=m
967CONFIG_CRYPTO_MANAGER=m
968CONFIG_CRYPTO_HMAC=m
969CONFIG_CRYPTO_XCBC=m
970CONFIG_CRYPTO_NULL=m
971CONFIG_CRYPTO_MD4=m
972CONFIG_CRYPTO_MD5=y
973CONFIG_CRYPTO_SHA1=m
974CONFIG_CRYPTO_SHA256=m
975CONFIG_CRYPTO_SHA512=m
976CONFIG_CRYPTO_WP512=m
977CONFIG_CRYPTO_TGR192=m
978CONFIG_CRYPTO_GF128MUL=m
979CONFIG_CRYPTO_ECB=m
980CONFIG_CRYPTO_CBC=m
981CONFIG_CRYPTO_PCBC=m
982CONFIG_CRYPTO_LRW=m
983CONFIG_CRYPTO_DES=m
984CONFIG_CRYPTO_FCRYPT=m
985CONFIG_CRYPTO_BLOWFISH=m
986CONFIG_CRYPTO_TWOFISH=m
987CONFIG_CRYPTO_TWOFISH_COMMON=m
988CONFIG_CRYPTO_SERPENT=m
989CONFIG_CRYPTO_AES=m
990CONFIG_CRYPTO_CAST5=m
991CONFIG_CRYPTO_CAST6=m
992CONFIG_CRYPTO_TEA=m
993CONFIG_CRYPTO_ARC4=m
994CONFIG_CRYPTO_KHAZAD=m
995CONFIG_CRYPTO_ANUBIS=m
996CONFIG_CRYPTO_DEFLATE=m
997CONFIG_CRYPTO_MICHAEL_MIC=m
998CONFIG_CRYPTO_CRC32C=m
999CONFIG_CRYPTO_CAMELLIA=m
1000# CONFIG_CRYPTO_TEST is not set
905 1001
906# 1002#
907# Hardware crypto devices 1003# Hardware crypto devices
@@ -910,8 +1006,13 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
910# 1006#
911# Library routines 1007# Library routines
912# 1008#
1009CONFIG_BITREVERSE=y
913# CONFIG_CRC_CCITT is not set 1010# CONFIG_CRC_CCITT is not set
914# CONFIG_CRC16 is not set 1011# CONFIG_CRC16 is not set
915CONFIG_CRC32=y 1012CONFIG_CRC32=y
916# CONFIG_LIBCRC32C is not set 1013CONFIG_LIBCRC32C=m
1014CONFIG_ZLIB_INFLATE=m
1015CONFIG_ZLIB_DEFLATE=m
917CONFIG_PLIST=y 1016CONFIG_PLIST=y
1017CONFIG_HAS_IOMEM=y
1018CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/wrppmc_defconfig b/arch/mips/configs/wrppmc_defconfig
index d3dfb702bb7c..52b48c0715d3 100644
--- a/arch/mips/configs/wrppmc_defconfig
+++ b/arch/mips/configs/wrppmc_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:21 2006 4# Tue Feb 20 21:47:42 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_WR_PPMC=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +63,14 @@ CONFIG_WR_PPMC=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
@@ -124,8 +127,8 @@ CONFIG_PAGE_SIZE_4KB=y
124# CONFIG_PAGE_SIZE_64KB is not set 127# CONFIG_PAGE_SIZE_64KB is not set
125CONFIG_CPU_HAS_PREFETCH=y 128CONFIG_CPU_HAS_PREFETCH=y
126CONFIG_MIPS_MT_DISABLED=y 129CONFIG_MIPS_MT_DISABLED=y
127# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_MT_SMP is not set 130# CONFIG_MIPS_MT_SMP is not set
131# CONFIG_MIPS_MT_SMTC is not set
129# CONFIG_MIPS_VPE_LOADER is not set 132# CONFIG_MIPS_VPE_LOADER is not set
130# CONFIG_64BIT_PHYS_ADDR is not set 133# CONFIG_64BIT_PHYS_ADDR is not set
131CONFIG_CPU_HAS_LLSC=y 134CONFIG_CPU_HAS_LLSC=y
@@ -143,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
144CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set 148# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1
146# CONFIG_HZ_48 is not set 150# CONFIG_HZ_48 is not set
147# CONFIG_HZ_100 is not set 151# CONFIG_HZ_100 is not set
148# CONFIG_HZ_128 is not set 152# CONFIG_HZ_128 is not set
@@ -155,6 +159,7 @@ CONFIG_HZ=1000
155CONFIG_PREEMPT_NONE=y 159CONFIG_PREEMPT_NONE=y
156# CONFIG_PREEMPT_VOLUNTARY is not set 160# CONFIG_PREEMPT_VOLUNTARY is not set
157# CONFIG_PREEMPT is not set 161# CONFIG_PREEMPT is not set
162# CONFIG_KEXEC is not set
158CONFIG_LOCKDEP_SUPPORT=y 163CONFIG_LOCKDEP_SUPPORT=y
159CONFIG_STACKTRACE_SUPPORT=y 164CONFIG_STACKTRACE_SUPPORT=y
160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 165CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -173,16 +178,22 @@ CONFIG_LOCALVERSION=""
173CONFIG_LOCALVERSION_AUTO=y 178CONFIG_LOCALVERSION_AUTO=y
174# CONFIG_SWAP is not set 179# CONFIG_SWAP is not set
175CONFIG_SYSVIPC=y 180CONFIG_SYSVIPC=y
181# CONFIG_IPC_NS is not set
182CONFIG_SYSVIPC_SYSCTL=y
176# CONFIG_POSIX_MQUEUE is not set 183# CONFIG_POSIX_MQUEUE is not set
177CONFIG_BSD_PROCESS_ACCT=y 184CONFIG_BSD_PROCESS_ACCT=y
178# CONFIG_BSD_PROCESS_ACCT_V3 is not set 185# CONFIG_BSD_PROCESS_ACCT_V3 is not set
179CONFIG_SYSCTL=y 186# CONFIG_TASKSTATS is not set
187# CONFIG_UTS_NS is not set
180# CONFIG_AUDIT is not set 188# CONFIG_AUDIT is not set
181# CONFIG_IKCONFIG is not set 189# CONFIG_IKCONFIG is not set
190CONFIG_SYSFS_DEPRECATED=y
182# CONFIG_RELAY is not set 191# CONFIG_RELAY is not set
183CONFIG_INITRAMFS_SOURCE="" 192CONFIG_INITRAMFS_SOURCE=""
184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 193# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
194CONFIG_SYSCTL=y
185CONFIG_EMBEDDED=y 195CONFIG_EMBEDDED=y
196CONFIG_SYSCTL_SYSCALL=y
186CONFIG_KALLSYMS=y 197CONFIG_KALLSYMS=y
187CONFIG_KALLSYMS_EXTRA_PASS=y 198CONFIG_KALLSYMS_EXTRA_PASS=y
188CONFIG_HOTPLUG=y 199CONFIG_HOTPLUG=y
@@ -190,12 +201,12 @@ CONFIG_PRINTK=y
190CONFIG_BUG=y 201CONFIG_BUG=y
191CONFIG_ELF_CORE=y 202CONFIG_ELF_CORE=y
192CONFIG_BASE_FULL=y 203CONFIG_BASE_FULL=y
193CONFIG_RT_MUTEXES=y
194CONFIG_FUTEX=y 204CONFIG_FUTEX=y
195# CONFIG_EPOLL is not set 205# CONFIG_EPOLL is not set
196CONFIG_SHMEM=y 206CONFIG_SHMEM=y
197CONFIG_SLAB=y 207CONFIG_SLAB=y
198CONFIG_VM_EVENT_COUNTERS=y 208CONFIG_VM_EVENT_COUNTERS=y
209CONFIG_RT_MUTEXES=y
199# CONFIG_TINY_SHMEM is not set 210# CONFIG_TINY_SHMEM is not set
200CONFIG_BASE_SMALL=0 211CONFIG_BASE_SMALL=0
201# CONFIG_SLOB is not set 212# CONFIG_SLOB is not set
@@ -213,6 +224,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
213# 224#
214# Block layer 225# Block layer
215# 226#
227CONFIG_BLOCK=y
216# CONFIG_LBD is not set 228# CONFIG_LBD is not set
217# CONFIG_BLK_DEV_IO_TRACE is not set 229# CONFIG_BLK_DEV_IO_TRACE is not set
218# CONFIG_LSF is not set 230# CONFIG_LSF is not set
@@ -258,6 +270,14 @@ CONFIG_BINFMT_MISC=y
258CONFIG_TRAD_SIGNALS=y 270CONFIG_TRAD_SIGNALS=y
259 271
260# 272#
273# Power management options
274#
275CONFIG_PM=y
276# CONFIG_PM_LEGACY is not set
277# CONFIG_PM_DEBUG is not set
278# CONFIG_PM_SYSFS_DEPRECATED is not set
279
280#
261# Networking 281# Networking
262# 282#
263CONFIG_NET=y 283CONFIG_NET=y
@@ -271,6 +291,8 @@ CONFIG_PACKET_MMAP=y
271CONFIG_UNIX=y 291CONFIG_UNIX=y
272CONFIG_XFRM=y 292CONFIG_XFRM=y
273# CONFIG_XFRM_USER is not set 293# CONFIG_XFRM_USER is not set
294# CONFIG_XFRM_SUB_POLICY is not set
295CONFIG_XFRM_MIGRATE=y
274# CONFIG_NET_KEY is not set 296# CONFIG_NET_KEY is not set
275CONFIG_INET=y 297CONFIG_INET=y
276CONFIG_IP_MULTICAST=y 298CONFIG_IP_MULTICAST=y
@@ -294,10 +316,13 @@ CONFIG_ARPD=y
294# CONFIG_INET_TUNNEL is not set 316# CONFIG_INET_TUNNEL is not set
295CONFIG_INET_XFRM_MODE_TRANSPORT=m 317CONFIG_INET_XFRM_MODE_TRANSPORT=m
296CONFIG_INET_XFRM_MODE_TUNNEL=m 318CONFIG_INET_XFRM_MODE_TUNNEL=m
319CONFIG_INET_XFRM_MODE_BEET=m
297CONFIG_INET_DIAG=y 320CONFIG_INET_DIAG=y
298CONFIG_INET_TCP_DIAG=y 321CONFIG_INET_TCP_DIAG=y
299# CONFIG_TCP_CONG_ADVANCED is not set 322# CONFIG_TCP_CONG_ADVANCED is not set
300CONFIG_TCP_CONG_BIC=y 323CONFIG_TCP_CONG_CUBIC=y
324CONFIG_DEFAULT_TCP_CONG="cubic"
325CONFIG_TCP_MD5SIG=y
301# CONFIG_IPV6 is not set 326# CONFIG_IPV6 is not set
302# CONFIG_INET6_XFRM_TUNNEL is not set 327# CONFIG_INET6_XFRM_TUNNEL is not set
303# CONFIG_INET6_TUNNEL is not set 328# CONFIG_INET6_TUNNEL is not set
@@ -327,7 +352,6 @@ CONFIG_NETWORK_SECMARK=y
327# CONFIG_ATALK is not set 352# CONFIG_ATALK is not set
328# CONFIG_X25 is not set 353# CONFIG_X25 is not set
329# CONFIG_LAPB is not set 354# CONFIG_LAPB is not set
330# CONFIG_NET_DIVERT is not set
331# CONFIG_ECONET is not set 355# CONFIG_ECONET is not set
332# CONFIG_WAN_ROUTER is not set 356# CONFIG_WAN_ROUTER is not set
333 357
@@ -375,6 +399,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
375# 399#
376# Plug and Play support 400# Plug and Play support
377# 401#
402# CONFIG_PNPACPI is not set
378 403
379# 404#
380# Block devices 405# Block devices
@@ -390,11 +415,18 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
390CONFIG_BLK_DEV_RAM=y 415CONFIG_BLK_DEV_RAM=y
391CONFIG_BLK_DEV_RAM_COUNT=16 416CONFIG_BLK_DEV_RAM_COUNT=16
392CONFIG_BLK_DEV_RAM_SIZE=4096 417CONFIG_BLK_DEV_RAM_SIZE=4096
418CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
393CONFIG_BLK_DEV_INITRD=y 419CONFIG_BLK_DEV_INITRD=y
394# CONFIG_CDROM_PKTCDVD is not set 420# CONFIG_CDROM_PKTCDVD is not set
395# CONFIG_ATA_OVER_ETH is not set 421# CONFIG_ATA_OVER_ETH is not set
396 422
397# 423#
424# Misc devices
425#
426CONFIG_SGI_IOC4=m
427# CONFIG_TIFM_CORE is not set
428
429#
398# ATA/ATAPI/MFM/RLL support 430# ATA/ATAPI/MFM/RLL support
399# 431#
400# CONFIG_IDE is not set 432# CONFIG_IDE is not set
@@ -404,6 +436,12 @@ CONFIG_BLK_DEV_INITRD=y
404# 436#
405# CONFIG_RAID_ATTRS is not set 437# CONFIG_RAID_ATTRS is not set
406# CONFIG_SCSI is not set 438# CONFIG_SCSI is not set
439# CONFIG_SCSI_NETLINK is not set
440
441#
442# Serial ATA (prod) and Parallel ATA (experimental) drivers
443#
444# CONFIG_ATA is not set
407 445
408# 446#
409# Multi-device support (RAID and LVM) 447# Multi-device support (RAID and LVM)
@@ -454,6 +492,8 @@ CONFIG_PHYLIB=y
454# CONFIG_CICADA_PHY is not set 492# CONFIG_CICADA_PHY is not set
455CONFIG_VITESSE_PHY=m 493CONFIG_VITESSE_PHY=m
456CONFIG_SMSC_PHY=m 494CONFIG_SMSC_PHY=m
495# CONFIG_BROADCOM_PHY is not set
496# CONFIG_FIXED_PHY is not set
457 497
458# 498#
459# Ethernet (10 or 100Mbit) 499# Ethernet (10 or 100Mbit)
@@ -490,7 +530,7 @@ CONFIG_E100=y
490# CONFIG_SUNDANCE is not set 530# CONFIG_SUNDANCE is not set
491# CONFIG_TLAN is not set 531# CONFIG_TLAN is not set
492# CONFIG_VIA_RHINE is not set 532# CONFIG_VIA_RHINE is not set
493# CONFIG_LAN_SAA9730 is not set 533# CONFIG_SC92031 is not set
494 534
495# 535#
496# Ethernet (1000 Mbit) 536# Ethernet (1000 Mbit)
@@ -509,14 +549,18 @@ CONFIG_E100=y
509# CONFIG_VIA_VELOCITY is not set 549# CONFIG_VIA_VELOCITY is not set
510# CONFIG_TIGON3 is not set 550# CONFIG_TIGON3 is not set
511# CONFIG_BNX2 is not set 551# CONFIG_BNX2 is not set
552CONFIG_QLA3XXX=m
553# CONFIG_ATL1 is not set
512 554
513# 555#
514# Ethernet (10000 Mbit) 556# Ethernet (10000 Mbit)
515# 557#
516# CONFIG_CHELSIO_T1 is not set 558# CONFIG_CHELSIO_T1 is not set
559CONFIG_CHELSIO_T3=m
517# CONFIG_IXGB is not set 560# CONFIG_IXGB is not set
518# CONFIG_S2IO is not set 561# CONFIG_S2IO is not set
519# CONFIG_MYRI10GE is not set 562# CONFIG_MYRI10GE is not set
563CONFIG_NETXEN_NIC=m
520 564
521# 565#
522# Token Ring devices 566# Token Ring devices
@@ -602,10 +646,6 @@ CONFIG_RTC=y
602# CONFIG_DTLK is not set 646# CONFIG_DTLK is not set
603# CONFIG_R3964 is not set 647# CONFIG_R3964 is not set
604# CONFIG_APPLICOM is not set 648# CONFIG_APPLICOM is not set
605
606#
607# Ftape, the floppy tape device driver
608#
609# CONFIG_DRM is not set 649# CONFIG_DRM is not set
610# CONFIG_RAW_DRIVER is not set 650# CONFIG_RAW_DRIVER is not set
611 651
@@ -613,7 +653,6 @@ CONFIG_RTC=y
613# TPM devices 653# TPM devices
614# 654#
615# CONFIG_TCG_TPM is not set 655# CONFIG_TCG_TPM is not set
616# CONFIG_TELCLOCK is not set
617 656
618# 657#
619# I2C support 658# I2C support
@@ -629,6 +668,7 @@ CONFIG_RTC=y
629# 668#
630# Dallas's 1-wire bus 669# Dallas's 1-wire bus
631# 670#
671# CONFIG_W1 is not set
632 672
633# 673#
634# Hardware Monitoring support 674# Hardware Monitoring support
@@ -637,17 +677,14 @@ CONFIG_HWMON=y
637# CONFIG_HWMON_VID is not set 677# CONFIG_HWMON_VID is not set
638# CONFIG_SENSORS_ABITUGURU is not set 678# CONFIG_SENSORS_ABITUGURU is not set
639# CONFIG_SENSORS_F71805F is not set 679# CONFIG_SENSORS_F71805F is not set
680# CONFIG_SENSORS_PC87427 is not set
681# CONFIG_SENSORS_VT1211 is not set
640# CONFIG_HWMON_DEBUG_CHIP is not set 682# CONFIG_HWMON_DEBUG_CHIP is not set
641 683
642# 684#
643# Misc devices
644#
645
646#
647# Multimedia devices 685# Multimedia devices
648# 686#
649# CONFIG_VIDEO_DEV is not set 687# CONFIG_VIDEO_DEV is not set
650CONFIG_VIDEO_V4L2=y
651 688
652# 689#
653# Digital Video Broadcasting Devices 690# Digital Video Broadcasting Devices
@@ -659,6 +696,7 @@ CONFIG_VIDEO_V4L2=y
659# 696#
660# CONFIG_FIRMWARE_EDID is not set 697# CONFIG_FIRMWARE_EDID is not set
661# CONFIG_FB is not set 698# CONFIG_FB is not set
699# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
662 700
663# 701#
664# Sound 702# Sound
@@ -728,14 +766,24 @@ CONFIG_USB_ARCH_HAS_EHCI=y
728# 766#
729 767
730# 768#
769# Auxiliary Display support
770#
771
772#
773# Virtualization
774#
775
776#
731# File systems 777# File systems
732# 778#
733# CONFIG_EXT2_FS is not set 779# CONFIG_EXT2_FS is not set
734# CONFIG_EXT3_FS is not set 780# CONFIG_EXT3_FS is not set
781# CONFIG_EXT4DEV_FS is not set
735# CONFIG_REISERFS_FS is not set 782# CONFIG_REISERFS_FS is not set
736# CONFIG_JFS_FS is not set 783# CONFIG_JFS_FS is not set
737# CONFIG_FS_POSIX_ACL is not set 784CONFIG_FS_POSIX_ACL=y
738# CONFIG_XFS_FS is not set 785# CONFIG_XFS_FS is not set
786# CONFIG_GFS2_FS is not set
739# CONFIG_OCFS2_FS is not set 787# CONFIG_OCFS2_FS is not set
740# CONFIG_MINIX_FS is not set 788# CONFIG_MINIX_FS is not set
741# CONFIG_ROMFS_FS is not set 789# CONFIG_ROMFS_FS is not set
@@ -746,6 +794,7 @@ CONFIG_DNOTIFY=y
746# CONFIG_AUTOFS_FS is not set 794# CONFIG_AUTOFS_FS is not set
747# CONFIG_AUTOFS4_FS is not set 795# CONFIG_AUTOFS4_FS is not set
748# CONFIG_FUSE_FS is not set 796# CONFIG_FUSE_FS is not set
797CONFIG_GENERIC_ACL=y
749 798
750# 799#
751# CD-ROM/DVD Filesystems 800# CD-ROM/DVD Filesystems
@@ -765,11 +814,13 @@ CONFIG_DNOTIFY=y
765# 814#
766CONFIG_PROC_FS=y 815CONFIG_PROC_FS=y
767CONFIG_PROC_KCORE=y 816CONFIG_PROC_KCORE=y
817CONFIG_PROC_SYSCTL=y
768CONFIG_SYSFS=y 818CONFIG_SYSFS=y
769CONFIG_TMPFS=y 819CONFIG_TMPFS=y
820CONFIG_TMPFS_POSIX_ACL=y
770# CONFIG_HUGETLB_PAGE is not set 821# CONFIG_HUGETLB_PAGE is not set
771CONFIG_RAMFS=y 822CONFIG_RAMFS=y
772# CONFIG_CONFIGFS_FS is not set 823CONFIG_CONFIGFS_FS=m
773 824
774# 825#
775# Miscellaneous filesystems 826# Miscellaneous filesystems
@@ -806,7 +857,6 @@ CONFIG_SUNRPC=y
806# CONFIG_RPCSEC_GSS_SPKM3 is not set 857# CONFIG_RPCSEC_GSS_SPKM3 is not set
807# CONFIG_SMB_FS is not set 858# CONFIG_SMB_FS is not set
808# CONFIG_CIFS is not set 859# CONFIG_CIFS is not set
809# CONFIG_CIFS_DEBUG2 is not set
810# CONFIG_NCP_FS is not set 860# CONFIG_NCP_FS is not set
811# CONFIG_CODA_FS is not set 861# CONFIG_CODA_FS is not set
812# CONFIG_AFS_FS is not set 862# CONFIG_AFS_FS is not set
@@ -824,6 +874,14 @@ CONFIG_MSDOS_PARTITION=y
824# CONFIG_NLS is not set 874# CONFIG_NLS is not set
825 875
826# 876#
877# Distributed Lock Manager
878#
879CONFIG_DLM=m
880CONFIG_DLM_TCP=y
881# CONFIG_DLM_SCTP is not set
882# CONFIG_DLM_DEBUG is not set
883
884#
827# Profiling support 885# Profiling support
828# 886#
829# CONFIG_PROFILING is not set 887# CONFIG_PROFILING is not set
@@ -833,11 +891,13 @@ CONFIG_MSDOS_PARTITION=y
833# 891#
834CONFIG_TRACE_IRQFLAGS_SUPPORT=y 892CONFIG_TRACE_IRQFLAGS_SUPPORT=y
835# CONFIG_PRINTK_TIME is not set 893# CONFIG_PRINTK_TIME is not set
894CONFIG_ENABLE_MUST_CHECK=y
836# CONFIG_MAGIC_SYSRQ is not set 895# CONFIG_MAGIC_SYSRQ is not set
837# CONFIG_UNUSED_SYMBOLS is not set 896# CONFIG_UNUSED_SYMBOLS is not set
897# CONFIG_DEBUG_FS is not set
898# CONFIG_HEADERS_CHECK is not set
838# CONFIG_DEBUG_KERNEL is not set 899# CONFIG_DEBUG_KERNEL is not set
839CONFIG_LOG_BUF_SHIFT=14 900CONFIG_LOG_BUF_SHIFT=14
840# CONFIG_DEBUG_FS is not set
841CONFIG_CROSSCOMPILE=y 901CONFIG_CROSSCOMPILE=y
842CONFIG_CMDLINE="console=ttyS0,115200n8" 902CONFIG_CMDLINE="console=ttyS0,115200n8"
843 903
@@ -850,7 +910,44 @@ CONFIG_CMDLINE="console=ttyS0,115200n8"
850# 910#
851# Cryptographic options 911# Cryptographic options
852# 912#
853# CONFIG_CRYPTO is not set 913CONFIG_CRYPTO=y
914CONFIG_CRYPTO_ALGAPI=y
915CONFIG_CRYPTO_BLKCIPHER=m
916CONFIG_CRYPTO_HASH=m
917CONFIG_CRYPTO_MANAGER=m
918CONFIG_CRYPTO_HMAC=m
919CONFIG_CRYPTO_XCBC=m
920CONFIG_CRYPTO_NULL=m
921CONFIG_CRYPTO_MD4=m
922CONFIG_CRYPTO_MD5=y
923CONFIG_CRYPTO_SHA1=m
924CONFIG_CRYPTO_SHA256=m
925CONFIG_CRYPTO_SHA512=m
926CONFIG_CRYPTO_WP512=m
927CONFIG_CRYPTO_TGR192=m
928CONFIG_CRYPTO_GF128MUL=m
929CONFIG_CRYPTO_ECB=m
930CONFIG_CRYPTO_CBC=m
931CONFIG_CRYPTO_PCBC=m
932CONFIG_CRYPTO_LRW=m
933CONFIG_CRYPTO_DES=m
934CONFIG_CRYPTO_FCRYPT=m
935CONFIG_CRYPTO_BLOWFISH=m
936CONFIG_CRYPTO_TWOFISH=m
937CONFIG_CRYPTO_TWOFISH_COMMON=m
938CONFIG_CRYPTO_SERPENT=m
939CONFIG_CRYPTO_AES=m
940CONFIG_CRYPTO_CAST5=m
941CONFIG_CRYPTO_CAST6=m
942CONFIG_CRYPTO_TEA=m
943CONFIG_CRYPTO_ARC4=m
944CONFIG_CRYPTO_KHAZAD=m
945CONFIG_CRYPTO_ANUBIS=m
946CONFIG_CRYPTO_DEFLATE=m
947CONFIG_CRYPTO_MICHAEL_MIC=m
948CONFIG_CRYPTO_CRC32C=m
949CONFIG_CRYPTO_CAMELLIA=m
950# CONFIG_CRYPTO_TEST is not set
854 951
855# 952#
856# Hardware crypto devices 953# Hardware crypto devices
@@ -859,8 +956,13 @@ CONFIG_CMDLINE="console=ttyS0,115200n8"
859# 956#
860# Library routines 957# Library routines
861# 958#
959CONFIG_BITREVERSE=y
862CONFIG_CRC_CCITT=y 960CONFIG_CRC_CCITT=y
863CONFIG_CRC16=y 961CONFIG_CRC16=y
864CONFIG_CRC32=y 962CONFIG_CRC32=y
865CONFIG_LIBCRC32C=y 963CONFIG_LIBCRC32C=y
964CONFIG_ZLIB_INFLATE=m
965CONFIG_ZLIB_DEFLATE=m
866CONFIG_PLIST=y 966CONFIG_PLIST=y
967CONFIG_HAS_IOMEM=y
968CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index b9f74d6745ee..6824606309e5 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:21 2006 4# Tue Feb 20 21:47:42 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47CONFIG_PMC_YOSEMITE=y 46CONFIG_PMC_YOSEMITE=y
@@ -65,10 +64,14 @@ CONFIG_PMC_YOSEMITE=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_HYPERTRANSPORT is not set 65# CONFIG_HYPERTRANSPORT is not set
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_COHERENT=y 75CONFIG_DMA_COHERENT=y
73CONFIG_CPU_BIG_ENDIAN=y 76CONFIG_CPU_BIG_ENDIAN=y
74# CONFIG_CPU_LITTLE_ENDIAN is not set 77# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -102,6 +105,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
102CONFIG_CPU_RM9000=y 105CONFIG_CPU_RM9000=y
103# CONFIG_CPU_SB1 is not set 106# CONFIG_CPU_SB1 is not set
104CONFIG_SYS_HAS_CPU_RM9000=y 107CONFIG_SYS_HAS_CPU_RM9000=y
108CONFIG_WEAK_ORDERING=y
105CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 109CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
106CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 110CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
107CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 111CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -118,8 +122,8 @@ CONFIG_PAGE_SIZE_4KB=y
118# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
119CONFIG_CPU_HAS_PREFETCH=y 123CONFIG_CPU_HAS_PREFETCH=y
120CONFIG_MIPS_MT_DISABLED=y 124CONFIG_MIPS_MT_DISABLED=y
121# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_MT_SMP is not set 125# CONFIG_MIPS_MT_SMP is not set
126# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_VPE_LOADER is not set 127# CONFIG_MIPS_VPE_LOADER is not set
124# CONFIG_64BIT_PHYS_ADDR is not set 128# CONFIG_64BIT_PHYS_ADDR is not set
125CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
139CONFIG_SMP=y 144CONFIG_SMP=y
140CONFIG_SYS_SUPPORTS_SMP=y 145CONFIG_SYS_SUPPORTS_SMP=y
141CONFIG_NR_CPUS=2 146CONFIG_NR_CPUS=2
@@ -170,15 +175,20 @@ CONFIG_LOCALVERSION=""
170CONFIG_LOCALVERSION_AUTO=y 175CONFIG_LOCALVERSION_AUTO=y
171CONFIG_SWAP=y 176CONFIG_SWAP=y
172CONFIG_SYSVIPC=y 177CONFIG_SYSVIPC=y
178# CONFIG_IPC_NS is not set
179CONFIG_SYSVIPC_SYSCTL=y
173# CONFIG_BSD_PROCESS_ACCT is not set 180# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 181# CONFIG_TASKSTATS is not set
182# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 183# CONFIG_AUDIT is not set
176CONFIG_IKCONFIG=y 184CONFIG_IKCONFIG=y
177CONFIG_IKCONFIG_PROC=y 185CONFIG_IKCONFIG_PROC=y
178# CONFIG_CPUSETS is not set 186# CONFIG_CPUSETS is not set
187CONFIG_SYSFS_DEPRECATED=y
179CONFIG_RELAY=y 188CONFIG_RELAY=y
180CONFIG_INITRAMFS_SOURCE="" 189CONFIG_SYSCTL=y
181CONFIG_EMBEDDED=y 190CONFIG_EMBEDDED=y
191CONFIG_SYSCTL_SYSCALL=y
182CONFIG_KALLSYMS=y 192CONFIG_KALLSYMS=y
183# CONFIG_KALLSYMS_ALL is not set 193# CONFIG_KALLSYMS_ALL is not set
184# CONFIG_KALLSYMS_EXTRA_PASS is not set 194# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -187,12 +197,12 @@ CONFIG_PRINTK=y
187CONFIG_BUG=y 197CONFIG_BUG=y
188CONFIG_ELF_CORE=y 198CONFIG_ELF_CORE=y
189CONFIG_BASE_FULL=y 199CONFIG_BASE_FULL=y
190CONFIG_RT_MUTEXES=y
191CONFIG_FUTEX=y 200CONFIG_FUTEX=y
192CONFIG_EPOLL=y 201CONFIG_EPOLL=y
193CONFIG_SHMEM=y 202CONFIG_SHMEM=y
194CONFIG_SLAB=y 203CONFIG_SLAB=y
195CONFIG_VM_EVENT_COUNTERS=y 204CONFIG_VM_EVENT_COUNTERS=y
205CONFIG_RT_MUTEXES=y
196# CONFIG_TINY_SHMEM is not set 206# CONFIG_TINY_SHMEM is not set
197CONFIG_BASE_SMALL=0 207CONFIG_BASE_SMALL=0
198# CONFIG_SLOB is not set 208# CONFIG_SLOB is not set
@@ -210,6 +220,7 @@ CONFIG_STOP_MACHINE=y
210# 220#
211# Block layer 221# Block layer
212# 222#
223CONFIG_BLOCK=y
213# CONFIG_LBD is not set 224# CONFIG_LBD is not set
214# CONFIG_BLK_DEV_IO_TRACE is not set 225# CONFIG_BLK_DEV_IO_TRACE is not set
215# CONFIG_LSF is not set 226# CONFIG_LSF is not set
@@ -252,6 +263,14 @@ CONFIG_BINFMT_ELF=y
252CONFIG_TRAD_SIGNALS=y 263CONFIG_TRAD_SIGNALS=y
253 264
254# 265#
266# Power management options
267#
268CONFIG_PM=y
269# CONFIG_PM_LEGACY is not set
270# CONFIG_PM_DEBUG is not set
271# CONFIG_PM_SYSFS_DEPRECATED is not set
272
273#
255# Networking 274# Networking
256# 275#
257CONFIG_NET=y 276CONFIG_NET=y
@@ -281,13 +300,15 @@ CONFIG_IP_PNP_BOOTP=y
281# CONFIG_INET_ESP is not set 300# CONFIG_INET_ESP is not set
282# CONFIG_INET_IPCOMP is not set 301# CONFIG_INET_IPCOMP is not set
283# CONFIG_INET_XFRM_TUNNEL is not set 302# CONFIG_INET_XFRM_TUNNEL is not set
284# CONFIG_INET_TUNNEL is not set 303CONFIG_INET_TUNNEL=m
285CONFIG_INET_XFRM_MODE_TRANSPORT=m 304CONFIG_INET_XFRM_MODE_TRANSPORT=m
286CONFIG_INET_XFRM_MODE_TUNNEL=m 305CONFIG_INET_XFRM_MODE_TUNNEL=m
306CONFIG_INET_XFRM_MODE_BEET=m
287CONFIG_INET_DIAG=y 307CONFIG_INET_DIAG=y
288CONFIG_INET_TCP_DIAG=y 308CONFIG_INET_TCP_DIAG=y
289# CONFIG_TCP_CONG_ADVANCED is not set 309# CONFIG_TCP_CONG_ADVANCED is not set
290CONFIG_TCP_CONG_BIC=y 310CONFIG_TCP_CONG_CUBIC=y
311CONFIG_DEFAULT_TCP_CONG="cubic"
291CONFIG_IPV6=m 312CONFIG_IPV6=m
292CONFIG_IPV6_PRIVACY=y 313CONFIG_IPV6_PRIVACY=y
293CONFIG_IPV6_ROUTER_PREF=y 314CONFIG_IPV6_ROUTER_PREF=y
@@ -298,6 +319,8 @@ CONFIG_INET6_XFRM_TUNNEL=m
298CONFIG_INET6_TUNNEL=m 319CONFIG_INET6_TUNNEL=m
299CONFIG_INET6_XFRM_MODE_TRANSPORT=m 320CONFIG_INET6_XFRM_MODE_TRANSPORT=m
300CONFIG_INET6_XFRM_MODE_TUNNEL=m 321CONFIG_INET6_XFRM_MODE_TUNNEL=m
322CONFIG_INET6_XFRM_MODE_BEET=m
323CONFIG_IPV6_SIT=m
301CONFIG_IPV6_TUNNEL=m 324CONFIG_IPV6_TUNNEL=m
302CONFIG_NETWORK_SECMARK=y 325CONFIG_NETWORK_SECMARK=y
303# CONFIG_NETFILTER is not set 326# CONFIG_NETFILTER is not set
@@ -336,6 +359,7 @@ CONFIG_STANDALONE=y
336CONFIG_PREVENT_FIRMWARE_BUILD=y 359CONFIG_PREVENT_FIRMWARE_BUILD=y
337CONFIG_FW_LOADER=m 360CONFIG_FW_LOADER=m
338# CONFIG_DEBUG_DRIVER is not set 361# CONFIG_DEBUG_DRIVER is not set
362# CONFIG_DEBUG_DEVRES is not set
339# CONFIG_SYS_HYPERVISOR is not set 363# CONFIG_SYS_HYPERVISOR is not set
340 364
341# 365#
@@ -356,6 +380,7 @@ CONFIG_CONNECTOR=m
356# 380#
357# Plug and Play support 381# Plug and Play support
358# 382#
383# CONFIG_PNPACPI is not set
359 384
360# 385#
361# Block devices 386# Block devices
@@ -374,6 +399,11 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
374CONFIG_ATA_OVER_ETH=m 399CONFIG_ATA_OVER_ETH=m
375 400
376# 401#
402# Misc devices
403#
404CONFIG_SGI_IOC4=m
405
406#
377# ATA/ATAPI/MFM/RLL support 407# ATA/ATAPI/MFM/RLL support
378# 408#
379# CONFIG_IDE is not set 409# CONFIG_IDE is not set
@@ -383,6 +413,12 @@ CONFIG_ATA_OVER_ETH=m
383# 413#
384CONFIG_RAID_ATTRS=m 414CONFIG_RAID_ATTRS=m
385# CONFIG_SCSI is not set 415# CONFIG_SCSI is not set
416# CONFIG_SCSI_NETLINK is not set
417
418#
419# Serial ATA (prod) and Parallel ATA (experimental) drivers
420#
421# CONFIG_ATA is not set
386 422
387# 423#
388# Multi-device support (RAID and LVM) 424# Multi-device support (RAID and LVM)
@@ -433,6 +469,8 @@ CONFIG_LXT_PHY=m
433CONFIG_CICADA_PHY=m 469CONFIG_CICADA_PHY=m
434CONFIG_VITESSE_PHY=m 470CONFIG_VITESSE_PHY=m
435CONFIG_SMSC_PHY=m 471CONFIG_SMSC_PHY=m
472# CONFIG_BROADCOM_PHY is not set
473# CONFIG_FIXED_PHY is not set
436 474
437# 475#
438# Ethernet (10 or 100Mbit) 476# Ethernet (10 or 100Mbit)
@@ -463,18 +501,22 @@ CONFIG_MII=y
463# CONFIG_R8169 is not set 501# CONFIG_R8169 is not set
464# CONFIG_SIS190 is not set 502# CONFIG_SIS190 is not set
465# CONFIG_SKGE is not set 503# CONFIG_SKGE is not set
504# CONFIG_SKY2 is not set
466# CONFIG_SK98LIN is not set 505# CONFIG_SK98LIN is not set
467# CONFIG_TIGON3 is not set 506# CONFIG_TIGON3 is not set
468# CONFIG_BNX2 is not set 507# CONFIG_BNX2 is not set
469CONFIG_TITAN_GE=y 508CONFIG_TITAN_GE=y
509CONFIG_QLA3XXX=m
470 510
471# 511#
472# Ethernet (10000 Mbit) 512# Ethernet (10000 Mbit)
473# 513#
474# CONFIG_CHELSIO_T1 is not set 514# CONFIG_CHELSIO_T1 is not set
515CONFIG_CHELSIO_T3=m
475# CONFIG_IXGB is not set 516# CONFIG_IXGB is not set
476# CONFIG_S2IO is not set 517# CONFIG_S2IO is not set
477# CONFIG_MYRI10GE is not set 518# CONFIG_MYRI10GE is not set
519CONFIG_NETXEN_NIC=m
478 520
479# 521#
480# Token Ring devices 522# Token Ring devices
@@ -559,10 +601,6 @@ CONFIG_GEN_RTC_X=y
559# CONFIG_DTLK is not set 601# CONFIG_DTLK is not set
560# CONFIG_R3964 is not set 602# CONFIG_R3964 is not set
561# CONFIG_APPLICOM is not set 603# CONFIG_APPLICOM is not set
562
563#
564# Ftape, the floppy tape device driver
565#
566# CONFIG_DRM is not set 604# CONFIG_DRM is not set
567# CONFIG_RAW_DRIVER is not set 605# CONFIG_RAW_DRIVER is not set
568 606
@@ -593,14 +631,9 @@ CONFIG_GEN_RTC_X=y
593# CONFIG_HWMON_VID is not set 631# CONFIG_HWMON_VID is not set
594 632
595# 633#
596# Misc devices
597#
598
599#
600# Multimedia devices 634# Multimedia devices
601# 635#
602# CONFIG_VIDEO_DEV is not set 636# CONFIG_VIDEO_DEV is not set
603CONFIG_VIDEO_V4L2=y
604 637
605# 638#
606# Digital Video Broadcasting Devices 639# Digital Video Broadcasting Devices
@@ -612,6 +645,7 @@ CONFIG_VIDEO_V4L2=y
612# 645#
613# CONFIG_FIRMWARE_EDID is not set 646# CONFIG_FIRMWARE_EDID is not set
614# CONFIG_FB is not set 647# CONFIG_FB is not set
648# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
615 649
616# 650#
617# Sound 651# Sound
@@ -680,14 +714,23 @@ CONFIG_USB_ARCH_HAS_EHCI=y
680# 714#
681 715
682# 716#
717# Auxiliary Display support
718#
719
720#
721# Virtualization
722#
723
724#
683# File systems 725# File systems
684# 726#
685# CONFIG_EXT2_FS is not set 727# CONFIG_EXT2_FS is not set
686# CONFIG_EXT3_FS is not set 728# CONFIG_EXT3_FS is not set
687# CONFIG_REISERFS_FS is not set 729# CONFIG_REISERFS_FS is not set
688# CONFIG_JFS_FS is not set 730# CONFIG_JFS_FS is not set
689# CONFIG_FS_POSIX_ACL is not set 731CONFIG_FS_POSIX_ACL=y
690# CONFIG_XFS_FS is not set 732# CONFIG_XFS_FS is not set
733# CONFIG_OCFS2_FS is not set
691# CONFIG_MINIX_FS is not set 734# CONFIG_MINIX_FS is not set
692# CONFIG_ROMFS_FS is not set 735# CONFIG_ROMFS_FS is not set
693CONFIG_INOTIFY=y 736CONFIG_INOTIFY=y
@@ -697,6 +740,7 @@ CONFIG_DNOTIFY=y
697# CONFIG_AUTOFS_FS is not set 740# CONFIG_AUTOFS_FS is not set
698# CONFIG_AUTOFS4_FS is not set 741# CONFIG_AUTOFS4_FS is not set
699CONFIG_FUSE_FS=m 742CONFIG_FUSE_FS=m
743CONFIG_GENERIC_ACL=y
700 744
701# 745#
702# CD-ROM/DVD Filesystems 746# CD-ROM/DVD Filesystems
@@ -716,8 +760,10 @@ CONFIG_FUSE_FS=m
716# 760#
717CONFIG_PROC_FS=y 761CONFIG_PROC_FS=y
718CONFIG_PROC_KCORE=y 762CONFIG_PROC_KCORE=y
763CONFIG_PROC_SYSCTL=y
719CONFIG_SYSFS=y 764CONFIG_SYSFS=y
720CONFIG_TMPFS=y 765CONFIG_TMPFS=y
766CONFIG_TMPFS_POSIX_ACL=y
721# CONFIG_HUGETLB_PAGE is not set 767# CONFIG_HUGETLB_PAGE is not set
722CONFIG_RAMFS=y 768CONFIG_RAMFS=y
723 769
@@ -737,6 +783,7 @@ CONFIG_RAMFS=y
737# 783#
738CONFIG_NFS_FS=y 784CONFIG_NFS_FS=y
739# CONFIG_NFS_V3 is not set 785# CONFIG_NFS_V3 is not set
786# CONFIG_NFS_DIRECTIO is not set
740# CONFIG_NFSD is not set 787# CONFIG_NFSD is not set
741CONFIG_ROOT_NFS=y 788CONFIG_ROOT_NFS=y
742CONFIG_LOCKD=y 789CONFIG_LOCKD=y
@@ -744,7 +791,6 @@ CONFIG_NFS_COMMON=y
744CONFIG_SUNRPC=y 791CONFIG_SUNRPC=y
745# CONFIG_SMB_FS is not set 792# CONFIG_SMB_FS is not set
746# CONFIG_CIFS is not set 793# CONFIG_CIFS is not set
747# CONFIG_CIFS_DEBUG2 is not set
748# CONFIG_NCP_FS is not set 794# CONFIG_NCP_FS is not set
749# CONFIG_CODA_FS is not set 795# CONFIG_CODA_FS is not set
750 796
@@ -764,31 +810,38 @@ CONFIG_MSDOS_PARTITION=y
764# 810#
765CONFIG_TRACE_IRQFLAGS_SUPPORT=y 811CONFIG_TRACE_IRQFLAGS_SUPPORT=y
766# CONFIG_PRINTK_TIME is not set 812# CONFIG_PRINTK_TIME is not set
813CONFIG_ENABLE_MUST_CHECK=y
767# CONFIG_MAGIC_SYSRQ is not set 814# CONFIG_MAGIC_SYSRQ is not set
768# CONFIG_UNUSED_SYMBOLS is not set 815# CONFIG_UNUSED_SYMBOLS is not set
816# CONFIG_DEBUG_FS is not set
817# CONFIG_HEADERS_CHECK is not set
769CONFIG_DEBUG_KERNEL=y 818CONFIG_DEBUG_KERNEL=y
819# CONFIG_DEBUG_SHIRQ is not set
770CONFIG_LOG_BUF_SHIFT=14 820CONFIG_LOG_BUF_SHIFT=14
771CONFIG_DETECT_SOFTLOCKUP=y 821CONFIG_DETECT_SOFTLOCKUP=y
772# CONFIG_SCHEDSTATS is not set 822# CONFIG_SCHEDSTATS is not set
823# CONFIG_TIMER_STATS is not set
773# CONFIG_DEBUG_SLAB is not set 824# CONFIG_DEBUG_SLAB is not set
774# CONFIG_DEBUG_RT_MUTEXES is not set 825# CONFIG_DEBUG_RT_MUTEXES is not set
775# CONFIG_RT_MUTEX_TESTER is not set 826# CONFIG_RT_MUTEX_TESTER is not set
776# CONFIG_DEBUG_SPINLOCK is not set 827# CONFIG_DEBUG_SPINLOCK is not set
777CONFIG_DEBUG_MUTEXES=y 828CONFIG_DEBUG_MUTEXES=y
778# CONFIG_DEBUG_RWSEMS is not set 829# CONFIG_DEBUG_LOCK_ALLOC is not set
830# CONFIG_PROVE_LOCKING is not set
779# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 831# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
780# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 832# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
781# CONFIG_DEBUG_KOBJECT is not set 833# CONFIG_DEBUG_KOBJECT is not set
782# CONFIG_DEBUG_HIGHMEM is not set 834# CONFIG_DEBUG_HIGHMEM is not set
783# CONFIG_DEBUG_INFO is not set 835# CONFIG_DEBUG_INFO is not set
784# CONFIG_DEBUG_FS is not set
785# CONFIG_DEBUG_VM is not set 836# CONFIG_DEBUG_VM is not set
837# CONFIG_DEBUG_LIST is not set
786CONFIG_FORCED_INLINING=y 838CONFIG_FORCED_INLINING=y
787# CONFIG_RCU_TORTURE_TEST is not set 839# CONFIG_RCU_TORTURE_TEST is not set
788CONFIG_CROSSCOMPILE=y 840CONFIG_CROSSCOMPILE=y
789CONFIG_CMDLINE="" 841CONFIG_CMDLINE=""
790# CONFIG_DEBUG_STACK_USAGE is not set 842# CONFIG_DEBUG_STACK_USAGE is not set
791# CONFIG_KGDB is not set 843# CONFIG_KGDB is not set
844CONFIG_SYS_SUPPORTS_KGDB=y
792# CONFIG_RUNTIME_DEBUG is not set 845# CONFIG_RUNTIME_DEBUG is not set
793 846
794# 847#
@@ -802,6 +855,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
802# Cryptographic options 855# Cryptographic options
803# 856#
804CONFIG_CRYPTO=y 857CONFIG_CRYPTO=y
858CONFIG_CRYPTO_ALGAPI=y
859CONFIG_CRYPTO_BLKCIPHER=m
860CONFIG_CRYPTO_HASH=y
861CONFIG_CRYPTO_MANAGER=y
805CONFIG_CRYPTO_HMAC=y 862CONFIG_CRYPTO_HMAC=y
806CONFIG_CRYPTO_NULL=m 863CONFIG_CRYPTO_NULL=m
807CONFIG_CRYPTO_MD4=m 864CONFIG_CRYPTO_MD4=m
@@ -811,9 +868,14 @@ CONFIG_CRYPTO_SHA256=m
811CONFIG_CRYPTO_SHA512=m 868CONFIG_CRYPTO_SHA512=m
812CONFIG_CRYPTO_WP512=m 869CONFIG_CRYPTO_WP512=m
813CONFIG_CRYPTO_TGR192=m 870CONFIG_CRYPTO_TGR192=m
871CONFIG_CRYPTO_ECB=m
872CONFIG_CRYPTO_CBC=m
873CONFIG_CRYPTO_PCBC=m
814CONFIG_CRYPTO_DES=m 874CONFIG_CRYPTO_DES=m
875CONFIG_CRYPTO_FCRYPT=m
815CONFIG_CRYPTO_BLOWFISH=m 876CONFIG_CRYPTO_BLOWFISH=m
816CONFIG_CRYPTO_TWOFISH=m 877CONFIG_CRYPTO_TWOFISH=m
878CONFIG_CRYPTO_TWOFISH_COMMON=m
817CONFIG_CRYPTO_SERPENT=m 879CONFIG_CRYPTO_SERPENT=m
818CONFIG_CRYPTO_AES=m 880CONFIG_CRYPTO_AES=m
819CONFIG_CRYPTO_CAST5=m 881CONFIG_CRYPTO_CAST5=m
@@ -825,6 +887,7 @@ CONFIG_CRYPTO_ANUBIS=m
825CONFIG_CRYPTO_DEFLATE=m 887CONFIG_CRYPTO_DEFLATE=m
826CONFIG_CRYPTO_MICHAEL_MIC=m 888CONFIG_CRYPTO_MICHAEL_MIC=m
827CONFIG_CRYPTO_CRC32C=m 889CONFIG_CRYPTO_CRC32C=m
890CONFIG_CRYPTO_CAMELLIA=m
828# CONFIG_CRYPTO_TEST is not set 891# CONFIG_CRYPTO_TEST is not set
829 892
830# 893#
@@ -834,6 +897,7 @@ CONFIG_CRYPTO_CRC32C=m
834# 897#
835# Library routines 898# Library routines
836# 899#
900CONFIG_BITREVERSE=m
837# CONFIG_CRC_CCITT is not set 901# CONFIG_CRC_CCITT is not set
838CONFIG_CRC16=m 902CONFIG_CRC16=m
839CONFIG_CRC32=m 903CONFIG_CRC32=m
@@ -841,3 +905,5 @@ CONFIG_LIBCRC32C=m
841CONFIG_ZLIB_INFLATE=m 905CONFIG_ZLIB_INFLATE=m
842CONFIG_ZLIB_DEFLATE=m 906CONFIG_ZLIB_DEFLATE=m
843CONFIG_PLIST=y 907CONFIG_PLIST=y
908CONFIG_HAS_IOMEM=y
909CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/ddb5xxx/ddb5477/Makefile b/arch/mips/ddb5xxx/ddb5477/Makefile
index ea68815ad17a..23fd3b81fe1a 100644
--- a/arch/mips/ddb5xxx/ddb5477/Makefile
+++ b/arch/mips/ddb5xxx/ddb5477/Makefile
@@ -6,5 +6,3 @@ obj-y += irq.o irq_5477.o setup.o lcd44780.o
6 6
7obj-$(CONFIG_RUNTIME_DEBUG) += debug.o 7obj-$(CONFIG_RUNTIME_DEBUG) += debug.o
8obj-$(CONFIG_KGDB) += kgdb_io.o 8obj-$(CONFIG_KGDB) += kgdb_io.o
9
10EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/ddb5xxx/ddb5477/irq.c b/arch/mips/ddb5xxx/ddb5477/irq.c
index 2b23234a5b95..faa4a506bf82 100644
--- a/arch/mips/ddb5xxx/ddb5477/irq.c
+++ b/arch/mips/ddb5xxx/ddb5477/irq.c
@@ -194,7 +194,7 @@ static void vrc5477_irq_dispatch(void)
194 194
195asmlinkage void plat_irq_dispatch(void) 195asmlinkage void plat_irq_dispatch(void)
196{ 196{
197 unsigned int pending = read_c0_cause() & read_c0_status(); 197 unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
198 198
199 if (pending & STATUSF_IP7) 199 if (pending & STATUSF_IP7)
200 do_IRQ(CPU_IRQ_BASE + 7); 200 do_IRQ(CPU_IRQ_BASE + 7);
diff --git a/arch/mips/dec/Makefile b/arch/mips/dec/Makefile
index 8b790c2900d5..9eb2f9c036aa 100644
--- a/arch/mips/dec/Makefile
+++ b/arch/mips/dec/Makefile
@@ -8,5 +8,3 @@ obj-y := ecc-berr.o int-handler.o ioasic-irq.o kn01-berr.o \
8obj-$(CONFIG_PROM_CONSOLE) += promcon.o 8obj-$(CONFIG_PROM_CONSOLE) += promcon.o
9obj-$(CONFIG_TC) += tc.o 9obj-$(CONFIG_TC) += tc.o
10obj-$(CONFIG_CPU_HAS_WB) += wbflush.o 10obj-$(CONFIG_CPU_HAS_WB) += wbflush.o
11
12EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/dec/prom/Makefile b/arch/mips/dec/prom/Makefile
index bcd0247b3a66..064ae7a76bdc 100644
--- a/arch/mips/dec/prom/Makefile
+++ b/arch/mips/dec/prom/Makefile
@@ -7,5 +7,3 @@ lib-y += init.o memory.o cmdline.o identify.o console.o
7 7
8lib-$(CONFIG_32BIT) += locore.o 8lib-$(CONFIG_32BIT) += locore.o
9lib-$(CONFIG_64BIT) += call_o32.o 9lib-$(CONFIG_64BIT) += call_o32.o
10
11EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/dec/prom/console.c b/arch/mips/dec/prom/console.c
index cade16ec7e5a..65419bf32441 100644
--- a/arch/mips/dec/prom/console.c
+++ b/arch/mips/dec/prom/console.c
@@ -16,40 +16,12 @@
16 16
17#include <asm/dec/prom.h> 17#include <asm/dec/prom.h>
18 18
19static void __init prom_console_write(struct console *con, const char *s, 19void prom_putchar(char c)
20 unsigned int c)
21{ 20{
22 static char sfmt[] __initdata = "%%%us"; 21 char s[2];
23 char fmt[13];
24 22
25 snprintf(fmt, sizeof(fmt), sfmt, c); 23 s[0] = c;
26 prom_printf(fmt, s); 24 s[1] = '\0';
27}
28
29static struct console promcons __initdata = {
30 .name = "prom",
31 .write = prom_console_write,
32 .flags = CON_PRINTBUFFER,
33 .index = -1,
34};
35
36static int promcons_output __initdata = 0;
37
38void __init register_prom_console(void)
39{
40 if (!promcons_output) {
41 promcons_output = 1;
42 register_console(&promcons);
43 }
44}
45 25
46void __init unregister_prom_console(void) 26 prom_printf( s);
47{
48 if (promcons_output) {
49 unregister_console(&promcons);
50 promcons_output = 0;
51 }
52} 27}
53
54void disable_early_printk(void)
55 __attribute__((alias("unregister_prom_console")));
diff --git a/arch/mips/dec/prom/identify.c b/arch/mips/dec/prom/identify.c
index c4e3c1ea0d48..cd85924e2572 100644
--- a/arch/mips/dec/prom/identify.c
+++ b/arch/mips/dec/prom/identify.c
@@ -26,9 +26,6 @@
26 26
27#include "dectypes.h" 27#include "dectypes.h"
28 28
29extern unsigned long mips_machgroup;
30extern unsigned long mips_machtype;
31
32static const char *dec_system_strings[] = { 29static const char *dec_system_strings[] = {
33 [MACH_DSUNKNOWN] "unknown DECstation", 30 [MACH_DSUNKNOWN] "unknown DECstation",
34 [MACH_DS23100] "DECstation 2100/3100", 31 [MACH_DS23100] "DECstation 2100/3100",
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c
index bf2858071f1f..a217aafe59f6 100644
--- a/arch/mips/dec/prom/init.c
+++ b/arch/mips/dec/prom/init.c
@@ -103,9 +103,6 @@ void __init prom_init(void)
103 if (prom_is_rex(magic)) 103 if (prom_is_rex(magic))
104 rex_clear_cache(); 104 rex_clear_cache();
105 105
106 /* Register the early console. */
107 register_prom_console();
108
109 /* Were we compiled with the right CPU option? */ 106 /* Were we compiled with the right CPU option? */
110#if defined(CONFIG_CPU_R3000) 107#if defined(CONFIG_CPU_R3000)
111 if ((current_cpu_data.cputype == CPU_R4000SC) || 108 if ((current_cpu_data.cputype == CPU_R4000SC) ||
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index f9812d1e4579..41211f8b7738 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:10 2006 4# Tue Feb 20 21:47:14 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -40,8 +39,8 @@ CONFIG_MIPS=y
40# CONFIG_MOMENCO_OCELOT_C is not set 39# CONFIG_MOMENCO_OCELOT_C is not set
41# CONFIG_MOMENCO_OCELOT_G is not set 40# CONFIG_MOMENCO_OCELOT_G is not set
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 42# CONFIG_PNX8550_JBS is not set
43# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 44# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 45# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 46# CONFIG_PMC_YOSEMITE is not set
@@ -64,13 +63,18 @@ CONFIG_SGI_IP22=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 63# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 64# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 65CONFIG_RWSEM_GENERIC_SPINLOCK=y
66# CONFIG_ARCH_HAS_ILOG2_U32 is not set
67# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 68CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 69CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_ARC=y 74CONFIG_ARC=y
72CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
77CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
74CONFIG_CPU_BIG_ENDIAN=y 78CONFIG_CPU_BIG_ENDIAN=y
75# CONFIG_CPU_LITTLE_ENDIAN is not set 79# CONFIG_CPU_LITTLE_ENDIAN is not set
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 80CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -123,8 +127,8 @@ CONFIG_PAGE_SIZE_4KB=y
123CONFIG_BOARD_SCACHE=y 127CONFIG_BOARD_SCACHE=y
124CONFIG_IP22_CPU_SCACHE=y 128CONFIG_IP22_CPU_SCACHE=y
125CONFIG_MIPS_MT_DISABLED=y 129CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 130# CONFIG_MIPS_MT_SMP is not set
131# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 132# CONFIG_MIPS_VPE_LOADER is not set
129# CONFIG_64BIT_PHYS_ADDR is not set 133# CONFIG_64BIT_PHYS_ADDR is not set
130CONFIG_CPU_HAS_LLSC=y 134CONFIG_CPU_HAS_LLSC=y
@@ -141,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set 147# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 149# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 150# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 151# CONFIG_HZ_128 is not set
@@ -153,6 +158,7 @@ CONFIG_HZ=1000
153# CONFIG_PREEMPT_NONE is not set 158# CONFIG_PREEMPT_NONE is not set
154CONFIG_PREEMPT_VOLUNTARY=y 159CONFIG_PREEMPT_VOLUNTARY=y
155# CONFIG_PREEMPT is not set 160# CONFIG_PREEMPT is not set
161# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 162CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 163CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 164CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,16 +177,21 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 177CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 178CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 179CONFIG_SYSVIPC=y
180# CONFIG_IPC_NS is not set
181CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 182# CONFIG_POSIX_MQUEUE is not set
175# CONFIG_BSD_PROCESS_ACCT is not set 183# CONFIG_BSD_PROCESS_ACCT is not set
176CONFIG_SYSCTL=y 184# CONFIG_TASKSTATS is not set
185# CONFIG_UTS_NS is not set
177# CONFIG_AUDIT is not set 186# CONFIG_AUDIT is not set
178CONFIG_IKCONFIG=y 187CONFIG_IKCONFIG=y
179CONFIG_IKCONFIG_PROC=y 188CONFIG_IKCONFIG_PROC=y
189CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 190CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 191# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
192CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 193CONFIG_EMBEDDED=y
194CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 195CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 196# CONFIG_KALLSYMS_EXTRA_PASS is not set
186# CONFIG_HOTPLUG is not set 197# CONFIG_HOTPLUG is not set
@@ -188,12 +199,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 199CONFIG_BUG=y
189CONFIG_ELF_CORE=y 200CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 201CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 202CONFIG_FUTEX=y
193CONFIG_EPOLL=y 203CONFIG_EPOLL=y
194CONFIG_SHMEM=y 204CONFIG_SHMEM=y
195CONFIG_SLAB=y 205CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 206CONFIG_VM_EVENT_COUNTERS=y
207CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 208# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 209CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 210# CONFIG_SLOB is not set
@@ -211,6 +222,7 @@ CONFIG_KMOD=y
211# 222#
212# Block layer 223# Block layer
213# 224#
225CONFIG_BLOCK=y
214# CONFIG_LBD is not set 226# CONFIG_LBD is not set
215# CONFIG_BLK_DEV_IO_TRACE is not set 227# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_LSF is not set 228# CONFIG_LSF is not set
@@ -238,7 +250,6 @@ CONFIG_MMU=y
238# 250#
239# PCCARD (PCMCIA/CardBus) support 251# PCCARD (PCMCIA/CardBus) support
240# 252#
241# CONFIG_PCCARD is not set
242 253
243# 254#
244# PCI Hotplug Support 255# PCI Hotplug Support
@@ -252,6 +263,14 @@ CONFIG_BINFMT_MISC=m
252CONFIG_TRAD_SIGNALS=y 263CONFIG_TRAD_SIGNALS=y
253 264
254# 265#
266# Power management options
267#
268CONFIG_PM=y
269# CONFIG_PM_LEGACY is not set
270# CONFIG_PM_DEBUG is not set
271# CONFIG_PM_SYSFS_DEPRECATED is not set
272
273#
255# Networking 274# Networking
256# 275#
257CONFIG_NET=y 276CONFIG_NET=y
@@ -265,7 +284,10 @@ CONFIG_PACKET_MMAP=y
265CONFIG_UNIX=y 284CONFIG_UNIX=y
266CONFIG_XFRM=y 285CONFIG_XFRM=y
267CONFIG_XFRM_USER=m 286CONFIG_XFRM_USER=m
287# CONFIG_XFRM_SUB_POLICY is not set
288CONFIG_XFRM_MIGRATE=y
268CONFIG_NET_KEY=y 289CONFIG_NET_KEY=y
290CONFIG_NET_KEY_MIGRATE=y
269CONFIG_INET=y 291CONFIG_INET=y
270CONFIG_IP_MULTICAST=y 292CONFIG_IP_MULTICAST=y
271# CONFIG_IP_ADVANCED_ROUTER is not set 293# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -286,10 +308,13 @@ CONFIG_INET_XFRM_TUNNEL=m
286CONFIG_INET_TUNNEL=m 308CONFIG_INET_TUNNEL=m
287CONFIG_INET_XFRM_MODE_TRANSPORT=m 309CONFIG_INET_XFRM_MODE_TRANSPORT=m
288CONFIG_INET_XFRM_MODE_TUNNEL=m 310CONFIG_INET_XFRM_MODE_TUNNEL=m
311CONFIG_INET_XFRM_MODE_BEET=m
289CONFIG_INET_DIAG=y 312CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y 313CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 314# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_BIC=y 315CONFIG_TCP_CONG_CUBIC=y
316CONFIG_DEFAULT_TCP_CONG="cubic"
317CONFIG_TCP_MD5SIG=y
293 318
294# 319#
295# IP: Virtual Server Configuration 320# IP: Virtual Server Configuration
@@ -331,11 +356,17 @@ CONFIG_IPV6_ROUTE_INFO=y
331CONFIG_INET6_AH=m 356CONFIG_INET6_AH=m
332CONFIG_INET6_ESP=m 357CONFIG_INET6_ESP=m
333CONFIG_INET6_IPCOMP=m 358CONFIG_INET6_IPCOMP=m
359CONFIG_IPV6_MIP6=y
334CONFIG_INET6_XFRM_TUNNEL=m 360CONFIG_INET6_XFRM_TUNNEL=m
335CONFIG_INET6_TUNNEL=m 361CONFIG_INET6_TUNNEL=m
336CONFIG_INET6_XFRM_MODE_TRANSPORT=m 362CONFIG_INET6_XFRM_MODE_TRANSPORT=m
337CONFIG_INET6_XFRM_MODE_TUNNEL=m 363CONFIG_INET6_XFRM_MODE_TUNNEL=m
364CONFIG_INET6_XFRM_MODE_BEET=m
365CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
366CONFIG_IPV6_SIT=m
338CONFIG_IPV6_TUNNEL=m 367CONFIG_IPV6_TUNNEL=m
368CONFIG_IPV6_MULTIPLE_TABLES=y
369CONFIG_IPV6_SUBTREES=y
339CONFIG_NETWORK_SECMARK=y 370CONFIG_NETWORK_SECMARK=y
340CONFIG_NETFILTER=y 371CONFIG_NETFILTER=y
341# CONFIG_NETFILTER_DEBUG is not set 372# CONFIG_NETFILTER_DEBUG is not set
@@ -346,19 +377,43 @@ CONFIG_NETFILTER=y
346CONFIG_NETFILTER_NETLINK=m 377CONFIG_NETFILTER_NETLINK=m
347CONFIG_NETFILTER_NETLINK_QUEUE=m 378CONFIG_NETFILTER_NETLINK_QUEUE=m
348CONFIG_NETFILTER_NETLINK_LOG=m 379CONFIG_NETFILTER_NETLINK_LOG=m
380CONFIG_NF_CONNTRACK_ENABLED=m
381CONFIG_NF_CONNTRACK_SUPPORT=y
382# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
383CONFIG_NF_CONNTRACK=m
384CONFIG_NF_CT_ACCT=y
385CONFIG_NF_CONNTRACK_MARK=y
386CONFIG_NF_CONNTRACK_SECMARK=y
387CONFIG_NF_CONNTRACK_EVENTS=y
388CONFIG_NF_CT_PROTO_GRE=m
389CONFIG_NF_CT_PROTO_SCTP=m
390CONFIG_NF_CONNTRACK_AMANDA=m
391CONFIG_NF_CONNTRACK_FTP=m
392CONFIG_NF_CONNTRACK_H323=m
393CONFIG_NF_CONNTRACK_IRC=m
394# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
395CONFIG_NF_CONNTRACK_PPTP=m
396CONFIG_NF_CONNTRACK_SANE=m
397CONFIG_NF_CONNTRACK_SIP=m
398CONFIG_NF_CONNTRACK_TFTP=m
399CONFIG_NF_CT_NETLINK=m
349CONFIG_NETFILTER_XTABLES=m 400CONFIG_NETFILTER_XTABLES=m
350CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 401CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
351CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 402CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
403CONFIG_NETFILTER_XT_TARGET_DSCP=m
352CONFIG_NETFILTER_XT_TARGET_MARK=m 404CONFIG_NETFILTER_XT_TARGET_MARK=m
353CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 405CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
406CONFIG_NETFILTER_XT_TARGET_NFLOG=m
354CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 407CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
355CONFIG_NETFILTER_XT_TARGET_SECMARK=m 408CONFIG_NETFILTER_XT_TARGET_SECMARK=m
356CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 409CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
410CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
357CONFIG_NETFILTER_XT_MATCH_COMMENT=m 411CONFIG_NETFILTER_XT_MATCH_COMMENT=m
358CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 412CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
359CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 413CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
360CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 414CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
361CONFIG_NETFILTER_XT_MATCH_DCCP=m 415CONFIG_NETFILTER_XT_MATCH_DCCP=m
416CONFIG_NETFILTER_XT_MATCH_DSCP=m
362CONFIG_NETFILTER_XT_MATCH_ESP=m 417CONFIG_NETFILTER_XT_MATCH_ESP=m
363CONFIG_NETFILTER_XT_MATCH_HELPER=m 418CONFIG_NETFILTER_XT_MATCH_HELPER=m
364CONFIG_NETFILTER_XT_MATCH_LENGTH=m 419CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -375,60 +430,45 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
375CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 430CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
376CONFIG_NETFILTER_XT_MATCH_STRING=m 431CONFIG_NETFILTER_XT_MATCH_STRING=m
377CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 432CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
433CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
378 434
379# 435#
380# IP: Netfilter Configuration 436# IP: Netfilter Configuration
381# 437#
382CONFIG_IP_NF_CONNTRACK=m 438CONFIG_NF_CONNTRACK_IPV4=m
383CONFIG_IP_NF_CT_ACCT=y 439CONFIG_NF_CONNTRACK_PROC_COMPAT=y
384CONFIG_IP_NF_CONNTRACK_MARK=y
385CONFIG_IP_NF_CONNTRACK_SECMARK=y
386CONFIG_IP_NF_CONNTRACK_EVENTS=y
387CONFIG_IP_NF_CONNTRACK_NETLINK=m
388# CONFIG_IP_NF_CT_PROTO_SCTP is not set
389CONFIG_IP_NF_FTP=m
390CONFIG_IP_NF_IRC=m
391# CONFIG_IP_NF_NETBIOS_NS is not set
392CONFIG_IP_NF_TFTP=m
393CONFIG_IP_NF_AMANDA=m
394CONFIG_IP_NF_PPTP=m
395CONFIG_IP_NF_H323=m
396CONFIG_IP_NF_SIP=m
397CONFIG_IP_NF_QUEUE=m 440CONFIG_IP_NF_QUEUE=m
398CONFIG_IP_NF_IPTABLES=m 441CONFIG_IP_NF_IPTABLES=m
399CONFIG_IP_NF_MATCH_IPRANGE=m 442CONFIG_IP_NF_MATCH_IPRANGE=m
400CONFIG_IP_NF_MATCH_TOS=m 443CONFIG_IP_NF_MATCH_TOS=m
401CONFIG_IP_NF_MATCH_RECENT=m 444CONFIG_IP_NF_MATCH_RECENT=m
402CONFIG_IP_NF_MATCH_ECN=m 445CONFIG_IP_NF_MATCH_ECN=m
403CONFIG_IP_NF_MATCH_DSCP=m
404CONFIG_IP_NF_MATCH_AH=m 446CONFIG_IP_NF_MATCH_AH=m
405CONFIG_IP_NF_MATCH_TTL=m 447CONFIG_IP_NF_MATCH_TTL=m
406CONFIG_IP_NF_MATCH_OWNER=m 448CONFIG_IP_NF_MATCH_OWNER=m
407CONFIG_IP_NF_MATCH_ADDRTYPE=m 449CONFIG_IP_NF_MATCH_ADDRTYPE=m
408CONFIG_IP_NF_MATCH_HASHLIMIT=m
409CONFIG_IP_NF_FILTER=m 450CONFIG_IP_NF_FILTER=m
410CONFIG_IP_NF_TARGET_REJECT=m 451CONFIG_IP_NF_TARGET_REJECT=m
411CONFIG_IP_NF_TARGET_LOG=m 452CONFIG_IP_NF_TARGET_LOG=m
412CONFIG_IP_NF_TARGET_ULOG=m 453CONFIG_IP_NF_TARGET_ULOG=m
413CONFIG_IP_NF_TARGET_TCPMSS=m 454CONFIG_NF_NAT=m
414CONFIG_IP_NF_NAT=m 455CONFIG_NF_NAT_NEEDED=y
415CONFIG_IP_NF_NAT_NEEDED=y
416CONFIG_IP_NF_TARGET_MASQUERADE=m 456CONFIG_IP_NF_TARGET_MASQUERADE=m
417CONFIG_IP_NF_TARGET_REDIRECT=m 457CONFIG_IP_NF_TARGET_REDIRECT=m
418CONFIG_IP_NF_TARGET_NETMAP=m 458CONFIG_IP_NF_TARGET_NETMAP=m
419CONFIG_IP_NF_TARGET_SAME=m 459CONFIG_IP_NF_TARGET_SAME=m
420CONFIG_IP_NF_NAT_SNMP_BASIC=m 460CONFIG_NF_NAT_SNMP_BASIC=m
421CONFIG_IP_NF_NAT_IRC=m 461CONFIG_NF_NAT_PROTO_GRE=m
422CONFIG_IP_NF_NAT_FTP=m 462CONFIG_NF_NAT_FTP=m
423CONFIG_IP_NF_NAT_TFTP=m 463CONFIG_NF_NAT_IRC=m
424CONFIG_IP_NF_NAT_AMANDA=m 464CONFIG_NF_NAT_TFTP=m
425CONFIG_IP_NF_NAT_PPTP=m 465CONFIG_NF_NAT_AMANDA=m
426CONFIG_IP_NF_NAT_H323=m 466CONFIG_NF_NAT_PPTP=m
427CONFIG_IP_NF_NAT_SIP=m 467CONFIG_NF_NAT_H323=m
468CONFIG_NF_NAT_SIP=m
428CONFIG_IP_NF_MANGLE=m 469CONFIG_IP_NF_MANGLE=m
429CONFIG_IP_NF_TARGET_TOS=m 470CONFIG_IP_NF_TARGET_TOS=m
430CONFIG_IP_NF_TARGET_ECN=m 471CONFIG_IP_NF_TARGET_ECN=m
431CONFIG_IP_NF_TARGET_DSCP=m
432CONFIG_IP_NF_TARGET_TTL=m 472CONFIG_IP_NF_TARGET_TTL=m
433CONFIG_IP_NF_TARGET_CLUSTERIP=m 473CONFIG_IP_NF_TARGET_CLUSTERIP=m
434CONFIG_IP_NF_RAW=m 474CONFIG_IP_NF_RAW=m
@@ -439,6 +479,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
439# 479#
440# IPv6: Netfilter Configuration (EXPERIMENTAL) 480# IPv6: Netfilter Configuration (EXPERIMENTAL)
441# 481#
482CONFIG_NF_CONNTRACK_IPV6=m
442CONFIG_IP6_NF_QUEUE=m 483CONFIG_IP6_NF_QUEUE=m
443CONFIG_IP6_NF_IPTABLES=m 484CONFIG_IP6_NF_IPTABLES=m
444CONFIG_IP6_NF_MATCH_RT=m 485CONFIG_IP6_NF_MATCH_RT=m
@@ -448,6 +489,7 @@ CONFIG_IP6_NF_MATCH_HL=m
448CONFIG_IP6_NF_MATCH_OWNER=m 489CONFIG_IP6_NF_MATCH_OWNER=m
449CONFIG_IP6_NF_MATCH_IPV6HEADER=m 490CONFIG_IP6_NF_MATCH_IPV6HEADER=m
450CONFIG_IP6_NF_MATCH_AH=m 491CONFIG_IP6_NF_MATCH_AH=m
492CONFIG_IP6_NF_MATCH_MH=m
451CONFIG_IP6_NF_MATCH_EUI64=m 493CONFIG_IP6_NF_MATCH_EUI64=m
452CONFIG_IP6_NF_FILTER=m 494CONFIG_IP6_NF_FILTER=m
453CONFIG_IP6_NF_TARGET_LOG=m 495CONFIG_IP6_NF_TARGET_LOG=m
@@ -484,7 +526,6 @@ CONFIG_SCTP_HMAC_MD5=y
484# CONFIG_ATALK is not set 526# CONFIG_ATALK is not set
485# CONFIG_X25 is not set 527# CONFIG_X25 is not set
486# CONFIG_LAPB is not set 528# CONFIG_LAPB is not set
487CONFIG_NET_DIVERT=y
488# CONFIG_ECONET is not set 529# CONFIG_ECONET is not set
489# CONFIG_WAN_ROUTER is not set 530# CONFIG_WAN_ROUTER is not set
490 531
@@ -492,6 +533,7 @@ CONFIG_NET_DIVERT=y
492# QoS and/or fair queueing 533# QoS and/or fair queueing
493# 534#
494CONFIG_NET_SCHED=y 535CONFIG_NET_SCHED=y
536CONFIG_NET_SCH_FIFO=y
495# CONFIG_NET_SCH_CLK_JIFFIES is not set 537# CONFIG_NET_SCH_CLK_JIFFIES is not set
496CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 538CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
497# CONFIG_NET_SCH_CLK_CPU is not set 539# CONFIG_NET_SCH_CLK_CPU is not set
@@ -546,6 +588,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
546CONFIG_IEEE80211_SOFTMAC=m 588CONFIG_IEEE80211_SOFTMAC=m
547# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 589# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
548CONFIG_WIRELESS_EXT=y 590CONFIG_WIRELESS_EXT=y
591CONFIG_FIB_RULES=y
549 592
550# 593#
551# Device Drivers 594# Device Drivers
@@ -556,7 +599,6 @@ CONFIG_WIRELESS_EXT=y
556# 599#
557CONFIG_STANDALONE=y 600CONFIG_STANDALONE=y
558CONFIG_PREVENT_FIRMWARE_BUILD=y 601CONFIG_PREVENT_FIRMWARE_BUILD=y
559# CONFIG_FW_LOADER is not set
560# CONFIG_SYS_HYPERVISOR is not set 602# CONFIG_SYS_HYPERVISOR is not set
561 603
562# 604#
@@ -577,6 +619,7 @@ CONFIG_CONNECTOR=m
577# 619#
578# Plug and Play support 620# Plug and Play support
579# 621#
622# CONFIG_PNPACPI is not set
580 623
581# 624#
582# Block devices 625# Block devices
@@ -592,6 +635,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
592CONFIG_ATA_OVER_ETH=m 635CONFIG_ATA_OVER_ETH=m
593 636
594# 637#
638# Misc devices
639#
640
641#
595# ATA/ATAPI/MFM/RLL support 642# ATA/ATAPI/MFM/RLL support
596# 643#
597# CONFIG_IDE is not set 644# CONFIG_IDE is not set
@@ -601,6 +648,8 @@ CONFIG_ATA_OVER_ETH=m
601# 648#
602CONFIG_RAID_ATTRS=m 649CONFIG_RAID_ATTRS=m
603CONFIG_SCSI=y 650CONFIG_SCSI=y
651CONFIG_SCSI_TGT=m
652# CONFIG_SCSI_NETLINK is not set
604CONFIG_SCSI_PROC_FS=y 653CONFIG_SCSI_PROC_FS=y
605 654
606# 655#
@@ -620,24 +669,30 @@ CONFIG_CHR_DEV_SCH=m
620# CONFIG_SCSI_MULTI_LUN is not set 669# CONFIG_SCSI_MULTI_LUN is not set
621CONFIG_SCSI_CONSTANTS=y 670CONFIG_SCSI_CONSTANTS=y
622# CONFIG_SCSI_LOGGING is not set 671# CONFIG_SCSI_LOGGING is not set
672CONFIG_SCSI_SCAN_ASYNC=y
623 673
624# 674#
625# SCSI Transport Attributes 675# SCSI Transports
626# 676#
627CONFIG_SCSI_SPI_ATTRS=m 677CONFIG_SCSI_SPI_ATTRS=m
628# CONFIG_SCSI_FC_ATTRS is not set 678# CONFIG_SCSI_FC_ATTRS is not set
629CONFIG_SCSI_ISCSI_ATTRS=m 679CONFIG_SCSI_ISCSI_ATTRS=m
630CONFIG_SCSI_SAS_ATTRS=m 680CONFIG_SCSI_SAS_ATTRS=m
681# CONFIG_SCSI_SAS_LIBSAS is not set
631 682
632# 683#
633# SCSI low-level drivers 684# SCSI low-level drivers
634# 685#
635CONFIG_ISCSI_TCP=m 686CONFIG_ISCSI_TCP=m
636CONFIG_SGIWD93_SCSI=y 687CONFIG_SGIWD93_SCSI=y
637# CONFIG_SCSI_SATA is not set
638# CONFIG_SCSI_DEBUG is not set 688# CONFIG_SCSI_DEBUG is not set
639 689
640# 690#
691# Serial ATA (prod) and Parallel ATA (experimental) drivers
692#
693# CONFIG_ATA is not set
694
695#
641# Multi-device support (RAID and LVM) 696# Multi-device support (RAID and LVM)
642# 697#
643# CONFIG_MD is not set 698# CONFIG_MD is not set
@@ -679,6 +734,8 @@ CONFIG_LXT_PHY=m
679CONFIG_CICADA_PHY=m 734CONFIG_CICADA_PHY=m
680# CONFIG_VITESSE_PHY is not set 735# CONFIG_VITESSE_PHY is not set
681# CONFIG_SMSC_PHY is not set 736# CONFIG_SMSC_PHY is not set
737# CONFIG_BROADCOM_PHY is not set
738# CONFIG_FIXED_PHY is not set
682 739
683# 740#
684# Ethernet (10 or 100Mbit) 741# Ethernet (10 or 100Mbit)
@@ -730,6 +787,7 @@ CONFIG_SGISEEQ=y
730# Input device support 787# Input device support
731# 788#
732CONFIG_INPUT=y 789CONFIG_INPUT=y
790# CONFIG_INPUT_FF_MEMLESS is not set
733 791
734# 792#
735# Userland interfaces 793# Userland interfaces
@@ -752,6 +810,7 @@ CONFIG_KEYBOARD_ATKBD=y
752# CONFIG_KEYBOARD_LKKBD is not set 810# CONFIG_KEYBOARD_LKKBD is not set
753# CONFIG_KEYBOARD_XTKBD is not set 811# CONFIG_KEYBOARD_XTKBD is not set
754# CONFIG_KEYBOARD_NEWTON is not set 812# CONFIG_KEYBOARD_NEWTON is not set
813# CONFIG_KEYBOARD_STOWAWAY is not set
755CONFIG_INPUT_MOUSE=y 814CONFIG_INPUT_MOUSE=y
756CONFIG_MOUSE_PS2=m 815CONFIG_MOUSE_PS2=m
757CONFIG_MOUSE_SERIAL=m 816CONFIG_MOUSE_SERIAL=m
@@ -815,10 +874,6 @@ CONFIG_SGI_DS1286=m
815# CONFIG_GEN_RTC is not set 874# CONFIG_GEN_RTC is not set
816# CONFIG_DTLK is not set 875# CONFIG_DTLK is not set
817# CONFIG_R3964 is not set 876# CONFIG_R3964 is not set
818
819#
820# Ftape, the floppy tape device driver
821#
822CONFIG_RAW_DRIVER=m 877CONFIG_RAW_DRIVER=m
823CONFIG_MAX_RAW_DEVS=256 878CONFIG_MAX_RAW_DEVS=256
824 879
@@ -826,7 +881,6 @@ CONFIG_MAX_RAW_DEVS=256
826# TPM devices 881# TPM devices
827# 882#
828# CONFIG_TCG_TPM is not set 883# CONFIG_TCG_TPM is not set
829# CONFIG_TELCLOCK is not set
830 884
831# 885#
832# I2C support 886# I2C support
@@ -851,14 +905,9 @@ CONFIG_MAX_RAW_DEVS=256
851# CONFIG_HWMON_VID is not set 905# CONFIG_HWMON_VID is not set
852 906
853# 907#
854# Misc devices
855#
856
857#
858# Multimedia devices 908# Multimedia devices
859# 909#
860# CONFIG_VIDEO_DEV is not set 910# CONFIG_VIDEO_DEV is not set
861CONFIG_VIDEO_V4L2=y
862 911
863# 912#
864# Digital Video Broadcasting Devices 913# Digital Video Broadcasting Devices
@@ -887,6 +936,7 @@ CONFIG_LOGO=y
887# CONFIG_LOGO_LINUX_VGA16 is not set 936# CONFIG_LOGO_LINUX_VGA16 is not set
888# CONFIG_LOGO_LINUX_CLUT224 is not set 937# CONFIG_LOGO_LINUX_CLUT224 is not set
889CONFIG_LOGO_SGI_CLUT224=y 938CONFIG_LOGO_SGI_CLUT224=y
939# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
890 940
891# 941#
892# Sound 942# Sound
@@ -894,6 +944,12 @@ CONFIG_LOGO_SGI_CLUT224=y
894# CONFIG_SOUND is not set 944# CONFIG_SOUND is not set
895 945
896# 946#
947# HID Devices
948#
949CONFIG_HID=y
950# CONFIG_HID_DEBUG is not set
951
952#
897# USB support 953# USB support
898# 954#
899# CONFIG_USB_ARCH_HAS_HCD is not set 955# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -954,6 +1010,14 @@ CONFIG_LOGO_SGI_CLUT224=y
954# 1010#
955 1011
956# 1012#
1013# Auxiliary Display support
1014#
1015
1016#
1017# Virtualization
1018#
1019
1020#
957# File systems 1021# File systems
958# 1022#
959CONFIG_EXT2_FS=m 1023CONFIG_EXT2_FS=m
@@ -963,6 +1027,7 @@ CONFIG_EXT3_FS=y
963CONFIG_EXT3_FS_XATTR=y 1027CONFIG_EXT3_FS_XATTR=y
964CONFIG_EXT3_FS_POSIX_ACL=y 1028CONFIG_EXT3_FS_POSIX_ACL=y
965CONFIG_EXT3_FS_SECURITY=y 1029CONFIG_EXT3_FS_SECURITY=y
1030# CONFIG_EXT4DEV_FS is not set
966CONFIG_JBD=y 1031CONFIG_JBD=y
967# CONFIG_JBD_DEBUG is not set 1032# CONFIG_JBD_DEBUG is not set
968CONFIG_FS_MBCACHE=y 1033CONFIG_FS_MBCACHE=y
@@ -974,6 +1039,7 @@ CONFIG_XFS_QUOTA=y
974CONFIG_XFS_SECURITY=y 1039CONFIG_XFS_SECURITY=y
975# CONFIG_XFS_POSIX_ACL is not set 1040# CONFIG_XFS_POSIX_ACL is not set
976# CONFIG_XFS_RT is not set 1041# CONFIG_XFS_RT is not set
1042# CONFIG_GFS2_FS is not set
977# CONFIG_OCFS2_FS is not set 1043# CONFIG_OCFS2_FS is not set
978CONFIG_MINIX_FS=m 1044CONFIG_MINIX_FS=m
979# CONFIG_ROMFS_FS is not set 1045# CONFIG_ROMFS_FS is not set
@@ -987,6 +1053,7 @@ CONFIG_DNOTIFY=y
987CONFIG_AUTOFS_FS=m 1053CONFIG_AUTOFS_FS=m
988CONFIG_AUTOFS4_FS=m 1054CONFIG_AUTOFS4_FS=m
989CONFIG_FUSE_FS=m 1055CONFIG_FUSE_FS=m
1056CONFIG_GENERIC_ACL=y
990 1057
991# 1058#
992# CD-ROM/DVD Filesystems 1059# CD-ROM/DVD Filesystems
@@ -994,7 +1061,6 @@ CONFIG_FUSE_FS=m
994CONFIG_ISO9660_FS=m 1061CONFIG_ISO9660_FS=m
995CONFIG_JOLIET=y 1062CONFIG_JOLIET=y
996CONFIG_ZISOFS=y 1063CONFIG_ZISOFS=y
997CONFIG_ZISOFS_FS=m
998CONFIG_UDF_FS=m 1064CONFIG_UDF_FS=m
999CONFIG_UDF_NLS=y 1065CONFIG_UDF_NLS=y
1000 1066
@@ -1013,17 +1079,20 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1013# 1079#
1014CONFIG_PROC_FS=y 1080CONFIG_PROC_FS=y
1015CONFIG_PROC_KCORE=y 1081CONFIG_PROC_KCORE=y
1082CONFIG_PROC_SYSCTL=y
1016CONFIG_SYSFS=y 1083CONFIG_SYSFS=y
1017CONFIG_TMPFS=y 1084CONFIG_TMPFS=y
1085CONFIG_TMPFS_POSIX_ACL=y
1018# CONFIG_HUGETLB_PAGE is not set 1086# CONFIG_HUGETLB_PAGE is not set
1019CONFIG_RAMFS=y 1087CONFIG_RAMFS=y
1020# CONFIG_CONFIGFS_FS is not set 1088CONFIG_CONFIGFS_FS=m
1021 1089
1022# 1090#
1023# Miscellaneous filesystems 1091# Miscellaneous filesystems
1024# 1092#
1025# CONFIG_ADFS_FS is not set 1093# CONFIG_ADFS_FS is not set
1026# CONFIG_AFFS_FS is not set 1094# CONFIG_AFFS_FS is not set
1095# CONFIG_ECRYPT_FS is not set
1027# CONFIG_HFS_FS is not set 1096# CONFIG_HFS_FS is not set
1028# CONFIG_HFSPLUS_FS is not set 1097# CONFIG_HFSPLUS_FS is not set
1029# CONFIG_BEFS_FS is not set 1098# CONFIG_BEFS_FS is not set
@@ -1142,6 +1211,14 @@ CONFIG_NLS_KOI8_U=m
1142CONFIG_NLS_UTF8=m 1211CONFIG_NLS_UTF8=m
1143 1212
1144# 1213#
1214# Distributed Lock Manager
1215#
1216CONFIG_DLM=m
1217CONFIG_DLM_TCP=y
1218# CONFIG_DLM_SCTP is not set
1219# CONFIG_DLM_DEBUG is not set
1220
1221#
1145# Profiling support 1222# Profiling support
1146# 1223#
1147# CONFIG_PROFILING is not set 1224# CONFIG_PROFILING is not set
@@ -1151,11 +1228,13 @@ CONFIG_NLS_UTF8=m
1151# 1228#
1152CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1229CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1153# CONFIG_PRINTK_TIME is not set 1230# CONFIG_PRINTK_TIME is not set
1231CONFIG_ENABLE_MUST_CHECK=y
1154# CONFIG_MAGIC_SYSRQ is not set 1232# CONFIG_MAGIC_SYSRQ is not set
1155# CONFIG_UNUSED_SYMBOLS is not set 1233# CONFIG_UNUSED_SYMBOLS is not set
1234# CONFIG_DEBUG_FS is not set
1235# CONFIG_HEADERS_CHECK is not set
1156# CONFIG_DEBUG_KERNEL is not set 1236# CONFIG_DEBUG_KERNEL is not set
1157CONFIG_LOG_BUF_SHIFT=14 1237CONFIG_LOG_BUF_SHIFT=14
1158# CONFIG_DEBUG_FS is not set
1159CONFIG_CROSSCOMPILE=y 1238CONFIG_CROSSCOMPILE=y
1160CONFIG_CMDLINE="" 1239CONFIG_CMDLINE=""
1161 1240
@@ -1170,18 +1249,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1170# Cryptographic options 1249# Cryptographic options
1171# 1250#
1172CONFIG_CRYPTO=y 1251CONFIG_CRYPTO=y
1252CONFIG_CRYPTO_ALGAPI=y
1253CONFIG_CRYPTO_BLKCIPHER=m
1254CONFIG_CRYPTO_HASH=y
1255CONFIG_CRYPTO_MANAGER=y
1173CONFIG_CRYPTO_HMAC=y 1256CONFIG_CRYPTO_HMAC=y
1257CONFIG_CRYPTO_XCBC=m
1174CONFIG_CRYPTO_NULL=m 1258CONFIG_CRYPTO_NULL=m
1175CONFIG_CRYPTO_MD4=m 1259CONFIG_CRYPTO_MD4=m
1176CONFIG_CRYPTO_MD5=m 1260CONFIG_CRYPTO_MD5=y
1177CONFIG_CRYPTO_SHA1=m 1261CONFIG_CRYPTO_SHA1=m
1178CONFIG_CRYPTO_SHA256=m 1262CONFIG_CRYPTO_SHA256=m
1179CONFIG_CRYPTO_SHA512=m 1263CONFIG_CRYPTO_SHA512=m
1180CONFIG_CRYPTO_WP512=m 1264CONFIG_CRYPTO_WP512=m
1181CONFIG_CRYPTO_TGR192=m 1265CONFIG_CRYPTO_TGR192=m
1266CONFIG_CRYPTO_GF128MUL=m
1267CONFIG_CRYPTO_ECB=m
1268CONFIG_CRYPTO_CBC=m
1269CONFIG_CRYPTO_PCBC=m
1270CONFIG_CRYPTO_LRW=m
1182CONFIG_CRYPTO_DES=m 1271CONFIG_CRYPTO_DES=m
1272CONFIG_CRYPTO_FCRYPT=m
1183CONFIG_CRYPTO_BLOWFISH=m 1273CONFIG_CRYPTO_BLOWFISH=m
1184CONFIG_CRYPTO_TWOFISH=m 1274CONFIG_CRYPTO_TWOFISH=m
1275CONFIG_CRYPTO_TWOFISH_COMMON=m
1185CONFIG_CRYPTO_SERPENT=m 1276CONFIG_CRYPTO_SERPENT=m
1186CONFIG_CRYPTO_AES=m 1277CONFIG_CRYPTO_AES=m
1187CONFIG_CRYPTO_CAST5=m 1278CONFIG_CRYPTO_CAST5=m
@@ -1193,6 +1284,7 @@ CONFIG_CRYPTO_ANUBIS=m
1193CONFIG_CRYPTO_DEFLATE=m 1284CONFIG_CRYPTO_DEFLATE=m
1194CONFIG_CRYPTO_MICHAEL_MIC=m 1285CONFIG_CRYPTO_MICHAEL_MIC=m
1195CONFIG_CRYPTO_CRC32C=m 1286CONFIG_CRYPTO_CRC32C=m
1287CONFIG_CRYPTO_CAMELLIA=m
1196# CONFIG_CRYPTO_TEST is not set 1288# CONFIG_CRYPTO_TEST is not set
1197 1289
1198# 1290#
@@ -1202,6 +1294,7 @@ CONFIG_CRYPTO_CRC32C=m
1202# 1294#
1203# Library routines 1295# Library routines
1204# 1296#
1297CONFIG_BITREVERSE=m
1205# CONFIG_CRC_CCITT is not set 1298# CONFIG_CRC_CCITT is not set
1206CONFIG_CRC16=m 1299CONFIG_CRC16=m
1207CONFIG_CRC32=m 1300CONFIG_CRC32=m
@@ -1213,3 +1306,5 @@ CONFIG_TEXTSEARCH_KMP=m
1213CONFIG_TEXTSEARCH_BM=m 1306CONFIG_TEXTSEARCH_BM=m
1214CONFIG_TEXTSEARCH_FSM=m 1307CONFIG_TEXTSEARCH_FSM=m
1215CONFIG_PLIST=y 1308CONFIG_PLIST=y
1309CONFIG_HAS_IOMEM=y
1310CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/emma2rh/common/irq.c b/arch/mips/emma2rh/common/irq.c
index c191b3e9d9d9..d95604773667 100644
--- a/arch/mips/emma2rh/common/irq.c
+++ b/arch/mips/emma2rh/common/irq.c
@@ -27,7 +27,6 @@
27#include <linux/irq.h> 27#include <linux/irq.h>
28#include <linux/types.h> 28#include <linux/types.h>
29 29
30#include <asm/i8259.h>
31#include <asm/system.h> 30#include <asm/system.h>
32#include <asm/mipsregs.h> 31#include <asm/mipsregs.h>
33#include <asm/debug.h> 32#include <asm/debug.h>
diff --git a/arch/mips/emma2rh/markeins/irq.c b/arch/mips/emma2rh/markeins/irq.c
index 3299b6dfe764..6bcf6a06367a 100644
--- a/arch/mips/emma2rh/markeins/irq.c
+++ b/arch/mips/emma2rh/markeins/irq.c
@@ -29,7 +29,6 @@
29#include <linux/ptrace.h> 29#include <linux/ptrace.h>
30#include <linux/delay.h> 30#include <linux/delay.h>
31 31
32#include <asm/i8259.h>
33#include <asm/irq_cpu.h> 32#include <asm/irq_cpu.h>
34#include <asm/system.h> 33#include <asm/system.h>
35#include <asm/mipsregs.h> 34#include <asm/mipsregs.h>
@@ -116,7 +115,7 @@ void __init arch_init_irq(void)
116 115
117asmlinkage void plat_irq_dispatch(void) 116asmlinkage void plat_irq_dispatch(void)
118{ 117{
119 unsigned int pending = read_c0_status() & read_c0_cause(); 118 unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
120 119
121 if (pending & STATUSF_IP7) 120 if (pending & STATUSF_IP7)
122 do_IRQ(CPU_IRQ_BASE + 7); 121 do_IRQ(CPU_IRQ_BASE + 7);
diff --git a/arch/mips/gt64120/ev64120/Makefile b/arch/mips/gt64120/ev64120/Makefile
index b2c53a8f8718..323b2cebc691 100644
--- a/arch/mips/gt64120/ev64120/Makefile
+++ b/arch/mips/gt64120/ev64120/Makefile
@@ -7,5 +7,3 @@
7# 7#
8 8
9obj-y += irq.o promcon.o reset.o serialGT.o setup.o 9obj-y += irq.o promcon.o reset.o serialGT.o setup.o
10
11EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/gt64120/ev64120/irq.c b/arch/mips/gt64120/ev64120/irq.c
index 04572b9c9642..64e4c80b6139 100644
--- a/arch/mips/gt64120/ev64120/irq.c
+++ b/arch/mips/gt64120/ev64120/irq.c
@@ -48,7 +48,7 @@
48 48
49asmlinkage void plat_irq_dispatch(void) 49asmlinkage void plat_irq_dispatch(void)
50{ 50{
51 unsigned int pending = read_c0_status() & read_c0_cause(); 51 unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
52 52
53 if (pending & STATUSF_IP4) /* int2 hardware line (timer) */ 53 if (pending & STATUSF_IP4) /* int2 hardware line (timer) */
54 do_IRQ(4); 54 do_IRQ(4);
diff --git a/arch/mips/gt64120/ev64120/promcon.c b/arch/mips/gt64120/ev64120/promcon.c
index b5937c4ba7db..6e0ecfed9640 100644
--- a/arch/mips/gt64120/ev64120/promcon.c
+++ b/arch/mips/gt64120/ev64120/promcon.c
@@ -24,11 +24,6 @@ static void prom_console_write(struct console *co, const char *s,
24 } 24 }
25} 25}
26 26
27int prom_getchar(void)
28{
29 return 0;
30}
31
32static struct console sercons = { 27static struct console sercons = {
33 .name = "ttyS", 28 .name = "ttyS",
34 .write = prom_console_write, 29 .write = prom_console_write,
diff --git a/arch/mips/gt64120/momenco_ocelot/Makefile b/arch/mips/gt64120/momenco_ocelot/Makefile
index 6f708df8373b..9f9a33fc76b9 100644
--- a/arch/mips/gt64120/momenco_ocelot/Makefile
+++ b/arch/mips/gt64120/momenco_ocelot/Makefile
@@ -5,5 +5,3 @@
5obj-y += irq.o prom.o reset.o setup.o 5obj-y += irq.o prom.o reset.o setup.o
6 6
7obj-$(CONFIG_KGDB) += dbg_io.o 7obj-$(CONFIG_KGDB) += dbg_io.o
8
9EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/gt64120/momenco_ocelot/prom.c b/arch/mips/gt64120/momenco_ocelot/prom.c
index 78f393b2afd9..c71c85276c74 100644
--- a/arch/mips/gt64120/momenco_ocelot/prom.c
+++ b/arch/mips/gt64120/momenco_ocelot/prom.c
@@ -32,7 +32,6 @@ void __init prom_init(void)
32 char **arg = (char **) fw_arg1; 32 char **arg = (char **) fw_arg1;
33 char **env = (char **) fw_arg2; 33 char **env = (char **) fw_arg2;
34 struct callvectors *cv = (struct callvectors *) fw_arg3; 34 struct callvectors *cv = (struct callvectors *) fw_arg3;
35 uint32_t tmp;
36 int i; 35 int i;
37 36
38 /* save the PROM vectors for debugging use */ 37 /* save the PROM vectors for debugging use */
diff --git a/arch/mips/gt64120/momenco_ocelot/setup.c b/arch/mips/gt64120/momenco_ocelot/setup.c
index 94f94ebbda6c..98b6fb38096d 100644
--- a/arch/mips/gt64120/momenco_ocelot/setup.c
+++ b/arch/mips/gt64120/momenco_ocelot/setup.c
@@ -79,7 +79,7 @@ static char reset_reason;
79static void __init setup_l3cache(unsigned long size); 79static void __init setup_l3cache(unsigned long size);
80 80
81/* setup code for a handoff from a version 1 PMON 2000 PROM */ 81/* setup code for a handoff from a version 1 PMON 2000 PROM */
82void PMON_v1_setup() 82static void PMON_v1_setup(void)
83{ 83{
84 /* A wired TLB entry for the GT64120A and the serial port. The 84 /* A wired TLB entry for the GT64120A and the serial port. The
85 GT64120A is going to be hit on every IRQ anyway - there's 85 GT64120A is going to be hit on every IRQ anyway - there's
diff --git a/arch/mips/gt64120/wrppmc/Makefile b/arch/mips/gt64120/wrppmc/Makefile
index 7cf52205511c..e4250435ad89 100644
--- a/arch/mips/gt64120/wrppmc/Makefile
+++ b/arch/mips/gt64120/wrppmc/Makefile
@@ -10,5 +10,3 @@
10# 10#
11 11
12obj-y += irq.o reset.o setup.o time.o pci.o 12obj-y += irq.o reset.o setup.o time.o pci.o
13
14EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/gt64120/wrppmc/irq.c b/arch/mips/gt64120/wrppmc/irq.c
index d3d96591780e..06177bf5b1d6 100644
--- a/arch/mips/gt64120/wrppmc/irq.c
+++ b/arch/mips/gt64120/wrppmc/irq.c
@@ -32,7 +32,7 @@
32 32
33asmlinkage void plat_irq_dispatch(void) 33asmlinkage void plat_irq_dispatch(void)
34{ 34{
35 unsigned int pending = read_c0_status() & read_c0_cause(); 35 unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
36 36
37 if (pending & STATUSF_IP7) 37 if (pending & STATUSF_IP7)
38 do_IRQ(WRPPMC_MIPS_TIMER_IRQ); /* CPU Compare/Count internal timer */ 38 do_IRQ(WRPPMC_MIPS_TIMER_IRQ); /* CPU Compare/Count internal timer */
diff --git a/arch/mips/gt64120/wrppmc/pci.c b/arch/mips/gt64120/wrppmc/pci.c
index 2fbe93467f78..0d5289bc1804 100644
--- a/arch/mips/gt64120/wrppmc/pci.c
+++ b/arch/mips/gt64120/wrppmc/pci.c
@@ -13,7 +13,7 @@
13#include <linux/kernel.h> 13#include <linux/kernel.h>
14#include <asm/gt64120.h> 14#include <asm/gt64120.h>
15 15
16extern struct pci_ops gt64120_pci_ops; 16extern struct pci_ops gt64xxx_pci0_ops;
17 17
18static struct resource pci0_io_resource = { 18static struct resource pci0_io_resource = {
19 .name = "pci_0 io", 19 .name = "pci_0 io",
@@ -30,7 +30,7 @@ static struct resource pci0_mem_resource = {
30}; 30};
31 31
32static struct pci_controller hose_0 = { 32static struct pci_controller hose_0 = {
33 .pci_ops = &gt64120_pci_ops, 33 .pci_ops = &gt64xxx_pci0_ops,
34 .io_resource = &pci0_io_resource, 34 .io_resource = &pci0_io_resource,
35 .mem_resource = &pci0_mem_resource, 35 .mem_resource = &pci0_mem_resource,
36}; 36};
diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile
index 02bd39add891..dd9d99bfcf7a 100644
--- a/arch/mips/jazz/Makefile
+++ b/arch/mips/jazz/Makefile
@@ -3,5 +3,3 @@
3# 3#
4 4
5obj-y := irq.o jazzdma.o reset.o setup.o 5obj-y := irq.o jazzdma.o reset.o setup.o
6
7EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index 295892e4ce53..015cf4bb51dd 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -122,7 +122,7 @@ static void ll_local_dev(void)
122 122
123asmlinkage void plat_irq_dispatch(void) 123asmlinkage void plat_irq_dispatch(void)
124{ 124{
125 unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM; 125 unsigned int pending = read_c0_cause() & read_c0_status();
126 126
127 if (pending & IE_IRQ5) 127 if (pending & IE_IRQ5)
128 write_c0_compare(0); 128 write_c0_compare(0);
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c
index 46e421e14348..e8e0ffb9354d 100644
--- a/arch/mips/jazz/jazzdma.c
+++ b/arch/mips/jazz/jazzdma.c
@@ -67,7 +67,8 @@ void __init vdma_init(void)
67 * aligned and should be uncached to avoid cache flushing after every 67 * aligned and should be uncached to avoid cache flushing after every
68 * update. 68 * update.
69 */ 69 */
70 vdma_pagetable_start = alloc_bootmem_low_pages(VDMA_PGTBL_SIZE); 70 vdma_pagetable_start =
71 (unsigned long) alloc_bootmem_low_pages(VDMA_PGTBL_SIZE);
71 if (!vdma_pagetable_start) 72 if (!vdma_pagetable_start)
72 BUG(); 73 BUG();
73 dma_cache_wback_inv(vdma_pagetable_start, VDMA_PGTBL_SIZE); 74 dma_cache_wback_inv(vdma_pagetable_start, VDMA_PGTBL_SIZE);
diff --git a/arch/mips/jmr3927/common/Makefile b/arch/mips/jmr3927/common/Makefile
index cb09a8eede15..01e7db19bcbe 100644
--- a/arch/mips/jmr3927/common/Makefile
+++ b/arch/mips/jmr3927/common/Makefile
@@ -2,4 +2,4 @@
2# Makefile for the common code of TOSHIBA JMR-TX3927 board 2# Makefile for the common code of TOSHIBA JMR-TX3927 board
3# 3#
4 4
5obj-y += prom.o puts.o rtc_ds1742.o 5obj-y += prom.o puts.o
diff --git a/arch/mips/jmr3927/common/prom.c b/arch/mips/jmr3927/common/prom.c
index aa481b774c42..5398813e50e6 100644
--- a/arch/mips/jmr3927/common/prom.c
+++ b/arch/mips/jmr3927/common/prom.c
@@ -41,16 +41,6 @@
41 41
42#include <asm/bootinfo.h> 42#include <asm/bootinfo.h>
43 43
44extern int prom_argc;
45extern char **prom_argv, **prom_envp;
46
47typedef struct
48{
49 char *name;
50/* char *val; */
51}t_env_var;
52
53
54char * __init prom_getcmdline(void) 44char * __init prom_getcmdline(void)
55{ 45{
56 return &(arcs_cmdline[0]); 46 return &(arcs_cmdline[0]);
@@ -60,6 +50,8 @@ void __init prom_init_cmdline(void)
60{ 50{
61 char *cp; 51 char *cp;
62 int actr; 52 int actr;
53 int prom_argc = fw_arg0;
54 char **prom_argv = (char **) fw_arg1;
63 55
64 actr = 1; /* Always ignore argv[0] */ 56 actr = 1; /* Always ignore argv[0] */
65 57
diff --git a/arch/mips/jmr3927/common/puts.c b/arch/mips/jmr3927/common/puts.c
index 1c1cad9cd078..c611ab497888 100644
--- a/arch/mips/jmr3927/common/puts.c
+++ b/arch/mips/jmr3927/common/puts.c
@@ -32,137 +32,29 @@
32 * 675 Mass Ave, Cambridge, MA 02139, USA. 32 * 675 Mass Ave, Cambridge, MA 02139, USA.
33 */ 33 */
34 34
35#include <linux/types.h>
36#include <asm/jmr3927/txx927.h>
37#include <asm/jmr3927/tx3927.h> 35#include <asm/jmr3927/tx3927.h>
38#include <asm/jmr3927/jmr3927.h>
39 36
40#define TIMEOUT 0xffffff 37#define TIMEOUT 0xffffff
41#define SLOW_DOWN
42
43static const char digits[16] = "0123456789abcdef";
44
45#ifdef SLOW_DOWN
46#define slow_down() { int k; for (k=0; k<10000; k++); }
47#else
48#define slow_down()
49#endif
50 38
51void 39void
52putch(const unsigned char c) 40prom_putchar(char c)
53{ 41{
54 int i = 0; 42 int i = 0;
55 43
56 do { 44 do {
57 slow_down();
58 i++; 45 i++;
59 if (i>TIMEOUT) { 46 if (i>TIMEOUT)
60 break; 47 break;
61 }
62 } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS)); 48 } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
63 tx3927_sioptr(1)->tfifo = c; 49 tx3927_sioptr(1)->tfifo = c;
64 return; 50 return;
65} 51}
66 52
67unsigned char getch(void)
68{
69 int i = 0;
70 int dicr;
71 char c;
72
73 /* diable RX int. */
74 dicr = tx3927_sioptr(1)->dicr;
75 tx3927_sioptr(1)->dicr = 0;
76
77 do {
78 slow_down();
79 i++;
80 if (i>TIMEOUT) {
81 break;
82 }
83 } while (tx3927_sioptr(1)->disr & TXx927_SIDISR_UVALID)
84 ;
85 c = tx3927_sioptr(1)->rfifo;
86
87 /* clear RX int. status */
88 tx3927_sioptr(1)->disr &= ~TXx927_SIDISR_RDIS;
89 /* enable RX int. */
90 tx3927_sioptr(1)->dicr = dicr;
91
92 return c;
93}
94void
95do_jmr3927_led_set(char n)
96{
97 /* and with current leds */
98 jmr3927_led_and_set(n);
99}
100
101void 53void
102puts(unsigned char *cp) 54puts(const char *cp)
103{ 55{
104 int i = 0; 56 while (*cp)
105 57 prom_putchar(*cp++);
106 while (*cp) { 58 prom_putchar('\r');
107 do { 59 prom_putchar('\n');
108 slow_down();
109 i++;
110 if (i>TIMEOUT) {
111 break;
112 }
113 } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
114 tx3927_sioptr(1)->tfifo = *cp++;
115 }
116 putch('\r');
117 putch('\n');
118}
119
120void
121fputs(unsigned char *cp)
122{
123 int i = 0;
124
125 while (*cp) {
126 do {
127 slow_down();
128 i++;
129 if (i>TIMEOUT) {
130 break;
131 }
132 } while (!(tx3927_sioptr(1)->cisr & TXx927_SICISR_TXALS));
133 tx3927_sioptr(1)->tfifo = *cp++;
134 }
135}
136
137
138void
139put64(uint64_t ul)
140{
141 int cnt;
142 unsigned ch;
143
144 cnt = 16; /* 16 nibbles in a 64 bit long */
145 putch('0');
146 putch('x');
147 do {
148 cnt--;
149 ch = (unsigned char)(ul >> cnt * 4) & 0x0F;
150 putch(digits[ch]);
151 } while (cnt > 0);
152}
153
154void
155put32(unsigned u)
156{
157 int cnt;
158 unsigned ch;
159
160 cnt = 8; /* 8 nibbles in a 32 bit long */
161 putch('0');
162 putch('x');
163 do {
164 cnt--;
165 ch = (unsigned char)(u >> cnt * 4) & 0x0F;
166 putch(digits[ch]);
167 } while (cnt > 0);
168} 60}
diff --git a/arch/mips/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c
deleted file mode 100644
index e6561345d12a..000000000000
--- a/arch/mips/jmr3927/common/rtc_ds1742.c
+++ /dev/null
@@ -1,171 +0,0 @@
1/*
2 * Copyright 2001 MontaVista Software Inc.
3 * Author: MontaVista Software, Inc.
4 * ahennessy@mvista.com
5 *
6 * arch/mips/jmr3927/common/rtc_ds1742.c
7 * Based on arch/mips/ddb5xxx/common/rtc_ds1386.c
8 * low-level RTC hookups for s for Dallas 1742 chip.
9 *
10 * Copyright (C) 2000-2001 Toshiba Corporation
11 *
12 * This program is free software; you can redistribute it and/or modify it
13 * under the terms of the GNU General Public License as published by the
14 * Free Software Foundation; either version 2 of the License, or (at your
15 * option) any later version.
16 *
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
20 * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
23 * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
24 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * You should have received a copy of the GNU General Public License along
29 * with this program; if not, write to the Free Software Foundation, Inc.,
30 * 675 Mass Ave, Cambridge, MA 02139, USA.
31 */
32
33
34/*
35 * This file exports a function, rtc_ds1386_init(), which expects an
36 * uncached base address as the argument. It will set the two function
37 * pointers expected by the MIPS generic timer code.
38 */
39
40#include <linux/bcd.h>
41#include <linux/types.h>
42#include <linux/time.h>
43#include <linux/rtc.h>
44#include <linux/ds1742rtc.h>
45
46#include <asm/time.h>
47#include <asm/addrspace.h>
48
49#include <asm/debug.h>
50
51#define EPOCH 2000
52
53static unsigned long rtc_base;
54
55static unsigned long
56rtc_ds1742_get_time(void)
57{
58 unsigned int year, month, day, hour, minute, second;
59 unsigned int century;
60 unsigned long flags;
61
62 spin_lock_irqsave(&rtc_lock, flags);
63 rtc_write(RTC_READ, RTC_CONTROL);
64 second = BCD2BIN(rtc_read(RTC_SECONDS) & RTC_SECONDS_MASK);
65 minute = BCD2BIN(rtc_read(RTC_MINUTES));
66 hour = BCD2BIN(rtc_read(RTC_HOURS));
67 day = BCD2BIN(rtc_read(RTC_DATE));
68 month = BCD2BIN(rtc_read(RTC_MONTH));
69 year = BCD2BIN(rtc_read(RTC_YEAR));
70 century = BCD2BIN(rtc_read(RTC_CENTURY) & RTC_CENTURY_MASK);
71 rtc_write(0, RTC_CONTROL);
72 spin_unlock_irqrestore(&rtc_lock, flags);
73
74 year += century * 100;
75
76 return mktime(year, month, day, hour, minute, second);
77}
78extern void to_tm(unsigned long tim, struct rtc_time * tm);
79
80static int
81rtc_ds1742_set_time(unsigned long t)
82{
83 struct rtc_time tm;
84 u8 year, month, day, hour, minute, second;
85 u8 cmos_year, cmos_month, cmos_day, cmos_hour, cmos_minute, cmos_second;
86 int cmos_century;
87 unsigned long flags;
88
89 spin_lock_irqsave(&rtc_lock, flags);
90 rtc_write(RTC_READ, RTC_CONTROL);
91 cmos_second = (u8)(rtc_read(RTC_SECONDS) & RTC_SECONDS_MASK);
92 cmos_minute = (u8)rtc_read(RTC_MINUTES);
93 cmos_hour = (u8)rtc_read(RTC_HOURS);
94 cmos_day = (u8)rtc_read(RTC_DATE);
95 cmos_month = (u8)rtc_read(RTC_MONTH);
96 cmos_year = (u8)rtc_read(RTC_YEAR);
97 cmos_century = rtc_read(RTC_CENTURY) & RTC_CENTURY_MASK;
98
99 rtc_write(RTC_WRITE, RTC_CONTROL);
100
101 /* convert */
102 to_tm(t, &tm);
103
104 /* check each field one by one */
105 year = BIN2BCD(tm.tm_year - EPOCH);
106 if (year != cmos_year) {
107 rtc_write(year,RTC_YEAR);
108 }
109
110 month = BIN2BCD(tm.tm_mon);
111 if (month != (cmos_month & 0x1f)) {
112 rtc_write((month & 0x1f) | (cmos_month & ~0x1f),RTC_MONTH);
113 }
114
115 day = BIN2BCD(tm.tm_mday);
116 if (day != cmos_day) {
117
118 rtc_write(day, RTC_DATE);
119 }
120
121 if (cmos_hour & 0x40) {
122 /* 12 hour format */
123 hour = 0x40;
124 if (tm.tm_hour > 12) {
125 hour |= 0x20 | (BIN2BCD(hour-12) & 0x1f);
126 } else {
127 hour |= BIN2BCD(tm.tm_hour);
128 }
129 } else {
130 /* 24 hour format */
131 hour = BIN2BCD(tm.tm_hour) & 0x3f;
132 }
133 if (hour != cmos_hour) rtc_write(hour, RTC_HOURS);
134
135 minute = BIN2BCD(tm.tm_min);
136 if (minute != cmos_minute) {
137 rtc_write(minute, RTC_MINUTES);
138 }
139
140 second = BIN2BCD(tm.tm_sec);
141 if (second != cmos_second) {
142 rtc_write(second & RTC_SECONDS_MASK,RTC_SECONDS);
143 }
144
145 /* RTC_CENTURY and RTC_CONTROL share same address... */
146 rtc_write(cmos_century, RTC_CONTROL);
147 spin_unlock_irqrestore(&rtc_lock, flags);
148
149 return 0;
150}
151
152void
153rtc_ds1742_init(unsigned long base)
154{
155 u8 cmos_second;
156
157 /* remember the base */
158 rtc_base = base;
159 db_assert((rtc_base & 0xe0000000) == KSEG1);
160
161 /* set the function pointers */
162 rtc_mips_get_time = rtc_ds1742_get_time;
163 rtc_mips_set_time = rtc_ds1742_set_time;
164
165 /* clear oscillator stop bit */
166 rtc_write(RTC_READ, RTC_CONTROL);
167 cmos_second = (u8)(rtc_read(RTC_SECONDS) & RTC_SECONDS_MASK);
168 rtc_write(RTC_WRITE, RTC_CONTROL);
169 rtc_write(cmos_second, RTC_SECONDS); /* clear msb */
170 rtc_write(0, RTC_CONTROL);
171}
diff --git a/arch/mips/jmr3927/rbhma3100/Makefile b/arch/mips/jmr3927/rbhma3100/Makefile
index baf5077813c1..8d00ba460cef 100644
--- a/arch/mips/jmr3927/rbhma3100/Makefile
+++ b/arch/mips/jmr3927/rbhma3100/Makefile
@@ -3,7 +3,4 @@
3# 3#
4 4
5obj-y += init.o irq.o setup.o 5obj-y += init.o irq.o setup.o
6obj-$(CONFIG_RUNTIME_DEBUG) += debug.o
7obj-$(CONFIG_KGDB) += kgdb_io.o 6obj-$(CONFIG_KGDB) += kgdb_io.o
8
9EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/jmr3927/rbhma3100/init.c
index a55cb4572ded..9169fab1773a 100644
--- a/arch/mips/jmr3927/rbhma3100/init.c
+++ b/arch/mips/jmr3927/rbhma3100/init.c
@@ -28,20 +28,10 @@
28 * 675 Mass Ave, Cambridge, MA 02139, USA. 28 * 675 Mass Ave, Cambridge, MA 02139, USA.
29 */ 29 */
30#include <linux/init.h> 30#include <linux/init.h>
31#include <linux/mm.h>
32#include <linux/sched.h>
33#include <linux/bootmem.h>
34
35#include <asm/addrspace.h>
36#include <asm/bootinfo.h> 31#include <asm/bootinfo.h>
37#include <asm/mipsregs.h>
38#include <asm/jmr3927/jmr3927.h> 32#include <asm/jmr3927/jmr3927.h>
39 33
40int prom_argc;
41char **prom_argv, **prom_envp;
42extern void __init prom_init_cmdline(void); 34extern void __init prom_init_cmdline(void);
43extern char *prom_getenv(char *envname);
44unsigned long mips_nofpu = 0;
45 35
46const char *get_system_type(void) 36const char *get_system_type(void)
47{ 37{
@@ -52,7 +42,7 @@ const char *get_system_type(void)
52 ; 42 ;
53} 43}
54 44
55extern void puts(unsigned char *cp); 45extern void puts(const char *cp);
56 46
57void __init prom_init(void) 47void __init prom_init(void)
58{ 48{
@@ -61,10 +51,6 @@ void __init prom_init(void)
61 if ((tx3927_ccfgptr->ccfg & TX3927_CCFG_TLBOFF) == 0) 51 if ((tx3927_ccfgptr->ccfg & TX3927_CCFG_TLBOFF) == 0)
62 puts("Warning: TX3927 TLB off\n"); 52 puts("Warning: TX3927 TLB off\n");
63#endif 53#endif
64 prom_argc = fw_arg0;
65 prom_argv = (char **) fw_arg1;
66 prom_envp = (char **) fw_arg2;
67
68 mips_machgroup = MACH_GROUP_TOSHIBA; 54 mips_machgroup = MACH_GROUP_TOSHIBA;
69 55
70#ifdef CONFIG_TOSHIBA_JMR3927 56#ifdef CONFIG_TOSHIBA_JMR3927
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index 7d2c203cb406..1187b44a3dd4 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -30,53 +30,21 @@
30 * 675 Mass Ave, Cambridge, MA 02139, USA. 30 * 675 Mass Ave, Cambridge, MA 02139, USA.
31 */ 31 */
32#include <linux/init.h> 32#include <linux/init.h>
33
34#include <linux/errno.h>
35#include <linux/irq.h>
36#include <linux/kernel_stat.h>
37#include <linux/signal.h>
38#include <linux/sched.h> 33#include <linux/sched.h>
39#include <linux/types.h> 34#include <linux/types.h>
40#include <linux/interrupt.h> 35#include <linux/interrupt.h>
41#include <linux/ioport.h>
42#include <linux/timex.h>
43#include <linux/slab.h>
44#include <linux/random.h>
45#include <linux/smp.h>
46#include <linux/smp_lock.h>
47#include <linux/bitops.h>
48 36
49#include <asm/irq_regs.h>
50#include <asm/io.h> 37#include <asm/io.h>
51#include <asm/mipsregs.h> 38#include <asm/mipsregs.h>
52#include <asm/system.h> 39#include <asm/system.h>
53 40
54#include <asm/ptrace.h>
55#include <asm/processor.h> 41#include <asm/processor.h>
56#include <asm/jmr3927/irq.h>
57#include <asm/debug.h>
58#include <asm/jmr3927/jmr3927.h> 42#include <asm/jmr3927/jmr3927.h>
59 43
60#if JMR3927_IRQ_END > NR_IRQS 44#if JMR3927_IRQ_END > NR_IRQS
61#error JMR3927_IRQ_END > NR_IRQS 45#error JMR3927_IRQ_END > NR_IRQS
62#endif 46#endif
63 47
64struct tb_irq_space* tb_irq_spaces;
65
66static int jmr3927_irq_base = -1;
67
68#ifdef CONFIG_PCI
69static int jmr3927_gen_iack(void)
70{
71 /* generate ACK cycle */
72#ifdef __BIG_ENDIAN
73 return (tx3927_pcicptr->iiadp >> 24) & 0xff;
74#else
75 return tx3927_pcicptr->iiadp & 0xff;
76#endif
77}
78#endif
79
80#define irc_dlevel 0 48#define irc_dlevel 0
81#define irc_elevel 1 49#define irc_elevel 1
82 50
@@ -87,89 +55,24 @@ static unsigned char irc_level[TX3927_NUM_IR] = {
87 6, 6, 6 /* TMR */ 55 6, 6, 6 /* TMR */
88}; 56};
89 57
90static void jmr3927_irq_disable(unsigned int irq_nr);
91static void jmr3927_irq_enable(unsigned int irq_nr);
92
93static void jmr3927_irq_ack(unsigned int irq)
94{
95 if (irq == JMR3927_IRQ_IRC_TMR0)
96 jmr3927_tmrptr->tisr = 0; /* ack interrupt */
97
98 jmr3927_irq_disable(irq);
99}
100
101static void jmr3927_irq_end(unsigned int irq)
102{
103 if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
104 jmr3927_irq_enable(irq);
105}
106
107static void jmr3927_irq_disable(unsigned int irq_nr)
108{
109 struct tb_irq_space* sp;
110
111 for (sp = tb_irq_spaces; sp; sp = sp->next) {
112 if (sp->start_irqno <= irq_nr &&
113 irq_nr < sp->start_irqno + sp->nr_irqs) {
114 if (sp->mask_func)
115 sp->mask_func(irq_nr - sp->start_irqno,
116 sp->space_id);
117 break;
118 }
119 }
120}
121
122static void jmr3927_irq_enable(unsigned int irq_nr)
123{
124 struct tb_irq_space* sp;
125
126 for (sp = tb_irq_spaces; sp; sp = sp->next) {
127 if (sp->start_irqno <= irq_nr &&
128 irq_nr < sp->start_irqno + sp->nr_irqs) {
129 if (sp->unmask_func)
130 sp->unmask_func(irq_nr - sp->start_irqno,
131 sp->space_id);
132 break;
133 }
134 }
135}
136
137/* 58/*
138 * CP0_STATUS is a thread's resource (saved/restored on context switch). 59 * CP0_STATUS is a thread's resource (saved/restored on context switch).
139 * So disable_irq/enable_irq MUST handle IOC/ISAC/IRC registers. 60 * So disable_irq/enable_irq MUST handle IOC/IRC registers.
140 */ 61 */
141static void mask_irq_isac(int irq_nr, int space_id) 62static void mask_irq_ioc(unsigned int irq)
142{
143 /* 0: mask */
144 unsigned char imask =
145 jmr3927_isac_reg_in(JMR3927_ISAC_INTM_ADDR);
146 unsigned int bit = 1 << irq_nr;
147 jmr3927_isac_reg_out(imask & ~bit, JMR3927_ISAC_INTM_ADDR);
148 /* flush write buffer */
149 (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
150}
151static void unmask_irq_isac(int irq_nr, int space_id)
152{
153 /* 0: mask */
154 unsigned char imask = jmr3927_isac_reg_in(JMR3927_ISAC_INTM_ADDR);
155 unsigned int bit = 1 << irq_nr;
156 jmr3927_isac_reg_out(imask | bit, JMR3927_ISAC_INTM_ADDR);
157 /* flush write buffer */
158 (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
159}
160
161static void mask_irq_ioc(int irq_nr, int space_id)
162{ 63{
163 /* 0: mask */ 64 /* 0: mask */
65 unsigned int irq_nr = irq - JMR3927_IRQ_IOC;
164 unsigned char imask = jmr3927_ioc_reg_in(JMR3927_IOC_INTM_ADDR); 66 unsigned char imask = jmr3927_ioc_reg_in(JMR3927_IOC_INTM_ADDR);
165 unsigned int bit = 1 << irq_nr; 67 unsigned int bit = 1 << irq_nr;
166 jmr3927_ioc_reg_out(imask & ~bit, JMR3927_IOC_INTM_ADDR); 68 jmr3927_ioc_reg_out(imask & ~bit, JMR3927_IOC_INTM_ADDR);
167 /* flush write buffer */ 69 /* flush write buffer */
168 (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR); 70 (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
169} 71}
170static void unmask_irq_ioc(int irq_nr, int space_id) 72static void unmask_irq_ioc(unsigned int irq)
171{ 73{
172 /* 0: mask */ 74 /* 0: mask */
75 unsigned int irq_nr = irq - JMR3927_IRQ_IOC;
173 unsigned char imask = jmr3927_ioc_reg_in(JMR3927_IOC_INTM_ADDR); 76 unsigned char imask = jmr3927_ioc_reg_in(JMR3927_IOC_INTM_ADDR);
174 unsigned int bit = 1 << irq_nr; 77 unsigned int bit = 1 << irq_nr;
175 jmr3927_ioc_reg_out(imask | bit, JMR3927_IOC_INTM_ADDR); 78 jmr3927_ioc_reg_out(imask | bit, JMR3927_IOC_INTM_ADDR);
@@ -177,8 +80,9 @@ static void unmask_irq_ioc(int irq_nr, int space_id)
177 (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR); 80 (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
178} 81}
179 82
180static void mask_irq_irc(int irq_nr, int space_id) 83static void mask_irq_irc(unsigned int irq)
181{ 84{
85 unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
182 volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; 86 volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
183 if (irq_nr & 1) 87 if (irq_nr & 1)
184 *ilrp = (*ilrp & 0x00ff) | (irc_dlevel << 8); 88 *ilrp = (*ilrp & 0x00ff) | (irc_dlevel << 8);
@@ -191,8 +95,9 @@ static void mask_irq_irc(int irq_nr, int space_id)
191 (void)tx3927_ircptr->ssr; 95 (void)tx3927_ircptr->ssr;
192} 96}
193 97
194static void unmask_irq_irc(int irq_nr, int space_id) 98static void unmask_irq_irc(unsigned int irq)
195{ 99{
100 unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
196 volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; 101 volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
197 if (irq_nr & 1) 102 if (irq_nr & 1)
198 *ilrp = (*ilrp & 0x00ff) | (irc_level[irq_nr] << 8); 103 *ilrp = (*ilrp & 0x00ff) | (irc_level[irq_nr] << 8);
@@ -203,98 +108,14 @@ static void unmask_irq_irc(int irq_nr, int space_id)
203 tx3927_ircptr->imr = irc_elevel; 108 tx3927_ircptr->imr = irc_elevel;
204} 109}
205 110
206struct tb_irq_space jmr3927_isac_irqspace = {
207 .next = NULL,
208 .start_irqno = JMR3927_IRQ_ISAC,
209 nr_irqs : JMR3927_NR_IRQ_ISAC,
210 .mask_func = mask_irq_isac,
211 .unmask_func = unmask_irq_isac,
212 .name = "ISAC",
213 .space_id = 0,
214 can_share : 0
215};
216struct tb_irq_space jmr3927_ioc_irqspace = {
217 .next = NULL,
218 .start_irqno = JMR3927_IRQ_IOC,
219 nr_irqs : JMR3927_NR_IRQ_IOC,
220 .mask_func = mask_irq_ioc,
221 .unmask_func = unmask_irq_ioc,
222 .name = "IOC",
223 .space_id = 0,
224 can_share : 1
225};
226
227struct tb_irq_space jmr3927_irc_irqspace = {
228 .next = NULL,
229 .start_irqno = JMR3927_IRQ_IRC,
230 .nr_irqs = JMR3927_NR_IRQ_IRC,
231 .mask_func = mask_irq_irc,
232 .unmask_func = unmask_irq_irc,
233 .name = "on-chip",
234 .space_id = 0,
235 .can_share = 0
236};
237
238
239#ifdef CONFIG_TX_BRANCH_LIKELY_BUG_WORKAROUND
240static int tx_branch_likely_bug_count = 0;
241static int have_tx_branch_likely_bug = 0;
242
243static void tx_branch_likely_bug_fixup(void)
244{
245 struct pt_regs *regs = get_irq_regs();
246
247 /* TX39/49-BUG: Under this condition, the insn in delay slot
248 of the branch likely insn is executed (not nullified) even
249 the branch condition is false. */
250 if (!have_tx_branch_likely_bug)
251 return;
252 if ((regs->cp0_epc & 0xfff) == 0xffc &&
253 KSEGX(regs->cp0_epc) != KSEG0 &&
254 KSEGX(regs->cp0_epc) != KSEG1) {
255 unsigned int insn = *(unsigned int*)(regs->cp0_epc - 4);
256 /* beql,bnel,blezl,bgtzl */
257 /* bltzl,bgezl,blezall,bgezall */
258 /* bczfl, bcztl */
259 if ((insn & 0xf0000000) == 0x50000000 ||
260 (insn & 0xfc0e0000) == 0x04020000 ||
261 (insn & 0xf3fe0000) == 0x41020000) {
262 regs->cp0_epc -= 4;
263 tx_branch_likely_bug_count++;
264 printk(KERN_INFO
265 "fix branch-likery bug in %s (insn %08x)\n",
266 current->comm, insn);
267 }
268 }
269}
270#endif
271
272static void jmr3927_spurious(void)
273{
274 struct pt_regs * regs = get_irq_regs();
275
276#ifdef CONFIG_TX_BRANCH_LIKELY_BUG_WORKAROUND
277 tx_branch_likely_bug_fixup();
278#endif
279 printk(KERN_WARNING "spurious interrupt (cause 0x%lx, pc 0x%lx, ra 0x%lx).\n",
280 regs->cp0_cause, regs->cp0_epc, regs->regs[31]);
281}
282
283asmlinkage void plat_irq_dispatch(void) 111asmlinkage void plat_irq_dispatch(void)
284{ 112{
285 struct pt_regs * regs = get_irq_regs(); 113 unsigned long cp0_cause = read_c0_cause();
286 int irq; 114 int irq;
287 115
288#ifdef CONFIG_TX_BRANCH_LIKELY_BUG_WORKAROUND 116 if ((cp0_cause & CAUSEF_IP7) == 0)
289 tx_branch_likely_bug_fixup();
290#endif
291 if ((regs->cp0_cause & CAUSEF_IP7) == 0) {
292#if 0
293 jmr3927_spurious();
294#endif
295 return; 117 return;
296 } 118 irq = (cp0_cause >> CAUSEB_IP2) & 0x0f;
297 irq = (regs->cp0_cause >> CAUSEB_IP2) & 0x0f;
298 119
299 do_IRQ(irq + JMR3927_IRQ_IRC); 120 do_IRQ(irq + JMR3927_IRQ_IRC);
300} 121}
@@ -317,35 +138,6 @@ static struct irqaction ioc_action = {
317 jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL, 138 jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL,
318}; 139};
319 140
320static irqreturn_t jmr3927_isac_interrupt(int irq, void *dev_id)
321{
322 unsigned char istat = jmr3927_isac_reg_in(JMR3927_ISAC_INTS2_ADDR);
323 int i;
324
325 for (i = 0; i < JMR3927_NR_IRQ_ISAC; i++) {
326 if (istat & (1 << i)) {
327 irq = JMR3927_IRQ_ISAC + i;
328 do_IRQ(irq);
329 }
330 }
331 return IRQ_HANDLED;
332}
333
334static struct irqaction isac_action = {
335 jmr3927_isac_interrupt, 0, CPU_MASK_NONE, "ISAC", NULL, NULL,
336};
337
338
339static irqreturn_t jmr3927_isaerr_interrupt(int irq, void *dev_id)
340{
341 printk(KERN_WARNING "ISA error interrupt (irq 0x%x).\n", irq);
342
343 return IRQ_HANDLED;
344}
345static struct irqaction isaerr_action = {
346 jmr3927_isaerr_interrupt, 0, CPU_MASK_NONE, "ISA error", NULL, NULL,
347};
348
349static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id) 141static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id)
350{ 142{
351 printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq); 143 printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq);
@@ -358,54 +150,19 @@ static struct irqaction pcierr_action = {
358 jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL, 150 jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL,
359}; 151};
360 152
361int jmr3927_ether1_irq = 0; 153static void __init jmr3927_irq_init(void);
362
363void jmr3927_irq_init(u32 irq_base);
364 154
365void __init arch_init_irq(void) 155void __init arch_init_irq(void)
366{ 156{
367 /* look for io board's presence */
368 int have_isac = jmr3927_have_isac();
369
370 /* Now, interrupt control disabled, */ 157 /* Now, interrupt control disabled, */
371 /* all IRC interrupts are masked, */ 158 /* all IRC interrupts are masked, */
372 /* all IRC interrupt mode are Low Active. */ 159 /* all IRC interrupt mode are Low Active. */
373 160
374 if (have_isac) {
375
376 /* ETHER1 (NE2000 compatible 10M-Ether) parameter setup */
377 /* temporary enable interrupt control */
378 tx3927_ircptr->cer = 1;
379 /* ETHER1 Int. Is High-Active. */
380 if (tx3927_ircptr->ssr & (1 << 0))
381 jmr3927_ether1_irq = JMR3927_IRQ_IRC_INT0;
382#if 0 /* INT3 may be asserted by ether0 (even after reboot...) */
383 else if (tx3927_ircptr->ssr & (1 << 3))
384 jmr3927_ether1_irq = JMR3927_IRQ_IRC_INT3;
385#endif
386 /* disable interrupt control */
387 tx3927_ircptr->cer = 0;
388
389 /* Ether1: High Active */
390 if (jmr3927_ether1_irq) {
391 int ether1_irc = jmr3927_ether1_irq - JMR3927_IRQ_IRC;
392 tx3927_ircptr->cr[ether1_irc / 8] |=
393 TX3927_IRCR_HIGH << ((ether1_irc % 8) * 2);
394 }
395 }
396
397 /* mask all IOC interrupts */ 161 /* mask all IOC interrupts */
398 jmr3927_ioc_reg_out(0, JMR3927_IOC_INTM_ADDR); 162 jmr3927_ioc_reg_out(0, JMR3927_IOC_INTM_ADDR);
399 /* setup IOC interrupt mode (SOFT:High Active, Others:Low Active) */ 163 /* setup IOC interrupt mode (SOFT:High Active, Others:Low Active) */
400 jmr3927_ioc_reg_out(JMR3927_IOC_INTF_SOFT, JMR3927_IOC_INTP_ADDR); 164 jmr3927_ioc_reg_out(JMR3927_IOC_INTF_SOFT, JMR3927_IOC_INTP_ADDR);
401 165
402 if (have_isac) {
403 /* mask all ISAC interrupts */
404 jmr3927_isac_reg_out(0, JMR3927_ISAC_INTM_ADDR);
405 /* setup ISAC interrupt mode (ISAIRQ3,ISAIRQ5:Low Active ???) */
406 jmr3927_isac_reg_out(JMR3927_ISAC_INTF_IRQ3|JMR3927_ISAC_INTF_IRQ5, JMR3927_ISAC_INTP_ADDR);
407 }
408
409 /* clear PCI Soft interrupts */ 166 /* clear PCI Soft interrupts */
410 jmr3927_ioc_reg_out(0, JMR3927_IOC_INTS1_ADDR); 167 jmr3927_ioc_reg_out(0, JMR3927_IOC_INTS1_ADDR);
411 /* clear PCI Reset interrupts */ 168 /* clear PCI Reset interrupts */
@@ -415,21 +172,11 @@ void __init arch_init_irq(void)
415 tx3927_ircptr->cer = TX3927_IRCER_ICE; 172 tx3927_ircptr->cer = TX3927_IRCER_ICE;
416 tx3927_ircptr->imr = irc_elevel; 173 tx3927_ircptr->imr = irc_elevel;
417 174
418 jmr3927_irq_init(NR_ISA_IRQS); 175 jmr3927_irq_init();
419
420 /* setup irq space */
421 add_tb_irq_space(&jmr3927_isac_irqspace);
422 add_tb_irq_space(&jmr3927_ioc_irqspace);
423 add_tb_irq_space(&jmr3927_irc_irqspace);
424 176
425 /* setup IOC interrupt 1 (PCI, MODEM) */ 177 /* setup IOC interrupt 1 (PCI, MODEM) */
426 setup_irq(JMR3927_IRQ_IOCINT, &ioc_action); 178 setup_irq(JMR3927_IRQ_IOCINT, &ioc_action);
427 179
428 if (have_isac) {
429 setup_irq(JMR3927_IRQ_ISACINT, &isac_action);
430 setup_irq(JMR3927_IRQ_ISAC_ISAER, &isaerr_action);
431 }
432
433#ifdef CONFIG_PCI 180#ifdef CONFIG_PCI
434 setup_irq(JMR3927_IRQ_IRC_PCI, &pcierr_action); 181 setup_irq(JMR3927_IRQ_IRC_PCI, &pcierr_action);
435#endif 182#endif
@@ -438,21 +185,28 @@ void __init arch_init_irq(void)
438 set_c0_status(ST0_IM); /* IE bit is still 0. */ 185 set_c0_status(ST0_IM); /* IE bit is still 0. */
439} 186}
440 187
441static struct irq_chip jmr3927_irq_controller = { 188static struct irq_chip jmr3927_irq_ioc = {
442 .name = "jmr3927_irq", 189 .name = "jmr3927_ioc",
443 .ack = jmr3927_irq_ack, 190 .ack = mask_irq_ioc,
444 .mask = jmr3927_irq_disable, 191 .mask = mask_irq_ioc,
445 .mask_ack = jmr3927_irq_ack, 192 .mask_ack = mask_irq_ioc,
446 .unmask = jmr3927_irq_enable, 193 .unmask = unmask_irq_ioc,
447 .end = jmr3927_irq_end,
448}; 194};
449 195
450void jmr3927_irq_init(u32 irq_base) 196static struct irq_chip jmr3927_irq_irc = {
197 .name = "jmr3927_irc",
198 .ack = mask_irq_irc,
199 .mask = mask_irq_irc,
200 .mask_ack = mask_irq_irc,
201 .unmask = unmask_irq_irc,
202};
203
204static void __init jmr3927_irq_init(void)
451{ 205{
452 u32 i; 206 u32 i;
453 207
454 for (i= irq_base; i< irq_base + JMR3927_NR_IRQ_IRC + JMR3927_NR_IRQ_IOC; i++) 208 for (i = JMR3927_IRQ_IRC; i < JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC; i++)
455 set_irq_chip(i, &jmr3927_irq_controller); 209 set_irq_chip_and_handler(i, &jmr3927_irq_irc, handle_level_irq);
456 210 for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++)
457 jmr3927_irq_base = irq_base; 211 set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq);
458} 212}
diff --git a/arch/mips/jmr3927/rbhma3100/kgdb_io.c b/arch/mips/jmr3927/rbhma3100/kgdb_io.c
index 269a42deae06..2604f2c9a96e 100644
--- a/arch/mips/jmr3927/rbhma3100/kgdb_io.c
+++ b/arch/mips/jmr3927/rbhma3100/kgdb_io.c
@@ -31,23 +31,12 @@
31 * 675 Mass Ave, Cambridge, MA 02139, USA. 31 * 675 Mass Ave, Cambridge, MA 02139, USA.
32 */ 32 */
33 33
34#include <linux/types.h>
35#include <asm/jmr3927/txx927.h>
36#include <asm/jmr3927/tx3927.h>
37#include <asm/jmr3927/jmr3927.h> 34#include <asm/jmr3927/jmr3927.h>
38 35
39#define TIMEOUT 0xffffff 36#define TIMEOUT 0xffffff
40#define SLOW_DOWN
41
42static const char digits[16] = "0123456789abcdef";
43
44#ifdef SLOW_DOWN
45#define slow_down() { int k; for (k=0; k<10000; k++); }
46#else
47#define slow_down()
48#endif
49 37
50static int remoteDebugInitialized = 0; 38static int remoteDebugInitialized = 0;
39static void debugInit(int baud)
51 40
52int putDebugChar(unsigned char c) 41int putDebugChar(unsigned char c)
53{ 42{
@@ -103,20 +92,8 @@ unsigned char getDebugChar(void)
103 return c; 92 return c;
104} 93}
105 94
106void debugInit(int baud) 95static void debugInit(int baud)
107{ 96{
108 /*
109 volatile unsigned long lcr;
110 volatile unsigned long dicr;
111 volatile unsigned long disr;
112 volatile unsigned long cisr;
113 volatile unsigned long fcr;
114 volatile unsigned long flcr;
115 volatile unsigned long bgr;
116 volatile unsigned long tfifo;
117 volatile unsigned long rfifo;
118 */
119
120 tx3927_sioptr(0)->lcr = 0x020; 97 tx3927_sioptr(0)->lcr = 0x020;
121 tx3927_sioptr(0)->dicr = 0; 98 tx3927_sioptr(0)->dicr = 0;
122 tx3927_sioptr(0)->disr = 0x4100; 99 tx3927_sioptr(0)->disr = 0x4100;
@@ -125,31 +102,4 @@ void debugInit(int baud)
125 tx3927_sioptr(0)->flcr = 0x02; 102 tx3927_sioptr(0)->flcr = 0x02;
126 tx3927_sioptr(0)->bgr = ((JMR3927_BASE_BAUD + baud / 2) / baud) | 103 tx3927_sioptr(0)->bgr = ((JMR3927_BASE_BAUD + baud / 2) / baud) |
127 TXx927_SIBGR_BCLK_T0; 104 TXx927_SIBGR_BCLK_T0;
128#if 0
129 /*
130 * Reset the UART.
131 */
132 tx3927_sioptr(0)->fcr = TXx927_SIFCR_SWRST;
133 while (tx3927_sioptr(0)->fcr & TXx927_SIFCR_SWRST)
134 ;
135
136 /*
137 * and set the speed of the serial port
138 * (currently hardwired to 9600 8N1
139 */
140
141 tx3927_sioptr(0)->lcr = TXx927_SILCR_UMODE_8BIT |
142 TXx927_SILCR_USBL_1BIT |
143 TXx927_SILCR_SCS_IMCLK_BG;
144 tx3927_sioptr(0)->bgr =
145 ((JMR3927_BASE_BAUD + baud / 2) / baud) |
146 TXx927_SIBGR_BCLK_T0;
147
148 /* HW RTS/CTS control */
149 if (ser->flags & ASYNC_HAVE_CTS_LINE)
150 tx3927_sioptr(0)->flcr = TXx927_SIFLCR_RCS | TXx927_SIFLCR_TES |
151 TXx927_SIFLCR_RTSTL_MAX /* 15 */;
152 /* Enable RX/TX */
153 tx3927_sioptr(0)->flcr &= ~(TXx927_SIFLCR_RSDE | TXx927_SIFLCR_TSDE);
154#endif
155} 105}
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c
index 7ca3d6d07b34..d1ef2895d564 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/jmr3927/rbhma3100/setup.c
@@ -45,6 +45,7 @@
45#include <linux/param.h> /* for HZ */ 45#include <linux/param.h> /* for HZ */
46#include <linux/delay.h> 46#include <linux/delay.h>
47#include <linux/pm.h> 47#include <linux/pm.h>
48#include <linux/platform_device.h>
48#ifdef CONFIG_SERIAL_TXX9 49#ifdef CONFIG_SERIAL_TXX9
49#include <linux/tty.h> 50#include <linux/tty.h>
50#include <linux/serial.h> 51#include <linux/serial.h>
@@ -53,94 +54,21 @@
53 54
54#include <asm/addrspace.h> 55#include <asm/addrspace.h>
55#include <asm/time.h> 56#include <asm/time.h>
56#include <asm/bcache.h>
57#include <asm/irq.h>
58#include <asm/reboot.h> 57#include <asm/reboot.h>
59#include <asm/gdb-stub.h>
60#include <asm/jmr3927/jmr3927.h> 58#include <asm/jmr3927/jmr3927.h>
61#include <asm/mipsregs.h> 59#include <asm/mipsregs.h>
62#include <asm/traps.h>
63 60
64extern void puts(unsigned char *cp); 61extern void puts(const char *cp);
65 62
66/* Tick Timer divider */ 63/* Tick Timer divider */
67#define JMR3927_TIMER_CCD 0 /* 1/2 */ 64#define JMR3927_TIMER_CCD 0 /* 1/2 */
68#define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD)) 65#define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD))
69 66
70unsigned char led_state = 0xf;
71
72struct {
73 struct resource ram0;
74 struct resource ram1;
75 struct resource pcimem;
76 struct resource iob;
77 struct resource ioc;
78 struct resource pciio;
79 struct resource jmy1394;
80 struct resource rom1;
81 struct resource rom0;
82 struct resource sio0;
83 struct resource sio1;
84} jmr3927_resources = {
85 {
86 .start = 0,
87 .end = 0x01FFFFFF,
88 .name = "RAM0",
89 .flags = IORESOURCE_MEM
90 }, {
91 .start = 0x02000000,
92 .end = 0x03FFFFFF,
93 .name = "RAM1",
94 .flags = IORESOURCE_MEM
95 }, {
96 .start = 0x08000000,
97 .end = 0x07FFFFFF,
98 .name = "PCIMEM",
99 .flags = IORESOURCE_MEM
100 }, {
101 .start = 0x10000000,
102 .end = 0x13FFFFFF,
103 .name = "IOB"
104 }, {
105 .start = 0x14000000,
106 .end = 0x14FFFFFF,
107 .name = "IOC"
108 }, {
109 .start = 0x15000000,
110 .end = 0x15FFFFFF,
111 .name = "PCIIO"
112 }, {
113 .start = 0x1D000000,
114 .end = 0x1D3FFFFF,
115 .name = "JMY1394"
116 }, {
117 .start = 0x1E000000,
118 .end = 0x1E3FFFFF,
119 .name = "ROM1"
120 }, {
121 .start = 0x1FC00000,
122 .end = 0x1FFFFFFF,
123 .name = "ROM0"
124 }, {
125 .start = 0xFFFEF300,
126 .end = 0xFFFEF3FF,
127 .name = "SIO0"
128 }, {
129 .start = 0xFFFEF400,
130 .end = 0xFFFEF4FF,
131 .name = "SIO1"
132 },
133};
134
135/* don't enable - see errata */ 67/* don't enable - see errata */
136int jmr3927_ccfg_toeon = 0; 68static int jmr3927_ccfg_toeon;
137 69
138static inline void do_reset(void) 70static inline void do_reset(void)
139{ 71{
140#ifdef CONFIG_TC35815
141 extern void tc35815_killall(void);
142 tc35815_killall();
143#endif
144#if 1 /* Resetting PCI bus */ 72#if 1 /* Resetting PCI bus */
145 jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); 73 jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);
146 jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI, JMR3927_IOC_RESET_ADDR); 74 jmr3927_ioc_reg_out(JMR3927_IOC_RESET_PCI, JMR3927_IOC_RESET_ADDR);
@@ -176,19 +104,16 @@ static cycle_t jmr3927_hpt_read(void)
176 return jiffies * (JMR3927_TIMER_CLK / HZ) + jmr3927_tmrptr->trr; 104 return jiffies * (JMR3927_TIMER_CLK / HZ) + jmr3927_tmrptr->trr;
177} 105}
178 106
179#define USE_RTC_DS1742 107static void jmr3927_timer_ack(void)
180#ifdef USE_RTC_DS1742 108{
181extern void rtc_ds1742_init(unsigned long base); 109 jmr3927_tmrptr->tisr = 0; /* ack interrupt */
182#endif 110}
111
183static void __init jmr3927_time_init(void) 112static void __init jmr3927_time_init(void)
184{ 113{
185 clocksource_mips.read = jmr3927_hpt_read; 114 clocksource_mips.read = jmr3927_hpt_read;
115 mips_timer_ack = jmr3927_timer_ack;
186 mips_hpt_frequency = JMR3927_TIMER_CLK; 116 mips_hpt_frequency = JMR3927_TIMER_CLK;
187#ifdef USE_RTC_DS1742
188 if (jmr3927_have_nvram()) {
189 rtc_ds1742_init(JMR3927_IOC_NVRAMB_ADDR);
190 }
191#endif
192} 117}
193 118
194void __init plat_timer_setup(struct irqaction *irq) 119void __init plat_timer_setup(struct irqaction *irq)
@@ -202,9 +127,6 @@ void __init plat_timer_setup(struct irqaction *irq)
202 setup_irq(JMR3927_IRQ_TICK, irq); 127 setup_irq(JMR3927_IRQ_TICK, irq);
203} 128}
204 129
205#define USECS_PER_JIFFY (1000000/HZ)
206
207//#undef DO_WRITE_THROUGH
208#define DO_WRITE_THROUGH 130#define DO_WRITE_THROUGH
209#define DO_ENABLE_CACHE 131#define DO_ENABLE_CACHE
210 132
@@ -236,12 +158,6 @@ void __init plat_mem_setup(void)
236 /* Reboot on panic */ 158 /* Reboot on panic */
237 panic_timeout = 180; 159 panic_timeout = 180;
238 160
239 {
240 unsigned int conf;
241 conf = read_c0_conf();
242 }
243
244#if 1
245 /* cache setup */ 161 /* cache setup */
246 { 162 {
247 unsigned int conf; 163 unsigned int conf;
@@ -268,16 +184,14 @@ void __init plat_mem_setup(void)
268 write_c0_conf(conf); 184 write_c0_conf(conf);
269 write_c0_cache(0); 185 write_c0_cache(0);
270 } 186 }
271#endif
272 187
273 /* initialize board */ 188 /* initialize board */
274 jmr3927_board_init(); 189 jmr3927_board_init();
275 190
276 argptr = prom_getcmdline(); 191 argptr = prom_getcmdline();
277 192
278 if ((argptr = strstr(argptr, "toeon")) != NULL) { 193 if ((argptr = strstr(argptr, "toeon")) != NULL)
279 jmr3927_ccfg_toeon = 1; 194 jmr3927_ccfg_toeon = 1;
280 }
281 argptr = prom_getcmdline(); 195 argptr = prom_getcmdline();
282 if ((argptr = strstr(argptr, "ip=")) == NULL) { 196 if ((argptr = strstr(argptr, "ip=")) == NULL) {
283 argptr = prom_getcmdline(); 197 argptr = prom_getcmdline();
@@ -293,7 +207,7 @@ void __init plat_mem_setup(void)
293 memset(&req, 0, sizeof(req)); 207 memset(&req, 0, sizeof(req));
294 req.line = i; 208 req.line = i;
295 req.iotype = UPIO_MEM; 209 req.iotype = UPIO_MEM;
296 req.membase = (char *)TX3927_SIO_REG(i); 210 req.membase = (unsigned char __iomem *)TX3927_SIO_REG(i);
297 req.mapbase = TX3927_SIO_REG(i); 211 req.mapbase = TX3927_SIO_REG(i);
298 req.irq = i == 0 ? 212 req.irq = i == 0 ?
299 JMR3927_IRQ_IRC_SIO0 : JMR3927_IRQ_IRC_SIO1; 213 JMR3927_IRQ_IRC_SIO0 : JMR3927_IRQ_IRC_SIO1;
@@ -315,65 +229,33 @@ void __init plat_mem_setup(void)
315 229
316static void tx3927_setup(void); 230static void tx3927_setup(void);
317 231
318#ifdef CONFIG_PCI
319unsigned long mips_pci_io_base;
320unsigned long mips_pci_io_size;
321unsigned long mips_pci_mem_base;
322unsigned long mips_pci_mem_size;
323/* for legacy I/O, PCI I/O PCI Bus address must be 0 */
324unsigned long mips_pci_io_pciaddr = 0;
325#endif
326
327static void __init jmr3927_board_init(void) 232static void __init jmr3927_board_init(void)
328{ 233{
329 char *argptr;
330
331#ifdef CONFIG_PCI
332 mips_pci_io_base = JMR3927_PCIIO;
333 mips_pci_io_size = JMR3927_PCIIO_SIZE;
334 mips_pci_mem_base = JMR3927_PCIMEM;
335 mips_pci_mem_size = JMR3927_PCIMEM_SIZE;
336#endif
337
338 tx3927_setup(); 234 tx3927_setup();
339 235
340 if (jmr3927_have_isac()) {
341
342#ifdef CONFIG_FB_E1355
343 argptr = prom_getcmdline();
344 if ((argptr = strstr(argptr, "video=")) == NULL) {
345 argptr = prom_getcmdline();
346 strcat(argptr, " video=e1355fb:crt16h");
347 }
348#endif
349
350#ifdef CONFIG_BLK_DEV_IDE
351 /* overrides PCI-IDE */
352#endif
353 }
354
355 /* SIO0 DTR on */ 236 /* SIO0 DTR on */
356 jmr3927_ioc_reg_out(0, JMR3927_IOC_DTR_ADDR); 237 jmr3927_ioc_reg_out(0, JMR3927_IOC_DTR_ADDR);
357 238
358 jmr3927_led_set(0); 239 jmr3927_led_set(0);
359 240
360
361 if (jmr3927_have_isac())
362 jmr3927_io_led_set(0);
363 printk("JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n", 241 printk("JMR-TX3927 (Rev %d) --- IOC(Rev %d) DIPSW:%d,%d,%d,%d\n",
364 jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) & JMR3927_REV_MASK, 242 jmr3927_ioc_reg_in(JMR3927_IOC_BREV_ADDR) & JMR3927_REV_MASK,
365 jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) & JMR3927_REV_MASK, 243 jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR) & JMR3927_REV_MASK,
366 jmr3927_dipsw1(), jmr3927_dipsw2(), 244 jmr3927_dipsw1(), jmr3927_dipsw2(),
367 jmr3927_dipsw3(), jmr3927_dipsw4()); 245 jmr3927_dipsw3(), jmr3927_dipsw4());
368 if (jmr3927_have_isac())
369 printk("JMI-3927IO2 --- ISAC(Rev %d) DIPSW:%01x\n",
370 jmr3927_isac_reg_in(JMR3927_ISAC_REV_ADDR) & JMR3927_REV_MASK,
371 jmr3927_io_dipsw());
372} 246}
373 247
374void __init tx3927_setup(void) 248static void __init tx3927_setup(void)
375{ 249{
376 int i; 250 int i;
251#ifdef CONFIG_PCI
252 unsigned long mips_pci_io_base = JMR3927_PCIIO;
253 unsigned long mips_pci_io_size = JMR3927_PCIIO_SIZE;
254 unsigned long mips_pci_mem_base = JMR3927_PCIMEM;
255 unsigned long mips_pci_mem_size = JMR3927_PCIMEM_SIZE;
256 /* for legacy I/O, PCI I/O PCI Bus address must be 0 */
257 unsigned long mips_pci_io_pciaddr = 0;
258#endif
377 259
378 /* SDRAMC are configured by PROM */ 260 /* SDRAMC are configured by PROM */
379 261
@@ -487,10 +369,8 @@ void __init tx3927_setup(void)
487 tx3927_pcicptr->mbas = ~(mips_pci_mem_size - 1); 369 tx3927_pcicptr->mbas = ~(mips_pci_mem_size - 1);
488 tx3927_pcicptr->mba = 0; 370 tx3927_pcicptr->mba = 0;
489 tx3927_pcicptr->tlbmma = 0; 371 tx3927_pcicptr->tlbmma = 0;
490#ifndef JMR3927_INIT_INDIRECT_PCI
491 /* Enable Direct mapping Address Space Decoder */ 372 /* Enable Direct mapping Address Space Decoder */
492 tx3927_pcicptr->lbc |= TX3927_PCIC_LBC_ILMDE | TX3927_PCIC_LBC_ILIDE; 373 tx3927_pcicptr->lbc |= TX3927_PCIC_LBC_ILMDE | TX3927_PCIC_LBC_ILIDE;
493#endif
494 374
495 /* Clear All Local Bus Status */ 375 /* Clear All Local Bus Status */
496 tx3927_pcicptr->lbstat = TX3927_PCIC_LBIM_ALL; 376 tx3927_pcicptr->lbstat = TX3927_PCIC_LBIM_ALL;
@@ -503,22 +383,15 @@ void __init tx3927_setup(void)
503 383
504 /* PCIC Int => IRC IRQ10 */ 384 /* PCIC Int => IRC IRQ10 */
505 tx3927_pcicptr->il = TX3927_IR_PCI; 385 tx3927_pcicptr->il = TX3927_IR_PCI;
506#if 1
507 /* Target Control (per errata) */ 386 /* Target Control (per errata) */
508 tx3927_pcicptr->tc = TX3927_PCIC_TC_OF8E | TX3927_PCIC_TC_IF8E; 387 tx3927_pcicptr->tc = TX3927_PCIC_TC_OF8E | TX3927_PCIC_TC_IF8E;
509#endif
510 388
511 /* Enable Bus Arbiter */ 389 /* Enable Bus Arbiter */
512#if 0
513 tx3927_pcicptr->req_trace = 0x73737373;
514#endif
515 tx3927_pcicptr->pbapmc = TX3927_PCIC_PBAPMC_PBAEN; 390 tx3927_pcicptr->pbapmc = TX3927_PCIC_PBAPMC_PBAEN;
516 391
517 tx3927_pcicptr->pcicmd = PCI_COMMAND_MASTER | 392 tx3927_pcicptr->pcicmd = PCI_COMMAND_MASTER |
518 PCI_COMMAND_MEMORY | 393 PCI_COMMAND_MEMORY |
519#if 1
520 PCI_COMMAND_IO | 394 PCI_COMMAND_IO |
521#endif
522 PCI_COMMAND_PARITY | PCI_COMMAND_SERR; 395 PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
523 } 396 }
524#endif /* CONFIG_PCI */ 397#endif /* CONFIG_PCI */
@@ -544,3 +417,30 @@ void __init tx3927_setup(void)
544 printk("TX3927 D-Cache WriteBack (CWF) .\n"); 417 printk("TX3927 D-Cache WriteBack (CWF) .\n");
545 } 418 }
546} 419}
420
421/* This trick makes rtc-ds1742 driver usable as is. */
422unsigned long __swizzle_addr_b(unsigned long port)
423{
424 if ((port & 0xffff0000) != JMR3927_IOC_NVRAMB_ADDR)
425 return port;
426 port = (port & 0xffff0000) | (port & 0x7fff << 1);
427#ifdef __BIG_ENDIAN
428 return port;
429#else
430 return port | 1;
431#endif
432}
433EXPORT_SYMBOL(__swizzle_addr_b);
434
435static int __init jmr3927_rtc_init(void)
436{
437 struct resource res = {
438 .start = JMR3927_IOC_NVRAMB_ADDR - IO_BASE,
439 .end = JMR3927_IOC_NVRAMB_ADDR - IO_BASE + 0x800 - 1,
440 .flags = IORESOURCE_MEM,
441 };
442 struct platform_device *dev;
443 dev = platform_device_register_simple("ds1742", -1, &res, 1);
444 return IS_ERR(dev) ? PTR_ERR(dev) : 0;
445}
446device_initcall(jmr3927_rtc_init);
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 1bf2c8448912..49246264cc7c 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -53,9 +53,9 @@ obj-$(CONFIG_MIPS_BOARDS_GEN) += irq-msc01.o
53obj-$(CONFIG_32BIT) += scall32-o32.o 53obj-$(CONFIG_32BIT) += scall32-o32.o
54obj-$(CONFIG_64BIT) += scall64-64.o 54obj-$(CONFIG_64BIT) += scall64-64.o
55obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o 55obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o
56obj-$(CONFIG_MIPS32_COMPAT) += linux32.o signal32.o 56obj-$(CONFIG_MIPS32_COMPAT) += linux32.o ptrace32.o signal32.o
57obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o 57obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o
58obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o ptrace32.o 58obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o
59 59
60obj-$(CONFIG_KGDB) += gdb-low.o gdb-stub.o 60obj-$(CONFIG_KGDB) += gdb-low.o gdb-stub.o
61obj-$(CONFIG_PROC_FS) += proc.o 61obj-$(CONFIG_PROC_FS) += proc.o
@@ -65,7 +65,6 @@ obj-$(CONFIG_64BIT) += cpu-bugs64.o
65obj-$(CONFIG_I8253) += i8253.o 65obj-$(CONFIG_I8253) += i8253.o
66 66
67obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o 67obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o
68obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
68 69
69CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) 70CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
70
71EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index c0b089d47181..761a779d5c4f 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -64,6 +64,9 @@ void output_ptreg_defines(void)
64 offset("#define PT_R31 ", struct pt_regs, regs[31]); 64 offset("#define PT_R31 ", struct pt_regs, regs[31]);
65 offset("#define PT_LO ", struct pt_regs, lo); 65 offset("#define PT_LO ", struct pt_regs, lo);
66 offset("#define PT_HI ", struct pt_regs, hi); 66 offset("#define PT_HI ", struct pt_regs, hi);
67#ifdef CONFIG_CPU_HAS_SMARTMIPS
68 offset("#define PT_ACX ", struct pt_regs, acx);
69#endif
67 offset("#define PT_EPC ", struct pt_regs, cp0_epc); 70 offset("#define PT_EPC ", struct pt_regs, cp0_epc);
68 offset("#define PT_BVADDR ", struct pt_regs, cp0_badvaddr); 71 offset("#define PT_BVADDR ", struct pt_regs, cp0_badvaddr);
69 offset("#define PT_STATUS ", struct pt_regs, cp0_status); 72 offset("#define PT_STATUS ", struct pt_regs, cp0_status);
@@ -99,7 +102,6 @@ void output_thread_info_defines(void)
99 offset("#define TI_ADDR_LIMIT ", struct thread_info, addr_limit); 102 offset("#define TI_ADDR_LIMIT ", struct thread_info, addr_limit);
100 offset("#define TI_RESTART_BLOCK ", struct thread_info, restart_block); 103 offset("#define TI_RESTART_BLOCK ", struct thread_info, restart_block);
101 offset("#define TI_REGS ", struct thread_info, regs); 104 offset("#define TI_REGS ", struct thread_info, regs);
102 constant("#define _THREAD_SIZE_ORDER ", THREAD_SIZE_ORDER);
103 constant("#define _THREAD_SIZE ", THREAD_SIZE); 105 constant("#define _THREAD_SIZE ", THREAD_SIZE);
104 constant("#define _THREAD_MASK ", THREAD_MASK); 106 constant("#define _THREAD_MASK ", THREAD_MASK);
105 linefeed; 107 linefeed;
@@ -246,6 +248,7 @@ void output_sc_defines(void)
246 text("/* Linux sigcontext offsets. */"); 248 text("/* Linux sigcontext offsets. */");
247 offset("#define SC_REGS ", struct sigcontext, sc_regs); 249 offset("#define SC_REGS ", struct sigcontext, sc_regs);
248 offset("#define SC_FPREGS ", struct sigcontext, sc_fpregs); 250 offset("#define SC_FPREGS ", struct sigcontext, sc_fpregs);
251 offset("#define SC_ACX ", struct sigcontext, sc_acx);
249 offset("#define SC_MDHI ", struct sigcontext, sc_mdhi); 252 offset("#define SC_MDHI ", struct sigcontext, sc_mdhi);
250 offset("#define SC_MDLO ", struct sigcontext, sc_mdlo); 253 offset("#define SC_MDLO ", struct sigcontext, sc_mdlo);
251 offset("#define SC_PC ", struct sigcontext, sc_pc); 254 offset("#define SC_PC ", struct sigcontext, sc_pc);
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index f59ef271d247..ab755ea26c6a 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -16,6 +16,7 @@
16#include <linux/ptrace.h> 16#include <linux/ptrace.h>
17#include <linux/stddef.h> 17#include <linux/stddef.h>
18 18
19#include <asm/bugs.h>
19#include <asm/cpu.h> 20#include <asm/cpu.h>
20#include <asm/fpu.h> 21#include <asm/fpu.h>
21#include <asm/mipsregs.h> 22#include <asm/mipsregs.h>
@@ -97,7 +98,7 @@ static void au1k_wait(void)
97 98
98static int __initdata nowait = 0; 99static int __initdata nowait = 0;
99 100
100int __init wait_disable(char *s) 101static int __init wait_disable(char *s)
101{ 102{
102 nowait = 1; 103 nowait = 1;
103 104
diff --git a/arch/mips/kernel/early_printk.c b/arch/mips/kernel/early_printk.c
new file mode 100644
index 000000000000..304efdc5682f
--- /dev/null
+++ b/arch/mips/kernel/early_printk.c
@@ -0,0 +1,40 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Copyright (C) 2002, 2003, 06, 07 Ralf Baechle (ralf@linux-mips.org)
7 * Copyright (C) 2007 MIPS Technologies, Inc.
8 * written by Ralf Baechle (ralf@linux-mips.org)
9 */
10#include <linux/console.h>
11#include <linux/init.h>
12
13extern void prom_putchar(char);
14
15static void early_console_write(struct console *con, const char *s, unsigned n)
16{
17 while (n-- && *s) {
18 if (*s == '\n')
19 prom_putchar('\r');
20 prom_putchar(*s);
21 s++;
22 }
23}
24
25static struct console early_console = {
26 .name = "early",
27 .write = early_console_write,
28 .flags = CON_PRINTBUFFER | CON_BOOT,
29 .index = -1
30};
31
32void __init setup_early_printk(void)
33{
34 register_console(&early_console);
35}
36
37void __init disable_early_printk(void)
38{
39 unregister_console(&early_console);
40}
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 0b78fcbf044a..686249c5c328 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -121,7 +121,11 @@ FEXPORT(restore_partial) # restore partial frame
121 SAVE_AT 121 SAVE_AT
122 SAVE_TEMP 122 SAVE_TEMP
123 LONG_L v0, PT_STATUS(sp) 123 LONG_L v0, PT_STATUS(sp)
124 and v0, 1 124#if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
125 and v0, ST0_IEP
126#else
127 and v0, ST0_IE
128#endif
125 beqz v0, 1f 129 beqz v0, 1f
126 jal trace_hardirqs_on 130 jal trace_hardirqs_on
127 b 2f 131 b 2f
diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index aacd4a005c5f..297bd56c2347 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -128,6 +128,37 @@ handle_vcei:
128 128
129 .align 5 129 .align 5
130NESTED(handle_int, PT_SIZE, sp) 130NESTED(handle_int, PT_SIZE, sp)
131#ifdef CONFIG_TRACE_IRQFLAGS
132 /*
133 * Check to see if the interrupted code has just disabled
134 * interrupts and ignore this interrupt for now if so.
135 *
136 * local_irq_disable() disables interrupts and then calls
137 * trace_hardirqs_off() to track the state. If an interrupt is taken
138 * after interrupts are disabled but before the state is updated
139 * it will appear to restore_all that it is incorrectly returning with
140 * interrupts disabled
141 */
142 .set push
143 .set noat
144 mfc0 k0, CP0_STATUS
145#if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
146 and k0, ST0_IEP
147 bnez k0, 1f
148
149 mfc0 k0, EP0_EPC
150 .set noreorder
151 j k0
152 rfe
153#else
154 and k0, ST0_IE
155 bnez k0, 1f
156
157 eret
158#endif
1591:
160 .set pop
161#endif
131 SAVE_ALL 162 SAVE_ALL
132 CLI 163 CLI
133 TRACE_IRQS_OFF 164 TRACE_IRQS_OFF
@@ -181,13 +212,13 @@ NESTED(except_vec_vi, 0, sp)
181 * during service by SMTC kernel, we also want to 212 * during service by SMTC kernel, we also want to
182 * pass the IM value to be cleared. 213 * pass the IM value to be cleared.
183 */ 214 */
184EXPORT(except_vec_vi_mori) 215FEXPORT(except_vec_vi_mori)
185 ori a0, $0, 0 216 ori a0, $0, 0
186#endif /* CONFIG_MIPS_MT_SMTC */ 217#endif /* CONFIG_MIPS_MT_SMTC */
187EXPORT(except_vec_vi_lui) 218FEXPORT(except_vec_vi_lui)
188 lui v0, 0 /* Patched */ 219 lui v0, 0 /* Patched */
189 j except_vec_vi_handler 220 j except_vec_vi_handler
190EXPORT(except_vec_vi_ori) 221FEXPORT(except_vec_vi_ori)
191 ori v0, 0 /* Patched */ 222 ori v0, 0 /* Patched */
192 .set pop 223 .set pop
193 END(except_vec_vi) 224 END(except_vec_vi)
@@ -220,7 +251,17 @@ NESTED(except_vec_vi_handler, 0, sp)
220 _ehb 251 _ehb
221#endif /* CONFIG_MIPS_MT_SMTC */ 252#endif /* CONFIG_MIPS_MT_SMTC */
222 CLI 253 CLI
254#ifdef CONFIG_TRACE_IRQFLAGS
255 move s0, v0
256#ifdef CONFIG_MIPS_MT_SMTC
257 move s1, a0
258#endif
223 TRACE_IRQS_OFF 259 TRACE_IRQS_OFF
260#ifdef CONFIG_MIPS_MT_SMTC
261 move a0, s1
262#endif
263 move v0, s0
264#endif
224 265
225 LONG_L s0, TI_REGS($28) 266 LONG_L s0, TI_REGS($28)
226 LONG_S sp, TI_REGS($28) 267 LONG_S sp, TI_REGS($28)
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index b33ba6cd7f5b..2345160e63fc 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -28,7 +28,7 @@
28 * moves to arch independent land 28 * moves to arch independent land
29 */ 29 */
30 30
31static int i8259A_auto_eoi; 31static int i8259A_auto_eoi = -1;
32DEFINE_SPINLOCK(i8259A_lock); 32DEFINE_SPINLOCK(i8259A_lock);
33/* some platforms call this... */ 33/* some platforms call this... */
34void mask_and_ack_8259A(unsigned int); 34void mask_and_ack_8259A(unsigned int);
@@ -216,7 +216,8 @@ spurious_8259A_irq:
216 216
217static int i8259A_resume(struct sys_device *dev) 217static int i8259A_resume(struct sys_device *dev)
218{ 218{
219 init_8259A(i8259A_auto_eoi); 219 if (i8259A_auto_eoi >= 0)
220 init_8259A(i8259A_auto_eoi);
220 return 0; 221 return 0;
221} 222}
222 223
@@ -226,8 +227,10 @@ static int i8259A_shutdown(struct sys_device *dev)
226 * the kernel initialization code can get it 227 * the kernel initialization code can get it
227 * out of. 228 * out of.
228 */ 229 */
229 outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */ 230 if (i8259A_auto_eoi >= 0) {
230 outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-1 */ 231 outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */
232 outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-1 */
233 }
231 return 0; 234 return 0;
232} 235}
233 236
@@ -252,7 +255,7 @@ static int __init i8259A_init_sysfs(void)
252 255
253device_initcall(i8259A_init_sysfs); 256device_initcall(i8259A_init_sysfs);
254 257
255void __init init_8259A(int auto_eoi) 258void init_8259A(int auto_eoi)
256{ 259{
257 unsigned long flags; 260 unsigned long flags;
258 261
@@ -325,8 +328,8 @@ void __init init_i8259_irqs (void)
325{ 328{
326 int i; 329 int i;
327 330
328 request_resource(&ioport_resource, &pic1_io_resource); 331 insert_resource(&ioport_resource, &pic1_io_resource);
329 request_resource(&ioport_resource, &pic2_io_resource); 332 insert_resource(&ioport_resource, &pic2_io_resource);
330 333
331 init_8259A(0); 334 init_8259A(0);
332 335
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
index 5929f883e46b..c6580018c94b 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -17,6 +17,7 @@
17 */ 17 */
18#include <linux/kernel.h> 18#include <linux/kernel.h>
19#include <linux/module.h> 19#include <linux/module.h>
20#include <linux/sched.h>
20#include <linux/unistd.h> 21#include <linux/unistd.h>
21#include <linux/file.h> 22#include <linux/file.h>
22#include <linux/fs.h> 23#include <linux/fs.h>
@@ -70,6 +71,7 @@ static int sp_stopping = 0;
70#define MTSP_SYSCALL_GETTIME (MTSP_SYSCALL_BASE + 7) 71#define MTSP_SYSCALL_GETTIME (MTSP_SYSCALL_BASE + 7)
71#define MTSP_SYSCALL_PIPEFREQ (MTSP_SYSCALL_BASE + 8) 72#define MTSP_SYSCALL_PIPEFREQ (MTSP_SYSCALL_BASE + 8)
72#define MTSP_SYSCALL_GETTOD (MTSP_SYSCALL_BASE + 9) 73#define MTSP_SYSCALL_GETTOD (MTSP_SYSCALL_BASE + 9)
74#define MTSP_SYSCALL_IOCTL (MTSP_SYSCALL_BASE + 10)
73 75
74#define MTSP_O_RDONLY 0x0000 76#define MTSP_O_RDONLY 0x0000
75#define MTSP_O_WRONLY 0x0001 77#define MTSP_O_WRONLY 0x0001
@@ -110,7 +112,8 @@ struct apsp_table syscall_command_table[] = {
110 { MTSP_SYSCALL_CLOSE, __NR_close }, 112 { MTSP_SYSCALL_CLOSE, __NR_close },
111 { MTSP_SYSCALL_READ, __NR_read }, 113 { MTSP_SYSCALL_READ, __NR_read },
112 { MTSP_SYSCALL_WRITE, __NR_write }, 114 { MTSP_SYSCALL_WRITE, __NR_write },
113 { MTSP_SYSCALL_LSEEK32, __NR_lseek } 115 { MTSP_SYSCALL_LSEEK32, __NR_lseek },
116 { MTSP_SYSCALL_IOCTL, __NR_ioctl }
114}; 117};
115 118
116static int sp_syscall(int num, int arg0, int arg1, int arg2, int arg3) 119static int sp_syscall(int num, int arg0, int arg1, int arg2, int arg3)
@@ -189,17 +192,22 @@ void sp_work_handle_request(void)
189 struct mtsp_syscall_generic generic; 192 struct mtsp_syscall_generic generic;
190 struct mtsp_syscall_ret ret; 193 struct mtsp_syscall_ret ret;
191 struct kspd_notifications *n; 194 struct kspd_notifications *n;
195 unsigned long written;
196 mm_segment_t old_fs;
192 struct timeval tv; 197 struct timeval tv;
193 struct timezone tz; 198 struct timezone tz;
194 int cmd; 199 int cmd;
195 200
196 char *vcwd; 201 char *vcwd;
197 mm_segment_t old_fs;
198 int size; 202 int size;
199 203
200 ret.retval = -1; 204 ret.retval = -1;
201 205
202 if (!rtlx_read(RTLX_CHANNEL_SYSIO, &sc, sizeof(struct mtsp_syscall), 0)) { 206 old_fs = get_fs();
207 set_fs(KERNEL_DS);
208
209 if (!rtlx_read(RTLX_CHANNEL_SYSIO, &sc, sizeof(struct mtsp_syscall))) {
210 set_fs(old_fs);
203 printk(KERN_ERR "Expected request but nothing to read\n"); 211 printk(KERN_ERR "Expected request but nothing to read\n");
204 return; 212 return;
205 } 213 }
@@ -207,7 +215,8 @@ void sp_work_handle_request(void)
207 size = sc.size; 215 size = sc.size;
208 216
209 if (size) { 217 if (size) {
210 if (!rtlx_read(RTLX_CHANNEL_SYSIO, &generic, size, 0)) { 218 if (!rtlx_read(RTLX_CHANNEL_SYSIO, &generic, size)) {
219 set_fs(old_fs);
211 printk(KERN_ERR "Expected request but nothing to read\n"); 220 printk(KERN_ERR "Expected request but nothing to read\n");
212 return; 221 return;
213 } 222 }
@@ -232,8 +241,6 @@ void sp_work_handle_request(void)
232 if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv, 241 if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,
233 (int)&tz, 0,0)) == 0) 242 (int)&tz, 0,0)) == 0)
234 ret.retval = tv.tv_sec; 243 ret.retval = tv.tv_sec;
235
236 ret.errno = errno;
237 break; 244 break;
238 245
239 case MTSP_SYSCALL_EXIT: 246 case MTSP_SYSCALL_EXIT:
@@ -270,7 +277,6 @@ void sp_work_handle_request(void)
270 if (cmd >= 0) { 277 if (cmd >= 0) {
271 ret.retval = sp_syscall(cmd, generic.arg0, generic.arg1, 278 ret.retval = sp_syscall(cmd, generic.arg0, generic.arg1,
272 generic.arg2, generic.arg3); 279 generic.arg2, generic.arg3);
273 ret.errno = errno;
274 } else 280 } else
275 printk(KERN_WARNING 281 printk(KERN_WARNING
276 "KSPD: Unknown SP syscall number %d\n", sc.cmd); 282 "KSPD: Unknown SP syscall number %d\n", sc.cmd);
@@ -280,8 +286,11 @@ void sp_work_handle_request(void)
280 if (vpe_getuid(SP_VPE)) 286 if (vpe_getuid(SP_VPE))
281 sp_setfsuidgid( 0, 0); 287 sp_setfsuidgid( 0, 0);
282 288
283 if ((rtlx_write(RTLX_CHANNEL_SYSIO, &ret, sizeof(struct mtsp_syscall_ret), 0)) 289 old_fs = get_fs();
284 < sizeof(struct mtsp_syscall_ret)) 290 set_fs(KERNEL_DS);
291 written = rtlx_write(RTLX_CHANNEL_SYSIO, &ret, sizeof(ret));
292 set_fs(old_fs);
293 if (written < sizeof(ret))
285 printk("KSPD: sp_work_handle_request failed to send to SP\n"); 294 printk("KSPD: sp_work_handle_request failed to send to SP\n");
286} 295}
287 296
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index fc4dd6c9dd80..37849edd0645 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -166,34 +166,6 @@ out:
166 return error; 166 return error;
167} 167}
168 168
169asmlinkage long
170sysn32_waitid(int which, compat_pid_t pid,
171 siginfo_t __user *uinfo, int options,
172 struct compat_rusage __user *uru)
173{
174 struct rusage ru;
175 long ret;
176 mm_segment_t old_fs = get_fs();
177 int si_signo;
178
179 if (!access_ok(VERIFY_WRITE, uinfo, sizeof(*uinfo)))
180 return -EFAULT;
181
182 set_fs (KERNEL_DS);
183 ret = sys_waitid(which, pid, uinfo, options,
184 uru ? (struct rusage __user *) &ru : NULL);
185 set_fs (old_fs);
186
187 if (__get_user(si_signo, &uinfo->si_signo))
188 return -EFAULT;
189 if (ret < 0 || si_signo == 0)
190 return ret;
191
192 if (uru)
193 ret = put_compat_rusage(&ru, uru);
194 return ret;
195}
196
197#define RLIM_INFINITY32 0x7fffffff 169#define RLIM_INFINITY32 0x7fffffff
198#define RESOURCE32(x) ((x > RLIM_INFINITY32) ? RLIM_INFINITY32 : x) 170#define RESOURCE32(x) ((x > RLIM_INFINITY32) ? RLIM_INFINITY32 : x)
199 171
@@ -339,6 +311,8 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,
339 return ret; 311 return ret;
340} 312}
341 313
314#ifdef CONFIG_SYSVIPC
315
342asmlinkage long 316asmlinkage long
343sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth) 317sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
344{ 318{
@@ -396,6 +370,16 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
396 return err; 370 return err;
397} 371}
398 372
373#else
374
375asmlinkage long
376sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
377{
378 return -ENOSYS;
379}
380
381#endif /* CONFIG_SYSVIPC */
382
399#ifdef CONFIG_MIPS32_N32 383#ifdef CONFIG_MIPS32_N32
400asmlinkage long sysn32_semctl(int semid, int semnum, int cmd, u32 arg) 384asmlinkage long sysn32_semctl(int semid, int semnum, int cmd, u32 arg)
401{ 385{
@@ -572,151 +556,6 @@ asmlinkage long sys32_sync_file_range(int fd, int __pad,
572 flags); 556 flags);
573} 557}
574 558
575/* Argument list sizes for sys_socketcall */
576#define AL(x) ((x) * sizeof(unsigned int))
577static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
578 AL(3),AL(3),AL(4),AL(4),AL(4),AL(6),
579 AL(6),AL(2),AL(5),AL(5),AL(3),AL(3)};
580#undef AL
581
582/*
583 * System call vectors.
584 *
585 * Argument checking cleaned up. Saved 20% in size.
586 * This function doesn't need to set the kernel lock because
587 * it is set by the callees.
588 */
589
590asmlinkage long sys32_socketcall(int call, unsigned int __user *args32)
591{
592 unsigned int a[6];
593 unsigned int a0,a1;
594 int err;
595
596 extern asmlinkage long sys_socket(int family, int type, int protocol);
597 extern asmlinkage long sys_bind(int fd, struct sockaddr __user *umyaddr, int addrlen);
598 extern asmlinkage long sys_connect(int fd, struct sockaddr __user *uservaddr, int addrlen);
599 extern asmlinkage long sys_listen(int fd, int backlog);
600 extern asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int __user *upeer_addrlen);
601 extern asmlinkage long sys_getsockname(int fd, struct sockaddr __user *usockaddr, int __user *usockaddr_len);
602 extern asmlinkage long sys_getpeername(int fd, struct sockaddr __user *usockaddr, int __user *usockaddr_len);
603 extern asmlinkage long sys_socketpair(int family, int type, int protocol, int __user *usockvec);
604 extern asmlinkage long sys_send(int fd, void __user * buff, size_t len, unsigned flags);
605 extern asmlinkage long sys_sendto(int fd, void __user * buff, size_t len, unsigned flags,
606 struct sockaddr __user *addr, int addr_len);
607 extern asmlinkage long sys_recv(int fd, void __user * ubuf, size_t size, unsigned flags);
608 extern asmlinkage long sys_recvfrom(int fd, void __user * ubuf, size_t size, unsigned flags,
609 struct sockaddr __user *addr, int __user *addr_len);
610 extern asmlinkage long sys_shutdown(int fd, int how);
611 extern asmlinkage long sys_setsockopt(int fd, int level, int optname, char __user *optval, int optlen);
612 extern asmlinkage long sys_getsockopt(int fd, int level, int optname, char __user *optval, int __user *optlen);
613 extern asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
614 extern asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flags);
615
616
617 if(call<1||call>SYS_RECVMSG)
618 return -EINVAL;
619
620 /* copy_from_user should be SMP safe. */
621 if (copy_from_user(a, args32, socketcall_nargs[call]))
622 return -EFAULT;
623
624 a0=a[0];
625 a1=a[1];
626
627 switch(call)
628 {
629 case SYS_SOCKET:
630 err = sys_socket(a0,a1,a[2]);
631 break;
632 case SYS_BIND:
633 err = sys_bind(a0,(struct sockaddr __user *)A(a1), a[2]);
634 break;
635 case SYS_CONNECT:
636 err = sys_connect(a0, (struct sockaddr __user *)A(a1), a[2]);
637 break;
638 case SYS_LISTEN:
639 err = sys_listen(a0,a1);
640 break;
641 case SYS_ACCEPT:
642 err = sys_accept(a0,(struct sockaddr __user *)A(a1), (int __user *)A(a[2]));
643 break;
644 case SYS_GETSOCKNAME:
645 err = sys_getsockname(a0,(struct sockaddr __user *)A(a1), (int __user *)A(a[2]));
646 break;
647 case SYS_GETPEERNAME:
648 err = sys_getpeername(a0, (struct sockaddr __user *)A(a1), (int __user *)A(a[2]));
649 break;
650 case SYS_SOCKETPAIR:
651 err = sys_socketpair(a0,a1, a[2], (int __user *)A(a[3]));
652 break;
653 case SYS_SEND:
654 err = sys_send(a0, (void __user *)A(a1), a[2], a[3]);
655 break;
656 case SYS_SENDTO:
657 err = sys_sendto(a0,(void __user *)A(a1), a[2], a[3],
658 (struct sockaddr __user *)A(a[4]), a[5]);
659 break;
660 case SYS_RECV:
661 err = sys_recv(a0, (void __user *)A(a1), a[2], a[3]);
662 break;
663 case SYS_RECVFROM:
664 err = sys_recvfrom(a0, (void __user *)A(a1), a[2], a[3],
665 (struct sockaddr __user *)A(a[4]), (int __user *)A(a[5]));
666 break;
667 case SYS_SHUTDOWN:
668 err = sys_shutdown(a0,a1);
669 break;
670 case SYS_SETSOCKOPT:
671 err = sys_setsockopt(a0, a1, a[2], (char __user *)A(a[3]), a[4]);
672 break;
673 case SYS_GETSOCKOPT:
674 err = sys_getsockopt(a0, a1, a[2], (char __user *)A(a[3]), (int __user *)A(a[4]));
675 break;
676 case SYS_SENDMSG:
677 err = sys_sendmsg(a0, (struct msghdr __user *) A(a1), a[2]);
678 break;
679 case SYS_RECVMSG:
680 err = sys_recvmsg(a0, (struct msghdr __user *) A(a1), a[2]);
681 break;
682 default:
683 err = -EINVAL;
684 break;
685 }
686 return err;
687}
688
689struct sigevent32 {
690 u32 sigev_value;
691 u32 sigev_signo;
692 u32 sigev_notify;
693 u32 payload[(64 / 4) - 3];
694};
695
696extern asmlinkage long
697sys_timer_create(clockid_t which_clock,
698 struct sigevent __user *timer_event_spec,
699 timer_t __user * created_timer_id);
700
701long
702sys32_timer_create(u32 clock, struct sigevent32 __user *se32, timer_t __user *timer_id)
703{
704 struct sigevent __user *p = NULL;
705 if (se32) {
706 struct sigevent se;
707 p = compat_alloc_user_space(sizeof(struct sigevent));
708 memset(&se, 0, sizeof(struct sigevent));
709 if (get_user(se.sigev_value.sival_int, &se32->sigev_value) ||
710 __get_user(se.sigev_signo, &se32->sigev_signo) ||
711 __get_user(se.sigev_notify, &se32->sigev_notify) ||
712 __copy_from_user(&se._sigev_un._pad, &se32->payload,
713 sizeof(se32->payload)) ||
714 copy_to_user(p, &se, sizeof(se)))
715 return -EFAULT;
716 }
717 return sys_timer_create(clock, p, timer_id);
718}
719
720save_static_function(sys32_clone); 559save_static_function(sys32_clone);
721__attribute_used__ noinline static int 560__attribute_used__ noinline static int
722_sys32_clone(nabi_no_regargs struct pt_regs regs) 561_sys32_clone(nabi_no_regargs struct pt_regs regs)
@@ -737,49 +576,3 @@ _sys32_clone(nabi_no_regargs struct pt_regs regs)
737 return do_fork(clone_flags, newsp, &regs, 0, 576 return do_fork(clone_flags, newsp, &regs, 0,
738 parent_tidptr, child_tidptr); 577 parent_tidptr, child_tidptr);
739} 578}
740
741/*
742 * Implement the event wait interface for the eventpoll file. It is the kernel
743 * part of the user space epoll_pwait(2).
744 */
745asmlinkage long compat_sys_epoll_pwait(int epfd,
746 struct epoll_event __user *events, int maxevents, int timeout,
747 const compat_sigset_t __user *sigmask, size_t sigsetsize)
748{
749 int error;
750 sigset_t ksigmask, sigsaved;
751
752 /*
753 * If the caller wants a certain signal mask to be set during the wait,
754 * we apply it here.
755 */
756 if (sigmask) {
757 if (sigsetsize != sizeof(sigset_t))
758 return -EINVAL;
759 if (!access_ok(VERIFY_READ, sigmask, sizeof(ksigmask)))
760 return -EFAULT;
761 if (__copy_conv_sigset_from_user(&ksigmask, sigmask))
762 return -EFAULT;
763 sigdelsetmask(&ksigmask, sigmask(SIGKILL) | sigmask(SIGSTOP));
764 sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
765 }
766
767 error = sys_epoll_wait(epfd, events, maxevents, timeout);
768
769 /*
770 * If we changed the signal mask, we need to restore the original one.
771 * In case we've got a signal while waiting, we do not restore the
772 * signal mask yet, and we allow do_signal() to deliver the signal on
773 * the way back to userspace, before the signal mask is restored.
774 */
775 if (sigmask) {
776 if (error == -EINTR) {
777 memcpy(&current->saved_sigmask, &sigsaved,
778 sizeof(sigsaved));
779 set_thread_flag(TIF_RESTORE_SIGMASK);
780 } else
781 sigprocmask(SIG_SETMASK, &sigsaved, NULL);
782 }
783
784 return error;
785}
diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c
index e0ad754c7edd..8f42fa85ac9e 100644
--- a/arch/mips/kernel/machine_kexec.c
+++ b/arch/mips/kernel/machine_kexec.c
@@ -13,8 +13,8 @@
13#include <asm/cacheflush.h> 13#include <asm/cacheflush.h>
14#include <asm/page.h> 14#include <asm/page.h>
15 15
16const extern unsigned char relocate_new_kernel[]; 16extern const unsigned char relocate_new_kernel[];
17const extern unsigned int relocate_new_kernel_size; 17extern const unsigned int relocate_new_kernel_size;
18 18
19extern unsigned long kexec_start_address; 19extern unsigned long kexec_start_address;
20extern unsigned long kexec_indirection_page; 20extern unsigned long kexec_indirection_page;
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
index 2ef857c3ee53..225755d0c1f6 100644
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
@@ -37,6 +37,7 @@ EXPORT_SYMBOL(kernel_thread);
37 * Userspace access stuff. 37 * Userspace access stuff.
38 */ 38 */
39EXPORT_SYMBOL(__copy_user); 39EXPORT_SYMBOL(__copy_user);
40EXPORT_SYMBOL(__copy_user_inatomic);
40EXPORT_SYMBOL(__bzero); 41EXPORT_SYMBOL(__bzero);
41EXPORT_SYMBOL(__strncpy_from_user_nocheck_asm); 42EXPORT_SYMBOL(__strncpy_from_user_nocheck_asm);
42EXPORT_SYMBOL(__strncpy_from_user_asm); 43EXPORT_SYMBOL(__strncpy_from_user_asm);
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 04e5b38d327d..6bdfb5a9fa1a 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -26,7 +26,6 @@
26#include <linux/completion.h> 26#include <linux/completion.h>
27#include <linux/kallsyms.h> 27#include <linux/kallsyms.h>
28 28
29#include <asm/abi.h>
30#include <asm/bootinfo.h> 29#include <asm/bootinfo.h>
31#include <asm/cpu.h> 30#include <asm/cpu.h>
32#include <asm/dsp.h> 31#include <asm/dsp.h>
@@ -52,11 +51,11 @@ ATTRIB_NORET void cpu_idle(void)
52 /* endless idle loop with no priority at all */ 51 /* endless idle loop with no priority at all */
53 while (1) { 52 while (1) {
54 while (!need_resched()) { 53 while (!need_resched()) {
55#ifdef CONFIG_MIPS_MT_SMTC 54#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
56 extern void smtc_idle_loop_hook(void); 55 extern void smtc_idle_loop_hook(void);
57 56
58 smtc_idle_loop_hook(); 57 smtc_idle_loop_hook();
59#endif /* CONFIG_MIPS_MT_SMTC */ 58#endif
60 if (cpu_wait) 59 if (cpu_wait)
61 (*cpu_wait)(); 60 (*cpu_wait)();
62 } 61 }
@@ -66,38 +65,6 @@ ATTRIB_NORET void cpu_idle(void)
66 } 65 }
67} 66}
68 67
69/*
70 * Native o32 and N64 ABI without DSP ASE
71 */
72struct mips_abi mips_abi = {
73 .do_signal = do_signal,
74#ifdef CONFIG_TRAD_SIGNALS
75 .setup_frame = setup_frame,
76#endif
77 .setup_rt_frame = setup_rt_frame
78};
79
80#ifdef CONFIG_MIPS32_O32
81/*
82 * o32 compatibility on 64-bit kernels, without DSP ASE
83 */
84struct mips_abi mips_abi_32 = {
85 .do_signal = do_signal32,
86 .setup_frame = setup_frame_32,
87 .setup_rt_frame = setup_rt_frame_32
88};
89#endif /* CONFIG_MIPS32_O32 */
90
91#ifdef CONFIG_MIPS32_N32
92/*
93 * N32 on 64-bit kernels, without DSP ASE
94 */
95struct mips_abi mips_abi_n32 = {
96 .do_signal = do_signal,
97 .setup_rt_frame = setup_rt_frame_n32
98};
99#endif /* CONFIG_MIPS32_N32 */
100
101asmlinkage void ret_from_fork(void); 68asmlinkage void ret_from_fork(void);
102 69
103void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp) 70void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
@@ -246,7 +213,7 @@ int dump_task_fpu (struct task_struct *t, elf_fpregset_t *fpr)
246/* 213/*
247 * Create a kernel thread 214 * Create a kernel thread
248 */ 215 */
249ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *)) 216static ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
250{ 217{
251 do_exit(fn(arg)); 218 do_exit(fn(arg));
252} 219}
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 258d74fd0b63..201ae194d1b8 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -236,6 +236,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
236 case MMLO: 236 case MMLO:
237 tmp = regs->lo; 237 tmp = regs->lo;
238 break; 238 break;
239#ifdef CONFIG_CPU_HAS_SMARTMIPS
240 case ACX:
241 tmp = regs->acx;
242 break;
243#endif
239 case FPC_CSR: 244 case FPC_CSR:
240 tmp = child->thread.fpu.fcr31; 245 tmp = child->thread.fpu.fcr31;
241 break; 246 break;
@@ -362,6 +367,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
362 case MMLO: 367 case MMLO:
363 regs->lo = data; 368 regs->lo = data;
364 break; 369 break;
370#ifdef CONFIG_CPU_HAS_SMARTMIPS
371 case ACX:
372 regs->acx = data;
373 break;
374#endif
365 case FPC_CSR: 375 case FPC_CSR:
366 child->thread.fpu.fcr31 = data; 376 child->thread.fpu.fcr31 = data;
367 break; 377 break;
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S
index 59c1577ecbb3..dbd42adc52ed 100644
--- a/arch/mips/kernel/r4k_fpu.S
+++ b/arch/mips/kernel/r4k_fpu.S
@@ -114,14 +114,6 @@ LEAF(_save_fp_context32)
114 */ 114 */
115LEAF(_restore_fp_context) 115LEAF(_restore_fp_context)
116 EX lw t0, SC_FPC_CSR(a0) 116 EX lw t0, SC_FPC_CSR(a0)
117
118 /* Fail if the CSR has exceptions pending */
119 srl t1, t0, 5
120 and t1, t0
121 andi t1, 0x1f << 7
122 bnez t1, fault
123 nop
124
125#ifdef CONFIG_64BIT 117#ifdef CONFIG_64BIT
126 EX ldc1 $f1, SC_FPREGS+8(a0) 118 EX ldc1 $f1, SC_FPREGS+8(a0)
127 EX ldc1 $f3, SC_FPREGS+24(a0) 119 EX ldc1 $f3, SC_FPREGS+24(a0)
@@ -165,14 +157,6 @@ LEAF(_restore_fp_context)
165LEAF(_restore_fp_context32) 157LEAF(_restore_fp_context32)
166 /* Restore an o32 sigcontext. */ 158 /* Restore an o32 sigcontext. */
167 EX lw t0, SC32_FPC_CSR(a0) 159 EX lw t0, SC32_FPC_CSR(a0)
168
169 /* Fail if the CSR has exceptions pending */
170 srl t1, t0, 5
171 and t1, t0
172 andi t1, 0x1f << 7
173 bnez t1, fault
174 nop
175
176 EX ldc1 $f0, SC32_FPREGS+0(a0) 160 EX ldc1 $f0, SC32_FPREGS+0(a0)
177 EX ldc1 $f2, SC32_FPREGS+16(a0) 161 EX ldc1 $f2, SC32_FPREGS+16(a0)
178 EX ldc1 $f4, SC32_FPREGS+32(a0) 162 EX ldc1 $f4, SC32_FPREGS+32(a0)
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index d92c48e0d7a6..bfc8ca168f83 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -53,7 +53,8 @@ static char module_name[] = "rtlx";
53static struct chan_waitqueues { 53static struct chan_waitqueues {
54 wait_queue_head_t rt_queue; 54 wait_queue_head_t rt_queue;
55 wait_queue_head_t lx_queue; 55 wait_queue_head_t lx_queue;
56 int in_open; 56 atomic_t in_open;
57 struct mutex mutex;
57} channel_wqs[RTLX_CHANNELS]; 58} channel_wqs[RTLX_CHANNELS];
58 59
59static struct irqaction irq; 60static struct irqaction irq;
@@ -146,110 +147,91 @@ static void stopping(int vpe)
146 147
147int rtlx_open(int index, int can_sleep) 148int rtlx_open(int index, int can_sleep)
148{ 149{
149 int ret; 150 struct rtlx_info **p;
150 struct rtlx_channel *chan; 151 struct rtlx_channel *chan;
151 volatile struct rtlx_info **p; 152 enum rtlx_state state;
153 int ret = 0;
152 154
153 if (index >= RTLX_CHANNELS) { 155 if (index >= RTLX_CHANNELS) {
154 printk(KERN_DEBUG "rtlx_open index out of range\n"); 156 printk(KERN_DEBUG "rtlx_open index out of range\n");
155 return -ENOSYS; 157 return -ENOSYS;
156 } 158 }
157 159
158 if (channel_wqs[index].in_open) { 160 if (atomic_inc_return(&channel_wqs[index].in_open) > 1) {
159 printk(KERN_DEBUG "rtlx_open channel %d already opened\n", index); 161 printk(KERN_DEBUG "rtlx_open channel %d already opened\n",
160 return -EBUSY; 162 index);
163 ret = -EBUSY;
164 goto out_fail;
161 } 165 }
162 166
163 channel_wqs[index].in_open++;
164
165 if (rtlx == NULL) { 167 if (rtlx == NULL) {
166 if( (p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) { 168 if( (p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) {
167 if (can_sleep) { 169 if (can_sleep) {
168 DECLARE_WAITQUEUE(wait, current); 170 __wait_event_interruptible(channel_wqs[index].lx_queue,
169 171 (p = vpe_get_shared(RTLX_TARG_VPE)),
170 /* go to sleep */ 172 ret);
171 add_wait_queue(&channel_wqs[index].lx_queue, &wait); 173 if (ret)
172 174 goto out_fail;
173 set_current_state(TASK_INTERRUPTIBLE);
174 while ((p = vpe_get_shared(RTLX_TARG_VPE)) == NULL) {
175 schedule();
176 set_current_state(TASK_INTERRUPTIBLE);
177 }
178
179 set_current_state(TASK_RUNNING);
180 remove_wait_queue(&channel_wqs[index].lx_queue, &wait);
181
182 /* back running */
183 } else { 175 } else {
184 printk( KERN_DEBUG "No SP program loaded, and device " 176 printk(KERN_DEBUG "No SP program loaded, and device "
185 "opened with O_NONBLOCK\n"); 177 "opened with O_NONBLOCK\n");
186 channel_wqs[index].in_open = 0; 178 ret = -ENOSYS;
187 return -ENOSYS; 179 goto out_fail;
188 } 180 }
189 } 181 }
190 182
183 smp_rmb();
191 if (*p == NULL) { 184 if (*p == NULL) {
192 if (can_sleep) { 185 if (can_sleep) {
193 DECLARE_WAITQUEUE(wait, current); 186 DEFINE_WAIT(wait);
194 187
195 /* go to sleep */ 188 for (;;) {
196 add_wait_queue(&channel_wqs[index].lx_queue, &wait); 189 prepare_to_wait(&channel_wqs[index].lx_queue, &wait, TASK_INTERRUPTIBLE);
197 190 smp_rmb();
198 set_current_state(TASK_INTERRUPTIBLE); 191 if (*p != NULL)
199 while (*p == NULL) { 192 break;
200 schedule(); 193 if (!signal_pending(current)) {
201 194 schedule();
202 /* reset task state to interruptable otherwise 195 continue;
203 we'll whizz round here like a very fast loopy 196 }
204 thing. schedule() appears to return with state 197 ret = -ERESTARTSYS;
205 set to TASK_RUNNING. 198 goto out_fail;
206
207 If the loaded SP program, for whatever reason,
208 doesn't set up the shared structure *p will never
209 become true. So whoever connected to either /dev/rt?
210 or if it was kspd, will then take up rather a lot of
211 processor cycles.
212 */
213
214 set_current_state(TASK_INTERRUPTIBLE);
215 } 199 }
216 200 finish_wait(&channel_wqs[index].lx_queue, &wait);
217 set_current_state(TASK_RUNNING); 201 } else {
218 remove_wait_queue(&channel_wqs[index].lx_queue, &wait);
219
220 /* back running */
221 }
222 else {
223 printk(" *vpe_get_shared is NULL. " 202 printk(" *vpe_get_shared is NULL. "
224 "Has an SP program been loaded?\n"); 203 "Has an SP program been loaded?\n");
225 channel_wqs[index].in_open = 0; 204 ret = -ENOSYS;
226 return -ENOSYS; 205 goto out_fail;
227 } 206 }
228 } 207 }
229 208
230 if ((unsigned int)*p < KSEG0) { 209 if ((unsigned int)*p < KSEG0) {
231 printk(KERN_WARNING "vpe_get_shared returned an invalid pointer " 210 printk(KERN_WARNING "vpe_get_shared returned an invalid pointer "
232 "maybe an error code %d\n", (int)*p); 211 "maybe an error code %d\n", (int)*p);
233 channel_wqs[index].in_open = 0; 212 ret = -ENOSYS;
234 return -ENOSYS; 213 goto out_fail;
235 } 214 }
236 215
237 if ((ret = rtlx_init(*p)) < 0) { 216 if ((ret = rtlx_init(*p)) < 0)
238 channel_wqs[index].in_open = 0; 217 goto out_ret;
239 return ret;
240 }
241 } 218 }
242 219
243 chan = &rtlx->channel[index]; 220 chan = &rtlx->channel[index];
244 221
245 if (chan->lx_state == RTLX_STATE_OPENED) { 222 state = xchg(&chan->lx_state, RTLX_STATE_OPENED);
246 channel_wqs[index].in_open = 0; 223 if (state == RTLX_STATE_OPENED) {
247 return -EBUSY; 224 ret = -EBUSY;
248 } 225 goto out_fail;
226 }
249 227
250 chan->lx_state = RTLX_STATE_OPENED; 228out_fail:
251 channel_wqs[index].in_open = 0; 229 smp_mb();
252 return 0; 230 atomic_dec(&channel_wqs[index].in_open);
231 smp_mb();
232
233out_ret:
234 return ret;
253} 235}
254 236
255int rtlx_release(int index) 237int rtlx_release(int index)
@@ -270,30 +252,17 @@ unsigned int rtlx_read_poll(int index, int can_sleep)
270 /* data available to read? */ 252 /* data available to read? */
271 if (chan->lx_read == chan->lx_write) { 253 if (chan->lx_read == chan->lx_write) {
272 if (can_sleep) { 254 if (can_sleep) {
273 DECLARE_WAITQUEUE(wait, current); 255 int ret = 0;
274
275 /* go to sleep */
276 add_wait_queue(&channel_wqs[index].lx_queue, &wait);
277
278 set_current_state(TASK_INTERRUPTIBLE);
279 while (chan->lx_read == chan->lx_write) {
280 schedule();
281 256
282 set_current_state(TASK_INTERRUPTIBLE); 257 __wait_event_interruptible(channel_wqs[index].lx_queue,
258 chan->lx_read != chan->lx_write || sp_stopping,
259 ret);
260 if (ret)
261 return ret;
283 262
284 if (sp_stopping) { 263 if (sp_stopping)
285 set_current_state(TASK_RUNNING); 264 return 0;
286 remove_wait_queue(&channel_wqs[index].lx_queue, &wait); 265 } else
287 return 0;
288 }
289 }
290
291 set_current_state(TASK_RUNNING);
292 remove_wait_queue(&channel_wqs[index].lx_queue, &wait);
293
294 /* back running */
295 }
296 else
297 return 0; 266 return 0;
298 } 267 }
299 268
@@ -320,56 +289,53 @@ unsigned int rtlx_write_poll(int index)
320 return write_spacefree(chan->rt_read, chan->rt_write, chan->buffer_size); 289 return write_spacefree(chan->rt_read, chan->rt_write, chan->buffer_size);
321} 290}
322 291
323static inline void copy_to(void *dst, void *src, size_t count, int user) 292ssize_t rtlx_read(int index, void __user *buff, size_t count)
324{ 293{
325 if (user) 294 size_t lx_write, fl = 0L;
326 copy_to_user(dst, src, count);
327 else
328 memcpy(dst, src, count);
329}
330
331static inline void copy_from(void *dst, void *src, size_t count, int user)
332{
333 if (user)
334 copy_from_user(dst, src, count);
335 else
336 memcpy(dst, src, count);
337}
338
339ssize_t rtlx_read(int index, void *buff, size_t count, int user)
340{
341 size_t fl = 0L;
342 struct rtlx_channel *lx; 295 struct rtlx_channel *lx;
296 unsigned long failed;
343 297
344 if (rtlx == NULL) 298 if (rtlx == NULL)
345 return -ENOSYS; 299 return -ENOSYS;
346 300
347 lx = &rtlx->channel[index]; 301 lx = &rtlx->channel[index];
348 302
303 mutex_lock(&channel_wqs[index].mutex);
304 smp_rmb();
305 lx_write = lx->lx_write;
306
349 /* find out how much in total */ 307 /* find out how much in total */
350 count = min(count, 308 count = min(count,
351 (size_t)(lx->lx_write + lx->buffer_size - lx->lx_read) 309 (size_t)(lx_write + lx->buffer_size - lx->lx_read)
352 % lx->buffer_size); 310 % lx->buffer_size);
353 311
354 /* then how much from the read pointer onwards */ 312 /* then how much from the read pointer onwards */
355 fl = min( count, (size_t)lx->buffer_size - lx->lx_read); 313 fl = min(count, (size_t)lx->buffer_size - lx->lx_read);
356 314
357 copy_to(buff, &lx->lx_buffer[lx->lx_read], fl, user); 315 failed = copy_to_user(buff, lx->lx_buffer + lx->lx_read, fl);
316 if (failed)
317 goto out;
358 318
359 /* and if there is anything left at the beginning of the buffer */ 319 /* and if there is anything left at the beginning of the buffer */
360 if ( count - fl ) 320 if (count - fl)
361 copy_to (buff + fl, lx->lx_buffer, count - fl, user); 321 failed = copy_to_user(buff + fl, lx->lx_buffer, count - fl);
322
323out:
324 count -= failed;
362 325
363 /* update the index */ 326 smp_wmb();
364 lx->lx_read += count; 327 lx->lx_read = (lx->lx_read + count) % lx->buffer_size;
365 lx->lx_read %= lx->buffer_size; 328 smp_wmb();
329 mutex_unlock(&channel_wqs[index].mutex);
366 330
367 return count; 331 return count;
368} 332}
369 333
370ssize_t rtlx_write(int index, void *buffer, size_t count, int user) 334ssize_t rtlx_write(int index, const void __user *buffer, size_t count)
371{ 335{
372 struct rtlx_channel *rt; 336 struct rtlx_channel *rt;
337 unsigned long failed;
338 size_t rt_read;
373 size_t fl; 339 size_t fl;
374 340
375 if (rtlx == NULL) 341 if (rtlx == NULL)
@@ -377,24 +343,35 @@ ssize_t rtlx_write(int index, void *buffer, size_t count, int user)
377 343
378 rt = &rtlx->channel[index]; 344 rt = &rtlx->channel[index];
379 345
346 mutex_lock(&channel_wqs[index].mutex);
347 smp_rmb();
348 rt_read = rt->rt_read;
349
380 /* total number of bytes to copy */ 350 /* total number of bytes to copy */
381 count = min(count, 351 count = min(count,
382 (size_t)write_spacefree(rt->rt_read, rt->rt_write, 352 (size_t)write_spacefree(rt_read, rt->rt_write, rt->buffer_size));
383 rt->buffer_size));
384 353
385 /* first bit from write pointer to the end of the buffer, or count */ 354 /* first bit from write pointer to the end of the buffer, or count */
386 fl = min(count, (size_t) rt->buffer_size - rt->rt_write); 355 fl = min(count, (size_t) rt->buffer_size - rt->rt_write);
387 356
388 copy_from (&rt->rt_buffer[rt->rt_write], buffer, fl, user); 357 failed = copy_from_user(rt->rt_buffer + rt->rt_write, buffer, fl);
358 if (failed)
359 goto out;
389 360
390 /* if there's any left copy to the beginning of the buffer */ 361 /* if there's any left copy to the beginning of the buffer */
391 if( count - fl ) 362 if (count - fl) {
392 copy_from (rt->rt_buffer, buffer + fl, count - fl, user); 363 failed = copy_from_user(rt->rt_buffer, buffer + fl, count - fl);
364 }
393 365
394 rt->rt_write += count; 366out:
395 rt->rt_write %= rt->buffer_size; 367 count -= failed;
396 368
397 return(count); 369 smp_wmb();
370 rt->rt_write = (rt->rt_write + count) % rt->buffer_size;
371 smp_wmb();
372 mutex_unlock(&channel_wqs[index].mutex);
373
374 return count;
398} 375}
399 376
400 377
@@ -446,7 +423,7 @@ static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
446 return 0; // -EAGAIN makes cat whinge 423 return 0; // -EAGAIN makes cat whinge
447 } 424 }
448 425
449 return rtlx_read(minor, buffer, count, 1); 426 return rtlx_read(minor, buffer, count);
450} 427}
451 428
452static ssize_t file_write(struct file *file, const char __user * buffer, 429static ssize_t file_write(struct file *file, const char __user * buffer,
@@ -454,28 +431,25 @@ static ssize_t file_write(struct file *file, const char __user * buffer,
454{ 431{
455 int minor; 432 int minor;
456 struct rtlx_channel *rt; 433 struct rtlx_channel *rt;
457 DECLARE_WAITQUEUE(wait, current);
458 434
459 minor = iminor(file->f_path.dentry->d_inode); 435 minor = iminor(file->f_path.dentry->d_inode);
460 rt = &rtlx->channel[minor]; 436 rt = &rtlx->channel[minor];
461 437
462 /* any space left... */ 438 /* any space left... */
463 if (!rtlx_write_poll(minor)) { 439 if (!rtlx_write_poll(minor)) {
440 int ret = 0;
464 441
465 if (file->f_flags & O_NONBLOCK) 442 if (file->f_flags & O_NONBLOCK)
466 return -EAGAIN; 443 return -EAGAIN;
467 444
468 add_wait_queue(&channel_wqs[minor].rt_queue, &wait); 445 __wait_event_interruptible(channel_wqs[minor].rt_queue,
469 set_current_state(TASK_INTERRUPTIBLE); 446 rtlx_write_poll(minor),
470 447 ret);
471 while (!rtlx_write_poll(minor)) 448 if (ret)
472 schedule(); 449 return ret;
473
474 set_current_state(TASK_RUNNING);
475 remove_wait_queue(&channel_wqs[minor].rt_queue, &wait);
476 } 450 }
477 451
478 return rtlx_write(minor, (void *)buffer, count, 1); 452 return rtlx_write(minor, buffer, count);
479} 453}
480 454
481static const struct file_operations rtlx_fops = { 455static const struct file_operations rtlx_fops = {
@@ -513,7 +487,8 @@ static int rtlx_module_init(void)
513 for (i = 0; i < RTLX_CHANNELS; i++) { 487 for (i = 0; i < RTLX_CHANNELS; i++) {
514 init_waitqueue_head(&channel_wqs[i].rt_queue); 488 init_waitqueue_head(&channel_wqs[i].rt_queue);
515 init_waitqueue_head(&channel_wqs[i].lx_queue); 489 init_waitqueue_head(&channel_wqs[i].lx_queue);
516 channel_wqs[i].in_open = 0; 490 atomic_set(&channel_wqs[i].in_open, 0);
491 mutex_init(&channel_wqs[i].mutex);
517 492
518 dev = device_create(mt_class, NULL, MKDEV(major, i), 493 dev = device_create(mt_class, NULL, MKDEV(major, i),
519 "%s%d", module_name, i); 494 "%s%d", module_name, i);
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 7c0b3936ba44..0c9a9ff8cd25 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -656,6 +656,8 @@ einval: li v0, -EINVAL
656 sys sys_kexec_load 4 656 sys sys_kexec_load 4
657 sys sys_getcpu 3 657 sys sys_getcpu 3
658 sys sys_epoll_pwait 6 658 sys sys_epoll_pwait 6
659 sys sys_ioprio_set 3
660 sys sys_ioprio_get 2
659 .endm 661 .endm
660 662
661 /* We pre-compute the number of _instruction_ bytes needed to 663 /* 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 10e9a18630aa..23f3b118f718 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -470,4 +470,7 @@ sys_call_table:
470 PTR sys_get_robust_list 470 PTR sys_get_robust_list
471 PTR sys_kexec_load /* 5270 */ 471 PTR sys_kexec_load /* 5270 */
472 PTR sys_getcpu 472 PTR sys_getcpu
473 PTR compat_sys_epoll_pwait 473 PTR sys_epoll_pwait
474 PTR sys_ioprio_set
475 PTR sys_ioprio_get
476 .size sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 2ceda4644a4d..6eac28337423 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -340,7 +340,7 @@ EXPORT(sysn32_call_table)
340 PTR compat_sys_statfs64 340 PTR compat_sys_statfs64
341 PTR compat_sys_fstatfs64 341 PTR compat_sys_fstatfs64
342 PTR sys_sendfile64 342 PTR sys_sendfile64
343 PTR sys32_timer_create /* 6220 */ 343 PTR compat_sys_timer_create /* 6220 */
344 PTR compat_sys_timer_settime 344 PTR compat_sys_timer_settime
345 PTR compat_sys_timer_gettime 345 PTR compat_sys_timer_gettime
346 PTR sys_timer_getoverrun 346 PTR sys_timer_getoverrun
@@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
361 PTR compat_sys_mq_notify 361 PTR compat_sys_mq_notify
362 PTR compat_sys_mq_getsetattr 362 PTR compat_sys_mq_getsetattr
363 PTR sys_ni_syscall /* 6240, sys_vserver */ 363 PTR sys_ni_syscall /* 6240, sys_vserver */
364 PTR sysn32_waitid 364 PTR compat_sys_waitid
365 PTR sys_ni_syscall /* available, was setaltroot */ 365 PTR sys_ni_syscall /* available, was setaltroot */
366 PTR sys_add_key 366 PTR sys_add_key
367 PTR sys_request_key 367 PTR sys_request_key
@@ -395,5 +395,8 @@ EXPORT(sysn32_call_table)
395 PTR compat_sys_set_robust_list 395 PTR compat_sys_set_robust_list
396 PTR compat_sys_get_robust_list 396 PTR compat_sys_get_robust_list
397 PTR compat_sys_kexec_load 397 PTR compat_sys_kexec_load
398 PTR sys_getcpu 398 PTR sys_getcpu /* 6275 */
399 PTR compat_sys_epoll_pwait 399 PTR compat_sys_epoll_pwait
400 PTR sys_ioprio_set
401 PTR sys_ioprio_get
402 .size sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index c5f590ca99b0..7e74b412a782 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -307,7 +307,7 @@ sys_call_table:
307 PTR compat_sys_statfs 307 PTR compat_sys_statfs
308 PTR compat_sys_fstatfs /* 4100 */ 308 PTR compat_sys_fstatfs /* 4100 */
309 PTR sys_ni_syscall /* sys_ioperm */ 309 PTR sys_ni_syscall /* sys_ioperm */
310 PTR sys32_socketcall 310 PTR compat_sys_socketcall
311 PTR sys_syslog 311 PTR sys_syslog
312 PTR compat_sys_setitimer 312 PTR compat_sys_setitimer
313 PTR compat_sys_getitimer /* 4105 */ 313 PTR compat_sys_getitimer /* 4105 */
@@ -462,7 +462,7 @@ sys_call_table:
462 PTR sys_fadvise64_64 462 PTR sys_fadvise64_64
463 PTR compat_sys_statfs64 /* 4255 */ 463 PTR compat_sys_statfs64 /* 4255 */
464 PTR compat_sys_fstatfs64 464 PTR compat_sys_fstatfs64
465 PTR sys32_timer_create 465 PTR compat_sys_timer_create
466 PTR compat_sys_timer_settime 466 PTR compat_sys_timer_settime
467 PTR compat_sys_timer_gettime 467 PTR compat_sys_timer_gettime
468 PTR sys_timer_getoverrun /* 4260 */ 468 PTR sys_timer_getoverrun /* 4260 */
@@ -518,5 +518,7 @@ sys_call_table:
518 PTR compat_sys_get_robust_list /* 4310 */ 518 PTR compat_sys_get_robust_list /* 4310 */
519 PTR compat_sys_kexec_load 519 PTR compat_sys_kexec_load
520 PTR sys_getcpu 520 PTR sys_getcpu
521 PTR sys_epoll_pwait 521 PTR compat_sys_epoll_pwait
522 PTR sys_ioprio_set
523 PTR sys_ioprio_get /* 4315 */
522 .size sys_call_table,.-sys_call_table 524 .size sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 394540fad769..4975da0bfb63 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -525,6 +525,14 @@ void __init setup_arch(char **cmdline_p)
525{ 525{
526 cpu_probe(); 526 cpu_probe();
527 prom_init(); 527 prom_init();
528
529#ifdef CONFIG_EARLY_PRINTK
530 {
531 extern void setup_early_printk(void);
532
533 setup_early_printk();
534 }
535#endif
528 cpu_report(); 536 cpu_report();
529 537
530#if defined(CONFIG_VT) 538#if defined(CONFIG_VT)
@@ -543,7 +551,7 @@ void __init setup_arch(char **cmdline_p)
543#endif 551#endif
544} 552}
545 553
546int __init fpu_disable(char *s) 554static int __init fpu_disable(char *s)
547{ 555{
548 int i; 556 int i;
549 557
@@ -555,7 +563,7 @@ int __init fpu_disable(char *s)
555 563
556__setup("nofpu", fpu_disable); 564__setup("nofpu", fpu_disable);
557 565
558int __init dsp_disable(char *s) 566static int __init dsp_disable(char *s)
559{ 567{
560 cpu_data[0].ases &= ~MIPS_ASE_DSP; 568 cpu_data[0].ases &= ~MIPS_ASE_DSP;
561 569
diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h
index fdbdbdc65b54..c0faabd52010 100644
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
@@ -31,4 +31,16 @@ extern void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
31 */ 31 */
32extern int install_sigtramp(unsigned int __user *tramp, unsigned int syscall); 32extern int install_sigtramp(unsigned int __user *tramp, unsigned int syscall);
33 33
34/* Check and clear pending FPU exceptions in saved CSR */
35extern int fpcsr_pending(unsigned int __user *fpcsr);
36
37/* Make sure we will not lose FPU ownership */
38#ifdef CONFIG_PREEMPT
39#define lock_fpu_owner() preempt_disable()
40#define unlock_fpu_owner() preempt_enable()
41#else
42#define lock_fpu_owner() pagefault_disable()
43#define unlock_fpu_owner() pagefault_enable()
44#endif
45
34#endif /* __SIGNAL_COMMON_H */ 46#endif /* __SIGNAL_COMMON_H */
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index b2e9ab1bb101..07d67309451a 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -20,6 +20,7 @@
20#include <linux/ptrace.h> 20#include <linux/ptrace.h>
21#include <linux/unistd.h> 21#include <linux/unistd.h>
22#include <linux/compiler.h> 22#include <linux/compiler.h>
23#include <linux/uaccess.h>
23 24
24#include <asm/abi.h> 25#include <asm/abi.h>
25#include <asm/asm.h> 26#include <asm/asm.h>
@@ -27,7 +28,6 @@
27#include <asm/cacheflush.h> 28#include <asm/cacheflush.h>
28#include <asm/fpu.h> 29#include <asm/fpu.h>
29#include <asm/sim.h> 30#include <asm/sim.h>
30#include <asm/uaccess.h>
31#include <asm/ucontext.h> 31#include <asm/ucontext.h>
32#include <asm/cpu-features.h> 32#include <asm/cpu-features.h>
33#include <asm/war.h> 33#include <asm/war.h>
@@ -78,10 +78,51 @@ struct rt_sigframe {
78/* 78/*
79 * Helper routines 79 * Helper routines
80 */ 80 */
81static int protected_save_fp_context(struct sigcontext __user *sc)
82{
83 int err;
84 while (1) {
85 lock_fpu_owner();
86 own_fpu_inatomic(1);
87 err = save_fp_context(sc); /* this might fail */
88 unlock_fpu_owner();
89 if (likely(!err))
90 break;
91 /* touch the sigcontext and try again */
92 err = __put_user(0, &sc->sc_fpregs[0]) |
93 __put_user(0, &sc->sc_fpregs[31]) |
94 __put_user(0, &sc->sc_fpc_csr);
95 if (err)
96 break; /* really bad sigcontext */
97 }
98 return err;
99}
100
101static int protected_restore_fp_context(struct sigcontext __user *sc)
102{
103 int err, tmp;
104 while (1) {
105 lock_fpu_owner();
106 own_fpu_inatomic(0);
107 err = restore_fp_context(sc); /* this might fail */
108 unlock_fpu_owner();
109 if (likely(!err))
110 break;
111 /* touch the sigcontext and try again */
112 err = __get_user(tmp, &sc->sc_fpregs[0]) |
113 __get_user(tmp, &sc->sc_fpregs[31]) |
114 __get_user(tmp, &sc->sc_fpc_csr);
115 if (err)
116 break; /* really bad sigcontext */
117 }
118 return err;
119}
120
81int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 121int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
82{ 122{
83 int err = 0; 123 int err = 0;
84 int i; 124 int i;
125 unsigned int used_math;
85 126
86 err |= __put_user(regs->cp0_epc, &sc->sc_pc); 127 err |= __put_user(regs->cp0_epc, &sc->sc_pc);
87 128
@@ -89,6 +130,9 @@ int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
89 for (i = 1; i < 32; i++) 130 for (i = 1; i < 32; i++)
90 err |= __put_user(regs->regs[i], &sc->sc_regs[i]); 131 err |= __put_user(regs->regs[i], &sc->sc_regs[i]);
91 132
133#ifdef CONFIG_CPU_HAS_SMARTMIPS
134 err |= __put_user(regs->acx, &sc->sc_acx);
135#endif
92 err |= __put_user(regs->hi, &sc->sc_mdhi); 136 err |= __put_user(regs->hi, &sc->sc_mdhi);
93 err |= __put_user(regs->lo, &sc->sc_mdlo); 137 err |= __put_user(regs->lo, &sc->sc_mdlo);
94 if (cpu_has_dsp) { 138 if (cpu_has_dsp) {
@@ -101,24 +145,48 @@ int setup_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
101 err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp); 145 err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
102 } 146 }
103 147
104 err |= __put_user(!!used_math(), &sc->sc_used_math); 148 used_math = !!used_math();
149 err |= __put_user(used_math, &sc->sc_used_math);
105 150
106 if (used_math()) { 151 if (used_math) {
107 /* 152 /*
108 * Save FPU state to signal context. Signal handler 153 * Save FPU state to signal context. Signal handler
109 * will "inherit" current FPU state. 154 * will "inherit" current FPU state.
110 */ 155 */
111 preempt_disable(); 156 err |= protected_save_fp_context(sc);
157 }
158 return err;
159}
112 160
113 if (!is_fpu_owner()) { 161int fpcsr_pending(unsigned int __user *fpcsr)
114 own_fpu(); 162{
115 restore_fp(current); 163 int err, sig = 0;
116 } 164 unsigned int csr, enabled;
117 err |= save_fp_context(sc);
118 165
119 preempt_enable(); 166 err = __get_user(csr, fpcsr);
167 enabled = FPU_CSR_UNI_X | ((csr & FPU_CSR_ALL_E) << 5);
168 /*
169 * If the signal handler set some FPU exceptions, clear it and
170 * send SIGFPE.
171 */
172 if (csr & enabled) {
173 csr &= ~enabled;
174 err |= __put_user(csr, fpcsr);
175 sig = SIGFPE;
120 } 176 }
121 return err; 177 return err ?: sig;
178}
179
180static int
181check_and_restore_fp_context(struct sigcontext __user *sc)
182{
183 int err, sig;
184
185 err = sig = fpcsr_pending(&sc->sc_fpc_csr);
186 if (err > 0)
187 err = 0;
188 err |= protected_restore_fp_context(sc);
189 return err ?: sig;
122} 190}
123 191
124int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) 192int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
@@ -132,6 +200,10 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
132 current_thread_info()->restart_block.fn = do_no_restart_syscall; 200 current_thread_info()->restart_block.fn = do_no_restart_syscall;
133 201
134 err |= __get_user(regs->cp0_epc, &sc->sc_pc); 202 err |= __get_user(regs->cp0_epc, &sc->sc_pc);
203
204#ifdef CONFIG_CPU_HAS_SMARTMIPS
205 err |= __get_user(regs->acx, &sc->sc_acx);
206#endif
135 err |= __get_user(regs->hi, &sc->sc_mdhi); 207 err |= __get_user(regs->hi, &sc->sc_mdhi);
136 err |= __get_user(regs->lo, &sc->sc_mdlo); 208 err |= __get_user(regs->lo, &sc->sc_mdlo);
137 if (cpu_has_dsp) { 209 if (cpu_has_dsp) {
@@ -150,19 +222,15 @@ int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
150 err |= __get_user(used_math, &sc->sc_used_math); 222 err |= __get_user(used_math, &sc->sc_used_math);
151 conditional_used_math(used_math); 223 conditional_used_math(used_math);
152 224
153 preempt_disable(); 225 if (used_math) {
154
155 if (used_math()) {
156 /* restore fpu context if we have used it before */ 226 /* restore fpu context if we have used it before */
157 own_fpu(); 227 if (!err)
158 err |= restore_fp_context(sc); 228 err = check_and_restore_fp_context(sc);
159 } else { 229 } else {
160 /* signal handler may have used FPU. Give it up. */ 230 /* signal handler may have used FPU. Give it up. */
161 lose_fpu(); 231 lose_fpu(0);
162 } 232 }
163 233
164 preempt_enable();
165
166 return err; 234 return err;
167} 235}
168 236
@@ -325,6 +393,7 @@ asmlinkage void sys_sigreturn(nabi_no_regargs struct pt_regs regs)
325{ 393{
326 struct sigframe __user *frame; 394 struct sigframe __user *frame;
327 sigset_t blocked; 395 sigset_t blocked;
396 int sig;
328 397
329 frame = (struct sigframe __user *) regs.regs[29]; 398 frame = (struct sigframe __user *) regs.regs[29];
330 if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) 399 if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
@@ -338,8 +407,11 @@ asmlinkage void sys_sigreturn(nabi_no_regargs struct pt_regs regs)
338 recalc_sigpending(); 407 recalc_sigpending();
339 spin_unlock_irq(&current->sighand->siglock); 408 spin_unlock_irq(&current->sighand->siglock);
340 409
341 if (restore_sigcontext(&regs, &frame->sf_sc)) 410 sig = restore_sigcontext(&regs, &frame->sf_sc);
411 if (sig < 0)
342 goto badframe; 412 goto badframe;
413 else if (sig)
414 force_sig(sig, current);
343 415
344 /* 416 /*
345 * Don't let your children do this ... 417 * Don't let your children do this ...
@@ -361,6 +433,7 @@ asmlinkage void sys_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
361 struct rt_sigframe __user *frame; 433 struct rt_sigframe __user *frame;
362 sigset_t set; 434 sigset_t set;
363 stack_t st; 435 stack_t st;
436 int sig;
364 437
365 frame = (struct rt_sigframe __user *) regs.regs[29]; 438 frame = (struct rt_sigframe __user *) regs.regs[29];
366 if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) 439 if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
@@ -374,8 +447,11 @@ asmlinkage void sys_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
374 recalc_sigpending(); 447 recalc_sigpending();
375 spin_unlock_irq(&current->sighand->siglock); 448 spin_unlock_irq(&current->sighand->siglock);
376 449
377 if (restore_sigcontext(&regs, &frame->rs_uc.uc_mcontext)) 450 sig = restore_sigcontext(&regs, &frame->rs_uc.uc_mcontext);
451 if (sig < 0)
378 goto badframe; 452 goto badframe;
453 else if (sig)
454 force_sig(sig, current);
379 455
380 if (__copy_from_user(&st, &frame->rs_uc.uc_stack, sizeof(st))) 456 if (__copy_from_user(&st, &frame->rs_uc.uc_stack, sizeof(st)))
381 goto badframe; 457 goto badframe;
@@ -398,7 +474,7 @@ badframe:
398} 474}
399 475
400#ifdef CONFIG_TRAD_SIGNALS 476#ifdef CONFIG_TRAD_SIGNALS
401int setup_frame(struct k_sigaction * ka, struct pt_regs *regs, 477static int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
402 int signr, sigset_t *set) 478 int signr, sigset_t *set)
403{ 479{
404 struct sigframe __user *frame; 480 struct sigframe __user *frame;
@@ -443,7 +519,7 @@ give_sigsegv:
443} 519}
444#endif 520#endif
445 521
446int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs, 522static int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
447 int signr, sigset_t *set, siginfo_t *info) 523 int signr, sigset_t *set, siginfo_t *info)
448{ 524{
449 struct rt_sigframe __user *frame; 525 struct rt_sigframe __user *frame;
@@ -501,6 +577,14 @@ give_sigsegv:
501 return -EFAULT; 577 return -EFAULT;
502} 578}
503 579
580struct mips_abi mips_abi = {
581#ifdef CONFIG_TRAD_SIGNALS
582 .setup_frame = setup_frame,
583#endif
584 .setup_rt_frame = setup_rt_frame,
585 .restart = __NR_restart_syscall
586};
587
504static int handle_signal(unsigned long sig, siginfo_t *info, 588static int handle_signal(unsigned long sig, siginfo_t *info,
505 struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs) 589 struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
506{ 590{
@@ -539,7 +623,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
539 return ret; 623 return ret;
540} 624}
541 625
542void do_signal(struct pt_regs *regs) 626static void do_signal(struct pt_regs *regs)
543{ 627{
544 struct k_sigaction ka; 628 struct k_sigaction ka;
545 sigset_t *oldset; 629 sigset_t *oldset;
@@ -589,7 +673,7 @@ void do_signal(struct pt_regs *regs)
589 regs->cp0_epc -= 8; 673 regs->cp0_epc -= 8;
590 } 674 }
591 if (regs->regs[2] == ERESTART_RESTARTBLOCK) { 675 if (regs->regs[2] == ERESTART_RESTARTBLOCK) {
592 regs->regs[2] = __NR_restart_syscall; 676 regs->regs[2] = current->thread.abi->restart;
593 regs->regs[7] = regs->regs[26]; 677 regs->regs[7] = regs->regs[26];
594 regs->cp0_epc -= 4; 678 regs->cp0_epc -= 4;
595 } 679 }
@@ -615,5 +699,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused,
615{ 699{
616 /* deal with pending signal delivery */ 700 /* deal with pending signal delivery */
617 if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) 701 if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
618 current->thread.abi->do_signal(regs); 702 do_signal(regs);
619} 703}
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index c28cb21514c8..b9a014411f83 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -22,6 +22,7 @@
22#include <linux/compat.h> 22#include <linux/compat.h>
23#include <linux/suspend.h> 23#include <linux/suspend.h>
24#include <linux/compiler.h> 24#include <linux/compiler.h>
25#include <linux/uaccess.h>
25 26
26#include <asm/abi.h> 27#include <asm/abi.h>
27#include <asm/asm.h> 28#include <asm/asm.h>
@@ -29,7 +30,6 @@
29#include <linux/bitops.h> 30#include <linux/bitops.h>
30#include <asm/cacheflush.h> 31#include <asm/cacheflush.h>
31#include <asm/sim.h> 32#include <asm/sim.h>
32#include <asm/uaccess.h>
33#include <asm/ucontext.h> 33#include <asm/ucontext.h>
34#include <asm/system.h> 34#include <asm/system.h>
35#include <asm/fpu.h> 35#include <asm/fpu.h>
@@ -104,17 +104,10 @@ typedef struct compat_siginfo {
104 */ 104 */
105#define __NR_O32_sigreturn 4119 105#define __NR_O32_sigreturn 4119
106#define __NR_O32_rt_sigreturn 4193 106#define __NR_O32_rt_sigreturn 4193
107#define __NR_O32_restart_syscall 4253 107#define __NR_O32_restart_syscall 4253
108 108
109/* 32-bit compatibility types */ 109/* 32-bit compatibility types */
110 110
111#define _NSIG_BPW32 32
112#define _NSIG_WORDS32 (_NSIG / _NSIG_BPW32)
113
114typedef struct {
115 unsigned int sig[_NSIG_WORDS32];
116} sigset_t32;
117
118typedef unsigned int __sighandler32_t; 111typedef unsigned int __sighandler32_t;
119typedef void (*vfptr_t)(void); 112typedef void (*vfptr_t)(void);
120 113
@@ -136,7 +129,7 @@ struct ucontext32 {
136 s32 uc_link; 129 s32 uc_link;
137 stack32_t uc_stack; 130 stack32_t uc_stack;
138 struct sigcontext32 uc_mcontext; 131 struct sigcontext32 uc_mcontext;
139 sigset_t32 uc_sigmask; /* mask last for extensibility */ 132 compat_sigset_t uc_sigmask; /* mask last for extensibility */
140}; 133};
141 134
142/* 135/*
@@ -150,7 +143,7 @@ struct sigframe32 {
150 u32 sf_ass[4]; /* argument save space for o32 */ 143 u32 sf_ass[4]; /* argument save space for o32 */
151 u32 sf_code[2]; /* signal trampoline */ 144 u32 sf_code[2]; /* signal trampoline */
152 struct sigcontext32 sf_sc; 145 struct sigcontext32 sf_sc;
153 sigset_t sf_mask; 146 compat_sigset_t sf_mask;
154}; 147};
155 148
156struct rt_sigframe32 { 149struct rt_sigframe32 {
@@ -166,7 +159,7 @@ struct sigframe32 {
166 u32 sf_ass[4]; /* argument save space for o32 */ 159 u32 sf_ass[4]; /* argument save space for o32 */
167 u32 sf_pad[2]; 160 u32 sf_pad[2];
168 struct sigcontext32 sf_sc; /* hw context */ 161 struct sigcontext32 sf_sc; /* hw context */
169 sigset_t sf_mask; 162 compat_sigset_t sf_mask;
170 u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */ 163 u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */
171}; 164};
172 165
@@ -183,11 +176,52 @@ struct rt_sigframe32 {
183/* 176/*
184 * sigcontext handlers 177 * sigcontext handlers
185 */ 178 */
179static int protected_save_fp_context32(struct sigcontext32 __user *sc)
180{
181 int err;
182 while (1) {
183 lock_fpu_owner();
184 own_fpu_inatomic(1);
185 err = save_fp_context32(sc); /* this might fail */
186 unlock_fpu_owner();
187 if (likely(!err))
188 break;
189 /* touch the sigcontext and try again */
190 err = __put_user(0, &sc->sc_fpregs[0]) |
191 __put_user(0, &sc->sc_fpregs[31]) |
192 __put_user(0, &sc->sc_fpc_csr);
193 if (err)
194 break; /* really bad sigcontext */
195 }
196 return err;
197}
198
199static int protected_restore_fp_context32(struct sigcontext32 __user *sc)
200{
201 int err, tmp;
202 while (1) {
203 lock_fpu_owner();
204 own_fpu_inatomic(0);
205 err = restore_fp_context32(sc); /* this might fail */
206 unlock_fpu_owner();
207 if (likely(!err))
208 break;
209 /* touch the sigcontext and try again */
210 err = __get_user(tmp, &sc->sc_fpregs[0]) |
211 __get_user(tmp, &sc->sc_fpregs[31]) |
212 __get_user(tmp, &sc->sc_fpc_csr);
213 if (err)
214 break; /* really bad sigcontext */
215 }
216 return err;
217}
218
186static int setup_sigcontext32(struct pt_regs *regs, 219static int setup_sigcontext32(struct pt_regs *regs,
187 struct sigcontext32 __user *sc) 220 struct sigcontext32 __user *sc)
188{ 221{
189 int err = 0; 222 int err = 0;
190 int i; 223 int i;
224 u32 used_math;
191 225
192 err |= __put_user(regs->cp0_epc, &sc->sc_pc); 226 err |= __put_user(regs->cp0_epc, &sc->sc_pc);
193 227
@@ -207,26 +241,31 @@ static int setup_sigcontext32(struct pt_regs *regs,
207 err |= __put_user(mflo3(), &sc->sc_lo3); 241 err |= __put_user(mflo3(), &sc->sc_lo3);
208 } 242 }
209 243
210 err |= __put_user(!!used_math(), &sc->sc_used_math); 244 used_math = !!used_math();
245 err |= __put_user(used_math, &sc->sc_used_math);
211 246
212 if (used_math()) { 247 if (used_math) {
213 /* 248 /*
214 * Save FPU state to signal context. Signal handler 249 * Save FPU state to signal context. Signal handler
215 * will "inherit" current FPU state. 250 * will "inherit" current FPU state.
216 */ 251 */
217 preempt_disable(); 252 err |= protected_save_fp_context32(sc);
218
219 if (!is_fpu_owner()) {
220 own_fpu();
221 restore_fp(current);
222 }
223 err |= save_fp_context32(sc);
224
225 preempt_enable();
226 } 253 }
227 return err; 254 return err;
228} 255}
229 256
257static int
258check_and_restore_fp_context32(struct sigcontext32 __user *sc)
259{
260 int err, sig;
261
262 err = sig = fpcsr_pending(&sc->sc_fpc_csr);
263 if (err > 0)
264 err = 0;
265 err |= protected_restore_fp_context32(sc);
266 return err ?: sig;
267}
268
230static int restore_sigcontext32(struct pt_regs *regs, 269static int restore_sigcontext32(struct pt_regs *regs,
231 struct sigcontext32 __user *sc) 270 struct sigcontext32 __user *sc)
232{ 271{
@@ -257,19 +296,15 @@ static int restore_sigcontext32(struct pt_regs *regs,
257 err |= __get_user(used_math, &sc->sc_used_math); 296 err |= __get_user(used_math, &sc->sc_used_math);
258 conditional_used_math(used_math); 297 conditional_used_math(used_math);
259 298
260 preempt_disable(); 299 if (used_math) {
261
262 if (used_math()) {
263 /* restore fpu context if we have used it before */ 300 /* restore fpu context if we have used it before */
264 own_fpu(); 301 if (!err)
265 err |= restore_fp_context32(sc); 302 err = check_and_restore_fp_context32(sc);
266 } else { 303 } else {
267 /* signal handler may have used FPU. Give it up. */ 304 /* signal handler may have used FPU. Give it up. */
268 lose_fpu(); 305 lose_fpu(0);
269 } 306 }
270 307
271 preempt_enable();
272
273 return err; 308 return err;
274} 309}
275 310
@@ -515,6 +550,7 @@ asmlinkage void sys32_sigreturn(nabi_no_regargs struct pt_regs regs)
515{ 550{
516 struct sigframe32 __user *frame; 551 struct sigframe32 __user *frame;
517 sigset_t blocked; 552 sigset_t blocked;
553 int sig;
518 554
519 frame = (struct sigframe32 __user *) regs.regs[29]; 555 frame = (struct sigframe32 __user *) regs.regs[29];
520 if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) 556 if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
@@ -528,8 +564,11 @@ asmlinkage void sys32_sigreturn(nabi_no_regargs struct pt_regs regs)
528 recalc_sigpending(); 564 recalc_sigpending();
529 spin_unlock_irq(&current->sighand->siglock); 565 spin_unlock_irq(&current->sighand->siglock);
530 566
531 if (restore_sigcontext32(&regs, &frame->sf_sc)) 567 sig = restore_sigcontext32(&regs, &frame->sf_sc);
568 if (sig < 0)
532 goto badframe; 569 goto badframe;
570 else if (sig)
571 force_sig(sig, current);
533 572
534 /* 573 /*
535 * Don't let your children do this ... 574 * Don't let your children do this ...
@@ -552,6 +591,7 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
552 sigset_t set; 591 sigset_t set;
553 stack_t st; 592 stack_t st;
554 s32 sp; 593 s32 sp;
594 int sig;
555 595
556 frame = (struct rt_sigframe32 __user *) regs.regs[29]; 596 frame = (struct rt_sigframe32 __user *) regs.regs[29];
557 if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) 597 if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
@@ -565,8 +605,11 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
565 recalc_sigpending(); 605 recalc_sigpending();
566 spin_unlock_irq(&current->sighand->siglock); 606 spin_unlock_irq(&current->sighand->siglock);
567 607
568 if (restore_sigcontext32(&regs, &frame->rs_uc.uc_mcontext)) 608 sig = restore_sigcontext32(&regs, &frame->rs_uc.uc_mcontext);
609 if (sig < 0)
569 goto badframe; 610 goto badframe;
611 else if (sig)
612 force_sig(sig, current);
570 613
571 /* The ucontext contains a stack32_t, so we must convert! */ 614 /* The ucontext contains a stack32_t, so we must convert! */
572 if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp)) 615 if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp))
@@ -598,7 +641,7 @@ badframe:
598 force_sig(SIGSEGV, current); 641 force_sig(SIGSEGV, current);
599} 642}
600 643
601int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs, 644static int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
602 int signr, sigset_t *set) 645 int signr, sigset_t *set)
603{ 646{
604 struct sigframe32 __user *frame; 647 struct sigframe32 __user *frame;
@@ -644,7 +687,7 @@ give_sigsegv:
644 return -EFAULT; 687 return -EFAULT;
645} 688}
646 689
647int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, 690static int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
648 int signr, sigset_t *set, siginfo_t *info) 691 int signr, sigset_t *set, siginfo_t *info)
649{ 692{
650 struct rt_sigframe32 __user *frame; 693 struct rt_sigframe32 __user *frame;
@@ -704,110 +747,14 @@ give_sigsegv:
704 return -EFAULT; 747 return -EFAULT;
705} 748}
706 749
707static inline int handle_signal(unsigned long sig, siginfo_t *info, 750/*
708 struct k_sigaction *ka, sigset_t *oldset, struct pt_regs * regs) 751 * o32 compatibility on 64-bit kernels, without DSP ASE
709{ 752 */
710 int ret; 753struct mips_abi mips_abi_32 = {
711 754 .setup_frame = setup_frame_32,
712 switch (regs->regs[0]) { 755 .setup_rt_frame = setup_rt_frame_32,
713 case ERESTART_RESTARTBLOCK: 756 .restart = __NR_O32_restart_syscall
714 case ERESTARTNOHAND: 757};
715 regs->regs[2] = EINTR;
716 break;
717 case ERESTARTSYS:
718 if (!(ka->sa.sa_flags & SA_RESTART)) {
719 regs->regs[2] = EINTR;
720 break;
721 }
722 /* fallthrough */
723 case ERESTARTNOINTR: /* Userland will reload $v0. */
724 regs->regs[7] = regs->regs[26];
725 regs->cp0_epc -= 8;
726 }
727
728 regs->regs[0] = 0; /* Don't deal with this again. */
729
730 if (ka->sa.sa_flags & SA_SIGINFO)
731 ret = current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);
732 else
733 ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);
734
735 spin_lock_irq(&current->sighand->siglock);
736 sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
737 if (!(ka->sa.sa_flags & SA_NODEFER))
738 sigaddset(&current->blocked,sig);
739 recalc_sigpending();
740 spin_unlock_irq(&current->sighand->siglock);
741
742 return ret;
743}
744
745void do_signal32(struct pt_regs *regs)
746{
747 struct k_sigaction ka;
748 sigset_t *oldset;
749 siginfo_t info;
750 int signr;
751
752 /*
753 * We want the common case to go fast, which is why we may in certain
754 * cases get here from kernel mode. Just return without doing anything
755 * if so.
756 */
757 if (!user_mode(regs))
758 return;
759
760 if (test_thread_flag(TIF_RESTORE_SIGMASK))
761 oldset = &current->saved_sigmask;
762 else
763 oldset = &current->blocked;
764
765 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
766 if (signr > 0) {
767 /* Whee! Actually deliver the signal. */
768 if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
769 /*
770 * A signal was successfully delivered; the saved
771 * sigmask will have been stored in the signal frame,
772 * and will be restored by sigreturn, so we can simply
773 * clear the TIF_RESTORE_SIGMASK flag.
774 */
775 if (test_thread_flag(TIF_RESTORE_SIGMASK))
776 clear_thread_flag(TIF_RESTORE_SIGMASK);
777 }
778
779 return;
780 }
781
782 /*
783 * Who's code doesn't conform to the restartable syscall convention
784 * dies here!!! The li instruction, a single machine instruction,
785 * must directly be followed by the syscall instruction.
786 */
787 if (regs->regs[0]) {
788 if (regs->regs[2] == ERESTARTNOHAND ||
789 regs->regs[2] == ERESTARTSYS ||
790 regs->regs[2] == ERESTARTNOINTR) {
791 regs->regs[7] = regs->regs[26];
792 regs->cp0_epc -= 8;
793 }
794 if (regs->regs[2] == ERESTART_RESTARTBLOCK) {
795 regs->regs[2] = __NR_O32_restart_syscall;
796 regs->regs[7] = regs->regs[26];
797 regs->cp0_epc -= 4;
798 }
799 regs->regs[0] = 0; /* Don't deal with this again. */
800 }
801
802 /*
803 * If there's no signal to deliver, we just put the saved sigmask
804 * back
805 */
806 if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
807 clear_thread_flag(TIF_RESTORE_SIGMASK);
808 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
809 }
810}
811 758
812asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 __user *act, 759asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
813 struct sigaction32 __user *oact, 760 struct sigaction32 __user *oact,
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 7ca2a078841f..a9202fa95987 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -29,6 +29,7 @@
29#include <linux/compat.h> 29#include <linux/compat.h>
30#include <linux/bitops.h> 30#include <linux/bitops.h>
31 31
32#include <asm/abi.h>
32#include <asm/asm.h> 33#include <asm/asm.h>
33#include <asm/cacheflush.h> 34#include <asm/cacheflush.h>
34#include <asm/compat-signal.h> 35#include <asm/compat-signal.h>
@@ -126,6 +127,7 @@ asmlinkage void sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
126 sigset_t set; 127 sigset_t set;
127 stack_t st; 128 stack_t st;
128 s32 sp; 129 s32 sp;
130 int sig;
129 131
130 frame = (struct rt_sigframe_n32 __user *) regs.regs[29]; 132 frame = (struct rt_sigframe_n32 __user *) regs.regs[29];
131 if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) 133 if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
@@ -139,8 +141,11 @@ asmlinkage void sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
139 recalc_sigpending(); 141 recalc_sigpending();
140 spin_unlock_irq(&current->sighand->siglock); 142 spin_unlock_irq(&current->sighand->siglock);
141 143
142 if (restore_sigcontext(&regs, &frame->rs_uc.uc_mcontext)) 144 sig = restore_sigcontext(&regs, &frame->rs_uc.uc_mcontext);
145 if (sig < 0)
143 goto badframe; 146 goto badframe;
147 else if (sig)
148 force_sig(sig, current);
144 149
145 /* The ucontext contains a stack32_t, so we must convert! */ 150 /* The ucontext contains a stack32_t, so we must convert! */
146 if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp)) 151 if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp))
@@ -169,7 +174,7 @@ badframe:
169 force_sig(SIGSEGV, current); 174 force_sig(SIGSEGV, current);
170} 175}
171 176
172int setup_rt_frame_n32(struct k_sigaction * ka, 177static int setup_rt_frame_n32(struct k_sigaction * ka,
173 struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info) 178 struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info)
174{ 179{
175 struct rt_sigframe_n32 __user *frame; 180 struct rt_sigframe_n32 __user *frame;
@@ -228,3 +233,8 @@ give_sigsegv:
228 force_sigsegv(signr, current); 233 force_sigsegv(signr, current);
229 return -EFAULT; 234 return -EFAULT;
230} 235}
236
237struct mips_abi mips_abi_n32 = {
238 .setup_rt_frame = setup_rt_frame_n32,
239 .restart = __NR_N32_restart_syscall
240};
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 0555fc554f65..c46e479c992b 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -51,31 +51,14 @@ int __cpu_logical_map[NR_CPUS]; /* Map logical to physical */
51EXPORT_SYMBOL(phys_cpu_present_map); 51EXPORT_SYMBOL(phys_cpu_present_map);
52EXPORT_SYMBOL(cpu_online_map); 52EXPORT_SYMBOL(cpu_online_map);
53 53
54/* This happens early in bootup, can't really do it better */
54static void smp_tune_scheduling (void) 55static void smp_tune_scheduling (void)
55{ 56{
56 struct cache_desc *cd = &current_cpu_data.scache; 57 struct cache_desc *cd = &current_cpu_data.scache;
57 unsigned long cachesize; /* kB */ 58 unsigned long cachesize = cd->linesz * cd->sets * cd->ways;
58 unsigned long cpu_khz;
59 59
60 /* 60 if (cachesize > max_cache_size)
61 * Crude estimate until we actually meassure ... 61 max_cache_size = cachesize;
62 */
63 cpu_khz = loops_per_jiffy * 2 * HZ / 1000;
64
65 /*
66 * Rough estimation for SMP scheduling, this is the number of
67 * cycles it takes for a fully memory-limited process to flush
68 * the SMP-local cache.
69 *
70 * (For a P5 this pretty much means we will choose another idle
71 * CPU almost always at wakeup time (this is due to the small
72 * L1 cache), on PIIs it's around 50-100 usecs, depending on
73 * the cache size)
74 */
75 if (!cpu_khz)
76 return;
77
78 cachesize = cd->linesz * cd->sets * cd->ways;
79} 62}
80 63
81extern void __init calibrate_delay(void); 64extern void __init calibrate_delay(void);
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 9251ea824937..5dcfab6b288e 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -4,6 +4,7 @@
4#include <linux/sched.h> 4#include <linux/sched.h>
5#include <linux/cpumask.h> 5#include <linux/cpumask.h>
6#include <linux/interrupt.h> 6#include <linux/interrupt.h>
7#include <linux/kernel_stat.h>
7#include <linux/module.h> 8#include <linux/module.h>
8 9
9#include <asm/cpu.h> 10#include <asm/cpu.h>
@@ -14,6 +15,7 @@
14#include <asm/hazards.h> 15#include <asm/hazards.h>
15#include <asm/mmu_context.h> 16#include <asm/mmu_context.h>
16#include <asm/smp.h> 17#include <asm/smp.h>
18#include <asm/mips-boards/maltaint.h>
17#include <asm/mipsregs.h> 19#include <asm/mipsregs.h>
18#include <asm/cacheflush.h> 20#include <asm/cacheflush.h>
19#include <asm/time.h> 21#include <asm/time.h>
@@ -75,7 +77,7 @@ static struct smtc_ipi_q freeIPIq;
75 77
76void ipi_decode(struct smtc_ipi *); 78void ipi_decode(struct smtc_ipi *);
77static void post_direct_ipi(int cpu, struct smtc_ipi *pipi); 79static void post_direct_ipi(int cpu, struct smtc_ipi *pipi);
78static void setup_cross_vpe_interrupts(void); 80static void setup_cross_vpe_interrupts(unsigned int nvpe);
79void init_smtc_stats(void); 81void init_smtc_stats(void);
80 82
81/* Global SMTC Status */ 83/* Global SMTC Status */
@@ -141,10 +143,7 @@ __setup("ipibufs=", ipibufs);
141__setup("nostlb", stlb_disable); 143__setup("nostlb", stlb_disable);
142__setup("asidmask=", asidmask_set); 144__setup("asidmask=", asidmask_set);
143 145
144/* Enable additional debug checks before going into CPU idle loop */ 146#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
145#define SMTC_IDLE_HOOK_DEBUG
146
147#ifdef SMTC_IDLE_HOOK_DEBUG
148 147
149static int hang_trig = 0; 148static int hang_trig = 0;
150 149
@@ -171,12 +170,15 @@ __setup("tintq=", tintq);
171 170
172int imstuckcount[2][8]; 171int imstuckcount[2][8];
173/* vpemask represents IM/IE bits of per-VPE Status registers, low-to-high */ 172/* vpemask represents IM/IE bits of per-VPE Status registers, low-to-high */
174int vpemask[2][8] = {{0,1,1,0,0,0,0,1},{0,1,0,0,0,0,0,1}}; 173int vpemask[2][8] = {
174 {0, 0, 1, 0, 0, 0, 0, 1},
175 {0, 0, 0, 0, 0, 0, 0, 1}
176};
175int tcnoprog[NR_CPUS]; 177int tcnoprog[NR_CPUS];
176static atomic_t idle_hook_initialized = {0}; 178static atomic_t idle_hook_initialized = {0};
177static int clock_hang_reported[NR_CPUS]; 179static int clock_hang_reported[NR_CPUS];
178 180
179#endif /* SMTC_IDLE_HOOK_DEBUG */ 181#endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */
180 182
181/* Initialize shared TLB - the should probably migrate to smtc_setup_cpus() */ 183/* Initialize shared TLB - the should probably migrate to smtc_setup_cpus() */
182 184
@@ -394,10 +396,10 @@ void mipsmt_prepare_cpus(void)
394 printk("ASID mask value override to 0x%x\n", asidmask); 396 printk("ASID mask value override to 0x%x\n", asidmask);
395 397
396 /* Temporary */ 398 /* Temporary */
397#ifdef SMTC_IDLE_HOOK_DEBUG 399#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
398 if (hang_trig) 400 if (hang_trig)
399 printk("Logic Analyser Trigger on suspected TC hang\n"); 401 printk("Logic Analyser Trigger on suspected TC hang\n");
400#endif /* SMTC_IDLE_HOOK_DEBUG */ 402#endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */
401 403
402 /* Put MVPE's into 'configuration state' */ 404 /* Put MVPE's into 'configuration state' */
403 write_c0_mvpcontrol( read_c0_mvpcontrol() | MVPCONTROL_VPC ); 405 write_c0_mvpcontrol( read_c0_mvpcontrol() | MVPCONTROL_VPC );
@@ -504,8 +506,7 @@ void mipsmt_prepare_cpus(void)
504 506
505 /* If we have multiple VPEs running, set up the cross-VPE interrupt */ 507 /* If we have multiple VPEs running, set up the cross-VPE interrupt */
506 508
507 if (nvpe > 1) 509 setup_cross_vpe_interrupts(nvpe);
508 setup_cross_vpe_interrupts();
509 510
510 /* Set up queue of free IPI "messages". */ 511 /* Set up queue of free IPI "messages". */
511 nipi = NR_CPUS * IPIBUF_PER_CPU; 512 nipi = NR_CPUS * IPIBUF_PER_CPU;
@@ -610,7 +611,12 @@ void smtc_cpus_done(void)
610int setup_irq_smtc(unsigned int irq, struct irqaction * new, 611int setup_irq_smtc(unsigned int irq, struct irqaction * new,
611 unsigned long hwmask) 612 unsigned long hwmask)
612{ 613{
614 unsigned int vpe = current_cpu_data.vpe_id;
615
613 irq_hwmask[irq] = hwmask; 616 irq_hwmask[irq] = hwmask;
617#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
618 vpemask[vpe][irq - MIPSCPU_INT_BASE] = 1;
619#endif
614 620
615 return setup_irq(irq, new); 621 return setup_irq(irq, new);
616} 622}
@@ -815,12 +821,15 @@ void ipi_decode(struct smtc_ipi *pipi)
815 smtc_ipi_nq(&freeIPIq, pipi); 821 smtc_ipi_nq(&freeIPIq, pipi);
816 switch (type_copy) { 822 switch (type_copy) {
817 case SMTC_CLOCK_TICK: 823 case SMTC_CLOCK_TICK:
824 irq_enter();
825 kstat_this_cpu.irqs[MIPSCPU_INT_BASE + MIPSCPU_INT_CPUCTR]++;
818 /* Invoke Clock "Interrupt" */ 826 /* Invoke Clock "Interrupt" */
819 ipi_timer_latch[dest_copy] = 0; 827 ipi_timer_latch[dest_copy] = 0;
820#ifdef SMTC_IDLE_HOOK_DEBUG 828#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
821 clock_hang_reported[dest_copy] = 0; 829 clock_hang_reported[dest_copy] = 0;
822#endif /* SMTC_IDLE_HOOK_DEBUG */ 830#endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */
823 local_timer_interrupt(0, NULL); 831 local_timer_interrupt(0, NULL);
832 irq_exit();
824 break; 833 break;
825 case LINUX_SMP_IPI: 834 case LINUX_SMP_IPI:
826 switch ((int)arg_copy) { 835 switch ((int)arg_copy) {
@@ -968,8 +977,11 @@ static void ipi_irq_dispatch(void)
968 977
969static struct irqaction irq_ipi; 978static struct irqaction irq_ipi;
970 979
971static void setup_cross_vpe_interrupts(void) 980static void setup_cross_vpe_interrupts(unsigned int nvpe)
972{ 981{
982 if (nvpe < 1)
983 return;
984
973 if (!cpu_has_vint) 985 if (!cpu_has_vint)
974 panic("SMTC Kernel requires Vectored Interupt support"); 986 panic("SMTC Kernel requires Vectored Interupt support");
975 987
@@ -987,10 +999,17 @@ static void setup_cross_vpe_interrupts(void)
987 999
988/* 1000/*
989 * SMTC-specific hacks invoked from elsewhere in the kernel. 1001 * SMTC-specific hacks invoked from elsewhere in the kernel.
1002 *
1003 * smtc_ipi_replay is called from raw_local_irq_restore which is only ever
1004 * called with interrupts disabled. We do rely on interrupts being disabled
1005 * here because using spin_lock_irqsave()/spin_unlock_irqrestore() would
1006 * result in a recursive call to raw_local_irq_restore().
990 */ 1007 */
991 1008
992void smtc_ipi_replay(void) 1009static void __smtc_ipi_replay(void)
993{ 1010{
1011 unsigned int cpu = smp_processor_id();
1012
994 /* 1013 /*
995 * To the extent that we've ever turned interrupts off, 1014 * To the extent that we've ever turned interrupts off,
996 * we may have accumulated deferred IPIs. This is subtle. 1015 * we may have accumulated deferred IPIs. This is subtle.
@@ -1005,22 +1024,35 @@ void smtc_ipi_replay(void)
1005 * is clear, and we'll handle it as a real pseudo-interrupt 1024 * is clear, and we'll handle it as a real pseudo-interrupt
1006 * and not a pseudo-pseudo interrupt. 1025 * and not a pseudo-pseudo interrupt.
1007 */ 1026 */
1008 if (IPIQ[smp_processor_id()].depth > 0) { 1027 if (IPIQ[cpu].depth > 0) {
1009 struct smtc_ipi *pipi; 1028 while (1) {
1010 extern void self_ipi(struct smtc_ipi *); 1029 struct smtc_ipi_q *q = &IPIQ[cpu];
1030 struct smtc_ipi *pipi;
1031 extern void self_ipi(struct smtc_ipi *);
1032
1033 spin_lock(&q->lock);
1034 pipi = __smtc_ipi_dq(q);
1035 spin_unlock(&q->lock);
1036 if (!pipi)
1037 break;
1011 1038
1012 while ((pipi = smtc_ipi_dq(&IPIQ[smp_processor_id()]))) {
1013 self_ipi(pipi); 1039 self_ipi(pipi);
1014 smtc_cpu_stats[smp_processor_id()].selfipis++; 1040 smtc_cpu_stats[cpu].selfipis++;
1015 } 1041 }
1016 } 1042 }
1017} 1043}
1018 1044
1045void smtc_ipi_replay(void)
1046{
1047 raw_local_irq_disable();
1048 __smtc_ipi_replay();
1049}
1050
1019EXPORT_SYMBOL(smtc_ipi_replay); 1051EXPORT_SYMBOL(smtc_ipi_replay);
1020 1052
1021void smtc_idle_loop_hook(void) 1053void smtc_idle_loop_hook(void)
1022{ 1054{
1023#ifdef SMTC_IDLE_HOOK_DEBUG 1055#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
1024 int im; 1056 int im;
1025 int flags; 1057 int flags;
1026 int mtflags; 1058 int mtflags;
@@ -1113,14 +1145,20 @@ void smtc_idle_loop_hook(void)
1113 local_irq_restore(flags); 1145 local_irq_restore(flags);
1114 if (pdb_msg != &id_ho_db_msg[0]) 1146 if (pdb_msg != &id_ho_db_msg[0])
1115 printk("CPU%d: %s", smp_processor_id(), id_ho_db_msg); 1147 printk("CPU%d: %s", smp_processor_id(), id_ho_db_msg);
1116#endif /* SMTC_IDLE_HOOK_DEBUG */ 1148#endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */
1117 1149
1118 /* 1150 /*
1119 * Replay any accumulated deferred IPIs. If "Instant Replay" 1151 * Replay any accumulated deferred IPIs. If "Instant Replay"
1120 * is in use, there should never be any. 1152 * is in use, there should never be any.
1121 */ 1153 */
1122#ifndef CONFIG_MIPS_MT_SMTC_INSTANT_REPLAY 1154#ifndef CONFIG_MIPS_MT_SMTC_INSTANT_REPLAY
1123 smtc_ipi_replay(); 1155 {
1156 unsigned long flags;
1157
1158 local_irq_save(flags);
1159 __smtc_ipi_replay();
1160 local_irq_restore(flags);
1161 }
1124#endif /* CONFIG_MIPS_MT_SMTC_INSTANT_REPLAY */ 1162#endif /* CONFIG_MIPS_MT_SMTC_INSTANT_REPLAY */
1125} 1163}
1126 1164
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 2a932cada244..493cb29b8a42 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -229,6 +229,9 @@ void show_regs(struct pt_regs *regs)
229 printk("\n"); 229 printk("\n");
230 } 230 }
231 231
232#ifdef CONFIG_CPU_HAS_SMARTMIPS
233 printk("Acx : %0*lx\n", field, regs->acx);
234#endif
232 printk("Hi : %0*lx\n", field, regs->hi); 235 printk("Hi : %0*lx\n", field, regs->hi);
233 printk("Lo : %0*lx\n", field, regs->lo); 236 printk("Lo : %0*lx\n", field, regs->lo);
234 237
@@ -340,13 +343,9 @@ NORET_TYPE void ATTRIB_NORET die(const char * str, struct pt_regs * regs)
340extern const struct exception_table_entry __start___dbe_table[]; 343extern const struct exception_table_entry __start___dbe_table[];
341extern const struct exception_table_entry __stop___dbe_table[]; 344extern const struct exception_table_entry __stop___dbe_table[];
342 345
343void __declare_dbe_table(void) 346__asm__(
344{ 347" .section __dbe_table, \"a\"\n"
345 __asm__ __volatile__( 348" .previous \n");
346 ".section\t__dbe_table,\"a\"\n\t"
347 ".previous"
348 );
349}
350 349
351/* Given an address, look for it in the exception tables. */ 350/* Given an address, look for it in the exception tables. */
352static const struct exception_table_entry *search_dbe_tables(unsigned long addr) 351static const struct exception_table_entry *search_dbe_tables(unsigned long addr)
@@ -611,16 +610,6 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
611 if (fcr31 & FPU_CSR_UNI_X) { 610 if (fcr31 & FPU_CSR_UNI_X) {
612 int sig; 611 int sig;
613 612
614 preempt_disable();
615
616#ifdef CONFIG_PREEMPT
617 if (!is_fpu_owner()) {
618 /* We might lose fpu before disabling preempt... */
619 own_fpu();
620 BUG_ON(!used_math());
621 restore_fp(current);
622 }
623#endif
624 /* 613 /*
625 * Unimplemented operation exception. If we've got the full 614 * Unimplemented operation exception. If we've got the full
626 * software emulator on-board, let's use it... 615 * software emulator on-board, let's use it...
@@ -631,18 +620,12 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
631 * register operands before invoking the emulator, which seems 620 * register operands before invoking the emulator, which seems
632 * a bit extreme for what should be an infrequent event. 621 * a bit extreme for what should be an infrequent event.
633 */ 622 */
634 save_fp(current);
635 /* Ensure 'resume' not overwrite saved fp context again. */ 623 /* Ensure 'resume' not overwrite saved fp context again. */
636 lose_fpu(); 624 lose_fpu(1);
637
638 preempt_enable();
639 625
640 /* Run the emulator */ 626 /* Run the emulator */
641 sig = fpu_emulator_cop1Handler (regs, &current->thread.fpu, 1); 627 sig = fpu_emulator_cop1Handler (regs, &current->thread.fpu, 1);
642 628
643 preempt_disable();
644
645 own_fpu(); /* Using the FPU again. */
646 /* 629 /*
647 * We can't allow the emulated instruction to leave any of 630 * We can't allow the emulated instruction to leave any of
648 * the cause bit set in $fcr31. 631 * the cause bit set in $fcr31.
@@ -650,9 +633,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
650 current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X; 633 current->thread.fpu.fcr31 &= ~FPU_CSR_ALL_X;
651 634
652 /* Restore the hardware register state */ 635 /* Restore the hardware register state */
653 restore_fp(current); 636 own_fpu(1); /* Using the FPU again. */
654
655 preempt_enable();
656 637
657 /* If something went wrong, signal */ 638 /* If something went wrong, signal */
658 if (sig) 639 if (sig)
@@ -669,7 +650,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
669 unsigned int opcode, bcode; 650 unsigned int opcode, bcode;
670 siginfo_t info; 651 siginfo_t info;
671 652
672 if (get_user(opcode, (unsigned int __user *) exception_epc(regs))) 653 if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
673 goto out_sigsegv; 654 goto out_sigsegv;
674 655
675 /* 656 /*
@@ -708,6 +689,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
708 die_if_kernel("Break instruction in kernel code", regs); 689 die_if_kernel("Break instruction in kernel code", regs);
709 force_sig(SIGTRAP, current); 690 force_sig(SIGTRAP, current);
710 } 691 }
692 return;
711 693
712out_sigsegv: 694out_sigsegv:
713 force_sig(SIGSEGV, current); 695 force_sig(SIGSEGV, current);
@@ -718,7 +700,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
718 unsigned int opcode, tcode = 0; 700 unsigned int opcode, tcode = 0;
719 siginfo_t info; 701 siginfo_t info;
720 702
721 if (get_user(opcode, (unsigned int __user *) exception_epc(regs))) 703 if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
722 goto out_sigsegv; 704 goto out_sigsegv;
723 705
724 /* Immediate versions don't provide a code. */ 706 /* Immediate versions don't provide a code. */
@@ -751,6 +733,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
751 die_if_kernel("Trap instruction in kernel code", regs); 733 die_if_kernel("Trap instruction in kernel code", regs);
752 force_sig(SIGTRAP, current); 734 force_sig(SIGTRAP, current);
753 } 735 }
736 return;
754 737
755out_sigsegv: 738out_sigsegv:
756 force_sig(SIGSEGV, current); 739 force_sig(SIGSEGV, current);
@@ -790,21 +773,15 @@ asmlinkage void do_cpu(struct pt_regs *regs)
790 break; 773 break;
791 774
792 case 1: 775 case 1:
793 preempt_disable(); 776 if (used_math()) /* Using the FPU again. */
794 777 own_fpu(1);
795 own_fpu(); 778 else { /* First time FPU user. */
796 if (used_math()) { /* Using the FPU again. */
797 restore_fp(current);
798 } else { /* First time FPU user. */
799 init_fpu(); 779 init_fpu();
800 set_used_math(); 780 set_used_math();
801 } 781 }
802 782
803 if (cpu_has_fpu) { 783 if (!raw_cpu_has_fpu) {
804 preempt_enable();
805 } else {
806 int sig; 784 int sig;
807 preempt_enable();
808 sig = fpu_emulator_cop1Handler(regs, 785 sig = fpu_emulator_cop1Handler(regs,
809 &current->thread.fpu, 0); 786 &current->thread.fpu, 0);
810 if (sig) 787 if (sig)
@@ -845,7 +822,6 @@ asmlinkage void do_cpu(struct pt_regs *regs)
845 822
846 case 2: 823 case 2:
847 case 3: 824 case 3:
848 die_if_kernel("do_cpu invoked from kernel context!", regs);
849 break; 825 break;
850 } 826 }
851 827
@@ -1258,26 +1234,26 @@ static inline void mips_srs_init(void)
1258/* 1234/*
1259 * This is used by native signal handling 1235 * This is used by native signal handling
1260 */ 1236 */
1261asmlinkage int (*save_fp_context)(struct sigcontext *sc); 1237asmlinkage int (*save_fp_context)(struct sigcontext __user *sc);
1262asmlinkage int (*restore_fp_context)(struct sigcontext *sc); 1238asmlinkage int (*restore_fp_context)(struct sigcontext __user *sc);
1263 1239
1264extern asmlinkage int _save_fp_context(struct sigcontext *sc); 1240extern asmlinkage int _save_fp_context(struct sigcontext __user *sc);
1265extern asmlinkage int _restore_fp_context(struct sigcontext *sc); 1241extern asmlinkage int _restore_fp_context(struct sigcontext __user *sc);
1266 1242
1267extern asmlinkage int fpu_emulator_save_context(struct sigcontext *sc); 1243extern asmlinkage int fpu_emulator_save_context(struct sigcontext __user *sc);
1268extern asmlinkage int fpu_emulator_restore_context(struct sigcontext *sc); 1244extern asmlinkage int fpu_emulator_restore_context(struct sigcontext __user *sc);
1269 1245
1270#ifdef CONFIG_SMP 1246#ifdef CONFIG_SMP
1271static int smp_save_fp_context(struct sigcontext *sc) 1247static int smp_save_fp_context(struct sigcontext __user *sc)
1272{ 1248{
1273 return cpu_has_fpu 1249 return raw_cpu_has_fpu
1274 ? _save_fp_context(sc) 1250 ? _save_fp_context(sc)
1275 : fpu_emulator_save_context(sc); 1251 : fpu_emulator_save_context(sc);
1276} 1252}
1277 1253
1278static int smp_restore_fp_context(struct sigcontext *sc) 1254static int smp_restore_fp_context(struct sigcontext __user *sc)
1279{ 1255{
1280 return cpu_has_fpu 1256 return raw_cpu_has_fpu
1281 ? _restore_fp_context(sc) 1257 ? _restore_fp_context(sc)
1282 : fpu_emulator_restore_context(sc); 1258 : fpu_emulator_restore_context(sc);
1283} 1259}
@@ -1305,14 +1281,14 @@ static inline void signal_init(void)
1305/* 1281/*
1306 * This is used by 32-bit signal stuff on the 64-bit kernel 1282 * This is used by 32-bit signal stuff on the 64-bit kernel
1307 */ 1283 */
1308asmlinkage int (*save_fp_context32)(struct sigcontext32 *sc); 1284asmlinkage int (*save_fp_context32)(struct sigcontext32 __user *sc);
1309asmlinkage int (*restore_fp_context32)(struct sigcontext32 *sc); 1285asmlinkage int (*restore_fp_context32)(struct sigcontext32 __user *sc);
1310 1286
1311extern asmlinkage int _save_fp_context32(struct sigcontext32 *sc); 1287extern asmlinkage int _save_fp_context32(struct sigcontext32 __user *sc);
1312extern asmlinkage int _restore_fp_context32(struct sigcontext32 *sc); 1288extern asmlinkage int _restore_fp_context32(struct sigcontext32 __user *sc);
1313 1289
1314extern asmlinkage int fpu_emulator_save_context32(struct sigcontext32 *sc); 1290extern asmlinkage int fpu_emulator_save_context32(struct sigcontext32 __user *sc);
1315extern asmlinkage int fpu_emulator_restore_context32(struct sigcontext32 *sc); 1291extern asmlinkage int fpu_emulator_restore_context32(struct sigcontext32 __user *sc);
1316 1292
1317static inline void signal32_init(void) 1293static inline void signal32_init(void)
1318{ 1294{
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 7e7d54823486..24b7b053cfe9 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -515,7 +515,7 @@ asmlinkage void do_ade(struct pt_regs *regs)
515 goto sigbus; 515 goto sigbus;
516 516
517 pc = (unsigned int __user *) exception_epc(regs); 517 pc = (unsigned int __user *) exception_epc(regs);
518 if ((current->thread.mflags & MF_FIXADE) == 0) 518 if (user_mode(regs) && (current->thread.mflags & MF_FIXADE) == 0)
519 goto sigbus; 519 goto sigbus;
520 520
521 /* 521 /*
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 9aca871a307f..c9ee9d2d5856 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1079,6 +1079,7 @@ static int getcwd(char *buff, int size)
1079static int vpe_open(struct inode *inode, struct file *filp) 1079static int vpe_open(struct inode *inode, struct file *filp)
1080{ 1080{
1081 int minor, ret; 1081 int minor, ret;
1082 enum vpe_state state;
1082 struct vpe *v; 1083 struct vpe *v;
1083 struct vpe_notifications *not; 1084 struct vpe_notifications *not;
1084 1085
@@ -1093,7 +1094,8 @@ static int vpe_open(struct inode *inode, struct file *filp)
1093 return -ENODEV; 1094 return -ENODEV;
1094 } 1095 }
1095 1096
1096 if (v->state != VPE_STATE_UNUSED) { 1097 state = xchg(&v->state, VPE_STATE_INUSE);
1098 if (state != VPE_STATE_UNUSED) {
1097 dvpe(); 1099 dvpe();
1098 1100
1099 printk(KERN_DEBUG "VPE loader: tc in use dumping regs\n"); 1101 printk(KERN_DEBUG "VPE loader: tc in use dumping regs\n");
@@ -1108,9 +1110,6 @@ static int vpe_open(struct inode *inode, struct file *filp)
1108 cleanup_tc(get_tc(minor)); 1110 cleanup_tc(get_tc(minor));
1109 } 1111 }
1110 1112
1111 // allocate it so when we get write ops we know it's expected.
1112 v->state = VPE_STATE_INUSE;
1113
1114 /* this of-course trashes what was there before... */ 1113 /* this of-course trashes what was there before... */
1115 v->pbuffer = vmalloc(P_SIZE); 1114 v->pbuffer = vmalloc(P_SIZE);
1116 v->plen = P_SIZE; 1115 v->plen = P_SIZE;
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c
index d425120b0282..fbe9a87bd0ad 100644
--- a/arch/mips/lasat/lasat_board.c
+++ b/arch/mips/lasat/lasat_board.c
@@ -110,12 +110,13 @@ int lasat_init_board_info(void)
110 sizeof(struct lasat_eeprom_struct) - 4); 110 sizeof(struct lasat_eeprom_struct) - 4);
111 111
112 if (crc != lasat_board_info.li_eeprom_info.crc32) { 112 if (crc != lasat_board_info.li_eeprom_info.crc32) {
113 prom_printf("WARNING...\nWARNING...\nEEPROM CRC does not match calculated, attempting to soldier on...\n"); 113 printk(KERN_WARNING "WARNING...\nWARNING...\nEEPROM CRC does "
114 "not match calculated, attempting to soldier on...\n");
114 } 115 }
115 116
116 if (lasat_board_info.li_eeprom_info.version != LASAT_EEPROM_VERSION) 117 if (lasat_board_info.li_eeprom_info.version != LASAT_EEPROM_VERSION) {
117 { 118 printk(KERN_WARNING "WARNING...\nWARNING...\nEEPROM version "
118 prom_printf("WARNING...\nWARNING...\nEEPROM version %d, wanted version %d, attempting to soldier on...\n", 119 "%d, wanted version %d, attempting to soldier on...\n",
119 (unsigned int)lasat_board_info.li_eeprom_info.version, 120 (unsigned int)lasat_board_info.li_eeprom_info.version,
120 LASAT_EEPROM_VERSION); 121 LASAT_EEPROM_VERSION);
121 } 122 }
@@ -124,7 +125,9 @@ int lasat_init_board_info(void)
124 cfg1 = lasat_board_info.li_eeprom_info.cfg[1]; 125 cfg1 = lasat_board_info.li_eeprom_info.cfg[1];
125 126
126 if ( LASAT_W0_DSCTYPE(cfg0) != 1) { 127 if ( LASAT_W0_DSCTYPE(cfg0) != 1) {
127 prom_printf("WARNING...\nWARNING...\nInvalid configuration read from EEPROM, attempting to soldier on..."); 128 printk(KERN_WARNING "WARNING...\nWARNING...\n"
129 "Invalid configuration read from EEPROM, attempting to "
130 "soldier on...");
128 } 131 }
129 /* We have a valid configuration */ 132 /* We have a valid configuration */
130 133
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c
index d47692f73a26..812c6ac366be 100644
--- a/arch/mips/lasat/prom.c
+++ b/arch/mips/lasat/prom.c
@@ -23,10 +23,6 @@
23#define PROM_PUTC_ADDR PROM_JUMP_TABLE_ENTRY(1) 23#define PROM_PUTC_ADDR PROM_JUMP_TABLE_ENTRY(1)
24#define PROM_MONITOR_ADDR PROM_JUMP_TABLE_ENTRY(2) 24#define PROM_MONITOR_ADDR PROM_JUMP_TABLE_ENTRY(2)
25 25
26static void null_prom_printf(const char * fmt, ...)
27{
28}
29
30static void null_prom_display(const char *string, int pos, int clear) 26static void null_prom_display(const char *string, int pos, int clear)
31{ 27{
32} 28}
@@ -40,50 +36,29 @@ static void null_prom_putc(char c)
40} 36}
41 37
42/* these are functions provided by the bootloader */ 38/* these are functions provided by the bootloader */
43static void (* prom_putc)(char c) = null_prom_putc; 39static void (* __prom_putc)(char c) = null_prom_putc;
44void (* prom_printf)(const char * fmt, ...) = null_prom_printf; 40
41void prom_putchar(char c)
42{
43 __prom_putc(c);
44}
45
45void (* prom_display)(const char *string, int pos, int clear) = 46void (* prom_display)(const char *string, int pos, int clear) =
46 null_prom_display; 47 null_prom_display;
47void (* prom_monitor)(void) = null_prom_monitor; 48void (* prom_monitor)(void) = null_prom_monitor;
48 49
49unsigned int lasat_ndelay_divider; 50unsigned int lasat_ndelay_divider;
50 51
51#define PROM_PRINTFBUF_SIZE 256
52static char prom_printfbuf[PROM_PRINTFBUF_SIZE];
53
54static void real_prom_printf(const char * fmt, ...)
55{
56 va_list ap;
57 int len;
58 char *c = prom_printfbuf;
59 int i;
60
61 va_start(ap, fmt);
62 len = vsnprintf(prom_printfbuf, PROM_PRINTFBUF_SIZE, fmt, ap);
63 va_end(ap);
64
65 /* output overflowed the buffer */
66 if (len < 0 || len > PROM_PRINTFBUF_SIZE)
67 len = PROM_PRINTFBUF_SIZE;
68
69 for (i=0; i < len; i++) {
70 if (*c == '\n')
71 prom_putc('\r');
72 prom_putc(*c++);
73 }
74}
75
76static void setup_prom_vectors(void) 52static void setup_prom_vectors(void)
77{ 53{
78 u32 version = *(u32 *)(RESET_VECTOR + 0x90); 54 u32 version = *(u32 *)(RESET_VECTOR + 0x90);
79 55
80 if (version >= 307) { 56 if (version >= 307) {
81 prom_display = (void *)PROM_DISPLAY_ADDR; 57 prom_display = (void *)PROM_DISPLAY_ADDR;
82 prom_putc = (void *)PROM_PUTC_ADDR; 58 __prom_putc = (void *)PROM_PUTC_ADDR;
83 prom_printf = real_prom_printf;
84 prom_monitor = (void *)PROM_MONITOR_ADDR; 59 prom_monitor = (void *)PROM_MONITOR_ADDR;
85 } 60 }
86 prom_printf("prom vectors set up\n"); 61 printk("prom vectors set up\n");
87} 62}
88 63
89static struct at93c_defs at93c_defs[N_MACHTYPES] = { 64static struct at93c_defs at93c_defs[N_MACHTYPES] = {
@@ -101,11 +76,11 @@ void __init prom_init(void)
101 setup_prom_vectors(); 76 setup_prom_vectors();
102 77
103 if (current_cpu_data.cputype == CPU_R5000) { 78 if (current_cpu_data.cputype == CPU_R5000) {
104 prom_printf("LASAT 200 board\n"); 79 printk("LASAT 200 board\n");
105 mips_machtype = MACH_LASAT_200; 80 mips_machtype = MACH_LASAT_200;
106 lasat_ndelay_divider = LASAT_200_DIVIDER; 81 lasat_ndelay_divider = LASAT_200_DIVIDER;
107 } else { 82 } else {
108 prom_printf("LASAT 100 board\n"); 83 printk("LASAT 100 board\n");
109 mips_machtype = MACH_LASAT_100; 84 mips_machtype = MACH_LASAT_100;
110 lasat_ndelay_divider = LASAT_100_DIVIDER; 85 lasat_ndelay_divider = LASAT_100_DIVIDER;
111 } 86 }
diff --git a/arch/mips/lasat/prom.h b/arch/mips/lasat/prom.h
index 07be7bf1e4a3..019d45fbd268 100644
--- a/arch/mips/lasat/prom.h
+++ b/arch/mips/lasat/prom.h
@@ -2,5 +2,4 @@
2#define PROM_H 2#define PROM_H
3extern void (* prom_display)(const char *string, int pos, int clear); 3extern void (* prom_display)(const char *string, int pos, int clear);
4extern void (* prom_monitor)(void); 4extern void (* prom_monitor)(void);
5extern void (* prom_printf)(const char * fmt, ...);
6#endif 5#endif
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index 14c55168f1ff..488007f13988 100644
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -116,7 +116,6 @@ static void lasat_time_init(void)
116 116
117void __init plat_timer_setup(struct irqaction *irq) 117void __init plat_timer_setup(struct irqaction *irq)
118{ 118{
119 write_c0_compare( read_c0_count() + mips_hpt_frequency / HZ);
120 change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5); 119 change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
121} 120}
122 121
@@ -179,5 +178,5 @@ void __init plat_mem_setup(void)
179 /* Switch from prom exception handler to normal mode */ 178 /* Switch from prom exception handler to normal mode */
180 change_c0_status(ST0_BEV,0); 179 change_c0_status(ST0_BEV,0);
181 180
182 prom_printf("Lasat specific initialization complete\n"); 181 pr_info("Lasat specific initialization complete\n");
183} 182}
diff --git a/arch/mips/lib-32/Makefile b/arch/mips/lib-32/Makefile
index 2036cf5e6857..8b94d4cc5a30 100644
--- a/arch/mips/lib-32/Makefile
+++ b/arch/mips/lib-32/Makefile
@@ -21,5 +21,3 @@ obj-$(CONFIG_CPU_SB1) += dump_tlb.o
21obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o 21obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o
22obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o 22obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o
23obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o 23obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o
24
25EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/lib-64/Makefile b/arch/mips/lib-64/Makefile
index 2036cf5e6857..8b94d4cc5a30 100644
--- a/arch/mips/lib-64/Makefile
+++ b/arch/mips/lib-64/Makefile
@@ -21,5 +21,3 @@ obj-$(CONFIG_CPU_SB1) += dump_tlb.o
21obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o 21obj-$(CONFIG_CPU_TX39XX) += r3k_dump_tlb.o
22obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o 22obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o
23obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o 23obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o
24
25EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 5ad501b30b43..d7d3b14dcfb2 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -2,12 +2,11 @@
2# Makefile for MIPS-specific library files.. 2# Makefile for MIPS-specific library files..
3# 3#
4 4
5lib-y += csum_partial.o memcpy.o memset.o promlib.o \ 5lib-y += csum_partial.o memcpy.o memcpy-inatomic.o memset.o strlen_user.o \
6 strlen_user.o strncpy_user.o strnlen_user.o uncached.o 6 strncpy_user.o strnlen_user.o uncached.o
7 7
8obj-y += iomap.o 8obj-y += iomap.o
9obj-$(CONFIG_PCI) += iomap-pci.o
9 10
10# libgcc-style stuff needed in the kernel 11# libgcc-style stuff needed in the kernel
11lib-y += ashldi3.o ashrdi3.o lshrdi3.o 12lib-y += ashldi3.o ashrdi3.o lshrdi3.o
12
13EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c
new file mode 100644
index 000000000000..c11b2494bb6e
--- /dev/null
+++ b/arch/mips/lib/iomap-pci.c
@@ -0,0 +1,74 @@
1/*
2 * Implement the default iomap interfaces
3 *
4 * (C) Copyright 2004 Linus Torvalds
5 * (C) Copyright 2006 Ralf Baechle <ralf@linux-mips.org>
6 * (C) Copyright 2007 MIPS Technologies, Inc.
7 * written by Ralf Baechle <ralf@linux-mips.org>
8 */
9#include <linux/pci.h>
10#include <linux/module.h>
11#include <asm/io.h>
12
13static void __iomem *ioport_map_pci(struct pci_dev *dev,
14 unsigned long port, unsigned int nr)
15{
16 struct pci_controller *ctrl = dev->bus->sysdata;
17 unsigned long base = ctrl->io_map_base;
18
19 /* This will eventually become a BUG_ON but for now be gentle */
20 if (unlikely(!ctrl->io_map_base)) {
21 struct pci_bus *bus = dev->bus;
22 char name[8];
23
24 while (bus->parent)
25 bus = bus->parent;
26
27 ctrl->io_map_base = base = mips_io_port_base;
28
29 sprintf(name, "%04x:%02x", pci_domain_nr(bus), bus->number);
30 printk(KERN_WARNING "io_map_base of root PCI bus %s unset. "
31 "Trying to continue but you better\nfix this issue or "
32 "report it to linux-mips@linux-mips.org or your "
33 "vendor.\n", name);
34#ifdef CONFIG_PCI_DOMAINS
35 panic("To avoid data corruption io_map_base MUST be set with "
36 "multiple PCI domains.");
37#endif
38 }
39
40 return (void __iomem *) (ctrl->io_map_base + port);
41}
42
43/*
44 * Create a virtual mapping cookie for a PCI BAR (memory or IO)
45 */
46void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
47{
48 unsigned long start = pci_resource_start(dev, bar);
49 unsigned long len = pci_resource_len(dev, bar);
50 unsigned long flags = pci_resource_flags(dev, bar);
51
52 if (!len || !start)
53 return NULL;
54 if (maxlen && len > maxlen)
55 len = maxlen;
56 if (flags & IORESOURCE_IO)
57 return ioport_map_pci(dev, start, len);
58 if (flags & IORESOURCE_MEM) {
59 if (flags & IORESOURCE_CACHEABLE)
60 return ioremap(start, len);
61 return ioremap_nocache(start, len);
62 }
63 /* What? */
64 return NULL;
65}
66
67EXPORT_SYMBOL(pci_iomap);
68
69void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
70{
71 iounmap(addr);
72}
73
74EXPORT_SYMBOL(pci_iounmap);
diff --git a/arch/mips/lib/iomap.c b/arch/mips/lib/iomap.c
index f4ac5bbcd81f..d51d5cb0a4a9 100644
--- a/arch/mips/lib/iomap.c
+++ b/arch/mips/lib/iomap.c
@@ -1,78 +1,227 @@
1/* 1/*
2 * iomap.c, Memory Mapped I/O routines for MIPS architecture. 2 * Implement the default iomap interfaces
3 * 3 *
4 * This code is based on lib/iomap.c, by Linus Torvalds. 4 * (C) Copyright 2004 Linus Torvalds
5 * 5 * (C) Copyright 2006 Ralf Baechle <ralf@linux-mips.org>
6 * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> 6 * (C) Copyright 2007 MIPS Technologies, Inc.
7 * 7 * written by Ralf Baechle <ralf@linux-mips.org>
8 * This program is free software; you can redistribute it and/or modify 8 */
9 * it under the terms of the GNU General Public License as published by 9#include <linux/pci.h>
10 * the Free Software Foundation; either version 2 of the License, or 10#include <linux/module.h>
11 * (at your option) any later version. 11#include <asm/io.h>
12
13/*
14 * Read/write from/to an (offsettable) iomem cookie. It might be a PIO
15 * access or a MMIO access, these functions don't care. The info is
16 * encoded in the hardware mapping set up by the mapping functions
17 * (or the cookie itself, depending on implementation and hw).
12 * 18 *
13 * This program is distributed in the hope that it will be useful, 19 * The generic routines don't assume any hardware mappings, and just
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 20 * encode the PIO/MMIO as part of the cookie. They coldly assume that
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 21 * the MMIO IO mappings are not in the low address range.
16 * GNU General Public License for more details.
17 * 22 *
18 * You should have received a copy of the GNU General Public License 23 * Architectures for which this is not true can't use this generic
19 * along with this program; if not, write to the Free Software 24 * implementation and should do their own copy.
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 */ 25 */
22#include <linux/ioport.h>
23#include <linux/module.h>
24#include <linux/pci.h>
25 26
26#include <asm/io.h> 27#define PIO_MASK 0x0ffffUL
27 28
28void __iomem *ioport_map(unsigned long port, unsigned int nr) 29unsigned int ioread8(void __iomem *addr)
29{ 30{
30 unsigned long end; 31 return readb(addr);
32}
31 33
32 end = port + nr - 1UL; 34EXPORT_SYMBOL(ioread8);
33 if (ioport_resource.start > port ||
34 ioport_resource.end < end || port > end)
35 return NULL;
36 35
37 return (void __iomem *)(mips_io_port_base + port); 36unsigned int ioread16(void __iomem *addr)
37{
38 return readw(addr);
38} 39}
39 40
40void ioport_unmap(void __iomem *addr) 41EXPORT_SYMBOL(ioread16);
42
43unsigned int ioread16be(void __iomem *addr)
41{ 44{
45 return be16_to_cpu(__raw_readw(addr));
42} 46}
43EXPORT_SYMBOL(ioport_map);
44EXPORT_SYMBOL(ioport_unmap);
45 47
46void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) 48EXPORT_SYMBOL(ioread16be);
49
50unsigned int ioread32(void __iomem *addr)
47{ 51{
48 unsigned long start, len, flags; 52 return readl(addr);
53}
49 54
50 if (dev == NULL) 55EXPORT_SYMBOL(ioread32);
51 return NULL;
52 56
53 start = pci_resource_start(dev, bar); 57unsigned int ioread32be(void __iomem *addr)
54 len = pci_resource_len(dev, bar); 58{
55 if (!start || !len) 59 return be32_to_cpu(__raw_readl(addr));
56 return NULL; 60}
57 61
58 if (maxlen != 0 && len > maxlen) 62EXPORT_SYMBOL(ioread32be);
59 len = maxlen; 63
64void iowrite8(u8 val, void __iomem *addr)
65{
66 writeb(val, addr);
67}
60 68
61 flags = pci_resource_flags(dev, bar); 69EXPORT_SYMBOL(iowrite8);
62 if (flags & IORESOURCE_IO) 70
63 return ioport_map(start, len); 71void iowrite16(u16 val, void __iomem *addr)
64 if (flags & IORESOURCE_MEM) { 72{
65 if (flags & IORESOURCE_CACHEABLE) 73 writew(val, addr);
66 return ioremap_cachable(start, len); 74}
67 return ioremap_nocache(start, len); 75
76EXPORT_SYMBOL(iowrite16);
77
78void iowrite16be(u16 val, void __iomem *addr)
79{
80 __raw_writew(cpu_to_be16(val), addr);
81}
82
83EXPORT_SYMBOL(iowrite16be);
84
85void iowrite32(u32 val, void __iomem *addr)
86{
87 writel(val, addr);
88}
89
90EXPORT_SYMBOL(iowrite32);
91
92void iowrite32be(u32 val, void __iomem *addr)
93{
94 __raw_writel(cpu_to_be32(val), addr);
95}
96
97EXPORT_SYMBOL(iowrite32be);
98
99/*
100 * These are the "repeat MMIO read/write" functions.
101 * Note the "__raw" accesses, since we don't want to
102 * convert to CPU byte order. We write in "IO byte
103 * order" (we also don't have IO barriers).
104 */
105static inline void mmio_insb(void __iomem *addr, u8 *dst, int count)
106{
107 while (--count >= 0) {
108 u8 data = __raw_readb(addr);
109 *dst = data;
110 dst++;
68 } 111 }
112}
69 113
70 return NULL; 114static inline void mmio_insw(void __iomem *addr, u16 *dst, int count)
115{
116 while (--count >= 0) {
117 u16 data = __raw_readw(addr);
118 *dst = data;
119 dst++;
120 }
71} 121}
72 122
73void pci_iounmap(struct pci_dev *dev, void __iomem *addr) 123static inline void mmio_insl(void __iomem *addr, u32 *dst, int count)
74{ 124{
75 iounmap(addr); 125 while (--count >= 0) {
126 u32 data = __raw_readl(addr);
127 *dst = data;
128 dst++;
129 }
76} 130}
77EXPORT_SYMBOL(pci_iomap); 131
78EXPORT_SYMBOL(pci_iounmap); 132static inline void mmio_outsb(void __iomem *addr, const u8 *src, int count)
133{
134 while (--count >= 0) {
135 __raw_writeb(*src, addr);
136 src++;
137 }
138}
139
140static inline void mmio_outsw(void __iomem *addr, const u16 *src, int count)
141{
142 while (--count >= 0) {
143 __raw_writew(*src, addr);
144 src++;
145 }
146}
147
148static inline void mmio_outsl(void __iomem *addr, const u32 *src, int count)
149{
150 while (--count >= 0) {
151 __raw_writel(*src, addr);
152 src++;
153 }
154}
155
156void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
157{
158 mmio_insb(addr, dst, count);
159}
160
161EXPORT_SYMBOL(ioread8_rep);
162
163void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
164{
165 mmio_insw(addr, dst, count);
166}
167
168EXPORT_SYMBOL(ioread16_rep);
169
170void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
171{
172 mmio_insl(addr, dst, count);
173}
174
175EXPORT_SYMBOL(ioread32_rep);
176
177void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
178{
179 mmio_outsb(addr, src, count);
180}
181
182EXPORT_SYMBOL(iowrite8_rep);
183
184void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
185{
186 mmio_outsw(addr, src, count);
187}
188
189EXPORT_SYMBOL(iowrite16_rep);
190
191void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
192{
193 mmio_outsl(addr, src, count);
194}
195
196EXPORT_SYMBOL(iowrite32_rep);
197
198/*
199 * Create a virtual mapping cookie for an IO port range
200 *
201 * This uses the same mapping are as the in/out family which has to be setup
202 * by the platform initialization code.
203 *
204 * Just to make matters somewhat more interesting on MIPS systems with
205 * multiple host bridge each will have it's own ioport address space.
206 */
207static void __iomem *ioport_map_legacy(unsigned long port, unsigned int nr)
208{
209 return (void __iomem *) (mips_io_port_base + port);
210}
211
212void __iomem *ioport_map(unsigned long port, unsigned int nr)
213{
214 if (port > PIO_MASK)
215 return NULL;
216
217 return ioport_map_legacy(port, nr);
218}
219
220EXPORT_SYMBOL(ioport_map);
221
222void ioport_unmap(void __iomem *addr)
223{
224 /* Nothing to do */
225}
226
227EXPORT_SYMBOL(ioport_unmap);
diff --git a/arch/mips/lib/memcpy-inatomic.S b/arch/mips/lib/memcpy-inatomic.S
new file mode 100644
index 000000000000..3a534b2baa0f
--- /dev/null
+++ b/arch/mips/lib/memcpy-inatomic.S
@@ -0,0 +1,436 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Unified implementation of memcpy, memmove and the __copy_user backend.
7 *
8 * Copyright (C) 1998, 99, 2000, 01, 2002 Ralf Baechle (ralf@gnu.org)
9 * Copyright (C) 1999, 2000, 01, 2002 Silicon Graphics, Inc.
10 * Copyright (C) 2002 Broadcom, Inc.
11 * memcpy/copy_user author: Mark Vandevoorde
12 *
13 * Mnemonic names for arguments to memcpy/__copy_user
14 */
15
16/*
17 * Hack to resolve longstanding prefetch issue
18 *
19 * Prefetching may be fatal on some systems if we're prefetching beyond the
20 * end of memory on some systems. It's also a seriously bad idea on non
21 * dma-coherent systems.
22 */
23#if !defined(CONFIG_DMA_COHERENT) || !defined(CONFIG_DMA_IP27)
24#undef CONFIG_CPU_HAS_PREFETCH
25#endif
26#ifdef CONFIG_MIPS_MALTA
27#undef CONFIG_CPU_HAS_PREFETCH
28#endif
29
30#include <asm/asm.h>
31#include <asm/asm-offsets.h>
32#include <asm/regdef.h>
33
34#define dst a0
35#define src a1
36#define len a2
37
38/*
39 * Spec
40 *
41 * memcpy copies len bytes from src to dst and sets v0 to dst.
42 * It assumes that
43 * - src and dst don't overlap
44 * - src is readable
45 * - dst is writable
46 * memcpy uses the standard calling convention
47 *
48 * __copy_user copies up to len bytes from src to dst and sets a2 (len) to
49 * the number of uncopied bytes due to an exception caused by a read or write.
50 * __copy_user assumes that src and dst don't overlap, and that the call is
51 * implementing one of the following:
52 * copy_to_user
53 * - src is readable (no exceptions when reading src)
54 * copy_from_user
55 * - dst is writable (no exceptions when writing dst)
56 * __copy_user uses a non-standard calling convention; see
57 * include/asm-mips/uaccess.h
58 *
59 * When an exception happens on a load, the handler must
60 # ensure that all of the destination buffer is overwritten to prevent
61 * leaking information to user mode programs.
62 */
63
64/*
65 * Implementation
66 */
67
68/*
69 * The exception handler for loads requires that:
70 * 1- AT contain the address of the byte just past the end of the source
71 * of the copy,
72 * 2- src_entry <= src < AT, and
73 * 3- (dst - src) == (dst_entry - src_entry),
74 * The _entry suffix denotes values when __copy_user was called.
75 *
76 * (1) is set up up by uaccess.h and maintained by not writing AT in copy_user
77 * (2) is met by incrementing src by the number of bytes copied
78 * (3) is met by not doing loads between a pair of increments of dst and src
79 *
80 * The exception handlers for stores adjust len (if necessary) and return.
81 * These handlers do not need to overwrite any data.
82 *
83 * For __rmemcpy and memmove an exception is always a kernel bug, therefore
84 * they're not protected.
85 */
86
87#define EXC(inst_reg,addr,handler) \
889: inst_reg, addr; \
89 .section __ex_table,"a"; \
90 PTR 9b, handler; \
91 .previous
92
93/*
94 * Only on the 64-bit kernel we can made use of 64-bit registers.
95 */
96#ifdef CONFIG_64BIT
97#define USE_DOUBLE
98#endif
99
100#ifdef USE_DOUBLE
101
102#define LOAD ld
103#define LOADL ldl
104#define LOADR ldr
105#define STOREL sdl
106#define STORER sdr
107#define STORE sd
108#define ADD daddu
109#define SUB dsubu
110#define SRL dsrl
111#define SRA dsra
112#define SLL dsll
113#define SLLV dsllv
114#define SRLV dsrlv
115#define NBYTES 8
116#define LOG_NBYTES 3
117
118/*
119 * As we are sharing code base with the mips32 tree (which use the o32 ABI
120 * register definitions). We need to redefine the register definitions from
121 * the n64 ABI register naming to the o32 ABI register naming.
122 */
123#undef t0
124#undef t1
125#undef t2
126#undef t3
127#define t0 $8
128#define t1 $9
129#define t2 $10
130#define t3 $11
131#define t4 $12
132#define t5 $13
133#define t6 $14
134#define t7 $15
135
136#else
137
138#define LOAD lw
139#define LOADL lwl
140#define LOADR lwr
141#define STOREL swl
142#define STORER swr
143#define STORE sw
144#define ADD addu
145#define SUB subu
146#define SRL srl
147#define SLL sll
148#define SRA sra
149#define SLLV sllv
150#define SRLV srlv
151#define NBYTES 4
152#define LOG_NBYTES 2
153
154#endif /* USE_DOUBLE */
155
156#ifdef CONFIG_CPU_LITTLE_ENDIAN
157#define LDFIRST LOADR
158#define LDREST LOADL
159#define STFIRST STORER
160#define STREST STOREL
161#define SHIFT_DISCARD SLLV
162#else
163#define LDFIRST LOADL
164#define LDREST LOADR
165#define STFIRST STOREL
166#define STREST STORER
167#define SHIFT_DISCARD SRLV
168#endif
169
170#define FIRST(unit) ((unit)*NBYTES)
171#define REST(unit) (FIRST(unit)+NBYTES-1)
172#define UNIT(unit) FIRST(unit)
173
174#define ADDRMASK (NBYTES-1)
175
176 .text
177 .set noreorder
178 .set noat
179
180/*
181 * A combined memcpy/__copy_user
182 * __copy_user sets len to 0 for success; else to an upper bound of
183 * the number of uncopied bytes.
184 * memcpy sets v0 to dst.
185 */
186 .align 5
187LEAF(__copy_user_inatomic)
188 /*
189 * Note: dst & src may be unaligned, len may be 0
190 * Temps
191 */
192#define rem t8
193
194 /*
195 * The "issue break"s below are very approximate.
196 * Issue delays for dcache fills will perturb the schedule, as will
197 * load queue full replay traps, etc.
198 *
199 * If len < NBYTES use byte operations.
200 */
201 PREF( 0, 0(src) )
202 PREF( 1, 0(dst) )
203 sltu t2, len, NBYTES
204 and t1, dst, ADDRMASK
205 PREF( 0, 1*32(src) )
206 PREF( 1, 1*32(dst) )
207 bnez t2, copy_bytes_checklen
208 and t0, src, ADDRMASK
209 PREF( 0, 2*32(src) )
210 PREF( 1, 2*32(dst) )
211 bnez t1, dst_unaligned
212 nop
213 bnez t0, src_unaligned_dst_aligned
214 /*
215 * use delay slot for fall-through
216 * src and dst are aligned; need to compute rem
217 */
218both_aligned:
219 SRL t0, len, LOG_NBYTES+3 # +3 for 8 units/iter
220 beqz t0, cleanup_both_aligned # len < 8*NBYTES
221 and rem, len, (8*NBYTES-1) # rem = len % (8*NBYTES)
222 PREF( 0, 3*32(src) )
223 PREF( 1, 3*32(dst) )
224 .align 4
2251:
226EXC( LOAD t0, UNIT(0)(src), l_exc)
227EXC( LOAD t1, UNIT(1)(src), l_exc_copy)
228EXC( LOAD t2, UNIT(2)(src), l_exc_copy)
229EXC( LOAD t3, UNIT(3)(src), l_exc_copy)
230 SUB len, len, 8*NBYTES
231EXC( LOAD t4, UNIT(4)(src), l_exc_copy)
232EXC( LOAD t7, UNIT(5)(src), l_exc_copy)
233 STORE t0, UNIT(0)(dst)
234 STORE t1, UNIT(1)(dst)
235EXC( LOAD t0, UNIT(6)(src), l_exc_copy)
236EXC( LOAD t1, UNIT(7)(src), l_exc_copy)
237 ADD src, src, 8*NBYTES
238 ADD dst, dst, 8*NBYTES
239 STORE t2, UNIT(-6)(dst)
240 STORE t3, UNIT(-5)(dst)
241 STORE t4, UNIT(-4)(dst)
242 STORE t7, UNIT(-3)(dst)
243 STORE t0, UNIT(-2)(dst)
244 STORE t1, UNIT(-1)(dst)
245 PREF( 0, 8*32(src) )
246 PREF( 1, 8*32(dst) )
247 bne len, rem, 1b
248 nop
249
250 /*
251 * len == rem == the number of bytes left to copy < 8*NBYTES
252 */
253cleanup_both_aligned:
254 beqz len, done
255 sltu t0, len, 4*NBYTES
256 bnez t0, less_than_4units
257 and rem, len, (NBYTES-1) # rem = len % NBYTES
258 /*
259 * len >= 4*NBYTES
260 */
261EXC( LOAD t0, UNIT(0)(src), l_exc)
262EXC( LOAD t1, UNIT(1)(src), l_exc_copy)
263EXC( LOAD t2, UNIT(2)(src), l_exc_copy)
264EXC( LOAD t3, UNIT(3)(src), l_exc_copy)
265 SUB len, len, 4*NBYTES
266 ADD src, src, 4*NBYTES
267 STORE t0, UNIT(0)(dst)
268 STORE t1, UNIT(1)(dst)
269 STORE t2, UNIT(2)(dst)
270 STORE t3, UNIT(3)(dst)
271 beqz len, done
272 ADD dst, dst, 4*NBYTES
273less_than_4units:
274 /*
275 * rem = len % NBYTES
276 */
277 beq rem, len, copy_bytes
278 nop
2791:
280EXC( LOAD t0, 0(src), l_exc)
281 ADD src, src, NBYTES
282 SUB len, len, NBYTES
283 STORE t0, 0(dst)
284 bne rem, len, 1b
285 ADD dst, dst, NBYTES
286
287 /*
288 * src and dst are aligned, need to copy rem bytes (rem < NBYTES)
289 * A loop would do only a byte at a time with possible branch
290 * mispredicts. Can't do an explicit LOAD dst,mask,or,STORE
291 * because can't assume read-access to dst. Instead, use
292 * STREST dst, which doesn't require read access to dst.
293 *
294 * This code should perform better than a simple loop on modern,
295 * wide-issue mips processors because the code has fewer branches and
296 * more instruction-level parallelism.
297 */
298#define bits t2
299 beqz len, done
300 ADD t1, dst, len # t1 is just past last byte of dst
301 li bits, 8*NBYTES
302 SLL rem, len, 3 # rem = number of bits to keep
303EXC( LOAD t0, 0(src), l_exc)
304 SUB bits, bits, rem # bits = number of bits to discard
305 SHIFT_DISCARD t0, t0, bits
306 STREST t0, -1(t1)
307 jr ra
308 move len, zero
309dst_unaligned:
310 /*
311 * dst is unaligned
312 * t0 = src & ADDRMASK
313 * t1 = dst & ADDRMASK; T1 > 0
314 * len >= NBYTES
315 *
316 * Copy enough bytes to align dst
317 * Set match = (src and dst have same alignment)
318 */
319#define match rem
320EXC( LDFIRST t3, FIRST(0)(src), l_exc)
321 ADD t2, zero, NBYTES
322EXC( LDREST t3, REST(0)(src), l_exc_copy)
323 SUB t2, t2, t1 # t2 = number of bytes copied
324 xor match, t0, t1
325 STFIRST t3, FIRST(0)(dst)
326 beq len, t2, done
327 SUB len, len, t2
328 ADD dst, dst, t2
329 beqz match, both_aligned
330 ADD src, src, t2
331
332src_unaligned_dst_aligned:
333 SRL t0, len, LOG_NBYTES+2 # +2 for 4 units/iter
334 PREF( 0, 3*32(src) )
335 beqz t0, cleanup_src_unaligned
336 and rem, len, (4*NBYTES-1) # rem = len % 4*NBYTES
337 PREF( 1, 3*32(dst) )
3381:
339/*
340 * Avoid consecutive LD*'s to the same register since some mips
341 * implementations can't issue them in the same cycle.
342 * It's OK to load FIRST(N+1) before REST(N) because the two addresses
343 * are to the same unit (unless src is aligned, but it's not).
344 */
345EXC( LDFIRST t0, FIRST(0)(src), l_exc)
346EXC( LDFIRST t1, FIRST(1)(src), l_exc_copy)
347 SUB len, len, 4*NBYTES
348EXC( LDREST t0, REST(0)(src), l_exc_copy)
349EXC( LDREST t1, REST(1)(src), l_exc_copy)
350EXC( LDFIRST t2, FIRST(2)(src), l_exc_copy)
351EXC( LDFIRST t3, FIRST(3)(src), l_exc_copy)
352EXC( LDREST t2, REST(2)(src), l_exc_copy)
353EXC( LDREST t3, REST(3)(src), l_exc_copy)
354 PREF( 0, 9*32(src) ) # 0 is PREF_LOAD (not streamed)
355 ADD src, src, 4*NBYTES
356#ifdef CONFIG_CPU_SB1
357 nop # improves slotting
358#endif
359 STORE t0, UNIT(0)(dst)
360 STORE t1, UNIT(1)(dst)
361 STORE t2, UNIT(2)(dst)
362 STORE t3, UNIT(3)(dst)
363 PREF( 1, 9*32(dst) ) # 1 is PREF_STORE (not streamed)
364 bne len, rem, 1b
365 ADD dst, dst, 4*NBYTES
366
367cleanup_src_unaligned:
368 beqz len, done
369 and rem, len, NBYTES-1 # rem = len % NBYTES
370 beq rem, len, copy_bytes
371 nop
3721:
373EXC( LDFIRST t0, FIRST(0)(src), l_exc)
374EXC( LDREST t0, REST(0)(src), l_exc_copy)
375 ADD src, src, NBYTES
376 SUB len, len, NBYTES
377 STORE t0, 0(dst)
378 bne len, rem, 1b
379 ADD dst, dst, NBYTES
380
381copy_bytes_checklen:
382 beqz len, done
383 nop
384copy_bytes:
385 /* 0 < len < NBYTES */
386#define COPY_BYTE(N) \
387EXC( lb t0, N(src), l_exc); \
388 SUB len, len, 1; \
389 beqz len, done; \
390 sb t0, N(dst)
391
392 COPY_BYTE(0)
393 COPY_BYTE(1)
394#ifdef USE_DOUBLE
395 COPY_BYTE(2)
396 COPY_BYTE(3)
397 COPY_BYTE(4)
398 COPY_BYTE(5)
399#endif
400EXC( lb t0, NBYTES-2(src), l_exc)
401 SUB len, len, 1
402 jr ra
403 sb t0, NBYTES-2(dst)
404done:
405 jr ra
406 nop
407 END(__copy_user_inatomic)
408
409l_exc_copy:
410 /*
411 * Copy bytes from src until faulting load address (or until a
412 * lb faults)
413 *
414 * When reached by a faulting LDFIRST/LDREST, THREAD_BUADDR($28)
415 * may be more than a byte beyond the last address.
416 * Hence, the lb below may get an exception.
417 *
418 * Assumes src < THREAD_BUADDR($28)
419 */
420 LOAD t0, TI_TASK($28)
421 nop
422 LOAD t0, THREAD_BUADDR(t0)
4231:
424EXC( lb t1, 0(src), l_exc)
425 ADD src, src, 1
426 sb t1, 0(dst) # can't fault -- we're copy_from_user
427 bne src, t0, 1b
428 ADD dst, dst, 1
429l_exc:
430 LOAD t0, TI_TASK($28)
431 nop
432 LOAD t0, THREAD_BUADDR(t0) # t0 is just past last good address
433 nop
434 SUB len, AT, t0 # len number of uncopied bytes
435 jr ra
436 nop
diff --git a/arch/mips/lib/promlib.c b/arch/mips/lib/promlib.c
deleted file mode 100644
index dddfe98b4ded..000000000000
--- a/arch/mips/lib/promlib.c
+++ /dev/null
@@ -1,24 +0,0 @@
1#include <stdarg.h>
2#include <linux/kernel.h>
3
4extern void prom_putchar(char);
5
6void prom_printf(char *fmt, ...)
7{
8 va_list args;
9 char ppbuf[1024];
10 char *bptr;
11
12 va_start(args, fmt);
13 vsprintf(ppbuf, fmt, args);
14
15 bptr = ppbuf;
16
17 while (*bptr != 0) {
18 if (*bptr == '\n')
19 prom_putchar('\r');
20
21 prom_putchar(*bptr++);
22 }
23 va_end(args);
24}
diff --git a/arch/mips/math-emu/kernel_linkage.c b/arch/mips/math-emu/kernel_linkage.c
index 5b3390f64917..ed49ef01ac53 100644
--- a/arch/mips/math-emu/kernel_linkage.c
+++ b/arch/mips/math-emu/kernel_linkage.c
@@ -51,7 +51,7 @@ void fpu_emulator_init_fpu(void)
51 * with appropriate macros from uaccess.h 51 * with appropriate macros from uaccess.h
52 */ 52 */
53 53
54int fpu_emulator_save_context(struct sigcontext *sc) 54int fpu_emulator_save_context(struct sigcontext __user *sc)
55{ 55{
56 int i; 56 int i;
57 int err = 0; 57 int err = 0;
@@ -65,7 +65,7 @@ int fpu_emulator_save_context(struct sigcontext *sc)
65 return err; 65 return err;
66} 66}
67 67
68int fpu_emulator_restore_context(struct sigcontext *sc) 68int fpu_emulator_restore_context(struct sigcontext __user *sc)
69{ 69{
70 int i; 70 int i;
71 int err = 0; 71 int err = 0;
@@ -84,7 +84,7 @@ int fpu_emulator_restore_context(struct sigcontext *sc)
84 * This is the o32 version 84 * This is the o32 version
85 */ 85 */
86 86
87int fpu_emulator_save_context32(struct sigcontext32 *sc) 87int fpu_emulator_save_context32(struct sigcontext32 __user *sc)
88{ 88{
89 int i; 89 int i;
90 int err = 0; 90 int err = 0;
@@ -98,7 +98,7 @@ int fpu_emulator_save_context32(struct sigcontext32 *sc)
98 return err; 98 return err;
99} 99}
100 100
101int fpu_emulator_restore_context32(struct sigcontext32 *sc) 101int fpu_emulator_restore_context32(struct sigcontext32 __user *sc)
102{ 102{
103 int i; 103 int i;
104 int err = 0; 104 int err = 0;
diff --git a/arch/mips/mips-boards/generic/Makefile b/arch/mips/mips-boards/generic/Makefile
index be47c1c2bc80..aade36d78787 100644
--- a/arch/mips/mips-boards/generic/Makefile
+++ b/arch/mips/mips-boards/generic/Makefile
@@ -18,9 +18,9 @@
18# Makefile for the MIPS boards generic routines under Linux. 18# Makefile for the MIPS boards generic routines under Linux.
19# 19#
20 20
21obj-y := reset.o display.o init.o memory.o printf.o \ 21obj-y := reset.o display.o init.o memory.o \
22 cmdline.o time.o 22 cmdline.o time.o
23
24obj-$(CONFIG_EARLY_PRINTK) += console.o
23obj-$(CONFIG_PCI) += pci.o 25obj-$(CONFIG_PCI) += pci.o
24obj-$(CONFIG_KGDB) += gdb_hook.o 26obj-$(CONFIG_KGDB) += gdb_hook.o
25
26EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/mips-boards/generic/printf.c b/arch/mips/mips-boards/generic/console.c
index 1a711bd79b51..4d8ab99e4155 100644
--- a/arch/mips/mips-boards/generic/printf.c
+++ b/arch/mips/mips-boards/generic/console.c
@@ -17,10 +17,9 @@
17 * 17 *
18 * Putting things on the screen/serial line using YAMONs facilities. 18 * Putting things on the screen/serial line using YAMONs facilities.
19 */ 19 */
20#include <linux/console.h>
20#include <linux/init.h> 21#include <linux/init.h>
21#include <linux/kernel.h>
22#include <linux/serial_reg.h> 22#include <linux/serial_reg.h>
23#include <linux/spinlock.h>
24#include <asm/io.h> 23#include <asm/io.h>
25 24
26#ifdef CONFIG_MIPS_ATLAS 25#ifdef CONFIG_MIPS_ATLAS
@@ -67,12 +66,3 @@ int prom_putchar(char c)
67 66
68 return 1; 67 return 1;
69} 68}
70
71char prom_getchar(void)
72{
73 while (!(serial_in(UART_LSR) & UART_LSR_DR))
74 ;
75
76 return serial_in(UART_RX);
77}
78
diff --git a/arch/mips/mips-boards/generic/display.c b/arch/mips/mips-boards/generic/display.c
index f653946afc23..548dbe5ce7c8 100644
--- a/arch/mips/mips-boards/generic/display.c
+++ b/arch/mips/mips-boards/generic/display.c
@@ -24,16 +24,16 @@
24 24
25void mips_display_message(const char *str) 25void mips_display_message(const char *str)
26{ 26{
27 static volatile unsigned int *display = NULL; 27 static unsigned int __iomem *display = NULL;
28 int i; 28 int i;
29 29
30 if (unlikely(display == NULL)) 30 if (unlikely(display == NULL))
31 display = (volatile unsigned int *)ioremap(ASCII_DISPLAY_POS_BASE, 16*sizeof(int)); 31 display = ioremap(ASCII_DISPLAY_POS_BASE, 16*sizeof(int));
32 32
33 for (i = 0; i <= 14; i=i+2) { 33 for (i = 0; i <= 14; i=i+2) {
34 if (*str) 34 if (*str)
35 display[i] = *str++; 35 writel(*str++, display + i);
36 else 36 else
37 display[i] = ' '; 37 writel(' ', display + i);
38 } 38 }
39} 39}
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c
index 58a0fe883591..88e9c2a7a2f9 100644
--- a/arch/mips/mips-boards/generic/init.c
+++ b/arch/mips/mips-boards/generic/init.c
@@ -145,7 +145,7 @@ static void __init console_config(void)
145 char parity = '\0', bits = '\0', flow = '\0'; 145 char parity = '\0', bits = '\0', flow = '\0';
146 char *s; 146 char *s;
147 147
148 if ((strstr(prom_getcmdline(), "console=ttyS")) == NULL) { 148 if ((strstr(prom_getcmdline(), "console=")) == NULL) {
149 s = prom_getenv("modetty0"); 149 s = prom_getenv("modetty0");
150 if (s) { 150 if (s) {
151 while (*s >= '0' && *s <= '9') 151 while (*s >= '0' && *s <= '9')
@@ -167,7 +167,7 @@ static void __init console_config(void)
167 flow = 'r'; 167 flow = 'r';
168 sprintf (console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow); 168 sprintf (console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow);
169 strcat (prom_getcmdline(), console_string); 169 strcat (prom_getcmdline(), console_string);
170 prom_printf("Config serial console:%s\n", console_string); 170 pr_info("Config serial console:%s\n", console_string);
171 } 171 }
172} 172}
173#endif 173#endif
@@ -210,8 +210,9 @@ void __init kgdb_config (void)
210 generic_getDebugChar = rs_getDebugChar; 210 generic_getDebugChar = rs_getDebugChar;
211 } 211 }
212 212
213 prom_printf("KGDB: Using serial line /dev/ttyS%d at %d for session, " 213 pr_info("KGDB: Using serial line /dev/ttyS%d at %d for "
214 "please connect your debugger\n", line ? 1 : 0, speed); 214 "session, please connect your debugger\n",
215 line ? 1 : 0, speed);
215 216
216 { 217 {
217 char *s; 218 char *s;
@@ -250,8 +251,6 @@ void __init mips_ejtag_setup (void)
250 251
251void __init prom_init(void) 252void __init prom_init(void)
252{ 253{
253 u32 start, map, mask, data;
254
255 prom_argc = fw_arg0; 254 prom_argc = fw_arg0;
256 _prom_argv = (int *) fw_arg1; 255 _prom_argv = (int *) fw_arg1;
257 _prom_envp = (int *) fw_arg2; 256 _prom_envp = (int *) fw_arg2;
@@ -277,6 +276,8 @@ void __init prom_init(void)
277 mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_MSC; 276 mips_revision_corid = MIPS_REVISION_CORID_CORE_EMUL_MSC;
278 } 277 }
279 switch(mips_revision_corid) { 278 switch(mips_revision_corid) {
279 u32 start, map, mask, data;
280
280 case MIPS_REVISION_CORID_QED_RM5261: 281 case MIPS_REVISION_CORID_QED_RM5261:
281 case MIPS_REVISION_CORID_CORE_LV: 282 case MIPS_REVISION_CORID_CORE_LV:
282 case MIPS_REVISION_CORID_CORE_FPGA: 283 case MIPS_REVISION_CORID_CORE_FPGA:
@@ -382,7 +383,7 @@ void __init prom_init(void)
382 board_nmi_handler_setup = mips_nmi_setup; 383 board_nmi_handler_setup = mips_nmi_setup;
383 board_ejtag_handler_setup = mips_ejtag_setup; 384 board_ejtag_handler_setup = mips_ejtag_setup;
384 385
385 prom_printf("\nLINUX started...\n"); 386 pr_info("\nLINUX started...\n");
386 prom_init_cmdline(); 387 prom_init_cmdline();
387 prom_meminit(); 388 prom_meminit();
388#ifdef CONFIG_SERIAL_8250_CONSOLE 389#ifdef CONFIG_SERIAL_8250_CONSOLE
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index ebf0e16c5a0d..ae39953da2c4 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -59,11 +59,12 @@ struct prom_pmemblock * __init prom_getmdesc(void)
59 /* otherwise look in the environment */ 59 /* otherwise look in the environment */
60 memsize_str = prom_getenv("memsize"); 60 memsize_str = prom_getenv("memsize");
61 if (!memsize_str) { 61 if (!memsize_str) {
62 prom_printf("memsize not set in boot prom, set to default (32Mb)\n"); 62 printk(KERN_WARNING
63 "memsize not set in boot prom, set to default (32Mb)\n");
63 physical_memsize = 0x02000000; 64 physical_memsize = 0x02000000;
64 } else { 65 } else {
65#ifdef DEBUG 66#ifdef DEBUG
66 prom_printf("prom_memsize = %s\n", memsize_str); 67 pr_debug("prom_memsize = %s\n", memsize_str);
67#endif 68#endif
68 physical_memsize = simple_strtol(memsize_str, NULL, 0); 69 physical_memsize = simple_strtol(memsize_str, NULL, 0);
69 } 70 }
@@ -141,12 +142,12 @@ void __init prom_meminit(void)
141 struct prom_pmemblock *p; 142 struct prom_pmemblock *p;
142 143
143#ifdef DEBUG 144#ifdef DEBUG
144 prom_printf("YAMON MEMORY DESCRIPTOR dump:\n"); 145 pr_debug("YAMON MEMORY DESCRIPTOR dump:\n");
145 p = prom_getmdesc(); 146 p = prom_getmdesc();
146 while (p->size) { 147 while (p->size) {
147 int i = 0; 148 int i = 0;
148 prom_printf("[%d,%p]: base<%08lx> size<%08lx> type<%s>\n", 149 pr_debug("[%d,%p]: base<%08lx> size<%08lx> type<%s>\n",
149 i, p, p->base, p->size, mtypes[p->type]); 150 i, p, p->base, p->size, mtypes[p->type]);
150 p++; 151 p++;
151 i++; 152 i++;
152 } 153 }
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c
index 3192a14698c8..f98d60f78658 100644
--- a/arch/mips/mips-boards/generic/pci.c
+++ b/arch/mips/mips-boards/generic/pci.c
@@ -65,7 +65,7 @@ static struct resource msc_io_resource = {
65}; 65};
66 66
67extern struct pci_ops bonito64_pci_ops; 67extern struct pci_ops bonito64_pci_ops;
68extern struct pci_ops gt64120_pci_ops; 68extern struct pci_ops gt64xxx_pci0_ops;
69extern struct pci_ops msc_pci_ops; 69extern struct pci_ops msc_pci_ops;
70 70
71static struct pci_controller bonito64_controller = { 71static struct pci_controller bonito64_controller = {
@@ -76,7 +76,7 @@ static struct pci_controller bonito64_controller = {
76}; 76};
77 77
78static struct pci_controller gt64120_controller = { 78static struct pci_controller gt64120_controller = {
79 .pci_ops = &gt64120_pci_ops, 79 .pci_ops = &gt64xxx_pci0_ops,
80 .io_resource = &gt64120_io_resource, 80 .io_resource = &gt64120_io_resource,
81 .mem_resource = &gt64120_mem_resource, 81 .mem_resource = &gt64120_mem_resource,
82}; 82};
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c
index 0996ba368b2a..7a1bb51f81ee 100644
--- a/arch/mips/mips-boards/generic/reset.c
+++ b/arch/mips/mips-boards/generic/reset.c
@@ -39,24 +39,24 @@ static void atlas_machine_power_off(void);
39 39
40static void mips_machine_restart(char *command) 40static void mips_machine_restart(char *command)
41{ 41{
42 volatile unsigned int *softres_reg = (unsigned int *)ioremap (SOFTRES_REG, sizeof(unsigned int)); 42 unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, sizeof(unsigned int));
43 43
44 *softres_reg = GORESET; 44 writew(GORESET, softres_reg);
45} 45}
46 46
47static void mips_machine_halt(void) 47static void mips_machine_halt(void)
48{ 48{
49 volatile unsigned int *softres_reg = (unsigned int *)ioremap (SOFTRES_REG, sizeof(unsigned int)); 49 unsigned int __iomem *softres_reg = ioremap(SOFTRES_REG, sizeof(unsigned int));
50 50
51 *softres_reg = GORESET; 51 writew(GORESET, softres_reg);
52} 52}
53 53
54#if defined(CONFIG_MIPS_ATLAS) 54#if defined(CONFIG_MIPS_ATLAS)
55static void atlas_machine_power_off(void) 55static void atlas_machine_power_off(void)
56{ 56{
57 volatile unsigned int *psustby_reg = (unsigned int *)ioremap(ATLAS_PSUSTBY_REG, sizeof(unsigned int)); 57 unsigned int __iomem *psustby_reg = ioremap(ATLAS_PSUSTBY_REG, sizeof(unsigned int));
58 58
59 *psustby_reg = ATLAS_GOSTBY; 59 writew(ATLAS_GOSTBY, psustby_reg);
60} 60}
61#endif 61#endif
62 62
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index a3c3a1d462b2..df2a2bd3aa5d 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -295,7 +295,4 @@ void __init plat_timer_setup(struct irqaction *irq)
295 irq_desc[mips_cpu_timer_irq].status |= IRQ_PER_CPU; 295 irq_desc[mips_cpu_timer_irq].status |= IRQ_PER_CPU;
296 set_irq_handler(mips_cpu_timer_irq, handle_percpu_irq); 296 set_irq_handler(mips_cpu_timer_irq, handle_percpu_irq);
297#endif 297#endif
298
299 /* to generate the first timer interrupt */
300 write_c0_compare (read_c0_count() + mips_hpt_frequency/HZ);
301} 298}
diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile
index cb7f349b0514..377d9e8f250a 100644
--- a/arch/mips/mips-boards/malta/Makefile
+++ b/arch/mips/mips-boards/malta/Makefile
@@ -21,4 +21,4 @@
21 21
22obj-y := malta_int.o malta_setup.o 22obj-y := malta_int.o malta_setup.o
23obj-$(CONFIG_MTD) += malta_mtd.o 23obj-$(CONFIG_MTD) += malta_mtd.o
24obj-$(CONFIG_SMP) += malta_smp.o 24obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c
index 3c206bb17160..83d76025d61d 100644
--- a/arch/mips/mips-boards/malta/malta_int.c
+++ b/arch/mips/mips-boards/malta/malta_int.c
@@ -42,8 +42,6 @@
42#include <asm/mips-boards/msc01_pci.h> 42#include <asm/mips-boards/msc01_pci.h>
43#include <asm/msc01_ic.h> 43#include <asm/msc01_ic.h>
44 44
45extern void mips_timer_interrupt(void);
46
47static DEFINE_SPINLOCK(mips_irq_lock); 45static DEFINE_SPINLOCK(mips_irq_lock);
48 46
49static inline int mips_pcibios_iack(void) 47static inline int mips_pcibios_iack(void)
@@ -85,7 +83,7 @@ static inline int mips_pcibios_iack(void)
85 dummy = BONITO_PCIMAP_CFG; 83 dummy = BONITO_PCIMAP_CFG;
86 iob(); /* sync */ 84 iob(); /* sync */
87 85
88 irq = *(volatile u32 *)(_pcictrl_bonito_pcicfg); 86 irq = readl((u32 *)_pcictrl_bonito_pcicfg);
89 iob(); /* sync */ 87 iob(); /* sync */
90 irq &= 0xff; 88 irq &= 0xff;
91 BONITO_PCIMAP_CFG = 0; 89 BONITO_PCIMAP_CFG = 0;
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 56ea76679cd4..7873932532a1 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -145,7 +145,8 @@ void __init plat_mem_setup(void)
145#ifdef CONFIG_BLK_DEV_IDE 145#ifdef CONFIG_BLK_DEV_IDE
146 /* Check PCI clock */ 146 /* Check PCI clock */
147 { 147 {
148 int jmpr = (*((volatile unsigned int *)ioremap(MALTA_JMPRS_REG, sizeof(unsigned int))) >> 2) & 0x07; 148 unsigned int __iomem *jmpr_p = (unsigned int *) ioremap(MALTA_JMPRS_REG, sizeof(unsigned int));
149 int jmpr = (readw(jmpr_p) >> 2) & 0x07;
149 static const int pciclocks[] __initdata = { 150 static const int pciclocks[] __initdata = {
150 33, 20, 25, 30, 12, 16, 37, 10 151 33, 20, 25, 30, 12, 16, 37, 10
151 }; 152 };
@@ -179,7 +180,6 @@ void __init plat_mem_setup(void)
179 }; 180 };
180#endif 181#endif
181#endif 182#endif
182
183 mips_reboot_setup(); 183 mips_reboot_setup();
184 184
185 board_time_init = mips_time_init; 185 board_time_init = mips_time_init;
diff --git a/arch/mips/mips-boards/malta/malta_smp.c b/arch/mips/mips-boards/malta/malta_smtc.c
index cf967170fe29..d1c80f631100 100644
--- a/arch/mips/mips-boards/malta/malta_smp.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -1,25 +1,14 @@
1/* 1/*
2 * Malta Platform-specific hooks for SMP operation 2 * Malta Platform-specific hooks for SMP operation
3 */ 3 */
4#include <linux/init.h>
4 5
5#include <linux/kernel.h> 6#include <asm/mipsregs.h>
6#include <linux/sched.h> 7#include <asm/mipsmtregs.h>
7#include <linux/cpumask.h> 8#include <asm/smtc.h>
8#include <linux/interrupt.h>
9
10#include <asm/atomic.h>
11#include <asm/cpu.h>
12#include <asm/processor.h>
13#include <asm/system.h>
14#include <asm/hardirq.h>
15#include <asm/mmu_context.h>
16#include <asm/smp.h>
17#ifdef CONFIG_MIPS_MT_SMTC
18#include <asm/smtc_ipi.h> 9#include <asm/smtc_ipi.h>
19#endif /* CONFIG_MIPS_MT_SMTC */
20 10
21/* VPE/SMP Prototype implements platform interfaces directly */ 11/* VPE/SMP Prototype implements platform interfaces directly */
22#if !defined(CONFIG_MIPS_MT_SMP)
23 12
24/* 13/*
25 * Cause the specified action to be performed on a targeted "CPU" 14 * Cause the specified action to be performed on a targeted "CPU"
@@ -27,10 +16,8 @@
27 16
28void core_send_ipi(int cpu, unsigned int action) 17void core_send_ipi(int cpu, unsigned int action)
29{ 18{
30/* "CPU" may be TC of same VPE, VPE of same CPU, or different CPU */ 19 /* "CPU" may be TC of same VPE, VPE of same CPU, or different CPU */
31#ifdef CONFIG_MIPS_MT_SMTC
32 smtc_send_ipi(cpu, LINUX_SMP_IPI, action); 20 smtc_send_ipi(cpu, LINUX_SMP_IPI, action);
33#endif /* CONFIG_MIPS_MT_SMTC */
34} 21}
35 22
36/* 23/*
@@ -39,9 +26,7 @@ void core_send_ipi(int cpu, unsigned int action)
39 26
40void prom_boot_secondary(int cpu, struct task_struct *idle) 27void prom_boot_secondary(int cpu, struct task_struct *idle)
41{ 28{
42#ifdef CONFIG_MIPS_MT_SMTC
43 smtc_boot_secondary(cpu, idle); 29 smtc_boot_secondary(cpu, idle);
44#endif /* CONFIG_MIPS_MT_SMTC */
45} 30}
46 31
47/* 32/*
@@ -50,7 +35,6 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
50 35
51void prom_init_secondary(void) 36void prom_init_secondary(void)
52{ 37{
53#ifdef CONFIG_MIPS_MT_SMTC
54 void smtc_init_secondary(void); 38 void smtc_init_secondary(void);
55 int myvpe; 39 int myvpe;
56 40
@@ -65,7 +49,6 @@ void prom_init_secondary(void)
65 } 49 }
66 50
67 smtc_init_secondary(); 51 smtc_init_secondary();
68#endif /* CONFIG_MIPS_MT_SMTC */
69} 52}
70 53
71/* 54/*
@@ -93,9 +76,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
93 76
94void prom_smp_finish(void) 77void prom_smp_finish(void)
95{ 78{
96#ifdef CONFIG_MIPS_MT_SMTC
97 smtc_smp_finish(); 79 smtc_smp_finish();
98#endif /* CONFIG_MIPS_MT_SMTC */
99} 80}
100 81
101/* 82/*
@@ -105,5 +86,3 @@ void prom_smp_finish(void)
105void prom_cpus_done(void) 86void prom_cpus_done(void)
106{ 87{
107} 88}
108
109#endif /* CONFIG_MIPS32R2_MT_SMP */
diff --git a/arch/mips/mips-boards/sim/Makefile b/arch/mips/mips-boards/sim/Makefile
index a12e32aafde0..dc0bfda11427 100644
--- a/arch/mips/mips-boards/sim/Makefile
+++ b/arch/mips/mips-boards/sim/Makefile
@@ -1,5 +1,7 @@
1# 1#
2# Copyright (C) 2005 MIPS Technologies, Inc. All rights reserved. 2# Copyright (C) 2005 MIPS Technologies, Inc. All rights reserved.
3# Copyright (C) 2007 MIPS Technologies, Inc.
4# written by Ralf Baechle (ralf@linux-mips.org)
3# 5#
4# This program is free software; you can distribute it and/or modify it 6# This program is free software; you can distribute it and/or modify it
5# under the terms of the GNU General Public License (Version 2) as 7# under the terms of the GNU General Public License (Version 2) as
@@ -15,5 +17,8 @@
15# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 17# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
16# 18#
17 19
18obj-y := sim_setup.o sim_mem.o sim_time.o sim_printf.o sim_int.o sim_cmdline.o 20obj-y := sim_platform.o sim_setup.o sim_mem.o sim_time.o sim_int.o \
21 sim_cmdline.o
22
23obj-$(CONFIG_EARLY_PRINTK) += sim_console.o
19obj-$(CONFIG_SMP) += sim_smp.o 24obj-$(CONFIG_SMP) += sim_smp.o
diff --git a/arch/mips/mips-boards/sim/sim_printf.c b/arch/mips/mips-boards/sim/sim_console.c
index 3ee5a0b501a6..de595a9ccb27 100644
--- a/arch/mips/mips-boards/sim/sim_printf.c
+++ b/arch/mips/mips-boards/sim/sim_console.c
@@ -1,7 +1,4 @@
1/* 1/*
2 * Carsten Langgaard, carstenl@mips.com
3 * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
4 *
5 * This program is free software; you can distribute it and/or modify it 2 * This program is free software; you can distribute it and/or modify it
6 * under the terms of the GNU General Public License (Version 2) as 3 * under the terms of the GNU General Public License (Version 2) as
7 * published by the Free Software Foundation. 4 * published by the Free Software Foundation.
@@ -15,14 +12,14 @@
15 * with this program; if not, write to the Free Software Foundation, Inc., 12 * with this program; if not, write to the Free Software Foundation, Inc.,
16 * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 13 * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
17 * 14 *
18 * Putting things on the screen/serial line using YAMONs facilities. 15 * Carsten Langgaard, carstenl@mips.com
16 * Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved.
17 * Copyright (C) 2007 MIPS Technologies, Inc.
18 * written by Ralf Baechle
19 */ 19 */
20#include <linux/init.h> 20#include <linux/init.h>
21#include <linux/kernel.h>
22#include <linux/serial_reg.h> 21#include <linux/serial_reg.h>
23#include <linux/spinlock.h>
24#include <asm/io.h> 22#include <asm/io.h>
25#include <asm/system.h>
26 23
27static inline unsigned int serial_in(int offset) 24static inline unsigned int serial_in(int offset)
28{ 25{
@@ -34,41 +31,10 @@ static inline void serial_out(int offset, int value)
34 outb(value, 0x3f8 + offset); 31 outb(value, 0x3f8 + offset);
35} 32}
36 33
37int putPromChar(char c) 34void __init prom_putchar(char c)
38{ 35{
39 while ((serial_in(UART_LSR) & UART_LSR_THRE) == 0) 36 while ((serial_in(UART_LSR) & UART_LSR_THRE) == 0)
40 ; 37 ;
41 38
42 serial_out(UART_TX, c); 39 serial_out(UART_TX, c);
43
44 return 1;
45}
46
47char getPromChar(void)
48{
49 while (!(serial_in(UART_LSR) & 1))
50 ;
51
52 return serial_in(UART_RX);
53}
54
55void prom_printf(char *fmt, ...)
56{
57 va_list args;
58 int l;
59 char *p, *buf_end;
60 char buf[1024];
61
62 va_start(args, fmt);
63 l = vsprintf(buf, fmt, args); /* hopefully i < sizeof(buf) */
64 va_end(args);
65
66 buf_end = buf + l;
67
68 for (p = buf; p < buf_end; p++) {
69 /* Crude cr/nl handling is better than none */
70 if (*p == '\n')
71 putPromChar('\r');
72 putPromChar(*p);
73 }
74} 40}
diff --git a/arch/mips/mips-boards/sim/sim_mem.c b/arch/mips/mips-boards/sim/sim_mem.c
index 46bc16f8b15d..e408ef0bcd6e 100644
--- a/arch/mips/mips-boards/sim/sim_mem.c
+++ b/arch/mips/mips-boards/sim/sim_mem.c
@@ -46,7 +46,7 @@ struct prom_pmemblock * __init prom_getmdesc(void)
46 unsigned int memsize; 46 unsigned int memsize;
47 47
48 memsize = 0x02000000; 48 memsize = 0x02000000;
49 prom_printf("Setting default memory size 0x%08x\n", memsize); 49 pr_info("Setting default memory size 0x%08x\n", memsize);
50 50
51 memset(mdesc, 0, sizeof(mdesc)); 51 memset(mdesc, 0, sizeof(mdesc));
52 52
diff --git a/arch/mips/mips-boards/sim/sim_platform.c b/arch/mips/mips-boards/sim/sim_platform.c
new file mode 100644
index 000000000000..53210a8c5dec
--- /dev/null
+++ b/arch/mips/mips-boards/sim/sim_platform.c
@@ -0,0 +1,35 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Copyright (C) 2007 by Ralf Baechle (ralf@linux-mips.org)
7 */
8#include <linux/init.h>
9#include <linux/if_ether.h>
10#include <linux/kernel.h>
11#include <linux/platform_device.h>
12
13static char mipsnet_string[] = "mipsnet";
14
15static struct platform_device eth1_device = {
16 .name = mipsnet_string,
17 .id = 0,
18};
19
20/*
21 * Create a platform device for the GPI port that receives the
22 * image data from the embedded camera.
23 */
24static int __init mipsnet_devinit(void)
25{
26 int err;
27
28 err = platform_device_register(&eth1_device);
29 if (err)
30 printk(KERN_ERR "%s: registration failed\n", mipsnet_string);
31
32 return err;
33}
34
35device_initcall(mipsnet_devinit);
diff --git a/arch/mips/mips-boards/sim/sim_setup.c b/arch/mips/mips-boards/sim/sim_setup.c
index ea2066c3a1f7..b705f09e57c3 100644
--- a/arch/mips/mips-boards/sim/sim_setup.c
+++ b/arch/mips/mips-boards/sim/sim_setup.c
@@ -55,7 +55,7 @@ void __init plat_mem_setup(void)
55 serial_init(); 55 serial_init();
56 56
57 board_time_init = sim_time_init; 57 board_time_init = sim_time_init;
58 prom_printf("Linux started...\n"); 58 pr_info("Linux started...\n");
59 59
60#ifdef CONFIG_MIPS_MT_SMP 60#ifdef CONFIG_MIPS_MT_SMP
61 sanitize_tlb_entries(); 61 sanitize_tlb_entries();
@@ -66,7 +66,7 @@ void prom_init(void)
66{ 66{
67 set_io_port_base(0xbfd00000); 67 set_io_port_base(0xbfd00000);
68 68
69 prom_printf("\nLINUX started...\n"); 69 pr_info("\nLINUX started...\n");
70 prom_init_cmdline(); 70 prom_init_cmdline();
71 prom_meminit(); 71 prom_meminit();
72} 72}
@@ -91,7 +91,7 @@ static void __init serial_init(void)
91 s.timeout = 4; 91 s.timeout = 4;
92 92
93 if (early_serial_setup(&s) != 0) { 93 if (early_serial_setup(&s) != 0) {
94 prom_printf(KERN_ERR "Serial setup failed!\n"); 94 printk(KERN_ERR "Serial setup failed!\n");
95 } 95 }
96 96
97#endif 97#endif
diff --git a/arch/mips/mips-boards/sim/sim_time.c b/arch/mips/mips-boards/sim/sim_time.c
index 30711d016fed..d3a21c741514 100644
--- a/arch/mips/mips-boards/sim/sim_time.c
+++ b/arch/mips/mips-boards/sim/sim_time.c
@@ -199,7 +199,4 @@ void __init plat_timer_setup(struct irqaction *irq)
199 irq_desc[mips_cpu_timer_irq].flags |= IRQ_PER_CPU; 199 irq_desc[mips_cpu_timer_irq].flags |= IRQ_PER_CPU;
200 set_irq_handler(mips_cpu_timer_irq, handle_percpu_irq); 200 set_irq_handler(mips_cpu_timer_irq, handle_percpu_irq);
201#endif 201#endif
202
203 /* to generate the first timer interrupt */
204 write_c0_compare(read_c0_count() + (mips_hpt_frequency/HZ));
205} 202}
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index de5727385bc6..293697b15603 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -31,5 +31,3 @@ obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
31obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o 31obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
32obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o 32obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
33obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o 33obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o
34
35EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c
index d1af42c2a52e..59868a1edf66 100644
--- a/arch/mips/mm/c-r3k.c
+++ b/arch/mips/mm/c-r3k.c
@@ -260,7 +260,7 @@ static void r3k_flush_cache_page(struct vm_area_struct *vma, unsigned long page,
260{ 260{
261} 261}
262 262
263static void local_r3k_flush_data_cache_page(unsigned long addr) 263static void local_r3k_flush_data_cache_page(void *addr)
264{ 264{
265} 265}
266 266
diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c
index f32ebde30ccf..560a6de96556 100644
--- a/arch/mips/mm/c-tx39.c
+++ b/arch/mips/mm/c-tx39.c
@@ -128,7 +128,6 @@ static inline void tx39_flush_cache_all(void)
128 return; 128 return;
129 129
130 tx39_blast_dcache(); 130 tx39_blast_dcache();
131 tx39_blast_icache();
132} 131}
133 132
134static inline void tx39___flush_cache_all(void) 133static inline void tx39___flush_cache_all(void)
@@ -142,24 +141,19 @@ static void tx39_flush_cache_mm(struct mm_struct *mm)
142 if (!cpu_has_dc_aliases) 141 if (!cpu_has_dc_aliases)
143 return; 142 return;
144 143
145 if (cpu_context(smp_processor_id(), mm) != 0) { 144 if (cpu_context(smp_processor_id(), mm) != 0)
146 tx39_flush_cache_all(); 145 tx39_blast_dcache();
147 }
148} 146}
149 147
150static void tx39_flush_cache_range(struct vm_area_struct *vma, 148static void tx39_flush_cache_range(struct vm_area_struct *vma,
151 unsigned long start, unsigned long end) 149 unsigned long start, unsigned long end)
152{ 150{
153 int exec; 151 if (!cpu_has_dc_aliases)
154 152 return;
155 if (!(cpu_context(smp_processor_id(), vma->vm_mm))) 153 if (!(cpu_context(smp_processor_id(), vma->vm_mm)))
156 return; 154 return;
157 155
158 exec = vma->vm_flags & VM_EXEC; 156 tx39_blast_dcache();
159 if (cpu_has_dc_aliases || exec)
160 tx39_blast_dcache();
161 if (exec)
162 tx39_blast_icache();
163} 157}
164 158
165static void tx39_flush_cache_page(struct vm_area_struct *vma, unsigned long page, unsigned long pfn) 159static void tx39_flush_cache_page(struct vm_area_struct *vma, unsigned long page, unsigned long pfn)
@@ -218,7 +212,7 @@ static void tx39_flush_cache_page(struct vm_area_struct *vma, unsigned long page
218 212
219static void local_tx39_flush_data_cache_page(void * addr) 213static void local_tx39_flush_data_cache_page(void * addr)
220{ 214{
221 tx39_blast_dcache_page(addr); 215 tx39_blast_dcache_page((unsigned long)addr);
222} 216}
223 217
224static void tx39_flush_data_cache_page(unsigned long addr) 218static void tx39_flush_data_cache_page(unsigned long addr)
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 31819c58bffa..abf99b1eba13 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -3,7 +3,8 @@
3 * License. See the file "COPYING" in the main directory of this archive 3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details. 4 * for more details.
5 * 5 *
6 * Copyright (C) 1994 - 2003 by Ralf Baechle 6 * Copyright (C) 1994 - 2003, 07 by Ralf Baechle (ralf@linux-mips.org)
7 * Copyright (C) 2007 MIPS Technologies, Inc.
7 */ 8 */
8#include <linux/init.h> 9#include <linux/init.h>
9#include <linux/kernel.h> 10#include <linux/kernel.h>
@@ -88,6 +89,19 @@ void __flush_dcache_page(struct page *page)
88 89
89EXPORT_SYMBOL(__flush_dcache_page); 90EXPORT_SYMBOL(__flush_dcache_page);
90 91
92void __flush_anon_page(struct page *page, unsigned long vmaddr)
93{
94 if (pages_do_alias((unsigned long)page_address(page), vmaddr)) {
95 void *kaddr;
96
97 kaddr = kmap_coherent(page, vmaddr);
98 flush_data_cache_page((unsigned long)kaddr);
99 kunmap_coherent();
100 }
101}
102
103EXPORT_SYMBOL(__flush_anon_page);
104
91void __update_cache(struct vm_area_struct *vma, unsigned long address, 105void __update_cache(struct vm_area_struct *vma, unsigned long address,
92 pte_t pte) 106 pte_t pte)
93{ 107{
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c
index e19fbb9ee47f..4c72e650f9b6 100644
--- a/arch/mips/mm/cerr-sb1.c
+++ b/arch/mips/mm/cerr-sb1.c
@@ -77,66 +77,66 @@ static uint32_t extract_dc(unsigned short addr, int data);
77static inline void breakout_errctl(unsigned int val) 77static inline void breakout_errctl(unsigned int val)
78{ 78{
79 if (val & CP0_ERRCTL_RECOVERABLE) 79 if (val & CP0_ERRCTL_RECOVERABLE)
80 prom_printf(" recoverable"); 80 printk(" recoverable");
81 if (val & CP0_ERRCTL_DCACHE) 81 if (val & CP0_ERRCTL_DCACHE)
82 prom_printf(" dcache"); 82 printk(" dcache");
83 if (val & CP0_ERRCTL_ICACHE) 83 if (val & CP0_ERRCTL_ICACHE)
84 prom_printf(" icache"); 84 printk(" icache");
85 if (val & CP0_ERRCTL_MULTIBUS) 85 if (val & CP0_ERRCTL_MULTIBUS)
86 prom_printf(" multiple-buserr"); 86 printk(" multiple-buserr");
87 prom_printf("\n"); 87 printk("\n");
88} 88}
89 89
90static inline void breakout_cerri(unsigned int val) 90static inline void breakout_cerri(unsigned int val)
91{ 91{
92 if (val & CP0_CERRI_TAG_PARITY) 92 if (val & CP0_CERRI_TAG_PARITY)
93 prom_printf(" tag-parity"); 93 printk(" tag-parity");
94 if (val & CP0_CERRI_DATA_PARITY) 94 if (val & CP0_CERRI_DATA_PARITY)
95 prom_printf(" data-parity"); 95 printk(" data-parity");
96 if (val & CP0_CERRI_EXTERNAL) 96 if (val & CP0_CERRI_EXTERNAL)
97 prom_printf(" external"); 97 printk(" external");
98 prom_printf("\n"); 98 printk("\n");
99} 99}
100 100
101static inline void breakout_cerrd(unsigned int val) 101static inline void breakout_cerrd(unsigned int val)
102{ 102{
103 switch (val & CP0_CERRD_CAUSES) { 103 switch (val & CP0_CERRD_CAUSES) {
104 case CP0_CERRD_LOAD: 104 case CP0_CERRD_LOAD:
105 prom_printf(" load,"); 105 printk(" load,");
106 break; 106 break;
107 case CP0_CERRD_STORE: 107 case CP0_CERRD_STORE:
108 prom_printf(" store,"); 108 printk(" store,");
109 break; 109 break;
110 case CP0_CERRD_FILLWB: 110 case CP0_CERRD_FILLWB:
111 prom_printf(" fill/wb,"); 111 printk(" fill/wb,");
112 break; 112 break;
113 case CP0_CERRD_COHERENCY: 113 case CP0_CERRD_COHERENCY:
114 prom_printf(" coherency,"); 114 printk(" coherency,");
115 break; 115 break;
116 case CP0_CERRD_DUPTAG: 116 case CP0_CERRD_DUPTAG:
117 prom_printf(" duptags,"); 117 printk(" duptags,");
118 break; 118 break;
119 default: 119 default:
120 prom_printf(" NO CAUSE,"); 120 printk(" NO CAUSE,");
121 break; 121 break;
122 } 122 }
123 if (!(val & CP0_CERRD_TYPES)) 123 if (!(val & CP0_CERRD_TYPES))
124 prom_printf(" NO TYPE"); 124 printk(" NO TYPE");
125 else { 125 else {
126 if (val & CP0_CERRD_MULTIPLE) 126 if (val & CP0_CERRD_MULTIPLE)
127 prom_printf(" multi-err"); 127 printk(" multi-err");
128 if (val & CP0_CERRD_TAG_STATE) 128 if (val & CP0_CERRD_TAG_STATE)
129 prom_printf(" tag-state"); 129 printk(" tag-state");
130 if (val & CP0_CERRD_TAG_ADDRESS) 130 if (val & CP0_CERRD_TAG_ADDRESS)
131 prom_printf(" tag-address"); 131 printk(" tag-address");
132 if (val & CP0_CERRD_DATA_SBE) 132 if (val & CP0_CERRD_DATA_SBE)
133 prom_printf(" data-SBE"); 133 printk(" data-SBE");
134 if (val & CP0_CERRD_DATA_DBE) 134 if (val & CP0_CERRD_DATA_DBE)
135 prom_printf(" data-DBE"); 135 printk(" data-DBE");
136 if (val & CP0_CERRD_EXTERNAL) 136 if (val & CP0_CERRD_EXTERNAL)
137 prom_printf(" external"); 137 printk(" external");
138 } 138 }
139 prom_printf("\n"); 139 printk("\n");
140} 140}
141 141
142#ifndef CONFIG_SIBYTE_BUS_WATCHER 142#ifndef CONFIG_SIBYTE_BUS_WATCHER
@@ -157,18 +157,18 @@ static void check_bus_watcher(void)
157 l2_tag = in64(IO_SPACE_BASE | A_L2_ECC_TAG); 157 l2_tag = in64(IO_SPACE_BASE | A_L2_ECC_TAG);
158#endif 158#endif
159 memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); 159 memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS));
160 prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); 160 printk("Bus watcher error counters: %08x %08x\n", l2_err, memio_err);
161 prom_printf("\nLast recorded signature:\n"); 161 printk("\nLast recorded signature:\n");
162 prom_printf("Request %02x from %d, answered by %d with Dcode %d\n", 162 printk("Request %02x from %d, answered by %d with Dcode %d\n",
163 (unsigned int)(G_SCD_BERR_TID(status) & 0x3f), 163 (unsigned int)(G_SCD_BERR_TID(status) & 0x3f),
164 (int)(G_SCD_BERR_TID(status) >> 6), 164 (int)(G_SCD_BERR_TID(status) >> 6),
165 (int)G_SCD_BERR_RID(status), 165 (int)G_SCD_BERR_RID(status),
166 (int)G_SCD_BERR_DCODE(status)); 166 (int)G_SCD_BERR_DCODE(status));
167#ifdef DUMP_L2_ECC_TAG_ON_ERROR 167#ifdef DUMP_L2_ECC_TAG_ON_ERROR
168 prom_printf("Last L2 tag w/ bad ECC: %016llx\n", l2_tag); 168 printk("Last L2 tag w/ bad ECC: %016llx\n", l2_tag);
169#endif 169#endif
170 } else { 170 } else {
171 prom_printf("Bus watcher indicates no error\n"); 171 printk("Bus watcher indicates no error\n");
172 } 172 }
173} 173}
174#else 174#else
@@ -177,8 +177,8 @@ extern void check_bus_watcher(void);
177 177
178asmlinkage void sb1_cache_error(void) 178asmlinkage void sb1_cache_error(void)
179{ 179{
180 uint64_t cerr_dpa;
181 uint32_t errctl, cerr_i, cerr_d, dpalo, dpahi, eepc, res; 180 uint32_t errctl, cerr_i, cerr_d, dpalo, dpahi, eepc, res;
181 unsigned long long cerr_dpa;
182 182
183#ifdef CONFIG_SIBYTE_BW_TRACE 183#ifdef CONFIG_SIBYTE_BW_TRACE
184 /* Freeze the trace buffer now */ 184 /* Freeze the trace buffer now */
@@ -187,11 +187,11 @@ asmlinkage void sb1_cache_error(void)
187#else 187#else
188 csr_out32(M_SCD_TRACE_CFG_FREEZE, IO_SPACE_BASE | A_SCD_TRACE_CFG); 188 csr_out32(M_SCD_TRACE_CFG_FREEZE, IO_SPACE_BASE | A_SCD_TRACE_CFG);
189#endif 189#endif
190 prom_printf("Trace buffer frozen\n"); 190 printk("Trace buffer frozen\n");
191#endif 191#endif
192 192
193 prom_printf("Cache error exception on CPU %x:\n", 193 printk("Cache error exception on CPU %x:\n",
194 (read_c0_prid() >> 25) & 0x7); 194 (read_c0_prid() >> 25) & 0x7);
195 195
196 __asm__ __volatile__ ( 196 __asm__ __volatile__ (
197 " .set push\n\t" 197 " .set push\n\t"
@@ -209,43 +209,43 @@ asmlinkage void sb1_cache_error(void)
209 "=r" (dpahi), "=r" (dpalo), "=r" (eepc)); 209 "=r" (dpahi), "=r" (dpalo), "=r" (eepc));
210 210
211 cerr_dpa = (((uint64_t)dpahi) << 32) | dpalo; 211 cerr_dpa = (((uint64_t)dpahi) << 32) | dpalo;
212 prom_printf(" c0_errorepc == %08x\n", eepc); 212 printk(" c0_errorepc == %08x\n", eepc);
213 prom_printf(" c0_errctl == %08x", errctl); 213 printk(" c0_errctl == %08x", errctl);
214 breakout_errctl(errctl); 214 breakout_errctl(errctl);
215 if (errctl & CP0_ERRCTL_ICACHE) { 215 if (errctl & CP0_ERRCTL_ICACHE) {
216 prom_printf(" c0_cerr_i == %08x", cerr_i); 216 printk(" c0_cerr_i == %08x", cerr_i);
217 breakout_cerri(cerr_i); 217 breakout_cerri(cerr_i);
218 if (CP0_CERRI_IDX_VALID(cerr_i)) { 218 if (CP0_CERRI_IDX_VALID(cerr_i)) {
219 /* Check index of EPC, allowing for delay slot */ 219 /* Check index of EPC, allowing for delay slot */
220 if (((eepc & SB1_CACHE_INDEX_MASK) != (cerr_i & SB1_CACHE_INDEX_MASK)) && 220 if (((eepc & SB1_CACHE_INDEX_MASK) != (cerr_i & SB1_CACHE_INDEX_MASK)) &&
221 ((eepc & SB1_CACHE_INDEX_MASK) != ((cerr_i & SB1_CACHE_INDEX_MASK) - 4))) 221 ((eepc & SB1_CACHE_INDEX_MASK) != ((cerr_i & SB1_CACHE_INDEX_MASK) - 4)))
222 prom_printf(" cerr_i idx doesn't match eepc\n"); 222 printk(" cerr_i idx doesn't match eepc\n");
223 else { 223 else {
224 res = extract_ic(cerr_i & SB1_CACHE_INDEX_MASK, 224 res = extract_ic(cerr_i & SB1_CACHE_INDEX_MASK,
225 (cerr_i & CP0_CERRI_DATA) != 0); 225 (cerr_i & CP0_CERRI_DATA) != 0);
226 if (!(res & cerr_i)) 226 if (!(res & cerr_i))
227 prom_printf("...didn't see indicated icache problem\n"); 227 printk("...didn't see indicated icache problem\n");
228 } 228 }
229 } 229 }
230 } 230 }
231 if (errctl & CP0_ERRCTL_DCACHE) { 231 if (errctl & CP0_ERRCTL_DCACHE) {
232 prom_printf(" c0_cerr_d == %08x", cerr_d); 232 printk(" c0_cerr_d == %08x", cerr_d);
233 breakout_cerrd(cerr_d); 233 breakout_cerrd(cerr_d);
234 if (CP0_CERRD_DPA_VALID(cerr_d)) { 234 if (CP0_CERRD_DPA_VALID(cerr_d)) {
235 prom_printf(" c0_cerr_dpa == %010llx\n", cerr_dpa); 235 printk(" c0_cerr_dpa == %010llx\n", cerr_dpa);
236 if (!CP0_CERRD_IDX_VALID(cerr_d)) { 236 if (!CP0_CERRD_IDX_VALID(cerr_d)) {
237 res = extract_dc(cerr_dpa & SB1_CACHE_INDEX_MASK, 237 res = extract_dc(cerr_dpa & SB1_CACHE_INDEX_MASK,
238 (cerr_d & CP0_CERRD_DATA) != 0); 238 (cerr_d & CP0_CERRD_DATA) != 0);
239 if (!(res & cerr_d)) 239 if (!(res & cerr_d))
240 prom_printf("...didn't see indicated dcache problem\n"); 240 printk("...didn't see indicated dcache problem\n");
241 } else { 241 } else {
242 if ((cerr_dpa & SB1_CACHE_INDEX_MASK) != (cerr_d & SB1_CACHE_INDEX_MASK)) 242 if ((cerr_dpa & SB1_CACHE_INDEX_MASK) != (cerr_d & SB1_CACHE_INDEX_MASK))
243 prom_printf(" cerr_d idx doesn't match cerr_dpa\n"); 243 printk(" cerr_d idx doesn't match cerr_dpa\n");
244 else { 244 else {
245 res = extract_dc(cerr_d & SB1_CACHE_INDEX_MASK, 245 res = extract_dc(cerr_d & SB1_CACHE_INDEX_MASK,
246 (cerr_d & CP0_CERRD_DATA) != 0); 246 (cerr_d & CP0_CERRD_DATA) != 0);
247 if (!(res & cerr_d)) 247 if (!(res & cerr_d))
248 prom_printf("...didn't see indicated problem\n"); 248 printk("...didn't see indicated problem\n");
249 } 249 }
250 } 250 }
251 } 251 }
@@ -329,12 +329,13 @@ static uint32_t extract_ic(unsigned short addr, int data)
329{ 329{
330 unsigned short way; 330 unsigned short way;
331 int valid; 331 int valid;
332 uint64_t taglo, va, tlo_tmp;
333 uint32_t taghi, taglolo, taglohi; 332 uint32_t taghi, taglolo, taglohi;
333 unsigned long long taglo, va;
334 uint64_t tlo_tmp;
334 uint8_t lru; 335 uint8_t lru;
335 int res = 0; 336 int res = 0;
336 337
337 prom_printf("Icache index 0x%04x ", addr); 338 printk("Icache index 0x%04x ", addr);
338 for (way = 0; way < 4; way++) { 339 for (way = 0; way < 4; way++) {
339 /* Index-load-tag-I */ 340 /* Index-load-tag-I */
340 __asm__ __volatile__ ( 341 __asm__ __volatile__ (
@@ -354,7 +355,7 @@ static uint32_t extract_ic(unsigned short addr, int data)
354 taglo = ((unsigned long long)taglohi << 32) | taglolo; 355 taglo = ((unsigned long long)taglohi << 32) | taglolo;
355 if (way == 0) { 356 if (way == 0) {
356 lru = (taghi >> 14) & 0xff; 357 lru = (taghi >> 14) & 0xff;
357 prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n", 358 printk("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n",
358 ((addr >> 5) & 0x3), /* bank */ 359 ((addr >> 5) & 0x3), /* bank */
359 ((addr >> 7) & 0x3f), /* index */ 360 ((addr >> 7) & 0x3f), /* index */
360 (lru & 0x3), 361 (lru & 0x3),
@@ -369,19 +370,19 @@ static uint32_t extract_ic(unsigned short addr, int data)
369 if (valid) { 370 if (valid) {
370 tlo_tmp = taglo & 0xfff3ff; 371 tlo_tmp = taglo & 0xfff3ff;
371 if (((taglo >> 10) & 1) ^ range_parity(tlo_tmp, 23, 0)) { 372 if (((taglo >> 10) & 1) ^ range_parity(tlo_tmp, 23, 0)) {
372 prom_printf(" ** bad parity in VTag0/G/ASID\n"); 373 printk(" ** bad parity in VTag0/G/ASID\n");
373 res |= CP0_CERRI_TAG_PARITY; 374 res |= CP0_CERRI_TAG_PARITY;
374 } 375 }
375 if (((taglo >> 11) & 1) ^ range_parity(taglo, 63, 24)) { 376 if (((taglo >> 11) & 1) ^ range_parity(taglo, 63, 24)) {
376 prom_printf(" ** bad parity in R/VTag1\n"); 377 printk(" ** bad parity in R/VTag1\n");
377 res |= CP0_CERRI_TAG_PARITY; 378 res |= CP0_CERRI_TAG_PARITY;
378 } 379 }
379 } 380 }
380 if (valid ^ ((taghi >> 27) & 1)) { 381 if (valid ^ ((taghi >> 27) & 1)) {
381 prom_printf(" ** bad parity for valid bit\n"); 382 printk(" ** bad parity for valid bit\n");
382 res |= CP0_CERRI_TAG_PARITY; 383 res |= CP0_CERRI_TAG_PARITY;
383 } 384 }
384 prom_printf(" %d [VA %016llx] [Vld? %d] raw tags: %08X-%016llX\n", 385 printk(" %d [VA %016llx] [Vld? %d] raw tags: %08X-%016llX\n",
385 way, va, valid, taghi, taglo); 386 way, va, valid, taghi, taglo);
386 387
387 if (data) { 388 if (data) {
@@ -407,21 +408,21 @@ static uint32_t extract_ic(unsigned short addr, int data)
407 : "r" ((way << 13) | addr | (offset << 3))); 408 : "r" ((way << 13) | addr | (offset << 3)));
408 predecode = (datahi >> 8) & 0xff; 409 predecode = (datahi >> 8) & 0xff;
409 if (((datahi >> 16) & 1) != (uint32_t)range_parity(predecode, 7, 0)) { 410 if (((datahi >> 16) & 1) != (uint32_t)range_parity(predecode, 7, 0)) {
410 prom_printf(" ** bad parity in predecode\n"); 411 printk(" ** bad parity in predecode\n");
411 res |= CP0_CERRI_DATA_PARITY; 412 res |= CP0_CERRI_DATA_PARITY;
412 } 413 }
413 /* XXXKW should/could check predecode bits themselves */ 414 /* XXXKW should/could check predecode bits themselves */
414 if (((datahi >> 4) & 0xf) ^ inst_parity(insta)) { 415 if (((datahi >> 4) & 0xf) ^ inst_parity(insta)) {
415 prom_printf(" ** bad parity in instruction a\n"); 416 printk(" ** bad parity in instruction a\n");
416 res |= CP0_CERRI_DATA_PARITY; 417 res |= CP0_CERRI_DATA_PARITY;
417 } 418 }
418 if ((datahi & 0xf) ^ inst_parity(instb)) { 419 if ((datahi & 0xf) ^ inst_parity(instb)) {
419 prom_printf(" ** bad parity in instruction b\n"); 420 printk(" ** bad parity in instruction b\n");
420 res |= CP0_CERRI_DATA_PARITY; 421 res |= CP0_CERRI_DATA_PARITY;
421 } 422 }
422 prom_printf(" %05X-%08X%08X", datahi, insta, instb); 423 printk(" %05X-%08X%08X", datahi, insta, instb);
423 } 424 }
424 prom_printf("\n"); 425 printk("\n");
425 } 426 }
426 } 427 }
427 return res; 428 return res;
@@ -484,12 +485,12 @@ static uint32_t extract_dc(unsigned short addr, int data)
484{ 485{
485 int valid, way; 486 int valid, way;
486 unsigned char state; 487 unsigned char state;
487 uint64_t taglo, pa;
488 uint32_t taghi, taglolo, taglohi; 488 uint32_t taghi, taglolo, taglohi;
489 unsigned long long taglo, pa;
489 uint8_t ecc, lru; 490 uint8_t ecc, lru;
490 int res = 0; 491 int res = 0;
491 492
492 prom_printf("Dcache index 0x%04x ", addr); 493 printk("Dcache index 0x%04x ", addr);
493 for (way = 0; way < 4; way++) { 494 for (way = 0; way < 4; way++) {
494 __asm__ __volatile__ ( 495 __asm__ __volatile__ (
495 " .set push\n\t" 496 " .set push\n\t"
@@ -509,7 +510,7 @@ static uint32_t extract_dc(unsigned short addr, int data)
509 pa = (taglo & 0xFFFFFFE000ULL) | addr; 510 pa = (taglo & 0xFFFFFFE000ULL) | addr;
510 if (way == 0) { 511 if (way == 0) {
511 lru = (taghi >> 14) & 0xff; 512 lru = (taghi >> 14) & 0xff;
512 prom_printf("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n", 513 printk("[Bank %d Set 0x%02x] LRU > %d %d %d %d > MRU\n",
513 ((addr >> 11) & 0x2) | ((addr >> 5) & 1), /* bank */ 514 ((addr >> 11) & 0x2) | ((addr >> 5) & 1), /* bank */
514 ((addr >> 6) & 0x3f), /* index */ 515 ((addr >> 6) & 0x3f), /* index */
515 (lru & 0x3), 516 (lru & 0x3),
@@ -519,15 +520,15 @@ static uint32_t extract_dc(unsigned short addr, int data)
519 } 520 }
520 state = (taghi >> 25) & 0x1f; 521 state = (taghi >> 25) & 0x1f;
521 valid = DC_TAG_VALID(state); 522 valid = DC_TAG_VALID(state);
522 prom_printf(" %d [PA %010llx] [state %s (%02x)] raw tags: %08X-%016llX\n", 523 printk(" %d [PA %010llx] [state %s (%02x)] raw tags: %08X-%016llX\n",
523 way, pa, dc_state_str(state), state, taghi, taglo); 524 way, pa, dc_state_str(state), state, taghi, taglo);
524 if (valid) { 525 if (valid) {
525 if (((taglo >> 11) & 1) ^ range_parity(taglo, 39, 26)) { 526 if (((taglo >> 11) & 1) ^ range_parity(taglo, 39, 26)) {
526 prom_printf(" ** bad parity in PTag1\n"); 527 printk(" ** bad parity in PTag1\n");
527 res |= CP0_CERRD_TAG_ADDRESS; 528 res |= CP0_CERRD_TAG_ADDRESS;
528 } 529 }
529 if (((taglo >> 10) & 1) ^ range_parity(taglo, 25, 13)) { 530 if (((taglo >> 10) & 1) ^ range_parity(taglo, 25, 13)) {
530 prom_printf(" ** bad parity in PTag0\n"); 531 printk(" ** bad parity in PTag0\n");
531 res |= CP0_CERRD_TAG_ADDRESS; 532 res |= CP0_CERRD_TAG_ADDRESS;
532 } 533 }
533 } else { 534 } else {
@@ -535,8 +536,8 @@ static uint32_t extract_dc(unsigned short addr, int data)
535 } 536 }
536 537
537 if (data) { 538 if (data) {
538 uint64_t datalo;
539 uint32_t datalohi, datalolo, datahi; 539 uint32_t datalohi, datalolo, datahi;
540 unsigned long long datalo;
540 int offset; 541 int offset;
541 char bad_ecc = 0; 542 char bad_ecc = 0;
542 543
@@ -567,13 +568,13 @@ static uint32_t extract_dc(unsigned short addr, int data)
567 } 568 }
568 res |= (bits == 1) ? CP0_CERRD_DATA_SBE : CP0_CERRD_DATA_DBE; 569 res |= (bits == 1) ? CP0_CERRD_DATA_SBE : CP0_CERRD_DATA_DBE;
569 } 570 }
570 prom_printf(" %02X-%016llX", datahi, datalo); 571 printk(" %02X-%016llX", datahi, datalo);
571 } 572 }
572 prom_printf("\n"); 573 printk("\n");
573 if (bad_ecc) 574 if (bad_ecc)
574 prom_printf(" dwords w/ bad ECC: %d %d %d %d\n", 575 printk(" dwords w/ bad ECC: %d %d %d %d\n",
575 !!(bad_ecc & 8), !!(bad_ecc & 4), 576 !!(bad_ecc & 8), !!(bad_ecc & 4),
576 !!(bad_ecc & 2), !!(bad_ecc & 1)); 577 !!(bad_ecc & 2), !!(bad_ecc & 1));
577 } 578 }
578 } 579 }
579 return res; 580 return res;
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index 4a32e939698f..f0eb29917d9a 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -19,6 +19,13 @@
19 19
20#include <dma-coherence.h> 20#include <dma-coherence.h>
21 21
22static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
23{
24 unsigned long addr = plat_dma_addr_to_phys(dma_addr);
25
26 return (unsigned long)phys_to_virt(addr);
27}
28
22/* 29/*
23 * Warning on the terminology - Linux calls an uncached area coherent; 30 * Warning on the terminology - Linux calls an uncached area coherent;
24 * MIPS terminology calls memory areas with hardware maintained coherency 31 * MIPS terminology calls memory areas with hardware maintained coherency
@@ -140,7 +147,7 @@ void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
140 enum dma_data_direction direction) 147 enum dma_data_direction direction)
141{ 148{
142 if (cpu_is_noncoherent_r10000(dev)) 149 if (cpu_is_noncoherent_r10000(dev))
143 __dma_sync(plat_dma_addr_to_phys(dma_addr) + PAGE_OFFSET, size, 150 __dma_sync(dma_addr_to_virt(dma_addr), size,
144 direction); 151 direction);
145 152
146 plat_unmap_dma_mem(dma_addr); 153 plat_unmap_dma_mem(dma_addr);
@@ -234,7 +241,7 @@ void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
234 if (cpu_is_noncoherent_r10000(dev)) { 241 if (cpu_is_noncoherent_r10000(dev)) {
235 unsigned long addr; 242 unsigned long addr;
236 243
237 addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle); 244 addr = dma_addr_to_virt(dma_handle);
238 __dma_sync(addr, size, direction); 245 __dma_sync(addr, size, direction);
239 } 246 }
240} 247}
@@ -246,10 +253,10 @@ void dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle,
246{ 253{
247 BUG_ON(direction == DMA_NONE); 254 BUG_ON(direction == DMA_NONE);
248 255
249 if (cpu_is_noncoherent_r10000(dev)) { 256 if (!plat_device_is_coherent(dev)) {
250 unsigned long addr; 257 unsigned long addr;
251 258
252 addr = plat_dma_addr_to_phys(dma_handle); 259 addr = dma_addr_to_virt(dma_handle);
253 __dma_sync(addr, size, direction); 260 __dma_sync(addr, size, direction);
254 } 261 }
255} 262}
@@ -264,7 +271,7 @@ void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle,
264 if (cpu_is_noncoherent_r10000(dev)) { 271 if (cpu_is_noncoherent_r10000(dev)) {
265 unsigned long addr; 272 unsigned long addr;
266 273
267 addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle); 274 addr = dma_addr_to_virt(dma_handle);
268 __dma_sync(addr + offset, size, direction); 275 __dma_sync(addr + offset, size, direction);
269 } 276 }
270} 277}
@@ -276,10 +283,10 @@ void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle,
276{ 283{
277 BUG_ON(direction == DMA_NONE); 284 BUG_ON(direction == DMA_NONE);
278 285
279 if (cpu_is_noncoherent_r10000(dev)) { 286 if (!plat_device_is_coherent(dev)) {
280 unsigned long addr; 287 unsigned long addr;
281 288
282 addr = PAGE_OFFSET + plat_dma_addr_to_phys(dma_handle); 289 addr = dma_addr_to_virt(dma_handle);
283 __dma_sync(addr + offset, size, direction); 290 __dma_sync(addr + offset, size, direction);
284 } 291 }
285} 292}
@@ -295,7 +302,7 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
295 302
296 /* Make sure that gcc doesn't leave the empty loop body. */ 303 /* Make sure that gcc doesn't leave the empty loop body. */
297 for (i = 0; i < nelems; i++, sg++) { 304 for (i = 0; i < nelems; i++, sg++) {
298 if (!plat_device_is_coherent(dev)) 305 if (cpu_is_noncoherent_r10000(dev))
299 __dma_sync((unsigned long)page_address(sg->page), 306 __dma_sync((unsigned long)page_address(sg->page),
300 sg->length, direction); 307 sg->length, direction);
301 plat_unmap_dma_mem(sg->dma_address); 308 plat_unmap_dma_mem(sg->dma_address);
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index 6f90e7ef66ac..f9c595dceba9 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -42,7 +42,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
42 siginfo_t info; 42 siginfo_t info;
43 43
44#if 0 44#if 0
45 printk("Cpu%d[%s:%d:%0*lx:%ld:%0*lx]\n", smp_processor_id(), 45 printk("Cpu%d[%s:%d:%0*lx:%ld:%0*lx]\n", raw_smp_processor_id(),
46 current->comm, current->pid, field, address, write, 46 current->comm, current->pid, field, address, write,
47 field, regs->cp0_epc); 47 field, regs->cp0_epc);
48#endif 48#endif
@@ -165,7 +165,7 @@ no_context:
165 165
166 printk(KERN_ALERT "CPU %d Unable to handle kernel paging request at " 166 printk(KERN_ALERT "CPU %d Unable to handle kernel paging request at "
167 "virtual address %0*lx, epc == %0*lx, ra == %0*lx\n", 167 "virtual address %0*lx, epc == %0*lx, ra == %0*lx\n",
168 smp_processor_id(), field, address, field, regs->cp0_epc, 168 raw_smp_processor_id(), field, address, field, regs->cp0_epc,
169 field, regs->regs[31]); 169 field, regs->regs[31]);
170 die("Oops", regs); 170 die("Oops", regs);
171 171
@@ -228,7 +228,7 @@ vmalloc_fault:
228 pmd_t *pmd, *pmd_k; 228 pmd_t *pmd, *pmd_k;
229 pte_t *pte_k; 229 pte_t *pte_k;
230 230
231 pgd = (pgd_t *) pgd_current[smp_processor_id()] + offset; 231 pgd = (pgd_t *) pgd_current[raw_smp_processor_id()] + offset;
232 pgd_k = init_mm.pgd + offset; 232 pgd_k = init_mm.pgd + offset;
233 233
234 if (!pgd_present(*pgd_k)) 234 if (!pgd_present(*pgd_k))
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 125a4a85ec05..2d1c2c024822 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -61,8 +61,6 @@
61 61
62DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); 62DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
63 63
64unsigned long highstart_pfn, highend_pfn;
65
66/* 64/*
67 * We have up to 8 empty zeroed pages so we can map one of the right colour 65 * We have up to 8 empty zeroed pages so we can map one of the right colour
68 * when needed. This is necessary only on R4000 / R4400 SC and MC versions 66 * when needed. This is necessary only on R4000 / R4400 SC and MC versions
@@ -125,7 +123,7 @@ static void __init kmap_coherent_init(void)
125static inline void kmap_coherent_init(void) {} 123static inline void kmap_coherent_init(void) {}
126#endif 124#endif
127 125
128static inline void *kmap_coherent(struct page *page, unsigned long addr) 126void *kmap_coherent(struct page *page, unsigned long addr)
129{ 127{
130 enum fixed_addresses idx; 128 enum fixed_addresses idx;
131 unsigned long vaddr, flags, entrylo; 129 unsigned long vaddr, flags, entrylo;
@@ -179,7 +177,7 @@ static inline void *kmap_coherent(struct page *page, unsigned long addr)
179 177
180#define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1))) 178#define UNIQUE_ENTRYHI(idx) (CKSEG0 + ((idx) << (PAGE_SHIFT + 1)))
181 179
182static inline void kunmap_coherent(struct page *page) 180void kunmap_coherent(void)
183{ 181{
184#ifndef CONFIG_MIPS_MT_SMTC 182#ifndef CONFIG_MIPS_MT_SMTC
185 unsigned int wired; 183 unsigned int wired;
@@ -212,7 +210,7 @@ void copy_user_highpage(struct page *to, struct page *from,
212 if (cpu_has_dc_aliases) { 210 if (cpu_has_dc_aliases) {
213 vfrom = kmap_coherent(from, vaddr); 211 vfrom = kmap_coherent(from, vaddr);
214 copy_page(vto, vfrom); 212 copy_page(vto, vfrom);
215 kunmap_coherent(from); 213 kunmap_coherent();
216 } else { 214 } else {
217 vfrom = kmap_atomic(from, KM_USER0); 215 vfrom = kmap_atomic(from, KM_USER0);
218 copy_page(vto, vfrom); 216 copy_page(vto, vfrom);
@@ -235,7 +233,7 @@ void copy_to_user_page(struct vm_area_struct *vma,
235 if (cpu_has_dc_aliases) { 233 if (cpu_has_dc_aliases) {
236 void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); 234 void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
237 memcpy(vto, src, len); 235 memcpy(vto, src, len);
238 kunmap_coherent(page); 236 kunmap_coherent();
239 } else 237 } else
240 memcpy(dst, src, len); 238 memcpy(dst, src, len);
241 if ((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc) 239 if ((vma->vm_flags & VM_EXEC) && !cpu_has_ic_fills_f_dc)
@@ -252,7 +250,7 @@ void copy_from_user_page(struct vm_area_struct *vma,
252 void *vfrom = 250 void *vfrom =
253 kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); 251 kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
254 memcpy(dst, vfrom, len); 252 memcpy(dst, vfrom, len);
255 kunmap_coherent(page); 253 kunmap_coherent();
256 } else 254 } else
257 memcpy(dst, src, len); 255 memcpy(dst, src, len);
258} 256}
@@ -261,6 +259,8 @@ EXPORT_SYMBOL(copy_from_user_page);
261 259
262 260
263#ifdef CONFIG_HIGHMEM 261#ifdef CONFIG_HIGHMEM
262unsigned long highstart_pfn, highend_pfn;
263
264pte_t *kmap_pte; 264pte_t *kmap_pte;
265pgprot_t kmap_prot; 265pgprot_t kmap_prot;
266 266
@@ -314,8 +314,6 @@ void __init fixrange_init(unsigned long start, unsigned long end,
314} 314}
315 315
316#ifndef CONFIG_NEED_MULTIPLE_NODES 316#ifndef CONFIG_NEED_MULTIPLE_NODES
317extern void pagetable_init(void);
318
319static int __init page_is_ram(unsigned long pagenr) 317static int __init page_is_ram(unsigned long pagenr)
320{ 318{
321 int i; 319 int i;
@@ -353,18 +351,15 @@ void __init paging_init(void)
353#endif 351#endif
354 kmap_coherent_init(); 352 kmap_coherent_init();
355 353
356#ifdef CONFIG_ISA 354#ifdef CONFIG_ZONE_DMA
357 if (max_low_pfn >= MAX_DMA_PFN) 355 if (min_low_pfn < MAX_DMA_PFN && MAX_DMA_PFN <= max_low_pfn) {
358 if (min_low_pfn >= MAX_DMA_PFN) { 356 zones_size[ZONE_DMA] = MAX_DMA_PFN - min_low_pfn;
359 zones_size[ZONE_DMA] = 0; 357 zones_size[ZONE_NORMAL] = max_low_pfn - MAX_DMA_PFN;
360 zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn; 358 } else if (max_low_pfn < MAX_DMA_PFN)
361 } else { 359 zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn;
362 zones_size[ZONE_DMA] = MAX_DMA_PFN - min_low_pfn;
363 zones_size[ZONE_NORMAL] = max_low_pfn - MAX_DMA_PFN;
364 }
365 else 360 else
366#endif 361#endif
367 zones_size[ZONE_DMA] = max_low_pfn - min_low_pfn; 362 zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;
368 363
369#ifdef CONFIG_HIGHMEM 364#ifdef CONFIG_HIGHMEM
370 zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn; 365 zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn;
@@ -379,7 +374,7 @@ void __init paging_init(void)
379#ifdef CONFIG_FLATMEM 374#ifdef CONFIG_FLATMEM
380 free_area_init(zones_size); 375 free_area_init(zones_size);
381#else 376#else
382 pfn = 0; 377 pfn = min_low_pfn;
383 for (i = 0; i < MAX_NR_ZONES; i++) 378 for (i = 0; i < MAX_NR_ZONES; i++)
384 for (j = 0; j < zones_size[i]; j++, pfn++) 379 for (j = 0; j < zones_size[i]; j++, pfn++)
385 if (!page_is_ram(pfn)) 380 if (!page_is_ram(pfn))
diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c
index fc2c96f0a1fd..cea7d0ea36e4 100644
--- a/arch/mips/mm/ioremap.c
+++ b/arch/mips/mm/ioremap.c
@@ -6,13 +6,98 @@
6 * (C) Copyright 1995 1996 Linus Torvalds 6 * (C) Copyright 1995 1996 Linus Torvalds
7 * (C) Copyright 2001, 2002 Ralf Baechle 7 * (C) Copyright 2001, 2002 Ralf Baechle
8 */ 8 */
9#include <linux/mm.h>
10#include <linux/module.h> 9#include <linux/module.h>
11#include <asm/addrspace.h> 10#include <asm/addrspace.h>
12#include <asm/byteorder.h> 11#include <asm/byteorder.h>
13 12
14#include <linux/vmalloc.h> 13#include <linux/vmalloc.h>
15#include <linux/io.h> 14#include <asm/cacheflush.h>
15#include <asm/io.h>
16#include <asm/tlbflush.h>
17
18static inline void remap_area_pte(pte_t * pte, unsigned long address,
19 phys_t size, phys_t phys_addr, unsigned long flags)
20{
21 phys_t end;
22 unsigned long pfn;
23 pgprot_t pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | __READABLE
24 | __WRITEABLE | flags);
25
26 address &= ~PMD_MASK;
27 end = address + size;
28 if (end > PMD_SIZE)
29 end = PMD_SIZE;
30 if (address >= end)
31 BUG();
32 pfn = phys_addr >> PAGE_SHIFT;
33 do {
34 if (!pte_none(*pte)) {
35 printk("remap_area_pte: page already exists\n");
36 BUG();
37 }
38 set_pte(pte, pfn_pte(pfn, pgprot));
39 address += PAGE_SIZE;
40 pfn++;
41 pte++;
42 } while (address && (address < end));
43}
44
45static inline int remap_area_pmd(pmd_t * pmd, unsigned long address,
46 phys_t size, phys_t phys_addr, unsigned long flags)
47{
48 phys_t end;
49
50 address &= ~PGDIR_MASK;
51 end = address + size;
52 if (end > PGDIR_SIZE)
53 end = PGDIR_SIZE;
54 phys_addr -= address;
55 if (address >= end)
56 BUG();
57 do {
58 pte_t * pte = pte_alloc_kernel(pmd, address);
59 if (!pte)
60 return -ENOMEM;
61 remap_area_pte(pte, address, end - address, address + phys_addr, flags);
62 address = (address + PMD_SIZE) & PMD_MASK;
63 pmd++;
64 } while (address && (address < end));
65 return 0;
66}
67
68static int remap_area_pages(unsigned long address, phys_t phys_addr,
69 phys_t size, unsigned long flags)
70{
71 int error;
72 pgd_t * dir;
73 unsigned long end = address + size;
74
75 phys_addr -= address;
76 dir = pgd_offset(&init_mm, address);
77 flush_cache_all();
78 if (address >= end)
79 BUG();
80 do {
81 pud_t *pud;
82 pmd_t *pmd;
83
84 error = -ENOMEM;
85 pud = pud_alloc(&init_mm, dir, address);
86 if (!pud)
87 break;
88 pmd = pmd_alloc(&init_mm, pud, address);
89 if (!pmd)
90 break;
91 if (remap_area_pmd(pmd, address, end - address,
92 phys_addr + address, flags))
93 break;
94 error = 0;
95 address = (address + PGDIR_SIZE) & PGDIR_MASK;
96 dir++;
97 } while (address && (address < end));
98 flush_tlb_all();
99 return error;
100}
16 101
17/* 102/*
18 * Generic mapping function (not visible outside): 103 * Generic mapping function (not visible outside):
@@ -36,7 +121,6 @@ void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
36 unsigned long offset; 121 unsigned long offset;
37 phys_t last_addr; 122 phys_t last_addr;
38 void * addr; 123 void * addr;
39 pgprot_t pgprot;
40 124
41 phys_addr = fixup_bigphys_addr(phys_addr, size); 125 phys_addr = fixup_bigphys_addr(phys_addr, size);
42 126
@@ -68,9 +152,6 @@ void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
68 return NULL; 152 return NULL;
69 } 153 }
70 154
71 pgprot = __pgprot(_PAGE_GLOBAL | _PAGE_PRESENT | __READABLE
72 | __WRITEABLE | flags);
73
74 /* 155 /*
75 * Mappings have to be page-aligned 156 * Mappings have to be page-aligned
76 */ 157 */
@@ -85,8 +166,7 @@ void __iomem * __ioremap(phys_t phys_addr, phys_t size, unsigned long flags)
85 if (!area) 166 if (!area)
86 return NULL; 167 return NULL;
87 addr = area->addr; 168 addr = area->addr;
88 if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size, 169 if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
89 phys_addr, pgprot)) {
90 vunmap(addr); 170 vunmap(addr);
91 return NULL; 171 return NULL;
92 } 172 }
diff --git a/arch/mips/mm/pg-sb1.c b/arch/mips/mm/pg-sb1.c
index fc3c7878fb45..adb37d0a30ea 100644
--- a/arch/mips/mm/pg-sb1.c
+++ b/arch/mips/mm/pg-sb1.c
@@ -218,8 +218,7 @@ void sb1_dma_init(void)
218 for (i = 0; i < DM_NUM_CHANNELS; i++) { 218 for (i = 0; i < DM_NUM_CHANNELS; i++) {
219 const u64 base_val = CPHYSADDR(&page_descr[i]) | 219 const u64 base_val = CPHYSADDR(&page_descr[i]) |
220 V_DM_DSCR_BASE_RINGSZ(1); 220 V_DM_DSCR_BASE_RINGSZ(1);
221 volatile void *base_reg = 221 void *base_reg = IOADDR(A_DM_REGISTER(i, R_DM_DSCR_BASE));
222 IOADDR(A_DM_REGISTER(i, R_DM_DSCR_BASE));
223 222
224 __raw_writeq(base_val, base_reg); 223 __raw_writeq(base_val, base_reg);
225 __raw_writeq(base_val | M_DM_DSCR_BASE_RESET, base_reg); 224 __raw_writeq(base_val | M_DM_DSCR_BASE_RESET, base_reg);
diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c
index 4a61e624b0ec..575e4019227b 100644
--- a/arch/mips/mm/pgtable-32.c
+++ b/arch/mips/mm/pgtable-32.c
@@ -11,6 +11,7 @@
11#include <linux/highmem.h> 11#include <linux/highmem.h>
12#include <asm/fixmap.h> 12#include <asm/fixmap.h>
13#include <asm/pgtable.h> 13#include <asm/pgtable.h>
14#include <asm/pgalloc.h>
14 15
15void pgd_init(unsigned long page) 16void pgd_init(unsigned long page)
16{ 17{
diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c
index c46eb651bf09..e4b565aeb008 100644
--- a/arch/mips/mm/pgtable-64.c
+++ b/arch/mips/mm/pgtable-64.c
@@ -10,6 +10,7 @@
10#include <linux/mm.h> 10#include <linux/mm.h>
11#include <asm/fixmap.h> 11#include <asm/fixmap.h>
12#include <asm/pgtable.h> 12#include <asm/pgtable.h>
13#include <asm/pgalloc.h>
13 14
14void pgd_init(unsigned long page) 15void pgd_init(unsigned long page)
15{ 16{
diff --git a/arch/mips/momentum/jaguar_atx/ja-console.c b/arch/mips/momentum/jaguar_atx/ja-console.c
index 2292d0ec47fc..2c30b4f56245 100644
--- a/arch/mips/momentum/jaguar_atx/ja-console.c
+++ b/arch/mips/momentum/jaguar_atx/ja-console.c
@@ -74,11 +74,6 @@ void prom_putchar(char c)
74 uart->iu_thr = c; 74 uart->iu_thr = c;
75} 75}
76 76
77char __init prom_getchar(void)
78{
79 return 0;
80}
81
82static void inline ja_console_probe(void) 77static void inline ja_console_probe(void)
83{ 78{
84 struct uart_port up; 79 struct uart_port up;
diff --git a/arch/mips/momentum/jaguar_atx/platform.c b/arch/mips/momentum/jaguar_atx/platform.c
index 81037709ba0d..561844878a90 100644
--- a/arch/mips/momentum/jaguar_atx/platform.c
+++ b/arch/mips/momentum/jaguar_atx/platform.c
@@ -38,8 +38,6 @@ static struct platform_device mv643xx_eth_shared_device = {
38#define MV64x60_IRQ_ETH_1 49 38#define MV64x60_IRQ_ETH_1 49
39#define MV64x60_IRQ_ETH_2 50 39#define MV64x60_IRQ_ETH_2 50
40 40
41#ifdef CONFIG_MV643XX_ETH_0
42
43static struct resource mv64x60_eth0_resources[] = { 41static struct resource mv64x60_eth0_resources[] = {
44 [0] = { 42 [0] = {
45 .name = "eth0 irq", 43 .name = "eth0 irq",
@@ -49,10 +47,8 @@ static struct resource mv64x60_eth0_resources[] = {
49 }, 47 },
50}; 48};
51 49
52static char eth0_mac_addr[ETH_ALEN];
53
54static struct mv643xx_eth_platform_data eth0_pd = { 50static struct mv643xx_eth_platform_data eth0_pd = {
55 .mac_addr = eth0_mac_addr, 51 .port_number = 0,
56 52
57 .tx_sram_addr = MV_SRAM_BASE_ETH0, 53 .tx_sram_addr = MV_SRAM_BASE_ETH0,
58 .tx_sram_size = MV_SRAM_TXRING_SIZE, 54 .tx_sram_size = MV_SRAM_TXRING_SIZE,
@@ -72,9 +68,6 @@ static struct platform_device eth0_device = {
72 .platform_data = &eth0_pd, 68 .platform_data = &eth0_pd,
73 }, 69 },
74}; 70};
75#endif /* CONFIG_MV643XX_ETH_0 */
76
77#ifdef CONFIG_MV643XX_ETH_1
78 71
79static struct resource mv64x60_eth1_resources[] = { 72static struct resource mv64x60_eth1_resources[] = {
80 [0] = { 73 [0] = {
@@ -85,10 +78,8 @@ static struct resource mv64x60_eth1_resources[] = {
85 }, 78 },
86}; 79};
87 80
88static char eth1_mac_addr[ETH_ALEN];
89
90static struct mv643xx_eth_platform_data eth1_pd = { 81static struct mv643xx_eth_platform_data eth1_pd = {
91 .mac_addr = eth1_mac_addr, 82 .port_number = 1,
92 83
93 .tx_sram_addr = MV_SRAM_BASE_ETH1, 84 .tx_sram_addr = MV_SRAM_BASE_ETH1,
94 .tx_sram_size = MV_SRAM_TXRING_SIZE, 85 .tx_sram_size = MV_SRAM_TXRING_SIZE,
@@ -108,9 +99,6 @@ static struct platform_device eth1_device = {
108 .platform_data = &eth1_pd, 99 .platform_data = &eth1_pd,
109 }, 100 },
110}; 101};
111#endif /* CONFIG_MV643XX_ETH_1 */
112
113#ifdef CONFIG_MV643XX_ETH_2
114 102
115static struct resource mv64x60_eth2_resources[] = { 103static struct resource mv64x60_eth2_resources[] = {
116 [0] = { 104 [0] = {
@@ -121,10 +109,8 @@ static struct resource mv64x60_eth2_resources[] = {
121 }, 109 },
122}; 110};
123 111
124static char eth2_mac_addr[ETH_ALEN];
125
126static struct mv643xx_eth_platform_data eth2_pd = { 112static struct mv643xx_eth_platform_data eth2_pd = {
127 .mac_addr = eth2_mac_addr, 113 .port_number = 2,
128}; 114};
129 115
130static struct platform_device eth2_device = { 116static struct platform_device eth2_device = {
@@ -136,19 +122,12 @@ static struct platform_device eth2_device = {
136 .platform_data = &eth2_pd, 122 .platform_data = &eth2_pd,
137 }, 123 },
138}; 124};
139#endif /* CONFIG_MV643XX_ETH_2 */
140 125
141static struct platform_device *mv643xx_eth_pd_devs[] __initdata = { 126static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
142 &mv643xx_eth_shared_device, 127 &mv643xx_eth_shared_device,
143#ifdef CONFIG_MV643XX_ETH_0
144 &eth0_device, 128 &eth0_device,
145#endif
146#ifdef CONFIG_MV643XX_ETH_1
147 &eth1_device, 129 &eth1_device,
148#endif
149#ifdef CONFIG_MV643XX_ETH_2
150 &eth2_device, 130 &eth2_device,
151#endif
152}; 131};
153 132
154static u8 __init exchange_bit(u8 val, u8 cs) 133static u8 __init exchange_bit(u8 val, u8 cs)
@@ -215,15 +194,9 @@ static int __init mv643xx_eth_add_pds(void)
215 int ret; 194 int ret;
216 195
217 get_mac(mac); 196 get_mac(mac);
218#ifdef CONFIG_MV643XX_ETH_0 197 eth_mac_add(eth0_pd.mac_addr, mac, 0);
219 eth_mac_add(eth1_mac_addr, mac, 0); 198 eth_mac_add(eth1_pd.mac_addr, mac, 1);
220#endif 199 eth_mac_add(eth2_pd.mac_addr, mac, 2);
221#ifdef CONFIG_MV643XX_ETH_1
222 eth_mac_add(eth1_mac_addr, mac, 1);
223#endif
224#ifdef CONFIG_MV643XX_ETH_2
225 eth_mac_add(eth2_mac_addr, mac, 2);
226#endif
227 ret = platform_add_devices(mv643xx_eth_pd_devs, 200 ret = platform_add_devices(mv643xx_eth_pd_devs,
228 ARRAY_SIZE(mv643xx_eth_pd_devs)); 201 ARRAY_SIZE(mv643xx_eth_pd_devs));
229 202
diff --git a/arch/mips/momentum/ocelot_3/platform.c b/arch/mips/momentum/ocelot_3/platform.c
index 57cfe5c6e4a8..44e4c3fc7403 100644
--- a/arch/mips/momentum/ocelot_3/platform.c
+++ b/arch/mips/momentum/ocelot_3/platform.c
@@ -38,8 +38,6 @@ static struct platform_device mv643xx_eth_shared_device = {
38#define MV64x60_IRQ_ETH_1 49 38#define MV64x60_IRQ_ETH_1 49
39#define MV64x60_IRQ_ETH_2 50 39#define MV64x60_IRQ_ETH_2 50
40 40
41#ifdef CONFIG_MV643XX_ETH_0
42
43static struct resource mv64x60_eth0_resources[] = { 41static struct resource mv64x60_eth0_resources[] = {
44 [0] = { 42 [0] = {
45 .name = "eth0 irq", 43 .name = "eth0 irq",
@@ -49,10 +47,8 @@ static struct resource mv64x60_eth0_resources[] = {
49 }, 47 },
50}; 48};
51 49
52static char eth0_mac_addr[ETH_ALEN];
53
54static struct mv643xx_eth_platform_data eth0_pd = { 50static struct mv643xx_eth_platform_data eth0_pd = {
55 .mac_addr = eth0_mac_addr, 51 .port_number = 0,
56 52
57 .tx_sram_addr = MV_SRAM_BASE_ETH0, 53 .tx_sram_addr = MV_SRAM_BASE_ETH0,
58 .tx_sram_size = MV_SRAM_TXRING_SIZE, 54 .tx_sram_size = MV_SRAM_TXRING_SIZE,
@@ -72,9 +68,6 @@ static struct platform_device eth0_device = {
72 .platform_data = &eth0_pd, 68 .platform_data = &eth0_pd,
73 }, 69 },
74}; 70};
75#endif /* CONFIG_MV643XX_ETH_0 */
76
77#ifdef CONFIG_MV643XX_ETH_1
78 71
79static struct resource mv64x60_eth1_resources[] = { 72static struct resource mv64x60_eth1_resources[] = {
80 [0] = { 73 [0] = {
@@ -85,10 +78,8 @@ static struct resource mv64x60_eth1_resources[] = {
85 }, 78 },
86}; 79};
87 80
88static char eth1_mac_addr[ETH_ALEN];
89
90static struct mv643xx_eth_platform_data eth1_pd = { 81static struct mv643xx_eth_platform_data eth1_pd = {
91 .mac_addr = eth1_mac_addr, 82 .port_number = 1,
92 83
93 .tx_sram_addr = MV_SRAM_BASE_ETH1, 84 .tx_sram_addr = MV_SRAM_BASE_ETH1,
94 .tx_sram_size = MV_SRAM_TXRING_SIZE, 85 .tx_sram_size = MV_SRAM_TXRING_SIZE,
@@ -108,9 +99,6 @@ static struct platform_device eth1_device = {
108 .platform_data = &eth1_pd, 99 .platform_data = &eth1_pd,
109 }, 100 },
110}; 101};
111#endif /* CONFIG_MV643XX_ETH_1 */
112
113#ifdef CONFIG_MV643XX_ETH_2
114 102
115static struct resource mv64x60_eth2_resources[] = { 103static struct resource mv64x60_eth2_resources[] = {
116 [0] = { 104 [0] = {
@@ -121,10 +109,8 @@ static struct resource mv64x60_eth2_resources[] = {
121 }, 109 },
122}; 110};
123 111
124static char eth2_mac_addr[ETH_ALEN];
125
126static struct mv643xx_eth_platform_data eth2_pd = { 112static struct mv643xx_eth_platform_data eth2_pd = {
127 .mac_addr = eth2_mac_addr, 113 .port_number = 2,
128}; 114};
129 115
130static struct platform_device eth2_device = { 116static struct platform_device eth2_device = {
@@ -136,19 +122,12 @@ static struct platform_device eth2_device = {
136 .platform_data = &eth2_pd, 122 .platform_data = &eth2_pd,
137 }, 123 },
138}; 124};
139#endif /* CONFIG_MV643XX_ETH_2 */
140 125
141static struct platform_device *mv643xx_eth_pd_devs[] __initdata = { 126static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
142 &mv643xx_eth_shared_device, 127 &mv643xx_eth_shared_device,
143#ifdef CONFIG_MV643XX_ETH_0
144 &eth0_device, 128 &eth0_device,
145#endif
146#ifdef CONFIG_MV643XX_ETH_1
147 &eth1_device, 129 &eth1_device,
148#endif
149#ifdef CONFIG_MV643XX_ETH_2
150 &eth2_device, 130 &eth2_device,
151#endif
152}; 131};
153 132
154static u8 __init exchange_bit(u8 val, u8 cs) 133static u8 __init exchange_bit(u8 val, u8 cs)
@@ -215,15 +194,9 @@ static int __init mv643xx_eth_add_pds(void)
215 int ret; 194 int ret;
216 195
217 get_mac(mac); 196 get_mac(mac);
218#ifdef CONFIG_MV643XX_ETH_0 197 eth_mac_add(eth0_pd.mac_addr, mac, 0);
219 eth_mac_add(eth1_mac_addr, mac, 0); 198 eth_mac_add(eth1_pd.mac_addr, mac, 1);
220#endif 199 eth_mac_add(eth2_pd.mac_addr, mac, 2);
221#ifdef CONFIG_MV643XX_ETH_1
222 eth_mac_add(eth1_mac_addr, mac, 1);
223#endif
224#ifdef CONFIG_MV643XX_ETH_2
225 eth_mac_add(eth2_mac_addr, mac, 2);
226#endif
227 ret = platform_add_devices(mv643xx_eth_pd_devs, 200 ret = platform_add_devices(mv643xx_eth_pd_devs,
228 ARRAY_SIZE(mv643xx_eth_pd_devs)); 201 ARRAY_SIZE(mv643xx_eth_pd_devs));
229 202
diff --git a/arch/mips/momentum/ocelot_c/irq.c b/arch/mips/momentum/ocelot_c/irq.c
index 40472f7944d7..844d566c9de3 100644
--- a/arch/mips/momentum/ocelot_c/irq.c
+++ b/arch/mips/momentum/ocelot_c/irq.c
@@ -64,7 +64,7 @@ extern void ll_cpci_irq(void);
64 64
65asmlinkage void plat_irq_dispatch(void) 65asmlinkage void plat_irq_dispatch(void)
66{ 66{
67 unsigned int pending = read_c0_cause() & read_c0_status(); 67 unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
68 68
69 if (pending & STATUSF_IP0) 69 if (pending & STATUSF_IP0)
70 do_IRQ(0); 70 do_IRQ(0);
diff --git a/arch/mips/momentum/ocelot_c/platform.c b/arch/mips/momentum/ocelot_c/platform.c
index 6c495b2f1560..7780aa0c6555 100644
--- a/arch/mips/momentum/ocelot_c/platform.c
+++ b/arch/mips/momentum/ocelot_c/platform.c
@@ -37,8 +37,6 @@ static struct platform_device mv643xx_eth_shared_device = {
37#define MV64x60_IRQ_ETH_0 48 37#define MV64x60_IRQ_ETH_0 48
38#define MV64x60_IRQ_ETH_1 49 38#define MV64x60_IRQ_ETH_1 49
39 39
40#ifdef CONFIG_MV643XX_ETH_0
41
42static struct resource mv64x60_eth0_resources[] = { 40static struct resource mv64x60_eth0_resources[] = {
43 [0] = { 41 [0] = {
44 .name = "eth0 irq", 42 .name = "eth0 irq",
@@ -48,10 +46,8 @@ static struct resource mv64x60_eth0_resources[] = {
48 }, 46 },
49}; 47};
50 48
51static char eth0_mac_addr[ETH_ALEN];
52
53static struct mv643xx_eth_platform_data eth0_pd = { 49static struct mv643xx_eth_platform_data eth0_pd = {
54 .mac_addr = eth0_mac_addr, 50 .port_number = 0,
55 51
56 .tx_sram_addr = MV_SRAM_BASE_ETH0, 52 .tx_sram_addr = MV_SRAM_BASE_ETH0,
57 .tx_sram_size = MV_SRAM_TXRING_SIZE, 53 .tx_sram_size = MV_SRAM_TXRING_SIZE,
@@ -71,9 +67,6 @@ static struct platform_device eth0_device = {
71 .platform_data = &eth0_pd, 67 .platform_data = &eth0_pd,
72 }, 68 },
73}; 69};
74#endif /* CONFIG_MV643XX_ETH_0 */
75
76#ifdef CONFIG_MV643XX_ETH_1
77 70
78static struct resource mv64x60_eth1_resources[] = { 71static struct resource mv64x60_eth1_resources[] = {
79 [0] = { 72 [0] = {
@@ -84,10 +77,8 @@ static struct resource mv64x60_eth1_resources[] = {
84 }, 77 },
85}; 78};
86 79
87static char eth1_mac_addr[ETH_ALEN];
88
89static struct mv643xx_eth_platform_data eth1_pd = { 80static struct mv643xx_eth_platform_data eth1_pd = {
90 .mac_addr = eth1_mac_addr, 81 .port_number = 1,
91 82
92 .tx_sram_addr = MV_SRAM_BASE_ETH1, 83 .tx_sram_addr = MV_SRAM_BASE_ETH1,
93 .tx_sram_size = MV_SRAM_TXRING_SIZE, 84 .tx_sram_size = MV_SRAM_TXRING_SIZE,
@@ -107,16 +98,11 @@ static struct platform_device eth1_device = {
107 .platform_data = &eth1_pd, 98 .platform_data = &eth1_pd,
108 }, 99 },
109}; 100};
110#endif /* CONFIG_MV643XX_ETH_1 */
111 101
112static struct platform_device *mv643xx_eth_pd_devs[] __initdata = { 102static struct platform_device *mv643xx_eth_pd_devs[] __initdata = {
113 &mv643xx_eth_shared_device, 103 &mv643xx_eth_shared_device,
114#ifdef CONFIG_MV643XX_ETH_0
115 &eth0_device, 104 &eth0_device,
116#endif
117#ifdef CONFIG_MV643XX_ETH_1
118 &eth1_device, 105 &eth1_device,
119#endif
120 /* The third port is not wired up on the Ocelot C */ 106 /* The third port is not wired up on the Ocelot C */
121}; 107};
122 108
@@ -184,12 +170,8 @@ static int __init mv643xx_eth_add_pds(void)
184 int ret; 170 int ret;
185 171
186 get_mac(mac); 172 get_mac(mac);
187#ifdef CONFIG_MV643XX_ETH_0 173 eth_mac_add(eth0_pd.mac_addr, mac, 0);
188 eth_mac_add(eth1_mac_addr, mac, 0); 174 eth_mac_add(eth1_pd.mac_addr, mac, 1);
189#endif
190#ifdef CONFIG_MV643XX_ETH_1
191 eth_mac_add(eth1_mac_addr, mac, 1);
192#endif
193 ret = platform_add_devices(mv643xx_eth_pd_devs, 175 ret = platform_add_devices(mv643xx_eth_pd_devs,
194 ARRAY_SIZE(mv643xx_eth_pd_devs)); 176 ARRAY_SIZE(mv643xx_eth_pd_devs));
195 177
diff --git a/arch/mips/momentum/ocelot_g/Makefile b/arch/mips/momentum/ocelot_g/Makefile
index adb5665d40a9..c0a0030d949d 100644
--- a/arch/mips/momentum/ocelot_g/Makefile
+++ b/arch/mips/momentum/ocelot_g/Makefile
@@ -4,5 +4,3 @@
4 4
5obj-y += irq.o gt-irq.o prom.o reset.o setup.o 5obj-y += irq.o gt-irq.o prom.o reset.o setup.o
6obj-$(CONFIG_KGDB) += dbg_io.o 6obj-$(CONFIG_KGDB) += dbg_io.o
7
8EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/oprofile/Kconfig b/arch/mips/oprofile/Kconfig
index ca395ef06d4e..fb6f235348b0 100644
--- a/arch/mips/oprofile/Kconfig
+++ b/arch/mips/oprofile/Kconfig
@@ -11,7 +11,7 @@ config PROFILING
11 11
12config OPROFILE 12config OPROFILE
13 tristate "OProfile system profiling (EXPERIMENTAL)" 13 tristate "OProfile system profiling (EXPERIMENTAL)"
14 depends on PROFILING && !!MIPS_MT_SMTC && EXPERIMENTAL 14 depends on PROFILING && !MIPS_MT_SMTC && EXPERIMENTAL
15 help 15 help
16 OProfile is a profiling system capable of profiling the 16 OProfile is a profiling system capable of profiling the
17 whole system, include the kernel, kernel modules, libraries, 17 whole system, include the kernel, kernel modules, libraries,
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 455d76ad06d8..4f94fa261aae 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -35,7 +35,7 @@
35#define vpe_id() smp_processor_id() 35#define vpe_id() smp_processor_id()
36#else 36#else
37#define WHAT 0 37#define WHAT 0
38#define vpe_id() smp_processor_id() 38#define vpe_id() 0
39#endif 39#endif
40 40
41#define __define_perf_accessors(r, n, np) \ 41#define __define_perf_accessors(r, n, np) \
@@ -74,13 +74,13 @@ static inline void w_c0_ ## r ## n(unsigned int value) \
74 74
75__define_perf_accessors(perfcntr, 0, 2) 75__define_perf_accessors(perfcntr, 0, 2)
76__define_perf_accessors(perfcntr, 1, 3) 76__define_perf_accessors(perfcntr, 1, 3)
77__define_perf_accessors(perfcntr, 2, 2) 77__define_perf_accessors(perfcntr, 2, 0)
78__define_perf_accessors(perfcntr, 3, 2) 78__define_perf_accessors(perfcntr, 3, 1)
79 79
80__define_perf_accessors(perfctrl, 0, 2) 80__define_perf_accessors(perfctrl, 0, 2)
81__define_perf_accessors(perfctrl, 1, 3) 81__define_perf_accessors(perfctrl, 1, 3)
82__define_perf_accessors(perfctrl, 2, 2) 82__define_perf_accessors(perfctrl, 2, 0)
83__define_perf_accessors(perfctrl, 3, 2) 83__define_perf_accessors(perfctrl, 3, 1)
84 84
85struct op_mips_model op_model_mipsxx_ops; 85struct op_mips_model op_model_mipsxx_ops;
86 86
@@ -97,7 +97,6 @@ static void mipsxx_reg_setup(struct op_counter_config *ctr)
97 int i; 97 int i;
98 98
99 /* Compute the performance counter control word. */ 99 /* Compute the performance counter control word. */
100 /* For now count kernel and user mode */
101 for (i = 0; i < counters; i++) { 100 for (i = 0; i < counters; i++) {
102 reg.control[i] = 0; 101 reg.control[i] = 0;
103 reg.counter[i] = 0; 102 reg.counter[i] = 0;
@@ -223,18 +222,17 @@ static inline int n_counters(void)
223 switch (current_cpu_data.cputype) { 222 switch (current_cpu_data.cputype) {
224 case CPU_R10000: 223 case CPU_R10000:
225 counters = 2; 224 counters = 2;
225 break;
226 226
227 case CPU_R12000: 227 case CPU_R12000:
228 case CPU_R14000: 228 case CPU_R14000:
229 counters = 4; 229 counters = 4;
230 break;
230 231
231 default: 232 default:
232 counters = __n_counters(); 233 counters = __n_counters();
233 } 234 }
234 235
235#ifdef CONFIG_MIPS_MT_SMP
236 counters >> 1;
237#endif
238 return counters; 236 return counters;
239} 237}
240 238
@@ -268,6 +266,10 @@ static int __init mipsxx_init(void)
268 266
269 reset_counters(counters); 267 reset_counters(counters);
270 268
269#ifdef CONFIG_MIPS_MT_SMP
270 counters >>= 1;
271#endif
272
271 op_model_mipsxx_ops.num_counters = counters; 273 op_model_mipsxx_ops.num_counters = counters;
272 switch (current_cpu_data.cputype) { 274 switch (current_cpu_data.cputype) {
273 case CPU_20KC: 275 case CPU_20KC:
@@ -324,7 +326,11 @@ static int __init mipsxx_init(void)
324 326
325static void mipsxx_exit(void) 327static void mipsxx_exit(void)
326{ 328{
327 reset_counters(op_model_mipsxx_ops.num_counters); 329 int counters = op_model_mipsxx_ops.num_counters;
330#ifdef CONFIG_MIPS_MT_SMP
331 counters <<= 1;
332#endif
333 reset_counters(counters);
328 334
329 perf_irq = null_perf_irq; 335 perf_irq = null_perf_irq;
330} 336}
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index bf85995ca042..df487c063b1d 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -8,8 +8,7 @@ obj-y += pci.o pci-dac.o
8# PCI bus host bridge specific code 8# PCI bus host bridge specific code
9# 9#
10obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o 10obj-$(CONFIG_MIPS_BONITO64) += ops-bonito64.o
11obj-$(CONFIG_MIPS_GT64111) += ops-gt64111.o 11obj-$(CONFIG_PCI_GT64XXX_PCI0) += ops-gt64xxx_pci0.o
12obj-$(CONFIG_MIPS_GT64120) += ops-gt64120.o
13obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o 12obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o
14obj-$(CONFIG_MIPS_MSC) += ops-msc.o 13obj-$(CONFIG_MIPS_MSC) += ops-msc.o
15obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o 14obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o
diff --git a/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c
index f8696081c5b1..73d18503517c 100644
--- a/arch/mips/pci/fixup-jmr3927.c
+++ b/arch/mips/pci/fixup-jmr3927.c
@@ -29,7 +29,6 @@
29 */ 29 */
30#include <linux/types.h> 30#include <linux/types.h>
31#include <linux/pci.h> 31#include <linux/pci.h>
32#include <linux/kernel.h>
33#include <linux/init.h> 32#include <linux/init.h>
34 33
35#include <asm/jmr3927/jmr3927.h> 34#include <asm/jmr3927/jmr3927.h>
@@ -38,6 +37,10 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
38{ 37{
39 unsigned char irq = pin; 38 unsigned char irq = pin;
40 39
40 /* SMSC SLC90E66 IDE uses irq 14, 15 (default) */
41 if (dev->vendor == PCI_VENDOR_ID_EFAR &&
42 dev->device == PCI_DEVICE_ID_EFAR_SLC90E66_1)
43 return irq;
41 /* IRQ rotation (PICMG) */ 44 /* IRQ rotation (PICMG) */
42 irq--; /* 0-3 */ 45 irq--; /* 0-3 */
43 if (dev->bus->parent == NULL && 46 if (dev->bus->parent == NULL &&
@@ -77,14 +80,8 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
77 80
78 /* Check OnBoard Ethernet (IDSEL=A24, DevNu=13) */ 81 /* Check OnBoard Ethernet (IDSEL=A24, DevNu=13) */
79 if (dev->bus->parent == NULL && 82 if (dev->bus->parent == NULL &&
80 slot == TX3927_PCIC_IDSEL_AD_TO_SLOT(24)) { 83 slot == TX3927_PCIC_IDSEL_AD_TO_SLOT(24))
81 extern int jmr3927_ether1_irq; 84 irq = JMR3927_IRQ_ETHER0;
82 /* check this irq line was reserved for ether1 */
83 if (jmr3927_ether1_irq != JMR3927_IRQ_ETHER0)
84 irq = JMR3927_IRQ_ETHER0;
85 else
86 irq = 0; /* disable */
87 }
88 return irq; 85 return irq;
89} 86}
90 87
@@ -93,13 +90,3 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
93{ 90{
94 return 0; 91 return 0;
95} 92}
96
97int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
98{
99 /* SMSC SLC90E66 IDE uses irq 14, 15 (default) */
100 if (!(dev->vendor == PCI_VENDOR_ID_EFAR &&
101 dev->device == PCI_DEVICE_ID_EFAR_SLC90E66_1))
102 return pci_get_irq(dev, pin);
103
104 dev->irq = irq;
105}
diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c
index a176f2ca8656..36e5fb1b3786 100644
--- a/arch/mips/pci/fixup-sni.c
+++ b/arch/mips/pci/fixup-sni.c
@@ -14,8 +14,10 @@
14#include <asm/mipsregs.h> 14#include <asm/mipsregs.h>
15#include <asm/sni.h> 15#include <asm/sni.h>
16 16
17#include <irq.h>
18
17/* 19/*
18 * Shortcuts ... 20 * PCIMT Shortcuts ...
19 */ 21 */
20#define SCSI PCIMT_IRQ_SCSI 22#define SCSI PCIMT_IRQ_SCSI
21#define ETH PCIMT_IRQ_ETHERNET 23#define ETH PCIMT_IRQ_ETHERNET
@@ -67,6 +69,50 @@ static char irq_tab_rm300d[8][5] __initdata = {
67 { 0, INTD, INTA, INTB, INTC }, /* Slot 4 */ 69 { 0, INTD, INTA, INTB, INTC }, /* Slot 4 */
68}; 70};
69 71
72static char irq_tab_rm300e[5][5] __initdata = {
73 /* INTA INTB INTC INTD */
74 { 0, 0, 0, 0, 0 }, /* HOST bridge */
75 { SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */
76 { 0, INTC, INTD, INTA, INTB }, /* Bridge/i960 */
77 { 0, INTD, INTA, INTB, INTC }, /* Slot 1 */
78 { 0, INTA, INTB, INTC, INTD }, /* Slot 2 */
79};
80#undef SCSI
81#undef ETH
82#undef INTA
83#undef INTB
84#undef INTC
85#undef INTD
86
87
88/*
89 * PCIT Shortcuts ...
90 */
91#define SCSI0 PCIT_IRQ_SCSI0
92#define SCSI1 PCIT_IRQ_SCSI1
93#define ETH PCIT_IRQ_ETHERNET
94#define INTA PCIT_IRQ_INTA
95#define INTB PCIT_IRQ_INTB
96#define INTC PCIT_IRQ_INTC
97#define INTD PCIT_IRQ_INTD
98
99static char irq_tab_pcit[13][5] __initdata = {
100 /* INTA INTB INTC INTD */
101 { 0, 0, 0, 0, 0 }, /* HOST bridge */
102 { SCSI0, SCSI0, SCSI0, SCSI0, SCSI0 }, /* SCSI */
103 { SCSI1, SCSI1, SCSI1, SCSI1, SCSI1 }, /* SCSI */
104 { ETH, ETH, ETH, ETH, ETH }, /* Ethernet */
105 { 0, INTA, INTB, INTC, INTD }, /* PCI-PCI bridge */
106 { 0, 0, 0, 0, 0 }, /* Unused */
107 { 0, 0, 0, 0, 0 }, /* Unused */
108 { 0, 0, 0, 0, 0 }, /* Unused */
109 { 0, INTA, INTB, INTC, INTD }, /* Slot 1 */
110 { 0, INTB, INTC, INTD, INTA }, /* Slot 2 */
111 { 0, INTC, INTD, INTA, INTB }, /* Slot 3 */
112 { 0, INTD, INTA, INTB, INTC }, /* Slot 4 */
113 { 0, INTA, INTB, INTC, INTD }, /* Slot 5 */
114};
115
70static inline int is_rm300_revd(void) 116static inline int is_rm300_revd(void)
71{ 117{
72 unsigned char csmsr = *(volatile unsigned char *)PCIMT_CSMSR; 118 unsigned char csmsr = *(volatile unsigned char *)PCIMT_CSMSR;
@@ -76,10 +122,24 @@ static inline int is_rm300_revd(void)
76 122
77int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 123int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
78{ 124{
79 if (is_rm300_revd()) 125 switch (sni_brd_type) {
80 return irq_tab_rm300d[slot][pin]; 126 case SNI_BRD_PCI_TOWER:
127 case SNI_BRD_PCI_TOWER_CPLUS:
128 return irq_tab_pcit[slot][pin];
81 129
82 return irq_tab_rm200[slot][pin]; 130 case SNI_BRD_PCI_MTOWER:
131 if (is_rm300_revd())
132 return irq_tab_rm300d[slot][pin];
133 /* fall through */
134
135 case SNI_BRD_PCI_DESKTOP:
136 return irq_tab_rm200[slot][pin];
137
138 case SNI_BRD_PCI_MTOWER_CPLUS:
139 return irq_tab_rm300e[slot][pin];
140 }
141
142 return 0;
83} 143}
84 144
85/* Do platform specific device initialization at pci_enable_device() time */ 145/* Do platform specific device initialization at pci_enable_device() time */
diff --git a/arch/mips/pci/ops-au1000.c b/arch/mips/pci/ops-au1000.c
index 8ae46481fcb7..7932dfe5eb9b 100644
--- a/arch/mips/pci/ops-au1000.c
+++ b/arch/mips/pci/ops-au1000.c
@@ -172,7 +172,11 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
172 error = -1; 172 error = -1;
173 DBG("Au1x Master Abort\n"); 173 DBG("Au1x Master Abort\n");
174 } else if ((status >> 28) & 0xf) { 174 } else if ((status >> 28) & 0xf) {
175 DBG("PCI ERR detected: status %x\n", status); 175 DBG("PCI ERR detected: device %d, status %x\n", device, ((status >> 28) & 0xf));
176
177 /* clear errors */
178 au_writel(status & 0xf000ffff, Au1500_PCI_STATCMD);
179
176 *data = 0xffffffff; 180 *data = 0xffffffff;
177 error = -1; 181 error = -1;
178 } 182 }
diff --git a/arch/mips/pci/ops-gt64111.c b/arch/mips/pci/ops-gt64111.c
deleted file mode 100644
index ecd3991bd0e4..000000000000
--- a/arch/mips/pci/ops-gt64111.c
+++ /dev/null
@@ -1,100 +0,0 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Copyright (C) 1995, 1996, 1997, 2002 by Ralf Baechle
7 * Copyright (C) 2001, 2002, 2003 by Liam Davies (ldavies@agile.tv)
8 */
9#include <linux/types.h>
10#include <linux/pci.h>
11#include <linux/kernel.h>
12#include <linux/init.h>
13
14#include <asm/pci.h>
15#include <asm/io.h>
16#include <asm/gt64120.h>
17
18#include <asm/mach-cobalt/cobalt.h>
19
20/*
21 * Device 31 on the GT64111 is used to generate PCI special
22 * cycles, so we shouldn't expected to find a device there ...
23 */
24static inline int pci_range_ck(struct pci_bus *bus, unsigned int devfn)
25{
26 if (bus->number == 0 && PCI_SLOT(devfn) < 31)
27 return 0;
28
29 return -1;
30}
31
32static int gt64111_pci_read_config(struct pci_bus *bus, unsigned int devfn,
33 int where, int size, u32 * val)
34{
35 if (pci_range_ck(bus, devfn))
36 return PCIBIOS_DEVICE_NOT_FOUND;
37
38 switch (size) {
39 case 4:
40 PCI_CFG_SET(devfn, where);
41 *val = GT_READ(GT_PCI0_CFGDATA_OFS);
42 return PCIBIOS_SUCCESSFUL;
43
44 case 2:
45 PCI_CFG_SET(devfn, (where & ~0x3));
46 *val = GT_READ(GT_PCI0_CFGDATA_OFS)
47 >> ((where & 3) * 8);
48 return PCIBIOS_SUCCESSFUL;
49
50 case 1:
51 PCI_CFG_SET(devfn, (where & ~0x3));
52 *val = GT_READ(GT_PCI0_CFGDATA_OFS)
53 >> ((where & 3) * 8);
54 return PCIBIOS_SUCCESSFUL;
55 }
56
57 return PCIBIOS_BAD_REGISTER_NUMBER;
58}
59
60static int gt64111_pci_write_config(struct pci_bus *bus, unsigned int devfn,
61 int where, int size, u32 val)
62{
63 u32 tmp;
64
65 if (pci_range_ck(bus, devfn))
66 return PCIBIOS_DEVICE_NOT_FOUND;
67
68 switch (size) {
69 case 4:
70 PCI_CFG_SET(devfn, where);
71 GT_WRITE(GT_PCI0_CFGDATA_OFS, val);
72
73 return PCIBIOS_SUCCESSFUL;
74
75 case 2:
76 PCI_CFG_SET(devfn, (where & ~0x3));
77 tmp = GT_READ(GT_PCI0_CFGDATA_OFS);
78 tmp &= ~(0xffff << ((where & 0x3) * 8));
79 tmp |= (val << ((where & 0x3) * 8));
80 GT_WRITE(GT_PCI0_CFGDATA_OFS, tmp);
81
82 return PCIBIOS_SUCCESSFUL;
83
84 case 1:
85 PCI_CFG_SET(devfn, (where & ~0x3));
86 tmp = GT_READ(GT_PCI0_CFGDATA_OFS);
87 tmp &= ~(0xff << ((where & 0x3) * 8));
88 tmp |= (val << ((where & 0x3) * 8));
89 GT_WRITE(GT_PCI0_CFGDATA_OFS, tmp);
90
91 return PCIBIOS_SUCCESSFUL;
92 }
93
94 return PCIBIOS_BAD_REGISTER_NUMBER;
95}
96
97struct pci_ops gt64111_pci_ops = {
98 .read = gt64111_pci_read_config,
99 .write = gt64111_pci_write_config,
100};
diff --git a/arch/mips/pci/ops-gt64120.c b/arch/mips/pci/ops-gt64xxx_pci0.c
index 6335844d607a..3d896c5f413f 100644
--- a/arch/mips/pci/ops-gt64120.c
+++ b/arch/mips/pci/ops-gt64xxx_pci0.c
@@ -39,8 +39,8 @@
39#define PCI_CFG_TYPE1_DEV_SHF 11 39#define PCI_CFG_TYPE1_DEV_SHF 11
40#define PCI_CFG_TYPE1_BUS_SHF 16 40#define PCI_CFG_TYPE1_BUS_SHF 16
41 41
42static int gt64120_pcibios_config_access(unsigned char access_type, 42static int gt64xxx_pci0_pcibios_config_access(unsigned char access_type,
43 struct pci_bus *bus, unsigned int devfn, int where, u32 * data) 43 struct pci_bus *bus, unsigned int devfn, int where, u32 * data)
44{ 44{
45 unsigned char busnum = bus->number; 45 unsigned char busnum = bus->number;
46 u32 intr; 46 u32 intr;
@@ -100,13 +100,13 @@ static int gt64120_pcibios_config_access(unsigned char access_type,
100 * We can't address 8 and 16 bit words directly. Instead we have to 100 * We can't address 8 and 16 bit words directly. Instead we have to
101 * read/write a 32bit word and mask/modify the data we actually want. 101 * read/write a 32bit word and mask/modify the data we actually want.
102 */ 102 */
103static int gt64120_pcibios_read(struct pci_bus *bus, unsigned int devfn, 103static int gt64xxx_pci0_pcibios_read(struct pci_bus *bus, unsigned int devfn,
104 int where, int size, u32 * val) 104 int where, int size, u32 * val)
105{ 105{
106 u32 data = 0; 106 u32 data = 0;
107 107
108 if (gt64120_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where, 108 if (gt64xxx_pci0_pcibios_config_access(PCI_ACCESS_READ, bus, devfn,
109 &data)) 109 where, &data))
110 return PCIBIOS_DEVICE_NOT_FOUND; 110 return PCIBIOS_DEVICE_NOT_FOUND;
111 111
112 if (size == 1) 112 if (size == 1)
@@ -119,16 +119,16 @@ static int gt64120_pcibios_read(struct pci_bus *bus, unsigned int devfn,
119 return PCIBIOS_SUCCESSFUL; 119 return PCIBIOS_SUCCESSFUL;
120} 120}
121 121
122static int gt64120_pcibios_write(struct pci_bus *bus, unsigned int devfn, 122static int gt64xxx_pci0_pcibios_write(struct pci_bus *bus, unsigned int devfn,
123 int where, int size, u32 val) 123 int where, int size, u32 val)
124{ 124{
125 u32 data = 0; 125 u32 data = 0;
126 126
127 if (size == 4) 127 if (size == 4)
128 data = val; 128 data = val;
129 else { 129 else {
130 if (gt64120_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, 130 if (gt64xxx_pci0_pcibios_config_access(PCI_ACCESS_READ, bus,
131 where, &data)) 131 devfn, where, &data))
132 return PCIBIOS_DEVICE_NOT_FOUND; 132 return PCIBIOS_DEVICE_NOT_FOUND;
133 133
134 if (size == 1) 134 if (size == 1)
@@ -139,14 +139,14 @@ static int gt64120_pcibios_write(struct pci_bus *bus, unsigned int devfn,
139 (val << ((where & 3) << 3)); 139 (val << ((where & 3) << 3));
140 } 140 }
141 141
142 if (gt64120_pcibios_config_access(PCI_ACCESS_WRITE, bus, devfn, where, 142 if (gt64xxx_pci0_pcibios_config_access(PCI_ACCESS_WRITE, bus, devfn,
143 &data)) 143 where, &data))
144 return PCIBIOS_DEVICE_NOT_FOUND; 144 return PCIBIOS_DEVICE_NOT_FOUND;
145 145
146 return PCIBIOS_SUCCESSFUL; 146 return PCIBIOS_SUCCESSFUL;
147} 147}
148 148
149struct pci_ops gt64120_pci_ops = { 149struct pci_ops gt64xxx_pci0_ops = {
150 .read = gt64120_pcibios_read, 150 .read = gt64xxx_pci0_pcibios_read,
151 .write = gt64120_pcibios_write 151 .write = gt64xxx_pci0_pcibios_write
152}; 152};
diff --git a/arch/mips/pci/ops-sni.c b/arch/mips/pci/ops-sni.c
index 2b0ccd6d9dcd..fa2d2c60f797 100644
--- a/arch/mips/pci/ops-sni.c
+++ b/arch/mips/pci/ops-sni.c
@@ -83,7 +83,82 @@ static int pcimt_write(struct pci_bus *bus, unsigned int devfn, int reg,
83 return 0; 83 return 0;
84} 84}
85 85
86struct pci_ops sni_pci_ops = { 86struct pci_ops sni_pcimt_ops = {
87 .read = pcimt_read, 87 .read = pcimt_read,
88 .write = pcimt_write, 88 .write = pcimt_write,
89}; 89};
90
91static int pcit_set_config_address(unsigned int busno, unsigned int devfn, int reg)
92{
93 if ((devfn > 255) || (reg > 255) || (busno > 255))
94 return PCIBIOS_BAD_REGISTER_NUMBER;
95
96 outl ((1 << 31) | ((busno & 0xff) << 16) | ((devfn & 0xff) << 8) | (reg & 0xfc), 0xcf8);
97 return PCIBIOS_SUCCESSFUL;
98}
99
100static int pcit_read(struct pci_bus *bus, unsigned int devfn, int reg,
101 int size, u32 * val)
102{
103 int res;
104
105 /*
106 * on bus 0 we need to check, whether there is a device answering
107 * for the devfn by doing a config write and checking the result. If
108 * we don't do it, we will get a data bus error
109 */
110 if (bus->number == 0) {
111 pcit_set_config_address (0, 0, 0x68);
112 outl (inl (0xcfc) | 0xc0000000, 0xcfc);
113 if ((res = pcit_set_config_address(0, devfn, 0)))
114 return res;
115 outl (0xffffffff, 0xcfc);
116 pcit_set_config_address (0, 0, 0x68);
117 if (inl(0xcfc) & 0x100000)
118 return PCIBIOS_DEVICE_NOT_FOUND;
119 }
120 if ((res = pcit_set_config_address(bus->number, devfn, reg)))
121 return res;
122
123 switch (size) {
124 case 1:
125 *val = inb(PCIMT_CONFIG_DATA + (reg & 3));
126 break;
127 case 2:
128 *val = inw(PCIMT_CONFIG_DATA + (reg & 2));
129 break;
130 case 4:
131 *val = inl(PCIMT_CONFIG_DATA);
132 break;
133 }
134 return 0;
135}
136
137static int pcit_write(struct pci_bus *bus, unsigned int devfn, int reg,
138 int size, u32 val)
139{
140 int res;
141
142 if ((res = pcit_set_config_address(bus->number, devfn, reg)))
143 return res;
144
145 switch (size) {
146 case 1:
147 outb (val, PCIMT_CONFIG_DATA + (reg & 3));
148 break;
149 case 2:
150 outw (val, PCIMT_CONFIG_DATA + (reg & 2));
151 break;
152 case 4:
153 outl (val, PCIMT_CONFIG_DATA);
154 break;
155 }
156
157 return 0;
158}
159
160
161struct pci_ops sni_pcit_ops = {
162 .read = pcit_read,
163 .write = pcit_write,
164};
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c
index 42530a0b84b3..aa698bd0d5e3 100644
--- a/arch/mips/pci/ops-tx3927.c
+++ b/arch/mips/pci/ops-tx3927.c
@@ -40,7 +40,6 @@
40 40
41#include <asm/addrspace.h> 41#include <asm/addrspace.h>
42#include <asm/jmr3927/jmr3927.h> 42#include <asm/jmr3927/jmr3927.h>
43#include <asm/debug.h>
44 43
45static inline int mkaddr(unsigned char bus, unsigned char dev_fn, 44static inline int mkaddr(unsigned char bus, unsigned char dev_fn,
46 unsigned char where) 45 unsigned char where)
@@ -130,234 +129,3 @@ struct pci_ops jmr3927_pci_ops = {
130 jmr3927_pci_read_config, 129 jmr3927_pci_read_config,
131 jmr3927_pci_write_config, 130 jmr3927_pci_write_config,
132}; 131};
133
134
135#ifndef JMR3927_INIT_INDIRECT_PCI
136
137inline unsigned long tc_readl(volatile __u32 * addr)
138{
139 return readl(addr);
140}
141
142inline void tc_writel(unsigned long data, volatile __u32 * addr)
143{
144 writel(data, addr);
145}
146#else
147
148unsigned long tc_readl(volatile __u32 * addr)
149{
150 unsigned long val;
151
152 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
153 (unsigned long) CPHYSADDR(addr);
154 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
155 (PCI_IPCIBE_ICMD_MEMREAD << PCI_IPCIBE_ICMD_SHIFT) |
156 PCI_IPCIBE_IBE_LONG;
157 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
158 val =
159 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
160 ipcidata);
161 /* clear by setting */
162 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
163 return val;
164}
165
166void tc_writel(unsigned long data, volatile __u32 * addr)
167{
168 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata =
169 cpu_to_le32(data);
170 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
171 (unsigned long) CPHYSADDR(addr);
172 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
173 (PCI_IPCIBE_ICMD_MEMWRITE << PCI_IPCIBE_ICMD_SHIFT) |
174 PCI_IPCIBE_IBE_LONG;
175 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
176 /* clear by setting */
177 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
178}
179
180unsigned char tx_ioinb(unsigned char *addr)
181{
182 unsigned long val;
183 __u32 ioaddr;
184 int offset;
185 int byte;
186
187 ioaddr = (unsigned long) addr;
188 offset = ioaddr & 0x3;
189 byte = 0xf & ~(8 >> offset);
190
191 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
192 (unsigned long) ioaddr;
193 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
194 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte;
195 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
196 val =
197 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
198 ipcidata);
199 val = val & 0xff;
200 /* clear by setting */
201 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
202 return val;
203}
204
205void tx_iooutb(unsigned long data, unsigned char *addr)
206{
207 __u32 ioaddr;
208 int offset;
209 int byte;
210
211 data = data | (data << 8) | (data << 16) | (data << 24);
212 ioaddr = (unsigned long) addr;
213 offset = ioaddr & 0x3;
214 byte = 0xf & ~(8 >> offset);
215
216 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata = data;
217 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
218 (unsigned long) ioaddr;
219 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
220 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte;
221 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
222 /* clear by setting */
223 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
224}
225
226unsigned short tx_ioinw(unsigned short *addr)
227{
228 unsigned long val;
229 __u32 ioaddr;
230 int offset;
231 int byte;
232
233 ioaddr = (unsigned long) addr;
234 offset = ioaddr & 0x2;
235 byte = 3 << offset;
236
237 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
238 (unsigned long) ioaddr;
239 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
240 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte;
241 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
242 val =
243 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
244 ipcidata);
245 val = val & 0xffff;
246 /* clear by setting */
247 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
248 return val;
249
250}
251
252void tx_iooutw(unsigned long data, unsigned short *addr)
253{
254 __u32 ioaddr;
255 int offset;
256 int byte;
257
258 data = data | (data << 16);
259 ioaddr = (unsigned long) addr;
260 offset = ioaddr & 0x2;
261 byte = 3 << offset;
262
263 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata = data;
264 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
265 (unsigned long) ioaddr;
266 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
267 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte;
268 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
269 /* clear by setting */
270 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
271}
272
273unsigned long tx_ioinl(unsigned int *addr)
274{
275 unsigned long val;
276 __u32 ioaddr;
277
278 ioaddr = (unsigned long) addr;
279 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
280 (unsigned long) ioaddr;
281 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
282 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) |
283 PCI_IPCIBE_IBE_LONG;
284 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
285 val =
286 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
287 ipcidata);
288 /* clear by setting */
289 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
290 return val;
291}
292
293void tx_iooutl(unsigned long data, unsigned int *addr)
294{
295 __u32 ioaddr;
296
297 ioaddr = (unsigned long) addr;
298 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata =
299 cpu_to_le32(data);
300 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
301 (unsigned long) ioaddr;
302 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
303 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) |
304 PCI_IPCIBE_IBE_LONG;
305 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
306 /* clear by setting */
307 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
308}
309
310void tx_insbyte(unsigned char *addr, void *buffer, unsigned int count)
311{
312 unsigned char *ptr = (unsigned char *) buffer;
313
314 while (count--) {
315 *ptr++ = tx_ioinb(addr);
316 }
317}
318
319void tx_insword(unsigned short *addr, void *buffer, unsigned int count)
320{
321 unsigned short *ptr = (unsigned short *) buffer;
322
323 while (count--) {
324 *ptr++ = tx_ioinw(addr);
325 }
326}
327
328void tx_inslong(unsigned int *addr, void *buffer, unsigned int count)
329{
330 unsigned long *ptr = (unsigned long *) buffer;
331
332 while (count--) {
333 *ptr++ = tx_ioinl(addr);
334 }
335}
336
337void tx_outsbyte(unsigned char *addr, void *buffer, unsigned int count)
338{
339 unsigned char *ptr = (unsigned char *) buffer;
340
341 while (count--) {
342 tx_iooutb(*ptr++, addr);
343 }
344}
345
346void tx_outsword(unsigned short *addr, void *buffer, unsigned int count)
347{
348 unsigned short *ptr = (unsigned short *) buffer;
349
350 while (count--) {
351 tx_iooutw(*ptr++, addr);
352 }
353}
354
355void tx_outslong(unsigned int *addr, void *buffer, unsigned int count)
356{
357 unsigned long *ptr = (unsigned long *) buffer;
358
359 while (count--) {
360 tx_iooutl(*ptr++, addr);
361 }
362}
363#endif
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index f6774f54cd3c..d7b9e1349f6d 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -216,7 +216,7 @@ static int __init bcm1480_pcibios_init(void)
216 /* 216 /*
217 * See if the PCI bus has been configured by the firmware. 217 * See if the PCI bus has been configured by the firmware.
218 */ 218 */
219 reg = *((volatile uint64_t *) IOADDR(A_SCD_SYSTEM_CFG)); 219 reg = __raw_readq(IOADDR(A_SCD_SYSTEM_CFG));
220 if (!(reg & M_BCM1480_SYS_PCI_HOST)) { 220 if (!(reg & M_BCM1480_SYS_PCI_HOST)) {
221 bcm1480_bus_status |= PCI_DEVICE_MODE; 221 bcm1480_bus_status |= PCI_DEVICE_MODE;
222 } else { 222 } else {
diff --git a/arch/mips/pci/pci-ev64120.c b/arch/mips/pci/pci-ev64120.c
index 9cd859ef1842..a84f594b5a18 100644
--- a/arch/mips/pci/pci-ev64120.c
+++ b/arch/mips/pci/pci-ev64120.c
@@ -1,4 +1,5 @@
1#include <linux/pci.h> 1#include <linux/pci.h>
2#include <asm/irq.h>
2 3
3int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 4int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
4{ 5{
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
index 88fb191ad2eb..985784a3e6f8 100644
--- a/arch/mips/pci/pci-lasat.c
+++ b/arch/mips/pci/pci-lasat.c
@@ -12,7 +12,7 @@
12#include <asm/bootinfo.h> 12#include <asm/bootinfo.h>
13 13
14extern struct pci_ops nile4_pci_ops; 14extern struct pci_ops nile4_pci_ops;
15extern struct pci_ops gt64120_pci_ops; 15extern struct pci_ops gt64xxx_pci0_ops;
16static struct resource lasat_pci_mem_resource = { 16static struct resource lasat_pci_mem_resource = {
17 .name = "LASAT PCI MEM", 17 .name = "LASAT PCI MEM",
18 .start = 0x18000000, 18 .start = 0x18000000,
@@ -38,7 +38,7 @@ static int __init lasat_pci_setup(void)
38 38
39 switch (mips_machtype) { 39 switch (mips_machtype) {
40 case MACH_LASAT_100: 40 case MACH_LASAT_100:
41 lasat_pci_controller.pci_ops = &gt64120_pci_ops; 41 lasat_pci_controller.pci_ops = &gt64xxx_pci0_ops;
42 break; 42 break;
43 case MACH_LASAT_200: 43 case MACH_LASAT_200:
44 lasat_pci_controller.pci_ops = &nile4_pci_ops; 44 lasat_pci_controller.pci_ops = &nile4_pci_ops;
diff --git a/arch/mips/pci/pci-ocelot.c b/arch/mips/pci/pci-ocelot.c
index 2b9495dce6ba..7f94f26d35ae 100644
--- a/arch/mips/pci/pci-ocelot.c
+++ b/arch/mips/pci/pci-ocelot.c
@@ -81,7 +81,7 @@ static struct resource ocelot_io_resource = {
81}; 81};
82 82
83static struct pci_controller ocelot_pci_controller = { 83static struct pci_controller ocelot_pci_controller = {
84 .pci_ops = gt64120_pci_ops; 84 .pci_ops = gt64xxx_pci0_ops;
85 .mem_resource = &ocelot_mem_resource; 85 .mem_resource = &ocelot_mem_resource;
86 .io_resource = &ocelot_io_resource; 86 .io_resource = &ocelot_io_resource;
87}; 87};
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c
index 80f5e8c4bcd4..75c1246ced5f 100644
--- a/arch/mips/pci/pci-sb1250.c
+++ b/arch/mips/pci/pci-sb1250.c
@@ -228,7 +228,7 @@ static int __init sb1250_pcibios_init(void)
228 /* 228 /*
229 * See if the PCI bus has been configured by the firmware. 229 * See if the PCI bus has been configured by the firmware.
230 */ 230 */
231 reg = *((volatile uint64_t *) IOADDR(A_SCD_SYSTEM_CFG)); 231 reg = __raw_readq(IOADDR(A_SCD_SYSTEM_CFG));
232 if (!(reg & M_SYS_PCI_HOST)) { 232 if (!(reg & M_SYS_PCI_HOST)) {
233 sb1250_bus_status |= PCI_DEVICE_MODE; 233 sb1250_bus_status |= PCI_DEVICE_MODE;
234 } else { 234 } else {
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 5ace368657ad..8108231f2e20 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -77,8 +77,28 @@ pcibios_align_resource(void *data, struct resource *res,
77 77
78void __init register_pci_controller(struct pci_controller *hose) 78void __init register_pci_controller(struct pci_controller *hose)
79{ 79{
80 if (request_resource(&iomem_resource, hose->mem_resource) < 0)
81 goto out;
82 if (request_resource(&ioport_resource, hose->io_resource) < 0) {
83 release_resource(hose->mem_resource);
84 goto out;
85 }
86
80 *hose_tail = hose; 87 *hose_tail = hose;
81 hose_tail = &hose->next; 88 hose_tail = &hose->next;
89
90 /*
91 * Do not panic here but later - this might hapen before console init.
92 */
93 if (!hose->io_map_base) {
94 printk(KERN_WARNING
95 "registering PCI controller with io_map_base unset\n");
96 }
97 return;
98
99out:
100 printk(KERN_WARNING
101 "Skipping PCI bus scan due to resource conflict\n");
82} 102}
83 103
84/* Most MIPS systems have straight-forward swizzling needs. */ 104/* Most MIPS systems have straight-forward swizzling needs. */
@@ -113,11 +133,6 @@ static int __init pcibios_init(void)
113 /* Scan all of the recorded PCI controllers. */ 133 /* Scan all of the recorded PCI controllers. */
114 for (next_busno = 0, hose = hose_head; hose; hose = hose->next) { 134 for (next_busno = 0, hose = hose_head; hose; hose = hose->next) {
115 135
116 if (request_resource(&iomem_resource, hose->mem_resource) < 0)
117 goto out;
118 if (request_resource(&ioport_resource, hose->io_resource) < 0)
119 goto out_free_mem_resource;
120
121 if (!hose->iommu) 136 if (!hose->iommu)
122 PCI_DMA_BUS_IS_PHYS = 1; 137 PCI_DMA_BUS_IS_PHYS = 1;
123 138
@@ -136,14 +151,6 @@ static int __init pcibios_init(void)
136 need_domain_info = 1; 151 need_domain_info = 1;
137 } 152 }
138 } 153 }
139 continue;
140
141out_free_mem_resource:
142 release_resource(hose->mem_resource);
143
144out:
145 printk(KERN_WARNING
146 "Skipping PCI bus scan due to resource conflict\n");
147 } 154 }
148 155
149 if (!pci_probe_only) 156 if (!pci_probe_only)
@@ -223,7 +230,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
223 return pcibios_plat_dev_init(dev); 230 return pcibios_plat_dev_init(dev);
224} 231}
225 232
226static void __init pcibios_fixup_device_resources(struct pci_dev *dev, 233static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
227 struct pci_bus *bus) 234 struct pci_bus *bus)
228{ 235{
229 /* Update device resources. */ 236 /* Update device resources. */
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c
index d48665ebd33c..aad03429a5e3 100644
--- a/arch/mips/philips/pnx8550/common/int.c
+++ b/arch/mips/philips/pnx8550/common/int.c
@@ -83,16 +83,15 @@ static void timer_irqdispatch(int irq)
83 83
84asmlinkage void plat_irq_dispatch(void) 84asmlinkage void plat_irq_dispatch(void)
85{ 85{
86 unsigned int pending = read_c0_status() & read_c0_cause(); 86 unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
87 87
88 if (pending & STATUSF_IP2) 88 if (pending & STATUSF_IP2)
89 hw0_irqdispatch(2); 89 hw0_irqdispatch(2);
90 else if (pending & STATUSF_IP7) { 90 else if (pending & STATUSF_IP7) {
91 if (read_c0_config7() & 0x01c0) 91 if (read_c0_config7() & 0x01c0)
92 timer_irqdispatch(7); 92 timer_irqdispatch(7);
93 } 93 } else
94 94 spurious_interrupt();
95 spurious_interrupt();
96} 95}
97 96
98static inline void modify_cp0_intmask(unsigned clr_mask, unsigned set_mask) 97static inline void modify_cp0_intmask(unsigned clr_mask, unsigned set_mask)
@@ -204,19 +203,7 @@ void __init arch_init_irq(void)
204 * Note, PCI INTA is active low on the bus, but inverted 203 * Note, PCI INTA is active low on the bus, but inverted
205 * in the GIC, so to us it's active high. 204 * in the GIC, so to us it's active high.
206 */ 205 */
207#ifdef CONFIG_PNX8550_V2PCI 206 PNX8550_GIC_REQ(i - PNX8550_INT_GIC_MIN) = 0x1E000000;
208 if (gic_int_line == (PNX8550_INT_GPIO0 - PNX8550_INT_GIC_MIN)) {
209 /* PCI INT through gpio 8, which is setup in
210 * pnx8550_setup.c and routed to GPIO
211 * Interrupt Level 0 (GPIO Connection 58).
212 * Set it active low. */
213
214 PNX8550_GIC_REQ(gic_int_line) = 0x1E020000;
215 } else
216#endif
217 {
218 PNX8550_GIC_REQ(i - PNX8550_INT_GIC_MIN) = 0x1E000000;
219 }
220 207
221 /* mask/priority is still 0 so we will not get any 208 /* mask/priority is still 0 so we will not get any
222 * interrupts until it is unmasked */ 209 * interrupts until it is unmasked */
diff --git a/arch/mips/philips/pnx8550/common/prom.c b/arch/mips/philips/pnx8550/common/prom.c
index 8aeed6c2b8c3..2f567452e7ac 100644
--- a/arch/mips/philips/pnx8550/common/prom.c
+++ b/arch/mips/philips/pnx8550/common/prom.c
@@ -112,7 +112,7 @@ void __init prom_free_prom_memory(void)
112 112
113extern int pnx8550_console_port; 113extern int pnx8550_console_port;
114 114
115/* used by prom_printf */ 115/* used by early printk */
116void prom_putchar(char c) 116void prom_putchar(char c)
117{ 117{
118 if (pnx8550_console_port != -1) { 118 if (pnx8550_console_port != -1) {
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c
index e62123ca9b64..5bd737477685 100644
--- a/arch/mips/philips/pnx8550/common/setup.c
+++ b/arch/mips/philips/pnx8550/common/setup.c
@@ -41,8 +41,6 @@
41#include <uart.h> 41#include <uart.h>
42#include <nand.h> 42#include <nand.h>
43 43
44extern void prom_printf(char *fmt, ...);
45
46extern void __init board_setup(void); 44extern void __init board_setup(void);
47extern void pnx8550_machine_restart(char *); 45extern void pnx8550_machine_restart(char *);
48extern void pnx8550_machine_halt(void); 46extern void pnx8550_machine_halt(void);
@@ -51,7 +49,6 @@ extern struct resource ioport_resource;
51extern struct resource iomem_resource; 49extern struct resource iomem_resource;
52extern void pnx8550_time_init(void); 50extern void pnx8550_time_init(void);
53extern void rs_kgdb_hook(int tty_no); 51extern void rs_kgdb_hook(int tty_no);
54extern void prom_printf(char *fmt, ...);
55extern char *prom_getcmdline(void); 52extern char *prom_getcmdline(void);
56 53
57struct resource standard_io_resources[] = { 54struct resource standard_io_resources[] = {
@@ -141,7 +138,7 @@ void __init plat_mem_setup(void)
141 argptr += strlen("console=ttyS"); 138 argptr += strlen("console=ttyS");
142 pnx8550_console_port = *argptr == '0' ? 0 : 1; 139 pnx8550_console_port = *argptr == '0' ? 0 : 1;
143 140
144 /* We must initialize the UART (console) before prom_printf */ 141 /* We must initialize the UART (console) before early printk */
145 /* Set LCR to 8-bit and BAUD to 38400 (no 5) */ 142 /* Set LCR to 8-bit and BAUD to 38400 (no 5) */
146 ip3106_lcr(UART_BASE, pnx8550_console_port) = 143 ip3106_lcr(UART_BASE, pnx8550_console_port) =
147 PNX8XXX_UART_LCR_8BIT; 144 PNX8XXX_UART_LCR_8BIT;
@@ -155,8 +152,8 @@ void __init plat_mem_setup(void)
155 argptr += strlen("kgdb=ttyS"); 152 argptr += strlen("kgdb=ttyS");
156 line = *argptr == '0' ? 0 : 1; 153 line = *argptr == '0' ? 0 : 1;
157 rs_kgdb_hook(line); 154 rs_kgdb_hook(line);
158 prom_printf("KGDB: Using ttyS%i for session, " 155 pr_info("KGDB: Using ttyS%i for session, "
159 "please connect your debugger\n", line ? 1 : 0); 156 "please connect your debugger\n", line ? 1 : 0);
160 } 157 }
161#endif 158#endif
162 return; 159 return;
diff --git a/arch/mips/pmc-sierra/yosemite/py-console.c b/arch/mips/pmc-sierra/yosemite/py-console.c
index 757e605693ff..b7f1d9c4a8a3 100644
--- a/arch/mips/pmc-sierra/yosemite/py-console.c
+++ b/arch/mips/pmc-sierra/yosemite/py-console.c
@@ -107,8 +107,3 @@ void prom_putchar(char c)
107 while ((readb_outer_space(lsr) & 0x20) == 0); 107 while ((readb_outer_space(lsr) & 0x20) == 0);
108 writeb_outer_space(thr, c); 108 writeb_outer_space(thr, c);
109} 109}
110
111char __init prom_getchar(void)
112{
113 return 0;
114}
diff --git a/arch/mips/qemu/q-smp.c b/arch/mips/qemu/q-smp.c
index 5a12354cd576..786bbfa214d1 100644
--- a/arch/mips/qemu/q-smp.c
+++ b/arch/mips/qemu/q-smp.c
@@ -46,3 +46,10 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
46void prom_boot_secondary(int cpu, struct task_struct *idle) 46void prom_boot_secondary(int cpu, struct task_struct *idle)
47{ 47{
48} 48}
49
50void __init plat_smp_setup(void)
51{
52}
53void __init plat_prepare_cpus(unsigned int max_cpus)
54{
55}
diff --git a/arch/mips/sgi-ip22/Makefile b/arch/mips/sgi-ip22/Makefile
index 6aa4c0cd169c..b6d649241dc1 100644
--- a/arch/mips/sgi-ip22/Makefile
+++ b/arch/mips/sgi-ip22/Makefile
@@ -7,5 +7,3 @@ obj-y += ip22-mc.o ip22-hpc.o ip22-int.o ip22-berr.o \
7 ip22-time.o ip22-nvram.o ip22-reset.o ip22-setup.o 7 ip22-time.o ip22-nvram.o ip22-reset.o ip22-setup.o
8 8
9obj-$(CONFIG_EISA) += ip22-eisa.o 9obj-$(CONFIG_EISA) += ip22-eisa.o
10
11EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c
index b454924aeb56..18348321795d 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -237,7 +237,7 @@ extern void indy_8254timer_irq(void);
237 237
238asmlinkage void plat_irq_dispatch(void) 238asmlinkage void plat_irq_dispatch(void)
239{ 239{
240 unsigned int pending = read_c0_cause(); 240 unsigned int pending = read_c0_status() & read_c0_cause();
241 241
242 /* 242 /*
243 * First we check for r4k counter/timer IRQ. 243 * First we check for r4k counter/timer IRQ.
diff --git a/arch/mips/sgi-ip22/ip22-nvram.c b/arch/mips/sgi-ip22/ip22-nvram.c
index fd29fd407ae8..e19d60d5fcc1 100644
--- a/arch/mips/sgi-ip22/ip22-nvram.c
+++ b/arch/mips/sgi-ip22/ip22-nvram.c
@@ -52,8 +52,7 @@
52 * national semiconductor nv ram chip the op code is 3 bits and 52 * national semiconductor nv ram chip the op code is 3 bits and
53 * the address is 6/8 bits. 53 * the address is 6/8 bits.
54 */ 54 */
55static inline void eeprom_cmd(volatile unsigned int *ctrl, unsigned cmd, 55static inline void eeprom_cmd(unsigned int *ctrl, unsigned cmd, unsigned reg)
56 unsigned reg)
57{ 56{
58 unsigned short ser_cmd; 57 unsigned short ser_cmd;
59 int i; 58 int i;
@@ -61,33 +60,34 @@ static inline void eeprom_cmd(volatile unsigned int *ctrl, unsigned cmd,
61 ser_cmd = cmd | (reg << (16 - BITS_IN_COMMAND)); 60 ser_cmd = cmd | (reg << (16 - BITS_IN_COMMAND));
62 for (i = 0; i < BITS_IN_COMMAND; i++) { 61 for (i = 0; i < BITS_IN_COMMAND; i++) {
63 if (ser_cmd & (1<<15)) /* if high order bit set */ 62 if (ser_cmd & (1<<15)) /* if high order bit set */
64 *ctrl |= EEPROM_DATO; 63 writel(readl(ctrl) | EEPROM_DATO, ctrl);
65 else 64 else
66 *ctrl &= ~EEPROM_DATO; 65 writel(readl(ctrl) & ~EEPROM_DATO, ctrl);
67 *ctrl &= ~EEPROM_ECLK; 66 writel(readl(ctrl) & ~EEPROM_ECLK, ctrl);
68 *ctrl |= EEPROM_ECLK; 67 writel(readl(ctrl) | EEPROM_ECLK, ctrl);
69 ser_cmd <<= 1; 68 ser_cmd <<= 1;
70 } 69 }
71 *ctrl &= ~EEPROM_DATO; /* see data sheet timing diagram */ 70 /* see data sheet timing diagram */
71 writel(readl(ctrl) & ~EEPROM_DATO, ctrl);
72} 72}
73 73
74unsigned short ip22_eeprom_read(volatile unsigned int *ctrl, int reg) 74unsigned short ip22_eeprom_read(unsigned int *ctrl, int reg)
75{ 75{
76 unsigned short res = 0; 76 unsigned short res = 0;
77 int i; 77 int i;
78 78
79 *ctrl &= ~EEPROM_EPROT; 79 writel(readl(ctrl) & ~EEPROM_EPROT, ctrl);
80 eeprom_cs_on(ctrl); 80 eeprom_cs_on(ctrl);
81 eeprom_cmd(ctrl, EEPROM_READ, reg); 81 eeprom_cmd(ctrl, EEPROM_READ, reg);
82 82
83 /* clock the data ouf of serial mem */ 83 /* clock the data ouf of serial mem */
84 for (i = 0; i < 16; i++) { 84 for (i = 0; i < 16; i++) {
85 *ctrl &= ~EEPROM_ECLK; 85 writel(readl(ctrl) & ~EEPROM_ECLK, ctrl);
86 delay(); 86 delay();
87 *ctrl |= EEPROM_ECLK; 87 writel(readl(ctrl) | EEPROM_ECLK, ctrl);
88 delay(); 88 delay();
89 res <<= 1; 89 res <<= 1;
90 if (*ctrl & EEPROM_DATI) 90 if (readl(ctrl) & EEPROM_DATI)
91 res |= 1; 91 res |= 1;
92 } 92 }
93 93
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index 205554734099..8e88a442b22a 100644
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -94,7 +94,7 @@ static int indy_rtc_set_time(unsigned long tim)
94static unsigned long dosample(void) 94static unsigned long dosample(void)
95{ 95{
96 u32 ct0, ct1; 96 u32 ct0, ct1;
97 volatile u8 msb, lsb; 97 u8 msb, lsb;
98 98
99 /* Start the counter. */ 99 /* Start the counter. */
100 sgint->tcword = (SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL | 100 sgint->tcword = (SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL |
@@ -107,21 +107,21 @@ static unsigned long dosample(void)
107 107
108 /* Latch and spin until top byte of counter2 is zero */ 108 /* Latch and spin until top byte of counter2 is zero */
109 do { 109 do {
110 sgint->tcword = SGINT_TCWORD_CNT2 | SGINT_TCWORD_CLAT; 110 writeb(SGINT_TCWORD_CNT2 | SGINT_TCWORD_CLAT, &sgint->tcword);
111 lsb = sgint->tcnt2; 111 lsb = readb(&sgint->tcnt2);
112 msb = sgint->tcnt2; 112 msb = readb(&sgint->tcnt2);
113 ct1 = read_c0_count(); 113 ct1 = read_c0_count();
114 } while (msb); 114 } while (msb);
115 115
116 /* Stop the counter. */ 116 /* Stop the counter. */
117 sgint->tcword = (SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL | 117 writeb(sgint->tcword, (SGINT_TCWORD_CNT2 | SGINT_TCWORD_CALL |
118 SGINT_TCWORD_MSWST); 118 SGINT_TCWORD_MSWST));
119 /* 119 /*
120 * Return the difference, this is how far the r4k counter increments 120 * Return the difference, this is how far the r4k counter increments
121 * for every 1/HZ seconds. We round off the nearest 1 MHz of master 121 * for every 1/HZ seconds. We round off the nearest 1 MHz of master
122 * clock (= 1000000 / HZ / 2). 122 * clock (= 1000000 / HZ / 2).
123 */ 123 */
124 /*return (ct1 - ct0 + (500000/HZ/2)) / (500000/HZ) * (500000/HZ);*/ 124
125 return (ct1 - ct0) / (500000/HZ) * (500000/HZ); 125 return (ct1 - ct0) / (500000/HZ) * (500000/HZ);
126} 126}
127 127
diff --git a/arch/mips/sgi-ip27/Makefile b/arch/mips/sgi-ip27/Makefile
index a457263f4391..7ce76e20beb9 100644
--- a/arch/mips/sgi-ip27/Makefile
+++ b/arch/mips/sgi-ip27/Makefile
@@ -9,5 +9,3 @@ obj-y := ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o ip27-klnuma.o \
9obj-$(CONFIG_EARLY_PRINTK) += ip27-console.o 9obj-$(CONFIG_EARLY_PRINTK) += ip27-console.o
10obj-$(CONFIG_KGDB) += ip27-dbgio.o 10obj-$(CONFIG_KGDB) += ip27-dbgio.o
11obj-$(CONFIG_SMP) += ip27-smp.o 11obj-$(CONFIG_SMP) += ip27-smp.o
12
13EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/sgi-ip27/ip27-console.c b/arch/mips/sgi-ip27/ip27-console.c
index 14211e382374..3ba830651c58 100644
--- a/arch/mips/sgi-ip27/ip27-console.c
+++ b/arch/mips/sgi-ip27/ip27-console.c
@@ -6,12 +6,6 @@
6 * Copyright (C) 2001, 2002 Ralf Baechle 6 * Copyright (C) 2001, 2002 Ralf Baechle
7 */ 7 */
8#include <linux/init.h> 8#include <linux/init.h>
9#include <linux/console.h>
10#include <linux/kdev_t.h>
11#include <linux/major.h>
12#include <linux/termios.h>
13#include <linux/sched.h>
14#include <linux/tty.h>
15 9
16#include <asm/page.h> 10#include <asm/page.h>
17#include <asm/semaphore.h> 11#include <asm/semaphore.h>
@@ -38,37 +32,10 @@ static inline struct ioc3_uartregs *console_uart(void)
38 return &ioc3->sregs.uarta; 32 return &ioc3->sregs.uarta;
39} 33}
40 34
41void prom_putchar(char c) 35void __init prom_putchar(char c)
42{ 36{
43 struct ioc3_uartregs *uart = console_uart(); 37 struct ioc3_uartregs *uart = console_uart();
44 38
45 while ((uart->iu_lsr & 0x20) == 0); 39 while ((uart->iu_lsr & 0x20) == 0);
46 uart->iu_thr = c; 40 uart->iu_thr = c;
47} 41}
48
49static void ioc3_console_write(struct console *con, const char *s, unsigned n)
50{
51 while (n-- && *s) {
52 if (*s == '\n')
53 prom_putchar('\r');
54 prom_putchar(*s);
55 s++;
56 }
57}
58
59static struct console ioc3_console = {
60 .name = "ioc3",
61 .write = ioc3_console_write,
62 .flags = CON_PRINTBUFFER | CON_BOOT,
63 .index = -1
64};
65
66__init void ip27_setup_console(void)
67{
68 register_console(&ioc3_console);
69}
70
71void __init disable_early_printk(void)
72{
73 unregister_console(&ioc3_console);
74}
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
index 9094baf31d0e..74158d349630 100644
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@ -191,7 +191,6 @@ static inline void ioc3_eth_init(void)
191 ioc3->eier = 0; 191 ioc3->eier = 0;
192} 192}
193 193
194extern void ip27_setup_console(void);
195extern void ip27_time_init(void); 194extern void ip27_time_init(void);
196extern void ip27_reboot_setup(void); 195extern void ip27_reboot_setup(void);
197 196
@@ -200,7 +199,6 @@ void __init plat_mem_setup(void)
200 hubreg_t p, e, n_mode; 199 hubreg_t p, e, n_mode;
201 nasid_t nid; 200 nasid_t nid;
202 201
203 ip27_setup_console();
204 ip27_reboot_setup(); 202 ip27_reboot_setup();
205 203
206 /* 204 /*
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 0e3d535e9f43..fe8a1066aec1 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -21,6 +21,7 @@
21#include <linux/pfn.h> 21#include <linux/pfn.h>
22#include <linux/highmem.h> 22#include <linux/highmem.h>
23#include <asm/page.h> 23#include <asm/page.h>
24#include <asm/pgalloc.h>
24#include <asm/sections.h> 25#include <asm/sections.h>
25 26
26#include <asm/sn/arch.h> 27#include <asm/sn/arch.h>
@@ -503,7 +504,6 @@ void __init prom_free_prom_memory(void)
503 /* We got nothing to free here ... */ 504 /* We got nothing to free here ... */
504} 505}
505 506
506extern void pagetable_init(void);
507extern unsigned long setup_zero_pages(void); 507extern unsigned long setup_zero_pages(void);
508 508
509void __init paging_init(void) 509void __init paging_init(void)
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 9ce513629b14..8c3c78c63ccd 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -190,7 +190,7 @@ static struct irq_chip rt_irq_type = {
190}; 190};
191 191
192static struct irqaction rt_irqaction = { 192static struct irqaction rt_irqaction = {
193 .handler = ip27_rt_timer_interrupt, 193 .handler = (irq_handler_t) ip27_rt_timer_interrupt,
194 .flags = IRQF_DISABLED, 194 .flags = IRQF_DISABLED,
195 .mask = CPU_MASK_NONE, 195 .mask = CPU_MASK_NONE,
196 .name = "timer" 196 .name = "timer"
diff --git a/arch/mips/sgi-ip32/Makefile b/arch/mips/sgi-ip32/Makefile
index 530bf848c3d0..7e1416768a60 100644
--- a/arch/mips/sgi-ip32/Makefile
+++ b/arch/mips/sgi-ip32/Makefile
@@ -5,5 +5,3 @@
5 5
6obj-y += ip32-berr.o ip32-irq.o ip32-setup.o ip32-reset.o \ 6obj-y += ip32-berr.o ip32-irq.o ip32-setup.o ip32-reset.o \
7 crime.o ip32-memory.o 7 crime.o ip32-memory.o
8
9EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c
index 8c450d9e8696..fb9da9acf53f 100644
--- a/arch/mips/sgi-ip32/ip32-irq.c
+++ b/arch/mips/sgi-ip32/ip32-irq.c
@@ -454,7 +454,7 @@ static void ip32_irq5(void)
454 454
455asmlinkage void plat_irq_dispatch(void) 455asmlinkage void plat_irq_dispatch(void)
456{ 456{
457 unsigned int pending = read_c0_cause(); 457 unsigned int pending = read_c0_status() & read_c0_cause();
458 458
459 if (likely(pending & IE_IRQ0)) 459 if (likely(pending & IE_IRQ0))
460 ip32_irq0(); 460 ip32_irq0();
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
index ec7a2cffacf0..e6b003ec6716 100644
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
@@ -1,35 +1,41 @@
1config SIBYTE_SB1250 1config SIBYTE_SB1250
2 bool 2 bool
3 select HW_HAS_PCI 3 select HW_HAS_PCI
4 select SIBYTE_HAS_LDT 4 select SIBYTE_ENABLE_LDT_IF_PCI
5 select SIBYTE_HAS_ZBUS_PROFILING
5 select SIBYTE_SB1xxx_SOC 6 select SIBYTE_SB1xxx_SOC
6 select SYS_SUPPORTS_SMP 7 select SYS_SUPPORTS_SMP
7 8
8config SIBYTE_BCM1120 9config SIBYTE_BCM1120
9 bool 10 bool
10 select SIBYTE_BCM112X 11 select SIBYTE_BCM112X
12 select SIBYTE_HAS_ZBUS_PROFILING
11 select SIBYTE_SB1xxx_SOC 13 select SIBYTE_SB1xxx_SOC
12 14
13config SIBYTE_BCM1125 15config SIBYTE_BCM1125
14 bool 16 bool
15 select HW_HAS_PCI 17 select HW_HAS_PCI
16 select SIBYTE_BCM112X 18 select SIBYTE_BCM112X
19 select SIBYTE_HAS_ZBUS_PROFILING
17 select SIBYTE_SB1xxx_SOC 20 select SIBYTE_SB1xxx_SOC
18 21
19config SIBYTE_BCM1125H 22config SIBYTE_BCM1125H
20 bool 23 bool
21 select HW_HAS_PCI 24 select HW_HAS_PCI
22 select SIBYTE_BCM112X 25 select SIBYTE_BCM112X
23 select SIBYTE_HAS_LDT 26 select SIBYTE_ENABLE_LDT_IF_PCI
27 select SIBYTE_HAS_ZBUS_PROFILING
24 select SIBYTE_SB1xxx_SOC 28 select SIBYTE_SB1xxx_SOC
25 29
26config SIBYTE_BCM112X 30config SIBYTE_BCM112X
27 bool 31 bool
28 select SIBYTE_SB1xxx_SOC 32 select SIBYTE_SB1xxx_SOC
33 select SIBYTE_HAS_ZBUS_PROFILING
29 34
30config SIBYTE_BCM1x80 35config SIBYTE_BCM1x80
31 bool 36 bool
32 select HW_HAS_PCI 37 select HW_HAS_PCI
38 select SIBYTE_HAS_ZBUS_PROFILING
33 select SIBYTE_SB1xxx_SOC 39 select SIBYTE_SB1xxx_SOC
34 select SYS_SUPPORTS_SMP 40 select SYS_SUPPORTS_SMP
35 41
@@ -37,6 +43,7 @@ config SIBYTE_BCM1x55
37 bool 43 bool
38 select HW_HAS_PCI 44 select HW_HAS_PCI
39 select SIBYTE_SB1xxx_SOC 45 select SIBYTE_SB1xxx_SOC
46 select SIBYTE_HAS_ZBUS_PROFILING
40 select SYS_SUPPORTS_SMP 47 select SYS_SUPPORTS_SMP
41 48
42config SIBYTE_SB1xxx_SOC 49config SIBYTE_SB1xxx_SOC
@@ -95,8 +102,10 @@ config CPU_SB1_PASS_2
95 102
96config SIBYTE_HAS_LDT 103config SIBYTE_HAS_LDT
97 bool 104 bool
98 depends on PCI && (SIBYTE_SB1250 || SIBYTE_BCM1125H) 105
99 default y 106config SIBYTE_ENABLE_LDT_IF_PCI
107 bool
108 select SIBYTE_HAS_LDT if PCI
100 109
101config SIMULATION 110config SIMULATION
102 bool "Running under simulation" 111 bool "Running under simulation"
@@ -116,6 +125,7 @@ config SB1_CERR_STALL
116config SIBYTE_CFE 125config SIBYTE_CFE
117 bool "Booting from CFE" 126 bool "Booting from CFE"
118 depends on SIBYTE_SB1xxx_SOC 127 depends on SIBYTE_SB1xxx_SOC
128 select SYS_HAS_EARLY_PRINTK
119 help 129 help
120 Make use of the CFE API for enumerating available memory, 130 Make use of the CFE API for enumerating available memory,
121 controlling secondary CPUs, and possibly console output. 131 controlling secondary CPUs, and possibly console output.
@@ -131,6 +141,7 @@ config SIBYTE_CFE_CONSOLE
131config SIBYTE_STANDALONE 141config SIBYTE_STANDALONE
132 bool 142 bool
133 depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE 143 depends on SIBYTE_SB1xxx_SOC && !SIBYTE_CFE
144 select SYS_HAS_EARLY_PRINTK
134 default y 145 default y
135 146
136config SIBYTE_STANDALONE_RAM_SIZE 147config SIBYTE_STANDALONE_RAM_SIZE
@@ -160,5 +171,8 @@ config SIBYTE_SB1250_PROF
160 depends on SIBYTE_SB1xxx_SOC 171 depends on SIBYTE_SB1xxx_SOC
161 172
162config SIBYTE_TBPROF 173config SIBYTE_TBPROF
163 bool "Support for ZBbus profiling" 174 tristate "Support for ZBbus profiling"
164 depends on SIBYTE_SB1xxx_SOC 175 depends on SIBYTE_HAS_ZBUS_PROFILING
176
177config SIBYTE_HAS_ZBUS_PROFILING
178 bool
diff --git a/arch/mips/sibyte/bcm1480/Makefile b/arch/mips/sibyte/bcm1480/Makefile
index 7b36ff3873b7..cdc4c56c3e29 100644
--- a/arch/mips/sibyte/bcm1480/Makefile
+++ b/arch/mips/sibyte/bcm1480/Makefile
@@ -1,5 +1,3 @@
1obj-y := setup.o irq.o time.o 1obj-y := setup.o irq.o time.o
2 2
3obj-$(CONFIG_SMP) += smp.o 3obj-$(CONFIG_SMP) += smp.o
4
5EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index 1dc5d05d8962..ba0c4b776c85 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -141,11 +141,11 @@ static void bcm1480_set_affinity(unsigned int irq, cpumask_t mask)
141 unsigned long flags; 141 unsigned long flags;
142 unsigned int irq_dirty; 142 unsigned int irq_dirty;
143 143
144 i = first_cpu(mask); 144 if (cpus_weight(mask) != 1) {
145 if (next_cpu(i, mask) <= NR_CPUS) {
146 printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq); 145 printk("attempted to set irq affinity for irq %d to multiple CPUs\n", irq);
147 return; 146 return;
148 } 147 }
148 i = first_cpu(mask);
149 149
150 /* Convert logical CPU to physical CPU */ 150 /* Convert logical CPU to physical CPU */
151 cpu = cpu_logical_map(i); 151 cpu = cpu_logical_map(i);
@@ -420,7 +420,7 @@ void __init arch_init_irq(void)
420#ifdef CONFIG_GDB_CONSOLE 420#ifdef CONFIG_GDB_CONSOLE
421 register_gdb_console(); 421 register_gdb_console();
422#endif 422#endif
423 prom_printf("Waiting for GDB on UART port %d\n", kgdb_port); 423 printk("Waiting for GDB on UART port %d\n", kgdb_port);
424 set_debug_traps(); 424 set_debug_traps();
425 breakpoint(); 425 breakpoint();
426 } 426 }
diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c
index 8236d0c48542..bdaac34ae708 100644
--- a/arch/mips/sibyte/bcm1480/setup.c
+++ b/arch/mips/sibyte/bcm1480/setup.c
@@ -69,7 +69,7 @@ static inline int sys_rev_decode(void)
69 break; 69 break;
70 70
71 default: 71 default:
72 prom_printf("Unknown part type %x\n", part_type); 72 printk("Unknown part type %x\n", part_type);
73 ret = 1; 73 ret = 1;
74 break; 74 break;
75 } 75 }
@@ -102,7 +102,7 @@ static inline int setup_bcm1x80_bcm1x55(void)
102 pass_str = "B0 (pass2)"; 102 pass_str = "B0 (pass2)";
103 break; 103 break;
104 default: 104 default:
105 prom_printf("Unknown %s rev %x\n", soc_str, soc_pass); 105 printk("Unknown %s rev %x\n", soc_str, soc_pass);
106 periph_rev = 1; 106 periph_rev = 1;
107 pass_str = "Unknown Revision"; 107 pass_str = "Unknown Revision";
108 break; 108 break;
@@ -122,14 +122,14 @@ void bcm1480_setup(void)
122 soc_pass = G_SYS_REVISION(sys_rev); 122 soc_pass = G_SYS_REVISION(sys_rev);
123 123
124 if (sys_rev_decode()) { 124 if (sys_rev_decode()) {
125 prom_printf("Restart after failure to identify SiByte chip\n"); 125 printk("Restart after failure to identify SiByte chip\n");
126 machine_restart(NULL); 126 machine_restart(NULL);
127 } 127 }
128 128
129 plldiv = G_BCM1480_SYS_PLL_DIV(__raw_readq(IOADDR(A_SCD_SYSTEM_CFG))); 129 plldiv = G_BCM1480_SYS_PLL_DIV(__raw_readq(IOADDR(A_SCD_SYSTEM_CFG)));
130 zbbus_mhz = ((plldiv >> 1) * 50) + ((plldiv & 1) * 25); 130 zbbus_mhz = ((plldiv >> 1) * 50) + ((plldiv & 1) * 25);
131 131
132 prom_printf("Broadcom SiByte %s %s @ %d MHz (SB-1A rev %d)\n", 132 printk("Broadcom SiByte %s %s @ %d MHz (SB-1A rev %d)\n",
133 soc_str, pass_str, zbbus_mhz * 2, sb1_pass); 133 soc_str, pass_str, zbbus_mhz * 2, sb1_pass);
134 prom_printf("Board type: %s\n", get_system_type()); 134 printk("Board type: %s\n", get_system_type());
135} 135}
diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index bf328277c775..6eac36d1b8c8 100644
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -34,21 +34,21 @@ extern void smp_call_function_interrupt(void);
34 * independent of board/firmware 34 * independent of board/firmware
35 */ 35 */
36 36
37static volatile void *mailbox_0_set_regs[] = { 37static void *mailbox_0_set_regs[] = {
38 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU), 38 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU),
39 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU), 39 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU),
40 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU), 40 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU),
41 IOADDR(A_BCM1480_IMR_CPU3_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU), 41 IOADDR(A_BCM1480_IMR_CPU3_BASE + R_BCM1480_IMR_MAILBOX_0_SET_CPU),
42}; 42};
43 43
44static volatile void *mailbox_0_clear_regs[] = { 44static void *mailbox_0_clear_regs[] = {
45 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU), 45 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU),
46 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU), 46 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU),
47 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU), 47 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU),
48 IOADDR(A_BCM1480_IMR_CPU3_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU), 48 IOADDR(A_BCM1480_IMR_CPU3_BASE + R_BCM1480_IMR_MAILBOX_0_CLR_CPU),
49}; 49};
50 50
51static volatile void *mailbox_0_regs[] = { 51static void *mailbox_0_regs[] = {
52 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_CPU), 52 IOADDR(A_BCM1480_IMR_CPU0_BASE + R_BCM1480_IMR_MAILBOX_0_CPU),
53 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CPU), 53 IOADDR(A_BCM1480_IMR_CPU1_BASE + R_BCM1480_IMR_MAILBOX_0_CPU),
54 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CPU), 54 IOADDR(A_BCM1480_IMR_CPU2_BASE + R_BCM1480_IMR_MAILBOX_0_CPU),
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index 9e6099e69622..ae4a92c3e529 100644
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -221,10 +221,10 @@ static int __init initrd_setup(char *str)
221 goto fail; 221 goto fail;
222 } 222 }
223 initrd_end = initrd_start + initrd_size; 223 initrd_end = initrd_start + initrd_size;
224 prom_printf("Found initrd of %lx@%lx\n", initrd_size, initrd_start); 224 printk("Found initrd of %lx@%lx\n", initrd_size, initrd_start);
225 return 1; 225 return 1;
226 fail: 226 fail:
227 prom_printf("Bad initrd argument. Disabling initrd\n"); 227 printk("Bad initrd argument. Disabling initrd\n");
228 initrd_start = 0; 228 initrd_start = 0;
229 initrd_end = 0; 229 initrd_end = 0;
230 return 1; 230 return 1;
@@ -281,7 +281,7 @@ void __init prom_init(void)
281 } 281 }
282 if (cfe_eptseal != CFE_EPTSEAL) { 282 if (cfe_eptseal != CFE_EPTSEAL) {
283 /* too early for panic to do any good */ 283 /* too early for panic to do any good */
284 prom_printf("CFE's entrypoint seal doesn't match. Spinning."); 284 printk("CFE's entrypoint seal doesn't match. Spinning.");
285 while (1) ; 285 while (1) ;
286 } 286 }
287 cfe_init(cfe_handle, cfe_ept); 287 cfe_init(cfe_handle, cfe_ept);
@@ -303,7 +303,7 @@ void __init prom_init(void)
303 } else { 303 } else {
304 /* The loader should have set the command line */ 304 /* The loader should have set the command line */
305 /* too early for panic to do any good */ 305 /* too early for panic to do any good */
306 prom_printf("LINUX_CMDLINE not defined in cfe."); 306 printk("LINUX_CMDLINE not defined in cfe.");
307 while (1) ; 307 while (1) ;
308 } 308 }
309 } 309 }
diff --git a/arch/mips/sibyte/common/Makefile b/arch/mips/sibyte/common/Makefile
new file mode 100644
index 000000000000..8a06a4fb5212
--- /dev/null
+++ b/arch/mips/sibyte/common/Makefile
@@ -0,0 +1,5 @@
1obj-y :=
2
3obj-$(CONFIG_SIBYTE_TBPROF) += sb_tbprof.o
4
5EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/sibyte/sb1250/bcm1250_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c
index 212547c57310..4fcdaa8ba514 100644
--- a/arch/mips/sibyte/sb1250/bcm1250_tbprof.c
+++ b/arch/mips/sibyte/common/sb_tbprof.c
@@ -1,6 +1,4 @@
1/* 1/*
2 * Copyright (C) 2001, 2002, 2003 Broadcom Corporation
3 *
4 * This program is free software; you can redistribute it and/or 2 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License 3 * modify it under the terms of the GNU General Public License
6 * as published by the Free Software Foundation; either version 2 4 * as published by the Free Software Foundation; either version 2
@@ -14,10 +12,16 @@
14 * You should have received a copy of the GNU General Public License 12 * You should have received a copy of the GNU General Public License
15 * along with this program; if not, write to the Free Software 13 * along with this program; if not, write to the Free Software
16 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 14 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
15 *
16 * Copyright (C) 2001, 2002, 2003 Broadcom Corporation
17 * Copyright (C) 2007 Ralf Baechle <ralf@linux-mips.org>
18 * Copyright (C) 2007 MIPS Technologies, Inc.
19 * written by Ralf Baechle <ralf@linux-mips.org>
17 */ 20 */
18 21
19#define SBPROF_TB_DEBUG 0 22#undef DEBUG
20 23
24#include <linux/device.h>
21#include <linux/module.h> 25#include <linux/module.h>
22#include <linux/kernel.h> 26#include <linux/kernel.h>
23#include <linux/types.h> 27#include <linux/types.h>
@@ -27,24 +31,113 @@
27#include <linux/vmalloc.h> 31#include <linux/vmalloc.h>
28#include <linux/fs.h> 32#include <linux/fs.h>
29#include <linux/errno.h> 33#include <linux/errno.h>
30#include <linux/reboot.h>
31#include <linux/smp_lock.h>
32#include <linux/wait.h> 34#include <linux/wait.h>
33#include <asm/uaccess.h>
34#include <asm/io.h> 35#include <asm/io.h>
35#include <asm/sibyte/sb1250.h> 36#include <asm/sibyte/sb1250.h>
37
38#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
39#include <asm/sibyte/bcm1480_regs.h>
40#include <asm/sibyte/bcm1480_scd.h>
41#include <asm/sibyte/bcm1480_int.h>
42#elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
36#include <asm/sibyte/sb1250_regs.h> 43#include <asm/sibyte/sb1250_regs.h>
37#include <asm/sibyte/sb1250_scd.h> 44#include <asm/sibyte/sb1250_scd.h>
38#include <asm/sibyte/sb1250_int.h> 45#include <asm/sibyte/sb1250_int.h>
39#include <asm/sibyte/trace_prof.h> 46#else
47#error invalid SiByte UART configuation
48#endif
49
50#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
51#undef K_INT_TRACE_FREEZE
52#define K_INT_TRACE_FREEZE K_BCM1480_INT_TRACE_FREEZE
53#undef K_INT_PERF_CNT
54#define K_INT_PERF_CNT K_BCM1480_INT_PERF_CNT
55#endif
56
57#include <asm/system.h>
58#include <asm/uaccess.h>
40 59
41#define DEVNAME "bcm1250_tbprof" 60#define SBPROF_TB_MAJOR 240
61
62typedef u64 tb_sample_t[6*256];
63
64enum open_status {
65 SB_CLOSED,
66 SB_OPENING,
67 SB_OPEN
68};
69
70struct sbprof_tb {
71 wait_queue_head_t tb_sync;
72 wait_queue_head_t tb_read;
73 struct mutex lock;
74 enum open_status open;
75 tb_sample_t *sbprof_tbbuf;
76 int next_tb_sample;
77
78 volatile int tb_enable;
79 volatile int tb_armed;
80
81};
42 82
43static struct sbprof_tb sbp; 83static struct sbprof_tb sbp;
44 84
85#define MAX_SAMPLE_BYTES (24*1024*1024)
86#define MAX_TBSAMPLE_BYTES (12*1024*1024)
87
88#define MAX_SAMPLES (MAX_SAMPLE_BYTES/sizeof(u_int32_t))
89#define TB_SAMPLE_SIZE (sizeof(tb_sample_t))
90#define MAX_TB_SAMPLES (MAX_TBSAMPLE_BYTES/TB_SAMPLE_SIZE)
91
92/* ioctls */
93#define SBPROF_ZBSTART _IOW('s', 0, int)
94#define SBPROF_ZBSTOP _IOW('s', 1, int)
95#define SBPROF_ZBWAITFULL _IOW('s', 2, int)
96
97/*
98 * Routines for using 40-bit SCD cycle counter
99 *
100 * Client responsible for either handling interrupts or making sure
101 * the cycles counter never saturates, e.g., by doing
102 * zclk_timer_init(0) at least every 2^40 - 1 ZCLKs.
103 */
104
105/*
106 * Configures SCD counter 0 to count ZCLKs starting from val;
107 * Configures SCD counters1,2,3 to count nothing.
108 * Must not be called while gathering ZBbus profiles.
109 */
110
111#define zclk_timer_init(val) \
112 __asm__ __volatile__ (".set push;" \
113 ".set mips64;" \
114 "la $8, 0xb00204c0;" /* SCD perf_cnt_cfg */ \
115 "sd %0, 0x10($8);" /* write val to counter0 */ \
116 "sd %1, 0($8);" /* config counter0 for zclks*/ \
117 ".set pop" \
118 : /* no outputs */ \
119 /* enable, counter0 */ \
120 : /* inputs */ "r"(val), "r" ((1ULL << 33) | 1ULL) \
121 : /* modifies */ "$8" )
122
123
124/* Reads SCD counter 0 and puts result in value
125 unsigned long long val; */
126#define zclk_get(val) \
127 __asm__ __volatile__ (".set push;" \
128 ".set mips64;" \
129 "la $8, 0xb00204c0;" /* SCD perf_cnt_cfg */ \
130 "ld %0, 0x10($8);" /* write val to counter0 */ \
131 ".set pop" \
132 : /* outputs */ "=r"(val) \
133 : /* inputs */ \
134 : /* modifies */ "$8" )
135
136#define DEVNAME "sb_tbprof"
137
45#define TB_FULL (sbp.next_tb_sample == MAX_TB_SAMPLES) 138#define TB_FULL (sbp.next_tb_sample == MAX_TB_SAMPLES)
46 139
47/************************************************************************ 140/*
48 * Support for ZBbus sampling using the trace buffer 141 * Support for ZBbus sampling using the trace buffer
49 * 142 *
50 * We use the SCD performance counter interrupt, caused by a Zclk counter 143 * We use the SCD performance counter interrupt, caused by a Zclk counter
@@ -55,28 +148,46 @@ static struct sbprof_tb sbp;
55 * 148 *
56 * We map the interrupt for trace_buffer_freeze to handle it on CPU 0. 149 * We map the interrupt for trace_buffer_freeze to handle it on CPU 0.
57 * 150 *
58 ************************************************************************/ 151 */
59 152
60static u_int64_t tb_period; 153static u64 tb_period;
61 154
62static void arm_tb(void) 155static void arm_tb(void)
63{ 156{
64 u_int64_t scdperfcnt; 157 u64 scdperfcnt;
65 u_int64_t next = (1ULL << 40) - tb_period; 158 u64 next = (1ULL << 40) - tb_period;
66 u_int64_t tb_options = M_SCD_TRACE_CFG_FREEZE_FULL; 159 u64 tb_options = M_SCD_TRACE_CFG_FREEZE_FULL;
67 /* Generate an SCD_PERFCNT interrupt in TB_PERIOD Zclks to 160
68 trigger start of trace. XXX vary sampling period */ 161 /*
162 * Generate an SCD_PERFCNT interrupt in TB_PERIOD Zclks to
163 * trigger start of trace. XXX vary sampling period
164 */
69 __raw_writeq(0, IOADDR(A_SCD_PERF_CNT_1)); 165 __raw_writeq(0, IOADDR(A_SCD_PERF_CNT_1));
70 scdperfcnt = __raw_readq(IOADDR(A_SCD_PERF_CNT_CFG)); 166 scdperfcnt = __raw_readq(IOADDR(A_SCD_PERF_CNT_CFG));
71 /* Unfortunately, in Pass 2 we must clear all counters to knock down 167
72 a previous interrupt request. This means that bus profiling 168 /*
73 requires ALL of the SCD perf counters. */ 169 * Unfortunately, in Pass 2 we must clear all counters to knock down
170 * a previous interrupt request. This means that bus profiling
171 * requires ALL of the SCD perf counters.
172 */
173#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
174 __raw_writeq((scdperfcnt & ~M_SPC_CFG_SRC1) |
175 /* keep counters 0,2,3,4,5,6,7 as is */
176 V_SPC_CFG_SRC1(1), /* counter 1 counts cycles */
177 IOADDR(A_BCM1480_SCD_PERF_CNT_CFG0));
178 __raw_writeq(
179 M_SPC_CFG_ENABLE | /* enable counting */
180 M_SPC_CFG_CLEAR | /* clear all counters */
181 V_SPC_CFG_SRC1(1), /* counter 1 counts cycles */
182 IOADDR(A_BCM1480_SCD_PERF_CNT_CFG1));
183#else
74 __raw_writeq((scdperfcnt & ~M_SPC_CFG_SRC1) | 184 __raw_writeq((scdperfcnt & ~M_SPC_CFG_SRC1) |
75 // keep counters 0,2,3 as is 185 /* keep counters 0,2,3 as is */
76 M_SPC_CFG_ENABLE | // enable counting 186 M_SPC_CFG_ENABLE | /* enable counting */
77 M_SPC_CFG_CLEAR | // clear all counters 187 M_SPC_CFG_CLEAR | /* clear all counters */
78 V_SPC_CFG_SRC1(1), // counter 1 counts cycles 188 V_SPC_CFG_SRC1(1), /* counter 1 counts cycles */
79 IOADDR(A_SCD_PERF_CNT_CFG)); 189 IOADDR(A_SCD_PERF_CNT_CFG));
190#endif
80 __raw_writeq(next, IOADDR(A_SCD_PERF_CNT_1)); 191 __raw_writeq(next, IOADDR(A_SCD_PERF_CNT_1));
81 /* Reset the trace buffer */ 192 /* Reset the trace buffer */
82 __raw_writeq(M_SCD_TRACE_CFG_RESET, IOADDR(A_SCD_TRACE_CFG)); 193 __raw_writeq(M_SCD_TRACE_CFG_RESET, IOADDR(A_SCD_TRACE_CFG));
@@ -91,49 +202,51 @@ static void arm_tb(void)
91static irqreturn_t sbprof_tb_intr(int irq, void *dev_id) 202static irqreturn_t sbprof_tb_intr(int irq, void *dev_id)
92{ 203{
93 int i; 204 int i;
94 DBG(printk(DEVNAME ": tb_intr\n")); 205
206 pr_debug(DEVNAME ": tb_intr\n");
207
95 if (sbp.next_tb_sample < MAX_TB_SAMPLES) { 208 if (sbp.next_tb_sample < MAX_TB_SAMPLES) {
96 /* XXX should use XKPHYS to make writes bypass L2 */ 209 /* XXX should use XKPHYS to make writes bypass L2 */
97 u_int64_t *p = sbp.sbprof_tbbuf[sbp.next_tb_sample++]; 210 u64 *p = sbp.sbprof_tbbuf[sbp.next_tb_sample++];
98 /* Read out trace */ 211 /* Read out trace */
99 __raw_writeq(M_SCD_TRACE_CFG_START_READ, 212 __raw_writeq(M_SCD_TRACE_CFG_START_READ,
100 IOADDR(A_SCD_TRACE_CFG)); 213 IOADDR(A_SCD_TRACE_CFG));
101 __asm__ __volatile__ ("sync" : : : "memory"); 214 __asm__ __volatile__ ("sync" : : : "memory");
102 /* Loop runs backwards because bundles are read out in reverse order */ 215 /* Loop runs backwards because bundles are read out in reverse order */
103 for (i = 256 * 6; i > 0; i -= 6) { 216 for (i = 256 * 6; i > 0; i -= 6) {
104 // Subscripts decrease to put bundle in the order 217 /* Subscripts decrease to put bundle in the order */
105 // t0 lo, t0 hi, t1 lo, t1 hi, t2 lo, t2 hi 218 /* t0 lo, t0 hi, t1 lo, t1 hi, t2 lo, t2 hi */
106 p[i - 1] = __raw_readq(IOADDR(A_SCD_TRACE_READ)); 219 p[i - 1] = __raw_readq(IOADDR(A_SCD_TRACE_READ));
107 // read t2 hi 220 /* read t2 hi */
108 p[i - 2] = __raw_readq(IOADDR(A_SCD_TRACE_READ)); 221 p[i - 2] = __raw_readq(IOADDR(A_SCD_TRACE_READ));
109 // read t2 lo 222 /* read t2 lo */
110 p[i - 3] = __raw_readq(IOADDR(A_SCD_TRACE_READ)); 223 p[i - 3] = __raw_readq(IOADDR(A_SCD_TRACE_READ));
111 // read t1 hi 224 /* read t1 hi */
112 p[i - 4] = __raw_readq(IOADDR(A_SCD_TRACE_READ)); 225 p[i - 4] = __raw_readq(IOADDR(A_SCD_TRACE_READ));
113 // read t1 lo 226 /* read t1 lo */
114 p[i - 5] = __raw_readq(IOADDR(A_SCD_TRACE_READ)); 227 p[i - 5] = __raw_readq(IOADDR(A_SCD_TRACE_READ));
115 // read t0 hi 228 /* read t0 hi */
116 p[i - 6] = __raw_readq(IOADDR(A_SCD_TRACE_READ)); 229 p[i - 6] = __raw_readq(IOADDR(A_SCD_TRACE_READ));
117 // read t0 lo 230 /* read t0 lo */
118 } 231 }
119 if (!sbp.tb_enable) { 232 if (!sbp.tb_enable) {
120 DBG(printk(DEVNAME ": tb_intr shutdown\n")); 233 pr_debug(DEVNAME ": tb_intr shutdown\n");
121 __raw_writeq(M_SCD_TRACE_CFG_RESET, 234 __raw_writeq(M_SCD_TRACE_CFG_RESET,
122 IOADDR(A_SCD_TRACE_CFG)); 235 IOADDR(A_SCD_TRACE_CFG));
123 sbp.tb_armed = 0; 236 sbp.tb_armed = 0;
124 wake_up(&sbp.tb_sync); 237 wake_up_interruptible(&sbp.tb_sync);
125 } else { 238 } else {
126 arm_tb(); // knock down current interrupt and get another one later 239 /* knock down current interrupt and get another one later */
240 arm_tb();
127 } 241 }
128 } else { 242 } else {
129 /* No more trace buffer samples */ 243 /* No more trace buffer samples */
130 DBG(printk(DEVNAME ": tb_intr full\n")); 244 pr_debug(DEVNAME ": tb_intr full\n");
131 __raw_writeq(M_SCD_TRACE_CFG_RESET, IOADDR(A_SCD_TRACE_CFG)); 245 __raw_writeq(M_SCD_TRACE_CFG_RESET, IOADDR(A_SCD_TRACE_CFG));
132 sbp.tb_armed = 0; 246 sbp.tb_armed = 0;
133 if (!sbp.tb_enable) { 247 if (!sbp.tb_enable)
134 wake_up(&sbp.tb_sync); 248 wake_up_interruptible(&sbp.tb_sync);
135 } 249 wake_up_interruptible(&sbp.tb_read);
136 wake_up(&sbp.tb_read);
137 } 250 }
138 return IRQ_HANDLED; 251 return IRQ_HANDLED;
139} 252}
@@ -144,23 +257,30 @@ static irqreturn_t sbprof_pc_intr(int irq, void *dev_id)
144 return IRQ_NONE; 257 return IRQ_NONE;
145} 258}
146 259
147int sbprof_zbprof_start(struct file *filp) 260/*
261 * Requires: Already called zclk_timer_init with a value that won't
262 * saturate 40 bits. No subsequent use of SCD performance counters
263 * or trace buffer.
264 */
265
266static int sbprof_zbprof_start(struct file *filp)
148{ 267{
149 u_int64_t scdperfcnt; 268 u64 scdperfcnt;
269 int err;
150 270
151 if (sbp.tb_enable) 271 if (xchg(&sbp.tb_enable, 1))
152 return -EBUSY; 272 return -EBUSY;
153 273
154 DBG(printk(DEVNAME ": starting\n")); 274 pr_debug(DEVNAME ": starting\n");
155 275
156 sbp.tb_enable = 1;
157 sbp.next_tb_sample = 0; 276 sbp.next_tb_sample = 0;
158 filp->f_pos = 0; 277 filp->f_pos = 0;
159 278
160 if (request_irq 279 err = request_irq (K_INT_TRACE_FREEZE, sbprof_tb_intr, 0,
161 (K_INT_TRACE_FREEZE, sbprof_tb_intr, 0, DEVNAME " trace freeze", &sbp)) { 280 DEVNAME " trace freeze", &sbp);
281 if (err)
162 return -EBUSY; 282 return -EBUSY;
163 } 283
164 /* Make sure there isn't a perf-cnt interrupt waiting */ 284 /* Make sure there isn't a perf-cnt interrupt waiting */
165 scdperfcnt = __raw_readq(IOADDR(A_SCD_PERF_CNT_CFG)); 285 scdperfcnt = __raw_readq(IOADDR(A_SCD_PERF_CNT_CFG));
166 /* Disable and clear counters, override SRC_1 */ 286 /* Disable and clear counters, override SRC_1 */
@@ -168,21 +288,30 @@ int sbprof_zbprof_start(struct file *filp)
168 M_SPC_CFG_ENABLE | M_SPC_CFG_CLEAR | V_SPC_CFG_SRC1(1), 288 M_SPC_CFG_ENABLE | M_SPC_CFG_CLEAR | V_SPC_CFG_SRC1(1),
169 IOADDR(A_SCD_PERF_CNT_CFG)); 289 IOADDR(A_SCD_PERF_CNT_CFG));
170 290
171 /* We grab this interrupt to prevent others from trying to use 291 /*
172 it, even though we don't want to service the interrupts 292 * We grab this interrupt to prevent others from trying to use
173 (they only feed into the trace-on-interrupt mechanism) */ 293 * it, even though we don't want to service the interrupts
174 if (request_irq 294 * (they only feed into the trace-on-interrupt mechanism)
175 (K_INT_PERF_CNT, sbprof_pc_intr, 0, DEVNAME " scd perfcnt", &sbp)) { 295 */
296 if (request_irq(K_INT_PERF_CNT, sbprof_pc_intr, 0, DEVNAME " scd perfcnt", &sbp)) {
176 free_irq(K_INT_TRACE_FREEZE, &sbp); 297 free_irq(K_INT_TRACE_FREEZE, &sbp);
177 return -EBUSY; 298 return -EBUSY;
178 } 299 }
179 300
180 /* I need the core to mask these, but the interrupt mapper to 301 /*
181 pass them through. I am exploiting my knowledge that 302 * I need the core to mask these, but the interrupt mapper to
182 cp0_status masks out IP[5]. krw */ 303 * pass them through. I am exploiting my knowledge that
304 * cp0_status masks out IP[5]. krw
305 */
306#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
307 __raw_writeq(K_BCM1480_INT_MAP_I3,
308 IOADDR(A_BCM1480_IMR_REGISTER(0, R_BCM1480_IMR_INTERRUPT_MAP_BASE_L) +
309 ((K_BCM1480_INT_PERF_CNT & 0x3f) << 3)));
310#else
183 __raw_writeq(K_INT_MAP_I3, 311 __raw_writeq(K_INT_MAP_I3,
184 IOADDR(A_IMR_REGISTER(0, R_IMR_INTERRUPT_MAP_BASE) + 312 IOADDR(A_IMR_REGISTER(0, R_IMR_INTERRUPT_MAP_BASE) +
185 (K_INT_PERF_CNT << 3))); 313 (K_INT_PERF_CNT << 3)));
314#endif
186 315
187 /* Initialize address traps */ 316 /* Initialize address traps */
188 __raw_writeq(0, IOADDR(A_ADDR_TRAP_UP_0)); 317 __raw_writeq(0, IOADDR(A_ADDR_TRAP_UP_0));
@@ -201,7 +330,7 @@ int sbprof_zbprof_start(struct file *filp)
201 __raw_writeq(0, IOADDR(A_ADDR_TRAP_CFG_3)); 330 __raw_writeq(0, IOADDR(A_ADDR_TRAP_CFG_3));
202 331
203 /* Initialize Trace Event 0-7 */ 332 /* Initialize Trace Event 0-7 */
204 // when interrupt 333 /* when interrupt */
205 __raw_writeq(M_SCD_TREVT_INTERRUPT, IOADDR(A_SCD_TRACE_EVENT_0)); 334 __raw_writeq(M_SCD_TREVT_INTERRUPT, IOADDR(A_SCD_TRACE_EVENT_0));
206 __raw_writeq(0, IOADDR(A_SCD_TRACE_EVENT_1)); 335 __raw_writeq(0, IOADDR(A_SCD_TRACE_EVENT_1));
207 __raw_writeq(0, IOADDR(A_SCD_TRACE_EVENT_2)); 336 __raw_writeq(0, IOADDR(A_SCD_TRACE_EVENT_2));
@@ -212,10 +341,10 @@ int sbprof_zbprof_start(struct file *filp)
212 __raw_writeq(0, IOADDR(A_SCD_TRACE_EVENT_7)); 341 __raw_writeq(0, IOADDR(A_SCD_TRACE_EVENT_7));
213 342
214 /* Initialize Trace Sequence 0-7 */ 343 /* Initialize Trace Sequence 0-7 */
215 // Start on event 0 (interrupt) 344 /* Start on event 0 (interrupt) */
216 __raw_writeq(V_SCD_TRSEQ_FUNC_START | 0x0fff, 345 __raw_writeq(V_SCD_TRSEQ_FUNC_START | 0x0fff,
217 IOADDR(A_SCD_TRACE_SEQUENCE_0)); 346 IOADDR(A_SCD_TRACE_SEQUENCE_0));
218 // dsamp when d used | asamp when a used 347 /* dsamp when d used | asamp when a used */
219 __raw_writeq(M_SCD_TRSEQ_ASAMPLE | M_SCD_TRSEQ_DSAMPLE | 348 __raw_writeq(M_SCD_TRSEQ_ASAMPLE | M_SCD_TRSEQ_DSAMPLE |
220 K_SCD_TRSEQ_TRIGGER_ALL, 349 K_SCD_TRSEQ_TRIGGER_ALL,
221 IOADDR(A_SCD_TRACE_SEQUENCE_1)); 350 IOADDR(A_SCD_TRACE_SEQUENCE_1));
@@ -227,40 +356,47 @@ int sbprof_zbprof_start(struct file *filp)
227 __raw_writeq(0, IOADDR(A_SCD_TRACE_SEQUENCE_7)); 356 __raw_writeq(0, IOADDR(A_SCD_TRACE_SEQUENCE_7));
228 357
229 /* Now indicate the PERF_CNT interrupt as a trace-relevant interrupt */ 358 /* Now indicate the PERF_CNT interrupt as a trace-relevant interrupt */
359#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
360 __raw_writeq(1ULL << (K_BCM1480_INT_PERF_CNT & 0x3f),
361 IOADDR(A_BCM1480_IMR_REGISTER(0, R_BCM1480_IMR_INTERRUPT_TRACE_L)));
362#else
230 __raw_writeq(1ULL << K_INT_PERF_CNT, 363 __raw_writeq(1ULL << K_INT_PERF_CNT,
231 IOADDR(A_IMR_REGISTER(0, R_IMR_INTERRUPT_TRACE))); 364 IOADDR(A_IMR_REGISTER(0, R_IMR_INTERRUPT_TRACE)));
232 365#endif
233 arm_tb(); 366 arm_tb();
234 367
235 DBG(printk(DEVNAME ": done starting\n")); 368 pr_debug(DEVNAME ": done starting\n");
236 369
237 return 0; 370 return 0;
238} 371}
239 372
240int sbprof_zbprof_stop(void) 373static int sbprof_zbprof_stop(void)
241{ 374{
242 DEFINE_WAIT(wait); 375 int err = 0;
243 DBG(printk(DEVNAME ": stopping\n")); 376
377 pr_debug(DEVNAME ": stopping\n");
244 378
245 if (sbp.tb_enable) { 379 if (sbp.tb_enable) {
380 /*
381 * XXXKW there is a window here where the intr handler may run,
382 * see the disable, and do the wake_up before this sleep
383 * happens.
384 */
385 pr_debug(DEVNAME ": wait for disarm\n");
386 err = wait_event_interruptible(sbp.tb_sync, !sbp.tb_armed);
387 pr_debug(DEVNAME ": disarm complete, stat %d\n", err);
388
389 if (err)
390 return err;
391
246 sbp.tb_enable = 0; 392 sbp.tb_enable = 0;
247 /* XXXKW there is a window here where the intr handler
248 may run, see the disable, and do the wake_up before
249 this sleep happens. */
250 if (sbp.tb_armed) {
251 DBG(printk(DEVNAME ": wait for disarm\n"));
252 prepare_to_wait(&sbp.tb_sync, &wait, TASK_INTERRUPTIBLE);
253 schedule();
254 finish_wait(&sbp.tb_sync, &wait);
255 DBG(printk(DEVNAME ": disarm complete\n"));
256 }
257 free_irq(K_INT_TRACE_FREEZE, &sbp); 393 free_irq(K_INT_TRACE_FREEZE, &sbp);
258 free_irq(K_INT_PERF_CNT, &sbp); 394 free_irq(K_INT_PERF_CNT, &sbp);
259 } 395 }
260 396
261 DBG(printk(DEVNAME ": done stopping\n")); 397 pr_debug(DEVNAME ": done stopping\n");
262 398
263 return 0; 399 return err;
264} 400}
265 401
266static int sbprof_tb_open(struct inode *inode, struct file *filp) 402static int sbprof_tb_open(struct inode *inode, struct file *filp)
@@ -268,22 +404,22 @@ static int sbprof_tb_open(struct inode *inode, struct file *filp)
268 int minor; 404 int minor;
269 405
270 minor = iminor(inode); 406 minor = iminor(inode);
271 if (minor != 0) { 407 if (minor != 0)
272 return -ENODEV; 408 return -ENODEV;
273 } 409
274 if (sbp.open) { 410 if (xchg(&sbp.open, SB_OPENING) != SB_CLOSED)
275 return -EBUSY; 411 return -EBUSY;
276 }
277 412
278 memset(&sbp, 0, sizeof(struct sbprof_tb)); 413 memset(&sbp, 0, sizeof(struct sbprof_tb));
279 sbp.sbprof_tbbuf = vmalloc(MAX_TBSAMPLE_BYTES); 414 sbp.sbprof_tbbuf = vmalloc(MAX_TBSAMPLE_BYTES);
280 if (!sbp.sbprof_tbbuf) { 415 if (!sbp.sbprof_tbbuf)
281 return -ENOMEM; 416 return -ENOMEM;
282 }
283 memset(sbp.sbprof_tbbuf, 0, MAX_TBSAMPLE_BYTES); 417 memset(sbp.sbprof_tbbuf, 0, MAX_TBSAMPLE_BYTES);
284 init_waitqueue_head(&sbp.tb_sync); 418 init_waitqueue_head(&sbp.tb_sync);
285 init_waitqueue_head(&sbp.tb_read); 419 init_waitqueue_head(&sbp.tb_read);
286 sbp.open = 1; 420 mutex_init(&sbp.lock);
421
422 sbp.open = SB_OPEN;
287 423
288 return 0; 424 return 0;
289} 425}
@@ -293,17 +429,19 @@ static int sbprof_tb_release(struct inode *inode, struct file *filp)
293 int minor; 429 int minor;
294 430
295 minor = iminor(inode); 431 minor = iminor(inode);
296 if (minor != 0 || !sbp.open) { 432 if (minor != 0 || !sbp.open)
297 return -ENODEV; 433 return -ENODEV;
298 }
299 434
300 if (sbp.tb_armed || sbp.tb_enable) { 435 mutex_lock(&sbp.lock);
436
437 if (sbp.tb_armed || sbp.tb_enable)
301 sbprof_zbprof_stop(); 438 sbprof_zbprof_stop();
302 }
303 439
304 vfree(sbp.sbprof_tbbuf); 440 vfree(sbp.sbprof_tbbuf);
305 sbp.open = 0; 441 sbp.open = 0;
306 442
443 mutex_unlock(&sbp.lock);
444
307 return 0; 445 return 0;
308} 446}
309 447
@@ -316,16 +454,29 @@ static ssize_t sbprof_tb_read(struct file *filp, char *buf,
316 char *dest = buf; 454 char *dest = buf;
317 long cur_off = *offp; 455 long cur_off = *offp;
318 456
457 if (!access_ok(VERIFY_WRITE, buf, size))
458 return -EFAULT;
459
460 mutex_lock(&sbp.lock);
461
319 count = 0; 462 count = 0;
320 cur_sample = cur_off / TB_SAMPLE_SIZE; 463 cur_sample = cur_off / TB_SAMPLE_SIZE;
321 sample_off = cur_off % TB_SAMPLE_SIZE; 464 sample_off = cur_off % TB_SAMPLE_SIZE;
322 sample_left = TB_SAMPLE_SIZE - sample_off; 465 sample_left = TB_SAMPLE_SIZE - sample_off;
466
323 while (size && (cur_sample < sbp.next_tb_sample)) { 467 while (size && (cur_sample < sbp.next_tb_sample)) {
468 int err;
469
324 cur_count = size < sample_left ? size : sample_left; 470 cur_count = size < sample_left ? size : sample_left;
325 src = (char *)(((long)sbp.sbprof_tbbuf[cur_sample])+sample_off); 471 src = (char *)(((long)sbp.sbprof_tbbuf[cur_sample])+sample_off);
326 copy_to_user(dest, src, cur_count); 472 err = __copy_to_user(dest, src, cur_count);
327 DBG(printk(DEVNAME ": read from sample %d, %d bytes\n", 473 if (err) {
328 cur_sample, cur_count)); 474 *offp = cur_off + cur_count - err;
475 mutex_unlock(&sbp.lock);
476 return err;
477 }
478 pr_debug(DEVNAME ": read from sample %d, %d bytes\n",
479 cur_sample, cur_count);
329 size -= cur_count; 480 size -= cur_count;
330 sample_left -= cur_count; 481 sample_left -= cur_count;
331 if (!sample_left) { 482 if (!sample_left) {
@@ -340,6 +491,7 @@ static ssize_t sbprof_tb_read(struct file *filp, char *buf,
340 count += cur_count; 491 count += cur_count;
341 } 492 }
342 *offp = cur_off; 493 *offp = cur_off;
494 mutex_unlock(&sbp.lock);
343 495
344 return count; 496 return count;
345} 497}
@@ -348,30 +500,36 @@ static long sbprof_tb_ioctl(struct file *filp,
348 unsigned int command, 500 unsigned int command,
349 unsigned long arg) 501 unsigned long arg)
350{ 502{
351 int error = 0; 503 int err = 0;
352 504
353 lock_kernel();
354 switch (command) { 505 switch (command) {
355 case SBPROF_ZBSTART: 506 case SBPROF_ZBSTART:
356 error = sbprof_zbprof_start(filp); 507 mutex_lock(&sbp.lock);
508 err = sbprof_zbprof_start(filp);
509 mutex_unlock(&sbp.lock);
357 break; 510 break;
511
358 case SBPROF_ZBSTOP: 512 case SBPROF_ZBSTOP:
359 error = sbprof_zbprof_stop(); 513 mutex_lock(&sbp.lock);
514 err = sbprof_zbprof_stop();
515 mutex_unlock(&sbp.lock);
516 break;
517
518 case SBPROF_ZBWAITFULL: {
519 err = wait_event_interruptible(sbp.tb_read, TB_FULL);
520 if (err)
521 break;
522
523 err = put_user(TB_FULL, (int *) arg);
360 break; 524 break;
361 case SBPROF_ZBWAITFULL: 525 }
362 DEFINE_WAIT(wait); 526
363 prepare_to_wait(&sbp.tb_read, &wait, TASK_INTERRUPTIBLE);
364 schedule();
365 finish_wait(&sbp.tb_read, &wait);
366 /* XXXKW check if interrupted? */
367 return put_user(TB_FULL, (int *) arg);
368 default: 527 default:
369 error = -EINVAL; 528 err = -EINVAL;
370 break; 529 break;
371 } 530 }
372 unlock_kernel();
373 531
374 return error; 532 return err;
375} 533}
376 534
377static const struct file_operations sbprof_tb_fops = { 535static const struct file_operations sbprof_tb_fops = {
@@ -384,23 +542,60 @@ static const struct file_operations sbprof_tb_fops = {
384 .mmap = NULL, 542 .mmap = NULL,
385}; 543};
386 544
545static struct class *tb_class;
546static struct device *tb_dev;
547
387static int __init sbprof_tb_init(void) 548static int __init sbprof_tb_init(void)
388{ 549{
550 struct device *dev;
551 struct class *tbc;
552 int err;
553
389 if (register_chrdev(SBPROF_TB_MAJOR, DEVNAME, &sbprof_tb_fops)) { 554 if (register_chrdev(SBPROF_TB_MAJOR, DEVNAME, &sbprof_tb_fops)) {
390 printk(KERN_WARNING DEVNAME ": initialization failed (dev %d)\n", 555 printk(KERN_WARNING DEVNAME ": initialization failed (dev %d)\n",
391 SBPROF_TB_MAJOR); 556 SBPROF_TB_MAJOR);
392 return -EIO; 557 return -EIO;
393 } 558 }
559
560 tbc = class_create(THIS_MODULE, "sb_tracebuffer");
561 if (IS_ERR(tbc)) {
562 err = PTR_ERR(tbc);
563 goto out_chrdev;
564 }
565
566 tb_class = tbc;
567
568 dev = device_create(tbc, NULL, MKDEV(SBPROF_TB_MAJOR, 0), "tb");
569 if (IS_ERR(dev)) {
570 err = PTR_ERR(dev);
571 goto out_class;
572 }
573 tb_dev = dev;
574
394 sbp.open = 0; 575 sbp.open = 0;
395 tb_period = zbbus_mhz * 10000LL; 576 tb_period = zbbus_mhz * 10000LL;
396 printk(KERN_INFO DEVNAME ": initialized - tb_period = %lld\n", tb_period); 577 pr_info(DEVNAME ": initialized - tb_period = %lld\n",
578 (long long) tb_period);
397 return 0; 579 return 0;
580
581out_class:
582 class_destroy(tb_class);
583out_chrdev:
584 unregister_chrdev(SBPROF_TB_MAJOR, DEVNAME);
585
586 return err;
398} 587}
399 588
400static void __exit sbprof_tb_cleanup(void) 589static void __exit sbprof_tb_cleanup(void)
401{ 590{
591 device_destroy(tb_class, MKDEV(SBPROF_TB_MAJOR, 0));
402 unregister_chrdev(SBPROF_TB_MAJOR, DEVNAME); 592 unregister_chrdev(SBPROF_TB_MAJOR, DEVNAME);
593 class_destroy(tb_class);
403} 594}
404 595
405module_init(sbprof_tb_init); 596module_init(sbprof_tb_init);
406module_exit(sbprof_tb_cleanup); 597module_exit(sbprof_tb_cleanup);
598
599MODULE_ALIAS_CHARDEV_MAJOR(SBPROF_TB_MAJOR);
600MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
601MODULE_LICENSE("GPL");
diff --git a/arch/mips/sibyte/sb1250/Makefile b/arch/mips/sibyte/sb1250/Makefile
index a2fdbd62f8ac..df662c61473a 100644
--- a/arch/mips/sibyte/sb1250/Makefile
+++ b/arch/mips/sibyte/sb1250/Makefile
@@ -1,8 +1,5 @@
1obj-y := setup.o irq.o time.o 1obj-y := setup.o irq.o time.o
2 2
3obj-$(CONFIG_SMP) += smp.o 3obj-$(CONFIG_SMP) += smp.o
4obj-$(CONFIG_SIBYTE_TBPROF) += bcm1250_tbprof.o
5obj-$(CONFIG_SIBYTE_STANDALONE) += prom.o 4obj-$(CONFIG_SIBYTE_STANDALONE) += prom.o
6obj-$(CONFIG_SIBYTE_BUS_WATCHER) += bus_watcher.o 5obj-$(CONFIG_SIBYTE_BUS_WATCHER) += bus_watcher.o
7
8EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 148239446e6e..0e6a13c0bd0e 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -421,7 +421,7 @@ asmlinkage void plat_irq_dispatch(void)
421 * blasting the high 32 bits. 421 * blasting the high 32 bits.
422 */ 422 */
423 423
424 pending = read_c0_cause() & read_c0_status(); 424 pending = read_c0_cause() & read_c0_status() & ST0_IM;
425 425
426#ifdef CONFIG_SIBYTE_SB1250_PROF 426#ifdef CONFIG_SIBYTE_SB1250_PROF
427 if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */ 427 if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */
diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c
index d0ee1d5b8223..f4a6169aa0a4 100644
--- a/arch/mips/sibyte/sb1250/setup.c
+++ b/arch/mips/sibyte/sb1250/setup.c
@@ -16,6 +16,7 @@
16 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 16 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
17 */ 17 */
18#include <linux/init.h> 18#include <linux/init.h>
19#include <linux/module.h>
19#include <linux/kernel.h> 20#include <linux/kernel.h>
20#include <linux/reboot.h> 21#include <linux/reboot.h>
21#include <linux/string.h> 22#include <linux/string.h>
@@ -32,6 +33,7 @@ unsigned int soc_pass;
32unsigned int soc_type; 33unsigned int soc_type;
33unsigned int periph_rev; 34unsigned int periph_rev;
34unsigned int zbbus_mhz; 35unsigned int zbbus_mhz;
36EXPORT_SYMBOL(zbbus_mhz);
35 37
36static char *soc_str; 38static char *soc_str;
37static char *pass_str; 39static char *pass_str;
@@ -67,7 +69,7 @@ static int __init sys_rev_decode(void)
67 ret = setup_bcm112x(); 69 ret = setup_bcm112x();
68 break; 70 break;
69 default: 71 default:
70 prom_printf("Unknown SOC type %x\n", soc_type); 72 printk("Unknown SOC type %x\n", soc_type);
71 ret = 1; 73 ret = 1;
72 break; 74 break;
73 } 75 }
@@ -112,7 +114,7 @@ static int __init setup_bcm1250(void)
112 pass_str = "A0-A6"; 114 pass_str = "A0-A6";
113 war_pass = K_SYS_REVISION_BCM1250_PASS2; 115 war_pass = K_SYS_REVISION_BCM1250_PASS2;
114 } else { 116 } else {
115 prom_printf("Unknown BCM1250 rev %x\n", soc_pass); 117 printk("Unknown BCM1250 rev %x\n", soc_pass);
116 ret = 1; 118 ret = 1;
117 } 119 }
118 break; 120 break;
@@ -139,8 +141,20 @@ static int __init setup_bcm112x(void)
139 periph_rev = 3; 141 periph_rev = 3;
140 pass_str = "A2"; 142 pass_str = "A2";
141 break; 143 break;
144 case K_SYS_REVISION_BCM112x_A3:
145 periph_rev = 3;
146 pass_str = "A3";
147 break;
148 case K_SYS_REVISION_BCM112x_A4:
149 periph_rev = 3;
150 pass_str = "A4";
151 break;
152 case K_SYS_REVISION_BCM112x_B0:
153 periph_rev = 3;
154 pass_str = "B0";
155 break;
142 default: 156 default:
143 prom_printf("Unknown %s rev %x\n", soc_str, soc_pass); 157 printk("Unknown %s rev %x\n", soc_str, soc_pass);
144 ret = 1; 158 ret = 1;
145 } 159 }
146 return ret; 160 return ret;
@@ -158,21 +172,21 @@ void __init sb1250_setup(void)
158 soc_pass = G_SYS_REVISION(sys_rev); 172 soc_pass = G_SYS_REVISION(sys_rev);
159 173
160 if (sys_rev_decode()) { 174 if (sys_rev_decode()) {
161 prom_printf("Restart after failure to identify SiByte chip\n"); 175 printk("Restart after failure to identify SiByte chip\n");
162 machine_restart(NULL); 176 machine_restart(NULL);
163 } 177 }
164 178
165 plldiv = G_SYS_PLL_DIV(__raw_readq(IOADDR(A_SCD_SYSTEM_CFG))); 179 plldiv = G_SYS_PLL_DIV(__raw_readq(IOADDR(A_SCD_SYSTEM_CFG)));
166 zbbus_mhz = ((plldiv >> 1) * 50) + ((plldiv & 1) * 25); 180 zbbus_mhz = ((plldiv >> 1) * 50) + ((plldiv & 1) * 25);
167 181
168 prom_printf("Broadcom SiByte %s %s @ %d MHz (SB1 rev %d)\n", 182 printk("Broadcom SiByte %s %s @ %d MHz (SB1 rev %d)\n",
169 soc_str, pass_str, zbbus_mhz * 2, sb1_pass); 183 soc_str, pass_str, zbbus_mhz * 2, sb1_pass);
170 prom_printf("Board type: %s\n", get_system_type()); 184 printk("Board type: %s\n", get_system_type());
171 185
172 switch (war_pass) { 186 switch (war_pass) {
173 case K_SYS_REVISION_BCM1250_PASS1: 187 case K_SYS_REVISION_BCM1250_PASS1:
174#ifndef CONFIG_SB1_PASS_1_WORKAROUNDS 188#ifndef CONFIG_SB1_PASS_1_WORKAROUNDS
175 prom_printf("@@@@ This is a BCM1250 A0-A2 (Pass 1) board, " 189 printk("@@@@ This is a BCM1250 A0-A2 (Pass 1) board, "
176 "and the kernel doesn't have the proper " 190 "and the kernel doesn't have the proper "
177 "workarounds compiled in. @@@@\n"); 191 "workarounds compiled in. @@@@\n");
178 bad_config = 1; 192 bad_config = 1;
@@ -182,27 +196,27 @@ void __init sb1250_setup(void)
182 /* Pass 2 - easiest as default for now - so many numbers */ 196 /* Pass 2 - easiest as default for now - so many numbers */
183#if !defined(CONFIG_SB1_PASS_2_WORKAROUNDS) || \ 197#if !defined(CONFIG_SB1_PASS_2_WORKAROUNDS) || \
184 !defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) 198 !defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS)
185 prom_printf("@@@@ This is a BCM1250 A3-A10 board, and the " 199 printk("@@@@ This is a BCM1250 A3-A10 board, and the "
186 "kernel doesn't have the proper workarounds " 200 "kernel doesn't have the proper workarounds "
187 "compiled in. @@@@\n"); 201 "compiled in. @@@@\n");
188 bad_config = 1; 202 bad_config = 1;
189#endif 203#endif
190#ifdef CONFIG_CPU_HAS_PREFETCH 204#ifdef CONFIG_CPU_HAS_PREFETCH
191 prom_printf("@@@@ Prefetches may be enabled in this kernel, " 205 printk("@@@@ Prefetches may be enabled in this kernel, "
192 "but are buggy on this board. @@@@\n"); 206 "but are buggy on this board. @@@@\n");
193 bad_config = 1; 207 bad_config = 1;
194#endif 208#endif
195 break; 209 break;
196 case K_SYS_REVISION_BCM1250_PASS2_2: 210 case K_SYS_REVISION_BCM1250_PASS2_2:
197#ifndef CONFIG_SB1_PASS_2_WORKAROUNDS 211#ifndef CONFIG_SB1_PASS_2_WORKAROUNDS
198 prom_printf("@@@@ This is a BCM1250 B1/B2. board, and the " 212 printk("@@@@ This is a BCM1250 B1/B2. board, and the "
199 "kernel doesn't have the proper workarounds " 213 "kernel doesn't have the proper workarounds "
200 "compiled in. @@@@\n"); 214 "compiled in. @@@@\n");
201 bad_config = 1; 215 bad_config = 1;
202#endif 216#endif
203#if defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) || \ 217#if defined(CONFIG_SB1_PASS_2_1_WORKAROUNDS) || \
204 !defined(CONFIG_CPU_HAS_PREFETCH) 218 !defined(CONFIG_CPU_HAS_PREFETCH)
205 prom_printf("@@@@ This is a BCM1250 B1/B2, but the kernel is " 219 printk("@@@@ This is a BCM1250 B1/B2, but the kernel is "
206 "conservatively configured for an 'A' stepping. " 220 "conservatively configured for an 'A' stepping. "
207 "@@@@\n"); 221 "@@@@\n");
208#endif 222#endif
@@ -211,7 +225,7 @@ void __init sb1250_setup(void)
211 break; 225 break;
212 } 226 }
213 if (bad_config) { 227 if (bad_config) {
214 prom_printf("Invalid configuration for this chip.\n"); 228 printk("Invalid configuration for this chip.\n");
215 machine_restart(NULL); 229 machine_restart(NULL);
216 } 230 }
217} 231}
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index defa1f1452ad..83572d8f3e14 100644
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -169,17 +169,19 @@ void __init plat_mem_setup(void)
169#define LEDS_PHYS MLEDS_PHYS 169#define LEDS_PHYS MLEDS_PHYS
170#endif 170#endif
171 171
172#define setled(index, c) \
173 ((unsigned char *)(IOADDR(LEDS_PHYS)+0x20))[(3-(index))<<3] = (c)
174void setleds(char *str) 172void setleds(char *str)
175{ 173{
174 void *reg;
176 int i; 175 int i;
176
177 for (i = 0; i < 4; i++) { 177 for (i = 0; i < 4; i++) {
178 if (!str[i]) { 178 reg = IOADDR(LEDS_PHYS) + 0x20 + ((3 - i) << 3);
179 setled(i, ' '); 179
180 } else { 180 if (!str[i])
181 setled(i, str[i]); 181 writeb(' ', reg);
182 } 182 else
183 writeb(str[i], reg);
183 } 184 }
184} 185}
185#endif 186
187#endif /* LEDS_PHYS */
diff --git a/arch/mips/sni/Makefile b/arch/mips/sni/Makefile
index a5eb0adb87c7..e5777b7e2bc9 100644
--- a/arch/mips/sni/Makefile
+++ b/arch/mips/sni/Makefile
@@ -2,7 +2,5 @@
2# Makefile for the SNI specific part of the kernel 2# Makefile for the SNI specific part of the kernel
3# 3#
4 4
5obj-y += irq.o pcimt_scache.o reset.o setup.o 5obj-y += irq.o reset.o setup.o ds1216.o a20r.o rm200.o pcimt.o pcit.o time.o
6obj-$(CONFIG_CPU_BIG_ENDIAN) += sniprom.o 6obj-$(CONFIG_CPU_BIG_ENDIAN) += sniprom.o
7
8EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
new file mode 100644
index 000000000000..31ab80f1befa
--- /dev/null
+++ b/arch/mips/sni/a20r.c
@@ -0,0 +1,227 @@
1/*
2 * A20R specific code
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */
10
11#include <linux/init.h>
12#include <linux/interrupt.h>
13#include <linux/platform_device.h>
14#include <linux/serial_8250.h>
15
16#include <asm/sni.h>
17#include <asm/time.h>
18#include <asm/ds1216.h>
19
20#define PORT(_base,_irq) \
21 { \
22 .iobase = _base, \
23 .irq = _irq, \
24 .uartclk = 1843200, \
25 .iotype = UPIO_PORT, \
26 .flags = UPF_BOOT_AUTOCONF, \
27 }
28
29static struct plat_serial8250_port a20r_data[] = {
30 PORT(0x3f8, 4),
31 PORT(0x2f8, 3),
32 { },
33};
34
35static struct platform_device a20r_serial8250_device = {
36 .name = "serial8250",
37 .id = PLAT8250_DEV_PLATFORM,
38 .dev = {
39 .platform_data = a20r_data,
40 },
41};
42
43static struct resource snirm_82596_rsrc[] = {
44 {
45 .start = 0xb8000000,
46 .end = 0xb8000004,
47 .flags = IORESOURCE_MEM
48 },
49 {
50 .start = 0xb8010000,
51 .end = 0xb8010004,
52 .flags = IORESOURCE_MEM
53 },
54 {
55 .start = 0xbff00000,
56 .end = 0xbff00020,
57 .flags = IORESOURCE_MEM
58 },
59 {
60 .start = 22,
61 .end = 22,
62 .flags = IORESOURCE_IRQ
63 },
64 {
65 .flags = 0x01 /* 16bit mpu port access */
66 }
67};
68
69static struct platform_device snirm_82596_pdev = {
70 .name = "snirm_82596",
71 .num_resources = ARRAY_SIZE(snirm_82596_rsrc),
72 .resource = snirm_82596_rsrc
73};
74
75static struct resource snirm_53c710_rsrc[] = {
76 {
77 .start = 0xb9000000,
78 .end = 0xb90fffff,
79 .flags = IORESOURCE_MEM
80 },
81 {
82 .start = 19,
83 .end = 19,
84 .flags = IORESOURCE_IRQ
85 }
86};
87
88static struct platform_device snirm_53c710_pdev = {
89 .name = "snirm_53c710",
90 .num_resources = ARRAY_SIZE(snirm_53c710_rsrc),
91 .resource = snirm_53c710_rsrc
92};
93
94static struct resource sc26xx_rsrc[] = {
95 {
96 .start = 0xbc070000,
97 .end = 0xbc0700ff,
98 .flags = IORESOURCE_MEM
99 },
100 {
101 .start = 20,
102 .end = 20,
103 .flags = IORESOURCE_IRQ
104 }
105};
106
107static struct platform_device sc26xx_pdev = {
108 .name = "SC26xx",
109 .num_resources = ARRAY_SIZE(sc26xx_rsrc),
110 .resource = sc26xx_rsrc
111};
112
113static u32 a20r_ack_hwint(void)
114{
115 u32 status = read_c0_status();
116
117 write_c0_status (status | 0x00010000);
118 asm volatile(
119 " .set push \n"
120 " .set noat \n"
121 " .set noreorder \n"
122 " lw $1, 0(%0) \n"
123 " sb $0, 0(%1) \n"
124 " sync \n"
125 " lb %1, 0(%1) \n"
126 " b 1f \n"
127 " ori %1, $1, 2 \n"
128 " .align 8 \n"
129 "1: \n"
130 " nop \n"
131 " sw %1, 0(%0) \n"
132 " sync \n"
133 " li %1, 0x20 \n"
134 "2: \n"
135 " nop \n"
136 " bnez %1,2b \n"
137 " addiu %1, -1 \n"
138 " sw $1, 0(%0) \n"
139 " sync \n"
140 ".set pop \n"
141 :
142 : "Jr" (PCIMT_UCONF), "Jr" (0xbc000000));
143 write_c0_status(status);
144
145 return status;
146}
147
148static inline void unmask_a20r_irq(unsigned int irq)
149{
150 set_c0_status(0x100 << (irq - SNI_A20R_IRQ_BASE));
151 irq_enable_hazard();
152}
153
154static inline void mask_a20r_irq(unsigned int irq)
155{
156 clear_c0_status(0x100 << (irq - SNI_A20R_IRQ_BASE));
157 irq_disable_hazard();
158}
159
160static void end_a20r_irq(unsigned int irq)
161{
162 if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
163 a20r_ack_hwint();
164 unmask_a20r_irq(irq);
165 }
166}
167
168static struct irq_chip a20r_irq_type = {
169 .typename = "A20R",
170 .ack = mask_a20r_irq,
171 .mask = mask_a20r_irq,
172 .mask_ack = mask_a20r_irq,
173 .unmask = unmask_a20r_irq,
174 .end = end_a20r_irq,
175};
176
177/*
178 * hwint 0 receive all interrupts
179 */
180static void a20r_hwint(void)
181{
182 u32 cause, status;
183 int irq;
184
185 clear_c0_status (IE_IRQ0);
186 status = a20r_ack_hwint();
187 cause = read_c0_cause();
188
189 irq = ffs(((cause & status) >> 8) & 0xf8);
190 if (likely(irq > 0))
191 do_IRQ(SNI_A20R_IRQ_BASE + irq - 1);
192 set_c0_status(IE_IRQ0);
193}
194
195void __init sni_a20r_irq_init(void)
196{
197 int i;
198
199 for (i = SNI_A20R_IRQ_BASE + 2 ; i < SNI_A20R_IRQ_BASE + 8; i++)
200 set_irq_chip(i, &a20r_irq_type);
201 sni_hwint = a20r_hwint;
202 change_c0_status(ST0_IM, IE_IRQ0);
203 setup_irq (SNI_A20R_IRQ_BASE + 3, &sni_isa_irq);
204}
205
206void sni_a20r_init(void)
207{
208 ds1216_base = (volatile unsigned char *) SNI_DS1216_A20R_BASE;
209 rtc_mips_get_time = ds1216_get_cmos_time;
210}
211
212static int __init snirm_a20r_setup_devinit(void)
213{
214 switch (sni_brd_type) {
215 case SNI_BRD_TOWER_OASIC:
216 case SNI_BRD_MINITOWER:
217 platform_device_register(&snirm_82596_pdev);
218 platform_device_register(&snirm_53c710_pdev);
219 platform_device_register(&sc26xx_pdev);
220 platform_device_register(&a20r_serial8250_device);
221 break;
222 }
223
224 return 0;
225}
226
227device_initcall(snirm_a20r_setup_devinit);
diff --git a/arch/mips/sni/ds1216.c b/arch/mips/sni/ds1216.c
new file mode 100644
index 000000000000..1d92732c14f1
--- /dev/null
+++ b/arch/mips/sni/ds1216.c
@@ -0,0 +1,81 @@
1
2#include <linux/bcd.h>
3#include <linux/time.h>
4
5#include <asm/ds1216.h>
6
7volatile unsigned char *ds1216_base;
8
9/*
10 * Read the 64 bit we'd like to have - It a series
11 * of 64 bits showing up in the LSB of the base register.
12 *
13 */
14static unsigned char *ds1216_read(void)
15{
16 static unsigned char rdbuf[8];
17 unsigned char c;
18 int i, j;
19
20 for (i = 0; i < 8; i++) {
21 c = 0x0;
22 for (j = 0; j < 8; j++) {
23 c |= (*ds1216_base & 0x1) << j;
24 }
25 rdbuf[i] = c;
26 }
27
28 return rdbuf;
29}
30
31static void ds1216_switch_ds_to_clock(void)
32{
33 unsigned char magic[] = {
34 0xc5, 0x3a, 0xa3, 0x5c, 0xc5, 0x3a, 0xa3, 0x5c
35 };
36 int i,j,c;
37
38 /* Reset magic pointer */
39 c = *ds1216_base;
40
41 /* Write 64 bit magic to DS1216 */
42 for (i = 0; i < 8; i++) {
43 c = magic[i];
44 for (j = 0; j < 8; j++) {
45 *ds1216_base = c;
46 c = c >> 1;
47 }
48 }
49}
50
51unsigned long ds1216_get_cmos_time(void)
52{
53 unsigned char *rdbuf;
54 unsigned int year, month, date, hour, min, sec;
55
56 ds1216_switch_ds_to_clock();
57 rdbuf = ds1216_read();
58
59 sec = BCD2BIN(DS1216_SEC(rdbuf));
60 min = BCD2BIN(DS1216_MIN(rdbuf));
61 hour = BCD2BIN(DS1216_HOUR(rdbuf));
62 date = BCD2BIN(DS1216_DATE(rdbuf));
63 month = BCD2BIN(DS1216_MONTH(rdbuf));
64 year = BCD2BIN(DS1216_YEAR(rdbuf));
65
66 if (DS1216_1224(rdbuf) && DS1216_AMPM(rdbuf))
67 hour+=12;
68
69 if (year < 70)
70 year += 2000;
71 else
72 year += 1900;
73
74 return mktime(year, month, date, hour, min, sec);
75}
76
77int ds1216_set_rtc_mmss(unsigned long nowtime)
78{
79 printk("ds1216_set_rtc_mmss called but not implemented\n");
80 return -1;
81}
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c
index 039e8e540508..ad5fc471a004 100644
--- a/arch/mips/sni/irq.c
+++ b/arch/mips/sni/irq.c
@@ -5,6 +5,7 @@
5 * 5 *
6 * Copyright (C) 1992 Linus Torvalds 6 * Copyright (C) 1992 Linus Torvalds
7 * Copyright (C) 1994 - 2000 Ralf Baechle 7 * Copyright (C) 1994 - 2000 Ralf Baechle
8 * Copyright (C) 2006 Thomas Bogendoerfer
8 */ 9 */
9#include <linux/delay.h> 10#include <linux/delay.h>
10#include <linux/init.h> 11#include <linux/init.h>
@@ -15,152 +16,34 @@
15#include <asm/i8259.h> 16#include <asm/i8259.h>
16#include <asm/io.h> 17#include <asm/io.h>
17#include <asm/sni.h> 18#include <asm/sni.h>
19#include <asm/irq.h>
20#include <asm/irq_cpu.h>
18 21
19static void enable_pciasic_irq(unsigned int irq) 22void (*sni_hwint)(void);
20{
21 unsigned int mask = 1 << (irq - PCIMT_IRQ_INT2);
22
23 *(volatile u8 *) PCIMT_IRQSEL |= mask;
24}
25
26void disable_pciasic_irq(unsigned int irq)
27{
28 unsigned int mask = ~(1 << (irq - PCIMT_IRQ_INT2));
29
30 *(volatile u8 *) PCIMT_IRQSEL &= mask;
31}
32 23
33static void end_pciasic_irq(unsigned int irq) 24asmlinkage void plat_irq_dispatch(void)
34{
35 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
36 enable_pciasic_irq(irq);
37}
38
39static struct irq_chip pciasic_irq_type = {
40 .name = "ASIC-PCI",
41 .ack = disable_pciasic_irq,
42 .mask = disable_pciasic_irq,
43 .mask_ack = disable_pciasic_irq,
44 .unmask = enable_pciasic_irq,
45 .end = end_pciasic_irq,
46};
47
48/*
49 * hwint0 should deal with MP agent, ASIC PCI, EISA NMI and debug
50 * button interrupts. Later ...
51 */
52static void pciasic_hwint0(void)
53{
54 panic("Received int0 but no handler yet ...");
55}
56
57/* This interrupt was used for the com1 console on the first prototypes. */
58static void pciasic_hwint2(void)
59{
60 /* I think this shouldn't happen on production machines. */
61 panic("hwint2 and no handler yet");
62}
63
64/* hwint5 is the r4k count / compare interrupt */
65static void pciasic_hwint5(void)
66{
67 panic("hwint5 and no handler yet");
68}
69
70static unsigned int ls1bit8(unsigned int x)
71{
72 int b = 7, s;
73
74 s = 4; if ((x & 0x0f) == 0) s = 0; b -= s; x <<= s;
75 s = 2; if ((x & 0x30) == 0) s = 0; b -= s; x <<= s;
76 s = 1; if ((x & 0x40) == 0) s = 0; b -= s;
77
78 return b;
79}
80
81/*
82 * hwint 1 deals with EISA and SCSI interrupts,
83 *
84 * The EISA_INT bit in CSITPEND is high active, all others are low active.
85 */
86static void pciasic_hwint1(void)
87{ 25{
88 u8 pend = *(volatile char *)PCIMT_CSITPEND; 26 sni_hwint();
89 unsigned long flags;
90
91 if (pend & IT_EISA) {
92 int irq;
93 /*
94 * Note: ASIC PCI's builtin interrupt achknowledge feature is
95 * broken. Using it may result in loss of some or all i8259
96 * interupts, so don't use PCIMT_INT_ACKNOWLEDGE ...
97 */
98 irq = i8259_irq();
99 if (unlikely(irq < 0))
100 return;
101
102 do_IRQ(irq);
103 }
104
105 if (!(pend & IT_SCSI)) {
106 flags = read_c0_status();
107 clear_c0_status(ST0_IM);
108 do_IRQ(PCIMT_IRQ_SCSI);
109 write_c0_status(flags);
110 }
111} 27}
112 28
113/* 29/* ISA irq handler */
114 * hwint 3 should deal with the PCI A - D interrupts, 30static irqreturn_t sni_isa_irq_handler(int dummy, void *p)
115 */
116static void pciasic_hwint3(void)
117{ 31{
118 u8 pend = *(volatile char *)PCIMT_CSITPEND;
119 int irq; 32 int irq;
120 33
121 pend &= (IT_INTA | IT_INTB | IT_INTC | IT_INTD); 34 irq = i8259_irq();
122 clear_c0_status(IE_IRQ3); 35 if (unlikely(irq < 0))
123 irq = PCIMT_IRQ_INT2 + ls1bit8(pend); 36 return IRQ_NONE;
124 do_IRQ(irq);
125 set_c0_status(IE_IRQ3);
126}
127 37
128/* 38 do_IRQ(irq);
129 * hwint 4 is used for only the onboard PCnet 32. 39 return IRQ_HANDLED;
130 */
131static void pciasic_hwint4(void)
132{
133 clear_c0_status(IE_IRQ4);
134 do_IRQ(PCIMT_IRQ_ETHERNET);
135 set_c0_status(IE_IRQ4);
136}
137
138asmlinkage void plat_irq_dispatch(void)
139{
140 unsigned int pending = read_c0_status() & read_c0_cause();
141 static unsigned char led_cache;
142
143 *(volatile unsigned char *) PCIMT_CSLED = ++led_cache;
144
145 if (pending & 0x0800)
146 pciasic_hwint1();
147 else if (pending & 0x4000)
148 pciasic_hwint4();
149 else if (pending & 0x2000)
150 pciasic_hwint3();
151 else if (pending & 0x1000)
152 pciasic_hwint2();
153 else if (pending & 0x8000)
154 pciasic_hwint5();
155 else if (pending & 0x0400)
156 pciasic_hwint0();
157} 40}
158 41
159void __init init_pciasic(void) 42struct irqaction sni_isa_irq = {
160{ 43 .handler = sni_isa_irq_handler,
161 * (volatile u8 *) PCIMT_IRQSEL = 44 .name = "ISA",
162 IT_EISA | IT_INTA | IT_INTB | IT_INTC | IT_INTD; 45 .flags = SA_SHIRQ
163} 46};
164 47
165/* 48/*
166 * On systems with i8259-style interrupt controllers we assume for 49 * On systems with i8259-style interrupt controllers we assume for
@@ -169,14 +52,31 @@ void __init init_pciasic(void)
169 */ 52 */
170void __init arch_init_irq(void) 53void __init arch_init_irq(void)
171{ 54{
172 int i;
173
174 init_i8259_irqs(); /* Integrated i8259 */ 55 init_i8259_irqs(); /* Integrated i8259 */
175 init_pciasic(); 56 switch (sni_brd_type) {
176 57 case SNI_BRD_10:
177 /* Actually we've got more interrupts to handle ... */ 58 case SNI_BRD_10NEW:
178 for (i = PCIMT_IRQ_INT2; i <= PCIMT_IRQ_ETHERNET; i++) 59 case SNI_BRD_TOWER_OASIC:
179 set_irq_chip(i, &pciasic_irq_type); 60 case SNI_BRD_MINITOWER:
180 61 sni_a20r_irq_init();
181 change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ2|IE_IRQ3|IE_IRQ4); 62 break;
63
64 case SNI_BRD_PCI_TOWER:
65 sni_pcit_irq_init();
66 break;
67
68 case SNI_BRD_PCI_TOWER_CPLUS:
69 sni_pcit_cplus_irq_init();
70 break;
71
72 case SNI_BRD_RM200:
73 sni_rm200_irq_init();
74 break;
75
76 case SNI_BRD_PCI_MTOWER:
77 case SNI_BRD_PCI_DESKTOP:
78 case SNI_BRD_PCI_MTOWER_CPLUS:
79 sni_pcimt_irq_init();
80 break;
81 }
182} 82}
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c
new file mode 100644
index 000000000000..9ee208daa8b1
--- /dev/null
+++ b/arch/mips/sni/pcimt.c
@@ -0,0 +1,305 @@
1/*
2 * PCIMT specific code
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org)
9 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
10 */
11
12#include <linux/init.h>
13#include <linux/interrupt.h>
14#include <linux/pci.h>
15#include <linux/serial_8250.h>
16
17#include <asm/mc146818-time.h>
18#include <asm/sni.h>
19#include <asm/time.h>
20#include <asm/i8259.h>
21#include <asm/irq_cpu.h>
22
23#define cacheconf (*(volatile unsigned int *)PCIMT_CACHECONF)
24#define invspace (*(volatile unsigned int *)PCIMT_INVSPACE)
25
26static void __init sni_pcimt_sc_init(void)
27{
28 unsigned int scsiz, sc_size;
29
30 scsiz = cacheconf & 7;
31 if (scsiz == 0) {
32 printk("Second level cache is deactived.\n");
33 return;
34 }
35 if (scsiz >= 6) {
36 printk("Invalid second level cache size configured, "
37 "deactivating second level cache.\n");
38 cacheconf = 0;
39 return;
40 }
41
42 sc_size = 128 << scsiz;
43 printk("%dkb second level cache detected, deactivating.\n", sc_size);
44 cacheconf = 0;
45}
46
47
48/*
49 * A bit more gossip about the iron we're running on ...
50 */
51static inline void sni_pcimt_detect(void)
52{
53 char boardtype[80];
54 unsigned char csmsr;
55 char *p = boardtype;
56 unsigned int asic;
57
58 csmsr = *(volatile unsigned char *)PCIMT_CSMSR;
59
60 p += sprintf(p, "%s PCI", (csmsr & 0x80) ? "RM200" : "RM300");
61 if ((csmsr & 0x80) == 0)
62 p += sprintf(p, ", board revision %s",
63 (csmsr & 0x20) ? "D" : "C");
64 asic = csmsr & 0x80;
65 asic = (csmsr & 0x08) ? asic : !asic;
66 p += sprintf(p, ", ASIC PCI Rev %s", asic ? "1.0" : "1.1");
67 printk("%s.\n", boardtype);
68}
69
70#define PORT(_base,_irq) \
71 { \
72 .iobase = _base, \
73 .irq = _irq, \
74 .uartclk = 1843200, \
75 .iotype = UPIO_PORT, \
76 .flags = UPF_BOOT_AUTOCONF, \
77 }
78
79static struct plat_serial8250_port pcimt_data[] = {
80 PORT(0x3f8, 4),
81 PORT(0x2f8, 3),
82 { },
83};
84
85static struct platform_device pcimt_serial8250_device = {
86 .name = "serial8250",
87 .id = PLAT8250_DEV_PLATFORM,
88 .dev = {
89 .platform_data = pcimt_data,
90 },
91};
92
93static struct resource sni_io_resource = {
94 .start = 0x00000000UL,
95 .end = 0x03bfffffUL,
96 .name = "PCIMT IO MEM",
97 .flags = IORESOURCE_IO,
98};
99
100static struct resource pcimt_io_resources[] = {
101 {
102 .start = 0x00,
103 .end = 0x1f,
104 .name = "dma1",
105 .flags = IORESOURCE_BUSY
106 }, {
107 .start = 0x40,
108 .end = 0x5f,
109 .name = "timer",
110 .flags = IORESOURCE_BUSY
111 }, {
112 .start = 0x60,
113 .end = 0x6f,
114 .name = "keyboard",
115 .flags = IORESOURCE_BUSY
116 }, {
117 .start = 0x80,
118 .end = 0x8f,
119 .name = "dma page reg",
120 .flags = IORESOURCE_BUSY
121 }, {
122 .start = 0xc0,
123 .end = 0xdf,
124 .name = "dma2",
125 .flags = IORESOURCE_BUSY
126 }, {
127 .start = 0xcfc,
128 .end = 0xcff,
129 .name = "PCI config data",
130 .flags = IORESOURCE_BUSY
131 }
132};
133
134static struct resource sni_mem_resource = {
135 .start = 0x18000000UL,
136 .end = 0x1fbfffffUL,
137 .name = "PCIMT PCI MEM",
138 .flags = IORESOURCE_MEM
139};
140
141static void __init sni_pcimt_resource_init(void)
142{
143 int i;
144
145 /* request I/O space for devices used on all i[345]86 PCs */
146 for (i = 0; i < ARRAY_SIZE(pcimt_io_resources); i++)
147 request_resource(&sni_io_resource, pcimt_io_resources + i);
148}
149
150extern struct pci_ops sni_pcimt_ops;
151
152static struct pci_controller sni_controller = {
153 .pci_ops = &sni_pcimt_ops,
154 .mem_resource = &sni_mem_resource,
155 .mem_offset = 0x00000000UL,
156 .io_resource = &sni_io_resource,
157 .io_offset = 0x00000000UL,
158 .io_map_base = SNI_PORT_BASE
159};
160
161static void enable_pcimt_irq(unsigned int irq)
162{
163 unsigned int mask = 1 << (irq - PCIMT_IRQ_INT2);
164
165 *(volatile u8 *) PCIMT_IRQSEL |= mask;
166}
167
168void disable_pcimt_irq(unsigned int irq)
169{
170 unsigned int mask = ~(1 << (irq - PCIMT_IRQ_INT2));
171
172 *(volatile u8 *) PCIMT_IRQSEL &= mask;
173}
174
175static void end_pcimt_irq(unsigned int irq)
176{
177 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
178 enable_pcimt_irq(irq);
179}
180
181static struct irq_chip pcimt_irq_type = {
182 .typename = "PCIMT",
183 .ack = disable_pcimt_irq,
184 .mask = disable_pcimt_irq,
185 .mask_ack = disable_pcimt_irq,
186 .unmask = enable_pcimt_irq,
187 .end = end_pcimt_irq,
188};
189
190/*
191 * hwint0 should deal with MP agent, ASIC PCI, EISA NMI and debug
192 * button interrupts. Later ...
193 */
194static void pcimt_hwint0(void)
195{
196 panic("Received int0 but no handler yet ...");
197}
198
199/*
200 * hwint 1 deals with EISA and SCSI interrupts,
201 *
202 * The EISA_INT bit in CSITPEND is high active, all others are low active.
203 */
204static void pcimt_hwint1(void)
205{
206 u8 pend = *(volatile char *)PCIMT_CSITPEND;
207 unsigned long flags;
208
209 if (pend & IT_EISA) {
210 int irq;
211 /*
212 * Note: ASIC PCI's builtin interrupt achknowledge feature is
213 * broken. Using it may result in loss of some or all i8259
214 * interupts, so don't use PCIMT_INT_ACKNOWLEDGE ...
215 */
216 irq = i8259_irq();
217 if (unlikely(irq < 0))
218 return;
219
220 do_IRQ(irq);
221 }
222
223 if (!(pend & IT_SCSI)) {
224 flags = read_c0_status();
225 clear_c0_status(ST0_IM);
226 do_IRQ(PCIMT_IRQ_SCSI);
227 write_c0_status(flags);
228 }
229}
230
231/*
232 * hwint 3 should deal with the PCI A - D interrupts,
233 */
234static void pcimt_hwint3(void)
235{
236 u8 pend = *(volatile char *)PCIMT_CSITPEND;
237 int irq;
238
239 pend &= (IT_INTA | IT_INTB | IT_INTC | IT_INTD);
240 pend ^= (IT_INTA | IT_INTB | IT_INTC | IT_INTD);
241 clear_c0_status(IE_IRQ3);
242 irq = PCIMT_IRQ_INT2 + ffs(pend) - 1;
243 do_IRQ(irq);
244 set_c0_status(IE_IRQ3);
245}
246
247static void sni_pcimt_hwint(void)
248{
249 u32 pending = read_c0_cause() & read_c0_status();
250
251 if (pending & C_IRQ5)
252 do_IRQ (MIPS_CPU_IRQ_BASE + 7);
253 else if (pending & C_IRQ4)
254 do_IRQ (MIPS_CPU_IRQ_BASE + 6);
255 else if (pending & C_IRQ3)
256 pcimt_hwint3();
257 else if (pending & C_IRQ1)
258 pcimt_hwint1();
259 else if (pending & C_IRQ0) {
260 pcimt_hwint0();
261 }
262}
263
264void __init sni_pcimt_irq_init(void)
265{
266 int i;
267
268 *(volatile u8 *) PCIMT_IRQSEL = IT_ETH | IT_EISA;
269 mips_cpu_irq_init();
270 /* Actually we've got more interrupts to handle ... */
271 for (i = PCIMT_IRQ_INT2; i <= PCIMT_IRQ_SCSI; i++)
272 set_irq_chip(i, &pcimt_irq_type);
273 sni_hwint = sni_pcimt_hwint;
274 change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ3);
275}
276
277void sni_pcimt_init(void)
278{
279 sni_pcimt_detect();
280 sni_pcimt_sc_init();
281 rtc_mips_get_time = mc146818_get_cmos_time;
282 rtc_mips_set_time = mc146818_set_rtc_mmss;
283 board_time_init = sni_cpu_time_init;
284 ioport_resource.end = sni_io_resource.end;
285#ifdef CONFIG_PCI
286 PCIBIOS_MIN_IO = 0x9000;
287 register_pci_controller(&sni_controller);
288#endif
289 sni_pcimt_resource_init();
290}
291
292static int __init snirm_pcimt_setup_devinit(void)
293{
294 switch (sni_brd_type) {
295 case SNI_BRD_PCI_MTOWER:
296 case SNI_BRD_PCI_DESKTOP:
297 case SNI_BRD_PCI_MTOWER_CPLUS:
298 platform_device_register(&pcimt_serial8250_device);
299 break;
300 }
301
302 return 0;
303}
304
305device_initcall(snirm_pcimt_setup_devinit);
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c
new file mode 100644
index 000000000000..00d151f4d121
--- /dev/null
+++ b/arch/mips/sni/pcit.c
@@ -0,0 +1,273 @@
1/*
2 * PCI Tower specific code
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */
10
11#include <linux/init.h>
12#include <linux/interrupt.h>
13#include <linux/pci.h>
14#include <linux/serial_8250.h>
15
16#include <asm/mc146818-time.h>
17#include <asm/sni.h>
18#include <asm/time.h>
19#include <asm/irq_cpu.h>
20
21
22#define PORT(_base,_irq) \
23 { \
24 .iobase = _base, \
25 .irq = _irq, \
26 .uartclk = 1843200, \
27 .iotype = UPIO_PORT, \
28 .flags = UPF_BOOT_AUTOCONF, \
29 }
30
31static struct plat_serial8250_port pcit_data[] = {
32 PORT(0x3f8, 0),
33 PORT(0x2f8, 3),
34 { },
35};
36
37static struct platform_device pcit_serial8250_device = {
38 .name = "serial8250",
39 .id = PLAT8250_DEV_PLATFORM,
40 .dev = {
41 .platform_data = pcit_data,
42 },
43};
44
45static struct plat_serial8250_port pcit_cplus_data[] = {
46 PORT(0x3f8, 0),
47 PORT(0x2f8, 3),
48 PORT(0x3e8, 4),
49 PORT(0x2e8, 3),
50 { },
51};
52
53static struct platform_device pcit_cplus_serial8250_device = {
54 .name = "serial8250",
55 .id = PLAT8250_DEV_PLATFORM,
56 .dev = {
57 .platform_data = pcit_cplus_data,
58 },
59};
60
61static struct resource sni_io_resource = {
62 .start = 0x00000000UL,
63 .end = 0x03bfffffUL,
64 .name = "PCIT IO",
65 .flags = IORESOURCE_IO,
66};
67
68static struct resource pcit_io_resources[] = {
69 {
70 .start = 0x00,
71 .end = 0x1f,
72 .name = "dma1",
73 .flags = IORESOURCE_BUSY
74 }, {
75 .start = 0x40,
76 .end = 0x5f,
77 .name = "timer",
78 .flags = IORESOURCE_BUSY
79 }, {
80 .start = 0x60,
81 .end = 0x6f,
82 .name = "keyboard",
83 .flags = IORESOURCE_BUSY
84 }, {
85 .start = 0x80,
86 .end = 0x8f,
87 .name = "dma page reg",
88 .flags = IORESOURCE_BUSY
89 }, {
90 .start = 0xc0,
91 .end = 0xdf,
92 .name = "dma2",
93 .flags = IORESOURCE_BUSY
94 }, {
95 .start = 0xcf8,
96 .end = 0xcfb,
97 .name = "PCI config addr",
98 .flags = IORESOURCE_BUSY
99 }, {
100 .start = 0xcfc,
101 .end = 0xcff,
102 .name = "PCI config data",
103 .flags = IORESOURCE_BUSY
104 }
105};
106
107static struct resource sni_mem_resource = {
108 .start = 0x18000000UL,
109 .end = 0x1fbfffffUL,
110 .name = "PCIT PCI MEM",
111 .flags = IORESOURCE_MEM
112};
113
114static void __init sni_pcit_resource_init(void)
115{
116 int i;
117
118 /* request I/O space for devices used on all i[345]86 PCs */
119 for (i = 0; i < ARRAY_SIZE(pcit_io_resources); i++)
120 request_resource(&sni_io_resource, pcit_io_resources + i);
121}
122
123
124extern struct pci_ops sni_pcit_ops;
125
126static struct pci_controller sni_pcit_controller = {
127 .pci_ops = &sni_pcit_ops,
128 .mem_resource = &sni_mem_resource,
129 .mem_offset = 0x00000000UL,
130 .io_resource = &sni_io_resource,
131 .io_offset = 0x00000000UL,
132 .io_map_base = SNI_PORT_BASE
133};
134
135static void enable_pcit_irq(unsigned int irq)
136{
137 u32 mask = 1 << (irq - SNI_PCIT_INT_START + 24);
138
139 *(volatile u32 *)SNI_PCIT_INT_REG |= mask;
140}
141
142void disable_pcit_irq(unsigned int irq)
143{
144 u32 mask = 1 << (irq - SNI_PCIT_INT_START + 24);
145
146 *(volatile u32 *)SNI_PCIT_INT_REG &= ~mask;
147}
148
149void end_pcit_irq(unsigned int irq)
150{
151 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
152 enable_pcit_irq(irq);
153}
154
155static struct irq_chip pcit_irq_type = {
156 .typename = "PCIT",
157 .ack = disable_pcit_irq,
158 .mask = disable_pcit_irq,
159 .mask_ack = disable_pcit_irq,
160 .unmask = enable_pcit_irq,
161 .end = end_pcit_irq,
162};
163
164static void pcit_hwint1(void)
165{
166 u32 pending = *(volatile u32 *)SNI_PCIT_INT_REG;
167 int irq;
168
169 clear_c0_status(IE_IRQ1);
170 irq = ffs((pending >> 16) & 0x7f);
171
172 if (likely(irq > 0))
173 do_IRQ (irq + SNI_PCIT_INT_START - 1);
174 set_c0_status (IE_IRQ1);
175}
176
177static void pcit_hwint0(void)
178{
179 u32 pending = *(volatile u32 *)SNI_PCIT_INT_REG;
180 int irq;
181
182 clear_c0_status(IE_IRQ0);
183 irq = ffs((pending >> 16) & 0x3f);
184
185 if (likely(irq > 0))
186 do_IRQ (irq + SNI_PCIT_INT_START - 1);
187 set_c0_status (IE_IRQ0);
188}
189
190static void sni_pcit_hwint(void)
191{
192 u32 pending = read_c0_cause() & read_c0_status();
193
194 if (pending & C_IRQ1)
195 pcit_hwint1();
196 else if (pending & C_IRQ2)
197 do_IRQ (MIPS_CPU_IRQ_BASE + 4);
198 else if (pending & C_IRQ3)
199 do_IRQ (MIPS_CPU_IRQ_BASE + 5);
200 else if (pending & C_IRQ5)
201 do_IRQ (MIPS_CPU_IRQ_BASE + 7);
202}
203
204static void sni_pcit_hwint_cplus(void)
205{
206 u32 pending = read_c0_cause() & read_c0_status();
207
208 if (pending & C_IRQ0)
209 pcit_hwint0();
210 else if (pending & C_IRQ1)
211 do_IRQ (MIPS_CPU_IRQ_BASE + 3);
212 else if (pending & C_IRQ2)
213 do_IRQ (MIPS_CPU_IRQ_BASE + 4);
214 else if (pending & C_IRQ3)
215 do_IRQ (MIPS_CPU_IRQ_BASE + 5);
216 else if (pending & C_IRQ5)
217 do_IRQ (MIPS_CPU_IRQ_BASE + 7);
218}
219
220void __init sni_pcit_irq_init(void)
221{
222 int i;
223
224 mips_cpu_irq_init();
225 for (i = SNI_PCIT_INT_START; i <= SNI_PCIT_INT_END; i++)
226 set_irq_chip(i, &pcit_irq_type);
227 *(volatile u32 *)SNI_PCIT_INT_REG = 0;
228 sni_hwint = sni_pcit_hwint;
229 change_c0_status(ST0_IM, IE_IRQ1);
230 setup_irq (SNI_PCIT_INT_START + 6, &sni_isa_irq);
231}
232
233void __init sni_pcit_cplus_irq_init(void)
234{
235 int i;
236
237 mips_cpu_irq_init();
238 for (i = SNI_PCIT_INT_START; i <= SNI_PCIT_INT_END; i++)
239 set_irq_chip(i, &pcit_irq_type);
240 *(volatile u32 *)SNI_PCIT_INT_REG = 0x40000000;
241 sni_hwint = sni_pcit_hwint_cplus;
242 change_c0_status(ST0_IM, IE_IRQ0);
243 setup_irq (MIPS_CPU_IRQ_BASE + 3, &sni_isa_irq);
244}
245
246void sni_pcit_init(void)
247{
248 rtc_mips_get_time = mc146818_get_cmos_time;
249 rtc_mips_set_time = mc146818_set_rtc_mmss;
250 board_time_init = sni_cpu_time_init;
251 ioport_resource.end = sni_io_resource.end;
252#ifdef CONFIG_PCI
253 PCIBIOS_MIN_IO = 0x9000;
254 register_pci_controller(&sni_pcit_controller);
255#endif
256 sni_pcit_resource_init();
257}
258
259static int __init snirm_pcit_setup_devinit(void)
260{
261 switch (sni_brd_type) {
262 case SNI_BRD_PCI_TOWER:
263 platform_device_register(&pcit_serial8250_device);
264 break;
265
266 case SNI_BRD_PCI_TOWER_CPLUS:
267 platform_device_register(&pcit_cplus_serial8250_device);
268 break;
269 }
270 return 0;
271}
272
273device_initcall(snirm_pcit_setup_devinit);
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index be85bec002e1..2eada8aea682 100644
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -13,12 +13,11 @@
13 * controller to pulse the reset-line low. We try that for a while, 13 * controller to pulse the reset-line low. We try that for a while,
14 * and if it doesn't work, we do some other stupid things. 14 * and if it doesn't work, we do some other stupid things.
15 */ 15 */
16static inline void 16static inline void kb_wait(void)
17kb_wait(void)
18{ 17{
19 int i; 18 int i;
20 19
21 for (i=0; i<0x10000; i++) 20 for (i = 0; i < 0x10000; i++)
22 if ((inb_p(0x64) & 0x02) == 0) 21 if ((inb_p(0x64) & 0x02) == 0)
23 break; 22 break;
24} 23}
@@ -32,9 +31,9 @@ void sni_machine_restart(char *command)
32 We can do that easier ... */ 31 We can do that easier ... */
33 local_irq_disable(); 32 local_irq_disable();
34 for (;;) { 33 for (;;) {
35 for (i=0; i<100; i++) { 34 for (i = 0; i < 100; i++) {
36 kb_wait(); 35 kb_wait();
37 for(j = 0; j < 100000 ; j++) 36 for (j = 0; j < 100000 ; j++)
38 /* nothing */; 37 /* nothing */;
39 outb_p(0xfe,0x64); /* pulse reset low */ 38 outb_p(0xfe,0x64); /* pulse reset low */
40 } 39 }
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
new file mode 100644
index 000000000000..b82ff129f5ea
--- /dev/null
+++ b/arch/mips/sni/rm200.c
@@ -0,0 +1,186 @@
1/*
2 * RM200 specific code
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */
10
11#include <linux/init.h>
12#include <linux/interrupt.h>
13#include <linux/platform_device.h>
14#include <linux/serial_8250.h>
15
16#include <asm/sni.h>
17#include <asm/time.h>
18#include <asm/ds1216.h>
19#include <asm/irq_cpu.h>
20
21#define PORT(_base,_irq) \
22 { \
23 .iobase = _base, \
24 .irq = _irq, \
25 .uartclk = 1843200, \
26 .iotype = UPIO_PORT, \
27 .flags = UPF_BOOT_AUTOCONF, \
28 }
29
30static struct plat_serial8250_port rm200_data[] = {
31 PORT(0x3f8, 4),
32 PORT(0x2f8, 3),
33 { },
34};
35
36static struct platform_device rm200_serial8250_device = {
37 .name = "serial8250",
38 .id = PLAT8250_DEV_PLATFORM,
39 .dev = {
40 .platform_data = rm200_data,
41 },
42};
43
44static struct resource snirm_82596_rm200_rsrc[] = {
45 {
46 .start = 0xb8000000,
47 .end = 0xb80fffff,
48 .flags = IORESOURCE_MEM
49 },
50 {
51 .start = 0xbb000000,
52 .end = 0xbb000004,
53 .flags = IORESOURCE_MEM
54 },
55 {
56 .start = 0xbff00000,
57 .end = 0xbff00020,
58 .flags = IORESOURCE_MEM
59 },
60 {
61 .start = 27,
62 .end = 27,
63 .flags = IORESOURCE_IRQ
64 },
65 {
66 .flags = 0x00
67 }
68};
69
70static struct platform_device snirm_82596_rm200_pdev = {
71 .name = "snirm_82596",
72 .num_resources = ARRAY_SIZE(snirm_82596_rm200_rsrc),
73 .resource = snirm_82596_rm200_rsrc
74};
75
76static struct resource snirm_53c710_rm200_rsrc[] = {
77 {
78 .start = 0xb9000000,
79 .end = 0xb90fffff,
80 .flags = IORESOURCE_MEM
81 },
82 {
83 .start = 26,
84 .end = 26,
85 .flags = IORESOURCE_IRQ
86 }
87};
88
89static struct platform_device snirm_53c710_rm200_pdev = {
90 .name = "snirm_53c710",
91 .num_resources = ARRAY_SIZE(snirm_53c710_rm200_rsrc),
92 .resource = snirm_53c710_rm200_rsrc
93};
94
95static int __init snirm_setup_devinit(void)
96{
97 if (sni_brd_type == SNI_BRD_RM200) {
98 platform_device_register(&rm200_serial8250_device);
99 platform_device_register(&snirm_82596_rm200_pdev);
100 platform_device_register(&snirm_53c710_rm200_pdev);
101 }
102 return 0;
103}
104
105device_initcall(snirm_setup_devinit);
106
107
108#define SNI_RM200_INT_STAT_REG 0xbc000000
109#define SNI_RM200_INT_ENA_REG 0xbc080000
110
111#define SNI_RM200_INT_START 24
112#define SNI_RM200_INT_END 28
113
114static void enable_rm200_irq(unsigned int irq)
115{
116 unsigned int mask = 1 << (irq - SNI_RM200_INT_START);
117
118 *(volatile u8 *)SNI_RM200_INT_ENA_REG &= ~mask;
119}
120
121void disable_rm200_irq(unsigned int irq)
122{
123 unsigned int mask = 1 << (irq - SNI_RM200_INT_START);
124
125 *(volatile u8 *)SNI_RM200_INT_ENA_REG |= mask;
126}
127
128void end_rm200_irq(unsigned int irq)
129{
130 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
131 enable_rm200_irq(irq);
132}
133
134static struct irq_chip rm200_irq_type = {
135 .typename = "RM200",
136 .ack = disable_rm200_irq,
137 .mask = disable_rm200_irq,
138 .mask_ack = disable_rm200_irq,
139 .unmask = enable_rm200_irq,
140 .end = end_rm200_irq,
141};
142
143static void sni_rm200_hwint(void)
144{
145 u32 pending = read_c0_cause() & read_c0_status();
146 u8 mask;
147 u8 stat;
148 int irq;
149
150 if (pending & C_IRQ5)
151 do_IRQ (MIPS_CPU_IRQ_BASE + 7);
152 else if (pending & C_IRQ0) {
153 clear_c0_status (IE_IRQ0);
154 mask = *(volatile u8 *)SNI_RM200_INT_ENA_REG ^ 0x1f;
155 stat = *(volatile u8 *)SNI_RM200_INT_STAT_REG ^ 0x14;
156 irq = ffs(stat & mask & 0x1f);
157
158 if (likely(irq > 0))
159 do_IRQ (irq + SNI_RM200_INT_START - 1);
160 set_c0_status (IE_IRQ0);
161 }
162}
163
164void __init sni_rm200_irq_init(void)
165{
166 int i;
167
168 * (volatile u8 *)SNI_RM200_INT_ENA_REG = 0x1f;
169
170 mips_cpu_irq_init();
171 /* Actually we've got more interrupts to handle ... */
172 for (i = SNI_RM200_INT_START; i <= SNI_RM200_INT_END; i++)
173 set_irq_chip(i, &rm200_irq_type);
174 sni_hwint = sni_rm200_hwint;
175 change_c0_status(ST0_IM, IE_IRQ0);
176 setup_irq (SNI_RM200_INT_START + 0, &sni_isa_irq);
177}
178
179void sni_rm200_init(void)
180{
181 set_io_port_base(SNI_PORT_BASE + 0x02000000);
182 ioport_resource.end += 0x02000000;
183 ds1216_base = (volatile unsigned char *) SNI_DS1216_RM200_BASE;
184 rtc_mips_get_time = ds1216_get_cmos_time;
185 board_time_init = sni_cpu_time_init;
186}
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index afeb7f13e5b5..68d7cf609b4f 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -6,16 +6,10 @@
6 * for more details. 6 * for more details.
7 * 7 *
8 * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org) 8 * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org)
9 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */ 10 */
10#include <linux/eisa.h> 11#include <linux/eisa.h>
11#include <linux/hdreg.h>
12#include <linux/ioport.h>
13#include <linux/sched.h>
14#include <linux/init.h> 12#include <linux/init.h>
15#include <linux/interrupt.h>
16#include <linux/mc146818rtc.h>
17#include <linux/pm.h>
18#include <linux/pci.h>
19#include <linux/console.h> 13#include <linux/console.h>
20#include <linux/fb.h> 14#include <linux/fb.h>
21#include <linux/screen_info.h> 15#include <linux/screen_info.h>
@@ -25,52 +19,16 @@
25#include <asm/sgialib.h> 19#include <asm/sgialib.h>
26#endif 20#endif
27 21
28#include <asm/bcache.h>
29#include <asm/bootinfo.h>
30#include <asm/io.h> 22#include <asm/io.h>
31#include <asm/irq.h>
32#include <asm/mc146818-time.h>
33#include <asm/processor.h>
34#include <asm/reboot.h> 23#include <asm/reboot.h>
35#include <asm/sni.h> 24#include <asm/sni.h>
36#include <asm/time.h> 25
37#include <asm/traps.h> 26unsigned int sni_brd_type;
38 27
39extern void sni_machine_restart(char *command); 28extern void sni_machine_restart(char *command);
40extern void sni_machine_halt(void); 29extern void sni_machine_halt(void);
41extern void sni_machine_power_off(void); 30extern void sni_machine_power_off(void);
42 31
43void __init plat_timer_setup(struct irqaction *irq)
44{
45 /* set the clock to 100 Hz */
46 outb_p(0x34,0x43); /* binary, mode 2, LSB/MSB, ch 0 */
47 outb_p(LATCH & 0xff , 0x40); /* LSB */
48 outb(LATCH >> 8 , 0x40); /* MSB */
49 setup_irq(0, irq);
50}
51
52/*
53 * A bit more gossip about the iron we're running on ...
54 */
55static inline void sni_pcimt_detect(void)
56{
57 char boardtype[80];
58 unsigned char csmsr;
59 char *p = boardtype;
60 unsigned int asic;
61
62 csmsr = *(volatile unsigned char *)PCIMT_CSMSR;
63
64 p += sprintf(p, "%s PCI", (csmsr & 0x80) ? "RM200" : "RM300");
65 if ((csmsr & 0x80) == 0)
66 p += sprintf(p, ", board revision %s",
67 (csmsr & 0x20) ? "D" : "C");
68 asic = csmsr & 0x80;
69 asic = (csmsr & 0x08) ? asic : !asic;
70 p += sprintf(p, ", ASIC PCI Rev %s", asic ? "1.0" : "1.1");
71 printk("%s.\n", boardtype);
72}
73
74static void __init sni_display_setup(void) 32static void __init sni_display_setup(void)
75{ 33{
76#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) && defined(CONFIG_ARC) 34#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) && defined(CONFIG_ARC)
@@ -90,175 +48,11 @@ static void __init sni_display_setup(void)
90#endif 48#endif
91} 49}
92 50
93static struct resource sni_io_resource = {
94 .start = 0x00001000UL,
95 .end = 0x03bfffffUL,
96 .name = "PCIMT IO MEM",
97 .flags = IORESOURCE_IO,
98};
99
100static struct resource pcimt_io_resources[] = {
101 {
102 .start = 0x00,
103 .end = 0x1f,
104 .name = "dma1",
105 .flags = IORESOURCE_BUSY
106 }, {
107 .start = 0x40,
108 .end = 0x5f,
109 .name = "timer",
110 .flags = IORESOURCE_BUSY
111 }, {
112 .start = 0x60,
113 .end = 0x6f,
114 .name = "keyboard",
115 .flags = IORESOURCE_BUSY
116 }, {
117 .start = 0x80,
118 .end = 0x8f,
119 .name = "dma page reg",
120 .flags = IORESOURCE_BUSY
121 }, {
122 .start = 0xc0,
123 .end = 0xdf,
124 .name = "dma2",
125 .flags = IORESOURCE_BUSY
126 }, {
127 .start = 0xcfc,
128 .end = 0xcff,
129 .name = "PCI config data",
130 .flags = IORESOURCE_BUSY
131 }
132};
133
134static struct resource sni_mem_resource = {
135 .start = 0x10000000UL,
136 .end = 0xffffffffUL,
137 .name = "PCIMT PCI MEM",
138 .flags = IORESOURCE_MEM
139};
140
141/*
142 * The RM200/RM300 has a few holes in it's PCI/EISA memory address space used
143 * for other purposes. Be paranoid and allocate all of the before the PCI
144 * code gets a chance to to map anything else there ...
145 *
146 * This leaves the following areas available:
147 *
148 * 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory
149 * 0x10100000 - 0x13ffffff ( 15MB) PCI/EISA/ISA Bus Memory
150 * 0x18000000 - 0x1fbfffff (124MB) PCI/EISA Bus Memory
151 * 0x1ff08000 - 0x1ffeffff (816kB) PCI/EISA Bus Memory
152 * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory
153 */
154static struct resource pcimt_mem_resources[] = {
155 {
156 .start = 0x100a0000,
157 .end = 0x100bffff,
158 .name = "Video RAM area",
159 .flags = IORESOURCE_BUSY
160 }, {
161 .start = 0x100c0000,
162 .end = 0x100fffff,
163 .name = "ISA Reserved",
164 .flags = IORESOURCE_BUSY
165 }, {
166 .start = 0x14000000,
167 .end = 0x17bfffff,
168 .name = "PCI IO",
169 .flags = IORESOURCE_BUSY
170 }, {
171 .start = 0x17c00000,
172 .end = 0x17ffffff,
173 .name = "Cache Replacement Area",
174 .flags = IORESOURCE_BUSY
175 }, {
176 .start = 0x1a000000,
177 .end = 0x1a000003,
178 .name = "PCI INT Acknowledge",
179 .flags = IORESOURCE_BUSY
180 }, {
181 .start = 0x1fc00000,
182 .end = 0x1fc7ffff,
183 .name = "Boot PROM",
184 .flags = IORESOURCE_BUSY
185 }, {
186 .start = 0x1fc80000,
187 .end = 0x1fcfffff,
188 .name = "Diag PROM",
189 .flags = IORESOURCE_BUSY
190 }, {
191 .start = 0x1fd00000,
192 .end = 0x1fdfffff,
193 .name = "X-Bus",
194 .flags = IORESOURCE_BUSY
195 }, {
196 .start = 0x1fe00000,
197 .end = 0x1fefffff,
198 .name = "BIOS map",
199 .flags = IORESOURCE_BUSY
200 }, {
201 .start = 0x1ff00000,
202 .end = 0x1ff7ffff,
203 .name = "NVRAM / EEPROM",
204 .flags = IORESOURCE_BUSY
205 }, {
206 .start = 0x1fff0000,
207 .end = 0x1fffefff,
208 .name = "ASIC PCI",
209 .flags = IORESOURCE_BUSY
210 }, {
211 .start = 0x1ffff000,
212 .end = 0x1fffffff,
213 .name = "MP Agent",
214 .flags = IORESOURCE_BUSY
215 }, {
216 .start = 0x20000000,
217 .end = 0x9fffffff,
218 .name = "Main Memory",
219 .flags = IORESOURCE_BUSY
220 }
221};
222
223static void __init sni_resource_init(void)
224{
225 int i;
226
227 /* request I/O space for devices used on all i[345]86 PCs */
228 for (i = 0; i < ARRAY_SIZE(pcimt_io_resources); i++)
229 request_resource(&ioport_resource, pcimt_io_resources + i);
230
231 /* request mem space for pcimt-specific devices */
232 for (i = 0; i < ARRAY_SIZE(pcimt_mem_resources); i++)
233 request_resource(&sni_mem_resource, pcimt_mem_resources + i);
234
235 ioport_resource.end = sni_io_resource.end;
236}
237
238extern struct pci_ops sni_pci_ops;
239
240static struct pci_controller sni_controller = {
241 .pci_ops = &sni_pci_ops,
242 .mem_resource = &sni_mem_resource,
243 .mem_offset = 0x10000000UL,
244 .io_resource = &sni_io_resource,
245 .io_offset = 0x00000000UL
246};
247
248static inline void sni_pcimt_time_init(void)
249{
250 rtc_mips_get_time = mc146818_get_cmos_time;
251 rtc_mips_set_time = mc146818_set_rtc_mmss;
252}
253 51
254void __init plat_mem_setup(void) 52void __init plat_mem_setup(void)
255{ 53{
256 sni_pcimt_detect();
257 sni_pcimt_sc_init();
258 sni_pcimt_time_init();
259
260 set_io_port_base(SNI_PORT_BASE); 54 set_io_port_base(SNI_PORT_BASE);
261 ioport_resource.end = sni_io_resource.end; 55// ioport_resource.end = sni_io_resource.end;
262 56
263 /* 57 /*
264 * Setup (E)ISA I/O memory access stuff 58 * Setup (E)ISA I/O memory access stuff
@@ -268,15 +62,33 @@ void __init plat_mem_setup(void)
268 EISA_bus = 1; 62 EISA_bus = 1;
269#endif 63#endif
270 64
271 sni_resource_init(); 65 switch (sni_brd_type) {
66 case SNI_BRD_10:
67 case SNI_BRD_10NEW:
68 case SNI_BRD_TOWER_OASIC:
69 case SNI_BRD_MINITOWER:
70 sni_a20r_init();
71 break;
72
73 case SNI_BRD_PCI_TOWER:
74 case SNI_BRD_PCI_TOWER_CPLUS:
75 sni_pcit_init();
76 break;
77
78 case SNI_BRD_RM200:
79 sni_rm200_init();
80 break;
81
82 case SNI_BRD_PCI_MTOWER:
83 case SNI_BRD_PCI_DESKTOP:
84 case SNI_BRD_PCI_MTOWER_CPLUS:
85 sni_pcimt_init();
86 break;
87 }
272 88
273 _machine_restart = sni_machine_restart; 89 _machine_restart = sni_machine_restart;
274 _machine_halt = sni_machine_halt; 90 _machine_halt = sni_machine_halt;
275 pm_power_off = sni_machine_power_off; 91 pm_power_off = sni_machine_power_off;
276 92
277 sni_display_setup(); 93 sni_display_setup();
278
279#ifdef CONFIG_PCI
280 register_pci_controller(&sni_controller);
281#endif
282} 94}
diff --git a/arch/mips/sni/sniprom.c b/arch/mips/sni/sniprom.c
index 1213d166f22e..643366eb854a 100644
--- a/arch/mips/sni/sniprom.c
+++ b/arch/mips/sni/sniprom.c
@@ -9,9 +9,12 @@
9 * Copyright (C) 2005-2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de) 9 * Copyright (C) 2005-2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
10 */ 10 */
11 11
12#define DEBUG
13
12#include <linux/kernel.h> 14#include <linux/kernel.h>
13#include <linux/init.h> 15#include <linux/init.h>
14#include <linux/string.h> 16#include <linux/string.h>
17#include <linux/console.h>
15 18
16#include <asm/addrspace.h> 19#include <asm/addrspace.h>
17#include <asm/sni.h> 20#include <asm/sni.h>
@@ -31,14 +34,13 @@
31#define PROM_ENTRY(x) (PROM_VEC + (x)) 34#define PROM_ENTRY(x) (PROM_VEC + (x))
32 35
33 36
34#undef DEBUG
35#ifdef DEBUG
36#define DBG_PRINTF(x...) prom_printf(x)
37#else
38#define DBG_PRINTF(x...)
39#endif
40
41static int *(*__prom_putchar)(int) = (int *(*)(int))PROM_ENTRY(PROM_PUTCHAR); 37static int *(*__prom_putchar)(int) = (int *(*)(int))PROM_ENTRY(PROM_PUTCHAR);
38
39void prom_putchar(char c)
40{
41 __prom_putchar(c);
42}
43
42static char *(*__prom_getenv)(char *) = (char *(*)(char *))PROM_ENTRY(PROM_GETENV); 44static char *(*__prom_getenv)(char *) = (char *(*)(char *))PROM_ENTRY(PROM_GETENV);
43static void (*__prom_get_memconf)(void *) = (void (*)(void *))PROM_ENTRY(PROM_GET_MEMCONF); 45static void (*__prom_get_memconf)(void *) = (void (*)(void *))PROM_ENTRY(PROM_GET_MEMCONF);
44 46
@@ -47,26 +49,6 @@ char *prom_getenv (char *s)
47 return __prom_getenv(s); 49 return __prom_getenv(s);
48} 50}
49 51
50void prom_printf(char *fmt, ...)
51{
52 va_list args;
53 char ppbuf[1024];
54 char *bptr;
55
56 va_start(args, fmt);
57 vsprintf(ppbuf, fmt, args);
58
59 bptr = ppbuf;
60
61 while (*bptr != 0) {
62 if (*bptr == '\n')
63 __prom_putchar('\r');
64
65 __prom_putchar(*bptr++);
66 }
67 va_end(args);
68}
69
70void __init prom_free_prom_memory(void) 52void __init prom_free_prom_memory(void)
71{ 53{
72} 54}
@@ -93,15 +75,15 @@ static void sni_idprom_dump(void)
93{ 75{
94 int i; 76 int i;
95 77
96 prom_printf("SNI IDProm dump (first 128byte):\n"); 78 pr_debug("SNI IDProm dump:\n");
97 for(i=0;i<128;i++) { 79 for (i = 0; i < 256; i++) {
98 if (i%16 == 0) 80 if (i%16 == 0)
99 prom_printf("%04x ", i); 81 pr_debug("%04x ", i);
100 82
101 prom_printf("%02x ", *(unsigned char *) (SNI_IDPROM_BASE+i)); 83 printk("%02x ", *(unsigned char *) (SNI_IDPROM_BASE + i));
102 84
103 if (i%16 == 15) 85 if (i % 16 == 15)
104 prom_printf("\n"); 86 printk("\n");
105 } 87 }
106} 88}
107#endif 89#endif
@@ -118,34 +100,142 @@ static void sni_mem_init(void )
118 } memconf[8]; 100 } memconf[8];
119 101
120 /* MemSIZE from prom in 16MByte chunks */ 102 /* MemSIZE from prom in 16MByte chunks */
121 memsize=*((unsigned char *) SNI_IDPROM_MEMSIZE) * 16; 103 memsize = *((unsigned char *) SNI_IDPROM_MEMSIZE) * 16;
122 104
123 DBG_PRINTF("IDProm memsize: %lu MByte\n", memsize); 105 pr_debug("IDProm memsize: %lu MByte\n", memsize);
124 106
125 /* get memory bank layout from prom */ 107 /* get memory bank layout from prom */
126 __prom_get_memconf(&memconf); 108 __prom_get_memconf(&memconf);
127 109
128 DBG_PRINTF("prom_get_mem_conf memory configuration:\n"); 110 pr_debug("prom_get_mem_conf memory configuration:\n");
129 for(i=0;i<8 && memconf[i].size;i++) { 111 for (i = 0;i < 8 && memconf[i].size; i++) {
130 prom_printf("Bank%d: %08x @ %08x\n", i, 112 if (sni_brd_type == SNI_BRD_PCI_TOWER ||
113 sni_brd_type == SNI_BRD_PCI_TOWER_CPLUS) {
114 if (memconf[i].base >= 0x20000000 &&
115 memconf[i].base < 0x30000000) {
116 memconf[i].base -= 0x20000000;
117 }
118 }
119 pr_debug("Bank%d: %08x @ %08x\n", i,
131 memconf[i].size, memconf[i].base); 120 memconf[i].size, memconf[i].base);
132 add_memory_region(memconf[i].base, memconf[i].size, BOOT_MEM_RAM); 121 add_memory_region(memconf[i].base, memconf[i].size, BOOT_MEM_RAM);
133 } 122 }
134} 123}
135 124
125static void __init sni_console_setup(void)
126{
127 char *ctype;
128 char *cdev;
129 char *baud;
130 int port;
131 static char options[8];
132
133 cdev = prom_getenv ("console_dev");
134 if (strncmp (cdev, "tty", 3) == 0) {
135 ctype = prom_getenv ("console");
136 switch (*ctype) {
137 default:
138 case 'l':
139 port = 0;
140 baud = prom_getenv("lbaud");
141 break;
142 case 'r':
143 port = 1;
144 baud = prom_getenv("rbaud");
145 break;
146 }
147 if (baud)
148 strcpy(options, baud);
149 add_preferred_console("ttyS", port, baud ? options : NULL);
150 }
151}
152
136void __init prom_init(void) 153void __init prom_init(void)
137{ 154{
138 int argc = fw_arg0; 155 int argc = fw_arg0;
139 char **argv = (void *)fw_arg1; 156 char **argv = (void *)fw_arg1;
140 unsigned int sni_brd_type = *(unsigned char *) SNI_IDPROM_BRDTYPE;
141 int i; 157 int i;
142 158 int cputype;
143 DBG_PRINTF("Found SNI brdtype %02x\n", sni_brd_type); 159
160 sni_brd_type = *(unsigned char *)SNI_IDPROM_BRDTYPE;
161 cputype = *(unsigned char *)SNI_IDPROM_CPUTYPE;
162 switch (sni_brd_type) {
163 case SNI_BRD_TOWER_OASIC:
164 switch (cputype) {
165 case SNI_CPU_M8030:
166 systype = "RM400-330";
167 break;
168 case SNI_CPU_M8031:
169 systype = "RM400-430";
170 break;
171 case SNI_CPU_M8037:
172 systype = "RM400-530";
173 break;
174 case SNI_CPU_M8034:
175 systype = "RM400-730";
176 break;
177 default:
178 systype = "RM400-xxx";
179 break;
180 }
181 break;
182 case SNI_BRD_MINITOWER:
183 switch (cputype) {
184 case SNI_CPU_M8021:
185 case SNI_CPU_M8043:
186 systype = "RM400-120";
187 break;
188 case SNI_CPU_M8040:
189 systype = "RM400-220";
190 break;
191 case SNI_CPU_M8053:
192 systype = "RM400-225";
193 break;
194 case SNI_CPU_M8050:
195 systype = "RM400-420";
196 break;
197 default:
198 systype = "RM400-xxx";
199 break;
200 }
201 break;
202 case SNI_BRD_PCI_TOWER:
203 systype = "RM400-Cxx";
204 break;
205 case SNI_BRD_RM200:
206 systype = "RM200-xxx";
207 break;
208 case SNI_BRD_PCI_MTOWER:
209 systype = "RM300-Cxx";
210 break;
211 case SNI_BRD_PCI_DESKTOP:
212 switch (read_c0_prid() & 0xff00) {
213 case PRID_IMP_R4600:
214 case PRID_IMP_R4700:
215 systype = "RM200-C20";
216 break;
217 case PRID_IMP_R5000:
218 systype = "RM200-C40";
219 break;
220 default:
221 systype = "RM200-Cxx";
222 break;
223 }
224 break;
225 case SNI_BRD_PCI_TOWER_CPLUS:
226 systype = "RM400-Exx";
227 break;
228 case SNI_BRD_PCI_MTOWER_CPLUS:
229 systype = "RM300-Exx";
230 break;
231 }
232 pr_debug("Found SNI brdtype %02x name %s\n", sni_brd_type,systype);
144 233
145#ifdef DEBUG 234#ifdef DEBUG
146 sni_idprom_dump(); 235 sni_idprom_dump();
147#endif 236#endif
148 sni_mem_init(); 237 sni_mem_init();
238 sni_console_setup();
149 239
150 /* copy prom cmdline parameters to kernel cmdline */ 240 /* copy prom cmdline parameters to kernel cmdline */
151 for (i = 1; i < argc; i++) { 241 for (i = 1; i < argc; i++) {
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
new file mode 100644
index 000000000000..20028fc7757e
--- /dev/null
+++ b/arch/mips/sni/time.c
@@ -0,0 +1,148 @@
1#include <linux/types.h>
2#include <linux/interrupt.h>
3#include <linux/time.h>
4
5#include <asm/sni.h>
6#include <asm/time.h>
7
8#define SNI_CLOCK_TICK_RATE 3686400
9#define SNI_COUNTER2_DIV 64
10#define SNI_COUNTER0_DIV ((SNI_CLOCK_TICK_RATE / SNI_COUNTER2_DIV) / HZ)
11
12static void sni_a20r_timer_ack(void)
13{
14 *(volatile u8 *)A20R_PT_TIM0_ACK = 0x0; wmb();
15}
16
17/*
18 * a20r platform uses 2 counters to divide the input frequency.
19 * Counter 2 output is connected to Counter 0 & 1 input.
20 */
21static void __init sni_a20r_timer_setup(struct irqaction *irq)
22{
23 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0x34; wmb();
24 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = (SNI_COUNTER0_DIV) & 0xff; wmb();
25 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = (SNI_COUNTER0_DIV >> 8) & 0xff; wmb();
26
27 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0xb4; wmb();
28 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = (SNI_COUNTER2_DIV) & 0xff; wmb();
29 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = (SNI_COUNTER2_DIV >> 8) & 0xff; wmb();
30
31 setup_irq(SNI_A20R_IRQ_TIMER, irq);
32 mips_timer_ack = sni_a20r_timer_ack;
33}
34
35#define SNI_8254_TICK_RATE 1193182UL
36
37#define SNI_8254_TCSAMP_COUNTER ((SNI_8254_TICK_RATE / HZ) + 255)
38
39static __init unsigned long dosample(void)
40{
41 u32 ct0, ct1;
42 volatile u8 msb, lsb;
43
44 /* Start the counter. */
45 outb_p (0x34, 0x43);
46 outb_p(SNI_8254_TCSAMP_COUNTER & 0xff, 0x40);
47 outb (SNI_8254_TCSAMP_COUNTER >> 8, 0x40);
48
49 /* Get initial counter invariant */
50 ct0 = read_c0_count();
51
52 /* Latch and spin until top byte of counter0 is zero */
53 do {
54 outb (0x00, 0x43);
55 lsb = inb (0x40);
56 msb = inb (0x40);
57 ct1 = read_c0_count();
58 } while (msb);
59
60 /* Stop the counter. */
61 outb (0x38, 0x43);
62 /*
63 * Return the difference, this is how far the r4k counter increments
64 * for every 1/HZ seconds. We round off the nearest 1 MHz of master
65 * clock (= 1000000 / HZ / 2).
66 */
67 /*return (ct1 - ct0 + (500000/HZ/2)) / (500000/HZ) * (500000/HZ);*/
68 return (ct1 - ct0) / (500000/HZ) * (500000/HZ);
69}
70
71/*
72 * Here we need to calibrate the cycle counter to at least be close.
73 */
74__init void sni_cpu_time_init(void)
75{
76 unsigned long r4k_ticks[3];
77 unsigned long r4k_tick;
78
79 /*
80 * Figure out the r4k offset, the algorithm is very simple and works in
81 * _all_ cases as long as the 8254 counter register itself works ok (as
82 * an interrupt driving timer it does not because of bug, this is why
83 * we are using the onchip r4k counter/compare register to serve this
84 * purpose, but for r4k_offset calculation it will work ok for us).
85 * There are other very complicated ways of performing this calculation
86 * but this one works just fine so I am not going to futz around. ;-)
87 */
88 printk(KERN_INFO "Calibrating system timer... ");
89 dosample(); /* Prime cache. */
90 dosample(); /* Prime cache. */
91 /* Zero is NOT an option. */
92 do {
93 r4k_ticks[0] = dosample();
94 } while (!r4k_ticks[0]);
95 do {
96 r4k_ticks[1] = dosample();
97 } while (!r4k_ticks[1]);
98
99 if (r4k_ticks[0] != r4k_ticks[1]) {
100 printk("warning: timer counts differ, retrying... ");
101 r4k_ticks[2] = dosample();
102 if (r4k_ticks[2] == r4k_ticks[0]
103 || r4k_ticks[2] == r4k_ticks[1])
104 r4k_tick = r4k_ticks[2];
105 else {
106 printk("disagreement, using average... ");
107 r4k_tick = (r4k_ticks[0] + r4k_ticks[1]
108 + r4k_ticks[2]) / 3;
109 }
110 } else
111 r4k_tick = r4k_ticks[0];
112
113 printk("%d [%d.%04d MHz CPU]\n", (int) r4k_tick,
114 (int) (r4k_tick / (500000 / HZ)),
115 (int) (r4k_tick % (500000 / HZ)));
116
117 mips_hpt_frequency = r4k_tick * HZ;
118}
119
120/*
121 * R4k counter based timer interrupt. Works on RM200-225 and possibly
122 * others but not on RM400
123 */
124static void __init sni_cpu_timer_setup(struct irqaction *irq)
125{
126 setup_irq(SNI_MIPS_IRQ_CPU_TIMER, irq);
127}
128
129void __init plat_timer_setup(struct irqaction *irq)
130{
131 switch (sni_brd_type) {
132 case SNI_BRD_10:
133 case SNI_BRD_10NEW:
134 case SNI_BRD_TOWER_OASIC:
135 case SNI_BRD_MINITOWER:
136 sni_a20r_timer_setup (irq);
137 break;
138
139 case SNI_BRD_PCI_TOWER:
140 case SNI_BRD_RM200:
141 case SNI_BRD_PCI_MTOWER:
142 case SNI_BRD_PCI_DESKTOP:
143 case SNI_BRD_PCI_TOWER_CPLUS:
144 case SNI_BRD_PCI_MTOWER_CPLUS:
145 sni_cpu_timer_setup (irq);
146 break;
147 }
148}
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c
index e7f3e5b84dcf..3d25d010f3d5 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -416,7 +416,7 @@ static int tx4927_irq_nested(void)
416 416
417asmlinkage void plat_irq_dispatch(void) 417asmlinkage void plat_irq_dispatch(void)
418{ 418{
419 unsigned int pending = read_c0_status() & read_c0_cause(); 419 unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
420 420
421 if (pending & STATUSF_IP7) /* cpu timer */ 421 if (pending & STATUSF_IP7) /* cpu timer */
422 do_IRQ(TX4927_IRQ_CPU_TIMER); 422 do_IRQ(TX4927_IRQ_CPU_TIMER);
diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c
index 941c441729b0..c8e49feb345b 100644
--- a/arch/mips/tx4927/common/tx4927_setup.c
+++ b/arch/mips/tx4927/common/tx4927_setup.c
@@ -81,18 +81,8 @@ void __init tx4927_time_init(void)
81 81
82void __init plat_timer_setup(struct irqaction *irq) 82void __init plat_timer_setup(struct irqaction *irq)
83{ 83{
84 u32 count;
85 u32 c1;
86 u32 c2;
87
88 setup_irq(TX4927_IRQ_CPU_TIMER, irq); 84 setup_irq(TX4927_IRQ_CPU_TIMER, irq);
89 85
90 /* to generate the first timer interrupt */
91 c1 = read_c0_count();
92 count = c1 + (mips_hpt_frequency / HZ);
93 write_c0_compare(count);
94 c2 = read_c0_count();
95
96#ifdef CONFIG_TOSHIBA_RBTX4927 86#ifdef CONFIG_TOSHIBA_RBTX4927
97 { 87 {
98 extern void toshiba_rbtx4927_timer_setup(struct irqaction 88 extern void toshiba_rbtx4927_timer_setup(struct irqaction
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
index c1a377a80a5d..8a991f3c1a6f 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile
+++ b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
@@ -1,5 +1,3 @@
1obj-y += toshiba_rbtx4927_prom.o 1obj-y += toshiba_rbtx4927_prom.o
2obj-y += toshiba_rbtx4927_setup.o 2obj-y += toshiba_rbtx4927_setup.o
3obj-y += toshiba_rbtx4927_irq.o 3obj-y += toshiba_rbtx4927_irq.o
4
5EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index dcce88f403c9..5cc30c10e746 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -132,9 +132,6 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
132#include <asm/wbflush.h> 132#include <asm/wbflush.h>
133#include <linux/bootmem.h> 133#include <linux/bootmem.h>
134#include <linux/blkdev.h> 134#include <linux/blkdev.h>
135#ifdef CONFIG_RTC_DS1742
136#include <linux/ds1742rtc.h>
137#endif
138#ifdef CONFIG_TOSHIBA_FPCIB0 135#ifdef CONFIG_TOSHIBA_FPCIB0
139#include <asm/tx4927/smsc_fdc37m81x.h> 136#include <asm/tx4927/smsc_fdc37m81x.h>
140#endif 137#endif
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index 7316a78fdd68..0f7576dfd141 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -53,6 +53,7 @@
53#include <linux/pci.h> 53#include <linux/pci.h>
54#include <linux/timex.h> 54#include <linux/timex.h>
55#include <linux/pm.h> 55#include <linux/pm.h>
56#include <linux/platform_device.h>
56 57
57#include <asm/bootinfo.h> 58#include <asm/bootinfo.h>
58#include <asm/page.h> 59#include <asm/page.h>
@@ -64,9 +65,6 @@
64#include <asm/time.h> 65#include <asm/time.h>
65#include <linux/bootmem.h> 66#include <linux/bootmem.h>
66#include <linux/blkdev.h> 67#include <linux/blkdev.h>
67#ifdef CONFIG_RTC_DS1742
68#include <linux/ds1742rtc.h>
69#endif
70#ifdef CONFIG_TOSHIBA_FPCIB0 68#ifdef CONFIG_TOSHIBA_FPCIB0
71#include <asm/tx4927/smsc_fdc37m81x.h> 69#include <asm/tx4927/smsc_fdc37m81x.h>
72#endif 70#endif
@@ -1020,69 +1018,12 @@ void __init toshiba_rbtx4927_setup(void)
1020 "+\n"); 1018 "+\n");
1021} 1019}
1022 1020
1023#ifdef CONFIG_RTC_DS1742
1024extern unsigned long rtc_ds1742_get_time(void);
1025extern int rtc_ds1742_set_time(unsigned long);
1026extern void rtc_ds1742_wait(void);
1027#endif
1028
1029void __init 1021void __init
1030toshiba_rbtx4927_time_init(void) 1022toshiba_rbtx4927_time_init(void)
1031{ 1023{
1032 u32 c1;
1033 u32 c2;
1034
1035 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT, "-\n"); 1024 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT, "-\n");
1036 1025
1037#ifdef CONFIG_RTC_DS1742 1026 mips_hpt_frequency = tx4927_cpu_clock / 2;
1038
1039 rtc_mips_get_time = rtc_ds1742_get_time;
1040 rtc_mips_set_time = rtc_ds1742_set_time;
1041
1042 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1043 ":rtc_ds1742_init()-\n");
1044 rtc_ds1742_init(0xbc010000);
1045 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1046 ":rtc_ds1742_init()+\n");
1047
1048 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1049 ":Calibrate mips_hpt_frequency-\n");
1050 rtc_ds1742_wait();
1051
1052 /* get the count */
1053 c1 = read_c0_count();
1054
1055 /* wait for the seconds to change again */
1056 rtc_ds1742_wait();
1057
1058 /* get the count again */
1059 c2 = read_c0_count();
1060
1061 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1062 ":Calibrate mips_hpt_frequency+\n");
1063 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1064 ":c1=%12u\n", c1);
1065 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1066 ":c2=%12u\n", c2);
1067
1068 /* this diff is as close as we are going to get to counter ticks per sec */
1069 mips_hpt_frequency = abs(c2 - c1);
1070 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1071 ":f1=%12u\n", mips_hpt_frequency);
1072
1073 /* round to 1/10th of a MHz */
1074 mips_hpt_frequency /= (100 * 1000);
1075 mips_hpt_frequency *= (100 * 1000);
1076 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1077 ":f2=%12u\n", mips_hpt_frequency);
1078
1079 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_INFO,
1080 ":mips_hpt_frequency=%uHz (%uMHz)\n",
1081 mips_hpt_frequency,
1082 mips_hpt_frequency / 1000000);
1083#else
1084 mips_hpt_frequency = 100000000;
1085#endif
1086 1027
1087 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT, "+\n"); 1028 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT, "+\n");
1088 1029
@@ -1095,3 +1036,16 @@ void __init toshiba_rbtx4927_timer_setup(struct irqaction *irq)
1095 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIMER_SETUP, 1036 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIMER_SETUP,
1096 "+\n"); 1037 "+\n");
1097} 1038}
1039
1040static int __init toshiba_rbtx4927_rtc_init(void)
1041{
1042 struct resource res = {
1043 .start = 0x1c010000,
1044 .end = 0x1c010000 + 0x800 - 1,
1045 .flags = IORESOURCE_MEM,
1046 };
1047 struct platform_device *dev =
1048 platform_device_register_simple("ds1742", -1, &res, 1);
1049 return IS_ERR(dev) ? PTR_ERR(dev) : 0;
1050}
1051device_initcall(toshiba_rbtx4927_rtc_init);
diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c
index dc87d92bb08d..142abf453e40 100644
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -55,14 +55,5 @@ tx4938_time_init(void)
55 55
56void __init plat_timer_setup(struct irqaction *irq) 56void __init plat_timer_setup(struct irqaction *irq)
57{ 57{
58 u32 count;
59 u32 c1;
60 u32 c2;
61
62 setup_irq(TX4938_IRQ_CPU_TIMER, irq); 58 setup_irq(TX4938_IRQ_CPU_TIMER, irq);
63
64 c1 = read_c0_count();
65 count = c1 + (mips_hpt_frequency / HZ);
66 write_c0_compare(count);
67 c2 = read_c0_count();
68} 59}
diff --git a/arch/mips/vr41xx/Kconfig b/arch/mips/vr41xx/Kconfig
index 92f41f6f934a..8f4d3e74c230 100644
--- a/arch/mips/vr41xx/Kconfig
+++ b/arch/mips/vr41xx/Kconfig
@@ -1,6 +1,10 @@
1config CASIO_E55 1choice
2 bool "Support for CASIO CASSIOPEIA E-10/15/55/65" 2 prompt "Machine type"
3 depends on MACH_VR41XX 3 depends on MACH_VR41XX
4 default TANBAC_TB022X
5
6config CASIO_E55
7 bool "CASIO CASSIOPEIA E-10/15/55/65"
4 select DMA_NONCOHERENT 8 select DMA_NONCOHERENT
5 select IRQ_CPU 9 select IRQ_CPU
6 select ISA 10 select ISA
@@ -8,8 +12,7 @@ config CASIO_E55
8 select SYS_SUPPORTS_LITTLE_ENDIAN 12 select SYS_SUPPORTS_LITTLE_ENDIAN
9 13
10config IBM_WORKPAD 14config IBM_WORKPAD
11 bool "Support for IBM WorkPad z50" 15 bool "IBM WorkPad z50"
12 depends on MACH_VR41XX
13 select DMA_NONCOHERENT 16 select DMA_NONCOHERENT
14 select IRQ_CPU 17 select IRQ_CPU
15 select ISA 18 select ISA
@@ -17,26 +20,18 @@ config IBM_WORKPAD
17 select SYS_SUPPORTS_LITTLE_ENDIAN 20 select SYS_SUPPORTS_LITTLE_ENDIAN
18 21
19config NEC_CMBVR4133 22config NEC_CMBVR4133
20 bool "Support for NEC CMB-VR4133" 23 bool "NEC CMB-VR4133"
21 depends on MACH_VR41XX
22 select DMA_NONCOHERENT 24 select DMA_NONCOHERENT
23 select IRQ_CPU 25 select IRQ_CPU
24 select HW_HAS_PCI 26 select HW_HAS_PCI
25 select SYS_SUPPORTS_32BIT_KERNEL 27 select SYS_SUPPORTS_32BIT_KERNEL
26 select SYS_SUPPORTS_LITTLE_ENDIAN 28 select SYS_SUPPORTS_LITTLE_ENDIAN
27 29
28config ROCKHOPPER
29 bool "Support for Rockhopper baseboard"
30 depends on NEC_CMBVR4133
31 select I8259
32 select HAVE_STD_PC_SERIAL_PORT
33
34config TANBAC_TB022X 30config TANBAC_TB022X
35 bool "Support for TANBAC VR4131 multichip module and TANBAC VR4131DIMM" 31 bool "TANBAC VR4131 multichip module and TANBAC VR4131DIMM"
36 depends on MACH_VR41XX
37 select DMA_NONCOHERENT 32 select DMA_NONCOHERENT
38 select HW_HAS_PCI
39 select IRQ_CPU 33 select IRQ_CPU
34 select HW_HAS_PCI
40 select SYS_SUPPORTS_32BIT_KERNEL 35 select SYS_SUPPORTS_32BIT_KERNEL
41 select SYS_SUPPORTS_LITTLE_ENDIAN 36 select SYS_SUPPORTS_LITTLE_ENDIAN
42 help 37 help
@@ -46,40 +41,65 @@ config TANBAC_TB022X
46 Please refer to <http://www.tanbac.co.jp/> 41 Please refer to <http://www.tanbac.co.jp/>
47 about VR4131 multichip module and VR4131DIMM. 42 about VR4131 multichip module and VR4131DIMM.
48 43
49config TANBAC_TB0226 44config VICTOR_MPC30X
50 bool "Support for TANBAC Mbase(TB0226)" 45 bool "Victor MP-C303/304"
46 select DMA_NONCOHERENT
47 select IRQ_CPU
48 select HW_HAS_PCI
49 select PCI_VR41XX
50 select SYS_SUPPORTS_32BIT_KERNEL
51 select SYS_SUPPORTS_LITTLE_ENDIAN
52
53config ZAO_CAPCELLA
54 bool "ZAO Networks Capcella"
55 select DMA_NONCOHERENT
56 select IRQ_CPU
57 select HW_HAS_PCI
58 select PCI_VR41XX
59 select SYS_SUPPORTS_32BIT_KERNEL
60 select SYS_SUPPORTS_LITTLE_ENDIAN
61
62endchoice
63
64config ROCKHOPPER
65 bool "Support for Rockhopper base board"
66 depends on NEC_CMBVR4133
67 select PCI_VR41XX
68 select I8259
69 select HAVE_STD_PC_SERIAL_PORT
70
71choice
72 prompt "Base board type"
51 depends on TANBAC_TB022X 73 depends on TANBAC_TB022X
74 default TANBAC_TB0287
75
76config TANBAC_TB0219
77 bool "TANBAC DIMM Evaluation Kit(TB0219)"
52 select GPIO_VR41XX 78 select GPIO_VR41XX
79 select PCI_VR41XX
80 help
81 The TANBAC DIMM Evaluation Kit(TB0219) is a MIPS-based platform
82 manufactured by TANBAC.
83 Please refer to <http://www.tanbac.co.jp/> about DIMM Evaluation Kit.
84
85config TANBAC_TB0226
86 bool "TANBAC Mbase(TB0226)"
87 select GPIO_VR41XX
88 select PCI_VR41XX
53 help 89 help
54 The TANBAC Mbase(TB0226) is a MIPS-based platform 90 The TANBAC Mbase(TB0226) is a MIPS-based platform
55 manufactured by TANBAC. 91 manufactured by TANBAC.
56 Please refer to <http://www.tanbac.co.jp/> about Mbase. 92 Please refer to <http://www.tanbac.co.jp/> about Mbase.
57 93
58config TANBAC_TB0287 94config TANBAC_TB0287
59 bool "Support for TANBAC Mini-ITX DIMM base(TB0287)" 95 bool "TANBAC Mini-ITX DIMM base(TB0287)"
60 depends on TANBAC_TB022X 96 select PCI_VR41XX
61 help 97 help
62 The TANBAC Mini-ITX DIMM base(TB0287) is a MIPS-based platform 98 The TANBAC Mini-ITX DIMM base(TB0287) is a MIPS-based platform
63 manufactured by TANBAC. 99 manufactured by TANBAC.
64 Please refer to <http://www.tanbac.co.jp/> about Mini-ITX DIMM base. 100 Please refer to <http://www.tanbac.co.jp/> about Mini-ITX DIMM base.
65 101
66config VICTOR_MPC30X 102endchoice
67 bool "Support for Victor MP-C303/304"
68 depends on MACH_VR41XX
69 select DMA_NONCOHERENT
70 select HW_HAS_PCI
71 select IRQ_CPU
72 select SYS_SUPPORTS_32BIT_KERNEL
73 select SYS_SUPPORTS_LITTLE_ENDIAN
74
75config ZAO_CAPCELLA
76 bool "Support for ZAO Networks Capcella"
77 depends on MACH_VR41XX
78 select DMA_NONCOHERENT
79 select HW_HAS_PCI
80 select IRQ_CPU
81 select SYS_SUPPORTS_32BIT_KERNEL
82 select SYS_SUPPORTS_LITTLE_ENDIAN
83 103
84config PCI_VR41XX 104config PCI_VR41XX
85 bool "Add PCI control unit support of NEC VR4100 series" 105 bool "Add PCI control unit support of NEC VR4100 series"
diff --git a/arch/mips/vr41xx/common/Makefile b/arch/mips/vr41xx/common/Makefile
index 975d5caf9d1b..f842783acd86 100644
--- a/arch/mips/vr41xx/common/Makefile
+++ b/arch/mips/vr41xx/common/Makefile
@@ -3,5 +3,3 @@
3# 3#
4 4
5obj-y += bcu.o cmu.o icu.o init.o irq.o pmu.o type.o 5obj-y += bcu.o cmu.o icu.o init.o irq.o pmu.o type.o
6
7EXTRA_AFLAGS := $(CFLAGS)
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-07 00:52:46 -0500