From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 20 Jul 2012 14:03:06 +0000 (-0300)
Subject: xserver-xf86-config (mx6): refactor default configuration
X-Git-Tag: 2.1~1738^2
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=db16ea2521a5f397832a36ff88f4177fe9f9caa4;p=meta-freescale.git

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>
---

diff --git a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
index fc227597..79b6c0fc 100644
--- a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
+++ b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
@@ -1,41 +1,12 @@
-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  "Framebuffer Device"
+    Identifier  "Kernel Framebuffer Device"
     Driver      "fbdev"
-    Option      "fbdev"     "/dev/fb0"
-EndSection
-
-Section "Monitor"
-    Identifier  "Configured Monitor"
-EndSection
-
-Section "Screen"
-    Identifier  "Default Screen"
-    Monitor     "Configured Monitor"
-    Device      "Framebuffer Device"
+    Option      "fbdev" "/dev/fb0"
 EndSection
 
-Section "ServerLayout"
-    Identifier  "Default Layout"
-    Screen      "Default Screen"
+Section "ServerFlags"
+    Option "BlankTime"  "0"
+    Option "StandbyTime"  "0"
+    Option "SuspendTime"  "0"
+    Option "OffTime"  "0"
 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 81dea271..032aad57 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 @@
 # Append path for freescale layer to include bsp xorg.conf 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 5}"
+PRINC := "${@int(PRINC) + 6}"