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>

4 files changed, 18 insertions, 18 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 = "\
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 4cde248..9349300 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -30,14 +30,8 @@ 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 \
-    "
 
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 6512f2b..7da7622 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -27,17 +27,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/toradex.inc b/conf/distro/include/toradex.inc
index 7df80e1..bd8ce84 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -21,3 +21,14 @@
 
 BBMASK ?= " "
 BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|recipes-core/glibc/glibc_linaro-2.20.bbappend"
+
+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 \
+    "