Re: [meta-freescale] [meta-fsl-arm][PATCH v2] chromium: Enable new version 52 for x11 support wayland on older version

2016-09-16 Thread Otavio Salvador 
Hello Lauren,

Thanks for updating the recipe.

On Fri, Sep 16, 2016 at 12:03 PM, Lauren Post  wrote:
> New chromium version works only on X11 and VPU patches do not apply on new 
> version
> For Wayland use olderchromium version renamed to chromium-wayland and add VPU 
> patches
>
> Signed-off-by: Lauren Post 

Carlos, could you review this?

-- 
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] Updates to meta-fsl-arm-extra (master) in 2016-09-16

2016-09-16 Thread Otavio Salvador 
Hello,

I pushed following updates:

commit 8d975d990072c6c8d8a50f530ef6a56b15382f1b (fslc/master, master)
Author: Daiane Angolini 
Date:   Fri Sep 16 15:09:24 2016 -0300

Revert "imx7s-warp: Does not include u-boot on image"

The WaRP7 board shipped today does not have the boot partition configured
as read only, the contrary of what were expected when I sent this patch.

Because of that, this patch reverts commit 
954548d649cd28e1251844eb62632c25bfdc7d4f.

For detail on how to lock/unlock the boot partition:

https://github.com/WaRP7/WaRP7-User-Guide/blob/v1.1/04-Chapter/U-boot.adoc#boot-partition

Signed-off-by: Daiane Angolini 
Signed-off-by: Otavio Salvador 

Regards,

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] Updates to meta-fsl-arm-extra (krogoth) in 2016-09-16

2016-09-16 Thread Otavio Salvador 
Hello,

I pushed following updates:

commit 7620a9846269fe03ab175891140a465907b9d70b (fslc/krogoth, krogoth)
Author: Daiane Angolini 
Date:   Fri Sep 16 15:09:24 2016 -0300

Revert "imx7s-warp: Does not include u-boot on image"

The WaRP7 board shipped today does not have the boot partition configured
as read only, the contrary of what were expected when I sent this patch.

Because of that, this patch reverts commit 
954548d649cd28e1251844eb62632c25bfdc7d4f.

For detail on how to lock/unlock the boot partition:

https://github.com/WaRP7/WaRP7-User-Guide/blob/v1.1/04-Chapter/U-boot.adoc#boot-partition

Signed-off-by: Daiane Angolini 
Signed-off-by: Otavio Salvador 

Regards,

--
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [meta-fsl-arm][PATCH] Revert "imx7s-warp: Does not include u-boot on image"

2016-09-16 Thread Daiane Angolini 
The WaRP7 board shipped today does not have the boot partition configured
as read only, the contrary of what were expected when I sent this patch.

Because of that, this patch reverts commit 
954548d649cd28e1251844eb62632c25bfdc7d4f.

For detail on how to lock/unlock the boot partition:
https://github.com/WaRP7/WaRP7-User-Guide/blob/v1.1/04-Chapter/U-boot.adoc#boot-partition

Signed-off-by: Daiane Angolini 
---
 conf/machine/imx7s-warp.conf | 8 
 1 file changed, 8 deletions(-)

diff --git a/conf/machine/imx7s-warp.conf b/conf/machine/imx7s-warp.conf
index b7b77e2..666d6b5 100644
--- a/conf/machine/imx7s-warp.conf
+++ b/conf/machine/imx7s-warp.conf
@@ -9,14 +9,6 @@ MACHINEOVERRIDES =. "mx7:mx7d:"
 require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa7.inc
 
-# WaRP uses eMMC boot partition by default and the u-boot inside .sdcard image
-# does not override it. However, build u-boot binary anyway in order to provide
-# a binary to be used if an update is needed.
-# See how-to override eMMC boot partition on the following link
-# http://git.denx.de/?p=u-boot.git;a=blob;f=board/warp7/README
-IMAGE_BOOTLOADER ?= ""
-EXTRA_IMAGEDEPENDS += "u-boot"
-
 MACHINE_FEATURES += " wifi bluetooth"
 
 KERNEL_DEVICETREE = "imx7s-warp.dtb"
-- 
2.7.4

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [meta-freescale PATCH] u-boot-fslc: Update to the 2016.09-based fork

2016-09-16 Thread Otavio Salvador 
This update the U-Boot fork to the 2016.09 release. The following
changes are applied on top of the original release:

