Module Name: src
Committed By: ryo
Date: Mon Mar 19 17:11:24 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: files.amlogic files.armadaxp files.awin
files.bcm53xx files.beagle files.evbarm files.fdt files.gemini
files.goldengate files.hawk files.imx23_olinuxino files.imx31
files.imx7 files.kobo files.n900 files.netwalker files.nitrogen6
files.osk5912 files.tisdp24xx files.zynq
Log Message:
move "defparam opt_machdep.h BOOT_ARGS" to files.evbarm from various places
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/files.amlogic \
src/sys/arch/evbarm/conf/files.bcm53xx \
src/sys/arch/evbarm/conf/files.gemini \
src/sys/arch/evbarm/conf/files.goldengate \
src/sys/arch/evbarm/conf/files.hawk src/sys/arch/evbarm/conf/files.imx7 \
src/sys/arch/evbarm/conf/files.osk5912 \
src/sys/arch/evbarm/conf/files.zynq
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/files.armadaxp \
src/sys/arch/evbarm/conf/files.awin \
src/sys/arch/evbarm/conf/files.imx23_olinuxino \
src/sys/arch/evbarm/conf/files.imx31
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/files.beagle
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/files.evbarm
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/files.fdt \
src/sys/arch/evbarm/conf/files.kobo \
src/sys/arch/evbarm/conf/files.nitrogen6 \
src/sys/arch/evbarm/conf/files.tisdp24xx
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/files.n900
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/files.netwalker
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/files.amlogic
diff -u src/sys/arch/evbarm/conf/files.amlogic:1.1 src/sys/arch/evbarm/conf/files.amlogic:1.2
--- src/sys/arch/evbarm/conf/files.amlogic:1.1 Sat Feb 7 17:20:16 2015
+++ src/sys/arch/evbarm/conf/files.amlogic Mon Mar 19 17:11:24 2018
@@ -1,10 +1,8 @@
-# $NetBSD: files.amlogic,v 1.1 2015/02/07 17:20:16 jmcneill Exp $
+# $NetBSD: files.amlogic,v 1.2 2018/03/19 17:11:24 ryo Exp $
#
# Amlogic configuration info
#
file arch/evbarm/amlogic/amlogic_machdep.c
-defparam opt_machdep.h BOOT_ARGS
-
include "arch/arm/amlogic/files.amlogic"
Index: src/sys/arch/evbarm/conf/files.bcm53xx
diff -u src/sys/arch/evbarm/conf/files.bcm53xx:1.1 src/sys/arch/evbarm/conf/files.bcm53xx:1.2
--- src/sys/arch/evbarm/conf/files.bcm53xx:1.1 Sat Sep 1 00:15:11 2012
+++ src/sys/arch/evbarm/conf/files.bcm53xx Mon Mar 19 17:11:24 2018
@@ -1,12 +1,9 @@
-# $NetBSD: files.bcm53xx,v 1.1 2012/09/01 00:15:11 matt Exp $
+# $NetBSD: files.bcm53xx,v 1.2 2018/03/19 17:11:24 ryo Exp $
#
# BCM5301X evaluation board configuration info
#
file arch/evbarm/bcm53xx/bcm53xx_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/broadcom/files.bcm53xx"
Index: src/sys/arch/evbarm/conf/files.gemini
diff -u src/sys/arch/evbarm/conf/files.gemini:1.1 src/sys/arch/evbarm/conf/files.gemini:1.2
--- src/sys/arch/evbarm/conf/files.gemini:1.1 Fri Oct 24 04:23:18 2008
+++ src/sys/arch/evbarm/conf/files.gemini Mon Mar 19 17:11:24 2018
@@ -1,12 +1,9 @@
-# $NetBSD: files.gemini,v 1.1 2008/10/24 04:23:18 matt Exp $
+# $NetBSD: files.gemini,v 1.2 2018/03/19 17:11:24 ryo Exp $
#
# GEMINI evaluation board configuration info
#
file arch/evbarm/gemini/gemini_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/gemini/files.gemini"
Index: src/sys/arch/evbarm/conf/files.goldengate
diff -u src/sys/arch/evbarm/conf/files.goldengate:1.1 src/sys/arch/evbarm/conf/files.goldengate:1.2
--- src/sys/arch/evbarm/conf/files.goldengate:1.1 Tue Feb 19 16:12:36 2013
+++ src/sys/arch/evbarm/conf/files.goldengate Mon Mar 19 17:11:24 2018
@@ -1,12 +1,9 @@
-# $NetBSD: files.goldengate,v 1.1 2013/02/19 16:12:36 matt Exp $
+# $NetBSD: files.goldengate,v 1.2 2018/03/19 17:11:24 ryo Exp $
#
# GoldenGate evaluation board configuration info
#
file arch/evbarm/goldengate/g2_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/cortina/files.g2"
Index: src/sys/arch/evbarm/conf/files.hawk
diff -u src/sys/arch/evbarm/conf/files.hawk:1.1 src/sys/arch/evbarm/conf/files.hawk:1.2
--- src/sys/arch/evbarm/conf/files.hawk:1.1 Wed Oct 2 16:48:26 2013
+++ src/sys/arch/evbarm/conf/files.hawk Mon Mar 19 17:11:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.hawk,v 1.1 2013/10/02 16:48:26 matt Exp $
+# $NetBSD: files.hawk,v 1.2 2018/03/19 17:11:24 ryo Exp $
#
# Hawk board configuration info
#
@@ -7,9 +7,6 @@ file arch/arm/arm32/arm32_boot.c
file arch/arm/arm32/arm32_kvminit.c
file arch/evbarm/hawk/hawk_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/omap/files.omapl1x"
Index: src/sys/arch/evbarm/conf/files.imx7
diff -u src/sys/arch/evbarm/conf/files.imx7:1.1 src/sys/arch/evbarm/conf/files.imx7:1.2
--- src/sys/arch/evbarm/conf/files.imx7:1.1 Tue May 17 06:44:46 2016
+++ src/sys/arch/evbarm/conf/files.imx7 Mon Mar 19 17:11:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.imx7,v 1.1 2016/05/17 06:44:46 ryo Exp $
+# $NetBSD: files.imx7,v 1.2 2018/03/19 17:11:24 ryo Exp $
#
# i.MX7
#
@@ -6,8 +6,5 @@
file arch/evbarm/imx7/imx7_machdep.c
file arch/evbarm/imx7/imx7_ioconfig.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/imx/files.imx7"
Index: src/sys/arch/evbarm/conf/files.osk5912
diff -u src/sys/arch/evbarm/conf/files.osk5912:1.1 src/sys/arch/evbarm/conf/files.osk5912:1.2
--- src/sys/arch/evbarm/conf/files.osk5912:1.1 Sat Jan 6 08:16:26 2007
+++ src/sys/arch/evbarm/conf/files.osk5912 Mon Mar 19 17:11:24 2018
@@ -1,13 +1,10 @@
-# $NetBSD: files.osk5912,v 1.1 2007/01/06 08:16:26 christos Exp $
+# $NetBSD: files.osk5912,v 1.2 2018/03/19 17:11:24 ryo Exp $
#
# TI OSK5912 evaluation board configuration info
#
file arch/evbarm/osk5912/osk5912_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/omap/files.omap"
Index: src/sys/arch/evbarm/conf/files.zynq
diff -u src/sys/arch/evbarm/conf/files.zynq:1.1 src/sys/arch/evbarm/conf/files.zynq:1.2
--- src/sys/arch/evbarm/conf/files.zynq:1.1 Fri Jan 23 12:34:09 2015
+++ src/sys/arch/evbarm/conf/files.zynq Mon Mar 19 17:11:24 2018
@@ -1,12 +1,9 @@
-# $NetBSD: files.zynq,v 1.1 2015/01/23 12:34:09 hkenken Exp $
+# $NetBSD: files.zynq,v 1.2 2018/03/19 17:11:24 ryo Exp $
#
# ZYNQ evaluation board configuration info
#
file arch/evbarm/zynq/zynq_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/zynq/files.zynq"
Index: src/sys/arch/evbarm/conf/files.armadaxp
diff -u src/sys/arch/evbarm/conf/files.armadaxp:1.3 src/sys/arch/evbarm/conf/files.armadaxp:1.4
--- src/sys/arch/evbarm/conf/files.armadaxp:1.3 Sat Mar 29 14:13:17 2014
+++ src/sys/arch/evbarm/conf/files.armadaxp Mon Mar 19 17:11:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.armadaxp,v 1.3 2014/03/29 14:13:17 matt Exp $
+# $NetBSD: files.armadaxp,v 1.4 2018/03/19 17:11:24 ryo Exp $
#
# Marvell Armada XP configuration info
#
@@ -8,8 +8,6 @@ file arch/arm/arm32/arm32_reboot.c
file arch/evbarm/armadaxp/armadaxp_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
defflag opt_cputypes.h L2CACHE_ENABLE
defflag opt_cputypes.h AURORA_IO_CACHE_COHERENCY AURORA_L2_PT_WALK
Index: src/sys/arch/evbarm/conf/files.awin
diff -u src/sys/arch/evbarm/conf/files.awin:1.3 src/sys/arch/evbarm/conf/files.awin:1.4
--- src/sys/arch/evbarm/conf/files.awin:1.3 Wed Oct 22 00:46:15 2014
+++ src/sys/arch/evbarm/conf/files.awin Mon Mar 19 17:11:24 2018
@@ -1,13 +1,10 @@
-# $NetBSD: files.awin,v 1.3 2014/10/22 00:46:15 jmcneill Exp $
+# $NetBSD: files.awin,v 1.4 2018/03/19 17:11:24 ryo Exp $
#
# Allwinner AXX evaluation board configuration info
#
file arch/evbarm/awin/awin_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# System config
defflag opt_allwinner.h AWIN_SYSCONFIG
Index: src/sys/arch/evbarm/conf/files.imx23_olinuxino
diff -u src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.3 src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.4
--- src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.3 Sat Jan 10 12:18:09 2015
+++ src/sys/arch/evbarm/conf/files.imx23_olinuxino Mon Mar 19 17:11:24 2018
@@ -1,4 +1,4 @@
-# $Id: files.imx23_olinuxino,v 1.3 2015/01/10 12:18:09 jmcneill Exp $
+# $Id: files.imx23_olinuxino,v 1.4 2018/03/19 17:11:24 ryo Exp $
#
# Olimex i.MX23 OLinuXino board configuration info.
#
@@ -6,9 +6,6 @@
# Pull in SoC support
include "arch/arm/imx/files.imx23"
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
file arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
file arch/arm/arm32/arm32_kvminit.c
file arch/arm/arm32/arm32_boot.c
Index: src/sys/arch/evbarm/conf/files.imx31
diff -u src/sys/arch/evbarm/conf/files.imx31:1.3 src/sys/arch/evbarm/conf/files.imx31:1.4
--- src/sys/arch/evbarm/conf/files.imx31:1.3 Sat Nov 13 04:53:58 2010
+++ src/sys/arch/evbarm/conf/files.imx31 Mon Mar 19 17:11:24 2018
@@ -1,18 +1,15 @@
#
-# $Id: files.imx31,v 1.3 2010/11/13 04:53:58 bsh Exp $
+# $Id: files.imx31,v 1.4 2018/03/19 17:11:24 ryo Exp $
#
# derived from:
-# $NetBSD: files.imx31,v 1.3 2010/11/13 04:53:58 bsh Exp $
+# $NetBSD: files.imx31,v 1.4 2018/03/19 17:11:24 ryo Exp $
#
# Freescale iMX31 evaluation board configuration info
#
file arch/evbarm/imx31/imx31lk_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/imx/files.imx31"
Index: src/sys/arch/evbarm/conf/files.beagle
diff -u src/sys/arch/evbarm/conf/files.beagle:1.4 src/sys/arch/evbarm/conf/files.beagle:1.5
--- src/sys/arch/evbarm/conf/files.beagle:1.4 Wed Sep 5 00:09:35 2012
+++ src/sys/arch/evbarm/conf/files.beagle Mon Mar 19 17:11:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.beagle,v 1.4 2012/09/05 00:09:35 matt Exp $
+# $NetBSD: files.beagle,v 1.5 2018/03/19 17:11:24 ryo Exp $
#
# TI OMAP2 evaluation board configuration info
#
@@ -9,9 +9,6 @@ file arch/arm/arm32/arm32_reboot.c
file arch/evbarm/beagle/beagle_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/omap/files.omap2"
Index: src/sys/arch/evbarm/conf/files.evbarm
diff -u src/sys/arch/evbarm/conf/files.evbarm:1.28 src/sys/arch/evbarm/conf/files.evbarm:1.29
--- src/sys/arch/evbarm/conf/files.evbarm:1.28 Mon Dec 18 15:53:38 2017
+++ src/sys/arch/evbarm/conf/files.evbarm Mon Mar 19 17:11:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.evbarm,v 1.28 2017/12/18 15:53:38 skrll Exp $
+# $NetBSD: files.evbarm,v 1.29 2018/03/19 17:11:24 ryo Exp $
#
# First try for arm-specific configuration info
#
@@ -37,6 +37,10 @@ include "dev/sdmmc/files.sdmmc" # SD/M
include "dev/scsipi/files.scsipi" # SCSI devices
include "dev/usb/files.usb" # USB devices
+
+# Kernel boot arguments
+defparam opt_machdep.h BOOT_ARGS
+
#
# ARM evaluation board specific devices
#
Index: src/sys/arch/evbarm/conf/files.fdt
diff -u src/sys/arch/evbarm/conf/files.fdt:1.2 src/sys/arch/evbarm/conf/files.fdt:1.3
--- src/sys/arch/evbarm/conf/files.fdt:1.2 Wed Aug 30 23:57:27 2017
+++ src/sys/arch/evbarm/conf/files.fdt Mon Mar 19 17:11:24 2018
@@ -1,10 +1,8 @@
-# $NetBSD: files.fdt,v 1.2 2017/08/30 23:57:27 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.3 2018/03/19 17:11:24 ryo Exp $
#
# FDT-based kernel configuration info
#
file arch/evbarm/fdt/fdt_machdep.c
-defparam opt_machdep.h BOOT_ARGS
-
include "arch/arm/fdt/files.fdt"
Index: src/sys/arch/evbarm/conf/files.kobo
diff -u src/sys/arch/evbarm/conf/files.kobo:1.2 src/sys/arch/evbarm/conf/files.kobo:1.3
--- src/sys/arch/evbarm/conf/files.kobo:1.2 Thu May 7 04:13:47 2015
+++ src/sys/arch/evbarm/conf/files.kobo Mon Mar 19 17:11:24 2018
@@ -1,13 +1,10 @@
-# $NetBSD: files.kobo,v 1.2 2015/05/07 04:13:47 hkenken Exp $
+# $NetBSD: files.kobo,v 1.3 2018/03/19 17:11:24 ryo Exp $
#
# KOBO evaluation board configuration info
#
file arch/evbarm/kobo/kobo_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/imx/files.imx51"
Index: src/sys/arch/evbarm/conf/files.nitrogen6
diff -u src/sys/arch/evbarm/conf/files.nitrogen6:1.2 src/sys/arch/evbarm/conf/files.nitrogen6:1.3
--- src/sys/arch/evbarm/conf/files.nitrogen6:1.2 Thu Jul 30 08:09:36 2015
+++ src/sys/arch/evbarm/conf/files.nitrogen6 Mon Mar 19 17:11:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.nitrogen6,v 1.2 2015/07/30 08:09:36 ryo Exp $
+# $NetBSD: files.nitrogen6,v 1.3 2018/03/19 17:11:24 ryo Exp $
#
# Nitrogen6X
#
@@ -6,9 +6,6 @@
file arch/evbarm/nitrogen6/nitrogen6_machdep.c
file arch/evbarm/nitrogen6/nitrogen6_iomux.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/imx/files.imx6"
Index: src/sys/arch/evbarm/conf/files.tisdp24xx
diff -u src/sys/arch/evbarm/conf/files.tisdp24xx:1.2 src/sys/arch/evbarm/conf/files.tisdp24xx:1.3
--- src/sys/arch/evbarm/conf/files.tisdp24xx:1.2 Sun Apr 27 18:58:46 2008
+++ src/sys/arch/evbarm/conf/files.tisdp24xx Mon Mar 19 17:11:24 2018
@@ -1,13 +1,10 @@
-# $NetBSD: files.tisdp24xx,v 1.2 2008/04/27 18:58:46 matt Exp $
+# $NetBSD: files.tisdp24xx,v 1.3 2018/03/19 17:11:24 ryo Exp $
#
# TI OMAP2 evaluation board configuration info
#
file arch/evbarm/tisdp24xx/sdp24xx_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/omap/files.omap2"
Index: src/sys/arch/evbarm/conf/files.n900
diff -u src/sys/arch/evbarm/conf/files.n900:1.5 src/sys/arch/evbarm/conf/files.n900:1.6
--- src/sys/arch/evbarm/conf/files.n900:1.5 Mon May 6 22:56:55 2013
+++ src/sys/arch/evbarm/conf/files.n900 Mon Mar 19 17:11:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.n900,v 1.5 2013/05/06 22:56:55 khorben Exp $
+# $NetBSD: files.n900,v 1.6 2018/03/19 17:11:24 ryo Exp $
#
# Nokia N900 configuration info
#
@@ -9,9 +9,6 @@ file arch/arm/arm32/arm32_reboot.c
file arch/evbarm/beagle/beagle_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/omap/files.omap2"
Index: src/sys/arch/evbarm/conf/files.netwalker
diff -u src/sys/arch/evbarm/conf/files.netwalker:1.10 src/sys/arch/evbarm/conf/files.netwalker:1.11
--- src/sys/arch/evbarm/conf/files.netwalker:1.10 Mon Dec 21 04:26:29 2015
+++ src/sys/arch/evbarm/conf/files.netwalker Mon Mar 19 17:11:24 2018
@@ -1,13 +1,10 @@
-# $NetBSD: files.netwalker,v 1.10 2015/12/21 04:26:29 hkenken Exp $
+# $NetBSD: files.netwalker,v 1.11 2018/03/19 17:11:24 ryo Exp $
#
# Sharp Netwalker configuration info
#
file arch/evbarm/netwalker/netwalker_machdep.c
-# Kernel boot arguments
-defparam opt_machdep.h BOOT_ARGS
-
# CPU support and integrated peripherals
include "arch/arm/imx/files.imx51"
