Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/atari/conf Move USERCONF to GENERIC.in and trim the...



details:   https://anonhg.NetBSD.org/src/rev/0ff5e25027a3
branches:  trunk
changeset: 525551:0ff5e25027a3
user:      leo <leo%NetBSD.org@localhost>
date:      Fri Apr 12 22:34:13 2002 +0000

description:
Move USERCONF to GENERIC.in and trim the phy-list.

diffstat:

 sys/arch/atari/conf/ATARITT      |  12 ++++----
 sys/arch/atari/conf/BOOT         |   7 ++---
 sys/arch/atari/conf/BOOTX        |   7 ++---
 sys/arch/atari/conf/FALCON       |  14 +++++-----
 sys/arch/atari/conf/GENERIC.in   |  20 +-------------
 sys/arch/atari/conf/HADES        |  44 ++++++++++++++++++++++++++++++---
 sys/arch/atari/conf/MILAN-ISAIDE |  53 +++++++++++++++++++++++++++++++++------
 sys/arch/atari/conf/MILAN-PCIIDE |  53 +++++++++++++++++++++++++++++++++------
 8 files changed, 149 insertions(+), 61 deletions(-)

diffs (truncated from 543 to 300 lines):

diff -r f4c25abb7375 -r 0ff5e25027a3 sys/arch/atari/conf/ATARITT
--- a/sys/arch/atari/conf/ATARITT       Fri Apr 12 22:29:14 2002 +0000
+++ b/sys/arch/atari/conf/ATARITT       Fri Apr 12 22:34:13 2002 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: ATARITT,v 1.43 2002/04/12 08:10:52 gmcgarry Exp $
+# $NetBSD: ATARITT,v 1.44 2002/04/12 22:34:13 leo 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.14 2002/01/27 13:23:13 jdolecek Exp $
+#              NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
 
 #This configuration file is for a GENERIC ATARI-TT
 
@@ -88,7 +88,7 @@
 options        SOFTDEP         # FFS soft updates support.
 options        NFSSERVER       # Network File System server side code
 #options       EXT2FS_SYSTEM_FLAGS     # makes ext2fs file flags (append and
-                               #immutable) behave as system flags.
+                               # immutable) behave as system flags.
 
 #Misc. debugging options
 
@@ -129,8 +129,7 @@
 
 options        KTRACE                  # Add kernel tracing system call
 options        DIAGNOSTIC              # Add additional error checking code
-#options       USERCONF                # userconf(4) support
-#options       PIPE_SOCKETPAIR         # smaller, but slower pipe(2)
+#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
 #Warning, these may compile large string tables into the kernel!
@@ -151,7 +150,8 @@
 
 options        SERCONSOLE              # modem1 console support
 options        RELOC_KERNEL            # TT/Falcon: relocate kernel to TT-RAM
-options        STATCLOCK               # Separate {stat,prof}clock
+#options       MSGBUFSIZE=32768        # size of kernel msg. buffer
+#options       STATCLOCK               # Separate {stat,prof}clock
 
 #Try linked commands on all targets
 options        TRY_SCSI_LINKED_COMMANDS=0x7f
diff -r f4c25abb7375 -r 0ff5e25027a3 sys/arch/atari/conf/BOOT
--- a/sys/arch/atari/conf/BOOT  Fri Apr 12 22:29:14 2002 +0000
+++ b/sys/arch/atari/conf/BOOT  Fri Apr 12 22:34:13 2002 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: BOOT,v 1.42 2002/04/12 08:10:52 gmcgarry Exp $
+# $NetBSD: BOOT,v 1.43 2002/04/12 22:34:13 leo 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.14 2002/01/27 13:23:13 jdolecek Exp $
+#              NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
 
 #This configuration file is for a generic ATARI-Falcon
 
@@ -65,7 +65,6 @@
 options        COMPAT_AOUT_M68K # Compatibility to a.out executables
 options        EXEC_AOUT       # a.out format executables
 
-#options       USERCONF        # userconf(4) support
 options                PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
@@ -115,7 +114,7 @@
 wdc0           at mainbus0     # IDE-bus
 wd*            at wdc? channel ? drive ?
 
- #ATAPI bus support
+ # ATAPI bus support
 atapibus* at wdc? channel ?
 
 #ATAPI devices
diff -r f4c25abb7375 -r 0ff5e25027a3 sys/arch/atari/conf/BOOTX
--- a/sys/arch/atari/conf/BOOTX Fri Apr 12 22:29:14 2002 +0000
+++ b/sys/arch/atari/conf/BOOTX Fri Apr 12 22:34:13 2002 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: BOOTX,v 1.36 2002/04/12 08:10:53 gmcgarry Exp $
+# $NetBSD: BOOTX,v 1.37 2002/04/12 22:34:13 leo 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.14 2002/01/27 13:23:13 jdolecek Exp $
+#              NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
 
 #This configuration file is for a generic ATARI-Falcon
 
