diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-21 11:57:54 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-21 11:57:54 +0300 |
commit | 460ef0a31e5e5684e785cdde115244e69f74b01b (patch) | |
tree | 6f42855f3e92e16e730fd1bfcbf7fb07369d42f7 /meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend | |
parent | 4ae75513231a69dc176fdb37c20bcb8c87c2f8c8 (diff) | |
parent | 2b115238356e2cfa963f004cb8469533d4d21305 (diff) | |
download | meta-boot2qt-460ef0a31e5e5684e785cdde115244e69f74b01b.tar.gz |
Merge remote-tracking branch 'origin/fido' into jethro
* origin/fido:
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
qt5: update submodules
qtquickcompiler: update revision
qtquickcompiler: update revision
Fix typo in RPi overlay config
Update meta layers
Conflicts:
conf/distro/include/colibri-imx6.conf
conf/distro/include/raspberrypi2.conf
conf/distro/include/toradex.inc
meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Update-default-args-for-apalis-imx6.patch
meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-colibri-imx6-enable-sdboot-by-default.patch
meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend
meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend
recipes-qt/b2qt-addons/b2qt-appcontroller.bb
recipes-qt/b2qt-addons/b2qt-utils.bb
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcanvas3d_git.bbappend
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative-render2d_git.bb
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcompiler_git.bb
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtsensors_git.bbappend
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qttranslations_git.bbappend
recipes-qt/qt5/qtvirtualkeyboard_git.bbappend
recipes-qt/qt5/qtwayland-native_git.bbappend
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
scripts/manifest.xml
Change-Id: I621a82a6deeeb2b74c8179c2f46b4fa42968b636
Diffstat (limited to 'meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend')
-rw-r--r-- | meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend deleted file mode 100644 index 45b5fd3..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_git.bbappend +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | ############################################################################ | ||
2 | ## | ||
3 | ## Copyright (C) 2016 The Qt Company Ltd. | ||
4 | ## Contact: https://www.qt.io/licensing/ | ||
5 | ## | ||
6 | ## This file is part of the Boot to Qt meta layer. | ||
7 | ## | ||
8 | ## $QT_BEGIN_LICENSE:GPL$ | ||
9 | ## Commercial License Usage | ||
10 | ## Licensees holding valid commercial Qt licenses may use this file in | ||
11 | ## accordance with the commercial license agreement provided with the | ||
12 | ## Software or, alternatively, in accordance with the terms contained in | ||
13 | ## a written agreement between you and The Qt Company. For licensing terms | ||
14 | ## and conditions see https://www.qt.io/terms-conditions. For further | ||
15 | ## information use the contact form at https://www.qt.io/contact-us. | ||
16 | ## | ||
17 | ## GNU General Public License Usage | ||
18 | ## Alternatively, this file may be used under the terms of the GNU | ||
19 | ## General Public License version 3 or (at your option) any later version | ||
20 | ## approved by the KDE Free Qt Foundation. The licenses are as published by | ||
21 | ## the Free Software Foundation and appearing in the file LICENSE.GPL3 | ||
22 | ## included in the packaging of this file. Please review the following | ||
23 | ## information to ensure the GNU General Public License requirements will | ||
24 | ## be met: https://www.gnu.org/licenses/gpl-3.0.html. | ||
25 | ## | ||
26 | ## $QT_END_LICENSE$ | ||
27 | ## | ||
28 | ############################################################################ | ||
29 | |||
30 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
31 | SRC_URI += " \ | ||
32 | file://0001-Update-default-args-for-apalis-imx6.patch \ | ||
33 | file://0001-colibri-imx6-enable-sdboot-by-default.patch \ | ||
34 | " | ||