Module Name: src
Committed By: martin
Date: Sun Jan 31 08:07:25 UTC 2021
Modified Files:
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Allow local builds to add configuration changes via GENERIC.local
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/arch/sparc64/conf/GENERIC
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/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.233 src/sys/arch/sparc64/conf/GENERIC:1.234
--- src/sys/arch/sparc64/conf/GENERIC:1.233 Fri Oct 30 06:44:37 2020
+++ src/sys/arch/sparc64/conf/GENERIC Sun Jan 31 08:07:25 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.233 2020/10/30 06:44:37 jdc Exp $
+# $NetBSD: GENERIC,v 1.234 2021/01/31 08:07:25 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.233 $"
+#ident "GENERIC-$Revision: 1.234 $"
maxusers 64
@@ -419,6 +419,9 @@ fdc0 at sbus? slot ? offset ? # SUNW,fd
#fdc0 at ebus? # fdthree, EXPERIMENTAL
fd* at fdc0 # the drive itself
+# Pull in optional local configuration
+cinclude "arch/sparc64/conf/GENERIC.local"
+
#
# accept filters
pseudo-device accf_data # "dataready" accept filter
