From c8044ff3841f15320030630a001a570ed19527fa Mon Sep 17 00:00:00 2001 From: Madeeha Javed Date: Tue, 8 Nov 2011 14:43:57 -0600 Subject: [PATCH] Add support for graphics on p1022ds Signed-off-by: Madeeha Javed Signed-off-by: Matthew McClintock --- meta-fsl-ppc/conf/machine/p1022ds.conf | 10 +++++ .../xorg-driver/xf86-video-fbdev_0.4.2.bb | 9 +++++ .../xorg-driver/xorg-driver-common.inc | 40 +++++++++++++++++++ .../xorg-driver/xorg-driver-video.inc | 4 ++ .../xserver-xf86-config/p1022ds/xorg.conf | 27 +++++++++++++ .../xserver-xf86-config_0.1.bbappend | 1 + 6 files changed, 91 insertions(+) create mode 100644 meta-fsl-ppc/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb create mode 100644 meta-fsl-ppc/recipes-graphics/xorg-driver/xorg-driver-common.inc create mode 100644 meta-fsl-ppc/recipes-graphics/xorg-driver/xorg-driver-video.inc create mode 100644 meta-fsl-ppc/recipes-graphics/xorg-xserver/xserver-xf86-config/p1022ds/xorg.conf create mode 100644 meta-fsl-ppc/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend diff --git a/meta-fsl-ppc/conf/machine/p1022ds.conf b/meta-fsl-ppc/conf/machine/p1022ds.conf index 07246dca..b104a482 100644 --- a/meta-fsl-ppc/conf/machine/p1022ds.conf +++ b/meta-fsl-ppc/conf/machine/p1022ds.conf @@ -6,3 +6,13 @@ require e500v2.inc UBOOT_MACHINES = "P1022DS" KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/p1022ds.dts" KERNEL_DEFCONFIG = "${S}/arch/powerpc/configs/mpc85xx_smp_defconfig" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite" + +XSERVER = " \ + xserver-xf86-lite \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-input-keyboard \ + xf86-video-fbdev \ +" diff --git a/meta-fsl-ppc/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb b/meta-fsl-ppc/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb new file mode 100644 index 00000000..d555fbc4 --- /dev/null +++ b/meta-fsl-ppc/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" + +DESCRIPTION = "X.Org X server -- fbdev display driver" +PE = "1" +PR = "${INC_PR}.1" + +SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074" +SRC_URI[sha256sum] = "93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5" diff --git a/meta-fsl-ppc/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta-fsl-ppc/recipes-graphics/xorg-driver/xorg-driver-common.inc new file mode 100644 index 00000000..c0f4a15a --- /dev/null +++ b/meta-fsl-ppc/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -0,0 +1,40 @@ +DESCRIPTION = "X driver" +HOMEPAGE = "http://www.x.org" +SECTION = "x11/drivers" +LICENSE = "MIT-X" +INC_PR = "r15" + +DEPENDS = "randrproto virtual/xserver-xf86 xproto" + +SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" + +S = "${WORKDIR}/${BPN}-${PV}" + +FILES_${PN} += " ${libdir}/xorg/modules" +FILES_${PN}-dbg += "${libdir}/xorg/modules/*/.debug" + +inherit autotools pkgconfig + +TARGET_CPPFLAGS += "-I${STAGING_DIR_HOST}/usr/include/xorg" + +# Another sucky behavor from Xorg configure scripts. +# They use AC_CHECK_FILE to check for DRI headers. Yuck! +# Of course this will blow up when cross compiling. + +do_configure_prepend() { + incdir=${layout_includedir}/xorg + for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do + path="$incdir/$f" + if [ -f "${STAGING_DIR_HOST}/$path" ]; then + p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'` + eval "export ac_cv_file_$p=yes" + fi + done +} + +# FIXME: We don't want to include the libtool archives (*.la) from modules +# directory, as they serve no useful purpose. Upstream should fix Makefile.am +do_install_append() { + find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- +} + diff --git a/meta-fsl-ppc/recipes-graphics/xorg-driver/xorg-driver-video.inc b/meta-fsl-ppc/recipes-graphics/xorg-driver/xorg-driver-video.inc new file mode 100644 index 00000000..bce8c9a7 --- /dev/null +++ b/meta-fsl-ppc/recipes-graphics/xorg-driver/xorg-driver-video.inc @@ -0,0 +1,4 @@ +include xorg-driver-common.inc + +DEPENDS = "randrproto renderproto videoproto xextproto fontsproto xproto" + diff --git a/meta-fsl-ppc/recipes-graphics/xorg-xserver/xserver-xf86-config/p1022ds/xorg.conf b/meta-fsl-ppc/recipes-graphics/xorg-xserver/xserver-xf86-config/p1022ds/xorg.conf new file mode 100644 index 00000000..57f284e8 --- /dev/null +++ b/meta-fsl-ppc/recipes-graphics/xorg-xserver/xserver-xf86-config/p1022ds/xorg.conf @@ -0,0 +1,27 @@ +Section "Screen" + Identifier "Builtin Default fbdev Screen 0" + Device "Builtin Default fbdev Device 0" +EndSection + +Section "ServerLayout" + Identifier "Builtin Default Layout" + Screen "Builtin Default fbdev Screen 0" +EndSection + +Section "ServerFlags" + Option "DontZap" "0" +EndSection + +Section "InputClass" + Identifier "keyboard-all" + Driver "evdev" + MatchIsKeyboard "on" +EndSection + + +Section "InputClass" + Identifier "mouse-all" + Driver "evdev" + MatchIsPointer "on" +EndSection + diff --git a/meta-fsl-ppc/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-fsl-ppc/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend new file mode 100644 index 00000000..72d991c7 --- /dev/null +++ b/meta-fsl-ppc/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -- 2.40.1