Module Name: src
Committed By: hsuenaga
Date: Wed Jun 3 04:31:46 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: ARMADAXP OPENBLOCKS_AX3
Log Message:
add kernel config of if_mvxpe(new ethernet) and mvxpsec(new cryptographic).
still disabled by default. I need to do more test...
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/ARMADAXP
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
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/ARMADAXP
diff -u src/sys/arch/evbarm/conf/ARMADAXP:1.15 src/sys/arch/evbarm/conf/ARMADAXP:1.16
--- src/sys/arch/evbarm/conf/ARMADAXP:1.15 Sat Aug 30 13:45:56 2014
+++ src/sys/arch/evbarm/conf/ARMADAXP Wed Jun 3 04:31:46 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: ARMADAXP,v 1.15 2014/08/30 13:45:56 kiyohara Exp $
+# $NetBSD: ARMADAXP,v 1.16 2015/06/03 04:31:46 hsuenaga Exp $
#
# ARMADA XP DEV BOARD
#
@@ -201,9 +201,13 @@ m25p0 at spi? slave 0
# TWSI SDRAM Serial Presence Detect
spdmem0 at iic? addr 0x56
-# On-chip Cryptographic Engines and Security Accelerator
+# On-chip Cryptographic Engines and Security Accelerator (S/W chaining)
mvcesa* at mvsoc? offset ? irq ?
+# On-chip Cryptographic Engines and Security Accelerator (H/W chaining)
+#mvxpsec* at mvsoc? offset ? irq ?
+#options MVXPSEC_DEBUG=MVXPSEC_DEBUG_ALL
+
# On-chip USB 2.0 Interface
ehci* at mvsoc? offset ? irq ?
@@ -250,10 +254,16 @@ wd* at atabus? drive ? flags 0x0000
sd* at atapibus? drive ? flags 0x0000 # ATAPI disk drives
uk* at atapibus? drive ? flags 0x0000 # ATAPI unknown
-# On-chip Gigabit Ethernet Controller Interface
+# On-chip Gigabit Ethernet Controller Interface (backward compatible mode)
mvgbec* at mvsoc? offset ?
mvgbe* at mvgbec? port ? irq ?
+# On-chip Gigabit Ethernet Controller Interface (counter mode)
+#mvxpbm* at mvsoc? offset ?
+#mvxpe* at mvsoc? irq ?
+#options MVXPE_EVENT_COUNTERS
+#options MVXPE_DEBUG=0
+
# On-chip RTC
mvsocrtc* at mvsoc? offset ? irq ?
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.13 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.14
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.13 Sat Aug 30 13:40:18 2014
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Wed Jun 3 04:31:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.13 2014/08/30 13:40:18 kiyohara Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.14 2015/06/03 04:31:46 hsuenaga Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -182,11 +182,17 @@ options MVSOC_FIXUP_DEVID=0x7826
# On-chip Serial-ATA II Host Controller (SATAHC)
mvsata* at mvsoc? offset ? irq ?
-# On-chip Gigabit Ethernet Controller Interface
+# On-chip Gigabit Ethernet Controller Interface (backward compatible mode)
mvgbec* at mvsoc? offset ?
mvgbe* at mvgbec? port ? irq ?
makphy* at mii? phy ?
+# On-chip Gigabit Ethernet Controller Interface (counter mode)
+#mvxpbm* at mvsoc? offset ?
+#mvxpe* at mvsoc? irq ?
+#options MVXPE_EVENT_COUNTERS
+#options MVXPE_DEBUG=0
+
# On-chip USB 2.0 Interface
ehci* at mvsoc? offset ? irq ?
@@ -199,6 +205,10 @@ gttwsi* at mvsoc? offset ? irq ?
iic* at gttwsi?
s390rtc* at iic1 addr 0x30
+# On-chip Cryptographic Engines and Security Accelerator (DMA)
+#mvxpsec* at mvsoc? offset ? irq ?
+#options MVXPSEC_DEBUG=MVXPSEC_DEBUG_ALL
+
# On-chip UART Interface
com* at mvsoc? offset ? irq ?
options COM_16750 # XXXX: required
