Tue Apr 25 18:52:31 2017 UTC ()
Switch BEAGLEBONE config over to using GENERIC.common.
Remove duplicates already defined in GENERIC.common.


(sevan)
diff -r1.40 -r1.41 src/sys/arch/evbarm/conf/BEAGLEBONE
cvs diff -r1.40 -r1.41 src/sys/arch/evbarm/conf/Attic/BEAGLEBONE (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/Attic/BEAGLEBONE 2017/03/30 17:17:41 1.40
+++ src/sys/arch/evbarm/conf/Attic/BEAGLEBONE 2017/04/25 18:52:31 1.41
@@ -1,158 +1,36 @@ @@ -1,158 +1,36 @@
1# 1#
2# $NetBSD: BEAGLEBONE,v 1.40 2017/03/30 17:17:41 sevan Exp $ 2# $NetBSD: BEAGLEBONE,v 1.41 2017/04/25 18:52:31 sevan Exp $
3# 3#
4# BEAGLEBONE -- TI AM335x board Kernel 4# BEAGLEBONE -- TI AM335x board Kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.beagle" 7include "arch/evbarm/conf/std.beagle"
8 8include "arch/evbarm/conf/GENERIC.common"
9# estimated number of users 
10 
11maxusers 32 
12 
13# Standard system options 
14 
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 
16#options NTP # NTP phase/frequency locked loop 
17 9
18# CPU options 10# CPU options
19 11
20options CPU_CORTEXA8 12options CPU_CORTEXA8
21options TI_AM335X 13options TI_AM335X
22options PMAPCOUNTERS 
23 14
24# XXX The Cortex PMC delay() doesn't seem to work. 15# XXX The Cortex PMC delay() doesn't seem to work.
25#no options CORTEX_PMC 16#no options CORTEX_PMC
26 17
27# Architecture options 18# Architecture options
28#makeoptions CPUFLAGS+="-mthumb" 19#makeoptions CPUFLAGS+="-mthumb"
29 20
30# File systems 
31 
32file-system FFS # UFS 
33#file-system LFS # log-structured file system 
34file-system MFS # memory file system 
35file-system NFS # Network file system 
36#file-system ADOSFS # AmigaDOS-compatible file system 
37file-system EXT2FS # second extended file system (linux) 
38#file-system CD9660 # ISO 9660 + Rock Ridge file system 
39file-system MSDOSFS # MS-DOS file system 
40#file-system FDESC # /dev/fd 
41#file-system KERNFS # /kern 
42file-system NULLFS # loopback file system 
43#file-system PROCFS # /proc 
44#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) 
45#file-system UMAPFS # NULLFS + uid and gid remapping 
46#file-system UNION # union file system 
47file-system TMPFS # memory file system 
48file-system PTYFS # /dev/pts/N support 
49 
50# File system options 
51#options QUOTA # legacy UFS quotas 
52#options QUOTA2 # new, in-filesystem UFS quotas 
53#options DISKLABEL_EI # disklabel Endian Independent support 
54#options FFS_EI # FFS Endian Independent support 
55#options NFSSERVER 
56options WAPBL # File system journaling support 
57#options FFS_NO_SNAPSHOT # No FFS snapshot support 
58 
59# Networking options 
60 
61#options GATEWAY # packet forwarding 
62options INET # IP + ICMP + TCP + UDP 
63options INET6 # IPV6 
64#options IPSEC # IP security 
65#options IPSEC_DEBUG # debug for IP security 
66#options MROUTING # IP multicast routing 
67#options PIM # Protocol Independent Multicast 
68#options NETATALK # AppleTalk networking 
69#options PPP_BSDCOMP # BSD-Compress compression support for PPP 
70#options PPP_DEFLATE # Deflate compression support for PPP 
71#options PPP_FILTER # Active filter support for PPP (requires bpf) 
72#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 
73 
74options NFS_BOOT_BOOTP 
75options NFS_BOOT_DHCP 
76#options NFS_BOOT_BOOTSTATIC 
77#options NFS_BOOTSTATIC_MYIP="\"192.168.1.4\"" 
78#options NFS_BOOTSTATIC_GWIP="\"192.168.1.1\"" 
79#options NFS_BOOTSTATIC_MASK="\"255.255.255.0\"" 
80#options NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\"" 
81#options NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\"" 
82 
83options NFS_BOOT_RWSIZE=1024 
84 
85# Compatibility options 
86 
87options COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries 
88#options COMPAT_43 # 4.3BSD compatibility. 
89#options COMPAT_09 # NetBSD 0.9, 
90#options COMPAT_10 # NetBSD 1.0, 
91#options COMPAT_11 # NetBSD 1.1, 
92#options COMPAT_12 # NetBSD 1.2, 
93#options COMPAT_13 # NetBSD 1.3, 
94#options COMPAT_14 # NetBSD 1.4, 
95#options COMPAT_15 # NetBSD 1.5, 
96#options COMPAT_16 # NetBSD 1.6, 
97#options COMPAT_20 # NetBSD 2.0, 
98options COMPAT_30 # NetBSD 3.0, 
99options COMPAT_40 # NetBSD 4.0, 
100options COMPAT_50 # NetBSD 5.0, 
101options COMPAT_60 # NetBSD 6.0, and 
102options COMPAT_70 # NetBSD 7.0 binary compatibility. 
103#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 
104#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 
105 
106# Shared memory options 
107 
108options SYSVMSG # System V-like message queues 
109options SYSVSEM # System V-like semaphores 
110options SYSVSHM # System V-like memory sharing 
111 
112# Device options 
113 
114#options MEMORY_DISK_HOOKS # boottime setup of ramdisk 
115#options MEMORY_DISK_ROOT_SIZE=8192 # Size in blocks 
116#options MEMORY_DISK_DYNAMIC 
117#options MINIROOTSIZE=1000 # Size in blocks 
118#options MEMORY_DISK_IS_ROOT # use memory disk as root 
119 
120# Wedge support 
121options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances 
122options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges 
123 
124# Miscellaneous kernel options 
125options KTRACE # system call tracing, a la ktrace(1) 
126#options SCSIVERBOSE # Verbose SCSI errors 
127#options MIIVERBOSE # Verbose MII autoconfuration messages 
128#options DDB_KEYCODE=0x40 
129#options USERCONF # userconf(4) support 
130#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 
131 
132# Development and Debugging options 21# Development and Debugging options
133 22
134#options PERFCTRS # performance counters 
135options DIAGNOSTIC # internal consistency checks 
136options DEBUG 23options DEBUG
137options KDTRACE_HOOKS # kernel DTrace hooks 
138options MODULAR # DTrace is a module (load via modules.conf) 
139#options PMAP_DEBUG # Enable pmap_debug_level code 
140#options IPKDB # remote kernel debugging 
141#options VERBOSE_INIT_ARM # verbose bootstraping messages 
142options DDB # in-kernel debugger 
143options DDB_ONPANIC=1 
144options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 
145#options KGDB 
146makeoptions DEBUG="-g" # compile full symbol table 24makeoptions DEBUG="-g" # compile full symbol table
147makeoptions COPY_SYMTAB=1 25makeoptions COPY_SYMTAB=1
148 26
149## USB Debugging options 27## USB Debugging options
150options USB_DEBUG 28options USB_DEBUG
151options EHCI_DEBUG 29options EHCI_DEBUG
152options OHCI_DEBUG 30options OHCI_DEBUG
153options UHUB_DEBUG 31options UHUB_DEBUG
154 32
155 33
156# Valid options for BOOT_ARGS: 34# Valid options for BOOT_ARGS:
157# single Boot to single user only 35# single Boot to single user only
158# kdb Give control to kernel debugger 36# kdb Give control to kernel debugger
@@ -330,34 +208,15 @@ wd* at umass? @@ -330,34 +208,15 @@ wd* at umass?
330# SCSI bus support 208# SCSI bus support
331scsibus* at scsi? 209scsibus* at scsi?
332# SCSI devices 210# SCSI devices
333sd* at scsibus? target ? lun ? # SCSI disk drives 211sd* at scsibus? target ? lun ? # SCSI disk drives
334 212
335axe* at uhub? port ? configuration ? interface ? 213axe* at uhub? port ? configuration ? interface ?
336 214
337# Ethernet 215# Ethernet
338cpsw* at obio2 addr 0x4a100000 size 0x8000 intrbase 40 216cpsw* at obio2 addr 0x4a100000 size 0x8000 intrbase 40
339ukphy* at mii? 217ukphy* at mii?
340 218
341# Pseudo-Devices 219# Pseudo-Devices
342 220
343# disk/mass storage pseudo-devices 
344#pseudo-device md # memory disk device (ramdisk) 
345#pseudo-device vnd # disk-like interface to files 
346#pseudo-device fss # file system snapshot device 
347#pseudo-device putter # for puffs and pud 
348pseudo-device drvctl # driver control 
349 
350# network pseudo-devices 
351pseudo-device bpfilter # Berkeley packet filter 
352pseudo-device loop # network loopback 
353#pseudo-device kttcp # network loopback 
354 
355# miscellaneous pseudo-devices 
356pseudo-device pty # pseudo-terminals 
357#options RND_COM 
358#pseudo-device clockctl # user control of clock subsystem 
359pseudo-device ksyms # /dev/ksyms 
360pseudo-device lockstat # lock profiling 
361 
362# local configuration 221# local configuration
363cinclude "arch/evbarm/conf/BEAGLEBONE.local" 222cinclude "arch/evbarm/conf/BEAGLEBONE.local"