Module Name:    src
Committed By:   tsutsui
Date:           Sat Feb 11 08:27:21 UTC 2023

Modified Files:
        src/sys/arch/next68k/conf: GENERIC

Log Message:
Disable rarely used options and devices, and add options MODULAR instead.

Also enable files-system MSDOS for file exchange via removable media.


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/next68k/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/next68k/conf/GENERIC
diff -u src/sys/arch/next68k/conf/GENERIC:1.160 src/sys/arch/next68k/conf/GENERIC:1.161
--- src/sys/arch/next68k/conf/GENERIC:1.160	Sat Feb 11 07:42:25 2023
+++ src/sys/arch/next68k/conf/GENERIC	Sat Feb 11 08:27:21 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.160 2023/02/11 07:42:25 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.161 2023/02/11 08:27:21 tsutsui 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.160 $"
+#ident 		"GENERIC-$Revision: 1.161 $"
 
 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
@@ -37,6 +37,9 @@ options 	SYSVMSG		# System V message que
 options 	SYSVSEM		# System V semaphores
 options 	SYSVSHM		# System V shared memory
 
+options 	MODULAR		# new style module(7) framework
+options 	MODULAR_DEFAULT_AUTOLOAD
+
 options 	INSECURE	# disable kernel security level
 options 	USERCONF	# userconf(4) support
 #options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
@@ -62,7 +65,7 @@ options 	DDB_HISTORY_SIZE=100	# enable h
 
 # Other debugging options
 #options 	PMAP_DEBUG
-options 	SCSIDEBUG
+#options 	SCSIDEBUG
 options 	SCSIVERBOSE		# Verbose SCSI errors
 
 # Compatibility options
@@ -83,15 +86,15 @@ file-system 	FFS		# UFS
 file-system 	MFS		# memory file system
 file-system 	NFS		# Network File System client
 file-system 	CD9660		# ISO 9660 + Rock Ridge file system
-#file-system 	MSDOSFS		# MS-DOS file system
+file-system 	MSDOSFS		# MS-DOS file system
 file-system 	FDESC		# /dev/fd
 file-system 	KERNFS		# /kern
 file-system 	NULLFS		# loopback file system
-file-system 	OVERLAY		# overlay file system
-file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
+#file-system 	OVERLAY		# overlay file system
+#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
 file-system 	PROCFS		# /proc
-file-system 	UMAPFS		# NULLFS + uid and gid remapping
-file-system 	UNION		# union file system
+#file-system 	UMAPFS		# NULLFS + uid and gid remapping
+#file-system 	UNION		# union file system
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -197,11 +200,11 @@ scsibus* at scsi?
 sd*	at scsibus? target ? lun ?	# SCSI disk drives
 st*	at scsibus? target ? lun ?	# SCSI tape drives
 cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
-ch*	at scsibus? target ? lun ?	# SCSI autochangers
+#ch*	at scsibus? target ? lun ?	# SCSI autochangers
 dse*	at scsibus? target ? lun ?	# SCSI ethernet (Dayna)
 se*	at scsibus? target ? lun ?	# SCSI ethernet
-ss*	at scsibus? target ? lun ?	# SCSI scanners
-uk*	at scsibus? target ? lun ?	# SCSI unknown
+#ss*	at scsibus? target ? lun ?	# SCSI scanners
+#uk*	at scsibus? target ? lun ?	# SCSI unknown
 
 
 # Memory-disk drivers
@@ -209,27 +212,27 @@ pseudo-device	md
 
 #
 # accept filters
-pseudo-device   accf_data		# "dataready" accept filter
-pseudo-device   accf_http		# "httpready" accept filter
+#pseudo-device   accf_data		# "dataready" accept filter
+#pseudo-device   accf_http		# "httpready" accept filter
 
 # Misc.
 pseudo-device	loop			# network loopback
 pseudo-device	bpfilter		# packet filter
-pseudo-device	carp			# Common Address Redundancy Protocol
+#pseudo-device	carp			# Common Address Redundancy Protocol
 pseudo-device	sl			# CSLIP
 pseudo-device	ppp			# PPP
 pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
-pseudo-device	tun			# network tunneling over tty
-pseudo-device	tap			# virtual Ethernet
+#pseudo-device	tun			# network tunneling over tty
+#pseudo-device	tap			# virtual Ethernet
 #pseudo-device	gre			# generic L3 over IP tunnel
-pseudo-device	npf			# NPF packet filter
+#pseudo-device	npf			# NPF packet filter
 pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	faith			# IPv[46] tcp relay translation i/f
 pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
-pseudo-device	vlan			# IEEE 802.1q encapsulation
-pseudo-device	bridge			# simple inter-network bridging
-pseudo-device	vether			# Virtual Ethernet for bridge
-pseudo-device	agr			# IEEE 802.3ad link aggregation
+#pseudo-device	vlan			# IEEE 802.1q encapsulation
+#pseudo-device	bridge			# simple inter-network bridging
+#pseudo-device	vether			# Virtual Ethernet for bridge
+#pseudo-device	agr			# IEEE 802.3ad link aggregation
 #pseudo-device	wsmux			# mouse & keyboard multiplexor
 
 pseudo-device	pty			# pseudo-terminals
@@ -245,10 +248,10 @@ pseudo-device	vnd			# paging to files
 # options	RF_INCLUDE_INTERDECLUSTER=1
 # options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 # options	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
-pseudo-device	fss			# file system snapshot device
-pseudo-device	ccd			# concatenated disks
+#pseudo-device	fss			# file system snapshot device
+#pseudo-device	ccd			# concatenated disks
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	ksyms			# /dev/ksyms
-pseudo-device	putter			# for puffs and pud
+#pseudo-device	putter			# for puffs and pud
 
-include "dev/veriexec.config"
+#include "dev/veriexec.config"

Reply via email to