summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrick <patrick@openbsd.org>2017-02-25 17:05:43 +0000
committerpatrick <patrick@openbsd.org>2017-02-25 17:05:43 +0000
commit0898cbfc81e69f0d8605603590ece69fefa275f6 (patch)
tree6d985b89fe720fb883dbd95519e098bc2259d73e
parentImplement ampintcmsi(4) in ampintc(4) to support MSI. The GICv2M is an (diff)
downloadwireguard-openbsd-0898cbfc81e69f0d8605603590ece69fefa275f6.tar.xz
wireguard-openbsd-0898cbfc81e69f0d8605603590ece69fefa275f6.zip
Enable ampintcmsi(4), pciecam(4), ppb(4) and virtio(4).
-rw-r--r--sys/arch/arm64/conf/GENERIC13
-rw-r--r--sys/arch/arm64/conf/RAMDISK13
2 files changed, 14 insertions, 12 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index 55cd63201f4..1539a40597a 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.12 2017/02/24 10:13:13 patrick Exp $
+# $OpenBSD: GENERIC,v 1.13 2017/02/25 17:05:43 patrick Exp $
#
# GENERIC machine description file
#
@@ -46,10 +46,11 @@ ch* at scsibus?
uk* at scsibus?
ampintc* at fdt?
+ampintcmsi* at fdt?
agtimer* at fdt?
ahci* at fdt?
-#pciecam* at fdt?
-#pci* at pciecam?
+pciecam* at fdt?
+pci* at pciecam?
# NS16550 compatible serial ports
com* at fdt?
@@ -60,7 +61,7 @@ plrtc* at fdt?
psci* at fdt?
virtio* at fdt?
-#virtio* at pci?
+virtio* at pci?
vio* at virtio?
vioblk* at virtio?
viomb* at virtio?
@@ -196,8 +197,8 @@ rlphy* at mii? # Realtek 8139 internal PHYs
ukphy* at mii? # "unknown" PHYs
# PCI
-#ppb* at pci? # PCI-PCI bridges
-#pci* at ppb?
+ppb* at pci? # PCI-PCI bridges
+pci* at ppb?
scsibus* at scsi?
sd* at scsibus?
diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index c956474a097..fe5ae9f421a 100644
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.9 2017/02/24 10:13:13 patrick Exp $
+# $OpenBSD: RAMDISK,v 1.10 2017/02/25 17:05:43 patrick Exp $
#
# GENERIC machine description file
#
@@ -56,10 +56,11 @@ ch* at scsibus?
uk* at scsibus?
ampintc* at fdt?
+ampintcmsi* at fdt?
agtimer* at fdt?
ahci* at fdt?
-#pciecam* at fdt?
-#pci* at pciecam?
+pciecam* at fdt?
+pci* at pciecam?
# NS16550 compatible serial ports
com* at fdt?
@@ -70,7 +71,7 @@ plrtc* at fdt?
psci* at fdt?
virtio* at fdt?
-#virtio* at pci?
+virtio* at pci?
vio* at virtio?
vioblk* at virtio?
viomb* at virtio?
@@ -133,8 +134,8 @@ rlphy* at mii? # Realtek 8139 internal PHYs
ukphy* at mii? # "unknown" PHYs
# PCI
-#ppb* at pci? # PCI-PCI bridges
-#pci* at ppb?
+ppb* at pci? # PCI-PCI bridges
+pci* at ppb?
scsibus* at scsi?
sd* at scsibus?