[src/trunk]: src/sys/arch/evbarm/conf PR/51017: VEXPRESS_A15 doesn't compile

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eecbd5ffba82
branches:  trunk
changeset: 344494:eecbd5ffba82
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Apr 02 08:48:35 2016 +0000

description:
PR/51017: VEXPRESS_A15 doesn't compile

Don't pretend to be anything other than A15

diffstat:

 sys/arch/evbarm/conf/VEXPRESS_A15 |  3 +--
 sys/arch/evbarm/conf/std.vexpress |  5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r c7ad5d203c92 -r eecbd5ffba82 sys/arch/evbarm/conf/VEXPRESS_A15
--- a/sys/arch/evbarm/conf/VEXPRESS_A15 Sat Apr 02 08:16:54 2016 +0000
+++ b/sys/arch/evbarm/conf/VEXPRESS_A15 Sat Apr 02 08:48:35 2016 +0000
@@ -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 @@
 
 # CPU options
 options        CPU_CORTEX
-options        CPU_CORTEXA7
 options        CPU_CORTEXA15
 #options       MULTIPROCESSOR
 
diff -r c7ad5d203c92 -r eecbd5ffba82 sys/arch/evbarm/conf/std.vexpress
--- a/sys/arch/evbarm/conf/std.vexpress Sat Apr 02 08:16:54 2016 +0000
+++ b/sys/arch/evbarm/conf/std.vexpress Sat Apr 02 08:48:35 2016 +0000
@@ -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 @@
 # 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_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