Module Name: src
Committed By: matt
Date: Wed Dec 12 00:39:42 UTC 2012
Modified Files:
src/sys/arch/evbarm/conf: BEAGLEBOARD
Log Message:
Disable omapfb/wsdisplay until they stop stealing the console
Enable EHCI and devices.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/BEAGLEBOARD
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/BEAGLEBOARD
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARD:1.31 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.32
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.31 Wed Oct 17 14:48:10 2012
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD Wed Dec 12 00:39:41 2012
@@ -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
#
@@ -17,6 +17,7 @@ options RTC_OFFSET=0 # hardware clock i
# CPU options
+#options UVMHIST,UVMHIST_PRINT
options CPU_CORTEXA8
options OMAP_3530
options PMAPCOUNTERS
@@ -140,7 +141,7 @@ options DDB_ONPANIC=1
options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
#options KGDB
makeoptions DEBUG="-g" # compile full symbol table
-options SYMTAB_SPACE=530000
+options SYMTAB_SPACE=600000
## USB Debugging options
options USB_DEBUG
@@ -168,8 +169,8 @@ mainbus0 at root
cpu0 at mainbus?
# Specify the memory size in megabytes.
-#options MEMSIZE=256
-options MEMSIZE=128
+options MEMSIZE=256
+#options MEMSIZE=128
# L3 Interconnect
L3i0 at mainbus?
@@ -246,11 +247,11 @@ omapwdt32k* at obio2 addr 0x49030000 siz
#omapwdt32k* at obio1 addr 0x48314000 size 2048 # WDT2
# onboard video
-omapfb* at obio0 addr 0x48050000 size 0x10000
+#omapfb* at obio0 addr 0x48050000 size 0x10000
# make sure the console display is always wsdisplay0
-wsdisplay0 at wsemuldisplaydev? console 1
-wsdisplay* at wsemuldisplaydev?
+#wsdisplay0 at wsemuldisplaydev? console 1
+#wsdisplay* at wsemuldisplaydev?
# various options for wscons - we try to look as much like a standard
# sun console as possible
@@ -272,21 +273,23 @@ pseudo-device wsfont
prcm* at obio1 addr 0x48306000 size 0x2000 # PRM Module
# On-board USB
-#ehci* at obio0 addr 0x48064800 size 0x0400 intr 77
#ohci* at obio0 addr 0x48064400 size 0x0400 intr 76
+ehci* at obio0 addr 0x48064800 size 0x0400 intr 77
#usb* at ohci?
-#usb* at ehci?
-#uhub* at usb?
-#uhub* at uhub? port ?
-#umass* at uhub? port ? configuration ? interface ?
-#wd* at umass?
-#uhidev* at uhub?
-#ukbd* at uhidev?
-#ums* at uhidev?
-#wskbd* at ukbd?
-#wsmouse* at ums?
+usb* at ehci?
+uhub* at usb?
+uhub* at uhub? port ?
+umass* at uhub? port ? configuration ? interface ?
+scsibus* at scsi?
+sd* at scsibus? target ? lun ?
+wd* at umass?
+uhidev* at uhub?
+ukbd* at uhidev?
+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
