Index: sys/arch/arm/amd/seattle_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/amd/seattle_platform.c,v
retrieving revision 1.2
diff -u -p -r1.2 seattle_platform.c
--- sys/arch/arm/amd/seattle_platform.c	10 Sep 2018 19:09:38 -0000	1.2
+++ sys/arch/arm/amd/seattle_platform.c	21 Sep 2018 10:24:29 -0000
@@ -28,7 +28,7 @@
 
 #include "opt_soc.h"
 #include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #define _ARM32_BUS_DMA_PRIVATE
 
Index: sys/arch/arm/amlogic/amlogic_board.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/amlogic/amlogic_board.c,v
retrieving revision 1.16
diff -u -p -r1.16 amlogic_board.c
--- sys/arch/arm/amlogic/amlogic_board.c	26 Nov 2015 00:06:59 -0000	1.16
+++ sys/arch/arm/amlogic/amlogic_board.c	21 Sep 2018 10:24:29 -0000
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_amlogic.h"
-
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.16 2015/11/26 00:06:59 jmcneill Exp $");
 
Index: sys/arch/arm/amlogic/amlogic_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/amlogic/amlogic_com.c,v
retrieving revision 1.5
diff -u -p -r1.5 amlogic_com.c
--- sys/arch/arm/amlogic/amlogic_com.c	3 Apr 2015 15:50:15 -0000	1.5
+++ sys/arch/arm/amlogic/amlogic_com.c	21 Sep 2018 10:24:29 -0000
@@ -29,6 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_console.h"
 #include "locators.h"
 
 #include <sys/cdefs.h>
Index: sys/arch/arm/amlogic/amlogic_cpufreq.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/amlogic/amlogic_cpufreq.c,v
retrieving revision 1.5
diff -u -p -r1.5 amlogic_cpufreq.c
--- sys/arch/arm/amlogic/amlogic_cpufreq.c	29 Nov 2015 19:16:58 -0000	1.5
+++ sys/arch/arm/amlogic/amlogic_cpufreq.c	21 Sep 2018 10:24:29 -0000
@@ -28,8 +28,6 @@
 
 #include "locators.h"
 
-#include "opt_amlogic.h"
-
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: amlogic_cpufreq.c,v 1.5 2015/11/29 19:16:58 jmcneill Exp $");
 
Index: sys/arch/arm/amlogic/amlogic_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/amlogic/amlogic_io.c,v
retrieving revision 1.13
diff -u -p -r1.13 amlogic_io.c
--- sys/arch/arm/amlogic/amlogic_io.c	21 Nov 2015 00:54:57 -0000	1.13
+++ sys/arch/arm/amlogic/amlogic_io.c	21 Sep 2018 10:24:29 -0000
@@ -26,8 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include "opt_amlogic.h"
-
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: amlogic_io.c,v 1.13 2015/11/21 00:54:57 jmcneill Exp $");
 
Index: sys/arch/arm/amlogic/files.amlogic
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/amlogic/files.amlogic,v
retrieving revision 1.13
diff -u -p -r1.13 files.amlogic
--- sys/arch/arm/amlogic/files.amlogic	29 Nov 2015 16:52:00 -0000	1.13
+++ sys/arch/arm/amlogic/files.amlogic	21 Sep 2018 10:24:29 -0000
@@ -63,10 +63,5 @@ device	amlogicrtc
 attach	amlogicrtc at amlogicio with amlogic_rtc
 file	arch/arm/amlogic/amlogic_rtc.c		amlogic_rtc
 
-# Console parameters
-defparam opt_amlogic.h			CONADDR
-defparam opt_amlogic.h			CONSPEED
-defparam opt_amlogic.h			CONMODE
-
 # Memory parameters
 defparam opt_amlogic.h			MEMSIZE
Index: sys/arch/arm/at91/at91bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91bus.c,v
retrieving revision 1.21
diff -u -p -r1.21 at91bus.c
--- sys/arch/arm/at91/at91bus.c	31 Jul 2018 06:46:25 -0000	1.21
+++ sys/arch/arm/at91/at91bus.c	21 Sep 2018 10:24:30 -0000
@@ -30,6 +30,7 @@
 __KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.21 2018/07/31 06:46:25 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/arm/broadcom/files.bcm53xx
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/broadcom/files.bcm53xx,v
retrieving revision 1.4
diff -u -p -r1.4 files.bcm53xx
--- sys/arch/arm/broadcom/files.bcm53xx	28 Oct 2013 22:51:16 -0000	1.4
+++ sys/arch/arm/broadcom/files.bcm53xx	21 Sep 2018 10:24:30 -0000
@@ -14,10 +14,6 @@ file	arch/arm/arm32/irq_dispatch.S
 file	arch/arm/broadcom/bcm53xx_board.c
 file	arch/arm/broadcom/bcmgen_space.c
 
-# Console parameters
-defparam opt_broadcom.h				CONADDR
-defparam opt_broadcom.h				CONSPEED
-defparam opt_broadcom.h				CONMODE
 defparam opt_broadcom.h				MEMSIZE
 defflag opt_broadcom.h				BCM53XX_CONSOLE_EARLY
 defflag opt_broadcom.h				BCMETH_COUNTERS
