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

* origin/fido:
  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
  qt5: update submodules
  qtquickcompiler: update revision
  qtquickcompiler: update revision
  Fix typo in RPi overlay config
  Update meta layers

Conflicts:
	conf/distro/include/colibri-imx6.conf
	conf/distro/include/raspberrypi2.conf
	conf/distro/include/toradex.inc
	meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
	meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
	meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
	meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend
	recipes-qt/b2qt-addons/b2qt-appcontroller.bb
	recipes-qt/b2qt-addons/b2qt-utils.bb
	recipes-qt/qt5/nativesdk-qtbase_git.bbappend
	recipes-qt/qt5/qtbase-native_git.bbappend
	recipes-qt/qt5/qtbase_git.bbappend
	recipes-qt/qt5/qtcanvas3d_git.bbappend
	recipes-qt/qt5/qtcharts_git.bb
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative-render2d_git.bb
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcompiler_git.bb
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsensors_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bb
	recipes-qt/qt5/qtserialport_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
	recipes-qt/qt5/qtwayland-native_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	scripts/manifest.xml

Change-Id: I621a82a6deeeb2b74c8179c2f46b4fa42968b636

1 files changed, 36 insertions, 0 deletions

diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
new file mode 100644
index 0000000..08ddd88
--- /dev/null
+++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch
@@ -0,0 +1,36 @@
+From c02da9f92f6ffaee65f428e1978bd3ff379a2612 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 14 Sep 2016 10:19:28 +0300
+Subject: [PATCH] Update only u-boot
+
+---
+ flash_blk.scr   | 4 ++--
+ flash_eth.scr   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/flash_blk.scr b/flash_blk.scr
+index cc4cf38..b63366a 100644
+--- a/flash_blk.scr
++++ b/flash_blk.scr
+@@ -14,6 +14,6 @@ setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.i
+ 
+ setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
+ setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi'
+-setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
++setenv update 'mtdparts default && run update_uboot && reset'
+ 
+-echo 'enter "run update" to update the entire module'
++echo 'enter "run update" to update the uboot'
+diff --git a/flash_eth.scr b/flash_eth.scr
+index 01be124..13025de 100644
+--- a/flash_eth.scr
++++ b/flash_eth.scr
+@@ -14,6 +14,6 @@ setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write
+ 
+ setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.'
+ setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi'
+-setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset'
++setenv update 'mtdparts default && run update_uboot && reset'
+ 
+-echo 'enter "run update" to update the entire module'
++echo 'enter "run update" to update the uboot'