From: Lauren Post <lauren.post@freescale.com>
Date: Sat, 22 Nov 2014 17:59:22 +0000 (-0600)
Subject: chromium-imx: Update chromium-imx to support SOC without VPU
X-Git-Tag: 2.1~762
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0ac4835968f35fbf3f75e6ee7a1e2426db77f4ee;p=meta-freescale.git

chromium-imx: Update chromium-imx to support SOC without VPU

Current VPU patches only work for mx6q and mx6dl that have VPU.  To build for future mx6sx need
to split VPU patches off for only mx6q and mx6dl. Also depends on libfslvpuwrap should be
restricted to mx6q and mx6dl.

Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium-imx.inc b/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium-imx.inc
index f955c808..f63807d5 100644
--- a/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ b/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium-imx.inc
@@ -1,4 +1,5 @@
-DEPENDS_append = " libfslvpuwrap"
+DEPENDS_append_mx6q = " libfslvpuwrap"
+DEPENDS_append_mx6dl = " libfslvpuwrap"
 
 # Additional imx code and patches are included in the chromium-imx git repository.
 # The code below fetches this repository, copies the extra source over to the main
@@ -11,6 +12,7 @@ CHROMIUM_IMX_DESTSUFFIX ?= "chromium-imx-git"
 PATCH_BASE_DIR = "${WORKDIR}/${CHROMIUM_IMX_DESTSUFFIX}/patches"
 
 CHROMIUM_IMX_COMMON_PATCHES ?= " "
+CHROMIUM_IMX_VPU_PATCHES ?= " "
 CHROMIUM_IMX_WAYLAND_PATCHES ?= " "
 
 SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV}"
@@ -36,6 +38,7 @@ copy_chromium_imx_files() {
 
 python add_chromium_imx_patches() {
     d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_COMMON_PATCHES', 1))
+    d.appendVar('SRC_URI', ' ' + d.getVar('CHROMIUM_IMX_VPU_PATCHES', 1))
     d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1))
 }
 
diff --git a/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium_38.0.2125.101.bbappend b/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium_38.0.2125.101.bbappend
index f4c857be..b21810de 100644
--- a/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium_38.0.2125.101.bbappend
+++ b/meta-fsl-arm/browser-layer/recipes-browser/chromium/chromium_38.0.2125.101.bbappend
@@ -2,6 +2,11 @@ include chromium-imx.inc
 
 CHROMIUM_IMX_BRANCH = "master"
 CHROMIUM_IMX_SRCREV = "aff6dd45041340190e3742118200219a6d7f3e87"
-CHROMIUM_IMX_COMMON_PATCHES += "file://${PATCH_BASE_DIR}/common/0001-Enable-share-group-workaround-for-Vivante-GPUs.patch \
-                                file://${PATCH_BASE_DIR}/common/0002-Add-VPU-video-decode-accelerator-to-Chromium-38-GPU-.patch"
+CHROMIUM_IMX_COMMON_PATCHES += "file://${PATCH_BASE_DIR}/common/0001-Enable-share-group-workaround-for-Vivante-GPUs.patch"
+
+VPU_PATCHES = "file://${PATCH_BASE_DIR}/common/0002-Add-VPU-video-decode-accelerator-to-Chromium-38-GPU-.patch"
+
+CHROMIUM_IMX_VPU_PATCHES_mx6q += "${VPU_PATCHES}"
+CHROMIUM_IMX_VPU_PATCHES_mx6dl += "${VPU_PATCHES}"
+
 CHROMIUM_IMX_WAYLAND_PATCHES += "file://${PATCH_BASE_DIR}/wayland/0001-Modify-eglwayland-versions-for-Vivante-GPUs.patch"