From 67e37b3971f6b853fb4df3e3ffb836887c5837e0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 7 May 2020 11:38:40 +0300 Subject: qbsp: move recipes to correct folder The BBFILES_DYNAMIC filter was not getting the bbappend from the subfolder. Change-Id: I6ccef5c26d1b7d8302d42ebb2feed0a521e94a36 Reviewed-by: Mikko Gronoff --- .../recipes-qt/boot2qt-addons/qbsp-readme.bbappend | 30 ++++++++++ .../recipes-qt/boot2qt-addons/qbsp-readme/README | 4 ++ .../qbsp-readme/qbsp-readme.bbappend | 30 ---------- .../boot2qt-addons/qbsp-readme/qbsp-readme/README | 4 -- .../recipes-qt/boot2qt-addons/qbsp-readme.bbappend | 30 ++++++++++ .../recipes-qt/boot2qt-addons/qbsp-readme/README | 66 ++++++++++++++++++++++ .../boot2qt-addons/qbsp-readme/mx8/README | 52 +++++++++++++++++ .../qbsp-readme/qbsp-readme.bbappend | 30 ---------- .../boot2qt-addons/qbsp-readme/qbsp-readme/README | 66 ---------------------- .../qbsp-readme/qbsp-readme/mx8/README | 52 ----------------- 10 files changed, 182 insertions(+), 182 deletions(-) create mode 100644 meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme.bbappend create mode 100644 meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/README delete mode 100644 meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend delete mode 100644 meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README create mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend create mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/README create mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8/README delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README delete mode 100644 meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/mx8/README diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme.bbappend new file mode 100644 index 00000000..64d9670e --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2019 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$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/README b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/README new file mode 100644 index 00000000..2095db24 --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/README @@ -0,0 +1,4 @@ +To successfully set up the Boot to Qt software stack, +follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#. + +In 3. Configuring a Device Kit in Qt Creator, you should note that Raspberry Pi does not support USB OTG. diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend deleted file mode 100644 index 64d9670e..00000000 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README b/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README deleted file mode 100644 index 2095db24..00000000 --- a/meta-boot2qt-distro/dynamic-layers/raspberrypi/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README +++ /dev/null @@ -1,4 +0,0 @@ -To successfully set up the Boot to Qt software stack, -follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#. - -In 3. Configuring a Device Kit in Qt Creator, you should note that Raspberry Pi does not support USB OTG. diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend new file mode 100644 index 00000000..64d9670e --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2019 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$ +## +############################################################################ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/README b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/README new file mode 100644 index 00000000..f91fd080 --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/README @@ -0,0 +1,66 @@ +To successfully set up the Boot to Qt software stack, +follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#. + +In 2. Installing Boot to Qt on Target Device, see also the following device specific instructions: + + +2. Installing Boot to Qt on Target Device + +To flash the image, you can use either Toradex Easy Installer +(https://developer.toradex.com/software/toradex-easy-installer#) or Qt's Flashing Wizard. +With Toradex Easy Installer, the image is flashed to the device's internal eMMC +flash memory. + + +2.1 Flashing with Toradex Easy Installer: + +When Toradex Easy Installer is connected to the Internet, it automatically provides +the latest Boot to Qt image in its image list but that is not necessarily compatible +with your Boot to Qt installation. When you flash with Toradex Easy Installer, +you should always use the *.tezi.tar package that is included into the Boot to Qt +installation. + +Flash the Boot to Qt image with Toradex Easy Installer as follows: + +1. If your target device does not have the pre-installed Toradex Easy Installer, +follow instructions in https://developer.toradex.com/software/toradex-easy-installer#load-toradex-easy-installer# +to load Toradex Easy Installer. +2. Your Boot to Qt installation has the *.tezi.tar package under +//Boot2Qt//images. Extract the package +to an SD card or a USB flash drive. +3. Flash the image from the SD card or the USB flash drive with Toradex Easy Installer. +See https://developer.toradex.com/software/toradex-easy-installer#installing-the-images. + + +2.2 Flashing with Qt's Flashing Wizard + +Use Flashing Wizard to flash the image to your device: + +1. Connect your SD card reader to the development host. Make sure that the SD card size is at least 4 GB. +2. Launch Qt Creator. +3. Select Tools > Flash Boot to Qt Device, and follow the instructions in Flashing Wizard. + +In order to boot from the external SD card, U-Boot needs to be updated. + + +2.3 Booting from External SD Card + +Connect a serial cable to the device and enter into the U-Boot environment by +pressing any key before the autoboot. + +Enter following commands into U-Boot: + +run setupdate +run update + +Reset or power cycle the device to start the new U-Boot. +To reset the U-Boot environment to new default values, enter the following commands in the U-Boot command line: + +env default -a +saveenv + +New U-Boot commands are now stored into the device. + +For more information about the boot process on the Toradex Colibri devices, +see https://developer.toradex.com/knowledge-base/linux-booting. + diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8/README b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8/README new file mode 100644 index 00000000..b1f8b744 --- /dev/null +++ b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/mx8/README @@ -0,0 +1,52 @@ +To successfully set up the Boot to Qt software stack, +follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#. + +In 2. Installing Boot to Qt on Target Device, see also the following device specific instructions. + + +2. Installing Boot to Qt on Target Device + +To flash the image, you can use either Toradex Easy Installer +(https://developer.toradex.com/software/toradex-easy-installer#) or Qt's Flashing Wizard. + + +2.1 Flashing with Toradex Easy Installer: + +When Toradex Easy Installer is connected to the Internet, it automatically provides +the latest Boot to Qt image in its image list but that is not necessarily compatible +with your Boot to Qt installation. When you flash with Toradex Easy Installer, +you should always use the *.tezi.tar package that is included into the Boot to Qt +installation. + +Flash the Boot to Qt image with Toradex Easy Installer as follows: + +1. If your target device does not have the pre-installed Toradex Easy Installer, +follow instructions in https://developer.toradex.com/software/toradex-easy-installer#load-toradex-easy-installer# +to load Toradex Easy Installer. +2. Your Boot to Qt installation has the *.tezi.tar package under +//Boot2Qt//images. Extract the package +to an SD card or a USB flash drive. +3. Flash the image from the SD card or the USB flash drive with Toradex Easy Installer. +See https://developer.toradex.com/software/toradex-easy-installer#installing-the-images. + + +2.2 Flashing with Qt's Flashing Wizard + +1. Use the RS-232 cable to access the serial terminal on Toradex board. +2. Power on your device and press any key to stop the autoboot. +3. Run the following command in U-Boot: + +ums 0 mmc 0 + +4. Connect your device to the development host using USB On-The-Go (OTG). +5. Use Flashing Wizard to flash the image to the device: + 5.1 Launch Qt Creator. + 5.2 Select Tools > Flash Boot to Qt Device, and follow the instructions in Flashing Wizard. +6. Press Ctrl+C in the U-Boot console and run the reset command. + +Note: The u-boot is not updated when using the Flashing Wizard. + +For more information about flashing the Toradex devices, +see https://developer.toradex.com/software/linux/linux-software/build-apalis-imx8-yoctoopenembedded-bring-up-image#emmc-boot#. + +Note: The Boot to Qt software stack supports only the v1.0B silicon. diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend deleted file mode 100644 index 64d9670e..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README deleted file mode 100644 index f91fd080..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/README +++ /dev/null @@ -1,66 +0,0 @@ -To successfully set up the Boot to Qt software stack, -follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#. - -In 2. Installing Boot to Qt on Target Device, see also the following device specific instructions: - - -2. Installing Boot to Qt on Target Device - -To flash the image, you can use either Toradex Easy Installer -(https://developer.toradex.com/software/toradex-easy-installer#) or Qt's Flashing Wizard. -With Toradex Easy Installer, the image is flashed to the device's internal eMMC -flash memory. - - -2.1 Flashing with Toradex Easy Installer: - -When Toradex Easy Installer is connected to the Internet, it automatically provides -the latest Boot to Qt image in its image list but that is not necessarily compatible -with your Boot to Qt installation. When you flash with Toradex Easy Installer, -you should always use the *.tezi.tar package that is included into the Boot to Qt -installation. - -Flash the Boot to Qt image with Toradex Easy Installer as follows: - -1. If your target device does not have the pre-installed Toradex Easy Installer, -follow instructions in https://developer.toradex.com/software/toradex-easy-installer#load-toradex-easy-installer# -to load Toradex Easy Installer. -2. Your Boot to Qt installation has the *.tezi.tar package under -//Boot2Qt//images. Extract the package -to an SD card or a USB flash drive. -3. Flash the image from the SD card or the USB flash drive with Toradex Easy Installer. -See https://developer.toradex.com/software/toradex-easy-installer#installing-the-images. - - -2.2 Flashing with Qt's Flashing Wizard - -Use Flashing Wizard to flash the image to your device: - -1. Connect your SD card reader to the development host. Make sure that the SD card size is at least 4 GB. -2. Launch Qt Creator. -3. Select Tools > Flash Boot to Qt Device, and follow the instructions in Flashing Wizard. - -In order to boot from the external SD card, U-Boot needs to be updated. - - -2.3 Booting from External SD Card - -Connect a serial cable to the device and enter into the U-Boot environment by -pressing any key before the autoboot. - -Enter following commands into U-Boot: - -run setupdate -run update - -Reset or power cycle the device to start the new U-Boot. -To reset the U-Boot environment to new default values, enter the following commands in the U-Boot command line: - -env default -a -saveenv - -New U-Boot commands are now stored into the device. - -For more information about the boot process on the Toradex Colibri devices, -see https://developer.toradex.com/knowledge-base/linux-booting. - diff --git a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/mx8/README b/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/mx8/README deleted file mode 100644 index b1f8b744..00000000 --- a/meta-boot2qt-distro/dynamic-layers/toradex-nxp-layer/recipes-qt/boot2qt-addons/qbsp-readme/qbsp-readme/mx8/README +++ /dev/null @@ -1,52 +0,0 @@ -To successfully set up the Boot to Qt software stack, -follow the instructions in https://doc.qt.io/QtForDeviceCreation/qtdc-qbsp-installation-guide.html#. - -In 2. Installing Boot to Qt on Target Device, see also the following device specific instructions. - - -2. Installing Boot to Qt on Target Device - -To flash the image, you can use either Toradex Easy Installer -(https://developer.toradex.com/software/toradex-easy-installer#) or Qt's Flashing Wizard. - - -2.1 Flashing with Toradex Easy Installer: - -When Toradex Easy Installer is connected to the Internet, it automatically provides -the latest Boot to Qt image in its image list but that is not necessarily compatible -with your Boot to Qt installation. When you flash with Toradex Easy Installer, -you should always use the *.tezi.tar package that is included into the Boot to Qt -installation. - -Flash the Boot to Qt image with Toradex Easy Installer as follows: - -1. If your target device does not have the pre-installed Toradex Easy Installer, -follow instructions in https://developer.toradex.com/software/toradex-easy-installer#load-toradex-easy-installer# -to load Toradex Easy Installer. -2. Your Boot to Qt installation has the *.tezi.tar package under -//Boot2Qt//images. Extract the package -to an SD card or a USB flash drive. -3. Flash the image from the SD card or the USB flash drive with Toradex Easy Installer. -See https://developer.toradex.com/software/toradex-easy-installer#installing-the-images. - - -2.2 Flashing with Qt's Flashing Wizard - -1. Use the RS-232 cable to access the serial terminal on Toradex board. -2. Power on your device and press any key to stop the autoboot. -3. Run the following command in U-Boot: - -ums 0 mmc 0 - -4. Connect your device to the development host using USB On-The-Go (OTG). -5. Use Flashing Wizard to flash the image to the device: - 5.1 Launch Qt Creator. - 5.2 Select Tools > Flash Boot to Qt Device, and follow the instructions in Flashing Wizard. -6. Press Ctrl+C in the U-Boot console and run the reset command. - -Note: The u-boot is not updated when using the Flashing Wizard. - -For more information about flashing the Toradex devices, -see https://developer.toradex.com/software/linux/linux-software/build-apalis-imx8-yoctoopenembedded-bring-up-image#emmc-boot#. - -Note: The Boot to Qt software stack supports only the v1.0B silicon. -- cgit v1.2.3