a3d27ea wandboard: Fix mmcroot device name
6ed7ce7 Revert conversion for config_distro_bootcmd.h
547c5ed warp: Change default bootenv configuration
dced260 wandboard: Drop revision specific DeviceTree support
6218c13 mx6sabresd: Enable video interfaces in bootargs
3196b92 Revert "embestmx6boards: convert to use config_distro_bootcmd.h"
a405f38 iMX6: Change mmcroot to use fixed mmc block index for USDHC
ddd4e7f embestmx6boards: Change default bootenv configuration
290d197 mx6sabresd: Use LDO dtb file until LDO bypass support is added
eee8253 mx6slevk: Use LDO dtb file until LDO bypass support is added
b8944fd arm: imx: add i.MX6ULL 14x14 EVK board support
067c0b6 dm: mmc: intialize dev when probe
6c7981f arm: dts: add device tree for i.MX6ULL
5bd8722 dt-bindings: add i.mx6ul clock header
cfe216b arm: dts: imx6ull: add pinctrl defines
56e4d12 pinctrl: imx6: support i.MX6ULL
3715a11 imx: iomux: fix snvs usage for i.MX6ULL
74592f9 imx: imx6ull: adjust the ldo 1.2v bandgap voltage
1245598 imx: mx6ull: Add AIPS3 initialization
de54ed4 imx: mx6ull: Update memory map address
c607887 imx: mx6ull: update clock settings and CCM register map
f4fdd70 imx: mx6ull: adjust POR_B setting for i.MX6ULL
c67a27c imx: mx6ull: misc soc update
3349f26 imx: mx6ul: using runtime check when configuring PMIC_STBY_REQ
1cc2fda imx: mx6ull: skip setting ahb clock
5be61be imx: timer: update gpt driver for i.MX6ULL
489f44d imx: ocotp: support i.MX6ULL
c8edd8a imx-common: introduce is_mx6ull
cddd8bf imx: mx6ull: add kconfig entry for MX6ULL
b8fea53 imx: mx6ull: add mx6ull major cpu type
6e6b252 imx: mx6ull: add iomux header file
480b1d5 configs: enable device tree for Colibri iMX7
cd81c94 colibri_imx7: use Ricoh RN5T567 to reboot the board
b900233 arm: dts: imx7: add Ricoh RN5T567 PMIC node
e1df8be power: pmic: add Ricoh RN5T567 PMIC support
2312eb0 colibri_imx7: remove legancy UART platform data
11169db colibri_imx7: remove legancy I2C support
76620e7 arm: dts: imx7: add basic i.MX 7/Colibri iMX7 device tree
23665c2 arm: dts: imx7: add pinctrl defines
e104855 pinctrl: imx: do not announce driver initialization
aee3b4c dm: imx: serial: support device tree

Signed-off-by: Otavio Salvador 
---

 ...-boot-fslc-mxsboot_2016.07.bb => u-boot-fslc-mxsboot_2016.09.bb} | 6 +++---
 recipes-bsp/u-boot/u-boot-fslc_2016.07.bb   | 6 --
 recipes-bsp/u-boot/u-boot-fslc_2016.09.bb   | 6 ++
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename recipes-bsp/u-boot/{u-boot-fslc-mxsboot_2016.07.bb => 
u-boot-fslc-mxsboot_2016.09.bb} (87%)
 delete mode 100644 recipes-bsp/u-boot/u-boot-fslc_2016.07.bb
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc_2016.09.bb

diff --git a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.07.bb 
b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb
similarity index 87%
rename from recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.07.bb
rename to recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb
index 674bf70..86a6abf 100644
--- a/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.07.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc-mxsboot_2016.09.bb
@@ -5,10 +5,10 @@ SECTION = "bootloader"
 DEPENDS = "openssl"
 PROVIDES = "u-boot-mxsboot"
 
-PV = "v2016.07+git${SRCPV}"
+PV = "v2016.09+git${SRCPV}"
 
-SRCREV = "16a26705252aac106e196d2f9593845539c73837"
-SRCBRANCH = "2016.07+fslc"
+SRCREV = "a3d27ead69a9e84a7794117cf965af20d0cfec4f"
+SRCBRANCH = "2016.09+fslc"
 
 SRC_URI = "git://github.com/Freescale/u-boot-fslc.git;branch=${SRCBRANCH}"
 
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2016.07.bb 
b/recipes-bsp/u-boot/u-boot-fslc_2016.07.bb
deleted file mode 100644
index 19e3614..000
--- a/recipes-bsp/u-boot/u-boot-fslc_2016.07.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-include u-boot-fslc.inc
-
-PV = "v2016.07+git${SRCPV}"
-
-SRCREV = "e6b42411ab33ec950ddb304de9dafaf8bad506a2"
-SRCBRANCH = "2016.07+fslc"
diff --git a/recipes-bsp/u-boot/u-boot-fslc_2016.09.bb 
b/recipes-bsp/u-boot/u-boot-fslc_2016.09.bb
new file mode 100644
index 000..07fa869
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc_2016.09.bb
@@ -0,0 +1,6 @@
+include u-boot-fslc.inc
+
+PV = "v2016.09+git${SRCPV}"
+
+SRCREV = "a3d27ead69a9e84a7794117cf965af20d0cfec4f"
+SRCBRANCH = "2016.09+fslc"
-- 
2.9.3

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [meta-freescale PATCH 2/3] qoriq-base.inc: Remove unused SoC family support

