Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sparc64/conf sync with GENERIC32.
details: https://anonhg.NetBSD.org/src/rev/4af96f20edfd
branches: trunk
changeset: 504432:4af96f20edfd
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Mar 02 07:56:26 2001 +0000
description:
sync with GENERIC32.
diffstat:
sys/arch/sparc64/conf/EVERGLADES32 | 31 +++++++++++--------------------
sys/arch/sparc64/conf/NONPLUS | 4 ++--
sys/arch/sparc64/conf/POWEROFSEVEN32 | 34 +++++++++++++---------------------
3 files changed, 26 insertions(+), 43 deletions(-)
diffs (222 lines):
diff -r 23816e09a690 -r 4af96f20edfd sys/arch/sparc64/conf/EVERGLADES32
--- a/sys/arch/sparc64/conf/EVERGLADES32 Fri Mar 02 07:50:08 2001 +0000
+++ b/sys/arch/sparc64/conf/EVERGLADES32 Fri Mar 02 07:56:26 2001 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: EVERGLADES32,v 1.6 2001/02/17 16:29:13 mrg Exp $
+# $NetBSD: EVERGLADES32,v 1.7 2001/03/02 07:56:26 mrg Exp $
#
-# from: NetBSD: GENERIC32,v 1.8 2000/11/09 00:06:47 eeh Exp
+# from: NetBSD: GENERIC32,v 1.13 2001/02/28 00:08:18 mjacob Exp
+#
+# Configuration for Ultra1
include "arch/sparc64/conf/std.sparc64"
-#ident "GENERIC-$Revision: 1.6 $"
+#ident "GENERIC-$Revision: 1.7 $"
maxusers 64
@@ -13,7 +15,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 SUN4U # sun4u - UltraSPARC
#options LOCKDEBUG
#options _LP64 # we're using a 64-bit compiler
@@ -128,6 +130,7 @@
## compat_sunos(8) and compat_svr4(8).
options COMPAT_43 # 4.3BSD system interfaces
+options COMPAT_09 # NetBSD 0.9 binary compatibility
options COMPAT_10 # NetBSD 1.0 binary compatibility
#options COMPAT_11 # NetBSD 1.1 binary compatibility
options COMPAT_12 # NetBSD 1.2 binary compatibility
@@ -135,6 +138,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 -- 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.
@@ -196,20 +200,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
@@ -240,11 +236,6 @@
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)
@@ -273,8 +264,9 @@
scsibus* at esp?
-## Qlogic ISP SBus SCSI Card
+## Qlogic ISP SBus or PCI SCSI Card
isp* at sbus? slot ? offset ?
+#isp* at pci?
scsibus* at isp?
## FAS support missing
@@ -353,7 +345,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"
diff -r 23816e09a690 -r 4af96f20edfd sys/arch/sparc64/conf/NONPLUS
--- a/sys/arch/sparc64/conf/NONPLUS Fri Mar 02 07:50:08 2001 +0000
+++ b/sys/arch/sparc64/conf/NONPLUS Fri Mar 02 07:56:26 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NONPLUS,v 1.25 2001/02/11 01:04:59 eeh Exp $
+# $NetBSD: NONPLUS,v 1.26 2001/03/02 07:56:26 mrg Exp $
include "arch/sparc64/conf/std.sparc64"
@@ -10,7 +10,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 SUN4U # sun4u - UltraSPARC
options __ELF__ # we use elf
#options _LP64 # we're using a 64-bit compiler
#options __SWAP_BROKEN
diff -r 23816e09a690 -r 4af96f20edfd sys/arch/sparc64/conf/POWEROFSEVEN32
--- a/sys/arch/sparc64/conf/POWEROFSEVEN32 Fri Mar 02 07:50:08 2001 +0000
+++ b/sys/arch/sparc64/conf/POWEROFSEVEN32 Fri Mar 02 07:56:26 2001 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: POWEROFSEVEN32,v 1.7 2001/02/05 12:49:11 mrg Exp $
+# $NetBSD: POWEROFSEVEN32,v 1.8 2001/03/02 07:56:26 mrg Exp $
+#
+# from: NetBSD: GENERIC32,v 1.13 2001/02/28 00:08:18 mjacob Exp
#
# Configuration for Ultra5/Ultra10
@@ -11,9 +13,8 @@
# 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 SUN4U # sun4u - UltraSPARC
#options LOCKDEBUG
-options __ELF__ # we use elf
#options _LP64 # we're using a 64-bit compiler
## System options specific to the sparc machine type
@@ -128,11 +129,12 @@
options COMPAT_12 # NetBSD 1.2 binary compatibility (SUNOS)
options COMPAT_13 # NetBSD 1.3 binary compatibility
options COMPAT_14 # NetBSD 1.4 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 COMPAT_SUNOS # SunOS 4.x binary compatibility
options COMPAT_SVR4 # SunOS 5.x binary compatibility
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
-#options EXEC_ELF64 # Exec module for sparc64 & SunOs 5.x binaries. -- 64-bit only
+#options EXEC_ELF64 # Exec module for sparc64 & SunOS 5.x binaries. -- 64-bit only
options EXEC_AOUT # execve(2) support for a.out binaries
## File systems. You probably need at least one of FFS or NFS.
@@ -189,21 +191,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
@@ -233,10 +226,8 @@
#zs0 at sbus0 slot ? offset ?
#zstty0 at zs0 channel 0 # ttya
#zstty1 at zs0 channel 1 # ttyb
-
-#zs1 at sbus0 slot ? offset ?
-#kbd0 at zs1 channel 0 # keyboard
-#ms0 at zs1 channel 1 # mouse
+#kbd0 at zstty?
+#ms0 at zstty?
## PCI machines:
## Siemens SAB82532 controller: ttya and ttyb (sab)
@@ -276,15 +267,16 @@
#scsibus* at esp?
-## Qlogic ISP SBus SCSI Card
+## Qlogic ISP SBus or PCI SCSI Card
#isp* at sbus? slot ? offset ?
+#isp* at pci?
#scsibus* at isp?
## FAS support missing
#fas* at sbus? slot ? offset ?
#scsibus* at fas?
-## NCR/Symbios 53c8xx support
+## GLM support
siop* at pci? dev ? function ? # 53C875 "glm" compatible
scsibus* at siop?
@@ -299,6 +291,7 @@
cd* at scsibus? target ? lun ? # SCSI CD-ROMs
ch* at scsibus? target ? lun ? # SCSI changer devices
ss* at scsibus? target ? lun ? # SCSI scanners
+ses* at scsibus? target ? lun ? # SCSI SES/SAF-TE devices
uk* at scsibus? target ? lun ? # unknown SCSI
# PCI IDE.
@@ -357,7 +350,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
## qec/be, qec/hme
#qec* at sbus? slot ? offset ?
Home |
Main Index |
Thread Index |
Old Index