xserver-xf86-config: merge imx53qsb and imx53ard onto mx5

This avoids meta-data duplication and easy code reuse for external
boards as they only need to make the board machine configuration from
mx5 SOC_FAMILY to properly configure Xorg.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf
deleted file mode 100644 (file)
index bbb1f53..0000000
--- a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-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"
-    Option      "fbdev"     "/dev/fb0"
-    # This option only recognized when "mxc_epdc_fb" frame buffer driver in
-    # use.  Values are "RGB565" (default, 16-bit RGB), "Y8" (8-bit gray),
-    # 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/imx53ard/xorg.conf b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
similarity index 100%
rename from meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf
rename to meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf

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 56cb2945339173eb153cb35951d489cbb58d436b..761eac95c151cd5d7a589d8f9c05f02f4e064fe1 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) + 1}"
+PRINC := "${@int(PRINC) + 2}"