Remove sio(4) and related options from MI files to amd64, i386

and pc98 MD files. Remove nodevice and nooption lines specific
to sio(4) from ia64, powerpc and sparc64 NOTES. There were no
such lines for arm yet.
sio(4) is usable on less than half the platforms, not counting
a future mips platform. Its presence in MI files is therefore
increasingly becoming a burden.

15 files changed, 141 insertions, 44 deletions

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index d51427c..d2d57f0 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -101,6 +101,44 @@ options 	CLK_USE_I8254_CALIBRATION
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
 
+# 
+# sio: serial ports (see sio(4)), including support for various
+#      PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf)
+#
+device		sio
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+
+# `flags' specific to sio(4).
+#	0x10	enable console support for this unit.  Other console flags
+#		(if applicable) are ignored unless this is set.  Enabling
+#		console support does not make the unit the preferred console.
+#		Boot with -h or set boot_serial=YES in the loader.  For sio(4)
+#		specifically, the 0x20 flag can also be set (see above).
+#		Currently, at most one unit can have console support; the
+#		first one (in config file order) with this flag set is
+#		preferred.  Setting this flag for sio0 gives the old behaviour.
+#	0x20	force this unit to be the console (unless there is another
+#		higher priority console).  This replaces the COMCONSOLE option.
+#	0x40	reserve this unit for low level console operations.  Do not
+#		access the device in any normal way.
+#	0x80	use this port for serial line gdb support in ddb.  Also known
+#		as debug port.
+# PnP `flags'
+#	0x1	disable probing of this device.  Used to prevent your modem
+#		from being attached as a PnP modem.
+# Other flags for sio that aren't documented in the man page.
+#	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
+#		ST16650A-compatible UARTs.
+
+# Options for sio:
+options 	COM_ESP			# Code for Hayes ESP.
+options 	COM_MULTIPORT		# Code for some cards with shared IRQs.
+options 	CONSPEED=115200		# Speed for serial console
+					# (default 9600).
+
 device		speaker		#Play IBM BASIC-style noises out your speaker
 hint.speaker.0.at="isa"
 hint.speaker.0.port="0x61"
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 765ad7e..203eeb9 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1611,35 +1611,6 @@ hint.fd.1.at="fdc0"
 hint.fd.1.drive="1"
 
 #
-# sio: serial ports (see sio(4)), including support for various
-#      PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf)
-#
-device		sio
-hint.sio.0.at="isa"
-hint.sio.0.port="0x3F8"
-hint.sio.0.flags="0x10"
-hint.sio.0.irq="4"
-
-# Options for sio:
-options 	COM_ESP			# Code for Hayes ESP.
-options 	COM_MULTIPORT		# Code for some cards with shared IRQs.
-options 	CONSPEED=115200		# Speed for serial console
-					# (default 9600).
-
-# `flags' specific to sio(4).  See below for flags used by both sio(4) and
-# uart(4).
-#	0x20	force this unit to be the console (unless there is another
-#		higher priority console).  This replaces the COMCONSOLE option.
-#	0x40	reserve this unit for low level console operations.  Do not
-#		access the device in any normal way.
-# PnP `flags'
-#	0x1	disable probing of this device.  Used to prevent your modem
-#		from being attached as a PnP modem.
-# Other flags for sio that aren't documented in the man page.
-#	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
-#		ST16650A-compatible UARTs.
-
-#
 # uart: newbusified driver for serial interfaces.  It consolidates the sio(4),
 #	sab(4) and zs(4) drivers.
 #
diff --git a/sys/conf/files b/sys/conf/files
index deb030a..2ea5afb 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -858,9 +858,6 @@ dev/si/si3_t225.c		optional si
 dev/si/si_eisa.c		optional si eisa
 dev/si/si_isa.c			optional si isa
 dev/si/si_pci.c			optional si pci
-dev/sio/sio_pccard.c		optional sio pccard
-dev/sio/sio_pci.c		optional sio pci
-dev/sio/sio_puc.c		optional sio puc
 dev/sk/if_sk.c			optional sk pci
 dev/smbus/smb.c			optional smb
 dev/smbus/smbconf.c		optional smbus
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index c430849..d1366bf 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -184,6 +184,9 @@ dev/rr232x/osm_bsd.c		optional	rr232x
 dev/rr232x/rr232x_config.c	optional	rr232x
 dev/sio/sio.c			optional	sio
 dev/sio/sio_isa.c		optional	sio isa
