Fri Feb 21 22:31:58 2014 UTC ()
Rearrange KERNEL_BASE_PHYS


(matt)
diff -r1.16 -r1.17 src/sys/arch/evbarm/conf/BCM5301X
diff -r1.1 -r1.2 src/sys/arch/evbarm/conf/BCM56340
diff -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.bcm53xx
cvs diff -r1.16 -r1.17 src/sys/arch/evbarm/conf/BCM5301X (switch to unified diff)

--- src/sys/arch/evbarm/conf/BCM5301X 2013/10/28 22:35:07 1.16
+++ src/sys/arch/evbarm/conf/BCM5301X 2014/02/21 22:31:58 1.17
@@ -1,288 +1,289 @@ @@ -1,288 +1,289 @@
1# 1#
2# $NetBSD: BCM5301X,v 1.16 2013/10/28 22:35:07 matt Exp $ 2# $NetBSD: BCM5301X,v 1.17 2014/02/21 22:31:58 matt Exp $
3# 3#
4# BCM5301X -- Broadcom BCM5301X Eval Board Kernel 4# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.bcm53xx" 7include "arch/evbarm/conf/std.bcm53xx"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
16#options NTP # NTP phase/frequency locked loop 16#options NTP # NTP phase/frequency locked loop
17 17
18# CPU options 18# CPU options
19 19
20#makeoptions DEFCOPTS="-O0" 20#makeoptions DEFCOPTS="-O0"
21options UVMHIST 21options UVMHIST
22#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30 22#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30
23options BCM53XX_CONSOLE_EARLY 23options BCM53XX_CONSOLE_EARLY
24options BCMETH_COUNTERS 24options BCMETH_COUNTERS
25#options MULTIPROCESSOR 25#options MULTIPROCESSOR
26options CPU_CORTEXA9 26options CPU_CORTEXA9
27#options MEMSIZE=256 27#options MEMSIZE=256
28options BCM5301X 28options BCM5301X
29options PMAPCOUNTERS 29options PMAPCOUNTERS
30options BUSDMA_COUNTERS 30options BUSDMA_COUNTERS
 31makeoptions KERNEL_BASE_PHYS="0x80100000"
