Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/evbarm/conf Sort options.
details: https://anonhg.NetBSD.org/src/rev/304e7f0a9112
branches: trunk
changeset: 836288:304e7f0a9112
user: skrll <skrll%NetBSD.org@localhost>
date: Mon Oct 08 10:22:17 2018 +0000
description:
Sort options.
No functional change.
diffstat:
sys/arch/evbarm/conf/std.altera | 10 ++++------
sys/arch/evbarm/conf/std.amlogic | 22 +++++++++++-----------
sys/arch/evbarm/conf/std.armadaxp | 37 ++++++++++++++++++-------------------
sys/arch/evbarm/conf/std.armadillo9 | 7 ++++---
sys/arch/evbarm/conf/std.bcm53xx | 23 +++++++++++------------
sys/arch/evbarm/conf/std.beagle | 23 +++++++++++------------
sys/arch/evbarm/conf/std.exynos | 35 +++++++++++++++++------------------
sys/arch/evbarm/conf/std.generic | 17 ++++++++---------
sys/arch/evbarm/conf/std.imx6ul | 31 +++++++++++++------------------
sys/arch/evbarm/conf/std.nitrogen6 | 30 +++++++++++++-----------------
sys/arch/evbarm/conf/std.rpi | 18 +++++++++---------
sys/arch/evbarm/conf/std.sunxi | 28 ++++++++++++++--------------
sys/arch/evbarm/conf/std.tegra | 34 +++++++++++++++++-----------------
sys/arch/evbarm/conf/std.vexpress | 24 ++++++++++++------------
sys/arch/evbarm/conf/std.virt | 24 ++++++++++++------------
sys/arch/evbarm/conf/std.zynq | 29 +++++++++++++----------------
16 files changed, 187 insertions(+), 205 deletions(-)
diffs (truncated from 733 to 300 lines):
diff -r e0b670ebc1ae -r 304e7f0a9112 sys/arch/evbarm/conf/std.altera
--- a/sys/arch/evbarm/conf/std.altera Mon Oct 08 08:16:59 2018 +0000
+++ b/sys/arch/evbarm/conf/std.altera Mon Oct 08 10:22:17 2018 +0000
@@ -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 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 ARM_HAS_VBAR
-options ARM_GENERIC_TODR
-options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
options TPIDRPRW_IS_CURCPU
options __BUS_SPACE_HAS_STREAM_METHODS
options __HAVE_CPU_COUNTER
@@ -19,10 +19,8 @@
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"
diff -r e0b670ebc1ae -r 304e7f0a9112 sys/arch/evbarm/conf/std.amlogic
--- a/sys/arch/evbarm/conf/std.amlogic Mon Oct 08 08:16:59 2018 +0000
+++ b/sys/arch/evbarm/conf/std.amlogic Mon Oct 08 10:22:17 2018 +0000
@@ -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/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
+
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.amlogic"
+makeoptions BOARDTYPE="amlogic"
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"
-
-options ARM_INTR_IMPL="<arch/arm/amlogic/amlogic_intr.h>"
-options ARM_GENERIC_TODR
diff -r e0b670ebc1ae -r 304e7f0a9112 sys/arch/evbarm/conf/std.armadaxp
--- a/sys/arch/evbarm/conf/std.armadaxp Mon Oct 08 08:16:59 2018 +0000
+++ b/sys/arch/evbarm/conf/std.armadaxp Mon Oct 08 10:22:17 2018 +0000
@@ -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 @@
# To support easy transit to ../arch/arm/arm32
options ARM32
-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
-
-
-# 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
+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
+makeoptions LOADADDRESS="0x00200000"
+makeoptions KERNEL_BASE_PHYS="0x00200000"
+makeoptions KERNEL_BASE_VIRT="0x80200000"
+makeoptions BOARDTYPE="armadaxp"
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadaxp"
diff -r e0b670ebc1ae -r 304e7f0a9112 sys/arch/evbarm/conf/std.armadillo9
--- a/sys/arch/evbarm/conf/std.armadillo9 Mon Oct 08 08:16:59 2018 +0000
+++ b/sys/arch/evbarm/conf/std.armadillo9 Mon Oct 08 10:22:17 2018 +0000
@@ -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 @@
# Pull in armadillo9 config definitions.
include "arch/evbarm/conf/files.armadillo9"
+options ARM_INTR_IMPL="<arch/arm/ep93xx/ep93xx_intr.h>"
+
+options KERNEL_BASE_EXT=0xc0000000
makeoptions BOARDTYPE="armadillo9"
-options KERNEL_BASE_EXT=0xc0000000
makeoptions LOADADDRESS="0xc0200000"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.armadillo9"
-options ARM_INTR_IMPL="<arch/arm/ep93xx/ep93xx_intr.h>"
diff -r e0b670ebc1ae -r 304e7f0a9112 sys/arch/evbarm/conf/std.bcm53xx
--- a/sys/arch/evbarm/conf/std.bcm53xx Mon Oct 08 08:16:59 2018 +0000
+++ b/sys/arch/evbarm/conf/std.bcm53xx Mon Oct 08 10:22:17 2018 +0000
@@ -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 @@
# 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 __HAVE_MM_MD_DIRECT_MAPPED_PHYS
+options __HAVE_MM_MD_CACHE_ALIASING
+
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"
-
-options ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>"
-options ARM_GENERIC_TODR
diff -r e0b670ebc1ae -r 304e7f0a9112 sys/arch/evbarm/conf/std.beagle
--- a/sys/arch/evbarm/conf/std.beagle Mon Oct 08 08:16:59 2018 +0000
+++ b/sys/arch/evbarm/conf/std.beagle Mon Oct 08 10:22:17 2018 +0000
@@ -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 @@
# 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
+
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.beagle"
+makeoptions BOARDTYPE="beagle"
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
diff -r e0b670ebc1ae -r 304e7f0a9112 sys/arch/evbarm/conf/std.exynos
--- a/sys/arch/evbarm/conf/std.exynos Mon Oct 08 08:16:59 2018 +0000
+++ b/sys/arch/evbarm/conf/std.exynos Mon Oct 08 10:22:17 2018 +0000
@@ -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 @@
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 DRAM_BLOCKS=256
options FDT # Flattened Device Tree support
-options DRAM_BLOCKS=256
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
+#options PMAP_NEED_ALLOC_POOLPAGE
+options TPIDRPRW_IS_CURCPU
+options FPU_VFP
+options PCI_NETBSD_CONFIGURE
+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 ARM_HAS_VBAR
+options __HAVE_GENERIC_CPU_INITCLOCKS
#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-#options PMAP_NEED_ALLOC_POOLPAGE
-options TPIDRPRW_IS_CURCPU
+options __HAVE_PCI_CONF_HOOK
+
+makeoptions BOARDMKFRAG="${THISARM}/conf/mk.exynos"
+makeoptions BOARDTYPE="exynos"
options KERNEL_BASE_EXT=0x80000000
-options FPU_VFP
-options PCI_NETBSD_CONFIGURE
-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"
-
-options ARM_INTR_IMPL="<arch/arm/fdt/fdt_intr.h>"
-options ARM_GENERIC_TODR
diff -r e0b670ebc1ae -r 304e7f0a9112 sys/arch/evbarm/conf/std.generic
--- a/sys/arch/evbarm/conf/std.generic Mon Oct 08 08:16:59 2018 +0000
+++ b/sys/arch/evbarm/conf/std.generic Mon Oct 08 10:22:17 2018 +0000
Home |
Main Index |
Thread Index |
Old Index