Module Name: src
Committed By: abs
Date: Sun Feb 12 14:50:42 UTC 2023
Modified Files:
src/sys/arch/acorn32/conf: GENERIC
src/sys/arch/amiga/conf: GENERIC GENERIC.in
src/sys/arch/amigappc/conf: GENERIC
src/sys/arch/arc/conf: GENERIC
src/sys/arch/bebox/conf: GENERIC
src/sys/arch/cats/conf: GENERIC
src/sys/arch/cesfic/conf: GENERIC
src/sys/arch/cobalt/conf: GENERIC
src/sys/arch/dreamcast/conf: GENERIC
src/sys/arch/emips/conf: GENERIC
src/sys/arch/epoc32/conf: GENERIC
src/sys/arch/ews4800mips/conf: GENERIC
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcmips/conf: GENERIC
src/sys/arch/hpcsh/conf: GENERIC
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/ibmnws/conf: GENERIC
src/sys/arch/iyonix/conf: GENERIC
src/sys/arch/luna68k/conf: GENERIC
src/sys/arch/mac68k/conf: GENERIC
src/sys/arch/mipsco/conf: GENERIC
src/sys/arch/mmeye/conf: GENERIC
src/sys/arch/mvme68k/conf: GENERIC
src/sys/arch/mvmeppc/conf: GENERIC
src/sys/arch/netwinder/conf: GENERIC
src/sys/arch/news68k/conf: GENERIC
src/sys/arch/newsmips/conf: GENERIC
src/sys/arch/next68k/conf: GENERIC
src/sys/arch/ofppc/conf: GENERIC
src/sys/arch/playstation2/conf: GENERIC
src/sys/arch/pmax/conf: GENERIC
src/sys/arch/sandpoint/conf: GENERIC
src/sys/arch/sbmips/conf: GENERIC
src/sys/arch/sparc/conf: GENERIC
src/sys/arch/sun2/conf: GENERIC
src/sys/arch/sun3/conf: GENERIC
src/sys/arch/vax/conf: GENERIC
src/sys/arch/x68k/conf: GENERIC
Log Message:
Add optoion GENERIC.local include to the end of ~all GENERIC configs
This excludes atari, sgimips, evbmips, evbppc, evbsh3, and hpcarm
all of which have somewhat specific kernel config file layouts
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.337 -r1.338 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.150 -r1.151 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.202 -r1.203 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/cesfic/conf/GENERIC
cvs rdiff -u -r1.172 -r1.173 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.136 -r1.137 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/emips/conf/GENERIC
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/epoc32/conf/GENERIC
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/ews4800mips/conf/GENERIC
cvs rdiff -u -r1.210 -r1.211 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.247 -r1.248 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/hpcsh/conf/GENERIC
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/ibmnws/conf/GENERIC
cvs rdiff -u -r1.115 -r1.116 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.135 -r1.136 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.236 -r1.237 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/mipsco/conf/GENERIC
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/mmeye/conf/GENERIC
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/mvme68k/conf/GENERIC
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/newsmips/conf/GENERIC
cvs rdiff -u -r1.161 -r1.162 src/sys/arch/next68k/conf/GENERIC
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/playstation2/conf/GENERIC
cvs rdiff -u -r1.206 -r1.207 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/sbmips/conf/GENERIC
cvs rdiff -u -r1.272 -r1.273 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sun2/conf/GENERIC
cvs rdiff -u -r1.189 -r1.190 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.218 -r1.219 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.207 -r1.208 src/sys/arch/x68k/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/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.136 src/sys/arch/acorn32/conf/GENERIC:1.137
--- src/sys/arch/acorn32/conf/GENERIC:1.136 Thu Sep 29 10:10:05 2022
+++ src/sys/arch/acorn32/conf/GENERIC Sun Feb 12 14:50:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.136 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.137 2023/02/12 14:50:37 abs Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.136 $"
+#ident "GENERIC-$Revision: 1.137 $"
# estimated number of users
maxusers 32
@@ -336,3 +336,6 @@ include "dev/veriexec.config"
#makeoptions MONITOR="Taxan875+LR"
#makeoptions MONITOR="AKF60"
#makeoptions MODES="1024,768,60 1024,768,70 800,600,60 640,480,60 1280,1024 1152,900"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/acorn32/conf/GENERIC.local"
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.337 src/sys/arch/amiga/conf/GENERIC:1.338
--- src/sys/arch/amiga/conf/GENERIC:1.337 Thu Sep 29 10:10:05 2022
+++ src/sys/arch/amiga/conf/GENERIC Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.337 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.338 2023/02/12 14:50:38 abs Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.337 $"
+#ident "GENERIC-$Revision: 1.338 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -601,3 +601,6 @@ pseudo-device swwdog # software watch
include "dev/veriexec.config"
config netbsd root on ? type ?
+
+# Pull in optional local configuration - always at end
+cinclude "arch/amiga/conf/GENERIC.local"
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.150 src/sys/arch/amiga/conf/GENERIC.in:1.151
--- src/sys/arch/amiga/conf/GENERIC.in:1.150 Sun Aug 7 02:52:23 2022
+++ src/sys/arch/amiga/conf/GENERIC.in Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.150 2022/08/07 02:52:23 simonb Exp $
+# $NetBSD: GENERIC.in,v 1.151 2023/02/12 14:50:38 abs Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.150 $"
+#ident "GENERIC-$Revision: 1.151 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os -fno-omit-frame-pointer"
@@ -711,3 +711,6 @@ pseudo-device btuart
include "dev/veriexec.config"
config netbsd root on ? type ?
+
+# Pull in optional local configuration - always at end
+cinclude "arch/amiga/conf/GENERIC.local"
Index: src/sys/arch/amigappc/conf/GENERIC
diff -u src/sys/arch/amigappc/conf/GENERIC:1.44 src/sys/arch/amigappc/conf/GENERIC:1.45
--- src/sys/arch/amigappc/conf/GENERIC:1.44 Thu Sep 29 10:10:05 2022
+++ src/sys/arch/amigappc/conf/GENERIC Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.44 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.45 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amigappc/conf/std.amigappc
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.44 $"
+#ident "GENERIC-$Revision: 1.45 $"
maxusers 8
@@ -435,3 +435,6 @@ include "dev/veriexec.config"
# Kernel root file system and dump configuration
config netbsd root on ? type ?
+
+# Pull in optional local configuration - always at end
+cinclude "arch/amigappc/conf/GENERIC.local"
Index: src/sys/arch/arc/conf/GENERIC
diff -u src/sys/arch/arc/conf/GENERIC:1.202 src/sys/arch/arc/conf/GENERIC:1.203
--- src/sys/arch/arc/conf/GENERIC:1.202 Thu Sep 29 10:10:05 2022
+++ src/sys/arch/arc/conf/GENERIC Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.202 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.203 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.202 $"
+#ident "GENERIC-$Revision: 1.203 $"
maxusers 32 # estimated number of users
@@ -481,3 +481,6 @@ pseudo-device swwdog # software watch
pseudo-device ksyms # /dev/ksyms
#include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/arc/conf/GENERIC.local"
Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.168 src/sys/arch/bebox/conf/GENERIC:1.169
--- src/sys/arch/bebox/conf/GENERIC:1.168 Thu Sep 29 10:10:05 2022
+++ src/sys/arch/bebox/conf/GENERIC Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.168 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.169 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.168 $"
+#ident "GENERIC-$Revision: 1.169 $"
maxusers 32
@@ -325,3 +325,6 @@ include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
+# Pull in optional local configuration - always at end
+cinclude "arch/bebox/conf/GENERIC.local"
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.186 src/sys/arch/cats/conf/GENERIC:1.187
--- src/sys/arch/cats/conf/GENERIC:1.186 Thu Sep 29 10:10:05 2022
+++ src/sys/arch/cats/conf/GENERIC Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.186 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.187 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -563,3 +563,6 @@ pseudo-device wsfont
pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/cats/conf/GENERIC.local"
Index: src/sys/arch/cesfic/conf/GENERIC
diff -u src/sys/arch/cesfic/conf/GENERIC:1.77 src/sys/arch/cesfic/conf/GENERIC:1.78
--- src/sys/arch/cesfic/conf/GENERIC:1.77 Thu Sep 29 10:10:05 2022
+++ src/sys/arch/cesfic/conf/GENERIC Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.77 2022/09/29 10:10:05 riastradh Exp $
+# $NetBSD: GENERIC,v 1.78 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -137,3 +137,6 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device swwdog # software watchdog timer -- swwdog(4)
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/cesfic/conf/GENERIC.local"
Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.172 src/sys/arch/cobalt/conf/GENERIC:1.173
--- src/sys/arch/cobalt/conf/GENERIC:1.172 Thu Sep 29 10:10:06 2022
+++ src/sys/arch/cobalt/conf/GENERIC Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.172 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.173 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.172 $"
+#ident "GENERIC-$Revision: 1.173 $"
maxusers 32
@@ -345,3 +345,6 @@ pseudo-device swwdog # software watch
pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/cobalt/conf/GENERIC.local"
Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.136 src/sys/arch/dreamcast/conf/GENERIC:1.137
--- src/sys/arch/dreamcast/conf/GENERIC:1.136 Thu Sep 29 10:10:06 2022
+++ src/sys/arch/dreamcast/conf/GENERIC Sun Feb 12 14:50:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.136 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.137 2023/02/12 14:50:38 abs Exp $
#
# GENERIC machine description file
#
@@ -222,3 +222,6 @@ pseudo-device swwdog # software watch
# Veriexec
# include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/dreamcast/conf/GENERIC.local"
Index: src/sys/arch/emips/conf/GENERIC
diff -u src/sys/arch/emips/conf/GENERIC:1.26 src/sys/arch/emips/conf/GENERIC:1.27
--- src/sys/arch/emips/conf/GENERIC:1.26 Thu Sep 29 10:10:06 2022
+++ src/sys/arch/emips/conf/GENERIC Sun Feb 12 14:50:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.26 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.27 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/emips/conf/std.emips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.26 $"
+#ident "GENERIC-$Revision: 1.27 $"
maxusers 64
@@ -210,3 +210,6 @@ pseudo-device fss # file system snaps
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
pseudo-device swwdog # software watchdog timer -- swwdog(4)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/emips/conf/GENERIC.local"
Index: src/sys/arch/epoc32/conf/GENERIC
diff -u src/sys/arch/epoc32/conf/GENERIC:1.17 src/sys/arch/epoc32/conf/GENERIC:1.18
--- src/sys/arch/epoc32/conf/GENERIC:1.17 Thu Sep 29 10:10:06 2022
+++ src/sys/arch/epoc32/conf/GENERIC Sun Feb 12 14:50:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.17 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: GENERIC,v 1.18 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/epoc32/conf/std.epoc32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.17 $"
+#ident "GENERIC-$Revision: 1.18 $"
maxusers 32 # estimated number of users
@@ -193,3 +193,6 @@ pseudo-device swwdog # software watch
# wscons pseudo-devices
#pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
+
+# Pull in optional local configuration - always at end
+cinclude "arch/epoc32/conf/GENERIC.local"
Index: src/sys/arch/ews4800mips/conf/GENERIC
diff -u src/sys/arch/ews4800mips/conf/GENERIC:1.66 src/sys/arch/ews4800mips/conf/GENERIC:1.67
--- src/sys/arch/ews4800mips/conf/GENERIC:1.66 Thu Sep 29 10:10:07 2022
+++ src/sys/arch/ews4800mips/conf/GENERIC Sun Feb 12 14:50:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.66 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.67 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
# This machine description file is used to generate the default NetBSD
@@ -25,7 +25,7 @@ include "arch/ews4800mips/conf/std.ews4
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.66 $"
+#ident "GENERIC-$Revision: 1.67 $"
maxusers 16
@@ -266,3 +266,6 @@ pseudo-device swwdog # software watch
pseudo-device wsmux
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/ews4800mips/conf/GENERIC.local"
Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.210 src/sys/arch/hp300/conf/GENERIC:1.211
--- src/sys/arch/hp300/conf/GENERIC:1.210 Thu Sep 29 10:10:07 2022
+++ src/sys/arch/hp300/conf/GENERIC Sun Feb 12 14:50:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.210 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.211 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.210 $"
+#ident "GENERIC-$Revision: 1.211 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -343,3 +343,6 @@ pseudo-device wsmux # mouse & keyboard
pseudo-device wsfont
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/hp300/conf/GENERIC.local"
Index: src/sys/arch/hpcmips/conf/GENERIC
diff -u src/sys/arch/hpcmips/conf/GENERIC:1.247 src/sys/arch/hpcmips/conf/GENERIC:1.248
--- src/sys/arch/hpcmips/conf/GENERIC:1.247 Thu Sep 29 10:10:07 2022
+++ src/sys/arch/hpcmips/conf/GENERIC Sun Feb 12 14:50:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.247 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.248 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.247 $"
+#ident "GENERIC-$Revision: 1.248 $"
maxusers 16
@@ -698,3 +698,6 @@ pseudo-device agr # IEEE 802.3ad link
pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/hpcmips/conf/GENERIC.local"
Index: src/sys/arch/hpcsh/conf/GENERIC
diff -u src/sys/arch/hpcsh/conf/GENERIC:1.116 src/sys/arch/hpcsh/conf/GENERIC:1.117
--- src/sys/arch/hpcsh/conf/GENERIC:1.116 Thu Sep 29 10:10:07 2022
+++ src/sys/arch/hpcsh/conf/GENERIC Sun Feb 12 14:50:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.116 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.117 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
#
@@ -375,3 +375,6 @@ pseudo-device wsmux # mouse & keyboard
#wskbd* at hpf1275a? mux 1
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/hpcsh/conf/GENERIC.local"
Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.41 src/sys/arch/hppa/conf/GENERIC:1.42
--- src/sys/arch/hppa/conf/GENERIC:1.41 Thu Sep 29 10:10:07 2022
+++ src/sys/arch/hppa/conf/GENERIC Sun Feb 12 14:50:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.41 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.42 2023/02/12 14:50:39 abs Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hppa/conf/std.hppa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.41 $"
+#ident "GENERIC-$Revision: 1.42 $"
maxusers 32 # estimated number of users
@@ -756,3 +756,6 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device drvctl
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/hppa/conf/GENERIC.local"
Index: src/sys/arch/ibmnws/conf/GENERIC
diff -u src/sys/arch/ibmnws/conf/GENERIC:1.56 src/sys/arch/ibmnws/conf/GENERIC:1.57
--- src/sys/arch/ibmnws/conf/GENERIC:1.56 Thu Sep 29 10:10:07 2022
+++ src/sys/arch/ibmnws/conf/GENERIC Sun Feb 12 14:50:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.56 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: GENERIC,v 1.57 2023/02/12 14:50:39 abs Exp $
#
#
@@ -302,3 +302,6 @@ pseudo-device drvctl # user control of
pseudo-device swwdog # software watchdog timer -- swwdog(4)
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/ibmnws/conf/GENERIC.local"
Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.115 src/sys/arch/iyonix/conf/GENERIC:1.116
--- src/sys/arch/iyonix/conf/GENERIC:1.115 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/iyonix/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.115 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.116 2023/02/12 14:50:40 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.115 $"
+#ident "GENERIC-$Revision: 1.116 $"
maxusers 32 # estimated number of users
@@ -407,3 +407,6 @@ pseudo-device wsfont
include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
+
+# Pull in optional local configuration - always at end
+cinclude "arch/iyonix/conf/GENERIC.local"
Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.135 src/sys/arch/luna68k/conf/GENERIC:1.136
--- src/sys/arch/luna68k/conf/GENERIC:1.135 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/luna68k/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.135 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.136 2023/02/12 14:50:40 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.135 $"
+#ident "GENERIC-$Revision: 1.136 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -219,3 +219,6 @@ pseudo-device wsmux # mouse & keyboard
# Veriexec
# include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/luna68k/conf/GENERIC.local"
Index: src/sys/arch/mac68k/conf/GENERIC
diff -u src/sys/arch/mac68k/conf/GENERIC:1.236 src/sys/arch/mac68k/conf/GENERIC:1.237
--- src/sys/arch/mac68k/conf/GENERIC:1.236 Thu Dec 22 11:05:55 2022
+++ src/sys/arch/mac68k/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.236 2022/12/22 11:05:55 nat Exp $
+# $NetBSD: GENERIC,v 1.237 2023/02/12 14:50:40 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mac68k/conf/std.mac68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.236 $"
+#ident "GENERIC-$Revision: 1.237 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -347,3 +347,6 @@ pseudo-device swwdog # software watchd
pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mac68k/conf/GENERIC.local"
Index: src/sys/arch/mipsco/conf/GENERIC
diff -u src/sys/arch/mipsco/conf/GENERIC:1.99 src/sys/arch/mipsco/conf/GENERIC:1.100
--- src/sys/arch/mipsco/conf/GENERIC:1.99 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/mipsco/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.99 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.100 2023/02/12 14:50:40 abs Exp $
#
# GENERIC machine description file
#
@@ -184,3 +184,6 @@ pseudo-device swwdog # software watch
pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mipsco/conf/GENERIC.local"
Index: src/sys/arch/mmeye/conf/GENERIC
diff -u src/sys/arch/mmeye/conf/GENERIC:1.131 src/sys/arch/mmeye/conf/GENERIC:1.132
--- src/sys/arch/mmeye/conf/GENERIC:1.131 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/mmeye/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.131 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.132 2023/02/12 14:50:40 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.131 $"
+#ident "GENERIC-$Revision: 1.132 $"
maxusers 16 # estimated number of users
@@ -229,3 +229,6 @@ pseudo-device swwdog # software watch
#options MEMORY_DISK_ROOT_SIZE=3074 # size of memory disk, in blocks
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mmeye/conf/GENERIC.local"
Index: src/sys/arch/mvme68k/conf/GENERIC
diff -u src/sys/arch/mvme68k/conf/GENERIC:1.105 src/sys/arch/mvme68k/conf/GENERIC:1.106
--- src/sys/arch/mvme68k/conf/GENERIC:1.105 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/mvme68k/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.105 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.106 2023/02/12 14:50:40 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mvme68k/conf/std.mvme68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.105 $"
+#ident "GENERIC-$Revision: 1.106 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -193,3 +193,6 @@ cd* at scsibus? target ? lun ?
#ch* at scsibus? target ? lun ?
#ss* at scsibus? target ? lun ? # SCSI scanners
#uk* at scsibus? target ? lun ? # SCSI unknown
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mvme68k/conf/GENERIC.local"
Index: src/sys/arch/mvmeppc/conf/GENERIC
diff -u src/sys/arch/mvmeppc/conf/GENERIC:1.32 src/sys/arch/mvmeppc/conf/GENERIC:1.33
--- src/sys/arch/mvmeppc/conf/GENERIC:1.32 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/mvmeppc/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.32 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.33 2023/02/12 14:50:40 abs Exp $
#
include "arch/mvmeppc/conf/std.mvmeppc"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.32 $"
+ident "GENERIC-$Revision: 1.33 $"
maxusers 8
@@ -256,3 +256,6 @@ pseudo-device swwdog # software watch
# wscons pseudo-devices
#pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mvmeppc/conf/GENERIC.local"
Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.144 src/sys/arch/netwinder/conf/GENERIC:1.145
--- src/sys/arch/netwinder/conf/GENERIC:1.144 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/netwinder/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.144 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.145 2023/02/12 14:50:40 abs Exp $
#
# GENERIC machine description file
#
@@ -296,3 +296,6 @@ pseudo-device wsmux # mouse & keyboard
#pseudo-device wsfont
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/netwinder/conf/GENERIC.local"
Index: src/sys/arch/news68k/conf/GENERIC
diff -u src/sys/arch/news68k/conf/GENERIC:1.140 src/sys/arch/news68k/conf/GENERIC:1.141
--- src/sys/arch/news68k/conf/GENERIC:1.140 Thu Sep 29 10:10:08 2022
+++ src/sys/arch/news68k/conf/GENERIC Sun Feb 12 14:50:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.140 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.141 2023/02/12 14:50:40 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/news68k/conf/std.news68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.140 $"
+#ident "GENERIC-$Revision: 1.141 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -255,3 +255,6 @@ pseudo-device putter # for puffs and p
pseudo-device swwdog # software watchdog timer -- swwdog(4)
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/news68k/conf/GENERIC.local"
Index: src/sys/arch/newsmips/conf/GENERIC
diff -u src/sys/arch/newsmips/conf/GENERIC:1.142 src/sys/arch/newsmips/conf/GENERIC:1.143
--- src/sys/arch/newsmips/conf/GENERIC:1.142 Thu Sep 29 10:10:09 2022
+++ src/sys/arch/newsmips/conf/GENERIC Sun Feb 12 14:50:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.142 2022/09/29 10:10:09 riastradh Exp $
+# $NetBSD: GENERIC,v 1.143 2023/02/12 14:50:41 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/newsmips/conf/std.newsmip
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.142 $"
+#ident "GENERIC-$Revision: 1.143 $"
maxusers 16
@@ -227,3 +227,6 @@ pseudo-device putter # for puffs and p
pseudo-device swwdog # software watchdog timer -- swwdog(4)
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/newsmips/conf/GENERIC.local"
Index: src/sys/arch/next68k/conf/GENERIC
diff -u src/sys/arch/next68k/conf/GENERIC:1.161 src/sys/arch/next68k/conf/GENERIC:1.162
--- src/sys/arch/next68k/conf/GENERIC:1.161 Sat Feb 11 08:27:21 2023
+++ src/sys/arch/next68k/conf/GENERIC Sun Feb 12 14:50:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.161 2023/02/11 08:27:21 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.162 2023/02/12 14:50:41 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/next68k/conf/std.next68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.161 $"
+#ident "GENERIC-$Revision: 1.162 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -255,3 +255,6 @@ pseudo-device ksyms # /dev/ksyms
#pseudo-device putter # for puffs and pud
#include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/next68k/conf/GENERIC.local"
Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.178 src/sys/arch/ofppc/conf/GENERIC:1.179
--- src/sys/arch/ofppc/conf/GENERIC:1.178 Thu Sep 29 10:10:09 2022
+++ src/sys/arch/ofppc/conf/GENERIC Sun Feb 12 14:50:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.178 2022/09/29 10:10:09 riastradh Exp $
+# $NetBSD: GENERIC,v 1.179 2023/02/12 14:50:41 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.178 $"
+#ident "GENERIC-$Revision: 1.179 $"
maxusers 32
@@ -446,3 +446,6 @@ pseudo-device swwdog # software watch
pseudo-device drvctl
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/ofppc/conf/GENERIC.local"
Index: src/sys/arch/playstation2/conf/GENERIC
diff -u src/sys/arch/playstation2/conf/GENERIC:1.13 src/sys/arch/playstation2/conf/GENERIC:1.14
--- src/sys/arch/playstation2/conf/GENERIC:1.13 Fri Apr 26 22:46:03 2019
+++ src/sys/arch/playstation2/conf/GENERIC Sun Feb 12 14:50:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.13 2019/04/26 22:46:03 sevan Exp $
+# $NetBSD: GENERIC,v 1.14 2023/02/12 14:50:41 abs Exp $
#
# GENERIC machine description file
#
@@ -43,3 +43,6 @@ config netbsd root on ? type ?
# Veriexec
# include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/playstation2/conf/GENERIC.local"
Index: src/sys/arch/pmax/conf/GENERIC
diff -u src/sys/arch/pmax/conf/GENERIC:1.206 src/sys/arch/pmax/conf/GENERIC:1.207
--- src/sys/arch/pmax/conf/GENERIC:1.206 Thu Sep 29 10:10:09 2022
+++ src/sys/arch/pmax/conf/GENERIC Sun Feb 12 14:50:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.206 2022/09/29 10:10:09 riastradh Exp $
+# $NetBSD: GENERIC,v 1.207 2023/02/12 14:50:41 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.206 $"
+#ident "GENERIC-$Revision: 1.207 $"
maxusers 64
@@ -316,3 +316,6 @@ options PAX_SEGVGUARD=0 # PaX Segmenta
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
+
+# Pull in optional local configuration - always at end
+cinclude "arch/pmax/conf/GENERIC.local"
Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.110 src/sys/arch/sandpoint/conf/GENERIC:1.111
--- src/sys/arch/sandpoint/conf/GENERIC:1.110 Thu Sep 29 10:10:09 2022
+++ src/sys/arch/sandpoint/conf/GENERIC Sun Feb 12 14:50:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.110 2022/09/29 10:10:09 riastradh Exp $
+# $NetBSD: GENERIC,v 1.111 2023/02/12 14:50:41 abs Exp $
#
# machine description file for GENERIC NAS
#
@@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpo
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.110 $"
+#ident "GENERIC-$Revision: 1.111 $"
maxusers 32
@@ -334,3 +334,6 @@ include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
+# Pull in optional local configuration - always at end
+cinclude "arch/sandpoint/conf/GENERIC.local"
Index: src/sys/arch/sbmips/conf/GENERIC
diff -u src/sys/arch/sbmips/conf/GENERIC:1.113 src/sys/arch/sbmips/conf/GENERIC:1.114
--- src/sys/arch/sbmips/conf/GENERIC:1.113 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/sbmips/conf/GENERIC Sun Feb 12 14:50:41 2023
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.113 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.114 2023/02/12 14:50:41 abs Exp $
include "arch/sbmips/conf/std.sbmips"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.113 $"
+#ident "GENERIC-$Revision: 1.114 $"
#options LOCKDEBUG # XXX XXX XXX XXX
#options DEBUG # extra kernel debugging support
@@ -207,3 +207,6 @@ pseudo-device swwdog # software watch
#pseudo-device vcoda # coda minicache <-> venus comm.
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/sbmips/conf/GENERIC.local"
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.272 src/sys/arch/sparc/conf/GENERIC:1.273
--- src/sys/arch/sparc/conf/GENERIC:1.272 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/sparc/conf/GENERIC Sun Feb 12 14:50:41 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.272 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.273 2023/02/12 14:50:41 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.272 $"
+#ident "GENERIC-$Revision: 1.273 $"
maxusers 32
@@ -716,3 +716,6 @@ include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
# (for static binaries only for now)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/sparc/conf/GENERIC.local"
Index: src/sys/arch/sun2/conf/GENERIC
diff -u src/sys/arch/sun2/conf/GENERIC:1.109 src/sys/arch/sun2/conf/GENERIC:1.110
--- src/sys/arch/sun2/conf/GENERIC:1.109 Sun Aug 7 02:52:30 2022
+++ src/sys/arch/sun2/conf/GENERIC Sun Feb 12 14:50:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.109 2022/08/07 02:52:30 simonb Exp $
+# $NetBSD: GENERIC,v 1.110 2023/02/12 14:50:42 abs Exp $
#
# GENERIC machine description file
#
@@ -29,7 +29,7 @@ options INSECURE # allow modload(8) in
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.109 $"
+#ident "GENERIC-$Revision: 1.110 $"
# Bootloader has size limit (~2MB). Kernel should be smaller than this
# hard limit. Otherwise, it freezes before adding swap even with 7MB
@@ -297,3 +297,6 @@ pseudo-device ksyms # /dev/ksyms
# Veriexec
# include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/sun2/conf/GENERIC.local"
Index: src/sys/arch/sun3/conf/GENERIC
diff -u src/sys/arch/sun3/conf/GENERIC:1.189 src/sys/arch/sun3/conf/GENERIC:1.190
--- src/sys/arch/sun3/conf/GENERIC:1.189 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/sun3/conf/GENERIC Sun Feb 12 14:50:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.189 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.190 2023/02/12 14:50:42 abs Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.189 $"
+#ident "GENERIC-$Revision: 1.190 $"
makeoptions COPTS="-Os -fno-unwind-tables -fno-omit-frame-pointer"
# Bootloader has size limit (~2MB). -fno-omit-frame-pointer is
@@ -296,3 +296,6 @@ pseudo-device swwdog # software watch
# include "dev/veriexec.config"
no obmem0 at mainbus? # XXXXXX
+
+# Pull in optional local configuration - always at end
+cinclude "arch/sun3/conf/GENERIC.local"
Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.218 src/sys/arch/vax/conf/GENERIC:1.219
--- src/sys/arch/vax/conf/GENERIC:1.218 Sat Feb 11 06:02:56 2023
+++ src/sys/arch/vax/conf/GENERIC Sun Feb 12 14:50:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.218 2023/02/11 06:02:56 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.219 2023/02/12 14:50:42 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.218 $"
+#ident "GENERIC-$Revision: 1.219 $"
# Here are all different supported CPU types listed.
#options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800
@@ -329,3 +329,6 @@ pseudo-device wsmux # mouse & keyboard
pseudo-device swwdog # software watchdog timer -- swwdog(4)
include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/vax/conf/GENERIC.local"
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.207 src/sys/arch/x68k/conf/GENERIC:1.208
--- src/sys/arch/x68k/conf/GENERIC:1.207 Thu Sep 29 10:10:10 2022
+++ src/sys/arch/x68k/conf/GENERIC Sun Feb 12 14:50:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.207 2022/09/29 10:10:10 riastradh Exp $
+# $NetBSD: GENERIC,v 1.208 2023/02/12 14:50:42 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.207 $"
+#ident "GENERIC-$Revision: 1.208 $"
makeoptions COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer"
# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -501,3 +501,6 @@ pseudo-device swwdog # software watch
# Veriexec
# include "dev/veriexec.config"
+
+# Pull in optional local configuration - always at end
+cinclude "arch/x68k/conf/GENERIC.local"
