Module Name: src
Committed By: skrll
Date: Fri Sep 21 12:04:10 UTC 2018
Modified Files:
src/sys/arch/arm/amd: seattle_platform.c
src/sys/arch/arm/amlogic: amlogic_board.c amlogic_com.c
amlogic_cpufreq.c amlogic_io.c files.amlogic
src/sys/arch/arm/at91: at91bus.c
src/sys/arch/arm/broadcom: files.bcm53xx
src/sys/arch/arm/conf: files.arm
src/sys/arch/arm/cortex: a9_mpsubr.S
src/sys/arch/arm/fdt: files.fdt
src/sys/arch/arm/gemini: files.gemini
src/sys/arch/arm/nvidia: tegra_platform.c
src/sys/arch/arm/omap: files.omap files.omapl1x
src/sys/arch/arm/rockchip: rk_cru.c rk_platform.c
src/sys/arch/arm/sa11x0: sa11x0_com.c
src/sys/arch/arm/samsung: exynos_platform.c files.exynos
src/sys/arch/arm/sunxi: sunxi_ccu.c sunxi_platform.c
src/sys/arch/arm/ti: ti_platform.c
src/sys/arch/arm/vexpress: vexpress_platform.c
src/sys/arch/arm/virt: virt_platform.c
src/sys/arch/arm/zynq: files.zynq
src/sys/arch/evbarm/adi_brh: brh_machdep.c
src/sys/arch/evbarm/amlogic: amlogic_machdep.c
src/sys/arch/evbarm/armadaxp: armadaxp_machdep.c
src/sys/arch/evbarm/armadillo: armadillo9_machdep.c
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c bcm53xx_start.S
src/sys/arch/evbarm/beagle: beagle_machdep.c beagle_start.S
src/sys/arch/evbarm/conf: files.beagle files.n900 files.tisdp24xx
src/sys/arch/evbarm/exynos: exynos_start.S
src/sys/arch/evbarm/g42xxeb: g42xxeb_machdep.c
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
src/sys/arch/evbarm/hawk: hawk_machdep.c
src/sys/arch/evbarm/hdl_g: hdlg_machdep.c
src/sys/arch/evbarm/imx31: imx31lk_machdep.c
src/sys/arch/evbarm/imx7: imx7_machdep.c imx7_start.S
src/sys/arch/evbarm/integrator: integrator_machdep.c
src/sys/arch/evbarm/iq80310: iq80310_machdep.c
src/sys/arch/evbarm/iq80321: iq80321_machdep.c
src/sys/arch/evbarm/ixdp425: ixdp425_machdep.c
src/sys/arch/evbarm/ixm1200: ixm1200_machdep.c
src/sys/arch/evbarm/kobo: kobo_machdep.c
src/sys/arch/evbarm/lubbock: lubbock_machdep.c
src/sys/arch/evbarm/marvell: marvell_machdep.c
src/sys/arch/evbarm/mini2440: mini2440_machdep.c
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
src/sys/arch/evbarm/nitrogen6: nitrogen6_machdep.c nitrogen6_start.S
src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
src/sys/arch/evbarm/osk5912: osk5912_machdep.c
src/sys/arch/evbarm/smdk2xx0: smdk2410_machdep.c smdk2800_machdep.c
src/sys/arch/evbarm/sunxi: sunxi_start.S
src/sys/arch/evbarm/tegra: tegra_start.S
src/sys/arch/evbarm/ti: ti_start.S
src/sys/arch/evbarm/tisdp24xx: sdp24xx_machdep.c
src/sys/arch/evbarm/tsarm: tsarm_machdep.c
src/sys/arch/evbarm/viper: viper_machdep.c
src/sys/arch/evbarm/zynq: zynq_machdep.c zynq_start.S
Log Message:
Centralise defparam CONSADDR, CONSPEED, CONMODE and CONADDR into
opt_console.h and adjust.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amd/seattle_platform.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/amlogic/amlogic_board.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/amlogic_com.c \
src/sys/arch/arm/amlogic/amlogic_cpufreq.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/amlogic/amlogic_io.c \
src/sys/arch/arm/amlogic/files.amlogic
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/broadcom/files.bcm53xx
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/arm/cortex/a9_mpsubr.S
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/fdt/files.fdt
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/gemini/files.gemini
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/nvidia/tegra_platform.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/omap/files.omap
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/files.omapl1x
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/rockchip/rk_cru.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rk_platform.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/arm/sa11x0/sa11x0_com.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sunxi_ccu.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/sunxi/sunxi_platform.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ti/ti_platform.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/vexpress/vexpress_platform.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/virt/virt_platform.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/zynq/files.zynq
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbarm/adi_brh/brh_machdep.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/amlogic/amlogic_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/beagle/beagle_start.S
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/files.beagle
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/files.n900
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/files.tisdp24xx
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/exynos/exynos_start.S
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/hawk/hawk_machdep.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/imx31/imx31lk_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/imx7/imx7_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/imx7/imx7_start.S
cvs rdiff -u -r1.75 -r1.76 \
src/sys/arch/evbarm/integrator/integrator_machdep.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/evbarm/iq80310/iq80310_machdep.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/iq80321/iq80321_machdep.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/kobo/kobo_machdep.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/lubbock/lubbock_machdep.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/marvell/marvell_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/mini2440/mini2440_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/netwalker/netwalker_machdep.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/nitrogen6/nitrogen6_start.S
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/nslu2/nslu2_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/osk5912/osk5912_machdep.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/sunxi/sunxi_start.S
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/tegra/tegra_start.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/ti/ti_start.S
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/tsarm/tsarm_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/viper/viper_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/zynq/zynq_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/zynq/zynq_start.S
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/arm/amd/seattle_platform.c
diff -u src/sys/arch/arm/amd/seattle_platform.c:1.2 src/sys/arch/arm/amd/seattle_platform.c:1.3
--- src/sys/arch/arm/amd/seattle_platform.c:1.2 Mon Sep 10 19:09:38 2018
+++ src/sys/arch/arm/amd/seattle_platform.c Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: seattle_platform.c,v 1.2 2018/09/10 19:09:38 jmcneill Exp $ */
+/* $NetBSD: seattle_platform.c,v 1.3 2018/09/21 12:04:06 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -28,12 +28,12 @@
#include "opt_soc.h"
#include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seattle_platform.c,v 1.2 2018/09/10 19:09:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seattle_platform.c,v 1.3 2018/09/21 12:04:06 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/amlogic/amlogic_board.c
diff -u src/sys/arch/arm/amlogic/amlogic_board.c:1.16 src/sys/arch/arm/amlogic/amlogic_board.c:1.17
--- src/sys/arch/arm/amlogic/amlogic_board.c:1.16 Thu Nov 26 00:06:59 2015
+++ src/sys/arch/arm/amlogic/amlogic_board.c Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_board.c,v 1.16 2015/11/26 00:06:59 jmcneill Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.17 2018/09/21 12:04:06 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,10 +26,8 @@
* 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 $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_board.c,v 1.17 2018/09/21 12:04:06 skrll Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
Index: src/sys/arch/arm/amlogic/amlogic_com.c
diff -u src/sys/arch/arm/amlogic/amlogic_com.c:1.5 src/sys/arch/arm/amlogic/amlogic_com.c:1.6
--- src/sys/arch/arm/amlogic/amlogic_com.c:1.5 Fri Apr 3 15:50:15 2015
+++ src/sys/arch/arm/amlogic/amlogic_com.c Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_com.c,v 1.5 2015/04/03 15:50:15 jmcneill Exp $ */
+/* $NetBSD: amlogic_com.c,v 1.6 2018/09/21 12:04:06 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -29,11 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include "opt_console.h"
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: amlogic_com.c,v 1.5 2015/04/03 15:50:15 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: amlogic_com.c,v 1.6 2018/09/21 12:04:06 skrll Exp $");
#define cn_trap() \
do { \
Index: src/sys/arch/arm/amlogic/amlogic_cpufreq.c
diff -u src/sys/arch/arm/amlogic/amlogic_cpufreq.c:1.5 src/sys/arch/arm/amlogic/amlogic_cpufreq.c:1.6
--- src/sys/arch/arm/amlogic/amlogic_cpufreq.c:1.5 Sun Nov 29 19:16:58 2015
+++ src/sys/arch/arm/amlogic/amlogic_cpufreq.c Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_cpufreq.c,v 1.5 2015/11/29 19:16:58 jmcneill Exp $ */
+/* $NetBSD: amlogic_cpufreq.c,v 1.6 2018/09/21 12:04:06 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -28,10 +28,8 @@
#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 $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_cpufreq.c,v 1.6 2018/09/21 12:04:06 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/amlogic/amlogic_io.c
diff -u src/sys/arch/arm/amlogic/amlogic_io.c:1.13 src/sys/arch/arm/amlogic/amlogic_io.c:1.14
--- src/sys/arch/arm/amlogic/amlogic_io.c:1.13 Sat Nov 21 00:54:57 2015
+++ src/sys/arch/arm/amlogic/amlogic_io.c Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_io.c,v 1.13 2015/11/21 00:54:57 jmcneill Exp $ */
+/* $NetBSD: amlogic_io.c,v 1.14 2018/09/21 12:04:06 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -26,10 +26,8 @@
* 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 $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_io.c,v 1.14 2018/09/21 12:04:06 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/arch/arm/amlogic/files.amlogic
diff -u src/sys/arch/arm/amlogic/files.amlogic:1.13 src/sys/arch/arm/amlogic/files.amlogic:1.14
--- src/sys/arch/arm/amlogic/files.amlogic:1.13 Sun Nov 29 16:52:00 2015
+++ src/sys/arch/arm/amlogic/files.amlogic Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.amlogic,v 1.13 2015/11/29 16:52:00 jmcneill Exp $
+# $NetBSD: files.amlogic,v 1.14 2018/09/21 12:04:06 skrll Exp $
#
# Configuration info for Amlogic ARM Peripherals
#
@@ -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: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.21 src/sys/arch/arm/at91/at91bus.c:1.22
--- src/sys/arch/arm/at91/at91bus.c:1.21 Tue Jul 31 06:46:25 2018
+++ src/sys/arch/arm/at91/at91bus.c Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.21 2018/07/31 06:46:25 skrll Exp $ */
+/* $NetBSD: at91bus.c,v 1.22 2018/09/21 12:04:06 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -27,9 +27,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.21 2018/07/31 06:46:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.22 2018/09/21 12:04:06 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: src/sys/arch/arm/broadcom/files.bcm53xx
diff -u src/sys/arch/arm/broadcom/files.bcm53xx:1.4 src/sys/arch/arm/broadcom/files.bcm53xx:1.5
--- src/sys/arch/arm/broadcom/files.bcm53xx:1.4 Mon Oct 28 22:51:16 2013
+++ src/sys/arch/arm/broadcom/files.bcm53xx Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.bcm53xx,v 1.4 2013/10/28 22:51:16 matt Exp $
+# $NetBSD: files.bcm53xx,v 1.5 2018/09/21 12:04:06 skrll Exp $
#
# Configuration info for Broadcom BCM5301X ARM Peripherals
#
@@ -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: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.142 src/sys/arch/arm/conf/files.arm:1.143
--- src/sys/arch/arm/conf/files.arm:1.142 Sun Sep 16 15:40:36 2018
+++ src/sys/arch/arm/conf/files.arm Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm,v 1.142 2018/09/16 15:40:36 skrll Exp $
+# $NetBSD: files.arm,v 1.143 2018/09/21 12:04:06 skrll Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defflag ARM32
@@ -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: src/sys/arch/arm/cortex/a9_mpsubr.S
diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.57 src/sys/arch/arm/cortex/a9_mpsubr.S:1.58
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.57 Wed Jun 27 11:12:14 2018
+++ src/sys/arch/arm/cortex/a9_mpsubr.S Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: a9_mpsubr.S,v 1.57 2018/06/27 11:12:14 ryo Exp $ */
+/* $NetBSD: a9_mpsubr.S,v 1.58 2018/09/21 12:04:06 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -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: src/sys/arch/arm/fdt/files.fdt
diff -u src/sys/arch/arm/fdt/files.fdt:1.25 src/sys/arch/arm/fdt/files.fdt:1.26
--- src/sys/arch/arm/fdt/files.fdt:1.25 Mon Sep 10 11:05:12 2018
+++ src/sys/arch/arm/fdt/files.fdt Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.25 2018/09/10 11:05:12 ryo Exp $
+# $NetBSD: files.fdt,v 1.26 2018/09/21 12:04:06 skrll Exp $
include "dev/pckbport/files.pckbport"
@@ -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: src/sys/arch/arm/gemini/files.gemini
diff -u src/sys/arch/arm/gemini/files.gemini:1.12 src/sys/arch/arm/gemini/files.gemini:1.13
--- src/sys/arch/arm/gemini/files.gemini:1.12 Wed Jun 6 20:21:45 2012
+++ src/sys/arch/arm/gemini/files.gemini Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.gemini,v 1.12 2012/06/06 20:21:45 skrll Exp $
+# $NetBSD: files.gemini,v 1.13 2018/09/21 12:04:06 skrll Exp $
#
# Configuration info for GEMINI CPU support
# Based on omap/files.omap2
@@ -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: src/sys/arch/arm/nvidia/tegra_platform.c
diff -u src/sys/arch/arm/nvidia/tegra_platform.c:1.15 src/sys/arch/arm/nvidia/tegra_platform.c:1.16
--- src/sys/arch/arm/nvidia/tegra_platform.c:1.15 Mon Sep 10 11:05:12 2018
+++ src/sys/arch/arm/nvidia/tegra_platform.c Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.15 2018/09/10 11:05:12 ryo Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.16 2018/09/21 12:04:06 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -28,12 +28,12 @@
#include "opt_tegra.h"
#include "opt_multiprocessor.h"
-#include "opt_fdt_arm.h"
+#include "opt_console.h"
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.15 2018/09/10 11:05:12 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.16 2018/09/21 12:04:06 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/omap/files.omap
diff -u src/sys/arch/arm/omap/files.omap:1.6 src/sys/arch/arm/omap/files.omap:1.7
--- src/sys/arch/arm/omap/files.omap:1.6 Wed Jun 6 20:21:45 2012
+++ src/sys/arch/arm/omap/files.omap Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.omap,v 1.6 2012/06/06 20:21:45 skrll Exp $
+# $NetBSD: files.omap,v 1.7 2018/09/21 12:04:06 skrll Exp $
#
# Configuration info for Texas Instruments OMAP CPU support
# Based on xscale/files.pxa2x0
@@ -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: src/sys/arch/arm/omap/files.omapl1x
diff -u src/sys/arch/arm/omap/files.omapl1x:1.1 src/sys/arch/arm/omap/files.omapl1x:1.2
--- src/sys/arch/arm/omap/files.omapl1x:1.1 Wed Oct 2 16:48:26 2013
+++ src/sys/arch/arm/omap/files.omapl1x Fri Sep 21 12:04:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.omapl1x,v 1.1 2013/10/02 16:48:26 matt Exp $
+# $NetBSD: files.omapl1x,v 1.2 2018/09/21 12:04:06 skrll Exp $
#
# Configuration info for Texas Instruments OMAP-L1x CPU support
# Based on files.omap2 and files.omap
@@ -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: src/sys/arch/arm/rockchip/rk_cru.c
diff -u src/sys/arch/arm/rockchip/rk_cru.c:1.7 src/sys/arch/arm/rockchip/rk_cru.c:1.8
--- src/sys/arch/arm/rockchip/rk_cru.c:1.7 Sun Sep 9 07:21:17 2018
+++ src/sys/arch/arm/rockchip/rk_cru.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_cru.c,v 1.7 2018/09/09 07:21:17 aymeric Exp $ */
+/* $NetBSD: rk_cru.c,v 1.8 2018/09/21 12:04:07 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,10 +27,10 @@
*/
#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 $");
+__KERNEL_RCSID(0, "$NetBSD: rk_cru.c,v 1.8 2018/09/21 12:04:07 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/rockchip/rk_platform.c
diff -u src/sys/arch/arm/rockchip/rk_platform.c:1.4 src/sys/arch/arm/rockchip/rk_platform.c:1.5
--- src/sys/arch/arm/rockchip/rk_platform.c:1.4 Mon Sep 10 11:05:12 2018
+++ src/sys/arch/arm/rockchip/rk_platform.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_platform.c,v 1.4 2018/09/10 11:05:12 ryo Exp $ */
+/* $NetBSD: rk_platform.c,v 1.5 2018/09/21 12:04:07 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -28,10 +28,10 @@
#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 $");
+__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.5 2018/09/21 12:04:07 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/sa11x0/sa11x0_com.c
diff -u src/sys/arch/arm/sa11x0/sa11x0_com.c:1.55 src/sys/arch/arm/sa11x0/sa11x0_com.c:1.56
--- src/sys/arch/arm/sa11x0/sa11x0_com.c:1.55 Mon Apr 13 21:18:41 2015
+++ src/sys/arch/arm/sa11x0/sa11x0_com.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x0_com.c,v 1.55 2015/04/13 21:18:41 riastradh Exp $ */
+/* $NetBSD: sa11x0_com.c,v 1.56 2018/09/21 12:04:07 skrll Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -64,9 +64,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.55 2015/04/13 21:18:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c,v 1.56 2018/09/21 12:04:07 skrll Exp $");
#include "opt_com.h"
+#include "opt_console.h"
#include "opt_ddb.h"
#include "opt_ddbparam.h"
#include "opt_kgdb.h"
Index: src/sys/arch/arm/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.16 src/sys/arch/arm/samsung/exynos_platform.c:1.17
--- src/sys/arch/arm/samsung/exynos_platform.c:1.16 Fri Sep 14 11:58:38 2018
+++ src/sys/arch/arm/samsung/exynos_platform.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.16 2018/09/14 11:58:38 skrll Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.17 2018/09/21 12:04:07 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,14 +27,15 @@
*/
#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"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.16 2018/09/14 11:58:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.17 2018/09/21 12:04:07 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/samsung/files.exynos
diff -u src/sys/arch/arm/samsung/files.exynos:1.32 src/sys/arch/arm/samsung/files.exynos:1.33
--- src/sys/arch/arm/samsung/files.exynos:1.32 Tue Sep 11 10:06:53 2018
+++ src/sys/arch/arm/samsung/files.exynos Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.exynos,v 1.32 2018/09/11 10:06:53 jmcneill Exp $
+# $NetBSD: files.exynos,v 1.33 2018/09/21 12:04:07 skrll Exp $
#
# Configuration info for Samsung Exynos SoC ARM Peripherals
#
@@ -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: src/sys/arch/arm/sunxi/sunxi_ccu.c
diff -u src/sys/arch/arm/sunxi/sunxi_ccu.c:1.11 src/sys/arch/arm/sunxi/sunxi_ccu.c:1.12
--- src/sys/arch/arm/sunxi/sunxi_ccu.c:1.11 Sun Sep 9 07:21:18 2018
+++ src/sys/arch/arm/sunxi/sunxi_ccu.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_ccu.c,v 1.11 2018/09/09 07:21:18 aymeric Exp $ */
+/* $NetBSD: sunxi_ccu.c,v 1.12 2018/09/21 12:04:07 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,10 +28,10 @@
#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 $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_ccu.c,v 1.12 2018/09/21 12:04:07 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.27 src/sys/arch/arm/sunxi/sunxi_platform.c:1.28
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.27 Sun Sep 16 13:21:36 2018
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.27 2018/09/16 13:21:36 jmcneill Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.28 2018/09/21 12:04:07 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,10 +28,10 @@
#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 $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.28 2018/09/21 12:04:07 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/ti/ti_platform.c
diff -u src/sys/arch/arm/ti/ti_platform.c:1.4 src/sys/arch/arm/ti/ti_platform.c:1.5
--- src/sys/arch/arm/ti/ti_platform.c:1.4 Sun Aug 5 14:02:35 2018
+++ src/sys/arch/arm/ti/ti_platform.c Fri Sep 21 12:04:07 2018
@@ -1,9 +1,9 @@
-/* $NetBSD: ti_platform.c,v 1.4 2018/08/05 14:02:35 skrll Exp $ */
+/* $NetBSD: ti_platform.c,v 1.5 2018/09/21 12:04:07 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 $");
+__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.5 2018/09/21 12:04:07 skrll Exp $");
#include <sys/param.h>
Index: src/sys/arch/arm/vexpress/vexpress_platform.c
diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.9 src/sys/arch/arm/vexpress/vexpress_platform.c:1.10
--- src/sys/arch/arm/vexpress/vexpress_platform.c:1.9 Sun Aug 5 14:02:35 2018
+++ src/sys/arch/arm/vexpress/vexpress_platform.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.9 2018/08/05 14:02:35 skrll Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.10 2018/09/21 12:04:07 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,10 +27,10 @@
*/
#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 $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.10 2018/09/21 12:04:07 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/virt/virt_platform.c
diff -u src/sys/arch/arm/virt/virt_platform.c:1.6 src/sys/arch/arm/virt/virt_platform.c:1.7
--- src/sys/arch/arm/virt/virt_platform.c:1.6 Mon Sep 10 11:05:12 2018
+++ src/sys/arch/arm/virt/virt_platform.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virt_platform.c,v 1.6 2018/09/10 11:05:12 ryo Exp $ */
+/* $NetBSD: virt_platform.c,v 1.7 2018/09/21 12:04:07 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -28,10 +28,9 @@
#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 $");
+__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.7 2018/09/21 12:04:07 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/zynq/files.zynq
diff -u src/sys/arch/arm/zynq/files.zynq:1.1 src/sys/arch/arm/zynq/files.zynq:1.2
--- src/sys/arch/arm/zynq/files.zynq:1.1 Fri Jan 23 12:34:09 2015
+++ src/sys/arch/arm/zynq/files.zynq Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.zynq,v 1.1 2015/01/23 12:34:09 hkenken Exp $
+# $NetBSD: files.zynq,v 1.2 2018/09/21 12:04:07 skrll Exp $
#
# Configuration info for xilinx Zynq-7000 ARM Peripherals
#
@@ -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: src/sys/arch/evbarm/adi_brh/brh_machdep.c
diff -u src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.45 src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.46
--- src/sys/arch/evbarm/adi_brh/brh_machdep.c:1.45 Tue Jul 31 06:46:25 2018
+++ src/sys/arch/evbarm/adi_brh/brh_machdep.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: brh_machdep.c,v 1.45 2018/07/31 06:46:25 skrll Exp $ */
+/* $NetBSD: brh_machdep.c,v 1.46 2018/09/21 12:04:07 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,9 +73,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.45 2018/07/31 06:46:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.46 2018/09/21 12:04:07 skrll Exp $");
#include "opt_arm_debug.h"
+#include "opt_console.h"
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
Index: src/sys/arch/evbarm/amlogic/amlogic_machdep.c
diff -u src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.23 src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.24
--- src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.23 Tue Jul 17 18:41:00 2018
+++ src/sys/arch/evbarm/amlogic/amlogic_machdep.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_machdep.c,v 1.23 2018/07/17 18:41:00 christos Exp $ */
+/* $NetBSD: amlogic_machdep.c,v 1.24 2018/09/21 12:04:07 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,8 +125,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.23 2018/07/17 18:41:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_machdep.c,v 1.24 2018/09/21 12:04:07 skrll Exp $");
+#include "opt_console.h"
#include "opt_machdep.h"
#include "opt_ddb.h"
#include "opt_md.h"
Index: src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c
diff -u src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.15 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.16
--- src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.15 Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c Fri Sep 21 12:04:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp_machdep.c,v 1.15 2018/07/31 06:46:26 skrll Exp $ */
+/* $NetBSD: armadaxp_machdep.c,v 1.16 2018/09/21 12:04:07 skrll Exp $ */
/*******************************************************************************
Copyright (C) Marvell International Ltd. and its affiliates
@@ -37,9 +37,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
*******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.15 2018/07/31 06:46:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.16 2018/09/21 12:04:07 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: src/sys/arch/evbarm/armadillo/armadillo9_machdep.c
diff -u src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.30 src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.31
--- src/sys/arch/evbarm/armadillo/armadillo9_machdep.c:1.30 Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/armadillo/armadillo9_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: armadillo9_machdep.c,v 1.30 2018/07/31 06:46:26 skrll Exp $ */
+/* $NetBSD: armadillo9_machdep.c,v 1.31 2018/09/21 12:04:08 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -110,9 +110,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.30 2018/07/31 06:46:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.31 2018/09/21 12:04:08 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: src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.15 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.16
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.15 Sun Aug 5 15:28:21 2018
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.15 2018/08/05 15:28:21 skrll Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.16 2018/09/21 12:04:08 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,9 +33,10 @@
#define IDM_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.15 2018/08/05 15:28:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.16 2018/09/21 12:04:08 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: src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.12 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.13
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.12 Thu May 28 02:22:05 2015
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_start.S,v 1.12 2015/05/28 02:22:05 matt Exp $ */
+/* $NetBSD: bcm53xx_start.S,v 1.13 2018/09/21 12:04:08 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -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"
@@ -45,7 +46,7 @@
#define CONADDR 0x18000300
#endif
-RCSID("$NetBSD: bcm53xx_start.S,v 1.12 2015/05/28 02:22:05 matt Exp $")
+RCSID("$NetBSD: bcm53xx_start.S,v 1.13 2018/09/21 12:04:08 skrll Exp $")
#if defined(VERBOSE_INIT_ARM)
#define XPUTC(n) mov r0, n; bl xputc
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.73 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.74
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.73 Wed Aug 15 05:58:35 2018
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.73 2018/08/15 05:58:35 skrll Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.74 2018/09/21 12:04:08 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,9 +125,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.73 2018/08/15 05:58:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.74 2018/09/21 12:04:08 skrll Exp $");
#include "opt_arm_debug.h"
+#include "opt_console.h"
#include "opt_com.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
Index: src/sys/arch/evbarm/beagle/beagle_start.S
diff -u src/sys/arch/evbarm/beagle/beagle_start.S:1.19 src/sys/arch/evbarm/beagle/beagle_start.S:1.20
--- src/sys/arch/evbarm/beagle/beagle_start.S:1.19 Sat Mar 29 14:47:30 2014
+++ src/sys/arch/evbarm/beagle/beagle_start.S Fri Sep 21 12:04:08 2018
@@ -83,6 +83,7 @@
*/
#include "opt_omap.h"
+#include "opt_console.h"
#include "opt_com.h"
#include "opt_cpuoptions.h"
#include "opt_cputypes.h"
@@ -99,7 +100,7 @@
#include <arm/cortex/a9tmr_reg.h>
#endif
-RCSID("$NetBSD: beagle_start.S,v 1.19 2014/03/29 14:47:30 matt Exp $")
+RCSID("$NetBSD: beagle_start.S,v 1.20 2018/09/21 12:04:08 skrll Exp $")
#if defined(VERBOSE_INIT_ARM)
#define XPUTC(n) mov r0, n; bl xputc
Index: src/sys/arch/evbarm/conf/files.beagle
diff -u src/sys/arch/evbarm/conf/files.beagle:1.5 src/sys/arch/evbarm/conf/files.beagle:1.6
--- src/sys/arch/evbarm/conf/files.beagle:1.5 Mon Mar 19 17:11:24 2018
+++ src/sys/arch/evbarm/conf/files.beagle Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.beagle,v 1.5 2018/03/19 17:11:24 ryo Exp $
+# $NetBSD: files.beagle,v 1.6 2018/09/21 12:04:08 skrll Exp $
#
# TI OMAP2 evaluation board configuration info
#
@@ -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: src/sys/arch/evbarm/conf/files.n900
diff -u src/sys/arch/evbarm/conf/files.n900:1.6 src/sys/arch/evbarm/conf/files.n900:1.7
--- src/sys/arch/evbarm/conf/files.n900:1.6 Mon Mar 19 17:11:24 2018
+++ src/sys/arch/evbarm/conf/files.n900 Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.n900,v 1.6 2018/03/19 17:11:24 ryo Exp $
+# $NetBSD: files.n900,v 1.7 2018/09/21 12:04:08 skrll Exp $
#
# Nokia N900 configuration info
#
@@ -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: src/sys/arch/evbarm/conf/files.tisdp24xx
diff -u src/sys/arch/evbarm/conf/files.tisdp24xx:1.3 src/sys/arch/evbarm/conf/files.tisdp24xx:1.4
--- src/sys/arch/evbarm/conf/files.tisdp24xx:1.3 Mon Mar 19 17:11:24 2018
+++ src/sys/arch/evbarm/conf/files.tisdp24xx Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.tisdp24xx,v 1.3 2018/03/19 17:11:24 ryo Exp $
+# $NetBSD: files.tisdp24xx,v 1.4 2018/09/21 12:04:08 skrll Exp $
#
# TI OMAP2 evaluation board configuration info
#
@@ -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: src/sys/arch/evbarm/exynos/exynos_start.S
diff -u src/sys/arch/evbarm/exynos/exynos_start.S:1.8 src/sys/arch/evbarm/exynos/exynos_start.S:1.9
--- src/sys/arch/evbarm/exynos/exynos_start.S:1.8 Tue Sep 11 10:06:53 2018
+++ src/sys/arch/evbarm/exynos/exynos_start.S Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_start.S,v 1.8 2018/09/11 10:06:53 jmcneill Exp $ */
+/* $NetBSD: exynos_start.S,v 1.9 2018/09/21 12:04:08 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,6 +30,7 @@
*/
#include "opt_exynos.h"
+#include "opt_console.h"
#include "opt_cpuoptions.h"
#include "opt_cputypes.h"
#include "opt_multiprocessor.h"
@@ -46,7 +47,7 @@
#include <evbarm/exynos/platform.h>
-RCSID("$NetBSD: exynos_start.S,v 1.8 2018/09/11 10:06:53 jmcneill Exp $")
+RCSID("$NetBSD: exynos_start.S,v 1.9 2018/09/21 12:04:08 skrll Exp $")
#if defined(KERNEL_BASES_EQUAL)
#define CALL(f) bl _C_LABEL(f)
Index: src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
diff -u src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.31 src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.32
--- src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c:1.31 Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: g42xxeb_machdep.c,v 1.31 2018/07/31 06:46:26 skrll Exp $ */
+/* $NetBSD: g42xxeb_machdep.c,v 1.32 2018/09/21 12:04:08 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2004, 2005 Genetec Corporation.
@@ -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: src/sys/arch/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.27 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.28
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.27 Sun Aug 12 18:42:08 2018
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_machdep.c,v 1.27 2018/08/12 18:42:08 skrll Exp $ */
+/* $NetBSD: gemini_machdep.c,v 1.28 2018/09/21 12:04:08 skrll Exp $ */
/* adapted from:
* NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,9 +129,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.27 2018/08/12 18:42:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.28 2018/09/21 12:04: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: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.60 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.61
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.60 Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_machdep.c,v 1.60 2018/07/31 06:46:26 skrll Exp $ */
+/* $NetBSD: gumstix_machdep.c,v 1.61 2018/09/21 12:04:08 skrll Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -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: src/sys/arch/evbarm/hawk/hawk_machdep.c
diff -u src/sys/arch/evbarm/hawk/hawk_machdep.c:1.3 src/sys/arch/evbarm/hawk/hawk_machdep.c:1.4
--- src/sys/arch/evbarm/hawk/hawk_machdep.c:1.3 Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/hawk/hawk_machdep.c Fri Sep 21 12:04:08 2018
@@ -26,9 +26,10 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hawk_machdep.c,v 1.3 2018/07/31 06:46:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hawk_machdep.c,v 1.4 2018/09/21 12:04:08 skrll Exp $");
#include "opt_arm_debug.h"
+#include "opt_console.h"
#include "opt_timer.h"
#include "opt_machdep.h"
#include "opt_ddb.h"
Index: src/sys/arch/evbarm/hdl_g/hdlg_machdep.c
diff -u src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.24 src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.25
--- src/sys/arch/evbarm/hdl_g/hdlg_machdep.c:1.24 Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/hdl_g/hdlg_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hdlg_machdep.c,v 1.24 2018/07/31 06:46:26 skrll Exp $ */
+/* $NetBSD: hdlg_machdep.c,v 1.25 2018/09/21 12:04:08 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,9 +73,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.24 2018/07/31 06:46:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.25 2018/09/21 12:04:08 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: src/sys/arch/evbarm/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.22 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.23
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.22 Tue Jul 31 06:46:26 2018
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.22 2018/07/31 06:46:26 skrll Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.23 2018/09/21 12:04:08 skrll Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,9 +110,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.22 2018/07/31 06:46:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.23 2018/09/21 12:04:08 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: src/sys/arch/evbarm/imx7/imx7_machdep.c
diff -u src/sys/arch/evbarm/imx7/imx7_machdep.c:1.8 src/sys/arch/evbarm/imx7/imx7_machdep.c:1.9
--- src/sys/arch/evbarm/imx7/imx7_machdep.c:1.8 Sun Aug 5 13:05:45 2018
+++ src/sys/arch/evbarm/imx7/imx7_machdep.c Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_machdep.c,v 1.8 2018/08/05 13:05:45 skrll Exp $ */
+/* $NetBSD: imx7_machdep.c,v 1.9 2018/09/21 12:04:08 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,10 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.8 2018/08/05 13:05:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_machdep.c,v 1.9 2018/09/21 12:04:08 skrll Exp $");
#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: src/sys/arch/evbarm/imx7/imx7_start.S
diff -u src/sys/arch/evbarm/imx7/imx7_start.S:1.1 src/sys/arch/evbarm/imx7/imx7_start.S:1.2
--- src/sys/arch/evbarm/imx7/imx7_start.S:1.1 Tue May 17 06:44:46 2016
+++ src/sys/arch/evbarm/imx7/imx7_start.S Fri Sep 21 12:04:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_start.S,v 1.1 2016/05/17 06:44:46 ryo Exp $ */
+/* $NetBSD: imx7_start.S,v 1.2 2018/09/21 12:04:08 skrll Exp $ */
/*-
* Copyright (c) 2014 Ryo Shimizu <r...@nerv.org>
@@ -27,6 +27,7 @@
*/
#include "opt_imx.h"
+#include "opt_console.h"
#include "opt_cpuoptions.h"
#include "opt_cputypes.h"
#include "opt_multiprocessor.h"
@@ -37,7 +38,7 @@
#include <arm/cortex/scu_reg.h>
#include "assym.h"
-RCSID("$NetBSD: imx7_start.S,v 1.1 2016/05/17 06:44:46 ryo Exp $")
+RCSID("$NetBSD: imx7_start.S,v 1.2 2018/09/21 12:04:08 skrll Exp $")
#ifndef CONADDR
#define CONADDR 0x30a60000
Index: src/sys/arch/evbarm/integrator/integrator_machdep.c
diff -u src/sys/arch/evbarm/integrator/integrator_machdep.c:1.75 src/sys/arch/evbarm/integrator/integrator_machdep.c:1.76
--- src/sys/arch/evbarm/integrator/integrator_machdep.c:1.75 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/integrator/integrator_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: integrator_machdep.c,v 1.75 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: integrator_machdep.c,v 1.76 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2001,2002 ARM Ltd
@@ -68,9 +68,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.75 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.76 2018/09/21 12:04:09 skrll Exp $");
#include "opt_arm_debug.h"
+#include "opt_console.h"
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
Index: src/sys/arch/evbarm/iq80310/iq80310_machdep.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.87 src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.88
--- src/sys/arch/evbarm/iq80310/iq80310_machdep.c:1.87 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/iq80310/iq80310_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_machdep.c,v 1.87 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: iq80310_machdep.c,v 1.88 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,9 +73,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.87 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.88 2018/09/21 12:04:09 skrll Exp $");
#include "opt_arm_debug.h"
+#include "opt_console.h"
#include "opt_ddb.h"
#include "opt_pmap_debug.h"
Index: src/sys/arch/evbarm/iq80321/iq80321_machdep.c
diff -u src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.57 src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.58
--- src/sys/arch/evbarm/iq80321/iq80321_machdep.c:1.57 Sun Dec 25 04:35:30 2016
+++ src/sys/arch/evbarm/iq80321/iq80321_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80321_machdep.c,v 1.57 2016/12/25 04:35:30 christos Exp $ */
+/* $NetBSD: iq80321_machdep.c,v 1.58 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,8 +73,9 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.57 2016/12/25 04:35:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.58 2018/09/21 12:04:09 skrll Exp $");
+#include "opt_console.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
#include "opt_pmap_debug.h"
Index: src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.39 src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.40
--- src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c:1.39 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_machdep.c,v 1.39 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: ixdp425_machdep.c,v 1.40 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ich...@ichiro.org>.
@@ -64,9 +64,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.39 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.40 2018/09/21 12:04:09 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: src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
diff -u src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.59 src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.60
--- src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c:1.59 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.59 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.60 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -61,9 +61,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.59 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.60 2018/09/21 12:04:09 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: src/sys/arch/evbarm/kobo/kobo_machdep.c
diff -u src/sys/arch/evbarm/kobo/kobo_machdep.c:1.4 src/sys/arch/evbarm/kobo/kobo_machdep.c:1.5
--- src/sys/arch/evbarm/kobo/kobo_machdep.c:1.4 Fri Sep 8 05:29:12 2017
+++ src/sys/arch/evbarm/kobo/kobo_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kobo_machdep.c,v 1.4 2017/09/08 05:29:12 hkenken Exp $ */
+/* $NetBSD: kobo_machdep.c,v 1.5 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,10 +102,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobo_machdep.c,v 1.4 2017/09/08 05:29:12 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobo_machdep.c,v 1.5 2018/09/21 12:04:09 skrll Exp $");
#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: src/sys/arch/evbarm/lubbock/lubbock_machdep.c
diff -u src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.35 src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.36
--- src/sys/arch/evbarm/lubbock/lubbock_machdep.c:1.35 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/lubbock/lubbock_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lubbock_machdep.c,v 1.35 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: lubbock_machdep.c,v 1.36 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -112,9 +112,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.35 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_machdep.c,v 1.36 2018/09/21 12:04:09 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: src/sys/arch/evbarm/marvell/marvell_machdep.c
diff -u src/sys/arch/evbarm/marvell/marvell_machdep.c:1.34 src/sys/arch/evbarm/marvell/marvell_machdep.c:1.35
--- src/sys/arch/evbarm/marvell/marvell_machdep.c:1.34 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/marvell/marvell_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_machdep.c,v 1.34 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: marvell_machdep.c,v 1.35 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,9 +25,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.34 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.35 2018/09/21 12:04:09 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: src/sys/arch/evbarm/mini2440/mini2440_machdep.c
diff -u src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.11 src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.12
--- src/sys/arch/evbarm/mini2440/mini2440_machdep.c:1.11 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/mini2440/mini2440_machdep.c Fri Sep 21 12:04:09 2018
@@ -131,9 +131,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.11 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mini2440_machdep.c,v 1.12 2018/09/21 12:04:09 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: src/sys/arch/evbarm/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.21 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.22
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.21 Fri Sep 8 05:29:12 2017
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_machdep.c,v 1.21 2017/09/08 05:29:12 hkenken Exp $ */
+/* $NetBSD: netwalker_machdep.c,v 1.22 2018/09/21 12:04:09 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,10 +102,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.21 2017/09/08 05:29:12 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.22 2018/09/21 12:04:09 skrll Exp $");
#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: src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
diff -u src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.9 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.10
--- src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.9 Sun Aug 5 13:05:45 2018
+++ src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nitrogen6_machdep.c,v 1.9 2018/08/05 13:05:45 skrll Exp $ */
+/* $NetBSD: nitrogen6_machdep.c,v 1.10 2018/09/21 12:04:09 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,11 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.9 2018/08/05 13:05:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.10 2018/09/21 12:04:09 skrll Exp $");
#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: src/sys/arch/evbarm/nitrogen6/nitrogen6_start.S
diff -u src/sys/arch/evbarm/nitrogen6/nitrogen6_start.S:1.2 src/sys/arch/evbarm/nitrogen6/nitrogen6_start.S:1.3
--- src/sys/arch/evbarm/nitrogen6/nitrogen6_start.S:1.2 Fri Jun 9 18:14:59 2017
+++ src/sys/arch/evbarm/nitrogen6/nitrogen6_start.S Fri Sep 21 12:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nitrogen6_start.S,v 1.2 2017/06/09 18:14:59 ryo Exp $ */
+/* $NetBSD: nitrogen6_start.S,v 1.3 2018/09/21 12:04:09 skrll Exp $ */
/*-
* Copyright (c) 2014 Ryo Shimizu <r...@nerv.org>
@@ -27,6 +27,7 @@
*/
#include "opt_imx.h"
+#include "opt_console.h"
#include "opt_cpuoptions.h"
#include "opt_cputypes.h"
#include "opt_multiprocessor.h"
@@ -37,7 +38,7 @@
#include <arm/cortex/scu_reg.h>
#include "assym.h"
-RCSID("$NetBSD: nitrogen6_start.S,v 1.2 2017/06/09 18:14:59 ryo Exp $")
+RCSID("$NetBSD: nitrogen6_start.S,v 1.3 2018/09/21 12:04:09 skrll Exp $")
#ifndef CONADDR
#define CONADDR 0x021e8000
Index: src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
diff -u src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.22 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.23
--- src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c:1.22 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: npwr_fc_machdep.c,v 1.22 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: npwr_fc_machdep.c,v 1.23 2018/09/21 12:04:10 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,9 +73,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.22 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.23 2018/09/21 12:04:10 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: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.28 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.29
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.28 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.28 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.29 2018/09/21 12:04:10 skrll Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,9 +94,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.28 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.29 2018/09/21 12:04:10 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: src/sys/arch/evbarm/osk5912/osk5912_machdep.c
diff -u src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.18 src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.19
--- src/sys/arch/evbarm/osk5912/osk5912_machdep.c:1.18 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/osk5912/osk5912_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: osk5912_machdep.c,v 1.18 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: osk5912_machdep.c,v 1.19 2018/09/21 12:04:10 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -99,9 +99,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.18 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osk5912_machdep.c,v 1.19 2018/09/21 12:04:10 skrll Exp $");
#include "opt_arm_debug.h"
+#include "opt_console.h"
#include "opt_machdep.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
Index: src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.37 src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.38
--- src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c:1.37 Tue Jul 31 06:46:27 2018
+++ src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2410_machdep.c,v 1.37 2018/07/31 06:46:27 skrll Exp $ */
+/* $NetBSD: smdk2410_machdep.c,v 1.38 2018/09/21 12:04:10 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Fujitsu Component Limited
@@ -105,9 +105,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.37 2018/07/31 06:46:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.38 2018/09/21 12:04:10 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: src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
diff -u src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.43 src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.44
--- src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c:1.43 Thu Dec 22 14:47:56 2016
+++ src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: smdk2800_machdep.c,v 1.43 2016/12/22 14:47:56 cherry Exp $ */
+/* $NetBSD: smdk2800_machdep.c,v 1.44 2018/09/21 12:04:10 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
@@ -106,9 +106,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.43 2016/12/22 14:47:56 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.44 2018/09/21 12:04:10 skrll Exp $");
#include "opt_ddb.h"
+#include "opt_console.h"
#include "opt_kgdb.h"
#include "opt_pmap_debug.h"
#include "opt_md.h"
Index: src/sys/arch/evbarm/sunxi/sunxi_start.S
diff -u src/sys/arch/evbarm/sunxi/sunxi_start.S:1.3 src/sys/arch/evbarm/sunxi/sunxi_start.S:1.4
--- src/sys/arch/evbarm/sunxi/sunxi_start.S:1.3 Sat Mar 3 13:46:32 2018
+++ src/sys/arch/evbarm/sunxi/sunxi_start.S Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_start.S,v 1.3 2018/03/03 13:46:32 skrll Exp $ */
+/* $NetBSD: sunxi_start.S,v 1.4 2018/09/21 12:04:10 skrll Exp $ */
/*-
* Copyright (c) 2014, 2015 The NetBSD Foundation, Inc.
@@ -30,18 +30,18 @@
*/
#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>
#include <arm/armreg.h>
#include "assym.h"
-RCSID("$NetBSD: sunxi_start.S,v 1.3 2018/03/03 13:46:32 skrll Exp $")
+RCSID("$NetBSD: sunxi_start.S,v 1.4 2018/09/21 12:04:10 skrll Exp $")
#if defined(VERBOSE_INIT_ARM) && defined(CONSADDR)
#define XPUTC(n) mov r0, n; bl xputc
Index: src/sys/arch/evbarm/tegra/tegra_start.S
diff -u src/sys/arch/evbarm/tegra/tegra_start.S:1.17 src/sys/arch/evbarm/tegra/tegra_start.S:1.18
--- src/sys/arch/evbarm/tegra/tegra_start.S:1.17 Sun Apr 1 04:35:05 2018
+++ src/sys/arch/evbarm/tegra/tegra_start.S Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_start.S,v 1.17 2018/04/01 04:35:05 ryo Exp $ */
+/* $NetBSD: tegra_start.S,v 1.18 2018/09/21 12:04:10 skrll Exp $ */
/*-
* Copyright (c) 2014, 2015 The NetBSD Foundation, Inc.
@@ -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>
@@ -44,7 +44,7 @@
#include <arm/nvidia/tegra_reg.h>
#include <arm/nvidia/tegra_platform.h>
-RCSID("$NetBSD: tegra_start.S,v 1.17 2018/04/01 04:35:05 ryo Exp $")
+RCSID("$NetBSD: tegra_start.S,v 1.18 2018/09/21 12:04:10 skrll Exp $")
#if defined(VERBOSE_INIT_ARM) && defined(CONSADDR)
#define XPUTC(n) mov r0, n; bl xputc
Index: src/sys/arch/evbarm/ti/ti_start.S
diff -u src/sys/arch/evbarm/ti/ti_start.S:1.2 src/sys/arch/evbarm/ti/ti_start.S:1.3
--- src/sys/arch/evbarm/ti/ti_start.S:1.2 Sat Mar 3 13:46:33 2018
+++ src/sys/arch/evbarm/ti/ti_start.S Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_start.S,v 1.2 2018/03/03 13:46:33 skrll Exp $ */
+/* $NetBSD: ti_start.S,v 1.3 2018/09/21 12:04:10 skrll Exp $ */
/*-
* Copyright (c) 2014, 2015 The NetBSD Foundation, Inc.
@@ -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>
@@ -42,7 +42,7 @@
#include <arch/arm/ti/ti_platform.h>
-RCSID("$NetBSD: ti_start.S,v 1.2 2018/03/03 13:46:33 skrll Exp $")
+RCSID("$NetBSD: ti_start.S,v 1.3 2018/09/21 12:04:10 skrll Exp $")
#if defined(VERBOSE_INIT_ARM) && defined(CONSADDR)
#define XPUTC(n) mov r0, n; bl xputc
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.21 src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.22
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c:1.21 Sat Aug 4 16:21:40 2018
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp24xx_machdep.c,v 1.21 2018/08/04 16:21:40 skrll Exp $ */
+/* $NetBSD: sdp24xx_machdep.c,v 1.22 2018/09/21 12:04:10 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,9 +125,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.21 2018/08/04 16:21:40 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdp24xx_machdep.c,v 1.22 2018/09/21 12:04:10 skrll Exp $");
#include "opt_arm_debug.h"
+#include "opt_console.h"
#include "opt_machdep.h"
#include "opt_ddb.h"
#include "opt_kgdb.h"
Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c
diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.25 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.26
--- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.25 Tue Jul 31 06:46:28 2018
+++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tsarm_machdep.c,v 1.25 2018/07/31 06:46:28 skrll Exp $ */
+/* $NetBSD: tsarm_machdep.c,v 1.26 2018/09/21 12:04:10 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -73,9 +73,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.25 2018/07/31 06:46:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.26 2018/09/21 12:04:10 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: src/sys/arch/evbarm/viper/viper_machdep.c
diff -u src/sys/arch/evbarm/viper/viper_machdep.c:1.26 src/sys/arch/evbarm/viper/viper_machdep.c:1.27
--- src/sys/arch/evbarm/viper/viper_machdep.c:1.26 Tue Jul 31 06:46:28 2018
+++ src/sys/arch/evbarm/viper/viper_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: viper_machdep.c,v 1.26 2018/07/31 06:46:28 skrll Exp $ */
+/* $NetBSD: viper_machdep.c,v 1.27 2018/09/21 12:04:10 skrll Exp $ */
/*
* Startup routines for the Arcom Viper. Below you can trace the
@@ -112,9 +112,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.26 2018/07/31 06:46:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viper_machdep.c,v 1.27 2018/09/21 12:04:10 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: src/sys/arch/evbarm/zynq/zynq_machdep.c
diff -u src/sys/arch/evbarm/zynq/zynq_machdep.c:1.3 src/sys/arch/evbarm/zynq/zynq_machdep.c:1.4
--- src/sys/arch/evbarm/zynq/zynq_machdep.c:1.3 Sun Aug 12 20:28:38 2018
+++ src/sys/arch/evbarm/zynq/zynq_machdep.c Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_machdep.c,v 1.3 2018/08/12 20:28:38 skrll Exp $ */
+/* $NetBSD: zynq_machdep.c,v 1.4 2018/09/21 12:04:10 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,10 +29,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.3 2018/08/12 20:28:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.4 2018/09/21 12:04:10 skrll Exp $");
#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: src/sys/arch/evbarm/zynq/zynq_start.S
diff -u src/sys/arch/evbarm/zynq/zynq_start.S:1.1 src/sys/arch/evbarm/zynq/zynq_start.S:1.2
--- src/sys/arch/evbarm/zynq/zynq_start.S:1.1 Fri Jan 23 12:34:09 2015
+++ src/sys/arch/evbarm/zynq/zynq_start.S Fri Sep 21 12:04:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_start.S,v 1.1 2015/01/23 12:34:09 hkenken Exp $ */
+/* $NetBSD: zynq_start.S,v 1.2 2018/09/21 12:04:10 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,6 +30,7 @@
*/
#include "opt_zynq.h"
+#include "opt_console.h"
#include "opt_cpuoptions.h"
#include "opt_cputypes.h"
#include "opt_multiprocessor.h"
@@ -40,7 +41,7 @@
#include <arm/cortex/scu_reg.h>
#include "assym.h"
-RCSID("$NetBSD: zynq_start.S,v 1.1 2015/01/23 12:34:09 hkenken Exp $")
+RCSID("$NetBSD: zynq_start.S,v 1.2 2018/09/21 12:04:10 skrll Exp $")
#ifndef CONADDR
#define CONADDR 0xe0001000
