Module Name: src
Committed By: skrll
Date: Sat Apr 2 08:48:35 UTC 2016
Modified Files:
src/sys/arch/evbarm/conf: VEXPRESS_A15 std.vexpress
Log Message:
PR/51017: VEXPRESS_A15 doesn't compile
Don't pretend to be anything other than A15
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/VEXPRESS_A15
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/std.vexpress
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/VEXPRESS_A15
diff -u src/sys/arch/evbarm/conf/VEXPRESS_A15:1.5 src/sys/arch/evbarm/conf/VEXPRESS_A15:1.6
--- src/sys/arch/evbarm/conf/VEXPRESS_A15:1.5 Fri Nov 27 22:02:15 2015
+++ src/sys/arch/evbarm/conf/VEXPRESS_A15 Sat Apr 2 08:48:35 2016
@@ -1,5 +1,5 @@
#
-# $NetBSD: VEXPRESS_A15,v 1.5 2015/11/27 22:02:15 skrll Exp $
+# $NetBSD: VEXPRESS_A15,v 1.6 2016/04/02 08:48:35 skrll Exp $
#
# VEXPRESS_A15 -- Versatile Express A15 kernel
#
@@ -17,7 +17,6 @@ options RTC_OFFSET=0 # hardware clock i
# CPU options
options CPU_CORTEX
-options CPU_CORTEXA7
options CPU_CORTEXA15
#options MULTIPROCESSOR
Index: src/sys/arch/evbarm/conf/std.vexpress
diff -u src/sys/arch/evbarm/conf/std.vexpress:1.2 src/sys/arch/evbarm/conf/std.vexpress:1.3
--- src/sys/arch/evbarm/conf/std.vexpress:1.2 Wed Feb 11 07:51:10 2015
+++ src/sys/arch/evbarm/conf/std.vexpress Sat Apr 2 08:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: std.vexpress,v 1.2 2015/02/11 07:51:10 ozaki-r Exp $
+# $NetBSD: std.vexpress,v 1.3 2016/04/02 08:48:35 skrll Exp $
#
# standard NetBSD/evbarm for VEXPRESS options
@@ -8,8 +8,6 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in VEXPRESS config definitions
include "arch/evbarm/conf/files.vexpress"
-makeoptions CPUFLAGS="-march=armv7-a -mfpu=neon"
-
# To support easy transit to ../arch/arm/arm32
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
@@ -26,6 +24,7 @@ makeoptions KERNEL_BASE_PHYS="0x8000
makeoptions KERNEL_BASE_VIRT="0x80000000"
makeoptions BOARDTYPE="vexpress"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.vexpress"
+makeoptions CPUFLAGS="-mcpu=cortex-a15 -mfpu=neon"
options ARM_INTR_IMPL="<arch/evbarm/vexpress/vexpress_intr.h>"
options ARM_GENERIC_TODR
