diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-01-09 22:00:27 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-01-09 22:00:27 +0000 |
| commit | 8f8953eb3c984f4a840336aa6e50f76aa9d66e55 (patch) | |
| tree | 0388a22baf91c1711a2d671a1e23db65bdcba195 /sys/arch | |
| parent | e143917a91709dc58b159a4cef5fc824d6f66c3a (diff) | |
add INET6 into conf/GENERIC.
add pseudo-devices for IPv6 into arch/*/conf/GENERIC.
nuke arch/*/conf/GENERIC.v6.
Diffstat (limited to 'sys/arch')
34 files changed, 71 insertions, 133 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index bf94c4b946d..5d064e76b8f 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.45 1999/12/14 21:30:07 jason Exp $ +# $OpenBSD: GENERIC,v 1.46 2000/01/09 22:00:17 itojun Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -161,3 +161,7 @@ wscons* at cfb? wscons* at vga? wscons* at sfb? wscons* at tga? + +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/alpha/conf/GENERIC.v6 b/sys/arch/alpha/conf/GENERIC.v6 deleted file mode 100644 index 8812cf25eeb..00000000000 --- a/sys/arch/alpha/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/alpha/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC index e27b8eecdd6..d55356be74c 100644 --- a/sys/arch/amiga/conf/GENERIC +++ b/sys/arch/amiga/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.27 1999/09/09 21:27:36 espie Exp $ +# $OpenBSD: GENERIC,v 1.28 2000/01/09 22:00:17 itojun Exp $ # $NetBSD: GENERIC,v 1.85 1997/08/27 19:32:49 is Exp $ # @@ -271,5 +271,8 @@ sm* at pcmcia? function ? # PCMCIA based sm ethernet fd* at fdc0 unit ? pseudo-device view 10 # views +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 config bsd swap on generic diff --git a/sys/arch/amiga/conf/GENERIC.v6 b/sys/arch/amiga/conf/GENERIC.v6 deleted file mode 100644 index c718d75d48b..00000000000 --- a/sys/arch/amiga/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/amiga/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC index 2b481554d15..eded2aa6054 100644 --- a/sys/arch/arc/conf/GENERIC +++ b/sys/arch/arc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $ +# $OpenBSD: GENERIC,v 1.30 2000/01/09 22:00:18 itojun Exp $ # # Generic configuration file for MIPS R4x00 ARC Systems # @@ -93,3 +93,7 @@ cd* at scsibus? target ? lun ? ch* at scsibus? target ? lun ? ss* at scsibus? target ? lun ? uk* at scsibus? target ? lun ? + +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/arc/conf/GENERIC.v6 b/sys/arch/arc/conf/GENERIC.v6 deleted file mode 100644 index b0014593cc8..00000000000 --- a/sys/arch/arc/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/arc/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/arm32/conf/GENERIC b/sys/arch/arm32/conf/GENERIC index 8088e7bf130..3103d84dae6 100644 --- a/sys/arch/arm32/conf/GENERIC +++ b/sys/arch/arm32/conf/GENERIC @@ -192,6 +192,10 @@ pseudo-device ccd 2 # concatenated disk devices pseudo-device rd 1 # Ramdisk driver +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 + makeoptions MONITOR="Taxan875+LR" #makeoptions MONITOR="AKF60" makeoptions MODES="1024,768,60 1024,768,70 800,600,60 640,480,60 1280,1024 1152,900" diff --git a/sys/arch/arm32/conf/GENERIC.v6 b/sys/arch/arm32/conf/GENERIC.v6 deleted file mode 100644 index 0bcd4e83e91..00000000000 --- a/sys/arch/arm32/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/arm32/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/atari/conf/GENERIC b/sys/arch/atari/conf/GENERIC index 2a947fbb4e7..763ab14ea75 100644 --- a/sys/arch/atari/conf/GENERIC +++ b/sys/arch/atari/conf/GENERIC @@ -106,6 +106,9 @@ pseudo-device vnd 3 # 3 pseudo disks (see vnconfig) pseudo-device bpfilter 2 # berkeley packet filters pseudo-device tun 2 # network tunnel pseudo-device ccd 4 # concatenating disk driver +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 # #The following sections describe various hardware options. diff --git a/sys/arch/atari/conf/GENERIC.v6 b/sys/arch/atari/conf/GENERIC.v6 deleted file mode 100644 index 2006bf5a57b..00000000000 --- a/sys/arch/atari/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/atari/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index a46eafafc7c..d803abd2a60 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.23 1999/06/13 06:27:12 downsj Exp $ +# $OpenBSD: GENERIC,v 1.24 2000/01/09 22:00:19 itojun Exp $ # $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $ # # Generic kernel - one size fits all. @@ -121,3 +121,7 @@ oscsi* at dio? scode ? # Old HP SCSI sd* at oscsi? target ? lun ? # SCSI disks st* at oscsi? target ? lun ? # SCSI tapes ac* at oscsi? target ? lun ? # SCSI changers + +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/hp300/conf/GENERIC.v6 b/sys/arch/hp300/conf/GENERIC.v6 deleted file mode 100644 index bc553484651..00000000000 --- a/sys/arch/hp300/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/hp300/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index f61bce0b638..6a724ff7667 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.7 1999/04/20 20:32:18 mickey Exp $ +# $OpenBSD: GENERIC,v 1.8 2000/01/09 22:00:19 itojun Exp $ # # Generic kernel config (all that is supportted) # @@ -19,3 +19,6 @@ config bsd swap generic sd* at scsibus? target ? lun ? #cd* at scsibus? target ? lun ? +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/hppa/conf/GENERIC.v6 b/sys/arch/hppa/conf/GENERIC.v6 deleted file mode 100644 index 328fab8c65b..00000000000 --- a/sys/arch/hppa/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/hppa/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 331185d1979..33a44783441 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.153 2000/01/09 01:42:25 jason Exp $ +# $OpenBSD: GENERIC,v 1.154 2000/01/09 22:00:20 itojun Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -329,5 +329,8 @@ pseudo-device pctr 1 pseudo-device mtrr 1 # Memory range attributes control pseudo-device sequencer 1 #pseudo-device raid 4 # RAIDframe disk driver +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 #option DEBUG_ISAPNP diff --git a/sys/arch/i386/conf/GENERIC.v6 b/sys/arch/i386/conf/GENERIC.v6 deleted file mode 100644 index 309659cff00..00000000000 --- a/sys/arch/i386/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/i386/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 8ba2f06ed6a..85d8f10b8e2 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.24 1998/05/08 22:21:34 gene Exp $ +# $OpenBSD: GENERIC,v 1.25 2000/01/09 22:00:20 itojun Exp $ # $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $ # # GENERIC - an all-in-one kernel for the mac68k @@ -62,3 +62,7 @@ cd* at scsibus? target ? lun ? # SCSI CD-ROM drives ch* at scsibus? target ? lun ? # SCSI autochangers ss* at scsibus? target ? lun ? # SCSI scanners uk* at scsibus? target ? lun ? # SCSI unknown + +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/mac68k/conf/GENERIC.v6 b/sys/arch/mac68k/conf/GENERIC.v6 deleted file mode 100644 index 1e76f7f68a9..00000000000 --- a/sys/arch/mac68k/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/mac68k/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC index a069a1f9621..ef30f738f4a 100644 --- a/sys/arch/mvme68k/conf/GENERIC +++ b/sys/arch/mvme68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 2000/01/06 03:21:42 smurph Exp $ +# $OpenBSD: GENERIC,v 1.11 2000/01/09 22:00:21 itojun Exp $ machine mvme68k m68k @@ -84,6 +84,9 @@ ss* at scsibus? target ? lun ? uk* at scsibus? target ? lun ? pseudo-device rd 2 +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 #si0 at vmes0 addr 0xff200000 ipl 2 vec 0x40 #nxdc0 at vmes0 addr 0xff00ee80 ipl 2 vec 0x44 diff --git a/sys/arch/mvme68k/conf/GENERIC.v6 b/sys/arch/mvme68k/conf/GENERIC.v6 deleted file mode 100644 index 190ac01a47d..00000000000 --- a/sys/arch/mvme68k/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/mvme68k/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index 4c65ca448e0..1944db44d80 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.10 1999/09/27 21:30:11 smurph Exp $ +# $OpenBSD: GENERIC,v 1.11 2000/01/09 22:00:21 itojun Exp $ machine mvme88k @@ -79,3 +79,6 @@ cd* at scsibus? target ? lun ? # ------------------------------ pseudo devices ------------------------ pseudo-device rd 2 +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/pc532/conf/GENERIC.v6 b/sys/arch/pc532/conf/GENERIC.v6 deleted file mode 100644 index 79ef81a00e6..00000000000 --- a/sys/arch/pc532/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/pc532/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC index 20f64307ce3..0b1dcd44b70 100644 --- a/sys/arch/pmax/conf/GENERIC +++ b/sys/arch/pmax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.15 1999/10/01 21:59:33 maja Exp $ +# $OpenBSD: GENERIC,v 1.16 2000/01/09 22:00:22 itojun Exp $ # # GENERIC kernel for the distribition simpleroot # @@ -135,3 +135,6 @@ pseudo-device vnd 4 # virtual disk ick pseudo-device ccd 4 # concatenated disks pseudo-device bpfilter 16 # packet filter ports pseudo-device pty 64 # pseudo ptys +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/pmax/conf/GENERIC.v6 b/sys/arch/pmax/conf/GENERIC.v6 deleted file mode 100644 index 67dbade0246..00000000000 --- a/sys/arch/pmax/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/pmax/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC index abe9da93afd..d8c1ef25efd 100644 --- a/sys/arch/powerpc/conf/GENERIC +++ b/sys/arch/powerpc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 1999/11/09 05:07:08 rahnds Exp $ +# $OpenBSD: GENERIC,v 1.12 2000/01/09 22:00:22 itojun Exp $ # # PPC GENERIC config file # @@ -80,3 +80,6 @@ ofdisk* at openfirm? # used for floppy support #ofnet* at openfirm? #ofcons* at openfirm? +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/powerpc/conf/GENERIC.v6 b/sys/arch/powerpc/conf/GENERIC.v6 deleted file mode 100644 index 05eeeca3515..00000000000 --- a/sys/arch/powerpc/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/powerpc/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 1478bd0e351..81e976c19c5 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.46 1999/10/29 14:14:27 art Exp $ +# $OpenBSD: GENERIC,v 1.47 2000/01/09 22:00:24 itojun Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -297,3 +297,6 @@ fd* at fdc0 # the drive itself pseudo-device kbd # Sun keyboard #pseudo-device strip 1 # radio clock pseudo-device rd 2 +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/sparc/conf/GENERIC.v6 b/sys/arch/sparc/conf/GENERIC.v6 deleted file mode 100644 index 55a158ee667..00000000000 --- a/sys/arch/sparc/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/sparc/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC index 2aa4be03ee6..092cd210514 100644 --- a/sys/arch/sun3/conf/GENERIC +++ b/sys/arch/sun3/conf/GENERIC @@ -180,3 +180,7 @@ pseudo-device tun 2 # network tunneling over tty pseudo-device pty 64 # pseudo-terminals #pseudo-device vnd 4 # paging to files + +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/sun3/conf/GENERIC.v6 b/sys/arch/sun3/conf/GENERIC.v6 deleted file mode 100644 index d14e5f28a69..00000000000 --- a/sys/arch/sun3/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/sun3/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index 8a612ee1504..43c5b0a3081 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.13 1997/10/02 19:55:16 niklas Exp $ +# $OpenBSD: GENERIC,v 1.14 2000/01/09 22:00:25 itojun Exp $ # $NetBSD: GENERIC,v 1.24 1997/08/23 19:19:31 ragge Exp $ # # GENERIC VAX configuration file; all supported devices. @@ -151,3 +151,6 @@ pseudo-device tun 2 pseudo-device tb 1 pseudo-device vnd 4 pseudo-device ccd 4 +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/vax/conf/GENERIC.v6 b/sys/arch/vax/conf/GENERIC.v6 deleted file mode 100644 index 645b1c022f5..00000000000 --- a/sys/arch/vax/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/vax/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 diff --git a/sys/arch/wgrisc/conf/GENERIC b/sys/arch/wgrisc/conf/GENERIC index 39fc21c1bb2..b64c99939fd 100644 --- a/sys/arch/wgrisc/conf/GENERIC +++ b/sys/arch/wgrisc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.4 1997/08/24 12:01:12 pefo Exp $ +# $OpenBSD: GENERIC,v 1.5 2000/01/09 22:00:26 itojun Exp $ # # Generic configuration file for Willowglen RISC-PC 9100 # @@ -124,3 +124,6 @@ pseudo-device tb 1 # tablet line discipline pseudo-device vnd 4 # paging to files #pseudo-device ccd 4 # concatenated disk devices +# for IPv6 +pseudo-device gif 4 +#pseudo-device faith 1 diff --git a/sys/arch/wgrisc/conf/GENERIC.v6 b/sys/arch/wgrisc/conf/GENERIC.v6 deleted file mode 100644 index 982f95ea0dc..00000000000 --- a/sys/arch/wgrisc/conf/GENERIC.v6 +++ /dev/null @@ -1,7 +0,0 @@ -include "arch/wgrisc/conf/GENERIC" - -options INET6 # IPV6 - -# for IPv6 -pseudo-device gif 4 -#pseudo-device faith 1 |