toradex: use latest u-boot and flashing scripts

The script sources are from meta-toradex-demos layer, but they are
patched to update only u-boot part. The u-boot from V2.6 release is
the latest that toradex uses in their boards and uses the changed
u-boot location.

Change-Id: I86345f692961ed906af4d9f251de28eb551d9cbf
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index d5827db..0cef55a 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -26,21 +26,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 \
     "
 
 MACHINE_EXTRA_INSTALL = "\