Module Name: src
Committed By: nia
Date: Wed Jan 20 01:20:26 UTC 2021
Modified Files:
src/sys/arch/evbarm/conf: ARMADILLO9 CUBOX DUOVERO GUMSTIX HDL_G
HPT5325 OPENBLOCKS_A6 PEPPER SHEEVAPLUG
src/sys/arch/riscv/conf: GENERIC
Log Message:
do not enable kernel OSS compat in configs without compat_linux
perhaps kernel OSS compat can be merged into compat_linux to avoid
further confusion
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/conf/ARMADILLO9
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/CUBOX
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/DUOVERO
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/HDL_G
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/PEPPER
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/riscv/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/evbarm/conf/ARMADILLO9
diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.65 src/sys/arch/evbarm/conf/ARMADILLO9:1.66
--- src/sys/arch/evbarm/conf/ARMADILLO9:1.65 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/ARMADILLO9 Wed Jan 20 01:20:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.65 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: ARMADILLO9,v 1.66 2021/01/20 01:20:26 nia Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -72,8 +72,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd20.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.19 src/sys/arch/evbarm/conf/CUBOX:1.20
--- src/sys/arch/evbarm/conf/CUBOX:1.19 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/CUBOX Wed Jan 20 01:20:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.19 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: CUBOX,v 1.20 2021/01/20 01:20:26 nia Exp $
#
# CUBOX -- SolidRun Ltd. Cubox kernel
#
@@ -77,8 +77,6 @@ makeoptions COPY_SYMTAB=1
include "conf/compat_netbsd60.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Wedge support
options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances
options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges
Index: src/sys/arch/evbarm/conf/DUOVERO
diff -u src/sys/arch/evbarm/conf/DUOVERO:1.22 src/sys/arch/evbarm/conf/DUOVERO:1.23
--- src/sys/arch/evbarm/conf/DUOVERO:1.22 Tue Sep 29 19:58:50 2020
+++ src/sys/arch/evbarm/conf/DUOVERO Wed Jan 20 01:20:26 2021
@@ -1,5 +1,5 @@
#
-# $NetBSD: DUOVERO,v 1.22 2020/09/29 19:58:50 jmcneill Exp $
+# $NetBSD: DUOVERO,v 1.23 2021/01/20 01:20:26 nia Exp $
#
# DUOOVERO -- Gumstix. Inc. DuoVero COMS platforms kernel
#
@@ -100,8 +100,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd30.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
#options SYSVMSG # System V-like message queues
Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.107 src/sys/arch/evbarm/conf/GUMSTIX:1.108
--- src/sys/arch/evbarm/conf/GUMSTIX:1.107 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/GUMSTIX Wed Jan 20 01:20:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.107 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: GUMSTIX,v 1.108 2021/01/20 01:20:26 nia Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -96,8 +96,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd16.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
#options SYSVMSG # System V-like message queues
Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.64 src/sys/arch/evbarm/conf/HDL_G:1.65
--- src/sys/arch/evbarm/conf/HDL_G:1.64 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/HDL_G Wed Jan 20 01:20:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.64 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: HDL_G,v 1.65 2021/01/20 01:20:26 nia Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -84,8 +84,6 @@ options NFS_BOOT_BOOTPARAM
include "conf/compat_netbsd09.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
options SYSVMSG # System V-like message queues
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.50 src/sys/arch/evbarm/conf/HPT5325:1.51
--- src/sys/arch/evbarm/conf/HPT5325:1.50 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/HPT5325 Wed Jan 20 01:20:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.50 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: HPT5325,v 1.51 2021/01/20 01:20:26 nia Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -92,8 +92,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd50.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
options SYSVMSG # System V-like message queues
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.42 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.43
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.42 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 Wed Jan 20 01:20:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_A6,v 1.42 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: OPENBLOCKS_A6,v 1.43 2021/01/20 01:20:26 nia Exp $
#
# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
@@ -90,8 +90,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd50.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
options SYSVMSG # System V-like message queues
Index: src/sys/arch/evbarm/conf/PEPPER
diff -u src/sys/arch/evbarm/conf/PEPPER:1.20 src/sys/arch/evbarm/conf/PEPPER:1.21
--- src/sys/arch/evbarm/conf/PEPPER:1.20 Tue Sep 29 19:58:50 2020
+++ src/sys/arch/evbarm/conf/PEPPER Wed Jan 20 01:20:26 2021
@@ -1,5 +1,5 @@
#
-# $NetBSD: PEPPER,v 1.20 2020/09/29 19:58:50 jmcneill Exp $
+# $NetBSD: PEPPER,v 1.21 2021/01/20 01:20:26 nia Exp $
#
# PEPPER -- Gumstix. Inc. Pepper Single Board Computer platforms kernel
#
@@ -98,8 +98,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd30.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
#options SYSVMSG # System V-like message queues
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.72 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.73
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.72 Sun Sep 27 13:48:50 2020
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Wed Jan 20 01:20:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.72 2020/09/27 13:48:50 roy Exp $
+# $NetBSD: SHEEVAPLUG,v 1.73 2021/01/20 01:20:26 nia Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -97,8 +97,6 @@ options NFS_BOOT_DHCP
include "conf/compat_netbsd50.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-
# Shared memory options
options SYSVMSG # System V-like message queues
Index: src/sys/arch/riscv/conf/GENERIC
diff -u src/sys/arch/riscv/conf/GENERIC:1.11 src/sys/arch/riscv/conf/GENERIC:1.12
--- src/sys/arch/riscv/conf/GENERIC:1.11 Wed Nov 4 06:56:56 2020
+++ src/sys/arch/riscv/conf/GENERIC Wed Jan 20 01:20:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.11 2020/11/04 06:56:56 skrll Exp $
+# $NetBSD: GENERIC,v 1.12 2021/01/20 01:20:26 nia Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/riscv/conf/std.riscv64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.11 $"
+#ident "GENERIC-$Revision: 1.12 $"
maxusers 64 # estimated number of users
@@ -73,7 +73,6 @@ options DDB_HISTORY_SIZE=512 # enable h
# Compatibility options
include "conf/compat_netbsd70.config"
-options COMPAT_OSSAUDIO
#options COMPAT_NETBSD32
#options EXEC_ELF32