Index: sys/arch/arm/conf/files.arm
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/conf/files.arm,v
retrieving revision 1.142
diff -u -p -r1.142 files.arm
--- sys/arch/arm/conf/files.arm	16 Sep 2018 15:40:36 -0000	1.142
+++ sys/arch/arm/conf/files.arm	21 Sep 2018 10:24:30 -0000
@@ -86,6 +86,12 @@ defflag  opt_arm_bus_space.h	__BUS_SPACE
 # Timer options
 defflag opt_arm_timer.h		__HAVE_GENERIC_CPU_INITCLOCKS
 
+# Console options
+defparam opt_console.h		CONSADDR
+defparam opt_console.h		CONSPEED
+defparam opt_console.h		CONMODE
+defparam opt_console.h		CONADDR
+
 # Floating point emulator
 obsolete defflag		ARMFPE
 
Index: sys/arch/arm/cortex/a9_mpsubr.S
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/cortex/a9_mpsubr.S,v
retrieving revision 1.57
diff -u -p -r1.57 a9_mpsubr.S
--- sys/arch/arm/cortex/a9_mpsubr.S	27 Jun 2018 11:12:14 -0000	1.57
+++ sys/arch/arm/cortex/a9_mpsubr.S	21 Sep 2018 10:24:31 -0000
@@ -28,6 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
Index: sys/arch/arm/fdt/files.fdt
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/fdt/files.fdt,v
retrieving revision 1.25
diff -u -p -r1.25 files.fdt
--- sys/arch/arm/fdt/files.fdt	10 Sep 2018 11:05:12 -0000	1.25
+++ sys/arch/arm/fdt/files.fdt	21 Sep 2018 10:24:31 -0000
@@ -67,5 +67,3 @@ file	dev/tprof/tprof_armv8.c			pmu_fdt &
 attach	genfb at fdt with plfb_fdt: fdt_display_timing
 file	arch/arm/fdt/plfb_fdt.c			plfb_fdt
 
-# Console parameters
-defparam opt_fdt_arm.h				CONSADDR
Index: sys/arch/arm/gemini/files.gemini
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/files.gemini,v
retrieving revision 1.12
diff -u -p -r1.12 files.gemini
--- sys/arch/arm/gemini/files.gemini	6 Jun 2012 20:21:45 -0000	1.12
+++ sys/arch/arm/gemini/files.gemini	21 Sep 2018 10:24:31 -0000
@@ -78,7 +78,6 @@ file	arch/arm/gemini/obio_wdt.c			obiowd
 # NS16550 compatible serial ports
 attach com at obio with gemini_com
 file	arch/arm/gemini/gemini_com.c		gemini_com
-defparam opt_com.h				CONSADDR CONSPEED CONMODE
 
 # GEMINI LPC Bus
 define  lpcbus  {[addr = -1]}
Index: sys/arch/arm/nvidia/tegra_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/nvidia/tegra_platform.c,v
retrieving revision 1.15
diff -u -p -r1.15 tegra_platform.c
--- sys/arch/arm/nvidia/tegra_platform.c	10 Sep 2018 11:05:12 -0000	1.15
+++ sys/arch/arm/nvidia/tegra_platform.c	21 Sep 2018 10:24:31 -0000
@@ -28,7 +28,7 @@
 
 #include "opt_tegra.h"
 #include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #include "ukbd.h"
 
Index: sys/arch/arm/omap/files.omap
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/files.omap,v
retrieving revision 1.6
diff -u -p -r1.6 files.omap
--- sys/arch/arm/omap/files.omap	6 Jun 2012 20:21:45 -0000	1.6
+++ sys/arch/arm/omap/files.omap	21 Sep 2018 10:24:31 -0000
@@ -103,7 +103,6 @@ file	arch/arm/arm/bus_space_a4x.S		tipb 
 # NS16550 compatible serial ports
 attach com at tipb with omapuart
 file	arch/arm/omap/omap_com.c		omapuart
-defparam opt_com.h				CONSADDR CONSPEED CONMODE
 
 # INTC controller
 define omapintc
Index: sys/arch/arm/omap/files.omapl1x
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/files.omapl1x,v
retrieving revision 1.1
diff -u -p -r1.1 files.omapl1x
--- sys/arch/arm/omap/files.omapl1x	2 Oct 2013 16:48:26 -0000	1.1
+++ sys/arch/arm/omap/files.omapl1x	21 Sep 2018 10:24:31 -0000
@@ -32,7 +32,6 @@ file   arch/arm/omap/omapl1x_aintc.c		om
 attach com at tipb with omapl1xcom
 file	arch/arm/omap/omapl1x_com.c		omapl1xcom
 defparam opt_com.h				OMAPL1X_COM_FREQ
-defparam opt_com.h				CONSADDR CONSPEED CONMODE
 
 #OMAPL1x Timer
 device omapl1xtimer
