Module Name:    src
Committed By:   macallan
Date:           Tue Aug 31 19:07:01 UTC 2010

Modified Files:
        src/sys/arch/evbarm/conf: BEAGLEBOARD

Log Message:
enable omapfb and related stuff


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/sys/arch/evbarm/conf/BEAGLEBOARD:1.11
--- src/sys/arch/evbarm/conf/BEAGLEBOARD:1.10	Sat Aug 28 13:02:32 2010
+++ src/sys/arch/evbarm/conf/BEAGLEBOARD	Tue Aug 31 19:07:01 2010
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BEAGLEBOARD,v 1.10 2010/08/28 13:02:32 ahoka Exp $
+#	$NetBSD: BEAGLEBOARD,v 1.11 2010/08/31 19:07:01 macallan Exp $
 #
 #	BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
 #
@@ -27,7 +27,7 @@
 
 file-system	FFS		# UFS
 #file-system	LFS		# log-structured file system
-file-system	MFS		# memory file system
+#file-system	MFS		# memory file system
 file-system	NFS		# Network file system
 #file-system 	ADOSFS		# AmigaDOS-compatible file system
 #file-system 	EXT2FS		# second extended file system (linux)
@@ -87,8 +87,8 @@
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
 options 	COMPAT_50	# NetBSD 5.0 compatibility.
-options 	COMPAT_40	# NetBSD 4.0 compatibility.
-options 	COMPAT_30	# NetBSD 3.0 compatibility.
+#options 	COMPAT_40	# NetBSD 4.0 compatibility.
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_20	# NetBSD 2.0 compatibility.
 #options 	COMPAT_16	# NetBSD 1.6 compatibility.
 #options 	COMPAT_15	# NetBSD 1.5 compatibility.
@@ -145,6 +145,7 @@
 
 ## USB Debugging options
 options USB_DEBUG
+options EHCI_DEBUG
 options OHCI_DEBUG 
 options UHUB_DEBUG 
 
@@ -168,7 +169,7 @@
 cpu0		at mainbus?
 
 # Specify the memory size in megabytes.
-options		MEMSIZE=128
+options		MEMSIZE=256
 
 # L3 Interconnect
 L3i0		at mainbus?
@@ -204,7 +205,7 @@
 
 # On-board 16550 UARTs
 com0		at obio2 addr 0x49020000 intr 74 mult 4	# UART3 (console)
-#options 	CONSADDR=0x49020000, CONSPEED=57600
+#options 	CONSADDR=0x49020000, CONSPEED=38400
 options 	CONSADDR=0x49020000, CONSPEED=115200
 
 # Operating System Timer
@@ -220,16 +221,47 @@
 #omapwdt32k*	at obio1 addr 0x4830c000 size 2048	# WDT1
 #omapwdt32k*	at obio1 addr 0x48314000 size 2048	# WDT2
 
+# onboard video
+omapfb*		at obio0 addr 0x48050000 size 0x10000
+
+# 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
+
+pseudo-device	wsmux			# mouse & keyboard multiplexor
+pseudo-device	wsfont
+
 # Power, Reset and Clock Management
 prcm*		at obio1 addr 0x48306000 size 0x2000	# PRM Module
 
 # On-board USB
-#ehci*		at obio0 addr 0x48064800 size 0x0400 intr 77
+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?
+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?
+
 #axe*		at uhub? port ? configuration ? interface ?
 
 # Hardware clocking and power management
@@ -241,7 +273,7 @@
 # Pseudo-Devices
 
 # disk/mass storage pseudo-devices
-pseudo-device	md		1	# memory disk device (ramdisk)
+#pseudo-device	md		1	# memory disk device (ramdisk)
 #pseudo-device	vnd			# disk-like interface to files
 #pseudo-device	fss			# file system snapshot device
 

Reply via email to