Fri Jun 10 16:38:17 2011 UTC ()
Change default of GUR_BASE to 0xffe00000 which is used on more recent machines.
Add options GUR_BASE=0xe0000000 to MPC8548CDS and RB800


(matt)
diff -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8536DS
diff -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8548CDS
diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020DS
diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020RDB
diff -r1.6 -r1.7 src/sys/arch/evbppc/conf/RB800
diff -r1.5 -r1.6 src/sys/arch/evbppc/conf/std.mpc85xx
cvs diff -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8536DS (switch to unified diff)

--- src/sys/arch/evbppc/conf/MPC8536DS 2011/06/08 05:03:43 1.4
+++ src/sys/arch/evbppc/conf/MPC8536DS 2011/06/10 16:38:17 1.5
@@ -1,224 +1,221 @@ @@ -1,224 +1,221 @@
1# $NetBSD: MPC8536DS,v 1.4 2011/06/08 05:03:43 matt Exp $ 1# $NetBSD: MPC8536DS,v 1.5 2011/06/10 16:38:17 matt Exp $
2# 2#
3# MPC8536DS -- everything that's currently supported 3# MPC8536DS -- everything that's currently supported
4# 4#
5 5
6include "arch/evbppc/conf/std.mpc85xx" 6include "arch/evbppc/conf/std.mpc85xx"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10ident "MPC8536DS-$Revision: 1.4 $" 10ident "MPC8536DS-$Revision: 1.5 $"
11 11
12maxusers 32 12maxusers 32
13 13
14makeoptions NEED_BINARY="yes" 14makeoptions NEED_BINARY="yes"
15makeoptions NEED_UBOOTIMAGE="yes" 15makeoptions NEED_UBOOTIMAGE="yes"
16 16
17#options UVMHIST 17#options UVMHIST
18#options UVMHIST_PRINT 18#options UVMHIST_PRINT
19 19
20no options GUR_BASE 
21options GUR_BASE=0xffe00000 
22 
23options MPC8536 20options MPC8536
24options PIXIS 21options PIXIS
25#options HZ=1000 22#options HZ=1000
26 23
27#options INSECURE # disable kernel security levels 24#options INSECURE # disable kernel security levels
28#options NTP # NTP phase/frequency locked loop 25#options NTP # NTP phase/frequency locked loop
29options KTRACE # system call tracing via ktrace(1) 26options KTRACE # system call tracing via ktrace(1)
30 27
31options SYSVMSG # System V message queues 28options SYSVMSG # System V message queues
32options SYSVSEM # System V semaphores 29options SYSVSEM # System V semaphores
33options SYSVSHM # System V shared memory 30options SYSVSHM # System V shared memory
34 31
35options USERCONF # userconf(4) support 32options USERCONF # userconf(4) support
36#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 33#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
37#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 34#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
38 35
39# Diagnostic/debugging support options 36# Diagnostic/debugging support options
40options DIAGNOSTIC # cheap kernel consistency checks 37options DIAGNOSTIC # cheap kernel consistency checks
41options DEBUG # expensive debugging checks/support 38options DEBUG # expensive debugging checks/support
42#options SYSCALL_DEBUG # syscall debugging 39#options SYSCALL_DEBUG # syscall debugging
43options DDB # in-kernel debugger 40options DDB # in-kernel debugger
44options DDB_HISTORY_SIZE=512 # enable history editing in DDB 41options DDB_HISTORY_SIZE=512 # enable history editing in DDB
45options TRAP_PANICWAIT 42options TRAP_PANICWAIT
46options SYMTAB_SPACE=410000 # size for embedded symbol table 43options SYMTAB_SPACE=410000 # size for embedded symbol table
47 44
48makeoptions DEBUG="-g" # compile full symbol table 45makeoptions DEBUG="-g" # compile full symbol table
49 46
50# Compatibility options 47# Compatibility options
51#options COMPAT_09 # NetBSD 0.9, 48#options COMPAT_09 # NetBSD 0.9,
52#options COMPAT_10 # NetBSD 1.0, 49#options COMPAT_10 # NetBSD 1.0,
53#options COMPAT_11 # NetBSD 1.1, 50#options COMPAT_11 # NetBSD 1.1,
54#options COMPAT_12 # NetBSD 1.2, 51#options COMPAT_12 # NetBSD 1.2,
55options COMPAT_13 # NetBSD 1.3, 52options COMPAT_13 # NetBSD 1.3,
56options COMPAT_14 # NetBSD 1.4, 53options COMPAT_14 # NetBSD 1.4,
57options COMPAT_15 # NetBSD 1.5, 54options COMPAT_15 # NetBSD 1.5,
58options COMPAT_16 # NetBSD 1.6, 55options COMPAT_16 # NetBSD 1.6,
59options COMPAT_20 # NetBSD 2.0, 56options COMPAT_20 # NetBSD 2.0,
60options COMPAT_30 # NetBSD 3.0, 57options COMPAT_30 # NetBSD 3.0,
61options COMPAT_40 # NetBSD 4.0, 58options COMPAT_40 # NetBSD 4.0,
62options COMPAT_50 # NetBSD 5.0 compatibility. 59options COMPAT_50 # NetBSD 5.0 compatibility.
63options COMPAT_43 # and 4.3BSD 60options COMPAT_43 # and 4.3BSD
64#options COMPAT_386BSD_MBRPART # recognize old partition ID 61#options COMPAT_386BSD_MBRPART # recognize old partition ID
65#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 62#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
66options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 63options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
67 64
68# File systems 65# File systems
69file-system FFS # UFS 66file-system FFS # UFS
70file-system EXT2FS # second extended file system (linux) 67file-system EXT2FS # second extended file system (linux)
71file-system LFS # log-structured file system 68file-system LFS # log-structured file system
72file-system MFS # memory file system 69file-system MFS # memory file system
73file-system NFS # Network File System client 70file-system NFS # Network File System client
74file-system CD9660 # ISO 9660 + Rock Ridge file system 71file-system CD9660 # ISO 9660 + Rock Ridge file system
75file-system MSDOSFS # MS-DOS file system 72file-system MSDOSFS # MS-DOS file system
76#file-system FDESC # /dev/fd 73#file-system FDESC # /dev/fd
77file-system TMPFS # efficient memory file system 74file-system TMPFS # efficient memory file system
78file-system KERNFS # /kern 75file-system KERNFS # /kern
79file-system NULLFS # loopback file system 76file-system NULLFS # loopback file system
80#file-system OVERLAY # overlay file system 77#file-system OVERLAY # overlay file system
81#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) 78#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
82file-system PROCFS # /proc 79file-system PROCFS # /proc
83#file-system UMAPFS # NULLFS + uid and gid remapping 80#file-system UMAPFS # NULLFS + uid and gid remapping
84#file-system UNION # union file system 81#file-system UNION # union file system
85file-system PTYFS # /dev/pts/N support 82file-system PTYFS # /dev/pts/N support
86 83
87# File system options 84# File system options
88options QUOTA # legacy UFS quotas 85options QUOTA # legacy UFS quotas
89options QUOTA2 # new, in-filesystem UFS quotas 86options QUOTA2 # new, in-filesystem UFS quotas
90options FFS_EI # FFS Endian Independant support 87options FFS_EI # FFS Endian Independant support
91options WAPBL # File system journaling support - Experimental 88options WAPBL # File system journaling support - Experimental
92options NFSSERVER # Network File System server 89options NFSSERVER # Network File System server
93#options FFS_NO_SNAPSHOT # No FFS snapshot support 90#options FFS_NO_SNAPSHOT # No FFS snapshot support
94options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 91options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
95 # immutable) behave as system flags. 92 # immutable) behave as system flags.
96 93
97options NFS_BOOT_DHCP # Support DHCP NFS root 94options NFS_BOOT_DHCP # Support DHCP NFS root
98 95
99# Networking options 96# Networking options
100#options GATEWAY # packet forwarding 97#options GATEWAY # packet forwarding
101options INET # IP + ICMP + TCP + UDP 98options INET # IP + ICMP + TCP + UDP
102options INET_CSUM_COUNTERS 99options INET_CSUM_COUNTERS
103options TCP_CSUM_COUNTERS 100options TCP_CSUM_COUNTERS
104options UDP_CSUM_COUNTERS 101options UDP_CSUM_COUNTERS
105#options INET6 # IPV6 102#options INET6 # IPV6
106#options IPSEC # IP security 103#options IPSEC # IP security
107#options IPSEC_ESP # IP security (encryption part; define w/IPSEC) 104#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
108#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) 105#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
109#options IPSEC_DEBUG # debug for IP security 106#options IPSEC_DEBUG # debug for IP security
110#options MROUTING # IP multicast routing 107#options MROUTING # IP multicast routing
111#options PIM # Protocol Independent Multicast 108#options PIM # Protocol Independent Multicast
112#options DIRECTED_BROADCAST # allow broadcasts through routers 109#options DIRECTED_BROADCAST # allow broadcasts through routers
113#options ISO,TPIP # OSI 110#options ISO,TPIP # OSI
114#options EON # OSI tunneling over IP 111#options EON # OSI tunneling over IP
115#options NETATALK # AppleTalk networking protocols 112#options NETATALK # AppleTalk networking protocols
116#options PPP_BSDCOMP # BSD-Compress compression support for PPP 113#options PPP_BSDCOMP # BSD-Compress compression support for PPP
117#options PPP_DEFLATE # Deflate compression support for PPP 114#options PPP_DEFLATE # Deflate compression support for PPP
118#options PPP_FILTER # Active filter support for PPP (requires bpf) 115#options PPP_FILTER # Active filter support for PPP (requires bpf)
119#options PFIL_HOOKS # pfil(9) packet filter hooks 116#options PFIL_HOOKS # pfil(9) packet filter hooks
120#options IPFILTER_LOG # ipmon(8) log support 117#options IPFILTER_LOG # ipmon(8) log support
121#options IPFILTER_LOOKUP # ippool(8) support 118#options IPFILTER_LOOKUP # ippool(8) support
122#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 119#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
123 120
124# These options enable verbose messages for several subsystems. 121# These options enable verbose messages for several subsystems.
125# Warning, these may compile large string tables into the kernel! 122# Warning, these may compile large string tables into the kernel!
126options PCIVERBOSE # verbose PCI device autoconfig messages 123options PCIVERBOSE # verbose PCI device autoconfig messages
127options MIIVERBOSE # verbose PHY autoconfig messages 124options MIIVERBOSE # verbose PHY autoconfig messages
128#options PCI_CONFIG_DUMP # verbosely dump PCI config space 125#options PCI_CONFIG_DUMP # verbosely dump PCI config space
129options SCSIVERBOSE # human readable SCSI error messages 126options SCSIVERBOSE # human readable SCSI error messages
130#options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices 127#options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices
131#options PCI_CONFIGURE_VERBOSE # Show PCI config information 128#options PCI_CONFIGURE_VERBOSE # Show PCI config information
132 129
133# wscons options 130# wscons options
134#options WSEMUL_SUN # sun terminal emulation 131#options WSEMUL_SUN # sun terminal emulation
135#options WSEMUL_VT100 # VT100 / VT220 emulation 132#options WSEMUL_VT100 # VT100 / VT220 emulation
136 133
137# Kernel root file system and dump configuration. 134# Kernel root file system and dump configuration.
138config netbsd root on ? type ? 135config netbsd root on ? type ?
139config nfsnetbsd root on tsec0 type nfs 136config nfsnetbsd root on tsec0 type nfs
140 137
141# 138#
142# Device configuration 139# Device configuration
143# 140#
144 141
145mainbus0 at root # Processor Local Bus 142mainbus0 at root # Processor Local Bus
146 143
147cpunode* at mainbus? node ? 144cpunode* at mainbus? node ?
148gpio* at gpiobus? 145gpio* at gpiobus?
149 146
150cpu0 at cpunode? 147cpu0 at cpunode?
151 148
152obio0 at cpunode? # On-chip Peripheral Bus 149obio0 at cpunode? # On-chip Peripheral Bus
153#mkclock0 at obio0 addr 0xf8000000 size 8192 150#mkclock0 at obio0 addr 0xf8000000 size 8192
154 151
155e500wdog* at cpunode? # Watchdog timer 152e500wdog* at cpunode? # Watchdog timer
156 153
157duart* at cpunode? 154duart* at cpunode?
158com* at duart? port ? 155com* at duart? port ?
159options CONSPEED=9600 156options CONSPEED=9600
160options CONSADDR="DUART1_BASE" 157options CONSADDR="DUART1_BASE"
161 158
162tsec0 at cpunode? flags 0x002 # Enhanced 3-Speed Ethernet Controller 159tsec0 at cpunode? flags 0x002 # Enhanced 3-Speed Ethernet Controller
163tsec1 at cpunode? flags 0x101 # Enhanced 3-Speed Ethernet Controller 160tsec1 at cpunode? flags 0x101 # Enhanced 3-Speed Ethernet Controller
164ciphy* at mii? # Cicada PHY 161ciphy* at mii? # Cicada PHY
165ukphy* at mii? 162ukphy* at mii?
166#options ETSEC_EVENT_COUNTERS 163#options ETSEC_EVENT_COUNTERS
167 164
168ehci* at cpunode? # usb 165ehci* at cpunode? # usb
169 166
170diic* at cpunode? # i2c bus 167diic* at cpunode? # i2c bus
171iic* at diic? 168iic* at diic?
172spdmem* at iic1 addr 0x51 # DDR 169spdmem* at iic1 addr 0x51 # DDR
173dsrtc* at iic1 addr 0x68 # RTC 170dsrtc* at iic1 addr 0x68 # RTC
174 171
175pq3pcie* at cpunode? # PCI-Express controller 172pq3pcie* at cpunode? # PCI-Express controller
176pq3pci* at cpunode? # PCI(X) 173pq3pci* at cpunode? # PCI(X)
177pci* at pq3pcie? 174pci* at pq3pcie?
178pci* at pq3pci? 175pci* at pq3pci?
179 176
180ppb* at pci? dev ? function ? # PCI-PCI bridges 177ppb* at pci? dev ? function ? # PCI-PCI bridges
181pci* at ppb? 178pci* at ppb?
182 179
183#ohci1 at pci1 dev 0 function 2 180#ohci1 at pci1 dev 0 function 2
184#ehci1 at pci1 dev 0 function 3 181#ehci1 at pci1 dev 0 function 3
185ohci* at pci? dev ? function ? 182ohci* at pci? dev ? function ?
186ehci* at pci? dev ? function ? 183ehci* at pci? dev ? function ?
187#uhci* at pci? dev ? function ? 184#uhci* at pci? dev ? function ?
188usb* at ehci? 185usb* at ehci?
189usb* at ohci? 186usb* at ohci?
190#usb* at uhci? 187#usb* at uhci?
191uhub* at usb? 188uhub* at usb?
192umass* at uhub? port ? 189umass* at uhub? port ?
193scsibus* at umass? channel ? 190scsibus* at umass? channel ?
194sd* at scsibus? target ? lun ? 191sd* at scsibus? target ? lun ?
195 192
196sdhc* at cpunode? # sdmmc 193sdhc* at cpunode? # sdmmc
197sdmmc* at sdhc? # SD/MMC bus 194sdmmc* at sdhc? # SD/MMC bus
198ld* at sdmmc? 195ld* at sdmmc?
199 196
200#siisata* at pci? dev ? function ? 197#siisata* at pci? dev ? function ?
201#atabus* at siisata? channel ? 198#atabus* at siisata? channel ?
202#jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers 199#jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
203#ahcisata* at jmide? 200#ahcisata* at jmide?
204#atabus* at ahcisata? channel ? 201#atabus* at ahcisata? channel ?
205 202
206#viaide* at pci? dev ? function ? 203#viaide* at pci? dev ? function ?
207#atabus* at viaide? channel ? 204#atabus* at viaide? channel ?
208#wd* at atabus? drive ? 205#wd* at atabus? drive ?
209#rtk* at pci? dev ? function ? 206#rtk* at pci? dev ? function ?
210wm* at pci? dev ? function ? # Intel Ethernet 207wm* at pci? dev ? function ? # Intel Ethernet
211 208
212#inphy* at mii? phy ? # Intel 82555 PHYs 209#inphy* at mii? phy ? # Intel 82555 PHYs
213#iophy* at mii? phy ? # Intel 82553 PHYs 210#iophy* at mii? phy ? # Intel 82553 PHYs
214makphy* at mii? phy ? # Marvell PHYs 211makphy* at mii? phy ? # Marvell PHYs
215#ukphy* at mii? phy ? # generic unknown PHYs 212#ukphy* at mii? phy ? # generic unknown PHYs
216 213
217pseudo-device loop # network loopback 214pseudo-device loop # network loopback
218pseudo-device bpfilter # packet filter 215pseudo-device bpfilter # packet filter
219pseudo-device rnd # /dev/random and in-kernel generator 216pseudo-device rnd # /dev/random and in-kernel generator
220pseudo-device clockctl # user control of clock subsystem 217pseudo-device clockctl # user control of clock subsystem
221pseudo-device ksyms # /dev/ksyms 218pseudo-device ksyms # /dev/ksyms
222pseudo-device pty # pseudo-terminals 219pseudo-device pty # pseudo-terminals
223pseudo-device kttcp # kernel ttcp 220pseudo-device kttcp # kernel ttcp
224pseudo-device vlan # 802.1Q VLANs 221pseudo-device vlan # 802.1Q VLANs
cvs diff -r1.4 -r1.5 src/sys/arch/evbppc/conf/MPC8548CDS (switch to unified diff)

