diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-03-08 08:57:17 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-03-08 08:57:17 +0000 |
| commit | 5ad44e412f76a9db1a22c70b004904a5069de5ac (patch) | |
| tree | 840a036d74d8175ecf657f4bc61418382c2e2943 /sys/arch/arm64/conf | |
| parent | fe2591891e1899c993e332ff49b1d92bb3f1a45f (diff) | |
Enable em(4), ahci(4), nvme(4) and USB controllers attached to pci(4).
Diffstat (limited to 'sys/arch/arm64/conf')
| -rw-r--r-- | sys/arch/arm64/conf/GENERIC | 29 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/RAMDISK | 29 |
2 files changed, 48 insertions, 10 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC index e796710c1ce..ab16f216207 100644 --- a/sys/arch/arm64/conf/GENERIC +++ b/sys/arch/arm64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.16 2017/03/07 03:07:12 jsg Exp $ +# $OpenBSD: GENERIC,v 1.17 2017/03/08 08:57:16 patrick Exp $ # # GENERIC machine description file # @@ -84,7 +84,30 @@ 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 +pci* at ppb? + +# PCI Ethernet +em* at pci? # Intel Pro/1000 ethernet + +# PCI SCSI +ahci* at pci? flags 0x0000 # AHCI SATA controllers + # flags 0x0001 to force SATA 1 (1.5Gb/s) +nvme* at pci? # NVMe controllers + +# USB Controllers +ohci* at pci? # Open Host Controller +uhci* at pci? # Universal Host Controller (Intel) +ehci* at pci? # Enhanced Host Controller +xhci* at pci? # eXtensible Host Controller + +# USB bus support +usb* at ohci? +usb* at uhci? usb* at ehci? +usb* at xhci? # USB devices uhub* at usb? # USB Hubs @@ -196,10 +219,6 @@ rgephy* at mii? # Realtek 8169S/8110S PHY rlphy* at mii? # Realtek 8139 internal PHYs ukphy* at mii? # "unknown" PHYs -# PCI -ppb* at pci? # PCI-PCI bridges -pci* at ppb? - scsibus* at scsi? sd* at scsibus? cd* at scsibus? diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK index adf94c0bb74..894f730b77f 100644 --- a/sys/arch/arm64/conf/RAMDISK +++ b/sys/arch/arm64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.13 2017/03/07 03:07:12 jsg Exp $ +# $OpenBSD: RAMDISK,v 1.14 2017/03/08 08:57:16 patrick Exp $ # # GENERIC machine description file # @@ -91,7 +91,30 @@ 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 +pci* at ppb? + +# PCI Ethernet +em* at pci? # Intel Pro/1000 ethernet + +# PCI SCSI +ahci* at pci? flags 0x0000 # AHCI SATA controllers + # flags 0x0001 to force SATA 1 (1.5Gb/s) +nvme* at pci? # NVMe controllers + +# USB Controllers +ohci* at pci? # Open Host Controller +uhci* at pci? # Universal Host Controller (Intel) +ehci* at pci? # Enhanced Host Controller +xhci* at pci? # eXtensible Host Controller + +# USB bus support +usb* at ohci? +usb* at uhci? usb* at ehci? +usb* at xhci? # USB devices uhub* at usb? # USB Hubs @@ -133,10 +156,6 @@ rgephy* at mii? # Realtek 8169S/8110S PHY rlphy* at mii? # Realtek 8139 internal PHYs ukphy* at mii? # "unknown" PHYs -# PCI -ppb* at pci? # PCI-PCI bridges -pci* at ppb? - scsibus* at scsi? sd* at scsibus? cd* at scsibus? |