Module Name: src
Committed By: kiyohara
Date: Sat Oct 5 06:10:35 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: OPENBLOCKS_A6 OPENBLOCKS_AX3
Log Message:
Cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.2 -r1.3 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/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.15 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.16
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.15 Sun Jun 30 21:38:56 2013
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 Sat Oct 5 06:10:35 2013
@@ -1,6 +1,6 @@
-# $NetBSD: OPENBLOCKS_A6,v 1.15 2013/06/30 21:38:56 rmind Exp $
+# $NetBSD: OPENBLOCKS_A6,v 1.16 2013/10/05 06:10:35 kiyohara Exp $
#
-# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
+# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
include "arch/evbarm/conf/std.marvell"
@@ -36,21 +36,20 @@ file-system FFS # UFS
file-system EXT2FS # second extended file system (linux)
#file-system LFS # log-structured file system
#file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system NFS # Network file system
+file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
+#file-system FDESC # /dev/fd
file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
+file-system NULLFS # loopback file system
#file-system OVERLAY # overlay file system
file-system PROCFS # /proc
-#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
+file-system PTYFS # /dev/ptm support
+#file-system PUFFS # Pass-to-Userspace Framework File System
#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
#file-system SMBFS # experimental - CIFS; also needs nsmb (below)
-file-system PTYFS # /dev/ptm support
file-system TMPFS # Efficient memory file-system
#file-system UDF # experimental - OSTA UDF CD/DVD file-system
#file-system HFS # experimental - Apple HFS+ (read-only)
@@ -75,8 +74,8 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-#options MROUTING # IP multicast routing
-#options PIM # Protocol Independent Multicast
+options MROUTING # IP multicast routing
+options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
@@ -131,11 +130,11 @@ options SYSVSHM # System V-like memory
#options KTRACE # system call tracing, a la ktrace(1)
options IRQSTATS # manage IRQ statistics
-#options LKM # loadable kernel modules
#options KMEMSTATS # kernel memory statistics
-options MIIVERBOSE # Verbose MII autoconfuration messages
+#options MIIVERBOSE # Verbose MII auto configuration messages
#options PCIVERBOSE # Verbose PCI descriptions
-options USBVERBOSE # verbose USB device autoconfig messages
+#options SCSIVERBOSE # Verbose SCSI errors
+options USBVERBOSE # Verbose USB device auto configuration messages
#options DDB_KEYCODE=0x40
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
@@ -367,7 +366,7 @@ pseudo-device faith # IPv[46] TCP rela
pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
-options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
+options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
pseudo-device agr # IEEE 802.3ad link aggregation
pseudo-device pf # PF packet filter
pseudo-device pflog # PF log if
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.2 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.3
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.2 Sat Oct 5 02:47:44 2013
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Sat Oct 5 06:10:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.2 2013/10/05 02:47:44 kiyohara Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.3 2013/10/05 06:10:35 kiyohara Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -56,7 +56,7 @@ file-system TMPFS # Efficient memory f
#options QUOTA # legacy UFS quotas
#options QUOTA2 # new, in-filesystem UFS quotas
options FFS_EI # FFS Endian Independent support
-options NFSSERVER
+options NFSSERVER # Network File System server
options WAPBL # File system journaling support
#options FFS_NO_SNAPSHOT # No FFS snapshot support
@@ -70,7 +70,6 @@ options IPSEC # IP security
options MROUTING # IP multicast routing
options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
-options PFIL_HOOKS # pfil(9) packet filter hooks
options PPP_BSDCOMP # BSD-Compress compression support for PPP
options PPP_DEFLATE # Deflate compression support for PPP
options PPP_FILTER # Active filter support for PPP (requires bpf)
@@ -164,19 +163,12 @@ mainbus0 at root
# The boot cpu
cpu0 at mainbus?
-# Marvell SoC Bus
+# Marvell MV88F78260 ARMADA XP System-on-chip
mvsoc0 at mainbus?
options MVSOC_FIXUP_DEVID=0x7826
-# On-chip Timers
-mvsoctmr* at mvsoc? offset ? irq ?
-
-# Serial Peripheral Interface (SPI)
-#mvspi* at mvsoc? offset ? irq ?
-#spi* at mvspi?
-
-# On-chip PCI Express Interface
-mvpex* at mvsoc? offset ? irq ?
+# On-chip Serial-ATA II Host Controller (SATAHC)
+mvsata* at mvsoc? offset ? irq ?
# On-chip Gigabit Ethernet Controller Interface
mvgbec* at mvsoc? offset ?
@@ -187,8 +179,22 @@ makphy* at mii? phy ?
ehci0 at mvsoc? offset ? irq ?
ehci1 at mvsoc? offset ? irq ?
-# On-chip Serial-ATA II Host Controller (SATAHC)
-mvsata* at mvsoc? offset ? irq ?
+# Serial Peripheral Interface (SPI)
+#mvspi* at mvsoc? offset ? irq ?
+#spi* at mvspi?
+
+# On-chip Two-Wire Serial Interface (TWSI)
+gttwsi* at mvsoc? offset ? irq ?
+iic* at gttwsi?
+s390rtc* at iic1 addr 0x30
+
+# On-chip UART Interface
+com* at mvsoc? offset ? irq ?
+options COM_16750 # XXXX: required
+#options COM_DEBUG
+
+# On-chip PCI Express Interface
+mvpex* at mvsoc? offset ? irq ?
# On-chip IDMA Controller
gtidmac* at mvsoc? offset ? irq ?
@@ -197,19 +203,8 @@ gtidmac* at mvsoc? offset ? irq ?
mvsdio* at mvsoc? offset ? irq ?
sdmmc* at mvsdio?
-# On-chip UART Interface
-com* at mvsoc?
-options COM_16750 # XXXX: required
-#options COM_DEBUG
-
-# On-chip Two-Wire Serial Interface (TWSI)
-gttwsi* at mvsoc? offset ? irq ?
-iic* at gttwsi?
-s390rtc* at iic1 addr 0x30
-
-# On-chip General Purpose I/O Port Interface
-mvsocgpp* at mvsoc? offset ? irq ?
-gpio* at mvsocgpp?
+# On-chip Timers
+mvsoctmr* at mvsoc? offset ? irq ?
# PCI bus support
