summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorabs <abs@NetBSD.org>2023-02-09 14:09:47 +0000
committerabs <abs@NetBSD.org>2023-02-09 14:09:47 +0000
commitb1eec2d7e03420122b47d945f71fd65ddfe682b5 (patch)
tree9c2f498d7e6c0b257f6c8ec6799af30a0fe75f0c /sys
parent97b50d273cf87521d8039f58c3184269fbc1aee9 (diff)
Adjust _all_ cinclude of *.local files
- Ensure always at end - Use tab rather than spaces - Add consistent comment "Pull in optional local configuration - always at end" The only functional change is that a local file which tried to override an existing setting (eg with "no foo") would have failed in some cases before, but now will work
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/conf/GENERIC6
-rw-r--r--sys/arch/amd64/conf/ALL6
-rw-r--r--sys/arch/amd64/conf/GENERIC8
-rw-r--r--sys/arch/amd64/conf/XEN3_DOM010
-rw-r--r--sys/arch/amd64/conf/XEN3_DOMU11
-rw-r--r--sys/arch/evbarm/conf/GENERIC6
-rw-r--r--sys/arch/evbarm/conf/GENERIC645
-rw-r--r--sys/arch/evbarm/conf/KOBO6
-rw-r--r--sys/arch/evbarm/conf/NETWALKER6
-rw-r--r--sys/arch/evbarm/conf/RPI7
-rw-r--r--sys/arch/evbmips/conf/CI206
-rw-r--r--sys/arch/evbmips/conf/OCTEON5
-rw-r--r--sys/arch/evbppc/conf/TWRP10255
-rw-r--r--sys/arch/i386/conf/ALL6
-rw-r--r--sys/arch/i386/conf/GENERIC8
-rw-r--r--sys/arch/i386/conf/GENERIC_TINY9
-rw-r--r--sys/arch/i386/conf/INSTALL_FLOPPY7
-rw-r--r--sys/arch/i386/conf/INSTALL_TINY8
-rw-r--r--sys/arch/i386/conf/XEN3PAE_DOM09
-rw-r--r--sys/arch/i386/conf/XEN3PAE_DOMU9
-rw-r--r--sys/arch/ia64/conf/GENERIC8
-rw-r--r--sys/arch/ia64/conf/GENERIC.SKI11
-rw-r--r--sys/arch/landisk/conf/GENERIC8
-rw-r--r--sys/arch/macppc/conf/GENERIC8
-rw-r--r--sys/arch/macppc/conf/POWERMAC_G51
-rw-r--r--sys/arch/mmeye/conf/MMTA10
-rw-r--r--sys/arch/mmeye/conf/MMTAICE10
-rw-r--r--sys/arch/mmeye/conf/MMTAROMNEW10
-rw-r--r--sys/arch/prep/conf/GENERIC8
-rw-r--r--sys/arch/prep/conf/INSTALL4
-rw-r--r--sys/arch/prep/conf/INSTALL_SMALL4
-rw-r--r--sys/arch/riscv/conf/GENERIC6
-rw-r--r--sys/arch/rs6000/conf/GENERIC8
-rw-r--r--sys/arch/shark/conf/GENERIC8
-rw-r--r--sys/arch/shark/conf/OFWGENCFG8
-rw-r--r--sys/arch/sparc64/conf/GENERIC8
-rw-r--r--sys/arch/usermode/conf/GENERIC.common8
-rw-r--r--sys/arch/zaurus/conf/GENERIC6
38 files changed, 136 insertions, 141 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 879344e1ecc..b5424f3828c 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.417 2022/12/22 11:05:54 nat Exp $
+# $NetBSD: GENERIC,v 1.418 2023/02/09 14:09:47 abs Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.417 $"
+ident "GENERIC-$Revision: 1.418 $"
maxusers 32
@@ -741,5 +741,5 @@ 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
+# Pull in optional local configuration - always at end
cinclude "arch/alpha/conf/GENERIC.local"
diff --git a/sys/arch/amd64/conf/ALL b/sys/arch/amd64/conf/ALL
index d57037e568b..d6a4055fddf 100644
--- a/sys/arch/amd64/conf/ALL
+++ b/sys/arch/amd64/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.176 2022/12/22 19:09:47 jakllsch Exp $
+# $NetBSD: ALL,v 1.177 2023/02/09 14:09:48 abs Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.176 $"
+#ident "ALL-$Revision: 1.177 $"
maxusers 64 # estimated number of users
@@ -1600,7 +1600,7 @@ flash* at flashbus?
# NAND subsystem
nand* at nandbus?
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
#include "arch/amd64/conf/ALL.local"
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 24515206783..da8ba15f5bb 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.600 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.601 2023/02/09 14:09:48 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.600 $"
+#ident "GENERIC-$Revision: 1.601 $"
maxusers 64 # estimated number of users
@@ -1234,5 +1234,5 @@ options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
options PAX_ASLR_DEBUG=1 # PaX ASLR debug
-# Pull in optional local configuration
-cinclude "arch/amd64/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/amd64/conf/GENERIC.local"
diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index 157762a4e73..16d50b23821 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.197 2022/08/07 02:52:23 simonb Exp $
+# $NetBSD: XEN3_DOM0,v 1.198 2023/02/09 14:09:48 abs Exp $
# XEN3_DOM0 machine description file
#
@@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "XEN3_DOM0-$Revision: 1.197 $"
+#ident "XEN3_DOM0-$Revision: 1.198 $"
maxusers 32 # estimated number of users
@@ -1127,10 +1127,6 @@ ld* at sdmmc?
# devices (watchdog timer, etc.)
weasel* at pci?
-# Pull in optional local configuration
-cinclude "arch/amd64/conf/GENERIC.local"
-
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -1229,3 +1225,5 @@ pseudo-device xenevt
pseudo-device xvif
pseudo-device xbdback
+# Pull in optional local configuration - always at end
+cinclude "arch/amd64/conf/GENERIC.local"
diff --git a/sys/arch/amd64/conf/XEN3_DOMU b/sys/arch/amd64/conf/XEN3_DOMU
index 36f09caff08..9a17cb177be 100644
--- a/sys/arch/amd64/conf/XEN3_DOMU
+++ b/sys/arch/amd64/conf/XEN3_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.99 2022/08/07 02:52:23 simonb Exp $
+# $NetBSD: XEN3_DOMU,v 1.100 2023/02/09 14:09:48 abs Exp $
include "arch/amd64/conf/std.xen"
@@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOMU-$Revision: 1.99 $"
+#ident "XEN3_DOMU-$Revision: 1.100 $"
maxusers 32 # estimated number of users
@@ -148,9 +148,6 @@ xencons* at hypervisor? # Xen virtual console
#pci* at xpci ?
# you then need to add your PCI devices drivers below.
-cinclude "arch/amd64/conf/GENERIC.local"
-cinclude "arch/amd64/conf/XEN3_DOMU.local"
-
# Pseudo-Devices
#
@@ -215,3 +212,7 @@ pseudo-device ksyms # /dev/ksyms
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
+
+# Pull in optional local configuration - always at end
+cinclude "arch/amd64/conf/GENERIC.local"
+cinclude "arch/amd64/conf/XEN3_DOMU.local"
diff --git a/sys/arch/evbarm/conf/GENERIC b/sys/arch/evbarm/conf/GENERIC
index 892d74d7a06..017bbb8b5ec 100644
--- a/sys/arch/evbarm/conf/GENERIC
+++ b/sys/arch/evbarm/conf/GENERIC
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.116 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.117 2023/02/09 14:09:48 abs Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -627,5 +627,5 @@ bthub* at ubt?
include "dev/bluetooth/bluetoothdevices.config"
-# Pull in optional local configuration
-cinclude "arch/evbarm/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/GENERIC.local"
diff --git a/sys/arch/evbarm/conf/GENERIC64 b/sys/arch/evbarm/conf/GENERIC64
index ac775617928..3443333dce5 100644
--- a/sys/arch/evbarm/conf/GENERIC64
+++ b/sys/arch/evbarm/conf/GENERIC64
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.207 2022/12/24 15:46:50 nia Exp $
+# $NetBSD: GENERIC64,v 1.208 2023/02/09 14:09:48 abs Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -561,4 +561,5 @@ mpt* at pci? dev ? function ?
scsibus* at scsi?
sd* at scsibus? target ? lun ? # SCSI disk drives
-cinclude "arch/evbarm/conf/GENERIC64.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/GENERIC64.local"
diff --git a/sys/arch/evbarm/conf/KOBO b/sys/arch/evbarm/conf/KOBO
index baf0b8fde81..f6ce106a279 100644
--- a/sys/arch/evbarm/conf/KOBO
+++ b/sys/arch/evbarm/conf/KOBO
@@ -1,4 +1,4 @@
-# $NetBSD: KOBO,v 1.13 2022/12/30 20:37:01 andvar Exp $
+# $NetBSD: KOBO,v 1.14 2023/02/09 14:09:48 abs Exp $
#
# KOBO -- http://kobo.com
#
@@ -130,5 +130,5 @@ rgephy* at mii? phy ?
rlphy* at mii? phy ?
ukphy* at mii? phy ?
-# local configuration
-cinclude "arch/evbarm/conf/KOBO.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/KOBO.local"
diff --git a/sys/arch/evbarm/conf/NETWALKER b/sys/arch/evbarm/conf/NETWALKER
index c6e2b545c23..e88b321a8b9 100644
--- a/sys/arch/evbarm/conf/NETWALKER
+++ b/sys/arch/evbarm/conf/NETWALKER
@@ -1,4 +1,4 @@
-# $NetBSD: NETWALKER,v 1.42 2022/12/30 20:37:01 andvar Exp $
+# $NetBSD: NETWALKER,v 1.43 2023/02/09 14:09:48 abs Exp $
#
# NETWALKER -- http://www.sharp.co.jp/netwalker/
#
@@ -170,5 +170,5 @@ options WSDISPLAY_DEFAULTSCREENS=4
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
-# local configuration
-cinclude "arch/evbarm/conf/NETWALKER.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/NETWALKER.local"
diff --git a/sys/arch/evbarm/conf/RPI b/sys/arch/evbarm/conf/RPI
index 6e6caaada2b..5a2d4523bdb 100644
--- a/sys/arch/evbarm/conf/RPI
+++ b/sys/arch/evbarm/conf/RPI
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.95 2022/01/17 16:31:24 thorpej Exp $
+# $NetBSD: RPI,v 1.96 2023/02/09 14:09:48 abs Exp $
#
# RPi -- Raspberry Pi
#
@@ -229,9 +229,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
-# local configuration
-cinclude "arch/evbarm/conf/RPI.local"
-
# Bluetooth devices
include "dev/bluetooth/bluetoothdevices.config"
+# Pull in optional local configuration - always at end
+cinclude "arch/evbarm/conf/RPI.local"
diff --git a/sys/arch/evbmips/conf/CI20 b/sys/arch/evbmips/conf/CI20
index 42f26bd7a8a..8acb8acca04 100644
--- a/sys/arch/evbmips/conf/CI20
+++ b/sys/arch/evbmips/conf/CI20
@@ -1,4 +1,4 @@
-# $NetBSD: CI20,v 1.32 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: CI20,v 1.33 2023/02/09 14:09:48 abs Exp $
#
# MIPS Creator CI20
#
@@ -7,7 +7,7 @@ include "arch/evbmips/conf/std.ingenic"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "CI20-$Revision: 1.32 $"
+#ident "CI20-$Revision: 1.33 $"
maxusers 32
@@ -275,5 +275,5 @@ pseudo-device ksyms # /dev/ksyms
include "dev/veriexec.config"
+# Pull in optional local configuration - always at end
cinclude "arch/evbmips/conf/CI20.local"
-
diff --git a/sys/arch/evbmips/conf/OCTEON b/sys/arch/evbmips/conf/OCTEON
index 875f1e4e5dc..d9c0061955b 100644
--- a/sys/arch/evbmips/conf/OCTEON
+++ b/sys/arch/evbmips/conf/OCTEON
@@ -1,11 +1,11 @@
-# $NetBSD: OCTEON,v 1.12 2022/09/29 10:10:06 riastradh Exp $
+# $NetBSD: OCTEON,v 1.13 2023/02/09 14:09:48 abs Exp $
include "arch/mips/conf/std.octeon"
include "arch/evbmips/conf/files.octeon"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "OCTEON-$Revision: 1.12 $"
+#ident "OCTEON-$Revision: 1.13 $"
maxusers 32
@@ -216,4 +216,5 @@ pseudo-device swwdog # software watchdog timer -- swwdog(4)
include "dev/veriexec.config"
+# Pull in optional local configuration - always at end
cinclude "arch/evbmips/conf/OCTEON.local"
diff --git a/sys/arch/evbppc/conf/TWRP1025 b/sys/arch/evbppc/conf/TWRP1025
index 8d5735c0b85..19f11054bce 100644
--- a/sys/arch/evbppc/conf/TWRP1025
+++ b/sys/arch/evbppc/conf/TWRP1025
@@ -1,4 +1,4 @@
-# $NetBSD: TWRP1025,v 1.29 2022/09/29 10:10:07 riastradh Exp $
+# $NetBSD: TWRP1025,v 1.30 2023/02/09 14:09:48 abs Exp $
#
# TWRP1025 -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "TWRP1025-$Revision: 1.29 $"
+ident "TWRP1025-$Revision: 1.30 $"
maxusers 32
@@ -226,4 +226,5 @@ pseudo-device swwdog # software watchdog timer -- swwdog(4)
include "dev/veriexec.config"
+# Pull in optional local configuration - always at end
cinclude "arch/evbppc/conf/TWRP1025.local"
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 943b2df23f7..4179d858a5d 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.505 2022/12/22 19:09:48 jakllsch Exp $
+# $NetBSD: ALL,v 1.506 2023/02/09 14:09:48 abs Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.505 $"
+#ident "ALL-$Revision: 1.506 $"
maxusers 64 # estimated number of users
@@ -1704,7 +1704,7 @@ flash* at flashbus?
# NAND subsystem
nand* at nandbus?
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
#include "arch/i386/conf/ALL.local"
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 4f610160ce8..19091f1e62d 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1245 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.1246 2023/02/09 14:09:48 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1245 $"
+#ident "GENERIC-$Revision: 1.1246 $"
maxusers 64 # estimated number of users
@@ -1516,5 +1516,5 @@ 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
-cinclude "arch/i386/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/GENERIC.local"
diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY
index cf084be8442..27afc0ebc75 100644
--- a/sys/arch/i386/conf/GENERIC_TINY
+++ b/sys/arch/i386/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.170 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: GENERIC_TINY,v 1.171 2023/02/09 14:09:48 abs Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -492,10 +492,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10
# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
-# Pull in optional local configuration
-cinclude "arch/i386/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -524,3 +520,6 @@ pseudo-device clockctl # user control of clock subsystem
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
+
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/GENERIC.local"
diff --git a/sys/arch/i386/conf/INSTALL_FLOPPY b/sys/arch/i386/conf/INSTALL_FLOPPY
index 0e45199a171..d2ab9d63206 100644
--- a/sys/arch/i386/conf/INSTALL_FLOPPY
+++ b/sys/arch/i386/conf/INSTALL_FLOPPY
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_FLOPPY,v 1.56 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: INSTALL_FLOPPY,v 1.57 2023/02/09 14:09:48 abs Exp $
#
# INSTALL - Installation kernel.
#
@@ -713,9 +713,6 @@ viomb* at virtio? # Virtio memory balloon device
ld* at virtio? # Virtio disk device
vioif* at virtio? # Virtio network device
-# Pull in optional local configuration
-cinclude "arch/i386/conf/INSTALL.local"
-
# Pseudo-Devices
@@ -749,3 +746,5 @@ options NO_DEV_PTM
pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/INSTALL.local"
diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY
index 4e6207e1900..4ef81dbcee3 100644
--- a/sys/arch/i386/conf/INSTALL_TINY
+++ b/sys/arch/i386/conf/INSTALL_TINY
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_TINY,v 1.163 2021/01/21 06:51:55 nia Exp $
+# $NetBSD: INSTALL_TINY,v 1.164 2023/02/09 14:09:48 abs Exp $
#
# This kernel should be derived from INSTALL (which is derived
# from GENERIC) with some features commented out.
@@ -461,9 +461,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq 10
# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
-# Pull in optional local configuration
-cinclude "arch/i386/conf/INSTALL.local"
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -483,3 +480,6 @@ pseudo-device loop # network loopback
pseudo-device pty # pseudo-terminals
options NO_DEV_PTM
#options RND_COM # use "com" randomness as well (BROKEN)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/INSTALL.local"
diff --git a/sys/arch/i386/conf/XEN3PAE_DOM0 b/sys/arch/i386/conf/XEN3PAE_DOM0
index 70baff3571f..1a6e64ffe62 100644
--- a/sys/arch/i386/conf/XEN3PAE_DOM0
+++ b/sys/arch/i386/conf/XEN3PAE_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOM0,v 1.36 2022/08/07 02:52:26 simonb Exp $
+# $NetBSD: XEN3PAE_DOM0,v 1.37 2023/02/09 14:09:48 abs Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -769,9 +769,6 @@ btsco* at bthub?
hifn* at pci? dev ? function ? # Hifn 7755/7811/795x
ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x
-cinclude "arch/i386/conf/GENERIC.local"
-cinclude "arch/i386/conf/XEN3_DOM0.local"
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -884,3 +881,7 @@ acpiecdt* at acpi? # ACPI Embedded Controller (early binding)
acpilid* at acpi? # ACPI Lid Switch
aibs* at acpi? # ASUSTeK AI Booster hardware monitor
hpqlb* at acpi? # HP Quick Launch Buttons
+
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/GENERIC.local"
+cinclude "arch/i386/conf/XEN3_DOM0.local"
diff --git a/sys/arch/i386/conf/XEN3PAE_DOMU b/sys/arch/i386/conf/XEN3PAE_DOMU
index ede118db799..46a62b1e723 100644
--- a/sys/arch/i386/conf/XEN3PAE_DOMU
+++ b/sys/arch/i386/conf/XEN3PAE_DOMU
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3PAE_DOMU,v 1.18 2022/08/07 02:52:26 simonb Exp $
+# $NetBSD: XEN3PAE_DOMU,v 1.19 2023/02/09 14:09:48 abs Exp $
include "arch/i386/conf/std.xen"
@@ -164,9 +164,6 @@ xennet* at xenbus? # Xen virtual network interface
xbd* at xenbus? # Xen virtual block device
balloon* at xenbus? # Xen balloon device
-cinclude "arch/i386/conf/GENERIC.local"
-cinclude "arch/i386/conf/XEN3_DOMU.local"
-
# Pseudo-Devices
pseudo-device crypto # /dev/crypto device
@@ -232,3 +229,7 @@ options PAX_ASLR=0 # PaX Address Space Layout Randomization
#xpci* at xenbus ? #Xen3 PCI front end driver
#pci* at xpci ?
# you then need to add your PCI devices drivers below.
+
+# Pull in optional local configuration - always at end
+cinclude "arch/i386/conf/GENERIC.local"
+cinclude "arch/i386/conf/XEN3_DOMU.local"
diff --git a/sys/arch/ia64/conf/GENERIC b/sys/arch/ia64/conf/GENERIC
index a701546af9a..3f54c7c311d 100644
--- a/sys/arch/ia64/conf/GENERIC
+++ b/sys/arch/ia64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.13 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.14 2023/02/09 14:09:48 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ia64/conf/std.ia64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.13 $"
+#ident "GENERIC-$Revision: 1.14 $"
maxusers 32 # estimated number of users
@@ -142,5 +142,5 @@ pseudo-device loop # network loopback
#pseudo-device pty # pseudo-terminals
pseudo-device swwdog # software watchdog timer -- swwdog(4)
-# Pull in optional local configuration
-cinclude "arch/ia64/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/ia64/conf/GENERIC.local"
diff --git a/sys/arch/ia64/conf/GENERIC.SKI b/sys/arch/ia64/conf/GENERIC.SKI
index e124ba77897..6994c6f2f57 100644
--- a/sys/arch/ia64/conf/GENERIC.SKI
+++ b/sys/arch/ia64/conf/GENERIC.SKI
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.SKI,v 1.20 2022/08/07 02:52:26 simonb Exp $
+# $NetBSD: GENERIC.SKI,v 1.21 2023/02/09 14:09:48 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/ia64/conf/std.ia64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.20 $"
+#ident "GENERIC-$Revision: 1.21 $"
maxusers 32 # estimated number of users
@@ -114,10 +114,6 @@ cpu* at mainbus?
acpi0 at mainbus?
-
-# Pull in optional local configuration
-cinclude "arch/ia64/conf/GENERIC.local"
-
# Console Devices
#ssccons* at mainbus0 # Ski console interface driver
#wsdisplay* at ssccons0 console ?
@@ -169,3 +165,6 @@ pseudo-device loop # network loopback
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
+
+# Pull in optional local configuration - always at end
+cinclude "arch/ia64/conf/GENERIC.local"
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index b002e0bed23..f5995b0a1ab 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.75 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.76 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.75 $"
+#ident "GENERIC-$Revision: 1.76 $"
maxusers 16 # estimated number of users
@@ -461,5 +461,5 @@ 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
-cinclude "arch/landisk/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/landisk/conf/GENERIC.local"
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 46c8748b011..ebd9c80f634 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.376 2023/01/26 00:15:47 macallan Exp $
+# $NetBSD: GENERIC,v 1.377 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.376 $"
+#ident "GENERIC-$Revision: 1.377 $"
maxusers 32
@@ -550,5 +550,5 @@ include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
-# Pull in optional local configuration
-cinclude "arch/macppc/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/macppc/conf/GENERIC.local"
diff --git a/sys/arch/macppc/conf/POWERMAC_G5 b/sys/arch/macppc/conf/POWERMAC_G5
index 379a041e86d..a7e589c604f 100644
--- a/sys/arch/macppc/conf/POWERMAC_G5
+++ b/sys/arch/macppc/conf/POWERMAC_G5
@@ -251,4 +251,5 @@ pseudo-device bpfilter # packet filter
#options MEMORY_DISK_ROOT_SIZE=4096 # 2 Megabytes
#options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
+# Pull in optional local configuration - always at end
cinclude "arch/macppc/conf/POWERMAC_G5.local"
diff --git a/sys/arch/mmeye/conf/MMTA b/sys/arch/mmeye/conf/MMTA
index f06896334bc..b4ceeec4b51 100644
--- a/sys/arch/mmeye/conf/MMTA
+++ b/sys/arch/mmeye/conf/MMTA
@@ -1,4 +1,4 @@
-# $NetBSD: MMTA,v 1.54 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: MMTA,v 1.55 2023/02/09 14:09:49 abs Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -188,11 +188,6 @@ sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
#tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-
-# Pull in optional local configuration
-cinclude "arch/mmeye/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -215,3 +210,6 @@ pseudo-device clockctl # user control of clock subsystem
# rnd is EXPERIMENTAL at this point.
#options RND_COM # use "com" randomness as well (BROKEN)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mmeye/conf/GENERIC.local"
diff --git a/sys/arch/mmeye/conf/MMTAICE b/sys/arch/mmeye/conf/MMTAICE
index c134e2b2881..257fff63e08 100644
--- a/sys/arch/mmeye/conf/MMTAICE
+++ b/sys/arch/mmeye/conf/MMTAICE
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAICE,v 1.58 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: MMTAICE,v 1.59 2023/02/09 14:09:49 abs Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -207,11 +207,6 @@ sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
#tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-
-# Pull in optional local configuration
-cinclude "arch/mmeye/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -234,3 +229,6 @@ pseudo-device clockctl # user control of clock subsystem
# rnd is EXPERIMENTAL at this point.
#options RND_COM # use "com" randomness as well (BROKEN)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mmeye/conf/GENERIC.local"
diff --git a/sys/arch/mmeye/conf/MMTAROMNEW b/sys/arch/mmeye/conf/MMTAROMNEW
index b49490fff9a..36b3a86f171 100644
--- a/sys/arch/mmeye/conf/MMTAROMNEW
+++ b/sys/arch/mmeye/conf/MMTAROMNEW
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAROMNEW,v 1.55 2020/01/19 01:25:06 thorpej Exp $
+# $NetBSD: MMTAROMNEW,v 1.56 2023/02/09 14:09:49 abs Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -192,11 +192,6 @@ sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
#tlphy* at mii? phy ? # ThunderLAN PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-
-# Pull in optional local configuration
-cinclude "arch/mmeye/conf/GENERIC.local"
-
-
# Pseudo-Devices
# disk/mass storage pseudo-devices
@@ -219,3 +214,6 @@ pseudo-device clockctl # user control of clock subsystem
# rnd is EXPERIMENTAL at this point.
#options RND_COM # use "com" randomness as well (BROKEN)
+
+# Pull in optional local configuration - always at end
+cinclude "arch/mmeye/conf/GENERIC.local"
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index fa32865e499..0ef18ad00e4 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.199 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.200 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.199 $"
+#ident "GENERIC-$Revision: 1.200 $"
maxusers 32
@@ -562,5 +562,5 @@ pseudo-device wsfont
include "dev/veriexec.config"
-# Pull in optional local configuration
-cinclude "arch/prep/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/prep/conf/GENERIC.local"
diff --git a/sys/arch/prep/conf/INSTALL b/sys/arch/prep/conf/INSTALL
index a9beaccf04d..ec16e4fa63d 100644
--- a/sys/arch/prep/conf/INSTALL
+++ b/sys/arch/prep/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.65 2021/12/12 22:20:52 andvar Exp $
+# $NetBSD: INSTALL,v 1.66 2023/02/09 14:09:49 abs Exp $
#
# INSTALL -- Installation kernel
#
@@ -253,7 +253,7 @@ tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
include "arch/prep/conf/INSTALL.local"
# Pseudo-Devices
diff --git a/sys/arch/prep/conf/INSTALL_SMALL b/sys/arch/prep/conf/INSTALL_SMALL
index f8259d0c6d3..788767d0557 100644
--- a/sys/arch/prep/conf/INSTALL_SMALL
+++ b/sys/arch/prep/conf/INSTALL_SMALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_SMALL,v 1.20 2021/12/12 22:20:52 andvar Exp $
+# $NetBSD: INSTALL_SMALL,v 1.21 2023/02/09 14:09:49 abs Exp $
#
# INSTALL -- Installation kernel
#
@@ -244,7 +244,7 @@ nsphy* at mii? phy ? # NS83840 PHYs
#sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
ukphy* at mii? phy ? # generic unknown PHYs
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
include "arch/prep/conf/INSTALL.local"
# Pseudo-Devices
diff --git a/sys/arch/riscv/conf/GENERIC b/sys/arch/riscv/conf/GENERIC
index c0514e68ec0..7722ea303d6 100644
--- a/sys/arch/riscv/conf/GENERIC
+++ b/sys/arch/riscv/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.22 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.23 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/riscv/sifive/files.sifive"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.22 $"
+#ident "GENERIC-$Revision: 1.23 $"
maxusers 64 # estimated number of users
@@ -188,5 +188,5 @@ pseudo-device drvctl
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
-# Pull in optional local configuration
+# Pull in optional local configuration - always at end
cinclude "arch/riscv/conf/GENERIC.local"
diff --git a/sys/arch/rs6000/conf/GENERIC b/sys/arch/rs6000/conf/GENERIC
index 5d0f60d9372..1f0f14d568f 100644
--- a/sys/arch/rs6000/conf/GENERIC
+++ b/sys/arch/rs6000/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.48 2023/02/09 13:16:04 abs Exp $
+# $NetBSD: GENERIC,v 1.49 2023/02/09 14:09:49 abs Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee
-#ident "GENERIC-$Revision: 1.48 $"
+#ident "GENERIC-$Revision: 1.49 $"
maxusers 32
@@ -252,5 +252,5 @@ pseudo-device wsfont
include "dev/veriexec.config"
-# Pull in optional local configuration
-cinclude "arch/rs6000/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/rs6000/conf/GENERIC.local"
diff --git a/sys/arch/shark/conf/GENERIC b/sys/arch/shark/conf/GENERIC
index 09cb6997c7e..50235b8c739 100644
--- a/sys/arch/shark/conf/GENERIC
+++ b/sys/arch/shark/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.143 2023/02/09 13:16:05 abs Exp $
+# $NetBSD: GENERIC,v 1.144 2023/02/09 14:09:49 abs Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.143 $"
+#ident "GENERIC-$Revision: 1.144 $"
# estimated number of users
maxusers 32
@@ -310,5 +310,5 @@ 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
-cinclude "arch/shark/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/shark/conf/GENERIC.local"
diff --git a/sys/arch/shark/conf/OFWGENCFG b/sys/arch/shark/conf/OFWGENCFG
index bf91da56251..a3ce09a5e97 100644
--- a/sys/arch/shark/conf/OFWGENCFG
+++ b/sys/arch/shark/conf/OFWGENCFG
@@ -1,4 +1,4 @@
-# $NetBSD: OFWGENCFG,v 1.49 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: OFWGENCFG,v 1.50 2023/02/09 14:09:49 abs Exp $
#
# OFWGENCFG: 'generic' configuration for Open Firmware boards.
#
@@ -114,9 +114,6 @@ ofcons* at ofbus?
ofrtc* at ofbus?
ofrom* at ofbus?
-# Pull in optional local configuration
-cinclude "arch/shark/conf/GENERIC.local"
-
pseudo-device loop # network loopback
pseudo-device bpfilter # packet filter
#pseudo-device sl # CSLIP
@@ -132,3 +129,6 @@ pseudo-device vnd # disk-like interface to files
#pseudo-device md # Ramdisk driver
pseudo-device clockctl # user control of clock subsystem
pseudo-device openfirm # /dev/openfirm
+
+# Pull in optional local configuration - always at end
+cinclude "arch/shark/conf/GENERIC.local"
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index fa6dcbf7abc..646e64acbc7 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.238 2023/02/09 13:16:05 abs Exp $
+# $NetBSD: GENERIC,v 1.239 2023/02/09 14:09:49 abs 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.238 $"
+#ident "GENERIC-$Revision: 1.239 $"
maxusers 64
@@ -867,5 +867,5 @@ options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
# options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
options PAX_ASLR=1 # PaX Address Space Layout Randomization
-# Pull in optional local configuration
-cinclude "arch/sparc64/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/sparc64/conf/GENERIC.local"
diff --git a/sys/arch/usermode/conf/GENERIC.common b/sys/arch/usermode/conf/GENERIC.common
index 3e1bbcf7c2c..b1deb706d26 100644
--- a/sys/arch/usermode/conf/GENERIC.common
+++ b/sys/arch/usermode/conf/GENERIC.common
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC.common,v 1.29 2021/01/20 13:22:08 nia Exp $
+# $NetBSD: GENERIC.common,v 1.30 2023/02/09 14:09:50 abs Exp $
include "arch/usermode/conf/std.usermode"
options INCLUDE_CONFIG_FILE
-#ident "GENERIC-$Revision: 1.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 32
makeoptions DEBUG="-O1 -g3"
@@ -94,5 +94,5 @@ pseudo-device drvctl
pseudo-device ksyms
pseudo-device wsmux
-# Pull in optional local configuration
-cinclude "arch/usermode/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/usermode/conf/GENERIC.local"
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index ce8297243f3..ddf157e2f1d 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.94 2023/02/09 13:16:05 abs Exp $
+# $NetBSD: GENERIC,v 1.95 2023/02/09 14:09:50 abs Exp $
#
# GENERIC machine description file
#
@@ -391,5 +391,5 @@ pseudo-device swwdog # software watchdog timer -- swwdog(4)
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
-# Pull in optional local configuration
-cinclude "arch/zaurus/conf/GENERIC.local"
+# Pull in optional local configuration - always at end
+cinclude "arch/zaurus/conf/GENERIC.local"