Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable omapfb/wsdisplay until they stop stealing the console

Browse Source 
Enable EHCI and devices.
This commit is contained in:
matt 2012-12-12 00:39:41 +00:00
parent 1153693c28
commit ba20058f33
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/arch/evbarm/conf/BEAGLEBOARD
View File

@ -1,5 +1,5 @@
# #
# $NetBSD: BEAGLEBOARD,v 1.31 2012/10/17 14:48:10 apb Exp $ # $NetBSD: BEAGLEBOARD,v 1.32 2012/12/12 00:39:41 matt Exp $
# #
# BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel # BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
# #
@ -17,6 +17,7 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
# CPU options # CPU options
#options UVMHIST,UVMHIST_PRINT
options CPU_CORTEXA8 options CPU_CORTEXA8
options OMAP_3530 options OMAP_3530
options PMAPCOUNTERS options PMAPCOUNTERS
@ -140,7 +141,7 @@ options DDB_ONPANIC=1
options DDB_HISTORY_SIZE=100 # Enable history editing in DDB options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
#options KGDB #options KGDB
makeoptions DEBUG="-g" # compile full symbol table makeoptions DEBUG="-g" # compile full symbol table
options SYMTAB_SPACE=530000 options SYMTAB_SPACE=600000
## USB Debugging options ## USB Debugging options
options USB_DEBUG options USB_DEBUG
@ -168,8 +169,8 @@ mainbus0 at root
cpu0 at mainbus? cpu0 at mainbus?
# Specify the memory size in megabytes. # Specify the memory size in megabytes.
#options MEMSIZE=256 options MEMSIZE=256
options MEMSIZE=128 #options MEMSIZE=128
# L3 Interconnect # L3 Interconnect
L3i0 at mainbus? L3i0 at mainbus?
@ -246,11 +247,11 @@ omapwdt32k* at obio2 addr 0x49030000 size 2048 # WDT3
#omapwdt32k* at obio1 addr 0x48314000 size 2048 # WDT2 #omapwdt32k* at obio1 addr 0x48314000 size 2048 # WDT2
# onboard video # onboard video
omapfb* at obio0 addr 0x48050000 size 0x10000 #omapfb* at obio0 addr 0x48050000 size 0x10000
# make sure the console display is always wsdisplay0 # make sure the console display is always wsdisplay0
wsdisplay0 at wsemuldisplaydev? console 1 #wsdisplay0 at wsemuldisplaydev? console 1
wsdisplay* at wsemuldisplaydev? #wsdisplay* at wsemuldisplaydev?
# various options for wscons - we try to look as much like a standard # various options for wscons - we try to look as much like a standard
# sun console as possible # sun console as possible
@ -272,21 +273,23 @@ pseudo-device wsfont
prcm* at obio1 addr 0x48306000 size 0x2000 # PRM Module prcm* at obio1 addr 0x48306000 size 0x2000 # PRM Module
# On-board USB # On-board USB
#ehci* at obio0 addr 0x48064800 size 0x0400 intr 77
#ohci* at obio0 addr 0x48064400 size 0x0400 intr 76 #ohci* at obio0 addr 0x48064400 size 0x0400 intr 76
ehci* at obio0 addr 0x48064800 size 0x0400 intr 77
#usb* at ohci? #usb* at ohci?
#usb* at ehci? usb* at ehci?
#uhub* at usb? uhub* at usb?
#uhub* at uhub? port ? uhub* at uhub? port ?
#umass* at uhub? port ? configuration ? interface ? umass* at uhub? port ? configuration ? interface ?
#wd* at umass? scsibus* at scsi?
#uhidev* at uhub? sd* at scsibus? target ? lun ?
#ukbd* at uhidev? wd* at umass?
#ums* at uhidev? uhidev* at uhub?
#wskbd* at ukbd? ukbd* at uhidev?
#wsmouse* at ums? ums* at uhidev?
wskbd* at ukbd?
wsmouse* at ums?
#axe* at uhub? port ? configuration ? interface ? axe* at uhub? port ? configuration ? interface ?
# Hardware clocking and power management # Hardware clocking and power management