diff options
author | ed <ed@FreeBSD.org> | 2008-07-13 07:20:14 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2008-07-13 07:20:14 +0000 |
commit | a8f4e95b680eed7a0c9b16b6e6597aeb830d6e4e (patch) | |
tree | 1661d26b0580d7da88725dbbd16d722c41a52531 | |
parent | c72cf0954da223c9fcfe19466f79e056fb8fe821 (diff) | |
download | FreeBSD-src-a8f4e95b680eed7a0c9b16b6e6597aeb830d6e4e.zip FreeBSD-src-a8f4e95b680eed7a0c9b16b6e6597aeb830d6e4e.tar.gz |
Make uart(4) the default serial port driver on i386 and amd64.
The uart(4) driver has the advantage of supporting a wider variety of
hardware on a greater amount of platforms. This driver has already been
the standard on platforms such as ia64, powerpc and sparc64.
I've decided not to change anything on pc98. I'd rather let people from
the pc98 team look at this.
Approved by: philip (mentor), marcel
-rw-r--r-- | UPDATING | 11 | ||||
-rw-r--r-- | etc/etc.amd64/ttys | 8 | ||||
-rw-r--r-- | etc/etc.i386/ttys | 8 | ||||
-rw-r--r-- | sys/amd64/conf/GENERIC | 1 | ||||
-rw-r--r-- | sys/amd64/conf/GENERIC.hints | 30 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 1 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC.hints | 30 |
7 files changed, 49 insertions, 40 deletions
@@ -22,6 +22,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20080713: + The sio(4) driver has been removed from the i386 and amd64 + kernel configuration files. This means uart(4) is now the + default serial port driver on those platforms as well. + + To prevent collisions with the sio(4) driver, the uart(4) driver + uses different names for its device nodes. This means the + onboard serial port will now most likely be called "ttyu0" + instead of "ttyd0". You may need to reconfigure applications to + use the new device names. + 20080609: The gpt(8) utility has been removed. Use gpart(8) to partition disks instead. diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys index a9719c4..562768b 100644 --- a/etc/etc.amd64/ttys +++ b/etc/etc.amd64/ttys @@ -44,10 +44,10 @@ ttyv7 "/usr/libexec/getty Pc" cons25 on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyd0 "/usr/libexec/getty std.9600" dialup off secure -ttyd1 "/usr/libexec/getty std.9600" dialup off secure -ttyd2 "/usr/libexec/getty std.9600" dialup off secure -ttyd3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.9600" dialup off secure +ttyu1 "/usr/libexec/getty std.9600" dialup off secure +ttyu2 "/usr/libexec/getty std.9600" dialup off secure +ttyu3 "/usr/libexec/getty std.9600" dialup off secure # Dumb console dcons "/usr/libexec/getty std.9600" vt100 off secure # Pseudo terminals diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys index a9719c4..562768b 100644 --- a/etc/etc.i386/ttys +++ b/etc/etc.i386/ttys @@ -44,10 +44,10 @@ ttyv7 "/usr/libexec/getty Pc" cons25 on secure ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. -ttyd0 "/usr/libexec/getty std.9600" dialup off secure -ttyd1 "/usr/libexec/getty std.9600" dialup off secure -ttyd2 "/usr/libexec/getty std.9600" dialup off secure -ttyd3 "/usr/libexec/getty std.9600" dialup off secure +ttyu0 "/usr/libexec/getty std.9600" dialup off secure +ttyu1 "/usr/libexec/getty std.9600" dialup off secure +ttyu2 "/usr/libexec/getty std.9600" dialup off secure +ttyu3 "/usr/libexec/getty std.9600" dialup off secure # Dumb console dcons "/usr/libexec/getty std.9600" vt100 off secure # Pseudo terminals diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 7ed3ad1..6c3afd2 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -172,7 +172,6 @@ device pccard # PC Card (16-bit) bus device cardbus # CardBus (32-bit) bus # Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports device uart # Generic UART driver # Parallel port diff --git a/sys/amd64/conf/GENERIC.hints b/sys/amd64/conf/GENERIC.hints index 9400343..a6b7196 100644 --- a/sys/amd64/conf/GENERIC.hints +++ b/sys/amd64/conf/GENERIC.hints @@ -16,20 +16,20 @@ hint.psm.0.irq="12" hint.vga.0.at="isa" hint.sc.0.at="isa" hint.sc.0.flags="0x100" -hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" -hint.sio.0.flags="0x10" -hint.sio.0.irq="4" -hint.sio.1.at="isa" -hint.sio.1.port="0x2F8" -hint.sio.1.irq="3" -hint.sio.2.at="isa" -hint.sio.2.disabled="1" -hint.sio.2.port="0x3E8" -hint.sio.2.irq="5" -hint.sio.3.at="isa" -hint.sio.3.disabled="1" -hint.sio.3.port="0x2E8" -hint.sio.3.irq="9" +hint.uart.0.at="isa" +hint.uart.0.port="0x3F8" +hint.uart.0.flags="0x10" +hint.uart.0.irq="4" +hint.uart.1.at="isa" +hint.uart.1.port="0x2F8" +hint.uart.1.irq="3" +hint.uart.2.at="isa" +hint.uart.2.disabled="1" +hint.uart.2.port="0x3E8" +hint.uart.2.irq="5" +hint.uart.3.at="isa" +hint.uart.3.disabled="1" +hint.uart.3.port="0x2E8" +hint.uart.3.irq="9" hint.ppc.0.at="isa" hint.ppc.0.irq="7" diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 88e4618..8947348 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -184,7 +184,6 @@ device pccard # PC Card (16-bit) bus device cardbus # CardBus (32-bit) bus # Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports device uart # Generic UART driver # Parallel port diff --git a/sys/i386/conf/GENERIC.hints b/sys/i386/conf/GENERIC.hints index f97628d..4c90888 100644 --- a/sys/i386/conf/GENERIC.hints +++ b/sys/i386/conf/GENERIC.hints @@ -32,21 +32,21 @@ hint.sc.0.at="isa" hint.sc.0.flags="0x100" hint.apm.0.disabled="1" hint.apm.0.flags="0x20" -hint.sio.0.at="isa" -hint.sio.0.port="0x3F8" -hint.sio.0.flags="0x10" -hint.sio.0.irq="4" -hint.sio.1.at="isa" -hint.sio.1.port="0x2F8" -hint.sio.1.irq="3" -hint.sio.2.at="isa" -hint.sio.2.disabled="1" -hint.sio.2.port="0x3E8" -hint.sio.2.irq="5" -hint.sio.3.at="isa" -hint.sio.3.disabled="1" -hint.sio.3.port="0x2E8" -hint.sio.3.irq="9" +hint.uart.0.at="isa" +hint.uart.0.port="0x3F8" +hint.uart.0.flags="0x10" +hint.uart.0.irq="4" +hint.uart.1.at="isa" +hint.uart.1.port="0x2F8" +hint.uart.1.irq="3" +hint.uart.2.at="isa" +hint.uart.2.disabled="1" +hint.uart.2.port="0x3E8" +hint.uart.2.irq="5" +hint.uart.3.at="isa" +hint.uart.3.disabled="1" +hint.uart.3.port="0x2E8" +hint.uart.3.irq="9" hint.ppc.0.at="isa" hint.ppc.0.irq="7" hint.ed.0.at="isa" |