diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-05-27 10:43:16 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-05-28 14:11:24 +0300 |
commit | d899f31b7fb5c857b159b46c52ce22b3c7b701f5 (patch) | |
tree | 3f307120e120671a7f7e81d04341f428124b1c9c /conf | |
parent | bfbad49ac1d55ec3864ddff6d8c7b4b38fbaf907 (diff) | |
download | meta-boot2qt-d899f31b7fb5c857b159b46c52ce22b3c7b701f5.tar.gz |
toradex: add support for u-boot update on colibri vf
Include flash scripts to boot partition, which can update u-boot
to NAND. Remove kernel and dtb files from boot partition, as they
are read from second partition.
u-boot env changed to boot from MMC by default and kernel
messages removed from tty1.
apalis flash scripts updated to latest version from toradex and
to use both flash_mmc and flash_blk.
Change-Id: I1a58badafa01e2023b9ae058b833eb108c097594
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/include/apalis-imx6.conf | 1 | ||||
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 86ae4f5..f04fbd0 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf | |||
@@ -28,6 +28,7 @@ BOOTFS_CONTENT = "\ | |||
28 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval_v1_0.dtb:imx6q-apalis-eval_v1_0.dtb \ | 28 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval_v1_0.dtb:imx6q-apalis-eval_v1_0.dtb \ |
29 | u-boot-${MACHINE}.imx:u-boot.imx \ | 29 | u-boot-${MACHINE}.imx:u-boot.imx \ |
30 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | 30 | flash_mmc-${MACHINE}.img:flash_mmc.img \ |
31 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
31 | " | 32 | " |
32 | 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" |
33 | 34 | ||
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 483511c..cb673bd 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -23,12 +23,11 @@ | |||
23 | include conf/distro/include/toradex.inc | 23 | include conf/distro/include/toradex.inc |
24 | 24 | ||
25 | BOOTFS_CONTENT = "\ | 25 | BOOTFS_CONTENT = "\ |
26 | ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ | 26 | u-boot-nand-${MACHINE}.imx:u-boot-nand.imx \ |
27 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ | 27 | flash_mmc-${MACHINE}.img:flash_mmc.img \ |
28 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ | 28 | flash_blk-${MACHINE}.img:flash_blk.img \ |
29 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
30 | " | 29 | " |
31 | BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" | 30 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
32 | 31 | ||
33 | MACHINE_EXTRA_INSTALL = "\ | 32 | MACHINE_EXTRA_INSTALL = "\ |
34 | opengldummy \ | 33 | opengldummy \ |