And here's the doozy... I could break this up into a series of patches if that would get it accepted, but it's been easier to maintain this portion as one patch.
Rework sparc Kconfig to appear more similar to other architectures.
Move options out of arch Kconfig into the rest of the tree.
Signed-off-by: Jeremy Huddleston <[EMAIL PROTECTED]>
diff -Naurp linux-2.6.13-rc4-git2/arch/sparc/Kconfig
linux-2.6.13-rc4-git2-gentoo/arch/sparc/Kconfig
--- linux-2.6.13-rc4-git2/arch/sparc/Kconfig 2005-07-30
19:45:56.026773134 -0700
+++ linux-2.6.13-rc4-git2-gentoo/arch/sparc/Kconfig 2005-07-30
19:54:22.326031025 -0700
@@ -5,15 +5,25 @@
mainmenu "Linux/SPARC Kernel Configuration"
-config MMU
+# Identify this as a Sparc32 build
+config SPARC32
bool
default y
+ help
+ SPARC is a family of RISC microprocessors designed and marketed by
+ Sun Microsystems, incorporated. They are very widely found in Sun
+ workstations and clones. This port covers the original 32-bit SPARC;
+ it is old and stable and usually considered one of the "big three"
+ along with the Intel and Alpha ports. The UltraLinux project
+ maintains both the SPARC32 and SPARC64 ports; its web page is
+ available at <http://www.ultralinux.org/>.
-config UID16
+# Global things across all Sun machines.
+config MMU
bool
default y
-config HIGHMEM
+config UID16
bool
default y
@@ -23,66 +33,36 @@ config GENERIC_ISA_DMA
source "init/Kconfig"
-menu "General machine setup"
-config VT
- bool
- select INPUT
- default y
- ---help---
- If you say Y here, you will get support for terminal devices with
- display and keyboard devices. These are called "virtual" because you
- can run several virtual terminals (also called virtual consoles) on
- one physical terminal. This is rather useful, for example one
- virtual terminal can collect system messages and warnings, another
- one can be used for a text-mode user session, and a third could run
- an X session, all in parallel. Switching between virtual terminals
- is done with certain key combinations, usually Alt-<function key>.
-
- The setterm command ("man setterm") can be used to change the
- properties (such as colors or beeping) of a virtual terminal. The
- man page console_codes(4) ("man console_codes") contains the special
- character sequences that can be used to change those properties
- directly. The fonts used on virtual terminals can be changed with
- the setfont ("man setfont") command and the key bindings are defined
- with the loadkeys ("man loadkeys") command.
-
- You need at least one virtual terminal device in order to make use
- of your keyboard and monitor. Therefore, only people configuring an
- embedded system would want to say N here in order to save some
- memory; the only way to log into such a system is then via a serial
- or network connection.
+menu "Processor type and features"
- If unsure, say Y, or else you won't be able to do much with your new
- shiny Linux system :-)
+choice
+ prompt "Subarchitecture Type"
+ default SUN4CDM
-config VT_CONSOLE
- bool
- default y
- ---help---
- The system console is the device which receives all kernel messages
- and warnings and which allows logins in single user mode. If you
- answer Y here, a virtual terminal (the device used to interact with
- a physical terminal) can be used as system console. This is the most
- common mode of operations, so you should say Y here unless you want
- the kernel messages be output only to a serial port (in which case
- you should say Y to "Console on serial port", below).
-
- If you do say Y here, by default the currently visible virtual
- terminal (/dev/tty0) will be used as system console. You can change
- that with a kernel command line option such as "console=tty3" which
- would use the third virtual terminal as system console. (Try "man
- bootparam" or see the documentation of your boot loader (lilo or
- loadlin) about how to pass options to the kernel at boot time.)
+config SUN4CDM
+ bool "sun4c/d/m"
+ help
+ Choose this option if your system is a SPARCstation 1, 1+, 2,
+ IPC, IPX, classic, LX, ZX, 4, 5, 10, 20, or a compatible clone,
+ or a SPARCserver 1000[E] or SPARCcenter 2000[E]. Most everyone
+ wants this.
- If unsure, say Y.
+ Kernels compiled with this option will not boot on sun4 machines.
-config HW_CONSOLE
- bool
- default y
+config SUN4
+ bool "sun4"
+ help
+ Choose this option if, and only if, your machine is a sun4,
+ such as a 4/330.
+
+ Kernels compiled with this option will boot only on sun4.
+ (And this version will probably work only on sun4/330.)
+
+endchoice
config SMP
- bool "Symmetric multi-processing support (does not work on
sun4/sun4c)"
+ bool "Symmetric multi-processing support"
depends on BROKEN
---help---
This enables support for systems with more than one CPU. If you have
@@ -110,122 +90,96 @@ config NR_CPUS
range 2 32
depends on SMP
default "32"
+ help
+ This allows you to specify the maximum number of CPUs which
this
+ kernel will support. The maximum supported value is 255 and
the
+ minimum value which makes sense is 2.
+
+ This is purely to save memory - each supported CPU adds
+ approximately eight kilobytes to the kernel image.
+
+config PREEMPT
+ bool "Preemptible Kernel"
+ help
+ This option reduces the latency of the kernel when reacting
to
+ real-time or interactive events by allowing a low priority
process to
+ be preempted even if it is in kernel mode executing a system
call.
+ This allows applications to run more reliably even when the
system is
+ under load.
-# Identify this as a Sparc32 build
-config SPARC32
+ Say Y here if you are building a kernel for a desktop,
embedded
+ or real-time system. Say N if you are unsure.
+
+config HIGHMEM
bool
default y
- help
- SPARC is a family of RISC microprocessors designed and marketed by
- Sun Microsystems, incorporated. They are very widely found in Sun
- workstations and clones. This port covers the original 32-bit SPARC;
- it is old and stable and usually considered one of the "big three"
- along with the Intel and Alpha ports. The UltraLinux project
- maintains both the SPARC32 and SPARC64 ports; its web page is
- available at <http://www.ultralinux.org/>.
-# Global things across all Sun machines.
-config ISA
+config RWSEM_GENERIC_SPINLOCK
bool
- help
- ISA is found on Espresso only and is not supported currently.
- Say N
+ default y
-config EISA
+config RWSEM_XCHGADD_ALGORITHM
bool
- help
- EISA is not supported.
- Say N
-config MCA
- bool
- help
- MCA is not supported.
- Say N
+source "mm/Kconfig"
-config PCMCIA
- tristate
- ---help---
- Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
- computer. These are credit-card size devices such as network cards,
- modems or hard drives often used with laptops computers. There are
- actually two varieties of these cards: the older 16 bit PCMCIA cards
- and the newer 32 bit CardBus cards. If you want to use CardBus
- cards, you need to say Y here and also to "CardBus support" below.
-
- To use your PC-cards, you will need supporting software from David
- Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
- for location). Please also read the PCMCIA-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
+endmenu
- To compile this driver as modules, choose M here: the
- modules will be called pcmcia_core and ds.
+source "net/Kconfig"
-config SBUS
- bool
- default y
+source "drivers/Kconfig"
+
+menu "Power Management Support"
-config SBUSCHAR
+source kernel/power/Kconfig
+
+config GENERIC_CALIBRATE_DELAY
bool
default y
-config SERIAL_CONSOLE
- bool
+config SUN_PM
+ depends on PM
+ bool "Sun power management support"
default y
- ---help---
- If you say Y here, it will be possible to use a serial port as the
- system console (the system console is the device which receives all
- kernel messages and warnings and which allows logins in single user
- mode). This could be useful if some terminal or printer is connected
- to that serial port.
-
- Even if you say Y here, the currently visible virtual console
- (/dev/tty0) will still be used as the system console by default, but
- you can alter that using a kernel command line option such as
- "console=ttyS1". (Try "man bootparam" or see the documentation of
- your boot loader (silo) about how to pass options to the kernel at
- boot time.)
-
- If you don't have a graphics card installed and you say Y here, the
- kernel will automatically use the first serial line, /dev/ttyS0, as
- system console.
+ help
+ Enable power management and CPU standby features on supported
+ SPARC platforms. This includes at least the SS4/5 and Voyager.
- If unsure, say N.
+ It is safe to say Y.
-config SUN_AUXIO
+endmenu
+
+menu "Bus options (PCI, SBUS, ...)"
+
+config SBUS
bool
default y
-config SUN_IO
+config SUN_AUXIO
bool
default y
-config RWSEM_GENERIC_SPINLOCK
+config SUN_IO
bool
default y
-config RWSEM_XCHGADD_ALGORITHM
+config ISA
bool
+ help
+ ISA is found on Espresso only and is not supported currently.
+ Say N
-config GENERIC_CALIBRATE_DELAY
+config EISA
bool
- default y
+ help
+ EISA is not supported.
+ Say N
-config SUN_PM
+config MCA
bool
- default y
help
- Enable power management and CPU standby features on supported
- SPARC platforms.
-
-config SUN4
- bool "Support for SUN4 machines (disables SUN4[CDM] support)"
- depends on !SMP
- default n
- help
- Say Y here if, and only if, your machine is a sun4. Note that
- a kernel compiled with this option will run only on sun4.
- (And the current version will probably work only on sun4/330.)
+ MCA is not supported.
+ Say N
if !SUN4
@@ -240,90 +194,47 @@ source "drivers/pci/Kconfig"
endif
-config SUN_OPENPROMFS
- tristate "Openprom tree appears in /proc/openprom"
- help
- If you say Y, the OpenPROM device tree will be available as a
- virtual file system, which you can mount to /proc/openprom by "mount
- -t openpromfs none /proc/openprom".
+config HOTPLUG
+ depends on BROKEN
+ bool "Support for hot-pluggable devices"
+ ---help---
+ Say Y here if you want to plug devices into your computer while
+ the system is running, and be able to use them quickly. In many
+ cases, the devices can likewise be unplugged at any time too.
+
+ One well known example of this is PCMCIA- or PC-cards, credit-card
+ size devices such as network cards, modems or hard drives which are
+ plugged into slots found on all modern laptop computers. Another
+ example, used on modern desktops as well as laptops, is USB.
+
+ Enable HOTPLUG and KMOD, and build a modular kernel. Get agent
+ software (at <http://linux-hotplug.sourceforge.net/>) and install
it.
+ Then your kernel will automatically call out to a user mode "policy
+ agent" (/sbin/hotplug) to load modules and set up software needed
+ to use devices as you hotplug them.
+
+source "drivers/pcmcia/Kconfig"
+
+source "drivers/pci/hotplug/Kconfig"
- To compile the /proc/openprom support as a module, choose M here:
the
- module will be called openpromfs.
+endmenu
- Only choose N if you know in advance that you will not need to
modify
- OpenPROM settings on the running system.
+menu "Executable file formats"
source "fs/Kconfig.binfmt"
config SUNOS_EMUL
+ select BINFMT_AOUT
bool "SunOS binary emulation"
help
This allows you to run most SunOS binaries. If you want to do this,
say Y here and place appropriate files in /usr/gnemul/sunos. See
- <http://www.ultralinux.org/faq.html> for more information. If you
- want to run SunOS binaries on an Ultra you must also say Y to
- "Kernel support for 32-bit a.out binaries" above.
-
-source "mm/Kconfig"
+ <http://www.ultralinux.org/faq.html> for more information.
endmenu
-source "net/Kconfig"
-
source "drivers/Kconfig"
-if !SUN4
-source "drivers/sbus/char/Kconfig"
-endif
-
-# This one must be before the filesystem configs. -DaveM
-
-menu "Unix98 PTY support"
-
-config UNIX98_PTYS
- bool "Unix98 PTY support"
- ---help---
- A pseudo terminal (PTY) is a software device consisting of two
- halves: a master and a slave. The slave device behaves identical to
- a physical terminal; the master device is used by a process to
- read data from and write data to the slave, thereby emulating a
- terminal. Typical programs for the master side are telnet servers
- and xterms.
-
- Linux has traditionally used the BSD-like names /dev/ptyxx for
- masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
- has a number of problems. The GNU C library glibc 2.1 and later,
- however, supports the Unix98 naming standard: in order to acquire a
- pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
- terminal is then made available to the process and the pseudo
- terminal slave can be accessed as /dev/pts/<number>. What was
- traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-
- The entries in /dev/pts/ are created on the fly by a virtual
- file system; therefore, if you say Y here you should say Y to
- "/dev/pts file system for Unix98 PTYs" as well.
-
- If you want to say Y here, you need to have the C library glibc 2.1
- or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*").
- Read the instructions in <file:Documentation/Changes> pertaining to
- pseudo terminals. It's safe to say N.
-
-config UNIX98_PTY_COUNT
- int "Maximum number of Unix98 PTYs in use (0-2048)"
- depends on UNIX98_PTYS
- default "256"
- help
- The maximum number of Unix98 PTYs that can be used at any one time.
- The default is 256, and should be enough for desktop systems. Server
- machines which support incoming telnet/rlogin/ssh connections and/or
- serve several X terminals may want to increase this: every incoming
- connection and every xterm uses up one PTY.
-
- When not in use, each additional set of 256 PTYs occupy
- approximately 8 KB of kernel memory on 32-bit architectures.
-
-endmenu
-
source "fs/Kconfig"
source "arch/sparc/Kconfig.debug"
diff -Naurp linux-2.6.13-rc4-git2/arch/sparc64/Kconfig
linux-2.6.13-rc4-git2-gentoo/arch/sparc64/Kconfig
--- linux-2.6.13-rc4-git2/arch/sparc64/Kconfig 2005-07-30
19:45:56.029772637 -0700
+++ linux-2.6.13-rc4-git2-gentoo/arch/sparc64/Kconfig 2005-07-30
19:54:22.349027257 -0700
@@ -5,6 +5,17 @@
mainmenu "Linux/UltraSPARC Kernel Configuration"
+# Identify this as a Sparc64 build
+config SPARC64
+ bool
+ default y
+ help
+ SPARC is a family of RISC microprocessors designed and marketed by
+ Sun Microsystems, incorporated. This port covers the newer 64-bit
+ UltraSPARC. The UltraLinux project maintains both the SPARC32 and
+ SPARC64 ports; its web page is available at
+ <http://www.ultralinux.org/>.
+
config 64BIT
def_bool y
@@ -12,10 +23,23 @@ config MMU
bool
default y
+config GENERIC_ISA_DMA
+ bool
+ default y
+
config TIME_INTERPOLATION
bool
default y
+source "init/Kconfig"
+
+config SYSVIPC_COMPAT
+ bool
+ depends on COMPAT && SYSVIPC
+ default y
+
+menu "Processor type and features"
+
choice
prompt "Kernel page size"
default SPARC64_PAGE_SIZE_8KB
@@ -62,84 +86,6 @@ config SECCOMP
source kernel/Kconfig.hz
-source "init/Kconfig"
-
-config SYSVIPC_COMPAT
- bool
- depends on COMPAT && SYSVIPC
- default y
-
-menu "General machine setup"
-
-config BBC_I2C
- tristate "UltraSPARC-III bootbus i2c controller driver"
- depends on PCI
- help
- The BBC devices on the UltraSPARC III have two I2C controllers. The
- first I2C controller connects mainly to configuration PROMs (NVRAM,
- CPU configuration, DIMM types, etc.). The second I2C controller
- connects to environmental control devices such as fans and
- temperature sensors. The second controller also connects to the
- smartcard reader, if present. Say Y to enable support for these.
-
-config VT
- bool "Virtual terminal" if EMBEDDED
- select INPUT
- default y
- ---help---
- If you say Y here, you will get support for terminal devices with
- display and keyboard devices. These are called "virtual" because you
- can run several virtual terminals (also called virtual consoles) on
- one physical terminal. This is rather useful, for example one
- virtual terminal can collect system messages and warnings, another
- one can be used for a text-mode user session, and a third could run
- an X session, all in parallel. Switching between virtual terminals
- is done with certain key combinations, usually Alt-<function key>.
-
- The setterm command ("man setterm") can be used to change the
- properties (such as colors or beeping) of a virtual terminal. The
- man page console_codes(4) ("man console_codes") contains the special
- character sequences that can be used to change those properties
- directly. The fonts used on virtual terminals can be changed with
- the setfont ("man setfont") command and the key bindings are defined
- with the loadkeys ("man loadkeys") command.
-
- You need at least one virtual terminal device in order to make use
- of your keyboard and monitor. Therefore, only people configuring an
- embedded system would want to say N here in order to save some
- memory; the only way to log into such a system is then via a serial
- or network connection.
-
- If unsure, say Y, or else you won't be able to do much with your new
- shiny Linux system :-)
-
-config VT_CONSOLE
- bool "Support for console on virtual terminal" if EMBEDDED
- depends on VT
- default y
- ---help---
- The system console is the device which receives all kernel messages
- and warnings and which allows logins in single user mode. If you
- answer Y here, a virtual terminal (the device used to interact with
- a physical terminal) can be used as system console. This is the most
- common mode of operations, so you should say Y here unless you want
- the kernel messages be output only to a serial port (in which case
- you should say Y to "Console on serial port", below).
-
- If you do say Y here, by default the currently visible virtual
- terminal (/dev/tty0) will be used as system console. You can change
- that with a kernel command line option such as "console=tty3" which
- would use the third virtual terminal as system console. (Try "man
- bootparam" or see the documentation of your boot loader (lilo or
- loadlin) about how to pass options to the kernel at boot time.)
-
- If unsure, say Y.
-
-config HW_CONSOLE
- bool
- depends on VT
- default y
-
config SMP
bool "Symmetric multi-processing support"
---help---
@@ -205,25 +151,6 @@ config US2E_FREQ
If in doubt, say N.
-# Identify this as a Sparc64 build
-config SPARC64
- bool
- default y
- help
- SPARC is a family of RISC microprocessors designed and marketed by
- Sun Microsystems, incorporated. This port covers the newer 64-bit
- UltraSPARC. The UltraLinux project maintains both the SPARC32 and
- SPARC64 ports; its web page is available at
- <http://www.ultralinux.org/>.
-
-# Global things across all Sun machines.
-config RWSEM_GENERIC_SPINLOCK
- bool
-
-config RWSEM_XCHGADD_ALGORITHM
- bool
- default y
-
config GENERIC_CALIBRATE_DELAY
bool
default y
@@ -246,7 +173,29 @@ config HUGETLB_PAGE_SIZE_64K
endchoice
-config GENERIC_ISA_DMA
+# Global things across all Sun machines.
+config RWSEM_GENERIC_SPINLOCK
+ bool
+
+config RWSEM_XCHGADD_ALGORITHM
+ bool
+ default y
+
+source "mm/Kconfig"
+
+endmenu
+
+menu "Bus options (PCI, SBUS, PCMCIA, ...)"
+
+config SBUS
+ bool
+ default y
+
+config SUN_AUXIO
+ bool
+ default y
+
+config SUN_IO
bool
default y
@@ -293,40 +242,6 @@ config MCA
<file:Documentation/mca.txt> (and especially the web page given
there) before attempting to build an MCA bus kernel.
-config PCMCIA
- tristate
- ---help---
- Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
- computer. These are credit-card size devices such as network cards,
- modems or hard drives often used with laptops computers. There are
- actually two varieties of these cards: the older 16 bit PCMCIA cards
- and the newer 32 bit CardBus cards. If you want to use CardBus
- cards, you need to say Y here and also to "CardBus support" below.
-
- To use your PC-cards, you will need supporting software from David
- Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
- for location). Please also read the PCMCIA-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as modules, choose M here: the
- modules will be called pcmcia_core and ds.
-
-config SBUS
- bool
- default y
-
-config SBUSCHAR
- bool
- default y
-
-config SUN_AUXIO
- bool
- default y
-
-config SUN_IO
- bool
- default y
-
config PCI
bool "PCI support"
help
@@ -344,44 +259,31 @@ config PCI_DOMAINS
bool
default PCI
-config RTC
- tristate
- depends on PCI
- default y
- ---help---
- If you say Y here and create a character special file /dev/rtc with
- major number 10 and minor number 135 using mknod ("man mknod"), you
- will get access to the real time clock (or hardware clock) built
- into your computer.
-
- Every PC has such a clock built in. It can be used to generate
- signals from as low as 1Hz up to 8192Hz, and can also be used
- as a 24 hour alarm. It reports status information via the file
- /proc/driver/rtc and its behaviour is set by various ioctls on
- /dev/rtc.
-
- If you run Linux on a multiprocessor machine and said Y to
- "Symmetric Multi Processing" above, you should say Y here to read
- and set the RTC in an SMP compatible fashion.
-
- If you think you have a use for such a device (such as periodic data
- sampling), then say Y here, and read <file:Documentation/rtc.txt>
- for details.
+source "drivers/pci/Kconfig"
- To compile this driver as a module, choose M here: the
- module will be called rtc.
+config HOTPLUG
+ bool "Support for hot-pluggable devices"
+ ---help---
+ Say Y here if you want to plug devices into your computer while
+ the system is running, and be able to use them quickly. In many
+ cases, the devices can likewise be unplugged at any time too.
+
+ One well known example of this is PCMCIA- or PC-cards, credit-card
+ size devices such as network cards, modems or hard drives which are
+ plugged into slots found on all modern laptop computers. Another
+ example, used on modern desktops as well as laptops, is USB.
+
+ Enable HOTPLUG and KMOD, and build a modular kernel. Get agent
+ software (at <http://linux-hotplug.sourceforge.net/>) and install
it.
+ Then your kernel will automatically call out to a user mode "policy
+ agent" (/sbin/hotplug) to load modules and set up software needed
+ to use devices as you hotplug them.
-source "drivers/pci/Kconfig"
+endmenu
-config SUN_OPENPROMFS
- tristate "Openprom tree appears in /proc/openprom"
- help
- If you say Y, the OpenPROM device tree will be available as a
- virtual file system, which you can mount to /proc/openprom by "mount
- -t openpromfs none /proc/openprom".
+menu "Executable file formats"
- To compile the /proc/openprom support as a module, choose M here:
the
- module will be called openpromfs. If unsure, choose M.
+source "fs/Kconfig.binfmt"
config SPARC32_COMPAT
bool "Kernel support for Linux/Sparc 32bit binary compatibility"
@@ -414,17 +316,14 @@ config BINFMT_AOUT32
If you want to run SunOS binaries (see SunOS binary emulation below)
or other a.out binaries, say Y. If unsure, say N.
-source "fs/Kconfig.binfmt"
-
config SUNOS_EMUL
+ select BINFMT_AOUT32
+ depends on SPARC32_COMPAT
bool "SunOS binary emulation"
- depends on BINFMT_AOUT32
help
This allows you to run most SunOS binaries. If you want to do this,
say Y here and place appropriate files in /usr/gnemul/sunos. See
- <http://www.ultralinux.org/faq.html> for more information. If you
- want to run SunOS binaries on an Ultra you must also say Y to
- "Kernel support for 32-bit a.out binaries" above.
+ <http://www.ultralinux.org/faq.html> for more information.
config SOLARIS_EMUL
tristate "Solaris binary emulation (EXPERIMENTAL)"
@@ -436,75 +335,6 @@ config SOLARIS_EMUL
To compile this code as a module, choose M here: the
module will be called solaris.
-source "drivers/parport/Kconfig"
-
-config PRINTER
- tristate "Parallel printer support"
- depends on PARPORT
- ---help---
- If you intend to attach a printer to the parallel port of your Linux
- box (as opposed to using a serial printer; if the connector at the
- printer has 9 or 25 holes ["female"], then it's serial), say Y.
- Also read the Printing-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- It is possible to share one parallel port among several devices
- (e.g. printer and ZIP drive) and it is safe to compile the
- corresponding drivers into the kernel.
- To compile this driver as a module, choose M here and read
- <file:Documentation/parport.txt>. The module will be called lp.
-
- If you have several parallel ports, you can specify which ports to
- use with the "lp" kernel command line option. (Try "man bootparam"
- or see the documentation of your boot loader (lilo or loadlin) about
- how to pass options to the kernel at boot time.) The syntax of the
- "lp" command line option can be found in <file:drivers/char/lp.c>.
-
- If you have more than 8 printers, you need to increase the LP_NO
- macro in lp.c and the PARPORT_MAX macro in parport.h.
-
-config PPDEV
- tristate "Support for user-space parallel port device drivers"
- depends on PARPORT
- ---help---
- Saying Y to this adds support for /dev/parport device nodes. This
- is needed for programs that want portable access to the parallel
- port, for instance deviceid (which displays Plug-and-Play device
- IDs).
-
- This is the parallel port equivalent of SCSI generic support (sg).
- It is safe to say N to this -- it is not needed for normal printing
- or parallel port CD-ROM/disk support.
-
- To compile this driver as a module, choose M here: the
- module will be called ppdev.
-
- If unsure, say N.
-
-config ENVCTRL
- tristate "SUNW, envctrl support"
- depends on PCI
- help
- Kernel support for temperature and fan monitoring on Sun SME
- machines.
-
- To compile this driver as a module, choose M here: the
- module will be called envctrl.
-
-config DISPLAY7SEG
- tristate "7-Segment Display support"
- depends on PCI
- ---help---
- This is the driver for the 7-segment display and LED present on
- Sun Microsystems CompactPCI models CP1400 and CP1500.
-
- To compile this driver as a module, choose M here: the
- module will be called display7seg.
-
- If you do not have a CompactPCI model CP1400 or CP1500, or
- another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
- you should say N to this option.
-
config CMDLINE_BOOL
bool "Default bootloader kernel arguments"
@@ -521,148 +351,14 @@ config CMDLINE
NOTE: This option WILL override the PROM bootargs setting!
-source "mm/Kconfig"
-
endmenu
source "net/Kconfig"
-source "drivers/base/Kconfig"
-
-source "drivers/video/Kconfig"
-
-source "drivers/serial/Kconfig"
-
-source "drivers/sbus/char/Kconfig"
-
-source "drivers/mtd/Kconfig"
-
-source "drivers/block/Kconfig"
-
-source "drivers/ide/Kconfig"
-
-source "drivers/scsi/Kconfig"
-
-source "drivers/fc4/Kconfig"
-
-source "drivers/md/Kconfig"
-
-if PCI
-source "drivers/message/fusion/Kconfig"
-endif
-
-source "drivers/ieee1394/Kconfig"
-
-source "drivers/net/Kconfig"
-
-source "drivers/isdn/Kconfig"
-
-source "drivers/telephony/Kconfig"
-
-# This one must be before the filesystem configs. -DaveM
-
-menu "Unix98 PTY support"
-
-config UNIX98_PTYS
- bool "Unix98 PTY support"
- ---help---
- A pseudo terminal (PTY) is a software device consisting of two
- halves: a master and a slave. The slave device behaves identical to
- a physical terminal; the master device is used by a process to
- read data from and write data to the slave, thereby emulating a
- terminal. Typical programs for the master side are telnet servers
- and xterms.
-
- Linux has traditionally used the BSD-like names /dev/ptyxx for
- masters and /dev/ttyxx for slaves of pseudo terminals. This scheme
- has a number of problems. The GNU C library glibc 2.1 and later,
- however, supports the Unix98 naming standard: in order to acquire a
- pseudo terminal, a process opens /dev/ptmx; the number of the pseudo
- terminal is then made available to the process and the pseudo
- terminal slave can be accessed as /dev/pts/<number>. What was
- traditionally /dev/ttyp2 will then be /dev/pts/2, for example.
-
- The entries in /dev/pts/ are created on the fly by a virtual
- file system; therefore, if you say Y here you should say Y to
- "/dev/pts file system for Unix98 PTYs" as well.
-
- If you want to say Y here, you need to have the C library glibc 2.1
- or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*").
- Read the instructions in <file:Documentation/Changes> pertaining to
- pseudo terminals. It's safe to say N.
-
-config UNIX98_PTY_COUNT
- int "Maximum number of Unix98 PTYs in use (0-2048)"
- depends on UNIX98_PTYS
- default "256"
- help
- The maximum number of Unix98 PTYs that can be used at any one time.
- The default is 256, and should be enough for desktop systems. Server
- machines which support incoming telnet/rlogin/ssh connections and/or
- serve several X terminals may want to increase this: every incoming
- connection and every xterm uses up one PTY.
-
- When not in use, each additional set of 256 PTYs occupy
- approximately 8 KB of kernel memory on 32-bit architectures.
-
-endmenu
-
-menu "XFree86 DRI support"
-
-config DRM
- bool "Direct Rendering Manager (XFree86 DRI support)"
- help
- Kernel-level support for the Direct Rendering Infrastructure (DRI)
- introduced in XFree86 4.0. If you say Y here, you need to select
- the module that's right for your graphics card from the list below.
- These modules provide support for synchronization, security, and
- DMA transfers. Please see <http://dri.sourceforge.net/> for more
- details. You should also select and configure AGP
- (/dev/agpgart) support.
-
-config DRM_FFB
- tristate "Creator/Creator3D"
- depends on DRM && BROKEN
- help
- Choose this option if you have one of Sun's Creator3D-based graphics
- and frame buffer cards. Product page at
- <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
-
-config DRM_TDFX
- tristate "3dfx Banshee/Voodoo3+"
- depends on DRM
- help
- Choose this option if you have a 3dfx Banshee or Voodoo3 (or later),
- graphics card. If M is selected, the module will be called tdfx.
-
-config DRM_R128
- tristate "ATI Rage 128"
- depends on DRM
- help
- Choose this option if you have an ATI Rage 128 graphics card. If M
- is selected, the module will be called r128. AGP support for
- this card is strongly suggested (unless you have a PCI version).
-
-endmenu
-
-source "drivers/input/Kconfig"
-
-source "drivers/i2c/Kconfig"
-
-source "drivers/hwmon/Kconfig"
+source "drivers/Kconfig"
source "fs/Kconfig"
-source "drivers/media/Kconfig"
-
-source "sound/Kconfig"
-
-source "drivers/usb/Kconfig"
-
-source "drivers/infiniband/Kconfig"
-
-source "drivers/char/watchdog/Kconfig"
-
source "arch/sparc64/oprofile/Kconfig"
source "arch/sparc64/Kconfig.debug"
diff -Naurp linux-2.6.13-rc4-git2/drivers/char/drm/Kconfig
linux-2.6.13-rc4-git2-gentoo/drivers/char/drm/Kconfig
--- linux-2.6.13-rc4-git2/drivers/char/drm/Kconfig 2005-07-30
19:46:00.126092873 -0700
+++ linux-2.6.13-rc4-git2-gentoo/drivers/char/drm/Kconfig 2005-07-30
19:54:22.350027093 -0700
@@ -6,15 +6,15 @@
#
config DRM
tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI
support)"
- depends on (AGP || AGP=n) && PCI
+ depends on AGP || PCI || SBUS
help
Kernel-level support for the Direct Rendering Infrastructure (DRI)
introduced in XFree86 4.0. If you say Y here, you need to select
the module that's right for your graphics card from the list below.
These modules provide support for synchronization, security, and
DMA transfers. Please see <http://dri.sourceforge.net/> for more
- details. You should also select and configure AGP
- (/dev/agpgart) support.
+ details. You should also select and configure AGP (/dev/agpgart)
+ support if your graphics card is connected to an AGP slot.
config DRM_TDFX
tristate "3dfx Banshee/Voodoo3+"
@@ -25,7 +25,7 @@ config DRM_TDFX
config DRM_GAMMA
tristate "3dlabs GMX 2000"
- depends on DRM && BROKEN
+ depends on DRM && PCI && BROKEN
help
This is the old gamma driver, please tell me if it might actually
work.
@@ -103,3 +103,11 @@ config DRM_VIA
Choose this option if you have a Via unichrome or compatible video
chipset. If M is selected the module will be called via.
+config DRM_FFB
+ tristate "Creator/Creator3D"
+ depends on DRM && SBUS && SPARC64 && BROKEN
+ help
+ Choose this option if you have one of Sun's Creator3D-based graphics
+ and frame buffer cards. Product page at
+ <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
+
diff -Naurp linux-2.6.13-rc4-git2/drivers/char/Kconfig
linux-2.6.13-rc4-git2-gentoo/drivers/char/Kconfig
--- linux-2.6.13-rc4-git2/drivers/char/Kconfig 2005-07-30
19:46:00.115094698 -0700
+++ linux-2.6.13-rc4-git2-gentoo/drivers/char/Kconfig 2005-07-30
19:57:05.398307358 -0700
@@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE
If you have an Alchemy AU1000 processor (MIPS based) and you want
to use a console on a serial port, say Y. Otherwise, say N.
+config SUN_AURORA
+ tristate "Aurora Multiboard 1600se (EXPERIMENTAL)"
+ depends on SERIAL_NONSTANDARD && EXPERIMENTAL && SBUS && !SUN4
+ help
+ The Aurora Multiboard is a multi-port high-speed serial controller.
+ If you have one of these, say Y.
+
config QTRONIX_KEYBOARD
bool "Enable Qtronix 990P Keyboard Support"
depends on IT8712
@@ -733,9 +740,20 @@ config SGI_IP27_RTC
via the file /proc/rtc and its behaviour is set by various ioctls on
/dev/rtc.
+config SUN_MOSTEK_RTC
+ tristate "Mostek real time clock support"
+ depends on (SPARC32 || SPARC64)
+ default y
+ help
+ The Mostek RTC chip is used on all known Sun computers except
+ some JavaStations. For a JavaStation you need to say Y both here
+ and to "Enhanced Real Time Clock Support".
+
+ Say Y here unless you are building a special purpose kernel.
+
config GEN_RTC
tristate "Generic /dev/rtc emulation"
- depends on RTC!=y && !IA64 && !ARM && !PPC64
+ depends on RTC!=y && !IA64 && !ARM && !PPC64 && SUN_MOSTEK_RTC!=y
---help---
If you say Y here and create a character special file /dev/rtc with
major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -844,6 +862,30 @@ config TANBAC_TB0219
tristate "TANBAC TB0219 base board support"
depends TANBAC_TB0229
+config ENVCTRL
+ tristate "SUNW,envctrl support"
+ depends on PCI && SPARC64
+ help
+ Kernel support for temperature and fan monitoring on Sun SME
+ machines.
+
+ To compile this driver as a module, choose M here: the
+ module will be called envctrl.
+
+config DISPLAY7SEG
+ tristate "Sun CPCI 7-Segment Display support"
+ depends on PCI && SPARC64
+ ---help---
+ This is the driver for the 7-segment display and LED present on
+ Sun Microsystems CompactPCI models CP1400 and CP1500.
+
+ To compile this driver as a module, choose M here: the
+ module will be called display7seg.
+
+ If you do not have a CompactPCI model CP1400 or CP1500, or
+ another UltraSPARC-IIi-cEngine boardset with a 7-segment display,
+ you should say N to this option.
+
menu "Ftape, the floppy tape device driver"
diff -Naurp linux-2.6.13-rc4-git2/drivers/Kconfig
linux-2.6.13-rc4-git2-gentoo/drivers/Kconfig
--- linux-2.6.13-rc4-git2/drivers/Kconfig 2005-07-30 19:45:58.456369955
-0700
+++ linux-2.6.13-rc4-git2-gentoo/drivers/Kconfig 2005-07-30
19:54:22.352026766 -0700
@@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig"
source "drivers/sn/Kconfig"
+if SPARC32 || SPARC64
+ source "drivers/fc4/Kconfig"
+ source "drivers/sbus/char/Kconfig"
+endif
+
endmenu
diff -Naurp linux-2.6.13-rc4-git2/drivers/sbus/char/Kconfig
linux-2.6.13-rc4-git2-gentoo/drivers/sbus/char/Kconfig
--- linux-2.6.13-rc4-git2/drivers/sbus/char/Kconfig 2005-07-30
19:46:09.698504394 -0700
+++ linux-2.6.13-rc4-git2-gentoo/drivers/sbus/char/Kconfig 2005-07-30
19:57:50.205963155 -0700
@@ -13,15 +13,6 @@ config SUN_OPENPROMIO
If unsure, say Y.
-config SUN_MOSTEK_RTC
- tristate "Mostek real time clock support"
- help
- The Mostek RTC chip is used on all known Sun computers except
- some JavaStations. For a JavaStation you need to say Y both here
- and to "Enhanced Real Time Clock Support".
-
- Say Y here unless you are building a special purpose kernel.
-
config OBP_FLASH
tristate "OBP Flash Device support"
depends on SPARC64
@@ -69,11 +60,5 @@ config SUN_JSFLASH
If you say Y here, you will be able to boot from your JavaStation's
Flash memory.
-# XXX Why don't we do "source drivers/char/Config.in" somewhere?
-# no shit
-config RTC
- tristate "PC-style Real Time Clock Support"
- depends on PCI && EXPERIMENTAL && SPARC32
-
endmenu
diff -Naurp linux-2.6.13-rc4-git2/drivers/sbus/Makefile
linux-2.6.13-rc4-git2-gentoo/drivers/sbus/Makefile
--- linux-2.6.13-rc4-git2/drivers/sbus/Makefile 2005-06-17
12:48:29.000000000 -0700
+++ linux-2.6.13-rc4-git2-gentoo/drivers/sbus/Makefile 2005-07-30
19:54:22.354026438 -0700
@@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k)
obj-y := sbus.o dvma.o
endif
-obj-$(CONFIG_SBUSCHAR) += char/
+obj-y += char/
diff -Naurp linux-2.6.13-rc4-git2/fs/Kconfig
linux-2.6.13-rc4-git2-gentoo/fs/Kconfig
--- linux-2.6.13-rc4-git2/fs/Kconfig 2005-07-30 19:46:15.724504429 -0700
+++ linux-2.6.13-rc4-git2-gentoo/fs/Kconfig 2005-07-30
19:54:22.356026110 -0700
@@ -856,6 +856,20 @@ config RAMFS
To compile this as a module, choose M here: the module will be
called
ramfs.
+config SUN_OPENPROMFS
+ depends on SPARC32 || SPARC64
+ tristate "OpenPROM file system"
+ help
+ If you say Y, the OpenPROM device tree will be available as a
+ virtual file system, which you can mount to /proc/openprom by "mount
+ -t openpromfs none /proc/openprom".
+
+ To compile the /proc/openprom support as a module, choose M here:
the
+ module will be called openpromfs.
+
+ Only choose N if you know in advance that you will not need to
modify
+ OpenPROM settings on the running system.
+
endmenu
menu "Miscellaneous filesystems"
signature.asc
Description: This is a digitally signed message part
