diff options
| author | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-02-24 10:13:14 +0000 |
|---|---|---|
| committer | Patrick Wildt <patrick@cvs.openbsd.org> | 2017-02-24 10:13:14 +0000 |
| commit | 49c21f8c23a11d45f2b96edf917a84c3a05b87c7 (patch) | |
| tree | 45521097cf1f527e5e8ca21819d2a547fdf577d7 /sys/arch | |
| parent | ebfdb6d4a6298d0d3e29174921a1a63986a3724d (diff) | |
Hook up pciecam(4), but don't compile it yet.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm64/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/RAMDISK | 9 | ||||
| -rw-r--r-- | sys/arch/arm64/conf/files.arm64 | 6 |
3 files changed, 21 insertions, 3 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC index a800cb2d7de..55cd63201f4 100644 --- a/sys/arch/arm64/conf/GENERIC +++ b/sys/arch/arm64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 2017/02/22 23:03:12 patrick Exp $ +# $OpenBSD: GENERIC,v 1.12 2017/02/24 10:13:13 patrick Exp $ # # GENERIC machine description file # @@ -48,6 +48,8 @@ uk* at scsibus? ampintc* at fdt? agtimer* at fdt? ahci* at fdt? +#pciecam* at fdt? +#pci* at pciecam? # NS16550 compatible serial ports com* at fdt? @@ -58,6 +60,7 @@ plrtc* at fdt? psci* at fdt? virtio* at fdt? +#virtio* at pci? vio* at virtio? vioblk* at virtio? viomb* at virtio? @@ -192,6 +195,10 @@ 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 8633c5faeba..c956474a097 100644 --- a/sys/arch/arm64/conf/RAMDISK +++ b/sys/arch/arm64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.8 2017/02/22 23:03:12 patrick Exp $ +# $OpenBSD: RAMDISK,v 1.9 2017/02/24 10:13:13 patrick Exp $ # # GENERIC machine description file # @@ -58,6 +58,8 @@ uk* at scsibus? ampintc* at fdt? agtimer* at fdt? ahci* at fdt? +#pciecam* at fdt? +#pci* at pciecam? # NS16550 compatible serial ports com* at fdt? @@ -68,6 +70,7 @@ plrtc* at fdt? psci* at fdt? virtio* at fdt? +#virtio* at pci? vio* at virtio? vioblk* at virtio? viomb* at virtio? @@ -129,6 +132,10 @@ 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/files.arm64 b/sys/arch/arm64/conf/files.arm64 index bba0574f2fb..89a54d8f0d6 100644 --- a/sys/arch/arm64/conf/files.arm64 +++ b/sys/arch/arm64/conf/files.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm64,v 1.9 2017/02/06 19:23:45 patrick Exp $ +# $OpenBSD: files.arm64,v 1.10 2017/02/24 10:13:13 patrick Exp $ maxpartitions 16 maxusers 2 8 64 @@ -130,3 +130,7 @@ file arch/arm64/dev/bcm2836_intr.c bcmintc include "dev/usb/dwc2/files.dwc2" attach dwctwo at fdt with bcmdwctwo file arch/arm64/dev/bcm2835_dwctwo.c bcmdwctwo needs-flag + +device pciecam: pcibus +attach pciecam at fdt +file arch/arm64/dev/pciecam.c pciecam |