From 208b19c76320731328e1e6b47a9c904431cdbb75 Mon Sep 17 00:00:00 2001 From: kettenis Date: Mon, 17 May 2021 19:43:37 +0000 Subject: [PATCH] Move pciecam.c to dev/fdt/. ok deraadt@ --- sys/arch/arm64/conf/files.arm64 | 6 +----- sys/dev/fdt/files.fdt | 6 +++++- sys/{arch/arm64/dev => dev/fdt}/pciecam.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename sys/{arch/arm64/dev => dev/fdt}/pciecam.c (99%) diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64 index e47cc08d99c..b22dbc7986c 100644 --- a/sys/arch/arm64/conf/files.arm64 +++ b/sys/arch/arm64/conf/files.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm64,v 1.38 2021/02/28 21:40:11 patrick Exp $ +# $OpenBSD: files.arm64,v 1.39 2021/05/17 19:43:38 kettenis Exp $ maxpartitions 16 maxusers 2 8 128 @@ -156,10 +156,6 @@ device bcmintc attach bcmintc at fdt file arch/arm64/dev/bcm2836_intr.c bcmintc -device pciecam: pcibus -attach pciecam at fdt -file arch/arm64/dev/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 9a84a2b9456..26b5d601a3a 100644 --- a/sys/dev/fdt/files.fdt +++ b/sys/dev/fdt/files.fdt @@ -1,4 +1,4 @@ -# $OpenBSD: files.fdt,v 1.149 2021/04/24 07:49:11 visa Exp $ +# $OpenBSD: files.fdt,v 1.150 2021/05/17 19:43:37 kettenis Exp $ # # Config file and device description for machine-independent FDT code. # Included by ports that need it. @@ -11,6 +11,10 @@ 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 diff --git a/sys/arch/arm64/dev/pciecam.c b/sys/dev/fdt/pciecam.c similarity index 99% rename from sys/arch/arm64/dev/pciecam.c rename to sys/dev/fdt/pciecam.c index efa54a0b995..b65ab3cf6a7 100644 --- a/sys/arch/arm64/dev/pciecam.c +++ b/sys/dev/fdt/pciecam.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciecam.c,v 1.15 2021/05/17 17:25:13 kettenis Exp $ */ +/* $OpenBSD: pciecam.c,v 1.1 2021/05/17 19:43:37 kettenis Exp $ */ /* * Copyright (c) 2013,2017 Patrick Wildt * -- 2.20.1