Module Name: src
Committed By: jakllsch
Date: Wed Mar 19 21:03:41 UTC 2025
Modified Files:
src/sys/arch/evbarm/conf: HPT5325 MINI2440
src/sys/arch/evbmips/conf: XLSATX
src/sys/arch/pmax/conf: GENERIC64 INSTALL64
src/sys/arch/vax/conf: VAX780
Log Message:
Remove last traces of 'options LKM' from kernel config files.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/MINI2440
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbmips/conf/XLSATX
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/pmax/conf/GENERIC64
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/pmax/conf/INSTALL64
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/conf/VAX780
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/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.54 src/sys/arch/evbarm/conf/HPT5325:1.55
--- src/sys/arch/evbarm/conf/HPT5325:1.54 Mon Jan 29 18:27:11 2024
+++ src/sys/arch/evbarm/conf/HPT5325 Wed Mar 19 21:03:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.54 2024/01/29 18:27:11 christos Exp $
+# $NetBSD: HPT5325,v 1.55 2025/03/19 21:03:40 jakllsch Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -107,7 +107,7 @@ options SYSVSHM # System V-like memory
#options KTRACE # system call tracing, a la ktrace(1)
options IRQSTATS # manage IRQ statistics
-#options LKM # loadable kernel modules
+#options MODULAR
options MIIVERBOSE # Verbose MII autoconfuration messages
#options PCIVERBOSE # Verbose PCI descriptions
options USBVERBOSE # verbose USB device autoconfig messages
Index: src/sys/arch/evbarm/conf/MINI2440
diff -u src/sys/arch/evbarm/conf/MINI2440:1.34 src/sys/arch/evbarm/conf/MINI2440:1.35
--- src/sys/arch/evbarm/conf/MINI2440:1.34 Sun Aug 7 02:52:25 2022
+++ src/sys/arch/evbarm/conf/MINI2440 Wed Mar 19 21:03:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: MINI2440,v 1.34 2022/08/07 02:52:25 simonb Exp $
+# $NetBSD: MINI2440,v 1.35 2025/03/19 21:03:40 jakllsch Exp $
#
# MINI2440 -- Friendly ARM evaluation board based on Samsung S3C2440
#
@@ -117,7 +117,7 @@ options COMPAT_NETBSD32 # allow running
# Miscellaneous kernel options
#options KTRACE # system call tracing, a la ktrace(1)
#options IRQSTATS # manage IRQ statistics
-#options LKM # loadable kernel modules
+#options MODULAR
#options SCSIVERBOSE # Verbose SCSI errors
#options PCIVERBOSE # Verbose PCI descriptions
#options MIIVERBOSE # Verbose MII autoconfuration messages
Index: src/sys/arch/evbmips/conf/XLSATX
diff -u src/sys/arch/evbmips/conf/XLSATX:1.34 src/sys/arch/evbmips/conf/XLSATX:1.35
--- src/sys/arch/evbmips/conf/XLSATX:1.34 Mon Jan 29 18:27:12 2024
+++ src/sys/arch/evbmips/conf/XLSATX Wed Mar 19 21:03:40 2025
@@ -1,8 +1,8 @@
-# $NetBSD: XLSATX,v 1.34 2024/01/29 18:27:12 christos Exp $
+# $NetBSD: XLSATX,v 1.35 2025/03/19 21:03:40 jakllsch Exp $
include "arch/evbmips/conf/std.rmixl"
-#ident "XLSATX-$Revision: 1.34 $"
+#ident "XLSATX-$Revision: 1.35 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -28,7 +28,7 @@ options SYSVMSG # System V message que
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
#options SHMMAXPGS=1024 # 1024 pages is the default
-#options LKM # loadable kernel modules
+#options MODULAR
options NTP # network time protocol
# Debugging options
Index: src/sys/arch/pmax/conf/GENERIC64
diff -u src/sys/arch/pmax/conf/GENERIC64:1.37 src/sys/arch/pmax/conf/GENERIC64:1.38
--- src/sys/arch/pmax/conf/GENERIC64:1.37 Sat Sep 21 06:42:21 2024
+++ src/sys/arch/pmax/conf/GENERIC64 Wed Mar 19 21:03:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.37 2024/09/21 06:42:21 andvar Exp $
+# $NetBSD: GENERIC64,v 1.38 2025/03/19 21:03:40 jakllsch Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.37 $"
+#ident "GENERIC-$Revision: 1.38 $"
maxusers 64
@@ -46,7 +46,7 @@ options SYSVMSG # System V-like messag
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-options LKM # loadable kernel modules
+#options MODULAR
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/pmax/conf/INSTALL64
diff -u src/sys/arch/pmax/conf/INSTALL64:1.12 src/sys/arch/pmax/conf/INSTALL64:1.13
--- src/sys/arch/pmax/conf/INSTALL64:1.12 Mon Jan 20 18:38:21 2020
+++ src/sys/arch/pmax/conf/INSTALL64 Wed Mar 19 21:03:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL64,v 1.12 2020/01/20 18:38:21 thorpej Exp $
+# $NetBSD: INSTALL64,v 1.13 2025/03/19 21:03:40 jakllsch Exp $
#
# Distribution install kernel (any model)
# netbsd: cut-down kernel for miniroots.
@@ -29,7 +29,7 @@ options DEC_3MAXPLUS # 5000/240 (kn03
#options DIAGNOSTIC # extra kernel debugging checks
#options DEBUG # extra kernel debugging support
#options KTRACE # system call tracing support
-#options LKM # loadable kernel modules
+#options MODULAR
options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.34 src/sys/arch/vax/conf/VAX780:1.35
--- src/sys/arch/vax/conf/VAX780:1.34 Mon Feb 6 13:13:05 2023
+++ src/sys/arch/vax/conf/VAX780 Wed Mar 19 21:03:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.34 2023/02/06 13:13:05 tsutsui Exp $
+# $NetBSD: VAX780,v 1.35 2025/03/19 21:03:40 jakllsch Exp $
#
# 11/780,750,730 machine description file
#
@@ -121,7 +121,7 @@ options COMPAT_VAX1K # Must be present
options COMPAT_ULTRIX # DEC Ultrix binary compatibility.
#options NO_INSN_EMULATE # CPU does not lack some hardware instructions.
-options LKM
+#options MODULAR
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