+dev/sio/sio_pccard.c		optional	sio pccard
+dev/sio/sio_pci.c		optional	sio pci
+dev/sio/sio_puc.c		optional	sio puc
 dev/speaker/spkr.c		optional	speaker
 dev/syscons/apm/apm_saver.c	optional	apm_saver apm
 dev/syscons/schistory.c		optional	sc
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 98db2d7..eba426e 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -212,6 +212,9 @@ dev/sbni/if_sbni_isa.c		optional sbni isa
 dev/sbni/if_sbni_pci.c		optional sbni pci
 dev/sio/sio.c			optional sio
 dev/sio/sio_isa.c		optional sio isa
+dev/sio/sio_pccard.c		optional sio pccard
+dev/sio/sio_pci.c		optional sio pci
+dev/sio/sio_puc.c		optional sio puc
 dev/speaker/spkr.c		optional speaker
 dev/sr/if_sr_isa.c		optional sr isa
 dev/syscons/apm/apm_saver.c	optional apm_saver apm
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index a61d1d8..37b1ddc 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -124,6 +124,9 @@ dev/mse/mse.c			optional mse
 dev/mse/mse_cbus.c		optional mse isa
 dev/sbni/if_sbni.c		optional sbni
 dev/sbni/if_sbni_pci.c		optional sbni pci
+dev/sio/sio_pccard.c		optional sio pccard
+dev/sio/sio_pci.c		optional sio pci
+dev/sio/sio_puc.c		optional sio puc
 dev/snc/dp83932.c		optional snc
 dev/snc/dp83932subr.c		optional snc
 dev/snc/if_snc.c		optional snc
diff --git a/sys/conf/options b/sys/conf/options
index b686539..244180a 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -50,7 +50,6 @@ TWA_FLASH_FIRMWARE	opt_twa.h
 DDB
 DDB_NUMSYM	opt_ddb.h
 GDB
-GDBSPEED	opt_gdb.h
 KDB		opt_global.h
 KDB_TRACE	opt_kdb.h
 KDB_UNATTENDED	opt_kdb.h
@@ -69,7 +68,6 @@ COMPAT_43TTY	opt_compat.h
 COMPAT_FREEBSD4	opt_compat.h
 COMPAT_FREEBSD5	opt_compat.h
 COMPILING_LINT	opt_global.h
-CONSPEED	opt_comconsole.h
 CY_PCI_FASTINTR
 DIRECTIO
 FULL_PREEMPTION	opt_sched.h
@@ -574,9 +572,6 @@ BKTR_SIS_VIA_MODE		opt_bktr.h
 BKTR_USE_FREEBSD_SMBUS		opt_bktr.h
 BKTR_NEW_MSP34XX_DRIVER		opt_bktr.h
 
-# options for serial support
-COM_ESP			opt_sio.h
-COM_MULTIPORT		opt_sio.h
 BREAK_TO_DEBUGGER	opt_comconsole.h
 ALT_BREAK_TO_DEBUGGER	opt_comconsole.h
 
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index ac5823e..7d29710 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -25,6 +25,12 @@ CLK_CALIBRATION_LOOP		opt_clock.h
 CLK_USE_I8254_CALIBRATION	opt_clock.h
 TIMER_FREQ			opt_clock.h
 
+# options for serial support
+COM_ESP			opt_sio.h
+COM_MULTIPORT		opt_sio.h
+CONSPEED		opt_sio.h
+GDBSPEED		opt_sio.h
+
 VGA_ALT_SEQACCESS	opt_vga.h
 VGA_DEBUG		opt_vga.h
 VGA_NO_FONT_LOADING	opt_vga.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 598c6cc..60a9542 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -75,6 +75,12 @@ I486_CPU		opt_global.h
 I586_CPU		opt_global.h
 I686_CPU		opt_global.h
 
+# options for serial support
+COM_ESP			opt_sio.h
+COM_MULTIPORT		opt_sio.h
+CONSPEED		opt_sio.h
+GDBSPEED		opt_sio.h
+
 VGA_ALT_SEQACCESS	opt_vga.h
 VGA_DEBUG		opt_vga.h
 VGA_NO_FONT_LOADING	opt_vga.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index fe1b20e..c3bc07f 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -35,6 +35,12 @@ CLK_CALIBRATION_LOOP		opt_clock.h
 CLK_USE_I8254_CALIBRATION	opt_clock.h
 TIMER_FREQ			opt_clock.h
 
+# options for serial support
+COM_ESP			opt_sio.h
+COM_MULTIPORT		opt_sio.h
+CONSPEED		opt_sio.h
+GDBSPEED		opt_sio.h
+
 CPU_BLUELIGHTNING_3X		opt_cpu.h
 CPU_BLUELIGHTNING_FPU_OP_CACHE	opt_cpu.h
 CPU_BTB_EN			opt_cpu.h
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index a9674e7..e17f747 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -272,6 +272,44 @@ options 	CLK_USE_I8254_CALIBRATION
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
 
