Module Name: src
Committed By: jmcneill
Date: Mon Nov 10 17:56:58 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: CUBIEBOARD
Log Message:
enable awinhdmi, awintcon, awindebe, genfb, wsmux, wsfont
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/CUBIEBOARD
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/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.31 src/sys/arch/evbarm/conf/CUBIEBOARD:1.32
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.31 Wed Nov 5 20:32:53 2014
+++ src/sys/arch/evbarm/conf/CUBIEBOARD Mon Nov 10 17:56:58 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: CUBIEBOARD,v 1.31 2014/11/05 20:32:53 martin Exp $
+# $NetBSD: CUBIEBOARD,v 1.32 2014/11/10 17:56:58 jmcneill Exp $
#
# CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
#
@@ -252,27 +252,30 @@ awincnt0 at awinio0
awinac0 at awinio0
audio0 at awinac0
-# onboard video
-#awinfb* at obio0 addr 0x48050000 size 0x10000
-#wsdisplay* at wsemuldisplaydev? console ?
-
-# 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_PCVT # emulate some ioctls
-#options WSDISPLAY_COMPAT_SYSCONS # emulate some more ioctls
-#options WSDISPLAY_COMPAT_USL # wsconscfg VT handling
-#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
-#options WSDISPLAY_DEFAULTSCREENS=4
-#options FONT_QVSS8x15
-#options FONT_GALLANT12x22 # the console font
+# HDMI
+awinhdmi0 at awinio0
-#pseudo-device wsmux # mouse & keyboard multiplexor
-#pseudo-device wsfont
+# TCON
+awintcon0 at awinio0 port 0
+
+# DE-BE
+awindebe0 at awinio0 port 0
+
+# Framebuffer
+genfb0 at awindebe0
+wsdisplay* at genfb?
+options VCONS_DRAW_INTR
+options WSEMUL_VT100
+options WS_KERNEL_FG=WSCOL_GREEN
+options WS_KERNEL_BG=WSCOL_BLACK
+options WSDISPLAY_COMPAT_PCVT
+options WSDISPLAY_COMPAT_SYSCONS
+options WSDISPLAY_COMPAT_USL
+options WSDISPLAY_COMPAT_RAWKBD
+options WSDISPLAY_DEFAULTSCREENS=4
+
+pseudo-device wsmux # mouse & keyboard multiplexor
+pseudo-device wsfont
# Power, Reset and Clock Management
#prcm* at awinio?
