[src/netbsd-1-5]: src/sys/arch/sparc64/conf pull up 1.3 (approved by thorpej):

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

details:   https://anonhg.NetBSD.org/src/rev/d0a39428208d
branches:  netbsd-1-5
changeset: 488959:d0a39428208d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 07 01:53:39 2000 +0000

description:
pull up 1.3 (approved by thorpej):
>hardcode onboard "hme" to "hme0"

diffstat:

 sys/arch/sparc64/conf/GENERIC32 |  18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 56c6c30f1853 -r d0a39428208d sys/arch/sparc64/conf/GENERIC32
--- a/sys/arch/sparc64/conf/GENERIC32   Mon Aug 07 01:52:02 2000 +0000
+++ b/sys/arch/sparc64/conf/GENERIC32   Mon Aug 07 01:53:39 2000 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: GENERIC32,v 1.1.2.2 2000/07/18 16:23:16 mrg Exp $
+#      $NetBSD: GENERIC32,v 1.1.2.3 2000/08/07 01:53:39 mrg Exp $
 
 include "arch/sparc64/conf/std.sparc64"
 
-#ident                 "GENERIC-$Revision: 1.1.2.2 $"
+#ident                 "GENERIC-$Revision: 1.1.2.3 $"
 
 maxusers       32
 
@@ -133,7 +133,6 @@
 options        COMPAT_SUNOS    # SunOS 4.x binary compatibility
 options        COMPAT_SVR4     # SunOS 5.x binary compatibility
 #options       COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only
-#options       COMPAT_AOUT     # NetBSD/sparc compat support
 options        EXEC_AOUT       # execve(2) support for a.out binaries
 options        EXEC_ELF32      # Exec module for SunOS 5.x binaries.
 #options       EXEC_ELF64      # Exec module for sparc64 & SunOs 5.x binaries. -- 64-bit only
@@ -194,12 +193,20 @@
 
 sbus0  at mainbus0                             # Ultra 1
 #upa0  at mainbus0                             # Ultra 1E, Ultra 2, Ex0000
-psycho*        at mainbus0                             # Darwin, Ultra5
+psycho0        at mainbus0                             # Darwin, Ultra5        
+psycho*        at mainbus0                             # U2P
+pci0   at psycho0
 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
@@ -347,7 +354,8 @@
 
 ## Happy Meal Ethernet
 hme*           at sbus? slot ? offset ?
-hme*           at pci?                                 # "hme" compatible
+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"