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

* origin/jethro:
  VKB: correctly override PACKAGECONFIG
  psplash: remove from image
  imx6: enable QT_QPA_EGLFS_FORCEVSYNC for all imx6 devices
  colibri-vf: use older 4.1 version of kernel to fix color issue
  colibri-imx7: add u-boot-nand.imx to image
  colibri-vf: add kernel image to rootfs
  dbus-session-init: fix broken init script
  Improve repo fetching
  qt5 recipes cleanup
  qt5: update submodules
  qt5: remove obsolete file 0001-Allow-a-tools-only-build.patch

Conflicts:
	meta-raspberrypi-extras/recipes/bluez5/bluez5_%.bbappend
	recipes-qt/qt5/nativesdk-qtbase_git.bbappend
	recipes-qt/qt5/qt3d_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.bbappend
	recipes-qt/qt5/qtconnectivity_git.bbappend
	recipes-qt/qt5/qtdeclarative_git.bbappend
	recipes-qt/qt5/qtgraphicaleffects_git.bbappend
	recipes-qt/qt5/qtimageformats_git.bbappend
	recipes-qt/qt5/qtlocation_git.bbappend
	recipes-qt/qt5/qtmultimedia_git.bbappend
	recipes-qt/qt5/qtquickcontrols2_git.bbappend
	recipes-qt/qt5/qtquickcontrols_git.bbappend
	recipes-qt/qt5/qtsensors_git.bbappend
	recipes-qt/qt5/qtserialbus_git.bbappend
	recipes-qt/qt5/qtserialport_git.bbappend
	recipes-qt/qt5/qtsvg_git.bbappend
	recipes-qt/qt5/qttools_git.bbappend
	recipes-qt/qt5/qttranslations_git.bbappend
	recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
	recipes-qt/qt5/qtwayland_git.bbappend
	recipes-qt/qt5/qtwebchannel_git.bbappend
	recipes-qt/qt5/qtwebengine_git.bbappend
	recipes-qt/qt5/qtwebsockets_git.bbappend
	recipes-qt/qt5/qtxmlpatterns_git.bbappend
	scripts/manifest.xml

Change-Id: I089e7d3667ac4ed150cc5c2201c2505103f548ee

2 files changed, 4 insertions, 0 deletions

diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 149894f..8565729 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -30,5 +30,8 @@ BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \
     "
 BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
+BOOT_SCRIPTS += " \
+    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
+    "
 
 DISTRO_FEATURES_remove = "webengine"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 1e8a5ac..d75bd9b 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -45,6 +45,7 @@ DEFAULTTUNE = "armv7ahf-neon"
 
 PREFERRED_PROVIDER_virtual/egl = "opengldummy"
 PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
+PREFERRED_VERSION_linux-toradex = "4.1"
 
 DISTRO_FEATURES_remove = "webengine"