2016-09-16 Thread Otavio Salvador 
The SoC family use has been removed in commit 8999634f (Migrate from
SOC_FAMILY to MACHINEOVERRIDES) so the support can be dropped as well.

Signed-off-by: Otavio Salvador 
---

 conf/machine/include/qoriq-base.inc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/machine/include/qoriq-base.inc 
b/conf/machine/include/qoriq-base.inc
index 0a463ee..1786b00 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -1,6 +1,3 @@
-# Provides the QorIQ common settings
-require conf/machine/include/soc-family.inc
-
 # common providers of QorIQ targets
 PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux"
 PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module"
-- 
2.9.3

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [meta-freescale PATCH 3/3] qoriq-base.inc: Use 'fsl-dynamic-packagearch' class

2016-09-16 Thread Otavio Salvador 
This ensures PACKAGE_ARCH has a better default.

 - use MACHINE_ARCH for every package depending on virtual/kernel

 - use MACHINE_SOCARCH for every package depending on
   cryptodev-qoriq-linux, cryptodev-qoriq-module, cryptodev-qoriq-test
   or openssl-qoriq;

Signed-off-by: Otavio Salvador 
---

 conf/machine/include/qoriq-base.inc | 9 +
 1 file changed, 9 insertions(+)

diff --git a/conf/machine/include/qoriq-base.inc 
b/conf/machine/include/qoriq-base.inc
index 1786b00..7360a75 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -17,3 +17,12 @@ MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf 
udev-rules-qoriq kernel-modules"
 EXTRA_IMAGEDEPENDS += "u-boot cst-native"
 
 MACHINEOVERRIDES =. "qoriq:"
+
+# Sub-architecture support
+MACHINE_SOCARCH_SUFFIX ?= ""
+MACHINE_SOCARCH_SUFFIX_qoriq = "-qoriq"
+
+MACHINE_ARCH_FILTER = "virtual/kernel"
+MACHINE_SOCARCH_FILTER_append_qoriq = " cryptodev-qoriq-linux 
cryptodev-qoriq-module cryptodev-qoriq-test openssl-qoriq"
+
+INHERIT += "fsl-dynamic-packagearch"
-- 
2.9.3

-- 
___
meta-freescale mailing list
meta-freescale@yoctoproject.org
https://lists.yoctoproject.org/listinfo/meta-freescale

[meta-freescale] [meta-freescale PATCH 1/3] openssl-qoriq: Sync with OE-Core recipe changes

2016-09-16 Thread Otavio Salvador 
This synchronizes the OpenSSL recipe with OE-Core as well as includes
the CVE-2016-2178 and CVE-2016-2177 security fixes in this fork.

Signed-off-by: Otavio Salvador 
---

 recipes-connectivity/openssl/openssl-qoriq.inc |   8 +-
 .../openssl/openssl-qoriq/CVE-2016-2177.patch  | 286 +
 .../openssl/openssl-qoriq/CVE-2016-2178.patch  |  51 
 .../openssl/openssl-qoriq_1.0.2h.bb|   2 +
 4 files changed, 345 insertions(+), 2 deletions(-)
 create mode 100644 
recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2177.patch
 create mode 100644 
recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2178.patch

diff --git a/recipes-connectivity/openssl/openssl-qoriq.inc 
b/recipes-connectivity/openssl/openssl-qoriq.inc
index 8c8c036..dfafaaf 100644
--- a/recipes-connectivity/openssl/openssl-qoriq.inc
+++ b/recipes-connectivity/openssl/openssl-qoriq.inc
@@ -8,7 +8,7 @@ SECTION = "libs/network"
 LICENSE = "openssl"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
-DEPENDS = "hostperl-runtime-native"
+DEPENDS = "makedepend-native hostperl-runtime-native"
 DEPENDS_append_class-target = " openssl-native"
 
 PROVIDES = "openssl"
