summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-04-29 09:55:59 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-04-29 13:14:51 -0300
commit84c700b91566e3f9577afc55fd16cc5d255ca513 (patch)
tree478395fb6ef40fedb738171a2bd1c15e30515961
parent6764afb5971ad26f3bfabc37e08b0796cc65a465 (diff)
downloadmeta-freescale-84c700b91566e3f9577afc55fd16cc5d255ca513.tar.gz
xserver-xf86-config: mx5: drop unused configurations
Nowadays Xorg can mostly auto-configure itself so xorg.conf ought to be used as less as possible; this drops the settings that Xorg ought to generate by itself. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf36
-rw-r--r--meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend2
2 files changed, 1 insertions, 37 deletions
diff --git a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
index bbb1f5305..ddfd7df05 100644
--- a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
+++ b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
@@ -1,24 +1,3 @@
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 "i.MX Accelerated Framebuffer Device" 2 Identifier "i.MX Accelerated Framebuffer Device"
24 Driver "imx" 3 Driver "imx"
@@ -28,18 +7,3 @@ Section "Device"
28 # and "Y8INV" (8-bit gray inverted). 7 # and "Y8INV" (8-bit gray inverted).
29 Option "FormatEPDC" "Y8INV" 8 Option "FormatEPDC" "Y8INV"
30EndSection 9EndSection
31
32Section "Monitor"
33 Identifier "Configured Monitor"
34EndSection
35
36Section "Screen"
37 Identifier "Default Screen"
38 Monitor "Configured Monitor"
39 Device "i.MX Accelerated Framebuffer Device"
40EndSection
41
42Section "ServerLayout"
43 Identifier "Default Layout"
44 Screen "Default Screen"
45EndSection
diff --git a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 761eac95c..f6de5e814 100644
--- a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/meta-fsl-arm/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) + 2}" 4PRINC := "${@int(PRINC) + 3}"