summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2017-04-30 14:03:45 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2017-04-30 14:03:45 +0000
commitfaefa3f042627526ccd35606398643f766fd4e76 (patch)
treeaa0c407444c8ec6e1981d0278af42a019436c21f /sys/arch
parent2a6016a45dcf021a577e8b6a7bdf238ab3536290 (diff)
Add xhci@fdt, and move ehci(4) from the sunxi block to the generic block.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/arm64/conf/GENERIC5
-rw-r--r--sys/arch/arm64/conf/RAMDISK5
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index 6d2ace33cc9..5e3af582371 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.25 2017/04/30 14:00:06 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.26 2017/04/30 14:03:44 kettenis Exp $
#
# GENERIC machine description file
#
@@ -50,8 +50,10 @@ ampintcmsi* at fdt?
agintc* at fdt?
agtimer* at fdt?
ahci* at fdt?
+ehci* at fdt?
pciecam* at fdt?
pci* at pciecam?
+xhci* at fdt?
# NS16550 compatible serial ports
com* at fdt?
@@ -88,7 +90,6 @@ sxiccmu* at fdt? early 1 # Clock Control Module/Unit
sxirtc* at fdt? # Real Time Clock
sximmc* at fdt? # SD/MMC card controller
sdmmc* at sximmc? # SD/MMC bus
-ehci* at fdt? # EHCI (shim)
# PCI
ppb* at pci? # PCI-PCI bridges
diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index 465970b7ec7..9f48c620317 100644
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.22 2017/04/30 14:00:06 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.23 2017/04/30 14:03:44 kettenis Exp $
#
# GENERIC machine description file
#
@@ -60,8 +60,10 @@ ampintcmsi* at fdt?
agintc* at fdt?
agtimer* at fdt?
ahci* at fdt?
+ehci* at fdt?
pciecam* at fdt?
pci* at pciecam?
+xhci* at fdt?
# NS16550 compatible serial ports
com* at fdt?
@@ -95,7 +97,6 @@ sxiccmu* at fdt? early 1 # Clock Control Module/Unit
sxirtc* at fdt? # Real Time Clock
sximmc* at fdt? # SD/MMC card controller
sdmmc* at sximmc? # SD/MMC bus
-ehci* at fdt? # EHCI (shim)
# PCI
ppb* at pci? # PCI-PCI bridges