From 8bb16ea61b19fb41cfb60f126fa45770c55c003a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 22 Aug 2016 15:17:04 +0300 Subject: Update meta layers Latest revisions from fido branches Change-Id: I9a7c13e11f5d1261bebcc145ba8ef3d21a30dcd2 Reviewed-by: Teemu Holappa --- scripts/manifest.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 2fb5349..982fe66 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -17,7 +17,7 @@ -- cgit v1.2.3-54-g00ecf From 4629e81dcb8b02fd9d26437c61a4bbaaca5784f0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Aug 2016 10:27:02 +0300 Subject: Fix typo in RPi overlay config Change-Id: Ifa7f7625817c9e635f0a40576963ce758ff0569a Task-number: QTBUG-52520 Reviewed-by: Teemu Holappa --- conf/distro/include/raspberrypi2.conf | 2 +- meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/raspberrypi2.conf b/conf/distro/include/raspberrypi2.conf index 040ea9b..392ce40 100644 --- a/conf/distro/include/raspberrypi2.conf +++ b/conf/distro/include/raspberrypi2.conf @@ -46,7 +46,7 @@ module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1" GPU_MEM = "256" # video camera support VIDEO_CAMERA = "1" -RPI_FT5604 = "1" +RPI_FT5406 = "1" KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb" MACHINE_FEATURES += "pitft" diff --git a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend index b711ab5..da7a7b5 100644 --- a/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend +++ b/meta-raspberrypi-extras/recipes/bootfiles/rpi-config_git.bbappend @@ -20,8 +20,8 @@ ############################################################################## do_deploy_append() { - if [ "${RPI_FT5604}" = "1" ]; then - echo "# Enable rpi-ft5604 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt + if [ "${RPI_FT5406}" = "1" ]; then + echo "# Enable rpi-ft5406 touch" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt echo "dtoverlay=rpi-ft5406" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt fi } -- cgit v1.2.3-54-g00ecf From 20e32018b7e29af39cb6315f5f6e575a662896e4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Aug 2016 16:51:03 +0300 Subject: qtquickcompiler: update revision Fix for segfault Change-Id: Iab8e4551eba94635116f1adab39516b8a8e3da23 Task-number: QTBUG-55394 Reviewed-by: Teemu Holappa --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 4b9abd8..446cca3 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -29,7 +29,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ " -SRCREV = "321c7d8bbc9e25fbb49dbba187b04916eddfdb2a" +SRCREV = "2fb03180754aa5f9ca640e9cdd264a7a3166149b" BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index ef78418..e697249 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -26,6 +26,9 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc +# Workaround for QTBUG-55471 +export QV4_NO_SSA = "1" + SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" -- cgit v1.2.3-54-g00ecf From 81c077be4feadc874a4c09b7c4bb2512ba2d85cf Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 25 Aug 2016 08:33:41 +0300 Subject: qtquickcompiler: update revision Change-Id: Iad6d6a3015e79a4e8213f14450b08e99ea73aa24 Task-number: QTBUG-55471 Reviewed-by: Teemu Holappa --- recipes-qt/qt5/qtquickcompiler_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 446cca3..e0091b4 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -29,7 +29,7 @@ SRC_URI = " \ git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ " -SRCREV = "2fb03180754aa5f9ca640e9cdd264a7a3166149b" +SRCREV = "382935b1c5c93fba9ff2f25b74ec6a5337ec62d0" BRANCH = "5.6" S = "${WORKDIR}/git" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index e697249..ef78418 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -26,9 +26,6 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -# Workaround for QTBUG-55471 -export QV4_NO_SSA = "1" - SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" -- cgit v1.2.3-54-g00ecf From 9a1dac10225f35942a82159b939ff324e93e1352 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Mon, 29 Aug 2016 13:02:35 +0300 Subject: ostree: Added dependency for systemd Change-Id: I43756c89a26988e2073acda53f9cbc358ed0e5d4 Reviewed-by: Gatis Paeglis --- recipes/ostree/ostree.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/ostree/ostree.bb b/recipes/ostree/ostree.bb index 39ee76c..6e79395 100644 --- a/recipes/ostree/ostree.bb +++ b/recipes/ostree/ostree.bb @@ -47,7 +47,7 @@ SRCREV = "v2016.5" S = "${WORKDIR}/git" -DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz" +DEPENDS = "glib-2.0 e2fsprogs gpgme attr libsoup-2.4 libgsystem libassuan xz systemd" # Bash is needed by the shipped dracut module. This dracut module is used to generate initramfs image. # The production image do not require bash for proper working. RDEPENDS_${PN} += "bash" -- cgit v1.2.3-54-g00ecf From 7704e43a1f3ab169de6b74624b7c0175de22fc7a Mon Sep 17 00:00:00 2001 From: Louai Al-Khanji Date: Mon, 22 Aug 2016 11:46:21 -0700 Subject: rcar-gen2: USB fixups Autoload USB modules for adb bridge and touch screens. Change-Id: I1370f87b25e1c0660ffc8fb6fd0aa6d0a1cf0658 Reviewed-by: Samuli Piippo --- conf/distro/include/rcar-gen2.inc | 6 ++++++ meta-renesas-extras/recipes/adbd/files/defaults | 2 +- meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc index a1768bc..f196ad5 100644 --- a/conf/distro/include/rcar-gen2.inc +++ b/conf/distro/include/rcar-gen2.inc @@ -58,6 +58,12 @@ # internal copy of R-Car_Series_Evaluation_Software_Packages used for CI FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen2/${PN}:" +KERNEL_MODULE_AUTOLOAD += " \ + phy-rcar-gen2-usb \ + hid_multitouch \ + renesas_usbhs \ +" + GLES_DRIVER = "sgx" GLES_DRIVER_r8a7790 = "rgx" diff --git a/meta-renesas-extras/recipes/adbd/files/defaults b/meta-renesas-extras/recipes/adbd/files/defaults index 0fbba4c..d2a3cc0 100644 --- a/meta-renesas-extras/recipes/adbd/files/defaults +++ b/meta-renesas-extras/recipes/adbd/files/defaults @@ -1,4 +1,4 @@ VENDOR=0x18d1 PRODUCT=0x0000 SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) -USE_ETHERNET=yes +USE_ETHERNET=no diff --git a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg b/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg index 6ecc61e..1c60d89 100644 --- a/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg +++ b/meta-renesas-extras/recipes/linux/linux-renesas/b2qt.cfg @@ -62,6 +62,18 @@ CONFIG_RFKILL=m CONFIG_FHANDLE=y CONFIG_USB_NAMESPACES=m +# HID support +CONFIG_HID=m +CONFIG_HID_BATTERY_STRENGTH=y +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# USB HID support +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + # needed for USB touchscreens CONFIG_HID_MULTITOUCH=y -- cgit v1.2.3-54-g00ecf From ac5fe7cd03fdde3c8ab557477f713a5deadd512d Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Thu, 25 Aug 2016 18:14:32 +0300 Subject: Fix raspberry3 build error in perl deployment Added dependency from samba to perl to avoid the situation where samba deploys the scripts to the sysroot folder before perl directory is created. Change-Id: I01c4b966a5465905b9bc18de1ddd463585ee05b6 Reviewed-by: Tuomas Heimonen --- recipes/samba/samba_4.1.12.bbappend | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 recipes/samba/samba_4.1.12.bbappend diff --git a/recipes/samba/samba_4.1.12.bbappend b/recipes/samba/samba_4.1.12.bbappend new file mode 100644 index 0000000..4a86809 --- /dev/null +++ b/recipes/samba/samba_4.1.12.bbappend @@ -0,0 +1,31 @@ +############################################################################ +## +## Copyright (C) 2016 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$ +## +############################################################################ + +DEPENDS += "perl" + -- cgit v1.2.3-54-g00ecf From fc564883ff56a8094ed3757a5ad097065b40f33e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 6 Sep 2016 16:24:48 +0300 Subject: Add rsync to image Make life easier for Qt devs Change-Id: I028710d4ad506d9609ab4cc281ad05010b7575cb Reviewed-by: Laszlo Agocs --- recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb index a0efef9..17b278c 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb @@ -43,5 +43,6 @@ RDEPENDS_${PN} = "\ ntp \ connman-client \ iproute2 \ + rsync \ ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-analyze", "", d)} \ " -- cgit v1.2.3-54-g00ecf From 20e52c9940fcb38a54bd87bbfff3a4905784d2a8 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 7 Sep 2016 14:03:15 +0300 Subject: qt5: update submodules using latest meta-qt5 Change-Id: Ic1ce180abb79beebf9a08dee4b64790e8a5d3c1b Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtsystems_git.bbappend | 2 +- recipes-qt/qt5/qttools_git.bbappend | 2 +- recipes-qt/qt5/qttranslations_git.bbappend | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 4 ++-- scripts/manifest.xml | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index ae8e6f4..cfab8e6 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" +SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 8d86d39..9b8c5c6 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" +SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 19cd2d6..48b8165 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" +SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 4b7a38a..c5a129d 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "c6d72bb6ebd860a38aac2e557bca330b0d5b1926" +SRCREV = "8ed3130583510feba58e6f289d1c7b5d051a6663" DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 934b40f..0439edb 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "f5fe6ce47841be34d4b851725d80133ff6d14fee" +SRCREV = "21e7cb1bafdfc06c263e10067d02f9b103ff660f" diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb index 1c45cb8..3e1152f 100644 --- a/recipes-qt/qt5/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer. inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "334ca348b0badb284a1ade66b61bdc588da64e33" +SRCREV = "ab6739631dd87ffa480e79b33ea14aa97a66bc9e" DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 8450938..609d934 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "b1eeb7cdde17f70e8e9ad3c610d6492f3ca70717" +SRCREV = "dcede8bbe1a4e1401679d42bf7179305771d0c5a" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 3f93547..cbe9ab9 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "fafc158427e9d54298ce5c3419c1d4b6ec3b946e" +SRCREV = "7504b2ce36a90261ba2409e4160570b58d8b38e0" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index ecc7f15..f4e1c3d 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -23,4 +23,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "c9de25fa342ff8066d49541179c30d0ce45950b4" +SRCREV = "6d95682d7ff282180655f2f384d8aba69c4f67af" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index e0b892d..ea2046d 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -21,4 +21,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRCREV = "c0f58d5283ce981b8cfbc43f602a3b6553e26ce2" +SRCREV = "846d04cec8d946c28ddbeecc79c63553e0891736" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 30e96b2..579cc47 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf" +SRCREV = "46d9a630a88fc5388dec7fd99289d0e9e0e1f680" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 491781c..bb934bc 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "0c63b3a441437a8bc42770d360a6696bbf11cd2d" +SRCREV = "c8305c87f805dbeb6cb5b09ac086a7651ef8c857" diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend index c8c7671..45a8ea6 100644 --- a/recipes-qt/qt5/qtsystems_git.bbappend +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "cc2077700bd5503d1fcf53aef83cbb76975e745a" +SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 4234480..44f6b33 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "85197ddb8d6da0e5cf74b8d945c076d4db3986a8" +SRCREV = "a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index f8021a5..d33921b 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722" +SRCREV = "225e1740fec4559bf8d66d915ddd06b9d4f48119" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 793ed1b..c2522cb 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "1bc3b0fdc8d934c1ab69a902054681896b56d672" +SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 793ed1b..c2522cb 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "1bc3b0fdc8d934c1ab69a902054681896b56d672" +SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index 0a094f4..af3e87c 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "b7fde78d7822ed7f2221acfd9db15b3ff579e29d" -SRCREV_chromium = "696c084930b870a5b1fd7f176d4e7ccb3eff416c" +SRCREV_qtwebengine = "2209add7a5b019afef7830d8bbf416fbb2a2ecf5" +SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 982fe66..861b21b 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -25,7 +25,7 @@ path="sources/meta-openembedded"/> Date: Mon, 29 Aug 2016 12:39:11 +0300 Subject: Fetch only external repos for repo mirror Change-Id: I55a8aa3d69a3df5337a8a61268bde91adb091ab0 Reviewed-by: Teemu Holappa --- b2qt-init-build-env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 87d05f4..20b3d78 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -165,7 +165,7 @@ mirror() { mkdir -p .repo/manifests cp ${DIR}/scripts/manifest.xml .repo/manifests/ MANIFEST="manifest.xml" - ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror + ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g external --mirror ${REPO} sync } -- cgit v1.2.3-54-g00ecf From 4ae75513231a69dc176fdb37c20bcb8c87c2f8c8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 Sep 2016 14:40:59 +0300 Subject: kontron: patch kernel to support newer vivante drivers This fixes following error: galcore: Unknown symbol v7_dma_map_area (err 0) galcore: Unknown symbol v7_dma_flush_range (err 0) When using the Vivante GPU module as a module. Change-Id: I2e84403b9bab5c45386b32716021f55c70938d8e Reviewed-by: Rainer Keller --- ...cache-flush-management-symbols-when-MULTI.patch | 31 ++++++++++++++++++++++ .../recipes/linux/linux-smx6_3.14.28.bbappend | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch new file mode 100644 index 0000000..c61a4dc --- /dev/null +++ b/meta-smx6-extras/recipes/linux/linux-smx6/0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch @@ -0,0 +1,31 @@ +From 56e321cd19ee4909ca623ce1c351c966904123a9 Mon Sep 17 00:00:00 2001 +From: Pantelis Antoniou +Date: Fri, 4 Jan 2013 00:32:33 +0200 +Subject: [PATCH] arm: Export cache flush management symbols when !MULTI_CACHE + +When compiling a kernel without CONFIG_MULTI_CACHE enabled the +dma access functions end up not being exported. Fix it. + +Signed-off-by: Pantelis Antoniou +Signed-off-by: Otavio Salvador +--- + arch/arm/kernel/setup.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c +index 1e8b030..c6a9a61 100644 +--- a/arch/arm/kernel/setup.c ++++ b/arch/arm/kernel/setup.c +@@ -1080,3 +1080,12 @@ const struct seq_operations cpuinfo_op = { + .stop = c_stop, + .show = c_show + }; ++ ++/* export the cache management functions */ ++#ifndef MULTI_CACHE ++ ++EXPORT_SYMBOL(__glue(_CACHE,_dma_map_area)); ++EXPORT_SYMBOL(__glue(_CACHE,_dma_unmap_area)); ++EXPORT_SYMBOL(__glue(_CACHE,_dma_flush_range)); ++ ++#endif diff --git a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend index ea88489..1bcbb80 100644 --- a/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend +++ b/meta-smx6-extras/recipes/linux/linux-smx6_3.14.28.bbappend @@ -31,6 +31,7 @@ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" SRC_URI += " \ file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \ file://0001-ARM-LLVMLinux-Change-extern-inline-to-static-inline-.patch \ + file://0001-arm-Export-cache-flush-management-symbols-when-MULTI.patch \ " do_configure_prepend() { -- cgit v1.2.3-54-g00ecf From e4d9e3dc3df86764f974074238c2daaca2d424bd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 16 Sep 2016 12:42:24 +0300 Subject: Use new repo url for utils and appcontroller Repos are now open. Using codereview still, since mirroring to code.qt.io and github does not currently work. Change-Id: I03dfb0352bb8c9bbc182dfbd243eb648bfa2ce9a Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- recipes-qt/b2qt-addons/b2qt-appcontroller.bb | 9 +++------ recipes-qt/b2qt-addons/b2qt-utils.bb | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb index b083a4f..c9682a5 100644 --- a/recipes-qt/b2qt-addons/b2qt-appcontroller.bb +++ b/recipes-qt/b2qt-addons/b2qt-appcontroller.bb @@ -23,18 +23,15 @@ DESCRIPTION = "Boot to Qt Appcontroller" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://main.cpp;md5=1fcdf6b49fbbf2bc9c831893cca1b279;beginline=1;endline=17" -inherit qmake5 sdk-sources +inherit qmake5 +require recipes-qt/qt5/qt5-git.inc SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/appcontroller;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-appcontroller/ \ + git://codereview.qt-project.org/qt-apps/boot2qt-appcontroller;branch=${QT_MODULE_BRANCH};protocol=http \ file://appcontroller.conf \ " SRCREV = "1e3c96e0e4f28a072c835775f7fdc310eb3b4f28" -BRANCH = "5.6" -PV = "5.6+git${SRCPV}" - -S = "${WORKDIR}/git" DEPENDS = "qtbase" diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb index f43e450..ee26caf 100644 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ b/recipes-qt/b2qt-addons/b2qt-utils.bb @@ -23,17 +23,14 @@ DESCRIPTION = "Boot to Qt Utils module" LICENSE = "QtEnterprise" LIC_FILES_CHKSUM = "file://src/wifi/qwifimanager.h;md5=0b2892e6aca7d0750bbd7fe6b6b1c033;beginline=1;endline=17" -inherit qt5-module sdk-sources +inherit qt5-module +require recipes-qt/qt5/qt5-git.inc SRC_URI = " \ - git://codereview.qt-project.org/tqtc-boot2qt/utils;branch=${BRANCH};protocol=ssh;sdk-uri=5.6/Boot2Qt/sources/b2qt-utils \ + git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ " SRCREV = "a34cacb1a239dff4033b6beffd811b35db7c339f" -BRANCH = "5.6" -PV = "5.6+git${SRCPV}" - -S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative wpa-supplicant" -- cgit v1.2.3-54-g00ecf From 252c7d1d0024b86e4a84297f987eabf890e2e2fb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 16 Sep 2016 12:47:24 +0300 Subject: Use code.qt.io with git protocol instead of codereview Change-Id: Icd747dd2aace36bc1caa0a219526752f3cb7845d Reviewed-by: Mikko Gronoff --- scripts/manifest.xml | 2 +- scripts/manifest_fido.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 861b21b..c8381de 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -10,7 +10,7 @@ - + diff --git a/scripts/manifest_fido.xml b/scripts/manifest_fido.xml index 2a5808c..7a618e5 100644 --- a/scripts/manifest_fido.xml +++ b/scripts/manifest_fido.xml @@ -10,7 +10,7 @@ - + -- cgit v1.2.3-54-g00ecf From 97e5acb0a9a1b8c772cbf0018d46f26f61605bd1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 19 Sep 2016 13:42:39 +0300 Subject: kontron: update to SMARC-sAMX6i BSP release v2.0, RC2 Change-Id: I56bd5f3c695e4ffb966f0c715d937d1fe945f929 Reviewed-by: Rainer Keller --- scripts/manifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/manifest.xml b/scripts/manifest.xml index c8381de..973aa69 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -85,7 +85,7 @@ groups="notdefault,internal"/> -- cgit v1.2.3-54-g00ecf From 5e19fd01a8021b2aef3488666c555edd63eb4582 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 14 Sep 2016 16:53:57 +0300 Subject: toradex: use latest u-boot and flashing scripts The script sources are from meta-toradex-demos layer, but they are patched to update only u-boot part. The u-boot from V2.6 release is the latest that toradex uses in their boards and uses the changed u-boot location. Change-Id: I86345f692961ed906af4d9f251de28eb551d9cbf Reviewed-by: Risto Avila Reviewed-by: Teemu Holappa --- conf/distro/include/apalis-imx6.conf | 12 +-- conf/distro/include/colibri-imx6.conf | 6 -- conf/distro/include/colibri-vf.conf | 7 +- conf/distro/include/toradex.inc | 11 +++ .../recipes/u-boot/u-boot-script-toradex.bb | 33 ++++----- .../apalis-imx6/0001-Update-only-u-boot.patch | 60 +++++++++++++++ .../apalis-imx6/flash_blk.scr | 45 +++++++++++ .../apalis-imx6/flash_eth.scr | 46 ++++++++++++ .../colibri-imx6/0001-Update-only-u-boot.patch | 52 +++++++++++++ .../colibri-imx6/flash_blk.scr | 41 +++++++++++ .../colibri-imx6/flash_eth.scr | 42 +++++++++++ .../colibri-imx7/0001-Update-only-u-boot.patch | 36 +++++++++ .../colibri-imx7/flash_blk.scr | 19 +++++ .../colibri-imx7/flash_eth.scr | 19 +++++ .../colibri-vf/0001-Update-only-u-boot.patch | 62 ++++++++++++++++ .../u-boot-script-toradex/colibri-vf/flash_blk.scr | 28 +++++++ .../u-boot-script-toradex/colibri-vf/flash_eth.scr | 28 +++++++ .../u-boot/u-boot-script-toradex/fwd_blk.scr | 11 +++ .../u-boot/u-boot-script-toradex/fwd_eth.scr | 6 ++ .../u-boot/u-boot-script-toradex/fwd_mmc.scr | 3 + .../u-boot/u-boot-script-toradex/mx6/flash_blk.scr | 6 -- .../u-boot/u-boot-script-toradex/mx6/flash_mmc.scr | 6 -- .../u-boot/u-boot-script-toradex/vf/flash_blk.scr | 2 - .../u-boot/u-boot-script-toradex/vf/flash_mmc.scr | 3 - .../0001-Update-default-args-for-apalis-imx6.patch | 57 -------------- ...001-colibri-imx6-enable-sdboot-by-default.patch | 36 --------- .../recipes/u-boot/u-boot-toradex-fsl_git.bbappend | 26 ------- .../0001-Make-sdboot-default-on-all-boards.patch | 86 ++++++++++++++++++++++ .../recipes/u-boot/u-boot-toradex_2015.04.bbappend | 13 +++- 29 files changed, 629 insertions(+), 173 deletions(-) create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch delete mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend create mode 100644 meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index d5827db..0cef55a 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -26,21 +26,21 @@ DEPLOY_CONF_NAME = "Toradex Apalis iMX6" KERNEL_IMAGETYPE = "uImage" +UBOOT_MACHINE = "" +UBOOT_CONFIG ??= "com it" +UBOOT_CONFIG[com] = "apalis_imx6_defconfig" +UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig" + BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ - u-boot-${MACHINE}.imx:u-boot.imx \ - flash_mmc-${MACHINE}.img:flash_mmc.img \ - flash_blk-${MACHINE}.img:flash_blk.img \ " BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" BOOT_SCRIPTS += " \ - u-boot-${MACHINE}.imx:u-boot.imx \ - flash_mmc-${MACHINE}.img:flash_mmc.img \ - flash_blk-${MACHINE}.img:flash_blk.img \ + u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \ " MACHINE_EXTRA_INSTALL = "\ diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf index 4cde248..9349300 100644 --- a/conf/distro/include/colibri-imx6.conf +++ b/conf/distro/include/colibri-imx6.conf @@ -30,14 +30,8 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ - u-boot-${MACHINE}.imx:u-boot.imx \ " BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" -BOOT_SCRIPTS += " \ - u-boot-${MACHINE}.imx:u-boot.imx \ - flash_mmc-${MACHINE}.img:flash_mmc.img \ - flash_blk-${MACHINE}.img:flash_blk.img \ - " MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 6512f2b..7da7622 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -27,17 +27,12 @@ IMAGE_FSTYPES += "ext3 sdcard" IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" BOOTFS_CONTENT = "\ - u-boot-${MACHINE}.imx:u-boot.imx \ - flash_mmc-${MACHINE}.img:flash_mmc.img \ - flash_blk-${MACHINE}.img:flash_blk.img \ ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ " BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" BOOT_SCRIPTS += " \ - u-boot-${MACHINE}.imx:u-boot.imx \ - flash_mmc-${MACHINE}.img:flash_mmc.img \ - flash_blk-${MACHINE}.img:flash_blk.img \ + u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ " DEFAULTTUNE = "armv7ahf-neon" diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc index 7df80e1..bd8ce84 100644 --- a/conf/distro/include/toradex.inc +++ b/conf/distro/include/toradex.inc @@ -21,3 +21,14 @@ BBMASK ?= " " BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|recipes-core/glibc/glibc_linaro-2.20.bbappend" + +PREFERRED_PROVIDER_u-boot = "u-boot-toradex" + +MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" +BOOT_SCRIPTS += " \ + fwd_blk.img:flash_blk.img \ + fwd_eth.img:flash_eth.img \ + fwd_mmc.img:flash_mmc.img \ + ${MACHINE}:${MACHINEDIR} \ + u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \ + " diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb index 337d57d..4d7c307 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex.bb @@ -22,11 +22,15 @@ LICENSE = "CLOSED" DEPENDS = "u-boot-mkimage-native" -PV = "v2.3" +PV = "v2.6" SRC_URI = " \ - file://flash_mmc.scr \ + file://fwd_mmc.scr \ + file://fwd_blk.scr \ + file://fwd_eth.scr \ file://flash_blk.scr \ + file://flash_eth.scr \ + file://0001-Update-only-u-boot.patch \ " S = "${WORKDIR}" @@ -34,27 +38,20 @@ S = "${WORKDIR}" inherit deploy do_mkimage () { - uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ - -n "update script" -d ${WORKDIR}/flash_mmc.scr \ - flash_mmc.img - - uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ - -n "update script" -d ${WORKDIR}/flash_blk.scr \ - flash_blk.img + for scr in ${WORKDIR}/*.scr; do + uboot-mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ + -n "update script" -d ${scr} \ + $(basename ${scr} .scr).img + done } addtask mkimage after do_compile before do_install do_deploy () { - install -d ${DEPLOYDIR} - install ${S}/flash_mmc.img ${DEPLOYDIR}/flash_mmc-${MACHINE}-${PV}-${PR}.img - install ${S}/flash_blk.img ${DEPLOYDIR}/flash_blk-${MACHINE}-${PV}-${PR}.img - - cd ${DEPLOYDIR} - rm -f flash_mmc-${MACHINE}.img - ln -sf flash_mmc-${MACHINE}-${PV}-${PR}.img flash_mmc-${MACHINE}.img - rm -f flash_blk-${MACHINE}.img - ln -sf flash_blk-${MACHINE}-${PV}-${PR}.img flash_blk-${MACHINE}.img + install -d ${DEPLOYDIR}/${MACHINE} + install -m 0644 -t ${DEPLOYDIR} ${S}/*.img + ln -s ../flash_blk.img ${DEPLOYDIR}/${MACHINE}/ + ln -s ../flash_eth.img ${DEPLOYDIR}/${MACHINE}/ } addtask deploy after do_install before do_build diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..5c62eb1 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/0001-Update-only-u-boot.patch @@ -0,0 +1,60 @@ +From 262b1dcc5f886ceb1944c8db3c1072c98d45a56e Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 14 Sep 2016 10:11:32 +0300 +Subject: [PATCH] Update only u-boot + +--- + flash_blk.scr | 8 ++++---- + flash_eth.scr | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/flash_blk.scr b/flash_blk.scr +index 800383c..398c4de 100644 +--- a/flash_blk.scr ++++ b/flash_blk.scr +@@ -30,16 +30,16 @@ setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfa + #do it in chunks of 64M to fit into DDR RAM of the smallest module + setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' + +-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" +-setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" ++setenv echo_migrate echo "successfully updated U-Boot" ++setenv echo_migrate-it echo "successfully updated U-Boot" + setenv migrate 'run migrate_configblock; run update_latest; reset' + setenv migrate_it 'setenv module_type -it; run migrate' + setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' + setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' + + setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' +-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' ++setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' + setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' + setenv update_it 'setenv module_type -it; run update' + +-echo 'enter "run update" or "run update_it" to update the entire module' ++echo 'enter "run update" or "run update_it" to update the uboot' +diff --git a/flash_eth.scr b/flash_eth.scr +index 804c924..2f64288 100644 +--- a/flash_eth.scr ++++ b/flash_eth.scr +@@ -31,16 +31,16 @@ setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt + #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- + setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' + +-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" +-setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" ++setenv echo_migrate echo "successfully updated U-Boot" ++setenv echo_migrate-it echo "successfully updated U-Boot" + setenv migrate 'run migrate_configblock; run update_latest; reset' + setenv migrate_it 'setenv module_type -it; run migrate' + setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' + setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' + + setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' +-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' ++setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' + setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' + setenv update_it 'setenv module_type -it; run update' + +-echo 'enter "run update" or "run update_it" to update the entire module' ++echo 'enter "run update" or "run update_it" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr new file mode 100644 index 0000000..398c4de --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_blk.scr @@ -0,0 +1,45 @@ +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 + +setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' +setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}' + +setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' + +setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' + +setenv migrate_uboot_old 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' +setenv migrate_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' + +setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' + +setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' +setenv update_uboot_it 'setenv module_type -it; run update_uboot' + +setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' + +setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' + +setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' + +setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +#do it in chunks of 64M to fit into DDR RAM of the smallest module +setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' + +setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" +setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" +setenv migrate 'run migrate_configblock; run update_latest; reset' +setenv migrate_it 'setenv module_type -it; run migrate' +setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' +setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' + +setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' +setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' +setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' +setenv update_it 'setenv module_type -it; run update' + +echo 'enter "run update" or "run update_it" to update the entire module' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr new file mode 100644 index 0000000..2f64288 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/apalis-imx6/flash_eth.scr @@ -0,0 +1,46 @@ +setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' +#workaround U-Boot counting in hex and split did in decimal +setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true' +setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' + +setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' + +setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' + +setenv migrate_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' +setenv migrate_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' + +setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' + +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx${module_type} && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' +setenv update_uboot_it 'setenv module_type -it; run update_uboot' + +setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' + +setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' + +setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' + +setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +#do it in chunks of 64M to fit into DDR RAM of the smallest module +#split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows +#split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- +setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' + +setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" +setenv echo_migrate-it echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate_it\" to complete update" +setenv migrate 'run migrate_configblock; run update_latest; reset' +setenv migrate_it 'setenv module_type -it; run migrate' +setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate${module_type}' +setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate${module_type}' + +setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' +setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' +setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' +setenv update_it 'setenv module_type -it; run update' + +echo 'enter "run update" or "run update_it" to update the entire module' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..cf01d59 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/0001-Update-only-u-boot.patch @@ -0,0 +1,52 @@ +From 40445299edb425159c30609e1ab7172801535a43 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 14 Sep 2016 10:17:02 +0300 +Subject: [PATCH] Update only u-boot + +--- + flash_blk.scr | 6 +++--- + flash_eth.scr | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/flash_blk.scr b/flash_blk.scr +index a60a7a5..23c5b72 100644 +--- a/flash_blk.scr ++++ b/flash_blk.scr +@@ -29,13 +29,13 @@ setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfa + #do it in chunks of 64M to fit into DDR RAM of the smallest module + setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' + +-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" ++setenv echo_migrate echo "successfully updated U-Boot" + setenv migrate 'run migrate_configblock; run update_latest; reset' + setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' + setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' + + setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' +-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' ++setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' + setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' + +-echo 'enter "run update" to update the entire module' ++echo 'enter "run update" to update the uboot' +diff --git a/flash_eth.scr b/flash_eth.scr +index a3906b2..14f4104 100644 +--- a/flash_eth.scr ++++ b/flash_eth.scr +@@ -30,13 +30,13 @@ setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt + #split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- + setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' + +-setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" ++setenv echo_migrate echo "successfully updated U-Boot" + setenv migrate 'run migrate_configblock; run update_latest; reset' + setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' + setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' + + setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' +-setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' ++setenv update_new 'updt_fuse -n && run update_uboot && reset; run update_v2.5b3' + setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' + +-echo 'enter "run update" to update the entire module' ++echo 'enter "run update" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr new file mode 100644 index 0000000..23c5b72 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_blk.scr @@ -0,0 +1,41 @@ +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 + +setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' +setenv set_nextpos 'setexpr filepos ${filepos} + ${filesize}; setexpr blkstart ${blkstart} + ${blkcnt}' + +setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' + +setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' + +setenv migrate_uboot_old 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' +setenv migrate_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' + +setenv cp_file_chunk 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/root.ext3 ${filesize} ${filepos}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' + +setenv update_uboot 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' + +setenv update_kernel 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' + +setenv update_fdt 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' + +setenv update_configblock 'run check_configblock; load ${interface} ${drive}:1 ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' + +setenv update_1 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'load ${interface} ${drive}:1 ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +#do it in chunks of 64M to fit into DDR RAM of the smallest module +setenv update_3 'setenv filesize 4000000; setenv filepos 0; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextpos; done; true' + +setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" +setenv migrate 'run migrate_configblock; run update_latest; reset' +setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' +setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' + +setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' +setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' +setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' + +echo 'enter "run update" to update the entire module' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr new file mode 100644 index 0000000..14f4104 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx6/flash_eth.scr @@ -0,0 +1,42 @@ +setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' +#workaround U-Boot counting in hex and split did in decimal +setenv incr_decimal 'setexpr filenum ${filenum} + 1; setexpr filenrlow ${filenum} % 0x10; test ${filenrlow} -eq "a" && setexpr filenum ${filenum} + 0x6; true' +setenv set_nextnum 'run incr_decimal; setexpr blkstart ${blkstart} + ${blkcnt}' + +setenv check_1 'setenv conf_blk_offset 0x1fff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_2 'setenv conf_blk_offset 0xfff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_3 'setenv conf_blk_offset 0x7ff; mmc read ${loadaddr} ${conf_blk_offset} 1' +setenv check_configblock 'setexpr toradex_oui_addr ${loadaddr} + 8; mw.l ${kernel_addr_r} 0x002d1400; mmc dev 0 1; run check_1 || run check_2 || run check_3; cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3' + +setenv migrate_configblock 'run check_configblock; mmc dev 0 0 && mmc read ${loadaddr} 0x500 1 && cmp.b ${kernel_addr_r} ${toradex_oui_addr} 3 && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' + +setenv migrate_uboot_old 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}; patch_ddr_size' +setenv migrate_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && mmc bootbus 0 2 1 2 && mmc partconf 0 1 1 0' + +setenv cp_file_chunk 'tftpboot ${loadaddr} ${board_name}/root.ext3-${filenum}; run set_blkcnt; mmc dev 0 0 && mmc write ${loadaddr} ${blkstart} ${blkcnt}' + +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot.imx && run set_blkcnt && mmc dev 0 1 && mmc write ${loadaddr} 2 ${blkcnt} && patch_ddr_size && updt_fuse && mmc bootbus 0 2 0 1 && mmc partconf 0 1 1 0 && mmc rst-function 0 1' + +setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/uImage && fatwrite mmc 0:1 ${loadaddr} uImage ${filesize}' + +setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${fdt_file} && fatwrite mmc 0:1 ${loadaddr} ${fdt_file} ${filesize}' + +setenv update_configblock 'run check_configblock; tftpboot ${loadaddr} ${board_name}/configblock.bin && mmc dev 0 1 && mmc write ${loadaddr} ${conf_blk_offset} 1' + +setenv update_1 'tftpboot ${loadaddr} ${board_name}/mbr.bin && mmc dev 0 0 && mmc write ${loadaddr} 0x0 0x1' +setenv update_2 'tftpboot ${loadaddr} ${board_name}/boot.vfat && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 0x2000 ${blkcnt}' +#do it in chunks of 64M to fit into DDR RAM of the smallest module +#split root.ext3 into multiple 64M chunks before copying to TFTP folder as follows +#split -a 2 -b `expr 64 \* 1024 \* 1024` --numeric-suffixes=10 root.ext3 root.ext3- +setenv update_3 'setenv filesize 4000000; setenv filenum 10; setenv blkstart a000; while test ${filesize} -eq "4000000"; do run cp_file_chunk; run set_nextnum; done; true' + +setenv echo_migrate echo "successfully updated U-Boot, power-cycle and enter \"run setupdate\; run migrate\" to complete update" +setenv migrate 'run migrate_configblock; run update_latest; reset' +setenv update_v2.4b1 'run check_configblock || run migrate_configblock; run migrate_uboot_old && run echo_migrate' +setenv update_v2.5b3 'run check_configblock || run migrate_configblock; run migrate_uboot && run echo_migrate' + +setenv update_latest 'run update_uboot; run update_1; run update_2; run update_kernel; run update_fdt; run update_3' +setenv update_new 'updt_fuse -n && run update_latest && reset; run update_v2.5b3' +setenv update 'mmc bootbus 0 2 0 1 && run update_new && exit; run update_v2.4b1' + +echo 'enter "run update" to update the entire module' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..08ddd88 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/0001-Update-only-u-boot.patch @@ -0,0 +1,36 @@ +From c02da9f92f6ffaee65f428e1978bd3ff379a2612 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 14 Sep 2016 10:19:28 +0300 +Subject: [PATCH] Update only u-boot + +--- + flash_blk.scr | 4 ++-- + flash_eth.scr | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/flash_blk.scr b/flash_blk.scr +index cc4cf38..b63366a 100644 +--- a/flash_blk.scr ++++ b/flash_blk.scr +@@ -14,6 +14,6 @@ setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.i + + setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' + setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' +-setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' ++setenv update 'mtdparts default && run update_uboot && reset' + +-echo 'enter "run update" to update the entire module' ++echo 'enter "run update" to update the uboot' +diff --git a/flash_eth.scr b/flash_eth.scr +index 01be124..13025de 100644 +--- a/flash_eth.scr ++++ b/flash_eth.scr +@@ -14,6 +14,6 @@ setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write + + setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' + setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' +-setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' ++setenv update 'mtdparts default && run update_uboot && reset' + +-echo 'enter "run update" to update the entire module' ++echo 'enter "run update" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr new file mode 100644 index 0000000..b63366a --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_blk.scr @@ -0,0 +1,19 @@ +setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' +setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}' + +# Migrate to UBI volume based boot schema +setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' +setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static' +setenv prepare_rootfs 'ubi create rootfs 0 dynamic' +setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi' + +setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize' +setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' +setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' +setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' + +setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' +setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' +setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' + +echo 'enter "run update" to update the entire module' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr new file mode 100644 index 0000000..13025de --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-imx7/flash_eth.scr @@ -0,0 +1,19 @@ +setenv create_bcb 'nand erase.part mx7-bcb && writebcb 80000 200000' +setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize} && nand write ${loadaddr} 0x20800 ${filesize}' + +# Migrate to UBI volume based boot schema +setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' +setenv prepare_m4firmware 'ubi create m4firmware 0xe0000 static' +setenv prepare_rootfs 'ubi create rootfs 0 dynamic' +setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_m4firmware && run prepare_rootfs; fi' + +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && writeboot ${loadaddr} 80000 200000 $filesize' +setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' +setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' +setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' + +setenv upgrade_alpha1_msg 'Updated U-Boot, please reset the board and use "run setupdate && run update" again.' +setenv prepare_alpha1_uboot 'if test "${soc}" = "mx7"; then run update_uboot && echo ${upgrade_alpha1_msg} && reset; fi' +setenv update 'mtdparts default && run prepare_alpha1_uboot; run update_uboot && run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs && reset' + +echo 'enter "run update" to update the entire module' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch new file mode 100644 index 0000000..f096c2e --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/0001-Update-only-u-boot.patch @@ -0,0 +1,62 @@ +From 2b11117dcc616843a6dce1a5e97fcecefa7e3f4b Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 14 Sep 2016 10:22:27 +0300 +Subject: [PATCH] Update only u-boot + +--- + flash_blk.scr | 6 +++--- + flash_eth.scr | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/flash_blk.scr b/flash_blk.scr +index 401c47a..8fa5af9 100644 +--- a/flash_blk.scr ++++ b/flash_blk.scr +@@ -11,7 +11,7 @@ setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage + setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' + setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' + +-setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' ++setenv update_new 'run update_uboot; reset' + + # Upgrade part 1, write new U-Boot, but with old ECC format still... + # Store config block temporarly in memory at kernel_addr_r. +@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 + setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' + + # Upgrade part 2, use new ECC format for the whole device... +-setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' ++setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}' + setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' + + # fsl_nfc indicates old NAND format (24-bit ECC), start migration process + setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' + +-echo 'enter "run update" to update the entire module' ++echo 'enter "run update" to update the uboot' +diff --git a/flash_eth.scr b/flash_eth.scr +index 15aab1c..aa98b3a 100644 +--- a/flash_eth.scr ++++ b/flash_eth.scr +@@ -11,7 +11,7 @@ setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${l + setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' + setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' + +-setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' ++setenv update_new 'run update_uboot; reset' + + # Upgrade part 1, write new U-Boot, but with old ECC format still... + # Store config block temporarly in memory at kernel_addr_r. +@@ -19,10 +19,10 @@ setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 + setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' + + # Upgrade part 2, use new ECC format for the whole device... +-setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' ++setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && echo ${upgrade_part2_msg}' + setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' + + # fsl_nfc indicates old NAND format (24-bit ECC), start migration process + setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' + +-echo 'enter "run update" to update the entire module' ++echo 'enter "run update" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr new file mode 100644 index 0000000..8fa5af9 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_blk.scr @@ -0,0 +1,28 @@ +setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' +setenv update_configblock 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' + +# Migrate to UBI volume based boot schema +setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' +setenv prepare_rootfs 'ubi create rootfs 0 dynamic' +setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' + +setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' +setenv update_kernel 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' +setenv update_fdt 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' +setenv update_rootfs 'fatload ${interface} 0:1 ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' + +setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' + +# Upgrade part 1, write new U-Boot, but with old ECC format still... +# Store config block temporarly in memory at kernel_addr_r. +setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"' +setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' + +# Upgrade part 2, use new ECC format for the whole device... +setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' +setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' + +# fsl_nfc indicates old NAND format (24-bit ECC), start migration process +setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' + +echo 'enter "run update" to update the entire module' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr new file mode 100644 index 0000000..aa98b3a --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/colibri-vf/flash_eth.scr @@ -0,0 +1,28 @@ +setenv create_bcb 'nand erase.part vf-bcb && writebcb 0x20000 0x20000' +setenv update_configblock 'tftpboot ${loadaddr} ${board_name}/configblock.bin && nand write ${loadaddr} 0x800 ${filesize}' + +# Migrate to UBI volume based boot schema +setenv prepare_kernel_fdt 'ubi create kernel 0x800000 static && ubi create dtb 0x20000 static' +setenv prepare_rootfs 'ubi create rootfs 0 dynamic' +setenv prepare_ubi 'ubi part ubi && if ubi check rootfs; then if ubi check kernel; then else ubi remove rootfs && run prepare_kernel_fdt && run prepare_rootfs; fi; else run prepare_kernel_fdt && run prepare_rootfs; fi' + +setenv update_uboot 'tftpboot ${loadaddr} ${board_name}/u-boot-nand.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' +setenv update_kernel 'tftpboot ${loadaddr} ${board_name}/zImage && ubi write ${loadaddr} kernel ${filesize}' +setenv update_fdt 'tftpboot ${loadaddr} ${board_name}/${soc}-colibri-${fdt_board}.dtb && ubi write ${loadaddr} dtb ${filesize}' +setenv update_rootfs 'tftpboot ${loadaddr} ${board_name}/ubifs.img && ubi write ${loadaddr} rootfs ${filesize}' + +setenv update_new 'run update_uboot; run prepare_ubi && run update_kernel && run update_fdt && run update_rootfs; reset' + +# Upgrade part 1, write new U-Boot, but with old ECC format still... +# Store config block temporarly in memory at kernel_addr_r. +setenv upgrade_part1 'run update_uboot && nand read ${kernel_addr_r} 0x800 0x20 && echo "${upgrade_part1_msg}"' +setenv upgrade_part1_msg 'Successfully updated U-Boot, NAND upgrade required. Enter "reset", interrupt boot process and enter "run setupdate; run upgrade_part2" to complete upgrade.' + +# Upgrade part 2, use new ECC format for the whole device... +setenv upgrade_part2 'run create_bcb && nand write ${kernel_addr_r} 0x800 0x20 && run update_uboot && nand erase.part ubi && run update_rootfs && echo ${upgrade_part2_msg}' +setenv upgrade_part2_msg 'Successfully upgraded module, enter "reset" to restart the module.' + +# fsl_nfc indicates old NAND format (24-bit ECC), start migration process +setenv update 'mtdparts default && if test "${mtdids}" = "nand0=fsl_nfc"; then; run upgrade_part1; else run update_new; fi' + +echo 'enter "run update" to update the entire module' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr new file mode 100644 index 0000000..7af72e6 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_blk.scr @@ -0,0 +1,11 @@ +#the update.sh script renames this. fwd_blk.scr -> ../flash_blk.img +test -n ${interface} || setenv interface mmc +test -n ${drive} || setenv drive 1 +test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf +test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf +test "${board_name}" = "colibri_imx7" && setenv drive 0 +test "${board_name}" = "colibri_t20" && setenv drive 0 +test "${board_name}" = "colibri_vf" && setenv drive 0 + +test -n ${board_name} || echo "board_name env not set!" && exit +fatload ${interface} ${drive}:1 ${loadaddr} ${board_name}/flash_blk.img && source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr new file mode 100644 index 0000000..d7ea35c --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_eth.scr @@ -0,0 +1,6 @@ +#the update.sh script renames this. fwd_eth.scr -> ../flash_eth.img +test -z "${board_name}" && test "${soc}" = "vf500" && setenv board_name colibri_vf +test -z "${board_name}" && test "${soc}" = "vf610" && setenv board_name colibri_vf + +test -n ${board_name} || echo "board_name env not set!" && exit +tftpboot ${loadaddr} "${board_name}/flash_eth.img" && source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr new file mode 100644 index 0000000..4c8f666 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/fwd_mmc.scr @@ -0,0 +1,3 @@ +#the update.sh script renames this. fwd_mmc.scr -> ../flash_mmc.img +#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions +fatload mmc ${drive}:1 ${loadaddr} flash_blk.img && source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr deleted file mode 100644 index ee87e85..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_blk.scr +++ /dev/null @@ -1,6 +0,0 @@ -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 - -setenv set_blkcnt 'setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt ${blkcnt} / 0x200' -setenv update_uboot 'fatload ${interface} ${drive}:1 ${loadaddr} u-boot.imx && run set_blkcnt && mmc dev 0 0 && mmc write ${loadaddr} 2 ${blkcnt}' -echo 'enter "run update_uboot" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr deleted file mode 100644 index 207c7db..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/mx6/flash_mmc.scr +++ /dev/null @@ -1,6 +0,0 @@ -#flash_mmc has been renamed to flash_blk, ensure compatibilty when updating from older versions -test -n ${interface} || setenv interface mmc -test -n ${drive} || setenv drive 1 - -fatload ${interface} ${drive}:1 ${loadaddr} flash_blk.img -source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr deleted file mode 100644 index be8ec8d..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_blk.scr +++ /dev/null @@ -1,2 +0,0 @@ -setenv update_uboot 'fatload ${interface} 0:1 ${loadaddr} u-boot.imx && nand erase.part u-boot && nand erase.part u-boot-env && nand write ${loadaddr} u-boot' -echo 'enter "run update_uboot" to update the uboot' diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr b/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr deleted file mode 100644 index e0770a0..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-script-toradex/vf/flash_mmc.scr +++ /dev/null @@ -1,3 +0,0 @@ -setenv interface mmc -fatload ${interface} 0:1 ${loadaddr} flash_blk.img -source ${loadaddr} diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch deleted file mode 100644 index b7c7d63..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-Update-default-args-for-apalis-imx6.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 94531a3ecaea073316b9e4c341085ce5e277bd9f Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Mon, 27 Oct 2014 14:53:25 +0200 -Subject: [PATCH] Update default args for apalis imx6 - -Boot from sd card by default, disable kernel logs from tty1, and -disable cursor blinking. ---- - include/configs/apalis_imx6.h | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h -index e7d0d20..a1d425d 100644 ---- a/include/configs/apalis_imx6.h -+++ b/include/configs/apalis_imx6.h -@@ -251,14 +251,14 @@ - "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - - #define SD_BOOTCMD \ -- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ -- "rootwait\0" \ -+ "drive=2\0" \ - "sdboot=run setup; " \ -- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ -+ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ -+ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ - "${vidargs}; echo Booting from SD card in 8-bit slot...; " \ -- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ -+ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ - "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ -- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ -+ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ - "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" - - #define USB_BOOTCMD \ -@@ -278,7 +278,8 @@ - #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" - #endif - #define CONFIG_EXTRA_ENV_SETTINGS \ -- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ -+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ -+ "run emmcboot ; echo ; echo emmcboot failed ; " \ - "run nfsboot ; echo ; echo nfsboot failed ; " \ - "usb start ;" \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -299,7 +300,7 @@ - "|| setenv drive 2; load ${interface} ${drive}:1 " \ - "${kernel_addr_r} flash_blk.img\0" \ - "setup=setenv setupargs fec_mac=${ethaddr} " \ -- "consoleblank=0 no_console_suspend=1 console=tty1 " \ -+ "consoleblank=0 no_console_suspend=1 vt.global_cursor_default=0 " \ - "console=${console},${baudrate}n8\0 " \ - "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ - " source ${kernel_addr_r}\0" \ --- -1.9.1 - diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch deleted file mode 100644 index 0743128..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl/0001-colibri-imx6-enable-sdboot-by-default.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 10ebeba59e6fd25352aa44ecd85913126ec45afe Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Wed, 24 Feb 2016 15:39:52 +0200 -Subject: [PATCH] colibri imx6: enable sdboot by default - -remove console from tty1 ---- - include/configs/colibri_imx6.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h -index c545334..eb0dfa9 100644 ---- a/include/configs/colibri_imx6.h -+++ b/include/configs/colibri_imx6.h -@@ -242,7 +242,8 @@ - - #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" - #define CONFIG_EXTRA_ENV_SETTINGS \ -- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ -+ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ -+ "run emmcboot ; echo ; echo emmcboot failed ; " \ - "run nfsboot ; echo ; echo nfsboot failed ; " \ - "usb start ;" \ - "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ -@@ -261,7 +262,7 @@ - "setsdupdate=setenv interface mmc; setenv drive 1; mmc rescan; " \ - "load ${interface} ${drive}:1 ${kernel_addr_r} flash_blk.img\0" \ - "setup=setenv setupargs fec_mac=${ethaddr} " \ -- "consoleblank=0 no_console_suspend=1 console=tty1 " \ -+ "consoleblank=0 no_console_suspend=1 " \ - "console=${console},${baudrate}n8\0 " \ - "setupdate=run setsdupdate || run setusbupdate || run setethupdate;" \ - " source ${kernel_addr_r}\0" \ --- -1.9.1 - 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 deleted file mode 100644 index 1165713..0000000 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex-fsl_git.bbappend +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################## -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:COMM$ -## -## 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 http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## $QT_END_LICENSE$ -## -############################################################################## - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-Update-default-args-for-apalis-imx6.patch \ - file://0001-colibri-imx6-enable-sdboot-by-default.patch \ - " diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch new file mode 100644 index 0000000..135dfd8 --- /dev/null +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex/0001-Make-sdboot-default-on-all-boards.patch @@ -0,0 +1,86 @@ +From 4c748ee698961515c1602373f4f5d399c0a8e4a1 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Wed, 14 Sep 2016 17:10:22 +0300 +Subject: [PATCH] Make sdboot default on all boards + +--- + include/configs/apalis_imx6.h | 13 +++++++------ + include/configs/colibri_imx6.h | 3 ++- + include/configs/colibri_imx7.h | 2 +- + include/configs/colibri_vf.h | 2 +- + 4 files changed, 11 insertions(+), 9 deletions(-) + +diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h +index 3ea4a5c..53d9a0c 100644 +--- a/include/configs/apalis_imx6.h ++++ b/include/configs/apalis_imx6.h +@@ -252,14 +252,14 @@ + "&& setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define SD_BOOTCMD \ +- "sdargs=ip=off root=/dev/mmcblk1p2 rw,noatime rootfstype=ext3 " \ +- "rootwait\0" \ ++ "drive=2\0" \ + "sdboot=run setup; " \ +- "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ ++ "setenv bootargs ${defargs} ip=off root=/dev/mmcblk${drive}p2 " \ ++ "rw,noatime rootfstype=ext3 rootwait ${setupargs} " \ + "${vidargs}; echo Booting from SD card in 8-bit slot...; " \ +- "run sddtbload; load mmc 1:1 ${kernel_addr_r} " \ ++ "run sddtbload; load mmc ${drive}:1 ${kernel_addr_r} " \ + "${boot_file} && bootm ${kernel_addr_r} ${dtbparam}\0" \ +- "sddtbload=setenv dtbparam; load mmc 1:1 ${fdt_addr_r} " \ ++ "sddtbload=setenv dtbparam; load mmc ${drive}:1 ${fdt_addr_r} " \ + "${fdt_file} && setenv dtbparam \" - ${fdt_addr_r}\" && true\0" + + #define USB_BOOTCMD \ +@@ -279,7 +279,8 @@ + #define FDT_FILE "imx6q-apalis_v1_0-eval.dtb" + #endif + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ ++ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ ++ "run emmcboot ; echo ; echo emmcboot failed ; " \ + "run nfsboot ; echo ; echo nfsboot failed ; " \ + "usb start ;" \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ +diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h +index adc2d1e..9fd5f4c 100644 +--- a/include/configs/colibri_imx6.h ++++ b/include/configs/colibri_imx6.h +@@ -245,7 +245,8 @@ + + #define FDT_FILE "imx6dl-colibri-eval-v3.dtb" + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "bootcmd=run emmcboot ; echo ; echo emmcboot failed ; " \ ++ "bootcmd=run sdboot ; echo ; echo sdboot failed ; " \ ++ "run emmcboot ; echo ; echo emmcboot failed ; " \ + "run nfsboot ; echo ; echo nfsboot failed ; " \ + "usb start ;" \ + "setenv stdout serial,vga ; setenv stdin serial,usbkbd\0" \ +diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h +index e585c81..f6267a7 100644 +--- a/include/configs/colibri_imx7.h ++++ b/include/configs/colibri_imx7.h +@@ -226,7 +226,7 @@ + "ubi read ${fdt_addr_r} dtb && " \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + +-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" ++#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" + + #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 + +diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h +index 26cf60a..33a3e3b 100644 +--- a/include/configs/colibri_vf.h ++++ b/include/configs/colibri_vf.h +@@ -185,7 +185,7 @@ + "ubi read ${fdt_addr_r} dtb && " \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + +-#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" ++#define CONFIG_BOOTCOMMAND "run sdboot; run ubiboot; run nfsboot" + + #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" + diff --git a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend index 4e0c623..d7be9e2 100644 --- a/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend +++ b/meta-toradex-extras/recipes/u-boot/u-boot-toradex_2015.04.bbappend @@ -19,7 +19,18 @@ ## ############################################################################## +PV = "v2015.04-v2.6b2.1+git${SRCPV}" +SRCREV_b2qt = "90a974d34aaa85d5ce69f83067928592c5389990" +SRCBRANCH = "2015.04-toradex" +COMPATIBLE_MACHINE = "(mx6|mx7|vf)" + +do_deploy_append_apalis-imx6() { + cd ${DEPLOYDIR} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} +} + FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ - file://0001-colibri-vf-remove-console-from-tty1.patch \ + file://0001-Make-sdboot-default-on-all-boards.patch \ " -- cgit v1.2.3-54-g00ecf From 2b115238356e2cfa963f004cb8469533d4d21305 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 19 Sep 2016 12:12:49 +0300 Subject: qt5: update submodules final qt 5.6.2 content Change-Id: I6b12d95cdc356a73f59c187d70676f2e17bb3b65 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtbase-native_git.bbappend | 2 +- recipes-qt/qt5/qtbase_git.bbappend | 2 +- recipes-qt/qt5/qtcanvas3d_git.bbappend | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bbappend | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bbappend | 2 +- recipes-qt/qt5/qtlocation_git.bbappend | 2 +- recipes-qt/qt5/qtmultimedia_git.bbappend | 2 +- recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 +- recipes-qt/qt5/qtsensors_git.bbappend | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bbappend | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland-native_git.bbappend | 2 +- recipes-qt/qt5/qtwayland_git.bbappend | 2 +- recipes-qt/qt5/qtwebengine_git.bbappend | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index cfab8e6..0fb1a15 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" +SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 9b8c5c6..529748f 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" +SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index 48b8165..9c92738 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "c8a6b4278b04ff3ffb4484a3cf17cf4638dbadb4" +SRCREV = "f242b91189e3bd0cc96dd1a2695eef0521099aea" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index 95ef942..2c3ba90 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "2778071f6c80b5397a183db37114aef881ade855" +SRCREV = "85fe2daab5ed14655b456df8821c9f5f606fdc12" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index c5a129d..359c43d 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "8ed3130583510feba58e6f289d1c7b5d051a6663" +SRCREV = "1474e311738e2676b65c4c40dc7ff0dbf4d6a5bd" DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 0439edb..f57a619 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "21e7cb1bafdfc06c263e10067d02f9b103ff660f" +SRCREV = "bd7649557e99be543b78492d96bb2982e0a3e4c4" diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb index 3e1152f..8597315 100644 --- a/recipes-qt/qt5/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/plugins/scenegraph/softwarecontext/softwarelayer. inherit qt5-module require recipes-qt/qt5/qt5-git.inc -SRCREV = "ab6739631dd87ffa480e79b33ea14aa97a66bc9e" +SRCREV = "d09edf104dd05b472d3004484cc9bd47befb0a3d" DEPENDS = "qtbase qtdeclarative" diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 609d934..f46ba76 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "dcede8bbe1a4e1401679d42bf7179305771d0c5a" +SRCREV = "c1d726fe19c83cf081042e55ace9d9d7b31c40e6" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index cbe9ab9..a318e4e 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "7504b2ce36a90261ba2409e4160570b58d8b38e0" +SRCREV = "7d01112c36a98912706e9d33ce2e36126de0ccec" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index f4e1c3d..fd551c6 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -23,4 +23,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "6d95682d7ff282180655f2f384d8aba69c4f67af" +SRCREV = "20686cb51fb2dfa5973d636875e9fc20c2bde4f5" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index ea2046d..895e4f8 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -21,4 +21,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRCREV = "846d04cec8d946c28ddbeecc79c63553e0891736" +SRCREV = "59c6c0e0b1b5b46747595a58e11311b7393d7e70" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index 579cc47..4407369 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "46d9a630a88fc5388dec7fd99289d0e9e0e1f680" +SRCREV = "922c2bb671c113b7e481fb86f823188b4bce1d3e" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index bb934bc..e4ef3c7 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -31,4 +31,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "c8305c87f805dbeb6cb5b09ac086a7651ef8c857" +SRCREV = "0a4a5f7e1cbca7bd8b797603025534368de02cb7" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index 7fbdf67..1bf4848 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "b0e3e7469cf5249bb395d044c5344bbe88884553" +SRCREV = "46ef9fdc130a06bd80c5c004f0dc95c473f704c8" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index ef78418..e7ab947 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec" +SRCREV = "13a199e6e2c5f27b0f12eff380df4f0c0d156e6e" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index c2522cb..b886d31 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" +SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index c2522cb..b886d31 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "f21246748ce20cd86346e192fe0c4c76a9b08a7c" +SRCREV = "82e11583928d47576c160d35c9df05c0eec34df8" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index af3e87c..97ba560 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "2209add7a5b019afef7830d8bbf416fbb2a2ecf5" +SRCREV_qtwebengine = "2f24e3c307aecb657736310948c7cdaad5176678" SRCREV_chromium = "4d61c01b71fcbe706ea4220d33294d4f5600ca31" -- cgit v1.2.3-54-g00ecf From b032c61b50f92013d750ff5b649c0f7184dd601d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 22 Sep 2016 08:11:18 +0300 Subject: nitrogen6x: add Nitrogen6QP_MAX and SOMv2 support BoundaryDevices' kernel has support for these boards, but their machine config has not enabled them until in krogoth branch. Change-Id: I31d93e2f3136ed647d673d29f64c20d7bb47af49 Task-number: QTBUG-56112 Reviewed-by: Rainer Keller Reviewed-by: Teemu Holappa --- conf/distro/include/nitrogen6x.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 7986cb7..511deab 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -91,7 +91,11 @@ UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config" EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" -KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb" +KERNEL_DEVICETREE += "\ + imx6dl-nit6xlite.dtb \ + imx6qp-nitrogen6_max.dtb \ + imx6q-nitrogen6_som2.dtb \ + " DISTRO_FEATURES_DEFAULT += "wayland" -- cgit v1.2.3-54-g00ecf From 286b1c29a4ffe4ec35194899552a88aa3d62168e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 22 Sep 2016 08:15:51 +0300 Subject: toradex: apply u-boot and flashing script changes to colibri-imx7 Add required changes to colibri-imx7 configs after the u-boot and flashing script change was merged from fido branch. Change-Id: Id01d311490f1b7a62994f914852a820a10ad7ddc Reviewed-by: Risto Avila Reviewed-by: Teemu Holappa --- conf/distro/include/colibri-imx7.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf index 722da17..16d34e2 100644 --- a/conf/distro/include/colibri-imx7.conf +++ b/conf/distro/include/colibri-imx7.conf @@ -30,13 +30,7 @@ BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \ ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \ - u-boot-${MACHINE}.imx:u-boot.imx \ " BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" -BOOT_SCRIPTS += " \ - u-boot-${MACHINE}.imx:u-boot.imx \ - flash_mmc-${MACHINE}.img:flash_mmc.img \ - flash_blk-${MACHINE}.img:flash_blk.img \ - " DISTRO_FEATURES_remove = "webengine" -- cgit v1.2.3-54-g00ecf From 1bf6d63760efe5f4a9ce04083d556fd423db9542 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 22 Sep 2016 09:49:12 +0300 Subject: Rename b2qt-utils to qtdeviceutilities Use the correct module name also in the recipe. Add PACKAGECONFIG to build with wpa-supplication support. Change-Id: Ia430912685478d077f997e410257ae1b92d93289 Reviewed-by: Kimmo Ollila Reviewed-by: Teemu Holappa --- recipes-qt/b2qt-addons/b2qt-utils.bb | 43 -------------------------------- recipes-qt/qt5/qtdeviceutilities.bb | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 43 deletions(-) delete mode 100644 recipes-qt/b2qt-addons/b2qt-utils.bb create mode 100644 recipes-qt/qt5/qtdeviceutilities.bb diff --git a/recipes-qt/b2qt-addons/b2qt-utils.bb b/recipes-qt/b2qt-addons/b2qt-utils.bb deleted file mode 100644 index 16ce360..0000000 --- a/recipes-qt/b2qt-addons/b2qt-utils.bb +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 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$ -## -############################################################################ - -DESCRIPTION = "Boot to Qt Utils module" -LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" -LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" - -inherit qt5-module -require recipes-qt/qt5/qt5-git.inc - -SRC_URI = " \ - git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ - " - -SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" - -DEPENDS = "qtbase qtdeclarative wpa-supplicant qtconnectivity" diff --git a/recipes-qt/qt5/qtdeviceutilities.bb b/recipes-qt/qt5/qtdeviceutilities.bb new file mode 100644 index 0000000..a4c0418 --- /dev/null +++ b/recipes-qt/qt5/qtdeviceutilities.bb @@ -0,0 +1,48 @@ +############################################################################ +## +## Copyright (C) 2016 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$ +## +############################################################################ + +DESCRIPTION = "Qt Device Utilities" +LICENSE = "GPL-3.0 | The-Qt-Company-DCLA-2.1" +LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504" + +inherit qt5-module +require recipes-qt/qt5/qt5-git.inc + +PACKAGECONFIG ??= "" +PACKAGECONFIG[wpasupplicant] = "CONFIG+=wpasupplicant,,wpa-supplicant" + +EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" + +SRC_URI = " \ + git://codereview.qt-project.org/qt/qtdeviceutilities;branch=${QT_MODULE_BRANCH};protocol=http \ + " + +SRCREV = "d0d70c3311b3dc3f0e4c11147a4b31e4da0ff56c" + +DEPENDS = "qtbase qtdeclarative qtconnectivity" -- cgit v1.2.3-54-g00ecf From 2b9e77c40609da75fa44e3376341f484e0ab0288 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 22 Sep 2016 14:11:41 +0300 Subject: Rename last references to b2qt-utils Change-Id: I4b204b6dea02fd3e298eb66028b44139eb12ff2a Reviewed-by: Risto Avila --- .../packagegroups/packagegroup-b2qt-automotive-addons.bb | 1 - recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb | 1 - .../packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 11 +++++------ recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb | 1 + 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb index 25a567d..391224e 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb @@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ b2qt-appcontroller \ - b2qt-utils \ qtivi \ neptune-ui \ neptune-ui-apps \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb index 9c2008d..3d60eed 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-addons.bb @@ -36,7 +36,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" RDEPENDS_${PN} += " \ b2qt-appcontroller \ - b2qt-utils \ b2qt-launcher \ b2qt-demos \ ${@base_contains("DISTRO_FEATURES", "wayland", "democompositor", "", d)} \ diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index 652c931..ec3125b 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -44,11 +44,14 @@ RDEPENDS_${PN} += " \ qt3d-dev \ qtbase-dev \ qtbase-staticdev \ - qtcanvas3d \ + qtcanvas3d-dev \ + qtcharts-dev \ qtconnectivity-dev \ + qtdatavis3d-dev \ qtdeclarative-dev \ qtdeclarative-render2d-dev \ qtdeclarative-staticdev \ + qtdeviceutilities-dev \ qtgraphicaleffects-dev \ qtimageformats-dev \ qtlocation-dev \ @@ -62,14 +65,10 @@ RDEPENDS_${PN} += " \ qtsvg-dev \ qttools-dev \ qttools-staticdev \ + qtvirtualkeyboard-dev \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland-dev', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ qtwebsockets-dev \ qtwebchannel-dev \ qtxmlpatterns-dev \ - \ - b2qt-utils-dev \ - qtcharts-dev \ - qtdatavis3d-dev \ - qtvirtualkeyboard-dev \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb index 8138b3e..c63ddb8 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-qt5-modules.bb @@ -44,6 +44,7 @@ RDEPENDS_${PN} += " \ qtdeclarative \ qtdeclarative-render2d \ qtdeclarative-tools \ + qtdeviceutilities \ qtgraphicaleffects \ qtimageformats \ qtlocation \ -- cgit v1.2.3-54-g00ecf