diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-08 13:17:44 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-08 13:18:39 +0300 |
| commit | 08875b8455350c58c59337a2343bb753c71349d9 (patch) | |
| tree | d9bffd4c4fbda5e7d1356d90307c1ef57f5df911 /conf/distro/include/apalis-imx6.conf | |
| parent | 583341f6ea2439f58ffcbf4e06070aeb9472ec08 (diff) | |
| parent | dae3725a434697424790aa628eeea769c0255c49 (diff) | |
| download | meta-boot2qt-08875b8455350c58c59337a2343bb753c71349d9.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dizzy
* origin/stable:
Update checksum for Noto fonts release 1.002
toradex: add support for u-boot update on colibri vf
Update Colibri-VF recpies to use latest meta-toradex (V2.3)
Fix Linux Kernel 3.18 build with Colibri-VF
scripts: use correct upload path
toradex: update toradex meta layer
Change mirror of hunspell dictionaries
Install CJK fonts on eLinux image
Conflicts:
conf/distro/include/colibri-vf.conf
meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch
recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
scripts/manifest.xml
scripts/upload.sh
Change-Id: I38f7fc045264d13e3a1c6c4afd4e7355ac8f56c9
Diffstat (limited to 'conf/distro/include/apalis-imx6.conf')
| -rw-r--r-- | conf/distro/include/apalis-imx6.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 9865549..ee811be 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf | |||
| @@ -30,6 +30,7 @@ BOOTFS_CONTENT = "\ | |||
| 30 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval_v1_0.dtb:imx6q-apalis-eval_v1_0.dtb \ | 30 | ${KERNEL_IMAGETYPE}-imx6q-apalis-eval_v1_0.dtb:imx6q-apalis-eval_v1_0.dtb \ |
| 31 | u-boot-${MACHINE}.imx:u-boot.imx \ | 31 | u-boot-${MACHINE}.imx:u-boot.imx \ |
| 32 | flash_mmc-${MACHINE}.img:flash_mmc.img \ | 32 | flash_mmc-${MACHINE}.img:flash_mmc.img \ |
| 33 | flash_blk-${MACHINE}.img:flash_blk.img \ | ||
| 33 | " | 34 | " |
| 34 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" | 35 | BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" |
| 35 | 36 | ||