[src/trunk]: src/sys/arch/sparc64/conf - no need to hard wire pci busses or h...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/23816e09a690
branches:  trunk
changeset: 504431:23816e09a690
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Mar 02 07:50:08 2001 +0000

description:
- no need to hard wire pci busses or hme0 anymore
- clean up some comments
- __ELF__ is defined by the compiler

diffstat:

 sys/arch/sparc64/conf/GENERIC32 |  32 ++++++++------------------------
 1 files changed, 8 insertions(+), 24 deletions(-)

diffs (86 lines):

diff -r 335d0a8be260 -r 23816e09a690 sys/arch/sparc64/conf/GENERIC32
--- a/sys/arch/sparc64/conf/GENERIC32   Fri Mar 02 07:40:18 2001 +0000
+++ b/sys/arch/sparc64/conf/GENERIC32   Fri Mar 02 07:50:08 2001 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: GENERIC32,v 1.13 2001/02/28 00:08:18 mjacob Exp $
+#      $NetBSD: GENERIC32,v 1.14 2001/03/02 07:50:08 mrg Exp $
 
 include "arch/sparc64/conf/std.sparc64"
 
-#ident                 "GENERIC-$Revision: 1.13 $"
+#ident                 "GENERIC-$Revision: 1.14 $"
 
 maxusers       64
 
@@ -11,8 +11,7 @@
 
 # Options for variants of the Sun SPARC architecure.
 # We currently support three architecture types; at least one is required.
-options        SUN4U           # sun4u - Ultra 140 and 170
-options        __ELF__         # we use elf 
+options        SUN4U           # sun4u - UltraSPARC
 #options       _LP64           # we're using a 64-bit compiler
 
 ## System options specific to the sparc machine type
@@ -132,7 +131,7 @@
 options        COMPAT_14       # NetBSD 1.4 binary compatibility
 options        COMPAT_SUNOS    # SunOS 4.x binary compatibility
 options        COMPAT_SVR4     # SunOS 5.x binary compatibility
-#options       COMPAT_SVR4_32  # SunOS 5.x 32-bit binary compatibility
+#options       COMPAT_SVR4_32  # SunOS 5.x 32-bit binary compatibility -- 64-bit only
 #options       COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only
 options        EXEC_AOUT       # execve(2) support for a.out binaries
 options        EXEC_ELF32      # Exec module for SunOS 5.x binaries.
@@ -194,20 +193,12 @@
 
 sbus0  at mainbus0                             # Ultra 1
 #upa0  at mainbus0                             # Ultra 1E, Ultra 2, Ex0000
-psycho0        at mainbus0                             # Darwin, Ultra5        
-psycho*        at mainbus0                             # U2P
-pci0   at psycho0
+psycho*        at mainbus0                             # Darwin, Ultra5
 pci*   at psycho?
 pci*   at simba?
 simba* at pci? dev ? function ?                # `APB' support.
 ebus*  at pci?                                 # ebus devices
 
-# Ultra5/10/AXi
-simba0 at pci0 dev 1 function 0
-pci1   at simba0
-simba1 at pci0 dev 1 function 1
-pci2   at simba1
-
 #### Standard system devices -- all required for a given architecture
 
 ## PROM console driver -- if all else fails
@@ -238,19 +229,13 @@
 kbd0   at zstty?
 ms0    at zstty?
 
-## Old scheme -- deprecated.
-#zs    at sbus? slot ? offset ?
-#kbd0  at zs1 channel 0                        # keyboard
-#ms0   at zs1 channel 1                        # mouse
-
 ## PCI machines have serial ports:
 ##     Siemens SAB82532 controller: ttya and ttyb (`su'; sab)
 ##     Part of NS PC87332VLJ Super I/O controller: kbd/mouse (`se'; com)
 
-## These are two SAB82532 controllers
-#sab0  at ebus?                                # ttya/ttyb
-#sabtty0       at sab0 channel 0               # ttya
-#sabtty1       at sab0 channel 1               # ttyb
+## The SAB82532 controller has two serial ports
+#sab*  at ebus?                                # ttya/ttyb
+#sabtty*       at sab? channel ?
 
 ## Part of a PC87332VLJ
 com*   at ebus?                                # `com' driver for `su'
@@ -353,7 +338,6 @@
 ## Happy Meal Ethernet
 hme*           at sbus? slot ? offset ?
 hme*           at pci? dev ? function ?        # network "hme" compatible
-hme0           at pci2 dev 1 function 1        # U5/U10 on-board
 
 # MII/PHY support
 # XXX: only nsphy "tested"