+# 
+# sio: serial ports (see sio(4)), including support for various
+#      PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf)
+#
+device		sio
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+
+# `flags' specific to sio(4).
+#	0x10	enable console support for this unit.  Other console flags
+#		(if applicable) are ignored unless this is set.  Enabling
+#		console support does not make the unit the preferred console.
+#		Boot with -h or set boot_serial=YES in the loader.  For sio(4)
+#		specifically, the 0x20 flag can also be set (see above).
+#		Currently, at most one unit can have console support; the
+#		first one (in config file order) with this flag set is
+#		preferred.  Setting this flag for sio0 gives the old behaviour.
+#	0x20	force this unit to be the console (unless there is another
+#		higher priority console).  This replaces the COMCONSOLE option.
+#	0x40	reserve this unit for low level console operations.  Do not
+#		access the device in any normal way.
+#	0x80	use this port for serial line gdb support in ddb.  Also known
+#		as debug port.
+# PnP `flags'
+#	0x1	disable probing of this device.  Used to prevent your modem
+#		from being attached as a PnP modem.
+# Other flags for sio that aren't documented in the man page.
+#	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
+#		ST16650A-compatible UARTs.
+
+# Options for sio:
+options 	COM_ESP			# Code for Hayes ESP.
+options 	COM_MULTIPORT		# Code for some cards with shared IRQs.
+options 	CONSPEED=115200		# Speed for serial console
+					# (default 9600).
+
 device		speaker		#Play IBM BASIC-style noises out your speaker
 hint.speaker.0.at="isa"
 hint.speaker.0.port="0x61"
diff --git a/sys/ia64/conf/NOTES b/sys/ia64/conf/NOTES
index ca23a80..8a4b8e1 100644
--- a/sys/ia64/conf/NOTES
+++ b/sys/ia64/conf/NOTES
@@ -49,6 +49,3 @@ device		pci
 # The following devices are not supported.
 nodevice	fdc
 nooption	FDC_DEBUG
-nodevice	sio
-nooption	COM_ESP
-nooption	CONSPEED
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 9e017cc..1bc2ba1 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -214,6 +214,44 @@ options 	CLK_USE_I8254_CALIBRATION
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
 
+# 
+# sio: serial ports (see sio(4)), including support for various
+#      PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf)
+#
+device		sio
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+
+# `flags' specific to sio(4).
+#	0x10	enable console support for this unit.  Other console flags
+#		(if applicable) are ignored unless this is set.  Enabling
+#		console support does not make the unit the preferred console.
+#		Boot with -h or set boot_serial=YES in the loader.  For sio(4)
+#		specifically, the 0x20 flag can also be set (see above).
+#		Currently, at most one unit can have console support; the
+#		first one (in config file order) with this flag set is
+#		preferred.  Setting this flag for sio0 gives the old behaviour.
+#	0x20	force this unit to be the console (unless there is another
+#		higher priority console).  This replaces the COMCONSOLE option.
+#	0x40	reserve this unit for low level console operations.  Do not
+#		access the device in any normal way.
+#	0x80	use this port for serial line gdb support in ddb.  Also known
+#		as debug port.
+# PnP `flags'
+#	0x1	disable probing of this device.  Used to prevent your modem
+#		from being attached as a PnP modem.
+# Other flags for sio that aren't documented in the man page.
+#	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
+#		ST16650A-compatible UARTs.
+
+# Options for sio:
+options 	COM_ESP			# Code for Hayes ESP.
+options 	COM_MULTIPORT		# Code for some cards with shared IRQs.
+options 	CONSPEED=115200		# Speed for serial console
+					# (default 9600).
+
 device		speaker		#Play IBM BASIC-style noises out your speaker
 hint.speaker.0.at="isa"
 hint.speaker.0.port="0x35"
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 327f5d0..7eb72ef 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -30,7 +30,6 @@ device		ofwd		# Open Firmware disks
 nodevice	atkbdc
 nodevice	atkbd
 nodevice	psm
-nodevice	sio
 nodevice	vga
 nodevice	fdc
 nodevice	ppc
diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES
index a43295a..a20149c 100644
--- a/sys/sparc64/conf/NOTES
+++ b/sys/sparc64/conf/NOTES
@@ -92,15 +92,12 @@ nodevice	bt
 nodevice	wds
 nodevice	ep
 nodevice	ex
-nodevice	sio
 
 
 #####################################################################
 # Options we don't want to deal with
 
 nooption	FDC_DEBUG
-nooption	COM_ESP
-nooption	CONSPEED
 nooption	VGA_DEBUG
 nooption	SC_RENDER_DEBUG
 nooption	SC_DEBUG_LEVEL