3 files changed, 13 insertions, 117 deletions

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
deleted file mode 100644
index f541e5c17..000000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 69a92f4576a1e789ba2fcf957164d2c4013020c5 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Wed, 2 Dec 2015 13:36:25 +0000
-Subject: [PATCH] Stop using Git to write local version
-Organization: O.S. Systems Software LTDA.
-
-The standard version does not use a Git repository so we should not
-use Git to identify the commit of the build as it can end getting the
-version from a wrong repository and can be misleading.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- EXA/src/makefile.tc         | 6 +++---
- FslExt/src/makefile.tc      | 6 +++---
- util/autohdmi/makefile.tc   | 6 +++---
- util/pandisplay/makefile.tc | 6 +++---
- 4 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/EXA/src/makefile.tc b/EXA/src/makefile.tc
-index 0b9a9e6..ec6e68d 100644
---- a/EXA/src/makefile.tc
-+++ b/EXA/src/makefile.tc
-@@ -52,8 +52,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/FslExt/src/makefile.tc b/FslExt/src/makefile.tc
-index 0b9a9e6..ec6e68d 100644
---- a/FslExt/src/makefile.tc
-+++ b/FslExt/src/makefile.tc
-@@ -52,8 +52,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/util/autohdmi/makefile.tc b/util/autohdmi/makefile.tc
-index c9de0a6..d0a468c 100644
---- a/util/autohdmi/makefile.tc
-+++ b/util/autohdmi/makefile.tc
-@@ -64,8 +64,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/util/pandisplay/makefile.tc b/util/pandisplay/makefile.tc
-index 28732b9..bf54c20 100644
---- a/util/pandisplay/makefile.tc
-+++ b/util/pandisplay/makefile.tc
-@@ -64,8 +64,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
--- 
-2.1.4
-
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb
deleted file mode 100644
index 5514962f9..000000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
-# Copyright 2017 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require xf86-video-imxfb-vivante.inc
-
-SRCBRANCH = "nxp/imx_4.9.11_1.0.0_ga"
-SRCREV = "07ef065dfe09f1c05a1a188c371577faa3677a17"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb
index c16da6717..04ae36cf1 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb
@@ -1,5 +1,6 @@
-# Copyright (C) 2012-2015 Freescale Semiconductor
-# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
+# Copyright (C) 2012-2016 Freescale Semiconductor
+# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
+# Copyright 2017-2018 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 require recipes-graphics/xorg-driver/xorg-driver-video.inc
@@ -12,6 +13,8 @@ DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 imx-gpu-viv virtua
 
 LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3"
 
+SRCREV = "946e8603ed9a52f36d305405dbb2ab8ff90943d0"
+SRCBRANCH = "imx_exa_viv6_g2d"
 SRC_URI = "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \
            file://rc.autohdmi"
 
@@ -21,36 +24,25 @@ INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi"
 INITSCRIPT_NAME = "rc.autohdmi"
 INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
 
-EXTRA_OEMAKE += "prefix=${D}/usr \
+EXTRA_OEMAKE += "prefix=${exec_prefix} \
                  sysroot=${STAGING_DIR_TARGET} \
+                 SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
                  LFLAGS="${LDFLAGS}" \
                  BUSID_HAS_NUMBER=1 \
                  BUILD_IN_YOCTO=1 \
                  XSERVER_GREATER_THAN_13=1"
 
-CFLAGS += "-I${STAGING_INCDIR}/xorg \
-           -I${STAGING_INCDIR}/drm \
-           -I../../DRI_1.10.4/src"
-
 PACKAGES =+ "xserver-xorg-extension-viv-autohdmi"
 
-# FIXME: The Freescale provided Makefile has hardcodec include paths
-#        and this does not work in case prefix is different than /usr,
-#        sed it.
-do_configure_prepend () {
-    sed -i 's,$(sysroot)/usr/include,${STAGING_INCDIR},g' \
-            ${S}EXA/src/makefile.linux
-}
-
 do_install_append () {
-        install -d ${D}${includedir}
-        cp -axr ${S}/EXA/src/vivante_gal/vivante_priv.h ${D}${includedir}
-        cp -axr ${S}/EXA/src/vivante_gal/vivante_gal.h ${D}${includedir}
+    install -d ${D}${includedir}
+    cp -axr ${S}/EXA/src/vivante_gal/vivante_priv.h ${D}${includedir}
+    cp -axr ${S}/EXA/src/vivante_gal/vivante_gal.h ${D}${includedir}
 
-        install -d ${D}/${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/rc.autohdmi ${D}/${sysconfdir}/init.d/rc.autohdmi
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 755 ${WORKDIR}/rc.autohdmi ${D}/${sysconfdir}/init.d/rc.autohdmi
 
-        find ${D}${includedir} -type f -exec chmod 660 {} \;
+    find ${D}${includedir} -type f -exec chmod 660 {} \;
 }
 
 RDEPENDS_${PN} += "libvivante-dri-imx \