Module Name: src
Committed By: christos
Date: Sat Nov 25 04:53:24 UTC 2017
Modified Files:
src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 DNS323 HUMMINGBOARD
PARALLELLA POGO ROCKCHIP VTC100 ZEDBOARD
Log Message:
comment out duplicate options and unknown devices
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/DNS323
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/HUMMINGBOARD \
src/sys/arch/evbarm/conf/PARALLELLA src/sys/arch/evbarm/conf/ZEDBOARD
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/POGO
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/ROCKCHIP
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/VTC100
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/ARMADILLO-IOT-G3
diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.9 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.10
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.9 Thu Sep 14 03:58:40 2017
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Fri Nov 24 23:53:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.9 2017/09/14 07:58:40 mrg Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.10 2017/11/25 04:53:24 christos Exp $
#
# ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
#
@@ -79,7 +79,7 @@ include "conf/compat_netbsd60.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
#options COMPAT_NDIS # NDIS network driver
-options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
+#options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
# Wedge support
Index: src/sys/arch/evbarm/conf/DNS323
diff -u src/sys/arch/evbarm/conf/DNS323:1.8 src/sys/arch/evbarm/conf/DNS323:1.9
--- src/sys/arch/evbarm/conf/DNS323:1.8 Thu Aug 20 21:52:07 2015
+++ src/sys/arch/evbarm/conf/DNS323 Fri Nov 24 23:53:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: DNS323,v 1.8 2015/08/21 01:52:07 uebayasi Exp $
+# $NetBSD: DNS323,v 1.9 2017/11/25 04:53:24 christos Exp $
#
# DNS323 -- D-Link. DNS-323 platform kernel
#
@@ -19,8 +19,8 @@ options DIAGNOSTIC # internal consisten
options DEBUG
#options PMAP_DEBUG # Enable pmap_debug_level code
#options VERBOSE_INIT_ARM # verbose bootstraping messages
-options DDB # in-kernel debugger
-pseudo-device ksyms
+#options DDB # in-kernel debugger
+#pseudo-device ksyms
#options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
#options KGDB
#options DEBUG_KGDB
Index: src/sys/arch/evbarm/conf/HUMMINGBOARD
diff -u src/sys/arch/evbarm/conf/HUMMINGBOARD:1.2 src/sys/arch/evbarm/conf/HUMMINGBOARD:1.3
--- src/sys/arch/evbarm/conf/HUMMINGBOARD:1.2 Thu Nov 9 00:57:23 2017
+++ src/sys/arch/evbarm/conf/HUMMINGBOARD Fri Nov 24 23:53:24 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: HUMMINGBOARD,v 1.2 2017/11/09 05:57:23 hkenken Exp $
+# $NetBSD: HUMMINGBOARD,v 1.3 2017/11/25 04:53:24 christos Exp $
#
# Hummingboard -- Freescale i.MX6 Eval Board Kernel
#
@@ -22,7 +22,7 @@ options MULTIPROCESSOR
options CONSDEVNAME="\"imxuart\"",CONADDR=0x02020000
options CONSPEED=115200 # Console speed
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
options DEBUG
#options KGDB
makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/evbarm/conf/PARALLELLA
diff -u src/sys/arch/evbarm/conf/PARALLELLA:1.2 src/sys/arch/evbarm/conf/PARALLELLA:1.3
--- src/sys/arch/evbarm/conf/PARALLELLA:1.2 Fri Apr 10 06:58:07 2015
+++ src/sys/arch/evbarm/conf/PARALLELLA Fri Nov 24 23:53:24 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: PARALLELLA,v 1.2 2015/04/10 10:58:07 hkenken Exp $
+# $NetBSD: PARALLELLA,v 1.3 2017/11/25 04:53:24 christos Exp $
#
# Parallella -- Xilinx Zynq Eval Board Kernel
#
@@ -26,7 +26,7 @@ options MEMSIZE=1024
options CONSDEVNAME="\"zynquart\"",CONADDR=0xe0001000
options CONSPEED=115200 # Console speed
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options KGDB
makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/evbarm/conf/ZEDBOARD
diff -u src/sys/arch/evbarm/conf/ZEDBOARD:1.2 src/sys/arch/evbarm/conf/ZEDBOARD:1.3
--- src/sys/arch/evbarm/conf/ZEDBOARD:1.2 Fri Apr 10 06:58:07 2015
+++ src/sys/arch/evbarm/conf/ZEDBOARD Fri Nov 24 23:53:24 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: ZEDBOARD,v 1.2 2015/04/10 10:58:07 hkenken Exp $
+# $NetBSD: ZEDBOARD,v 1.3 2017/11/25 04:53:24 christos Exp $
#
# ZedBoard -- Xilinx Zynq Eval Board Kernel
#
@@ -25,7 +25,7 @@ options MEMSIZE=512
options CONSDEVNAME="\"zynquart\"",CONADDR=0xe0001000
options CONSPEED=115200 # Console speed
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options KGDB
makeoptions DEBUG="-g" # compile full symbol table
Index: src/sys/arch/evbarm/conf/POGO
diff -u src/sys/arch/evbarm/conf/POGO:1.3 src/sys/arch/evbarm/conf/POGO:1.4
--- src/sys/arch/evbarm/conf/POGO:1.3 Tue Dec 13 15:42:17 2016
+++ src/sys/arch/evbarm/conf/POGO Fri Nov 24 23:53:24 2017
@@ -7,12 +7,12 @@ no options COMPAT_LINUX
no options DIAGNOSTIC
no options DEBUG
no uaudio*
-no umidi*
+#no umidi*
no uberry*
no urio*
no uvisor*
no ukyopon*
-no uscanner*
+#no uscanner*
no usscanner*
no utoppy*
no uyap*
Index: src/sys/arch/evbarm/conf/ROCKCHIP
diff -u src/sys/arch/evbarm/conf/ROCKCHIP:1.20 src/sys/arch/evbarm/conf/ROCKCHIP:1.21
--- src/sys/arch/evbarm/conf/ROCKCHIP:1.20 Fri Apr 3 19:25:07 2015
+++ src/sys/arch/evbarm/conf/ROCKCHIP Fri Nov 24 23:53:24 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: ROCKCHIP,v 1.20 2015/04/03 23:25:07 jmcneill Exp $
+# $NetBSD: ROCKCHIP,v 1.21 2017/11/25 04:53:24 christos Exp $
#
# Rockchip RK3066/RK3188 based SBC (Single Board Computer)
#
@@ -11,7 +11,7 @@ options CPU_CORTEXA9
options MULTIPROCESSOR
options MEMSIZE=1024
-options DIAGNOSTIC # internal consistency checks
+#options DIAGNOSTIC # internal consistency checks
#options DEBUG
#options LOCKDEBUG
#options VERBOSE_INIT_ARM # verbose bootstraping messages
Index: src/sys/arch/evbarm/conf/VTC100
diff -u src/sys/arch/evbarm/conf/VTC100:1.14 src/sys/arch/evbarm/conf/VTC100:1.15
--- src/sys/arch/evbarm/conf/VTC100:1.14 Thu Sep 14 03:58:40 2017
+++ src/sys/arch/evbarm/conf/VTC100 Fri Nov 24 23:53:24 2017
@@ -1,5 +1,5 @@
#
-# $NetBSD: VTC100,v 1.14 2017/09/14 07:58:40 mrg Exp $
+# $NetBSD: VTC100,v 1.15 2017/11/25 04:53:24 christos Exp $
#
# VTC100 -- NEXCOM VTC100 Kernel
#
@@ -85,7 +85,6 @@ options NFS_BOOT_RWSIZE=1024
# Compatibility options
include "conf/compat_netbsd30.config"
options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-include "arch/evbarm/conf/compat_netbsd09.config"
# Shared memory options
