From 6ef0105b9322b54258723cce725650fff1cb0bfb Mon Sep 17 00:00:00 2001 From: lukem Date: Wed, 18 Sep 2002 02:20:50 +0000 Subject: [PATCH] regen for: enable USERCONF --- sys/arch/atari/conf/ATARITT | 11 +++++++---- sys/arch/atari/conf/BOOT | 9 ++++++--- sys/arch/atari/conf/BOOTX | 9 ++++++--- sys/arch/atari/conf/FALCON | 6 +++--- sys/arch/atari/conf/HADES | 11 +++++++---- sys/arch/atari/conf/MILAN-ISAIDE | 11 +++++++---- sys/arch/atari/conf/MILAN-PCIIDE | 11 +++++++---- 7 files changed, 43 insertions(+), 25 deletions(-) diff --git a/sys/arch/atari/conf/ATARITT b/sys/arch/atari/conf/ATARITT index 505069df0191..8614062f265a 100644 --- a/sys/arch/atari/conf/ATARITT +++ b/sys/arch/atari/conf/ATARITT @@ -1,12 +1,12 @@ # -# $NetBSD: ATARITT,v 1.48 2002/06/17 05:25:18 lukem Exp $ +# $NetBSD: ATARITT,v 1.49 2002/09/18 02:20:50 lukem Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: ATARITT.in,v 1.4 2001/04/10 06:28:38 leo Exp $ -# NetBSD: GENERIC.in,v 1.21 2002/06/17 05:14:06 lukem Exp $ +# NetBSD: GENERIC.in,v 1.23 2002/09/18 02:19:19 lukem Exp $ #This configuration file is for a GENERIC ATARI-TT @@ -54,6 +54,7 @@ options NS # XNS options ISO,TPIP # OSI #options EON # OSI tunneling over IP options CCITT,LLC,HDLC # X.25 + options NETATALK # AppleTalk networking protocols options PPP_BSDCOMP # BSD-Compress compression support for PPP @@ -131,7 +132,7 @@ options SYSVSEM # System V semaphores options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code -#options USERCONF # userconf(4) support +options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #These options enable verbose messages for several subsystems. @@ -153,7 +154,7 @@ options DISKLABEL_AHDI # NetBSD/AHDI disklabels options SERCONSOLE # modem1 console support options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM -#options MSGBUFSIZE=32768 # size of kernel msg. buffer +options MSGBUFSIZE=32768 # size of kernel msg. buffer #options STATCLOCK # Separate {stat,prof}clock #Try linked commands on all targets @@ -179,8 +180,10 @@ pseudo-device tun 2 # network tunnel pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation + pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device bridge # simple inter-network bridging + pseudo-device ccd 4 # concatenating disk driver pseudo-device raid 8 # RAIDframe disk driver options RAID_AUTOCONFIG # auto-configuration of RAID components diff --git a/sys/arch/atari/conf/BOOT b/sys/arch/atari/conf/BOOT index c14a1cc52d61..e282cc501d00 100644 --- a/sys/arch/atari/conf/BOOT +++ b/sys/arch/atari/conf/BOOT @@ -1,18 +1,21 @@ # -# $NetBSD: BOOT,v 1.47 2002/06/17 05:25:18 lukem Exp $ +# $NetBSD: BOOT,v 1.48 2002/09/18 02:20:50 lukem Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: FALCON.in,v 1.5 2001/11/20 11:29:41 lukem Exp $ -# NetBSD: GENERIC.in,v 1.21 2002/06/17 05:14:06 lukem Exp $ +# NetBSD: FALCON.in,v 1.6 2002/09/02 12:10:46 leo Exp $ +# NetBSD: GENERIC.in,v 1.23 2002/09/18 02:19:19 lukem Exp $ #This configuration file is for a generic ATARI-Falcon #Define 'INSTALL_KERNEL' or 'INSTALLX_KERNEL' to generate a BOOT or #BOOTX kernel respectively. +#There is no possibility for physical network interfaces. Use the define +#below to turn off vlan, pppoe, bridge and NETATALK. + #Generic atari include "arch/atari/conf/std.atari" diff --git a/sys/arch/atari/conf/BOOTX b/sys/arch/atari/conf/BOOTX index e09b5559d414..087f1b0990c4 100644 --- a/sys/arch/atari/conf/BOOTX +++ b/sys/arch/atari/conf/BOOTX @@ -1,18 +1,21 @@ # -# $NetBSD: BOOTX,v 1.41 2002/06/17 05:25:18 lukem Exp $ +# $NetBSD: BOOTX,v 1.42 2002/09/18 02:20:50 lukem Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: -# NetBSD: FALCON.in,v 1.5 2001/11/20 11:29:41 lukem Exp $ -# NetBSD: GENERIC.in,v 1.21 2002/06/17 05:14:06 lukem Exp $ +# NetBSD: FALCON.in,v 1.6 2002/09/02 12:10:46 leo Exp $ +# NetBSD: GENERIC.in,v 1.23 2002/09/18 02:19:19 lukem Exp $ #This configuration file is for a generic ATARI-Falcon #Define 'INSTALL_KERNEL' or 'INSTALLX_KERNEL' to generate a BOOT or #BOOTX kernel respectively. +#There is no possibility for physical network interfaces. Use the define +#below to turn off vlan, pppoe, bridge and NETATALK. + #Generic atari include "arch/atari/conf/std.atari" diff --git a/sys/arch/atari/conf/FALCON b/sys/arch/atari/conf/FALCON index fe66d73617c2..4f067d732731 100644 --- a/sys/arch/atari/conf/FALCON +++ b/sys/arch/atari/conf/FALCON @@ -1,12 +1,12 @@ # -# $NetBSD: FALCON,v 1.49 2002/09/02 12:13:35 leo Exp $ +# $NetBSD: FALCON,v 1.50 2002/09/18 02:20:50 lukem Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: FALCON.in,v 1.6 2002/09/02 12:10:46 leo Exp $ -# NetBSD: GENERIC.in,v 1.22 2002/09/02 12:10:46 leo Exp $ +# NetBSD: GENERIC.in,v 1.23 2002/09/18 02:19:19 lukem Exp $ #This configuration file is for a generic ATARI-Falcon @@ -136,7 +136,7 @@ options SYSVSEM # System V semaphores options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code -#options USERCONF # userconf(4) support +options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #These options enable verbose messages for several subsystems. diff --git a/sys/arch/atari/conf/HADES b/sys/arch/atari/conf/HADES index bec73a739205..d37ccd322324 100644 --- a/sys/arch/atari/conf/HADES +++ b/sys/arch/atari/conf/HADES @@ -1,12 +1,12 @@ # -# $NetBSD: HADES,v 1.39 2002/06/17 05:25:18 lukem Exp $ +# $NetBSD: HADES,v 1.40 2002/09/18 02:20:50 lukem Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: HADES.in,v 1.4 2001/04/10 06:28:38 leo Exp $ -# NetBSD: GENERIC.in,v 1.21 2002/06/17 05:14:06 lukem Exp $ +# NetBSD: GENERIC.in,v 1.23 2002/09/18 02:19:19 lukem Exp $ #This configuration file is for a generic Medusa-Hades @@ -53,6 +53,7 @@ options NS # XNS options ISO,TPIP # OSI #options EON # OSI tunneling over IP options CCITT,LLC,HDLC # X.25 + options NETATALK # AppleTalk networking protocols options PPP_BSDCOMP # BSD-Compress compression support for PPP @@ -130,7 +131,7 @@ options SYSVSEM # System V semaphores options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code -#options USERCONF # userconf(4) support +options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #These options enable verbose messages for several subsystems. @@ -156,7 +157,7 @@ options DISKLABEL_AHDI # NetBSD/AHDI disklabels options SERCONSOLE # modem1 console support options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM -#options MSGBUFSIZE=32768 # size of kernel msg. buffer +options MSGBUFSIZE=32768 # size of kernel msg. buffer #options STATCLOCK # Separate {stat,prof}clock #Try linked commands on all targets @@ -182,8 +183,10 @@ pseudo-device tun 2 # network tunnel pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation + pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device bridge # simple inter-network bridging + pseudo-device ccd 4 # concatenating disk driver pseudo-device raid 8 # RAIDframe disk driver options RAID_AUTOCONFIG # auto-configuration of RAID components diff --git a/sys/arch/atari/conf/MILAN-ISAIDE b/sys/arch/atari/conf/MILAN-ISAIDE index ea6cff1efcc3..a5b717538f5b 100644 --- a/sys/arch/atari/conf/MILAN-ISAIDE +++ b/sys/arch/atari/conf/MILAN-ISAIDE @@ -1,12 +1,12 @@ # -# $NetBSD: MILAN-ISAIDE,v 1.15 2002/06/17 05:25:18 lukem Exp $ +# $NetBSD: MILAN-ISAIDE,v 1.16 2002/09/18 02:20:50 lukem Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: MILAN.in,v 1.10 2002/06/15 21:44:07 leo Exp $ -# NetBSD: GENERIC.in,v 1.21 2002/06/17 05:14:06 lukem Exp $ +# NetBSD: GENERIC.in,v 1.23 2002/09/18 02:19:19 lukem Exp $ #This configuration file is for a generic Milan @@ -53,6 +53,7 @@ options NS # XNS options ISO,TPIP # OSI #options EON # OSI tunneling over IP options CCITT,LLC,HDLC # X.25 + options NETATALK # AppleTalk networking protocols options PPP_BSDCOMP # BSD-Compress compression support for PPP @@ -130,7 +131,7 @@ options SYSVSEM # System V semaphores options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code -#options USERCONF # userconf(4) support +options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #These options enable verbose messages for several subsystems. @@ -153,7 +154,7 @@ options DISKLABEL_AHDI # NetBSD/AHDI disklabels options SERCONSOLE # modem1 console support options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM -#options MSGBUFSIZE=32768 # size of kernel msg. buffer +options MSGBUFSIZE=32768 # size of kernel msg. buffer #options STATCLOCK # Separate {stat,prof}clock #Try linked commands on all targets @@ -179,8 +180,10 @@ pseudo-device tun 2 # network tunnel pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation + pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device bridge # simple inter-network bridging + pseudo-device ccd 4 # concatenating disk driver pseudo-device raid 8 # RAIDframe disk driver options RAID_AUTOCONFIG # auto-configuration of RAID components diff --git a/sys/arch/atari/conf/MILAN-PCIIDE b/sys/arch/atari/conf/MILAN-PCIIDE index 912750d3a6fa..86896c29304a 100644 --- a/sys/arch/atari/conf/MILAN-PCIIDE +++ b/sys/arch/atari/conf/MILAN-PCIIDE @@ -1,12 +1,12 @@ # -# $NetBSD: MILAN-PCIIDE,v 1.15 2002/06/17 05:25:18 lukem Exp $ +# $NetBSD: MILAN-PCIIDE,v 1.16 2002/09/18 02:20:50 lukem Exp $ # # This file was automatically created. Changes will be # lost when running makeconf in this directory. # # Created from: # NetBSD: MILAN.in,v 1.10 2002/06/15 21:44:07 leo Exp $ -# NetBSD: GENERIC.in,v 1.21 2002/06/17 05:14:06 lukem Exp $ +# NetBSD: GENERIC.in,v 1.23 2002/09/18 02:19:19 lukem Exp $ #This configuration file is for a generic Milan @@ -53,6 +53,7 @@ options NS # XNS options ISO,TPIP # OSI #options EON # OSI tunneling over IP options CCITT,LLC,HDLC # X.25 + options NETATALK # AppleTalk networking protocols options PPP_BSDCOMP # BSD-Compress compression support for PPP @@ -130,7 +131,7 @@ options SYSVSEM # System V semaphores options KTRACE # Add kernel tracing system call options DIAGNOSTIC # Add additional error checking code -#options USERCONF # userconf(4) support +options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #These options enable verbose messages for several subsystems. @@ -153,7 +154,7 @@ options DISKLABEL_AHDI # NetBSD/AHDI disklabels options SERCONSOLE # modem1 console support options RELOC_KERNEL # TT/Falcon: relocate kernel to TT-RAM -#options MSGBUFSIZE=32768 # size of kernel msg. buffer +options MSGBUFSIZE=32768 # size of kernel msg. buffer #options STATCLOCK # Separate {stat,prof}clock #Try linked commands on all targets @@ -179,8 +180,10 @@ pseudo-device tun 2 # network tunnel pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith 1 # IPv[46] tcp relay translation i/f #pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation + pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device bridge # simple inter-network bridging + pseudo-device ccd 4 # concatenating disk driver pseudo-device raid 8 # RAIDframe disk driver options RAID_AUTOCONFIG # auto-configuration of RAID components