summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorLouai Al-Khanji <louai.al-khanji@qt.io>2016-05-31 14:28:55 -0700
committerLouai Al-Khanji <louai.al-khanji@qt.io>2016-06-02 14:51:10 +0000
commitd92820c12827588507e111803638aaf819d57592 (patch)
tree655a3982e8dbd921e3f37700b875ba0f9bcb5923 /conf
parent6b54d74844ffb0683260dfc6c532993469a2f196 (diff)
downloadmeta-boot2qt-d92820c12827588507e111803638aaf819d57592.tar.gz
Refactor i.MX6 configurations
Change-Id: I6b86b5b6084377bcca4bbc7cd1e01e772683084e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/apalis-imx6.conf17
-rw-r--r--conf/distro/include/colibri-imx6.conf17
-rw-r--r--conf/distro/include/imx6-egl.inc41
-rw-r--r--conf/distro/include/imx6-opencv.inc39
-rw-r--r--conf/distro/include/imx6.inc12
-rw-r--r--conf/distro/include/imx6qsabresd.conf22
-rw-r--r--conf/distro/include/nitrogen6x.conf19
-rw-r--r--conf/distro/include/smarc-samx6i.conf14
-rw-r--r--conf/distro/include/tibidabo.conf17
9 files changed, 97 insertions, 101 deletions
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index c5d2b3a..fdc211d 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -29,6 +29,7 @@
29 29
30include conf/distro/include/toradex.inc 30include conf/distro/include/toradex.inc
31include conf/distro/include/imx6.inc 31include conf/distro/include/imx6.inc
32include conf/distro/include/imx6-egl.inc
32 33
33DEPLOY_CONF_NAME = "Toradex Apalis iMX6" 34DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
34 35
@@ -51,21 +52,5 @@ BOOT_SCRIPTS += " \
51 flash_blk-${MACHINE}.img:flash_blk.img \ 52 flash_blk-${MACHINE}.img:flash_blk.img \
52 " 53 "
53 54
54MACHINE_EXTRA_INSTALL = "\
55 libgal-mx6 \
56 libegl-mx6 \
57 libgles2-mx6 \
58 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
59 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
60 "
61
62MACHINE_EXTRA_INSTALL_SDK += " \
63 libgal-mx6 \
64 libegl-mx6 \
65 libegl-mx6-dev \
66 libgles2-mx6 \
67 libgles2-mx6-dev \
68 "
69
70SERIAL_CONSOLES = "115200;ttymxc0 \ 55SERIAL_CONSOLES = "115200;ttymxc0 \
71 115200;ttymxc1" 56 115200;ttymxc1"
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index fa3dba0..6427ee9 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -29,6 +29,7 @@
29 29
30include conf/distro/include/toradex.inc 30include conf/distro/include/toradex.inc
31include conf/distro/include/imx6.inc 31include conf/distro/include/imx6.inc
32include conf/distro/include/imx6-egl.inc
32 33
33DEPLOY_CONF_NAME = "Toradex Colibri iMX6" 34DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
34 35
@@ -46,19 +47,3 @@ BOOT_SCRIPTS += " \
46 flash_mmc-${MACHINE}.img:flash_mmc.img \ 47 flash_mmc-${MACHINE}.img:flash_mmc.img \
47 flash_blk-${MACHINE}.img:flash_blk.img \ 48 flash_blk-${MACHINE}.img:flash_blk.img \
48 " 49 "
49
50MACHINE_EXTRA_INSTALL = "\
51 libgal-mx6 \
52 libegl-mx6 \
53 libgles2-mx6 \
54 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
55 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
56 "
57
58MACHINE_EXTRA_INSTALL_SDK += " \
59 libgal-mx6 \
60 libegl-mx6 \
61 libegl-mx6-dev \
62 libgles2-mx6 \
63 libgles2-mx6-dev \
64 "
diff --git a/conf/distro/include/imx6-egl.inc b/conf/distro/include/imx6-egl.inc
new file mode 100644
index 0000000..8c4bbcd
--- /dev/null
+++ b/conf/distro/include/imx6-egl.inc
@@ -0,0 +1,41 @@
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 libegl-mx6 \
32 libgles2-mx6 \
33 "
34
35MACHINE_EXTRA_INSTALL_SDK += " \
36 libegl-mx6 \
37 libegl-mx6-dev \
38 libgles2-mx6 \
39 libgles2-mx6-dev \
40 ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
41 "
diff --git a/conf/distro/include/imx6-opencv.inc b/conf/distro/include/imx6-opencv.inc
new file mode 100644
index 0000000..a1d37df
--- /dev/null
+++ b/conf/distro/include/imx6-opencv.inc
@@ -0,0 +1,39 @@
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
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index 8f5a2fd..e686e85 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -32,7 +32,13 @@ BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
32 32
33IMAGE_FSTYPES += "ext3 sdcard" 33IMAGE_FSTYPES += "ext3 sdcard"
34 34
35MACHINE_EXTRA_INSTALL_SDK = " \ 35MACHINE_EXTRA_INSTALL += "\
36 ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \ 36 libgal-mx6 \
37 " 37 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
38 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
39 "
40
41MACHINE_EXTRA_INSTALL_SDK += " \
42 libgal-mx6 \
43 "
38 44
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index d6d6118..1463c67 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -28,6 +28,8 @@
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/imx6.inc
31include conf/distro/include/imx6-egl.inc
32include conf/distro/include/imx6-opencv.inc
31 33
32DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad" 34DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
33 35
@@ -45,26 +47,6 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
45 47
46DISTRO_FEATURES_DEFAULT += "wayland" 48DISTRO_FEATURES_DEFAULT += "wayland"
47 49
48MACHINE_EXTRA_INSTALL = "\
49 libgal-mx6 \
50 libegl-mx6 \
51 libgles2-mx6 \
52 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
53 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
54 libopencv-core \
55 libopencv-imgproc \
56 libopencv-objdetect \
57 "
58
59MACHINE_EXTRA_INSTALL_SDK += " \
60 libgal-mx6 \
61 libegl-mx6 \
62 libegl-mx6-dev \
63 libgles2-mx6 \
64 libgles2-mx6-dev \
65 opencv-dev \
66 "
67
68KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" 50KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
69 51
70# add support for both imx6qsabresd and imx6dlsabresd 52# add support for both imx6qsabresd and imx6dlsabresd
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 942c8fd..7986cb7 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -28,6 +28,8 @@
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/imx6.inc
31include conf/distro/include/imx6-egl.inc
32include conf/distro/include/imx6-opencv.inc
31 33
32DEPLOY_CONF_NAME = "Boundary Devices i.MX6" 34DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
33 35
@@ -94,24 +96,7 @@ KERNEL_DEVICETREE += "imx6dl-nit6xlite.dtb"
94DISTRO_FEATURES_DEFAULT += "wayland" 96DISTRO_FEATURES_DEFAULT += "wayland"
95 97
96MACHINE_EXTRA_INSTALL = "\ 98MACHINE_EXTRA_INSTALL = "\
97 libgal-mx6 \
98 libegl-mx6 \
99 libgles2-mx6 \
100 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
101 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
102 bcm4330-nvram-config \ 99 bcm4330-nvram-config \
103 libopencv-core \
104 libopencv-imgproc \
105 libopencv-objdetect \
106 "
107
108MACHINE_EXTRA_INSTALL_SDK += " \
109 libgal-mx6 \
110 libegl-mx6 \
111 libegl-mx6-dev \
112 libgles2-mx6 \
113 libgles2-mx6-dev \
114 opencv-dev \
115 " 100 "
116 101
117ADB_PRODUCTID = "0x0d02" 102ADB_PRODUCTID = "0x0d02"
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 3582ade..95388b6 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -28,6 +28,7 @@
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/imx6.inc
31include conf/distro/include/imx6-egl.inc
31 32
32DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i" 33DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i"
33 34
@@ -36,22 +37,9 @@ KERNEL_IMAGETYPE = "uImage"
36BOOTFS_CONTENT = " " 37BOOTFS_CONTENT = " "
37 38
38MACHINE_EXTRA_INSTALL = "\ 39MACHINE_EXTRA_INSTALL = "\
39 libgal-mx6 \
40 libegl-mx6 \
41 libgles2-mx6 \
42 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
43 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
44 kernel-devicetree \ 40 kernel-devicetree \
45 " 41 "
46 42
47MACHINE_EXTRA_INSTALL_SDK += " \
48 libgal-mx6 \
49 libegl-mx6 \
50 libegl-mx6-dev \
51 libgles2-mx6 \
52 libgles2-mx6-dev \
53 "
54
55KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" 43KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
56 44
57BBMASK ?= " " 45BBMASK ?= " "
diff --git a/conf/distro/include/tibidabo.conf b/conf/distro/include/tibidabo.conf
index 706ebfb..01e1f63 100644
--- a/conf/distro/include/tibidabo.conf
+++ b/conf/distro/include/tibidabo.conf
@@ -28,6 +28,7 @@
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/imx6.inc
31include conf/distro/include/imx6-egl.inc
31 32
32DEPLOY_CONF_NAME = "ArchiTech Tibidabo" 33DEPLOY_CONF_NAME = "ArchiTech Tibidabo"
33 34
@@ -45,20 +46,4 @@ PREFERRED_PROVIDER_virtual/libgles1_mx6q = "gpu-viv-bin-mx6q"
45PREFERRED_PROVIDER_virtual/libgles2_mx6q = "gpu-viv-bin-mx6q" 46PREFERRED_PROVIDER_virtual/libgles2_mx6q = "gpu-viv-bin-mx6q"
46PREFERRED_PROVIDER_virtual/libgl_mx6q = "gpu-viv-bin-mx6q" 47PREFERRED_PROVIDER_virtual/libgl_mx6q = "gpu-viv-bin-mx6q"
47 48
48MACHINE_EXTRA_INSTALL = "\
49 libgal-mx6 \
50 libegl-mx6 \
51 libgles2-mx6 \
52 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
53 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
54 "
55
56MACHINE_EXTRA_INSTALL_SDK += " \
57 libgal-mx6 \
58 libegl-mx6 \
59 libegl-mx6-dev \
60 libgles2-mx6 \
61 libgles2-mx6-dev \
62 "
63
64KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" 49KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-22 06:52:26 +0000