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 /meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend | |
| parent | 583341f6ea2439f58ffcbf4e06070aeb9472ec08 (diff) | |
| parent | dae3725a434697424790aa628eeea769c0255c49 (diff) | |
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 'meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend')
| -rw-r--r-- | meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend index d1675deb..1c2e5617 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend @@ -24,3 +24,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_apalis-imx6 = " \ file://0001-Update-default-args-for-apalis-imx6.patch \ " +SRC_URI_append_colibri-vf = " \ + file://0001-colibri-vf-enable-sdboot-by-default.patch \ + " |