Index: sys/arch/arm/rockchip/rk_cru.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/rockchip/rk_cru.c,v
retrieving revision 1.7
diff -u -p -r1.7 rk_cru.c
--- sys/arch/arm/rockchip/rk_cru.c	9 Sep 2018 07:21:17 -0000	1.7
+++ sys/arch/arm/rockchip/rk_cru.c	21 Sep 2018 10:24:31 -0000
@@ -27,7 +27,7 @@
  */
 
 #include "opt_soc.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: rk_cru.c,v 1.7 2018/09/09 07:21:17 aymeric Exp $");
Index: sys/arch/arm/rockchip/rk_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/rockchip/rk_platform.c,v
retrieving revision 1.4
diff -u -p -r1.4 rk_platform.c
--- sys/arch/arm/rockchip/rk_platform.c	10 Sep 2018 11:05:12 -0000	1.4
+++ sys/arch/arm/rockchip/rk_platform.c	21 Sep 2018 10:24:31 -0000
@@ -28,7 +28,7 @@
 
 #include "opt_soc.h"
 #include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.4 2018/09/10 11:05:12 ryo Exp $");
Index: sys/arch/arm/sa11x0/sa11x0_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa11x0_com.c,v
retrieving revision 1.55
diff -u -p -r1.55 sa11x0_com.c
--- sys/arch/arm/sa11x0/sa11x0_com.c	13 Apr 2015 21:18:41 -0000	1.55
+++ sys/arch/arm/sa11x0/sa11x0_com.c	21 Sep 2018 10:24:32 -0000
@@ -67,6 +67,7 @@
 __KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.55 2015/04/13 21:18:41 riastradh Exp $");
 
 #include "opt_com.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_ddbparam.h"
 #include "opt_kgdb.h"
Index: sys/arch/arm/samsung/exynos_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/samsung/exynos_platform.c,v
retrieving revision 1.16
diff -u -p -r1.16 exynos_platform.c
--- sys/arch/arm/samsung/exynos_platform.c	14 Sep 2018 11:58:38 -0000	1.16
+++ sys/arch/arm/samsung/exynos_platform.c	21 Sep 2018 10:24:32 -0000
@@ -27,9 +27,10 @@
  */
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_exynos.h"
 #include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #include "ukbd.h"
 
Index: sys/arch/arm/samsung/files.exynos
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/samsung/files.exynos,v
retrieving revision 1.32
diff -u -p -r1.32 files.exynos
--- sys/arch/arm/samsung/files.exynos	11 Sep 2018 10:06:53 -0000	1.32
+++ sys/arch/arm/samsung/files.exynos	21 Sep 2018 10:24:32 -0000
@@ -19,11 +19,6 @@ file	arch/arm/arm/bus_space_a4x.S
 file	arch/arm/samsung/exynos_soc.c
 file	arch/arm/samsung/exynos_smc.S		arm_trustzone_firmware
 
-# Console parameters
-defparam opt_exynos.h				CONADDR
-defparam opt_exynos.h				CONSPEED
-defparam opt_exynos.h				CONMODE
-
 # Memory size in megabytes
 defparam opt_exynos.h				MEMSIZE
 defparam opt_exynos.h				EXYNOS_WDT_DEFAULT_PERIOD
Index: sys/arch/arm/sunxi/sunxi_ccu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sunxi/sunxi_ccu.c,v
retrieving revision 1.11
diff -u -p -r1.11 sunxi_ccu.c
--- sys/arch/arm/sunxi/sunxi_ccu.c	9 Sep 2018 07:21:18 -0000	1.11
+++ sys/arch/arm/sunxi/sunxi_ccu.c	21 Sep 2018 10:24:32 -0000
@@ -28,7 +28,7 @@
 
 #include "opt_soc.h"
 #include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: sunxi_ccu.c,v 1.11 2018/09/09 07:21:18 aymeric Exp $");
Index: sys/arch/arm/sunxi/sunxi_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sunxi/sunxi_platform.c,v
retrieving revision 1.27
diff -u -p -r1.27 sunxi_platform.c
--- sys/arch/arm/sunxi/sunxi_platform.c	16 Sep 2018 13:21:36 -0000	1.27
+++ sys/arch/arm/sunxi/sunxi_platform.c	21 Sep 2018 10:24:32 -0000
@@ -28,7 +28,7 @@
 
 #include "opt_soc.h"
 #include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.27 2018/09/16 13:21:36 jmcneill Exp $");
Index: sys/arch/arm/ti/ti_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ti/ti_platform.c,v
retrieving revision 1.4
diff -u -p -r1.4 ti_platform.c
--- sys/arch/arm/ti/ti_platform.c	5 Aug 2018 14:02:35 -0000	1.4
+++ sys/arch/arm/ti/ti_platform.c	21 Sep 2018 10:24:32 -0000
@@ -1,6 +1,6 @@
 /* $NetBSD: ti_platform.c,v 1.4 2018/08/05 14:02:35 skrll Exp $ */
 
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.4 2018/08/05 14:02:35 skrll Exp $");
Index: sys/arch/arm/vexpress/vexpress_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/vexpress/vexpress_platform.c,v
retrieving revision 1.9
diff -u -p -r1.9 vexpress_platform.c
--- sys/arch/arm/vexpress/vexpress_platform.c	5 Aug 2018 14:02:35 -0000	1.9
+++ sys/arch/arm/vexpress/vexpress_platform.c	21 Sep 2018 10:24:32 -0000
@@ -27,7 +27,7 @@
  */
 
 #include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.9 2018/08/05 14:02:35 skrll Exp $");
