From owner-svn-src-head@FreeBSD.ORG Thu Feb 19 23:29:05 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B52B0106564A; Thu, 19 Feb 2009 23:29:05 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A1D1B8FC19; Thu, 19 Feb 2009 23:29:05 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1JNT5ea010641; Thu, 19 Feb 2009 23:29:05 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1JNT5LF010637; Thu, 19 Feb 2009 23:29:05 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <200902192329.n1JNT5LF010637@svn.freebsd.org> From: Luigi Rizzo Date: Thu, 19 Feb 2009 23:29:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r188834 - in head/release/picobsd: bridge floppy.tree/etc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Feb 2009 23:29:06 -0000 Author: luigi Date: Thu Feb 19 23:29:05 2009 New Revision: 188834 URL: http://svn.freebsd.org/changeset/base/188834 Log: update 'sio' with 'uart' and apply related changes. Modified: head/release/picobsd/bridge/PICOBSD head/release/picobsd/bridge/PICOBSD.hints head/release/picobsd/bridge/crunch.conf head/release/picobsd/floppy.tree/etc/ttys Modified: head/release/picobsd/bridge/PICOBSD ============================================================================== --- head/release/picobsd/bridge/PICOBSD Thu Feb 19 22:28:48 2009 (r188833) +++ head/release/picobsd/bridge/PICOBSD Thu Feb 19 23:29:05 2009 (r188834) @@ -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 Modified: head/release/picobsd/bridge/PICOBSD.hints ============================================================================== --- head/release/picobsd/bridge/PICOBSD.hints Thu Feb 19 22:28:48 2009 (r188833) +++ head/release/picobsd/bridge/PICOBSD.hints Thu Feb 19 23:29:05 2009 (r188834) @@ -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" Modified: head/release/picobsd/bridge/crunch.conf ============================================================================== --- head/release/picobsd/bridge/crunch.conf Thu Feb 19 22:28:48 2009 (r188833) +++ head/release/picobsd/bridge/crunch.conf Thu Feb 19 23:29:05 2009 (r188834) @@ -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 libs -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses libs -lgeom +libs -lsbuf libs -lbsdxml # used by ifconfig Modified: head/release/picobsd/floppy.tree/etc/ttys ============================================================================== --- head/release/picobsd/floppy.tree/etc/ttys Thu Feb 19 22:28:48 2009 (r188833) +++ head/release/picobsd/floppy.tree/etc/ttys Thu Feb 19 23:29:05 2009 (r188834) @@ -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