Move npx and loop, fix wording, and delete the big comment found

in GENERIC.

Approved by:	brueffer (mentor)
This commit is contained in:
Joel Dahl 2005-08-30 07:12:45 +00:00
parent 37d5407cab
commit 1f5b165da0
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=25514

View file

@ -453,11 +453,9 @@
Each line contains a keyword and one or more arguments. For Each line contains a keyword and one or more arguments. For
simplicity, most lines only contain one argument. Anything simplicity, most lines only contain one argument. Anything
following a <literal>#</literal> is considered a comment and following a <literal>#</literal> is considered a comment and
ignored. The following sections describe each keyword, generally in ignored. The following sections describe each keyword, in
the order they are listed in <filename>GENERIC</filename>, although the order they are listed in <filename>GENERIC</filename>.
some related keywords have been grouped together in a single section <anchor
(such as Networking) even though they are actually scattered
throughout the <filename>GENERIC</filename> file. <anchor
id="kernelconfig-options"> For an exhaustive list of architecture id="kernelconfig-options"> For an exhaustive list of architecture
dependent options and devices, see the <filename>NOTES</filename> dependent options and devices, see the <filename>NOTES</filename>
file in the same directory as <filename>GENERIC</filename>. For file in the same directory as <filename>GENERIC</filename>. For
@ -502,28 +500,6 @@
<filename>/usr/src/sys/<replaceable>i386</replaceable>/conf/GENERIC</filename> <filename>/usr/src/sys/<replaceable>i386</replaceable>/conf/GENERIC</filename>
fairly closely.</para> fairly closely.</para>
<programlisting>#
# GENERIC -- Generic kernel configuration file for &os;/i386
#
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
#
# http://www.&os;.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
# &os; World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
# device lines is also present in the ../../conf/NOTES and NOTES files.
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
# &dollar;FreeBSD: /repoman/r/ncvs/src/sys/i386/conf/GENERIC,v 1.413 2004/08/11 01:34:18 rwatson Exp &dollar;</programlisting>
<para>The following are the mandatory keywords required in
<emphasis>every</emphasis> kernel you build:</para>
<indexterm> <indexterm>
<primary>kernel options</primary> <primary>kernel options</primary>
<secondary>machine</secondary> <secondary>machine</secondary>
@ -601,27 +577,6 @@ cpu I686_CPU</programlisting>
kernel, so it is useful to give the new kernel a different name if you kernel, so it is useful to give the new kernel a different name if you
want to keep it separate from your usual kernel (e.g., you want to want to keep it separate from your usual kernel (e.g., you want to
build an experimental kernel).</para> build an experimental kernel).</para>
<programlisting># Floating point support - do not disable.
device npx</programlisting>
<para><literal>npx</literal> is the interface to the floating point
math unit in &os;, which is either the hardware co-processor or
the software math emulator. This is <emphasis>not</emphasis>
optional.</para>
<programlisting># Pseudo devices
device loop # Network loopback</programlisting>
<para>This is the generic loopback device for TCP/IP. If you telnet
or FTP to <hostid>localhost</hostid> (a.k.a. <hostid
role="ipaddr">127.0.0.1</hostid>) it will come back at you through
this device. This is <emphasis>mandatory</emphasis>. Under
&os;&nbsp;4.X you have to use the line <literal>pseudo-device
loop</literal>.</para>
<para>Everything that follows is more or less optional. See the notes
underneath or next to each option for more information.</para>
<programlisting>#To statically compile in device wiring instead of /boot/device.hints <programlisting>#To statically compile in device wiring instead of /boot/device.hints
#hints "GENERIC.hints" # Default places to look for devices.</programlisting> #hints "GENERIC.hints" # Default places to look for devices.</programlisting>
@ -1067,6 +1022,14 @@ device sc</programlisting>
will enable support for AGP, and AGP GART for boards which will enable support for AGP, and AGP GART for boards which
have these features.</para> have these features.</para>
<programlisting># Floating point support - do not disable.
device npx</programlisting>
<para><literal>npx</literal> is the interface to the floating point
math unit in &os;, which is either the hardware co-processor or
the software math emulator. This is <emphasis>not</emphasis>
optional.</para>
<indexterm> <indexterm>
<primary>APM</primary> <primary>APM</primary>
</indexterm> </indexterm>
@ -1235,6 +1198,16 @@ device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
<para>Support for various wireless cards.</para> <para>Support for various wireless cards.</para>
<programlisting># Pseudo devices
device loop # Network loopback</programlisting>
<para>This is the generic loopback device for TCP/IP. If you telnet
or FTP to <hostid>localhost</hostid> (a.k.a. <hostid
role="ipaddr">127.0.0.1</hostid>) it will come back at you through
this device. This is <emphasis>mandatory</emphasis>. Under
&os;&nbsp;4.X you have to use the line <literal>pseudo-device
loop</literal>.</para>
<programlisting>device mem # Memory and kernel memory devices</programlisting> <programlisting>device mem # Memory and kernel memory devices</programlisting>
<para>The system memory devices.</para> <para>The system memory devices.</para>