summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <n-dechesne@ti.com>2012-10-19 15:51:26 +0200
committerDenys Dmytriyenko <denys@ti.com>2012-10-24 20:57:37 -0400
commit95e12712ddffcc7ec0789a8700137afe2e449445 (patch)
tree59611daa7640372e248d6e58df9d23211e1faa54
parent410dc026f2ee24a2346e7563a83f0181c79809cf (diff)
downloadmeta-ti-95e12712ddffcc7ec0789a8700137afe2e449445.tar.gz
pandaboard: use xf86-video-omap by default in XSERVER config
Also we need to pull in module-exa as xf86-video-omap relies on it, at run time. And replaced the default xorg.conf for 'omap4' machine to take new driver into account. Do not enable HWcursor (e.g. mouse using DSS overlay) to keep things simple for now.. Signed-off-by: Nicolas Dechesne <n-dechesne@ti.com> Signed-off-by: Hervé Fache <h-fache@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--conf/machine/include/omap4.inc3
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf44
2 files changed, 17 insertions, 30 deletions
diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index 96eaae76..ecd23c40 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -11,8 +11,9 @@ XSERVER = "xserver-xorg \
11 xserver-xorg-extension-dri \ 11 xserver-xorg-extension-dri \
12 xserver-xorg-extension-dri2 \ 12 xserver-xorg-extension-dri2 \
13 xserver-xorg-extension-glx \ 13 xserver-xorg-extension-glx \
14 xserver-xorg-module-exa \
14 xf86-input-evdev \ 15 xf86-input-evdev \
15 xf86-video-fbdev" 16 xf86-video-omap"
16 17
17# Increase this everytime you change something in the kernel 18# Increase this everytime you change something in the kernel
18MACHINE_KERNEL_PR = "r1" 19MACHINE_KERNEL_PR = "r1"
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf
index 0d6ab435..87ded4dd 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/omap4/xorg.conf
@@ -1,29 +1,15 @@
1Section "Module" 1# more /usr/share/X11/xorg.conf.d/99-omap.conf
2 Load "extmod" 2# X.Org X server configuration file
3 Load "dbe" 3
4 Load "glx" 4Section "Device"
5 Load "freetype" 5 Identifier "Video Device"
6 Load "type1" 6 Driver "omap"
7 Load "record" 7 Option "Debug" "false"
8 Load "dri" 8 Option "HWcursor" "false"
9EndSection 9EndSection
10 10
11Section "Monitor" 11Section "Screen"
12 Identifier "Builtin Default Monitor" 12 Identifier "Screen"
13EndSection 13 Monitor "Monitor"
14 14 Device "Video Device"
15Section "Device" 15EndSection
16 Identifier "Builtin Default fbdev Device 0"
17 Driver "fbdev"
18EndSection
19
20Section "Screen"
21 Identifier "Builtin Default fbdev Screen 0"
22 Device "Builtin Default fbdev Device 0"
23 Monitor "Builtin Default Monitor"
24EndSection
25
26Section "ServerLayout"
27 Identifier "Builtin Default Layout"
28 Screen "Builtin Default fbdev Screen 0"
29EndSection