/[linux-patches]/genpatches-2.6/trunk/2.6.14-pre/1361_sparc-kconfig-rework.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.14-pre/1361_sparc-kconfig-rework.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 111 - (show annotations) (download)
Sun Jul 24 21:30:24 2005 UTC (13 years, 3 months ago) by eradicator
Original Path: genpatches-2.6/trunk/2.6.13-pre/1361_sparc-kconfig-rework.patch
File size: 40321 byte(s)
More Kconfig cleanup.
1 diff -Naurp linux-2.6.13-rc3-git4/arch/sparc/Kconfig linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig
2 --- linux-2.6.13-rc3-git4/arch/sparc/Kconfig 2005-07-18 18:00:39.812719000 -0700
3 +++ linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig 2005-07-24 13:35:15.368325289 -0700
4 @@ -5,15 +5,25 @@
5
6 mainmenu "Linux/SPARC Kernel Configuration"
7
8 -config MMU
9 +# Identify this as a Sparc32 build
10 +config SPARC32
11 bool
12 default y
13 + help
14 + SPARC is a family of RISC microprocessors designed and marketed by
15 + Sun Microsystems, incorporated. They are very widely found in Sun
16 + workstations and clones. This port covers the original 32-bit SPARC;
17 + it is old and stable and usually considered one of the "big three"
18 + along with the Intel and Alpha ports. The UltraLinux project
19 + maintains both the SPARC32 and SPARC64 ports; its web page is
20 + available at <http://www.ultralinux.org/>.
21
22 -config UID16
23 +# Global things across all Sun machines.
24 +config MMU
25 bool
26 default y
27
28 -config HIGHMEM
29 +config UID16
30 bool
31 default y
32
33 @@ -23,66 +33,36 @@ config GENERIC_ISA_DMA
34
35 source "init/Kconfig"
36
37 -menu "General machine setup"
38
39 -config VT
40 - bool
41 - select INPUT
42 - default y
43 - ---help---
44 - If you say Y here, you will get support for terminal devices with
45 - display and keyboard devices. These are called "virtual" because you
46 - can run several virtual terminals (also called virtual consoles) on
47 - one physical terminal. This is rather useful, for example one
48 - virtual terminal can collect system messages and warnings, another
49 - one can be used for a text-mode user session, and a third could run
50 - an X session, all in parallel. Switching between virtual terminals
51 - is done with certain key combinations, usually Alt-<function key>.
52 -
53 - The setterm command ("man setterm") can be used to change the
54 - properties (such as colors or beeping) of a virtual terminal. The
55 - man page console_codes(4) ("man console_codes") contains the special
56 - character sequences that can be used to change those properties
57 - directly. The fonts used on virtual terminals can be changed with
58 - the setfont ("man setfont") command and the key bindings are defined
59 - with the loadkeys ("man loadkeys") command.
60 -
61 - You need at least one virtual terminal device in order to make use
62 - of your keyboard and monitor. Therefore, only people configuring an
63 - embedded system would want to say N here in order to save some
64 - memory; the only way to log into such a system is then via a serial
65 - or network connection.
66 +menu "Processor type and features"
67
68 - If unsure, say Y, or else you won't be able to do much with your new
69 - shiny Linux system :-)
70 +choice
71 + prompt "Subarchitecture Type"
72 + default SUN4CDM
73
74 -config VT_CONSOLE
75 - bool
76 - default y
77 - ---help---
78 - The system console is the device which receives all kernel messages
79 - and warnings and which allows logins in single user mode. If you
80 - answer Y here, a virtual terminal (the device used to interact with
81 - a physical terminal) can be used as system console. This is the most
82 - common mode of operations, so you should say Y here unless you want
83 - the kernel messages be output only to a serial port (in which case
84 - you should say Y to "Console on serial port", below).
85 -
86 - If you do say Y here, by default the currently visible virtual
87 - terminal (/dev/tty0) will be used as system console. You can change
88 - that with a kernel command line option such as "console=tty3" which
89 - would use the third virtual terminal as system console. (Try "man
90 - bootparam" or see the documentation of your boot loader (lilo or
91 - loadlin) about how to pass options to the kernel at boot time.)
92 +config SUN4CDM
93 + bool "sun4c/d/m"
94 + help
95 + Choose this option if your system is a SPARCstation 1, 1+, 2,
96 + IPC, IPX, classic, LX, ZX, 4, 5, 10, 20, or a compatible clone,
97 + or a SPARCserver 1000[E] or SPARCcenter 2000[E]. Most everyone
98 + wants this.
99
100 - If unsure, say Y.
101 + Kernels compiled with this option will not boot on sun4 machines.
102
103 -config HW_CONSOLE
104 - bool
105 - default y
106 +config SUN4
107 + bool "sun4"
108 + help
109 + Choose this option if, and only if, your machine is a sun4,
110 + such as a 4/330.
111 +
112 + Kernels compiled with this option will boot only on sun4.
113 + (And this version will probably work only on sun4/330.)
114 +
115 +endchoice
116
117 config SMP
118 - bool "Symmetric multi-processing support (does not work on sun4/sun4c)"
119 + bool "Symmetric multi-processing support"
120 depends on BROKEN
121 ---help---
122 This enables support for systems with more than one CPU. If you have
123 @@ -110,122 +90,96 @@ config NR_CPUS
124 range 2 32
125 depends on SMP
126 default "32"
127 + help
128 + This allows you to specify the maximum number of CPUs which this
129 + kernel will support. The maximum supported value is 255 and the
130 + minimum value which makes sense is 2.
131 +
132 + This is purely to save memory - each supported CPU adds
133 + approximately eight kilobytes to the kernel image.
134 +
135 +config PREEMPT
136 + bool "Preemptible Kernel"
137 + help
138 + This option reduces the latency of the kernel when reacting to
139 + real-time or interactive events by allowing a low priority process to
140 + be preempted even if it is in kernel mode executing a system call.
141 + This allows applications to run more reliably even when the system is
142 + under load.
143
144 -# Identify this as a Sparc32 build
145 -config SPARC32
146 + Say Y here if you are building a kernel for a desktop, embedded
147 + or real-time system. Say N if you are unsure.
148 +
149 +config HIGHMEM
150 bool
151 default y
152 - help
153 - SPARC is a family of RISC microprocessors designed and marketed by
154 - Sun Microsystems, incorporated. They are very widely found in Sun
155 - workstations and clones. This port covers the original 32-bit SPARC;
156 - it is old and stable and usually considered one of the "big three"
157 - along with the Intel and Alpha ports. The UltraLinux project
158 - maintains both the SPARC32 and SPARC64 ports; its web page is
159 - available at <http://www.ultralinux.org/>.
160
161 -# Global things across all Sun machines.
162 -config ISA
163 +config RWSEM_GENERIC_SPINLOCK
164 bool
165 - help
166 - ISA is found on Espresso only and is not supported currently.
167 - Say N
168 + default y
169
170 -config EISA
171 +config RWSEM_XCHGADD_ALGORITHM
172 bool
173 - help
174 - EISA is not supported.
175 - Say N
176
177 -config MCA
178 - bool
179 - help
180 - MCA is not supported.
181 - Say N
182 +source "mm/Kconfig"
183
184 -config PCMCIA
185 - tristate
186 - ---help---
187 - Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
188 - computer. These are credit-card size devices such as network cards,
189 - modems or hard drives often used with laptops computers. There are
190 - actually two varieties of these cards: the older 16 bit PCMCIA cards
191 - and the newer 32 bit CardBus cards. If you want to use CardBus
192 - cards, you need to say Y here and also to "CardBus support" below.
193 -
194 - To use your PC-cards, you will need supporting software from David
195 - Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
196 - for location). Please also read the PCMCIA-HOWTO, available from
197 - <http://www.tldp.org/docs.html#howto>.
198 +endmenu
199
200 - To compile this driver as modules, choose M here: the
201 - modules will be called pcmcia_core and ds.
202 +source "net/Kconfig"
203
204 -config SBUS
205 - bool
206 - default y
207 +source "drivers/Kconfig"
208 +
209 +menu "Power Management Support"
210 +
211 +source kernel/power/Kconfig
212
213 -config SBUSCHAR
214 +config GENERIC_CALIBRATE_DELAY
215 bool
216 default y
217
218 -config SERIAL_CONSOLE
219 - bool
220 +config SUN_PM
221 + depends on PM
222 + bool "Sun power management support"
223 default y
224 - ---help---
225 - If you say Y here, it will be possible to use a serial port as the
226 - system console (the system console is the device which receives all
227 - kernel messages and warnings and which allows logins in single user
228 - mode). This could be useful if some terminal or printer is connected
229 - to that serial port.
230 -
231 - Even if you say Y here, the currently visible virtual console
232 - (/dev/tty0) will still be used as the system console by default, but
233 - you can alter that using a kernel command line option such as
234 - "console=ttyS1". (Try "man bootparam" or see the documentation of
235 - your boot loader (silo) about how to pass options to the kernel at
236 - boot time.)
237 -
238 - If you don't have a graphics card installed and you say Y here, the
239 - kernel will automatically use the first serial line, /dev/ttyS0, as
240 - system console.
241 + help
242 + Enable power management and CPU standby features on supported
243 + SPARC platforms. This includes at least the SS4/5 and Voyager.
244
245 - If unsure, say N.
246 + It is safe to say Y.
247
248 -config SUN_AUXIO
249 +endmenu
250 +
251 +menu "Bus options (PCI, SBUS, ...)"
252 +
253 +config SBUS
254 bool
255 default y
256
257 -config SUN_IO
258 +config SUN_AUXIO
259 bool
260 default y
261
262 -config RWSEM_GENERIC_SPINLOCK
263 +config SUN_IO
264 bool
265 default y
266
267 -config RWSEM_XCHGADD_ALGORITHM
268 +config ISA
269 bool
270 + help
271 + ISA is found on Espresso only and is not supported currently.
272 + Say N
273
274 -config GENERIC_CALIBRATE_DELAY
275 +config EISA
276 bool
277 - default y
278 + help
279 + EISA is not supported.
280 + Say N
281
282 -config SUN_PM
283 +config MCA
284 bool
285 - default y
286 help
287 - Enable power management and CPU standby features on supported
288 - SPARC platforms.
289 -
290 -config SUN4
291 - bool "Support for SUN4 machines (disables SUN4[CDM] support)"
292 - depends on !SMP
293 - default n
294 - help
295 - Say Y here if, and only if, your machine is a sun4. Note that
296 - a kernel compiled with this option will run only on sun4.
297 - (And the current version will probably work only on sun4/330.)
298 + MCA is not supported.
299 + Say N
300
301 if !SUN4
302
303 @@ -240,90 +194,47 @@ source "drivers/pci/Kconfig"
304
305 endif
306
307 -config SUN_OPENPROMFS
308 - tristate "Openprom tree appears in /proc/openprom"
309 - help
310 - If you say Y, the OpenPROM device tree will be available as a
311 - virtual file system, which you can mount to /proc/openprom by "mount
312 - -t openpromfs none /proc/openprom".
313 +config HOTPLUG
314 + depends on BROKEN
315 + bool "Support for hot-pluggable devices"
316 + ---help---
317 + Say Y here if you want to plug devices into your computer while
318 + the system is running, and be able to use them quickly. In many
319 + cases, the devices can likewise be unplugged at any time too.
320 +
321 + One well known example of this is PCMCIA- or PC-cards, credit-card
322 + size devices such as network cards, modems or hard drives which are
323 + plugged into slots found on all modern laptop computers. Another
324 + example, used on modern desktops as well as laptops, is USB.
325 +
326 + Enable HOTPLUG and KMOD, and build a modular kernel. Get agent
327 + software (at <http://linux-hotplug.sourceforge.net/>) and install it.
328 + Then your kernel will automatically call out to a user mode "policy
329 + agent" (/sbin/hotplug) to load modules and set up software needed
330 + to use devices as you hotplug them.
331
332 - To compile the /proc/openprom support as a module, choose M here: the
333 - module will be called openpromfs.
334 +source "drivers/pcmcia/Kconfig"
335 +
336 +source "drivers/pci/hotplug/Kconfig"
337 +
338 +endmenu
339
340 - Only choose N if you know in advance that you will not need to modify
341 - OpenPROM settings on the running system.
342 +menu "Executable file formats"
343
344 source "fs/Kconfig.binfmt"
345
346 config SUNOS_EMUL
347 + select BINFMT_AOUT
348 bool "SunOS binary emulation"
349 help
350 This allows you to run most SunOS binaries. If you want to do this,
351 say Y here and place appropriate files in /usr/gnemul/sunos. See
352 - <http://www.ultralinux.org/faq.html> for more information. If you
353 - want to run SunOS binaries on an Ultra you must also say Y to
354 - "Kernel support for 32-bit a.out binaries" above.
355 -
356 -source "mm/Kconfig"
357 + <http://www.ultralinux.org/faq.html> for more information.
358
359 endmenu
360
361 -source "net/Kconfig"
362 -
363 source "drivers/Kconfig"
364
365 -if !SUN4
366 -source "drivers/sbus/char/Kconfig"
367 -endif
368 -
369 -# This one must be before the filesystem configs. -DaveM
370 -
371 -menu "Unix98 PTY support"
372 -
373 -config UNIX98_PTYS
374 - bool "Unix98 PTY support"
375 - ---help---
376 - A pseudo terminal (PTY) is a software device consisting of two
377 - halves: a master and a slave. The slave device behaves identical to
378 - a physical terminal; the master device is used by a process to
379 - read data from and write data to the slave, thereby emulating a
380 - terminal. Typical programs for the master side are telnet servers
381 - and xterms.
382 -
383 - Linux has traditionally used the BSD-like names /dev/ptyxx for
384 - masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
385 - has a number of problems. The GNU C library glibc 2.1 and later,
386 - however, supports the Unix98 naming standard: in order to acquire a
387 - pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
388 - terminal is then made available to the process and the pseudo
389 - terminal slave can be accessed as /dev/pts/<number>. What was
390 - traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
391 -
392 - The entries in /dev/pts/ are created on the fly by a virtual
393 - file system; therefore, if you say Y here you should say Y to
394 - "/dev/pts file system for Unix98 PTYs" as well.
395 -
396 - If you want to say Y here, you need to have the C library glibc 2.1
397 - or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*").
398 - Read the instructions in <file:Documentation/Changes> pertaining to
399 - pseudo terminals. It's safe to say N.
400 -
401 -config UNIX98_PTY_COUNT
402 - int "Maximum number of Unix98 PTYs in use (0-2048)"
403 - depends on UNIX98_PTYS
404 - default "256"
405 - help
406 - The maximum number of Unix98 PTYs that can be used at any one time.
407 - The default is 256, and should be enough for desktop systems. Server
408 - machines which support incoming telnet/rlogin/ssh connections and/or
409 - serve several X terminals may want to increase this: every incoming
410 - connection and every xterm uses up one PTY.
411 -
412 - When not in use, each additional set of 256 PTYs occupy
413 - approximately 8 KB of kernel memory on 32-bit architectures.
414 -
415 -endmenu
416 -
417 source "fs/Kconfig"
418
419 source "arch/sparc/Kconfig.debug"
420 @@ -333,3 +244,4 @@ source "security/Kconfig"
421 source "crypto/Kconfig"
422
423 source "lib/Kconfig"
424 +
425 diff -Naurp linux-2.6.13-rc3-git4/arch/sparc/Kconfig.debug linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig.debug
426 --- linux-2.6.13-rc3-git4/arch/sparc/Kconfig.debug 2005-06-17 12:48:29.000000000 -0700
427 +++ linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig.debug 1969-12-31 16:00:00.000000000 -0800
428 @@ -1,14 +0,0 @@
429 -menu "Kernel hacking"
430 -
431 -source "lib/Kconfig.debug"
432 -
433 -config DEBUG_STACK_USAGE
434 - bool "Enable stack utilization instrumentation"
435 - depends on DEBUG_KERNEL
436 - help
437 - Enables the display of the minimum amount of free stack which each
438 - task has ever had available in the sysrq-T and sysrq-P debug output.
439 -
440 - This option will slow down process creation somewhat.
441 -
442 -endmenu
443 diff -Naurp linux-2.6.13-rc3-git4/arch/sparc64/Kconfig linux-2.6.13-rc3-git4-gentoo/arch/sparc64/Kconfig
444 --- linux-2.6.13-rc3-git4/arch/sparc64/Kconfig 2005-07-18 18:00:39.839714000 -0700
445 +++ linux-2.6.13-rc3-git4-gentoo/arch/sparc64/Kconfig 2005-07-24 13:35:15.447312335 -0700
446 @@ -5,6 +5,17 @@
447
448 mainmenu "Linux/UltraSPARC Kernel Configuration"
449
450 +# Identify this as a Sparc64 build
451 +config SPARC64
452 + bool
453 + default y
454 + help
455 + SPARC is a family of RISC microprocessors designed and marketed by
456 + Sun Microsystems, incorporated. This port covers the newer 64-bit
457 + UltraSPARC. The UltraLinux project maintains both the SPARC32 and
458 + SPARC64 ports; its web page is available at
459 + <http://www.ultralinux.org/>.
460 +
461 config 64BIT
462 def_bool y
463
464 @@ -12,10 +23,23 @@ config MMU
465 bool
466 default y
467
468 +config GENERIC_ISA_DMA
469 + bool
470 + default y
471 +
472 config TIME_INTERPOLATION
473 bool
474 default y
475
476 +source "init/Kconfig"
477 +
478 +config SYSVIPC_COMPAT
479 + bool
480 + depends on COMPAT && SYSVIPC
481 + default y
482 +
483 +menu "Processor type and features"
484 +
485 choice
486 prompt "Kernel page size"
487 default SPARC64_PAGE_SIZE_8KB
488 @@ -62,84 +86,6 @@ config SECCOMP
489
490 source kernel/Kconfig.hz
491
492 -source "init/Kconfig"
493 -
494 -config SYSVIPC_COMPAT
495 - bool
496 - depends on COMPAT && SYSVIPC
497 - default y
498 -
499 -menu "General machine setup"
500 -
501 -config BBC_I2C
502 - tristate "UltraSPARC-III bootbus i2c controller driver"
503 - depends on PCI
504 - help
505 - The BBC devices on the UltraSPARC III have two I2C controllers. The
506 - first I2C controller connects mainly to configuration PROMs (NVRAM,
507 - CPU configuration, DIMM types, etc.). The second I2C controller
508 - connects to environmental control devices such as fans and
509 - temperature sensors. The second controller also connects to the
510 - smartcard reader, if present. Say Y to enable support for these.
511 -
512 -config VT
513 - bool "Virtual terminal" if EMBEDDED
514 - select INPUT
515 - default y
516 - ---help---
517 - If you say Y here, you will get support for terminal devices with
518 - display and keyboard devices. These are called "virtual" because you
519 - can run several virtual terminals (also called virtual consoles) on
520 - one physical terminal. This is rather useful, for example one
521 - virtual terminal can collect system messages and warnings, another
522 - one can be used for a text-mode user session, and a third could run
523 - an X session, all in parallel. Switching between virtual terminals
524 - is done with certain key combinations, usually Alt-<function key>.
525 -
526 - The setterm command ("man setterm") can be used to change the
527 - properties (such as colors or beeping) of a virtual terminal. The
528 - man page console_codes(4) ("man console_codes") contains the special
529 - character sequences that can be used to change those properties
530 - directly. The fonts used on virtual terminals can be changed with
531 - the setfont ("man setfont") command and the key bindings are defined
532 - with the loadkeys ("man loadkeys") command.
533 -
534 - You need at least one virtual terminal device in order to make use
535 - of your keyboard and monitor. Therefore, only people configuring an
536 - embedded system would want to say N here in order to save some
537 - memory; the only way to log into such a system is then via a serial
538 - or network connection.
539 -
540 - If unsure, say Y, or else you won't be able to do much with your new
541 - shiny Linux system :-)
542 -
543 -config VT_CONSOLE
544 - bool "Support for console on virtual terminal" if EMBEDDED
545 - depends on VT
546 - default y
547 - ---help---
548 - The system console is the device which receives all kernel messages
549 - and warnings and which allows logins in single user mode. If you
550 - answer Y here, a virtual terminal (the device used to interact with
551 - a physical terminal) can be used as system console. This is the most
552 - common mode of operations, so you should say Y here unless you want
553 - the kernel messages be output only to a serial port (in which case
554 - you should say Y to "Console on serial port", below).
555 -
556 - If you do say Y here, by default the currently visible virtual
557 - terminal (/dev/tty0) will be used as system console. You can change
558 - that with a kernel command line option such as "console=tty3" which
559 - would use the third virtual terminal as system console. (Try "man
560 - bootparam" or see the documentation of your boot loader (lilo or
561 - loadlin) about how to pass options to the kernel at boot time.)
562 -
563 - If unsure, say Y.
564 -
565 -config HW_CONSOLE
566 - bool
567 - depends on VT
568 - default y
569 -
570 config SMP
571 bool "Symmetric multi-processing support"
572 ---help---
573 @@ -205,25 +151,6 @@ config US2E_FREQ
574
575 If in doubt, say N.
576
577 -# Identify this as a Sparc64 build
578 -config SPARC64
579 - bool
580 - default y
581 - help
582 - SPARC is a family of RISC microprocessors designed and marketed by
583 - Sun Microsystems, incorporated. This port covers the newer 64-bit
584 - UltraSPARC. The UltraLinux project maintains both the SPARC32 and
585 - SPARC64 ports; its web page is available at
586 - <http://www.ultralinux.org/>.
587 -
588 -# Global things across all Sun machines.
589 -config RWSEM_GENERIC_SPINLOCK
590 - bool
591 -
592 -config RWSEM_XCHGADD_ALGORITHM
593 - bool
594 - default y
595 -
596 config GENERIC_CALIBRATE_DELAY
597 bool
598 default y
599 @@ -246,7 +173,29 @@ config HUGETLB_PAGE_SIZE_64K
600
601 endchoice
602
603 -config GENERIC_ISA_DMA
604 +# Global things across all Sun machines.
605 +config RWSEM_GENERIC_SPINLOCK
606 + bool
607 +
608 +config RWSEM_XCHGADD_ALGORITHM
609 + bool
610 + default y
611 +
612 +source "mm/Kconfig"
613 +
614 +endmenu
615 +
616 +menu "Bus options (PCI, SBUS, PCMCIA, ...)"
617 +
618 +config SBUS
619 + bool
620 + default y
621 +
622 +config SUN_AUXIO
623 + bool
624 + default y
625 +
626 +config SUN_IO
627 bool
628 default y
629
630 @@ -293,40 +242,6 @@ config MCA
631 <file:Documentation/mca.txt> (and especially the web page given
632 there) before attempting to build an MCA bus kernel.
633
634 -config PCMCIA
635 - tristate
636 - ---help---
637 - Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
638 - computer. These are credit-card size devices such as network cards,
639 - modems or hard drives often used with laptops computers. There are
640 - actually two varieties of these cards: the older 16 bit PCMCIA cards
641 - and the newer 32 bit CardBus cards. If you want to use CardBus
642 - cards, you need to say Y here and also to "CardBus support" below.
643 -
644 - To use your PC-cards, you will need supporting software from David
645 - Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
646 - for location). Please also read the PCMCIA-HOWTO, available from
647 - <http://www.tldp.org/docs.html#howto>.
648 -
649 - To compile this driver as modules, choose M here: the
650 - modules will be called pcmcia_core and ds.
651 -
652 -config SBUS
653 - bool
654 - default y
655 -
656 -config SBUSCHAR
657 - bool
658 - default y
659 -
660 -config SUN_AUXIO
661 - bool
662 - default y
663 -
664 -config SUN_IO
665 - bool
666 - default y
667 -
668 config PCI
669 bool "PCI support"
670 help
671 @@ -344,44 +259,31 @@ config PCI_DOMAINS
672 bool
673 default PCI
674
675 -config RTC
676 - tristate
677 - depends on PCI
678 - default y
679 - ---help---
680 - If you say Y here and create a character special file /dev/rtc with
681 - major number 10 and minor number 135 using mknod ("man mknod"), you
682 - will get access to the real time clock (or hardware clock) built
683 - into your computer.
684 -
685 - Every PC has such a clock built in. It can be used to generate
686 - signals from as low as 1Hz up to 8192Hz, and can also be used
687 - as a 24 hour alarm. It reports status information via the file
688 - /proc/driver/rtc and its behaviour is set by various ioctls on
689 - /dev/rtc.
690 -
691 - If you run Linux on a multiprocessor machine and said Y to
692 - "Symmetric Multi Processing" above, you should say Y here to read
693 - and set the RTC in an SMP compatible fashion.
694 -
695 - If you think you have a use for such a device (such as periodic data
696 - sampling), then say Y here, and read <file:Documentation/rtc.txt>
697 - for details.
698 +source "drivers/pci/Kconfig"
699
700 - To compile this driver as a module, choose M here: the
701 - module will be called rtc.
702 +config HOTPLUG
703 + bool "Support for hot-pluggable devices"
704 + ---help---
705 + Say Y here if you want to plug devices into your computer while
706 + the system is running, and be able to use them quickly. In many
707 + cases, the devices can likewise be unplugged at any time too.
708 +
709 + One well known example of this is PCMCIA- or PC-cards, credit-card
710 + size devices such as network cards, modems or hard drives which are
711 + plugged into slots found on all modern laptop computers. Another
712 + example, used on modern desktops as well as laptops, is USB.
713 +
714 + Enable HOTPLUG and KMOD, and build a modular kernel. Get agent
715 + software (at <http://linux-hotplug.sourceforge.net/>) and install it.
716 + Then your kernel will automatically call out to a user mode "policy
717 + agent" (/sbin/hotplug) to load modules and set up software needed
718 + to use devices as you hotplug them.
719
720 -source "drivers/pci/Kconfig"
721 +endmenu
722
723 -config SUN_OPENPROMFS
724 - tristate "Openprom tree appears in /proc/openprom"
725 - help
726 - If you say Y, the OpenPROM device tree will be available as a
727 - virtual file system, which you can mount to /proc/openprom by "mount
728 - -t openpromfs none /proc/openprom".
729 +menu "Executable file formats"
730
731 - To compile the /proc/openprom support as a module, choose M here: the
732 - module will be called openpromfs. If unsure, choose M.
733 +source "fs/Kconfig.binfmt"
734
735 config SPARC32_COMPAT
736 bool "Kernel support for Linux/Sparc 32bit binary compatibility"
737 @@ -414,17 +316,14 @@ config BINFMT_AOUT32
738 If you want to run SunOS binaries (see SunOS binary emulation below)
739 or other a.out binaries, say Y. If unsure, say N.
740
741 -source "fs/Kconfig.binfmt"
742 -
743 config SUNOS_EMUL
744 + select BINFMT_AOUT32
745 + depends on SPARC32_COMPAT
746 bool "SunOS binary emulation"
747 - depends on BINFMT_AOUT32
748 help
749 This allows you to run most SunOS binaries. If you want to do this,
750 say Y here and place appropriate files in /usr/gnemul/sunos. See
751 - <http://www.ultralinux.org/faq.html> for more information. If you
752 - want to run SunOS binaries on an Ultra you must also say Y to
753 - "Kernel support for 32-bit a.out binaries" above.
754 + <http://www.ultralinux.org/faq.html> for more information.
755
756 config SOLARIS_EMUL
757 tristate "Solaris binary emulation (EXPERIMENTAL)"
758 @@ -436,75 +335,6 @@ config SOLARIS_EMUL
759 To compile this code as a module, choose M here: the
760 module will be called solaris.
761
762 -source "drivers/parport/Kconfig"
763 -
764 -config PRINTER
765 - tristate "Parallel printer support"
766 - depends on PARPORT
767 - ---help---
768 - If you intend to attach a printer to the parallel port of your Linux
769 - box (as opposed to using a serial printer; if the connector at the
770 - printer has 9 or 25 holes ["female"], then it's serial), say Y.
771 - Also read the Printing-HOWTO, available from
772 - <http://www.tldp.org/docs.html#howto>.
773 -
774 - It is possible to share one parallel port among several devices
775 - (e.g. printer and ZIP drive) and it is safe to compile the
776 - corresponding drivers into the kernel.
777 - To compile this driver as a module, choose M here and read
778 - <file:Documentation/parport.txt>. The module will be called lp.
779 -
780 - If you have several parallel ports, you can specify which ports to
781 - use with the "lp" kernel command line option. (Try "man bootparam"
782 - or see the documentation of your boot loader (lilo or loadlin) about
783 - how to pass options to the kernel at boot time.) The syntax of the
784 - "lp" command line option can be found in <file:drivers/char/lp.c>.
785 -
786 - If you have more than 8 printers, you need to increase the LP_NO
787 - macro in lp.c and the PARPORT_MAX macro in parport.h.
788 -
789 -config PPDEV
790 - tristate "Support for user-space parallel port device drivers"
791 - depends on PARPORT
792 - ---help---
793 - Saying Y to this adds support for /dev/parport device nodes. This
794 - is needed for programs that want portable access to the parallel
795 - port, for instance deviceid (which displays Plug-and-Play device
796 - IDs).
797 -
798 - This is the parallel port equivalent of SCSI generic support (sg).
799 - It is safe to say N to this -- it is not needed for normal printing
800 - or parallel port CD-ROM/disk support.
801 -
802 - To compile this driver as a module, choose M here: the
803 - module will be called ppdev.
804 -
805 - If unsure, say N.
806 -
807 -config ENVCTRL
808 - tristate "SUNW, envctrl support"
809 - depends on PCI
810 - help
811 - Kernel support for temperature and fan monitoring on Sun SME
812 - machines.
813 -
814 - To compile this driver as a module, choose M here: the
815 - module will be called envctrl.
816 -
817 -config DISPLAY7SEG
818 - tristate "7-Segment Display support"
819 - depends on PCI
820 - ---help---
821 - This is the driver for the 7-segment display and LED present on
822 - Sun Microsystems CompactPCI models CP1400 and CP1500.
823 -
824 - To compile this driver as a module, choose M here: the
825 - module will be called display7seg.
826 -
827 - If you do not have a CompactPCI model CP1400 or CP1500, or
828 - another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
829 - you should say N to this option.
830 -
831 config CMDLINE_BOOL
832 bool "Default bootloader kernel arguments"
833
834 @@ -521,148 +351,14 @@ config CMDLINE
835
836 NOTE: This option WILL override the PROM bootargs setting!
837
838 -source "mm/Kconfig"
839 -
840 endmenu
841
842 source "net/Kconfig"
843
844 -source "drivers/base/Kconfig"
845 -
846 -source "drivers/video/Kconfig"
847 -
848 -source "drivers/serial/Kconfig"
849 -
850 -source "drivers/sbus/char/Kconfig"
851 -
852 -source "drivers/mtd/Kconfig"
853 -
854 -source "drivers/block/Kconfig"
855 -
856 -source "drivers/ide/Kconfig"
857 -
858 -source "drivers/scsi/Kconfig"
859 -
860 -source "drivers/fc4/Kconfig"
861 -
862 -source "drivers/md/Kconfig"
863 -
864 -if PCI
865 -source "drivers/message/fusion/Kconfig"
866 -endif
867 -
868 -source "drivers/ieee1394/Kconfig"
869 -
870 -source "drivers/net/Kconfig"
871 -
872 -source "drivers/isdn/Kconfig"
873 -
874 -source "drivers/telephony/Kconfig"
875 -
876 -# This one must be before the filesystem configs. -DaveM
877 -
878 -menu "Unix98 PTY support"
879 -
880 -config UNIX98_PTYS
881 - bool "Unix98 PTY support"
882 - ---help---
883 - A pseudo terminal (PTY) is a software device consisting of two
884 - halves: a master and a slave. The slave device behaves identical to
885 - a physical terminal; the master device is used by a process to
886 - read data from and write data to the slave, thereby emulating a
887 - terminal. Typical programs for the master side are telnet servers
888 - and xterms.
889 -
890 - Linux has traditionally used the BSD-like names /dev/ptyxx for
891 - masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
892 - has a number of problems. The GNU C library glibc 2.1 and later,
893 - however, supports the Unix98 naming standard: in order to acquire a
894 - pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
895 - terminal is then made available to the process and the pseudo
896 - terminal slave can be accessed as /dev/pts/<number>. What was
897 - traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
898 -
899 - The entries in /dev/pts/ are created on the fly by a virtual
900 - file system; therefore, if you say Y here you should say Y to
901 - "/dev/pts file system for Unix98 PTYs" as well.
902 -
903 - If you want to say Y here, you need to have the C library glibc 2.1
904 - or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*").
905 - Read the instructions in <file:Documentation/Changes> pertaining to
906 - pseudo terminals. It's safe to say N.
907 -
908 -config UNIX98_PTY_COUNT
909 - int "Maximum number of Unix98 PTYs in use (0-2048)"
910 - depends on UNIX98_PTYS
911 - default "256"
912 - help
913 - The maximum number of Unix98 PTYs that can be used at any one time.
914 - The default is 256, and should be enough for desktop systems. Server
915 - machines which support incoming telnet/rlogin/ssh connections and/or
916 - serve several X terminals may want to increase this: every incoming
917 - connection and every xterm uses up one PTY.
918 -
919 - When not in use, each additional set of 256 PTYs occupy
920 - approximately 8 KB of kernel memory on 32-bit architectures.
921 -
922 -endmenu
923 -
924 -menu "XFree86 DRI support"
925 -
926 -config DRM
927 - bool "Direct Rendering Manager (XFree86 DRI support)"
928 - help
929 - Kernel-level support for the Direct Rendering Infrastructure (DRI)
930 - introduced in XFree86 4.0. If you say Y here, you need to select
931 - the module that's right for your graphics card from the list below.
932 - These modules provide support for synchronization, security, and
933 - DMA transfers. Please see <http://dri.sourceforge.net/> for more
934 - details. You should also select and configure AGP
935 - (/dev/agpgart) support.
936 -
937 -config DRM_FFB
938 - tristate "Creator/Creator3D"
939 - depends on DRM && BROKEN
940 - help
941 - Choose this option if you have one of Sun's Creator3D-based graphics
942 - and frame buffer cards. Product page at
943 - <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
944 -
945 -config DRM_TDFX
946 - tristate "3dfx Banshee/Voodoo3+"
947 - depends on DRM
948 - help
949 - Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
950 - graphics card. If M is selected, the module will be called tdfx.
951 -
952 -config DRM_R128
953 - tristate "ATI Rage 128"
954 - depends on DRM
955 - help
956 - Choose this option if you have an ATI Rage 128 graphics card. If M
957 - is selected, the module will be called r128. AGP support for
958 - this card is strongly suggested (unless you have a PCI version).
959 -
960 -endmenu
961 -
962 -source "drivers/input/Kconfig"
963 -
964 -source "drivers/i2c/Kconfig"
965 -
966 -source "drivers/hwmon/Kconfig"
967 +source "drivers/Kconfig"
968
969 source "fs/Kconfig"
970
971 -source "drivers/media/Kconfig"
972 -
973 -source "sound/Kconfig"
974 -
975 -source "drivers/usb/Kconfig"
976 -
977 -source "drivers/infiniband/Kconfig"
978 -
979 -source "drivers/char/watchdog/Kconfig"
980 -
981 source "arch/sparc64/oprofile/Kconfig"
982
983 source "arch/sparc64/Kconfig.debug"
984 diff -Naurp linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig
985 --- linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig 2005-07-18 18:11:44.574247000 -0700
986 +++ linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig 2005-07-24 13:40:23.591743253 -0700
987 @@ -6,15 +6,15 @@
988 #
989 config DRM
990 tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
991 - depends on (AGP || AGP=n) && PCI
992 + depends on AGP || PCI || SBUS
993 help
994 Kernel-level support for the Direct Rendering Infrastructure (DRI)
995 introduced in XFree86 4.0. If you say Y here, you need to select
996 the module that's right for your graphics card from the list below.
997 These modules provide support for synchronization, security, and
998 DMA transfers. Please see <http://dri.sourceforge.net/> for more
999 - details. You should also select and configure AGP
1000 - (/dev/agpgart) support.
1001 + details. You should also select and configure AGP (/dev/agpgart)
1002 + support if your graphics card is connected to an AGP slot.
1003
1004 config DRM_TDFX
1005 tristate "3dfx Banshee/Voodoo3+"
1006 @@ -103,3 +103,11 @@ config DRM_VIA
1007 Choose this option if you have a Via unichrome or compatible video
1008 chipset. If M is selected the module will be called via.
1009
1010 +config DRM_FFB
1011 + tristate "Creator/Creator3D"
1012 + depends on DRM && SBUS && SPARC64 && BROKEN
1013 + help
1014 + Choose this option if you have one of Sun's Creator3D-based graphics
1015 + and frame buffer cards. Product page at
1016 + <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
1017 +
1018 diff -Naurp linux-2.6.13-rc3-git4/drivers/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig
1019 --- linux-2.6.13-rc3-git4/drivers/char/Kconfig 2005-07-18 18:11:44.575247000 -0700
1020 +++ linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 2005-07-24 13:35:15.608285936 -0700
1021 @@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE
1022 If you have an Alchemy AU1000 processor (MIPS based) and you want
1023 to use a console on a serial port, say Y. Otherwise, say N.
1024
1025 +config SUN_AURORA
1026 + tristate "Aurora Multiboard 1600se (EXPERIMENTAL)"
1027 + depends on SERIAL_NONSTANDARD && EXPERIMENTAL && SBUS && !SUN4
1028 + help
1029 + The Aurora Multiboard is a multi-port high-speed serial controller.
1030 + If you have one of these, say Y.
1031 +
1032 config QTRONIX_KEYBOARD
1033 bool "Enable Qtronix 990P Keyboard Support"
1034 depends on IT8712
1035 @@ -734,9 +741,20 @@ config SGI_IP27_RTC
1036 via the file /proc/rtc and its behaviour is set by various ioctls on
1037 /dev/rtc.
1038
1039 +config SUN_MOSTEK_RTC
1040 + tristate "Mostek real time clock support"
1041 + depends on (SPARC32 || SPARC64)
1042 + default y
1043 + help
1044 + The Mostek RTC chip is used on all known Sun computers except
1045 + some JavaStations. For a JavaStation you need to say Y both here
1046 + and to "Enhanced Real Time Clock Support".
1047 +
1048 + Say Y here unless you are building a special purpose kernel.
1049 +
1050 config GEN_RTC
1051 tristate "Generic /dev/rtc emulation"
1052 - depends on RTC!=y && !IA64 && !ARM
1053 + depends on RTC!=y && !IA64 && !ARM && SUN_MOSTEK_RTC!=y
1054 ---help---
1055 If you say Y here and create a character special file /dev/rtc with
1056 major number 10 and minor number 135 using mknod ("man mknod"), you
1057 @@ -846,6 +864,30 @@ config TANBAC_TB0219
1058 tristate "TANBAC TB0219 base board support"
1059 depends TANBAC_TB0229
1060
1061 +config ENVCTRL
1062 + tristate "SUNW,envctrl support"
1063 + depends on PCI && SPARC64
1064 + help
1065 + Kernel support for temperature and fan monitoring on Sun SME
1066 + machines.
1067 +
1068 + To compile this driver as a module, choose M here: the
1069 + module will be called envctrl.
1070 +
1071 +config DISPLAY7SEG
1072 + tristate "Sun CPCI 7-Segment Display support"
1073 + depends on PCI && SPARC64
1074 + ---help---
1075 + This is the driver for the 7-segment display and LED present on
1076 + Sun Microsystems CompactPCI models CP1400 and CP1500.
1077 +
1078 + To compile this driver as a module, choose M here: the
1079 + module will be called display7seg.
1080 +
1081 + If you do not have a CompactPCI model CP1400 or CP1500, or
1082 + another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
1083 + you should say N to this option.
1084 +
1085
1086 menu "Ftape, the floppy tape device driver"
1087
1088 diff -Naurp linux-2.6.13-rc3-git4/drivers/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/Kconfig
1089 --- linux-2.6.13-rc3-git4/drivers/Kconfig 2005-07-18 18:00:40.075674000 -0700
1090 +++ linux-2.6.13-rc3-git4-gentoo/drivers/Kconfig 2005-07-24 13:35:15.640280688 -0700
1091 @@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig"
1092
1093 source "drivers/sn/Kconfig"
1094
1095 +if SPARC32 || SPARC64
1096 + source "drivers/fc4/Kconfig"
1097 + source "drivers/sbus/char/Kconfig"
1098 +endif
1099 +
1100 endmenu
1101 diff -Naurp linux-2.6.13-rc3-git4/drivers/sbus/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/sbus/char/Kconfig
1102 --- linux-2.6.13-rc3-git4/drivers/sbus/char/Kconfig 2005-06-17 12:48:29.000000000 -0700
1103 +++ linux-2.6.13-rc3-git4-gentoo/drivers/sbus/char/Kconfig 2005-07-24 13:35:15.709269374 -0700
1104 @@ -13,15 +13,6 @@ config SUN_OPENPROMIO
1105
1106 If unsure, say Y.
1107
1108 -config SUN_MOSTEK_RTC
1109 - tristate "Mostek real time clock support"
1110 - help
1111 - The Mostek RTC chip is used on all known Sun computers except
1112 - some JavaStations. For a JavaStation you need to say Y both here
1113 - and to "Enhanced Real Time Clock Support".
1114 -
1115 - Say Y here unless you are building a special purpose kernel.
1116 -
1117 config OBP_FLASH
1118 tristate "OBP Flash Device support"
1119 depends on SPARC64
1120 @@ -69,25 +60,16 @@ config SUN_JSFLASH
1121 If you say Y here, you will be able to boot from your JavaStation's
1122 Flash memory.
1123
1124 -# XXX Why don't we do "source drivers/char/Config.in" somewhere?
1125 -# no shit
1126 -config APM_RTC_IS_GMT
1127 - bool
1128 - depends on EXPERIMENTAL && SPARC32 && PCI
1129 - default y
1130 - help
1131 - Say Y here if your RTC (Real Time Clock a.k.a. hardware clock)
1132 - stores the time in GMT (Greenwich Mean Time). Say N if your RTC
1133 - stores localtime.
1134 -
1135 - It is in fact recommended to store GMT in your RTC, because then you
1136 - don't have to worry about daylight savings time changes. The only
1137 - reason not to use GMT in your RTC is if you also run a broken OS
1138 - that doesn't understand GMT.
1139 -
1140 -config RTC
1141 - tristate "PC-style Real Time Clock Support"
1142 - depends on PCI && EXPERIMENTAL && SPARC32
1143 +config BBC_I2C
1144 + tristate "UltraSPARC-III bootbus i2c controller driver"
1145 + depends on SPARC64 && PCI
1146 + help
1147 + The BBC devices on the UltraSPARC III have two I2C controllers. The
1148 + first I2C controller connects mainly to configuration PROMs (NVRAM,
1149 + CPU configuration, DIMM types, etc.). The second I2C controller
1150 + connects to environmental control devices such as fans and
1151 + temperature sensors. The second controller also connects to the
1152 + smartcard reader, if present. Say Y to enable support for these.
1153
1154 endmenu
1155
1156 diff -Naurp linux-2.6.13-rc3-git4/drivers/sbus/Makefile linux-2.6.13-rc3-git4-gentoo/drivers/sbus/Makefile
1157 --- linux-2.6.13-rc3-git4/drivers/sbus/Makefile 2005-06-17 12:48:29.000000000 -0700
1158 +++ linux-2.6.13-rc3-git4-gentoo/drivers/sbus/Makefile 2005-07-24 13:35:15.808253141 -0700
1159 @@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k)
1160 obj-y := sbus.o dvma.o
1161 endif
1162
1163 -obj-$(CONFIG_SBUSCHAR) += char/
1164 +obj-y += char/
1165 diff -Naurp linux-2.6.13-rc3-git4/fs/Kconfig linux-2.6.13-rc3-git4-gentoo/fs/Kconfig
1166 --- linux-2.6.13-rc3-git4/fs/Kconfig 2005-07-18 18:00:42.781209000 -0700
1167 +++ linux-2.6.13-rc3-git4-gentoo/fs/Kconfig 2005-07-24 13:35:15.883240843 -0700
1168 @@ -856,6 +856,20 @@ config RAMFS
1169 To compile this as a module, choose M here: the module will be called
1170 ramfs.
1171
1172 +config SUN_OPENPROMFS
1173 + depends on SPARC32 || SPARC64
1174 + tristate "OpenPROM file system"
1175 + help
1176 + If you say Y, the OpenPROM device tree will be available as a
1177 + virtual file system, which you can mount to /proc/openprom by "mount
1178 + -t openpromfs none /proc/openprom".
1179 +
1180 + To compile the /proc/openprom support as a module, choose M here: the
1181 + module will be called openpromfs.
1182 +
1183 + Only choose N if you know in advance that you will not need to modify
1184 + OpenPROM settings on the running system.
1185 +
1186 endmenu
1187
1188 menu "Miscellaneous filesystems"

  ViewVC Help
Powered by ViewVC 1.1.20