From 7d022182b9af479ae4bf1b1196f9c12066a601f8 Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Mon, 1 Jan 2024 18:25:50 +0000
Subject: [PATCH] Move fdt attachment into sys/conf/files.conf instead of
 duplicating it on an MD basis.

ok patrick@
---
 sys/arch/arm/conf/files.arm             | 4 +---
 sys/arch/arm64/conf/files.arm64         | 4 +---
 sys/arch/octeon/conf/files.octeon       | 3 +--
 sys/arch/powerpc64/conf/files.powerpc64 | 4 +---
 sys/arch/riscv64/conf/files.riscv64     | 4 +---
 sys/conf/files                          | 3 ++-
 6 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index 0d28e653766..2c451014da5 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.arm,v 1.50 2018/05/15 11:11:35 kettenis Exp $
+#	$OpenBSD: files.arm,v 1.51 2024/01/01 18:25:50 kettenis Exp $
 #	$NetBSD: files.arm,v 1.76 2003/11/05 12:53:15 scw Exp $
 
 # generic networking files
@@ -15,8 +15,6 @@ file	arch/arm/arm/disassem.c			ddb
 file	arch/arm/arm/fiq.c			fiq
 file	arch/arm/arm/fiq_subr.S			fiq
 
-define	fdt {[early = 0]}
-
 # mainbus files
 define	mainbus {}
 device	mainbus: fdt
diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64
index 4414dd8d981..117a99b10e4 100644
--- a/sys/arch/arm64/conf/files.arm64
+++ b/sys/arch/arm64/conf/files.arm64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.arm64,v 1.67 2023/12/11 11:15:44 claudio Exp $
+# $OpenBSD: files.arm64,v 1.68 2024/01/01 18:25:50 kettenis Exp $
 
 maxpartitions	16
 maxusers	2 8 128
@@ -51,8 +51,6 @@ file	arch/arm64/arm64/disasm.c		ddb
 pseudo-device	openprom
 file	arch/arm64/arm64/openprom.c		openprom needs-flag
 
-define	fdt {[early = 0]}
-
 # mainbus files
 define	mainbus {}
 device	mainbus: fdt
diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon
index 263b14282d9..e11ae434ede 100644
--- a/sys/arch/octeon/conf/files.octeon
+++ b/sys/arch/octeon/conf/files.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.octeon,v 1.58 2020/10/25 10:31:33 visa Exp $
+#	$OpenBSD: files.octeon,v 1.59 2024/01/01 18:25:50 kettenis Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -74,7 +74,6 @@ file	arch/octeon/dev/cn30xxipd.c			iobus
 file	arch/octeon/dev/cn30xxpko.c			iobus
 file	arch/octeon/dev/cn30xxasx.c			iobus
 
-define	fdt {[early = 0]}
 define	fdt_octeon {[early = 0]}
 
 device	simplebus: fdt, fdt_octeon
diff --git a/sys/arch/powerpc64/conf/files.powerpc64 b/sys/arch/powerpc64/conf/files.powerpc64
index bc87f7a7df3..4fb2f8b3ecc 100644
--- a/sys/arch/powerpc64/conf/files.powerpc64
+++ b/sys/arch/powerpc64/conf/files.powerpc64
@@ -1,4 +1,4 @@
-# $OpenBSD: files.powerpc64,v 1.27 2021/10/05 04:55:53 deraadt Exp $
+# $OpenBSD: files.powerpc64,v 1.28 2024/01/01 18:25:50 kettenis Exp $
 
 maxpartitions	16
 maxusers	2 8 128
@@ -46,8 +46,6 @@ file	arch/powerpc64/dev/kexec_subr.S		kexec needs-flag
 pseudo-device	openprom
 file	arch/powerpc64/powerpc64/openprom.c	openprom needs-flag
 
-define	fdt {[early = 0]}
-
 # mainbus files
 define	mainbus {}
 device	mainbus: fdt
diff --git a/sys/arch/riscv64/conf/files.riscv64 b/sys/arch/riscv64/conf/files.riscv64
index b415c7e2db7..eb15831ea4e 100644
--- a/sys/arch/riscv64/conf/files.riscv64
+++ b/sys/arch/riscv64/conf/files.riscv64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.riscv64,v 1.27 2023/09/23 18:29:55 kettenis Exp $
+#	$OpenBSD: files.riscv64,v 1.28 2024/01/01 18:25:50 kettenis Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -46,8 +46,6 @@ file	arch/riscv64/dev/pci_machdep.c
 pseudo-device	openprom
 file	arch/riscv64/riscv64/openprom.c		openprom needs-flag
 
-define	fdt {[early = 0]}
-
 #
 # mainbus
 #
diff --git a/sys/conf/files b/sys/conf/files
index 34f73aa71f2..7ebeee9c3c0 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.728 2023/12/28 17:36:29 stsp Exp $
+#	$OpenBSD: files,v 1.729 2024/01/01 18:25:50 kettenis Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -22,6 +22,7 @@ define	gpiobus {}
 define	onewirebus {}
 define	video {}
 define	intrmap {}
+define	fdt {[early = 0]}
 
 # filesystem firmware loading attribute
 define firmload
-- 
2.20.1