On Thu, Nov 22, 2012 at 10:56 AM, Fabio Estevam <festevam@...> wrote:

On Wed, Nov 21, 2012 at 10:38 AM, Otavio Salvador
<otavio@...> wrote:

It seems to be all done; I am pondering if it might be a problem with
our U-Boot; you might try to use Freescale U-Boot and give it a try.

What makes you suspect of a bootloader related issue?

It try to find a base address and it might be have been placed
somewhere during SoC initialization however Daiane has tested it with
mainline and FSL U-Boot and both has same result.

--
Otavio Salvador O.S. Systems
E-mail: otavio@... http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

Hello,

This is the third version of the patchset. The segfault seems fixed
and I'd like to ask you to test and comment on them.

If we don't find new problems from this I'd like to merge this
patchset soon so we reduce the amount of not-merged patches being
handled. This is also going to offer a good base for work in next
integration steps as for example Qt support.

The the GStreamer codec support is being finished and we'll send it as
another patchset soon.

Changes for v3:

* Drop merged patches (firmware-imx, imx-lib, imx-test);
* Rework GPU packaging to include test applications;
* Fix Linux kernel configuration to have GPU module built-in;

Changes for v2:

* Fix Vivant Xorg driver to rdepends on Xorg EXA module;
* Minor cleanup in Xorg driver packaging;

Adrian Alonso (2):
xf86-dri-vivante: Add Vivant DRI driver for Xorg
xf86-video-imxfb-vivante: Add Vivant Xorg driver for iMX SoCs

Daiane Angolini (1):
linux-imx (3.0.35): Configure GPU module to be builtin

Otavio Salvador (5):
linux-imx (3.0.35): Move defconfig to mx6 directory
gpu-viv-bin-mx6q: Add Vivant GPU libraries
mesa-dri: Change provided set of libraries when building for iMX6
xserver-xf86-config: Use Vivant accelerated driver for iMX6
imx-base: Use xf86-video-imxfb-vivant for iMX6 targets

conf/machine/include/imx-base.inc | 1 +
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 144 ++++++++++++++++++++
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb | 9 ++
recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 4 +-
recipes-graphics/mesa/mesa-dri_git.bbappend | 4 +-
.../xorg-driver/xf86-dri-vivante_12.09.01.bb | 31 +++++
.../Makefile.am-remove-prefixed-include-path.patch | 29 ++++
.../xf86-video-imxfb-vivante_12.09.01.bb | 27 ++++
.../xorg-xserver/xserver-xf86-config/mx6/xorg.conf | 8 +-
.../xorg-xserver/xserver-xf86-config_0.1.bbappend | 2 +-
.../linux/linux-imx-3.0.35/{ => mx6}/defconfig | 2 +-
recipes-kernel/linux/linux-imx_3.0.35.bb | 2 +-
12 files changed, 255 insertions(+), 8 deletions(-)
create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
create mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
create mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
rename recipes-kernel/linux/linux-imx-3.0.35/{ => mx6}/defconfig (99%)

--
1.7.10.4

The defconfig is specific of mx6 SoCs thus needs to be moved to
reflect it.

Change-Id: I6a5651ef8e72109353399aeadb5acf2f92980d45
Signed-off-by: Otavio Salvador <otavio@...>
---
recipes-kernel/linux/linux-imx-3.0.35/{ => mx6}/defconfig | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename recipes-kernel/linux/linux-imx-3.0.35/{ => mx6}/defconfig (100%)

diff --git a/recipes-kernel/linux/linux-imx-3.0.35/defconfig b/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux-imx-3.0.35/defconfig
rename to recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig
--
1.7.10.4

From: Daiane Angolini <daiane.angolini@...>

Change defconfig for mx6 family.

This module was configured to be built as module, but
for X11 environment it would be better to have it always
included in kernel.

