diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2021-05-18 11:39:38 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2021-05-18 11:39:38 +0000 |
| commit | 294e07d2f5c8797c90862d796db7147afe8f1f69 (patch) | |
| tree | 900b700992dc8314c5ba2bc78d5a35572964e2df /sys | |
| parent | 7500cc55372ab36070039e00229363b606476168 (diff) | |
Move the pciecam stanza back into files.arm64 since armv7 has its own
pciecam(4) implementation hidden away in arch/armv7/vexpress.
Unbreaks armv7 kernel builds.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/arm64/conf/files.arm64 | 6 | ||||
| -rw-r--r-- | sys/dev/fdt/files.fdt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64 index b22dbc7986c..6b4517f72b9 100644 --- a/sys/arch/arm64/conf/files.arm64 +++ b/sys/arch/arm64/conf/files.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm64,v 1.39 2021/05/17 19:43:38 kettenis Exp $ +# $OpenBSD: files.arm64,v 1.40 2021/05/18 11:39:37 kettenis Exp $ maxpartitions 16 maxusers 2 8 128 @@ -156,6 +156,10 @@ device bcmintc attach bcmintc at fdt file arch/arm64/dev/bcm2836_intr.c bcmintc +device pciecam: pcibus +attach pciecam at fdt +file dev/fdt/pciecam.c pciecam + device smmu attach smmu at fdt with smmu_fdt file arch/arm64/dev/smmu.c smmu diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt index 26b5d601a3a..9e0c3a87322 100644 --- a/sys/dev/fdt/files.fdt +++ b/sys/dev/fdt/files.fdt @@ -1,4 +1,4 @@ -# $OpenBSD: files.fdt,v 1.150 2021/05/17 19:43:37 kettenis Exp $ +# $OpenBSD: files.fdt,v 1.151 2021/05/18 11:39:37 kettenis Exp $ # # Config file and device description for machine-independent FDT code. # Included by ports that need it. @@ -11,10 +11,6 @@ device graphaudio: audio attach graphaudio at fdt file dev/fdt/graphaudio.c graphaudio -device pciecam: pcibus -attach pciecam at fdt -file dev/fdt/pciecam.c pciecam - device simpleamp attach simpleamp at fdt file dev/fdt/simpleamp.c simpleamp |