diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-14 16:53:57 +0300 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2016-09-19 14:46:40 +0000 |
commit | 5e19fd01a8021b2aef3488666c555edd63eb4582 (patch) | |
tree | a35161921fbfcdf0fa2d2b73c3bbd0ea79160709 /conf | |
parent | 97e5acb0a9a1b8c772cbf0018d46f26f61605bd1 (diff) | |
download | meta-boot2qt-5e19fd01a8021b2aef3488666c555edd63eb4582.tar.gz |
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>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/apalis-imx6.conf | 12 | ||||
-rw-r--r-- | conf/distro/include/colibri-imx6.conf | 6 | ||||
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 7 | ||||
-rw-r--r-- | conf/distro/include/toradex.inc | 11 |
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" | |||
26 | 26 | ||
27 | KERNEL_IMAGETYPE = "uImage" | 27 | KERNEL_IMAGETYPE = "uImage" |
28 | 28 | ||
29 | UBOOT_MACHINE = "" | ||
30 | UBOOT_CONFIG ??= "com it" | ||
31 | UBOOT_CONFIG[com] = "apalis_imx6_defconfig" | ||
32 | UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig" | ||
33 | |||
29 | BOOTFS_CONTENT = "\ | 34 | BOOTFS_CONTENT = "\ |
30 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 35 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
31 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ | 36 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ |
32 | ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ | 37 | ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ |
33 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ | 38 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ |
34 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ | 39 | ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ |
35 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
36 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
37 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
38 | " | 40 | " |
39 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 41 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
40 | BOOT_SCRIPTS += " \ | 42 | BOOT_SCRIPTS += " \ |
41 | u-boot-${MACHINE}.imx:u-boot.imx \ | 43 | u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \ |
42 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
43 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
44 | " | 44 | " |
45 | 45 | ||
46 | MACHINE_EXTRA_INSTALL = "\ | 46 | 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 = "\ | |||
30 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 30 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ |
31 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ | 31 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ |
32 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ | 32 | ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ |
33 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
34 | " | 33 | " |
35 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 34 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
36 | BOOT_SCRIPTS += " \ | ||
37 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
38 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
39 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
40 | " | ||
41 | 35 | ||
42 | MACHINE_EXTRA_INSTALL = "\ | 36 | MACHINE_EXTRA_INSTALL = "\ |
43 | libgal-mx6 \ | 37 | 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" | |||
27 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" | 27 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" |
28 | 28 | ||
29 | BOOTFS_CONTENT = "\ | 29 | BOOTFS_CONTENT = "\ |
30 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
31 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
32 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
33 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ | 30 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ |
34 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ | 31 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ |
35 | " | 32 | " |
36 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 33 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
37 | BOOT_SCRIPTS += " \ | 34 | BOOT_SCRIPTS += " \ |
38 | u-boot-${MACHINE}.imx:u-boot.imx \ | 35 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ |
39 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
40 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
41 | " | 36 | " |
42 | 37 | ||
43 | DEFAULTTUNE = "armv7ahf-neon" | 38 | 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 @@ | |||
21 | 21 | ||
22 | BBMASK ?= " " | 22 | BBMASK ?= " " |
23 | 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" | 23 | 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" |
24 | |||
25 | PREFERRED_PROVIDER_u-boot = "u-boot-toradex" | ||
26 | |||
27 | MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" | ||
28 | BOOT_SCRIPTS += " \ | ||
29 | fwd_blk.img:flash_blk.img \ | ||
30 | fwd_eth.img:flash_eth.img \ | ||
31 | fwd_mmc.img:flash_mmc.img \ | ||
32 | ${MACHINE}:${MACHINEDIR} \ | ||
33 | u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \ | ||
34 | " | ||