From a38939e7a86f835f101efacf4db7967bb4b489be Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 24 Feb 2016 14:26:30 +0200 Subject: toradex: enable u-boot update Add all necessary files to enable u-boot update on all toradex devices. Update patch to the new u-boot that colibri vf is using and enable sd boot for colibri imx6. Task-number: QTEE-1070 Task-number: QTEE-978 Change-Id: I6ff362028cfb80cd34bbe5362bb6976d0084e008 Reviewed-by: Teemu Holappa --- conf/distro/include/apalis-imx6.conf | 5 +++++ conf/distro/include/colibri-imx6.conf | 7 ++++++- conf/distro/include/colibri-vf.conf | 7 ++++++- 3 files changed, 17 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 9938003..d5827db 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -37,6 +37,11 @@ BOOTFS_CONTENT = "\ 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 \ + " MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 6d1a2d5..4c9a923 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -32,7 +32,12 @@ BOOTFS_CONTENT = "\ ${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 virtual/kernel:do_deploy" +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 f71d118..0d31f99 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -26,13 +26,18 @@ DEPLOY_CONF_NAME = "Toradex Colibri VF" IMAGE_FSTYPES += "ext3 sdcard" BOOTFS_CONTENT = "\ - u-boot-nand.imx:u-boot-nand.imx \ + 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 \ + " DEFAULTTUNE = "armv7ahf-neon" -- cgit v1.2.3-54-g00ecf