Thu Jan 19 23:37:24 2012 UTC ()
Add cfi/nor


(matt)
diff -r1.15 -r1.16 src/sys/arch/evbppc/conf/RB800

cvs diff -r1.15 -r1.16 src/sys/arch/evbppc/conf/RB800 (switch to unified diff)

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