Merge branch 'stable' into releaseQtEE_v3.0.0

* stable: (25 commits)
  blacklist evbug kernel module
  ca-certificates: enable c_rehash in update-ca-certificates
  openssl: make sure c_rehash is included in the image
  emulator: include mesa back to the image
  mesa: include gles development files in sdk
  sabre: updated kernel arguments
  imx6: kernel update for nitrogen6x
  mesa: remove from emulator image
  Include support for Freescale SABRE SD (iMX6Q)
  sabresd: add function fs support to sabresd kernel
  gstreamer: include icydemuxer needed for internet radios
  libsdl: disable dependency to libglu
  linux-yocto: upstream version has changed
  wpa-supplicant: upstream version has changed
  gpu-viv-bin-mx6q: upstream version has changed
  busybox: upstream version has changed
  nitrogen6x: use preferred version for kernel
  libgles: inhibit QA error for files already being stripped
  Update used branch to daisy
  Move to version 1.6
  ...

Change-Id: Ie81ed17be1096dbb37b1e5f023aa4eba846ca0fe

1 files changed, 5 insertions, 0 deletions

diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 2a64026..8066936 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -24,6 +24,9 @@ IMAGE_FSTYPES = "tar.gz"
 
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
     6x_bootscript-${MACHINE}:6x_bootscript \
     6x_upgrade-${MACHINE}:6x_upgrade \
     "
@@ -31,6 +34,8 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-bounda
 
 EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
 
+PREFERRED_VERSION_linux-boundary = "3.10.17"
+
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \