Module Name: src
Committed By: matt
Date: Tue Mar 18 05:50:06 UTC 2014
Modified Files:
src/sys/arch/arm/marvell: files.marvell
src/sys/arch/evbarm/conf: files.marvell
Log Message:
Move defparam opt_mvsoc.h to more appropriate place.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/marvell/files.marvell
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/files.marvell
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.10 src/sys/arch/arm/marvell/files.marvell:1.11
--- src/sys/arch/arm/marvell/files.marvell:1.10 Mon Sep 30 13:06:03 2013
+++ src/sys/arch/arm/marvell/files.marvell Tue Mar 18 05:50:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.marvell,v 1.10 2013/09/30 13:06:03 kiyohara Exp $
+# $NetBSD: files.marvell,v 1.11 2014/03/18 05:50:06 matt Exp $
#
# Configuration info for Marvell System on Chip support
#
@@ -13,7 +13,10 @@ file arch/arm/marvell/mvsoc_dma.c
file arch/arm/arm32/irq_dispatch.S
+# Some SoC(ARMADAXP) reports false DeviceID.
defflag opt_mvsoc.h ORION KIRKWOOD MV78XX0 ARMADAXP
+defparam opt_mvsoc.h MVSOC_INTERREGS_PBASE
+ MVSOC_FIXUP_DEVID
file arch/arm/marvell/mvsoc_intr.c
file arch/arm/marvell/orion.c orion
file arch/arm/marvell/kirkwood.c kirkwood
Index: src/sys/arch/evbarm/conf/files.marvell
diff -u src/sys/arch/evbarm/conf/files.marvell:1.4 src/sys/arch/evbarm/conf/files.marvell:1.5
--- src/sys/arch/evbarm/conf/files.marvell:1.4 Sat Mar 15 13:56:19 2014
+++ src/sys/arch/evbarm/conf/files.marvell Tue Mar 18 05:50:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.marvell,v 1.4 2014/03/15 13:56:19 kiyohara Exp $
+# $NetBSD: files.marvell,v 1.5 2014/03/18 05:50:06 matt Exp $
#
# Marvell Orion, Discovery Innovation and Kirkwood NASs configuration info
#
@@ -11,7 +11,3 @@ file arch/evbarm/marvell/marvell_machdep
# CPU support and integrated peripherals
include "arch/arm/marvell/files.marvell"
-
-# Some SoC(ARMADAXP) reports false DeviceID.
-defparam opt_mvsoc.h MVSOC_INTERREGS_PBASE
- MVSOC_FIXUP_DEVID
