Module Name: src
Committed By: wiz
Date: Thu Jun 3 07:41:26 UTC 2021
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4/man4.i386: Makefile intro.4
src/share/man/man4/man4.x86: Makefile
Added Files:
src/share/man/man4/man4.x86: autoconf.4 console.4
Removed Files:
src/share/man/man4/man4.i386: autoconf.4 console.4
Log Message:
Remove i386/autoconf(4) and i386/console(4) to x86/autoconf(4) and
x86/console(4)
Part of PR 36350.
To generate a diff of this commit:
cvs rdiff -u -r1.1720 -r1.1721 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.78 -r1.79 src/share/man/man4/man4.i386/Makefile
cvs rdiff -u -r1.11 -r0 src/share/man/man4/man4.i386/autoconf.4
cvs rdiff -u -r1.12 -r0 src/share/man/man4/man4.i386/console.4
cvs rdiff -u -r1.34 -r1.35 src/share/man/man4/man4.i386/intro.4
cvs rdiff -u -r1.21 -r1.22 src/share/man/man4/man4.x86/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.x86/autoconf.4 \
src/share/man/man4/man4.x86/console.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1720 src/distrib/sets/lists/man/mi:1.1721
--- src/distrib/sets/lists/man/mi:1.1720 Mon May 17 04:07:42 2021
+++ src/distrib/sets/lists/man/mi Thu Jun 3 07:41:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1720 2021/05/17 04:07:42 yamaguchi Exp $
+# $NetBSD: mi,v 1.1721 2021/06/03 07:41:26 wiz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1264,12 +1264,12 @@
./usr/share/man/cat4/hythygtemp.0 man-sys-catman .cat
./usr/share/man/cat4/i386/PCIBIOS.0 man-sys-catman .cat
./usr/share/man/cat4/i386/apm.0 man-sys-catman .cat
-./usr/share/man/cat4/i386/autoconf.0 man-sys-catman .cat
+./usr/share/man/cat4/i386/autoconf.0 man-obsolete obsolete
./usr/share/man/cat4/i386/busmouse.0 man-obsolete obsolete
./usr/share/man/cat4/i386/cmos.0 man-sys-catman .cat
./usr/share/man/cat4/i386/com.0 man-obsolete obsolete
-./usr/share/man/cat4/i386/cons.0 man-sys-catman .cat
-./usr/share/man/cat4/i386/console.0 man-sys-catman .cat
+./usr/share/man/cat4/i386/cons.0 man-obsolete obsolete
+./usr/share/man/cat4/i386/console.0 man-obsolete obsolete
./usr/share/man/cat4/i386/ed.0 man-sys-catman .cat
./usr/share/man/cat4/i386/elanpar.0 man-sys-catman .cat
./usr/share/man/cat4/i386/elanpex.0 man-sys-catman .cat
@@ -2078,7 +2078,10 @@
./usr/share/man/cat4/x86/amdsmn.0 man-sys-catman .cat
./usr/share/man/cat4/x86/amdzentemp.0 man-sys-catman .cat
./usr/share/man/cat4/x86/apic.0 man-sys-catman .cat
+./usr/share/man/cat4/x86/autoconf.0 man-sys-catman .cat
./usr/share/man/cat4/x86/balloon.0 man-sys-catman .cat
+./usr/share/man/cat4/x86/cons.0 man-sys-catman .cat
+./usr/share/man/cat4/x86/console.0 man-sys-catman .cat
./usr/share/man/cat4/x86/coretemp.0 man-sys-catman .cat
./usr/share/man/cat4/x86/est.0 man-sys-catman .cat
./usr/share/man/cat4/x86/fdc.0 man-sys-catman .cat
@@ -4486,10 +4489,10 @@
./usr/share/man/html4/hythygtemp.html man-sys-htmlman html
./usr/share/man/html4/i386/PCIBIOS.html man-sys-htmlman html
./usr/share/man/html4/i386/apm.html man-sys-htmlman html
-./usr/share/man/html4/i386/autoconf.html man-sys-htmlman html
+./usr/share/man/html4/386/autoconf.html man-obsolete obsolete
./usr/share/man/html4/i386/cmos.html man-sys-htmlman html
-./usr/share/man/html4/i386/cons.html man-sys-htmlman html
-./usr/share/man/html4/i386/console.html man-sys-htmlman html
+./usr/share/man/html4/i386/cons.html man-obsolete obsolete
+./usr/share/man/html4/i386/console.html man-obsolete obsolete
./usr/share/man/html4/i386/ed.html man-sys-htmlman html
./usr/share/man/html4/i386/elanpar.html man-sys-htmlman html
./usr/share/man/html4/i386/elanpex.html man-sys-htmlman html
@@ -5231,7 +5234,10 @@
./usr/share/man/html4/x86/amdsmn.html man-sys-htmlman html
./usr/share/man/html4/x86/amdzentemp.html man-sys-htmlman html
./usr/share/man/html4/x86/apic.html man-sys-htmlman html
+./usr/share/man/html4/x86/autoconf.html man-sys-htmlman html
./usr/share/man/html4/x86/balloon.html man-sys-htmlman html
+./usr/share/man/html4/x86/cons.html man-sys-htmlman html
+./usr/share/man/html4/x86/console.html man-sys-htmlman html
./usr/share/man/html4/x86/coretemp.html man-sys-htmlman html
./usr/share/man/html4/x86/est.html man-sys-htmlman html
./usr/share/man/html4/x86/fdc.html man-sys-htmlman html
@@ -7501,12 +7507,12 @@
./usr/share/man/man4/hythygtemp.4 man-sys-man .man
./usr/share/man/man4/i386/PCIBIOS.4 man-sys-man .man
./usr/share/man/man4/i386/apm.4 man-sys-man .man
-./usr/share/man/man4/i386/autoconf.4 man-sys-man .man
+./usr/share/man/man4/i386/autoconf.4 man-obsolete obsolete
./usr/share/man/man4/i386/busmouse.4 man-obsolete obsolete
./usr/share/man/man4/i386/cmos.4 man-sys-man .man
./usr/share/man/man4/i386/com.4 man-obsolete obsolete
-./usr/share/man/man4/i386/cons.4 man-sys-man .man
-./usr/share/man/man4/i386/console.4 man-sys-man .man
+./usr/share/man/man4/i386/cons.4 man-obsolete obsolete
+./usr/share/man/man4/i386/console.4 man-obsolete obsolete
./usr/share/man/man4/i386/ed.4 man-sys-man .man
./usr/share/man/man4/i386/elanpar.4 man-sys-man .man
./usr/share/man/man4/i386/elanpex.4 man-sys-man .man
@@ -8316,7 +8322,10 @@
./usr/share/man/man4/x86/amdsmn.4 man-sys-man .man
./usr/share/man/man4/x86/amdzentemp.4 man-sys-man .man
./usr/share/man/man4/x86/apic.4 man-sys-man .man
+./usr/share/man/man4/x86/autoconf.4 man-sys-man .man
./usr/share/man/man4/x86/balloon.4 man-sys-man .man
+./usr/share/man/man4/x86/cons.4 man-sys-man .man
+./usr/share/man/man4/x86/console.4 man-sys-man .man
./usr/share/man/man4/x86/coretemp.4 man-sys-man .man
./usr/share/man/man4/x86/est.4 man-sys-man .man
./usr/share/man/man4/x86/fdc.4 man-sys-man .man
Index: src/share/man/man4/man4.i386/Makefile
diff -u src/share/man/man4/man4.i386/Makefile:1.78 src/share/man/man4/man4.i386/Makefile:1.79
--- src/share/man/man4/man4.i386/Makefile:1.78 Sat Aug 25 07:48:56 2018
+++ src/share/man/man4/man4.i386/Makefile Thu Jun 3 07:41:26 2021
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.78 2018/08/25 07:48:56 maxv Exp $
+# $NetBSD: Makefile,v 1.79 2021/06/03 07:41:26 wiz Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
-MAN= apm.4 autoconf.4 \
- cmos.4 console.4 \
+MAN= apm.4 \
+ cmos.4 \
elanpar.4 elanpex.4 elansc.4 \
gcscide.4 gcscpcib.4 geodewdog.4 geodecntr.4 glxsb.4 gscpcib.4 \
intro.4 io.4 lms.4 mms.4 \
pcibios.4 pnpbios.4 rdcide.4 rdcpcib.4 spic.4 viac7temp.4
MLINKS+=pcibios.4 PCIBIOS.4
-MLINKS+=console.4 cons.4
MANSUBDIR=/i386
.include <bsd.man.mk>
Index: src/share/man/man4/man4.i386/intro.4
diff -u src/share/man/man4/man4.i386/intro.4:1.34 src/share/man/man4/man4.i386/intro.4:1.35
--- src/share/man/man4/man4.i386/intro.4:1.34 Fri Mar 12 10:45:43 2021
+++ src/share/man/man4/man4.i386/intro.4 Thu Jun 3 07:41:26 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: intro.4,v 1.34 2021/03/12 10:45:43 nia Exp $
+.\" $NetBSD: intro.4,v 1.35 2021/06/03 07:41:26 wiz Exp $
.\"
.\" Copyright (c) 1997 Jonathan Stone
.\" Copyright (c) 1994 Christopher G. Demetriou
@@ -92,7 +92,7 @@ To enable a device which did not autocon
the system must be rebooted.
.Pp
The autoconfiguration system is described in
-.Xr i386/autoconf 4 .
+.Xr x86/autoconf 4 .
A list of the supported devices is given below.
.Sh LIST OF DEVICES
The devices listed below are supported in this incarnation of
@@ -166,8 +166,8 @@ console driver.
.\"
.Sh SEE ALSO
.Xr config 1 ,
-.Xr i386/autoconf 4 ,
-.Xr netintro 4
+.Xr netintro 4 ,
+.Xr x86/autoconf 4
.Sh HISTORY
The
.Tn i386
Index: src/share/man/man4/man4.x86/Makefile
diff -u src/share/man/man4/man4.x86/Makefile:1.21 src/share/man/man4/man4.x86/Makefile:1.22
--- src/share/man/man4/man4.x86/Makefile:1.21 Tue Oct 27 08:57:10 2020
+++ src/share/man/man4/man4.x86/Makefile Thu Jun 3 07:41:26 2021
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.21 2020/10/27 08:57:10 ryo Exp $
+# $NetBSD: Makefile,v 1.22 2021/06/03 07:41:26 wiz Exp $
-MAN= amdpcib.4 apic.4 balloon.4 coretemp.4 est.4 fdc.4 \
+MAN= amdpcib.4 apic.4 autoconf.4 balloon.4 console.4 coretemp.4 est.4 fdc.4 \
fwhrng.4 hpet.4 ichlpcib.4 imcsmb.4 lpt.4 mem.4 odcm.4 powernow.4 \
soekrisgpio.4 tco.4 \
amdsmn.4 amdzentemp.4
MLINKS+=apic.4 ioapic.4 \
apic.4 lapic.4
+MLINKS+=console.4 cons.4
MLINKS+=lpt.4 lpa.4
MLINKS+=mem.4 kmem.4
Added files:
Index: src/share/man/man4/man4.x86/autoconf.4
diff -u /dev/null src/share/man/man4/man4.x86/autoconf.4:1.1
--- /dev/null Thu Jun 3 07:41:26 2021
+++ src/share/man/man4/man4.x86/autoconf.4 Thu Jun 3 07:41:26 2021
@@ -0,0 +1,69 @@
+.\" $NetBSD: autoconf.4,v 1.1 2021/06/03 07:41:26 wiz Exp $
+.\"
+.\" Copyright (c) 1994 Christopher G. Demetriou
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" This product includes software developed for the
+.\" NetBSD Project. See http://www.NetBSD.org/ for
+.\" information about NetBSD.
+.\" 4. The name of the author may not be used to endorse or promote products
+.\" derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\" <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
+.\"
+.Dd February 17, 2017
+.Dt AUTOCONF 4 x86
+.Os
+.Sh NAME
+.Nm autoconf
+.Nd diagnostics from the autoconfiguration code
+.Sh DESCRIPTION
+When
+.Nx
+bootstraps it probes the innards of the machine
+on which it is running
+and locates controllers, drives, and other devices, printing out
+what it finds on the console.
+This procedure is driven by a system
+configuration table which is processed by
+.Xr config 1
+and compiled into each kernel.
+Devices which exist in the machine but are not configured into the
+kernel are not detected.
+.Sh DIAGNOSTICS
+.Bl -diag
+.It CPU class not configured.
+You tried to boot
+.Nx
+on a class of
+.Tn CPU
+type which it doesn't
+(or at least this compiled version of
+.Nx
+doesn't) understand.
+.El
+.Sh SEE ALSO
+.Xr config 1 ,
+.Xr intro 4 ,
+.Xr boot 8
Index: src/share/man/man4/man4.x86/console.4
diff -u /dev/null src/share/man/man4/man4.x86/console.4:1.1
--- /dev/null Thu Jun 3 07:41:26 2021
+++ src/share/man/man4/man4.x86/console.4 Thu Jun 3 07:41:26 2021
@@ -0,0 +1,116 @@
+.\" $NetBSD: console.4,v 1.1 2021/06/03 07:41:26 wiz Exp $
+.\"
+.Dd September 6, 2006
+.Dt CONS 4 x86
+.Os
+.Sh NAME
+.Nm console
+.Nd x86 console interface
+.Sh SYNOPSIS
+.Cd options CONSDEVNAME=string
+.Cd options CONADDR=integer
+.Cd options CONSPEED=integer
+.Cd options CONS_OVERRIDE
+.Cd options CONMODE=integer
+.Sh DESCRIPTION
+The
+.Dq console
+device is used for
+.Em kernel printf
+messages and accesses to the
+.Pa /dev/console
+character special device in user mode.
+It is attached to a hardware interface at boot time controlled by options
+in the kernel configuration file, or information passed by the boot loader.
+.Pp
+Bootblocks from
+.Nx 1.4
+or newer select their console device from a compiled-in list,
+and then pass their choice of console device and console parameters to
+the kernel.
+.Pp
+As of
+.Nx 1.5 ,
+the
+.Ic consdev
+bootblock command allows changing the console device on-the-fly.
+.Pp
+The kernel will use the same console device as the
+bootblock; no special kernel configuration is required.
+.Pp
+To override
+the bootblock's choice of console, or to use a serial kernel console
+with older bootblocks, you must specify kernel config-file options to
+override the information passed by the bootblock.
+The current option choices are:
+.Bl -tag -width aaa
+.It - the standard PC keyboard and display
+(with either the
+.Dq pc
+or the
+.Xr wscons 4
+driver)
+.It - standard PC serial ports
+(with
+.Xr com 4
+driver)
+.El
+.Pp
+The available
+.Em kernel configuration
+options are:
+.Bl -ohang
+.It Cd options CONSDEVNAME=string
+specifies the name of the console device.
+Valid values are
+.Dq pc
+for the pc keyboard / display (default)
+and
+.Dq com
+for a serial port.
+.It Cd options CONADDR=integer
+sets the base address for the serial console port (default: 0x3f8).
+.It Cd options CONSPEED=integer
+sets the baudrate for the serial console (default: 9600).
+.It Cd options CONS_OVERRIDE
+causes console information passed by the bootloader to be ignored and
+the settings specified by the three options above (or the defaults) to be
+used.
+Default behaviour is to use the settings from the bootloader if
+present, and to use option / default values only if no information was
+passed.
+.It Cd options CONMODE=integer
+allows to specify terminal control flags.
+The argument is a
+.Dq cflag
+value, see
+.Xr termios 4
+for details.
+Default is
+.Li ( CREAD | CS8 | HUPCL )
+(8N1).
+This option takes always effect, because mode settings are not passed
+by the bootloader.
+.El
+.Sh FILES
+.Bl -tag -width /dev/console
+.It Pa /dev/console
+.El
+.Sh EXAMPLES
+.Cd options CONSDEVNAME=\&"\e"com\e"\&",CONADDR=0x2f8,CONSPEED=57600
+.Sh SEE ALSO
+.Xr config 1 ,
+.Xr tty 4 ,
+.Xr boot 8
+.Sh BUGS
+The console device is chosen early in system startup regardless
+if the specified driver / device is present in the system configuration file.
+If the driver asked for by the bootloader or
+.Dq Cd options CONSDEVNAME
+is not configured into the system, a panic is caused.
+Because there is
+no console device, no explaining message will be printed.
+If the driver is present, but the specific device instance not, kernel
+printf will work, but
+.Pa /dev/console
+becomes a dummy.
