Merge remote-tracking branch 'origin/pyro' into sumo

* origin/pyro: (29 commits) meta-qt5: update layer qt5: Enable Link Time Optimization toradex: add Qt marketing slides toradex: add support for colibri-imx6ull rpi: include mcp2515 overlay for CAN support qtdeviceutilities: update to latest version boot2qt-demos: update revision boot2qt-addons: update components meta-qt5: update layer boot2qt-launcher: update to latest version qtdeviceutilities: update to latest version Do not use Link Time Optimization boot2qt-demo: update demo videos qtquicktimeline: fetch from public repository boot2qt-demos: no need to patch demos anymore Don't use git folder to check if we are using SDK sources toradex: include easy installer file in the release 7z toradex: Add Boot2Qt material to the Tezi image meta-qt5: update layer qt5: update submodules ... Change-Id: I23e9b0a018328d7be1441616c07c526e2db61be2
author: Samuli Piippo <samuli.piippo@qt.io> 2018-09-10 17:01:55 +0300
committer: Samuli Piippo <samuli.piippo@qt.io> 2018-09-10 17:01:55 +0300
commit: c38d1b6eecfa0e209a0c1fa93319bf4aeb6e3759 (patch)
tree: 14aa05d27ee4012a8c6b62e847792f9b31d6db52 /meta-boot2qt-distro/conf
parent: a0d9fb33f8475336fbdebdbab803f43c7b9107d4 (diff)
parent: 014389ed5af9c5870efbbcd2c03f9641f65cda99 (diff)
download: meta-boot2qt-c38d1b6eecfa0e209a0c1fa93319bf4aeb6e3759.tar.gz
11 files changed, 40 insertions, 169 deletions
diff --git a/meta-boot2qt-distro/conf/bblayers.conf.ti.sample b/meta-boot2qt-distro/conf/bblayers.conf.ti.sample
deleted file mode 100644
index 47260a4..0000000
--- a/meta-boot2qt-distro/conf/bblayers.conf.ti.sample
+++ /dev/null
@@ -1,53 +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$
-##
-############################################################################
-# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-POKY_BBLAYERS_CONF_VERSION = "2"
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
-BBLAYERS ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/meta-ti \
-  ${BSPDIR}/sources/meta-freescale \
-  ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-openembedded/meta-python \
-  ${BSPDIR}/sources/meta-openembedded/meta-networking \
-  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
-  ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
-  ${BSPDIR}/sources/meta-mingw \
-  ${BSPDIR}/sources/meta-qt5 \
-  "
diff --git a/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf b/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
deleted file mode 100644
index 4ec3e4d..0000000
--- a/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
+++ /dev/null
@@ -1,34 +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$
-##
-############################################################################
-include conf/distro/include/ti.inc
-DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit"
-DISTRO_FEATURES_remove = "webengine"
diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
index bdb57d8..0d3fd29 100644
--- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
 IMAGE_FSTYPES += "teziimg"
+QBSP_IMAGE_CONTENT += "\
+    ${IMAGE_LINK_NAME}.tezi.tar \
+    "
 BOOT_SCRIPTS += " \
    u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
    SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
diff --git a/meta-boot2qt-distro/conf/distro/include/beagleboard.conf b/meta-boot2qt-distro/conf/distro/include/beagleboard.conf
deleted file mode 100644
index d9b92f0..0000000
--- a/meta-boot2qt-distro/conf/distro/include/beagleboard.conf
+++ /dev/null
@@ -1,34 +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$
-##
-############################################################################
-include conf/distro/include/ti.inc
-DEPLOY_CONF_NAME = "BeagleBoard"
-DISTRO_FEATURES_remove = "webengine opengl"
diff --git a/meta-boot2qt-distro/conf/distro/include/beaglebone.conf b/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
deleted file mode 100644
index 099be56..0000000
--- a/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
+++ /dev/null
@@ -1,36 +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$
-##
-############################################################################
-include conf/distro/include/ti.inc
-DEPLOY_CONF_NAME = "BeagleBone Black"
-DISTRO_FEATURES_remove = "webengine"
-BOOT_SPACE = "33792"
diff --git a/meta-boot2qt-distro/conf/distro/include/ci.inc b/meta-boot2qt-distro/conf/distro/include/ci.inc
index f6e3fd7..f213281 100644
--- a/meta-boot2qt-distro/conf/distro/include/ci.inc
+++ b/meta-boot2qt-distro/conf/distro/include/ci.inc
@@ -27,4 +27,4 @@
 ##
 ############################################################################
