Sat Sep 22 19:53:03 2012 UTC ()
Disable L2 cache for now.  Add phys for wm


(matt)
diff -r1.5 -r1.6 src/sys/arch/evbarm/conf/BCM5301X
cvs diff -r1.5 -r1.6 src/sys/arch/evbarm/conf/BCM5301X (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/BCM5301X 2012/09/15 06:10:13 1.5
+++ src/sys/arch/evbarm/conf/BCM5301X 2012/09/22 19:53:03 1.6
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# 1#
2# $NetBSD: BCM5301X,v 1.5 2012/09/15 06:10:13 matt Exp $ 2# $NetBSD: BCM5301X,v 1.6 2012/09/22 19:53:03 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
24#options MULTIPROCESSOR 24#options MULTIPROCESSOR
25options CPU_CORTEXA9 25options CPU_CORTEXA9
26#options FPU_VFP 
27options BCM5301 26options BCM5301
28options PMAPCOUNTERS 27options PMAPCOUNTERS
29 28
30# Architecture options 29# Architecture options
31 30
32# File systems 31# File systems
33 32
34file-system FFS # UFS 33file-system FFS # UFS
35#file-system LFS # log-structured file system 34#file-system LFS # log-structured file system
36file-system MFS # memory file system 35file-system MFS # memory file system
37file-system NFS # Network file system 36file-system NFS # Network file system
38#file-system ADOSFS # AmigaDOS-compatible file system 37#file-system ADOSFS # AmigaDOS-compatible file system
39#file-system EXT2FS # second extended file system (linux) 38#file-system EXT2FS # second extended file system (linux)
@@ -145,27 +144,27 @@ options RNDVERBOSE # Verbose rnd messag @@ -145,27 +144,27 @@ options RNDVERBOSE # Verbose rnd messag
145options DIAGNOSTIC # internally consistency checks 144options DIAGNOSTIC # internally consistency checks
146options DEBUG 145options DEBUG
147#options LOCKDEBUG # Enable lock debugging 146#options LOCKDEBUG # Enable lock debugging
148#options PMAP_DEBUG # Enable pmap_debug_level code 147#options PMAP_DEBUG # Enable pmap_debug_level code
149#options IPKDB # remote kernel debugging 148#options IPKDB # remote kernel debugging
150#options VERBOSE_INIT_ARM # verbose bootstraping messages 149#options VERBOSE_INIT_ARM # verbose bootstraping messages
151options DDB # in-kernel debugger 150options DDB # in-kernel debugger
152options DDB_ONPANIC=1 151options DDB_ONPANIC=1
153options DDB_HISTORY_SIZE=100 # Enable history editing in DDB 152options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
154options DDB_COMMANDONENTER="show event" 153options DDB_COMMANDONENTER="show event"
155options DB_MAX_LINE=INT_MAX 154options DB_MAX_LINE=INT_MAX
156#options KGDB 155#options KGDB
157makeoptions DEBUG="-g" # compile full symbol table 156makeoptions DEBUG="-g" # compile full symbol table
158options SYMTAB_SPACE=530000 157options SYMTAB_SPACE=575000
159 158
160## USB Debugging options 159## USB Debugging options
161options USB_DEBUG 160options USB_DEBUG
162options EHCI_DEBUG 161options EHCI_DEBUG
163options OHCI_DEBUG 162options OHCI_DEBUG
164options UHUB_DEBUG 163options UHUB_DEBUG
165 164
166 165
167# Valid options for BOOT_ARGS: 166# Valid options for BOOT_ARGS:
168# single Boot to single user only 167# single Boot to single user only
169# kdb Give control to kernel debugger 168# kdb Give control to kernel debugger
170# ask Ask for file name to reboot from 169# ask Ask for file name to reboot from
171# pmapdebug=<n> If PMAP_DEBUG, set pmap_debug_level to <n> 170# pmapdebug=<n> If PMAP_DEBUG, set pmap_debug_level to <n>
@@ -176,47 +175,50 @@ options BOOT_ARGS="\"\"" @@ -176,47 +175,50 @@ options BOOT_ARGS="\"\""
176 175
177config netbsd root on ? type ? 176config netbsd root on ? type ?
178 177
179# The main bus device 178# The main bus device
180mainbus0 at root 179mainbus0 at root
181 180
182# The boot cpu 181# The boot cpu
183cpu0 at mainbus? 182cpu0 at mainbus?
184#cpu* at mainbus? 183#cpu* at mainbus?
185 184
186# The MPCore interrupt controller and global timer 185# The MPCore interrupt controller and global timer
187armperiph0 at mainbus? # A9 On-Chip Peripherals 186armperiph0 at mainbus? # A9 On-Chip Peripherals
188armgic0 at armperiph? # ARM Generic Interrupt Controller 187armgic0 at armperiph? # ARM Generic Interrupt Controller
189arml2cc0 at armperiph? # ARM PL310 L2CC 188arml2cc0 at armperiph? flags 1 # ARM PL310 L2CC
190a9tmr0 at armperiph? # A9 Global Timer 189a9tmr0 at armperiph? # A9 Global Timer
191a9wdt0 at armperiph? flags 1 # A9 Watchdog Timer 190a9wdt0 at armperiph? flags 1 # A9 Watchdog Timer
192 191
193# ChipCommonA Peripherals 192# ChipCommonA Peripherals
194bcmcca0 at mainbus? # ChipCommonA 193bcmcca0 at mainbus? # ChipCommonA
195#options CONADDR=0x18000300, CONSPEED=115200 194#options CONADDR=0x18000300, CONSPEED=115200
196com0 at bcmcca? channel 0 195com0 at bcmcca? channel 0
197com* at bcmcca? channel 1 196com* at bcmcca? channel 1
198 197
199# ChipCommonB Peripherals 198# ChipCommonB Peripherals
200bcmccb0 at mainbus? # ChipCommonB 199bcmccb0 at mainbus? # ChipCommonB
201bcmpax* at bcmccb? port ? 200bcmpax* at bcmccb? port ?
202pci* at bcmpax? 201pci* at bcmpax?
203ppb* at pci? dev ? function ? 202ppb* at pci? dev ? function ?
204pci* at ppb? 203pci* at ppb?
205 204
206ahcisata* at pci? dev ? function ? 205ahcisata* at pci? dev ? function ?
207atabus* at ahcisata? channel ? 206atabus* at ahcisata? channel ?
 207#options ATADEBUG
208wd* at atabus? drive ? 208wd* at atabus? drive ?
209wm* at pci? dev ? function ? 209wm* at pci? dev ? function ?
 210makphy* at mii?
 211ukphy* at mii?
210 212
211bcmmdio0 at bcmccb0 213bcmmdio0 at bcmccb0
212bcmeth* at bcmccb? port ? 214bcmeth* at bcmccb? port ?
213 215
214# SDHC controllers 216# SDHC controllers
215sdhc0 at bcmccb0 217sdhc0 at bcmccb0
216sdmmc* at sdhc? # SD/MMC bus 218sdmmc* at sdhc? # SD/MMC bus
217ld* at sdmmc? 219ld* at sdmmc?
218 220
219# Random Number Generator 221# Random Number Generator
220bcmrng0 at bcmccb0 222bcmrng0 at bcmccb0
221 223
222# NAND controller 224# NAND controller
@@ -243,27 +245,27 @@ iic* at bcmi2c? @@ -243,27 +245,27 @@ iic* at bcmi2c?
243#bcmwdt* at bcmccb0 245#bcmwdt* at bcmccb0
244 246
245# On-board USB 247# On-board USB
246bcmusb* at bcmccb0 248bcmusb* at bcmccb0
247ohci* at bcmusb0 249ohci* at bcmusb0
248usb* at ohci? 250usb* at ohci?
249ehci* at bcmusb0 251ehci* at bcmusb0
250usb* at ehci? 252usb* at ehci?
251uhub* at usb? 253uhub* at usb?
252uhub* at uhub? port ? 254uhub* at uhub? port ?
253umass* at uhub? port ? configuration ? interface ? 255umass* at uhub? port ? configuration ? interface ?
254scsibus* at scsi? 256scsibus* at scsi?
255sd* at scsibus? target ? lun ? 257sd* at scsibus? target ? lun ?
256wd* at umass? 258#wd* at umass?
257 259
258axe* at uhub? port ? configuration ? interface ? 260axe* at uhub? port ? configuration ? interface ?
259 261
260# Hardware clocking and power management 262# Hardware clocking and power management
261 263
262# Pseudo-Devices 264# Pseudo-Devices
263 265
264# disk/mass storage pseudo-devices 266# disk/mass storage pseudo-devices
265#pseudo-device md # memory disk device (ramdisk) 267#pseudo-device md # memory disk device (ramdisk)
266#pseudo-device vnd # disk-like interface to files 268#pseudo-device vnd # disk-like interface to files
267#pseudo-device fss # file system snapshot device 269#pseudo-device fss # file system snapshot device
268#pseudo-device putter # for puffs and pud 270#pseudo-device putter # for puffs and pud
269 271