xserver-xf86-config: move xorg.conf to being machine specific

While on that we refactored the recipe to use PRINC and
FILESEXTRAPATHS_prepend.

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

diff --git a/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf
similarity index 100%
rename from meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
rename to meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf

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
new file mode 100644 (file)
index 0000000..bbb1f53
--- /dev/null
+++ b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf
@@ -0,0 +1,45 @@
+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_0.1.bbappend b/meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index e6c5a53f55d32c42652239a2f75efd94baaa5702..56cb2945339173eb153cb35951d489cbb58d436b 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 
-THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
-FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+PRINC := "${@int(PRINC) + 1}"