aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/Makefile.alpha2
-rw-r--r--sys/conf/Makefile.amd642
-rw-r--r--sys/conf/Makefile.arm2
-rw-r--r--sys/conf/Makefile.i3862
-rw-r--r--sys/conf/Makefile.ia642
-rw-r--r--sys/conf/Makefile.pc982
-rw-r--r--sys/conf/Makefile.powerpc2
-rw-r--r--sys/conf/Makefile.sparc642
-rw-r--r--sys/conf/NOTES33
-rw-r--r--sys/conf/files14
-rw-r--r--sys/conf/files.pc984
-rw-r--r--sys/conf/options9
-rw-r--r--sys/conf/options.pc984
13 files changed, 47 insertions, 33 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index d17855daab85..b310d5dbe281 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500013
+%VERSREQ= 600000
.if !defined(S)
.if exists(./@/.)
diff --git a/sys/conf/Makefile.amd64 b/sys/conf/Makefile.amd64
index 02687616bb2f..965524732e3e 100644
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500013
+%VERSREQ= 600000
STD8X16FONT?= iso
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 998d296e187e..dbbe7d614a41 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500013
+%VERSREQ= 600000
# Temporary stuff while we're still embryonic
NO_MODULES?= yes
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 6259f6932172..dd02522c1a6f 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500013
+%VERSREQ= 600000
STD8X16FONT?= iso
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 82d79a8d5e4e..b543fbcfd29c 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -19,7 +19,7 @@
GCC3= you bet
# Which version of config(8) is required.
-%VERSREQ= 500013
+%VERSREQ= 600000
STD8X16FONT?= iso
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index eb8fda091ab9..161dbccddd89 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -19,7 +19,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500013
+%VERSREQ= 600000
.if !defined(S)
.if exists(./@/.)
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 471ae7f92765..93c219cc6a96 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500013
+%VERSREQ= 600000
# Temporary stuff while we're still embryonic
NO_MODULES?= yes
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index a9e11e51d9de..357bc0fbfa8e 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 500013
+%VERSREQ= 600000
STD8X16FONT?= iso
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5eb1b49176db..f03555f03fb0 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -817,10 +817,11 @@ options NFS_DEBUG # Enable NFS Debugging
# Coda stuff:
options CODA #CODA filesystem.
-device vcoda 4 #coda minicache <-> venus comm.
+device vcoda #coda minicache <-> venus comm.
# Use the old Coda 5.x venus<->kernel interface instead of the new
# realms-aware 6.x protocol.
#options CODA_COMPAT_5
+options NVCODA=4
#
# Add support for the EXT2FS filesystem of Linux fame. Be a bit
@@ -1869,32 +1870,32 @@ device sound
# snd_vibes: S3 Sonicvibes PCI.
# snd_uaudio: USB audio.
-device "snd_ad1816"
-device "snd_als4000"
-#device "snd_au88x0"
+device snd_ad1816
+device snd_als4000
+#device snd_au88x0
device snd_cmi
-device "snd_cs4281"
+device snd_cs4281
device snd_csa
-device "snd_ds1"
-device "snd_emu10k1"
-device "snd_es137x"
+device snd_ds1
+device snd_emu10k1
+device snd_es137x
device snd_ess
-device "snd_fm801"
+device snd_fm801
device snd_gusc
device snd_ich
device snd_maestro
-device "snd_maestro3"
+device snd_maestro3
device snd_mss
device snd_neomagic
-device "snd_sb16"
-device "snd_sb8"
+device snd_sb16
+device snd_sb8
device snd_sbc
device snd_solo
-device "snd_t4dwave"
-device "snd_via8233"
-device "snd_via82c686"
+device snd_t4dwave
+device snd_via8233
+device snd_via82c686
device snd_vibes
-#device "snd_vortex1"
+#device snd_vortex1
device snd_uaudio
# For non-pnp sound cards:
diff --git a/sys/conf/files b/sys/conf/files
index 32aa116ca59b..0874c7ad9b7e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -82,7 +82,7 @@ cam/scsi/scsi_sa.c optional sa
cam/scsi/scsi_ses.c optional ses
cam/scsi/scsi_targ_bh.c optional targbh
cam/scsi/scsi_target.c optional targ
-coda/coda_fbsd.c count vcoda
+coda/coda_fbsd.c optional vcoda
coda/coda_namecache.c optional vcoda
coda/coda_psdev.c optional vcoda
coda/coda_subr.c optional vcoda
@@ -992,14 +992,14 @@ gnu/ext2fs/ext2_vnops.c optional ext2fs
#
# isdn4bsd device drivers
#
-i4b/driver/i4b_trace.c count i4btrc
-i4b/driver/i4b_rbch.c count i4brbch
-i4b/driver/i4b_tel.c count i4btel
-i4b/driver/i4b_ipr.c count i4bipr
+i4b/driver/i4b_trace.c optional i4btrc
+i4b/driver/i4b_rbch.c optional i4brbch
+i4b/driver/i4b_tel.c optional i4btel
+i4b/driver/i4b_ipr.c optional i4bipr
net/slcompress.c optional i4bipr
i4b/driver/i4b_ctl.c optional i4bctl
-i4b/driver/i4b_ing.c count i4bing
-i4b/driver/i4b_isppp.c count i4bisppp
+i4b/driver/i4b_ing.c optional i4bing
+i4b/driver/i4b_isppp.c optional i4bisppp
net/slcompress.c optional i4bisppp
#
# isdn4bsd CAPI driver
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 634566ae70e1..66f02c4a8047 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -347,8 +347,8 @@ pc98/pc98/scvtbpc98.c optional sc
pc98/pc98/sio.c optional sio
pc98/pc98/sio_cbus.c optional sio isa
pc98/pc98/syscons_pc98.c optional sc
-pc98/pc98/wd.c count wdc
-pc98/pc98/wd_cd.c count wcd wdc
+pc98/pc98/wd.c optional wdc
+pc98/pc98/wd_cd.c optional wcd wdc
pccard/mecia.c optional mecia card
pci/agp_ali.c optional agp
pci/agp_amd.c optional agp
diff --git a/sys/conf/options b/sys/conf/options
index 28c9e5c728e9..9cbc5409d0c4 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -60,6 +60,7 @@ ADAPTIVE_GIANT opt_adaptive_mutexes.h
NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h
ALQ
CODA_COMPAT_5 opt_coda.h
+NVCODA opt_coda.h
COMPAT_43 opt_compat.h
COMPAT_FREEBSD4 opt_compat.h
COMPILING_LINT opt_global.h
@@ -679,3 +680,11 @@ DCONS_BUF_SIZE opt_dcons.h
DCONS_POLL_HZ opt_dcons.h
DCONS_FORCE_CONSOLE opt_dcons.h
DCONS_FORCE_GDB opt_dcons.h
+
+# Static unit counts
+NI4BTRC opt_i4b.h
+NI4BRBCH opt_i4b.h
+NI4BTEL opt_i4b.h
+NI4BIPR opt_i4b.h
+NI4BING opt_i4b.h
+NI4BISPPP opt_i4b.h
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index e5354a905a19..7a147de00c11 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -108,3 +108,7 @@ PC98 opt_global.h
DEV_APIC opt_apic.h
DEV_MECIA opt_mecia.h
DEV_NPX opt_npx.h
+DEV_WCD opt_wcd.h
+
+# Static unit counts
+NWDC opt_wdc.h
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 04:19:19 +0000