Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Centralise defparam CONSADDR, CONSPEED, CONMODE and...
details: https://anonhg.NetBSD.org/src/rev/374a99f355b5
branches: trunk
changeset: 836008:374a99f355b5
user: skrll <skrll%NetBSD.org@localhost>
date: Fri Sep 21 12:04:06 2018 +0000
description:
Centralise defparam CONSADDR, CONSPEED, CONMODE and CONADDR into
opt_console.h and adjust.
diffstat:
sys/arch/arm/amd/seattle_platform.c | 6 +++---
sys/arch/arm/amlogic/amlogic_board.c | 6 ++----
sys/arch/arm/amlogic/amlogic_com.c | 5 +++--
sys/arch/arm/amlogic/amlogic_cpufreq.c | 6 ++----
sys/arch/arm/amlogic/amlogic_io.c | 6 ++----
sys/arch/arm/amlogic/files.amlogic | 7 +------
sys/arch/arm/at91/at91bus.c | 5 +++--
sys/arch/arm/broadcom/files.bcm53xx | 6 +-----
sys/arch/arm/conf/files.arm | 8 +++++++-
sys/arch/arm/cortex/a9_mpsubr.S | 3 ++-
sys/arch/arm/fdt/files.fdt | 4 +---
sys/arch/arm/gemini/files.gemini | 3 +--
sys/arch/arm/nvidia/tegra_platform.c | 6 +++---
sys/arch/arm/omap/files.omap | 3 +--
sys/arch/arm/omap/files.omapl1x | 3 +--
sys/arch/arm/rockchip/rk_cru.c | 6 +++---
sys/arch/arm/rockchip/rk_platform.c | 6 +++---
sys/arch/arm/sa11x0/sa11x0_com.c | 5 +++--
sys/arch/arm/samsung/exynos_platform.c | 7 ++++---
sys/arch/arm/samsung/files.exynos | 7 +------
sys/arch/arm/sunxi/sunxi_ccu.c | 6 +++---
sys/arch/arm/sunxi/sunxi_platform.c | 6 +++---
sys/arch/arm/ti/ti_platform.c | 6 +++---
sys/arch/arm/vexpress/vexpress_platform.c | 6 +++---
sys/arch/arm/virt/virt_platform.c | 5 ++---
sys/arch/arm/zynq/files.zynq | 5 +----
sys/arch/evbarm/adi_brh/brh_machdep.c | 5 +++--
sys/arch/evbarm/amlogic/amlogic_machdep.c | 5 +++--
sys/arch/evbarm/armadaxp/armadaxp_machdep.c | 5 +++--
sys/arch/evbarm/armadillo/armadillo9_machdep.c | 5 +++--
sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c | 5 +++--
sys/arch/evbarm/bcm53xx/bcm53xx_start.S | 5 +++--
sys/arch/evbarm/beagle/beagle_machdep.c | 5 +++--
sys/arch/evbarm/beagle/beagle_start.S | 3 ++-
sys/arch/evbarm/conf/files.beagle | 3 +--
sys/arch/evbarm/conf/files.n900 | 3 +--
sys/arch/evbarm/conf/files.tisdp24xx | 3 +--
sys/arch/evbarm/exynos/exynos_start.S | 5 +++--
sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c | 3 ++-
sys/arch/evbarm/gemini/gemini_machdep.c | 5 +++--
sys/arch/evbarm/gumstix/gumstix_machdep.c | 3 ++-
sys/arch/evbarm/hawk/hawk_machdep.c | 3 ++-
sys/arch/evbarm/hdl_g/hdlg_machdep.c | 5 +++--
sys/arch/evbarm/imx31/imx31lk_machdep.c | 5 +++--
sys/arch/evbarm/imx7/imx7_machdep.c | 5 +++--
sys/arch/evbarm/imx7/imx7_start.S | 5 +++--
sys/arch/evbarm/integrator/integrator_machdep.c | 5 +++--
sys/arch/evbarm/iq80310/iq80310_machdep.c | 5 +++--
sys/arch/evbarm/iq80321/iq80321_machdep.c | 5 +++--
sys/arch/evbarm/ixdp425/ixdp425_machdep.c | 5 +++--
sys/arch/evbarm/ixm1200/ixm1200_machdep.c | 5 +++--
sys/arch/evbarm/kobo/kobo_machdep.c | 5 +++--
sys/arch/evbarm/lubbock/lubbock_machdep.c | 5 +++--
sys/arch/evbarm/marvell/marvell_machdep.c | 5 +++--
sys/arch/evbarm/mini2440/mini2440_machdep.c | 3 ++-
sys/arch/evbarm/netwalker/netwalker_machdep.c | 5 +++--
sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c | 5 +++--
sys/arch/evbarm/nitrogen6/nitrogen6_start.S | 5 +++--
sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c | 5 +++--
sys/arch/evbarm/nslu2/nslu2_machdep.c | 5 +++--
sys/arch/evbarm/osk5912/osk5912_machdep.c | 5 +++--
sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c | 5 +++--
sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c | 5 +++--
sys/arch/evbarm/sunxi/sunxi_start.S | 6 +++---
sys/arch/evbarm/tegra/tegra_start.S | 6 +++---
sys/arch/evbarm/ti/ti_start.S | 6 +++---
sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c | 5 +++--
sys/arch/evbarm/tsarm/tsarm_machdep.c | 5 +++--
sys/arch/evbarm/viper/viper_machdep.c | 5 +++--
sys/arch/evbarm/zynq/zynq_machdep.c | 5 +++--
sys/arch/evbarm/zynq/zynq_start.S | 5 +++--
71 files changed, 186 insertions(+), 168 deletions(-)
diffs (truncated from 1503 to 300 lines):
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/amd/seattle_platform.c
--- a/sys/arch/arm/amd/seattle_platform.c Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/amd/seattle_platform.c Fri Sep 21 12:04:06 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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>
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/amlogic/amlogic_board.c
--- a/sys/arch/arm/amlogic/amlogic_board.c Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/amlogic/amlogic_board.c Fri Sep 21 12:04:06 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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>
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/amlogic/amlogic_com.c
--- a/sys/arch/arm/amlogic/amlogic_com.c Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/amlogic/amlogic_com.c Fri Sep 21 12:04:06 2018 +0000
@@ -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 { \
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/amlogic/amlogic_cpufreq.c
--- a/sys/arch/arm/amlogic/amlogic_cpufreq.c Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/amlogic/amlogic_cpufreq.c Fri Sep 21 12:04:06 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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>
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/amlogic/amlogic_io.c
--- a/sys/arch/arm/amlogic/amlogic_io.c Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/amlogic/amlogic_io.c Fri Sep 21 12:04:06 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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>
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/amlogic/files.amlogic
--- a/sys/arch/arm/amlogic/files.amlogic Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/amlogic/files.amlogic Fri Sep 21 12:04:06 2018 +0000
@@ -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 @@
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
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/at91/at91bus.c
--- a/sys/arch/arm/at91/at91bus.c Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/at91/at91bus.c Fri Sep 21 12:04:06 2018 +0000
@@ -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"
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/broadcom/files.bcm53xx
--- a/sys/arch/arm/broadcom/files.bcm53xx Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/broadcom/files.bcm53xx Fri Sep 21 12:04:06 2018 +0000
@@ -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/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
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/conf/files.arm Fri Sep 21 12:04:06 2018 +0000
@@ -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 @@
# 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
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/cortex/a9_mpsubr.S
--- a/sys/arch/arm/cortex/a9_mpsubr.S Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/cortex/a9_mpsubr.S Fri Sep 21 12:04:06 2018 +0000
@@ -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"
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/fdt/files.fdt
--- a/sys/arch/arm/fdt/files.fdt Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/fdt/files.fdt Fri Sep 21 12:04:06 2018 +0000
@@ -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 @@
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
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/gemini/files.gemini
--- a/sys/arch/arm/gemini/files.gemini Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/gemini/files.gemini Fri Sep 21 12:04:06 2018 +0000
@@ -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 @@
# 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]}
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/nvidia/tegra_platform.c
--- a/sys/arch/arm/nvidia/tegra_platform.c Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/nvidia/tegra_platform.c Fri Sep 21 12:04:06 2018 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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>
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/omap/files.omap
--- a/sys/arch/arm/omap/files.omap Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/omap/files.omap Fri Sep 21 12:04:06 2018 +0000
@@ -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 @@
# 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
diff -r d69fc460bd8a -r 374a99f355b5 sys/arch/arm/omap/files.omapl1x
--- a/sys/arch/arm/omap/files.omapl1x Fri Sep 21 11:49:16 2018 +0000
+++ b/sys/arch/arm/omap/files.omapl1x Fri Sep 21 12:04:06 2018 +0000
@@ -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 @@
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
Home |
Main Index |
Thread Index |
Old Index