Module Name: src
Committed By: skrll
Date: Mon Dec 18 15:53:39 UTC 2017
Modified Files:
src/sys/arch/arm/conf: std.arm
src/sys/arch/evbarm/conf: files.evbarm
src/sys/arch/macppc/conf: files.macppc
src/sys/arch/ofppc/conf: files.ofppc
src/sys/arch/shark/conf: files.shark
src/sys/conf: files
Log Message:
Generalise FDT and OFW
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/conf/std.arm
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/files.evbarm
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/macppc/conf/files.macppc
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/ofppc/conf/files.ofppc
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/shark/conf/files.shark
cvs rdiff -u -r1.1188 -r1.1189 src/sys/conf/files
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/conf/std.arm
diff -u src/sys/arch/arm/conf/std.arm:1.4 src/sys/arch/arm/conf/std.arm:1.5
--- src/sys/arch/arm/conf/std.arm:1.4 Fri Dec 15 16:41:40 2017
+++ src/sys/arch/arm/conf/std.arm Mon Dec 18 15:53:38 2017
@@ -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
Index: src/sys/arch/evbarm/conf/files.evbarm
diff -u src/sys/arch/evbarm/conf/files.evbarm:1.27 src/sys/arch/evbarm/conf/files.evbarm:1.28
--- src/sys/arch/evbarm/conf/files.evbarm:1.27 Wed Aug 30 23:57:27 2017
+++ src/sys/arch/evbarm/conf/files.evbarm Mon Dec 18 15:53:38 2017
@@ -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 @@ file arch/evbarm/dev/plcom.c plcom nee
#
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"
Index: src/sys/arch/macppc/conf/files.macppc
diff -u src/sys/arch/macppc/conf/files.macppc:1.105 src/sys/arch/macppc/conf/files.macppc:1.106
--- src/sys/arch/macppc/conf/files.macppc:1.105 Fri Sep 22 03:11:43 2017
+++ src/sys/arch/macppc/conf/files.macppc Mon Dec 18 15:53:38 2017
@@ -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/scsipi/files.scsipi"
include "dev/ata/files.ata"
#
-# Generic OpenFirmware device support
-#
-include "dev/ofw/files.ofw"
-
-#
# Machine-independent I2O drivers
#
include "dev/i2o/files.i2o"
Index: src/sys/arch/ofppc/conf/files.ofppc
diff -u src/sys/arch/ofppc/conf/files.ofppc:1.46 src/sys/arch/ofppc/conf/files.ofppc:1.47
--- src/sys/arch/ofppc/conf/files.ofppc:1.46 Thu Aug 4 15:07:04 2011
+++ src/sys/arch/ofppc/conf/files.ofppc Mon Dec 18 15:53:39 2017
@@ -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.pic"
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 @@ device mainbus: mainbus
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
Index: src/sys/arch/shark/conf/files.shark
diff -u src/sys/arch/shark/conf/files.shark:1.20 src/sys/arch/shark/conf/files.shark:1.21
--- src/sys/arch/shark/conf/files.shark:1.20 Fri Mar 10 00:09:13 2017
+++ src/sys/arch/shark/conf/files.shark Mon Dec 18 15:53:39 2017
@@ -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/pckbport/files.pckbport"
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
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1188 src/sys/conf/files:1.1189
--- src/sys/conf/files:1.1188 Sat Dec 16 09:34:18 2017
+++ src/sys/conf/files Mon Dec 18 15:53:39 2017
@@ -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 @@ include "dev/ic/files.athn"
# MI clk api
#
include "dev/clk/files.clk"
+
+#
+# Flattened Device Tree (FDT) support
+#
+include "dev/ofw/files.ofw"
+include "dev/fdt/files.fdt"
