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

1 files changed, 6 insertions, 6 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 \