Change-Id: I3fc48192a1f366671f1f5fea904379bdee6eb69c
Signed-off-by: Daiane Angolini <daiane.angolini@...>
---
recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig | 2 +-
recipes-kernel/linux/linux-imx_3.0.35.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig b/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig
index b5e457e..a8bc503 100644
--- a/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig
+++ b/recipes-kernel/linux/linux-imx-3.0.35/mx6/defconfig
@@ -250,7 +250,7 @@ CONFIG_MXC_IPU=y
# CONFIG_MXC_HWEVENT is not set
CONFIG_MXC_ASRC=y
CONFIG_MXC_MLB150=m
-CONFIG_MXC_GPU_VIV=m
+CONFIG_MXC_GPU_VIV=y
CONFIG_MXC_MIPI_CSI2=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb
index 37f38ac..60ec3b0 100644
--- a/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/recipes-kernel/linux/linux-imx_3.0.35.bb
@@ -3,7 +3,7 @@

include linux-imx.inc

-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"

COMPATIBLE_MACHINE = "(mx6)"

--
1.7.10.4

This recipe provides the binary libraries for use with iMX6 CPUs.

Change-Id: If21cf21535fc8ec4a0a1117974a8cb1f43499f66
Signed-off-by: Adrian Alonso <aalonso00@...>
Signed-off-by: Otavio Salvador <otavio@...>
---
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 144 ++++++++++++++++++++
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb | 9 ++
2 files changed, 153 insertions(+)
create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
new file mode 100644
index 0000000..83ab75a
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -0,0 +1,144 @@
+# Copyright (C) 2012 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "GPU driver and apps for imx6"
+SECTION = "libs"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=092bc28e13d678ceaebe1a40559275fb"
+PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6"
+
+INC_PR = "r0"
+
+inherit fsl-eula-unpack
+
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+
+PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
+ libegl-fb-mx6 libegl-fb-mx6-dev libegl-fb-mx6-dbg \
+ libegl-x11-mx6 libegl-x11-mx6-dev libegl-x11-mx6-dbg \
+ libegl-common-mx6 libegl-common-mx6-dev libegl-common-mx6-dbg \
+ libgal-fb-mx6 libgal-fb-mx6-dev libgal-fb-mx6-dbg \
+ libgal-x11-mx6 libgal-x11-mx6-dev libgal-x11-mx6-dbg \
+ libgal-common-mx6 libgal-common-mx6-dev libgal-common-mx6-dbg \
+ libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
+ libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
+ libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
+ libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \
+ libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \
+ libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \
+ libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \
+ libvivante-x11-mx6 libvivante-x11-mx6-dev libvivante-x11-mx6-dbg \
+ libvivante-fb-mx6 libvivante-fb-mx6-dev libvivante-fb-mx6-dbg \
+ libvivante-dri-mx6 libvivante-dri-mx6-dev libvivante-dri-mx6-dbg \
+ libvivante-common-mx6 libvivante-common-mx6-dev libvivante-common-mx6-dbg \
+ "
+
+# FIXME: The provided binary doesn't provide soname. If in future BSP
+# release the libraries are fixed, we can drop this hack.
+SOLIBS = "${SOLIBSDEV}"
+
+# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
+# the source we cannot fix it. Disable the insane check for now.
+python __anonymous() {
+ packages = d.getVar('PACKAGES', True).split()
+ for p in packages:
+ d.setVar("INSANE_SKIP_%s" % p, "ldflags")
+}
+
+do_install () {
+ install -d ${D}${libdir}/dri
+ install -d ${D}${includedir}
+
+ cp ${S}/usr/lib/*.so ${D}${libdir}
+ cp -axr ${S}/usr/include/* ${D}${includedir}
+
+ cp -axr ${S}/opt ${D}
+
+ # Move DRI library to proper path
+ mv ${D}${libdir}/vivante_dri.so ${D}${libdir}/dri
+
+ find ${D}${libdir} -type f -exec chmod 644 {} \;
+ find ${D}${includedir} -type f -exec chmod 644 {} \;
+}
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+FILES_${PN} += "/opt"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-dbg = "${libdir}/.debug ${libdir}/dri/.debug \
+ /opt/viv_samples/*/*/.debug"
+
+FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
+FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
+FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
+
+FILES_libegl-common-mx6 = "${libdir}/libEGL${SOLIBS}"
+FILES_libegl-common-mx6-dev = "${includedir}/EGL ${libdir}/libEGL${SOLIBSDEV}"
+FILES_libegl-common-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
+
+FILES_libegl-fb-mx6 = "${libdir}/libEGL-fb${SOLIBS}"
+FILES_libegl-fb-mx6-dev = "${libdir}/libEGL-fb${SOLIBSDEV}"
+FILES_libegl-fb-mx6-dbg = "${libdir}/.debug/libEGL-fb${SOLIBS}"
+
+FILES_libegl-x11-mx6 = "${libdir}/libEGL-x11${SOLIBS}"
+FILES_libegl-x11-mx6-dev = "${libdir}/libEGL-x11${SOLIBSDEV}"
+FILES_libegl-x11-mx6-dbg = "${libdir}/.debug/libEGL-x11${SOLIBS}"
+
+FILES_libgal-common-mx6 = "${libdir}/libGAL${SOLIBS}"
+FILES_libgal-common-mx6-dev = "${includedir}/HAL ${libdir}/libGAL${SOLIBSDEV}"
+FILES_libgal-common-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
+
+FILES_libgal-fb-mx6 = "${libdir}/libGAL-fb${SOLIBS}"
+FILES_libgal-fb-mx6-dev = "${libdir}/libGAL-fb${SOLIBSDEV}"
+FILES_libgal-fb-mx6-dbg = "${libdir}/.debug/libGAL-fb${SOLIBS}"
+
+FILES_libgal-x11-mx6 = "${libdir}/libGAL-x11${SOLIBS}"
+FILES_libgal-x11-mx6-dev = "${libdir}/libGAL-x11${SOLIBSDEV}"
+FILES_libgal-x11-mx6-dbg = "${libdir}/.debug/libGAL-x11${SOLIBS}"
+
+FILES_libgles-mx6 = "${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}"
+FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV}"
+FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
+
+FILES_libgles2-mx6 = "${libdir}/libGLESv2${SOLIBS}"
+FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}"
+FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
+
+FILES_libgl-mx6 = "${libdir}/libGL${SOLIBS}"
+FILES_libgl-mx6-dev = "${includedir}/GL ${libdir}/libGL${SOLIBSDEV}"
+FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL${SOLIBS}"
+
+FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}"
+FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
+FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}"
+
+FILES_libopencl-mx6 = "${libdir}/libOpenCL${SOLIBS}"
+FILES_libopencl-mx6-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
+FILES_libopencl-mx6-dbg = "${libdir}/.debug/libOpenCL${SOLIBS}"
+
+FILES_libopenvg-mx6 = "${libdir}/libOpenVG*${SOLIBS}"
+FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV}"
+FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}"
+
+FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}"
+FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}"
+FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}"
+
+FILES_libvivante-common-mx6 = "${libdir}/libVIVANTE${SOLIBS}"
+FILES_libvivante-common-mx6-dev = "${includedir}/HAL ${libdir}/libVIVANTE${SOLIBSDEV}"
+FILES_libvivante-common-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}"
+
+FILES_libvivante-fb-mx6 = "${libdir}/libVIVANTE-fb${SOLIBS}"
+FILES_libvivante-fb-mx6-dev = "${libdir}/libVIVANTE-fb${SOLIBSDEV}"
+FILES_libvivante-fb-mx6-dbg = "${libdir}/.debug/libVIVANTE-fb${SOLIBS}"
+
+FILES_libvivante-x11-mx6 = "${libdir}/libVIVANTE-x11${SOLIBS}"
+FILES_libvivante-x11-mx6-dev = "${libdir}/libVIVANTE-x11${SOLIBSDEV}"
+FILES_libvivante-x11-mx6-dbg = "${libdir}/.debug/libVIVANTE-x11${SOLIBS}"
+
+FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri${SOLIBS}"
+FILES_libvivante-dri-mx6-dev = ""
+FILES_libvivante-dri-mx6-dbg = "${libdir}/dri/.debug/vivante_dri${SOLIBS}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
new file mode 100644
index 0000000..c54ad19
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
@@ -0,0 +1,9 @@
+# Copyright (C) 2012 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+PR = "${INC_PR}.0"
+
+include gpu-viv-bin-mx6q.inc
+
+SRC_URI[md5sum] = "9f2c43b6eae468df6cc6fd75efd00bc5"
+SRC_URI[sha256sum] = "2cec10c1d69bce75a7c2a4482eb3ed29b171578c3b01c5b4ef2cc868ca327330"
--
1.7.10.4

