Module Name: src
Committed By: skrll
Date: Sun Oct 7 07:48:44 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: std.adi_brh std.altera std.amlogic
std.armadaxp std.armadillo9 std.bcm53xx std.beagle std.cp3100
std.exynos std.g42xxeb std.gemini std.generic64 std.gumstix
std.hawk std.hdl_g std.igepv2 std.imx23_olinuxino std.imx31
std.imx6ul std.imx7 std.integrator std.integrator_cp std.iq31244
std.iq80310 std.iq80321 std.ixdp425 std.ixm1200 std.kobo
std.lubbock std.marvell std.mini2440 std.mmnet std.mpcsa std.mv2120
std.n900 std.netwalker std.nitrogen6 std.npwr_fc std.nslu2
std.osk5912 std.overo std.rpi std.smdk2410 std.smdk2800 std.sunxi
std.tegra std.ti std.tisdp24xx std.tsarm std.vexpress std.viper
std.virt std.zynq
Log Message:
Whitespace consistency.
{make,}options<space><tab>
everything else just <tab?
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/std.adi_brh \
src/sys/arch/evbarm/conf/std.lubbock \
src/sys/arch/evbarm/conf/std.netwalker
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.altera \
src/sys/arch/evbarm/conf/std.hawk src/sys/arch/evbarm/conf/std.imx6ul \
src/sys/arch/evbarm/conf/std.ti
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/std.amlogic \
src/sys/arch/evbarm/conf/std.mpcsa src/sys/arch/evbarm/conf/std.virt
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/std.armadaxp \
src/sys/arch/evbarm/conf/std.imx23_olinuxino \
src/sys/arch/evbarm/conf/std.mini2440 src/sys/arch/evbarm/conf/std.sunxi
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.armadillo9 \
src/sys/arch/evbarm/conf/std.npwr_fc \
src/sys/arch/evbarm/conf/std.vexpress
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/std.bcm53xx \
src/sys/arch/evbarm/conf/std.beagle
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/std.cp3100 \
src/sys/arch/evbarm/conf/std.marvell src/sys/arch/evbarm/conf/std.n900 \
src/sys/arch/evbarm/conf/std.nitrogen6 src/sys/arch/evbarm/conf/std.nslu2 \
src/sys/arch/evbarm/conf/std.osk5912
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.exynos \
src/sys/arch/evbarm/conf/std.hdl_g
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/std.g42xxeb \
src/sys/arch/evbarm/conf/std.gemini src/sys/arch/evbarm/conf/std.igepv2 \
src/sys/arch/evbarm/conf/std.overo src/sys/arch/evbarm/conf/std.smdk2410 \
src/sys/arch/evbarm/conf/std.tsarm src/sys/arch/evbarm/conf/std.viper
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/std.generic64 \
src/sys/arch/evbarm/conf/std.imx7 \
src/sys/arch/evbarm/conf/std.integrator_cp \
src/sys/arch/evbarm/conf/std.kobo src/sys/arch/evbarm/conf/std.mmnet \
src/sys/arch/evbarm/conf/std.mv2120 src/sys/arch/evbarm/conf/std.zynq
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/std.gumstix \
src/sys/arch/evbarm/conf/std.imx31 src/sys/arch/evbarm/conf/std.tisdp24xx
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/std.integrator
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/std.iq31244
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/std.iq80310
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/std.iq80321 \
src/sys/arch/evbarm/conf/std.smdk2800 src/sys/arch/evbarm/conf/std.tegra
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.ixdp425
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/std.ixm1200
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/std.rpi
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/std.adi_brh
diff -u src/sys/arch/evbarm/conf/std.adi_brh:1.10 src/sys/arch/evbarm/conf/std.adi_brh:1.11
--- src/sys/arch/evbarm/conf/std.adi_brh:1.10 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.adi_brh Sun Oct 7 07:48:43 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.adi_brh,v 1.10 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.adi_brh,v 1.11 2018/10/07 07:48:43 skrll Exp $
#
# standard NetBSD/evbarm for ADI BRH options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in ADI BRH config definitions.
@@ -11,9 +11,9 @@ include "arch/evbarm/conf/files.adi_brh
options EXEC_AOUT
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDTYPE="adi_brh"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.adi_brh"
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDTYPE="adi_brh"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.adi_brh"
options ARM_INTR_IMPL="<arch/arm/xscale/becc_intr.h>"
Index: src/sys/arch/evbarm/conf/std.lubbock
diff -u src/sys/arch/evbarm/conf/std.lubbock:1.10 src/sys/arch/evbarm/conf/std.lubbock:1.11
--- src/sys/arch/evbarm/conf/std.lubbock:1.10 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.lubbock Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.lubbock,v 1.10 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.lubbock,v 1.11 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for LUBBOCK options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in LUBBOCK config definitions.
@@ -12,13 +12,13 @@ options COTULLA
options LUBBOCK
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDTYPE="lubbock"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.lubbock"
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDTYPE="lubbock"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.lubbock"
options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
# OS Timer This is compatible to SA1110's OS Timer.
-saost* at pxaip? addr 0x40a00000 size 0x20
+saost* at pxaip? addr 0x40a00000 size 0x20
Index: src/sys/arch/evbarm/conf/std.netwalker
diff -u src/sys/arch/evbarm/conf/std.netwalker:1.10 src/sys/arch/evbarm/conf/std.netwalker:1.11
--- src/sys/arch/evbarm/conf/std.netwalker:1.10 Sun Aug 24 07:59:22 2014
+++ src/sys/arch/evbarm/conf/std.netwalker Sun Oct 7 07:48:44 2018
@@ -1,18 +1,18 @@
-# $NetBSD: std.netwalker,v 1.10 2014/08/24 07:59:22 jnemeth Exp $
+# $NetBSD: std.netwalker,v 1.11 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm options for Sharp NetWalker
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in i.mx51 config definitions.
-include "arch/evbarm/conf/files.netwalker"
+include "arch/evbarm/conf/files.netwalker"
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_CPU_COUNTER
-options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options ARM_HAS_VBAR
options TPIDRPRW_IS_CURCPU
options CORTEX_PMC
@@ -21,9 +21,9 @@ options KERNEL_BASE_EXT=0x80000000
options EVBARM_BOARDTYPE="netwalker"
options FPU_VFP
-makeoptions LOADADDRESS="0x90100000"
-makeoptions BOARDTYPE="netwalker"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.netwalker"
+makeoptions LOADADDRESS="0x90100000"
+makeoptions BOARDTYPE="netwalker"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.netwalker"
options ARM_INTR_IMPL="<arch/arm/imx/imx51_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.altera
diff -u src/sys/arch/evbarm/conf/std.altera:1.1 src/sys/arch/evbarm/conf/std.altera:1.2
--- src/sys/arch/evbarm/conf/std.altera:1.1 Wed Sep 19 17:31:39 2018
+++ src/sys/arch/evbarm/conf/std.altera Sun Oct 7 07:48:43 2018
@@ -1,22 +1,22 @@
-# $NetBSD: std.altera,v 1.1 2018/09/19 17:31:39 aymeric Exp $
+# $NetBSD: std.altera,v 1.2 2018/10/07 07:48:43 skrll Exp $
-machine evbarm arm
+machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
-include "arch/evbarm/conf/files.altera"
+include "arch/evbarm/conf/std.evbarm"
+include "arch/evbarm/conf/files.altera"
-options FDT
options DRAM_BLOCKS=256
+options FDT
options FPU_VFP
-options TPIDRPRW_IS_CURCPU
options ARM_HAS_VBAR
options ARM_GENERIC_TODR
options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options __HAVE_FAST_SOFTINTS
+options TPIDRPRW_IS_CURCPU
+options __BUS_SPACE_HAS_STREAM_METHODS
options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_FAST_SOFTINTS
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options __BUS_SPACE_HAS_STREAM_METHODS
options KERNEL_BASE_EXT=0x80000000
Index: src/sys/arch/evbarm/conf/std.hawk
diff -u src/sys/arch/evbarm/conf/std.hawk:1.1 src/sys/arch/evbarm/conf/std.hawk:1.2
--- src/sys/arch/evbarm/conf/std.hawk:1.1 Wed Oct 2 16:48:26 2013
+++ src/sys/arch/evbarm/conf/std.hawk Sun Oct 7 07:48:44 2018
@@ -1,13 +1,13 @@
-# $NetBSD: std.hawk,v 1.1 2013/10/02 16:48:26 matt Exp $
+# $NetBSD: std.hawk,v 1.2 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for hawk options
-machine evbarm arm
+machine evbarm arm
include "conf/std" # MI standard options
include "arch/arm/conf/std.arm" # arch standard options
# Pull in omapl1x config definitions.
-include "arch/evbarm/conf/files.hawk"
+include "arch/evbarm/conf/files.hawk"
options EXEC_ELF32
options EXEC_SCRIPT
@@ -16,10 +16,10 @@ options EXEC_SCRIPT
options ARM32
options KERNEL_BASE_EXT=0xc0000000
-makeoptions KERNEL_BASE_PHYS=0xc0200000
-makeoptions KERNEL_BASE_VIRT=0xc0200000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDTYPE="hawk"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.hawk"
+makeoptions KERNEL_BASE_PHYS=0xc0200000
+makeoptions KERNEL_BASE_VIRT=0xc0200000
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDTYPE="hawk"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.hawk"
options ARM_INTR_IMPL="<arch/arm/omap/omapl1x_intr.h>"
Index: src/sys/arch/evbarm/conf/std.imx6ul
diff -u src/sys/arch/evbarm/conf/std.imx6ul:1.1 src/sys/arch/evbarm/conf/std.imx6ul:1.2
--- src/sys/arch/evbarm/conf/std.imx6ul:1.1 Fri Jun 9 18:14:59 2017
+++ src/sys/arch/evbarm/conf/std.imx6ul Sun Oct 7 07:48:44 2018
@@ -1,12 +1,12 @@
-# $NetBSD: std.imx6ul,v 1.1 2017/06/09 18:14:59 ryo Exp $
+# $NetBSD: std.imx6ul,v 1.2 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm options for i.MX6UL
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in nitrogen6 config definitions.
-include "arch/evbarm/conf/files.nitrogen6"
+include "arch/evbarm/conf/files.nitrogen6"
options NITROGEN6
@@ -28,8 +28,8 @@ options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x80800000"
makeoptions KERNEL_BASE_VIRT="0x80800000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx6ul"
-makeoptions CPPFLAGS+="-I$S/../../../include"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx6ul"
+makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/imx/imx6_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.ti
diff -u src/sys/arch/evbarm/conf/std.ti:1.1 src/sys/arch/evbarm/conf/std.ti:1.2
--- src/sys/arch/evbarm/conf/std.ti:1.1 Thu Oct 26 01:16:32 2017
+++ src/sys/arch/evbarm/conf/std.ti Sun Oct 7 07:48:44 2018
@@ -1,16 +1,16 @@
-# $NetBSD: std.ti,v 1.1 2017/10/26 01:16:32 jakllsch Exp $
+# $NetBSD: std.ti,v 1.2 2018/10/07 07:48:44 skrll Exp $
#
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
-include "arch/evbarm/conf/files.ti"
+include "arch/evbarm/conf/files.ti"
options FDT
options DRAM_BLOCKS=256
options __HAVE_CPU_COUNTER
-options __HAVE_FAST_SOFTINTS
+options __HAVE_FAST_SOFTINTS
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options ARM_HAS_VBAR
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
@@ -21,8 +21,8 @@ options __BUS_SPACE_HAS_STREAM_METHODS
options __HAVE_GENERIC_CPU_INITCLOCKS
options LOADADDRESS="0x80008000"
-makeoptions KERNEL_BASE_PHYS="0x80008000"
-makeoptions KERNEL_BASE_VIRT="0x80008000"
+makeoptions KERNEL_BASE_PHYS="0x80008000"
+makeoptions KERNEL_BASE_VIRT="0x80008000"
makeoptions BOARDTYPE="TI"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.ti"
makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
Index: src/sys/arch/evbarm/conf/std.amlogic
diff -u src/sys/arch/evbarm/conf/std.amlogic:1.3 src/sys/arch/evbarm/conf/std.amlogic:1.4
--- src/sys/arch/evbarm/conf/std.amlogic:1.3 Sat Jul 1 14:51:59 2017
+++ src/sys/arch/evbarm/conf/std.amlogic Sun Oct 7 07:48:43 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.amlogic,v 1.3 2017/07/01 14:51:59 skrll Exp $
+# $NetBSD: std.amlogic,v 1.4 2018/10/07 07:48:43 skrll Exp $
#
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.amlogic"
@@ -18,10 +18,10 @@ options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
-makeoptions KERNEL_BASE_PHYS="0x00100000"
-makeoptions KERNEL_BASE_VIRT="0x80100000"
-makeoptions BOARDTYPE="amlogic"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.amlogic"
+makeoptions KERNEL_BASE_PHYS="0x00100000"
+makeoptions KERNEL_BASE_VIRT="0x80100000"
+makeoptions BOARDTYPE="amlogic"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.amlogic"
options ARM_INTR_IMPL="<arch/arm/amlogic/amlogic_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.mpcsa
diff -u src/sys/arch/evbarm/conf/std.mpcsa:1.3 src/sys/arch/evbarm/conf/std.mpcsa:1.4
--- src/sys/arch/evbarm/conf/std.mpcsa:1.3 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.mpcsa Sun Oct 7 07:48:44 2018
@@ -1,28 +1,28 @@
-# $NetBSD: std.mpcsa,v 1.3 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.mpcsa,v 1.4 2018/10/07 07:48:44 skrll Exp $
#
# NetBSD/evbarm options for MPCSA evaluation board
#
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in MPCSA config definitions.
include "arch/evbarm/conf/files.mpcsa"
-options AT91RM9200 # enable AT91RM9200 support
+options AT91RM9200 # enable AT91RM9200 support
options EXEC_AOUT
options ARM_GENERIC_TODR
# timer speed
-options HZ=1000
+options HZ=1000
options KERNEL_BASE_EXT=0xc0000000
-makeoptions BOARDTYPE="mpcsa"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.mpcsa"
-makeoptions KERNEL_BASE_PHYS=0x20200000
-makeoptions KERNEL_BASE_VIRT=0xc0200000
+makeoptions BOARDTYPE="mpcsa"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.mpcsa"
+makeoptions KERNEL_BASE_PHYS=0x20200000
+makeoptions KERNEL_BASE_VIRT=0xc0200000
options ARM_INTR_IMPL="<arch/arm/at91/at91intr.h>"
Index: src/sys/arch/evbarm/conf/std.virt
diff -u src/sys/arch/evbarm/conf/std.virt:1.3 src/sys/arch/evbarm/conf/std.virt:1.4
--- src/sys/arch/evbarm/conf/std.virt:1.3 Fri Jun 15 15:22:01 2018
+++ src/sys/arch/evbarm/conf/std.virt Sun Oct 7 07:48:44 2018
@@ -1,12 +1,12 @@
-# $NetBSD: std.virt,v 1.3 2018/06/15 15:22:01 jakllsch Exp $
+# $NetBSD: std.virt,v 1.4 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for VIRT options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in VIRT config definitions
-include "arch/evbarm/conf/files.virt"
+include "arch/evbarm/conf/files.virt"
options FDT # Flattened Device Tree support
options DRAM_BLOCKS=256
@@ -21,16 +21,16 @@ options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
-makeoptions KERNEL_BASE_PHYS="0x41000000"
-makeoptions KERNEL_BASE_VIRT="0x81000000"
-makeoptions BOARDTYPE="virt"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.virt"
-makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
+makeoptions KERNEL_BASE_PHYS="0x41000000"
+makeoptions KERNEL_BASE_VIRT="0x81000000"
+makeoptions BOARDTYPE="virt"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.virt"
+makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
-options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
+options ARM_GENERIC_TODR
# initrd support
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_DYNAMIC
-pseudo-device md
+options MEMORY_DISK_HOOKS
+options MEMORY_DISK_DYNAMIC
+pseudo-device md
Index: src/sys/arch/evbarm/conf/std.armadaxp
diff -u src/sys/arch/evbarm/conf/std.armadaxp:1.4 src/sys/arch/evbarm/conf/std.armadaxp:1.5
--- src/sys/arch/evbarm/conf/std.armadaxp:1.4 Sat Jul 1 09:26:51 2017
+++ src/sys/arch/evbarm/conf/std.armadaxp Sun Oct 7 07:48:43 2018
@@ -1,11 +1,11 @@
-# $NetBSD: std.armadaxp,v 1.4 2017/07/01 09:26:51 skrll Exp $
+# $NetBSD: std.armadaxp,v 1.5 2018/10/07 07:48:43 skrll Exp $
#
# standard NetBSD/evbarm for ARMADAXP options
machine evbarm arm
include "conf/std" # MI standard options
-include "arch/evbarm/conf/files.armadaxp"
+include "arch/evbarm/conf/files.armadaxp"
options EXEC_ELF32
options EXEC_SCRIPT
@@ -18,20 +18,20 @@ options __HAVE_CPU_UAREA_ALLOC_IDLELWP
# Build for armv7-a, soft-floats only
-makeoptions CPUFLAGS="-march=armv7-a -msoft-float"
+makeoptions CPUFLAGS="-march=armv7-a -msoft-float"
options KERNEL_BASE_EXT=0x80000000
options STARTUP_PAGETABLE_ADDR=0x00100000
options MEMSTART=0x00000000
-makeoptions LOADADDRESS="0x00200000"
-makeoptions KERNEL_BASE_PHYS="0x00200000"
-makeoptions KERNEL_BASE_VIRT="0x80200000"
+makeoptions LOADADDRESS="0x00200000"
+makeoptions KERNEL_BASE_PHYS="0x00200000"
+makeoptions KERNEL_BASE_VIRT="0x80200000"
-makeoptions BOARDTYPE="armadaxp"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadaxp"
+makeoptions BOARDTYPE="armadaxp"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadaxp"
options EVBARM_BOARDTYPE="Armada XP"
-options ARM_HAS_VBAR
+options ARM_HAS_VBAR
options ARM_INTR_IMPL="<arch/arm/marvell/mvsoc_intr.h>"
options COM_REGMAP
options COM_16750
Index: src/sys/arch/evbarm/conf/std.imx23_olinuxino
diff -u src/sys/arch/evbarm/conf/std.imx23_olinuxino:1.4 src/sys/arch/evbarm/conf/std.imx23_olinuxino:1.5
--- src/sys/arch/evbarm/conf/std.imx23_olinuxino:1.4 Mon Oct 7 17:36:40 2013
+++ src/sys/arch/evbarm/conf/std.imx23_olinuxino Sun Oct 7 07:48:44 2018
@@ -1,18 +1,18 @@
-# $Id: std.imx23_olinuxino,v 1.4 2013/10/07 17:36:40 matt Exp $
+# $Id: std.imx23_olinuxino,v 1.5 2018/10/07 07:48:44 skrll Exp $
#
# IMX23_OLINUXINO standard kernel options.
machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
-options CPU_ARM9E
+options CPU_ARM9E
-options ARM_INTR_IMPL="<arch/arm/imx/imx23_intr.h>"
-options EVBARM_BOARDTYPE=OLinuXino
-options KERNEL_BASE_EXT=0xc0000000
+options ARM_INTR_IMPL="<arch/arm/imx/imx23_intr.h>"
+options EVBARM_BOARDTYPE=OLinuXino
+options KERNEL_BASE_EXT=0xc0000000
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx23_olinuxino"
-makeoptions CPUFLAGS="-march=armv5te -mtune=arm926ej-s"
-makeoptions LOADADDRESS="0x40000000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx23_olinuxino"
+makeoptions CPUFLAGS="-march=armv5te -mtune=arm926ej-s"
+makeoptions LOADADDRESS="0x40000000"
-include "arch/evbarm/conf/files.imx23_olinuxino"
+include "arch/evbarm/conf/files.imx23_olinuxino"
Index: src/sys/arch/evbarm/conf/std.mini2440
diff -u src/sys/arch/evbarm/conf/std.mini2440:1.4 src/sys/arch/evbarm/conf/std.mini2440:1.5
--- src/sys/arch/evbarm/conf/std.mini2440:1.4 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.mini2440 Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.mini2440,v 1.4 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.mini2440,v 1.5 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for MINI2440 options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Config definitions for MINI2440
@@ -10,11 +10,11 @@ include "arch/evbarm/conf/files.mini244
options EXEC_AOUT
-options SSCOM_S3C2440
+options SSCOM_S3C2440
-makeoptions BOARDTYPE="mini2440"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.mini2440"
-makeoptions KERNEL_BASE_PHYS=0x30200000
+makeoptions BOARDTYPE="mini2440"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.mini2440"
+makeoptions KERNEL_BASE_PHYS=0x30200000
options KERNEL_BASE_EXT=0xc0000000
options ARM_INTR_IMPL="<arch/arm/s3c2xx0/s3c2440_intr.h>"
Index: src/sys/arch/evbarm/conf/std.sunxi
diff -u src/sys/arch/evbarm/conf/std.sunxi:1.4 src/sys/arch/evbarm/conf/std.sunxi:1.5
--- src/sys/arch/evbarm/conf/std.sunxi:1.4 Fri Aug 25 00:07:03 2017
+++ src/sys/arch/evbarm/conf/std.sunxi Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.sunxi,v 1.4 2017/08/25 00:07:03 jmcneill Exp $
+# $NetBSD: std.sunxi,v 1.5 2018/10/07 07:48:44 skrll Exp $
#
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.sunxi"
@@ -22,16 +22,16 @@ options FPU_VFP
options __BUS_SPACE_HAS_STREAM_METHODS
options __HAVE_GENERIC_CPU_INITCLOCKS
-makeoptions KERNEL_BASE_PHYS="0x40008000"
-makeoptions KERNEL_BASE_VIRT="0x80008000"
-makeoptions BOARDTYPE="sunxi"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.sunxi"
-makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
+makeoptions KERNEL_BASE_PHYS="0x40008000"
+makeoptions KERNEL_BASE_VIRT="0x80008000"
+makeoptions BOARDTYPE="sunxi"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.sunxi"
+makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
# initrd support
options MEMORY_DISK_HOOKS
options MEMORY_DISK_DYNAMIC
-pseudo-device md
+pseudo-device md
Index: src/sys/arch/evbarm/conf/std.armadillo9
diff -u src/sys/arch/evbarm/conf/std.armadillo9:1.7 src/sys/arch/evbarm/conf/std.armadillo9:1.8
--- src/sys/arch/evbarm/conf/std.armadillo9:1.7 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.armadillo9 Sun Oct 7 07:48:43 2018
@@ -1,15 +1,15 @@
-# $NetBSD: std.armadillo9,v 1.7 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.armadillo9,v 1.8 2018/10/07 07:48:43 skrll Exp $
#
# standard NetBSD/evbarm for Armadillo9 options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in armadillo9 config definitions.
include "arch/evbarm/conf/files.armadillo9"
-makeoptions BOARDTYPE="armadillo9"
+makeoptions BOARDTYPE="armadillo9"
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadillo9"
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadillo9"
options ARM_INTR_IMPL="<arch/arm/ep93xx/ep93xx_intr.h>"
Index: src/sys/arch/evbarm/conf/std.npwr_fc
diff -u src/sys/arch/evbarm/conf/std.npwr_fc:1.7 src/sys/arch/evbarm/conf/std.npwr_fc:1.8
--- src/sys/arch/evbarm/conf/std.npwr_fc:1.7 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.npwr_fc Sun Oct 7 07:48:44 2018
@@ -1,18 +1,18 @@
-# $NetBSD: std.npwr_fc,v 1.7 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.npwr_fc,v 1.8 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for IQ80321 options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in IQ80321 config definitions.
include "arch/evbarm/conf/files.npwr_fc"
options EXEC_AOUT
-options KERNEL_BASE_EXT=0xc0000000
-makeoptions BOARDTYPE="iq80321"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
+options KERNEL_BASE_EXT=0xc0000000
+makeoptions BOARDTYPE="iq80321"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
options ARM_INTR_IMPL="<arch/arm/xscale/i80321_intr.h>"
Index: src/sys/arch/evbarm/conf/std.vexpress
diff -u src/sys/arch/evbarm/conf/std.vexpress:1.7 src/sys/arch/evbarm/conf/std.vexpress:1.8
--- src/sys/arch/evbarm/conf/std.vexpress:1.7 Sun Jul 16 21:40:28 2017
+++ src/sys/arch/evbarm/conf/std.vexpress Sun Oct 7 07:48:44 2018
@@ -1,12 +1,12 @@
-# $NetBSD: std.vexpress,v 1.7 2017/07/16 21:40:28 jmcneill Exp $
+# $NetBSD: std.vexpress,v 1.8 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for VEXPRESS options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in VEXPRESS config definitions
-include "arch/evbarm/conf/files.vexpress"
+include "arch/evbarm/conf/files.vexpress"
options FDT # Flattened Device Tree support
options DRAM_BLOCKS=256
@@ -21,16 +21,16 @@ options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
-makeoptions KERNEL_BASE_PHYS="0x81000000"
-makeoptions KERNEL_BASE_VIRT="0x81000000"
-makeoptions BOARDTYPE="vexpress"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.vexpress"
-makeoptions CPUFLAGS="-mcpu=cortex-a15 -mfpu=neon"
+makeoptions KERNEL_BASE_PHYS="0x81000000"
+makeoptions KERNEL_BASE_VIRT="0x81000000"
+makeoptions BOARDTYPE="vexpress"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.vexpress"
+makeoptions CPUFLAGS="-mcpu=cortex-a15 -mfpu=neon"
-options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
+options ARM_GENERIC_TODR
# initrd support
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_DYNAMIC
-pseudo-device md
+options MEMORY_DISK_HOOKS
+options MEMORY_DISK_DYNAMIC
+pseudo-device md
Index: src/sys/arch/evbarm/conf/std.bcm53xx
diff -u src/sys/arch/evbarm/conf/std.bcm53xx:1.14 src/sys/arch/evbarm/conf/std.bcm53xx:1.15
--- src/sys/arch/evbarm/conf/std.bcm53xx:1.14 Fri Feb 21 22:31:58 2014
+++ src/sys/arch/evbarm/conf/std.bcm53xx Sun Oct 7 07:48:43 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.bcm53xx,v 1.14 2014/02/21 22:31:58 matt Exp $
+# $NetBSD: std.bcm53xx,v 1.15 2018/10/07 07:48:43 skrll Exp $
#
# standard NetBSD/evbarm for BCM5301X options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in BCM53xx config definitions.
include "arch/evbarm/conf/files.bcm53xx"
@@ -24,10 +24,10 @@ options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
options EVBARM_BOARDTYPE="bcm53xx"
-makeoptions BOARDTYPE="bcm53xx"
-makeoptions KERNEL_BASE_VIRT="0x80100000"
-makeoptions LOADADDRESS="0x00100000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"
+makeoptions BOARDTYPE="bcm53xx"
+makeoptions KERNEL_BASE_VIRT="0x80100000"
+makeoptions LOADADDRESS="0x00100000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"
options ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.beagle
diff -u src/sys/arch/evbarm/conf/std.beagle:1.14 src/sys/arch/evbarm/conf/std.beagle:1.15
--- src/sys/arch/evbarm/conf/std.beagle:1.14 Sun Jul 2 10:12:44 2017
+++ src/sys/arch/evbarm/conf/std.beagle Sun Oct 7 07:48:43 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.beagle,v 1.14 2017/07/02 10:12:44 skrll Exp $
+# $NetBSD: std.beagle,v 1.15 2018/10/07 07:48:43 skrll Exp $
#
# standard NetBSD/evbarm for BEAGLEBOARD options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in BEAGLEBOARD config definitions.
include "arch/evbarm/conf/files.beagle"
@@ -21,9 +21,9 @@ options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
-makeoptions LOADADDRESS="0x80300000"
-makeoptions BOARDTYPE="beagle"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
+makeoptions LOADADDRESS="0x80300000"
+makeoptions BOARDTYPE="beagle"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.cp3100
diff -u src/sys/arch/evbarm/conf/std.cp3100:1.5 src/sys/arch/evbarm/conf/std.cp3100:1.6
--- src/sys/arch/evbarm/conf/std.cp3100:1.5 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.cp3100 Sun Oct 7 07:48:43 2018
@@ -1,18 +1,18 @@
-# $NetBSD: std.cp3100,v 1.5 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.cp3100,v 1.6 2018/10/07 07:48:43 skrll Exp $
#
# Standard NetBSD/evbarm options for CP3100
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in CP3100 config definitions.
include "arch/evbarm/conf/files.cp3100"
options EXEC_AOUT
-options KERNEL_BASE_EXT=0xc0000000
-makeoptions BOARDTYPE="cp3100"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
+options KERNEL_BASE_EXT=0xc0000000
+makeoptions BOARDTYPE="cp3100"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
options ARM_INTR_IMPL="<arch/arm/xscale/i80321_intr.h>"
Index: src/sys/arch/evbarm/conf/std.marvell
diff -u src/sys/arch/evbarm/conf/std.marvell:1.5 src/sys/arch/evbarm/conf/std.marvell:1.6
--- src/sys/arch/evbarm/conf/std.marvell:1.5 Thu Aug 3 12:34:32 2017
+++ src/sys/arch/evbarm/conf/std.marvell Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.marvell,v 1.5 2017/08/03 12:34:32 martin Exp $
+# $NetBSD: std.marvell,v 1.6 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for MARVELL options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.marvell"
@@ -16,7 +16,7 @@ options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options COM_REGMAP
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0008000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.marvell"
+makeoptions LOADADDRESS="0xc0008000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.marvell"
options ARM_INTR_IMPL="<arch/arm/marvell/mvsoc_intr.h>"
Index: src/sys/arch/evbarm/conf/std.n900
diff -u src/sys/arch/evbarm/conf/std.n900:1.5 src/sys/arch/evbarm/conf/std.n900:1.6
--- src/sys/arch/evbarm/conf/std.n900:1.5 Sun Nov 2 16:07:15 2014
+++ src/sys/arch/evbarm/conf/std.n900 Sun Oct 7 07:48:44 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.n900,v 1.5 2014/11/02 16:07:15 hkenken Exp $
+# $NetBSD: std.n900,v 1.6 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for N900 options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in N900 config definitions.
include "arch/evbarm/conf/files.n900"
@@ -18,9 +18,9 @@ options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
-makeoptions LOADADDRESS="0x80300000"
-makeoptions BOARDTYPE="n900"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
+makeoptions LOADADDRESS="0x80300000"
+makeoptions BOARDTYPE="n900"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.nitrogen6
diff -u src/sys/arch/evbarm/conf/std.nitrogen6:1.5 src/sys/arch/evbarm/conf/std.nitrogen6:1.6
--- src/sys/arch/evbarm/conf/std.nitrogen6:1.5 Sat Jul 1 12:52:01 2017
+++ src/sys/arch/evbarm/conf/std.nitrogen6 Sun Oct 7 07:48:44 2018
@@ -1,12 +1,12 @@
-# $NetBSD: std.nitrogen6,v 1.5 2017/07/01 12:52:01 skrll Exp $
+# $NetBSD: std.nitrogen6,v 1.6 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm options for Nitrogen6X
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in nitrogen6 config definitions.
-include "arch/evbarm/conf/files.nitrogen6"
+include "arch/evbarm/conf/files.nitrogen6"
options NITROGEN6
@@ -17,7 +17,7 @@ options __HAVE_FAST_SOFTINTS # should
options TPIDRPRW_IS_CURCPU
options PCI_NETBSD_CONFIGURE
-makeoptions CPUFLAGS="-mcpu=cortex-a9"
+makeoptions CPUFLAGS="-mcpu=cortex-a9"
# To support easy transit to ../arch/arm/arm32
options FPU_VFP
@@ -28,8 +28,8 @@ options KERNEL_BASE_EXT=0x80000000
makeoptions KERNEL_BASE_PHYS="0x10800000"
makeoptions KERNEL_BASE_VIRT="0x80800000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.nitrogen6"
-makeoptions CPPFLAGS+="-I$S/../../../include"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.nitrogen6"
+makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/imx/imx6_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.nslu2
diff -u src/sys/arch/evbarm/conf/std.nslu2:1.5 src/sys/arch/evbarm/conf/std.nslu2:1.6
--- src/sys/arch/evbarm/conf/std.nslu2:1.5 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.nslu2 Sun Oct 7 07:48:44 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.nslu2,v 1.5 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.nslu2,v 1.6 2018/10/07 07:48:44 skrll Exp $
#
# Standard NetBSD/evbarm options for Linksys NSLU2
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in NSLU2 config definitions.
include "arch/evbarm/conf/files.nslu2"
Index: src/sys/arch/evbarm/conf/std.osk5912
diff -u src/sys/arch/evbarm/conf/std.osk5912:1.5 src/sys/arch/evbarm/conf/std.osk5912:1.6
--- src/sys/arch/evbarm/conf/std.osk5912:1.5 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.osk5912 Sun Oct 7 07:48:44 2018
@@ -1,15 +1,15 @@
-# $NetBSD: std.osk5912,v 1.5 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.osk5912,v 1.6 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for OSK5912 options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in OSK5912 config definitions.
include "arch/evbarm/conf/files.osk5912"
-makeoptions LOADADDRESS="0x80000000"
-makeoptions BOARDTYPE="osk5912"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.osk5912"
+makeoptions LOADADDRESS="0x80000000"
+makeoptions BOARDTYPE="osk5912"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.osk5912"
options ARM_INTR_IMPL="<arch/arm/omap/omap5912_intr.h>"
Index: src/sys/arch/evbarm/conf/std.exynos
diff -u src/sys/arch/evbarm/conf/std.exynos:1.6 src/sys/arch/evbarm/conf/std.exynos:1.7
--- src/sys/arch/evbarm/conf/std.exynos:1.6 Sun Jul 1 23:41:37 2018
+++ src/sys/arch/evbarm/conf/std.exynos Sun Oct 7 07:48:43 2018
@@ -1,15 +1,15 @@
-# $NetBSD: std.exynos,v 1.6 2018/07/01 23:41:37 jmcneill Exp $
+# $NetBSD: std.exynos,v 1.7 2018/10/07 07:48:43 skrll Exp $
#
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.exynos"
makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
options ARM_TRUSTZONE_FIRMWARE
-options __NO_FIQ
+options __NO_FIQ
options FDT # Flattened Device Tree support
options DRAM_BLOCKS=256
@@ -29,10 +29,10 @@ options __HAVE_PCI_CONF_HOOK
options __BUS_SPACE_HAS_STREAM_METHODS
options __HAVE_GENERIC_CPU_INITCLOCKS
-makeoptions KERNEL_BASE_PHYS="0x40000000"
-makeoptions KERNEL_BASE_VIRT="0x80000000"
-makeoptions BOARDTYPE="exynos"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.exynos"
+makeoptions KERNEL_BASE_PHYS="0x40000000"
+makeoptions KERNEL_BASE_VIRT="0x80000000"
+makeoptions BOARDTYPE="exynos"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.exynos"
options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.hdl_g
diff -u src/sys/arch/evbarm/conf/std.hdl_g:1.6 src/sys/arch/evbarm/conf/std.hdl_g:1.7
--- src/sys/arch/evbarm/conf/std.hdl_g:1.6 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.hdl_g Sun Oct 7 07:48:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.hdl_g,v 1.6 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.hdl_g,v 1.7 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for I-O DATA HDL-G options
@@ -8,8 +8,8 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in HDL-G config definitions.
include "arch/evbarm/conf/files.hdl_g"
-makeoptions BOARDTYPE="hdlg"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.hdl_g"
+makeoptions BOARDTYPE="hdlg"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.hdl_g"
options ARM_INTR_IMPL="<arch/arm/xscale/i80321_intr.h>"
Index: src/sys/arch/evbarm/conf/std.g42xxeb
diff -u src/sys/arch/evbarm/conf/std.g42xxeb:1.8 src/sys/arch/evbarm/conf/std.g42xxeb:1.9
--- src/sys/arch/evbarm/conf/std.g42xxeb:1.8 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.g42xxeb Sun Oct 7 07:48:44 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.g42xxeb,v 1.8 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.g42xxeb,v 1.9 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for TWINTAIL (G4255EB) options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in LUBBOCK config definitions.
include "arch/evbarm/conf/files.g42xxeb"
@@ -11,13 +11,13 @@ include "arch/evbarm/conf/files.g42xxeb
options G42XXEB
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDTYPE="g42xxeb"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.g42xxeb"
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDTYPE="g42xxeb"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.g42xxeb"
options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
# OS Timer
-saost* at pxaip? addr 0x40a00000 size 0x20
+saost* at pxaip? addr 0x40a00000 size 0x20
Index: src/sys/arch/evbarm/conf/std.gemini
diff -u src/sys/arch/evbarm/conf/std.gemini:1.8 src/sys/arch/evbarm/conf/std.gemini:1.9
--- src/sys/arch/evbarm/conf/std.gemini:1.8 Fri Nov 1 18:41:06 2013
+++ src/sys/arch/evbarm/conf/std.gemini Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.gemini,v 1.8 2013/11/01 18:41:06 skrll Exp $
+# $NetBSD: std.gemini,v 1.9 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for GEMINI options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in GEMINI config definitions.
@@ -13,13 +13,13 @@ options ARM9
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_PCI_CONF_HOOK # should be in types.h
-makeoptions KERNEL_BASE_PHYS="0x00200000"
-makeoptions KERNEL_BASE_VIRT="0x80200000"
-makeoptions LOADADDRESS="0x00200000"
-makeoptions BOARDTYPE="gemini"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gemini"
+makeoptions KERNEL_BASE_PHYS="0x00200000"
+makeoptions KERNEL_BASE_VIRT="0x80200000"
+makeoptions LOADADDRESS="0x00200000"
+makeoptions BOARDTYPE="gemini"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gemini"
-options EVBARM_BOARDTYPE=gemini
+options EVBARM_BOARDTYPE=gemini
options ARM_INTR_IMPL="<arch/arm/gemini/gemini_intr.h>"
#options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.igepv2
diff -u src/sys/arch/evbarm/conf/std.igepv2:1.8 src/sys/arch/evbarm/conf/std.igepv2:1.9
--- src/sys/arch/evbarm/conf/std.igepv2:1.8 Mon Feb 27 06:50:15 2017
+++ src/sys/arch/evbarm/conf/std.igepv2 Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.igepv2,v 1.8 2017/02/27 06:50:15 chs Exp $
+# $NetBSD: std.igepv2,v 1.9 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for IGEPV2 options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in BEAGLEBOARD config definitions.
@@ -21,9 +21,9 @@ options FPU_VFP
options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
-makeoptions LOADADDRESS="0x80300000"
-makeoptions BOARDTYPE="igepv2"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
+makeoptions LOADADDRESS="0x80300000"
+makeoptions BOARDTYPE="igepv2"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.overo
diff -u src/sys/arch/evbarm/conf/std.overo:1.8 src/sys/arch/evbarm/conf/std.overo:1.9
--- src/sys/arch/evbarm/conf/std.overo:1.8 Tue Oct 4 16:17:37 2016
+++ src/sys/arch/evbarm/conf/std.overo Sun Oct 7 07:48:44 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.overo,v 1.8 2016/10/04 16:17:37 kiyohara Exp $
+# $NetBSD: std.overo,v 1.9 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for OVERO options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.overo"
@@ -12,8 +12,8 @@ options __HAVE_FAST_SOFTINTS # should
options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
-makeoptions LOADADDRESS="0x80200000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gumstix"
+makeoptions LOADADDRESS="0x80200000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gumstix"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.smdk2410
diff -u src/sys/arch/evbarm/conf/std.smdk2410:1.8 src/sys/arch/evbarm/conf/std.smdk2410:1.9
--- src/sys/arch/evbarm/conf/std.smdk2410:1.8 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.smdk2410 Sun Oct 7 07:48:44 2018
@@ -1,20 +1,20 @@
-# $NetBSD: std.smdk2410,v 1.8 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.smdk2410,v 1.9 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for SMDK2410 options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Config definitions for SMDK2410
include "arch/evbarm/conf/files.smdk2410"
options EXEC_AOUT
-options SSCOM_S3C2410
+options SSCOM_S3C2410
-makeoptions BOARDTYPE="smdk2410"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.smdk2xx0"
-makeoptions KERNEL_BASE_PHYS=0x30200000
+makeoptions BOARDTYPE="smdk2410"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.smdk2xx0"
+makeoptions KERNEL_BASE_PHYS=0x30200000
options KERNEL_BASE_EXT=0xc0000000
options ARM_INTR_IMPL="<arch/arm/s3c2xx0/s3c2410_intr.h>"
Index: src/sys/arch/evbarm/conf/std.tsarm
diff -u src/sys/arch/evbarm/conf/std.tsarm:1.8 src/sys/arch/evbarm/conf/std.tsarm:1.9
--- src/sys/arch/evbarm/conf/std.tsarm:1.8 Sun Dec 16 23:47:57 2012
+++ src/sys/arch/evbarm/conf/std.tsarm Sun Oct 7 07:48:44 2018
@@ -1,19 +1,19 @@
-# $NetBSD: std.tsarm,v 1.8 2012/12/16 23:47:57 matt Exp $
+# $NetBSD: std.tsarm,v 1.9 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for TS7200 options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in tsarm config definitions.
include "arch/evbarm/conf/files.tsarm"
options EXEC_AOUT
-options HZ=64
+options HZ=64
-makeoptions BOARDTYPE="tsarm"
+makeoptions BOARDTYPE="tsarm"
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tsarm"
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tsarm"
options ARM_INTR_IMPL="<arch/arm/ep93xx/ep93xx_intr.h>"
Index: src/sys/arch/evbarm/conf/std.viper
diff -u src/sys/arch/evbarm/conf/std.viper:1.8 src/sys/arch/evbarm/conf/std.viper:1.9
--- src/sys/arch/evbarm/conf/std.viper:1.8 Sun Dec 16 23:47:57 2012
+++ src/sys/arch/evbarm/conf/std.viper Sun Oct 7 07:48:44 2018
@@ -1,19 +1,19 @@
-# $NetBSD: std.viper,v 1.8 2012/12/16 23:47:57 matt Exp $
+# $NetBSD: std.viper,v 1.9 2018/10/07 07:48:44 skrll Exp $
#
# Arcom Viper standard kernel options
#
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.viper"
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDTYPE="viper"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.viper"
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDTYPE="viper"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.viper"
-options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
+options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
# OS Timer This is compatible to SA1110's OS Timer.
-saost* at pxaip? addr 0x40a00000 size 0x20
+saost* at pxaip? addr 0x40a00000 size 0x20
Index: src/sys/arch/evbarm/conf/std.generic64
diff -u src/sys/arch/evbarm/conf/std.generic64:1.2 src/sys/arch/evbarm/conf/std.generic64:1.3
--- src/sys/arch/evbarm/conf/std.generic64:1.2 Sat Sep 8 00:42:24 2018
+++ src/sys/arch/evbarm/conf/std.generic64 Sun Oct 7 07:48:44 2018
@@ -1,6 +1,6 @@
-# $NetBSD: std.generic64,v 1.2 2018/09/08 00:42:24 jmcneill Exp $
+# $NetBSD: std.generic64,v 1.3 2018/10/07 07:48:44 skrll Exp $
#
-# generic NetBSD/evbarm64 with FDT support
+# generic NetBSD/evbarm64 with FDT support
machine evbarm aarch64
include "conf/std"
@@ -29,9 +29,9 @@ options PCI_NETBSD_CONFIGURE
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.generic64"
# initrd support
-options MEMORY_DISK_HOOKS
-options MEMORY_DISK_DYNAMIC
-pseudo-device md
+options MEMORY_DISK_HOOKS
+options MEMORY_DISK_DYNAMIC
+pseudo-device md
# General options
options CHILD_MAX=1024 # 160 is too few
Index: src/sys/arch/evbarm/conf/std.imx7
diff -u src/sys/arch/evbarm/conf/std.imx7:1.2 src/sys/arch/evbarm/conf/std.imx7:1.3
--- src/sys/arch/evbarm/conf/std.imx7:1.2 Mon Oct 17 10:36:56 2016
+++ src/sys/arch/evbarm/conf/std.imx7 Sun Oct 7 07:48:44 2018
@@ -1,12 +1,12 @@
-# $NetBSD: std.imx7,v 1.2 2016/10/17 10:36:56 ryo Exp $
+# $NetBSD: std.imx7,v 1.3 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm options for i.MX7 board
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in imx7 config definitions.
-include "arch/evbarm/conf/files.imx7"
+include "arch/evbarm/conf/files.imx7"
options IMX7BOARD
@@ -17,7 +17,7 @@ options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options TPIDRPRW_IS_CURCPU
-makeoptions CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
+makeoptions CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
# To support easy transit to ../arch/arm/arm32
options FPU_VFP
@@ -25,11 +25,11 @@ options CORTEX_PMC
options CORTEX_PMC_CCNT_HZ=792000000
options KERNEL_BASE_EXT=0x80000000
-makeoptions KERNEL_BASE_PHYS="0x82000000"
-makeoptions KERNEL_BASE_VIRT="0x82000000"
+makeoptions KERNEL_BASE_PHYS="0x82000000"
+makeoptions KERNEL_BASE_VIRT="0x82000000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx7"
-makeoptions CPPFLAGS+="-I$S/../../../include"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx7"
+makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/imx/imx7_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.integrator_cp
diff -u src/sys/arch/evbarm/conf/std.integrator_cp:1.2 src/sys/arch/evbarm/conf/std.integrator_cp:1.3
--- src/sys/arch/evbarm/conf/std.integrator_cp:1.2 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.integrator_cp Sun Oct 7 07:48:44 2018
@@ -1,19 +1,19 @@
-# $NetBSD: std.integrator_cp,v 1.2 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.integrator_cp,v 1.3 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/integrator options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in Integrator config definitions.
-include "arch/evbarm/conf/files.integrator"
+include "arch/evbarm/conf/files.integrator"
options EXEC_AOUT
options _ARM32_NEED_BUS_DMA_BOUNCE
-makeoptions BOARDTYPE="integrator"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.integrator_cp"
+makeoptions BOARDTYPE="integrator"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.integrator_cp"
options ARM_INTR_IMPL="<arch/evbarm/ifpga/ifpga_intr.h>"
Index: src/sys/arch/evbarm/conf/std.kobo
diff -u src/sys/arch/evbarm/conf/std.kobo:1.2 src/sys/arch/evbarm/conf/std.kobo:1.3
--- src/sys/arch/evbarm/conf/std.kobo:1.2 Sun Aug 24 07:59:22 2014
+++ src/sys/arch/evbarm/conf/std.kobo Sun Oct 7 07:48:44 2018
@@ -1,18 +1,18 @@
-# $NetBSD: std.kobo,v 1.2 2014/08/24 07:59:22 jnemeth Exp $
+# $NetBSD: std.kobo,v 1.3 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm options for Kobo
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in i.mx51 config definitions.
-include "arch/evbarm/conf/files.kobo"
+include "arch/evbarm/conf/files.kobo"
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_CPU_COUNTER
-options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options ARM_HAS_VBAR
options TPIDRPRW_IS_CURCPU
@@ -22,9 +22,9 @@ options KERNEL_BASE_EXT=0x80000000
options EVBARM_BOARDTYPE="kobo"
options FPU_VFP
-makeoptions LOADADDRESS_VIRT="0x80100000"
-makeoptions LOADADDRESS="0x70100000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.kobo"
+makeoptions LOADADDRESS_VIRT="0x80100000"
+makeoptions LOADADDRESS="0x70100000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.kobo"
options ARM_INTR_IMPL="<arch/arm/imx/imx51_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.mmnet
diff -u src/sys/arch/evbarm/conf/std.mmnet:1.2 src/sys/arch/evbarm/conf/std.mmnet:1.3
--- src/sys/arch/evbarm/conf/std.mmnet:1.2 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.mmnet Sun Oct 7 07:48:44 2018
@@ -1,28 +1,28 @@
-# $NetBSD: std.mmnet,v 1.2 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.mmnet,v 1.3 2018/10/07 07:48:44 skrll Exp $
#
# NetBSD/evbarm options for Propox MMnet1002 evaluation board
#
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in MMnet config definitions.
include "arch/evbarm/conf/files.mmnet"
-options AT91SAM9260
+options AT91SAM9260
options EXEC_AOUT
options ARM_GENERIC_TODR
# timer speed
-options HZ=100
+options HZ=100
options KERNEL_BASE_EXT=0xc0000000
-makeoptions BOARDTYPE="mmnet"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.mmnet"
-makeoptions KERNEL_BASE_PHYS=0x20200000
-makeoptions KERNEL_BASE_VIRT=0xc0200000
+makeoptions BOARDTYPE="mmnet"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.mmnet"
+makeoptions KERNEL_BASE_PHYS=0x20200000
+makeoptions KERNEL_BASE_VIRT=0xc0200000
options ARM_INTR_IMPL="<arch/arm/at91/at91intr.h>"
Index: src/sys/arch/evbarm/conf/std.mv2120
diff -u src/sys/arch/evbarm/conf/std.mv2120:1.2 src/sys/arch/evbarm/conf/std.mv2120:1.3
--- src/sys/arch/evbarm/conf/std.mv2120:1.2 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.mv2120 Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.mv2120,v 1.2 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.mv2120,v 1.3 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for MARVELL options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.marvell"
@@ -12,6 +12,6 @@ options __HAVE_PCI_CONF_HOOK # should
options COM_REGMAP
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0400000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.mv2120"
+makeoptions LOADADDRESS="0xc0400000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.mv2120"
options ARM_INTR_IMPL="<arch/arm/marvell/mvsoc_intr.h>"
Index: src/sys/arch/evbarm/conf/std.zynq
diff -u src/sys/arch/evbarm/conf/std.zynq:1.2 src/sys/arch/evbarm/conf/std.zynq:1.3
--- src/sys/arch/evbarm/conf/std.zynq:1.2 Mon Aug 28 08:00:20 2017
+++ src/sys/arch/evbarm/conf/std.zynq Sun Oct 7 07:48:44 2018
@@ -1,12 +1,12 @@
-# $NetBSD: std.zynq,v 1.2 2017/08/28 08:00:20 skrll Exp $
+# $NetBSD: std.zynq,v 1.3 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for ZYNQ options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in Zynq config definitions.
-include "arch/evbarm/conf/files.zynq"
+include "arch/evbarm/conf/files.zynq"
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
@@ -25,11 +25,11 @@ options FPU_VFP
options CORTEX_PMC
options CORTEX_PMC_CCNT_HZ=666666666
-makeoptions LOADADDRESS_VIRT="0x80100000"
-makeoptions LOADADDRESS="0x00100000"
+makeoptions LOADADDRESS_VIRT="0x80100000"
+makeoptions LOADADDRESS="0x00100000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.zynq"
-makeoptions CPPFLAGS+="-I$S/../../../include"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.zynq"
+makeoptions CPPFLAGS+="-I$S/../../../include"
options ARM_INTR_IMPL="<arch/arm/zynq/zynq7000_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.gumstix
diff -u src/sys/arch/evbarm/conf/std.gumstix:1.9 src/sys/arch/evbarm/conf/std.gumstix:1.10
--- src/sys/arch/evbarm/conf/std.gumstix:1.9 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.gumstix Sun Oct 7 07:48:44 2018
@@ -1,19 +1,19 @@
-# $NetBSD: std.gumstix,v 1.9 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.gumstix,v 1.10 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for GUMSTIX options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.gumstix"
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDTYPE="gumstix"
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDTYPE="gumstix"
options EVBARM_BOARDTYPE=gumstix
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gumstix"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.gumstix"
options ARM_INTR_IMPL="<arch/arm/xscale/pxa2x0_intr.h>"
# OS Timer
-saost* at pxaip? addr 0x40a00000 size 0x20
+saost* at pxaip? addr 0x40a00000 size 0x20
Index: src/sys/arch/evbarm/conf/std.imx31
diff -u src/sys/arch/evbarm/conf/std.imx31:1.9 src/sys/arch/evbarm/conf/std.imx31:1.10
--- src/sys/arch/evbarm/conf/std.imx31:1.9 Sun Mar 30 23:14:15 2014
+++ src/sys/arch/evbarm/conf/std.imx31 Sun Oct 7 07:48:44 2018
@@ -1,15 +1,15 @@
-# $NetBSD: std.imx31,v 1.9 2014/03/30 23:14:15 matt Exp $
+# $NetBSD: std.imx31,v 1.10 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm options for FreeScale I.MX31
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in i.mx31 config definitions.
include "arch/evbarm/conf/files.imx31"
options KERNEL_BASE_EXT=0x80000000
-makeoptions CPUFLAGS="-march=armv6k -mtune=arm1136j-s -mfpu=vfp"
+makeoptions CPUFLAGS="-march=armv6k -mtune=arm1136j-s -mfpu=vfp"
options ARM11_PMC
options ARM11_CACHE_WRITE_THROUGH
@@ -21,9 +21,9 @@ options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options TPIDRPRW_IS_CURCPU
-makeoptions LOADADDRESS="0x80100000"
-makeoptions BOARDTYPE="imx31"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx31"
+makeoptions LOADADDRESS="0x80100000"
+makeoptions BOARDTYPE="imx31"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx31"
options ARM_INTR_IMPL="<arch/arm/imx/imx31_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.tisdp24xx
diff -u src/sys/arch/evbarm/conf/std.tisdp24xx:1.9 src/sys/arch/evbarm/conf/std.tisdp24xx:1.10
--- src/sys/arch/evbarm/conf/std.tisdp24xx:1.9 Fri Nov 1 18:41:06 2013
+++ src/sys/arch/evbarm/conf/std.tisdp24xx Sun Oct 7 07:48:44 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.tisdp24xx,v 1.9 2013/11/01 18:41:06 skrll Exp $
+# $NetBSD: std.tisdp24xx,v 1.10 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for SDP2430 options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Pull in SDP2430 config definitions.
include "arch/evbarm/conf/files.tisdp24xx"
@@ -15,10 +15,10 @@ options __HAVE_FAST_SOFTINTS # should
#options TPIDRPRW_IS_CURCPU
options KERNEL_BASE_EXT=0x80000000
-makeoptions LOADADDRESS="0x80300000"
-#makeoptions LOADADDRESS="0xc0000000"
-makeoptions BOARDTYPE="sdp2430"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tisdp24xx"
+makeoptions LOADADDRESS="0x80300000"
+#makeoptions LOADADDRESS="0xc0000000"
+makeoptions BOARDTYPE="sdp2430"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tisdp24xx"
options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.integrator
diff -u src/sys/arch/evbarm/conf/std.integrator:1.19 src/sys/arch/evbarm/conf/std.integrator:1.20
--- src/sys/arch/evbarm/conf/std.integrator:1.19 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.integrator Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.integrator,v 1.19 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.integrator,v 1.20 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/integrator options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in Integrator config definitions.
@@ -12,7 +12,7 @@ options EXEC_AOUT
options _ARM32_NEED_BUS_DMA_BOUNCE
-makeoptions BOARDTYPE="integrator"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.integrator"
+makeoptions BOARDTYPE="integrator"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.integrator"
options ARM_INTR_IMPL="<arch/evbarm/ifpga/ifpga_intr.h>"
Index: src/sys/arch/evbarm/conf/std.iq31244
diff -u src/sys/arch/evbarm/conf/std.iq31244:1.11 src/sys/arch/evbarm/conf/std.iq31244:1.12
--- src/sys/arch/evbarm/conf/std.iq31244:1.11 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.iq31244 Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.iq31244,v 1.11 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.iq31244,v 1.12 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for IQ31244 options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in IQ31244 config definitions.
@@ -10,12 +10,12 @@ include "arch/evbarm/conf/files.iq31244
options EXEC_AOUT
-options KERNEL_BASE_EXT=0xc0000000
-makeoptions BOARDTYPE="iq31244"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
+options KERNEL_BASE_EXT=0xc0000000
+makeoptions BOARDTYPE="iq31244"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
options ARM_INTR_IMPL="<arch/arm/xscale/i80321_intr.h>"
-options I80321_REBOOT=iq31244_reboot
+options I80321_REBOOT=iq31244_reboot
# We need to configure the PCI bus.
options PCI_NETBSD_CONFIGURE
Index: src/sys/arch/evbarm/conf/std.iq80310
diff -u src/sys/arch/evbarm/conf/std.iq80310:1.23 src/sys/arch/evbarm/conf/std.iq80310:1.24
--- src/sys/arch/evbarm/conf/std.iq80310:1.23 Sun Dec 16 23:47:56 2012
+++ src/sys/arch/evbarm/conf/std.iq80310 Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.iq80310,v 1.23 2012/12/16 23:47:56 matt Exp $
+# $NetBSD: std.iq80310,v 1.24 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for IQ80310 options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in IQ80310 config definitions.
@@ -11,8 +11,8 @@ include "arch/evbarm/conf/files.iq80310
options EXEC_AOUT
options KERNEL_BASE_EXT=0xc0000000
-makeoptions BOARDTYPE="iq80310"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80310"
+makeoptions BOARDTYPE="iq80310"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80310"
options ARM_INTR_IMPL="<arch/evbarm/iq80310/iq80310_intr.h>"
Index: src/sys/arch/evbarm/conf/std.iq80321
diff -u src/sys/arch/evbarm/conf/std.iq80321:1.16 src/sys/arch/evbarm/conf/std.iq80321:1.17
--- src/sys/arch/evbarm/conf/std.iq80321:1.16 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.iq80321 Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.iq80321,v 1.16 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.iq80321,v 1.17 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for IQ80321 options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in IQ80321 config definitions.
@@ -10,9 +10,9 @@ include "arch/evbarm/conf/files.iq80321
options EXEC_AOUT
-options KERNEL_BASE_EXT=0xc0000000
-makeoptions BOARDTYPE="iq80321"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
+options KERNEL_BASE_EXT=0xc0000000
+makeoptions BOARDTYPE="iq80321"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.iq80321"
options ARM_INTR_IMPL="<arch/arm/xscale/i80321_intr.h>"
Index: src/sys/arch/evbarm/conf/std.smdk2800
diff -u src/sys/arch/evbarm/conf/std.smdk2800:1.16 src/sys/arch/evbarm/conf/std.smdk2800:1.17
--- src/sys/arch/evbarm/conf/std.smdk2800:1.16 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.smdk2800 Sun Oct 7 07:48:44 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.smdk2800,v 1.16 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.smdk2800,v 1.17 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for SMDK2800 options
-machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+machine evbarm arm
+include "arch/evbarm/conf/std.evbarm"
# Config definitions for SMDK2800
include "arch/evbarm/conf/files.smdk2800"
@@ -14,9 +14,9 @@ options ARM9_CACHE_WRITE_THROUGH # we
options SSCOM_S3C2800
-makeoptions BOARDTYPE="smdk2800"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.smdk2xx0"
-makeoptions KERNEL_BASE_PHYS=0x08200000
+makeoptions BOARDTYPE="smdk2800"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.smdk2xx0"
+makeoptions KERNEL_BASE_PHYS=0x08200000
options KERNEL_BASE_EXT=0xc0000000
options ARM_INTR_IMPL="<arch/arm/s3c2xx0/s3c2800_intr.h>"
Index: src/sys/arch/evbarm/conf/std.tegra
diff -u src/sys/arch/evbarm/conf/std.tegra:1.16 src/sys/arch/evbarm/conf/std.tegra:1.17
--- src/sys/arch/evbarm/conf/std.tegra:1.16 Thu Jul 6 00:35:28 2017
+++ src/sys/arch/evbarm/conf/std.tegra Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.tegra,v 1.16 2017/07/06 00:35:28 jmcneill Exp $
+# $NetBSD: std.tegra,v 1.17 2018/10/07 07:48:44 skrll Exp $
#
machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.tegra"
@@ -23,15 +23,15 @@ options PCI_NETBSD_CONFIGURE
options __HAVE_PCI_CONF_HOOK
options __BUS_SPACE_HAS_STREAM_METHODS
-makeoptions KERNEL_BASE_PHYS="0x81000000"
-makeoptions KERNEL_BASE_VIRT="0x81000000"
-makeoptions BOARDTYPE="tegra"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tegra"
+makeoptions KERNEL_BASE_PHYS="0x81000000"
+makeoptions KERNEL_BASE_VIRT="0x81000000"
+makeoptions BOARDTYPE="tegra"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tegra"
options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
+options ARM_GENERIC_TODR
# initrd support
options MEMORY_DISK_HOOKS
options MEMORY_DISK_DYNAMIC
-pseudo-device md
+pseudo-device md
Index: src/sys/arch/evbarm/conf/std.ixdp425
diff -u src/sys/arch/evbarm/conf/std.ixdp425:1.13 src/sys/arch/evbarm/conf/std.ixdp425:1.14
--- src/sys/arch/evbarm/conf/std.ixdp425:1.13 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.ixdp425 Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.ixdp425,v 1.13 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.ixdp425,v 1.14 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for IXDP425 options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in IXDP425 config definitions.
@@ -13,8 +13,8 @@ options EXEC_AOUT
options COM_PXA2X0 # Enable IXP Uart support in com(4)
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xc0200000"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.ixdp425"
+makeoptions LOADADDRESS="0xc0200000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.ixdp425"
options ARM_INTR_IMPL="<arch/arm/xscale/ixp425_intr.h>"
Index: src/sys/arch/evbarm/conf/std.ixm1200
diff -u src/sys/arch/evbarm/conf/std.ixm1200:1.15 src/sys/arch/evbarm/conf/std.ixm1200:1.16
--- src/sys/arch/evbarm/conf/std.ixm1200:1.15 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/evbarm/conf/std.ixm1200 Sun Oct 7 07:48:44 2018
@@ -1,8 +1,8 @@
-# $NetBSD: std.ixm1200,v 1.15 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: std.ixm1200,v 1.16 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for IXM1200 options
-machine evbarm arm
+machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
# Pull in IXM1200 config definitions.
@@ -11,9 +11,9 @@ include "arch/evbarm/conf/files.ixm1200
options EXEC_AOUT
options KERNEL_BASE_EXT=0xc0000000
-makeoptions LOADADDRESS="0xC0200000"
-makeoptions BOARDTYPE="ixm1200"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.ixm1200"
+makeoptions LOADADDRESS="0xC0200000"
+makeoptions BOARDTYPE="ixm1200"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.ixm1200"
options ARM_INTR_IMPL="<arch/arm/ixp12x0/ixp12x0_intr.h>"
Index: src/sys/arch/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.20 src/sys/arch/evbarm/conf/std.rpi:1.21
--- src/sys/arch/evbarm/conf/std.rpi:1.20 Sun Dec 10 21:38:26 2017
+++ src/sys/arch/evbarm/conf/std.rpi Sun Oct 7 07:48:44 2018
@@ -1,9 +1,9 @@
-# $NetBSD: std.rpi,v 1.20 2017/12/10 21:38:26 skrll Exp $
+# $NetBSD: std.rpi,v 1.21 2018/10/07 07:48:44 skrll Exp $
#
# standard NetBSD/evbarm for Raspberry Pi options
machine evbarm arm
-include "arch/evbarm/conf/std.evbarm"
+include "arch/evbarm/conf/std.evbarm"
# Pull in Raspberry Pi config definitions.
include "arch/evbarm/conf/files.rpi"
@@ -21,8 +21,8 @@ options ARM_HAS_VBAR
options KERNEL_BASE_EXT=0x80000000
options EVBARM_BOARDTYPE="rpi"
-makeoptions BOARDMKFRAG="${THISARM}/conf/mk.rpi"
-makeoptions LOADADDRESS="0x80008000"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.rpi"
+makeoptions LOADADDRESS="0x80008000"
options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options ARM_GENERIC_TODR