--- src/sys/arch/evbppc/conf/MPC8548CDS 2011/06/08 05:03:44 1.4
+++ src/sys/arch/evbppc/conf/MPC8548CDS 2011/06/10 16:38:17 1.5
@@ -1,214 +1,215 @@ @@ -1,214 +1,215 @@
1# $NetBSD: MPC8548CDS,v 1.4 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: MPC8548CDS,v 1.5 2011/06/10 16:38:17 matt Exp $
2# 2#
3# MPC8548CDS -- everything that's currently supported 3# MPC8548CDS -- everything that's currently supported
4# 4#
5 5
6include "arch/evbppc/conf/std.mpc85xx" 6include "arch/evbppc/conf/std.mpc85xx"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10ident "MPC8548CDS-$Revision: 1.4 $" 10ident "MPC8548CDS-$Revision: 1.5 $"
11 11
12maxusers 32 12maxusers 32
13 13
14makeoptions NEED_BINARY="yes" 14makeoptions NEED_BINARY="yes"
15makeoptions NEED_UBOOTIMAGE="yes" 15makeoptions NEED_UBOOTIMAGE="yes"
16 16
17#options UVMHIST 17#options UVMHIST
18#options UVMHIST_PRINT 18#options UVMHIST_PRINT
19 19
20options MPC8548 20options MPC8548
21options CADMUS 21options CADMUS
 22options GUR_BASE=0xe0000000