-MACHINE_EXTRA_INSTALL += "libnss-mdns"
+MACHINE_EXTRA_INSTALL_SDK += "libnss-mdns"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
index 814676b..f1bf7d8 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
 IMAGE_FSTYPES += "teziimg"
+QBSP_IMAGE_CONTENT += "\
+    ${IMAGE_LINK_NAME}.tezi.tar \
+    "
 BOOT_SCRIPTS += " \
    u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
    SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \
diff --git a/meta-boot2qt-distro/conf/distro/include/ti.inc b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
index 80f90f2..9090055 100644
--- a/meta-boot2qt-distro/conf/distro/include/ti.inc
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,17 +27,24 @@
 ##
 ############################################################################
-include conf/distro/include/fsl.inc
+include conf/distro/include/toradex.inc
-UBOOT_SUFFIX = "img"
+DEPLOY_CONF_NAME = "Toradex Colibri iMX6ULL"
-BOOT_SCRIPTS += "\
-    MLO-${MACHINE}:MLO \
+IMAGE_FSTYPES += "teziimg"
-    u-boot-${MACHINE}.img:u-boot.img \
+QBSP_IMAGE_CONTENT += "\
+    ${IMAGE_LINK_NAME}.tezi.tar \
    "
-EXTRA_IMAGEDEPENDS += "u-boot"
+BOOT_SCRIPTS += " \
+    u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \
+    "
+PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy"
+PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy"
+DISTRO_FEATURES_remove = "webengine wayland"
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
+# try to limit the maximum size of the tezi image
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
+RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/mesa = "ti-sgx-ddk-um"
diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
index 4e0daa7..a5695f7 100644
--- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
+++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
 IMAGE_FSTYPES += "teziimg"
+QBSP_IMAGE_CONTENT += "\
+    ${IMAGE_LINK_NAME}.tezi.tar \
+    "
 BOOT_SCRIPTS += " \
    u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
    "
diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index 8c86d1a..1d2cf9d 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
@@ -52,3 +52,8 @@ BBMASK += "\
    "
 MACHINE_GSTREAMER_1_0_PLUGIN += "gstreamer1.0-omx"
+KERNEL_DEVICETREE += "\
+    overlays/mcp2515-can0.dtbo \
+    overlays/mcp2515-can1.dtbo \
+    "
diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc
index 83b6d45..85d9455 100644
--- a/meta-boot2qt-distro/conf/distro/include/toradex.inc
+++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -46,3 +46,7 @@ BOOT_SCRIPTS += " \
    fwd_mmc.img:flash_mmc.img \
    ${MACHINE}:${MACHINEDIR} \
    "
+# fix: basehash value changed from ... to ....
+# The metadata is not deterministic and this needs to be fixed.
+rootfs_tezi_json[vardepsexclude] = "DATE"
author	Samuli Piippo <samuli.piippo@qt.io>	2018-09-10 17:01:55 +0300
committer	Samuli Piippo <samuli.piippo@qt.io>	2018-09-10 17:01:55 +0300
commit	c38d1b6eecfa0e209a0c1fa93319bf4aeb6e3759 (patch)
tree	14aa05d27ee4012a8c6b62e847792f9b31d6db52 /meta-boot2qt-distro/conf
parent	a0d9fb33f8475336fbdebdbab803f43c7b9107d4 (diff)
parent	014389ed5af9c5870efbbcd2c03f9641f65cda99 (diff)
download	meta-boot2qt-c38d1b6eecfa0e209a0c1fa93319bf4aeb6e3759.tar.gz