@@ -69,7 +69,6 @@
 options        COMPAT_AOUT_M68K # Compatibility to a.out executables
 options        EXEC_AOUT       # a.out format executables
 
-#options       USERCONF        # userconf(4) support
 options                PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
@@ -126,7 +125,7 @@
 wdc0           at mainbus0     # IDE-bus
 wd*            at wdc? channel ? drive ?
 
- #ATAPI bus support
+ # ATAPI bus support
 atapibus* at wdc? channel ?
 
 #ATAPI devices
diff -r f4c25abb7375 -r 0ff5e25027a3 sys/arch/atari/conf/FALCON
--- a/sys/arch/atari/conf/FALCON        Fri Apr 12 22:29:14 2002 +0000
+++ b/sys/arch/atari/conf/FALCON        Fri Apr 12 22:34:13 2002 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: FALCON,v 1.43 2002/04/12 08:10:53 gmcgarry Exp $
+# $NetBSD: FALCON,v 1.44 2002/04/12 22:34:13 leo 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.14 2002/01/27 13:23:13 jdolecek Exp $
+#              NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
 
 #This configuration file is for a generic ATARI-Falcon
 
@@ -91,7 +91,7 @@
 options        SOFTDEP         # FFS soft updates support.
 options        NFSSERVER       # Network File System server side code
 #options       EXT2FS_SYSTEM_FLAGS     # makes ext2fs file flags (append and
-                               #immutable) behave as system flags.
+                               # immutable) behave as system flags.
 
 #Misc. debugging options
 
@@ -132,8 +132,7 @@
 
 options        KTRACE                  # Add kernel tracing system call
 options        DIAGNOSTIC              # Add additional error checking code
-#options       USERCONF                # userconf(4) support
-#options       PIPE_SOCKETPAIR         # smaller, but slower pipe(2)
+#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
 #These options enable verbose messages for several subsystems.
 #Warning, these may compile large string tables into the kernel!
@@ -154,7 +153,8 @@
 
 options        SERCONSOLE              # modem1 console support
 options        RELOC_KERNEL            # TT/Falcon: relocate kernel to TT-RAM
-options        STATCLOCK               # Separate {stat,prof}clock
+#options       MSGBUFSIZE=32768        # size of kernel msg. buffer
+#options       STATCLOCK               # Separate {stat,prof}clock
 
 #Try linked commands on all targets
 options        TRY_SCSI_LINKED_COMMANDS=0x7f
@@ -219,7 +219,7 @@
 wdc0           at mainbus0     # IDE-bus
 wd*            at wdc? channel ? drive ?
 
- #ATAPI bus support
+ # ATAPI bus support
 atapibus* at wdc? channel ?
 
 #ATAPI devices
diff -r f4c25abb7375 -r 0ff5e25027a3 sys/arch/atari/conf/GENERIC.in
--- a/sys/arch/atari/conf/GENERIC.in    Fri Apr 12 22:29:14 2002 +0000
+++ b/sys/arch/atari/conf/GENERIC.in    Fri Apr 12 22:34:13 2002 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
+#      $NetBSD: GENERIC.in,v 1.17 2002/04/12 22:34:13 leo Exp $
 #
 # Generic atari
 #
@@ -157,6 +157,7 @@
 #
 options        KTRACE                  # Add kernel tracing system call
 options        DIAGNOSTIC              # Add additional error checking code
+#options       USERCONF                # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 #else /* INSTALL_KERNEL */
 options                PIPE_SOCKETPAIR # smaller, but slower pipe(2)
@@ -241,26 +242,9 @@
 #if defined(HADES_KERNEL) || defined(MILAN_KERNEL)
 
 # MII/PHY support
-acphy* at mii? phy ?                   # DAltima AC101 and AMD Am79c874 PHYs
-amhphy*        at mii? phy ?                   # AMD 79c901 Ethernet PHYs
-bmtphy*        at mii? phy ?                   # Broadcom BCM5201 and BCM5202 PHYs
-brgphy*        at mii? phy ?                   # Broadcom BCM5400-family PHYs
-dmphy* at mii? phy ?                   # Davicom DM9101 PHYs
 exphy* at mii? phy ?                   # 3Com internal PHYs
-glxtphy* at mii? phy ?                 # Level One LXT-1000 PHYs
-gphyter* at mii? phy ?                 # NS83861 Gig-E PHY
-icsphy*        at mii? phy ?                   # Integrated Circuit Systems ICS1890
 inphy* at mii? phy ?                   # Intel 82555 PHYs
 iophy* at mii? phy ?                   # Intel 82553 PHYs
