From ac62a9eb55518b7e0947685c633b0eb0f4c6385f Mon Sep 17 00:00:00 2001 From: patrick Date: Fri, 28 May 2021 11:50:18 +0000 Subject: [PATCH] Move imxdog(4) to sys/dev/fdt. ok kettenis@ --- sys/arch/armv7/imx/files.imx | 6 +----- sys/dev/fdt/files.fdt | 6 +++++- sys/{arch/armv7/imx => dev/fdt}/imxdog.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename sys/{arch/armv7/imx => dev/fdt}/imxdog.c (97%) diff --git a/sys/arch/armv7/imx/files.imx b/sys/arch/armv7/imx/files.imx index 41945d77a6c..aafbdec91bc 100644 --- a/sys/arch/armv7/imx/files.imx +++ b/sys/arch/armv7/imx/files.imx @@ -1,8 +1,4 @@ -# $OpenBSD: files.imx,v 1.31 2020/04/23 22:14:49 patrick Exp $ - -device imxdog -attach imxdog at fdt -file arch/armv7/imx/imxdog.c imxdog +# $OpenBSD: files.imx,v 1.32 2021/05/28 11:50:18 patrick Exp $ device imxahci: scsi, atascsi attach imxahci at fdt diff --git a/sys/dev/fdt/files.fdt b/sys/dev/fdt/files.fdt index 9e0c3a87322..f93b48c7939 100644 --- a/sys/dev/fdt/files.fdt +++ b/sys/dev/fdt/files.fdt @@ -1,4 +1,4 @@ -# $OpenBSD: files.fdt,v 1.151 2021/05/18 11:39:37 kettenis Exp $ +# $OpenBSD: files.fdt,v 1.152 2021/05/28 11:50:18 patrick Exp $ # # Config file and device description for machine-independent FDT code. # Included by ports that need it. @@ -469,6 +469,10 @@ device imxccm attach imxccm at fdt file dev/fdt/imxccm.c imxccm +device imxdog +attach imxdog at fdt +file dev/fdt/imxdog.c imxdog + device imxdwusb: fdt attach imxdwusb at fdt file dev/fdt/imxdwusb.c imxdwusb diff --git a/sys/arch/armv7/imx/imxdog.c b/sys/dev/fdt/imxdog.c similarity index 97% rename from sys/arch/armv7/imx/imxdog.c rename to sys/dev/fdt/imxdog.c index 8b19c55426f..69663afe217 100644 --- a/sys/arch/armv7/imx/imxdog.c +++ b/sys/dev/fdt/imxdog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imxdog.c,v 1.6 2021/03/25 04:12:01 jsg Exp $ */ +/* $OpenBSD: imxdog.c,v 1.1 2021/05/28 11:50:18 patrick Exp $ */ /* * Copyright (c) 2012-2013 Patrick Wildt * -- 2.20.1