summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2001-03-08 03:37:21 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2001-03-08 03:37:21 +0000
commit37b9458625cf8520c818e3a3cd00c6385f0bb78f (patch)
tree55b53423574faeea86d2e7218c038f30272c1f42
parentc133ffa9b430ff6130e9afcf1511f024b2c70afb (diff)
move gif* and faith* into sys/conf/GENERIC. deraadt and angelos ok
Diffstat
-rw-r--r--sys/arch/alpha/conf/GENERIC6
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG5
-rw-r--r--sys/arch/amiga/conf/GENERIC5
-rw-r--r--sys/arch/hp300/conf/GENERIC6
-rw-r--r--sys/arch/hppa/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/GENERIC5
-rw-r--r--sys/arch/mac68k/conf/GENERIC6
-rw-r--r--sys/arch/mvme68k/conf/GENERIC5
-rw-r--r--sys/arch/mvme88k/conf/GENERIC5
-rw-r--r--sys/arch/mvme88k/conf/M1875
-rw-r--r--sys/arch/mvme88k/conf/M1885
-rw-r--r--sys/arch/mvme88k/conf/M1975
-rw-r--r--sys/arch/pmax/conf/GENERIC5
-rw-r--r--sys/arch/powerpc/conf/GENERIC-NONMAC6
-rw-r--r--sys/arch/sparc/conf/GENERIC5
-rw-r--r--sys/arch/sparc/conf/GENERIC_SCSI35
-rw-r--r--sys/arch/sparc/conf/SUN4M5
-rw-r--r--sys/arch/sun3/conf/COYOTE6
-rw-r--r--sys/arch/sun3/conf/DISKLESS6
-rw-r--r--sys/arch/sun3/conf/FOUR_TTYS6
-rw-r--r--sys/arch/sun3/conf/GENERIC6
-rw-r--r--sys/arch/sun3/conf/SMD_TEST6
-rw-r--r--sys/conf/GENERIC6
23 files changed, 27 insertions, 99 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 6d755d48349..14c6990c8cd 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.66 2001/02/13 16:25:54 art Exp $
+# $OpenBSD: GENERIC,v 1.67 2001/03/08 03:37:16 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.
@@ -305,7 +305,3 @@ wsmouse* at pms?
#ubsec* at pci? dev ? function ? # Bluesteel Networks 5xxx crypto card
#pseudo-device raid 4 # RAIDframe disk driver
-
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 214009f6437..2244cf57f7e 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.4 2001/02/13 14:50:33 deraadt Exp $
+# $OpenBSD: RAMDISKBIG,v 1.5 2001/03/08 03:37:16 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.
@@ -307,6 +307,3 @@ wsmouse* at pms?
#ubsec* at pci? dev ? function ? # Bluesteel Networks 5xxx crypto card
#pseudo-device raid 4 # RAIDframe disk driver
-# 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 2f4bc18c542..6923e0a973e 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.33 2000/11/08 11:53:53 art Exp $
+# $OpenBSD: GENERIC,v 1.34 2001/03/08 03:37:17 itojun Exp $
# $NetBSD: GENERIC,v 1.85 1997/08/27 19:32:49 is Exp $
#
@@ -284,8 +284,5 @@ 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/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index d803abd2a60..3af3172cc8a 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.24 2000/01/09 22:00:19 itojun Exp $
+# $OpenBSD: GENERIC,v 1.25 2001/03/08 03:37:17 itojun Exp $
# $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
#
# Generic kernel - one size fits all.
@@ -121,7 +121,3 @@ 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/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index bb1dee9fc64..d55eb8262be 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.9 2000/11/06 23:44:04 mickey Exp $
+# $OpenBSD: GENERIC,v 1.10 2001/03/08 03:37:17 itojun Exp $
#
# Generic kernel config (all that is supportted)
#
@@ -18,7 +18,3 @@ 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/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 6c51ee2bce2..30f199bef9b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.245 2001/03/05 15:13:42 aaron Exp $
+# $OpenBSD: GENERIC,v 1.246 2001/03/08 03:37:17 itojun Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -429,9 +429,6 @@ 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
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 85d8f10b8e2..7b3bde2ddf3 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.25 2000/01/09 22:00:20 itojun Exp $
+# $OpenBSD: GENERIC,v 1.26 2001/03/08 03:37:17 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,7 +62,3 @@ 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/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index d69ad5e0322..eb2e7aa84cd 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.15 2001/02/18 17:41:01 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.16 2001/03/08 03:37:18 itojun Exp $
machine mvme68k m68k
@@ -96,9 +96,6 @@ 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/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index ad30cfa3005..26b89f8a9f9 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.15 2001/03/07 02:00:08 miod Exp $
+# $OpenBSD: GENERIC,v 1.16 2001/03/08 03:37:18 itojun Exp $
machine mvme88k
@@ -85,6 +85,3 @@ cd* at scsibus? target ? lun ?
# ------------------------------ pseudo devices ------------------------
#pseudo-device raid 4
pseudo-device rd 2
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index b38cd45e7d1..5febdd8c762 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,4 +1,4 @@
-# $OpenBSD: M187,v 1.7 2001/03/07 02:00:08 miod Exp $
+# $OpenBSD: M187,v 1.8 2001/03/08 03:37:18 itojun Exp $
machine mvme88k
@@ -66,6 +66,3 @@ 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/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
index 34d7ae9ff48..1d276dfa0fe 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,4 +1,4 @@
-# $OpenBSD: M188,v 1.4 2001/03/07 02:00:08 miod Exp $
+# $OpenBSD: M188,v 1.5 2001/03/08 03:37:18 itojun Exp $
machine mvme88k
@@ -60,6 +60,3 @@ 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/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index 7eaa468c02c..110bb6ad98e 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,4 +1,4 @@
-# $OpenBSD: M197,v 1.2 2001/03/07 02:00:08 miod Exp $
+# $OpenBSD: M197,v 1.3 2001/03/08 03:37:18 itojun Exp $
machine mvme88k
@@ -70,6 +70,3 @@ 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/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 2f8d0c5ad56..cf71f0efcd1 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.18 2000/09/13 21:03:36 maja Exp $
+# $OpenBSD: GENERIC,v 1.19 2001/03/08 03:37:19 itojun Exp $
#
# GENERIC kernel for the distribition simpleroot
#
@@ -137,6 +137,3 @@ 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/powerpc/conf/GENERIC-NONMAC b/sys/arch/powerpc/conf/GENERIC-NONMAC
index 4e72f7d153e..0cfddcf16f2 100644
--- a/sys/arch/powerpc/conf/GENERIC-NONMAC
+++ b/sys/arch/powerpc/conf/GENERIC-NONMAC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-NONMAC,v 1.1 2000/08/08 01:07:52 deraadt Exp $
+# $OpenBSD: GENERIC-NONMAC,v 1.2 2001/03/08 03:37:19 itojun Exp $
#
# PPC GENERIC config file
#
@@ -77,7 +77,3 @@ ofrtc* at openfirm?
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/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 81e976c19c5..313bbd5b73c 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.47 2000/01/09 22:00:24 itojun Exp $
+# $OpenBSD: GENERIC,v 1.48 2001/03/08 03:37:19 itojun Exp $
# $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
# Machine architecture; required by config(8)
@@ -297,6 +297,3 @@ 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_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3
index 6797fcf7f53..e7478e37f76 100644
--- a/sys/arch/sparc/conf/GENERIC_SCSI3
+++ b/sys/arch/sparc/conf/GENERIC_SCSI3
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC_SCSI3,v 1.32 2000/01/22 10:01:57 deraadt Exp $
+# $OpenBSD: GENERIC_SCSI3,v 1.33 2001/03/08 03:37:19 itojun Exp $
# $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
# Machine architecture; required by config(8)
@@ -300,6 +300,3 @@ 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/SUN4M b/sys/arch/sparc/conf/SUN4M
index 172447b987e..15b47f5b5d6 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-# $OpenBSD: SUN4M,v 1.36 2001/02/19 02:08:32 naddy Exp $
+# $OpenBSD: SUN4M,v 1.37 2001/03/08 03:37:19 itojun Exp $
# $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
# Machine architecture; required by config(8)
@@ -174,6 +174,3 @@ 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/sun3/conf/COYOTE b/sys/arch/sun3/conf/COYOTE
index 1eca5a2f7d6..ed425fc2524 100644
--- a/sys/arch/sun3/conf/COYOTE
+++ b/sys/arch/sun3/conf/COYOTE
@@ -1,5 +1,5 @@
#
-# $OpenBSD: COYOTE,v 1.12 2001/01/03 02:03:28 miod Exp $
+# $OpenBSD: COYOTE,v 1.13 2001/03/08 03:37:20 itojun Exp $
#
#
@@ -100,7 +100,3 @@ option COMPAT_SUNOS # can run SunOS 4.1.1 executables
#option SYSCALL_DEBUG
#option EXEC_DEBUG
#option SCSIDEBUG
-
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1
diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index f6832f7e8c2..fcd26b8e7b2 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $OpenBSD: DISKLESS,v 1.17 2001/01/03 22:04:43 miod Exp $
+# $OpenBSD: DISKLESS,v 1.18 2001/03/08 03:37:20 itojun Exp $
# $NetBSD: DISKLESS,v 1.12.4.1 1996/08/19 23:35:03 gwr Exp $
#
@@ -107,7 +107,3 @@ option PMAP_DEBUG
#option VMFAULT_TRACE
#option SYSCALL_DEBUG
#option EXEC_DEBUG
-
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1
diff --git a/sys/arch/sun3/conf/FOUR_TTYS b/sys/arch/sun3/conf/FOUR_TTYS
index 0d048b1dca3..e91266a463b 100644
--- a/sys/arch/sun3/conf/FOUR_TTYS
+++ b/sys/arch/sun3/conf/FOUR_TTYS
@@ -1,4 +1,4 @@
-# $OpenBSD: FOUR_TTYS,v 1.12 2001/01/03 02:03:28 miod Exp $
+# $OpenBSD: FOUR_TTYS,v 1.13 2001/03/08 03:37:20 itojun Exp $
# $NetBSD: FOUR_TTYS,v 1.1.4.1 1996/08/19 23:35:05 gwr Exp $
#
@@ -156,7 +156,3 @@ option PMAP_DEBUG
#option SYSCALL_DEBUG
#option EXEC_DEBUG
#option SCSIDEBUG
-
-# 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 31365a32b53..4139047cff8 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.22 2001/01/03 01:51:56 miod Exp $
+# $OpenBSD: GENERIC,v 1.23 2001/03/08 03:37:20 itojun Exp $
# $NetBSD: GENERIC,v 1.27.4.1 1996/08/19 23:35:06 gwr Exp $
#
@@ -151,7 +151,3 @@ option PMAP_DEBUG
#option SYSCALL_DEBUG
#option EXEC_DEBUG
#option SCSIDEBUG
-
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1
diff --git a/sys/arch/sun3/conf/SMD_TEST b/sys/arch/sun3/conf/SMD_TEST
index eb986a5dd16..61152676d3c 100644
--- a/sys/arch/sun3/conf/SMD_TEST
+++ b/sys/arch/sun3/conf/SMD_TEST
@@ -1,4 +1,4 @@
-# $OpenBSD: SMD_TEST,v 1.14 2001/01/03 02:03:28 miod Exp $
+# $OpenBSD: SMD_TEST,v 1.15 2001/03/08 03:37:20 itojun Exp $
# $NetBSD: SMD_TEST,v 1.2.4.1 1996/08/19 23:35:11 gwr Exp $
#
@@ -150,7 +150,3 @@ option PMAP_DEBUG
#option SYSCALL_DEBUG
#option EXEC_DEBUG
#option SCSIDEBUG
-
-# for IPv6
-pseudo-device gif 4
-#pseudo-device faith 1
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 52f969e469f..3a10b83c947 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.68 2001/01/05 05:13:46 angelos Exp $
+# $OpenBSD: GENERIC,v 1.69 2001/03/08 03:37:16 itojun Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -100,4 +100,8 @@ pseudo-device bridge 2 # network bridging support
#pseudo-device vlan 2 # IEEE 802.1Q VLAN
pseudo-device gre 1 # GRE encapsulation interface
+# for IPv6
+pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+
option BOOT_CONFIG # add support for boot -c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 23:51:33 +0000