diff --git a/meta-boot2qt-distro/conf/bblayers.conf.ti.sample b/meta-boot2qt-distro/conf/bblayers.conf.ti.sample deleted file mode 100644 index 47260a4..0000000 --- a/meta-boot2qt-distro/conf/bblayers.conf.ti.sample +++ /dev/null
@@ -1,53 +0,0 @@
1	############################################################################
2	##
3	## Copyright (C) 2016 The Qt Company Ltd.
4	## Contact: https://www.qt.io/licensing/
5	##
6	## This file is part of the Boot to Qt meta layer.
7	##
8	## $QT_BEGIN_LICENSE:GPL$
9	## Commercial License Usage
10	## Licensees holding valid commercial Qt licenses may use this file in
11	## accordance with the commercial license agreement provided with the
12	## Software or, alternatively, in accordance with the terms contained in
13	## a written agreement between you and The Qt Company. For licensing terms
14	## and conditions see https://www.qt.io/terms-conditions. For further
15	## information use the contact form at https://www.qt.io/contact-us.
16	##
17	## GNU General Public License Usage
18	## Alternatively, this file may be used under the terms of the GNU
19	## General Public License version 3 or (at your option) any later version
20	## approved by the KDE Free Qt Foundation. The licenses are as published by
21	## the Free Software Foundation and appearing in the file LICENSE.GPL3
22	## included in the packaging of this file. Please review the following
23	## information to ensure the GNU General Public License requirements will
24	## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25	##
26	## $QT_END_LICENSE$
27	##
28	############################################################################
29
30	# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31	# changes incompatibly
32	POKY_BBLAYERS_CONF_VERSION = "2"
33
34	BBPATH = "${TOPDIR}"
35	BBFILES ?= ""
36	BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
37
38	BBLAYERS ?= " \
39	${BSPDIR}/sources/poky/meta \
40	${BSPDIR}/sources/poky/meta-poky \
41	${BSPDIR}/sources/meta-ti \
42	${BSPDIR}/sources/meta-freescale \
43	${BSPDIR}/sources/meta-openembedded/meta-oe \
44	${BSPDIR}/sources/meta-openembedded/meta-python \
45	${BSPDIR}/sources/meta-openembedded/meta-networking \
46	${BSPDIR}/sources/meta-openembedded/meta-initramfs \
47	${BSPDIR}/sources/meta-openembedded/meta-multimedia \
48	${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \
49	${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \
50	${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
51	${BSPDIR}/sources/meta-mingw \
52	${BSPDIR}/sources/meta-qt5 \
53	"


diff --git a/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf b/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf deleted file mode 100644 index 4ec3e4d..0000000 --- a/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf +++ /dev/null
@@ -1,34 +0,0 @@
1	############################################################################
2	##
3	## Copyright (C) 2016 The Qt Company Ltd.
4	## Contact: https://www.qt.io/licensing/
5	##
6	## This file is part of the Boot to Qt meta layer.
7	##
8	## $QT_BEGIN_LICENSE:GPL$
9	## Commercial License Usage
10	## Licensees holding valid commercial Qt licenses may use this file in
11	## accordance with the commercial license agreement provided with the
12	## Software or, alternatively, in accordance with the terms contained in
13	## a written agreement between you and The Qt Company. For licensing terms
14	## and conditions see https://www.qt.io/terms-conditions. For further
15	## information use the contact form at https://www.qt.io/contact-us.
16	##
17	## GNU General Public License Usage
18	## Alternatively, this file may be used under the terms of the GNU
19	## General Public License version 3 or (at your option) any later version
20	## approved by the KDE Free Qt Foundation. The licenses are as published by
21	## the Free Software Foundation and appearing in the file LICENSE.GPL3
22	## included in the packaging of this file. Please review the following
23	## information to ensure the GNU General Public License requirements will
24	## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25	##
26	## $QT_END_LICENSE$
27	##
28	############################################################################
29
30	include conf/distro/include/ti.inc
31
32	DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit"
33
34	DISTRO_FEATURES_remove = "webengine"


diff --git a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf index bdb57d8..0d3fd29 100644 --- a/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf +++ b/meta-boot2qt-distro/conf/distro/include/apalis-imx6.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
33		33
34	IMAGE_FSTYPES += "teziimg"	34	IMAGE_FSTYPES += "teziimg"
35		35
		36	QBSP_IMAGE_CONTENT += "\
		37	${IMAGE_LINK_NAME}.tezi.tar \
		38	"
		39
36	BOOT_SCRIPTS += " \	40	BOOT_SCRIPTS += " \
37	u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \	41	u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
38	SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \	42	SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \


diff --git a/meta-boot2qt-distro/conf/distro/include/beagleboard.conf b/meta-boot2qt-distro/conf/distro/include/beagleboard.conf deleted file mode 100644 index d9b92f0..0000000 --- a/meta-boot2qt-distro/conf/distro/include/beagleboard.conf +++ /dev/null
@@ -1,34 +0,0 @@
1	############################################################################
2	##
3	## Copyright (C) 2016 The Qt Company Ltd.
4	## Contact: https://www.qt.io/licensing/
5	##
6	## This file is part of the Boot to Qt meta layer.
7	##
8	## $QT_BEGIN_LICENSE:GPL$
9	## Commercial License Usage
10	## Licensees holding valid commercial Qt licenses may use this file in
11	## accordance with the commercial license agreement provided with the
12	## Software or, alternatively, in accordance with the terms contained in
13	## a written agreement between you and The Qt Company. For licensing terms
14	## and conditions see https://www.qt.io/terms-conditions. For further
15	## information use the contact form at https://www.qt.io/contact-us.
16	##
17	## GNU General Public License Usage
18	## Alternatively, this file may be used under the terms of the GNU
19	## General Public License version 3 or (at your option) any later version
20	## approved by the KDE Free Qt Foundation. The licenses are as published by
21	## the Free Software Foundation and appearing in the file LICENSE.GPL3
22	## included in the packaging of this file. Please review the following
23	## information to ensure the GNU General Public License requirements will
24	## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25	##
26	## $QT_END_LICENSE$
27	##
28	############################################################################
29
30	include conf/distro/include/ti.inc
31
32	DEPLOY_CONF_NAME = "BeagleBoard"
33
34	DISTRO_FEATURES_remove = "webengine opengl"


diff --git a/meta-boot2qt-distro/conf/distro/include/beaglebone.conf b/meta-boot2qt-distro/conf/distro/include/beaglebone.conf deleted file mode 100644 index 099be56..0000000 --- a/meta-boot2qt-distro/conf/distro/include/beaglebone.conf +++ /dev/null
@@ -1,36 +0,0 @@
1	############################################################################
2	##
3	## Copyright (C) 2016 The Qt Company Ltd.
4	## Contact: https://www.qt.io/licensing/
5	##
6	## This file is part of the Boot to Qt meta layer.
7	##
8	## $QT_BEGIN_LICENSE:GPL$
9	## Commercial License Usage
10	## Licensees holding valid commercial Qt licenses may use this file in
11	## accordance with the commercial license agreement provided with the
12	## Software or, alternatively, in accordance with the terms contained in
13	## a written agreement between you and The Qt Company. For licensing terms
14	## and conditions see https://www.qt.io/terms-conditions. For further
15	## information use the contact form at https://www.qt.io/contact-us.
16	##
17	## GNU General Public License Usage
18	## Alternatively, this file may be used under the terms of the GNU
19	## General Public License version 3 or (at your option) any later version
20	## approved by the KDE Free Qt Foundation. The licenses are as published by
21	## the Free Software Foundation and appearing in the file LICENSE.GPL3
22	## included in the packaging of this file. Please review the following
23	## information to ensure the GNU General Public License requirements will
24	## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25	##
26	## $QT_END_LICENSE$
27	##
28	############################################################################
29
30	include conf/distro/include/ti.inc
31
32	DEPLOY_CONF_NAME = "BeagleBone Black"
33
34	DISTRO_FEATURES_remove = "webengine"
35
36	BOOT_SPACE = "33792"


diff --git a/meta-boot2qt-distro/conf/distro/include/ci.inc b/meta-boot2qt-distro/conf/distro/include/ci.inc index f6e3fd7..f213281 100644 --- a/meta-boot2qt-distro/conf/distro/include/ci.inc +++ b/meta-boot2qt-distro/conf/distro/include/ci.inc
@@ -27,4 +27,4 @@
27	##	27	##
28	############################################################################	28	############################################################################
29		29
30	MACHINE_EXTRA_INSTALL += "libnss-mdns"	30	MACHINE_EXTRA_INSTALL_SDK += "libnss-mdns"


diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf index 814676b..f1bf7d8 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
33		33
34	IMAGE_FSTYPES += "teziimg"	34	IMAGE_FSTYPES += "teziimg"
35		35
		36	QBSP_IMAGE_CONTENT += "\
		37	${IMAGE_LINK_NAME}.tezi.tar \
		38	"
		39
