Module Name: src
Committed By: skrll
Date: Mon Oct 8 10:22:17 UTC 2018
Modified Files:
src/sys/arch/evbarm/conf: std.altera std.amlogic std.armadaxp
std.armadillo9 std.bcm53xx std.beagle std.exynos std.generic
std.imx6ul std.nitrogen6 std.rpi std.sunxi std.tegra std.vexpress
std.virt std.zynq
Log Message:
Sort options.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/std.altera \
src/sys/arch/evbarm/conf/std.imx6ul
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/std.amlogic \
src/sys/arch/evbarm/conf/std.armadaxp src/sys/arch/evbarm/conf/std.sunxi
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/std.armadillo9 \
src/sys/arch/evbarm/conf/std.vexpress
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/std.bcm53xx \
src/sys/arch/evbarm/conf/std.beagle
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.exynos
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.generic
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.nitrogen6
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/std.rpi
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/std.tegra
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/std.virt
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/std.zynq
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.altera
diff -u src/sys/arch/evbarm/conf/std.altera:1.2 src/sys/arch/evbarm/conf/std.altera:1.3
--- src/sys/arch/evbarm/conf/std.altera:1.2 Sun Oct 7 07:48:43 2018
+++ src/sys/arch/evbarm/conf/std.altera Mon Oct 8 10:22:17 2018
@@ -1,16 +1,16 @@
-# $NetBSD: std.altera,v 1.2 2018/10/07 07:48:43 skrll Exp $
+# $NetBSD: std.altera,v 1.3 2018/10/08 10:22:17 skrll Exp $
machine evbarm arm
include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.altera"
-options DRAM_BLOCKS=256
-options FDT
-options FPU_VFP
options ARM_HAS_VBAR
options ARM_GENERIC_TODR
options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
+options DRAM_BLOCKS=256
+options FDT
+options FPU_VFP
options TPIDRPRW_IS_CURCPU
options __BUS_SPACE_HAS_STREAM_METHODS
options __HAVE_CPU_COUNTER
@@ -19,10 +19,8 @@ options __HAVE_FAST_SOFTINTS
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
options KERNEL_BASE_EXT=0x80000000
-
makeoptions KERNEL_BASE_PHYS="0x10000"
makeoptions KERNEL_BASE_VIRT="0x80010000"
-
makeoptions BOARDTYPE="nanosoc"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.altera"
Index: src/sys/arch/evbarm/conf/std.imx6ul
diff -u src/sys/arch/evbarm/conf/std.imx6ul:1.2 src/sys/arch/evbarm/conf/std.imx6ul:1.3
--- src/sys/arch/evbarm/conf/std.imx6ul:1.2 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.imx6ul Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.imx6ul,v 1.2 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.imx6ul,v 1.3 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm options for i.MX6UL
@@ -8,28 +8,23 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in nitrogen6 config definitions.
include "arch/evbarm/conf/files.nitrogen6"
-options NITROGEN6
-
+# Architecture opions
+options ARM_GENERIC_TODR
options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/imx/imx6_intr.h>"
+options CORTEX_PMC
+options CORTEX_PMC_CCNT_HZ=792000000
+options FPU_VFP
+options NITROGEN6
+#options PMAP_NEED_ALLOC_POOLPAGE
+options TPIDRPRW_IS_CURCPU
options __HAVE_CPU_COUNTER
options __HAVE_FAST_SOFTINTS # should be in types.h
-options TPIDRPRW_IS_CURCPU
#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-#options PMAP_NEED_ALLOC_POOLPAGE
-
-makeoptions CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
-
-# To support easy transit to ../arch/arm/arm32
-options FPU_VFP
-options CORTEX_PMC
-options CORTEX_PMC_CCNT_HZ=792000000
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.imx6ul"
+makeoptions CPPFLAGS+="-I$S/../../../include"
+makeoptions CPUFLAGS="-mcpu=cortex-a7 -mfpu=neon"
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"
-
-options ARM_INTR_IMPL="<arch/arm/imx/imx6_intr.h>"
-options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.amlogic
diff -u src/sys/arch/evbarm/conf/std.amlogic:1.5 src/sys/arch/evbarm/conf/std.amlogic:1.6
--- src/sys/arch/evbarm/conf/std.amlogic:1.5 Sun Oct 7 07:51:54 2018
+++ src/sys/arch/evbarm/conf/std.amlogic Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.amlogic,v 1.5 2018/10/07 07:51:54 skrll Exp $
+# $NetBSD: std.amlogic,v 1.6 2018/10/08 10:22:17 skrll Exp $
#
machine evbarm arm
@@ -6,22 +6,22 @@ include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.amlogic"
+# Architecture opions
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/amlogic/amlogic_intr.h>"
+options CORTEX_PMC
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
+options TPIDRPRW_IS_CURCPU
options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
-options CORTEX_PMC
options __HAVE_FAST_SOFTINTS # should be in types.h
-options ARM_HAS_VBAR
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
-options FPU_VFP
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.amlogic"
+makeoptions BOARDTYPE="amlogic"
+options KERNEL_BASE_EXT=0x80000000
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
Index: src/sys/arch/evbarm/conf/std.armadaxp
diff -u src/sys/arch/evbarm/conf/std.armadaxp:1.5 src/sys/arch/evbarm/conf/std.armadaxp:1.6
--- src/sys/arch/evbarm/conf/std.armadaxp:1.5 Sun Oct 7 07:48:43 2018
+++ src/sys/arch/evbarm/conf/std.armadaxp Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.armadaxp,v 1.5 2018/10/07 07:48:43 skrll Exp $
+# $NetBSD: std.armadaxp,v 1.6 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm for ARMADAXP options
@@ -12,27 +12,26 @@ options EXEC_SCRIPT
# To support easy transit to ../arch/arm/arm32
options ARM32
+options EVBARM_BOARDTYPE="Armada XP"
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/marvell/mvsoc_intr.h>"
+options COM_REGMAP
+options COM_16750
+options PIC_MAXSOURCES=128
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_PCI_CONF_HOOK # should be in types.h
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options STARTUP_PAGETABLE_ADDR=0x00100000
+options MEMSTART=0x00000000
+
# Build for armv7-a, soft-floats only
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 BOARDTYPE="armadaxp"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadaxp"
-
-options EVBARM_BOARDTYPE="Armada XP"
-options ARM_HAS_VBAR
-options ARM_INTR_IMPL="<arch/arm/marvell/mvsoc_intr.h>"
-options COM_REGMAP
-options COM_16750
-options PIC_MAXSOURCES=128
Index: src/sys/arch/evbarm/conf/std.sunxi
diff -u src/sys/arch/evbarm/conf/std.sunxi:1.5 src/sys/arch/evbarm/conf/std.sunxi:1.6
--- src/sys/arch/evbarm/conf/std.sunxi:1.5 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.sunxi Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.sunxi,v 1.5 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.sunxi,v 1.6 2018/10/08 10:22:17 skrll Exp $
#
machine evbarm arm
@@ -6,30 +6,30 @@ include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.sunxi"
-options FDT # Flattened Device Tree support
+# Architecture opions
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options DRAM_BLOCKS=256
+options FDT # Flattened Device Tree support
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
-options __HAVE_CPU_COUNTER
-options __HAVE_FAST_SOFTINTS # should be in types.h
-options __HAVE_CPU_UAREA_ALLOC_IDLELWP
-options ARM_HAS_VBAR
-#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#options PMAP_NEED_ALLOC_POOLPAGE
options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
-options FPU_VFP
options __BUS_SPACE_HAS_STREAM_METHODS
+options __HAVE_CPU_COUNTER
+options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_GENERIC_CPU_INITCLOCKS
+#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-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 KERNEL_BASE_EXT=0x80000000
+makeoptions KERNEL_BASE_PHYS="0x40008000"
+makeoptions KERNEL_BASE_VIRT="0x80008000"
# initrd support
options MEMORY_DISK_HOOKS
Index: src/sys/arch/evbarm/conf/std.armadillo9
diff -u src/sys/arch/evbarm/conf/std.armadillo9:1.8 src/sys/arch/evbarm/conf/std.armadillo9:1.9
--- src/sys/arch/evbarm/conf/std.armadillo9:1.8 Sun Oct 7 07:48:43 2018
+++ src/sys/arch/evbarm/conf/std.armadillo9 Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.armadillo9,v 1.8 2018/10/07 07:48:43 skrll Exp $
+# $NetBSD: std.armadillo9,v 1.9 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm for Armadillo9 options
@@ -8,8 +8,9 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in armadillo9 config definitions.
include "arch/evbarm/conf/files.armadillo9"
-makeoptions BOARDTYPE="armadillo9"
+options ARM_INTR_IMPL="<arch/arm/ep93xx/ep93xx_intr.h>"
+
options KERNEL_BASE_EXT=0xc0000000
+makeoptions BOARDTYPE="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.vexpress
diff -u src/sys/arch/evbarm/conf/std.vexpress:1.8 src/sys/arch/evbarm/conf/std.vexpress:1.9
--- src/sys/arch/evbarm/conf/std.vexpress:1.8 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.vexpress Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.vexpress,v 1.8 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.vexpress,v 1.9 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm for VEXPRESS options
@@ -8,27 +8,27 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in VEXPRESS config definitions
include "arch/evbarm/conf/files.vexpress"
-options FDT # Flattened Device Tree support
+# Architecture opions
+options ARM_HAS_VBAR
+options ARM_GENERIC_TODR
+options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options DRAM_BLOCKS=256
+options FDT # Flattened Device Tree support
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
-options ARM_HAS_VBAR
+options TPIDRPRW_IS_CURCPU
options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_FAST_SOFTINTS # should be in types.h
#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-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 BOARDTYPE="vexpress"
makeoptions CPUFLAGS="-mcpu=cortex-a15 -mfpu=neon"
-
-options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
+options KERNEL_BASE_EXT=0x80000000
+makeoptions KERNEL_BASE_PHYS="0x81000000"
+makeoptions KERNEL_BASE_VIRT="0x81000000"
# initrd support
options MEMORY_DISK_HOOKS
Index: src/sys/arch/evbarm/conf/std.bcm53xx
diff -u src/sys/arch/evbarm/conf/std.bcm53xx:1.15 src/sys/arch/evbarm/conf/std.bcm53xx:1.16
--- src/sys/arch/evbarm/conf/std.bcm53xx:1.15 Sun Oct 7 07:48:43 2018
+++ src/sys/arch/evbarm/conf/std.bcm53xx Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.bcm53xx,v 1.15 2018/10/07 07:48:43 skrll Exp $
+# $NetBSD: std.bcm53xx,v 1.16 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm for BCM5301X options
@@ -8,26 +8,25 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in BCM53xx config definitions.
include "arch/evbarm/conf/files.bcm53xx"
-options SOSEND_NO_LOAN
+options ARM_GENERIC_TODR
+options ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>"
options COM_TOLERANCE=40
-options FPU_VFP
options CORTEX_PMC
-options _ARM32_NEED_BUS_DMA_BOUNCE
+options EVBARM_BOARDTYPE="bcm53xx"
+options FPU_VFP
options PMAP_NEED_ALLOC_POOLPAGE
-options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options __HAVE_MM_MD_CACHE_ALIASING
+options SOSEND_NO_LOAN
+options TPIDRPRW_IS_CURCPU
+options _ARM32_NEED_BUS_DMA_BOUNCE
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_CPU_COUNTER
options __HAVE_PCI_CONF_HOOK
-options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
-options EVBARM_BOARDTYPE="bcm53xx"
+options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+options __HAVE_MM_MD_CACHE_ALIASING
+options KERNEL_BASE_EXT=0x80000000
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
Index: src/sys/arch/evbarm/conf/std.beagle
diff -u src/sys/arch/evbarm/conf/std.beagle:1.15 src/sys/arch/evbarm/conf/std.beagle:1.16
--- src/sys/arch/evbarm/conf/std.beagle:1.15 Sun Oct 7 07:48:43 2018
+++ src/sys/arch/evbarm/conf/std.beagle Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.beagle,v 1.15 2018/10/07 07:48:43 skrll Exp $
+# $NetBSD: std.beagle,v 1.16 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm for BEAGLEBOARD options
@@ -8,22 +8,21 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in BEAGLEBOARD config definitions.
include "arch/evbarm/conf/files.beagle"
-# To support easy transit to ../arch/arm/arm32
+# Architecture opions
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/omap/omap2_intr.h>"
+options CORTEX_PMC
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
+options TPIDRPRW_IS_CURCPU
options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
-options CORTEX_PMC
options __HAVE_FAST_SOFTINTS # should be in types.h
-options ARM_HAS_VBAR
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
-options FPU_VFP
-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
+makeoptions BOARDTYPE="beagle"
+options KERNEL_BASE_EXT=0x80000000
+makeoptions LOADADDRESS="0x80300000"
Index: src/sys/arch/evbarm/conf/std.exynos
diff -u src/sys/arch/evbarm/conf/std.exynos:1.7 src/sys/arch/evbarm/conf/std.exynos:1.8
--- src/sys/arch/evbarm/conf/std.exynos:1.7 Sun Oct 7 07:48:43 2018
+++ src/sys/arch/evbarm/conf/std.exynos Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.exynos,v 1.7 2018/10/07 07:48:43 skrll Exp $
+# $NetBSD: std.exynos,v 1.8 2018/10/08 10:22:17 skrll Exp $
#
machine evbarm arm
@@ -8,31 +8,30 @@ include "arch/evbarm/conf/files.exynos"
makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
+# Architecture opions
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options ARM_TRUSTZONE_FIRMWARE
-options __NO_FIQ
-
-options FDT # Flattened Device Tree support
options DRAM_BLOCKS=256
+options FDT # Flattened Device Tree support
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
-options __HAVE_CPU_COUNTER
-options __HAVE_CPU_UAREA_ALLOC_IDLELWP
-options __HAVE_FAST_SOFTINTS # should be in types.h
-options ARM_HAS_VBAR
-#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#options PMAP_NEED_ALLOC_POOLPAGE
options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
options FPU_VFP
options PCI_NETBSD_CONFIGURE
-options __HAVE_PCI_CONF_HOOK
+options __NO_FIQ
options __BUS_SPACE_HAS_STREAM_METHODS
+options __HAVE_CPU_COUNTER
+options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_GENERIC_CPU_INITCLOCKS
+#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+options __HAVE_PCI_CONF_HOOK
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.exynos"
+makeoptions BOARDTYPE="exynos"
+options KERNEL_BASE_EXT=0x80000000
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
Index: src/sys/arch/evbarm/conf/std.generic
diff -u src/sys/arch/evbarm/conf/std.generic:1.1 src/sys/arch/evbarm/conf/std.generic:1.2
--- src/sys/arch/evbarm/conf/std.generic:1.1 Sun Apr 1 04:35:04 2018
+++ src/sys/arch/evbarm/conf/std.generic Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.generic,v 1.1 2018/04/01 04:35:04 ryo Exp $
+# $NetBSD: std.generic,v 1.2 2018/10/08 10:22:17 skrll Exp $
#
# generic NetBSD/evbarm with FDT support
@@ -8,15 +8,9 @@ include "arch/arm/conf/std.arm" # arch
# Architecture opions
options ARM32
-
-options __BUS_SPACE_HAS_STREAM_METHODS
-options __HAVE_CPU_COUNTER
-options __HAVE_CPU_UAREA_ALLOC_IDLELWP
-options __HAVE_FAST_SOFTINTS # should be in types.h
-options __HAVE_PCI_CONF_HOOK
+options ARM_GENERIC_TODR
options ARM_HAS_VBAR
options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
options DRAM_BLOCKS=256
options EVBARM_BOARDTYPE="evbarm"
options FDT # Flattened Device Tree support
@@ -25,9 +19,14 @@ options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
options PCI_NETBSD_CONFIGURE
options TPIDRPRW_IS_CURCPU
+options __BUS_SPACE_HAS_STREAM_METHODS
+options __HAVE_CPU_COUNTER
+options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_FAST_SOFTINTS # should be in types.h
+options __HAVE_PCI_CONF_HOOK
+
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.generic"
# General options
options CHILD_MAX=1024 # 160 is too few
options OPEN_MAX=1024 # 128 is too few
-
Index: src/sys/arch/evbarm/conf/std.nitrogen6
diff -u src/sys/arch/evbarm/conf/std.nitrogen6:1.6 src/sys/arch/evbarm/conf/std.nitrogen6:1.7
--- src/sys/arch/evbarm/conf/std.nitrogen6:1.6 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.nitrogen6 Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.nitrogen6,v 1.6 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.nitrogen6,v 1.7 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm options for Nitrogen6X
@@ -8,28 +8,24 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in nitrogen6 config definitions.
include "arch/evbarm/conf/files.nitrogen6"
-options NITROGEN6
-
+# Architecture opions
+options ARM_GENERIC_TODR
options ARM_HAS_VBAR
+options ARM_GENERIC_TODR
+options ARM_INTR_IMPL="<arch/arm/imx/imx6_intr.h>"
+options CORTEX_PMC
+options CORTEX_PMC_CCNT_HZ=792000000
+options FPU_VFP
+options NITROGEN6
+options PCI_NETBSD_CONFIGURE
+options TPIDRPRW_IS_CURCPU
options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_FAST_SOFTINTS # should be in types.h
-options TPIDRPRW_IS_CURCPU
-options PCI_NETBSD_CONFIGURE
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.nitrogen6"
+makeoptions CPPFLAGS+="-I$S/../../../include"
makeoptions CPUFLAGS="-mcpu=cortex-a9"
-
-# To support easy transit to ../arch/arm/arm32
-options FPU_VFP
-options CORTEX_PMC
-options CORTEX_PMC_CCNT_HZ=792000000
-
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"
-
-options ARM_INTR_IMPL="<arch/arm/imx/imx6_intr.h>"
-options ARM_GENERIC_TODR
Index: src/sys/arch/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.21 src/sys/arch/evbarm/conf/std.rpi:1.22
--- src/sys/arch/evbarm/conf/std.rpi:1.21 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.rpi Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.rpi,v 1.21 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.rpi,v 1.22 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm for Raspberry Pi options
@@ -8,21 +8,21 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in Raspberry Pi config definitions.
include "arch/evbarm/conf/files.rpi"
-options FDT # Flattened Device Tree support
+# Architecture opions
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options DRAM_BLOCKS=256
+options EVBARM_BOARDTYPE="rpi"
+options FDT # Flattened Device Tree support
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
-options FPU_VFP
options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options ARM_HAS_VBAR
-options KERNEL_BASE_EXT=0x80000000
-options EVBARM_BOARDTYPE="rpi"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.rpi"
makeoptions LOADADDRESS="0x80008000"
-
-options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
+options KERNEL_BASE_EXT=0x80000000
Index: src/sys/arch/evbarm/conf/std.tegra
diff -u src/sys/arch/evbarm/conf/std.tegra:1.17 src/sys/arch/evbarm/conf/std.tegra:1.18
--- src/sys/arch/evbarm/conf/std.tegra:1.17 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.tegra Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.tegra,v 1.17 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.tegra,v 1.18 2018/10/08 10:22:17 skrll Exp $
#
machine evbarm arm
@@ -6,30 +6,30 @@ include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.tegra"
-options FDT # Flattened Device Tree support
+# Architecture opions
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options DRAM_BLOCKS=256
+options FDT # Flattened Device Tree support
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
+#options PMAP_NEED_ALLOC_POOLPAGE
+options PCI_NETBSD_CONFIGURE
+options TPIDRPRW_IS_CURCPU
+options __BUS_SPACE_HAS_STREAM_METHODS
options __HAVE_CPU_COUNTER
-options __HAVE_FAST_SOFTINTS # should be in types.h
-options ARM_HAS_VBAR
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_FAST_SOFTINTS # should be in types.h
#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-#options PMAP_NEED_ALLOC_POOLPAGE
-options TPIDRPRW_IS_CURCPU
-options KERNEL_BASE_EXT=0x80000000
-options FPU_VFP
-options PCI_NETBSD_CONFIGURE
options __HAVE_PCI_CONF_HOOK
-options __BUS_SPACE_HAS_STREAM_METHODS
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.tegra"
+makeoptions BOARDTYPE="tegra"
+options KERNEL_BASE_EXT=0x80000000
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
# initrd support
options MEMORY_DISK_HOOKS
Index: src/sys/arch/evbarm/conf/std.virt
diff -u src/sys/arch/evbarm/conf/std.virt:1.4 src/sys/arch/evbarm/conf/std.virt:1.5
--- src/sys/arch/evbarm/conf/std.virt:1.4 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.virt Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.virt,v 1.4 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.virt,v 1.5 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm for VIRT options
@@ -8,27 +8,27 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in VIRT config definitions
include "arch/evbarm/conf/files.virt"
-options FDT # Flattened Device Tree support
+# Architecture opions
+options ARM_HAS_VBAR
+options ARM_GENERIC_TODR
+options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options DRAM_BLOCKS=256
+options FDT # Flattened Device Tree support
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
-options ARM_HAS_VBAR
+options TPIDRPRW_IS_CURCPU
options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_FAST_SOFTINTS # should be in types.h
#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-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 BOARDTYPE="virt"
makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
-
-options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
+options KERNEL_BASE_EXT=0x80000000
+makeoptions KERNEL_BASE_PHYS="0x41000000"
+makeoptions KERNEL_BASE_VIRT="0x81000000"
# initrd support
options MEMORY_DISK_HOOKS
Index: src/sys/arch/evbarm/conf/std.zynq
diff -u src/sys/arch/evbarm/conf/std.zynq:1.3 src/sys/arch/evbarm/conf/std.zynq:1.4
--- src/sys/arch/evbarm/conf/std.zynq:1.3 Sun Oct 7 07:48:44 2018
+++ src/sys/arch/evbarm/conf/std.zynq Mon Oct 8 10:22:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.zynq,v 1.3 2018/10/07 07:48:44 skrll Exp $
+# $NetBSD: std.zynq,v 1.4 2018/10/08 10:22:17 skrll Exp $
#
# standard NetBSD/evbarm for ZYNQ options
@@ -8,28 +8,25 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in Zynq config definitions.
include "arch/evbarm/conf/files.zynq"
+# Architecture opions
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL="<arch/arm/zynq/zynq7000_intr.h>"
+options COM_TOLERANCE=40
+options CORTEX_PMC
+options CORTEX_PMC_CCNT_HZ=666666666
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
-options ARM_HAS_VBAR
options PMAP_NEED_ALLOC_POOLPAGE
+options TPIDRPRW_IS_CURCPU
options __HAVE_CPU_COUNTER
options __HAVE_CPU_UAREA_ALLOC_IDLELWP
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options TPIDRPRW_IS_CURCPU
-options COM_TOLERANCE=40
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.zynq"
+makeoptions CPPFLAGS+="-I$S/../../../include"
options KERNEL_BASE_EXT=0x80000000
-
-options FPU_VFP
-options CORTEX_PMC
-options CORTEX_PMC_CCNT_HZ=666666666
-
makeoptions LOADADDRESS_VIRT="0x80100000"
makeoptions LOADADDRESS="0x00100000"
-
-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