22#options HZ=1000 23#options HZ=1000
23 24
24#options INSECURE # disable kernel security levels 25#options INSECURE # disable kernel security levels
25#options NTP # NTP phase/frequency locked loop 26#options NTP # NTP phase/frequency locked loop
26options KTRACE # system call tracing via ktrace(1) 27options KTRACE # system call tracing via ktrace(1)
27 28
28options SYSVMSG # System V message queues 29options SYSVMSG # System V message queues
29options SYSVSEM # System V semaphores 30options SYSVSEM # System V semaphores
30options SYSVSHM # System V shared memory 31options SYSVSHM # System V shared memory
31 32
32options USERCONF # userconf(4) support 33options USERCONF # userconf(4) support
33#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 34#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
34#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 35#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
35 36
36# Diagnostic/debugging support options 37# Diagnostic/debugging support options
37options DIAGNOSTIC # cheap kernel consistency checks 38options DIAGNOSTIC # cheap kernel consistency checks
38options DEBUG # expensive debugging checks/support 39options DEBUG # expensive debugging checks/support
39#options SYSCALL_DEBUG # syscall debugging 40#options SYSCALL_DEBUG # syscall debugging
40options DDB # in-kernel debugger 41options DDB # in-kernel debugger
41options DDB_HISTORY_SIZE=512 # enable history editing in DDB 42options DDB_HISTORY_SIZE=512 # enable history editing in DDB
42options TRAP_PANICWAIT 43options TRAP_PANICWAIT
43options SYMTAB_SPACE=410000 # size for embedded symbol table 44options SYMTAB_SPACE=410000 # size for embedded symbol table
44 45
45makeoptions DEBUG="-g" # compile full symbol table 46makeoptions DEBUG="-g" # compile full symbol table
46 47
47# Compatibility options 48# Compatibility options
48#options COMPAT_09 # NetBSD 0.9, 49#options COMPAT_09 # NetBSD 0.9,
49#options COMPAT_10 # NetBSD 1.0, 50#options COMPAT_10 # NetBSD 1.0,
50#options COMPAT_11 # NetBSD 1.1, 51#options COMPAT_11 # NetBSD 1.1,
51#options COMPAT_12 # NetBSD 1.2, 52#options COMPAT_12 # NetBSD 1.2,
52options COMPAT_13 # NetBSD 1.3, 53options COMPAT_13 # NetBSD 1.3,
53options COMPAT_14 # NetBSD 1.4, 54options COMPAT_14 # NetBSD 1.4,
54options COMPAT_15 # NetBSD 1.5, 55options COMPAT_15 # NetBSD 1.5,
55options COMPAT_16 # NetBSD 1.6, 56options COMPAT_16 # NetBSD 1.6,
56options COMPAT_20 # NetBSD 2.0, 57options COMPAT_20 # NetBSD 2.0,
57options COMPAT_30 # NetBSD 3.0, 58options COMPAT_30 # NetBSD 3.0,
58options COMPAT_40 # NetBSD 4.0, 59options COMPAT_40 # NetBSD 4.0,
59options COMPAT_50 # NetBSD 5.0 compatibility. 60options COMPAT_50 # NetBSD 5.0 compatibility.
60options COMPAT_43 # and 4.3BSD 61options COMPAT_43 # and 4.3BSD
61#options COMPAT_386BSD_MBRPART # recognize old partition ID 62#options COMPAT_386BSD_MBRPART # recognize old partition ID
62#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 63#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
63options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 64options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
64 65
65# File systems 66# File systems
66file-system FFS # UFS 67file-system FFS # UFS
67file-system EXT2FS # second extended file system (linux) 68file-system EXT2FS # second extended file system (linux)
68file-system LFS # log-structured file system 69file-system LFS # log-structured file system
69file-system MFS # memory file system 70file-system MFS # memory file system
70file-system NFS # Network File System client 71file-system NFS # Network File System client
71file-system CD9660 # ISO 9660 + Rock Ridge file system 72file-system CD9660 # ISO 9660 + Rock Ridge file system
72file-system MSDOSFS # MS-DOS file system 73file-system MSDOSFS # MS-DOS file system
73#file-system FDESC # /dev/fd 74#file-system FDESC # /dev/fd
74file-system TMPFS # efficient memory file system 75file-system TMPFS # efficient memory file system
75file-system KERNFS # /kern 76file-system KERNFS # /kern
76file-system NULLFS # loopback file system 77file-system NULLFS # loopback file system
77#file-system OVERLAY # overlay file system 78#file-system OVERLAY # overlay file system
78#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) 79#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
79file-system PROCFS # /proc 80file-system PROCFS # /proc
80#file-system UMAPFS # NULLFS + uid and gid remapping 81#file-system UMAPFS # NULLFS + uid and gid remapping
81#file-system UNION # union file system 82#file-system UNION # union file system
82file-system PTYFS # /dev/pts/N support 83file-system PTYFS # /dev/pts/N support
83 84
84# File system options 85# File system options
85options QUOTA # legacy UFS quotas 86options QUOTA # legacy UFS quotas
86options QUOTA2 # new, in-filesystem UFS quotas 87options QUOTA2 # new, in-filesystem UFS quotas
87options FFS_EI # FFS Endian Independant support 88options FFS_EI # FFS Endian Independant support
88options WAPBL # File system journaling support - Experimental 89options WAPBL # File system journaling support - Experimental
89options NFSSERVER # Network File System server 90options NFSSERVER # Network File System server
90#options FFS_NO_SNAPSHOT # No FFS snapshot support 91#options FFS_NO_SNAPSHOT # No FFS snapshot support
91options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 92options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
92 # immutable) behave as system flags. 93 # immutable) behave as system flags.
93 94
94options NFS_BOOT_DHCP # Support DHCP NFS root 95options NFS_BOOT_DHCP # Support DHCP NFS root
95 96
96# Networking options 97# Networking options
97#options GATEWAY # packet forwarding 98#options GATEWAY # packet forwarding
98options INET # IP + ICMP + TCP + UDP 99options INET # IP + ICMP + TCP + UDP
99options INET_CSUM_COUNTERS 100options INET_CSUM_COUNTERS
100options TCP_CSUM_COUNTERS 101options TCP_CSUM_COUNTERS
101options UDP_CSUM_COUNTERS 102options UDP_CSUM_COUNTERS
102#options INET6 # IPV6 103#options INET6 # IPV6
103#options IPSEC # IP security 104#options IPSEC # IP security
104#options IPSEC_ESP # IP security (encryption part; define w/IPSEC) 105#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
105#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) 106#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
106#options IPSEC_DEBUG # debug for IP security 107#options IPSEC_DEBUG # debug for IP security
107#options MROUTING # IP multicast routing 108#options MROUTING # IP multicast routing
108#options PIM # Protocol Independent Multicast 109#options PIM # Protocol Independent Multicast
109#options DIRECTED_BROADCAST # allow broadcasts through routers 110#options DIRECTED_BROADCAST # allow broadcasts through routers
110#options ISO,TPIP # OSI 111#options ISO,TPIP # OSI
111#options EON # OSI tunneling over IP 112#options EON # OSI tunneling over IP
112#options NETATALK # AppleTalk networking protocols 113#options NETATALK # AppleTalk networking protocols
113#options PPP_BSDCOMP # BSD-Compress compression support for PPP 114#options PPP_BSDCOMP # BSD-Compress compression support for PPP
114#options PPP_DEFLATE # Deflate compression support for PPP 115#options PPP_DEFLATE # Deflate compression support for PPP
115#options PPP_FILTER # Active filter support for PPP (requires bpf) 116#options PPP_FILTER # Active filter support for PPP (requires bpf)
116#options PFIL_HOOKS # pfil(9) packet filter hooks 117#options PFIL_HOOKS # pfil(9) packet filter hooks
117#options IPFILTER_LOG # ipmon(8) log support 118#options IPFILTER_LOG # ipmon(8) log support
118#options IPFILTER_LOOKUP # ippool(8) support 119#options IPFILTER_LOOKUP # ippool(8) support
119#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 120#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
120 121
121# These options enable verbose messages for several subsystems. 122# These options enable verbose messages for several subsystems.
122# Warning, these may compile large string tables into the kernel! 123# Warning, these may compile large string tables into the kernel!
123options PCIVERBOSE # verbose PCI device autoconfig messages 124options PCIVERBOSE # verbose PCI device autoconfig messages
124options MIIVERBOSE # verbose PHY autoconfig messages 125options MIIVERBOSE # verbose PHY autoconfig messages
125#options PCI_CONFIG_DUMP # verbosely dump PCI config space 126#options PCI_CONFIG_DUMP # verbosely dump PCI config space
126options SCSIVERBOSE # human readable SCSI error messages 127options SCSIVERBOSE # human readable SCSI error messages
127#options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices 128#options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices
128#options PCI_CONFIGURE_VERBOSE # Show PCI config information 129#options PCI_CONFIGURE_VERBOSE # Show PCI config information
129 130
130# wscons options 131# wscons options
131#options WSEMUL_SUN # sun terminal emulation 132#options WSEMUL_SUN # sun terminal emulation
132#options WSEMUL_VT100 # VT100 / VT220 emulation 133#options WSEMUL_VT100 # VT100 / VT220 emulation
133 134
134# Kernel root file system and dump configuration. 135# Kernel root file system and dump configuration.
135config netbsd root on ? type ? 136config netbsd root on ? type ?
136config nfsnetbsd root on tsec0 type nfs 137config nfsnetbsd root on tsec0 type nfs
137 138
138# 139#
139# Device configuration 140# Device configuration
140# 141#
141 142
142mainbus0 at root # Processor Local Bus 143mainbus0 at root # Processor Local Bus
143 144
144cpunode* at mainbus? node ? 145cpunode* at mainbus? node ?
145gpio* at gpiobus? 146gpio* at gpiobus?
146 147
147cpu0 at cpunode? 148cpu0 at cpunode?
148 149
149obio0 at cpunode? # On-chip Peripheral Bus 150obio0 at cpunode? # On-chip Peripheral Bus
150mkclock0 at obio0 addr 0xf8000000 size 8192 151mkclock0 at obio0 addr 0xf8000000 size 8192
151 152
152e500wdog* at cpunode? # Watchdog timer 153e500wdog* at cpunode? # Watchdog timer
153 154
154duart* at cpunode? 155duart* at cpunode?
155com* at duart? port ? 156com* at duart? port ?
156options CONSPEED=115200 157options CONSPEED=115200
157 158
158tsec0 at cpunode? flags 1 # Enhanced 3-Speed Ethernet Controller 159tsec0 at cpunode? flags 1 # Enhanced 3-Speed Ethernet Controller
159tsec1 at cpunode? flags 1 # Enhanced 3-Speed Ethernet Controller 160tsec1 at cpunode? flags 1 # Enhanced 3-Speed Ethernet Controller
160makphy* at mii? # Marvell PHY 161makphy* at mii? # Marvell PHY
161ukphy* at mii? 162ukphy* at mii?
162#options ETSEC_EVENT_COUNTERS 163#options ETSEC_EVENT_COUNTERS
163 164
164diic* at cpunode? # i2c bus 165diic* at cpunode? # i2c bus
165iic* at diic? 166iic* at diic?
166spdmem* at iic0 addr 0x51 # DDR 167spdmem* at iic0 addr 0x51 # DDR
167#ds1743rtc0 at smb? addr ? # RTC 168#ds1743rtc0 at smb? addr ? # RTC
168 169
169pq3pcie* at cpunode? # PCI-Express controller 170pq3pcie* at cpunode? # PCI-Express controller
170pq3pci* at cpunode? # PCI(X) 171pq3pci* at cpunode? # PCI(X)
171pci* at pq3pcie? 172pci* at pq3pcie?
172pci* at pq3pci? 173pci* at pq3pci?
173 174
174ppb* at pci? dev ? function ? # PCI-PCI bridges 175ppb* at pci? dev ? function ? # PCI-PCI bridges
175pci* at ppb? 176pci* at ppb?
176 177
177ohci1 at pci1 dev 0 function 2 178ohci1 at pci1 dev 0 function 2
178ehci1 at pci1 dev 0 function 3 179ehci1 at pci1 dev 0 function 3
179#ohci* at pci? dev ? function ? 180#ohci* at pci? dev ? function ?
180#ehci* at pci? dev ? function ? 181#ehci* at pci? dev ? function ?
181#uhci* at pci? dev ? function ? 182#uhci* at pci? dev ? function ?
182usb* at ehci? 183usb* at ehci?
183usb* at ohci? 184usb* at ohci?
184#usb* at uhci? 185#usb* at uhci?
185uhub* at usb? 186uhub* at usb?
186umass* at uhub? port ? 187umass* at uhub? port ?
187scsibus* at umass? channel ? 188scsibus* at umass? channel ?
188sd* at scsibus? target ? lun ? 189sd* at scsibus? target ? lun ?
189 190
190siisata* at pci? dev ? function ? 191siisata* at pci? dev ? function ?
191atabus* at siisata? channel ? 192atabus* at siisata? channel ?
192jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers 193jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
193ahcisata* at jmide? 194ahcisata* at jmide?
194atabus* at ahcisata? channel ? 195atabus* at ahcisata? channel ?
195 196
196#viaide* at pci? dev ? function ? 197#viaide* at pci? dev ? function ?
197#atabus* at viaide? channel ? 198#atabus* at viaide? channel ?
198wd* at atabus? drive ? 199wd* at atabus? drive ?
199#rtk* at pci? dev ? function ? 200#rtk* at pci? dev ? function ?
200#wm* at pci? dev ? function ? # Intel Ethernet 201#wm* at pci? dev ? function ? # Intel Ethernet
201 202
202#inphy* at mii? phy ? # Intel 82555 PHYs 203#inphy* at mii? phy ? # Intel 82555 PHYs
203#iophy* at mii? phy ? # Intel 82553 PHYs 204#iophy* at mii? phy ? # Intel 82553 PHYs
204#makphy* at mii? phy ? # Level One LXT-970 PHYs 205#makphy* at mii? phy ? # Level One LXT-970 PHYs
205#ukphy* at mii? phy ? # generic unknown PHYs 206#ukphy* at mii? phy ? # generic unknown PHYs
206 207
207pseudo-device loop # network loopback 208pseudo-device loop # network loopback
208pseudo-device bpfilter # packet filter 209pseudo-device bpfilter # packet filter
209pseudo-device rnd # /dev/random and in-kernel generator 210pseudo-device rnd # /dev/random and in-kernel generator
210pseudo-device clockctl # user control of clock subsystem 211pseudo-device clockctl # user control of clock subsystem
211pseudo-device ksyms # /dev/ksyms 212pseudo-device ksyms # /dev/ksyms
212pseudo-device pty # pseudo-terminals 213pseudo-device pty # pseudo-terminals
213pseudo-device kttcp # kernel ttcp 214pseudo-device kttcp # kernel ttcp
214pseudo-device vlan # 802.1Q VLANs 215pseudo-device vlan # 802.1Q VLANs
cvs diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020DS (switch to unified diff)

