diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-07-20 11:03:06 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-07-20 13:53:24 -0300 |
commit | e634ab0400de9b460eefafd2b50bcec84f31ca2d (patch) | |
tree | f100310f948a8b348f4f03b8235cd5de52cf11a4 | |
parent | 053d5f2c9cabc2b6d24fdacfcdeea89ff204074a (diff) | |
download | meta-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.conf | 43 | ||||
-rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 2 |
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 @@ | |||
1 | Section "InputDevice" | ||
2 | Identifier "Generic Keyboard" | ||
3 | Driver "kbd" | ||
4 | Option "XkbRules" "xorg" | ||
5 | Option "XkbModel" "pc105" | ||
6 | Option "XkbLayout" "us" | ||
7 | EndSection | ||
8 | |||
9 | Section "InputDevice" | ||
10 | Identifier "Configured Mouse" | ||
11 | Driver "mouse" | ||
12 | Option "CorePointer" | ||
13 | EndSection | ||
14 | |||
15 | Section "InputClass" | ||
16 | Identifier "eGalax" | ||
17 | MatchIsTouchscreen "on" | ||
18 | MatchDevicePath "/dev/input/event*" | ||
19 | Driver "evdev" | ||
20 | EndSection | ||
21 | |||
22 | Section "Device" | 1 | Section "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" |
26 | EndSection | ||
27 | |||
28 | Section "Monitor" | ||
29 | Identifier "Configured Monitor" | ||
30 | EndSection | ||
31 | |||
32 | Section "Screen" | ||
33 | Identifier "Default Screen" | ||
34 | Monitor "Configured Monitor" | ||
35 | Device "Framebuffer Device" | ||
36 | EndSection | 5 | EndSection |
37 | 6 | ||
38 | Section "ServerLayout" | 7 | Section "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" | ||
41 | EndSection | 12 | EndSection |
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 |
2 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 2 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
3 | 3 | ||
4 | PRINC := "${@int(PRINC) + 5}" | 4 | PRINC := "${@int(PRINC) + 6}" |