summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt-distro/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'meta-boot2qt-distro/conf/distro')
-rw-r--r--meta-boot2qt-distro/conf/distro/include/boundary.inc4
-rw-r--r--meta-boot2qt-distro/conf/distro/include/draak.conf5
-rw-r--r--meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf1
-rw-r--r--meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf1
-rw-r--r--meta-boot2qt-distro/conf/distro/include/opencv.inc39
5 files changed, 4 insertions, 46 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index b08e11a..8dcf16b 100644
--- a/meta-boot2qt-distro/conf/distro/include/boundary.inc
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
@@ -30,12 +30,10 @@
30include conf/distro/include/fsl.inc 30include conf/distro/include/fsl.inc
31 31
32BBMASK += " \ 32BBMASK += " \
33 meta-boundary/recipes-browser/chromium \
34 meta-boundary/recipes-core/init-ifupdown \ 33 meta-boundary/recipes-core/init-ifupdown \
35 meta-boundary/recipes-mozilla/firefox \
36 " 34 "
37 35
38MACHINE_EXTRA_INSTALL += "\ 36MACHINE_EXTRA_INSTALL += "\
39 kernel-module-qcacld \ 37 kernel-module-qcacld \
40 linux-firmware-bdsdmac-wlan \ 38 linux-firmware-bdsdmac \
41 " 39 "
diff --git a/meta-boot2qt-distro/conf/distro/include/draak.conf b/meta-boot2qt-distro/conf/distro/include/draak.conf
index 94ca09e..daf68f7 100644
--- a/meta-boot2qt-distro/conf/distro/include/draak.conf
+++ b/meta-boot2qt-distro/conf/distro/include/draak.conf
@@ -40,9 +40,10 @@ WKS_FILE_DEPENDS_remove = "optee-os"
40QBSP_IMAGE_CONTENT_remove = "tee-${MACHINE}.srec" 40QBSP_IMAGE_CONTENT_remove = "tee-${MACHINE}.srec"
41 41
42BBMASK += "\ 42BBMASK += "\
43 meta-rcar-gen3/recipes-multimedia/webp \
44 meta-rcar-gen3/recipes-connectivity/ppp \ 43 meta-rcar-gen3/recipes-connectivity/ppp \
45 meta-rcar-gen3/recipes-graphics/wayland/wayland-protocols \ 44 meta-rcar-gen3/recipes-graphics/wayland/wayland-protocols \
46 meta-renesas/meta-rcar-gen3/recipes-graphics/drm \
47 meta-rcar-gen3/recipes-multimedia/gstreamer \ 45 meta-rcar-gen3/recipes-multimedia/gstreamer \
46 meta-rcar-gen3/recipes-multimedia/webp \
47 meta-renesas/meta-rcar-gen3/recipes-graphics/drm \
48 meta-renesas-extras/recipes/arm-trusted-firmware \
48 " 49 "
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
index 5f3ddb3..644dac0 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
@@ -28,7 +28,6 @@
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/fsl.inc 30include conf/distro/include/fsl.inc
31include conf/distro/include/opencv.inc
32 31
33DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device" 32DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device"
34 33
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
index f6871be..7883ab5 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
@@ -28,7 +28,6 @@
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/boundary.inc 30include conf/distro/include/boundary.inc
31include conf/distro/include/opencv.inc
32 31
33DEPLOY_CONF_NAME = "Boundary Devices i.MX6" 32DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
34 33
diff --git a/meta-boot2qt-distro/conf/distro/include/opencv.inc b/meta-boot2qt-distro/conf/distro/include/opencv.inc
deleted file mode 100644
index a1d37df..0000000
--- a/meta-boot2qt-distro/conf/distro/include/opencv.inc
+++ /dev/null
@@ -1,39 +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
30MACHINE_EXTRA_INSTALL += "\
31 libopencv-core \
32 libopencv-imgproc \
33 libopencv-objdetect \
34 "
35
36MACHINE_EXTRA_INSTALL_SDK += " \
37 opencv-dev \
38 "
39