-lxtphy*        at mii? phy ?                   # Level One LXT-970 PHYs
-makphy*        at mii? phy ?                   # Marvell Semiconductor 88E1000 PHYs
-nsphy* at mii? phy ?                   # NS83840 PHYs
-nsphyter* at mii? phy ?                        # NS83843 PHYs
-pnaphy*        at mii? phy ?                   # generic HomePNA PHYs
-qsphy* at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
-sqphy* at mii? phy ?                   # Seeq 80220/80221/80223 PHYs
-tlphy* at mii? phy ?                   # ThunderLAN PHYs
-tqphy* at mii? phy ?                   # TDK Semiconductor PHYs
 ukphy* at mii? phy ?                   # generic unknown PHYs
 
 # PCI network interfaces
diff -r f4c25abb7375 -r 0ff5e25027a3 sys/arch/atari/conf/HADES
--- a/sys/arch/atari/conf/HADES Fri Apr 12 22:29:14 2002 +0000
+++ b/sys/arch/atari/conf/HADES Fri Apr 12 22:34:13 2002 +0000
@@ -1,12 +1,12 @@
 #
-# $NetBSD: HADES,v 1.33 2002/01/27 13:56:49 jdolecek Exp $
+# $NetBSD: HADES,v 1.34 2002/04/12 22:34:13 leo 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.14 2002/01/27 13:23:13 jdolecek Exp $
+#              NetBSD: GENERIC.in,v 1.16 2002/04/12 22:29:14 leo Exp $
 
 #This configuration file is for a generic Medusa-Hades
 
@@ -87,7 +87,7 @@
 options        SOFTDEP         # FFS soft updates support.
 options        NFSSERVER       # Network File System server side code
 #options       EXT2FS_SYSTEM_FLAGS     # makes ext2fs file flags (append and
-                               #immutable) behave as system flags.
+                               # immutable) behave as system flags.
 
 #Misc. debugging options
 
@@ -135,6 +135,7 @@
 
 options        SCSIVERBOSE             # human readable SCSI error messages
 
+options        MIIVERBOSE              # verbose PHY autoconfig messages
 options        PCIVERBOSE              # verbose PCI device autoconfig messages
 #options       PCI_CONFIG_DUMP         # verbosely dump PCI config space
 
@@ -152,7 +153,8 @@
 
 options        SERCONSOLE              # modem1 console support
 options        RELOC_KERNEL            # TT/Falcon: relocate kernel to TT-RAM
-options        STATCLOCK               # Separate {stat,prof}clock
+#options       MSGBUFSIZE=32768        # size of kernel msg. buffer
+#options       STATCLOCK               # Separate {stat,prof}clock
 
 #Try linked commands on all targets
 options        TRY_SCSI_LINKED_COMMANDS=0x7f
@@ -191,6 +193,40 @@
 pseudo-device  ipfilter                # IP filtering device
 pseudo-device  rnd                     # /dev/random and in-kernel generator
 
+#MII/PHY support
+acphy* at mii? phy ?                   # DAltima AC101 and AMD Am79c874 PHYs
+amhphy*        at mii? phy ?                   # AMD 79c901 Ethernet PHYs
+bmtphy*        at mii? phy ?                   # Broadcom BCM5201 and BCM5202 PHYs
+brgphy*        at mii? phy ?                   # Broadcom BCM5400-family PHYs
+dmphy* at mii? phy ?                   # Davicom DM9101 PHYs
+exphy* at mii? phy ?                   # 3Com internal PHYs
+glxtphy* at mii? phy ?                 # Level One LXT-1000 PHYs
+gphyter* at mii? phy ?                 # NS83861 Gig-E PHY
+icsphy*        at mii? phy ?                   # Integrated Circuit Systems ICS1890
+inphy* at mii? phy ?                   # Intel 82555 PHYs
+iophy* at mii? phy ?                   # Intel 82553 PHYs
+lxtphy*        at mii? phy ?                   # Level One LXT-970 PHYs
+makphy*        at mii? phy ?                   # Marvell Semiconductor 88E1000 PHYs
+nsphy* at mii? phy ?                   # NS83840 PHYs
+nsphyter* at mii? phy ?                        # NS83843 PHYs
+pnaphy*        at mii? phy ?                   # generic HomePNA PHYs
+qsphy* at mii? phy ?                   # Quality Semiconductor QS6612 PHYs
+sqphy* at mii? phy ?                   # Seeq 80220/80221/80223 PHYs
+tlphy* at mii? phy ?                   # ThunderLAN PHYs
+tqphy* at mii? phy ?                   # TDK Semiconductor PHYs
+ukphy* at mii? phy ?                   # generic unknown PHYs
+
+#PCI network interfaces
+#If unsure, check the port-atari page for tested cards.
+ep*    at pci? dev ? function ?        # 3Com 3c59x
+ex*    at pci? dev ? function ?        # 3Com 90x[BC]
+fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
+
+#This is the only tested audio card at the moment.
+
+eso*   at pci? dev ? function ?        # ESS Solo-1 PCI AudioDrive
+audio* at eso?



Home | Main Index | Thread Index | Old Index