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 - do the "options<space><tab>" thing e...
details: https://anonhg.NetBSD.org/src/rev/d3bd4bdd52e9
branches: trunk
changeset: 484838:d3bd4bdd52e9
user: mrg <mrg%NetBSD.org@localhost>
date: Thu Apr 13 11:23:14 2000 +0000
description:
- do the "options<space><tab>" thing everywhere.
- disable COMPAT_AOUT.
- enable hme at sbus/pci
- enable bpp at sbus
- clean up esp attachments
- enable all xxphy's
- sync GENERIC & GENERIC64.
diffstat:
sys/arch/sparc64/conf/GENERIC | 101 +++++++++++-------------
sys/arch/sparc64/conf/GENERIC64 | 162 ++++++++++++++++++++++++---------------
2 files changed, 144 insertions(+), 119 deletions(-)
diffs (truncated from 556 to 300 lines):
diff -r b6632af805d1 -r d3bd4bdd52e9 sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC Thu Apr 13 11:21:18 2000 +0000
+++ b/sys/arch/sparc64/conf/GENERIC Thu Apr 13 11:23:14 2000 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: GENERIC,v 1.28 2000/04/05 14:28:55 mrg Exp $
+# $NetBSD: GENERIC,v 1.29 2000/04/13 11:23:14 mrg Exp $
include "arch/sparc64/conf/std.sparc64"
-#ident "GENERIC-$Revision: 1.28 $"
+#ident "GENERIC-$Revision: 1.29 $"
maxusers 32
@@ -11,10 +11,10 @@
# 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 TRAPWIN
-options __ELF__ # we use elf
-#options _LP64 # we're using a 64-bit compiler
+options SUN4U # sun4u - Ultra 140 and 170
+options TRAPWIN
+options __ELF__ # we use elf
+#options _LP64 # we're using a 64-bit compiler
## System options specific to the sparc machine type
@@ -22,6 +22,8 @@
## for headless (no framebuffer) machines.
# XXX broken on sparc64
#options RASTERCONSOLE # fast rasterop console
+#options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
#### System options that are the same for all ports
@@ -33,7 +35,7 @@
config netbsd root on ? type ?
## UVM options.
-#options UVM_PAGE_TRKOWN
+#options UVM_PAGE_TRKOWN
#options UVMHIST
#options UVMHIST_PRINT # Loud!
@@ -127,14 +129,14 @@
options COMPAT_12 # NetBSD 1.2 binary compatibility
options COMPAT_13 # NetBSD 1.3 binary compatibility
options COMPAT_14 # NetBSD 1.4 binary compatibility
-#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 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
-#options SYSCALL_DEBUG
-options COMPAT_AOUT # NetBSD/sparc compat support
-options EXEC_AOUT # execve(2) support for a.out binaries
+#options EXEC_ELF64 # Exec module for sparc64 & SunOs 5.x binaries. -- 64-bit only
+#options SYSCALL_DEBUG
## File systems. You probably need at least one of FFS or NFS.
file-system FFS # Berkeley Fast Filesystem
@@ -213,37 +215,35 @@
#### Standard system devices -- all required for a given architecture
## Auxiliary system registers -- We use the OBP for power management
-#auxreg0 at sbus0
auxio0 at ebus? # auxio registers
# We also need:
-# bpp0 at sbus0 # parallel port
-# ecpp0 at pci0 # parallel port ?
+bpp* at sbus? slot ? offset ? # parallel port
lpt* at ebus? # parallel port
## Mostek clock found on 4/300, sun4c, sun4m and sun4u systems.
## The Mostek clock NVRAM is the "eeprom" on sun4/300 systems.
-clock0 at sbus0 slot ? offset ?
-clock0 at ebus?
+clock* at sbus? slot ? offset ?
+clock* at ebus?
-## Timer chip found on 4/300, sun4c, sun4m and sun4u systems.
-timer0 at mainbus0 # sun4c
+## Timer chip found on 4/300, sun4c, sun4m and (some) sun4u systems.
+timer* at mainbus0 # sun4c
#### Serial port configuration
## Zilog 8530 serial chips. Each has two-channels.
## zs0 is ttya and ttyb. zs1 is the keyboard and mouse.
-zs0 at sbus0 slot ? offset ?
+zs0 at sbus? slot ? offset ?
zstty0 at zs0 channel 0 # ttya
zstty1 at zs0 channel 1 # ttyb
-zs1 at sbus0 slot ? offset ?
+zs1 at sbus? slot ? offset ?
kbd0 at zs1 channel 0 # keyboard
ms0 at zs1 channel 1 # mouse
-## PCI machines apparently have serial ports
-## Siemens SAB82532 controller: ttya and ttyb (sab)
-## Part of NS PC87332VLJ Super I/O controller: kbd/mouse (com)
+## 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
@@ -264,19 +264,9 @@
## bits 0-7: disable disconnect/reselect for the corresponding target
## bits 8-15: disable synchronous negotiation for target [bit-8]
-## sun4/300, sun4c, sun4m and sun4u on-board SCSI, and FSBE/S SBus SCSI cards.
-## Both `dma' and `esp' are needed in all cases.
-## Two kinds of additional SBus SCSI interfaces are available. One uses
-## "esp at sbus" like the sun4c on-board; the other uses "esp at dma".
+## sun4u on-board SCSI, and FSBE/S SBus SCSI cards, an NCR53c94 or
+## equivalent behind an LSI Logic DMA controller
-## sun4/300 SCSI - an NCR53c94 or equivalent behind
-## an LSI Logic DMA controller
-
-dma0 at sbus0 slot ? offset ? # sun4c/sun4m/sun4u
-esp0 at dma0 flags 0x0000 # sun4m/sun4u
-scsibus* at esp?
-
-# FSBE/S SCSI
dma* at sbus? slot ? offset ? # SBus
esp* at dma? flags 0x0000 # SBus
@@ -290,8 +280,9 @@
#fas* at sbus? slot ? offset ?
#scsibus* at fas?
-## GLM support is missing
-#scsi* at pci? # 53C875 "glm" compatible
+## GLM support missing
+#sym* at pci? # 53C875 "glm" compatible
+#scsibus* at sym?
## These entries find devices on all SCSI busses and assign
## unit numbers dynamically.
@@ -313,9 +304,9 @@
## Floppy controller and drive found on SPARCstations.
-# need share with the sparc...uses auxreg. what is this on sparc64?
-#fdc0 at sbus0 slot ? offset ?
-#fdc0 at pci? # Called fdthree?
+# need share with the sparc, and everyone else. needs to use auxio.
+#fdc0 at sbus? slot ? offset ?
+#fdc0 at ebus? # fdthree
#fd* at fdc0 # the drive itself
## A disk-like interface to files. Can be used to create floppy, CD,
@@ -346,7 +337,7 @@
## directly like the sun4c on-board, one uses the ledma device like the
## sun4m on-board, and one uses the lebuffer device.
-ledma0 at sbus0 slot ? offset ? # sun4m on-board
+ledma0 at sbus? slot ? offset ? # sun4m on-board
le0 at ledma0 # sun4m on-board
le* at sbus? slot ? offset ? # SBus
ledma* at sbus? slot ? offset ? # SBus
@@ -356,21 +347,21 @@
lebuffer* at sbus? slot ? offset ? # SBus
le* at lebuffer? # SBus
-## HME not supported yet
-#hme* at sbus0 slot ? offset ?
+## Happy Meal Ethernet
+hme* at sbus? slot ? offset ?
hme* at pci? # "hme" compatible
# MII/PHY support
# XXX: only nsphy "tested"
-#exphy* at mii? phy ? # 3Com internal PHYs
-#icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
-#inphy* at mii? phy ? # Intel 82555 PHYs
-#lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+exphy* at mii? phy ? # 3Com internal PHYs
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
+inphy* at mii? phy ? # Intel 82555 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-#qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
-#sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
-#tlphy* at mii? phy ? # ThunderLAN PHYs
-#ukphy* at mii? phy ? # generic unknown PHYs
+qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
+sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
+tlphy* at mii? phy ? # ThunderLAN PHYs
+ukphy* at mii? phy ? # generic unknown PHYs
## qec/be, qec/hme
qec* at sbus? slot ? offset ?
@@ -413,8 +404,8 @@
## /dev/audio support (`audiocs' plus `audio')
##
-audiocs0 at sbus0 slot ? offset ? # SUNW,CS4231
-audio* at audiocs0
+audiocs* at sbus? slot ? offset ? # SUNW,CS4231
+audio* at audiocs?
## Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
@@ -422,7 +413,7 @@
## the P4 entries for "bwtwo" will attach to the overlay plane of the
## "cgfour".
-#bwtwo0 at sbus0 slot ? offset ? # sun4c and sun4m
+#bwtwo0 at sbus? slot ? offset ? # sun4c and sun4m
#bwtwo* at sbus? slot ? offset ? #
## Sun "cgthree" Sbus color framebuffer
diff -r b6632af805d1 -r d3bd4bdd52e9 sys/arch/sparc64/conf/GENERIC64
--- a/sys/arch/sparc64/conf/GENERIC64 Thu Apr 13 11:21:18 2000 +0000
+++ b/sys/arch/sparc64/conf/GENERIC64 Thu Apr 13 11:23:14 2000 +0000
@@ -1,7 +1,9 @@
-# $NetBSD: GENERIC64,v 1.11 2000/04/05 14:28:55 mrg Exp $
+# $NetBSD: GENERIC64,v 1.12 2000/04/13 11:23:14 mrg Exp $
include "arch/sparc64/conf/std.sparc64"
+#ident "GENERIC-$Revision: 1.12 $"
+
maxusers 32
## System kernel for a 64-bit configuration. See options(4) for more detail.
@@ -9,10 +11,10 @@
# 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 TRAPWIN
-options __ELF__ # we use elf
-options _LP64 # we're using a 64-bit compiler
+options SUN4U # sun4u - Ultra 140 and 170
+options TRAPWIN
+options __ELF__ # we use elf
+options _LP64 # we're using a 64-bit compiler
## System options specific to the sparc machine type
@@ -20,8 +22,8 @@
## for headless (no framebuffer) machines.
# XXX broken on sparc64
#options RASTERCONSOLE # fast rasterop console
-#options FONT_GALLANT12x22 # the console font
-#options FONT_BOLD8x16 # a somewhat smaller font
+#options FONT_GALLANT12x22 # the console font
+#options FONT_BOLD8x16 # a somewhat smaller font
#### System options that are the same for all ports
@@ -33,7 +35,7 @@
config netbsd root on ? type ?
## UVM options.
-#options UVM_PAGE_TRKOWN
+#options UVM_PAGE_TRKOWN
#options UVMHIST
#options UVMHIST_PRINT # Loud!
@@ -66,7 +68,7 @@
## intercept. DDB_HISTORY_SIZE adds up/down arrow command history.
# we enable DDB in GENERIC for now.
options DDB # kernel dynamic debugger
-#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
#options DDB_ONPANIC # see also sysctl(8): `ddb.onpanic'
## You may also use gdb, on another computer connected to this machine over
@@ -95,6 +97,8 @@
## Make SCSI error messages more verbose when explaining their meanings.
options SCSIVERBOSE
+options PCIVERBOSE
+#options PCI_CONFIG_DUMP # verbosely dump PCI config space
## `INSECURE' turns off the kernel security level (securelevel = 0 always).
## This allows writing to /dev/mem, loading kernel modules while multi-user,
@@ -125,20 +129,21 @@
options COMPAT_12 # NetBSD 1.2 binary compatibility
options COMPAT_13 # NetBSD 1.3 binary compatibility
options COMPAT_14 # NetBSD 1.4 binary compatibility
+options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
options COMPAT_SUNOS # SunOS 4.x binary compatibility
options COMPAT_SVR4 # SunOS 5.x binary compatibility
-options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
-options COMPAT_AOUT # NetBSD/sparc compat support
+#options COMPAT_AOUT # NetBSD/sparc compat support
Home |
Main Index |
Thread Index |
Old Index