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

1 files changed, 2 insertions, 1 deletions

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"