summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Wildt <patrick@cvs.openbsd.org>2018-05-23 08:53:32 +0000
committerPatrick Wildt <patrick@cvs.openbsd.org>2018-05-23 08:53:32 +0000
commit02eddbbbb39acbacf7d59c7630c8da66ab467558 (patch)
tree244727e70a259f5894e78ac2a2beb4b3664674b7
parentd88153b3d81553f61feb93be97849e002f64f104 (diff)
Enable bwfm(4).
ok stsp@
-rw-r--r--sys/arch/amd64/conf/GENERIC8
-rw-r--r--sys/arch/arm64/conf/GENERIC4
-rw-r--r--sys/arch/armv7/conf/GENERIC6
3 files changed, 10 insertions, 8 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index f6662bb3885..d52200444d1 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.453 2018/04/20 04:39:37 dlg Exp $
+# $OpenBSD: GENERIC,v 1.454 2018/05/23 08:53:31 patrick Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -313,7 +313,7 @@ video* at utvfu?
audio* at utvfu?
udl* at uhub? # DisplayLink USB displays
wsdisplay* at udl?
-#bwfm* at uhub? # Broadcom FullMAC
+bwfm* at uhub? # Broadcom FullMAC
puc* at pci? # PCI "universal" communication device
com* at cardbus?
@@ -322,7 +322,7 @@ sdhc* at pci? # SD Host Controller
sdmmc* at sdhc? # SD/MMC bus
rtsx* at pci? # Realtek SD Card Reader
sdmmc* at rtsx? # SD/MMC bus
-#bwfm* at sdmmc? # Broadcom FullMAC
+bwfm* at sdmmc? # Broadcom FullMAC
isadma0 at isa?
@@ -411,7 +411,7 @@ pcscp* at pci? # AMD 53c974 PCscsi-PCI SCSI
#trm* at pci? # Tekram DC-3x5U SCSI Controllers
vmwpvs* at pci? # VMware ParaVirtual SCSI
nvme* at pci? # NVMe controllers
-#bwfm* at pci? # Broadcom FullMAC
+bwfm* at pci? # Broadcom FullMAC
scsibus* at scsi?
sd* at scsibus? # SCSI disk drives
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index 8c8728199ca..8941a8e6b55 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.71 2018/05/16 13:42:35 patrick Exp $
+# $OpenBSD: GENERIC,v 1.72 2018/05/23 08:53:31 patrick Exp $
#
# GENERIC machine description file
#
@@ -59,6 +59,7 @@ pciecam* at fdt?
pci* at pciecam?
sdhc* at fdt?
sdmmc* at sdhc?
+bwfm* at sdmmc? # Broadcom FullMAC
xhci* at fdt?
ccp* at fdt? # AMD Cryptographic Co-processor
@@ -280,6 +281,7 @@ video* at utvfu?
audio* at utvfu?
udl* at uhub? # DisplayLink USB displays
wsdisplay* at udl?
+bwfm* at uhub? # Broadcom FullMAC
amphy* at mii? # AMD 79C873 PHYs
atphy* at mii? # Attansic F1 PHYs
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index 8d2ff0ae4dd..6a21dd4e021 100644
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.107 2018/05/16 13:42:35 patrick Exp $
+# $OpenBSD: GENERIC,v 1.108 2018/05/23 08:53:31 patrick Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -119,7 +119,7 @@ virtio* at fdt?
sdhc* at fdt?
sdmmc* at sdhc?
-#bwfm* at sdmmc? # Broadcom FullMAC
+bwfm* at sdmmc? # Broadcom FullMAC
psci* at fdt? early 1
syscon* at fdt? early 1
@@ -300,7 +300,7 @@ video* at utvfu?
audio* at utvfu?
udl* at uhub? # DisplayLink USB displays
wsdisplay* at udl?
-#bwfm* at uhub? # Broadcom FullMAC
+bwfm* at uhub? # Broadcom FullMAC
atphy* at mii? # Attansic F1 PHYs
rgephy* at mii? # Realtek 8169S/8110S PHY