Module Name: src
Committed By: hsuenaga
Date: Wed Jun 3 03:34:38 UTC 2015
Modified Files:
src/sys/arch/arm/marvell: files.marvell
Added Files:
src/sys/dev/marvell: files.armada
Log Message:
move Marvell ARMADA SoC's device driver definitions from arm/marvell
to dev/marvell.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/marvell/files.marvell
cvs rdiff -u -r0 -r1.1 src/sys/dev/marvell/files.armada
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/marvell/files.marvell
diff -u src/sys/arch/arm/marvell/files.marvell:1.14 src/sys/arch/arm/marvell/files.marvell:1.15
--- src/sys/arch/arm/marvell/files.marvell:1.14 Sun May 3 14:38:09 2015
+++ src/sys/arch/arm/marvell/files.marvell Wed Jun 3 03:34:38 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.marvell,v 1.14 2015/05/03 14:38:09 hsuenaga Exp $
+# $NetBSD: files.marvell,v 1.15 2015/06/03 03:34:38 hsuenaga Exp $
#
# Configuration info for Marvell System on Chip support
#
@@ -27,6 +27,7 @@ file arch/arm/marvell/armadaxp.c armada
# Integrated peripherals
include "dev/marvell/files.discovery"
+include "dev/marvell/files.armada"
# Timers
device mvsoctmr: sysmon_wdog
@@ -58,10 +59,7 @@ attach mvsata at mvsoc with mvsata_mbus
attach mvgbec at mvsoc with mvgbec_mbus
# ARMADA XP Gigabit Ethernet Controller Interface
-define mvxpe { [port = -1 ], [irq = -1] }
-device mvxpe: ether, ifnet, arp, mii
attach mvxpe at mvsoc with mvxpe_mbus
-file dev/marvell/if_mvxpe.c mvxpe needs-flag
# USB 2.0 Interface
attach ehci at mvsoc with mvusb_mbus
Added files:
Index: src/sys/dev/marvell/files.armada
diff -u /dev/null src/sys/dev/marvell/files.armada:1.1
--- /dev/null Wed Jun 3 03:34:38 2015
+++ src/sys/dev/marvell/files.armada Wed Jun 3 03:34:38 2015
@@ -0,0 +1,7 @@
+# $NetBSD: files.armada,v 1.1 2015/06/03 03:34:38 hsuenaga Exp $
+# Configuration info for Marvell ARMADA integrated peripherals
+
+# ARMADA XP Gigabit Ethernet Controller Interface
+define mvxpe { [port = -1 ], [irq = -1] }
+device mvxpe: ether, ifnet, arp, mii
+file dev/marvell/if_mvxpe.c mvxpe needs-flag