36	BOOT_SCRIPTS += " \	40	BOOT_SCRIPTS += " \
37	u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \	41	u-boot-${MACHINE}.imx-spl:${MACHINEDIR}/u-boot.imx-spl \
38	SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \	42	SPL-${MACHINE}-spl:${MACHINEDIR}/SPL \


diff --git a/meta-boot2qt-distro/conf/distro/include/ti.inc b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf index 80f90f2..9090055 100644 --- a/meta-boot2qt-distro/conf/distro/include/ti.inc +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx6ull.conf
@@ -1,6 +1,6 @@
1	############################################################################	1	############################################################################
2	##	2	##
3	## Copyright (C) 2016 The Qt Company Ltd.	3	## Copyright (C) 2018 The Qt Company Ltd.
4	## Contact: https://www.qt.io/licensing/	4	## Contact: https://www.qt.io/licensing/
5	##	5	##
6	## This file is part of the Boot to Qt meta layer.	6	## This file is part of the Boot to Qt meta layer.
@@ -27,17 +27,24 @@
27	##	27	##
28	############################################################################	28	############################################################################
29		29
30	include conf/distro/include/fsl.inc	30	include conf/distro/include/toradex.inc
31		31
32	UBOOT_SUFFIX = "img"	32	DEPLOY_CONF_NAME = "Toradex Colibri iMX6ULL"
33	BOOT_SCRIPTS += "\	33
34	MLO-${MACHINE}:MLO \	34	IMAGE_FSTYPES += "teziimg"
35	u-boot-${MACHINE}.img:u-boot.img \	35
		36	QBSP_IMAGE_CONTENT += "\
		37	${IMAGE_LINK_NAME}.tezi.tar \
36	"	38	"
37		39
38	EXTRA_IMAGEDEPENDS += "u-boot"	40	BOOT_SCRIPTS += " \
		41	u-boot-${MACHINE}.imx:${MACHINEDIR}/u-boot.imx \
		42	"
		43
		44	PREFERRED_PROVIDER_virtual/egl_b2qt = "opengldummy"
		45	PREFERRED_PROVIDER_virtual/libgles2_b2qt = "opengldummy"
		46
		47	DISTRO_FEATURES_remove = "webengine wayland"
39		48
40	PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"	49	# try to limit the maximum size of the tezi image
41	PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"	50	RDEPENDS_packagegroup-b2qt-embedded-base_remove_pn-packagegroup-b2qt-embedded-base = "linux-firmware"
42	PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
43	PREFERRED_PROVIDER_virtual/mesa = "ti-sgx-ddk-um"


diff --git a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf index 4e0daa7..a5695f7 100644 --- a/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf +++ b/meta-boot2qt-distro/conf/distro/include/colibri-imx7.conf
@@ -33,6 +33,10 @@ DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
33		33
34	IMAGE_FSTYPES += "teziimg"	34	IMAGE_FSTYPES += "teziimg"
35		35
		36	QBSP_IMAGE_CONTENT += "\
		37	${IMAGE_LINK_NAME}.tezi.tar \
		38	"
		39
36	BOOT_SCRIPTS += " \	40	BOOT_SCRIPTS += " \
37	u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \	41	u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
38	"	42	"


diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc index 8c86d1a..1d2cf9d 100644 --- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc +++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
@@ -52,3 +52,8 @@ BBMASK += "\
52	"	52	"
53		53
54	MACHINE_GSTREAMER_1_0_PLUGIN += "gstreamer1.0-omx"	54	MACHINE_GSTREAMER_1_0_PLUGIN += "gstreamer1.0-omx"
		55
		56	KERNEL_DEVICETREE += "\
		57	overlays/mcp2515-can0.dtbo \
		58	overlays/mcp2515-can1.dtbo \
		59	"


diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index 83b6d45..85d9455 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc
@@ -46,3 +46,7 @@ BOOT_SCRIPTS += " \
46	fwd_mmc.img:flash_mmc.img \	46	fwd_mmc.img:flash_mmc.img \
47	${MACHINE}:${MACHINEDIR} \	47	${MACHINE}:${MACHINEDIR} \
48	"	48	"
		49
		50	# fix: basehash value changed from ... to ....
		51	# The metadata is not deterministic and this needs to be fixed.
		52	rootfs_tezi_json[vardepsexclude] = "DATE"