--- src/sys/arch/evbppc/conf/P2020DS 2011/06/08 05:03:44 1.3
+++ src/sys/arch/evbppc/conf/P2020DS 2011/06/10 16:38:17 1.4
@@ -1,228 +1,227 @@ @@ -1,228 +1,227 @@
1# $NetBSD: P2020DS,v 1.3 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: P2020DS,v 1.4 2011/06/10 16:38:17 matt Exp $
2# 2#
3# P2020DS -- everything that's currently supported 3# P2020DS -- everything that's currently supported
4# 4#
5# 5#
6 6
7include "arch/evbppc/conf/std.mpc85xx" 7include "arch/evbppc/conf/std.mpc85xx"
8 8
9options INCLUDE_CONFIG_FILE # embed config file in kernel binary 9options INCLUDE_CONFIG_FILE # embed config file in kernel binary
10 10
11ident "P2020DS-$Revision: 1.3 $" 11ident "P2020DS-$Revision: 1.4 $"
12 12
13maxusers 32 13maxusers 32
14 14
15#options UVMHIST 15#options UVMHIST
16#options UVMHIST_PRINT 16#options UVMHIST_PRINT
17 17
18no options GUR_BASE 
19options GUR_BASE=0xffe00000 
20 
21options P2020 18options P2020
22options PIXIS 19options PIXIS
23#options SYS_CLK=100000000 20#options SYS_CLK=100000000
24#options HZ=1000 21#options HZ=1000
25 22
26makeoptions NEED_BINARY="yes" 23makeoptions NEED_BINARY="yes"
27makeoptions NEED_UBOOTIMAGE="yes" 24makeoptions NEED_UBOOTIMAGE="yes"
28 25
29#options INSECURE # disable kernel security levels 26#options INSECURE # disable kernel security levels
30#options NTP # NTP phase/frequency locked loop 27#options NTP # NTP phase/frequency locked loop
31options KTRACE # system call tracing via ktrace(1) 28options KTRACE # system call tracing via ktrace(1)
32 29
33options SYSVMSG # System V message queues 30options SYSVMSG # System V message queues
34options SYSVSEM # System V semaphores 31options SYSVSEM # System V semaphores
35options SYSVSHM # System V shared memory 32options SYSVSHM # System V shared memory
36 33
37options USERCONF # userconf(4) support 34options USERCONF # userconf(4) support
38#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 35#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
39#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 36#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
40 37
41# Diagnostic/debugging support options 38# Diagnostic/debugging support options
42options DIAGNOSTIC # cheap kernel consistency checks 39options DIAGNOSTIC # cheap kernel consistency checks
43options DEBUG # expensive debugging checks/support 40options DEBUG # expensive debugging checks/support
44#options SYSCALL_DEBUG # syscall debugging 41#options SYSCALL_DEBUG # syscall debugging
45options DDB # in-kernel debugger 42options DDB # in-kernel debugger
46options DDB_HISTORY_SIZE=512 # enable history editing in DDB 43options DDB_HISTORY_SIZE=512 # enable history editing in DDB
47options TRAP_PANICWAIT 44options TRAP_PANICWAIT
48options SYMTAB_SPACE=410000 # size for embedded symbol table 45options SYMTAB_SPACE=410000 # size for embedded symbol table
49 46
50makeoptions DEBUG="-g" # compile full symbol table 47makeoptions DEBUG="-g" # compile full symbol table
51 48
52# Compatibility options 49# Compatibility options
53#options COMPAT_09 # NetBSD 0.9, 50#options COMPAT_09 # NetBSD 0.9,
54#options COMPAT_10 # NetBSD 1.0, 51#options COMPAT_10 # NetBSD 1.0,
55#options COMPAT_11 # NetBSD 1.1, 52#options COMPAT_11 # NetBSD 1.1,
56#options COMPAT_12 # NetBSD 1.2, 53#options COMPAT_12 # NetBSD 1.2,
57options COMPAT_13 # NetBSD 1.3, 54options COMPAT_13 # NetBSD 1.3,
58options COMPAT_14 # NetBSD 1.4, 55options COMPAT_14 # NetBSD 1.4,
59options COMPAT_15 # NetBSD 1.5, 56options COMPAT_15 # NetBSD 1.5,
60options COMPAT_16 # NetBSD 1.6, 57options COMPAT_16 # NetBSD 1.6,
61options COMPAT_20 # NetBSD 2.0, 58options COMPAT_20 # NetBSD 2.0,
62options COMPAT_30 # NetBSD 3.0, 59options COMPAT_30 # NetBSD 3.0,
63options COMPAT_40 # NetBSD 4.0, 60options COMPAT_40 # NetBSD 4.0,
64options COMPAT_50 # NetBSD 5.0 compatibility. 61options COMPAT_50 # NetBSD 5.0 compatibility.
65options COMPAT_43 # and 4.3BSD 62options COMPAT_43 # and 4.3BSD
66#options COMPAT_386BSD_MBRPART # recognize old partition ID 63#options COMPAT_386BSD_MBRPART # recognize old partition ID
67#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 64#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
68options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 65options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
69 66
70# File systems 67# File systems
71file-system FFS # UFS 68file-system FFS # UFS
72file-system EXT2FS # second extended file system (linux) 69file-system EXT2FS # second extended file system (linux)
73file-system LFS # log-structured file system 70file-system LFS # log-structured file system
74file-system MFS # memory file system 71file-system MFS # memory file system
75file-system NFS # Network File System client 72file-system NFS # Network File System client
76file-system CD9660 # ISO 9660 + Rock Ridge file system 73file-system CD9660 # ISO 9660 + Rock Ridge file system
77file-system MSDOSFS # MS-DOS file system 74file-system MSDOSFS # MS-DOS file system
78#file-system FDESC # /dev/fd 75#file-system FDESC # /dev/fd
79file-system TMPFS # efficient memory file system 76file-system TMPFS # efficient memory file system
80file-system KERNFS # /kern 77file-system KERNFS # /kern
81file-system NULLFS # loopback file system 78file-system NULLFS # loopback file system
82#file-system OVERLAY # overlay file system 79#file-system OVERLAY # overlay file system
83#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) 80#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
84file-system PROCFS # /proc 81file-system PROCFS # /proc
85#file-system UMAPFS # NULLFS + uid and gid remapping 82#file-system UMAPFS # NULLFS + uid and gid remapping
86#file-system UNION # union file system 83#file-system UNION # union file system
87file-system PTYFS # /dev/pts/N support 84file-system PTYFS # /dev/pts/N support
88 85
89# File system options 86# File system options
90options QUOTA # legacy UFS quotas 87options QUOTA # legacy UFS quotas
91options QUOTA2 # new, in-filesystem UFS quotas 88options QUOTA2 # new, in-filesystem UFS quotas
92options FFS_EI # FFS Endian Independant support 89options FFS_EI # FFS Endian Independant support
93options WAPBL # File system journaling support - Experimental 90options WAPBL # File system journaling support - Experimental
94options NFSSERVER # Network File System server 91options NFSSERVER # Network File System server
95#options FFS_NO_SNAPSHOT # No FFS snapshot support 92#options FFS_NO_SNAPSHOT # No FFS snapshot support
96options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 93options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
97 # immutable) behave as system flags. 94 # immutable) behave as system flags.
98 95
99options NFS_BOOT_DHCP # Support DHCP NFS root 96options NFS_BOOT_DHCP # Support DHCP NFS root
100 97
101# Networking options 98# Networking options
102#options GATEWAY # packet forwarding 99#options GATEWAY # packet forwarding
103options INET # IP + ICMP + TCP + UDP 100options INET # IP + ICMP + TCP + UDP
104options INET_CSUM_COUNTERS 101options INET_CSUM_COUNTERS
105options TCP_CSUM_COUNTERS 102options TCP_CSUM_COUNTERS
106options UDP_CSUM_COUNTERS 103options UDP_CSUM_COUNTERS
107#options INET6 # IPV6 104#options INET6 # IPV6
108#options IPSEC # IP security 105#options IPSEC # IP security
109#options IPSEC_ESP # IP security (encryption part; define w/IPSEC) 106#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
110#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) 107#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
111#options IPSEC_DEBUG # debug for IP security 108#options IPSEC_DEBUG # debug for IP security
112#options MROUTING # IP multicast routing 109#options MROUTING # IP multicast routing
113#options PIM # Protocol Independent Multicast 110#options PIM # Protocol Independent Multicast
114#options DIRECTED_BROADCAST # allow broadcasts through routers 111#options DIRECTED_BROADCAST # allow broadcasts through routers
115#options ISO,TPIP # OSI 112#options ISO,TPIP # OSI
116#options EON # OSI tunneling over IP 113#options EON # OSI tunneling over IP
117#options NETATALK # AppleTalk networking protocols 114#options NETATALK # AppleTalk networking protocols
118#options PPP_BSDCOMP # BSD-Compress compression support for PPP 115#options PPP_BSDCOMP # BSD-Compress compression support for PPP
119#options PPP_DEFLATE # Deflate compression support for PPP 116#options PPP_DEFLATE # Deflate compression support for PPP
120#options PPP_FILTER # Active filter support for PPP (requires bpf) 117#options PPP_FILTER # Active filter support for PPP (requires bpf)
121#options PFIL_HOOKS # pfil(9) packet filter hooks 118#options PFIL_HOOKS # pfil(9) packet filter hooks
122#options IPFILTER_LOG # ipmon(8) log support 119#options IPFILTER_LOG # ipmon(8) log support
123#options IPFILTER_LOOKUP # ippool(8) support 120#options IPFILTER_LOOKUP # ippool(8) support
124#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 121#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
125 122
126# These options enable verbose messages for several subsystems. 123# These options enable verbose messages for several subsystems.
127# Warning, these may compile large string tables into the kernel! 124# Warning, these may compile large string tables into the kernel!
128options PCIVERBOSE # verbose PCI device autoconfig messages 125options PCIVERBOSE # verbose PCI device autoconfig messages
129options MIIVERBOSE # verbose PHY autoconfig messages 126options MIIVERBOSE # verbose PHY autoconfig messages
130#options PCI_CONFIG_DUMP # verbosely dump PCI config space 127#options PCI_CONFIG_DUMP # verbosely dump PCI config space
131options SCSIVERBOSE # human readable SCSI error messages 128options SCSIVERBOSE # human readable SCSI error messages
132#options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices 129#options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices
133#options PCI_CONFIGURE_VERBOSE # Show PCI config information 130#options PCI_CONFIGURE_VERBOSE # Show PCI config information
134 131
135# wscons options 132# wscons options
136#options WSEMUL_SUN # sun terminal emulation 133#options WSEMUL_SUN # sun terminal emulation
137#options WSEMUL_VT100 # VT100 / VT220 emulation 134#options WSEMUL_VT100 # VT100 / VT220 emulation
138 135
139# Kernel root file system and dump configuration. 136# Kernel root file system and dump configuration.
140config netbsd root on ? type ? 137config netbsd root on ? type ?
141config nfsnetbsd root on tsec0 type nfs 138config nfsnetbsd root on tsec0 type nfs
142config netbsd-esata root on wd1a type ffs 139config netbsd-esata root on wd1a type ffs
143 140
144# 141#
145# Device configuration 142# Device configuration
146# 143#
147 144
148mainbus0 at root # Processor Local Bus 145mainbus0 at root # Processor Local Bus
149 146
150cpunode* at mainbus? node ? 147cpunode* at mainbus? node ?
151gpio* at gpiobus? 148gpio* at gpiobus?
152 149
153cpu* at cpunode? 150cpu* at cpunode?
154 151
155obio0 at cpunode? # On-chip Peripheral Bus 152obio0 at cpunode? # On-chip Peripheral Bus
156 153
157e500wdog* at cpunode? # Watchdog timer 154e500wdog* at cpunode? # Watchdog timer
158 155
159duart* at cpunode? 156duart* at cpunode?
160com* at duart? port ? 157com* at duart? port ?
161options CONSPEED=115200 158options CONSPEED=115200
162options CONSADDR="DUART1_BASE" 159options CONSADDR="DUART1_BASE"
163 160
164tsec0 at cpunode? flags 0x001 # Enhanced 3-Speed Ethernet Controller 161tsec0 at cpunode? flags 0x001 # Enhanced 3-Speed Ethernet Controller
165tsec1 at cpunode? flags 0x102 # Enhanced 3-Speed Ethernet Controller 162tsec1 at cpunode? flags 0x102 # Enhanced 3-Speed Ethernet Controller
166tsec2 at cpunode? flags 0x103 # Enhanced 3-Speed Ethernet Controller 163tsec2 at cpunode? flags 0x103 # Enhanced 3-Speed Ethernet Controller
167options ETSEC_EVENT_COUNTERS 164options ETSEC_EVENT_COUNTERS
168 165
169ehci* at cpunode? # usb 166ehci* at cpunode? # usb
170 167
171diic* at cpunode? # i2c bus 168diic* at cpunode? # i2c bus
172iic* at diic? 169iic* at diic?
173spdmem* at iic0 addr 0x51 # DDR 170spdmem* at iic0 addr 0x51 # DDR
174dsrtc* at iic1 addr 0x68 # RTC 171dsrtc* at iic1 addr 0x68 # RTC
175 172
176pq3pcie* at cpunode? # PCI-Express controller 173pq3pcie* at cpunode? # PCI-Express controller
177pq3pci* at cpunode? # PCI(X) 174pq3pci* at cpunode? # PCI(X)
178pci* at pq3pcie? 175pci* at pq3pcie?
179pci* at pq3pci? 176pci* at pq3pci?
180 177
181ppb* at pci? dev ? function ? # PCI-PCI bridges 178ppb* at pci? dev ? function ? # PCI-PCI bridges
182pci* at ppb? 179pci* at ppb?
183 180
184#ohci1 at pci1 dev 0 function 2 181#ohci1 at pci1 dev 0 function 2
185#ehci1 at pci1 dev 0 function 3 182#ehci1 at pci1 dev 0 function 3
186#ohci* at pci? dev ? function ? 183#ohci* at pci? dev ? function ?
187#ehci* at pci? dev ? function ? 184#ehci* at pci? dev ? function ?
188#uhci* at pci? dev ? function ? 185#uhci* at pci? dev ? function ?
189usb* at ehci? 186usb* at ehci?
190#usb* at ohci? 187#usb* at ohci?
191#usb* at uhci? 188#usb* at uhci?
192uhub* at usb? 189uhub* at usb?
193umass* at uhub? port ? 190umass* at uhub? port ?
194scsibus* at umass? channel ? 191scsibus* at umass? channel ?
195sd* at scsibus? target ? lun ? 192sd* at scsibus? target ? lun ?
 193ugen* at uhub? port ?
 194uhub* at uhub? port ?
