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 Switch BEAGLEBONE config over to using ...



details:   https://anonhg.NetBSD.org/src/rev/0d614da26ef6
branches:  trunk
changeset: 823493:0d614da26ef6
user:      sevan <sevan%NetBSD.org@localhost>
date:      Tue Apr 25 18:52:31 2017 +0000

description:
Switch BEAGLEBONE config over to using GENERIC.common.
Remove duplicates already defined in GENERIC.common.

diffstat:

 sys/arch/evbarm/conf/BEAGLEBONE |  145 +---------------------------------------
 1 files changed, 2 insertions(+), 143 deletions(-)

diffs (179 lines):

diff -r 809408da1a98 -r 0d614da26ef6 sys/arch/evbarm/conf/BEAGLEBONE
--- a/sys/arch/evbarm/conf/BEAGLEBONE   Tue Apr 25 17:11:47 2017 +0000
+++ b/sys/arch/evbarm/conf/BEAGLEBONE   Tue Apr 25 18:52:31 2017 +0000
@@ -1,25 +1,16 @@
 #
-#      $NetBSD: BEAGLEBONE,v 1.40 2017/03/30 17:17:41 sevan Exp $
+#      $NetBSD: BEAGLEBONE,v 1.41 2017/04/25 18:52:31 sevan Exp $
 #
 #      BEAGLEBONE -- TI AM335x board Kernel
 #
 
 include        "arch/evbarm/conf/std.beagle"
-
-# 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
 options        TI_AM335X
-options        PMAPCOUNTERS
 
 # XXX The Cortex PMC delay() doesn't seem to work.
 #no options    CORTEX_PMC
@@ -27,122 +18,9 @@
 # Architecture options
 #makeoptions   CPUFLAGS+="-mthumb"
 
-# 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   UMAPFS          # NULLFS + uid and gid remapping
-#file-system   UNION           # union file system
-file-system    TMPFS           # memory 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       DISKLABEL_EI    # disklabel Endian Independent support
-#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_BOOTSTATIC
-#options               NFS_BOOTSTATIC_MYIP="\"192.168.1.4\""
-#options               NFS_BOOTSTATIC_GWIP="\"192.168.1.1\""
-#options               NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
-#options               NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\""
-#options               NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\""
-
-options                NFS_BOOT_RWSIZE=1024
-
-# 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_BSDPTY   # /dev/[pt]ty?? ptys.
-
-# Shared memory options
-
-options        SYSVMSG         # System V-like message queues
-options        SYSVSEM         # System V-like semaphores
-options        SYSVSHM         # System V-like memory sharing
-
-# Device options
-
-#options       MEMORY_DISK_HOOKS       # boottime setup of ramdisk
-#options       MEMORY_DISK_ROOT_SIZE=8192      # Size in blocks
-#options       MEMORY_DISK_DYNAMIC
-#options       MINIROOTSIZE=1000       # Size in blocks
-#options       MEMORY_DISK_IS_ROOT     # use memory disk as root
-
-# Wedge support
-options        DKWEDGE_AUTODISCOVER    # Automatically add dk(4) instances
-options        DKWEDGE_METHOD_GPT      # Supports GPT partitions as wedges
-
-# Miscellaneous kernel options
-options        KTRACE          # system call tracing, a la ktrace(1)
-#options       SCSIVERBOSE     # Verbose SCSI errors
-#options       MIIVERBOSE      # Verbose MII autoconfuration messages
-#options       DDB_KEYCODE=0x40
-#options       USERCONF        # userconf(4) support
-#options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-
 # Development and Debugging options
 
-#options       PERFCTRS        # performance counters
-options        DIAGNOSTIC      # internal consistency checks
 options        DEBUG
-options        KDTRACE_HOOKS   # kernel DTrace hooks
-options        MODULAR         # DTrace is a module (load via modules.conf)
-#options       PMAP_DEBUG      # Enable pmap_debug_level code
-#options       IPKDB           # remote kernel debugging
-#options       VERBOSE_INIT_ARM # verbose bootstraping messages
-options        DDB             # in-kernel debugger
-options                DDB_ONPANIC=1
-options        DDB_HISTORY_SIZE=100    # Enable history editing in DDB
-#options       KGDB
 makeoptions    DEBUG="-g"      # compile full symbol table
 makeoptions    COPY_SYMTAB=1
 
@@ -340,24 +218,5 @@
 
 # Pseudo-Devices
 
-# disk/mass storage pseudo-devices
-#pseudo-device md                      # memory disk device (ramdisk)
-#pseudo-device vnd                     # disk-like interface to files
-#pseudo-device fss                     # file system snapshot device
-#pseudo-device putter                  # for puffs and pud
-pseudo-device  drvctl                  # driver control
-
-# network pseudo-devices
-pseudo-device  bpfilter                # Berkeley packet filter
-pseudo-device  loop                    # network loopback
-#pseudo-device kttcp                   # network loopback
-
-# miscellaneous pseudo-devices
-pseudo-device  pty                     # pseudo-terminals
-#options       RND_COM
-#pseudo-device clockctl                # user control of clock subsystem
-pseudo-device  ksyms                   # /dev/ksyms
-pseudo-device  lockstat                # lock profiling
-
 # local configuration
 cinclude "arch/evbarm/conf/BEAGLEBONE.local"



Home | Main Index | Thread Index | Old Index