From b579763aacec7c809a97f4a3bdc786c7759ef471 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 23 Apr 2012 09:59:31 -0300 Subject: [PATCH] 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 --- .../xserver-xf86-config/imx53qsb/xorg.conf | 45 ------------------- .../{imx53ard => mx5}/xorg.conf | 0 .../xserver-xf86-config_0.1.bbappend | 2 +- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf rename meta-fsl-arm/recipes-graphics/xorg-xserver/xserver-xf86-config/{imx53ard => mx5}/xorg.conf (100%) 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 index bbb1f530..00000000 --- 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 56cb2945..761eac95 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) + 1}" +PRINC := "${@int(PRINC) + 2}" -- 2.40.1