Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbarm/conf include "GENERIC.common"



details:   https://anonhg.NetBSD.org/src/rev/281d6aa7dfe5
branches:  trunk
changeset: 337295:281d6aa7dfe5
user:      hkenken <hkenken%NetBSD.org@localhost>
date:      Fri Apr 10 10:58:07 2015 +0000

description:
include "GENERIC.common"

diffstat:

 sys/arch/evbarm/conf/KOBO       |  176 +---------------------------------
 sys/arch/evbarm/conf/NETWALKER  |  176 +--------------------------------
 sys/arch/evbarm/conf/PARALLELLA |  203 +---------------------------------------
 sys/arch/evbarm/conf/ZEDBOARD   |  203 +---------------------------------------
 4 files changed, 26 insertions(+), 732 deletions(-)

diffs (truncated from 917 to 300 lines):

diff -r 6d4d7a597144 -r 281d6aa7dfe5 sys/arch/evbarm/conf/KOBO
--- a/sys/arch/evbarm/conf/KOBO Fri Apr 10 09:34:43 2015 +0000
+++ b/sys/arch/evbarm/conf/KOBO Fri Apr 10 10:58:07 2015 +0000
@@ -1,27 +1,16 @@
-#      $NetBSD: KOBO,v 1.6 2014/10/11 11:55:07 uebayasi Exp $
+#      $NetBSD: KOBO,v 1.7 2015/04/10 10:58:07 hkenken Exp $
 #
 #      KOBO -- http://kobo.com
 #
 
 include        "arch/evbarm/conf/std.kobo"
-
-#options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
-
-# estimated number of users
-
-maxusers       32
-
-# Standard system options
-
-options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
-#options       NTP             # NTP phase/frequency locked loop
+include        "arch/evbarm/conf/GENERIC.common"
 
 # CPU options
 options        CPU_CORTEXA8    # Support the ARM-v7a core
+options                IMX51
 options        IMX50
 options        IMX508
-options                IMX51
-options        PMAPCOUNTERS
 
 # Architecture options
 
@@ -29,144 +18,17 @@
 options        MEMSIZE=256
 options        IMX51_IPGCLK_FREQ=50000000   # XXX This value is not correct.
 
-# File systems
-
-file-system    FFS             # UFS
-#file-system   LFS             # log-structured file system
-file-system    MFS             # memory file system
-file-system    NFS             # Network file system
-#file-system   ADOSFS          # AmigaDOS-compatible file system
-file-system    EXT2FS          # second extended file system (linux)
-#file-system   CD9660          # ISO 9660 + Rock Ridge file system
-file-system    MSDOSFS         # MS-DOS file system
-file-system    FDESC           # /dev/fd
-file-system    KERNFS          # /kern
-file-system    NULLFS          # loopback file system
-file-system    PROCFS          # /proc
-#file-system   PUFFS           # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system    TMPFS           # memory file system
-#file-system   UMAPFS          # NULLFS + uid and gid remapping
-#file-system   UNION           # union file system
-file-system    PTYFS           # /dev/pts/N support
-
-# File system options
-#options       QUOTA           # legacy UFS quotas
-#options       QUOTA2          # new, in-filesystem UFS quotas
-#options       FFS_EI          # FFS Endian Independent support
-#options       NFSSERVER
-options        WAPBL           # File system journaling support
-#options       FFS_NO_SNAPSHOT # No FFS snapshot support
-
-# Networking options
-
-#options       GATEWAY         # packet forwarding
-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       NETATALK        # AppleTalk networking
-#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)
-#options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
-
-#options       NFS_BOOT_BOOTP
-#options       NFS_BOOT_DHCP
-#options       NFS_BOOT_BOOTPARAM
-#options       DEBUG_NFS_BOOT_DHCP
-
-# Compatibility options
-
-options                COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-#options       COMPAT_43       # 4.3BSD compatibility.
-#options       COMPAT_09       # NetBSD 0.9,
-#options       COMPAT_10       # NetBSD 1.0,
-#options       COMPAT_11       # NetBSD 1.1,
-#options       COMPAT_12       # NetBSD 1.2,
-#options       COMPAT_13       # NetBSD 1.3,
-#options       COMPAT_14       # NetBSD 1.4,
-#options       COMPAT_15       # NetBSD 1.5,
-#options       COMPAT_16       # NetBSD 1.6,
-#options       COMPAT_20       # NetBSD 2.0,
-#options       COMPAT_30       # NetBSD 3.0,
-#options       COMPAT_40       # NetBSD 4.0,
-#options       COMPAT_50       # NetBSD 5.0,
-options        COMPAT_60       # NetBSD 6.0, and
-options        COMPAT_70       # NetBSD 7.0 binary compatibility.
-#options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
-
-options        COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility
-#options       COMPAT_LINUX    # binary compatibility with Linux
-options                COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
-
-# Shared memory options
-
-options        SYSVMSG         # System V-like message queues
-options        SYSVSEM         # System V-like semaphores
-#options       SEMMNI=10       # number of semaphore identifiers
-#options       SEMMNS=60       # number of semaphores in system
-#options       SEMUME=10       # max number of undo entries per process
-#options       SEMMNU=30       # number of undo structures in system
-options        SYSVSHM         # System V-like memory sharing
-
 # Device options
 
 # Console options.    also need IMXUARTCONSOLE
 options        CONSDEVNAME="\"imxuart\"",CONADDR=0x53fc0000
 options        CONSPEED=115200 # Console speed
 