Index: sys/arch/arm/virt/virt_platform.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/virt/virt_platform.c,v
retrieving revision 1.6
diff -u -p -r1.6 virt_platform.c
--- sys/arch/arm/virt/virt_platform.c	10 Sep 2018 11:05:12 -0000	1.6
+++ sys/arch/arm/virt/virt_platform.c	21 Sep 2018 10:24:32 -0000
@@ -28,7 +28,6 @@
 
 #include "opt_soc.h"
 #include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
 
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.6 2018/09/10 11:05:12 ryo Exp $");
Index: sys/arch/arm/zynq/files.zynq
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/zynq/files.zynq,v
retrieving revision 1.1
diff -u -p -r1.1 files.zynq
--- sys/arch/arm/zynq/files.zynq	23 Jan 2015 12:34:09 -0000	1.1
+++ sys/arch/arm/zynq/files.zynq	21 Sep 2018 10:24:33 -0000
@@ -19,9 +19,6 @@ file	arch/arm/zynq/zynq7000_board.c
 # Console parameters
 defflag opt_zynq.h				ZYNQ
 defflag opt_zynq.h				ZYNQ7000
-defparam opt_zynq.h				CONADDR
-defparam opt_zynq.h				CONSPEED
-defparam opt_zynq.h				CONMODE
 defparam opt_zynq.h				MEMSIZE
 
 # AXI bus interface and SoC domains
Index: sys/arch/evbarm/adi_brh/brh_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/adi_brh/brh_machdep.c,v
retrieving revision 1.45
diff -u -p -r1.45 brh_machdep.c
--- sys/arch/evbarm/adi_brh/brh_machdep.c	31 Jul 2018 06:46:25 -0000	1.45
+++ sys/arch/evbarm/adi_brh/brh_machdep.c	21 Sep 2018 10:24:34 -0000
@@ -76,6 +76,7 @@
 __KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.45 2018/07/31 06:46:25 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 
Index: sys/arch/evbarm/amlogic/amlogic_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/amlogic/amlogic_machdep.c,v
retrieving revision 1.23
diff -u -p -r1.23 amlogic_machdep.c
--- sys/arch/evbarm/amlogic/amlogic_machdep.c	17 Jul 2018 18:41:00 -0000	1.23
+++ sys/arch/evbarm/amlogic/amlogic_machdep.c	21 Sep 2018 10:24:34 -0000
@@ -127,6 +127,7 @@
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.23 2018/07/17 18:41:00 christos Exp $");
 
+#include "opt_console.h"
 #include "opt_machdep.h"
 #include "opt_ddb.h"
 #include "opt_md.h"
Index: sys/arch/evbarm/armadaxp/armadaxp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c,v
retrieving revision 1.15
diff -u -p -r1.15 armadaxp_machdep.c
--- sys/arch/evbarm/armadaxp/armadaxp_machdep.c	31 Jul 2018 06:46:26 -0000	1.15
+++ sys/arch/evbarm/armadaxp/armadaxp_machdep.c	21 Sep 2018 10:24:35 -0000
@@ -40,6 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
 __KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.15 2018/07/31 06:46:26 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_machdep.h"
 #include "opt_mvsoc.h"
 #include "opt_evbarm_boardtype.h"
Index: sys/arch/evbarm/armadillo/armadillo9_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/armadillo/armadillo9_machdep.c,v
retrieving revision 1.30
diff -u -p -r1.30 armadillo9_machdep.c
--- sys/arch/evbarm/armadillo/armadillo9_machdep.c	31 Jul 2018 06:46:26 -0000	1.30
+++ sys/arch/evbarm/armadillo/armadillo9_machdep.c	21 Sep 2018 10:24:35 -0000
@@ -113,6 +113,7 @@
 __KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.30 2018/07/31 06:46:26 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c,v
retrieving revision 1.15
diff -u -p -r1.15 bcm53xx_machdep.c
--- sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c	5 Aug 2018 15:28:21 -0000	1.15
+++ sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c	21 Sep 2018 10:24:35 -0000
@@ -36,6 +36,7 @@
 __KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.15 2018/08/05 15:28:21 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_evbarm_boardtype.h"
 #include "opt_broadcom.h"
 #include "opt_kgdb.h"
Index: sys/arch/evbarm/bcm53xx/bcm53xx_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S,v
retrieving revision 1.12
diff -u -p -r1.12 bcm53xx_start.S
--- sys/arch/evbarm/bcm53xx/bcm53xx_start.S	28 May 2015 02:22:05 -0000	1.12
+++ sys/arch/evbarm/bcm53xx/bcm53xx_start.S	21 Sep 2018 10:24:35 -0000
@@ -31,6 +31,7 @@
 //#define GXEMUL
 
 #include "opt_broadcom.h"
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
Index: sys/arch/evbarm/beagle/beagle_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/beagle/beagle_machdep.c,v
retrieving revision 1.73
diff -u -p -r1.73 beagle_machdep.c
--- sys/arch/evbarm/beagle/beagle_machdep.c	15 Aug 2018 05:58:35 -0000	1.73
+++ sys/arch/evbarm/beagle/beagle_machdep.c	21 Sep 2018 10:24:36 -0000
@@ -128,6 +128,7 @@
 __KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.73 2018/08/15 05:58:35 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_com.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