@@ -95,7 +95,7 @@ do_configure () {
target=linux-elf-armeb
;;
linux-aarch64*)
-   target=linux-aarch64
+   target=linux-generic64
;;
linux-sh3)
target=debian-sh3
@@ -160,10 +160,14 @@ do_compile_prepend_class-target () {
 }
 
 do_compile () {
+   oe_runmake depend
oe_runmake
 }
 
 do_compile_ptest () {
+   # build dependencies for test directory too
+   export DIRS="$DIRS test"
+   oe_runmake depend
oe_runmake buildtest
 }
 
diff --git a/recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2177.patch 
b/recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2177.patch
new file mode 100644
index 000..df36d5f
--- /dev/null
+++ b/recipes-connectivity/openssl/openssl-qoriq/CVE-2016-2177.patch
@@ -0,0 +1,286 @@
+From a004e72b95835136d3f1ea90517f706c24c03da7 Mon Sep 17 00:00:00 2001
+From: Matt Caswell 
+Date: Thu, 5 May 2016 11:10:26 +0100
+Subject: [PATCH] Avoid some undefined pointer arithmetic
+
+A common idiom in the codebase is:
+
+if (p + len > limit)
+{
+return; /* Too long */
+}
+
+Where "p" points to some malloc'd data of SIZE bytes and
+limit == p + SIZE
+
+"len" here could be from some externally supplied data (e.g. from a TLS
+message).
+
+The rules of C pointer arithmetic are such that "p + len" is only well
+defined where len <= SIZE. Therefore the above idiom is actually
+undefined behaviour.
+
+For example this could cause problems if some malloc implementation
+provides an address for "p" such that "p + len" actually overflows for
+values of len that are too big and therefore p + len < limit!
+
+Issue reported by Guido Vranken.
+
+CVE-2016-2177
+
+Reviewed-by: Rich Salz 
+
+Upstream-Status: Backport
+CVE: CVE-2016-2177
+
+Signed-off-by: Armin Kuster 
+
+
+---
+ ssl/s3_srvr.c  | 14 +++---
+ ssl/ssl_sess.c |  2 +-
+ ssl/t1_lib.c   | 56 ++--
+ 3 files changed, 38 insertions(+), 34 deletions(-)
+
+diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
+index ab28702..ab7f690 100644
+--- a/ssl/s3_srvr.c
 b/ssl/s3_srvr.c
