diff options
author | luigi <luigi@FreeBSD.org> | 2009-02-19 23:29:05 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2009-02-19 23:29:05 +0000 |
commit | 9686c139b1ecf389a4c251fffa07c93e04161309 (patch) | |
tree | a183302125234f3b6dd136e1e24116d83441536f /release | |
parent | 5dc7ef7e69e7552a62f396a484740c12642918df (diff) | |
download | FreeBSD-src-9686c139b1ecf389a4c251fffa07c93e04161309.zip FreeBSD-src-9686c139b1ecf389a4c251fffa07c93e04161309.tar.gz |
update 'sio' with 'uart' and apply related changes.
Diffstat (limited to 'release')
-rw-r--r-- | release/picobsd/bridge/PICOBSD | 12 | ||||
-rw-r--r-- | release/picobsd/bridge/PICOBSD.hints | 14 | ||||
-rw-r--r-- | release/picobsd/bridge/crunch.conf | 3 | ||||
-rw-r--r-- | release/picobsd/floppy.tree/etc/ttys | 4 |
4 files changed, 20 insertions, 13 deletions
diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD index e0c2833..7829dd0 100644 --- a/release/picobsd/bridge/PICOBSD +++ b/release/picobsd/bridge/PICOBSD @@ -7,6 +7,10 @@ options MD_ROOT_SIZE=3200 # same as def_sz hints "PICOBSD.hints" + +# values accessible through getenv() +# env "PICOBSD.env" + cpu I486_CPU cpu I586_CPU cpu I686_CPU @@ -68,7 +72,7 @@ device sc device npx # Serial (COM) ports -device sio +device uart # Audio support #device pcm @@ -107,10 +111,10 @@ device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" #device gif 4 # IPv6 and IPv4 tunneling #device faith 1 # IPv6-to-IPv4 relaying (translation) -#device tap +device tap -options DEVICE_POLLING +#options DEVICE_POLLING # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! -#device bpf # Berkeley packet filter +device bpf # Berkeley packet filter diff --git a/release/picobsd/bridge/PICOBSD.hints b/release/picobsd/bridge/PICOBSD.hints index 580dd1a..4f1b403 100644 --- a/release/picobsd/bridge/PICOBSD.hints +++ b/release/picobsd/bridge/PICOBSD.hints @@ -22,13 +22,13 @@ hint.sc.0.at="isa" hint.npx.0.at="nexus" hint.npx.0.port="0x0F0" hint.npx.0.irq="13" -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.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.ed.0.at="isa" hint.ed.0.port="0x280" hint.ed.0.irq="5" diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf index b1ec9ce..3db93ba 100644 --- a/release/picobsd/bridge/crunch.conf +++ b/release/picobsd/bridge/crunch.conf @@ -94,7 +94,7 @@ progs w # 0KB. progs msg # 0KB. ln msg dmesg progs reboot # 0KB. -#progs less # 36KB +progs less # 36KB #ln less more #progs more # 12KB special more srcdir /usr/ports/misc/44bsd-more/work @@ -181,4 +181,5 @@ libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm libs -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses libs -lgeom +libs -lsbuf libs -lbsdxml # used by ifconfig diff --git a/release/picobsd/floppy.tree/etc/ttys b/release/picobsd/floppy.tree/etc/ttys index 12c672d..dcfac7a 100644 --- a/release/picobsd/floppy.tree/etc/ttys +++ b/release/picobsd/floppy.tree/etc/ttys @@ -1,6 +1,8 @@ # # @(#)ttys 5.1 (Berkeley) 4/17/89 # +# $FreeBSD$ +# # name getty type status comments # # This entry needed for asking password when init goes to single-user mode @@ -30,4 +32,4 @@ ttyp6 none network secure ttyp7 none network secure ttyp8 none network secure ttyp9 none network secure -ttyd0 "/usr/libexec/getty std.9600" dialup on secure +ttyu0 "/usr/libexec/getty std.9600" dialup on secure |