From 8afceb4e6a6c40f471f903cdf7f12e136e9ff971 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 21 Nov 2016 12:28:18 +0200 Subject: Add support for i.MX7S WaRP Change-Id: Ib2c82ccf8d7648bb303e0fc949e3c1aef5b09195 Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- b2qt-init-build-env | 2 +- conf/distro/include/imx7s-warp.conf | 37 ++++++++++++++++++++++ .../recipes/linux/linux-warp7_4.1.bbappend | 34 ++++++++++++++++++++ scripts/setup-environment.sh | 2 +- 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 conf/distro/include/imx7s-warp.conf create mode 100644 meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend diff --git a/b2qt-init-build-env b/b2qt-init-build-env index e90188a..d72d28c 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -109,7 +109,7 @@ get_groups() { apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) PROJECT_GROUPS="fsl" ;; - imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd) + imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp) PROJECT_GROUPS="fsl" ;; smarc-samx6i) diff --git a/conf/distro/include/imx7s-warp.conf b/conf/distro/include/imx7s-warp.conf new file mode 100644 index 0000000..fdd7f17 --- /dev/null +++ b/conf/distro/include/imx7s-warp.conf @@ -0,0 +1,37 @@ +############################################################################ +## +## Copyright (C) 2017 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$ +## +############################################################################ + +include conf/distro/include/fsl.inc + +DEPLOY_CONF_NAME = "i.MX7S WaRP" + +PREFERRED_PROVIDER_virtual/egl = "opengldummy" +PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" + +DISTRO_FEATURES_remove = "webengine wayland" diff --git a/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend new file mode 100644 index 0000000..82604d4 --- /dev/null +++ b/meta-fsl-extras/recipes/linux/linux-warp7_4.1.bbappend @@ -0,0 +1,34 @@ +############################################################################ +## +## Copyright (C) 2017 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$ +## +############################################################################ + +do_configure_prepend() { + echo "CONFIG_NAMESPACES=y" >> ${WORKDIR}/defconfig + echo "CONFIG_FHANDLE=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig +} diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index a556e4f..f29832d 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -59,7 +59,7 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then apalis-imx6|colibri-imx6|colibri-vf|colibri-imx7) LAYERSCONF="bblayers.conf.fsl.sample" ;; - imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd) + imx6qsabresd|imx6dlsabresd|nitrogen6x|imx7dsabresd|imx7s-warp) LAYERSCONF="bblayers.conf.fsl.sample" ;; smarc-samx6i) -- cgit v1.2.3-54-g00ecf