From 835f73ec45e7b159969c49b08467a31b54b76491 Mon Sep 17 00:00:00 2001 From: Ari Parkkila Date: Tue, 13 Dec 2022 13:18:01 +0200 Subject: Use NXP BSP, u-boot and Linux for fsl machine family This reverts #04bbfa85cddd04005ddb77af0d84606bc7c7cf69 to use u-boot-imx and linux-imx on NXP boards. Fixes: QTBUG-109345 Change-Id: Iced2668082a06e5fabd2833ab46e67139faa1d7e Reviewed-by: Samuli Piippo (cherry picked from commit 615189940c4ff1859f17a53fca327eb6e542b0c9) --- meta-boot2qt-distro/conf/distro/include/fsl.inc | 34 +++---------- meta-boot2qt-distro/conf/distro/include/imx.inc | 55 ++++++++++++++++++++++ .../conf/distro/include/toradex.inc | 2 +- 3 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 meta-boot2qt-distro/conf/distro/include/imx.inc diff --git a/meta-boot2qt-distro/conf/distro/include/fsl.inc b/meta-boot2qt-distro/conf/distro/include/fsl.inc index b4980f45..ba460ddf 100644 --- a/meta-boot2qt-distro/conf/distro/include/fsl.inc +++ b/meta-boot2qt-distro/conf/distro/include/fsl.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,6 +27,8 @@ ## ############################################################################ +include conf/distro/include/imx.inc + DEPLOY_CONF_NAME:imx6qdlsabresd = "NXP i.MX6QP/Q/DL SABRE Smart Device" DEPLOY_CONF_NAME:imx7dsabresd = "NXP SABRE SD i.MX7 Dual" DEPLOY_CONF_NAME:imx8mm-ddr4-evk = "NXP i.MX 8M Mini DDR4 EVK" @@ -39,29 +41,7 @@ DEPLOY_CONF_NAME:imx8mq-evk = "NXP i.MX 8MQuad EVK" DEPLOY_CONF_NAME:imx8qm-mek = "NXP i.MX 8QuadMax MEK" DEPLOY_CONF_NAME:imx8qpx-mek = "NXP i.MX 8QuadXPlus MEK" -IMAGE_FSTYPES += "wic.xz" - -DEPLOY_CONF_IMAGE_TYPE = "wic.xz" - -QBSP_IMAGE_CONTENT += "\ - ${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE} \ - ${IMAGE_LINK_NAME}.conf \ - ${IMAGE_LINK_NAME}.info \ - " - -QBSP_LICENSE_FILE ?= "${FSL_EULA_FILE}" -QBSP_LICENSE_NAME ?= "NXP Semiconductors Software License Agreement" - -# Use gstreamer from meta-freescale -PREFERRED_VERSION_gstreamer1.0:use-nxp-bsp ?= "1.20.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-base:use-nxp-bsp ?= "1.20.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-good:use-nxp-bsp ?= "1.20.0.imx" -PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-nxp-bsp ?= "1.20.0.imx" -PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp ?= "1.20.0" -PREFERRED_VERSION_gstreamer1.0-rtsp-server:use-nxp-bsp ?= "1.20.0" - -MACHINE_GSTREAMER_1_0_PLUGIN:append:imxgpu = " imx-gst1.0-plugin" - -GPULESS_FEATURES = "wayland opengl vulkan webengine" -DISTRO_FEATURES:remove:mx6ul-generic-bsp = "${GPULESS_FEATURES}" -DISTRO_FEATURES:remove:mx7-generic-bsp = "${GPULESS_FEATURES}" +# Use NXP BSP and u-boot for default (meta-freescale-distro) +IMX_DEFAULT_BSP = "nxp" +IMX_DEFAULT_BOOTLOADER:imx-nxp-bsp = "u-boot-imx" +PREFERRED_PROVIDER_virtual/kernel:imx-nxp-bsp = "linux-imx" diff --git a/meta-boot2qt-distro/conf/distro/include/imx.inc b/meta-boot2qt-distro/conf/distro/include/imx.inc new file mode 100644 index 00000000..039da398 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/imx.inc @@ -0,0 +1,55 @@ +############################################################################ +## +## Copyright (C) 2021 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$ +## +############################################################################ + +IMAGE_FSTYPES += "wic.xz" + +DEPLOY_CONF_IMAGE_TYPE = "wic.xz" + +QBSP_IMAGE_CONTENT += "\ + ${IMAGE_LINK_NAME}.${DEPLOY_CONF_IMAGE_TYPE} \ + ${IMAGE_LINK_NAME}.conf \ + ${IMAGE_LINK_NAME}.info \ + " + +QBSP_LICENSE_FILE ?= "${FSL_EULA_FILE}" +QBSP_LICENSE_NAME ?= "NXP Semiconductors Software License Agreement" + +# Use gstreamer from meta-freescale +PREFERRED_VERSION_gstreamer1.0:use-nxp-bsp ?= "1.20.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-base:use-nxp-bsp ?= "1.20.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-good:use-nxp-bsp ?= "1.20.0.imx" +PREFERRED_VERSION_gstreamer1.0-plugins-bad:use-nxp-bsp ?= "1.20.0.imx" +PREFERRED_VERSION_gstreamer1.0-libav:use-nxp-bsp ?= "1.20.0" +PREFERRED_VERSION_gstreamer1.0-rtsp-server:use-nxp-bsp ?= "1.20.0" + +MACHINE_GSTREAMER_1_0_PLUGIN:append:imxgpu = " imx-gst1.0-plugin" + +GPULESS_FEATURES = "wayland opengl vulkan webengine" +DISTRO_FEATURES:remove:mx6ul-generic-bsp = "${GPULESS_FEATURES}" +DISTRO_FEATURES:remove:mx7-generic-bsp = "${GPULESS_FEATURES}" diff --git a/meta-boot2qt-distro/conf/distro/include/toradex.inc b/meta-boot2qt-distro/conf/distro/include/toradex.inc index 61f1e354..ed284025 100644 --- a/meta-boot2qt-distro/conf/distro/include/toradex.inc +++ b/meta-boot2qt-distro/conf/distro/include/toradex.inc @@ -27,7 +27,7 @@ ## ############################################################################ -include conf/distro/include/fsl.inc +include conf/distro/include/imx.inc # include file from meta-toradex-nxp include conf/machine/include/${MACHINE}.inc -- cgit v1.2.3