+@@ -980,7 +980,7 @@ int ssl3_get_client_hello(SSL *s)
+ 
+ session_length = *(p + SSL3_RANDOM_SIZE);
+ 
+-if (p + SSL3_RANDOM_SIZE + session_length + 1 >= d + n) {
++if (SSL3_RANDOM_SIZE + session_length + 1 >= (d + n) - p) {
+ al = SSL_AD_DECODE_ERROR;
+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
+ goto f_err;
+@@ -998,7 +998,7 @@ int ssl3_get_client_hello(SSL *s)
+ /* get the session-id */
+ j = *(p++);
+ 
+-if (p + j > d + n) {
++if ((d + n) - p < j) {
+ al = SSL_AD_DECODE_ERROR;
+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
+ goto f_err;
+@@ -1054,14 +1054,14 @@ int ssl3_get_client_hello(SSL *s)
+ 
+ if (SSL_IS_DTLS(s)) {
+ /* cookie stuff */
+-if (p + 1 > d + n) {
++if ((d + n) - p < 1) {
+ al = SSL_AD_DECODE_ERROR;
+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
+ goto f_err;
+ }
+ cookie_len = *(p++);
+ 
+-if (p + cookie_len > d + n) {
++if ((d + n ) - p < cookie_len) {
+ al = SSL_AD_DECODE_ERROR;
+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
+ goto f_err;
+@@ -1131,7 +1131,7 @@ int ssl3_get_client_hello(SSL *s)
+ }
+ }
+ 
+-if (p + 2 > d + n) {
++if ((d + n ) - p < 2) {
+ al = SSL_AD_DECODE_ERROR;
+ SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
+ goto f_err;
+@@ -1145,7

[meta-freescale] [meta-fsl-arm][PATCH v2] chromium: Enable new version 52 for x11 support wayland on older version

2016-09-16 Thread Lauren Post 
New chromium version works only on X11 and VPU patches do not apply on new 
version
For Wayland use olderchromium version renamed to chromium-wayland and add VPU 
patches

Signed-off-by: Lauren Post 
---
 .../recipes-browser/chromium/chromium-imx.inc  |  8 
 .../chromium/chromium-wayland_48.0.2548.0.bbappend | 36 +++
 .../chromium/chromium/chromium.patch   | 51 ++
 .../chromium/chromium_48.0.2548.0.bbappend |  9 
 .../chromium/chromium_52.0.2743.76.bbappend| 15 +++
 5 files changed, 102 insertions(+), 17 deletions(-)
 create mode 100644 
browser-layer/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bbappend
 create mode 100644 
browser-layer/recipes-browser/chromium/chromium/chromium.patch
 delete mode 100644 
browser-layer/recipes-browser/chromium/chromium_48.0.2548.0.bbappend
 create mode 100644 
browser-layer/recipes-browser/chromium/chromium_52.0.2743.76.bbappend

diff --git a/browser-layer/recipes-browser/chromium/chromium-imx.inc 
b/browser-layer/recipes-browser/chromium/chromium-imx.inc
index f8ba268..f755d96 100644
--- a/browser-layer/recipes-browser/chromium/chromium-imx.inc
+++ b/browser-layer/recipes-browser/chromium/chromium-imx.inc
@@ -1,5 +1,3 @@
-DEPENDS_append_imxvpu = " imx-vpuwrap"
-
 # 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
 # chromium source directory, and applies the patches.
@@ -36,10 +34,4 @@ copy_chromium_imx_files() {
cp -r ${WORKDIR}/chromium-imx-git/src/* ${S}/
 }
 
-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))
-}
-
 COMPATIBLE_MACHINE = "(mx6)"
diff --git 
a/browser-layer/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bbappend 
b/browser-layer/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bbappend
new file mode 100644
index 000..ccfcd93
--- /dev/null
+++ 
b/browser-layer/recipes-browser/chromium/chromium-wayland_48.0.2548.0.bbappend
@@ -0,0 +1,36 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/chromium:"
+
+include chromium-imx.inc
+
+CHROMIUM_IMX_BRANCH = "master"
+CHROMIUM_IMX_SRCREV = "4a2d15ab899b9944bb3adb2ddd250530da5b2e1a"
+CHROMIUM_IMX_COMMON_PATCHES += 
"file://${PATCH_BASE_DIR}/common/0001-Enable-share-group-workaround-for-Vivante-GPUs.patch"
+CHROMIUM_ENABLE_WAYLAND = "0"
+
+DEPENDS_append_imxvpu = " imx-vpuwrap"
+
+VPU_PATCHES = 
"file://${PATCH_BASE_DIR}/common/0002-Add-VPU-video-decode-accelerator-to-Chromium-GPU-.patch"
+
+CHROMIUM_IMX_VPU_PATCHES_imxvpu += "${VPU_PATCHES}"
+
+CHROMIUM_IMX_WAYLAND_PATCHES += 
"file://${PATCH_BASE_DIR}/wayland/0001-Modify-eglwayland-versions-for-Vivante-GPUs.patch"
+
+# Don't use X if it's running through Wayland
+CHROMIUM_ENABLE_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 
'1', \
+  bb.utils.contains('DISTRO_FEATURES', 'x11', '0', \
+  '0', d),d)}"
+
+SRC_URI += "\
+${@oe.utils.conditional('CHROMIUM_ENABLE_WAYLAND', '1', 
'git://github.com/01org/ozone-wayland.git;destsuffix=${OZONE_WAYLAND_GIT_DESTSUFFIX};branch=${OZONE_WAYLAND_GIT_BRANCH};rev=${OZONE_WAYLAND_GIT_SRCREV}',
 '', d)} \
+${@oe.utils.conditional('CHROMIUM_ENABLE_WAYLAND', '1', ' 
file://chromium.patch', '', d)} \
+"
+
+# Remove packages as Chromium is changed to statically link against ffmpeg.
+PACKAGES_remove = "${PN}-codecs-ffmpeg ${PN}-plugin-pdf"
+
+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/chromium.patch 
b/browser-layer/recipes-browser/chromium/chromium/chromium.patch
new file mode 100644
index 000..0329d42
--- /dev/null
+++ b/browser-layer/recipes-browser/chromium/chromium/chromium.patch
@@ -0,0 +1,51 @@
+diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h 
chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h
+--- chromium-48.0.2548.0_org/third_party/libva/va/va_dec_jpeg.h
2016-05-27 11:45:31.248306710 -0500
 chromium-48.0.2548.0/third_party/libva/va/va_dec_jpeg.h2016-05-27 
11:49:53.0 -0500
+@@ -36,7 +36,7 @@
+ extern "C" {
+ #endif
+ 
+-#include 
++#include 
+ 
+ /**
+  * \defgroup api_dec_jpeg JPEG decoding API
+diff -Naur chromium-48.0.2548.0_org/third_party/libva/va/va.h 
chromium-48.0.2548.0/third_party/libva/va/va.h
+--- chromium-48.0.2548.0_org/third_party/libva/va/va.h 2016-05-27 
11:45:31.248306710 -0500