summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/b2qt.conf4
-rw-r--r--conf/distro/include/am335x-evm.conf10
-rw-r--r--conf/distro/include/apalis-imx6.conf11
-rw-r--r--conf/distro/include/beagleboard.conf17
-rw-r--r--conf/distro/include/beaglebone.conf10
-rw-r--r--conf/distro/include/colibri-imx6.conf10
-rw-r--r--conf/distro/include/colibri-imx7.conf10
-rw-r--r--conf/distro/include/colibri-vf.conf12
-rw-r--r--conf/distro/include/emulator.conf2
-rw-r--r--conf/distro/include/fsl.inc (renamed from conf/distro/include/imx6-egl.inc)8
-rw-r--r--conf/distro/include/imx6.inc38
-rw-r--r--conf/distro/include/imx6qsabresd.conf15
-rw-r--r--conf/distro/include/imx7dsabresd.conf24
-rw-r--r--conf/distro/include/intel-corei7-64.conf4
-rw-r--r--conf/distro/include/nitrogen6x.conf17
-rw-r--r--conf/distro/include/nvidia-logan.conf8
-rw-r--r--conf/distro/include/raspberrypi.inc8
-rw-r--r--conf/distro/include/smarc-samx6i.conf5
-rw-r--r--conf/distro/include/ti.inc17
-rw-r--r--conf/distro/include/toradex.inc4
20 files changed, 30 insertions, 204 deletions
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index c488d5c..9a59812 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -68,8 +68,6 @@ PREFERRED_PROVIDER_udev-utils ?= "systemd"
68PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo" 68PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo"
69PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native" 69PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
70 70
71MACHINE_EXTRA_INSTALL ?= ""
72
73# Override mkspec for mingw build 71# Override mkspec for mingw build
74OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe" 72OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"
75OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe" 73OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
@@ -79,7 +77,7 @@ QT_MODULE_BRANCH_PARAM = "nobranch=1"
79 77
80PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" 78PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler"
81 79
82IMAGE_FSTYPES = "tar.gz conf" 80IMAGE_FSTYPES = "conf"
83IMAGE_CLASSES += "image_types_sdcard deploy-conf" 81IMAGE_CLASSES += "image_types_sdcard deploy-conf"
84 82
85LICENSE_CREATE_PACKAGE = "1" 83LICENSE_CREATE_PACKAGE = "1"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 62e5ecd..4ec3e4d 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -31,14 +31,4 @@ include conf/distro/include/ti.inc
31 31
32DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit" 32DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit"
33 33
34BOOTFS_CONTENT = "\
35 u-boot-${MACHINE}.img:u-boot.img \
36 MLO-${MACHINE}:MLO \
37 "
38BOOTFS_DEPENDS = "u-boot:do_deploy"
39
40DISTRO_FEATURES_remove = "webengine" 34DISTRO_FEATURES_remove = "webengine"
41
42MACHINE_EXTRA_INSTALL += "\
43 lighttpd \
44 "
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
index 7a2666b..ff939bb 100644
--- a/conf/distro/include/apalis-imx6.conf
+++ b/conf/distro/include/apalis-imx6.conf
@@ -27,8 +27,7 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/toradex.inc
31include conf/distro/include/imx6-egl.inc
32 31
33DEPLOY_CONF_NAME = "Toradex Apalis iMX6" 32DEPLOY_CONF_NAME = "Toradex Apalis iMX6"
34 33
@@ -39,14 +38,6 @@ UBOOT_CONFIG ??= "com it"
39UBOOT_CONFIG[com] = "apalis_imx6_defconfig" 38UBOOT_CONFIG[com] = "apalis_imx6_defconfig"
40UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig" 39UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig"
41 40
42BOOTFS_CONTENT = "\
43 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
44 ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \
45 ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \
46 ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \
47 ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \
48 "
49BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
50BOOT_SCRIPTS += " \ 41BOOT_SCRIPTS += " \
51 u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \ 42 u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \
52 " 43 "
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 59eb076..fa446d2 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -31,21 +31,6 @@ include conf/distro/include/ti.inc
31 31
32DEPLOY_CONF_NAME = "BeagleBoard" 32DEPLOY_CONF_NAME = "BeagleBoard"
33 33
34BOOTFS_CONTENT = "\ 34DISTRO_FEATURES_remove = "webengine opengl"
35 u-boot-${MACHINE}.img:u-boot.img \
36 MLO-${MACHINE}:MLO \
37 "
38BOOTFS_DEPENDS = "u-boot:do_deploy"
39
40PREFERRED_PROVIDER_virtual/egl = "libgles-omap3"
41PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3"
42
43PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
44PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
45
46MACHINE_EXTRA_INSTALL += "\
47 libgles-omap3 \
48 libgles-omap3-rawdemos \
49 "
50 35
51ADB_PRODUCTID = "0x9018" 36ADB_PRODUCTID = "0x9018"
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 15faa2a..6f12d90 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -31,16 +31,6 @@ include conf/distro/include/ti.inc
31 31
32DEPLOY_CONF_NAME = "BeagleBone Black" 32DEPLOY_CONF_NAME = "BeagleBone Black"
33 33
34BOOTFS_CONTENT = "\
35 u-boot-${MACHINE}.img:u-boot.img \
36 MLO-${MACHINE}:MLO \
37 "
38BOOTFS_DEPENDS = "u-boot:do_deploy"
39
40DISTRO_FEATURES_remove = "webengine" 34DISTRO_FEATURES_remove = "webengine"
41 35
42MACHINE_EXTRA_INSTALL += "\
43 bb-org-overlays \
44 "
45
46ADB_PRODUCTID = "0xD002" 36ADB_PRODUCTID = "0xD002"
diff --git a/conf/distro/include/colibri-imx6.conf b/conf/distro/include/colibri-imx6.conf
index 8a9bda5..987764a 100644
--- a/conf/distro/include/colibri-imx6.conf
+++ b/conf/distro/include/colibri-imx6.conf
@@ -27,16 +27,8 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/toradex.inc
31include conf/distro/include/imx6-egl.inc
32 31
33DEPLOY_CONF_NAME = "Toradex Colibri iMX6" 32DEPLOY_CONF_NAME = "Toradex Colibri iMX6"
34 33
35KERNEL_IMAGETYPE = "uImage" 34KERNEL_IMAGETYPE = "uImage"
36
37BOOTFS_CONTENT = "\
38 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
39 ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \
40 ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \
41 "
42BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
diff --git a/conf/distro/include/colibri-imx7.conf b/conf/distro/include/colibri-imx7.conf
index 8565729..903ad77 100644
--- a/conf/distro/include/colibri-imx7.conf
+++ b/conf/distro/include/colibri-imx7.conf
@@ -20,16 +20,10 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23DEPLOY_CONF_NAME = "Toradex Colibri iMX7" 23include conf/distro/include/toradex.inc
24 24
25IMAGE_FSTYPES += "ext3 sdcard" 25DEPLOY_CONF_NAME = "Toradex Colibri iMX7"
26 26
27BOOTFS_CONTENT = "\
28 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
29 ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \
30 ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \
31 "
32BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
33BOOT_SCRIPTS += " \ 27BOOT_SCRIPTS += " \
34 u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ 28 u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
35 " 29 "
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index accd2ca..859e387 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -27,16 +27,12 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/toradex.inc
31
30DEPLOY_CONF_NAME = "Toradex Colibri VF" 32DEPLOY_CONF_NAME = "Toradex Colibri VF"
31 33
32IMAGE_FSTYPES += "ext3 sdcard"
33IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" 34IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024"
34 35
35BOOTFS_CONTENT = "\
36 ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \
37 ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \
38 "
39BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy"
40BOOT_SCRIPTS += " \ 36BOOT_SCRIPTS += " \
41 u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ 37 u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \
42 " 38 "
@@ -48,7 +44,3 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy"
48PREFERRED_VERSION_linux-toradex = "4.1" 44PREFERRED_VERSION_linux-toradex = "4.1"
49 45
50DISTRO_FEATURES_remove = "webengine" 46DISTRO_FEATURES_remove = "webengine"
51
52MACHINE_EXTRA_INSTALL += "\
53 opengldummy \
54 "
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index 75fbbf7..d7cb2c3 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -45,8 +45,6 @@ DISTRO_FEATURES_remove = "webengine opengl"
45 45
46MACHINE_EXTRA_INSTALL += "\ 46MACHINE_EXTRA_INSTALL += "\
47 mount-vboxsf \ 47 mount-vboxsf \
48 "
49MACHINE_EXTRA_INSTALL_QT = "\
50 qtsystems \ 48 qtsystems \
51 qtglesstream \ 49 qtglesstream \
52 b2qt-emulator-proxy \ 50 b2qt-emulator-proxy \
diff --git a/conf/distro/include/imx6-egl.inc b/conf/distro/include/fsl.inc
index efe3c18..d0e2c7a 100644
--- a/conf/distro/include/imx6-egl.inc
+++ b/conf/distro/include/fsl.inc
@@ -27,7 +27,7 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30MACHINE_EXTRA_INSTALL += "\ 30BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
31 libegl-mx6 \ 31
32 libgles2-mx6 \ 32IMAGE_FSTYPES += "ext3 sdcard"
33 " 33IMAGE_CLASSES += "image_types_fsl"
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
deleted file mode 100644
index 8605b1a..0000000
--- a/conf/distro/include/imx6.inc
+++ /dev/null
@@ -1,38 +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
30BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
31
32IMAGE_FSTYPES += "ext3 sdcard"
33
34MACHINE_EXTRA_INSTALL += "\
35 libgal-mx6 \
36 ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
37 ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
38 "
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 1463c67..2cb9a1f 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -27,24 +27,11 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/fsl.inc
31include conf/distro/include/imx6-egl.inc
32include conf/distro/include/imx6-opencv.inc 31include conf/distro/include/imx6-opencv.inc
33 32
34DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad" 33DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad"
35 34
36BOOTFS_CONTENT = "\
37 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
38 ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \
39 ${KERNEL_IMAGETYPE}-imx6q-sabresd-hdcp.dtb:imx6q-sabresd-hdcp.dtb \
40 ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \
41 ${KERNEL_IMAGETYPE}-imx6dl-sabresd.dtb:imx6dl-sabresd.dtb \
42 ${KERNEL_IMAGETYPE}-imx6dl-sabresd-hdcp.dtb:imx6dl-sabresd-hdcp.dtb \
43 ${KERNEL_IMAGETYPE}-imx6dl-sabresd-ldo.dtb:imx6dl-sabresd-ldo.dtb \
44 u-boot-${MACHINE}.imx:u-boot.imx \
45 "
46BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy"
47
48DISTRO_FEATURES_DEFAULT += "wayland" 35DISTRO_FEATURES_DEFAULT += "wayland"
49 36
50KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture" 37KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf
index dbf04a1..962077c 100644
--- a/conf/distro/include/imx7dsabresd.conf
+++ b/conf/distro/include/imx7dsabresd.conf
@@ -27,28 +27,8 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual" 30include conf/distro/include/fsl.inc
31
32IMAGE_FSTYPES += "ext3 sdcard"
33
34BOOTFS_CONTENT = "\
35 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
36 ${KERNEL_IMAGETYPE}-imx7d-sdb.dtb:imx7d-sdb.dtb \
37 ${KERNEL_IMAGETYPE}-imx7d-sdb-enet.dtb:imx7d-sdb-enet.dtb \
38 ${KERNEL_IMAGETYPE}-imx7d-sdb-epdc.dtb:imx7d-sdb-epdc.dtb \
39 ${KERNEL_IMAGETYPE}-imx7d-sdb-gpmi-weim.dtb:imx7d-sdb-gpmi-weim.dtb \
40 ${KERNEL_IMAGETYPE}-imx7d-sdb-hdmi-audio.dtb:imx7d-sdb-hdmi-audio.dtb \
41 ${KERNEL_IMAGETYPE}-imx7d-sdb-m4.dtb:imx7d-sdb-m4.dtb \
42 ${KERNEL_IMAGETYPE}-imx7d-sdb-qspi.dtb:imx7d-sdb-qspi.dtb \
43 ${KERNEL_IMAGETYPE}-imx7d-sdb-sim.dtb:imx7d-sdb-sim.dtb \
44 ${KERNEL_IMAGETYPE}-imx7d-sdb-touch.dtb:imx7d-sdb-touch.dtb \
45 ${KERNEL_IMAGETYPE}-imx7d-sdb-wm8960.dtb:imx7d-sdb-wm8960.dtb \
46 u-boot-${MACHINE}.imx:u-boot.imx \
47 "
48 31
49BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" 32DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual"
50 33
51DISTRO_FEATURES_remove = "webengine" 34DISTRO_FEATURES_remove = "webengine"
52
53MACHINE_EXTRA_INSTALL += "\
54 "
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf
index d7db6f2..2ae90ee 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/conf/distro/include/intel-corei7-64.conf
@@ -29,7 +29,7 @@
29 29
30DEPLOY_CONF_NAME = "Intel NUC" 30DEPLOY_CONF_NAME = "Intel NUC"
31 31
32DISTRO_FEATURES_DEFAULT += "wayland weston" 32DISTRO_FEATURES_DEFAULT += "wayland"
33 33
34DISTRO_FEATURES_remove = "usbgadget" 34DISTRO_FEATURES_remove = "usbgadget"
35 35
@@ -41,7 +41,5 @@ INITRAMFS_IMAGE = "initramfs-basic"
41SYSVINIT_ENABLED_GETTYS = "1" 41SYSVINIT_ENABLED_GETTYS = "1"
42 42
43MACHINE_EXTRA_INSTALL += "\ 43MACHINE_EXTRA_INSTALL += "\
44 wayland \
45 mesa-megadriver \
46 grub-efi-config \ 44 grub-efi-config \
47 " 45 "
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 751c264..4dffde8 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -27,24 +27,11 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/fsl.inc
31include conf/distro/include/imx6-egl.inc
32include conf/distro/include/imx6-opencv.inc 31include conf/distro/include/imx6-opencv.inc
33 32
34DEPLOY_CONF_NAME = "Boundary Devices i.MX6" 33DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
35 34
36BOOTFS_CONTENT = "\
37 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
38 ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
39 ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
40 ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
41 ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \
42 ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \
43 6x_bootscript-${MACHINE}:6x_bootscript \
44 6x_upgrade-${MACHINE}:6x_upgrade \
45 u-boot-${MACHINE}.imx:u-boot.imx \
46 "
47BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy"
48BOOT_SPACE = "16384" 35BOOT_SPACE = "16384"
49BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \ 36BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \
50 u-boot-nit6xlite-*.imx:u-boot.nit6xlite \ 37 u-boot-nit6xlite-*.imx:u-boot.nit6xlite \
@@ -89,7 +76,7 @@ UBOOT_CONFIG[nitrogen6_max] = "nitrogen6_max_config"
89UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config" 76UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config"
90UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config" 77UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config"
91 78
92EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" 79EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary"
93 80
94KERNEL_DEVICETREE += "\ 81KERNEL_DEVICETREE += "\
95 imx6dl-nit6xlite.dtb \ 82 imx6dl-nit6xlite.dtb \
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
index 5474921..f8ec689 100644
--- a/conf/distro/include/nvidia-logan.conf
+++ b/conf/distro/include/nvidia-logan.conf
@@ -35,14 +35,6 @@ 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 = "\
39 libegl \
40 libgles2 \
41 tegra-firmware-gk20a \
42 graphics-fw \
43 libdrm-nv \
44"
45
46PREFERRED_PROVIDER_libdrm ?= "libdrm-nv" 38PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
47PREFERRED_PROVIDER_drm ?= "libdrm-nv" 39PREFERRED_PROVIDER_drm ?= "libdrm-nv"
48 40
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
index 5c76a83..aa7839a 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/conf/distro/include/raspberrypi.inc
@@ -29,15 +29,7 @@
29 29
30IMAGE_FSTYPES += "ext3 rpi-sdimg" 30IMAGE_FSTYPES += "ext3 rpi-sdimg"
31 31
32BOOTFS_CONTENT = "\
33 bcm2835-bootfiles/*: \
34 ${KERNEL_IMAGETYPE}:kernel.img \
35 "
36
37BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
38
39MACHINE_EXTRA_INSTALL += "\ 32MACHINE_EXTRA_INSTALL += "\
40 userland \
41 omxplayer \ 33 omxplayer \
42 " 34 "
43 35
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 1089f83..39dd17d 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -27,15 +27,12 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/imx6.inc 30include conf/distro/include/fsl.inc
31include conf/distro/include/imx6-egl.inc
32 31
33DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i" 32DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i"
34 33
35KERNEL_IMAGETYPE = "uImage" 34KERNEL_IMAGETYPE = "uImage"
36 35
37BOOTFS_CONTENT = " "
38
39MACHINE_EXTRA_INSTALL += "\ 36MACHINE_EXTRA_INSTALL += "\
40 kernel-devicetree \ 37 kernel-devicetree \
41 " 38 "
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index 074a186..4c9f803 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -27,19 +27,16 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5" 30include conf/distro/include/fsl.inc
31
32IMAGE_FSTYPES += "ext3 sdcard"
33IMAGE_CLASSES += "image_types_fsl"
34 31
35UBOOT_SUFFIX = "img" 32UBOOT_SUFFIX = "img"
36BOOT_SCRIPTS = "${BOOTFS_CONTENT}" 33BOOT_SCRIPTS += "\
34 MLO-${MACHINE}:MLO \
35 u-boot-${MACHINE}.img:u-boot.img \
36 "
37
38EXTRA_IMAGEDEPENDS += "u-boot"
37 39
38PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" 40PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
39PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" 41PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
40PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" 42PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
41
42MACHINE_EXTRA_INSTALL += "\
43 ti-sgx-ddk-km \
44 ti-sgx-ddk-um \
45 "
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index f448fbe..d6b74e0 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -27,8 +27,12 @@
27## 27##
28############################################################################ 28############################################################################
29 29
30include conf/distro/include/fsl.inc
31
30PREFERRED_PROVIDER_u-boot = "u-boot-toradex" 32PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
31 33
34EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex"
35
32MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" 36MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}"
33BOOT_SCRIPTS += " \ 37BOOT_SCRIPTS += " \
34 fwd_blk.img:flash_blk.img \ 38 fwd_blk.img:flash_blk.img \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-22 06:50:41 +0000