From 552c27f51b6192abc4eca8a1ab32d62a17095ced Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Sat, 22 Nov 2014 11:59:22 -0600 Subject: 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 Signed-off-by: Otavio Salvador --- browser-layer/recipes-browser/chromium/chromium-imx.inc | 5 ++++- .../recipes-browser/chromium/chromium_38.0.2125.101.bbappend | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/browser-layer/recipes-browser/chromium/chromium-imx.inc b/browser-layer/recipes-browser/chromium/chromium-imx.inc index f955c80..f63807d 100644 --- a/browser-layer/recipes-browser/chromium/chromium-imx.inc +++ b/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/browser-layer/recipes-browser/chromium/chromium_38.0.2125.101.bbappend b/browser-layer/recipes-browser/chromium/chromium_38.0.2125.101.bbappend index f4c857b..b21810d 100644 --- a/browser-layer/recipes-browser/chromium/chromium_38.0.2125.101.bbappend +++ b/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" -- cgit v1.2.3-54-g00ecf