196 195
197#sdhc* at cpunode? # sdmmc 196#sdhc* at cpunode? # sdmmc
198#sdmmc* at sdhc? # SD/MMC bus 197#sdmmc* at sdhc? # SD/MMC bus
199#ld* at sdmmc? 198#ld* at sdmmc?
200 199
201ahcisata* at pci? dev ? function ? 200ahcisata* at pci? dev ? function ?
202atabus0 at ahcisata? channel 0 201atabus0 at ahcisata? channel 0
203atabus1 at ahcisata? channel 1 202atabus1 at ahcisata? channel 1
204atabus2 at ahcisata? channel 2 203atabus2 at ahcisata? channel 2
205atabus3 at ahcisata? channel 3 204atabus3 at ahcisata? channel 3
206atabus* at ahcisata? channel ? 205atabus* at ahcisata? channel ?
207aceride* at pci? dev ? function ? 206aceride* at pci? dev ? function ?
208atabus* at aceride? channel ? 207atabus* at aceride? channel ?
209wd0 at atabus0 drive ? 208wd0 at atabus0 drive ?
210wd1 at atabus3 drive ? 209wd1 at atabus3 drive ?
211wd* at atabus? drive ? 210wd* at atabus? drive ?
212 211
213#wm* at pci? dev ? function ? # Intel Ethernet 212#wm* at pci? dev ? function ? # Intel Ethernet
214 213
215#ciphy* at mii? phy ? # Cicada PHY 214#ciphy* at mii? phy ? # Cicada PHY
216#inphy* at mii? phy ? # Intel 82555 PHYs 215#inphy* at mii? phy ? # Intel 82555 PHYs
217#iophy* at mii? phy ? # Intel 82553 PHYs 216#iophy* at mii? phy ? # Intel 82553 PHYs
218#makphy* at mii? phy ? # Marvell PHYs 217#makphy* at mii? phy ? # Marvell PHYs
219ukphy* at mii? phy ? # generic unknown PHYs 218ukphy* at mii? phy ? # generic unknown PHYs
220 219
221pseudo-device loop # network loopback 220pseudo-device loop # network loopback
222pseudo-device bpfilter # packet filter 221pseudo-device bpfilter # packet filter
223pseudo-device rnd # /dev/random and in-kernel generator 222pseudo-device rnd # /dev/random and in-kernel generator
224pseudo-device clockctl # user control of clock subsystem 223pseudo-device clockctl # user control of clock subsystem
225pseudo-device ksyms # /dev/ksyms 224pseudo-device ksyms # /dev/ksyms
226pseudo-device pty # pseudo-terminals 225pseudo-device pty # pseudo-terminals
227pseudo-device kttcp # kernel ttcp 226pseudo-device kttcp # kernel ttcp
228pseudo-device vlan # 802.1Q VLANs 227pseudo-device vlan # 802.1Q VLANs
cvs diff -r1.3 -r1.4 src/sys/arch/evbppc/conf/P2020RDB (switch to unified diff)

