Module Name: src
Committed By: skrll
Date: Wed Dec 19 16:56:17 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 CUBOX-I IMX6UL-STARTER
MMNET_GENERIC MPCSA_GENERIC NITROGEN6X
Log Message:
Remove CONS_OVERRIDE - it's an i386 option
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/IMX6UL-STARTER
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/NITROGEN6X
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.15 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.16
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.15 Sat Aug 25 07:48:56 2018
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Wed Dec 19 16:56:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.15 2018/08/25 07:48:56 maxv Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.16 2018/12/19 16:56:17 skrll Exp $
#
# ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
#
@@ -158,7 +158,6 @@ options PPP_FILTER # Active filter supp
# Console options. also need IMXUARTCONSOLE
options CONSDEVNAME="\"imxuart\"",CONADDR=0x30a70000,CONSPEED=115200
-options CONS_OVERRIDE
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.18 src/sys/arch/evbarm/conf/CUBOX-I:1.19
--- src/sys/arch/evbarm/conf/CUBOX-I:1.18 Sat Aug 25 07:48:56 2018
+++ src/sys/arch/evbarm/conf/CUBOX-I Wed Dec 19 16:56:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.18 2018/08/25 07:48:56 maxv Exp $
+# $NetBSD: CUBOX-I,v 1.19 2018/12/19 16:56:17 skrll Exp $
#
# CuBox-i
# - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -154,7 +154,6 @@ options PPP_FILTER # Active filter supp
# Console options. also need IMXUARTCONSOLE
options CONSDEVNAME="\"imxuart\"",CONADDR=0x02020000,CONSPEED=115200
-options CONS_OVERRIDE
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
Index: src/sys/arch/evbarm/conf/IMX6UL-STARTER
diff -u src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.10 src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.11
--- src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.10 Thu Oct 18 09:01:53 2018
+++ src/sys/arch/evbarm/conf/IMX6UL-STARTER Wed Dec 19 16:56:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: IMX6UL-STARTER,v 1.10 2018/10/18 09:01:53 skrll Exp $
+# $NetBSD: IMX6UL-STARTER,v 1.11 2018/12/19 16:56:17 skrll Exp $
#
# IMX6UL-STARTER - Freescale i.MX6UL Evaluation Board
#
@@ -161,7 +161,6 @@ options PPP_FILTER # Active filter supp
# Console options. also need IMXUARTCONSOLE
options EARLYCONS=nitrogen6,CONADDR=0x021f4000
options CONSDEVNAME="\"imxuart\"",CONSPEED=115200
-options CONS_OVERRIDE
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.43 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.44
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.43 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Wed Dec 19 16:56:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.43 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: MMNET_GENERIC,v 1.44 2018/12/19 16:56:17 skrll Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.43 $"
+#ident "GENERIC-$Revision: 1.44 $"
maxusers 32 # estimated number of users
@@ -42,7 +42,6 @@ makeoptions CPUFLAGS="-mtune=arm926ej-s
#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
# you don't want the option below ON iff you are using the
# serial console option of the new boot strap code.
-#options CONS_OVERRIDE # Always use above! independent of boot info
# Standard system options
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.64 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.65
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.64 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Wed Dec 19 16:56:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.64 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.65 2018/12/19 16:56:17 skrll Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.64 $"
+#ident "GENERIC-$Revision: 1.65 $"
maxusers 32 # estimated number of users
@@ -42,7 +42,6 @@ makeoptions CPUFLAGS="-mtune=arm920t -mc
#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
# you don't want the option below ON iff you are using the
# serial console option of the new boot strap code.
-#options CONS_OVERRIDE # Always use above! independent of boot info
# Standard system options
Index: src/sys/arch/evbarm/conf/NITROGEN6X
diff -u src/sys/arch/evbarm/conf/NITROGEN6X:1.20 src/sys/arch/evbarm/conf/NITROGEN6X:1.21
--- src/sys/arch/evbarm/conf/NITROGEN6X:1.20 Sat Aug 25 07:48:56 2018
+++ src/sys/arch/evbarm/conf/NITROGEN6X Wed Dec 19 16:56:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NITROGEN6X,v 1.20 2018/08/25 07:48:56 maxv Exp $
+# $NetBSD: NITROGEN6X,v 1.21 2018/12/19 16:56:17 skrll Exp $
#
# Nitrogen6X
# - http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
@@ -154,7 +154,6 @@ options PPP_FILTER # Active filter supp
# Console options. also need IMXUARTCONSOLE
options CONSDEVNAME="\"imxuart\"",CONADDR=0x021e8000,CONSPEED=115200
-options CONS_OVERRIDE
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