31 32
32# Architecture options 33# Architecture options
33 34
34# File systems 35# File systems
35 36
36file-system FFS # UFS 37file-system FFS # UFS
37#file-system LFS # log-structured file system 38#file-system LFS # log-structured file system
38file-system MFS # memory file system 39file-system MFS # memory file system
39file-system NFS # Network file system 40file-system NFS # Network file system
40#file-system ADOSFS # AmigaDOS-compatible file system 41#file-system ADOSFS # AmigaDOS-compatible file system
41#file-system EXT2FS # second extended file system (linux) 42#file-system EXT2FS # second extended file system (linux)
42file-system CD9660 # ISO 9660 + Rock Ridge file system 43file-system CD9660 # ISO 9660 + Rock Ridge file system
43file-system MSDOSFS # MS-DOS file system 44file-system MSDOSFS # MS-DOS file system
44#file-system FDESC # /dev/fd 45#file-system FDESC # /dev/fd
45file-system KERNFS # /kern 46file-system KERNFS # /kern
46#file-system NULLFS # loopback file system 47#file-system NULLFS # loopback file system
47#file-system PROCFS # /proc 48#file-system PROCFS # /proc
48#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) 49#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
49#file-system UMAPFS # NULLFS + uid and gid remapping 50#file-system UMAPFS # NULLFS + uid and gid remapping
50#file-system UNION # union file system 51#file-system UNION # union file system
51file-system TMPFS # memory file system 52file-system TMPFS # memory file system
52file-system PTYFS # /dev/pts/N support 53file-system PTYFS # /dev/pts/N support
53 54
54# File system options 55# File system options
55#options QUOTA # legacy UFS quotas 56#options QUOTA # legacy UFS quotas
56#options QUOTA2 # new, in-filesystem UFS quotas 57#options QUOTA2 # new, in-filesystem UFS quotas
57#options FFS_EI # FFS Endian Independent support 58#options FFS_EI # FFS Endian Independent support
58#options NFSSERVER 59#options NFSSERVER
59options WAPBL # File system journaling support 60options WAPBL # File system journaling support
60#options FFS_NO_SNAPSHOT # No FFS snapshot support 61#options FFS_NO_SNAPSHOT # No FFS snapshot support
61 62
62# Networking options 63# Networking options
63 64
64#options GATEWAY # packet forwarding 65#options GATEWAY # packet forwarding
65options INET # IP + ICMP + TCP + UDP 66options INET # IP + ICMP + TCP + UDP
66options INET6 # IPV6 67options INET6 # IPV6
67#options IPSEC # IP security 68#options IPSEC # IP security
68#options IPSEC_DEBUG # debug for IP security 69#options IPSEC_DEBUG # debug for IP security
69#options MROUTING # IP multicast routing 70#options MROUTING # IP multicast routing
70#options PIM # Protocol Independent Multicast 71#options PIM # Protocol Independent Multicast
71#options NETATALK # AppleTalk networking 72#options NETATALK # AppleTalk networking
72#options PPP_BSDCOMP # BSD-Compress compression support for PPP 73#options PPP_BSDCOMP # BSD-Compress compression support for PPP
73#options PPP_DEFLATE # Deflate compression support for PPP 74#options PPP_DEFLATE # Deflate compression support for PPP
74#options PPP_FILTER # Active filter support for PPP (requires bpf) 75#options PPP_FILTER # Active filter support for PPP (requires bpf)
75#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 76#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
76 77
77options NFS_BOOT_BOOTP 78options NFS_BOOT_BOOTP
78options NFS_BOOT_DHCP 79options NFS_BOOT_DHCP
79#options NFS_BOOT_BOOTSTATIC 80#options NFS_BOOT_BOOTSTATIC
80#options NFS_BOOTSTATIC_MYIP="\"192.168.1.4\"" 81#options NFS_BOOTSTATIC_MYIP="\"192.168.1.4\""
81#options NFS_BOOTSTATIC_GWIP="\"192.168.1.1\"" 82#options NFS_BOOTSTATIC_GWIP="\"192.168.1.1\""
82#options NFS_BOOTSTATIC_MASK="\"255.255.255.0\"" 83#options NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
83#options NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\"" 84#options NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\""
84#options NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\"" 85#options NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\""
85 86
86options NFS_BOOT_RWSIZE=1024 87options NFS_BOOT_RWSIZE=1024
87 88
88# Compatibility options 89# Compatibility options
89 90
90#options COMPAT_43 # 4.3BSD compatibility. 91#options COMPAT_43 # 4.3BSD compatibility.
91options COMPAT_60 # NetBSD 6.0 compatibility. 92options COMPAT_60 # NetBSD 6.0 compatibility.
92options COMPAT_50 # NetBSD 5.0 compatibility. 93options COMPAT_50 # NetBSD 5.0 compatibility.
93options COMPAT_40 # NetBSD 4.0 compatibility. 94options COMPAT_40 # NetBSD 4.0 compatibility.
94options COMPAT_30 # NetBSD 3.0 compatibility. 95options COMPAT_30 # NetBSD 3.0 compatibility.
95#options COMPAT_20 # NetBSD 2.0 compatibility. 96#options COMPAT_20 # NetBSD 2.0 compatibility.
96#options COMPAT_16 # NetBSD 1.6 compatibility. 97#options COMPAT_16 # NetBSD 1.6 compatibility.
97#options COMPAT_15 # NetBSD 1.5 compatibility. 98#options COMPAT_15 # NetBSD 1.5 compatibility.
98#options COMPAT_14 # NetBSD 1.4 compatibility. 99#options COMPAT_14 # NetBSD 1.4 compatibility.
99#options COMPAT_13 # NetBSD 1.3 compatibility. 100#options COMPAT_13 # NetBSD 1.3 compatibility.
100#options COMPAT_12 # NetBSD 1.2 compatibility. 101#options COMPAT_12 # NetBSD 1.2 compatibility.
101#options COMPAT_11 # NetBSD 1.1 compatibility. 102#options COMPAT_11 # NetBSD 1.1 compatibility.
102#options COMPAT_10 # NetBSD 1.0 compatibility. 103#options COMPAT_10 # NetBSD 1.0 compatibility.
103#options COMPAT_09 # NetBSD 0.9 compatibility. 104#options COMPAT_09 # NetBSD 0.9 compatibility.
104#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 105#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
105#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 106#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
106 107
107# Shared memory options 108# Shared memory options
108 109
109options SYSVMSG # System V-like message queues 110options SYSVMSG # System V-like message queues
110options SYSVSEM # System V-like semaphores 111options SYSVSEM # System V-like semaphores
111options SYSVSHM # System V-like memory sharing 112options SYSVSHM # System V-like memory sharing
112 113
113# Device options 114# Device options
114 115
115#options MEMORY_DISK_HOOKS # boottime setup of ramdisk 116#options MEMORY_DISK_HOOKS # boottime setup of ramdisk
116#options MEMORY_DISK_ROOT_SIZE=8192 # Size in blocks 117#options MEMORY_DISK_ROOT_SIZE=8192 # Size in blocks
117#options MEMORY_DISK_DYNAMIC 118#options MEMORY_DISK_DYNAMIC
118#options MINIROOTSIZE=1000 # Size in blocks 119#options MINIROOTSIZE=1000 # Size in blocks
119#options MEMORY_DISK_IS_ROOT # use memory disk as root 120#options MEMORY_DISK_IS_ROOT # use memory disk as root
120 121
121options DKWEDGE_AUTODISCOVER 122options DKWEDGE_AUTODISCOVER
122options DKWEDGE_METHOD_GPT 123options DKWEDGE_METHOD_GPT
123 124
124# Miscellaneous kernel options 125# Miscellaneous kernel options
125options MODULAR # support dynamically loaded kernel modules 126options MODULAR # support dynamically loaded kernel modules
126options KTRACE # system call tracing, a la ktrace(1) 127options KTRACE # system call tracing, a la ktrace(1)
127#options KMEMSTATS # kernel memory statistics 128#options KMEMSTATS # kernel memory statistics
128options PCIVERBOSE # Verbose PCI autoconfiguration messages 129options PCIVERBOSE # Verbose PCI autoconfiguration messages
129#options PCI_CONFIG_DUMP # Verbose PCI autoconfiguration messages 130#options PCI_CONFIG_DUMP # Verbose PCI autoconfiguration messages
130options PCI_NETBSD_CONFIGURE # perform PCI configuration 131options PCI_NETBSD_CONFIGURE # perform PCI configuration
131options RNDVERBOSE # Verbose rnd messages 132options RNDVERBOSE # Verbose rnd messages
132#options SCSIVERBOSE # Verbose SCSI errors 133#options SCSIVERBOSE # Verbose SCSI errors
133#options MIIVERBOSE # Verbose MII autoconfiguration messages 134#options MIIVERBOSE # Verbose MII autoconfiguration messages
134#options DDB_KEYCODE=0x40 135#options DDB_KEYCODE=0x40
135#options USERCONF # userconf(4) support 136#options USERCONF # userconf(4) support
136#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 137#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
137 138
138# Development and Debugging options 139# Development and Debugging options
139 140
140#options PERFCTRS # performance counters 141#options PERFCTRS # performance counters
141options DIAGNOSTIC # internally consistency checks 142options DIAGNOSTIC # internally consistency checks
142options DEBUG 143options DEBUG
143#options LOCKDEBUG # Enable lock debugging 144#options LOCKDEBUG # Enable lock debugging
144#options PMAP_DEBUG # Enable pmap_debug_level code 145#options PMAP_DEBUG # Enable pmap_debug_level code
145#options IPKDB # remote kernel debugging 146#options IPKDB # remote kernel debugging
146options VERBOSE_INIT_ARM # verbose bootstraping messages 147options VERBOSE_INIT_ARM # verbose bootstraping messages
147options DDB # in-kernel debugger 148options DDB # in-kernel debugger
148options DDB_ONPANIC=1 149options DDB_ONPANIC=1
149options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 150options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
150options DDB_COMMANDONENTER="show event" 151options DDB_COMMANDONENTER="show event"
151options DB_MAX_LINE=INT_MAX 152options DB_MAX_LINE=INT_MAX
152#options KGDB 153#options KGDB
153makeoptions DEBUG="-g" # compile full symbol table 154makeoptions DEBUG="-g" # compile full symbol table
154options SYMTAB_SPACE=600000 155options SYMTAB_SPACE=600000
155 156
156## USB Debugging options 157## USB Debugging options
157options USB_DEBUG 158options USB_DEBUG
158options EHCI_DEBUG 159options EHCI_DEBUG
159options OHCI_DEBUG 160options OHCI_DEBUG
160options UHUB_DEBUG 161options UHUB_DEBUG
161 162
162 163
163# Valid options for BOOT_ARGS: 164# Valid options for BOOT_ARGS:
164# single Boot to single user only 165# single Boot to single user only
165# kdb Give control to kernel debugger 166# kdb Give control to kernel debugger
166# ask Ask for file name to reboot from 167# ask Ask for file name to reboot from
167# pmapdebug=<n> If PMAP_DEBUG, set pmap_debug_level to <n> 168# pmapdebug=<n> If PMAP_DEBUG, set pmap_debug_level to <n>
168# memorydisk=<n> Set memorydisk size to <n> KB 169# memorydisk=<n> Set memorydisk size to <n> KB
169# quiet Show aprint_naive output 170# quiet Show aprint_naive output
170# verbose Show aprint_normal and aprint_verbose output 171# verbose Show aprint_normal and aprint_verbose output
171options BOOT_ARGS="\"\"" 172options BOOT_ARGS="\"\""
172 173
173config netbsd root on ? type ? 174config netbsd root on ? type ?
174 175
175# The main bus device 176# The main bus device
176mainbus0 at root 177mainbus0 at root
177 178
178# The boot cpu 179# The boot cpu
179cpu0 at mainbus? 180cpu0 at mainbus?
180#cpu* at mainbus? 181#cpu* at mainbus?
181 182
182# The MPCore interrupt controller and global timer 183# The MPCore interrupt controller and global timer
183armperiph0 at mainbus? # A9 On-Chip Peripherals 184armperiph0 at mainbus? # A9 On-Chip Peripherals
184armgic0 at armperiph? # ARM Generic Interrupt Controller 185armgic0 at armperiph? # ARM Generic Interrupt Controller
185arml2cc0 at armperiph? flags 0 # ARM PL310 L2CC 186arml2cc0 at armperiph? flags 0 # ARM PL310 L2CC
186a9tmr0 at armperiph? # A9 Global Timer 187a9tmr0 at armperiph? # A9 Global Timer
187a9wdt0 at armperiph? flags 1 # A9 Watchdog Timer 188a9wdt0 at armperiph? flags 1 # A9 Watchdog Timer
188 189
189# ChipCommonA Peripherals 190# ChipCommonA Peripherals
190bcmcca0 at mainbus? # ChipCommonA 191bcmcca0 at mainbus? # ChipCommonA
191#options CONADDR=0x18000300, CONSPEED=115200 192#options CONADDR=0x18000300, CONSPEED=115200
192options CONSPEED=9600 193options CONSPEED=9600
193com0 at bcmcca? channel 0 194com0 at bcmcca? channel 0
194com* at bcmcca? channel 1 195com* at bcmcca? channel 1
195 196
196# ChipCommonB Peripherals 197# ChipCommonB Peripherals
197bcmccb0 at mainbus? # ChipCommonB 198bcmccb0 at mainbus? # ChipCommonB
198bcmpax* at bcmccb? port ? flags 2 # use bounce buffers 199bcmpax* at bcmccb? port ? flags 2 # use bounce buffers
199pci* at bcmpax? 200pci* at bcmpax?
200ppb* at pci? dev ? function ? 201ppb* at pci? dev ? function ?
201pci* at ppb? 202pci* at ppb?
202 203
203ahcisata* at pci? dev ? function ? 204ahcisata* at pci? dev ? function ?
204atabus* at ahcisata? channel ? 205atabus* at ahcisata? channel ?
205#options ATADEBUG 206#options ATADEBUG
206wd* at atabus? drive ? 207wd* at atabus? drive ?
207wm* at pci? dev ? function ? 208wm* at pci? dev ? function ?
208makphy* at mii? 209makphy* at mii?
209ukphy* at mii? 210ukphy* at mii?
210 211
211bcmmdio0 at bcmccb0 212bcmmdio0 at bcmccb0
212bcmeth* at bcmccb? port ? 213bcmeth* at bcmccb? port ?
213 214
214# SDHC controllers 215# SDHC controllers
215sdhc0 at bcmccb0 216sdhc0 at bcmccb0
216sdmmc* at sdhc? # SD/MMC bus 217sdmmc* at sdhc? # SD/MMC bus
217ld* at sdmmc? 218ld* at sdmmc?
218 219
219# Random Number Generator 220# Random Number Generator
220bcmrng0 at bcmccb0 221bcmrng0 at bcmccb0
221 222
222# NAND controller 223# NAND controller
223#bcmnand0 at bcmccb0 224#bcmnand0 at bcmccb0
224 225
225# NAND layer 226# NAND layer
226#nand0 at nandbus? 227#nand0 at nandbus?
227 228
228# use the bad block table 229# use the bad block table
229#options NAND_BBT 230#options NAND_BBT
230 231
231# Define flash partitions for board 232# Define flash partitions for board
232#flash0 at nand0 offset 0x000000 size 0x080000 readonly 1 # X-Loader 233#flash0 at nand0 offset 0x000000 size 0x080000 readonly 1 # X-Loader
233#flash1 at nand0 offset 0x080000 size 0x1e0000 readonly 1 # U-Boot 234#flash1 at nand0 offset 0x080000 size 0x1e0000 readonly 1 # U-Boot
234#flash2 at nand0 offset 0x260000 size 0x020000 readonly 1 # UB Env 235#flash2 at nand0 offset 0x260000 size 0x020000 readonly 1 # UB Env
235#flash3 at nand0 offset 0x280000 size 0x400000 # kernel 236#flash3 at nand0 offset 0x280000 size 0x400000 # kernel
236#flash4 at nand0 offset 0x680000 size 0 # filesystem 237#flash4 at nand0 offset 0x680000 size 0 # filesystem
237 238
238# I2C Controller 239# I2C Controller
239bcmi2c0 at bcmccb0 240bcmi2c0 at bcmccb0
240iic* at bcmi2c? 241iic* at bcmi2c?
241 242
242# NAND Controller 243# NAND Controller
243bcmnand0 at bcmccb0 244bcmnand0 at bcmccb0
244nand* at nandbus? 245nand* at nandbus?
245flash* at nand? 246flash* at nand?
246 247
247# Watchdog timers 248# Watchdog timers
248#bcmwdt* at bcmccb0 249#bcmwdt* at bcmccb0
249 250
250# On-board USB 251# On-board USB
251bcmusb* at bcmccb0 252bcmusb* at bcmccb0
252ohci* at bcmusb0 253ohci* at bcmusb0
253usb* at ohci? 254usb* at ohci?
254ehci* at bcmusb0 255ehci* at bcmusb0
255usb* at ehci? 256usb* at ehci?
256uhub* at usb? 257uhub* at usb?
257uhub* at uhub? port ? 258uhub* at uhub? port ?
258umass* at uhub? port ? configuration ? interface ? 259umass* at uhub? port ? configuration ? interface ?
259scsibus* at scsi? 260scsibus* at scsi?
260sd* at scsibus? target ? lun ? 261sd* at scsibus? target ? lun ?
261#wd* at umass? 262#wd* at umass?
262 263
263axe* at uhub? port ? configuration ? interface ? 264axe* at uhub? port ? configuration ? interface ?
264 265
265# Hardware clocking and power management 266# Hardware clocking and power management
266 267
267# Pseudo-Devices 268# Pseudo-Devices
268 269
269# disk/mass storage pseudo-devices 270# disk/mass storage pseudo-devices
270#pseudo-device md # memory disk device (ramdisk) 271#pseudo-device md # memory disk device (ramdisk)
271#pseudo-device vnd # disk-like interface to files 272#pseudo-device vnd # disk-like interface to files
272#pseudo-device fss # file system snapshot device 273#pseudo-device fss # file system snapshot device
273#pseudo-device putter # for puffs and pud 274#pseudo-device putter # for puffs and pud
274 275
275# network pseudo-devices 276# network pseudo-devices
276pseudo-device bpfilter # Berkeley packet filter 277pseudo-device bpfilter # Berkeley packet filter
277pseudo-device loop # network loopback 278pseudo-device loop # network loopback
278#pseudo-device kttcp # network loopback 279#pseudo-device kttcp # network loopback
279pseudo-device vlan 280pseudo-device vlan
280pseudo-device bridge 281pseudo-device bridge
281 282
282# miscellaneous pseudo-devices 283# miscellaneous pseudo-devices
283pseudo-device pty # pseudo-terminals 284pseudo-device pty # pseudo-terminals
284#options RND_COM 285#options RND_COM
285#pseudo-device clockctl # user control of clock subsystem 286#pseudo-device clockctl # user control of clock subsystem
286pseudo-device ksyms # /dev/ksyms 287pseudo-device ksyms # /dev/ksyms
287pseudo-device drvctl # device control 288pseudo-device drvctl # device control
288pseudo-device lockstat # lock profiling 289pseudo-device lockstat # lock profiling
cvs diff -r1.1 -r1.2 src/sys/arch/evbarm/conf/BCM56340 (switch to unified diff)