From: Adrian Alonso <aalonso00@...>

Change-Id: I07eeb3ce0960021a12c04a38447c379318821f75
Signed-off-by: Adrian Alonso <aalonso00@...>
---
.../xorg-driver/xf86-dri-vivante_12.09.01.bb | 31 ++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb

diff --git a/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb b/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
new file mode 100644
index 0000000..3bf133b
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
@@ -0,0 +1,31 @@
+# Copyright (C) 2012 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+LICENSE = "MIT"
+SECTION = "x11/base"
+DEPENDS = "virtual/libx11 util-macros xf86-video-vivante"
+LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=1d0d59e1dc96f5197ea3a8b101bf1fcc"
+
+SRC_URI = "${FSL_MIRROR}/dri-xorg-graphic-imx-viv-${PV}.tar.gz"
+SRC_URI[md5sum] = "6a3d8130945a24294d34b61cd59e5d59"
+SRC_URI[sha256sum] = "437187360fe76fbee5ad70b1a661d3196568cc8c28a457170494effef859d054"
+
+S = "${WORKDIR}/dri-xorg-graphic-imx-viv-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF_armv7a = " --enable-neon "
+CFLAGS += " -I${STAGING_INCDIR}/xorg"
+
+do_install_append () {
+# Install header files
+ install -d ${D}${includedir}/xorg
+ cp -axr ${S}/src/*.h ${D}${includedir}/xorg
+ find ${D}${includedir} -type f -exec chmod 660 {} \;
+# don't install libtool (*.la) archive not usefull, fix Makefile.am
+ find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
+}
+
+FILES_${PN}-dev += "${includedir}/xorg/*.h"
+FILES_${PN} += " ${libdir}/xorg/modules/extensions/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/extensions/.debug"
--
1.7.10.4

From: Adrian Alonso <aalonso00@...>

Change-Id: I2b9a107b1fe6d50f3f0aa47a0df3115d7a8bc650
Signed-off-by: Adrian Alonso <aalonso00@...>
Signed-off-by: Otavio Salvador <otavio@...>
---
.../Makefile.am-remove-prefixed-include-path.patch | 29 ++++++++++++++++++++
.../xf86-video-imxfb-vivante_12.09.01.bb | 27 ++++++++++++++++++
2 files changed, 56 insertions(+)
create mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
create mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
new file mode 100644
index 0000000..4354ae4
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
@@ -0,0 +1,29 @@
+From 230acf40ab9ed8ab5f291ff6644160b3f3859d69 Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso00@...>
+Date: Fri, 15 Jun 2012 00:46:28 -0500
+Subject: [PATCH] Makefile.am remove prefixed include path
+
+* Remove prefixed include path, use ${STAGING_INCDIR}
+ to locate drm headers.
+
+Signed-off-by: Adrian Alonso <aalonso00@...>
+---
+ src/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 820278b..4acdf6a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -50,7 +50,7 @@ VIVSRC_CFLAGS = \
+ -I./vivante_util \
+ -I./vivante_exa
+
+-AM_CFLAGS = @XORG_CFLAGS@ $(VIVSRC_CFLAGS) -I/usr/include/drm
++AM_CFLAGS = @XORG_CFLAGS@ $(VIVSRC_CFLAGS) ${CFLAGS}
+ vivante_drv_la_LTLIBRARIES = vivante_drv.la
+ vivante_drv_la_LDFLAGS = -module -avoid-version
+ vivante_drv_ladir = @moduledir@/drivers
+--
+1.7.7.6
+
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
new file mode 100644
index 0000000..34e68a4
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
@@ -0,0 +1,27 @@
+# Copyright (C) 2012 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
+
+DEPENDS += "virtual/libgal-x11 gpu-viv-bin-mx6q"
+
+LIC_FILES_CHKSUM = "file://src/vivante_fbdev/vivante.h;endline=19;md5=93a322f91ec495569dcbcfbb2a95454a"
+
+SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
+ file://Makefile.am-remove-prefixed-include-path.patch"
+SRC_URI[md5sum] = "1948119717aa01bed1f630be9ee7a708"
+SRC_URI[sha256sum] = "5b3be4b426d2d2803554df9e4d8919d1f9d17659c3153c71c6529f43c37e6ed1"
+
+EXTRA_OECONF_armv7a = " --enable-neon --disable-static"
+CFLAGS += " -I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/drm"
+LDFLAGS += "-lm -ldl -lGAL-x11"
+
+S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}"
+
+do_install_append () {
+ install -d ${D}${includedir}
+ cp -axr ${S}/src/vivante_gal/vivante_priv.h ${D}${includedir}
+ find ${D}${includedir} -type f -exec chmod 660 {} \;
+}
+
+RDEPENDS_${PN} += "xserver-xorg-module-exa"
--
1.7.10.4

This overrides the 8.0.4 and git versions of mesa-dri recipe.

Change-Id: Ica3e05ade74ccc8c8c2090cac2c2f9e72fb0f66d
Signed-off-by: Otavio Salvador <otavio@...>
---
recipes-graphics/mesa/mesa-dri_8.0.4.bbappend | 4 +++-
recipes-graphics/mesa/mesa-dri_git.bbappend | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend b/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
index 1dff9fe..8b5cfe6 100644
--- a/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
+++ b/recipes-graphics/mesa/mesa-dri_8.0.4.bbappend
@@ -1,5 +1,7 @@
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"

PROVIDES_mx5 = "virtual/libgl"
+PROVIDES_mx6 = "virtual/libgl"

PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/mesa/mesa-dri_git.bbappend b/recipes-graphics/mesa/mesa-dri_git.bbappend
index 1dff9fe..8b5cfe6 100644
--- a/recipes-graphics/mesa/mesa-dri_git.bbappend
+++ b/recipes-graphics/mesa/mesa-dri_git.bbappend
@@ -1,5 +1,7 @@
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"

PROVIDES_mx5 = "virtual/libgl"
+PROVIDES_mx6 = "virtual/libgl"

PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
--
1.7.10.4

Change-Id: Ief51e752d58efbdf5412c93a786c442e3531a961
Signed-off-by: Adrian Alonso <aalonso00@...>
Signed-off-by: Otavio Salvador <otavio@...>
---
.../xorg-xserver/xserver-xf86-config/mx6/xorg.conf | 8 +++++---
recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
index 79b6c0f..b89bed6 100644
--- a/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
+++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/mx6/xorg.conf
@@ -1,7 +1,9 @@
Section "Device"
- Identifier "Kernel Framebuffer Device"
- Driver "fbdev"
- Option "fbdev" "/dev/fb0"
+ Identifier "i.MX Accelerated Framebuffer Device"
+ Driver "vivante"
+ Option "fbdev" "/dev/fb0"
+ Option "vivante_fbdev" "/dev/fb0"
+ Option "HWcursor" "false"
EndSection

Section "ServerFlags"
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 f9ea3a4..8337e55 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) + 7}"
+PRINC := "${@int(PRINC) + 8}"
--
1.7.10.4

Change-Id: I9fb4fa04aef988fb8fd3105ab9444276ea0cbc29
Signed-off-by: Adrian Alonso <aalonso00@...>
Signed-off-by: Otavio Salvador <otavio@...>
---
conf/machine/include/imx-base.inc | 1 +
1 file changed, 1 insertion(+)

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 0c2f10d..a920a4b 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -24,6 +24,7 @@ UBOOT_LOADADDRESS_mx6 = "0x10800000"

XSERVER_DRIVER = "xf86-video-fbdev"
XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
+XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante"
XSERVER = "xserver-xorg \
xf86-input-evdev \
${XSERVER_DRIVER}"
--
1.7.10.4

On Thu, Nov 22, 2012 at 4:49 PM, Otavio Salvador
<otavio@...> wrote:

Change-Id: Ief51e752d58efbdf5412c93a786c442e3531a961
Signed-off-by: Adrian Alonso <aalonso00@...>
Signed-off-by: Otavio Salvador <otavio@...>

Please use Vivante in the subject, instead of Vivant. Same for the next patch.

Signed-off-by: Alexandre Belloni <alexandre.belloni@...>
---
README | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 48ae12c..d54cc8b 100644
--- a/README
+++ b/README
@@ -21,8 +21,8 @@ revision: HEAD
Contributing
------------

-To contribute to this layer you should the patches for review to the
-mailing list.
+To contribute to this layer you should send the patches for review to
+the mailing list.

Mailing list: https://lists.yoctoproject.org/listinfo/meta-freescale
Source code: https://github.com/Freescale/meta-fsl-demos
--
1.7.9.5

Signed-off-by: Alexandre Belloni <alexandre.belloni@...>
---
README | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 6ff6747..c3be468 100644
--- a/README
+++ b/README
@@ -62,19 +62,19 @@ The following layers are included on this release:
Path: sources/meta-fsl-arm
Project: https://github.com/Freescale/meta-fsl-arm
GIT: git://github.com/Freescale/meta-fsl-arm.git
- Mailing list: http://groups.google.com/group/meta-fsl-arm
+ Mailing list: https://lists.yoctoproject.org/listinfo/meta-freescale

* meta-fsl-arm-extra: support for boards using Freescale's processors
Path: sources/meta-fsl-arm-extra
Project: https://github.com/Freescale/meta-fsl-arm-extra
GIT: git://github.com/Freescale/meta-fsl-extra.git
- Mailing list: http://groups.google.com/group/meta-fsl-arm
+ Mailing list: https://lists.yoctoproject.org/listinfo/meta-freescale
Note: Use [meta-fsl-arm-extra] in subject to easy the processing

* meta-fsl-demos: demo images and recipes
Path: sources/meta-fsl-demos
Project: https://github.com/Freescale/meta-fsl-demos
GIT: git://github.com/Freescale/meta-fsl-demos.git
- Mailing list: http://groups.google.com/group/meta-fsl-arm
+ Mailing list: https://lists.yoctoproject.org/listinfo/meta-freescale
Note: Use [meta-fsl-demos] in subject to easy the processing

--
1.7.9.5

upgrade the version to 2.9.0 to fix following version mismatch issue:
ERROR: No recipes available for:
/srv/home/pokybuild/yocto-autobuilder/yocto-slave/p1022ds/build/yocto/meta-fsl-ppc/recipes-append/libxml/libxml2_2.8.0.bbappend

[YOCTO #3476]

Signed-off-by: Zhenhua Luo <b19537@...>
---
recipes-append/libxml/libxml2_2.8.0.bbappend | 3 ---
recipes-append/libxml/libxml2_2.9.0.bbappend | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
delete mode 100644 recipes-append/libxml/libxml2_2.8.0.bbappend
create mode 100644 recipes-append/libxml/libxml2_2.9.0.bbappend

diff --git a/recipes-append/libxml/libxml2_2.8.0.bbappend b/recipes-append/libxml/libxml2_2.8.0.bbappend
deleted file mode 100644
index 13c1fd7..0000000
--- a/recipes-append/libxml/libxml2_2.8.0.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_OECONF_fsl += "--with-fexceptions"
-
-PR_fsl .= "+${DISTRO}.0"
diff --git a/recipes-append/libxml/libxml2_2.9.0.bbappend b/recipes-append/libxml/libxml2_2.9.0.bbappend
new file mode 100644
index 0000000..13c1fd7
--- /dev/null
+++ b/recipes-append/libxml/libxml2_2.9.0.bbappend
@@ -0,0 +1,3 @@
+EXTRA_OECONF_fsl += "--with-fexceptions"
+
+PR_fsl .= "+${DISTRO}.0"
--
1.7.9.5

This is OK to me.

If no comments, please, push.

(I shouldn't be the person to ACK my own patch)

Daiane

Acked-by: Daiane Angolini <daiane.angolini@...>

Acked-by: Daiane Angolini <daiane.angolini@...>

On Fri, Nov 23, 2012 at 9:09 AM, Daiane Angolini <daiane.list@...> wrote:

Acked-by: Daiane Angolini <daiane.angolini@...>

I forgot to say, please, fix subject before you merge it (vivant ->
vivante as Fabio said)

I completely agree.


Acked-by: Daiane Angolini <daiane.angolini@...>

Missing:

* Add to commig log that this package is for imx6 only
* it needs COMPATIBLE_MACHINE

Could you, please, double check if the other GPU package recipe needs
to have COMPATIBLE_MACHINE included as well?

Daiane