--- src/sys/arch/evbppc/conf/P2020RDB 2011/06/08 05:03:44 1.3
+++ src/sys/arch/evbppc/conf/P2020RDB 2011/06/10 16:38:17 1.4
@@ -1,216 +1,213 @@ @@ -1,216 +1,213 @@
1# $NetBSD: P2020RDB,v 1.3 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: P2020RDB,v 1.4 2011/06/10 16:38:17 matt Exp $
2# 2#
3# P2020RBD -- everything that's currently supported 3# P2020RBD -- everything that's currently supported
4# 4#
5 5
6include "arch/evbppc/conf/std.mpc85xx" 6include "arch/evbppc/conf/std.mpc85xx"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10ident "P2020RBD-$Revision: 1.3 $" 10ident "P2020RBD-$Revision: 1.4 $"
11 11
12maxusers 32 12maxusers 32
13 13
14makeoptions NEED_BINARY="yes" 14makeoptions NEED_BINARY="yes"
15makeoptions NEED_UBOOTIMAGE="yes" 15makeoptions NEED_UBOOTIMAGE="yes"
16 16
17#options UVMHIST 17#options UVMHIST
18#options UVMHIST_PRINT 18#options UVMHIST_PRINT
19 19
20no options GUR_BASE 
21options GUR_BASE=0xffe00000 
22 
23options P2020 20options P2020
24options SYS_CLK=100000000 21options SYS_CLK=100000000
25#options HZ=1000 22#options HZ=1000
26 23
27#options INSECURE # disable kernel security levels 24#options INSECURE # disable kernel security levels
28#options NTP # NTP phase/frequency locked loop 25#options NTP # NTP phase/frequency locked loop
29options KTRACE # system call tracing via ktrace(1) 26options KTRACE # system call tracing via ktrace(1)
30 27
31options SYSVMSG # System V message queues 28options SYSVMSG # System V message queues
32options SYSVSEM # System V semaphores 29options SYSVSEM # System V semaphores
33options SYSVSHM # System V shared memory 30options SYSVSHM # System V shared memory
34 31
35options USERCONF # userconf(4) support 32options USERCONF # userconf(4) support
36#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 33#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
37#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 34#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
38 35
39# Diagnostic/debugging support options 36# Diagnostic/debugging support options
40options DIAGNOSTIC # cheap kernel consistency checks 37options DIAGNOSTIC # cheap kernel consistency checks
41options DEBUG # expensive debugging checks/support 38options DEBUG # expensive debugging checks/support
42#options SYSCALL_DEBUG # syscall debugging 39#options SYSCALL_DEBUG # syscall debugging
43options DDB # in-kernel debugger 40options DDB # in-kernel debugger
44options DDB_HISTORY_SIZE=512 # enable history editing in DDB 41options DDB_HISTORY_SIZE=512 # enable history editing in DDB
45options TRAP_PANICWAIT 42options TRAP_PANICWAIT
46options SYMTAB_SPACE=410000 # size for embedded symbol table 43options SYMTAB_SPACE=410000 # size for embedded symbol table
47 44
48makeoptions DEBUG="-g" # compile full symbol table 45makeoptions DEBUG="-g" # compile full symbol table
49 46
50# Compatibility options 47# Compatibility options
51#options COMPAT_09 # NetBSD 0.9, 48#options COMPAT_09 # NetBSD 0.9,
52#options COMPAT_10 # NetBSD 1.0, 49#options COMPAT_10 # NetBSD 1.0,
53#options COMPAT_11 # NetBSD 1.1, 50#options COMPAT_11 # NetBSD 1.1,
54#options COMPAT_12 # NetBSD 1.2, 51#options COMPAT_12 # NetBSD 1.2,
55options COMPAT_13 # NetBSD 1.3, 52options COMPAT_13 # NetBSD 1.3,
56options COMPAT_14 # NetBSD 1.4, 53options COMPAT_14 # NetBSD 1.4,
57options COMPAT_15 # NetBSD 1.5, 54options COMPAT_15 # NetBSD 1.5,
58options COMPAT_16 # NetBSD 1.6, 55options COMPAT_16 # NetBSD 1.6,
59options COMPAT_20 # NetBSD 2.0, 56options COMPAT_20 # NetBSD 2.0,
60options COMPAT_30 # NetBSD 3.0, 57options COMPAT_30 # NetBSD 3.0,
61options COMPAT_40 # NetBSD 4.0, 58options COMPAT_40 # NetBSD 4.0,
62options COMPAT_50 # NetBSD 5.0 compatibility. 59options COMPAT_50 # NetBSD 5.0 compatibility.
63options COMPAT_43 # and 4.3BSD 60options COMPAT_43 # and 4.3BSD
64#options COMPAT_386BSD_MBRPART # recognize old partition ID 61#options COMPAT_386BSD_MBRPART # recognize old partition ID
65#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 62#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
66options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 63options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
67 64
68# File systems 65# File systems
69file-system FFS # UFS 66file-system FFS # UFS
70file-system EXT2FS # second extended file system (linux) 67file-system EXT2FS # second extended file system (linux)
71file-system LFS # log-structured file system 68file-system LFS # log-structured file system
72file-system MFS # memory file system 69file-system MFS # memory file system
73file-system NFS # Network File System client 70file-system NFS # Network File System client
74file-system CD9660 # ISO 9660 + Rock Ridge file system 71file-system CD9660 # ISO 9660 + Rock Ridge file system
75file-system MSDOSFS # MS-DOS file system 72file-system MSDOSFS # MS-DOS file system
76#file-system FDESC # /dev/fd 73#file-system FDESC # /dev/fd
77file-system TMPFS # efficient memory file system 74file-system TMPFS # efficient memory file system
78file-system KERNFS # /kern 75file-system KERNFS # /kern
79file-system NULLFS # loopback file system 76file-system NULLFS # loopback file system
80#file-system OVERLAY # overlay file system 77#file-system OVERLAY # overlay file system
81#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) 78#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
82file-system PROCFS # /proc 79file-system PROCFS # /proc
83#file-system UMAPFS # NULLFS + uid and gid remapping 80#file-system UMAPFS # NULLFS + uid and gid remapping
84#file-system UNION # union file system 81#file-system UNION # union file system
85file-system PTYFS # /dev/pts/N support 82file-system PTYFS # /dev/pts/N support
86 83
87# File system options 84# File system options
88options QUOTA # legacy UFS quotas 85options QUOTA # legacy UFS quotas
89options QUOTA2 # new, in-filesystem UFS quotas 86options QUOTA2 # new, in-filesystem UFS quotas
90options FFS_EI # FFS Endian Independant support 87options FFS_EI # FFS Endian Independant support
91options WAPBL # File system journaling support - Experimental 88options WAPBL # File system journaling support - Experimental
92options NFSSERVER # Network File System server 89options NFSSERVER # Network File System server
93#options FFS_NO_SNAPSHOT # No FFS snapshot support 90#options FFS_NO_SNAPSHOT # No FFS snapshot support
94options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 91options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
95 # immutable) behave as system flags. 92 # immutable) behave as system flags.
96 93
97options NFS_BOOT_DHCP # Support DHCP NFS root 94options NFS_BOOT_DHCP # Support DHCP NFS root
98 95
99# Networking options 96# Networking options
100#options GATEWAY # packet forwarding 97#options GATEWAY # packet forwarding
101options INET # IP + ICMP + TCP + UDP 98options INET # IP + ICMP + TCP + UDP
102options INET_CSUM_COUNTERS 99options INET_CSUM_COUNTERS
103options TCP_CSUM_COUNTERS 100options TCP_CSUM_COUNTERS
104options UDP_CSUM_COUNTERS 101options UDP_CSUM_COUNTERS
105#options INET6 # IPV6 102#options INET6 # IPV6
106#options IPSEC # IP security 103#options IPSEC # IP security
107#options IPSEC_ESP # IP security (encryption part; define w/IPSEC) 104#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
108#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) 105#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
109#options IPSEC_DEBUG # debug for IP security 106#options IPSEC_DEBUG # debug for IP security
110#options MROUTING # IP multicast routing 107#options MROUTING # IP multicast routing
111#options PIM # Protocol Independent Multicast 108#options PIM # Protocol Independent Multicast
112#options DIRECTED_BROADCAST # allow broadcasts through routers 109#options DIRECTED_BROADCAST # allow broadcasts through routers
113#options ISO,TPIP # OSI 110#options ISO,TPIP # OSI
114#options EON # OSI tunneling over IP 111#options EON # OSI tunneling over IP
115#options NETATALK # AppleTalk networking protocols 112#options NETATALK # AppleTalk networking protocols
116#options PPP_BSDCOMP # BSD-Compress compression support for PPP 113#options PPP_BSDCOMP # BSD-Compress compression support for PPP
117#options PPP_DEFLATE # Deflate compression support for PPP 114#options PPP_DEFLATE # Deflate compression support for PPP
118#options PPP_FILTER # Active filter support for PPP (requires bpf) 115#options PPP_FILTER # Active filter support for PPP (requires bpf)
119#options PFIL_HOOKS # pfil(9) packet filter hooks 116#options PFIL_HOOKS # pfil(9) packet filter hooks
120#options IPFILTER_LOG # ipmon(8) log support 117#options IPFILTER_LOG # ipmon(8) log support
121#options IPFILTER_LOOKUP # ippool(8) support 118#options IPFILTER_LOOKUP # ippool(8) support
122#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 119#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
123 120
124# These options enable verbose messages for several subsystems. 121# These options enable verbose messages for several subsystems.
125# Warning, these may compile large string tables into the kernel! 122# Warning, these may compile large string tables into the kernel!
126options PCIVERBOSE # verbose PCI device autoconfig messages 123options PCIVERBOSE # verbose PCI device autoconfig messages
127options MIIVERBOSE # verbose PHY autoconfig messages 124options MIIVERBOSE # verbose PHY autoconfig messages
128#options PCI_CONFIG_DUMP # verbosely dump PCI config space 125#options PCI_CONFIG_DUMP # verbosely dump PCI config space
129options SCSIVERBOSE # human readable SCSI error messages 126options SCSIVERBOSE # human readable SCSI error messages
130#options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices 127#options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices
131#options PCI_CONFIGURE_VERBOSE # Show PCI config information 128#options PCI_CONFIGURE_VERBOSE # Show PCI config information
132 129
133# wscons options 130# wscons options
134#options WSEMUL_SUN # sun terminal emulation 131#options WSEMUL_SUN # sun terminal emulation
135#options WSEMUL_VT100 # VT100 / VT220 emulation 132#options WSEMUL_VT100 # VT100 / VT220 emulation
136 133
137# Kernel root file system and dump configuration. 134# Kernel root file system and dump configuration.
138config netbsd root on ? type ? 135config netbsd root on ? type ?
139config nfsnetbsd root on tsec0 type nfs 136config nfsnetbsd root on tsec0 type nfs
140 137
141# 138#
142# Device configuration 139# Device configuration
143# 140#
144 141
145mainbus0 at root # Processor Local Bus 142mainbus0 at root # Processor Local Bus
146 143
147cpunode* at mainbus? node ? 144cpunode* at mainbus? node ?
148gpio* at gpiobus? 145gpio* at gpiobus?
149 146
150cpu0 at cpunode? 147cpu0 at cpunode?
151 148
152obio0 at cpunode? # On-chip Peripheral Bus 149obio0 at cpunode? # On-chip Peripheral Bus
153#nandfcm* at obio0 cs ? # nand flash 150#nandfcm* at obio0 cs ? # nand flash
154#nand* at nandfcm? 151#nand* at nandfcm?
155#flash* at nand? 152#flash* at nand?
156 153
157e500wdog* at cpunode? # Watchdog timer 154e500wdog* at cpunode? # Watchdog timer
158 155
159duart* at cpunode? 156duart* at cpunode?
160com* at duart? port ? 157com* at duart? port ?
161options CONSADDR="DUART1_BASE" 158options CONSADDR="DUART1_BASE"
162 159
163tsec0 at cpunode? flags 0x021 # Enhanced 3-Speed Ethernet Controller 160tsec0 at cpunode? flags 0x021 # Enhanced 3-Speed Ethernet Controller
164tsec1 at cpunode? flags 0x101 # Enhanced 3-Speed Ethernet Controller 161tsec1 at cpunode? flags 0x101 # Enhanced 3-Speed Ethernet Controller
165tsec2 at cpunode? flags 0x102 # Enhanced 3-Speed Ethernet Controller 162tsec2 at cpunode? flags 0x102 # Enhanced 3-Speed Ethernet Controller
166ukphy* at mii? 163ukphy* at mii?
167#options ETSEC_EVENT_COUNTERS 164#options ETSEC_EVENT_COUNTERS
168 165
169diic* at cpunode? # i2c bus 166diic* at cpunode? # i2c bus
170iic* at diic? 167iic* at diic?
171dsrtc* at iic1 addr 0x68 # RTC 168dsrtc* at iic1 addr 0x68 # RTC
172 169
173pq3pcie* at cpunode? # PCI-Express controller 170pq3pcie* at cpunode? # PCI-Express controller
174pq3pci* at cpunode? # PCI(X) 171pq3pci* at cpunode? # PCI(X)
175pci* at pq3pcie? 172pci* at pq3pcie?
176pci* at pq3pci? 173pci* at pq3pci?
177 174
178ppb* at pci? dev ? function ? # PCI-PCI bridges 175ppb* at pci? dev ? function ? # PCI-PCI bridges
179pci* at ppb? 176pci* at ppb?
180 177
181ehci* at cpunode? # usb 178ehci* at cpunode? # usb
182usb* at ehci? 179usb* at ehci?
183uhub* at usb? 180uhub* at usb?
184umass* at uhub? port ? 181umass* at uhub? port ?
185scsibus* at umass? channel ? 182scsibus* at umass? channel ?
186sd* at scsibus? target ? lun ? 183sd* at scsibus? target ? lun ?
187 184
188#sdhc* at cpunode? # sdmmc 185#sdhc* at cpunode? # sdmmc
189#sdmmc* at sdhc? # SD/MMC bus 186#sdmmc* at sdhc? # SD/MMC bus
190#ld* at sdmmc? 187#ld* at sdmmc?
191 188
192#siisata* at pci? dev ? function ? 189#siisata* at pci? dev ? function ?
193#atabus* at siisata? channel ? 190#atabus* at siisata? channel ?
194#jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers 191#jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers
195#ahcisata* at jmide? 192#ahcisata* at jmide?
196#atabus* at ahcisata? channel ? 193#atabus* at ahcisata? channel ?
197 194
198#viaide* at pci? dev ? function ? 195#viaide* at pci? dev ? function ?
199#atabus* at viaide? channel ? 196#atabus* at viaide? channel ?
200#wd* at atabus? drive ? 197#wd* at atabus? drive ?
201#rtk* at pci? dev ? function ? 198#rtk* at pci? dev ? function ?
202#wm* at pci? dev ? function ? # Intel Ethernet 199#wm* at pci? dev ? function ? # Intel Ethernet
203 200
204#inphy* at mii? phy ? # Intel 82555 PHYs 201#inphy* at mii? phy ? # Intel 82555 PHYs
205#iophy* at mii? phy ? # Intel 82553 PHYs 202#iophy* at mii? phy ? # Intel 82553 PHYs
206#makphy* at mii? phy ? # Marvell PHYs 203#makphy* at mii? phy ? # Marvell PHYs
207#ukphy* at mii? phy ? # generic unknown PHYs 204#ukphy* at mii? phy ? # generic unknown PHYs
208 205
209pseudo-device loop # network loopback 206pseudo-device loop # network loopback
210pseudo-device bpfilter # packet filter 207pseudo-device bpfilter # packet filter
211pseudo-device rnd # /dev/random and in-kernel generator 208pseudo-device rnd # /dev/random and in-kernel generator
212pseudo-device clockctl # user control of clock subsystem 209pseudo-device clockctl # user control of clock subsystem
213pseudo-device ksyms # /dev/ksyms 210pseudo-device ksyms # /dev/ksyms
214pseudo-device pty # pseudo-terminals 211pseudo-device pty # pseudo-terminals
215pseudo-device kttcp # kernel ttcp 212pseudo-device kttcp # kernel ttcp
216pseudo-device vlan # 802.1Q VLANs 213pseudo-device vlan # 802.1Q VLANs
cvs diff -r1.6 -r1.7 src/sys/arch/evbppc/conf/RB800 (switch to unified diff)