Index: sys/arch/evbarm/beagle/beagle_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/beagle/beagle_start.S,v
retrieving revision 1.19
diff -u -p -r1.19 beagle_start.S
--- sys/arch/evbarm/beagle/beagle_start.S	29 Mar 2014 14:47:30 -0000	1.19
+++ sys/arch/evbarm/beagle/beagle_start.S	21 Sep 2018 10:24:36 -0000
@@ -83,6 +83,7 @@
  */
 
 #include "opt_omap.h"
+#include "opt_console.h"
 #include "opt_com.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
Index: sys/arch/evbarm/conf/files.beagle
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.beagle,v
retrieving revision 1.5
diff -u -p -r1.5 files.beagle
--- sys/arch/evbarm/conf/files.beagle	19 Mar 2018 17:11:24 -0000	1.5
+++ sys/arch/evbarm/conf/files.beagle	21 Sep 2018 10:24:36 -0000
@@ -15,7 +15,6 @@ include "arch/arm/omap/files.omap2"
 # NS16550 compatible serial ports
 attach com at obio with obiouart
 file	arch/arm/omap/obio_com.c		obiouart
-defparam opt_com.h				CONSADDR CONSPEED CONMODE
 
 attach smsh at gpmc with smsh_gpmc
 file	arch/evbarm/gumstix/if_smsh_gpmc.c	smsh_gpmc
Index: sys/arch/evbarm/conf/files.n900
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.n900,v
retrieving revision 1.6
diff -u -p -r1.6 files.n900
--- sys/arch/evbarm/conf/files.n900	19 Mar 2018 17:11:24 -0000	1.6
+++ sys/arch/evbarm/conf/files.n900	21 Sep 2018 10:24:36 -0000
@@ -15,7 +15,6 @@ include "arch/arm/omap/files.omap2"
 # NS16550 compatible serial ports
 attach com at obio with obiouart
 file	arch/arm/omap/obio_com.c		obiouart
-defparam opt_com.h				CONSADDR CONSPEED CONMODE
 
 # Audio jack
 device n900audjck: sysmon_envsys
Index: sys/arch/evbarm/conf/files.tisdp24xx
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/conf/files.tisdp24xx,v
retrieving revision 1.3
diff -u -p -r1.3 files.tisdp24xx
--- sys/arch/evbarm/conf/files.tisdp24xx	19 Mar 2018 17:11:24 -0000	1.3
+++ sys/arch/evbarm/conf/files.tisdp24xx	21 Sep 2018 10:24:36 -0000
@@ -15,5 +15,4 @@ file	arch/evbarm/tisdp24xx/if_sm_gpmc.c	
 # NS16550 compatible serial ports
 attach com at obio with obiouart
 file	arch/arm/omap/obio_com.c		obiouart
-defparam opt_com.h				CONSADDR CONSPEED CONMODE
 
Index: sys/arch/evbarm/exynos/exynos_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/exynos/exynos_start.S,v
retrieving revision 1.8
diff -u -p -r1.8 exynos_start.S
--- sys/arch/evbarm/exynos/exynos_start.S	11 Sep 2018 10:06:53 -0000	1.8
+++ sys/arch/evbarm/exynos/exynos_start.S	21 Sep 2018 10:24:36 -0000
@@ -30,6 +30,7 @@
  */
 
 #include "opt_exynos.h"
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
Index: sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c,v
retrieving revision 1.31
diff -u -p -r1.31 g42xxeb_machdep.c
--- sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c	31 Jul 2018 06:46:26 -0000	1.31
+++ sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c	21 Sep 2018 10:24:37 -0000
@@ -108,6 +108,7 @@
  */
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/gemini/gemini_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gemini/gemini_machdep.c,v
retrieving revision 1.27
diff -u -p -r1.27 gemini_machdep.c
--- sys/arch/evbarm/gemini/gemini_machdep.c	12 Aug 2018 18:42:08 -0000	1.27
+++ sys/arch/evbarm/gemini/gemini_machdep.c	21 Sep 2018 10:24:37 -0000
@@ -132,6 +132,7 @@
 __KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.27 2018/08/12 18:42:08 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_machdep.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
Index: sys/arch/evbarm/gumstix/gumstix_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gumstix/gumstix_machdep.c,v
retrieving revision 1.60
diff -u -p -r1.60 gumstix_machdep.c
--- sys/arch/evbarm/gumstix/gumstix_machdep.c	31 Jul 2018 06:46:26 -0000	1.60
+++ sys/arch/evbarm/gumstix/gumstix_machdep.c	21 Sep 2018 10:24:37 -0000
@@ -139,6 +139,7 @@
 
 #include "opt_arm_debug.h"
 #include "opt_com.h"
