Module Name: src
Committed By: kiyohara
Date: Fri Jul 27 03:10:23 UTC 2012
Modified Files:
src/sys/arch/evbarm/conf: MARVELL_NAS SHEEVAPLUG
Log Message:
Enable mvcesa.
Also enable idmac in SHEEVAPLUG.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/SHEEVAPLUG
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/MARVELL_NAS
diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.7 src/sys/arch/evbarm/conf/MARVELL_NAS:1.8
--- src/sys/arch/evbarm/conf/MARVELL_NAS:1.7 Sat Mar 31 02:45:37 2012
+++ src/sys/arch/evbarm/conf/MARVELL_NAS Fri Jul 27 03:10:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: MARVELL_NAS,v 1.7 2012/03/31 02:45:37 tsutsui Exp $
+# $NetBSD: MARVELL_NAS,v 1.8 2012/07/27 03:10:23 kiyohara Exp $
#
# This configuration supports for generically Marvell NAS.
@@ -176,7 +176,7 @@ mvgbe* at mvgbec? port ? irq ?
ehci* at mvsoc? offset ? irq ?
# On-chip Cryptographic Engines and Security Accelerator
-#mvcesa* at mvsoc? offset ? irq ?
+mvcesa* at mvsoc? offset ? irq ?
# On-chip Two-Wire Serial Interface (TWSI)
gttwsi* at mvsoc? offset ? irq ?
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.14 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.15
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.14 Sat Mar 31 02:45:37 2012
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Fri Jul 27 03:10:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.14 2012/03/31 02:45:37 tsutsui Exp $
+# $NetBSD: SHEEVAPLUG,v 1.15 2012/07/27 03:10:23 kiyohara Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -194,7 +194,7 @@ makphy* at mii? phy ?
ehci* at mvsoc? offset ? irq ?
# On-chip Cryptographic Engines and Security Accelerator
-#mvcesa* at mvsoc? offset ? irq ?
+mvcesa* at mvsoc? offset ? irq ?
# On-chip Two-Wire Serial Interface (TWSI)
gttwsi* at mvsoc? offset ? irq ?
@@ -204,7 +204,7 @@ iic* at gttwsi?
com* at mvsoc? offset ? irq ?
# On-chip IDMA Controller
-#gtidmac* at mvsoc? offset ? irq ?
+gtidmac* at mvsoc? offset ? irq ?
# On-chip General Purpose I/O Port Interface
#mvsocgpp* at mvsoc? offset ? irq ?