Module Name: src
Committed By: thorpej
Date: Fri Jul 23 14:38:58 UTC 2021
Modified Files:
src/sys/arch/alpha/conf: GENERIC INSTALL
Log Message:
Use wildcard matches more consistently, and attach pci, eisa, isa, and
usb to their interface attributes, which makes for easier trimming-down
with "no" directives.
To generate a diff of this commit:
cvs rdiff -u -r1.412 -r1.413 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/alpha/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.412 src/sys/arch/alpha/conf/GENERIC:1.413
--- src/sys/arch/alpha/conf/GENERIC:1.412 Tue Jun 29 10:22:34 2021
+++ src/sys/arch/alpha/conf/GENERIC Fri Jul 23 14:38:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.412 2021/06/29 10:22:34 nia Exp $
+# $NetBSD: GENERIC,v 1.413 2021/07/23 14:38:58 thorpej Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.412 $"
+ident "GENERIC-$Revision: 1.413 $"
maxusers 32
@@ -184,11 +184,11 @@ config netbsd root on ? type ?
#config netbsd root on ? type nfs
mainbus0 at root
-cpu* at mainbus0
-qemu* at mainbus0
+cpu* at mainbus?
+qemu* at mainbus?
# TurboLaser bus support and devices
-tlsb* at mainbus0
+tlsb* at mainbus?
gbus* at tlsb? node ? offset ?
tlsbmem* at tlsb? node ? offset ?
kft* at tlsb? node ? offset ?
@@ -197,19 +197,19 @@ kft* at tlsb? node ? offset ?
mcclock* at gbus? offset ?
# MCBUS bus support
-mcbus* at mainbus0
+mcbus* at mainbus?
mcmem* at mcbus? mid ?
#i2c at mcbus?
#EV6 Tsunami Core Logic
-tsc* at mainbus0
+tsc* at mainbus?
tsciic* at tsc?
iic* at tsciic?
# DECpc AXP150 (Jensen) internal bus support
-jensenio* at mainbus0
+jensenio* at mainbus?
com* at jensenio? port ?
lpt* at jensenio? port ?
@@ -217,7 +217,7 @@ mcclock* at jensenio? port ?
pckbc* at jensenio? port ?
# TURBOchannel host bus adapter support
-tcasic* at mainbus0
+tcasic* at mainbus?
# TURBOchannel bus support
tc* at tcasic?
@@ -269,18 +269,10 @@ pckbc* at sableio? port ?
fdc* at sableio? port ?
# PCI bus support
-pci* at apecs?
-pci* at cia?
-pci* at irongate?
-pci* at lca?
-pci* at ppb?
-pci* at dwlpx?
-pci* at mcpcia?
-pci* at tsp?
-pci* at ttwopci?
+pci* at pcibus? # "pcibus" interface attribute
# AGP support
-agp* at irongate?
+agp* at agpbus? # "agpbus" interface attribute
# PCI devices
@@ -404,11 +396,8 @@ tqphy* at mii? phy ? # TDK Semiconduct
ukphy* at mii? phy ? # generic unknown PHYs
# ISA/EISA bus support
-isa* at jensenio?
-eisa* at jensenio?
-isa* at pceb?
-eisa* at pceb?
-isa* at sio?
+isa* at isabus? # "isabus" interface attribute
+eisa* at eisabus? # "eisabus" interface attribute
#isapnp* at isa?
# ISA devices
@@ -550,11 +539,7 @@ iic* at alipm?
slhci* at pcmcia? function ? # ScanLogic SL811HS
# USB bus support
-usb* at xhci?
-usb* at ehci?
-usb* at ohci?
-usb* at slhci?
-usb* at uhci?
+usb* at usbus? # "usbus" interface attribute
# USB Hubs
uhub* at usb?
Index: src/sys/arch/alpha/conf/INSTALL
diff -u src/sys/arch/alpha/conf/INSTALL:1.117 src/sys/arch/alpha/conf/INSTALL:1.118
--- src/sys/arch/alpha/conf/INSTALL:1.117 Mon Sep 28 03:48:12 2020
+++ src/sys/arch/alpha/conf/INSTALL Fri Jul 23 14:38:58 2021
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.117 2020/09/28 03:48:12 thorpej Exp $
+# $NetBSD: INSTALL,v 1.118 2021/07/23 14:38:58 thorpej Exp $
#
# Alpha INSTALL kernel.
@@ -86,11 +86,11 @@ options WSEMUL_VT100
config netbsd root on ? type ?
mainbus0 at root
-cpu* at mainbus0
-qemu* at mainbus0
+cpu* at mainbus?
+qemu* at mainbus?
# TurboLaser bus support and devices
-tlsb* at mainbus0
+tlsb* at mainbus?
gbus* at tlsb? node ? offset ?
tlsbmem* at tlsb? node ? offset ?
kft* at tlsb? node ? offset ?
@@ -99,15 +99,15 @@ kft* at tlsb? node ? offset ?
mcclock* at gbus? offset ?
# MCBUS bus support
-mcbus* at mainbus0
+mcbus* at mainbus?
mcmem* at mcbus? mid ?
#EV6 Tsunami Core Logic
-tsc* at mainbus0
+tsc* at mainbus?
# DECpc AXP150 (Jensen) internal bus support
-jensenio* at mainbus0
+jensenio* at mainbus?
com* at jensenio? port ?
lpt* at jensenio? port ?
@@ -115,7 +115,7 @@ mcclock* at jensenio? port ?
pckbc* at jensenio? port ?
# TURBOchannel host bus adapter support
-tcasic* at mainbus0
+tcasic* at mainbus?
# TURBOchannel bus support
tc* at tcasic?
@@ -164,18 +164,10 @@ pckbc* at sableio? port ?
fdc* at sableio? port ?
# PCI bus support
-pci* at apecs?
-pci* at cia?
-pci* at irongate?
-pci* at lca?
-pci* at ppb?
-pci* at dwlpx?
-pci* at mcpcia?
-pci* at tsp?
-pci* at ttwopci?
+pci* at pcibus? # "pcibus" interface attribute
# AGP support
-agp* at irongate?
+agp* at agpbus? # "agpbus" interface attribute
# PCI devices
adv* at pci? dev ? function ? # AdvanSys SCSI
@@ -250,11 +242,8 @@ tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
# ISA/EISA bus support
-isa* at jensenio?
-eisa* at jensenio?
-isa* at pceb?
-eisa* at pceb?
-isa* at sio?
+isa* at isabus? # "isabus" interface attribute
+eisa* at eisabus? # "eisabus" interface attribute
# ISA devices
mcclock* at isa? port 0x70
