/[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 151 - (hide annotations) (download)
Mon Aug 29 09:34:13 2005 UTC (13 years, 2 months ago) by dsd
Original Path: genpatches-2.6/trunk/2.6.13/1361_sparc-kconfig-rework.patch
File size: 38760 byte(s)
2.6.13-pre --> 2.6.13
1 eradicator 127 diff -Naurp linux-2.6.13-rc4-git2/arch/sparc/Kconfig linux-2.6.13-rc4-git2-gentoo/arch/sparc/Kconfig
2     --- linux-2.6.13-rc4-git2/arch/sparc/Kconfig 2005-07-30 19:45:56.026773134 -0700
3     +++ linux-2.6.13-rc4-git2-gentoo/arch/sparc/Kconfig 2005-07-30 19:54:22.326031025 -0700
4 eradicator 106 @@ -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     -config SBUSCHAR
212 eradicator 127 +source kernel/power/Kconfig
213     +
214 eradicator 106 +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 eradicator 127 +
332     +source "drivers/pcmcia/Kconfig"
333     +
334     +source "drivers/pci/hotplug/Kconfig"
335 eradicator 106
336     - To compile the /proc/openprom support as a module, choose M here: the
337     - module will be called openpromfs.
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 eradicator 127 diff -Naurp linux-2.6.13-rc4-git2/arch/sparc64/Kconfig linux-2.6.13-rc4-git2-gentoo/arch/sparc64/Kconfig
421     --- linux-2.6.13-rc4-git2/arch/sparc64/Kconfig 2005-07-30 19:45:56.029772637 -0700
422     +++ linux-2.6.13-rc4-git2-gentoo/arch/sparc64/Kconfig 2005-07-30 19:54:22.349027257 -0700
423 eradicator 106 @@ -5,6 +5,17 @@
424    
425     mainmenu "Linux/UltraSPARC Kernel Configuration"
426    
427     +# Identify this as a Sparc64 build
428     +config SPARC64
429     + bool
430     + default y
431     + help
432     + SPARC is a family of RISC microprocessors designed and marketed by
433     + Sun Microsystems, incorporated. This port covers the newer 64-bit
434     + UltraSPARC. The UltraLinux project maintains both the SPARC32 and
435     + SPARC64 ports; its web page is available at
436     + <http://www.ultralinux.org/>.
437     +
438     config 64BIT
439     def_bool y
440    
441 eradicator 107 @@ -12,10 +23,23 @@ config MMU
442 eradicator 106 bool
443     default y
444    
445     +config GENERIC_ISA_DMA
446     + bool
447     + default y
448     +
449     config TIME_INTERPOLATION
450     bool
451     default y
452    
453 eradicator 107 +source "init/Kconfig"
454     +
455     +config SYSVIPC_COMPAT
456     + bool
457     + depends on COMPAT && SYSVIPC
458     + default y
459     +
460     +menu "Processor type and features"
461     +
462     choice
463     prompt "Kernel page size"
464     default SPARC64_PAGE_SIZE_8KB
465     @@ -62,84 +86,6 @@ config SECCOMP
466    
467     source kernel/Kconfig.hz
468    
469     -source "init/Kconfig"
470     -
471     -config SYSVIPC_COMPAT
472     - bool
473     - depends on COMPAT && SYSVIPC
474     - default y
475     -
476 eradicator 106 -menu "General machine setup"
477     -
478     -config BBC_I2C
479     - tristate "UltraSPARC-III bootbus i2c controller driver"
480     - depends on PCI
481     - help
482     - The BBC devices on the UltraSPARC III have two I2C controllers. The
483     - first I2C controller connects mainly to configuration PROMs (NVRAM,
484     - CPU configuration, DIMM types, etc.). The second I2C controller
485     - connects to environmental control devices such as fans and
486     - temperature sensors. The second controller also connects to the
487     - smartcard reader, if present. Say Y to enable support for these.
488     -
489     -config VT
490     - bool "Virtual terminal" if EMBEDDED
491     - select INPUT
492     - default y
493     - ---help---
494     - If you say Y here, you will get support for terminal devices with
495     - display and keyboard devices. These are called "virtual" because you
496     - can run several virtual terminals (also called virtual consoles) on
497     - one physical terminal. This is rather useful, for example one
498     - virtual terminal can collect system messages and warnings, another
499     - one can be used for a text-mode user session, and a third could run
500     - an X session, all in parallel. Switching between virtual terminals
501     - is done with certain key combinations, usually Alt-<function key>.
502     -
503     - The setterm command ("man setterm") can be used to change the
504     - properties (such as colors or beeping) of a virtual terminal. The
505     - man page console_codes(4) ("man console_codes") contains the special
506     - character sequences that can be used to change those properties
507     - directly. The fonts used on virtual terminals can be changed with
508     - the setfont ("man setfont") command and the key bindings are defined
509     - with the loadkeys ("man loadkeys") command.
510     -
511     - You need at least one virtual terminal device in order to make use
512     - of your keyboard and monitor. Therefore, only people configuring an
513     - embedded system would want to say N here in order to save some
514     - memory; the only way to log into such a system is then via a serial
515     - or network connection.
516     -
517     - If unsure, say Y, or else you won't be able to do much with your new
518     - shiny Linux system :-)
519     -
520     -config VT_CONSOLE
521     - bool "Support for console on virtual terminal" if EMBEDDED
522     - depends on VT
523     - default y
524     - ---help---
525     - The system console is the device which receives all kernel messages
526     - and warnings and which allows logins in single user mode. If you
527     - answer Y here, a virtual terminal (the device used to interact with
528     - a physical terminal) can be used as system console. This is the most
529     - common mode of operations, so you should say Y here unless you want
530     - the kernel messages be output only to a serial port (in which case
531     - you should say Y to "Console on serial port", below).
532     -
533     - If you do say Y here, by default the currently visible virtual
534     - terminal (/dev/tty0) will be used as system console. You can change
535     - that with a kernel command line option such as "console=tty3" which
536     - would use the third virtual terminal as system console. (Try "man
537     - bootparam" or see the documentation of your boot loader (lilo or
538     - loadlin) about how to pass options to the kernel at boot time.)
539     -
540     - If unsure, say Y.
541     -
542     -config HW_CONSOLE
543     - bool
544     - depends on VT
545     - default y
546 eradicator 107 -
547 eradicator 106 config SMP
548     bool "Symmetric multi-processing support"
549 eradicator 107 ---help---
550 eradicator 106 @@ -205,25 +151,6 @@ config US2E_FREQ
551    
552     If in doubt, say N.
553    
554     -# Identify this as a Sparc64 build
555     -config SPARC64
556     - bool
557     - default y
558     - help
559     - SPARC is a family of RISC microprocessors designed and marketed by
560     - Sun Microsystems, incorporated. This port covers the newer 64-bit
561     - UltraSPARC. The UltraLinux project maintains both the SPARC32 and
562     - SPARC64 ports; its web page is available at
563     - <http://www.ultralinux.org/>.
564     -
565     -# Global things across all Sun machines.
566     -config RWSEM_GENERIC_SPINLOCK
567     - bool
568     -
569     -config RWSEM_XCHGADD_ALGORITHM
570     - bool
571     - default y
572     -
573     config GENERIC_CALIBRATE_DELAY
574     bool
575     default y
576     @@ -246,7 +173,29 @@ config HUGETLB_PAGE_SIZE_64K
577    
578     endchoice
579    
580     -config GENERIC_ISA_DMA
581     +# Global things across all Sun machines.
582     +config RWSEM_GENERIC_SPINLOCK
583     + bool
584     +
585     +config RWSEM_XCHGADD_ALGORITHM
586     + bool
587     + default y
588     +
589     +source "mm/Kconfig"
590     +
591     +endmenu
592     +
593     +menu "Bus options (PCI, SBUS, PCMCIA, ...)"
594     +
595     +config SBUS
596     + bool
597     + default y
598     +
599     +config SUN_AUXIO
600     + bool
601     + default y
602     +
603     +config SUN_IO
604     bool
605     default y
606    
607     @@ -293,40 +242,6 @@ config MCA
608     <file:Documentation/mca.txt> (and especially the web page given
609     there) before attempting to build an MCA bus kernel.
610    
611     -config PCMCIA
612     - tristate
613     - ---help---
614     - Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
615     - computer. These are credit-card size devices such as network cards,
616     - modems or hard drives often used with laptops computers. There are
617     - actually two varieties of these cards: the older 16 bit PCMCIA cards
618     - and the newer 32 bit CardBus cards. If you want to use CardBus
619     - cards, you need to say Y here and also to "CardBus support" below.
620     -
621     - To use your PC-cards, you will need supporting software from David
622     - Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
623     - for location). Please also read the PCMCIA-HOWTO, available from
624     - <http://www.tldp.org/docs.html#howto>.
625     -
626     - To compile this driver as modules, choose M here: the
627     - modules will be called pcmcia_core and ds.
628     -
629     -config SBUS
630     - bool
631     - default y
632     -
633     -config SBUSCHAR
634     - bool
635     - default y
636     -
637     -config SUN_AUXIO
638     - bool
639     - default y
640     -
641     -config SUN_IO
642     - bool
643     - default y
644     -
645     config PCI
646     bool "PCI support"
647     help
648     @@ -344,44 +259,31 @@ config PCI_DOMAINS
649     bool
650     default PCI
651    
652     -config RTC
653     - tristate
654     - depends on PCI
655     - default y
656     - ---help---
657     - If you say Y here and create a character special file /dev/rtc with
658     - major number 10 and minor number 135 using mknod ("man mknod"), you
659     - will get access to the real time clock (or hardware clock) built
660     - into your computer.
661     -
662     - Every PC has such a clock built in. It can be used to generate
663     - signals from as low as 1Hz up to 8192Hz, and can also be used
664     - as a 24 hour alarm. It reports status information via the file
665     - /proc/driver/rtc and its behaviour is set by various ioctls on
666     - /dev/rtc.
667     -
668     - If you run Linux on a multiprocessor machine and said Y to
669     - "Symmetric Multi Processing" above, you should say Y here to read
670     - and set the RTC in an SMP compatible fashion.
671     -
672     - If you think you have a use for such a device (such as periodic data
673     - sampling), then say Y here, and read <file:Documentation/rtc.txt>
674     - for details.
675     +source "drivers/pci/Kconfig"
676    
677     - To compile this driver as a module, choose M here: the
678     - module will be called rtc.
679     +config HOTPLUG
680     + bool "Support for hot-pluggable devices"
681     + ---help---
682     + Say Y here if you want to plug devices into your computer while
683     + the system is running, and be able to use them quickly. In many
684     + cases, the devices can likewise be unplugged at any time too.
685     +
686     + One well known example of this is PCMCIA- or PC-cards, credit-card
687     + size devices such as network cards, modems or hard drives which are
688     + plugged into slots found on all modern laptop computers. Another
689     + example, used on modern desktops as well as laptops, is USB.
690     +
691     + Enable HOTPLUG and KMOD, and build a modular kernel. Get agent
692     + software (at <http://linux-hotplug.sourceforge.net/>) and install it.
693     + Then your kernel will automatically call out to a user mode "policy
694     + agent" (/sbin/hotplug) to load modules and set up software needed
695     + to use devices as you hotplug them.
696    
697     -source "drivers/pci/Kconfig"
698     +endmenu
699    
700     -config SUN_OPENPROMFS
701     - tristate "Openprom tree appears in /proc/openprom"
702     - help
703     - If you say Y, the OpenPROM device tree will be available as a
704     - virtual file system, which you can mount to /proc/openprom by "mount
705     - -t openpromfs none /proc/openprom".
706     +menu "Executable file formats"
707    
708     - To compile the /proc/openprom support as a module, choose M here: the
709     - module will be called openpromfs. If unsure, choose M.
710     +source "fs/Kconfig.binfmt"
711    
712     config SPARC32_COMPAT
713     bool "Kernel support for Linux/Sparc 32bit binary compatibility"
714     @@ -414,17 +316,14 @@ config BINFMT_AOUT32
715     If you want to run SunOS binaries (see SunOS binary emulation below)
716     or other a.out binaries, say Y. If unsure, say N.
717    
718     -source "fs/Kconfig.binfmt"
719     -
720     config SUNOS_EMUL
721     + select BINFMT_AOUT32
722     + depends on SPARC32_COMPAT
723     bool "SunOS binary emulation"
724     - depends on BINFMT_AOUT32
725     help
726     This allows you to run most SunOS binaries. If you want to do this,
727     say Y here and place appropriate files in /usr/gnemul/sunos. See
728     - <http://www.ultralinux.org/faq.html> for more information. If you
729     - want to run SunOS binaries on an Ultra you must also say Y to
730     - "Kernel support for 32-bit a.out binaries" above.
731     + <http://www.ultralinux.org/faq.html> for more information.
732    
733     config SOLARIS_EMUL
734     tristate "Solaris binary emulation (EXPERIMENTAL)"
735     @@ -436,75 +335,6 @@ config SOLARIS_EMUL
736     To compile this code as a module, choose M here: the
737     module will be called solaris.
738    
739     -source "drivers/parport/Kconfig"
740     -
741     -config PRINTER
742     - tristate "Parallel printer support"
743     - depends on PARPORT
744     - ---help---
745     - If you intend to attach a printer to the parallel port of your Linux
746     - box (as opposed to using a serial printer; if the connector at the
747     - printer has 9 or 25 holes ["female"], then it's serial), say Y.
748     - Also read the Printing-HOWTO, available from
749     - <http://www.tldp.org/docs.html#howto>.
750     -
751     - It is possible to share one parallel port among several devices
752     - (e.g. printer and ZIP drive) and it is safe to compile the
753     - corresponding drivers into the kernel.
754     - To compile this driver as a module, choose M here and read
755     - <file:Documentation/parport.txt>. The module will be called lp.
756     -
757     - If you have several parallel ports, you can specify which ports to
758     - use with the "lp" kernel command line option. (Try "man bootparam"
759     - or see the documentation of your boot loader (lilo or loadlin) about
760     - how to pass options to the kernel at boot time.) The syntax of the
761     - "lp" command line option can be found in <file:drivers/char/lp.c>.
762     -
763     - If you have more than 8 printers, you need to increase the LP_NO
764     - macro in lp.c and the PARPORT_MAX macro in parport.h.
765     -
766     -config PPDEV
767     - tristate "Support for user-space parallel port device drivers"
768     - depends on PARPORT
769     - ---help---
770     - Saying Y to this adds support for /dev/parport device nodes. This
771     - is needed for programs that want portable access to the parallel
772     - port, for instance deviceid (which displays Plug-and-Play device
773     - IDs).
774     -
775     - This is the parallel port equivalent of SCSI generic support (sg).
776     - It is safe to say N to this -- it is not needed for normal printing
777     - or parallel port CD-ROM/disk support.
778     -
779     - To compile this driver as a module, choose M here: the
780     - module will be called ppdev.
781     -
782     - If unsure, say N.
783     -
784     -config ENVCTRL
785     - tristate "SUNW, envctrl support"
786     - depends on PCI
787     - help
788     - Kernel support for temperature and fan monitoring on Sun SME
789     - machines.
790     -
791     - To compile this driver as a module, choose M here: the
792     - module will be called envctrl.
793     -
794     -config DISPLAY7SEG
795     - tristate "7-Segment Display support"
796     - depends on PCI
797     - ---help---
798     - This is the driver for the 7-segment display and LED present on
799     - Sun Microsystems CompactPCI models CP1400 and CP1500.
800     -
801     - To compile this driver as a module, choose M here: the
802     - module will be called display7seg.
803     -
804     - If you do not have a CompactPCI model CP1400 or CP1500, or
805     - another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
806     - you should say N to this option.
807     -
808     config CMDLINE_BOOL
809     bool "Default bootloader kernel arguments"
810    
811 eradicator 107 @@ -521,148 +351,14 @@ config CMDLINE
812 eradicator 106
813     NOTE: This option WILL override the PROM bootargs setting!
814    
815     -source "mm/Kconfig"
816     -
817     endmenu
818    
819 eradicator 107 source "net/Kconfig"
820 eradicator 106
821     -source "drivers/base/Kconfig"
822     -
823     -source "drivers/video/Kconfig"
824 eradicator 107 -
825 eradicator 106 -source "drivers/serial/Kconfig"
826     -
827     -source "drivers/sbus/char/Kconfig"
828 eradicator 107 -
829     -source "drivers/mtd/Kconfig"
830     -
831     -source "drivers/block/Kconfig"
832     -
833     -source "drivers/ide/Kconfig"
834     -
835     -source "drivers/scsi/Kconfig"
836     -
837     -source "drivers/fc4/Kconfig"
838     -
839     -source "drivers/md/Kconfig"
840     -
841     -if PCI
842     -source "drivers/message/fusion/Kconfig"
843     -endif
844     -
845     -source "drivers/ieee1394/Kconfig"
846     -
847     -source "drivers/net/Kconfig"
848     -
849     -source "drivers/isdn/Kconfig"
850     -
851     -source "drivers/telephony/Kconfig"
852     -
853 eradicator 106 -# This one must be before the filesystem configs. -DaveM
854 eradicator 107 -
855 eradicator 106 -menu "Unix98 PTY support"
856 eradicator 107 -
857 eradicator 106 -config UNIX98_PTYS
858     - bool "Unix98 PTY support"
859     - ---help---
860     - A pseudo terminal (PTY) is a software device consisting of two
861     - halves: a master and a slave. The slave device behaves identical to
862     - a physical terminal; the master device is used by a process to
863     - read data from and write data to the slave, thereby emulating a
864     - terminal. Typical programs for the master side are telnet servers
865     - and xterms.
866     -
867     - Linux has traditionally used the BSD-like names /dev/ptyxx for
868     - masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
869     - has a number of problems. The GNU C library glibc 2.1 and later,
870     - however, supports the Unix98 naming standard: in order to acquire a
871     - pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
872     - terminal is then made available to the process and the pseudo
873     - terminal slave can be accessed as /dev/pts/<number>. What was
874     - traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
875     -
876     - The entries in /dev/pts/ are created on the fly by a virtual
877     - file system; therefore, if you say Y here you should say Y to
878     - "/dev/pts file system for Unix98 PTYs" as well.
879     -
880     - If you want to say Y here, you need to have the C library glibc 2.1
881     - or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*").
882     - Read the instructions in <file:Documentation/Changes> pertaining to
883     - pseudo terminals. It's safe to say N.
884     -
885     -config UNIX98_PTY_COUNT
886     - int "Maximum number of Unix98 PTYs in use (0-2048)"
887     - depends on UNIX98_PTYS
888     - default "256"
889     - help
890     - The maximum number of Unix98 PTYs that can be used at any one time.
891     - The default is 256, and should be enough for desktop systems. Server
892     - machines which support incoming telnet/rlogin/ssh connections and/or
893     - serve several X terminals may want to increase this: every incoming
894     - connection and every xterm uses up one PTY.
895 eradicator 107 -
896 eradicator 106 - When not in use, each additional set of 256 PTYs occupy
897     - approximately 8 KB of kernel memory on 32-bit architectures.
898 eradicator 107 -
899 eradicator 106 -endmenu
900 eradicator 107 -
901 eradicator 106 -menu "XFree86 DRI support"
902 eradicator 107 -
903 eradicator 106 -config DRM
904     - bool "Direct Rendering Manager (XFree86 DRI support)"
905     - help
906     - Kernel-level support for the Direct Rendering Infrastructure (DRI)
907     - introduced in XFree86 4.0. If you say Y here, you need to select
908     - the module that's right for your graphics card from the list below.
909     - These modules provide support for synchronization, security, and
910     - DMA transfers. Please see <http://dri.sourceforge.net/> for more
911     - details. You should also select and configure AGP
912     - (/dev/agpgart) support.
913     -
914     -config DRM_FFB
915     - tristate "Creator/Creator3D"
916     - depends on DRM && BROKEN
917     - help
918     - Choose this option if you have one of Sun's Creator3D-based graphics
919     - and frame buffer cards. Product page at
920     - <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
921     -
922     -config DRM_TDFX
923     - tristate "3dfx Banshee/Voodoo3+"
924     - depends on DRM
925     - help
926     - Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
927     - graphics card. If M is selected, the module will be called tdfx.
928     -
929     -config DRM_R128
930     - tristate "ATI Rage 128"
931     - depends on DRM
932     - help
933     - Choose this option if you have an ATI Rage 128 graphics card. If M
934     - is selected, the module will be called r128. AGP support for
935     - this card is strongly suggested (unless you have a PCI version).
936 eradicator 107 -
937 eradicator 106 -endmenu
938 eradicator 107 -
939 eradicator 106 -source "drivers/input/Kconfig"
940 eradicator 107 -
941 eradicator 106 -source "drivers/i2c/Kconfig"
942 eradicator 107 -
943     -source "drivers/hwmon/Kconfig"
944     +source "drivers/Kconfig"
945 eradicator 106
946     source "fs/Kconfig"
947    
948     -source "drivers/media/Kconfig"
949     -
950     -source "sound/Kconfig"
951     -
952     -source "drivers/usb/Kconfig"
953     -
954     -source "drivers/infiniband/Kconfig"
955     -
956     -source "drivers/char/watchdog/Kconfig"
957     -
958     source "arch/sparc64/oprofile/Kconfig"
959    
960     source "arch/sparc64/Kconfig.debug"
961 eradicator 127 diff -Naurp linux-2.6.13-rc4-git2/drivers/char/drm/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/char/drm/Kconfig
962     --- linux-2.6.13-rc4-git2/drivers/char/drm/Kconfig 2005-07-30 19:46:00.126092873 -0700
963     +++ linux-2.6.13-rc4-git2-gentoo/drivers/char/drm/Kconfig 2005-07-30 19:54:22.350027093 -0700
964 eradicator 111 @@ -6,15 +6,15 @@
965     #
966     config DRM
967     tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
968     - depends on (AGP || AGP=n) && PCI
969     + depends on AGP || PCI || SBUS
970     help
971     Kernel-level support for the Direct Rendering Infrastructure (DRI)
972     introduced in XFree86 4.0. If you say Y here, you need to select
973     the module that's right for your graphics card from the list below.
974     These modules provide support for synchronization, security, and
975     DMA transfers. Please see <http://dri.sourceforge.net/> for more
976     - details. You should also select and configure AGP
977     - (/dev/agpgart) support.
978     + details. You should also select and configure AGP (/dev/agpgart)
979     + support if your graphics card is connected to an AGP slot.
980    
981     config DRM_TDFX
982     tristate "3dfx Banshee/Voodoo3+"
983 eradicator 127 @@ -25,7 +25,7 @@ config DRM_TDFX
984    
985     config DRM_GAMMA
986     tristate "3dlabs GMX 2000"
987     - depends on DRM && BROKEN
988     + depends on DRM && PCI && BROKEN
989     help
990     This is the old gamma driver, please tell me if it might actually
991     work.
992 eradicator 107 @@ -103,3 +103,11 @@ config DRM_VIA
993     Choose this option if you have a Via unichrome or compatible video
994     chipset. If M is selected the module will be called via.
995    
996     +config DRM_FFB
997     + tristate "Creator/Creator3D"
998 eradicator 111 + depends on DRM && SBUS && SPARC64 && BROKEN
999 eradicator 107 + help
1000     + Choose this option if you have one of Sun's Creator3D-based graphics
1001     + and frame buffer cards. Product page at
1002     + <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
1003     +
1004 eradicator 127 diff -Naurp linux-2.6.13-rc4-git2/drivers/char/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/char/Kconfig
1005     --- linux-2.6.13-rc4-git2/drivers/char/Kconfig 2005-07-30 19:46:00.115094698 -0700
1006     +++ linux-2.6.13-rc4-git2-gentoo/drivers/char/Kconfig 2005-07-30 19:57:05.398307358 -0700
1007 eradicator 106 @@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE
1008     If you have an Alchemy AU1000 processor (MIPS based) and you want
1009     to use a console on a serial port, say Y. Otherwise, say N.
1010    
1011     +config SUN_AURORA
1012     + tristate "Aurora Multiboard 1600se (EXPERIMENTAL)"
1013     + depends on SERIAL_NONSTANDARD && EXPERIMENTAL && SBUS && !SUN4
1014     + help
1015     + The Aurora Multiboard is a multi-port high-speed serial controller.
1016     + If you have one of these, say Y.
1017     +
1018     config QTRONIX_KEYBOARD
1019     bool "Enable Qtronix 990P Keyboard Support"
1020     depends on IT8712
1021 eradicator 127 @@ -733,9 +740,20 @@ config SGI_IP27_RTC
1022 eradicator 106 via the file /proc/rtc and its behaviour is set by various ioctls on
1023     /dev/rtc.
1024    
1025     +config SUN_MOSTEK_RTC
1026     + tristate "Mostek real time clock support"
1027     + depends on (SPARC32 || SPARC64)
1028     + default y
1029     + help
1030     + The Mostek RTC chip is used on all known Sun computers except
1031     + some JavaStations. For a JavaStation you need to say Y both here
1032     + and to "Enhanced Real Time Clock Support".
1033     +
1034     + Say Y here unless you are building a special purpose kernel.
1035     +
1036     config GEN_RTC
1037     tristate "Generic /dev/rtc emulation"
1038 eradicator 127 - depends on RTC!=y && !IA64 && !ARM && !PPC64
1039     + depends on RTC!=y && !IA64 && !ARM && !PPC64 && SUN_MOSTEK_RTC!=y
1040 eradicator 106 ---help---
1041     If you say Y here and create a character special file /dev/rtc with
1042     major number 10 and minor number 135 using mknod ("man mknod"), you
1043 eradicator 127 @@ -844,6 +862,30 @@ config TANBAC_TB0219
1044 eradicator 106 tristate "TANBAC TB0219 base board support"
1045     depends TANBAC_TB0229
1046    
1047     +config ENVCTRL
1048     + tristate "SUNW,envctrl support"
1049     + depends on PCI && SPARC64
1050     + help
1051     + Kernel support for temperature and fan monitoring on Sun SME
1052     + machines.
1053     +
1054     + To compile this driver as a module, choose M here: the
1055     + module will be called envctrl.
1056     +
1057     +config DISPLAY7SEG
1058     + tristate "Sun CPCI 7-Segment Display support"
1059     + depends on PCI && SPARC64
1060     + ---help---
1061     + This is the driver for the 7-segment display and LED present on
1062     + Sun Microsystems CompactPCI models CP1400 and CP1500.
1063     +
1064     + To compile this driver as a module, choose M here: the
1065     + module will be called display7seg.
1066     +
1067     + If you do not have a CompactPCI model CP1400 or CP1500, or
1068     + another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
1069     + you should say N to this option.
1070     +
1071    
1072     menu "Ftape, the floppy tape device driver"
1073    
1074 eradicator 127 diff -Naurp linux-2.6.13-rc4-git2/drivers/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/Kconfig
1075     --- linux-2.6.13-rc4-git2/drivers/Kconfig 2005-07-30 19:45:58.456369955 -0700
1076     +++ linux-2.6.13-rc4-git2-gentoo/drivers/Kconfig 2005-07-30 19:54:22.352026766 -0700
1077 eradicator 107 @@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig"
1078 eradicator 106
1079 eradicator 107 source "drivers/sn/Kconfig"
1080    
1081     +if SPARC32 || SPARC64
1082     + source "drivers/fc4/Kconfig"
1083     + source "drivers/sbus/char/Kconfig"
1084     +endif
1085 eradicator 106 +
1086 eradicator 107 endmenu
1087 eradicator 127 diff -Naurp linux-2.6.13-rc4-git2/drivers/sbus/char/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/sbus/char/Kconfig
1088     --- linux-2.6.13-rc4-git2/drivers/sbus/char/Kconfig 2005-07-30 19:46:09.698504394 -0700
1089     +++ linux-2.6.13-rc4-git2-gentoo/drivers/sbus/char/Kconfig 2005-07-30 19:57:50.205963155 -0700
1090 eradicator 106 @@ -13,15 +13,6 @@ config SUN_OPENPROMIO
1091    
1092     If unsure, say Y.
1093    
1094     -config SUN_MOSTEK_RTC
1095     - tristate "Mostek real time clock support"
1096     - help
1097     - The Mostek RTC chip is used on all known Sun computers except
1098     - some JavaStations. For a JavaStation you need to say Y both here
1099     - and to "Enhanced Real Time Clock Support".
1100     -
1101     - Say Y here unless you are building a special purpose kernel.
1102     -
1103     config OBP_FLASH
1104     tristate "OBP Flash Device support"
1105     depends on SPARC64
1106 eradicator 127 @@ -69,11 +60,5 @@ config SUN_JSFLASH
1107 eradicator 106 If you say Y here, you will be able to boot from your JavaStation's
1108     Flash memory.
1109    
1110     -# XXX Why don't we do "source drivers/char/Config.in" somewhere?
1111     -# no shit
1112     -config RTC
1113     - tristate "PC-style Real Time Clock Support"
1114     - depends on PCI && EXPERIMENTAL && SPARC32
1115 eradicator 127 -
1116 eradicator 106 endmenu
1117    
1118 eradicator 127 diff -Naurp linux-2.6.13-rc4-git2/drivers/sbus/Makefile linux-2.6.13-rc4-git2-gentoo/drivers/sbus/Makefile
1119     --- linux-2.6.13-rc4-git2/drivers/sbus/Makefile 2005-06-17 12:48:29.000000000 -0700
1120     +++ linux-2.6.13-rc4-git2-gentoo/drivers/sbus/Makefile 2005-07-30 19:54:22.354026438 -0700
1121 eradicator 107 @@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k)
1122     obj-y := sbus.o dvma.o
1123     endif
1124    
1125     -obj-$(CONFIG_SBUSCHAR) += char/
1126     +obj-y += char/
1127 eradicator 127 diff -Naurp linux-2.6.13-rc4-git2/fs/Kconfig linux-2.6.13-rc4-git2-gentoo/fs/Kconfig
1128     --- linux-2.6.13-rc4-git2/fs/Kconfig 2005-07-30 19:46:15.724504429 -0700
1129     +++ linux-2.6.13-rc4-git2-gentoo/fs/Kconfig 2005-07-30 19:54:22.356026110 -0700
1130 eradicator 106 @@ -856,6 +856,20 @@ config RAMFS
1131     To compile this as a module, choose M here: the module will be called
1132     ramfs.
1133    
1134     +config SUN_OPENPROMFS
1135     + depends on SPARC32 || SPARC64
1136     + tristate "OpenPROM file system"
1137     + help
1138     + If you say Y, the OpenPROM device tree will be available as a
1139     + virtual file system, which you can mount to /proc/openprom by "mount
1140     + -t openpromfs none /proc/openprom".
1141     +
1142     + To compile the /proc/openprom support as a module, choose M here: the
1143     + module will be called openpromfs.
1144     +
1145     + Only choose N if you know in advance that you will not need to modify
1146     + OpenPROM settings on the running system.
1147     +
1148     endmenu
1149    
1150     menu "Miscellaneous filesystems"

  ViewVC Help
Powered by ViewVC 1.1.20