[src/trunk]: src/sys Generalise FDT and OFW

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e66c590c8b21
branches:  trunk
changeset: 828536:e66c590c8b21
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Dec 18 15:53:38 2017 +0000

description:
Generalise FDT and OFW

diffstat:

 sys/arch/arm/conf/std.arm         |   3 +--
 sys/arch/evbarm/conf/files.evbarm |   8 +-------
 sys/arch/macppc/conf/files.macppc |   7 +------
 sys/arch/ofppc/conf/files.ofppc   |  11 +----------
 sys/arch/shark/conf/files.shark   |   3 +--
 sys/conf/files                    |   8 +++++++-
 6 files changed, 12 insertions(+), 28 deletions(-)

diffs (120 lines):

diff -r 0148a4987c9f -r e66c590c8b21 sys/arch/arm/conf/std.arm
--- a/sys/arch/arm/conf/std.arm Mon Dec 18 13:56:14 2017 +0000
+++ b/sys/arch/arm/conf/std.arm Mon Dec 18 15:53:38 2017 +0000
@@ -1,6 +1,5 @@
-#      $NetBSD: std.arm,v 1.4 2017/12/15 16:41:40 christos Exp $
+#      $NetBSD: std.arm,v 1.5 2017/12/18 15:53:38 skrll Exp $
 #
 # standard NetBSD/arm options
 
 options                CPU_IN_CKSUM
-defflag                FDT
diff -r 0148a4987c9f -r e66c590c8b21 sys/arch/evbarm/conf/files.evbarm
--- a/sys/arch/evbarm/conf/files.evbarm Mon Dec 18 13:56:14 2017 +0000
+++ b/sys/arch/evbarm/conf/files.evbarm Mon Dec 18 15:53:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.evbarm,v 1.27 2017/08/30 23:57:27 jmcneill Exp $
+#      $NetBSD: files.evbarm,v 1.28 2017/12/18 15:53:38 skrll Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -53,10 +53,4 @@
 #
 defparam       opt_machdep.h                   DRAM_BLOCKS
 
-#
-# Flattened Device Tree (FDT) support
-#
-include "dev/ofw/files.ofw"
-include "dev/fdt/files.fdt"
-
 include "arch/arm/conf/majors.arm32"
diff -r 0148a4987c9f -r e66c590c8b21 sys/arch/macppc/conf/files.macppc
--- a/sys/arch/macppc/conf/files.macppc Mon Dec 18 13:56:14 2017 +0000
+++ b/sys/arch/macppc/conf/files.macppc Mon Dec 18 15:53:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.macppc,v 1.105 2017/09/22 03:11:43 macallan Exp $
+#      $NetBSD: files.macppc,v 1.106 2017/12/18 15:53:38 skrll Exp $
 #
 # macppc-specific configuration info
 
@@ -65,11 +65,6 @@
 include "dev/ata/files.ata"
 
 #
-# Generic OpenFirmware device support
-#
-include "dev/ofw/files.ofw"
-
-#
 # Machine-independent I2O drivers
 #
 include "dev/i2o/files.i2o"
diff -r 0148a4987c9f -r e66c590c8b21 sys/arch/ofppc/conf/files.ofppc
--- a/sys/arch/ofppc/conf/files.ofppc   Mon Dec 18 13:56:14 2017 +0000
+++ b/sys/arch/ofppc/conf/files.ofppc   Mon Dec 18 15:53:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.ofppc,v 1.46 2011/08/04 15:07:04 phx Exp $
+#      $NetBSD: files.ofppc,v 1.47 2017/12/18 15:53:39 skrll Exp $
 #
 # NetBSD/ofppc configuration info
 #
@@ -38,11 +38,6 @@
 include "arch/powerpc/pic/files.ipi"
 
 #
-# Generic OpenFirmware device support
-#
-#include "dev/ofw/files.ofw"
-
-#
 # I2O device support
 #
 include "dev/i2o/files.i2o"
@@ -65,10 +60,6 @@
 attach mainbus at root
 file   arch/ofppc/ofppc/mainbus.c              mainbus
 
-defpseudo openfirm
-file   dev/ofw/openfirmio.c                    openfirm needs-flag
-file   dev/ofw/ofw_subr.c                      ofbus | openfirm
-
 device rtas
 attach rtas at mainbus
 file   arch/powerpc/powerpc/rtas.c             rtas needs-flag
diff -r 0148a4987c9f -r e66c590c8b21 sys/arch/shark/conf/files.shark
--- a/sys/arch/shark/conf/files.shark   Mon Dec 18 13:56:14 2017 +0000
+++ b/sys/arch/shark/conf/files.shark   Mon Dec 18 15:53:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.shark,v 1.20 2017/03/10 00:09:13 macallan Exp $
+#      $NetBSD: files.shark,v 1.21 2017/12/18 15:53:39 skrll Exp $
 #
 # First try for arm-specific configuration info
 #
@@ -38,7 +38,6 @@
 include "dev/ata/files.ata"
 
 # Common OFW files
-include "dev/ofw/files.ofw"
 include "arch/arm/ofw/files.ofw"
 attach ofbus at root with ofbus_root
 file   arch/shark/ofw/ofw.c
diff -r 0148a4987c9f -r e66c590c8b21 sys/conf/files
--- a/sys/conf/files    Mon Dec 18 13:56:14 2017 +0000
+++ b/sys/conf/files    Mon Dec 18 15:53:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1188 2017/12/16 09:34:18 maxv Exp $
+#      $NetBSD: files,v 1.1189 2017/12/18 15:53:39 skrll Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20171118
@@ -1631,3 +1631,9 @@
 # MI clk api
 #
 include "dev/clk/files.clk"
+
+#
+# Flattened Device Tree (FDT) support
+#
+include "dev/ofw/files.ofw"
+include "dev/fdt/files.fdt"