Merge remote-tracking branch 'freescale/denzil' into master

* freescale/denzil:
  xserver-xf86-config (mx6): refactor default configuration
  xserver-xf86-config (mx5): disable DPMS functions by default

3 files changed, 15 insertions, 37 deletions

diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
index ddfd7df..a99e6f2 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
@@ -7,3 +7,10 @@ Section "Device"
     # and "Y8INV" (8-bit gray inverted).
     Option      "FormatEPDC"    "Y8INV"
 EndSection
+
+Section "ServerFlags"
+    Option "BlankTime"  "0"
+    Option "StandbyTime"  "0"
+    Option "SuspendTime"  "0"
+    Option "OffTime"  "0"
+EndSection
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 @@
-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/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 1265c1d..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 @@
 # Append path for freescale layer to include bsp xorg.conf 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 4}"
+PRINC := "${@int(PRINC) + 6}"