[src/trunk]: src/sys/arch Fix VEXPRESS_A15 build

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

details:   https://anonhg.NetBSD.org/src/rev/59ccc9dee88f
branches:  trunk
changeset: 365292:59ccc9dee88f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Aug 11 10:20:44 2018 +0000

description:
Fix VEXPRESS_A15 build

diffstat:

 sys/arch/arm/vexpress/files.vexpress |  13 +------------
 sys/arch/evbarm/conf/files.vexpress  |  13 ++++++++++++-
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (49 lines):

diff -r 036a32a15aa9 -r 59ccc9dee88f sys/arch/arm/vexpress/files.vexpress
--- a/sys/arch/arm/vexpress/files.vexpress      Sat Aug 11 10:06:40 2018 +0000
+++ b/sys/arch/arm/vexpress/files.vexpress      Sat Aug 11 10:20:44 2018 +0000
@@ -1,20 +1,9 @@
-#      $NetBSD: files.vexpress,v 1.5 2018/03/17 18:34:09 ryo Exp $
+#      $NetBSD: files.vexpress,v 1.6 2018/08/11 10:20:44 jmcneill Exp $
 #
 # Configuration info for ARM Ltd. Versatile Express peripherals
 #
 #
 
-include        "arch/arm/pic/files.pic"
-include        "arch/arm/cortex/files.cortex"
-
-file   arch/arm/arm32/arm32_boot.c
-file   arch/arm/arm32/arm32_kvminit.c
-file   arch/arm/arm32/arm32_reboot.c
-file   arch/arm/arm32/irq_dispatch.S
-file   arch/arm/arm32/armv7_generic_space.c
-file   arch/arm/arm/arm_generic_dma.c
-file   arch/arm/arm/bus_space_a4x.S
-
 file   arch/arm/vexpress/vexpress_platform.c
 
 device vxsysreg
diff -r 036a32a15aa9 -r 59ccc9dee88f sys/arch/evbarm/conf/files.vexpress
--- a/sys/arch/evbarm/conf/files.vexpress       Sat Aug 11 10:06:40 2018 +0000
+++ b/sys/arch/evbarm/conf/files.vexpress       Sat Aug 11 10:20:44 2018 +0000
@@ -1,8 +1,19 @@
-#      $NetBSD: files.vexpress,v 1.3 2017/06/02 15:22:47 jmcneill Exp $
+#      $NetBSD: files.vexpress,v 1.4 2018/08/11 10:20:44 jmcneill Exp $
 #
 # Versatile Express board configuration info
 #
 
+include "arch/arm/pic/files.pic"
+include "arch/arm/cortex/files.cortex"
+
+file   arch/arm/arm32/arm32_boot.c
+file   arch/arm/arm32/arm32_kvminit.c
+file   arch/arm/arm32/arm32_reboot.c
+file   arch/arm/arm32/irq_dispatch.S
+file   arch/arm/arm32/armv7_generic_space.c
+file   arch/arm/arm/arm_generic_dma.c
+file   arch/arm/arm/bus_space_a4x.S
+
 include "arch/evbarm/conf/files.fdt"
 
 include "arch/arm/vexpress/files.vexpress"