svn commit: r324341 - in head/sys: arm/allwinner arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/broadcom/bcm2835 arm/conf arm/freescale/imx arm/freescale/vybrid arm/mv arm/mv/armad...
Warner Losh
imp at FreeBSD.org
Thu Oct 5 23:01:55 UTC 2017
Author: imp
Date: Thu Oct 5 23:01:50 2017
New Revision: 324341
URL: https://svnweb.freebsd.org/changeset/base/324341
Log:
Tag all armv7 kernels as such in their machine config line.
Transition all boards that support arm cortex CPUs to armv7. This
leaves two armv6 kernels in the tree. RPI-B, which uses the BCM2835
which has a ARM1176 core, and VERSATILEPB, which is a qemu board setup
around the time RPI-B went in. Copy std.armv6 to std.armv7, even
though that duplicates a lot of stuff. More work needs to be done to
sort out the duplication.
Differential Revision: https://reviews.freebsd.org/D12027
Added:
head/sys/arm/conf/VIRT
- copied, changed from r324340, head/sys/arm/conf/ARMADAXP
head/sys/arm/conf/std.armv7
- copied, changed from r324340, head/sys/arm/conf/std.armv6
Modified:
head/sys/arm/allwinner/std.allwinner
head/sys/arm/allwinner/std.allwinner_up
head/sys/arm/altera/socfpga/std.socfpga
head/sys/arm/amlogic/aml8726/std.aml8726
head/sys/arm/annapurna/alpine/std.alpine
head/sys/arm/broadcom/bcm2835/std.bcm2836
head/sys/arm/conf/ALLWINNER_UP
head/sys/arm/conf/ALPINE
head/sys/arm/conf/AML8726
head/sys/arm/conf/ARMADA38X
head/sys/arm/conf/ARMADAXP
head/sys/arm/conf/BEAGLEBONE
head/sys/arm/conf/EFIKA_MX
head/sys/arm/conf/EXYNOS5.common
head/sys/arm/conf/GENERIC
head/sys/arm/conf/IMX53
head/sys/arm/conf/IMX6
head/sys/arm/conf/PANDABOARD
head/sys/arm/conf/RK3188
head/sys/arm/conf/RPI2
head/sys/arm/conf/SOCFPGA
head/sys/arm/conf/TEGRA124
head/sys/arm/conf/VYBRID
head/sys/arm/conf/ZEDBOARD
head/sys/arm/conf/std.armv6
head/sys/arm/freescale/imx/std.imx51
head/sys/arm/freescale/imx/std.imx53
head/sys/arm/freescale/imx/std.imx6
head/sys/arm/freescale/vybrid/std.vybrid
head/sys/arm/mv/armada38x/std.armada38x
head/sys/arm/mv/std-pj4b.mv
head/sys/arm/nvidia/tegra124/std.tegra124
head/sys/arm/qemu/std.virt
head/sys/arm/rockchip/std.rk30xx
head/sys/arm/samsung/exynos/std.exynos5250
head/sys/arm/samsung/exynos/std.exynos5420
head/sys/arm/ti/std.ti
head/sys/arm/xilinx/std.zynq7
head/sys/conf/files.arm
head/sys/conf/options.arm
Modified: head/sys/arm/allwinner/std.allwinner
==============================================================================
--- head/sys/arm/allwinner/std.allwinner Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/allwinner/std.allwinner Thu Oct 5 23:01:50 2017 (r324341)
@@ -2,7 +2,7 @@
#$FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0200000
Modified: head/sys/arm/allwinner/std.allwinner_up
==============================================================================
--- head/sys/arm/allwinner/std.allwinner_up Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/allwinner/std.allwinner_up Thu Oct 5 23:01:50 2017 (r324341)
@@ -2,7 +2,7 @@
#$FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0200000
Modified: head/sys/arm/altera/socfpga/std.socfpga
==============================================================================
--- head/sys/arm/altera/socfpga/std.socfpga Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/altera/socfpga/std.socfpga Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,7 +1,7 @@
# $FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0f00000
Modified: head/sys/arm/amlogic/aml8726/std.aml8726
==============================================================================
--- head/sys/arm/amlogic/aml8726/std.aml8726 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/amlogic/aml8726/std.aml8726 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,7 +1,7 @@
# $FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
# Physical memory starts at 0x80000000. We assume the kernel is loaded
Modified: head/sys/arm/annapurna/alpine/std.alpine
==============================================================================
--- head/sys/arm/annapurna/alpine/std.alpine Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/annapurna/alpine/std.alpine Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,7 +1,7 @@
# $FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES"
makeoptions KERNVIRTADDR=0xa0200000
Modified: head/sys/arm/broadcom/bcm2835/std.bcm2836
==============================================================================
--- head/sys/arm/broadcom/bcm2835/std.bcm2836 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/broadcom/bcm2835/std.bcm2836 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,6 +1,6 @@
# $FreeBSD$
-machine arm armv6
+machine arm armv7
cpu CPU_CORTEXA
makeoptions CONF_CFLAGS="-march=armv7a"
options SOC_BCM2836
Modified: head/sys/arm/conf/ALLWINNER_UP
==============================================================================
--- head/sys/arm/conf/ALLWINNER_UP Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/ALLWINNER_UP Thu Oct 5 23:01:50 2017 (r324341)
@@ -20,7 +20,7 @@
ident ALLWINNER_UP
-include "std.armv6"
+include "std.armv7"
include "../allwinner/std.allwinner_up"
options INTRNG
Modified: head/sys/arm/conf/ALPINE
==============================================================================
--- head/sys/arm/conf/ALPINE Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/ALPINE Thu Oct 5 23:01:50 2017 (r324341)
@@ -19,7 +19,7 @@
ident ALPINE
-include "std.armv6"
+include "std.armv7"
include "../annapurna/alpine/std.alpine"
makeoptions MODULES_OVERRIDE=""
Modified: head/sys/arm/conf/AML8726
==============================================================================
--- head/sys/arm/conf/AML8726 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/AML8726 Thu Oct 5 23:01:50 2017 (r324341)
@@ -23,7 +23,7 @@
ident AML8726
-include "std.armv6"
+include "std.armv7"
include "../amlogic/aml8726/std.aml8726"
options SCHED_ULE # ULE scheduler
Modified: head/sys/arm/conf/ARMADA38X
==============================================================================
--- head/sys/arm/conf/ARMADA38X Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/ARMADA38X Thu Oct 5 23:01:50 2017 (r324341)
@@ -5,7 +5,7 @@
#
include "../mv/armada38x/std.armada38x"
-include "std.armv6"
+include "std.armv7"
ident ARMADA38X
Modified: head/sys/arm/conf/ARMADAXP
==============================================================================
--- head/sys/arm/conf/ARMADAXP Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/ARMADAXP Thu Oct 5 23:01:50 2017 (r324341)
@@ -23,7 +23,7 @@
ident MV-88F78XX0
-include "std.armv6"
+include "std.armv7"
include "../mv/armadaxp/std.mv78x60"
options SOC_MV_ARMADAXP
Modified: head/sys/arm/conf/BEAGLEBONE
==============================================================================
--- head/sys/arm/conf/BEAGLEBONE Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/BEAGLEBONE Thu Oct 5 23:01:50 2017 (r324341)
@@ -23,7 +23,7 @@
ident BEAGLEBONE
-include "std.armv6"
+include "std.armv7"
include "../ti/am335x/std.am335x"
makeoptions MODULES_EXTRA="dtb/am335x am335x_dmtpps"
Modified: head/sys/arm/conf/EFIKA_MX
==============================================================================
--- head/sys/arm/conf/EFIKA_MX Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/EFIKA_MX Thu Oct 5 23:01:50 2017 (r324341)
@@ -20,7 +20,7 @@
ident EFIKA_MX
-include "std.armv6"
+include "std.armv7"
include "../freescale/imx/std.imx51"
makeoptions WITHOUT_MODULES="ahc"
Modified: head/sys/arm/conf/EXYNOS5.common
==============================================================================
--- head/sys/arm/conf/EXYNOS5.common Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/EXYNOS5.common Thu Oct 5 23:01:50 2017 (r324341)
@@ -20,7 +20,7 @@
makeoptions WERROR="-Werror"
-include "std.armv6"
+include "std.armv7"
options SCHED_ULE # ULE scheduler
options PLATFORM # Platform based SoC
options PREEMPTION # Enable kernel thread preemption
Modified: head/sys/arm/conf/GENERIC
==============================================================================
--- head/sys/arm/conf/GENERIC Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/GENERIC Thu Oct 5 23:01:50 2017 (r324341)
@@ -22,13 +22,13 @@ ident GENERIC
cpu CPU_CORTEXA
options SMP_ON_UP
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0000000
options KERNVIRTADDR=0xc0000000
-include "std.armv6"
+include "std.armv7"
files "../allwinner/files.allwinner"
files "../allwinner/files.allwinner_up"
files "../allwinner/a10/files.a10"
Modified: head/sys/arm/conf/IMX53
==============================================================================
--- head/sys/arm/conf/IMX53 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/IMX53 Thu Oct 5 23:01:50 2017 (r324341)
@@ -20,7 +20,7 @@
ident IMX53
-include "std.armv6"
+include "std.armv7"
include "../freescale/imx/std.imx53"
options SOC_IMX53
Modified: head/sys/arm/conf/IMX6
==============================================================================
--- head/sys/arm/conf/IMX6 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/IMX6 Thu Oct 5 23:01:50 2017 (r324341)
@@ -19,7 +19,7 @@
# $FreeBSD$
ident IMX6
-include "std.armv6"
+include "std.armv7"
include "../freescale/imx/std.imx6"
options INTRNG
Modified: head/sys/arm/conf/PANDABOARD
==============================================================================
--- head/sys/arm/conf/PANDABOARD Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/PANDABOARD Thu Oct 5 23:01:50 2017 (r324341)
@@ -27,7 +27,7 @@ ident PANDABOARD
hints "PANDABOARD.hints"
-include "std.armv6"
+include "std.armv7"
include "../ti/omap4/std.omap4"
makeoptions MODULES_EXTRA=dtb/omap4
Modified: head/sys/arm/conf/RK3188
==============================================================================
--- head/sys/arm/conf/RK3188 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/RK3188 Thu Oct 5 23:01:50 2017 (r324341)
@@ -20,7 +20,7 @@
ident RK3188
-include "std.armv6"
+include "std.armv7"
include "../rockchip/std.rk30xx"
options SOC_ROCKCHIP_RK3188
Modified: head/sys/arm/conf/RPI2
==============================================================================
--- head/sys/arm/conf/RPI2 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/RPI2 Thu Oct 5 23:01:50 2017 (r324341)
@@ -22,7 +22,7 @@
ident RPI2
-include "std.armv6"
+include "std.armv7"
include "../broadcom/bcm2835/std.rpi"
include "../broadcom/bcm2835/std.bcm2836"
Modified: head/sys/arm/conf/SOCFPGA
==============================================================================
--- head/sys/arm/conf/SOCFPGA Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/SOCFPGA Thu Oct 5 23:01:50 2017 (r324341)
@@ -19,7 +19,7 @@
# $FreeBSD$
ident SOCFPGA
-include "std.armv6"
+include "std.armv7"
include "../altera/socfpga/std.socfpga"
makeoptions MODULES_OVERRIDE=""
Modified: head/sys/arm/conf/TEGRA124
==============================================================================
--- head/sys/arm/conf/TEGRA124 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/TEGRA124 Thu Oct 5 23:01:50 2017 (r324341)
@@ -18,7 +18,7 @@
#
# $FreeBSD$
-include "std.armv6"
+include "std.armv7"
include "../nvidia/tegra124/std.tegra124"
ident TEGRA124
Copied and modified: head/sys/arm/conf/VIRT (from r324340, head/sys/arm/conf/ARMADAXP)
==============================================================================
--- head/sys/arm/conf/ARMADAXP Thu Oct 5 23:01:33 2017 (r324340, copy source)
+++ head/sys/arm/conf/VIRT Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,5 +1,5 @@
#
-# Custom kernel for Marvell Armada XP
+# VIRT -- Custom configuration for the qemu virt platform
#
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
@@ -18,73 +18,42 @@
#
# $FreeBSD$
-# TODO: Port to INTRNG
-#NO_UNIVERSE
+ident VIRT
-ident MV-88F78XX0
+include "std.armv7"
+include "../qemu/std.virt"
-include "std.armv6"
-include "../mv/armadaxp/std.mv78x60"
-
-options SOC_MV_ARMADAXP
-
-makeoptions WERROR="-Werror"
-
options SCHED_ULE # ULE scheduler
+options PLATFORM
options SMP # Enable multiple cores
-# NFS root from boopt/dhcp
-options BOOTP
-options BOOTP_NFSROOT
-options BOOTP_NFSV3
-options BOOTP_WIRED_TO=mge0
+# Interrupt controller
+device gic
+options INTRNG
-options ROOTDEVNAME=\"ufs:/dev/da0p1\"
+# ARM Generic Timer
+device generic_timer
-options MUTEX_NOINLINE
-options RWLOCK_NOINLINE
-options NO_FFS_SNAPSHOT
-options NO_SWAPPING
-
-# Pseudo devices
-device random
-device pty
+device bpf
device loop
-device md
-
-# USB
-device usb
-device ehci
-device umass
-device scbus
-device pass
-device da
-
-# SATA
-device mvs
-
-# Serial ports
+device ether
device uart
+device pty
+device snp
+device pl011
+device psci
-# I2C (TWSI)
-device iic
-device iicbus
-device twsi
+device virtio
+device virtio_mmio
+device virtio_blk
+device vtnet
-#Network
-device ether
-device mge # Marvell Gigabit Ethernet controller
-device mii
-device mdio
-device e1000phy
-device bpf
-options DEVICE_POLLING
-device vlan
+device md
+device random # Entropy device
-#PCI/PCIE
-device pci
-
# Flattened Device Tree
options FDT # Configure using FDT/DTB data
-options FDT_DTB_STATIC
-makeoptions FDT_DTS_FILE=db78460.dts
+
+# Extensible Firmware Interface
+options EFI
+
Modified: head/sys/arm/conf/VYBRID
==============================================================================
--- head/sys/arm/conf/VYBRID Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/VYBRID Thu Oct 5 23:01:50 2017 (r324341)
@@ -19,7 +19,7 @@
# $FreeBSD$
ident VYBRID
-include "std.armv6"
+include "std.armv7"
include "../freescale/vybrid/std.vybrid"
makeoptions WERROR="-Werror"
Modified: head/sys/arm/conf/ZEDBOARD
==============================================================================
--- head/sys/arm/conf/ZEDBOARD Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/ZEDBOARD Thu Oct 5 23:01:50 2017 (r324341)
@@ -21,7 +21,7 @@
ident ZEDBOARD
-include "std.armv6"
+include "std.armv7"
include "../xilinx/std.zynq7"
makeoptions MODULES_EXTRA="dtb/zynq"
Modified: head/sys/arm/conf/std.armv6
==============================================================================
--- head/sys/arm/conf/std.armv6 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/conf/std.armv6 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,4 +1,4 @@
-# Standard kernel config items for all ARMv6/v7 systems.
+# Standard kernel config items for all ARMv6 systems.
#
# $FreeBSD$
Copied and modified: head/sys/arm/conf/std.armv7 (from r324340, head/sys/arm/conf/std.armv6)
==============================================================================
--- head/sys/arm/conf/std.armv6 Thu Oct 5 23:01:33 2017 (r324340, copy source)
+++ head/sys/arm/conf/std.armv7 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,4 +1,4 @@
-# Standard kernel config items for all ARMv6/v7 systems.
+# Standard kernel config items for all ARMv7 systems.
#
# $FreeBSD$
Modified: head/sys/arm/freescale/imx/std.imx51
==============================================================================
--- head/sys/arm/freescale/imx/std.imx51 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/freescale/imx/std.imx51 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,5 +1,5 @@
# $FreeBSD$
-machine arm armv6
+machine arm armv7
cpu CPU_CORTEXA
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/freescale/imx/std.imx53
==============================================================================
--- head/sys/arm/freescale/imx/std.imx53 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/freescale/imx/std.imx53 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,5 +1,5 @@
# $FreeBSD$
-machine arm armv6
+machine arm armv7
cpu CPU_CORTEXA
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/freescale/imx/std.imx6
==============================================================================
--- head/sys/arm/freescale/imx/std.imx6 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/freescale/imx/std.imx6 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,5 +1,5 @@
# $FreeBSD$
-machine arm armv6
+machine arm armv7
cpu CPU_CORTEXA
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/freescale/vybrid/std.vybrid
==============================================================================
--- head/sys/arm/freescale/vybrid/std.vybrid Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/freescale/vybrid/std.vybrid Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,7 +1,7 @@
# $FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0100000
Modified: head/sys/arm/mv/armada38x/std.armada38x
==============================================================================
--- head/sys/arm/mv/armada38x/std.armada38x Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/mv/armada38x/std.armada38x Thu Oct 5 23:01:50 2017 (r324341)
@@ -2,7 +2,7 @@
files "../mv/armada38x/files.armada38x"
files "../mv/files.mv"
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0000000
Modified: head/sys/arm/mv/std-pj4b.mv
==============================================================================
--- head/sys/arm/mv/std-pj4b.mv Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/mv/std-pj4b.mv Thu Oct 5 23:01:50 2017 (r324341)
@@ -2,7 +2,7 @@
files "../mv/files.mv"
cpu CPU_MV_PJ4B
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
# This was originally defined as "(KERNBASE-(1024*1024*1024))" but that
Modified: head/sys/arm/nvidia/tegra124/std.tegra124
==============================================================================
--- head/sys/arm/nvidia/tegra124/std.tegra124 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/nvidia/tegra124/std.tegra124 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,6 +1,6 @@
# $FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
options KERNVIRTADDR = 0xc0200000
Modified: head/sys/arm/qemu/std.virt
==============================================================================
--- head/sys/arm/qemu/std.virt Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/qemu/std.virt Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,5 +1,5 @@
# $FreeBSD$
-machine arm armv6
+machine arm armv7
cpu CPU_CORTEXA
makeoptions CONF_CFLAGS="-march=armv7a"
Modified: head/sys/arm/rockchip/std.rk30xx
==============================================================================
--- head/sys/arm/rockchip/std.rk30xx Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/rockchip/std.rk30xx Thu Oct 5 23:01:50 2017 (r324341)
@@ -2,7 +2,7 @@
#$FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0400000
Modified: head/sys/arm/samsung/exynos/std.exynos5250
==============================================================================
--- head/sys/arm/samsung/exynos/std.exynos5250 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/samsung/exynos/std.exynos5250 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,7 +1,7 @@
# $FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0f00000
Modified: head/sys/arm/samsung/exynos/std.exynos5420
==============================================================================
--- head/sys/arm/samsung/exynos/std.exynos5420 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/samsung/exynos/std.exynos5420 Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,7 +1,7 @@
# $FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
makeoptions KERNVIRTADDR=0xc0f00000
Modified: head/sys/arm/ti/std.ti
==============================================================================
--- head/sys/arm/ti/std.ti Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/ti/std.ti Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,6 +1,6 @@
# $FreeBSD$
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
files "../ti/files.ti"
Modified: head/sys/arm/xilinx/std.zynq7
==============================================================================
--- head/sys/arm/xilinx/std.zynq7 Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/arm/xilinx/std.zynq7 Thu Oct 5 23:01:50 2017 (r324341)
@@ -4,7 +4,7 @@
# $FreeBSD$
cpu CPU_CORTEXA
-machine arm armv6
+machine arm armv7
makeoptions CONF_CFLAGS="-march=armv7a"
files "../xilinx/files.zynq7"
Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/conf/files.arm Thu Oct 5 23:01:50 2017 (r324341)
@@ -25,8 +25,8 @@ arm/arm/blockio.S standard
arm/arm/bus_space_asm_generic.S standard
arm/arm/bus_space_base.c optional fdt
arm/arm/bus_space_generic.c standard
-arm/arm/busdma_machdep-v4.c optional !armv6 !ARM_USE_V6_BUSDMA
-arm/arm/busdma_machdep-v6.c optional armv6 | ARM_USE_V6_BUSDMA
+arm/arm/busdma_machdep-v4.c optional !armv7 !armv6 !ARM_USE_V6_BUSDMA
+arm/arm/busdma_machdep-v6.c optional armv7 | armv6 | ARM_USE_V6_BUSDMA
arm/arm/copystr.S standard
arm/arm/cpufunc.c standard
arm/arm/cpufunc_asm.S standard
@@ -43,11 +43,12 @@ arm/arm/cpufunc_asm_sheeva.S optional cpu_arm9e
arm/arm/cpufunc_asm_xscale.S optional cpu_xscale_pxa2x0 | cpu_xscale_ixp425 | cpu_xscale_81342
arm/arm/cpufunc_asm_xscale_c3.S optional cpu_xscale_81342
arm/arm/cpuinfo.c standard
-arm/arm/cpu_asm-v6.S optional armv6
+arm/arm/cpu_asm-v6.S optional armv7 | armv6
arm/arm/db_disasm.c optional ddb
arm/arm/db_interface.c optional ddb
arm/arm/db_trace.c optional ddb
arm/arm/debug_monitor.c optional ddb armv6
+arm/arm/debug_monitor.c optional ddb armv7
arm/arm/disassem.c optional ddb
arm/arm/dump_machdep.c standard
arm/arm/elf_machdep.c standard
@@ -60,14 +61,14 @@ arm/arm/gdb_machdep.c optional gdb
arm/arm/generic_timer.c optional generic_timer
arm/arm/gic.c optional gic
arm/arm/gic_fdt.c optional gic fdt
-arm/arm/identcpu-v4.c optional !armv6
-arm/arm/identcpu-v6.c optional armv6
+arm/arm/identcpu-v4.c optional !armv7 !armv6
+arm/arm/identcpu-v6.c optional armv7 | armv6
arm/arm/in_cksum.c optional inet | inet6
arm/arm/in_cksum_arm.S optional inet | inet6
arm/arm/intr.c optional !intrng
kern/subr_intr.c optional intrng
arm/arm/locore.S standard no-obj
-arm/arm/hypervisor-stub.S optional armv6
+arm/arm/hypervisor-stub.S optional armv7 | armv6
arm/arm/machdep.c standard
arm/arm/machdep_boot.c standard
arm/arm/machdep_kdb.c standard
@@ -85,8 +86,8 @@ arm/arm/pl310.c optional pl310
arm/arm/platform.c optional platform
arm/arm/platform_if.m optional platform
arm/arm/platform_pl310_if.m optional platform pl310
-arm/arm/pmap-v4.c optional !armv6
-arm/arm/pmap-v6.c optional armv6
+arm/arm/pmap-v4.c optional !armv7 !armv6
+arm/arm/pmap-v6.c optional armv7 | armv6
arm/arm/pmu.c optional pmu | fdt hwpmc
arm/arm/ptrace_machdep.c standard
arm/arm/sc_machdep.c optional sc
@@ -97,12 +98,12 @@ arm/arm/stdatomic.c standard \
compile-with "${NORMAL_C:N-Wmissing-prototypes}"
arm/arm/support.S standard
arm/arm/swtch.S standard
-arm/arm/swtch-v4.S optional !armv6
-arm/arm/swtch-v6.S optional armv6
+arm/arm/swtch-v4.S optional !armv7 !armv6
+arm/arm/swtch-v6.S optional armv7 | armv6
arm/arm/sys_machdep.c standard
arm/arm/syscall.c standard
-arm/arm/trap-v4.c optional !armv6
-arm/arm/trap-v6.c optional armv6
+arm/arm/trap-v4.c optional !armv7 !armv6
+arm/arm/trap-v6.c optional armv7 | armv6
arm/arm/uio_machdep.c standard
arm/arm/undefined.c standard
arm/arm/unwind.c optional ddb | kdtrace_hooks
@@ -128,6 +129,7 @@ dev/fdt/fdt_arm_platform.c optional platform fdt
dev/hdmi/hdmi_if.m optional hdmi
dev/hwpmc/hwpmc_arm.c optional hwpmc
dev/hwpmc/hwpmc_armv7.c optional hwpmc armv6
+dev/hwpmc/hwpmc_armv7.c optional hwpmc armv7
dev/iicbus/twsi/twsi.c optional twsi
dev/ofw/ofwpci.c optional fdt pci
dev/pci/pci_host_generic.c optional pci_host_generic pci
Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm Thu Oct 5 23:01:33 2017 (r324340)
+++ head/sys/conf/options.arm Thu Oct 5 23:01:50 2017 (r324341)
@@ -1,5 +1,6 @@
#$FreeBSD$
ARMV6 opt_global.h
+ARMV7 opt_global.h
ARM_CACHE_LOCK_ENABLE opt_global.h
ARM_KERN_DIRECTMAP opt_vm.h
ARM_L2_PIPT opt_global.h
More information about the svn-src-all
mailing list