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>

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 bbb1f5305ab20550462209d1ff0bcef484e7c7db..ddfd7df050916858b3567cf7250bcd7dce81aa98 100644 (file)
--- 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 @@
-Section "InputDevice"
-    Identifier  "Generic Keyboard"
-    Driver      "kbd"
-    Option      "XkbRules"  "xorg"
-    Option      "XkbModel"  "pc105"
-    Option      "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
-    Identifier  "Configured Mouse"
-    Driver      "mouse"
-    Option      "CorePointer"
-EndSection
-
-Section "InputClass"
-    Identifier "eGalax"
-    MatchIsTouchscreen "on"
-    MatchDevicePath "/dev/input/event*"
-    Driver "evdev"
-EndSection
-
 Section "Device"
     Identifier  "i.MX Accelerated Framebuffer Device"
     Driver      "imx"
@@ -28,18 +7,3 @@ Section "Device"
     # and "Y8INV" (8-bit gray inverted).
     Option      "FormatEPDC"    "Y8INV"
 EndSection
-
-Section "Monitor"
-    Identifier  "Configured Monitor"
-EndSection
-
-Section "Screen"
-    Identifier  "Default Screen"
-    Monitor     "Configured Monitor"
-    Device      "i.MX Accelerated Framebuffer Device"
-EndSection
-
-Section "ServerLayout"
-    Identifier  "Default Layout"
-    Screen      "Default Screen"
-EndSection

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 761eac95c151cd5d7a589d8f9c05f02f4e064fe1..f6de5e814eb92b986fe392533f8ee407eff5030a 100644 (file)
--- 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 @@
 # Append path for freescale layer to include bsp xorg.conf 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"