Module Name: src
Committed By: kiyohara
Date: Mon Dec 24 07:05:24 UTC 2012
Modified Files:
src/sys/arch/evbarm/conf: OVERO
Log Message:
Enable ehci and umass. (tested only Chestnut43)
Add some comment-outed devices.
Indent and reorder.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/OVERO
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/OVERO
diff -u src/sys/arch/evbarm/conf/OVERO:1.20 src/sys/arch/evbarm/conf/OVERO:1.21
--- src/sys/arch/evbarm/conf/OVERO:1.20 Sat Dec 8 07:05:23 2012
+++ src/sys/arch/evbarm/conf/OVERO Mon Dec 24 07:05:24 2012
@@ -1,5 +1,5 @@
#
-# $NetBSD: OVERO,v 1.20 2012/12/08 07:05:23 matt Exp $
+# $NetBSD: OVERO,v 1.21 2012/12/24 07:05:24 kiyohara Exp $
#
# OVERO -- Gumstix. Inc. Overo platforms kernel
#
@@ -188,42 +188,42 @@ omapgpio5 at obio2 addr 0x49058000 size
gpio* at omapgpio?
+# I2C Controller
+#omapiic0 at obio0 addr 0x48070000 size 0x80 intr 56
+#omapiic1 at obio0 addr 0x48060000 size 0x80 intr 61
+
+#iic* at omapiic?
+
+# Integrated Power Management/Audio Codec
+#gaia* at iic? addr 0x48..0x4b
+
# On-board 16550 UARTs
com0 at obio2 addr 0x49020000 intr 74 mult 4 # UART3 (console)
options CONSADDR=0x49020000, CONSPEED=115200
+#com1 at obio0 addr 0x4806c000 intr 73 mult 4 # UART2 (bluetooth)
# Operating System Timer
-omapmputmr0 at obio2 addr 0x49032000 intr 38 # GP Timer 2
+omapmputmr0 at obio2 addr 0x49032000 intr 38 # GP Timer 2
# Statistics Timer
-omapmputmr1 at obio2 addr 0x49034000 intr 39 # GP Timer 3
+omapmputmr1 at obio2 addr 0x49034000 intr 39 # GP Timer 3
# Microtime Reference Timer
-omapmputmr2 at obio2 addr 0x49036000 intr 40 # GP Timer 4
+omapmputmr2 at obio2 addr 0x49036000 intr 40 # GP Timer 4
options OMAP_MPU_TIMER_CLOCK_FREQ=12000000
# Watchdog timers
-#omapwdt32k* at obio2 addr 0x49030000 size 0x0800 # WDT3
-#omapwdt32k* at obio1 addr 0x4830c000 size 0x0800 # WDT1
-omapwdt32k* at obio1 addr 0x48314000 size 0x0800 # WDT2
+omapwdt32k* at obio1 addr 0x48314000 size 0x0800 # WDT2
+#omapwdt32k* at obio2 addr 0x49030000 size 0x0800 # WDT3
# Power, Reset and Clock Management
-prcm* at obio1 addr 0x48306000 size 0x2000 # PRM Module
+prcm* at obio1 addr 0x48306000 size 0x2000 # PRM Module
# SDHC controllers
sdhc0 at obio0 addr 0x4809c000 size 0x0400 intr 83
-#sdhc1 at obio0 addr 0x480b4000 size 0x0400 intr 86 # Wifi
+#sdhc1 at obio0 addr 0x480b4000 size 0x0400 intr 86 # Wifi
-sdmmc* at sdhc? # SD/MMC bus
+sdmmc* at sdhc? # SD/MMC bus
ld* at sdmmc?
-# On-board USB
-#ehci* at obio0 addr 0x48064800 size 0x0400 intr 77
-#ohci* at obio0 addr 0x48064400 size 0x0400 intr 76
-#usb* at ohci?
-#uhub* at usb?
-##umass* at uhub? port ? configuration ? interface ?
-##wd* at umass?
-#axe* at uhub? port ? configuration ? interface ?
-
# Hardware clocking and power management
options HWCLOCK
@@ -233,11 +233,49 @@ options OMAP_CK_REF_SPEED=12000000
# overo expantion boards
# SMSC LAN9221
-smsh0 at gpmc? addr 0x01000000 intr 272 # Tobi, Chestnut43
-smsh1 at gpmc? addr 0x02000000 intr 161 # Tobi-Duo
+smsh0 at gpmc? addr 0x01000000 intr 272 # Tobi, Chestnut43
+smsh1 at gpmc? addr 0x02000000 intr 161 # Tobi-Duo
# MII/PHY support
-ukphy* at mii? phy ? # smsh(4) internal PHY
+ukphy* at mii? phy ? # smsh(4) internal PHY
+
+# LCD/DVI-D
+#omapfb* at obio0 addr 0x48050000 size 0x10000 # Chestnut*, Palo*,
+ # Gallop* (LCD)
+ # Tobi, Summit (DVI-D)
+
+# make sure the console display is always wsdisplay0
+#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
+options WSEMUL_VT100 # sun terminal emulation
+options WS_DEFAULT_FG=WSCOL_BLACK
+options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
+options WS_KERNEL_FG=WSCOL_GREEN
+options WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+options WSDISPLAY_DEFAULTSCREENS=4
+options FONT_QVSS8x15
+#options FONT_GALLANT12x22 # the console font
+
+# USB Host
+ehci* at obio0 addr 0x48064800 size 0x0400 intr 77
+ # Chestnut*, Palo*,
+ # RoboVero, Summit,
+ # Tobi, TurtleCore
+usb* at ehci?
+
+# USB Hubs
+uhub* at usb?
+uhub* at uhub? port ?
+
+umass* at uhub? port ?
+scsibus* at scsi?
+sd* at scsibus? target ? lun ?
+wd* at umass?
# Pseudo-Devices
@@ -272,14 +310,14 @@ pseudo-device loop # network loopback
#pseudo-device sl # Serial Line IP
#pseudo-device strip # Starmode Radio IP (Metricom)
#pseudo-device irframetty # IrDA frame line discipline
-#pseudo-device tap # virtual Ethernet
+pseudo-device tap # virtual Ethernet
#pseudo-device tun # network tunneling over tty
#pseudo-device gre # generic L3 over IP tunnel
#pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
#pseudo-device faith # IPv[46] TCP relay translation i/f
#pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation
#pseudo-device vlan # IEEE 802.1q encapsulation
-#pseudo-device bridge # simple inter-network bridging
+pseudo-device bridge # simple inter-network bridging
#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
#pseudo-device agr # IEEE 802.3ad link aggregation
#pseudo-device pf # PF packet filter
@@ -291,8 +329,7 @@ pseudo-device pty # pseudo-terminals
options RND_COM
pseudo-device clockctl # user control of clock subsystem
pseudo-device ksyms # /dev/ksyms
-#pseudo-device bcsp # BlueCore Serial Protocol
-pseudo-device btuart # Bluetooth HCI UART (H4)
+#pseudo-device btuart # Bluetooth HCI UART (H4)
# connect CSR module
# a pseudo device needed for Coda # also needs CODA (above)
@@ -303,7 +340,7 @@ pseudo-device btuart # Bluetooth HCI U
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
-#pseudo-device wsfont
+pseudo-device wsfont
# data mover pseudo-devices
#pseudo-device swdmover # software dmover(9) back-end