-# kgdb
-#options       KGDB
-#options       KGDB_DEVNAME="\"imxuart\""
-#options       KGDB_DEVADDR=0x73fbc000
-#options       KGDB_DEVRATE=115200
-
-# Miscellaneous kernel options
-options        KTRACE          # system call tracing, a la ktrace(1)
-options        IRQSTATS        # manage IRQ statistics
-#options       KMEMSTATS       # kernel memory statistics
-options        PCMCIAVERBOSE   # verbose PCMCIA configuration messages
-options        USBVERBOSE      # verbose USB device autoconfig messages
-#options       SCSIVERBOSE     # Verbose SCSI errors
-options        MIIVERBOSE      # Verbose MII autoconfuration messages
-#options       PCI_CONFIG_DUMP # verbosely dump PCI config space
-#options       DDB_KEYCODE=0x40
-options        USERCONF        # userconf(4) support
-#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-#options       SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
-options        NO_POWERSAVE    # uncomment this to run under ICE
-
-# Development and Debugging options
-#options       PERFCTRS        # performance counters
-#options       DIAGNOSTIC      # internal consistency checks
-#options       DEBUG
-#options       KMEMSTATS       # kernel memory statistics (vmstat -m)
-options        DDB             # in-kernel debugger
-options        DDB_ONPANIC=1   # see also sysctl(8): `ddb.onpanic'
-options        DDB_HISTORY_SIZE=100    # Enable history editing in DDB
-options        DDB_VERBOSE_HELP
-#options       LOCKDEBUG
-#ptions        PMAP_DEBUG      # Enable pmap_debug_level code
-#options       IPKDB           # remote kernel debugging
-options        VERBOSE_INIT_ARM # verbose bootstraping messages
+options         DIAGNOSTIC      # internal consistency checks
+#options        DEBUG
+#options       KGDB
 makeoptions    DEBUG="-g"      # compile full symbol table
-#makeoptions   COPTS="-O2"
-#options       SYSCALL_STATS   # per syscall counts
-#options       SYSCALL_TIMES   # per syscall times
-#options       SYSCALL_TIMES_HASCOUNTER        # use 'broken' rdtsc (soekris)
-#options       SCSIPI_DEBUG
-#options       SCSIPI_DEBUG_TYPE=SCSIPI_BUSTYPE_SCSI
-#options       SCSIPI_DEBUG_TARGET=0
-#options       SCSIPI_DEBUG_LUN=0
-#options       DEBUG_STARTUP
-
-## USB Debugging options
-#options       USB_DEBUG
-#options       EHCI_DEBUG
-#options       OHCI_DEBUG
-#options       UHUB_DEBUG
+makeoptions    COPY_SYMTAB=1
 
 # Valid options for BOOT_ARGS:
 #  single              Boot to single user only
@@ -265,29 +127,5 @@
 
 ukphy*         at mii? phy ?
 
