From 1f84c1fd36c0e7a08f02ad4e0796b944ae11f112 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 23 Apr 2012 09:59:31 -0300 Subject: 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/imx53ard/xorg.conf | 45 ---------------------- .../xserver-xf86-config/imx53qsb/xorg.conf | 45 ---------------------- .../xorg-xserver/xserver-xf86-config/mx5/xorg.conf | 45 ++++++++++++++++++++++ .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 2 +- 4 files changed, 46 insertions(+), 91 deletions(-) delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf deleted file mode 100644 index bbb1f53..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/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/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/mx5/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/xorg.conf new file mode 100644 index 0000000..bbb1f53 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx5/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/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}" -- cgit v1.2.3-54-g00ecf