Merge branch 'stable' into releaseQtEE_v3.1.0

* stable:
  linux-boundary: revert 1G/3G memory split configure
  Use specific SHA1 from all of the meta repos
  beagleboard specific u-boot was removed from meta-ti
  Old libgles-omap3 packages were removed from meta-ti
  toradex: enable FunctionFS module needed for adb
  bbb: correct path for kernel configure fragment
  image: include i2c-tools in image
  adb: enabled network mode for toradex
  toradex: Add hardware acceleration for gstream
  adbd: add dependency to openssl for libcrypto
  Include toradex repository
  imx6: set preferred version for gpu drivers
  Include older Vivante drivers for Apalis iMX6
  Include support for Toradox Apalis iMX6
  BBB: enable USB serial kernel drivers
  No need for RPi in BBMASK

Change-Id: Ic3192cd00a8b24972253c64f294de5d364111135

5 files changed, 60 insertions, 2 deletions

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 5a95ec2..9789ceb 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -34,6 +34,7 @@ BBLAYERS ?= " \
   ##COREBASE##/meta-fsl-arm-extra \
   ##COREBASE##/meta-ti \
   ##COREBASE##/meta-raspberrypi \
+  ##COREBASE##/meta-toradex \
   ##COREBASE##/meta-openembedded/meta-oe \
   ##COREBASE##/meta-b2qt \
   "
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
new file mode 100644
index 0000000..144693d
--- /dev/null
+++ b/conf/distro/include/apalis-imx6.conf
@@ -0,0 +1,52 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+IMAGE_FSTYPES = "tar.gz"
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
+PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.9-1.0.0-hfp"
+PREFERRED_VERSION_imx-lib = "3.10.9-1.0.0"
+
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        gst-fsl-plugin \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
+
+ADB_PRODUCTID = "0x0000"
+
+SERIAL_CONSOLES = "115200;ttymxc0 \
+                   115200;ttymxc1"
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 1298ee4..a19f85f 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -31,6 +31,9 @@ BOOTFS_CONTENT = "\
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy"
 
+PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp"
+PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
+
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 8066936..9af8417 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -34,7 +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"
+PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp"
+PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
 
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index a9e1b34..3874397 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -275,7 +275,8 @@ CONF_VERSION = "1"
 
 INHERIT += "rm_work"
 
-BBMASK = "meta-ti/recipes-misc|meta-raspberrypi/recipes-graphics/mesa/mesa_9.2.2.bbappend"
+BBMASK = "meta-ti/recipes-misc"
+BBMASK += "|meta-toradex/recipes/images|meta-toradex/recipes-browser|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes-mozilla|meta-toradex/recipes-graphics|meta-toradex/recipes-devtools/mtd|meta-toradex/recipes-core/psplash|meta-toradex/recipes-lxde|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes/trdx-config|meta-toradex/recipes-core/util-linux|meta-toradex/recipes-core/systemd|meta-toradex/recipes-support|meta-toradex/recipes-core/dropbear|meta-toradex/recipes/base-files|meta-toradex/recipes-multimedia/gstreamer"
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"