--- src/sys/arch/evbarm/conf/BCM56340 2013/10/28 22:35:07 1.1
+++ src/sys/arch/evbarm/conf/BCM56340 2014/02/21 22:31:58 1.2
@@ -1,288 +1,289 @@ @@ -1,288 +1,289 @@
1# 1#
2# $NetBSD: BCM56340,v 1.1 2013/10/28 22:35:07 matt Exp $ 2# $NetBSD: BCM56340,v 1.2 2014/02/21 22:31:58 matt Exp $
3# 3#
4# BCM5301X -- Broadcom BCM5301X Eval Board Kernel 4# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.bcm53xx" 7include "arch/evbarm/conf/std.bcm53xx"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
16#options NTP # NTP phase/frequency locked loop 16#options NTP # NTP phase/frequency locked loop
17 17
18# CPU options 18# CPU options
19 19
20#makeoptions DEFCOPTS="-O0" 20#makeoptions DEFCOPTS="-O0"
21options UVMHIST 21options UVMHIST
22#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30 22#options UVMHIST_PRINT,A9WDT_PERIOD_DEFAULT=30
23options BCM53XX_CONSOLE_EARLY 23options BCM53XX_CONSOLE_EARLY
24options BCMETH_COUNTERS 24options BCMETH_COUNTERS
25#options MULTIPROCESSOR 25#options MULTIPROCESSOR
26options CPU_CORTEXA9 26options CPU_CORTEXA9
27#options MEMSIZE=256 27#options MEMSIZE=256
28options BCM563XX 28options BCM563XX
29options PMAPCOUNTERS 29options PMAPCOUNTERS
30options BUSDMA_COUNTERS 30options BUSDMA_COUNTERS
 31makeoptions KERNEL_BASE_PHYS="0x60100000"
31 32
32# Architecture options 33# Architecture options
33 34
34# File systems 35# File systems
35 36
36file-system FFS # UFS 37file-system FFS # UFS
37#file-system LFS # log-structured file system 38#file-system LFS # log-structured file system
38file-system MFS # memory file system 39file-system MFS # memory file system
39file-system NFS # Network file system 40file-system NFS # Network file system
40#file-system ADOSFS # AmigaDOS-compatible file system 41#file-system ADOSFS # AmigaDOS-compatible file system
41#file-system EXT2FS # second extended file system (linux) 42#file-system EXT2FS # second extended file system (linux)
42file-system CD9660 # ISO 9660 + Rock Ridge file system 43file-system CD9660 # ISO 9660 + Rock Ridge file system
43file-system MSDOSFS # MS-DOS file system 44file-system MSDOSFS # MS-DOS file system
44#file-system FDESC # /dev/fd 45#file-system FDESC # /dev/fd
45file-system KERNFS # /kern 46file-system KERNFS # /kern
46#file-system NULLFS # loopback file system 47#file-system NULLFS # loopback file system
47#file-system PROCFS # /proc 48#file-system PROCFS # /proc
48#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs) 49#file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
49#file-system UMAPFS # NULLFS + uid and gid remapping 50#file-system UMAPFS # NULLFS + uid and gid remapping
50#file-system UNION # union file system 51#file-system UNION # union file system
51file-system TMPFS # memory file system 52file-system TMPFS # memory file system
52file-system PTYFS # /dev/pts/N support 53file-system PTYFS # /dev/pts/N support
53 54
54# File system options 55# File system options
55#options QUOTA # legacy UFS quotas 56#options QUOTA # legacy UFS quotas
56#options QUOTA2 # new, in-filesystem UFS quotas 57#options QUOTA2 # new, in-filesystem UFS quotas
57#options FFS_EI # FFS Endian Independent support 58#options FFS_EI # FFS Endian Independent support
58#options NFSSERVER 59#options NFSSERVER
59options WAPBL # File system journaling support 60options WAPBL # File system journaling support
60#options FFS_NO_SNAPSHOT # No FFS snapshot support 61#options FFS_NO_SNAPSHOT # No FFS snapshot support
61 62
62# Networking options 63# Networking options
63 64
64#options GATEWAY # packet forwarding 65#options GATEWAY # packet forwarding
65options INET # IP + ICMP + TCP + UDP 66options INET # IP + ICMP + TCP + UDP
66options INET6 # IPV6 67options INET6 # IPV6
67#options IPSEC # IP security 68#options IPSEC # IP security
68#options IPSEC_DEBUG # debug for IP security 69#options IPSEC_DEBUG # debug for IP security
69#options MROUTING # IP multicast routing 70#options MROUTING # IP multicast routing
70#options PIM # Protocol Independent Multicast 71#options PIM # Protocol Independent Multicast
71#options NETATALK # AppleTalk networking 72#options NETATALK # AppleTalk networking
72#options PPP_BSDCOMP # BSD-Compress compression support for PPP 73#options PPP_BSDCOMP # BSD-Compress compression support for PPP
73#options PPP_DEFLATE # Deflate compression support for PPP 74#options PPP_DEFLATE # Deflate compression support for PPP
74#options PPP_FILTER # Active filter support for PPP (requires bpf) 75#options PPP_FILTER # Active filter support for PPP (requires bpf)
75#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG 76#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
76 77
77options NFS_BOOT_BOOTP 78options NFS_BOOT_BOOTP
78options NFS_BOOT_DHCP 79options NFS_BOOT_DHCP
79#options NFS_BOOT_BOOTSTATIC 80#options NFS_BOOT_BOOTSTATIC
80#options NFS_BOOTSTATIC_MYIP="\"192.168.1.4\"" 81#options NFS_BOOTSTATIC_MYIP="\"192.168.1.4\""
81#options NFS_BOOTSTATIC_GWIP="\"192.168.1.1\"" 82#options NFS_BOOTSTATIC_GWIP="\"192.168.1.1\""
82#options NFS_BOOTSTATIC_MASK="\"255.255.255.0\"" 83#options NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
83#options NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\"" 84#options NFS_BOOTSTATIC_SERVADDR="\"192.168.1.1\""
84#options NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\"" 85#options NFS_BOOTSTATIC_SERVER="\"192.168.1.1:/nfs/sdp2430\""
85 86
86options NFS_BOOT_RWSIZE=1024 87options NFS_BOOT_RWSIZE=1024
87 88
88# Compatibility options 89# Compatibility options
89 90
90#options COMPAT_43 # 4.3BSD compatibility. 91#options COMPAT_43 # 4.3BSD compatibility.
91options COMPAT_60 # NetBSD 6.0 compatibility. 92options COMPAT_60 # NetBSD 6.0 compatibility.
92options COMPAT_50 # NetBSD 5.0 compatibility. 93options COMPAT_50 # NetBSD 5.0 compatibility.
93options COMPAT_40 # NetBSD 4.0 compatibility. 94options COMPAT_40 # NetBSD 4.0 compatibility.
94options COMPAT_30 # NetBSD 3.0 compatibility. 95options COMPAT_30 # NetBSD 3.0 compatibility.
95#options COMPAT_20 # NetBSD 2.0 compatibility. 96#options COMPAT_20 # NetBSD 2.0 compatibility.
96#options COMPAT_16 # NetBSD 1.6 compatibility. 97#options COMPAT_16 # NetBSD 1.6 compatibility.
97#options COMPAT_15 # NetBSD 1.5 compatibility. 98#options COMPAT_15 # NetBSD 1.5 compatibility.
98#options COMPAT_14 # NetBSD 1.4 compatibility. 99#options COMPAT_14 # NetBSD 1.4 compatibility.
99#options COMPAT_13 # NetBSD 1.3 compatibility. 100#options COMPAT_13 # NetBSD 1.3 compatibility.
100#options COMPAT_12 # NetBSD 1.2 compatibility. 101#options COMPAT_12 # NetBSD 1.2 compatibility.
101#options COMPAT_11 # NetBSD 1.1 compatibility. 102#options COMPAT_11 # NetBSD 1.1 compatibility.
102#options COMPAT_10 # NetBSD 1.0 compatibility. 103#options COMPAT_10 # NetBSD 1.0 compatibility.
103#options COMPAT_09 # NetBSD 0.9 compatibility. 104#options COMPAT_09 # NetBSD 0.9 compatibility.
104#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. 105#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
105#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. 106#options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
106 107
107# Shared memory options 108# Shared memory options
108 109
109options SYSVMSG # System V-like message queues 110options SYSVMSG # System V-like message queues
110options SYSVSEM # System V-like semaphores 111options SYSVSEM # System V-like semaphores
111options SYSVSHM # System V-like memory sharing 112options SYSVSHM # System V-like memory sharing
112 113
113# Device options 114# Device options
114 115
115#options MEMORY_DISK_HOOKS # boottime setup of ramdisk 116#options MEMORY_DISK_HOOKS # boottime setup of ramdisk
116#options MEMORY_DISK_ROOT_SIZE=8192 # Size in blocks 117#options MEMORY_DISK_ROOT_SIZE=8192 # Size in blocks
117#options MEMORY_DISK_DYNAMIC 118#options MEMORY_DISK_DYNAMIC
118#options MINIROOTSIZE=1000 # Size in blocks 119#options MINIROOTSIZE=1000 # Size in blocks
119#options MEMORY_DISK_IS_ROOT # use memory disk as root 120#options MEMORY_DISK_IS_ROOT # use memory disk as root
120 121
121options DKWEDGE_AUTODISCOVER 122options DKWEDGE_AUTODISCOVER
122options DKWEDGE_METHOD_GPT 123options DKWEDGE_METHOD_GPT
123 124
124# Miscellaneous kernel options 125# Miscellaneous kernel options
125options MODULAR # support dynamically loaded kernel modules 126options MODULAR # support dynamically loaded kernel modules
126options KTRACE # system call tracing, a la ktrace(1) 127options KTRACE # system call tracing, a la ktrace(1)
127#options KMEMSTATS # kernel memory statistics 128#options KMEMSTATS # kernel memory statistics
128options PCIVERBOSE # Verbose PCI autoconfiguration messages 129options PCIVERBOSE # Verbose PCI autoconfiguration messages
129#options PCI_CONFIG_DUMP # Verbose PCI autoconfiguration messages 130#options PCI_CONFIG_DUMP # Verbose PCI autoconfiguration messages
130options PCI_NETBSD_CONFIGURE # perform PCI configuration 131options PCI_NETBSD_CONFIGURE # perform PCI configuration
131options RNDVERBOSE # Verbose rnd messages 132options RNDVERBOSE # Verbose rnd messages
132#options SCSIVERBOSE # Verbose SCSI errors 133#options SCSIVERBOSE # Verbose SCSI errors
133#options MIIVERBOSE # Verbose MII autoconfiguration messages 134#options MIIVERBOSE # Verbose MII autoconfiguration messages
134#options DDB_KEYCODE=0x40 135#options DDB_KEYCODE=0x40
135#options USERCONF # userconf(4) support 136#options USERCONF # userconf(4) support
136#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) 137#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
137 138
138# Development and Debugging options 139# Development and Debugging options
139 140
140#options PERFCTRS # performance counters 141#options PERFCTRS # performance counters
141options DIAGNOSTIC # internally consistency checks 142options DIAGNOSTIC # internally consistency checks
142options DEBUG 143options DEBUG
143#options LOCKDEBUG # Enable lock debugging 144#options LOCKDEBUG # Enable lock debugging
144#options PMAP_DEBUG # Enable pmap_debug_level code 145#options PMAP_DEBUG # Enable pmap_debug_level code
145#options IPKDB # remote kernel debugging 146#options IPKDB # remote kernel debugging
146options VERBOSE_INIT_ARM # verbose bootstraping messages 147options VERBOSE_INIT_ARM # verbose bootstraping messages
147options DDB # in-kernel debugger 148options DDB # in-kernel debugger
148options DDB_ONPANIC=1 149options DDB_ONPANIC=1
149options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 150options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
150options DDB_COMMANDONENTER="show event" 151options DDB_COMMANDONENTER="show event"
151options DB_MAX_LINE=INT_MAX 152options DB_MAX_LINE=INT_MAX
152#options KGDB 153#options KGDB
153makeoptions DEBUG="-g" # compile full symbol table 154makeoptions DEBUG="-g" # compile full symbol table
154options SYMTAB_SPACE=575000 155options SYMTAB_SPACE=590000
155 156
156## USB Debugging options 157## USB Debugging options
157options USB_DEBUG 158options USB_DEBUG
158options EHCI_DEBUG 159options EHCI_DEBUG
159options OHCI_DEBUG 160options OHCI_DEBUG
160options UHUB_DEBUG 161options UHUB_DEBUG
161 162
162 163
163# Valid options for BOOT_ARGS: 164# Valid options for BOOT_ARGS:
164# single Boot to single user only 165# single Boot to single user only
165# kdb Give control to kernel debugger 166# kdb Give control to kernel debugger
166# ask Ask for file name to reboot from 167# ask Ask for file name to reboot from
167# pmapdebug=<n> If PMAP_DEBUG, set pmap_debug_level to <n> 168# pmapdebug=<n> If PMAP_DEBUG, set pmap_debug_level to <n>
168# memorydisk=<n> Set memorydisk size to <n> KB 169# memorydisk=<n> Set memorydisk size to <n> KB
169# quiet Show aprint_naive output 170# quiet Show aprint_naive output
170# verbose Show aprint_normal and aprint_verbose output 171# verbose Show aprint_normal and aprint_verbose output
171options BOOT_ARGS="\"\"" 172options BOOT_ARGS="\"\""
172 173
173config netbsd root on ? type ? 174config netbsd root on ? type ?
174 175
175# The main bus device 176# The main bus device
176mainbus0 at root 177mainbus0 at root
177 178
178# The boot cpu 179# The boot cpu
179cpu0 at mainbus? 180cpu0 at mainbus?
180#cpu* at mainbus? 181#cpu* at mainbus?
181 182
182# The MPCore interrupt controller and global timer 183# The MPCore interrupt controller and global timer
183armperiph0 at mainbus? # A9 On-Chip Peripherals 184armperiph0 at mainbus? # A9 On-Chip Peripherals
184armgic0 at armperiph? # ARM Generic Interrupt Controller 185armgic0 at armperiph? # ARM Generic Interrupt Controller
185arml2cc0 at armperiph? flags 0 # ARM PL310 L2CC 186arml2cc0 at armperiph? flags 0 # ARM PL310 L2CC
186a9tmr0 at armperiph? # A9 Global Timer 187a9tmr0 at armperiph? # A9 Global Timer
187a9wdt0 at armperiph? flags 1 # A9 Watchdog Timer 188a9wdt0 at armperiph? flags 1 # A9 Watchdog Timer
188 189
189# ChipCommonA Peripherals 190# ChipCommonA Peripherals
190bcmcca0 at mainbus? # ChipCommonA 191bcmcca0 at mainbus? # ChipCommonA
191#options CONADDR=0x18000300, CONSPEED=115200 192#options CONADDR=0x18000300, CONSPEED=115200
192options CONSPEED=9600 193options CONSPEED=9600
193com0 at bcmcca? channel 0 194com0 at bcmcca? channel 0
194com* at bcmcca? channel 1 195com* at bcmcca? channel 1
195 196
196# ChipCommonB Peripherals 197# ChipCommonB Peripherals
197bcmccb0 at mainbus? # ChipCommonB 198bcmccb0 at mainbus? # ChipCommonB
198bcmpax* at bcmccb? port ? flags 2 # use bounce buffers 199bcmpax* at bcmccb? port ? flags 2 # use bounce buffers
199pci* at bcmpax? 200pci* at bcmpax?
200ppb* at pci? dev ? function ? 201ppb* at pci? dev ? function ?
201pci* at ppb? 202pci* at ppb?
202 203
203ahcisata* at pci? dev ? function ? 204ahcisata* at pci? dev ? function ?
204atabus* at ahcisata? channel ? 205atabus* at ahcisata? channel ?
205#options ATADEBUG 206#options ATADEBUG
206wd* at atabus? drive ? 207wd* at atabus? drive ?
207wm* at pci? dev ? function ? 208wm* at pci? dev ? function ?
208makphy* at mii? 209makphy* at mii?
209ukphy* at mii? 210ukphy* at mii?
210 211
211bcmmdio0 at bcmccb0 212bcmmdio0 at bcmccb0
212bcmeth* at bcmccb? port ? 213bcmeth* at bcmccb? port ?
213 214
214# SDHC controllers 215# SDHC controllers
215sdhc0 at bcmccb0 216sdhc0 at bcmccb0
216sdmmc* at sdhc? # SD/MMC bus 217sdmmc* at sdhc? # SD/MMC bus
217ld* at sdmmc? 218ld* at sdmmc?
218 219
219# Random Number Generator 220# Random Number Generator
220bcmrng0 at bcmccb0 221bcmrng0 at bcmccb0
221 222
222# NAND controller 223# NAND controller
223#bcmnand0 at bcmccb0 224#bcmnand0 at bcmccb0
224 225
225# NAND layer 226# NAND layer
226#nand0 at nandbus? 227#nand0 at nandbus?
227 228
228# use the bad block table 229# use the bad block table
229#options NAND_BBT 230#options NAND_BBT
230 231
231# Define flash partitions for board 232# Define flash partitions for board
232#flash0 at nand0 offset 0x000000 size 0x080000 readonly 1 # X-Loader 233#flash0 at nand0 offset 0x000000 size 0x080000 readonly 1 # X-Loader
233#flash1 at nand0 offset 0x080000 size 0x1e0000 readonly 1 # U-Boot 234#flash1 at nand0 offset 0x080000 size 0x1e0000 readonly 1 # U-Boot
234#flash2 at nand0 offset 0x260000 size 0x020000 readonly 1 # UB Env 235#flash2 at nand0 offset 0x260000 size 0x020000 readonly 1 # UB Env
235#flash3 at nand0 offset 0x280000 size 0x400000 # kernel 236#flash3 at nand0 offset 0x280000 size 0x400000 # kernel
236#flash4 at nand0 offset 0x680000 size 0 # filesystem 237#flash4 at nand0 offset 0x680000 size 0 # filesystem
237 238
238# I2C Controller 239# I2C Controller
239bcmi2c0 at bcmccb0 240bcmi2c0 at bcmccb0
240iic* at bcmi2c? 241iic* at bcmi2c?
241 242
242# NAND Controller 243# NAND Controller
243bcmnand0 at bcmccb0 244bcmnand0 at bcmccb0
244nand* at nandbus? 245nand* at nandbus?
245flash* at nand? 246flash* at nand?
246 247
247# Watchdog timers 248# Watchdog timers
248#bcmwdt* at bcmccb0 249#bcmwdt* at bcmccb0
249 250
250# On-board USB 251# On-board USB
251bcmusb* at bcmccb0 252bcmusb* at bcmccb0
252ohci* at bcmusb0 253ohci* at bcmusb0
253usb* at ohci? 254usb* at ohci?
254ehci* at bcmusb0 255ehci* at bcmusb0
255usb* at ehci? 256usb* at ehci?
256uhub* at usb? 257uhub* at usb?
257uhub* at uhub? port ? 258uhub* at uhub? port ?
258umass* at uhub? port ? configuration ? interface ? 259umass* at uhub? port ? configuration ? interface ?
259scsibus* at scsi? 260scsibus* at scsi?
260sd* at scsibus? target ? lun ? 261sd* at scsibus? target ? lun ?
261#wd* at umass? 262#wd* at umass?
262 263
263axe* at uhub? port ? configuration ? interface ? 264axe* at uhub? port ? configuration ? interface ?
264 265
265# Hardware clocking and power management 266# Hardware clocking and power management
266 267
267# Pseudo-Devices 268# Pseudo-Devices
268 269
269# disk/mass storage pseudo-devices 270# disk/mass storage pseudo-devices
270#pseudo-device md # memory disk device (ramdisk) 271#pseudo-device md # memory disk device (ramdisk)
271#pseudo-device vnd # disk-like interface to files 272#pseudo-device vnd # disk-like interface to files
272#pseudo-device fss # file system snapshot device 273#pseudo-device fss # file system snapshot device
273#pseudo-device putter # for puffs and pud 274#pseudo-device putter # for puffs and pud
274 275
275# network pseudo-devices 276# network pseudo-devices
276pseudo-device bpfilter # Berkeley packet filter 277pseudo-device bpfilter # Berkeley packet filter
277pseudo-device loop # network loopback 278pseudo-device loop # network loopback
278#pseudo-device kttcp # network loopback 279#pseudo-device kttcp # network loopback
279pseudo-device vlan 280pseudo-device vlan
280pseudo-device bridge 281pseudo-device bridge
281 282
282# miscellaneous pseudo-devices 283# miscellaneous pseudo-devices
283pseudo-device pty # pseudo-terminals 284pseudo-device pty # pseudo-terminals
284#options RND_COM 285#options RND_COM
285#pseudo-device clockctl # user control of clock subsystem 286#pseudo-device clockctl # user control of clock subsystem
286pseudo-device ksyms # /dev/ksyms 287pseudo-device ksyms # /dev/ksyms
287pseudo-device drvctl # device control 288pseudo-device drvctl # device control
288pseudo-device lockstat # lock profiling 289pseudo-device lockstat # lock profiling
cvs diff -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.bcm53xx (switch to unified diff)

