From 57f2d6e8c7a518b50981674849014c1640022563 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 1 Nov 2016 10:13:58 +0200 Subject: images: do not explicitly define Qt dependency packages Remove all Qt dependency packages from machine include files and base packagegroups, instead let packagemanager pull in all the needed dependent packages. Do not create tar image or bootfs, since they are not used anymore. The old base image is now renamed for CI usage and contains all the Qt dependent packages but without any Qt modules. This is achieved by first installing all the Qt modules (which pulls in all the dependencies) and then removing only Qt modules. Change-Id: I36d996d4531af42e955f19a487c22d0b90c5ada9 Reviewed-by: Risto Avila --- conf/distro/b2qt.conf | 4 +--- conf/distro/include/am335x-evm.conf | 10 --------- conf/distro/include/apalis-imx6.conf | 11 +-------- conf/distro/include/beagleboard.conf | 17 +------------- conf/distro/include/beaglebone.conf | 10 --------- conf/distro/include/colibri-imx6.conf | 10 +-------- conf/distro/include/colibri-imx7.conf | 10 ++------- conf/distro/include/colibri-vf.conf | 12 ++-------- conf/distro/include/emulator.conf | 2 -- conf/distro/include/fsl.inc | 33 +++++++++++++++++++++++++++ conf/distro/include/imx6-egl.inc | 33 --------------------------- conf/distro/include/imx6.inc | 38 -------------------------------- conf/distro/include/imx6qsabresd.conf | 15 +------------ conf/distro/include/imx7dsabresd.conf | 24 ++------------------ conf/distro/include/intel-corei7-64.conf | 4 +--- conf/distro/include/nitrogen6x.conf | 17 ++------------ conf/distro/include/nvidia-logan.conf | 8 ------- conf/distro/include/raspberrypi.inc | 8 ------- conf/distro/include/smarc-samx6i.conf | 5 +---- conf/distro/include/ti.inc | 17 ++++++-------- conf/distro/include/toradex.inc | 4 ++++ 21 files changed, 59 insertions(+), 233 deletions(-) create mode 100644 conf/distro/include/fsl.inc delete mode 100644 conf/distro/include/imx6-egl.inc delete mode 100644 conf/distro/include/imx6.inc (limited to 'conf') 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" PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo" PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native" -MACHINE_EXTRA_INSTALL ?= "" - # Override mkspec for mingw build OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe" OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe" @@ -79,7 +77,7 @@ QT_MODULE_BRANCH_PARAM = "nobranch=1" PACKAGE_EXCLUDE_COMPLEMENTARY ?= "qtquickcompiler" -IMAGE_FSTYPES = "tar.gz conf" +IMAGE_FSTYPES = "conf" IMAGE_CLASSES += "image_types_sdcard deploy-conf" LICENSE_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 DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit" -BOOTFS_CONTENT = "\ - u-boot-${MACHINE}.img:u-boot.img \ - MLO-${MACHINE}:MLO \ - " -BOOTFS_DEPENDS = "u-boot:do_deploy" - DISTRO_FEATURES_remove = "webengine" - -MACHINE_EXTRA_INSTALL += "\ - lighttpd \ - " 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 @@ ## ############################################################################ -include conf/distro/include/imx6.inc -include conf/distro/include/imx6-egl.inc +include conf/distro/include/toradex.inc DEPLOY_CONF_NAME = "Toradex Apalis iMX6" @@ -39,14 +38,6 @@ UBOOT_CONFIG ??= "com it" UBOOT_CONFIG[com] = "apalis_imx6_defconfig" UBOOT_CONFIG[it] = "apalis_imx6_it_defconfig" -BOOTFS_CONTENT = "\ - ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-imx6q-apalis-eval.dtb:imx6q-apalis-eval.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-apalis-ixora.dtb:imx6q-apalis-ixora.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-eval.dtb:imx6q-apalis_v1_0-eval.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-apalis_v1_0-ixora.dtb:imx6q-apalis_v1_0-ixora.dtb \ - " -BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" BOOT_SCRIPTS += " \ u-boot-${MACHINE}.imx-it:${MACHINEDIR}/u-boot.imx-it \ " 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 DEPLOY_CONF_NAME = "BeagleBoard" -BOOTFS_CONTENT = "\ - u-boot-${MACHINE}.img:u-boot.img \ - MLO-${MACHINE}:MLO \ - " -BOOTFS_DEPENDS = "u-boot:do_deploy" - -PREFERRED_PROVIDER_virtual/egl = "libgles-omap3" -PREFERRED_PROVIDER_virtual/libgles2 = "libgles-omap3" - -PREFERRED_VERSION_libgles-omap3 = "4.09.00.01" -PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01" - -MACHINE_EXTRA_INSTALL += "\ - libgles-omap3 \ - libgles-omap3-rawdemos \ - " +DISTRO_FEATURES_remove = "webengine opengl" ADB_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 DEPLOY_CONF_NAME = "BeagleBone Black" -BOOTFS_CONTENT = "\ - u-boot-${MACHINE}.img:u-boot.img \ - MLO-${MACHINE}:MLO \ - " -BOOTFS_DEPENDS = "u-boot:do_deploy" - DISTRO_FEATURES_remove = "webengine" -MACHINE_EXTRA_INSTALL += "\ - bb-org-overlays \ - " - ADB_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 @@ ## ############################################################################ -include conf/distro/include/imx6.inc -include conf/distro/include/imx6-egl.inc +include conf/distro/include/toradex.inc DEPLOY_CONF_NAME = "Toradex Colibri iMX6" KERNEL_IMAGETYPE = "uImage" - -BOOTFS_CONTENT = "\ - ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-imx6dl-colibri-eval-v3.dtb:imx6dl-colibri-eval-v3.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-colibri-cam-eval-v3.dtb:imx6dl-colibri-cam-eval-v3.dtb \ - " -BOOTFS_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 @@ ## ############################################################################# -DEPLOY_CONF_NAME = "Toradex Colibri iMX7" +include conf/distro/include/toradex.inc -IMAGE_FSTYPES += "ext3 sdcard" +DEPLOY_CONF_NAME = "Toradex Colibri iMX7" -BOOTFS_CONTENT = "\ - ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-imx7d-colibri-eval-v3.dtb:imx7d-colibri-eval-v3.dtb \ - ${KERNEL_IMAGETYPE}-imx7s-colibri-eval-v3.dtb:imx7s-colibri-eval-v3.dtb \ - " -BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" BOOT_SCRIPTS += " \ u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ " 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 @@ ## ############################################################################ +include conf/distro/include/toradex.inc + DEPLOY_CONF_NAME = "Toradex Colibri VF" -IMAGE_FSTYPES += "ext3 sdcard" IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024" -BOOTFS_CONTENT = "\ - ${KERNEL_IMAGETYPE}-vf500-colibri-eval-v3.dtb:vf500-colibri-eval-v3.dtb \ - ${KERNEL_IMAGETYPE}-vf610-colibri-eval-v3.dtb:vf610-colibri-eval-v3.dtb \ - " -BOOTFS_DEPENDS = "u-boot:do_deploy u-boot-script-toradex:do_deploy virtual/kernel:do_deploy" BOOT_SCRIPTS += " \ u-boot-nand.imx:${MACHINEDIR}/u-boot-nand.imx \ " @@ -48,7 +44,3 @@ PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" PREFERRED_VERSION_linux-toradex = "4.1" DISTRO_FEATURES_remove = "webengine" - -MACHINE_EXTRA_INSTALL += "\ - opengldummy \ - " 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" MACHINE_EXTRA_INSTALL += "\ mount-vboxsf \ - " -MACHINE_EXTRA_INSTALL_QT = "\ qtsystems \ qtglesstream \ b2qt-emulator-proxy \ diff --git a/conf/distro/include/fsl.inc b/conf/distro/include/fsl.inc new file mode 100644 index 0000000..d0e2c7a --- /dev/null +++ b/conf/distro/include/fsl.inc @@ -0,0 +1,33 @@ +############################################################################ +## +## 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$ +## +############################################################################ + +BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5" + +IMAGE_FSTYPES += "ext3 sdcard" +IMAGE_CLASSES += "image_types_fsl" diff --git a/conf/distro/include/imx6-egl.inc b/conf/distro/include/imx6-egl.inc deleted file mode 100644 index efe3c18..0000000 --- a/conf/distro/include/imx6-egl.inc +++ /dev/null @@ -1,33 +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$ -## -############################################################################ - -MACHINE_EXTRA_INSTALL += "\ - libegl-mx6 \ - libgles2-mx6 \ - " 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 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5" - -IMAGE_FSTYPES += "ext3 sdcard" - -MACHINE_EXTRA_INSTALL += "\ - libgal-mx6 \ - ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \ - " 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 @@ ## ############################################################################ -include conf/distro/include/imx6.inc -include conf/distro/include/imx6-egl.inc +include conf/distro/include/fsl.inc include conf/distro/include/imx6-opencv.inc DEPLOY_CONF_NAME = "Freescale SABRE SD i.MX6Quad" -BOOTFS_CONTENT = "\ - ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-sabresd-hdcp.dtb:imx6q-sabresd-hdcp.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-sabresd.dtb:imx6dl-sabresd.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-sabresd-hdcp.dtb:imx6dl-sabresd-hdcp.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-sabresd-ldo.dtb:imx6dl-sabresd-ldo.dtb \ - u-boot-${MACHINE}.imx:u-boot.imx \ - " -BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" - DISTRO_FEATURES_DEFAULT += "wayland" KERNEL_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 @@ ## ############################################################################ -DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual" - -IMAGE_FSTYPES += "ext3 sdcard" - -BOOTFS_CONTENT = "\ - ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-imx7d-sdb.dtb:imx7d-sdb.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-enet.dtb:imx7d-sdb-enet.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-epdc.dtb:imx7d-sdb-epdc.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-gpmi-weim.dtb:imx7d-sdb-gpmi-weim.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-hdmi-audio.dtb:imx7d-sdb-hdmi-audio.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-m4.dtb:imx7d-sdb-m4.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-qspi.dtb:imx7d-sdb-qspi.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-sim.dtb:imx7d-sdb-sim.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-touch.dtb:imx7d-sdb-touch.dtb \ - ${KERNEL_IMAGETYPE}-imx7d-sdb-wm8960.dtb:imx7d-sdb-wm8960.dtb \ - u-boot-${MACHINE}.imx:u-boot.imx \ - " +include conf/distro/include/fsl.inc -BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" +DEPLOY_CONF_NAME = "NXP SABRE SD i.MX7 Dual" DISTRO_FEATURES_remove = "webengine" - -MACHINE_EXTRA_INSTALL += "\ - " 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 @@ DEPLOY_CONF_NAME = "Intel NUC" -DISTRO_FEATURES_DEFAULT += "wayland weston" +DISTRO_FEATURES_DEFAULT += "wayland" DISTRO_FEATURES_remove = "usbgadget" @@ -41,7 +41,5 @@ INITRAMFS_IMAGE = "initramfs-basic" SYSVINIT_ENABLED_GETTYS = "1" MACHINE_EXTRA_INSTALL += "\ - wayland \ - mesa-megadriver \ grub-efi-config \ " 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 @@ ## ############################################################################ -include conf/distro/include/imx6.inc -include conf/distro/include/imx6-egl.inc +include conf/distro/include/fsl.inc include conf/distro/include/imx6-opencv.inc DEPLOY_CONF_NAME = "Boundary Devices i.MX6" -BOOTFS_CONTENT = "\ - ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ - ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \ - ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \ - ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ - 6x_bootscript-${MACHINE}:6x_bootscript \ - 6x_upgrade-${MACHINE}:6x_upgrade \ - u-boot-${MACHINE}.imx:u-boot.imx \ - " -BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-boundary:do_deploy" BOOT_SPACE = "16384" BOOT_SCRIPTS += "6x_upgrade-${MACHINE}:6x_upgrade \ u-boot-nit6xlite-*.imx:u-boot.nit6xlite \ @@ -89,7 +76,7 @@ UBOOT_CONFIG[nitrogen6_max] = "nitrogen6_max_config" UBOOT_CONFIG[nitrogen6_vm1g] = "nitrogen6_vm1g_config" UBOOT_CONFIG[nitrogen6_vm] = "nitrogen6_vm_config" -EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" +EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-boundary" KERNEL_DEVICETREE += "\ 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 PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}' NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer" -MACHINE_EXTRA_INSTALL = "\ - libegl \ - libgles2 \ - tegra-firmware-gk20a \ - graphics-fw \ - libdrm-nv \ -" - PREFERRED_PROVIDER_libdrm ?= "libdrm-nv" PREFERRED_PROVIDER_drm ?= "libdrm-nv" 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 @@ IMAGE_FSTYPES += "ext3 rpi-sdimg" -BOOTFS_CONTENT = "\ - bcm2835-bootfiles/*: \ - ${KERNEL_IMAGETYPE}:kernel.img \ - " - -BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" - MACHINE_EXTRA_INSTALL += "\ - userland \ omxplayer \ " 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 @@ ## ############################################################################ -include conf/distro/include/imx6.inc -include conf/distro/include/imx6-egl.inc +include conf/distro/include/fsl.inc DEPLOY_CONF_NAME = "Kontron SMARC-sAMX6i" KERNEL_IMAGETYPE = "uImage" -BOOTFS_CONTENT = " " - MACHINE_EXTRA_INSTALL += "\ kernel-devicetree \ " 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 @@ ## ############################################################################ -BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5" - -IMAGE_FSTYPES += "ext3 sdcard" -IMAGE_CLASSES += "image_types_fsl" +include conf/distro/include/fsl.inc UBOOT_SUFFIX = "img" -BOOT_SCRIPTS = "${BOOTFS_CONTENT}" +BOOT_SCRIPTS += "\ + MLO-${MACHINE}:MLO \ + u-boot-${MACHINE}.img:u-boot.img \ + " + +EXTRA_IMAGEDEPENDS += "u-boot" PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um" PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um" - -MACHINE_EXTRA_INSTALL += "\ - ti-sgx-ddk-km \ - ti-sgx-ddk-um \ - " 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 @@ ## ############################################################################ +include conf/distro/include/fsl.inc + PREFERRED_PROVIDER_u-boot = "u-boot-toradex" +EXTRA_IMAGEDEPENDS += "u-boot u-boot-script-toradex" + MACHINEDIR = "${@d.getVar('MACHINE', True).replace('-','_')}" BOOT_SCRIPTS += " \ fwd_blk.img:flash_blk.img \ -- cgit v1.2.3-54-g00ecf