--- src/sys/arch/evbppc/conf/RB800 2011/06/08 05:03:44 1.6
+++ src/sys/arch/evbppc/conf/RB800 2011/06/10 16:38:17 1.7
@@ -1,220 +1,221 @@ @@ -1,220 +1,221 @@
1# $NetBSD: RB800,v 1.6 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: RB800,v 1.7 2011/06/10 16:38:17 matt Exp $
2# 2#
3# RB800 -- everything that's currently supported 3# RB800 -- everything that's currently supported
4# 4#
5 5
6include "arch/evbppc/conf/std.mpc85xx" 6include "arch/evbppc/conf/std.mpc85xx"
7 7
8options INCLUDE_CONFIG_FILE # embed config file in kernel binary 8options INCLUDE_CONFIG_FILE # embed config file in kernel binary
9 9
10ident "RB800-$Revision: 1.6 $" 10ident "RB800-$Revision: 1.7 $"
11 11
12maxusers 32 12maxusers 32
13 13
14#options UVMHIST 14#options UVMHIST
15#options UVMHIST_PRINT 15#options UVMHIST_PRINT
16 16
17options MPC8544 17options MPC8544
18options PPC_HAVE_SPE 18options PPC_HAVE_SPE
 19options GUR_BASE=0xe0000000