--- src/sys/arch/evbarm/conf/std.bcm53xx 2013/11/01 18:41:06 1.13
+++ src/sys/arch/evbarm/conf/std.bcm53xx 2014/02/21 22:31:58 1.14
@@ -1,35 +1,33 @@ @@ -1,35 +1,33 @@
1# $NetBSD: std.bcm53xx,v 1.13 2013/11/01 18:41:06 skrll Exp $ 1# $NetBSD: std.bcm53xx,v 1.14 2014/02/21 22:31:58 matt Exp $
2# 2#
3# standard NetBSD/evbarm for BCM5301X options 3# standard NetBSD/evbarm for BCM5301X options
4 4
5machine evbarm arm 5machine evbarm arm
6include "arch/evbarm/conf/std.evbarm" 6include "arch/evbarm/conf/std.evbarm"
7 7
8# Pull in BCM53xx config definitions. 8# Pull in BCM53xx config definitions.
9include "arch/evbarm/conf/files.bcm53xx" 9include "arch/evbarm/conf/files.bcm53xx"
10 10
11options SOSEND_NO_LOAN 11options SOSEND_NO_LOAN
12options COM_TOLERANCE=40 12options COM_TOLERANCE=40
13options FPU_VFP 13options FPU_VFP
14options CORTEX_PMC 14options CORTEX_PMC
15options _ARM32_NEED_BUS_DMA_BOUNCE 15options _ARM32_NEED_BUS_DMA_BOUNCE
16options PMAP_NEED_ALLOC_POOLPAGE 16options PMAP_NEED_ALLOC_POOLPAGE
17options __HAVE_MM_MD_DIRECT_MAPPED_PHYS 17options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
18options __HAVE_MM_MD_CACHE_ALIASING 18options __HAVE_MM_MD_CACHE_ALIASING
19options __HAVE_FAST_SOFTINTS # should be in types.h 19options __HAVE_FAST_SOFTINTS # should be in types.h
20options __HAVE_CPU_UAREA_ALLOC_IDLELWP 20options __HAVE_CPU_UAREA_ALLOC_IDLELWP
21options __HAVE_CPU_COUNTER 21options __HAVE_CPU_COUNTER
22options __HAVE_ATOMIC64_OPS 
23options __HAVE_PCI_CONF_HOOK 22options __HAVE_PCI_CONF_HOOK
24options TPIDRPRW_IS_CURCPU 23options TPIDRPRW_IS_CURCPU
25options KERNEL_BASE_EXT=0x80000000 24options KERNEL_BASE_EXT=0x80000000
26options EVBARM_BOARDTYPE="bcm53xx" 25options EVBARM_BOARDTYPE="bcm53xx"
27 26
28makeoptions BOARDTYPE="bcm53xx" 27makeoptions BOARDTYPE="bcm53xx"
29makeoptions KERNEL_BASE_PHYS="0x60100000" 
30makeoptions KERNEL_BASE_VIRT="0x80100000" 28makeoptions KERNEL_BASE_VIRT="0x80100000"
31makeoptions LOADADDRESS="0x00100000" 29makeoptions LOADADDRESS="0x00100000"
32makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx" 30makeoptions BOARDMKFRAG="${THISARM}/conf/mk.bcm53xx"
33 31
34options ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>" 32options ARM_INTR_IMPL="<arch/arm/broadcom/bcm53xx_intr.h>"
35options ARM_GENERIC_TODR 33options ARM_GENERIC_TODR