From 9ea61a832acf1691b66b8defacf8f949f68669cd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Mar 2017 10:00:55 +0200 Subject: toradex: add missing USB kernel config for colibri vf These are needed to enable USB in colibri vf modules Task-number: QTBUG-57728 Change-Id: I29b72a62b48a61170b5d251ccd9bb9261f269f17 Reviewed-by: Karim Pinter --- meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend index 5a92f25..5830238 100644 --- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend @@ -34,4 +34,7 @@ do_preconfigure_prepend () { echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig + + echo "CONFIG_EXTCON=y" >> ${WORKDIR}/defconfig + echo "CONFIG_EXTCON_USB_GPIO=y" >> ${WORKDIR}/defconfig } -- cgit v1.2.3-54-g00ecf From db3ed4765a6540e9cee42540123e35079306238d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 29 Mar 2017 09:53:07 +0300 Subject: neptune: update to latest version Change-Id: I82f64cea54658353528dba083f0eb15334858424 Reviewed-by: Dominik Holland --- recipes-qt/automotive/neptune-ui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 8a3abf3..368050b 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -41,7 +41,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "504d9720ed7ef921af7e5f1ebf709662baac6555" +SRCREV = "a4b46cdb7a6b4123a341857ff71a47332479acea" DEPENDS = "qtbase qtdeclarative" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ -- cgit v1.2.3-54-g00ecf From 960bbabec91bd7c13d0238a70759ee310c1fb470 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 30 Mar 2017 14:32:58 +0200 Subject: neptune-ui: Update to the latest version Also fix the neptune.service to the new standalone yaml file Task-number: QTAUTO-329 Change-Id: Id561cd051f799998f88968cf8160cd04a04087a2 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui/neptune.service | 2 +- recipes-qt/automotive/neptune-ui_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service index e9f3793..7793d0b 100644 --- a/recipes-qt/automotive/neptune-ui/neptune.service +++ b/recipes-qt/automotive/neptune-ui/neptune.service @@ -3,7 +3,7 @@ Description=Neptune After=dbus.service dbus-session.service systemd-user-sessions.service [Service] -ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml +ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Main.qml Restart=on-failure WorkingDirectory=/opt/neptune diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 368050b..1209c68 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -41,7 +41,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "a4b46cdb7a6b4123a341857ff71a47332479acea" +SRCREV = "b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d" DEPENDS = "qtbase qtdeclarative" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ -- cgit v1.2.3-54-g00ecf From 68e55e210d4b2d86bdacb08a72db90108306479f Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Thu, 30 Mar 2017 14:32:42 +0200 Subject: qtivi: Update to the latest version Change-Id: If830306dfb29a1a28d323a3b7176572de73dba63 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/qtivi_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index e3dd3fd..8423f99 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -44,6 +44,6 @@ PACKAGECONFIG[geniviextras-only] = "CONFIG+=geniviextras-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "a15c13d6255d23ce90997913b7c1347fef396fa8" +SRCREV = "8cabf3fb534d572c905fc0a783dbb4ebc98df41c" DEPENDS = "qtbase qtdeclarative qtmultimedia" -- cgit v1.2.3-54-g00ecf From 96cd5d35ca029573bc7a4d8a7b3d5d9f10f97c70 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 3 Apr 2017 14:23:41 +0300 Subject: multiscreen-demo: update revision Change-Id: Id760ab89cc2d9c6fcf9aac8652aa7bf05c053d15 Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/multiscreen-demo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb index 1997bd5..63860e0 100644 --- a/recipes-qt/automotive/multiscreen-demo_git.bb +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -39,7 +39,7 @@ QT_MODULE_BRANCH = "master" SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets" -SRCREV_multiscreen = "77ecd7d03aeea3bb7d10ac8ef448920da11ae306" +SRCREV_multiscreen = "c4e489dc70974212e47edbf876bd02e1e7fd7877" SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" SRCREV_FORMAT = "multiscreen_assets" -- cgit v1.2.3-54-g00ecf From 4a7f4138443cacf4ac505947385500c2e30f28ec Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 5 Apr 2017 05:38:11 +0000 Subject: Revert "qtglesstream: update to newer version" This reverts commit 91867a7eb331909e61f5d84187d8c39f5deb0857. Emulator fix done in a different way. Change-Id: I13796218e9adfb0e054a212abd7dfd76d4966e68 Reviewed-by: Samuli Piippo --- recipes-qt/qt5-addons/qtglesstream.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5-addons/qtglesstream.bb b/recipes-qt/qt5-addons/qtglesstream.bb index 9ed6991..57eae88 100644 --- a/recipes-qt/qt5-addons/qtglesstream.bb +++ b/recipes-qt/qt5-addons/qtglesstream.bb @@ -38,7 +38,7 @@ SRC_URI = " \ " PV = "1.0.0" -SRCREV = "2a58387d9ca27ba528d5d2ab5db6c9e5a2f8a1de" +SRCREV = "c11bf065f7630b7800dda157e4bc1aeba7a533d2" BRANCH = "dev" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 9b97d94ee4ba2458cb9b3050e654dcde528f4a81 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 4 Apr 2017 09:10:30 +0300 Subject: qt5: use newer meta-qt5 * update submodules to 5.9.0 Beta RC2 Change-Id: I845ad3174daa501a6ccf37fa80f2a7bb3d5b20e5 Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index c83692b..c4c2805 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Tue, 4 Apr 2017 12:34:30 +0200 Subject: neptune-ui: rdepends on dbus-session Change-Id: I0e829d71411f68493d5a276b08ab0f89b7c99643 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 1209c68..9535a1b 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -44,7 +44,7 @@ SRC_URI += " \ SRCREV = "b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d" DEPENDS = "qtbase qtdeclarative" -RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ +RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus-session \ qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" -- cgit v1.2.3-54-g00ecf From 573282df8e7e7b108bb3717084f0677372055b37 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 5 Apr 2017 13:45:28 +0300 Subject: Multiscreen-demo: update revision Change-Id: Ibc1cbff42bfc5dd66c3bacc7c9d66fa7186ee0a9 Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/multiscreen-demo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb index 63860e0..0c9a2bb 100644 --- a/recipes-qt/automotive/multiscreen-demo_git.bb +++ b/recipes-qt/automotive/multiscreen-demo_git.bb @@ -39,7 +39,7 @@ QT_MODULE_BRANCH = "master" SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets" -SRCREV_multiscreen = "c4e489dc70974212e47edbf876bd02e1e7fd7877" +SRCREV_multiscreen = "f4cd6b9667b4649b4ef8b4bb645850b05aceebde" SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" SRCREV_FORMAT = "multiscreen_assets" -- cgit v1.2.3-54-g00ecf From 117aaf1974f41527cd12620d141adb5beb38f392 Mon Sep 17 00:00:00 2001 From: Gordan Markuš Date: Wed, 5 Apr 2017 10:06:36 +0200 Subject: neptune-ui: depends on qttools-native * Switch RDEPENDS from dbus-session to dbus * The i18ndemo plugin depends on lrelease Build error: build/tmp/sysroots/x86_64-linux/usr/bin/qt5/lrelease: Command not found Change-Id: I595b6633f6ef9dacdeef4393d381a7a81f358538 Reviewed-by: Samuli Piippo --- recipes-qt/automotive/neptune-ui_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index 9535a1b..ad94fc8 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -43,8 +43,8 @@ SRC_URI += " \ SRCREV = "b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d" -DEPENDS = "qtbase qtdeclarative" -RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus-session \ +DEPENDS = "qtbase qtdeclarative qttools-native" +RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \ qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" -- cgit v1.2.3-54-g00ecf From 5ecd16962f740bb267360b40d7b269a52be9e89e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 5 Apr 2017 08:48:59 +0300 Subject: qtbase: disable eglfs device integration plugin usage in emulator Boot2Qt Emulator does not launch with Qt 5.9.0 due changes in qtglesstream. Instead of updating emulator & qtglesstream, disable eglfs device integration plugin usage in the emulator VM image. Task-number: QTBUG-59771 Change-Id: I40998fc81fb75cede447d6dd6142e3bd87e387b9 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri index 9f6fdc3..43e1685 100644 --- a/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri +++ b/recipes-qt/qt5/qtbase/emulator/oe-device-extra.pri @@ -3,3 +3,4 @@ QMAKE_LIBS_OPENGL_ES2 = -lQtGlesStreamClient QMAKE_PLATFORM += boot2qt QT_QPA_DEFAULT_PLATFORM = eglfs +EGLFS_DEVICE_INTEGRATION = none -- cgit v1.2.3-54-g00ecf From 09aff0bac92e648856d3eee80479c876a3e0fab7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 6 Apr 2017 15:58:39 +0300 Subject: neptune-ui: update revision Change-Id: I791a1f2d33715d6da0bc19fad4f4b1a0b38a019d Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/neptune-ui_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb index ad94fc8..30ead52 100644 --- a/recipes-qt/automotive/neptune-ui_git.bb +++ b/recipes-qt/automotive/neptune-ui_git.bb @@ -41,7 +41,7 @@ SRC_URI += " \ file://neptune.service \ " -SRCREV = "b41bbb2e3d9bca3a5f29dcf5995e4ed2d1664d9d" +SRCREV = "1770881783025b04ff5b4c7da7810d1648485b92" DEPENDS = "qtbase qtdeclarative qttools-native" RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \ -- cgit v1.2.3-54-g00ecf From 2205c9adcc9dc94f9a7f7a4b53a4740f7f6e9929 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 12 Apr 2017 10:20:27 +0300 Subject: poky: update morty branch Update poky morty branch by moving one commit up the branch. The pulled python change fixes broken Boot2Qt debugger. Task-number: QTBUG-59974 Change-Id: I8eaa2da41b6dcc58881c5b755fe13fa28c985edb Reviewed-by: Teemu Holappa --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index c4c2805..365c999 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,7 +16,7 @@ Date: Tue, 11 Apr 2017 10:07:13 +0300 Subject: qt5: use newer meta-qt5 * Use meta-qt5 5.9.0 Beta 2 (snapshot 1) Change-Id: Ib6f3b7a0d1ceb964733c90d76c8abb45bb1a1063 Reviewed-by: Teemu Holappa --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 365c999..644971e 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Mon, 17 Apr 2017 19:18:17 +0300 Subject: use newer meta-qt5 * update meta-qt5 to 5.9.0 Beta 2 Change-Id: I4236b782c39aa1b607af1198e16776eec54cc9a6 Reviewed-by: Kari Oikarinen --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 644971e..b9e7e86 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Thu, 20 Apr 2017 09:11:49 +0300 Subject: Update and re-enable QtQuickCompiler Change-Id: Idb019e6d056815be968aca7ef4bd7a40ef28d3da Reviewed-by: Mikko Gronoff --- conf/local.conf.sample | 1 - recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 81fd5c7..f98c43b 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -283,7 +283,6 @@ INHERIT += "internal-build" # Enables use of QtQuickCompiler if you have access to the gerrit project #ENABLE_QTQUICKCOMPILER = "1" -DISABLE_QTQUICKCOMPILER = "1" ACCEPT_FSL_EULA = "1" LICENSE_FLAGS_WHITELIST = "commercial" diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 63f0f6a..23fbaf8 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -37,7 +37,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;nobranch=1;protocol=ssh \ " -SRCREV = "8df367f3a7356337dba25666c52e73e3b0480df3" +SRCREV = "86d362f4ed6baeab0dfc6d892f18458a65ec7361" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 8afceb4e6a6c40f471f903cdf7f12e136e9ff971 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 21 Nov 2016 12:28:18 +0200 Subject: Add support for i.MX7S WaRP Change-Id: Ib2c82ccf8d7648bb303e0fc949e3c1aef5b09195 Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- b2qt-init-build-env | 2 +- conf/distro/include/imx7s-warp.conf | 37 ++++++++++++++++++++++ .../recipes/linux/linux-warp7_4.1.bbappend | 34 ++++++++++++++++++++ scripts/setup-environment.sh | 2 +- 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 conf/distro/include/imx7s-warp.conf create mode 100644 meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend diff --git a/b2qt-init-build-env b/b2qt-init-build-env index e90188a..d72d28c 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -109,7 +109,7 @@ get_groups() { apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) PROJECT_GROUPS="fsl" ;; - imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd) + imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp) PROJECT_GROUPS="fsl" ;; smarc-samx6i) diff --git a/conf/distro/include/imx7s-warp.conf b/conf/distro/include/imx7s-warp.conf new file mode 100644 index 0000000..fdd7f17 --- /dev/null +++ b/conf/distro/include/imx7s-warp.conf @@ -0,0 +1,37 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +include conf/distro/include/fsl.inc + +DEPLOY_CONF_NAME = "i.MX7S WaRP" + +PREFERRED_PROVIDER_virtual/egl = "opengldummy" +PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" + +DISTRO_FEATURES_remove = "webengine wayland" diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend new file mode 100644 index 0000000..82604d4 --- /dev/null +++ b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend @@ -0,0 +1,34 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +do_configure_prepend() { + echo "CONFIG_NAMESPACES=y" >> ${WORKDIR}/defconfig + echo "CONFIG_FHANDLE=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig +} diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index a556e4f..f29832d 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -59,7 +59,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) LAYERSCONF="bblayers.conf.fsl.sample" ;; - imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd) + imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp) LAYERSCONF="bblayers.conf.fsl.sample" ;; smarc-samx6i) -- cgit v1.2.3-54-g00ecf From a732b58770a17125b5b32ff994f443272472c9f4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 21 Apr 2017 15:20:56 +0300 Subject: warp7: add kernel configs to right file Change-Id: I7549d1853cca7c563e072d05fa0526bdd0cd3bac Reviewed-by: Mikko Gronoff --- meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend index 82604d4..5efcce0 100644 --- a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend @@ -28,7 +28,7 @@ ############################################################################ do_configure_prepend() { - echo "CONFIG_NAMESPACES=y" >> ${WORKDIR}/defconfig - echo "CONFIG_FHANDLE=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + echo "CONFIG_NAMESPACES=y" >> ${B}/.config + echo "CONFIG_FHANDLE=y" >> ${B}/.config + echo "CONFIG_USB_FUNCTIONFS=m" >> ${B}/.config } -- cgit v1.2.3-54-g00ecf From 3ea0a00de7762e7facf1ee309132ba2d8c1bff47 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 21 Apr 2017 15:24:14 +0300 Subject: qtivi: update to version that compiles with Qt 5.9 Change-Id: I24ba7de59c466956987d0c81645976fc383b7ec2 Reviewed-by: Mikko Gronoff --- recipes-qt/automotive/qtivi_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb index 8423f99..b471a89 100644 --- a/recipes-qt/automotive/qtivi_git.bb +++ b/recipes-qt/automotive/qtivi_git.bb @@ -44,6 +44,6 @@ PACKAGECONFIG[geniviextras-only] = "CONFIG+=geniviextras-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "8cabf3fb534d572c905fc0a783dbb4ebc98df41c" +SRCREV = "40e8ba1c8dd89474c4d890a3e050890d0cd9654e" DEPENDS = "qtbase qtdeclarative qtmultimedia" -- cgit v1.2.3-54-g00ecf From 598139f2e742ccac9d0a31030209e14a73317764 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 21 Apr 2017 16:20:33 +0300 Subject: sdk: use python3 for toolchain Python3 in now the defaut python version, include correct modules to the toolchain. Task-number: QTBUG-59974 Change-Id: I5b851bf7344c85469318a756b7e1a37afbb596ae Reviewed-by: Mikko Gronoff --- .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index cc25bd4..9f43fff 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -47,8 +47,8 @@ RDEPENDS_${PN} = "\ " RDEPENDS_${PN}_append_linux = "\ - nativesdk-python-modules \ - nativesdk-python-misc \ + nativesdk-python3-modules \ + nativesdk-python3-misc \ nativesdk-perl-modules \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "nativesdk-wayland-dev", "", d)} \ " -- cgit v1.2.3-54-g00ecf From c91018095897ac9b4dea998700809a5555f9b1dc Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 13 Apr 2017 14:57:27 +0300 Subject: fsl: update freescale meta layers & related .bbappend entries * Update meta-freescale & meta-freescale-3rdparty layers to the latest SHA1s in morty branches * Update related meta-boot2qt/meta-fsl-extras .bbappend entries by removing duplicate/obsolete entries * Update CMA-reserved-size patch for nitrogen6x * Remove Add-recovery-support patch Change-Id: Ifa1063d7b8bb4f76eea0c9c735f483136d2cd8bb Reviewed-by: Samuli Piippo --- .../bcm4330-nvram-config.bbappend | 2 +- .../recipes/linux/linux-fslc-imx_4.%.bbappend | 5 --- .../recipes/linux/linux-imx_4.%.bbappend | 4 --- .../recipes/linux/linux-toradex_3.14.%.bbappend | 1 - .../recipes/linux/linux-toradex_4.%.bbappend | 4 --- .../0002-Add-recovery-support.patch | 37 ---------------------- .../0002-set-CMA-reserved-size-to-384MB.patch | 23 ++++++++++++++ .../recipes/u-boot/u-boot-boundary_git.bbappend | 2 +- .../0001-set-CMA-reserved-size-to-384MB.patch | 27 ---------------- .../u-boot/u-boot-script-boundary_git.bbappend | 1 - scripts/manifest.xml | 4 +-- 11 files changed, 27 insertions(+), 83 deletions(-) delete mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch create mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch delete mode 100644 meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch diff --git a/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend b/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend index 4c472db..068b9fa 100644 --- a/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend +++ b/meta-fsl-extras/recipes/broadcom-nvram-config/bcm4330-nvram-config.bbappend @@ -29,4 +29,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}:" -COMPATIBLE_MACHINE = "(nitrogen6x|nitrogen6x-lite|wandboard-dual|wandboard-quad)" +COMPATIBLE_MACHINE = "(cubox-i|nitrogen6x|nitrogen6x-lite|wandboard|imx6sl-warp)" diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend index c4e0158..9a50c92 100644 --- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend @@ -35,12 +35,7 @@ do_preconfigure_prepend() { echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig echo "CONFIG_NAMESPACES=y" >> ${WORKDIR}/defconfig - echo "CONFIG_FHANDLE=y" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend index c4e0158..208ec74 100644 --- a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend @@ -35,11 +35,7 @@ do_preconfigure_prepend() { echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig echo "CONFIG_NAMESPACES=y" >> ${WORKDIR}/defconfig echo "CONFIG_FHANDLE=y" >> ${WORKDIR}/defconfig diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend index f8fac0d..58c64de 100644 --- a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend @@ -33,5 +33,4 @@ RDEPENDS_kernel-base = "" do_preconfigure_prepend () { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend index 5830238..431005b 100644 --- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend +++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend @@ -32,9 +32,5 @@ RDEPENDS_kernel-base = "kernel-image kernel-devicetree" do_preconfigure_prepend () { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig - - echo "CONFIG_EXTCON=y" >> ${WORKDIR}/defconfig - echo "CONFIG_EXTCON_USB_GPIO=y" >> ${WORKDIR}/defconfig } diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch deleted file mode 100644 index d1f5616..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-Add-recovery-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 33a5a73cd846c0bbf6a507aa4e658c74815eb1d7 Mon Sep 17 00:00:00 2001 -From: Rainer Keller -Date: Wed, 4 May 2016 12:49:40 +0200 -Subject: [PATCH] Add recovery support - ---- - include/configs/nitrogen6x.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h -index bbc613d..9c939e6 100644 ---- a/include/configs/nitrogen6x.h -+++ b/include/configs/nitrogen6x.h -@@ -232,6 +232,11 @@ - "clearenv=if sf probe || sf probe || sf probe 1 ; then " \ - "sf erase 0xc0000 0x2000 && " \ - "echo restored environment to factory default ; fi\0" \ -+ "recovery_boot=setenv recovery true ; dtype=mmc ; setenv bootpart 3 ; " \ -+ "for disk in 0 1 ; do " \ -+ "${dtype} dev ${disk} ; " \ -+ "load ${dtype} ${disk}:${bootpart} 10008000 /6x_bootscript && source 10008000 ; " \ -+ "done\0" \ - "bootcmd=for dtype in ${bootdevs}" \ - "; do " \ - "if itest.s \"xusb\" == \"x${dtype}\" ; then " \ -@@ -245,6 +250,8 @@ - "&& source 10008000 ; " \ - "done ; " \ - "done; " \ -+ "echo Startup failed, running recovery ; " \ -+ "run recovery_boot ; " \ - "setenv stdout serial,vga ; " \ - "echo ; echo 6x_bootscript not found ; " \ - "echo ; echo serial console at 115200, 8N1 ; echo ; " \ --- -2.7.3 - diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch new file mode 100644 index 0000000..9eda199 --- /dev/null +++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary/0002-set-CMA-reserved-size-to-384MB.patch @@ -0,0 +1,23 @@ +From 59d272d9df5337bb4bd62a96fc16c8e280c49344 Mon Sep 17 00:00:00 2001 +From: Mikko Gronoff +Date: Sun, 23 Apr 2017 21:47:01 +0300 +Subject: [PATCH] set CMA reserved size to 384MB + +Increased from 256MB (the default) to 384MB. Without this, HW-accelerated +video decoding cannot work for high resolution videos. +--- + include/configs/nitrogen6x.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h +index 646c505..ddbb4c5 100644 +--- a/include/configs/nitrogen6x.h ++++ b/include/configs/nitrogen6x.h +@@ -28,6 +28,7 @@ + #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 + #define CONFIG_VIDEO + #define BD_I2C_MASK 7 ++#define BD_CMA "384M" + + #if defined(CONFIG_SABRELITE) + #define CONFIG_ENV_IS_IN_MMC diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend index 5f0d155..013e54b 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-boundary_git.bbappend @@ -30,5 +30,5 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-Add-support-for-KOE-tx31d200vm0baa-display.patch \ - file://0002-Add-recovery-support.patch \ + file://0002-set-CMA-reserved-size-to-384MB.patch \ " diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch deleted file mode 100644 index d648340..0000000 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary/0001-set-CMA-reserved-size-to-384MB.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3bb661da09e2a57ef452d388d69b8d01044136f1 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 13 Jan 2016 09:26:33 +0200 -Subject: [PATCH] set CMA reserved size to 384MB - -Increased from 256MB (the default) to 384MB. Without this, HW-accelerated -video decoding cannot work for high resolution videos. ---- - board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt -index 86242b5..da4ea05 100644 ---- a/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt -+++ b/board/boundary/nitrogen6x/6x_bootscript-yocto-3.14.txt -@@ -92,7 +92,7 @@ if itest.s "x" == "x${cmd_xxx_present}" ; then - echo "!!!!!!!!!!!!!!!!" - fi - --setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc" -+setenv bootargs "${bootargs} console=${console},115200 vmalloc=400M cma=384M consoleblank=0 rootwait fixrtc" - - - bpart=2 --- -1.9.1 - diff --git a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend index a01780a..dafcf84 100644 --- a/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend +++ b/meta-fsl-extras/recipes/u-boot/u-boot-script-boundary_git.bbappend @@ -29,6 +29,5 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ - file://0001-set-CMA-reserved-size-to-384MB.patch \ file://0001-Set-screen-resolution-for-ft5x06_ts-based-on-selecte.patch \ " diff --git a/scripts/manifest.xml b/scripts/manifest.xml index b9e7e86..362e545 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -33,7 +33,7 @@ Date: Tue, 25 Apr 2017 12:46:50 +0300 Subject: qt5: update submodules * Update submodules to 5.9.0 Beta 3 Change-Id: I46e6aa3ad673fb5ac67bcea3e0d0c2ce39df79eb Reviewed-by: Samuli Piippo --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 362e545..26e05b6 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -24,7 +24,7 @@ path="sources/meta-openembedded"/> Date: Thu, 27 Apr 2017 13:02:50 +0300 Subject: deviceutilities: update to newer version * commits included since previous version: Don't give connman user name as a network name Fix bad annotations of D-Bus signal arguments Remove duplicate D-Bus annotation Add plugins.qmltypes files to the QML plugins Use qml_plugin.prf for the QML plugins Remove dead .pro file Merge remote-tracking branch 'origin/5.8' into 5.9 Exclude all the other build targets than linux Fix qmake warnings Doc: Bump version to 5.8.0 Change-Id: I09a8eb3ba564862cbfcf70efca3eaacb43374446 Reviewed-by: Kari Oikarinen --- recipes-qt/qt5/qtdeviceutilities.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb index 1c91236..e5d7cb8 100644 --- a/recipes-qt/qt5/qtdeviceutilities.bb +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -43,6 +43,6 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/qtdeviceutilities;${QT_MODULE_BRANCH_PARAM};protocol=http \ " -SRCREV = "4f54d9b10ebdd296accfa5526d7c941a03249a50" +SRCREV = "314de829065a3fa411b8fed90ff1289b000e229b" DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf