summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bblayers.conf.bbb.sample58
-rw-r--r--conf/bblayers.conf.emulator.sample10
-rw-r--r--conf/bblayers.conf.fsl.sample10
-rw-r--r--conf/bblayers.conf.intel.sample10
-rw-r--r--conf/bblayers.conf.nvidia-logan.sample11
-rw-r--r--conf/bblayers.conf.nvidia-tegra.sample11
-rw-r--r--conf/bblayers.conf.rcar-gen2.sample14
-rw-r--r--conf/bblayers.conf.rpi.sample10
-rw-r--r--conf/bblayers.conf.sample23
-rw-r--r--conf/bblayers.conf.smx6.sample10
-rw-r--r--conf/bblayers.conf.ti.sample10
-rw-r--r--conf/bblayers.conf.tibidabo.sample10
-rw-r--r--conf/distro/b2qt.conf3
-rw-r--r--conf/distro/include/am335x-evm.conf11
-rw-r--r--conf/distro/include/apalis-imx6.conf1
-rw-r--r--conf/distro/include/beaglebone.conf22
-rw-r--r--conf/distro/include/colibri-imx6.conf1
-rw-r--r--conf/distro/include/colibri-imx7.conf2
-rw-r--r--conf/distro/include/colibri-vf.conf4
-rw-r--r--conf/distro/include/imx6.inc3
-rw-r--r--conf/distro/include/nitrogen6x.conf2
-rw-r--r--conf/distro/include/nvidia-logan.conf26
-rw-r--r--conf/distro/include/raspberrypi.inc2
-rw-r--r--conf/distro/include/raspberrypi0.conf (renamed from conf/bblayers.conf.toradex.sample)33
-rw-r--r--conf/distro/include/rcar-gen2.inc28
-rw-r--r--conf/distro/include/smarc-samx6i.conf3
-rw-r--r--conf/distro/include/tegra-t18x.conf31
-rw-r--r--conf/distro/include/ti.inc16
-rw-r--r--conf/distro/include/toradex.inc3
29 files changed, 105 insertions, 273 deletions
diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample
deleted file mode 100644
index ddd469b..0000000
--- a/conf/bblayers.conf.bbb.sample
+++ /dev/null
@@ -1,58 +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# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly
32LCONF_VERSION = "6"
33
34BBPATH = "${TOPDIR}"
35BBFILES ?= ""
36BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
37
38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \
41 ${BSPDIR}/sources/meta-beagleboard/common-bsp \
42 ${BSPDIR}/sources/meta-ti \
43 ${BSPDIR}/sources/meta-fsl-arm \
44 ${BSPDIR}/sources/meta-openembedded/meta-oe \
45 ${BSPDIR}/sources/meta-openembedded/meta-python \
46 ${BSPDIR}/sources/meta-openembedded/meta-networking \
47 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
48 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
49 ${BSPDIR}/sources/meta-boot2qt \
50 ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
51 ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
52 ${BSPDIR}/sources/meta-mingw \
53 ${BSPDIR}/sources/meta-qt5 \
54 "
55BBLAYERS_NON_REMOVABLE ?= " \
56 ${BSPDIR}/sources/poky/meta \
57 ${BSPDIR}/sources/poky/meta-yocto \
58 "
diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample
index 75d7aae..381c488 100644
--- a/conf/bblayers.conf.emulator.sample
+++ b/conf/bblayers.conf.emulator.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 41 ${BSPDIR}/sources/meta-openembedded/meta-oe \
42 ${BSPDIR}/sources/meta-openembedded/meta-python \ 42 ${BSPDIR}/sources/meta-openembedded/meta-python \
43 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 43 ${BSPDIR}/sources/meta-openembedded/meta-networking \
@@ -47,7 +47,3 @@ BBLAYERS ?= " \
47 ${BSPDIR}/sources/meta-mingw \ 47 ${BSPDIR}/sources/meta-mingw \
48 ${BSPDIR}/sources/meta-qt5 \ 48 ${BSPDIR}/sources/meta-qt5 \
49 " 49 "
50BBLAYERS_NON_REMOVABLE ?= " \
51 ${BSPDIR}/sources/poky/meta \
52 ${BSPDIR}/sources/poky/meta-yocto \
53 "
diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample
index 1a255de..61e12fa 100644
--- a/conf/bblayers.conf.fsl.sample
+++ b/conf/bblayers.conf.fsl.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-fsl-arm \ 41 ${BSPDIR}/sources/meta-fsl-arm \
42 ${BSPDIR}/sources/meta-fsl-arm-extra \ 42 ${BSPDIR}/sources/meta-fsl-arm-extra \
43 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 43 ${BSPDIR}/sources/meta-openembedded/meta-oe \
@@ -50,7 +50,3 @@ BBLAYERS ?= " \
50 ${BSPDIR}/sources/meta-mingw \ 50 ${BSPDIR}/sources/meta-mingw \
51 ${BSPDIR}/sources/meta-qt5 \ 51 ${BSPDIR}/sources/meta-qt5 \
52 " 52 "
53BBLAYERS_NON_REMOVABLE ?= " \
54 ${BSPDIR}/sources/poky/meta \
55 ${BSPDIR}/sources/poky/meta-yocto \
56 "
diff --git a/conf/bblayers.conf.intel.sample b/conf/bblayers.conf.intel.sample
index c03ad50..e6094d6 100644
--- a/conf/bblayers.conf.intel.sample
+++ b/conf/bblayers.conf.intel.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-intel \ 41 ${BSPDIR}/sources/meta-intel \
42 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 42 ${BSPDIR}/sources/meta-openembedded/meta-oe \
43 ${BSPDIR}/sources/meta-openembedded/meta-python \ 43 ${BSPDIR}/sources/meta-openembedded/meta-python \
@@ -49,7 +49,3 @@ BBLAYERS ?= " \
49 ${BSPDIR}/sources/meta-mingw \ 49 ${BSPDIR}/sources/meta-mingw \
50 ${BSPDIR}/sources/meta-qt5 \ 50 ${BSPDIR}/sources/meta-qt5 \
51 " 51 "
52BBLAYERS_NON_REMOVABLE ?= " \
53 ${BSPDIR}/sources/poky/meta \
54 ${BSPDIR}/sources/poky/meta-yocto \
55 "
diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
index f893f8c..9a7272c 100644
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ b/conf/bblayers.conf.nvidia-logan.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/nvidia-layer/meta-tegra \ 41 ${BSPDIR}/sources/nvidia-layer/meta-tegra \
42 ${BSPDIR}/sources/nvidia-layer/meta-vib3 \ 42 ${BSPDIR}/sources/nvidia-layer/meta-vib3 \
43 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 43 ${BSPDIR}/sources/meta-openembedded/meta-oe \
@@ -51,8 +51,3 @@ BBLAYERS ?= " \
51 ${BSPDIR}/sources/meta-mingw \ 51 ${BSPDIR}/sources/meta-mingw \
52 ${BSPDIR}/sources/meta-qt5 \ 52 ${BSPDIR}/sources/meta-qt5 \
53 " 53 "
54
55BBLAYERS_NON_REMOVABLE ?= " \
56 ${BSPDIR}/sources/poky/meta \
57 ${BSPDIR}/sources/poky/meta-yocto \
58 "
diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample
index 1fbce2b..ec480ef 100644
--- a/conf/bblayers.conf.nvidia-tegra.sample
+++ b/conf/bblayers.conf.nvidia-tegra.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/nvidia-layer/meta-tegra \ 41 ${BSPDIR}/sources/nvidia-layer/meta-tegra \
42 ${BSPDIR}/sources/nvidia-layer/meta-vib4 \ 42 ${BSPDIR}/sources/nvidia-layer/meta-vib4 \
43 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 43 ${BSPDIR}/sources/meta-openembedded/meta-oe \
@@ -51,8 +51,3 @@ BBLAYERS ?= " \
51 ${BSPDIR}/sources/meta-mingw \ 51 ${BSPDIR}/sources/meta-mingw \
52 ${BSPDIR}/sources/meta-qt5 \ 52 ${BSPDIR}/sources/meta-qt5 \
53 " 53 "
54
55BBLAYERS_NON_REMOVABLE ?= " \
56 ${BSPDIR}/sources/poky/meta \
57 ${BSPDIR}/sources/poky/meta-yocto \
58 "
diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample
index f19b1ea..27f28ae 100644
--- a/conf/bblayers.conf.rcar-gen2.sample
+++ b/conf/bblayers.conf.rcar-gen2.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,12 +37,12 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/meta-boot2qt \ 39 ${BSPDIR}/sources/meta-boot2qt \
40 ${BSPDIR}/sources/meta-renesas \
41 ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
40 ${BSPDIR}/sources/poky/meta \ 42 ${BSPDIR}/sources/poky/meta \
41 ${BSPDIR}/sources/poky/meta-yocto \ 43 ${BSPDIR}/sources/poky/meta-poky \
42 ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ 44 ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \
43 ${BSPDIR}/sources/meta-fsl-arm \ 45 ${BSPDIR}/sources/meta-fsl-arm \
44 ${BSPDIR}/sources/meta-renesas \
45 ${BSPDIR}/sources/meta-renesas/meta-rcar-gen2 \
46 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 46 ${BSPDIR}/sources/meta-openembedded/meta-oe \
47 ${BSPDIR}/sources/meta-openembedded/meta-python \ 47 ${BSPDIR}/sources/meta-openembedded/meta-python \
48 ${BSPDIR}/sources/meta-openembedded/meta-networking \ 48 ${BSPDIR}/sources/meta-openembedded/meta-networking \
@@ -51,7 +51,3 @@ BBLAYERS ?= " \
51 ${BSPDIR}/sources/meta-qt5 \ 51 ${BSPDIR}/sources/meta-qt5 \
52 ${BSPDIR}/sources/meta-mingw \ 52 ${BSPDIR}/sources/meta-mingw \
53 " 53 "
54BBLAYERS_NON_REMOVABLE ?= " \
55 ${BSPDIR}/sources/poky/meta \
56 ${BSPDIR}/sources/poky/meta-yocto \
57 "
diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample
index c788ab0..e376bea 100644
--- a/conf/bblayers.conf.rpi.sample
+++ b/conf/bblayers.conf.rpi.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-raspberrypi \ 41 ${BSPDIR}/sources/meta-raspberrypi \
42 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 42 ${BSPDIR}/sources/meta-openembedded/meta-oe \
43 ${BSPDIR}/sources/meta-openembedded/meta-python \ 43 ${BSPDIR}/sources/meta-openembedded/meta-python \
@@ -49,7 +49,3 @@ BBLAYERS ?= " \
49 ${BSPDIR}/sources/meta-mingw \ 49 ${BSPDIR}/sources/meta-mingw \
50 ${BSPDIR}/sources/meta-qt5 \ 50 ${BSPDIR}/sources/meta-qt5 \
51 " 51 "
52BBLAYERS_NON_REMOVABLE ?= " \
53 ${BSPDIR}/sources/poky/meta \
54 ${BSPDIR}/sources/poky/meta-yocto \
55 "
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 8b3e578..381c488 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,24 +37,13 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-fsl-arm \
42 ${BSPDIR}/sources/meta-fsl-arm-extra \
43 ${BSPDIR}/sources/meta-beagleboard/common-bsp \
44 ${BSPDIR}/sources/meta-ti \
45 ${BSPDIR}/sources/meta-raspberrypi \
46 ${BSPDIR}/sources/meta-toradex \
47 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 41 ${BSPDIR}/sources/meta-openembedded/meta-oe \
42 ${BSPDIR}/sources/meta-openembedded/meta-python \
43 ${BSPDIR}/sources/meta-openembedded/meta-networking \
44 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
48 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ 45 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
49 ${BSPDIR}/sources/meta-boot2qt \ 46 ${BSPDIR}/sources/meta-boot2qt \
50 ${BSPDIR}/sources/meta-boot2qt/meta-ti-extras \
51 ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
52 ${BSPDIR}/sources/meta-boot2qt/meta-beagleboard-extras \
53 ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
54 ${BSPDIR}/sources/meta-mingw \ 47 ${BSPDIR}/sources/meta-mingw \
55 ${BSPDIR}/sources/meta-qt5 \ 48 ${BSPDIR}/sources/meta-qt5 \
56 " 49 "
57BBLAYERS_NON_REMOVABLE ?= " \
58 ${BSPDIR}/sources/poky/meta \
59 ${BSPDIR}/sources/poky/meta-yocto \
60 "
diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample
index 55a9535..b10e415 100644
--- a/conf/bblayers.conf.smx6.sample
+++ b/conf/bblayers.conf.smx6.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-fsl-arm \ 41 ${BSPDIR}/sources/meta-fsl-arm \
42 ${BSPDIR}/sources/meta-fsl-arm-extra \ 42 ${BSPDIR}/sources/meta-fsl-arm-extra \
43 ${BSPDIR}/sources/meta-smx6 \ 43 ${BSPDIR}/sources/meta-smx6 \
@@ -52,7 +52,3 @@ BBLAYERS ?= " \
52 ${BSPDIR}/sources/meta-mingw \ 52 ${BSPDIR}/sources/meta-mingw \
53 ${BSPDIR}/sources/meta-qt5 \ 53 ${BSPDIR}/sources/meta-qt5 \
54 " 54 "
55BBLAYERS_NON_REMOVABLE ?= " \
56 ${BSPDIR}/sources/poky/meta \
57 ${BSPDIR}/sources/poky/meta-yocto \
58 "
diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample
index 527b404..8ad8960 100644
--- a/conf/bblayers.conf.ti.sample
+++ b/conf/bblayers.conf.ti.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-ti \ 41 ${BSPDIR}/sources/meta-ti \
42 ${BSPDIR}/sources/meta-fsl-arm \ 42 ${BSPDIR}/sources/meta-fsl-arm \
43 ${BSPDIR}/sources/meta-openembedded/meta-oe \ 43 ${BSPDIR}/sources/meta-openembedded/meta-oe \
@@ -50,7 +50,3 @@ BBLAYERS ?= " \
50 ${BSPDIR}/sources/meta-mingw \ 50 ${BSPDIR}/sources/meta-mingw \
51 ${BSPDIR}/sources/meta-qt5 \ 51 ${BSPDIR}/sources/meta-qt5 \
52 " 52 "
53BBLAYERS_NON_REMOVABLE ?= " \
54 ${BSPDIR}/sources/poky/meta \
55 ${BSPDIR}/sources/poky/meta-yocto \
56 "
diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample
index 6351d1f..e71d646 100644
--- a/conf/bblayers.conf.tibidabo.sample
+++ b/conf/bblayers.conf.tibidabo.sample
@@ -27,9 +27,9 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
31# changes incompatibly 31# changes incompatibly
32LCONF_VERSION = "6" 32POKY_BBLAYERS_CONF_VERSION = "2"
33 33
34BBPATH = "${TOPDIR}" 34BBPATH = "${TOPDIR}"
35BBFILES ?= "" 35BBFILES ?= ""
@@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..'
37 37
38BBLAYERS ?= " \ 38BBLAYERS ?= " \
39 ${BSPDIR}/sources/poky/meta \ 39 ${BSPDIR}/sources/poky/meta \
40 ${BSPDIR}/sources/poky/meta-yocto \ 40 ${BSPDIR}/sources/poky/meta-poky \
41 ${BSPDIR}/sources/meta-fsl-arm \ 41 ${BSPDIR}/sources/meta-fsl-arm \
42 ${BSPDIR}/sources/meta-fsl-arm-extra \ 42 ${BSPDIR}/sources/meta-fsl-arm-extra \
43 ${BSPDIR}/sources/meta-tibidabo \ 43 ${BSPDIR}/sources/meta-tibidabo \
@@ -52,7 +52,3 @@ BBLAYERS ?= " \
52 ${BSPDIR}/sources/meta-mingw \ 52 ${BSPDIR}/sources/meta-mingw \
53 ${BSPDIR}/sources/meta-qt5 \ 53 ${BSPDIR}/sources/meta-qt5 \
54 " 54 "
55BBLAYERS_NON_REMOVABLE ?= " \
56 ${BSPDIR}/sources/poky/meta \
57 ${BSPDIR}/sources/poky/meta-yocto \
58 "
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index bf0a05b..f5839a3 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -56,9 +56,6 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio sysvinit"
56 56
57FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache" 57FONTCONFIG_CACHE_DIR = "${libdir}/fontconfig/cache"
58 58
59# backport from oe/krogoth, needed by meta-qt5
60PACKAGECONFIG_CONFARGS += "${EXTRA_OECONF}"
61
62# use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10 59# use GStreamer 1.0, optionally change to "gstreamer010" to use GStreamer 0.10
63DISTRO_FEATURES += "gstreamer" 60DISTRO_FEATURES += "gstreamer"
64 61
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 4f90a0e..cc4f573 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -39,20 +39,9 @@ BOOTFS_DEPENDS = "u-boot:do_deploy"
39 39
40DISTRO_FEATURES_remove = "webengine" 40DISTRO_FEATURES_remove = "webengine"
41 41
42PREFERRED_VERSION_linux-ti-staging = "3.14%"
43
44PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
45PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
46
47PREFERRED_VERSION_libgles-omap3 = "5.01.01.02"
48PREFERRED_VERSION_omap3-sgx-modules = "5.01.01.02"
49
50MACHINE_EXTRA_INSTALL += "\ 42MACHINE_EXTRA_INSTALL += "\
51 libgles-omap3 \
52 libgles-omap3-rawdemos \
53 lighttpd \ 43 lighttpd \
54 " 44 "
55 45
56MACHINE_EXTRA_INSTALL_SDK += "\ 46MACHINE_EXTRA_INSTALL_SDK += "\
57 libgles-omap3-dev \
58 " 47 "
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 1e8e876..7a2666b 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -27,7 +27,6 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/toradex.inc
31include conf/distro/include/imx6.inc 30include conf/distro/include/imx6.inc
32include conf/distro/include/imx6-egl.inc 31include conf/distro/include/imx6-egl.inc
33 32
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 54455a3..a9fa010 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -34,34 +34,16 @@ DEPLOY_CONF_NAME = "BeagleBone Black"
34BOOTFS_CONTENT = "\ 34BOOTFS_CONTENT = "\
35 u-boot-${MACHINE}.img:u-boot.img \ 35 u-boot-${MACHINE}.img:u-boot.img \
36 MLO-${MACHINE}:MLO \ 36 MLO-${MACHINE}:MLO \
37 uEnv-${MACHINE}.txt:uEnv.txt \
38 " 37 "
39BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-uenv-script:do_deploy" 38BOOTFS_DEPENDS = "u-boot:do_deploy"
40
41EXTRA_IMAGEDEPENDS += "u-boot-uenv-script"
42 39
43DISTRO_FEATURES_remove = "webengine" 40DISTRO_FEATURES_remove = "webengine"
44 41
45PREFERRED_VERSION_libgles-omap3 = "4.10.00.01"
46PREFERRED_VERSION_omap3-sgx-modules = "4.10.00.01"
47
48PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
49PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
50
51PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
52EXTRA_IMAGEDEPENDS_remove = "u-boot-denx"
53UBOOT_MACHINE = "am335x_boneblack_config"
54KERNEL_IMAGETYPE = "zImage"
55
56MACHINE_EXTRA_INSTALL += "\ 42MACHINE_EXTRA_INSTALL += "\
57 libgles-omap3 \ 43 bb-org-overlays \
58 libgles-omap3-rawdemos \
59 " 44 "
60 45
61MACHINE_EXTRA_INSTALL_SDK += "\ 46MACHINE_EXTRA_INSTALL_SDK += "\
62 libgles-omap3-dev \
63 " 47 "
64 48
65ADB_PRODUCTID = "0xD002" 49ADB_PRODUCTID = "0xD002"
66
67DEFAULTTUNE = "armv7ahf-neon"
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 0b4b12c..8a9bda5 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -27,7 +27,6 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/toradex.inc
31include conf/distro/include/imx6.inc 30include conf/distro/include/imx6.inc
32include conf/distro/include/imx6-egl.inc 31include conf/distro/include/imx6-egl.inc
33 32
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 877177e..8565729 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -20,8 +20,6 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23include conf/distro/include/toradex.inc
24
25DEPLOY_CONF_NAME = "Toradex Colibri iMX7" 23DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
26 24
27IMAGE_FSTYPES += "ext3 sdcard" 25IMAGE_FSTYPES += "ext3 sdcard"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 5a8498f..d75bd9b 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -27,10 +27,6 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/toradex.inc
31
32BBMASK .= "|meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex|meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb|meta-fsl-arm-extra/recipes-bsp/mqxboot"
33
34DEPLOY_CONF_NAME = "Toradex Colibri VF" 30DEPLOY_CONF_NAME = "Toradex Colibri VF"
35 31
36IMAGE_FSTYPES += "ext3 sdcard" 32IMAGE_FSTYPES += "ext3 sdcard"
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index e686e85..25eb691 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -27,8 +27,7 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30BBMASK ?= " " 30BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
31BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
32 31
33IMAGE_FSTYPES += "ext3 sdcard" 32IMAGE_FSTYPES += "ext3 sdcard"
34 33
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index bfe29bf..751c264 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -93,8 +93,6 @@ EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
93 93
94KERNEL_DEVICETREE += "\ 94KERNEL_DEVICETREE += "\
95 imx6dl-nit6xlite.dtb \ 95 imx6dl-nit6xlite.dtb \
96 imx6qp-nitrogen6_max.dtb \
97 imx6q-nitrogen6_som2.dtb \
98 " 96 "
99 97
100DISTRO_FEATURES_DEFAULT += "wayland" 98DISTRO_FEATURES_DEFAULT += "wayland"
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
index 632e31b..0dc1d84 100644
--- a/conf/distro/include/nvidia-logan.conf
+++ b/conf/distro/include/nvidia-logan.conf
@@ -35,7 +35,7 @@ KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-v
35PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' 35PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
36NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" 36NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
37 37
38MACHINE_EXTRA_INSTALL += "\ 38MACHINE_EXTRA_INSTALL = "\
39 libegl \ 39 libegl \
40 libgles2 \ 40 libgles2 \
41 tegra-firmware-gk20a \ 41 tegra-firmware-gk20a \
@@ -43,7 +43,7 @@ MACHINE_EXTRA_INSTALL += "\
43 libdrm-nv \ 43 libdrm-nv \
44" 44"
45 45
46MACHINE_EXTRA_INSTALL_SDK += "\ 46MACHINE_EXTRA_INSTALL_SDK = "\
47 libegl-dev \ 47 libegl-dev \
48 libgles2-dev \ 48 libgles2-dev \
49 graphics-headers-dev \ 49 graphics-headers-dev \
@@ -53,14 +53,14 @@ MACHINE_EXTRA_INSTALL_SDK += "\
53PREFERRED_PROVIDER_libdrm ?= "libdrm-nv" 53PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
54PREFERRED_PROVIDER_drm ?= "libdrm-nv" 54PREFERRED_PROVIDER_drm ?= "libdrm-nv"
55 55
56BBMASK ?= " " 56BBMASK += "\
57BBMASK .= "\ 57 meta-vib3/recipes-kernel/linux-libc-headers \
58|meta-vib3/recipes-kernel/linux-libc-headers\ 58 meta-vib3/recipes-devtools/binutils \
59|meta-vib3/recipes-devtools/binutils\ 59 meta-vib3/recipes-core/eglibc \
60|meta-vib3/recipes-core/eglibc\ 60 meta-vib3/recipes-core/systemd \
61|meta-vib3/recipes-core/systemd\ 61 meta-vib3/recipes-connectivity \
62|meta-vib3/recipes-connectivity\ 62 meta-vib3/recipes-multimedia/pulseaudio \
63|meta-vib3/recipes-multimedia/pulseaudio\ 63 meta-vib3/recipes-core/meta \
64|meta-vib3/recipes-core/meta/external-tegra-toolchain.bb\ 64 meta-vib3/recipes-core/packagegroups \
65|meta-vib3/recipes-core/packagegroups\ 65 meta-vib3/recipes-devtools/gcc \
66" 66 "
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
index 0833404..fb56934 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/conf/distro/include/raspberrypi.inc
@@ -53,6 +53,4 @@ module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
53VIDEO_CAMERA = "1" 53VIDEO_CAMERA = "1"
54 54
55RPI_FT5604 = "1" 55RPI_FT5604 = "1"
56KERNEL_DEVICETREE += "overlays/rpi-ft5406-overlay.dtb"
57MACHINE_FEATURES += "pitft" 56MACHINE_FEATURES += "pitft"
58
diff --git a/conf/bblayers.conf.toradex.sample b/conf/distro/include/raspberrypi0.conf
index 7e49d04..647e597 100644
--- a/conf/bblayers.conf.toradex.sample
+++ b/conf/distro/include/raspberrypi0.conf
@@ -27,32 +27,11 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf 30include conf/distro/include/raspberrypi.inc
31# changes incompatibly
32LCONF_VERSION = "6"
33 31
34BBPATH = "${TOPDIR}" 32DEPLOY_CONF_NAME = "Raspberry Pi Zero"
35BBFILES ?= ""
36BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
37 33
38BBLAYERS ?= " \ 34DISTRO_FEATURES_remove = "webengine"
39 ${BSPDIR}/sources/poky/meta \ 35
40 ${BSPDIR}/sources/poky/meta-yocto \ 36# additional memory for GPU
41 ${BSPDIR}/sources/meta-toradex \ 37GPU_MEM = "128"
42 ${BSPDIR}/sources/meta-fsl-arm \
43 ${BSPDIR}/sources/meta-fsl-arm-extra \
44 ${BSPDIR}/sources/meta-openembedded/meta-oe \
45 ${BSPDIR}/sources/meta-openembedded/meta-python \
46 ${BSPDIR}/sources/meta-openembedded/meta-networking \
47 ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
48 ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
49 ${BSPDIR}/sources/meta-boot2qt \
50 ${BSPDIR}/sources/meta-boot2qt/meta-fsl-extras \
51 ${BSPDIR}/sources/meta-boot2qt/meta-toradex-extras \
52 ${BSPDIR}/sources/meta-mingw \
53 ${BSPDIR}/sources/meta-qt5 \
54 "
55BBLAYERS_NON_REMOVABLE ?= " \
56 ${BSPDIR}/sources/poky/meta \
57 ${BSPDIR}/sources/poky/meta-yocto \
58 "
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index 9b638c3..9a33319 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -123,18 +123,18 @@ MACHINE_EXTRA_INSTALL_append_lcb = " \
123" 123"
124 124
125BB_MULTIMEDIA_TEST_MODULE = "\ 125BB_MULTIMEDIA_TEST_MODULE = "\
126|fdpm-tp-user-module\ 126 fdpm-tp-user-module \
127|mmngr-tp-user-module\ 127 mmngr-tp-user-module \
128|mmngrbuf-tp-user-module\ 128 mmngrbuf-tp-user-module \
129|s3ctl-tp-user-module\ 129 s3ctl-tp-user-module \
130|vspm-tp-user-module\ 130 vspm-tp-user-module \
131" 131 "
132 132
133BBMASK ?= " " 133BBMASK += "\
134BBMASK .= "\ 134 ${BB_MULTIMEDIA_TEST_MODULE} \
135${BB_MULTIMEDIA_TEST_MODULE}\ 135 dtv-module ssp-module scu-module \
136|dtv-module|ssp-module|scu-module\ 136 gles-test-module \
137|gles-test-module\ 137 poky/meta/recipes-graphics/mesa \
138|poky/meta/recipes-graphics/mesa\ 138 meta-fsl-arm/recipes-graphics/mesa \
139|meta-fsl-arm/recipes-graphics/mesa\ 139 meta-rcar-gen2/recipes-devtools/file \
140" 140 "
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 7c441ff..1089f83 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -42,5 +42,4 @@ MACHINE_EXTRA_INSTALL += "\
42 42
43KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" 43KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
44 44
45BBMASK ?= " " 45BBMASK += "meta-smx6/recipes-qt"
46BBMASK .= "|meta-smx6/recipes-qt"
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index 50ed829..a1fad00 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -22,6 +22,8 @@
22 22
23include conf/distro/include/tegra.inc 23include conf/distro/include/tegra.inc
24 24
25OLDEST_KERNEL_aarch64 = "3.18"
26
25TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM" 27TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
26DISTRO_FEATURES_DEFAULT += "wayland" 28DISTRO_FEATURES_DEFAULT += "wayland"
27 29
@@ -62,18 +64,17 @@ PREFERRED_PROVIDER_wayland ?= "wayland-nv"
62PREFERRED_PROVIDER_wayland-native ?= "wayland-nv" 64PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
63PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv" 65PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
64 66
65BBMASK ?= " " 67BBMASK += "\
66BBMASK .= "\ 68 meta-vib4/recipes-connectivity/connman \
67|meta-vib4/recipes-connectivity/connman\ 69 meta-vib4/recipes-core/busybox \
68|meta-vib4/recipes-core/busybox\ 70 meta-vib4/recipes-core/images \
69|meta-vib4/recipes-core/images\ 71 meta-vib4/recipes-core/meta \
70|meta-vib4/recipes-core/meta\ 72 meta-vib4/recipes-core/packagegroups \
71|meta-vib4/recipes-core/packagegroups\ 73 meta-vib4/recipes-core/systemd/systemd \
72|meta-vib4/recipes-core/systemd/systemd\ 74 meta-vib4/recipes-devtools \
73|meta-vib4/recipes-devtools\ 75 meta-vib4/recipes-extended \
74|meta-vib4/recipes-extended\ 76 meta-vib4/recipes-multimedia/audiomanager \
75|meta-vib4/recipes-multimedia/audiomanager\ 77 meta-vib4/recipes-core/glibc \
76|meta-vib4/recipes-core/glibc\ 78 meta-vib4/recipes-support/lvm2 \
77|meta-vib4/recipes-support/lvm2\ 79 meta-vib4/recipes-kernel/linux-libc-headers \
78|meta-vib4/recipes-kernel/linux-libc-headers\ 80 "
79"
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index a445dc2..a97511a 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -27,11 +27,23 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30BBMASK ?= " " 30BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
31BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
32 31
33IMAGE_FSTYPES += "ext3 sdcard" 32IMAGE_FSTYPES += "ext3 sdcard"
34IMAGE_CLASSES += "image_types_fsl" 33IMAGE_CLASSES += "image_types_fsl"
35 34
36UBOOT_SUFFIX = "img" 35UBOOT_SUFFIX = "img"
37BOOT_SCRIPTS = "${BOOTFS_CONTENT}" 36BOOT_SCRIPTS = "${BOOTFS_CONTENT}"
37
38PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
39PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
40PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
41
42MACHINE_EXTRA_INSTALL += "\
43 ti-sgx-ddk-km \
44 ti-sgx-ddk-um \
45 "
46
47MACHINE_EXTRA_INSTALL_SDK += "\
48 ti-sgx-ddk-um-dev \
49 "
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index 647362d..f448fbe 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -27,9 +27,6 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30BBMASK ?= " "
31BBMASK .= "|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|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit|meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5|meta-toradex/recipes-bsp/binary-drivers/opencv4tegra"
32
33PREFERRED_PROVIDER_u-boot = "u-boot-toradex" 30PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
34 31
35MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" 32MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}"