+#include "opt_console.h"
 #include "opt_cputypes.h"
 #include "opt_evbarm_boardtype.h"
 #include "opt_gumstix.h"
Index: sys/arch/evbarm/hawk/hawk_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hawk/hawk_machdep.c,v
retrieving revision 1.3
diff -u -p -r1.3 hawk_machdep.c
--- sys/arch/evbarm/hawk/hawk_machdep.c	31 Jul 2018 06:46:26 -0000	1.3
+++ sys/arch/evbarm/hawk/hawk_machdep.c	21 Sep 2018 10:24:37 -0000
@@ -29,6 +29,7 @@
 __KERNEL_RCSID(0, "$NetBSD: hawk_machdep.c,v 1.3 2018/07/31 06:46:26 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_timer.h"
 #include "opt_machdep.h"
 #include "opt_ddb.h"
Index: sys/arch/evbarm/hdl_g/hdlg_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hdl_g/hdlg_machdep.c,v
retrieving revision 1.24
diff -u -p -r1.24 hdlg_machdep.c
--- sys/arch/evbarm/hdl_g/hdlg_machdep.c	31 Jul 2018 06:46:26 -0000	1.24
+++ sys/arch/evbarm/hdl_g/hdlg_machdep.c	21 Sep 2018 10:24:38 -0000
@@ -76,6 +76,7 @@
 __KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.24 2018/07/31 06:46:26 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/imx31/imx31lk_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/imx31/imx31lk_machdep.c,v
retrieving revision 1.22
diff -u -p -r1.22 imx31lk_machdep.c
--- sys/arch/evbarm/imx31/imx31lk_machdep.c	31 Jul 2018 06:46:26 -0000	1.22
+++ sys/arch/evbarm/imx31/imx31lk_machdep.c	21 Sep 2018 10:24:38 -0000
@@ -113,6 +113,7 @@
 __KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.22 2018/07/31 06:46:26 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/imx7/imx7_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/imx7/imx7_machdep.c,v
retrieving revision 1.8
diff -u -p -r1.8 imx7_machdep.c
--- sys/arch/evbarm/imx7/imx7_machdep.c	5 Aug 2018 13:05:45 -0000	1.8
+++ sys/arch/evbarm/imx7/imx7_machdep.c	21 Sep 2018 10:24:38 -0000
@@ -34,6 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx7_machdep
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_kgdb.h"
 #include "com.h"
 #include "opt_machdep.h"
Index: sys/arch/evbarm/imx7/imx7_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/imx7/imx7_start.S,v
retrieving revision 1.1
diff -u -p -r1.1 imx7_start.S
--- sys/arch/evbarm/imx7/imx7_start.S	17 May 2016 06:44:46 -0000	1.1
+++ sys/arch/evbarm/imx7/imx7_start.S	21 Sep 2018 10:24:39 -0000
@@ -27,6 +27,7 @@
  */
 
 #include "opt_imx.h"
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
Index: sys/arch/evbarm/integrator/integrator_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/integrator/integrator_machdep.c,v
retrieving revision 1.75
diff -u -p -r1.75 integrator_machdep.c
--- sys/arch/evbarm/integrator/integrator_machdep.c	31 Jul 2018 06:46:27 -0000	1.75
+++ sys/arch/evbarm/integrator/integrator_machdep.c	21 Sep 2018 10:24:39 -0000
@@ -71,6 +71,7 @@
 __KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.75 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 
Index: sys/arch/evbarm/iq80310/iq80310_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/iq80310_machdep.c,v
retrieving revision 1.87
diff -u -p -r1.87 iq80310_machdep.c
--- sys/arch/evbarm/iq80310/iq80310_machdep.c	31 Jul 2018 06:46:27 -0000	1.87
+++ sys/arch/evbarm/iq80310/iq80310_machdep.c	21 Sep 2018 10:24:39 -0000
@@ -76,6 +76,7 @@
 __KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.87 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 
Index: sys/arch/evbarm/iq80321/iq80321_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80321/iq80321_machdep.c,v
retrieving revision 1.57
diff -u -p -r1.57 iq80321_machdep.c
--- sys/arch/evbarm/iq80321/iq80321_machdep.c	25 Dec 2016 04:35:30 -0000	1.57
+++ sys/arch/evbarm/iq80321/iq80321_machdep.c	21 Sep 2018 10:24:39 -0000
@@ -75,6 +75,7 @@
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.57 2016/12/25 04:35:30 christos Exp $");
 
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/ixdp425/ixdp425_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c,v
retrieving revision 1.39
diff -u -p -r1.39 ixdp425_machdep.c
--- sys/arch/evbarm/ixdp425/ixdp425_machdep.c	31 Jul 2018 06:46:27 -0000	1.39
+++ sys/arch/evbarm/ixdp425/ixdp425_machdep.c	21 Sep 2018 10:24:39 -0000
@@ -67,6 +67,7 @@
 __KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.39 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/ixm1200/ixm1200_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c,v
retrieving revision 1.59
diff -u -p -r1.59 ixm1200_machdep.c
--- sys/arch/evbarm/ixm1200/ixm1200_machdep.c	31 Jul 2018 06:46:27 -0000	1.59
+++ sys/arch/evbarm/ixm1200/ixm1200_machdep.c	21 Sep 2018 10:24:40 -0000
@@ -64,6 +64,7 @@
 __KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.59 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/kobo/kobo_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/kobo/kobo_machdep.c,v
retrieving revision 1.4
diff -u -p -r1.4 kobo_machdep.c
--- sys/arch/evbarm/kobo/kobo_machdep.c	8 Sep 2017 05:29:12 -0000	1.4
+++ sys/arch/evbarm/kobo/kobo_machdep.c	21 Sep 2018 10:24:40 -0000
@@ -106,6 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: kobo_machdep
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_cputypes.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
Index: sys/arch/evbarm/lubbock/lubbock_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/lubbock_machdep.c,v
retrieving revision 1.35
diff -u -p -r1.35 lubbock_machdep.c
--- sys/arch/evbarm/lubbock/lubbock_machdep.c	31 Jul 2018 06:46:27 -0000	1.35
+++ sys/arch/evbarm/lubbock/lubbock_machdep.c	21 Sep 2018 10:24:41 -0000
@@ -115,6 +115,7 @@
 __KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.35 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/marvell/marvell_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/marvell/marvell_machdep.c,v
retrieving revision 1.34
diff -u -p -r1.34 marvell_machdep.c
--- sys/arch/evbarm/marvell/marvell_machdep.c	31 Jul 2018 06:46:27 -0000	1.34
+++ sys/arch/evbarm/marvell/marvell_machdep.c	21 Sep 2018 10:24:41 -0000
@@ -28,6 +28,7 @@
 __KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.34 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_evbarm_boardtype.h"
 #include "opt_ddb.h"
 #include "opt_pci.h"
Index: sys/arch/evbarm/mini2440/mini2440_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/mini2440/mini2440_machdep.c,v
retrieving revision 1.11
diff -u -p -r1.11 mini2440_machdep.c
--- sys/arch/evbarm/mini2440/mini2440_machdep.c	31 Jul 2018 06:46:27 -0000	1.11
+++ sys/arch/evbarm/mini2440/mini2440_machdep.c	21 Sep 2018 10:24:41 -0000
@@ -134,6 +134,7 @@
 __KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.11 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/netwalker/netwalker_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/netwalker/netwalker_machdep.c,v
retrieving revision 1.21
diff -u -p -r1.21 netwalker_machdep.c
--- sys/arch/evbarm/netwalker/netwalker_machdep.c	8 Sep 2017 05:29:12 -0000	1.21
+++ sys/arch/evbarm/netwalker/netwalker_machdep.c	21 Sep 2018 10:24:42 -0000
@@ -106,6 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: netwalker_ma
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_cputypes.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
Index: sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c,v
retrieving revision 1.9
diff -u -p -r1.9 nitrogen6_machdep.c
--- sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c	5 Aug 2018 13:05:45 -0000	1.9
+++ sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c	21 Sep 2018 10:24:42 -0000
@@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: nitrogen6_ma
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
 #include "opt_kgdb.h"
+#include "opt_console.h"
 #include "com.h"
 #include "opt_machdep.h"
 #include "opt_imxuart.h"
Index: sys/arch/evbarm/nitrogen6/nitrogen6_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/nitrogen6/nitrogen6_start.S,v
retrieving revision 1.2
diff -u -p -r1.2 nitrogen6_start.S
--- sys/arch/evbarm/nitrogen6/nitrogen6_start.S	9 Jun 2017 18:14:59 -0000	1.2
+++ sys/arch/evbarm/nitrogen6/nitrogen6_start.S	21 Sep 2018 10:24:42 -0000
@@ -27,6 +27,7 @@
  */
 
 #include "opt_imx.h"
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
Index: sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c,v
retrieving revision 1.22
diff -u -p -r1.22 npwr_fc_machdep.c
--- sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c	31 Jul 2018 06:46:27 -0000	1.22
+++ sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c	21 Sep 2018 10:24:42 -0000
@@ -76,6 +76,7 @@
 __KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.22 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/nslu2/nslu2_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/nslu2/nslu2_machdep.c,v
retrieving revision 1.28
diff -u -p -r1.28 nslu2_machdep.c
--- sys/arch/evbarm/nslu2/nslu2_machdep.c	31 Jul 2018 06:46:27 -0000	1.28
+++ sys/arch/evbarm/nslu2/nslu2_machdep.c	21 Sep 2018 10:24:43 -0000
@@ -97,6 +97,7 @@
 __KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.28 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/osk5912/osk5912_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/osk5912/osk5912_machdep.c,v
retrieving revision 1.18
diff -u -p -r1.18 osk5912_machdep.c
--- sys/arch/evbarm/osk5912/osk5912_machdep.c	31 Jul 2018 06:46:27 -0000	1.18
+++ sys/arch/evbarm/osk5912/osk5912_machdep.c	21 Sep 2018 10:24:43 -0000
@@ -102,6 +102,7 @@
 __KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.18 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_machdep.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
Index: sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c,v
retrieving revision 1.37
diff -u -p -r1.37 smdk2410_machdep.c
--- sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c	31 Jul 2018 06:46:27 -0000	1.37
+++ sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c	21 Sep 2018 10:24:43 -0000
@@ -108,6 +108,7 @@
 __KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.37 2018/07/31 06:46:27 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c,v
retrieving revision 1.43
diff -u -p -r1.43 smdk2800_machdep.c
--- sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c	22 Dec 2016 14:47:56 -0000	1.43
+++ sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c	21 Sep 2018 10:24:43 -0000
@@ -109,6 +109,7 @@
 __KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.43 2016/12/22 14:47:56 cherry Exp $");
 
 #include "opt_ddb.h"
+#include "opt_console.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #include "opt_md.h"
Index: sys/arch/evbarm/sunxi/sunxi_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/sunxi/sunxi_start.S,v
retrieving revision 1.3
diff -u -p -r1.3 sunxi_start.S
--- sys/arch/evbarm/sunxi/sunxi_start.S	3 Mar 2018 13:46:32 -0000	1.3
+++ sys/arch/evbarm/sunxi/sunxi_start.S	21 Sep 2018 10:24:44 -0000
@@ -30,11 +30,11 @@
  */
 
 #include "opt_soc.h"
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
 #include "opt_arm_debug.h"
-#include "opt_fdt_arm.h"
 #include "opt_fdt.h"
 
 #include <arm/asm.h>
Index: sys/arch/evbarm/tegra/tegra_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tegra/tegra_start.S,v
retrieving revision 1.17
diff -u -p -r1.17 tegra_start.S
--- sys/arch/evbarm/tegra/tegra_start.S	1 Apr 2018 04:35:05 -0000	1.17
+++ sys/arch/evbarm/tegra/tegra_start.S	21 Sep 2018 10:24:44 -0000
@@ -30,11 +30,11 @@
  */
 
 #include "opt_tegra.h"
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
 #include "opt_arm_debug.h"
-#include "opt_fdt_arm.h"
 #include "opt_fdt.h"
 
 #include <arm/asm.h>
Index: sys/arch/evbarm/ti/ti_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ti/ti_start.S,v
retrieving revision 1.2
diff -u -p -r1.2 ti_start.S
--- sys/arch/evbarm/ti/ti_start.S	3 Mar 2018 13:46:33 -0000	1.2
+++ sys/arch/evbarm/ti/ti_start.S	21 Sep 2018 10:24:44 -0000
@@ -29,11 +29,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
 #include "opt_arm_debug.h"
-#include "opt_fdt_arm.h"
 #include "opt_fdt.h"
 
 #include <arm/asm.h>
Index: sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c,v
retrieving revision 1.21
diff -u -p -r1.21 sdp24xx_machdep.c
--- sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c	4 Aug 2018 16:21:40 -0000	1.21
+++ sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c	21 Sep 2018 10:24:44 -0000
@@ -128,6 +128,7 @@
 __KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.21 2018/08/04 16:21:40 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_machdep.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
Index: sys/arch/evbarm/tsarm/tsarm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/tsarm_machdep.c,v
retrieving revision 1.25
diff -u -p -r1.25 tsarm_machdep.c
--- sys/arch/evbarm/tsarm/tsarm_machdep.c	31 Jul 2018 06:46:28 -0000	1.25
+++ sys/arch/evbarm/tsarm/tsarm_machdep.c	21 Sep 2018 10:24:45 -0000
@@ -76,6 +76,7 @@
 __KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.25 2018/07/31 06:46:28 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/viper/viper_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/viper/viper_machdep.c,v
retrieving revision 1.26
diff -u -p -r1.26 viper_machdep.c
--- sys/arch/evbarm/viper/viper_machdep.c	31 Jul 2018 06:46:28 -0000	1.26
+++ sys/arch/evbarm/viper/viper_machdep.c	21 Sep 2018 10:24:45 -0000
@@ -115,6 +115,7 @@
 __KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.26 2018/07/31 06:46:28 skrll Exp $");
 
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
Index: sys/arch/evbarm/zynq/zynq_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/zynq/zynq_machdep.c,v
retrieving revision 1.3
diff -u -p -r1.3 zynq_machdep.c
--- sys/arch/evbarm/zynq/zynq_machdep.c	12 Aug 2018 20:28:38 -0000	1.3
+++ sys/arch/evbarm/zynq/zynq_machdep.c	21 Sep 2018 10:24:45 -0000
@@ -33,6 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_machdep
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
+#include "opt_console.h"
 #include "opt_kgdb.h"
 #include "com.h"
 #include "opt_zynq.h"
Index: sys/arch/evbarm/zynq/zynq_start.S
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/zynq/zynq_start.S,v
retrieving revision 1.1
diff -u -p -r1.1 zynq_start.S
--- sys/arch/evbarm/zynq/zynq_start.S	23 Jan 2015 12:34:09 -0000	1.1
+++ sys/arch/evbarm/zynq/zynq_start.S	21 Sep 2018 10:24:45 -0000
@@ -30,6 +30,7 @@
  */
 
 #include "opt_zynq.h"
+#include "opt_console.h"
 #include "opt_cpuoptions.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"