diff options
author | roger <roger@FreeBSD.org> | 1999-05-24 17:27:30 +0000 |
---|---|---|
committer | roger <roger@FreeBSD.org> | 1999-05-24 17:27:30 +0000 |
commit | c32c8650455449ee155601b51819447763a8dce3 (patch) | |
tree | 7cfcada432aa2d304792f2b4ea74c919b99426fb /release/picobsd | |
parent | c6862b32c09553d9e7dd35b372cd8c14d6f2cbd3 (diff) | |
download | FreeBSD-src-c32c8650455449ee155601b51819447763a8dce3.zip FreeBSD-src-c32c8650455449ee155601b51819447763a8dce3.tar.gz |
Update PicoBSD kernel config files. Changes are
removal of bio, tty, net
removal of quotes
switches from isa? to nexus? or atkbdc?
additional comments
These bring the kernel config files in sync with those in
RELENG_3
Diffstat (limited to 'release/picobsd')
-rw-r--r-- | release/picobsd/dial/conf/PICOBSD | 80 | ||||
-rw-r--r-- | release/picobsd/isp/conf/PICOBSD | 106 | ||||
-rw-r--r-- | release/picobsd/net/conf/PICOBSD | 82 | ||||
-rw-r--r-- | release/picobsd/router/conf/PICOBSD | 82 |
4 files changed, 181 insertions, 169 deletions
diff --git a/release/picobsd/dial/conf/PICOBSD b/release/picobsd/dial/conf/PICOBSD index 574a61f..61d851f 100644 --- a/release/picobsd/dial/conf/PICOBSD +++ b/release/picobsd/dial/conf/PICOBSD @@ -1,82 +1,82 @@ # -# $Id: PICOBSD,v 1.5 1999/01/14 23:15:39 abial Exp $ +# $Id: PICOBSD,v 1.5.2.1 1999/02/07 22:19:52 abial Exp $ # -machine "i386" -cpu "I386_CPU" -cpu "I486_CPU" -cpu "I586_CPU" -cpu "I686_CPU" +machine i386 +cpu I386_CPU +cpu I486_CPU +cpu I586_CPU +cpu I686_CPU ident PICOBSD maxusers 3 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem -options FFS_ROOT -options MFS +options FFS_ROOT #FFS usable as root device [keep this!] +options MFS #Memory Filesystem options MSDOSFS #MSDOS Filesystem -options "CD9660" #ISO 9660 Filesystem -options "EXT2FS" -options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] +options CD9660 #ISO 9660 Filesystem +options EXT2FS +options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options USERCONFIG #boot -c editor options VISUAL_USERCONFIG #visual boot -c editor options INTRO_USERCONFIG #imply -c and parse info area #options DEVFS options PCI_QUIET options NO_SWAPPING -options NO_LKM - -config kernel root on fd0 controller isa0 controller pci0 -controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 +controller fdc0 at isa? port IO_FD1 irq 6 drq 2 disk fd0 at fdc0 drive 0 disk fd1 at fdc0 drive 1 -options "CMD640" # work around CMD640 chip deficiency -controller wdc0 at isa? port "IO_WD1" bio irq 14 +controller wdc0 at isa? port IO_WD1 irq 14 disk wd0 at wdc0 drive 0 disk wd1 at wdc0 drive 1 -controller wdc1 at isa? port "IO_WD2" bio irq 15 +controller wdc1 at isa? port IO_WD2 irq 15 disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 -options ATAPI #Enable ATAPI support for IDE bus -options ATAPI_STATIC #Don't do it as an LKM -device acd0 #IDE CD-ROM +device wcd0 #IDE CD-ROM -# syscons is the default console driver, resembling an SCO console +# atkbdc0 controlls both the keyboard and the PS/2 mouse +controller atkbdc0 at isa? port IO_KBD +device atkbd0 at atkbdc? irq 1 +device psm0 at atkbdc? irq 12 -controller atkbdc0 at isa? port IO_KBD tty -device atkbd0 at isa? tty irq 1 -device psm0 at isa? tty irq 12 device vga0 at isa? port ? conflicts -device sc0 at isa? tty -device npx0 at isa? port IO_NPX irq 13 +# syscons is the default console driver, resembling an SCO console +device sc0 at isa? + +device npx0 at nexus? port IO_NPX irq 13 -device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 -device sio1 at isa? port "IO_COM2" tty irq 3 -device sio2 at isa? disable port "IO_COM3" tty irq 5 -device sio3 at isa? disable port "IO_COM4" tty irq 9 +device sio0 at isa? port IO_COM1 flags 0x10 irq 4 +device sio1 at isa? port IO_COM2 irq 3 +device sio2 at isa? disable port IO_COM3 irq 5 +device sio3 at isa? disable port IO_COM4 irq 9 +# +# The following Ethernet NICs are all PCI devices. +# +device de0 # DEC/Intel DC21x4x (``Tulip'') +#device de1 # DEC/Intel DC21x4x (``Tulip'') +device fxp0 # Intel EtherExpress PRO/100B (82557, 82558 + # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See # revision 1.20 of this file. -device de0 -#device de1 -device fxp0 - -device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 -device ep0 at isa? port 0x300 net irq 10 -device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device lnc0 at isa? port 0x300 net irq 10 + +device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 +device ep0 at isa? port 0x300 irq 10 +device ie0 at isa? port 0x300 irq 5 iomem 0xd0000 +device le0 at isa? port 0x300 irq 5 iomem 0xd0000 +device lnc0 at isa? port 0x300 irq 10 pseudo-device loop pseudo-device ether diff --git a/release/picobsd/isp/conf/PICOBSD b/release/picobsd/isp/conf/PICOBSD index 36b13f9..f8e9568 100644 --- a/release/picobsd/isp/conf/PICOBSD +++ b/release/picobsd/isp/conf/PICOBSD @@ -1,26 +1,26 @@ # -# $Id: PICOBSD,v 1.9 1999/02/10 02:26:04 des Exp $ +# $Id: PICOBSD,v 1.8.2.2 1999/02/15 02:49:12 des Exp $ # -machine "i386" -cpu "I386_CPU" -cpu "I486_CPU" -cpu "I586_CPU" -cpu "I686_CPU" +machine i386 +cpu I386_CPU +cpu I486_CPU +cpu I586_CPU +cpu I686_CPU ident PICOBSD maxusers 20 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem -options FFS_ROOT +options FFS_ROOT #FFS usable as root device [keep this!] options NFS #Network Filesystem #options BOOTP -options MFS +options MFS #Memory Filesystem options MSDOSFS #MSDOS Filesystem -options "CD9660" #ISO 9660 Filesystem +options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem -options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options USERCONFIG #boot -c editor options INTRO_USERCONFIG #imply -c and parse info area options VISUAL_USERCONFIG #visual boot -c editor @@ -29,46 +29,42 @@ options IPFIREWALL_DEFAULT_TO_ACCEPT options IPDIVERT #options DEVFS options PCI_QUIET -options NO_LKM # Support for bridging and bandwidth limiting #options DUMMYNET #options BRIDGE -config kernel root on fd0a - controller isa0 controller pci0 -controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 +controller fdc0 at isa? port IO_FD1 irq 6 drq 2 disk fd0 at fdc0 drive 0 #disk fd1 at fdc0 drive 1 -options "CMD640" # work around CMD640 chip deficiency -controller wdc0 at isa? port "IO_WD1" bio irq 14 +controller wdc0 at isa? port IO_WD1 irq 14 disk wd0 at wdc0 drive 0 disk wd1 at wdc0 drive 1 -controller wdc1 at isa? port "IO_WD2" bio irq 15 +controller wdc1 at isa? port IO_WD2 irq 15 disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 -options ATAPI #Enable ATAPI support for IDE bus -options ATAPI_STATIC #Don't do it as an LKM -device acd0 #IDE CD-ROM +device wcd0 #IDE CD-ROM -# syscons is the default console driver, resembling an SCO console +# atkbdc0 controlls both the keyboard and the PS/2 mouse +controller atkbdc0 at isa? port IO_KBD +device atkbd0 at atkbdc? irq 1 -controller atkbdc0 at isa? port IO_KBD tty -device atkbd0 at isa? tty irq 1 device vga0 at isa? port ? conflicts -device sc0 at isa? tty -device npx0 at isa? port IO_NPX irq 13 +# syscons is the default console driver, resembling an SCO console +device sc0 at isa? + +device npx0 at nexus? port IO_NPX irq 13 -device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 -device sio1 at isa? port "IO_COM2" tty irq 3 -device sio2 at isa? port "IO_COM3" tty irq 5 -device sio3 at isa? port "IO_COM4" tty irq 9 +device sio0 at isa? port IO_COM1 flags 0x10 irq 4 +device sio1 at isa? port IO_COM2 irq 3 +device sio2 at isa? port IO_COM3 irq 5 +device sio3 at isa? port IO_COM4 irq 9 # Support for multiport serial cards @@ -76,17 +72,17 @@ options COM_MULTIPORT # AST -device sio4 at isa? port 0x2a0 tty flags 0x701 -device sio5 at isa? port 0x2a8 tty flags 0x701 -device sio6 at isa? port 0x2b0 tty flags 0x701 -device sio7 at isa? port 0x2b8 tty flags 0x701 irq 12 +device sio4 at isa? port 0x2a0 flags 0x701 +device sio5 at isa? port 0x2a8 flags 0x701 +device sio6 at isa? port 0x2b0 flags 0x701 +device sio7 at isa? port 0x2b8 flags 0x701 irq 12 # Boca Board. You must configure the ports above with -c to change the flags. -device sio8 at isa? port 0x120 tty flags 0xb05 -device sio9 at isa? port 0x128 tty flags 0xb05 -device sio10 at isa? port 0x130 tty flags 0xb05 -device sio11 at isa? port 0x138 tty flags 0xb05 irq 12 +device sio8 at isa? port 0x120 flags 0xb05 +device sio9 at isa? port 0x128 flags 0xb05 +device sio10 at isa? port 0x130 flags 0xb05 +device sio11 at isa? port 0x138 flags 0xb05 irq 12 # Hayes ESP boards @@ -97,28 +93,36 @@ options COM_ESP device rp0 device rp1 # The ISA versions -device rp0 at isa? port 0x100 tty -device rp1 at isa? port 0x180 tty +device rp0 at isa? port 0x100 +device rp1 at isa? port 0x180 # Cyclades Cyclom-Y serial driver -device cy0 at isa? tty irq 10 iomem 0xd4000 iosiz 0x2000 -device cy1 at isa? tty irq 11 iomem 0xd6000 iosiz 0x2000 +device cy0 at isa? irq 10 iomem 0xd4000 iosiz 0x2000 +device cy1 at isa? irq 11 iomem 0xd6000 iosiz 0x2000 -device lpt0 at isa? port? tty irq 7 +device ppc0 at isa? port? flags 0x40 irq 7 +controller ppbus0 +device lpt0 at ppbus? +device plip0 at ppbus? +device ppi0 at ppbus? + +# +# The following Ethernet NICs are all PCI devices. +# +device de0 # DEC/Intel DC21x4x (``Tulip'') +device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See # revision 1.20 of this file. -device de0 -device fxp0 - -device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 -device ed1 at isa? port 0x300 net irq 5 iomem 0xd0000 -device ep0 at isa? port 0x300 net irq 10 -device ep1 at isa? port 0x280 net irq 5 -device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device lnc0 at isa? port 0x300 net irq 10 drq 0 + +device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 +device ed1 at isa? port 0x300 irq 5 iomem 0xd0000 +device ep0 at isa? port 0x300 irq 10 +device ep1 at isa? port 0x280 irq 5 +device ie0 at isa? port 0x300 irq 5 iomem 0xd0000 +device lnc0 at isa? port 0x300 irq 10 drq 0 pseudo-device loop pseudo-device ether diff --git a/release/picobsd/net/conf/PICOBSD b/release/picobsd/net/conf/PICOBSD index 8c56b28..47b250c 100644 --- a/release/picobsd/net/conf/PICOBSD +++ b/release/picobsd/net/conf/PICOBSD @@ -1,24 +1,24 @@ # -# $Id: PICOBSD,v 1.9 1999/02/10 02:26:04 des Exp $ +# $Id: PICOBSD,v 1.8.2.2 1999/02/15 02:49:24 des Exp $ # -machine "i386" -cpu "I386_CPU" -cpu "I486_CPU" -cpu "I586_CPU" -cpu "I686_CPU" +machine i386 +cpu I386_CPU +cpu I486_CPU +cpu I586_CPU +cpu I686_CPU ident PICOBSD maxusers 10 options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem -options FFS_ROOT +options FFS_ROOT #FFS usable as root device [keep this!] options NFS #Network Filesystem -options MFS +options MFS #Memory Filesystem options MSDOSFS #MSDOS Filesystem -options "CD9660" #ISO 9660 Filesystem -options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] +options CD9660 #ISO 9660 Filesystem +options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options USERCONFIG #boot -c editor options INTRO_USERCONFIG #imply -c and parse info area options VISUAL_USERCONFIG #visual boot -c editor @@ -26,63 +26,67 @@ options IPFIREWALL options IPFIREWALL_DEFAULT_TO_ACCEPT options IPDIVERT options PCI_QUIET -options NO_LKM #options DEVFS # Support for bridging and bandwidth limiting #options DUMMYNET #options BRIDGE -config kernel root on fd0a - controller isa0 controller pci0 -controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 +controller fdc0 at isa? port IO_FD1 irq 6 drq 2 disk fd0 at fdc0 drive 0 #disk fd1 at fdc0 drive 1 -options "CMD640" # work around CMD640 chip deficiency -controller wdc0 at isa? port "IO_WD1" bio irq 14 +controller wdc0 at isa? port IO_WD1 irq 14 disk wd0 at wdc0 drive 0 disk wd1 at wdc0 drive 1 -controller wdc1 at isa? port "IO_WD2" bio irq 15 +controller wdc1 at isa? port IO_WD2 irq 15 disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 -options ATAPI #Enable ATAPI support for IDE bus -options ATAPI_STATIC #Don't do it as an LKM -device acd0 #IDE CD-ROM +device wcd0 #IDE CD-ROM -# syscons is the default console driver, resembling an SCO console +# atkbdc0 controlls both the keyboard and the PS/2 mouse +controller atkbdc0 at isa? port IO_KBD +device atkbd0 at atkbdc? irq 1 -controller atkbdc0 at isa? port IO_KBD tty -device atkbd0 at isa? tty irq 1 device vga0 at isa? port ? conflicts -device sc0 at isa? tty -device npx0 at isa? port IO_NPX irq 13 +# syscons is the default console driver, resembling an SCO console +device sc0 at isa? + +device npx0 at nexus? port IO_NPX irq 13 -device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 -device sio1 at isa? port "IO_COM2" tty irq 3 -device sio2 at isa? disable port "IO_COM3" tty irq 5 -device sio3 at isa? disable port "IO_COM4" tty irq 9 +device sio0 at isa? port IO_COM1 flags 0x10 irq 4 +device sio1 at isa? port IO_COM2 irq 3 +device sio2 at isa? disable port IO_COM3 irq 5 +device sio3 at isa? disable port IO_COM4 irq 9 -device lpt0 at isa? port? tty irq 7 +device ppc0 at isa? port? flags 0x40 irq 7 +controller ppbus0 +device lpt0 at ppbus? +device plip0 at ppbus? +device ppi0 at ppbus? + +# +# The following Ethernet NICs are all PCI devices. +# +device de0 # DEC/Intel DC21x4x (``Tulip'') +device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See # revision 1.20 of this file. -device de0 -device fxp0 - -device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 -device ed1 at isa? port 0x300 net irq 10 iomem 0xd0000 -device ep0 at isa? port 0x300 net irq 10 -device ep1 at isa? port 0x280 net irq 5 -device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 + +device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 +device ed1 at isa? port 0x300 irq 10 iomem 0xd0000 +device ep0 at isa? port 0x300 irq 10 +device ep1 at isa? port 0x280 irq 5 +device ie0 at isa? port 0x300 irq 5 iomem 0xd0000 +device ie1 at isa? port 0x360 irq 7 iomem 0xd0000 pseudo-device loop pseudo-device ether diff --git a/release/picobsd/router/conf/PICOBSD b/release/picobsd/router/conf/PICOBSD index f900120..ead218c 100644 --- a/release/picobsd/router/conf/PICOBSD +++ b/release/picobsd/router/conf/PICOBSD @@ -1,25 +1,25 @@ # -# $Id: PICOBSD,v 1.12 1999/02/10 02:26:04 des Exp $ +# $Id: PICOBSD,v 1.11.2.2 1999/02/15 02:49:31 des Exp $ # -machine "i386" -cpu "I386_CPU" -cpu "I486_CPU" -cpu "I586_CPU" -cpu "I686_CPU" +machine i386 +cpu I386_CPU +cpu I486_CPU +cpu I586_CPU +cpu I686_CPU ident PICOBSD maxusers 10 #options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem -options FFS_ROOT +options FFS_ROOT #FFS usable as root device [keep this!] #options NFS #Network Filesystem -options MFS +options MFS #Memory Filesystem #options MSDOSFS #MSDOS Filesystem -#options "CD9660" #ISO 9660 Filesystem +#options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem -options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options USERCONFIG #boot -c editor #options USERCONFIG_BOOT #imply -c and parse info area #options VISUAL_USERCONFIG #visual boot -c editor @@ -28,63 +28,67 @@ options IPFIREWALL_DEFAULT_TO_ACCEPT options IPDIVERT options PCI_QUIET #options DEVFS -options NO_LKM options NO_SWAPPING # Support for bridging and bandwidth limiting #options DUMMYNET #options BRIDGE -config kernel root on fd0a - controller isa0 controller pci0 -controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 +controller fdc0 at isa? port IO_FD1 irq 6 drq 2 disk fd0 at fdc0 drive 0 #disk fd1 at fdc0 drive 1 -#options "CMD640" # work around CMD640 chip deficiency -#controller wdc0 at isa? port "IO_WD1" bio irq 14 +#controller wdc0 at isa? port IO_WD1 irq 14 #disk wd0 at wdc0 drive 0 #disk wd1 at wdc0 drive 1 -#controller wdc1 at isa? port "IO_WD2" bio irq 15 +#controller wdc1 at isa? port IO_WD2 irq 15 #disk wd2 at wdc1 drive 0 #disk wd3 at wdc1 drive 1 -#options ATAPI #Enable ATAPI support for IDE bus -#options ATAPI_STATIC #Don't do it as an LKM -#device acd0 #IDE CD-ROM +#device wcd0 #IDE CD-ROM -# syscons is the default console driver, resembling an SCO console +# atkbdc0 controlls both the keyboard and the PS/2 mouse +controller atkbdc0 at isa? port IO_KBD +device atkbd0 at atkbdc? irq 1 -controller atkbdc0 at isa? port IO_KBD tty -device atkbd0 at isa? tty irq 1 device vga0 at isa? port ? conflicts -device sc0 at isa? tty -device npx0 at isa? port IO_NPX irq 13 +# syscons is the default console driver, resembling an SCO console +device sc0 at isa? + +device npx0 at nexus? port IO_NPX irq 13 -device sio0 at isa? port "IO_COM1" flags 0x10 tty irq 4 -device sio1 at isa? port "IO_COM2" tty irq 3 vector siointr -device sio2 at isa? disable port "IO_COM3" tty irq 5 -device sio3 at isa? disable port "IO_COM4" tty irq 9 +device sio0 at isa? port IO_COM1 flags 0x10 irq 4 +device sio1 at isa? port IO_COM2 irq 3 +device sio2 at isa? disable port IO_COM3 irq 5 +device sio3 at isa? disable port IO_COM4 irq 9 -#device lpt0 at isa? port? tty irq 7 +#device ppc0 at isa? port? flags 0x40 irq 7 +#controller ppbus0 +#device lpt0 at ppbus? +#device plip0 at ppbus? +#device ppi0 at ppbus? + +# +# The following Ethernet NICs are all PCI devices. +# +device de0 # DEC/Intel DC21x4x (``Tulip'') +device fxp0 # Intel EtherExpress PRO/100B (82557, 82558) # Order is important here due to intrusive probes, do *not* alphabetize # this list of network interfaces until the probes have been fixed. # Right now it appears that the ie0 must be probed before ep0. See # revision 1.20 of this file. -device de0 -device fxp0 - -device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000 -device ed1 at isa? port 0x300 net irq 10 iomem 0xd0000 -device ep0 at isa? port 0x300 net irq 10 -device ep1 at isa? port 0x280 net irq 5 -device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000 -device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000 + +device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 +device ed1 at isa? port 0x300 irq 10 iomem 0xd0000 +device ep0 at isa? port 0x300 irq 10 +device ep1 at isa? port 0x280 irq 5 +device ie0 at isa? port 0x300 irq 5 iomem 0xd0000 +device ie1 at isa? port 0x360 irq 7 iomem 0xd0000 pseudo-device loop pseudo-device ether |