19 20
20#options INSECURE # disable kernel security levels 21#options INSECURE # disable kernel security levels
21#options NTP # NTP phase/frequency locked loop 22#options NTP # NTP phase/frequency locked loop
22options KTRACE # system call tracing via ktrace(1) 23options KTRACE # system call tracing via ktrace(1)
23 24
24options SYSVMSG # System V message queues 25options SYSVMSG # System V message queues
25options SYSVSEM # System V semaphores 26options SYSVSEM # System V semaphores
26options SYSVSHM # System V shared memory 27options SYSVSHM # System V shared memory
27 28
28options USERCONF # userconf(4) support 29options USERCONF # userconf(4) support
29#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 30#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
30#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel 31#options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
31 32
32# Diagnostic/debugging support options 33# Diagnostic/debugging support options
33#options VERBOSE_INITPPC 34#options VERBOSE_INITPPC
34options DIAGNOSTIC # cheap kernel consistency checks 35options DIAGNOSTIC # cheap kernel consistency checks
35options DEBUG # expensive debugging checks/support 36options DEBUG # expensive debugging checks/support
36#options SYSCALL_DEBUG # syscall debugging 37#options SYSCALL_DEBUG # syscall debugging
37options DDB # in-kernel debugger 38options DDB # in-kernel debugger
38options DDB_HISTORY_SIZE=512 # enable history editing in DDB 39options DDB_HISTORY_SIZE=512 # enable history editing in DDB
39options TRAP_PANICWAIT 40options TRAP_PANICWAIT
40options SYMTAB_SPACE=410000 # size for embedded symbol table 41options SYMTAB_SPACE=410000 # size for embedded symbol table
41 42
42makeoptions DEBUG="-g" # compile full symbol table 43makeoptions DEBUG="-g" # compile full symbol table
43 44
44# Compatibility options 45# Compatibility options
45#options COMPAT_09 # NetBSD 0.9, 46#options COMPAT_09 # NetBSD 0.9,
46#options COMPAT_10 # NetBSD 1.0, 47#options COMPAT_10 # NetBSD 1.0,
47#options COMPAT_11 # NetBSD 1.1, 48#options COMPAT_11 # NetBSD 1.1,
48#options COMPAT_12 # NetBSD 1.2, 49#options COMPAT_12 # NetBSD 1.2,
49options COMPAT_13 # NetBSD 1.3, 50options COMPAT_13 # NetBSD 1.3,
50options COMPAT_14 # NetBSD 1.4, 51options COMPAT_14 # NetBSD 1.4,
51options COMPAT_15 # NetBSD 1.5, 52options COMPAT_15 # NetBSD 1.5,
52options COMPAT_16 # NetBSD 1.6, 53options COMPAT_16 # NetBSD 1.6,
53options COMPAT_20 # NetBSD 2.0, 54options COMPAT_20 # NetBSD 2.0,
54options COMPAT_30 # NetBSD 3.0, 55options COMPAT_30 # NetBSD 3.0,
55options COMPAT_40 # NetBSD 4.0, 56options COMPAT_40 # NetBSD 4.0,
56options COMPAT_50 # NetBSD 5.0 compatibility. 57options COMPAT_50 # NetBSD 5.0 compatibility.
57options COMPAT_43 # and 4.3BSD 58options COMPAT_43 # and 4.3BSD
58#options COMPAT_386BSD_MBRPART # recognize old partition ID 59#options COMPAT_386BSD_MBRPART # recognize old partition ID
59#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 60#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
60options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 61options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
61 62
62# File systems 63# File systems
63file-system FFS # UFS 64file-system FFS # UFS
64file-system EXT2FS # second extended file system (linux) 65file-system EXT2FS # second extended file system (linux)
65file-system LFS # log-structured file system 66file-system LFS # log-structured file system
66file-system MFS # memory file system 67file-system MFS # memory file system
67file-system NFS # Network File System client 68file-system NFS # Network File System client
68file-system CD9660 # ISO 9660 + Rock Ridge file system 69file-system CD9660 # ISO 9660 + Rock Ridge file system
69file-system MSDOSFS # MS-DOS file system 70file-system MSDOSFS # MS-DOS file system
70#file-system FDESC # /dev/fd 71#file-system FDESC # /dev/fd
71file-system TMPFS # efficient memory file system 72file-system TMPFS # efficient memory file system
72file-system KERNFS # /kern 73file-system KERNFS # /kern
73file-system NULLFS # loopback file system 74file-system NULLFS # loopback file system
74#file-system OVERLAY # overlay file system 75#file-system OVERLAY # overlay file system
75#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) 76#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
76file-system PROCFS # /proc 77file-system PROCFS # /proc
77#file-system UMAPFS # NULLFS + uid and gid remapping 78#file-system UMAPFS # NULLFS + uid and gid remapping
78#file-system UNION # union file system 79#file-system UNION # union file system
79file-system PTYFS # /dev/pts/N support 80file-system PTYFS # /dev/pts/N support
80 81
81# File system options 82# File system options
82options QUOTA # legacy UFS quotas 83options QUOTA # legacy UFS quotas
83options QUOTA2 # new, in-filesystem UFS quotas 84options QUOTA2 # new, in-filesystem UFS quotas
84options FFS_EI # FFS Endian Independant support 85options FFS_EI # FFS Endian Independant support
85options WAPBL # File system journaling support - Experimental 86options WAPBL # File system journaling support - Experimental
86options NFSSERVER # Network File System server 87options NFSSERVER # Network File System server
87#options FFS_NO_SNAPSHOT # No FFS snapshot support 88#options FFS_NO_SNAPSHOT # No FFS snapshot support
88options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 89options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
89 # immutable) behave as system flags. 90 # immutable) behave as system flags.
90 91
91options NFS_BOOT_BOOTP # Support BOOTP NFS root 92options NFS_BOOT_BOOTP # Support BOOTP NFS root
92#options NFS_BOOT_DHCP # Support DHCP NFS root 93#options NFS_BOOT_DHCP # Support DHCP NFS root
93 94
94# Networking options 95# Networking options
95#options GATEWAY # packet forwarding 96#options GATEWAY # packet forwarding
96options INET # IP + ICMP + TCP + UDP 97options INET # IP + ICMP + TCP + UDP
97options INET_CSUM_COUNTERS 98options INET_CSUM_COUNTERS
98options TCP_CSUM_COUNTERS 99options TCP_CSUM_COUNTERS
99options UDP_CSUM_COUNTERS 100options UDP_CSUM_COUNTERS
100#options INET6 # IPV6 101#options INET6 # IPV6
101#options IPSEC # IP security 102#options IPSEC # IP security
102#options IPSEC_ESP # IP security (encryption part; define w/IPSEC) 103#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
103#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) 104#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
104#options IPSEC_DEBUG # debug for IP security 105#options IPSEC_DEBUG # debug for IP security
105#options MROUTING # IP multicast routing 106#options MROUTING # IP multicast routing
106#options PIM # Protocol Independent Multicast 107#options PIM # Protocol Independent Multicast
107#options DIRECTED_BROADCAST # allow broadcasts through routers 108#options DIRECTED_BROADCAST # allow broadcasts through routers
108#options ISO,TPIP # OSI 109#options ISO,TPIP # OSI
109#options EON # OSI tunneling over IP 110#options EON # OSI tunneling over IP
110#options NETATALK # AppleTalk networking protocols 111#options NETATALK # AppleTalk networking protocols
111#options PPP_BSDCOMP # BSD-Compress compression support for PPP 112#options PPP_BSDCOMP # BSD-Compress compression support for PPP
112#options PPP_DEFLATE # Deflate compression support for PPP 113#options PPP_DEFLATE # Deflate compression support for PPP
113#options PPP_FILTER # Active filter support for PPP (requires bpf) 114#options PPP_FILTER # Active filter support for PPP (requires bpf)
114#options PFIL_HOOKS # pfil(9) packet filter hooks 115#options PFIL_HOOKS # pfil(9) packet filter hooks
115#options IPFILTER_LOG # ipmon(8) log support 116#options IPFILTER_LOG # ipmon(8) log support
116#options IPFILTER_LOOKUP # ippool(8) support 117#options IPFILTER_LOOKUP # ippool(8) support
117#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 118#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
118 119
119# These options enable verbose messages for several subsystems. 120# These options enable verbose messages for several subsystems.
120# Warning, these may compile large string tables into the kernel! 121# Warning, these may compile large string tables into the kernel!
121options PCIVERBOSE # verbose PCI device autoconfig messages 122options PCIVERBOSE # verbose PCI device autoconfig messages
122options MIIVERBOSE # verbose PHY autoconfig messages 123options MIIVERBOSE # verbose PHY autoconfig messages
123#options PCI_CONFIG_DUMP # verbosely dump PCI config space 124#options PCI_CONFIG_DUMP # verbosely dump PCI config space
124options SCSIVERBOSE # human readable SCSI error messages 125options SCSIVERBOSE # human readable SCSI error messages
125options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices 126options PCI_NETBSD_CONFIGURE # Do not rely on BIOS/whatever to configure PCI devices
126options PCI_CONFIGURE_VERBOSE # Show PCI config information 127options PCI_CONFIGURE_VERBOSE # Show PCI config information
127 128
128# wscons options 129# wscons options
129#options WSEMUL_SUN # sun terminal emulation 130#options WSEMUL_SUN # sun terminal emulation
130#options WSEMUL_VT100 # VT100 / VT220 emulation 131#options WSEMUL_VT100 # VT100 / VT220 emulation
131 132
132# Kernel root file system and dump configuration. 133# Kernel root file system and dump configuration.
133config netbsd root on ? type ? 134config netbsd root on ? type ?
134config nfsnetbsd root on tsec1 type nfs 135config nfsnetbsd root on tsec1 type nfs
135 136
136# 137#
137# Device configuration 138# Device configuration
138# 139#
139 140
140mainbus0 at root # Processor Local Bus 141mainbus0 at root # Processor Local Bus
141 142
142cpunode* at mainbus? node ? 143cpunode* at mainbus? node ?
143 144
144cpu0 at cpunode? 145cpu0 at cpunode?
145 146
146obio0 at cpunode? # On-chip Peripheral Bus 147obio0 at cpunode? # On-chip Peripheral Bus
147#nflash0 at obio0 cs 0 148#nflash0 at obio0 cs 0
148#ds1553rtc0 at obio0 addr 0xf8000000 size 8192 149#ds1553rtc0 at obio0 addr 0xf8000000 size 8192
149#wdc0 at obio0 cs 2 150#wdc0 at obio0 cs 2
150#atabus* at wdc? 151#atabus* at wdc?
151#wd* at atabus? 152#wd* at atabus?
152gpio* at gpiobus? 153gpio* at gpiobus?
153 154
154e500wdog* at cpunode? # Watchdog timer 155e500wdog* at cpunode? # Watchdog timer
155 156
156duart* at cpunode? 157duart* at cpunode?
157com* at duart? port ? 158com* at duart? port ?
158options CONSPEED=115200 159options CONSPEED=115200
159options CONSADDR="DUART1_BASE" 160options CONSADDR="DUART1_BASE"
160 161
161tsec0 at cpunode? flags 0x003 # 3-Speed Ethernet Controller (phy 2) 162tsec0 at cpunode? flags 0x003 # 3-Speed Ethernet Controller (phy 2)
162tsec1 at cpunode? flags 0x102 # 3-Speed Ethernet Controller (phy 1) 163tsec1 at cpunode? flags 0x102 # 3-Speed Ethernet Controller (phy 1)
163atphy* at mii? # Attansic PHY 164atphy* at mii? # Attansic PHY
164ukphy* at mii? 165ukphy* at mii?
165#options TSEC_EVENT_COUNTERS 166#options TSEC_EVENT_COUNTERS
166 167
167diic* at cpunode? # i2c bus 168diic* at cpunode? # i2c bus
168iic* at diic? 169iic* at diic?
169#lm* at iic? addr 0x48 170#lm* at iic? addr 0x48
170#lm* at iic? addr 0x49 171#lm* at iic? addr 0x49
171#lm* at iic? addr 0x4a 172#lm* at iic? addr 0x4a
172#lm* at iic? addr 0x4b 173#lm* at iic? addr 0x4b
173#lm* at iic? addr 0x4c 174#lm* at iic? addr 0x4c
174#lm* at iic? addr 0x4d 175#lm* at iic? addr 0x4d
175#lm* at iic? addr 0x4e 176#lm* at iic? addr 0x4e
176#lm* at iic? addr 0x4f 177#lm* at iic? addr 0x4f
177 178
178options PCI_MEMBASE=0xa0000000,PCI_MEMSIZE=0x04000000 179options PCI_MEMBASE=0xa0000000,PCI_MEMSIZE=0x04000000
179options PCI_IOBASE=0xb0000000,PCI_IOSIZE=0x00100000 180options PCI_IOBASE=0xb0000000,PCI_IOSIZE=0x00100000
180pq3pcie* at cpunode? # PCI-Express controller 181pq3pcie* at cpunode? # PCI-Express controller
181pq3pci* at cpunode? # PCI(X) 182pq3pci* at cpunode? # PCI(X)
182pci* at pq3pcie? 183pci* at pq3pcie?
183pci* at pq3pci? 184pci* at pq3pci?
184 185
185ppb* at pci? dev ? function ? # PCI-PCI bridges 186ppb* at pci? dev ? function ? # PCI-PCI bridges
186pci* at ppb? 187pci* at ppb?
187 188
188alc* at pci? dev ? function ? 189alc* at pci? dev ? function ?
189 190
190#ehci* at pci? dev ? function ? 191#ehci* at pci? dev ? function ?
191#ohci* at pci? dev ? function ? 192#ohci* at pci? dev ? function ?
192#uhci* at pci? dev ? function ? 193#uhci* at pci? dev ? function ?
193#usb* at ehci? 194#usb* at ehci?
194#usb* at ohci? 195#usb* at ohci?
195#usb* at uhci? 196#usb* at uhci?
196#uhub* at usb? 197#uhub* at usb?
197#umass* at uhub? port ? 198#umass* at uhub? port ?
198#scsibus* at umass? channel ? 199#scsibus* at umass? channel ?
199 200
200arcmsr* at pci? dev ? function ? 201arcmsr* at pci? dev ? function ?
201scsibus* at arcmsr? 202scsibus* at arcmsr?
202sd* at scsibus? target ? lun ? 203sd* at scsibus? target ? lun ?
203 204
204viaide* at pci? dev ? function ? 205viaide* at pci? dev ? function ?
205atabus* at viaide? channel ? 206atabus* at viaide? channel ?
206wd* at atabus? drive ? 207wd* at atabus? drive ?
207#rtk* at pci? dev ? function ? 208#rtk* at pci? dev ? function ?
208wm* at pci? dev ? function ? # Intel Ethernet 209wm* at pci? dev ? function ? # Intel Ethernet
209 210
210makphy* at mii? phy ? # Marvell PHYs 211makphy* at mii? phy ? # Marvell PHYs
211ukphy* at mii? phy ? # generic unknown PHYs 212ukphy* at mii? phy ? # generic unknown PHYs
212 213
213pseudo-device md 1 # memory disk device 214pseudo-device md 1 # memory disk device
214pseudo-device loop # network loopback 215pseudo-device loop # network loopback
215pseudo-device bpfilter # packet filter 216pseudo-device bpfilter # packet filter
216pseudo-device rnd # /dev/random and in-kernel generator 217pseudo-device rnd # /dev/random and in-kernel generator
217pseudo-device clockctl # user control of clock subsystem 218pseudo-device clockctl # user control of clock subsystem
218pseudo-device ksyms # /dev/ksyms 219pseudo-device ksyms # /dev/ksyms
219pseudo-device pty # pseudo-terminals 220pseudo-device pty # pseudo-terminals
220pseudo-device kttcp # kernel ttcp 221pseudo-device kttcp # kernel ttcp
cvs diff -r1.5 -r1.6 src/sys/arch/evbppc/conf/std.mpc85xx (switch to unified diff)

--- src/sys/arch/evbppc/conf/std.mpc85xx 2011/06/08 05:03:44 1.5
+++ src/sys/arch/evbppc/conf/std.mpc85xx 2011/06/10 16:38:17 1.6
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: std.mpc85xx,v 1.5 2011/06/08 05:03:44 matt Exp $ 1# $NetBSD: std.mpc85xx,v 1.6 2011/06/10 16:38:17 matt Exp $
2# 2#
3# Standard/required options for NetBSD/mpc85xx. 3# Standard/required options for NetBSD/mpc85xx.
4 4
5machine evbppc powerpc 5machine evbppc powerpc
6include "conf/std" # MI standard options 6include "conf/std" # MI standard options
7 7
8# standard ("mandatory") kernel options. 8# standard ("mandatory") kernel options.
9options PPC_BOOKE # Freescale e500 family 9options PPC_BOOKE # Freescale e500 family
10options EVBPPC_HAS_MBR # Use MBR format (needed for SDCARD booting) 10options EVBPPC_HAS_MBR # Use MBR format (needed for SDCARD booting)
11 11
12# Executable support: 12# Executable support:
13options EXEC_ELF32 # (native) ELF32 binary support 13options EXEC_ELF32 # (native) ELF32 binary support
14options EXEC_SCRIPT # shell script support 14options EXEC_SCRIPT # shell script support
15 15
16makeoptions TEXTADDR=0x20000 16makeoptions TEXTADDR=0x20000
17makeoptions BOARDTYPE="mpc85xx" 17makeoptions BOARDTYPE="mpc85xx"
18makeoptions PPCDIR="booke" 18makeoptions PPCDIR="booke"
19 19
20options PPC_INTR_IMPL="<powerpc/booke/intr.h>" 20options PPC_INTR_IMPL="<powerpc/booke/intr.h>"
21options PPC_PCI_MACHDEP_IMPL="<powerpc/pci_machdep.h>" 21options PPC_PCI_MACHDEP_IMPL="<powerpc/pci_machdep.h>"
22options KERNBASE=0x20000 22options KERNBASE=0x20000
23options GUR_BASE=0xe0000000 23options GUR_BASE=0xffe00000
 24#options USB_FRAG_DMA_WORKAROUND
24 25
25include "arch/powerpc/conf/files.booke" 26include "arch/powerpc/conf/files.booke"
26include "arch/evbppc/conf/files.mpc85xx" 27include "arch/evbppc/conf/files.mpc85xx"