Module Name: src
Committed By: jmcneill
Date: Sat Aug 11 10:20:44 UTC 2018
Modified Files:
src/sys/arch/arm/vexpress: files.vexpress
src/sys/arch/evbarm/conf: files.vexpress
Log Message:
Fix VEXPRESS_A15 build
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/vexpress/files.vexpress
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/files.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/arm/vexpress/files.vexpress
diff -u src/sys/arch/arm/vexpress/files.vexpress:1.5 src/sys/arch/arm/vexpress/files.vexpress:1.6
--- src/sys/arch/arm/vexpress/files.vexpress:1.5 Sat Mar 17 18:34:09 2018
+++ src/sys/arch/arm/vexpress/files.vexpress Sat Aug 11 10:20:44 2018
@@ -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
Index: src/sys/arch/evbarm/conf/files.vexpress
diff -u src/sys/arch/evbarm/conf/files.vexpress:1.3 src/sys/arch/evbarm/conf/files.vexpress:1.4
--- src/sys/arch/evbarm/conf/files.vexpress:1.3 Fri Jun 2 15:22:47 2017
+++ src/sys/arch/evbarm/conf/files.vexpress Sat Aug 11 10:20:44 2018
@@ -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"