-# Pseudo-Devices
-
-pseudo-device  crypto                  # /dev/crypto device
-pseudo-device  swcrypto                # software crypto implementation
-
-# disk/mass storage pseudo-devices
-#pseudo-device md                      # memory disk device (ramdisk)
-#pseudo-device vnd                     # disk-like interface to files
-
-# network pseudo-devices
-pseudo-device  bpfilter                # Berkeley packet filter
-#pseudo-device ipfilter                # IP filter (firewall) and NAT
-pseudo-device  loop                    # network loopback
-pseudo-device  ppp                     # Point-to-Point Protocol
-
-# miscellaneous pseudo-devices
-pseudo-device  pty                     # pseudo-terminals
-pseudo-device  ksyms                   # /dev/ksyms
-pseudo-device  clockctl                # NTP clockctl
-
-# wscons pseudo-devices
-pseudo-device  wsmux                   # mouse & keyboard multiplexor
-pseudo-device  wsfont
-
 # local configuration
 cinclude "arch/evbarm/conf/KOBO.local"
diff -r 6d4d7a597144 -r 281d6aa7dfe5 sys/arch/evbarm/conf/NETWALKER
--- a/sys/arch/evbarm/conf/NETWALKER    Fri Apr 10 09:34:43 2015 +0000
+++ b/sys/arch/evbarm/conf/NETWALKER    Fri Apr 10 10:58:07 2015 +0000
@@ -1,105 +1,14 @@
-#      $NetBSD: NETWALKER,v 1.32 2014/10/11 11:55:07 uebayasi Exp $
+#      $NetBSD: NETWALKER,v 1.33 2015/04/10 10:58:07 hkenken Exp $
 #
 #      NETWALKER -- http://www.sharp.co.jp/netwalker/
 #
 
 include        "arch/evbarm/conf/std.netwalker"
-
-#options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
-
-# estimated number of users
-
-maxusers       32
-
-# Standard system options
-
-options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
-#options       NTP             # NTP phase/frequency locked loop
+include        "arch/evbarm/conf/GENERIC.common"
 
 # CPU options
 options        CPU_CORTEXA8    # Support the ARM-v7a core
 options        IMX51
-options        PMAPCOUNTERS
-
-# Architecture options
-
-# File systems
-
-file-system    FFS             # UFS
-#file-system   LFS             # log-structured file system
-file-system    MFS             # memory file system
-file-system    NFS             # Network file system
-#file-system   ADOSFS          # AmigaDOS-compatible file system
-file-system    EXT2FS          # second extended file system (linux)
-#file-system   CD9660          # ISO 9660 + Rock Ridge file system
-file-system    MSDOSFS         # MS-DOS file system
-file-system    FDESC           # /dev/fd
-file-system    KERNFS          # /kern
-file-system    NULLFS          # loopback file system
-file-system    PROCFS          # /proc
-#file-system   PUFFS           # Userspace file systems (e.g. ntfs-3g & sshfs)
-file-system    TMPFS           # memory file system
-#file-system   UMAPFS          # NULLFS + uid and gid remapping
-#file-system   UNION           # union file system
-file-system    PTYFS           # /dev/pts/N support
-
-# File system options
-#options       QUOTA           # legacy UFS quotas
-#options       QUOTA2          # new, in-filesystem UFS quotas
-#options       FFS_EI          # FFS Endian Independent support
-#options       NFSSERVER
-options        WAPBL           # File system journaling support
-#options       FFS_NO_SNAPSHOT # No FFS snapshot support
-
-# Networking options
-
-#options       GATEWAY         # packet forwarding
-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       NETATALK        # AppleTalk networking
-#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)
-#options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
-
-#options       NFS_BOOT_BOOTP
-#options       NFS_BOOT_DHCP
-#options       NFS_BOOT_BOOTPARAM
-#options       DEBUG_NFS_BOOT_DHCP
-
-# Compatibility options
-
-options                COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
-#options       COMPAT_43       # 4.3BSD compatibility.
-#options       COMPAT_09       # NetBSD 0.9,
-#options       COMPAT_10       # NetBSD 1.0,
-#options       COMPAT_11       # NetBSD 1.1,
-#options       COMPAT_12       # NetBSD 1.2,



Home | Main Index | Thread Index | Old Index