aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-graphics/xorg-xserver
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-04-23 09:59:31 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-04-23 10:07:40 -0300
commit1f84c1fd36c0e7a08f02ad4e0796b944ae11f112 (patch)
treef5a154ae6d36279dd5e0225140dcfd50707ea188 /recipes-graphics/xorg-xserver
parent0359d775e6ca41b2babe2fe78b3d5a1970e378ba (diff)
downloadmeta-fsl-arm-1f84c1fd36c0e7a08f02ad4e0796b944ae11f112.zip
meta-fsl-arm-1f84c1fd36c0e7a08f02ad4e0796b944ae11f112.tar.gz
meta-fsl-arm-1f84c1fd36c0e7a08f02ad4e0796b944ae11f112.tar.bz2
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>
Diffstat (limited to 'recipes-graphics/xorg-xserver')
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf45
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf (renamed from recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf)0
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend2
3 files changed, 1 insertions, 46 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf
deleted file mode 100644
index bbb1f53..0000000
--- a/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/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
index bbb1f53..bbb1f53 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf
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 56cb294..761eac9 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) + 1}"
+PRINC := "${@int(PRINC) + 2}"