summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-07-20 11:03:06 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-07-20 13:53:24 -0300
commite634ab0400de9b460eefafd2b50bcec84f31ca2d (patch)
treef100310f948a8b348f4f03b8235cd5de52cf11a4
parent053d5f2c9cabc2b6d24fdacfcdeea89ff204074a (diff)
downloadmeta-fsl-arm-e634ab0400de9b460eefafd2b50bcec84f31ca2d.tar.gz
xserver-xf86-config (mx6): refactor default configuration
We refactor the default configuration to the same defaults used in mx5 machines. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Daiane Angolini <daiane.angolini@freescale.com>
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf43
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend2
2 files changed, 8 insertions, 37 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
index fc22759..79b6c0f 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
@@ -1,41 +1,12 @@
1Section "InputDevice"
2 Identifier "Generic Keyboard"
3 Driver "kbd"
4 Option "XkbRules" "xorg"
5 Option "XkbModel" "pc105"
6 Option "XkbLayout" "us"
7EndSection
8
9Section "InputDevice"
10 Identifier "Configured Mouse"
11 Driver "mouse"
12 Option "CorePointer"
13EndSection
14
15Section "InputClass"
16 Identifier "eGalax"
17 MatchIsTouchscreen "on"
18 MatchDevicePath "/dev/input/event*"
19 Driver "evdev"
20EndSection
21
22Section "Device" 1Section "Device"
23 Identifier "Framebuffer Device" 2 Identifier "Kernel Framebuffer Device"
24 Driver "fbdev" 3 Driver "fbdev"
25 Option "fbdev" "/dev/fb0" 4 Option "fbdev" "/dev/fb0"
26EndSection
27
28Section "Monitor"
29 Identifier "Configured Monitor"
30EndSection
31
32Section "Screen"
33 Identifier "Default Screen"
34 Monitor "Configured Monitor"
35 Device "Framebuffer Device"
36EndSection 5EndSection
37 6
38Section "ServerLayout" 7Section "ServerFlags"
39 Identifier "Default Layout" 8 Option "BlankTime" "0"
40 Screen "Default Screen" 9 Option "StandbyTime" "0"
10 Option "SuspendTime" "0"
11 Option "OffTime" "0"
41EndSection 12EndSection
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 81dea27..032aad5 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1,4 +1,4 @@
1# Append path for freescale layer to include bsp xorg.conf 1# Append path for freescale layer to include bsp xorg.conf
2FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 2FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
3 3
4PRINC := "${@int(PRINC) + 5}" 4PRINC := "${@int(PRINC) + 6}"