Merge remote-tracking branch 'origin/jethro' into merge

* origin/jethro:
  Rename last references to b2qt-utils
  Rename b2qt-utils to qtdeviceutilities
  toradex: apply u-boot and flashing script changes to colibri-imx7
  nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support
  qt5: update submodules
  toradex: use latest u-boot and flashing scripts
  kontron: update to SMARC-sAMX6i BSP release v2.0, RC2
  Use code.qt.io with git protocol instead of codereview
  Use new repo url for utils and appcontroller
  kontron: patch kernel to support newer vivante drivers
  Fetch only external repos for repo mirror
  qt5: update submodules
  Add rsync to image
  Fix raspberry3 build error in perl deployment
  rcar-gen2: USB fixups
  ostree: Added dependency for systemd
  qtquickcompiler: update revision
  qtquickcompiler: update revision
  Fix typo in RPi overlay config
  Update meta layers

Conflicts:
	conf/distro/include/toradex.inc
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
	meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
	meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
	meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
	recipes/ostree/ostree.bb
	recipes/samba/samba_4.1.12.bbappend
	scripts/manifest_jethro.xml

Change-Id: I6b6ec105394f03fb57d8f922e358fef51de1e848

7 files changed, 57 insertions, 25 deletions

diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 58bcdba..7a2666b 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -34,21 +34,21 @@ DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 
 KERNEL_IMAGETYPE = "uImage"
 
+UBOOT_MACHINE = ""
+UBOOT_CONFIG ??= "com it"
+UBOOT_CONFIG[com] = "apalis_imx6_defconfig"
+UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig"
+
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    flash_mmc-${MACHINE}.img:flash_mmc.img \
-    flash_blk-${MACHINE}.img:flash_blk.img \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
 BOOT_SCRIPTS += " \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    flash_mmc-${MACHINE}.img:flash_mmc.img \
-    flash_blk-${MACHINE}.img:flash_blk.img \
+    u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \
     "
 
 SERIAL_CONSOLES = "115200;ttymxc0 \
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index eabaf91..8a9bda5 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -38,11 +38,5 @@ BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \
     ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \
-    u-boot-${MACHINE}.imx:u-boot.imx \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
-BOOT_SCRIPTS += " \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    flash_mmc-${MACHINE}.img:flash_mmc.img \
-    flash_blk-${MACHINE}.img:flash_blk.img \
-    "
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 193e6aa..149894f 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -28,13 +28,7 @@ BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
     ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \
     ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \
-    u-boot-${MACHINE}.imx:u-boot.imx \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
-BOOT_SCRIPTS += " \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    flash_mmc-${MACHINE}.img:flash_mmc.img \
-    flash_blk-${MACHINE}.img:flash_blk.img \
-    "
 
 DISTRO_FEATURES_remove = "webengine"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index e4fdd93..845e2ff 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -33,17 +33,12 @@ IMAGE_FSTYPES += "ext3 sdcard"
 IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024"
 
 BOOTFS_CONTENT = "\
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    flash_mmc-${MACHINE}.img:flash_mmc.img \
-    flash_blk-${MACHINE}.img:flash_blk.img \
     ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \
     ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
 BOOT_SCRIPTS += " \
-    u-boot-${MACHINE}.imx:u-boot.imx \
-    flash_mmc-${MACHINE}.img:flash_mmc.img \
-    flash_blk-${MACHINE}.img:flash_blk.img \
+    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
     "
 
 DEFAULTTUNE = "armv7ahf-neon"
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 7986cb7..511deab 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -91,7 +91,11 @@ UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config"
 
 EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
 
-KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb"
+KERNEL_DEVICETREE += "\
+    imx6dl-nit6xlite.dtb \
+    imx6qp-nitrogen6_max.dtb \
+    imx6q-nitrogen6_som2.dtb \
+    "
 
 DISTRO_FEATURES_DEFAULT += "wayland"
 
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index c9bf0ae..806c591 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -58,6 +58,12 @@
 # internal copy of R-Car_Series_Evaluation_Software_Packages used for CI
 FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:"
 
+KERNEL_MODULE_AUTOLOAD += " \
+    phy-rcar-gen2-usb \
+    hid_multitouch \
+    renesas_usbhs \
+"
+
 GLES_DRIVER = "sgx"
 GLES_DRIVER_r8a7790 = "rgx"
 
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
new file mode 100644
index 0000000..f448fbe
--- /dev/null
+++ b/conf/distro/include/toradex.inc
@@ -0,0 +1,39 @@
+############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
+
+MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}"
+BOOT_SCRIPTS += " \
+    fwd_blk.img:flash_blk.img \
+    fwd_eth.img:flash_eth.img \
+    fwd_mmc.img:flash_mmc.img \
+    ${MACHINE}:${MACHINEDIR} \
+    u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \
+    "