diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-22 15:02:09 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-22 15:56:17 +0300 |
commit | 650460f8f125d18ae03c0622e3dd93630efb0fc7 (patch) | |
tree | cccae5089a35efb860e9bbe0ae9c20be114bf35a /conf/distro/include/colibri-vf.conf | |
parent | f668dddf1f95318b14737c6eb17dabbca213ca22 (diff) | |
parent | 2b9e77c40609da75fa44e3376341f484e0ab0288 (diff) | |
download | meta-boot2qt-650460f8f125d18ae03c0622e3dd93630efb0fc7.tar.gz |
Merge remote-tracking branch 'origin/jethro' into merge
* origin/jethro:
Rename last references to b2qt-utils
Rename b2qt-utils to qtdeviceutilities
toradex: apply u-boot and flashing script changes to colibri-imx7
nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support
qt5: update submodules
toradex: use latest u-boot and flashing scripts
kontron: update to SMARC-sAMX6i BSP release v2.0, RC2
Use code.qt.io with git protocol instead of codereview
Use new repo url for utils and appcontroller
kontron: patch kernel to support newer vivante drivers
Fetch only external repos for repo mirror
qt5: update submodules
Add rsync to image
Fix raspberry3 build error in perl deployment
rcar-gen2: USB fixups
ostree: Added dependency for systemd
qtquickcompiler: update revision
qtquickcompiler: update revision
Fix typo in RPi overlay config
Update meta layers
Conflicts:
conf/distro/include/toradex.inc
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr
meta-fsl-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr
meta-fsl-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
meta-fsl-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
recipes/ostree/ostree.bb
recipes/samba/samba_4.1.12.bbappend
scripts/manifest_jethro.xml
Change-Id: I6b6ec105394f03fb57d8f922e358fef51de1e848
Diffstat (limited to 'conf/distro/include/colibri-vf.conf')
-rw-r--r-- | conf/distro/include/colibri-vf.conf | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index e4fdd93..845e2ff 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf | |||
@@ -33,17 +33,12 @@ IMAGE_FSTYPES += "ext3 sdcard" | |||
33 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" | 33 | IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" |
34 | 34 | ||
35 | BOOTFS_CONTENT = "\ | 35 | BOOTFS_CONTENT = "\ |
36 | u-boot-${MACHINE}.imx:u-boot.imx \ | ||
37 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
38 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
39 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ | 36 | ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ |
40 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ | 37 | ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ |
41 | " | 38 | " |
42 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 39 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
43 | BOOT_SCRIPTS += " \ | 40 | BOOT_SCRIPTS += " \ |
44 | u-boot-${MACHINE}.imx:u-boot.imx \ | 41 | u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ |
45 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | ||
46 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
47 | " | 42 | " |
48 | 43 | ||
49 | DEFAULTTUNE = "armv7ahf-neon" | 44 | DEFAULTTUNE = "armv7ahf-neon" |