Module Name: src
Committed By: skrll
Date: Sat Apr 18 11:30:22 UTC 2015
Modified Files:
src/sys/arch/evbarm/conf: RPI
Log Message:
Use GENERIC.common
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/conf/RPI
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/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.61 src/sys/arch/evbarm/conf/RPI:1.62
--- src/sys/arch/evbarm/conf/RPI:1.61 Sat Mar 14 14:59:43 2015
+++ src/sys/arch/evbarm/conf/RPI Sat Apr 18 11:30:22 2015
@@ -1,24 +1,15 @@
#
-# $NetBSD: RPI,v 1.61 2015/03/14 14:59:43 jmcneill Exp $
+# $NetBSD: RPI,v 1.62 2015/04/18 11:30:22 skrll Exp $
#
# RPi -- Raspberry Pi
#
include "arch/evbarm/conf/std.rpi"
-
-# 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_ARM1176
-options PMAPCOUNTERS
options TPIDRPRW_IS_CURLWP
options ARM11_COMPAT_MMU
options __HAVE_MM_MD_CACHE_ALIASING
@@ -26,121 +17,7 @@ makeoptions CPUFLAGS="-march=armv6z -mt
# 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 UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
-file-system TMPFS # memory file system
-#file-system UDF # experimental - OSTA UDF CD/DVD file-system
-#file-system HFS # experimental - Apple HFS+ (read-only)
-#file-system NILFS # experimental - NTT's NiLFS(2)
-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_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 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
-
-#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
-
-# Miscellaneous kernel options
-options KTRACE # system call tracing, a la ktrace(1)
-#options KMEMSTATS # kernel memory statistics
-#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 LOCKDEBUG
-#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,KGDB_PLCOMUNIT=0,KGDB_DEVRATE=115200,KGDB_CONMODE=0xB00
makeoptions DEBUG="-g" # compile full symbol table
makeoptions COPY_SYMTAB=1
@@ -294,18 +171,9 @@ options WSDISPLAY_DEFAULTSCREENS=4
# Pseudo-Devices
-# disk/mass storage pseudo-devices
-#pseudo-device fss # file system snapshot device
-
-#pseudo-device md # memory disk device (ramdisk)
-pseudo-device vnd # disk-like interface to files
-pseudo-device putter # for puffs and pud
-
# network pseudo-devices
-pseudo-device bpfilter # Berkeley packet filter
#pseudo-device carp # Common Address Redundancy Protocol
#pseudo-device ipfilter # IP filter (firewall) and NAT
-pseudo-device loop # network loopback
#pseudo-device kttcp # network loopback
#pseudo-device ppp # Point-to-Point Protocol
#pseudo-device pppoe # PPP over Ethernet (RFC 2516)
@@ -327,11 +195,6 @@ pseudo-device loop # network loopback
#pseudo-device pflog # PF log if
# 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
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
@@ -342,7 +205,6 @@ pseudo-device wsfont
#pseudo-device dmoverio # /dev/dmover dmover(9) interface
# userland interface to drivers, including autoconf and properties retrieval
-pseudo-device drvctl
# local configuration
cinclude "arch/evbarm/conf/RPI.local"
