Module Name: src
Committed By: kiyohara
Date: Sun Aug 25 07:08:37 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: files.armadaxp
src/sys/dev/marvell: files.discovery
Log Message:
Move mvspi defines into sys/dev/marvell/files.discovery.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/files.armadaxp
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/marvell/files.discovery
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/files.armadaxp
diff -u src/sys/arch/evbarm/conf/files.armadaxp:1.1 src/sys/arch/evbarm/conf/files.armadaxp:1.2
--- src/sys/arch/evbarm/conf/files.armadaxp:1.1 Wed May 29 22:52:19 2013
+++ src/sys/arch/evbarm/conf/files.armadaxp Sun Aug 25 07:08:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.armadaxp,v 1.1 2013/05/29 22:52:19 rkujawa Exp $
+# $NetBSD: files.armadaxp,v 1.2 2013/08/25 07:08:37 kiyohara Exp $
#
# Marvell Armada XP configuration info
#
@@ -16,8 +16,3 @@ defflag opt_cputypes.h AURORA_IO_CACHE
# CPU support and integrated peripherals
include "arch/arm/marvell/files.marvell"
-# SPI Serial Peripheral Interface
-device mvspi: spibus
-attach mvspi at mvsoc with mvspi_mbus
-file dev/marvell/mvspi.c mvspi
-
Index: src/sys/dev/marvell/files.discovery
diff -u src/sys/dev/marvell/files.discovery:1.19 src/sys/dev/marvell/files.discovery:1.20
--- src/sys/dev/marvell/files.discovery:1.19 Fri Jul 27 03:00:01 2012
+++ src/sys/dev/marvell/files.discovery Sun Aug 25 07:08:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.discovery,v 1.19 2012/07/27 03:00:01 kiyohara Exp $
+# $NetBSD: files.discovery,v 1.20 2013/08/25 07:08:37 kiyohara Exp $
#
# Config file and device description for machine-independent support for
# the Marvell (formerly Galileo Technology) Discovery system controllers.
@@ -95,3 +95,8 @@ device mvsdio: sdmmcbus
file dev/marvell/mvsdio.c mvsdio
defparam opt_mvsdio.h MVSDIO_CARD_DETECT
MVSDIO_WRITE_PROTECT
+
+# SPI Serial Peripheral Interface
+device mvspi: spibus
+attach mvspi at mvsoc with mvspi_mbus
+file dev/marvell/mvspi.c mvspi
