diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-09-11 10:21:20 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-09-13 08:37:29 +0300 |
commit | 71ce6d4eca531518fdabcde2478c5178f08abece (patch) | |
tree | 311a9b1681cd431ceeb100dd859f9c58ee372689 | |
parent | 0814bfcd81549c132ae9541bc4afecf965ec2489 (diff) |
Remove all renesas related files
Renesas support is moved to a separate boot2qt bsp layer in
yocto/meta-boot2qt-renesas.
Change-Id: I204c2484ce20071d00c28faac609b152d1f4423a
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
43 files changed, 0 insertions, 1663 deletions
diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 9fecb9d8..571627a8 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -178,12 +178,6 @@ get_groups() { jetson-tx1|jetson-tx2|jetson-tk1) PROJECT_GROUPS="jetson" ;; - salvator-x|h3ulcb|m3ulcb|ebisu) - PROJECT_GROUPS="renesas-gen3" - ;; - draak) - PROJECT_GROUPS="renesas-draak" - ;; esac fi diff --git a/meta-boot2qt-distro/conf/bblayers.conf.draak.sample b/meta-boot2qt-distro/conf/bblayers.conf.draak.sample deleted file mode 100644 index e6b76a51..00000000 --- a/meta-boot2qt-distro/conf/bblayers.conf.draak.sample +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -POKY_BBLAYERS_CONF_VERSION = "2" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" - -BBLAYERS ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-poky \ - ${BSPDIR}/sources/meta-renesas-D3/meta-rcar-gen3 \ - ${BSPDIR}/sources/meta-linaro/meta-optee \ - ${BSPDIR}/sources/meta-openembedded/meta-oe \ - ${BSPDIR}/sources/meta-openembedded/meta-python \ - ${BSPDIR}/sources/meta-openembedded/meta-networking \ - ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ - ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ - ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \ - ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \ - ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ - ${BSPDIR}/sources/meta-mingw \ - ${BSPDIR}/sources/meta-qt5 \ - " - diff --git a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample b/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample deleted file mode 100644 index c2abc8e0..00000000 --- a/meta-boot2qt-distro/conf/bblayers.conf.rcar-gen3.sample +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf -# changes incompatibly -POKY_BBLAYERS_CONF_VERSION = "2" - -BBPATH = "${TOPDIR}" -BBFILES ?= "" -BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE')) + '/../..')}" - -BBLAYERS ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-poky \ - ${BSPDIR}/sources/meta-renesas/meta-rcar-gen3 \ - ${BSPDIR}/sources/meta-linaro/meta-optee \ - ${BSPDIR}/sources/meta-openembedded/meta-oe \ - ${BSPDIR}/sources/meta-openembedded/meta-python \ - ${BSPDIR}/sources/meta-openembedded/meta-networking \ - ${BSPDIR}/sources/meta-openembedded/meta-initramfs \ - ${BSPDIR}/sources/meta-openembedded/meta-multimedia \ - ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt \ - ${BSPDIR}/sources/meta-boot2qt/meta-boot2qt-distro \ - ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ - ${BSPDIR}/sources/meta-mingw \ - ${BSPDIR}/sources/meta-qt5 \ - " - diff --git a/meta-boot2qt-distro/conf/distro/include/draak.conf b/meta-boot2qt-distro/conf/distro/include/draak.conf deleted file mode 100644 index 4d9db182..00000000 --- a/meta-boot2qt-distro/conf/distro/include/draak.conf +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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/rcar-gen3.inc - -DEPLOY_CONF_NAME = "Renesas R-Car-D3 (Draak)" - -PREFERRED_PROVIDER_virtual/egl = "gles-user-module" -PREFERRED_VERSION_libdrm = "2.4.94" - -KERNEL_DEVICETREE += "renesas/r8a77995-draak-lvds.dtb" - -WKS_FILE_DEPENDS_remove = "optee-os" -QBSP_IMAGE_CONTENT_remove = "tee-${MACHINE}.srec" - -BBMASK += "\ - meta-rcar-gen3/recipes-connectivity/ppp \ - meta-rcar-gen3/recipes-graphics/wayland/wayland_1.11.0.bb \ - meta-rcar-gen3/recipes-graphics/wayland/wayland-protocols \ - meta-rcar-gen3/recipes-multimedia/gstreamer \ - meta-rcar-gen3/recipes-multimedia/webp \ - meta-renesas/meta-rcar-gen3/recipes-graphics/drm \ - meta-renesas-extras/recipes-bsp/arm-trusted-firmware \ - " diff --git a/meta-boot2qt-distro/conf/distro/include/ebisu.conf b/meta-boot2qt-distro/conf/distro/include/ebisu.conf deleted file mode 100644 index 24bdedd8..00000000 --- a/meta-boot2qt-distro/conf/distro/include/ebisu.conf +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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/rcar-gen3.inc - -DEPLOY_CONF_NAME = "Renesas R-Car-E3 Ebisu 4D" diff --git a/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf deleted file mode 100644 index 2c73a11a..00000000 --- a/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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/rcar-gen3.inc - -DEPLOY_CONF_NAME = "Renesas R-Car-H3 Starter Kit Premier" - -UBOOT_MACHINE = "r8a7795_ulcb_defconfig" diff --git a/meta-boot2qt-distro/conf/distro/include/h3ulcb.pre.inc b/meta-boot2qt-distro/conf/distro/include/h3ulcb.pre.inc deleted file mode 100644 index ad1e9aaf..00000000 --- a/meta-boot2qt-distro/conf/distro/include/h3ulcb.pre.inc +++ /dev/null @@ -1 +0,0 @@ -SOC_FAMILY = "r8a7795" diff --git a/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf deleted file mode 100644 index d886adda..00000000 --- a/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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/rcar-gen3.inc - -DEPLOY_CONF_NAME = "Renesas R-Car-M3 Starter Kit Pro" - -UBOOT_MACHINE = "r8a7796_ulcb_defconfig" diff --git a/meta-boot2qt-distro/conf/distro/include/m3ulcb.pre.inc b/meta-boot2qt-distro/conf/distro/include/m3ulcb.pre.inc deleted file mode 100644 index c0429dbd..00000000 --- a/meta-boot2qt-distro/conf/distro/include/m3ulcb.pre.inc +++ /dev/null @@ -1 +0,0 @@ -SOC_FAMILY = "r8a7796" diff --git a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc deleted file mode 100644 index bcf2268b..00000000 --- a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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" -WKS_FILE = "sdimage-bootpart.wks" -WIC_CREATE_EXTRA_ARGS = "--no-fstab-update" -WKS_FILE_DEPENDS += "u-boot optee-os" - -IMAGE_BOOT_FILES = "\ - Image \ - r*.dtb \ - " - -QBSP_IMAGE_CONTENT = "\ - ${IMAGE_LINK_NAME}.img \ - ${IMAGE_LINK_NAME}.conf \ - bl2-${MACHINE}.srec \ - bl31-${MACHINE}.srec \ - tee-${MACHINE}.srec \ - bootparam_sa0.srec \ - cert_header_sa6.srec \ - u-boot-elf-${MACHINE}.srec \ - " - -BOOT_SPACE = "32768" - -# uncomment following if using the evaluation drivers -#DISTRO_FEATURES_append = " use_eva_pkg" - -MACHINE_FEATURES_append = " gsx multimedia" - -MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2 virtual/libgbm" - -#DISTRO_FEATURES_append = " pam" -PREFERRED_PROVIDER_virtual/libgles1 = "" -PREFERRED_PROVIDER_virtual/libgles2 = "gles-user-module" -PREFERRED_PROVIDER_virtual/egl = "libegl" -PREFERRED_PROVIDER_virtual/libgl = "" -PREFERRED_PROVIDER_virtual/mesa = "" -PREFERRED_PROVIDER_libgbm = "libgbm" -PREFERRED_PROVIDER_libgbm-dev = "libgbm" -PREFERRED_PROVIDER_virtual/libgbm = "libgbm" -BBMASK += "mesa-gl" - -# internal copy of R-Car_Series_Evaluation_Software_Packages used for CI -FILESEXTRAPATHS_append = "${BSPDIR}/sources/renesas-rcar-gen3/${PN}:" - -BBMASK += "\ - meta-linaro/meta-optee/recipes-security/optee \ - meta-rcar-gen3/recipes-core/packagegroups \ - meta-rcar-gen3/recipes-devtools/perl \ - meta-rcar-gen3/recipes-graphics/wayland/weston \ - meta-rcar-gen3/recipes-graphics/xorg-xserver \ - meta-rcar-gen3/recipes-multimedia/alsa \ - meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bbappend \ - meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bbappend \ - meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bbappend \ - " diff --git a/meta-boot2qt-distro/conf/distro/include/salvator-x.conf b/meta-boot2qt-distro/conf/distro/include/salvator-x.conf deleted file mode 100644 index 73a453ec..00000000 --- a/meta-boot2qt-distro/conf/distro/include/salvator-x.conf +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## 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/rcar-gen3.inc - -DEPLOY_CONF_NAME = "Renesas R-Car H3 M3 Salvator-X(S)" diff --git a/meta-boot2qt-distro/conf/distro/include/salvator-x.pre.inc b/meta-boot2qt-distro/conf/distro/include/salvator-x.pre.inc deleted file mode 100644 index e87933ce..00000000 --- a/meta-boot2qt-distro/conf/distro/include/salvator-x.pre.inc +++ /dev/null @@ -1 +0,0 @@ -SOC_FAMILY ?= "r8a7795" diff --git a/meta-renesas-extras/conf/layer.conf b/meta-renesas-extras/conf/layer.conf deleted file mode 100644 index 6379f674..00000000 --- a/meta-renesas-extras/conf/layer.conf +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -# We have a conf and classes directory, append to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have a recipes directory, add to BBFILES -BBFILES += "${LAYERDIR}/recipes*/*/*.bb \ - ${LAYERDIR}/recipes*/*/*.bbappend \ - " - -BBFILE_COLLECTIONS += "b2qt_renesas" -BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/" -BBFILE_PRIORITY_b2qt_renesas = "20" - -LAYERSERIES_COMPAT_b2qt_renesas = "thud" - -# override meta-renesas layer COMPAT -LAYERSERIES_COMPAT_rcar-gen3 = "thud" diff --git a/meta-renesas-extras/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend b/meta-renesas-extras/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend deleted file mode 100644 index 8a62d828..00000000 --- a/meta-renesas-extras/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" -SRCREV = "dcb310296c07bce69149fa9d74f1848cdfd01f5a" diff --git a/meta-renesas-extras/recipes-bsp/optee/optee-os_git.bbappend b/meta-renesas-extras/recipes-bsp/optee/optee-os_git.bbappend deleted file mode 100644 index 98990256..00000000 --- a/meta-renesas-extras/recipes-bsp/optee/optee-os_git.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -# disable -Werror=cast-function-type -EXTRA_OEMAKE += "NOWERROR=1" diff --git a/meta-renesas-extras/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-renesas-extras/recipes-bsp/u-boot/u-boot_%.bbappend deleted file mode 100644 index 8511d33b..00000000 --- a/meta-renesas-extras/recipes-bsp/u-boot/u-boot_%.bbappend +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend_draak := "${THISDIR}/${PN}:" - -DEPENDS += "bison-native" - -BRANCH = "v2018.09/rcar-3.9.1" -SRCREV = "4d322dccdcf49c0aab18eb703663128aec81cffc" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" - -LICENSE_draak = "GPLv2+" - -S_draak = "${WORKDIR}/git" - -do_deploy_prepend_draak() { - cp ${B}/${UBOOT_SREC} ${S}/${UBOOT_SREC} -} diff --git a/meta-renesas-extras/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch b/meta-renesas-extras/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch deleted file mode 100644 index 1d6174fc..00000000 --- a/meta-renesas-extras/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c8b5b91b8a794719280b313e7dd844c3c2142668 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Fri, 22 Feb 2019 15:10:24 +0200 -Subject: [PATCH] statx: don't redefine if structs are available from - sys/stat.h - ---- - src/basic/missing.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index dddc6de05c..d6ff612680 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -1405,7 +1405,7 @@ struct fib_rule_uid_range { - #define PF_KTHREAD 0x00200000 - #endif - --#if ! HAVE_STRUCT_STATX -+#if ! HAVE_STRUCT_STATX && !HAVE_STRUCT_STATX_IN_SYS_STAT_H - struct statx_timestamp { - int64_t tv_sec; - uint32_t tv_nsec; diff --git a/meta-renesas-extras/recipes-core/systemd/systemd_%.bbappend b/meta-renesas-extras/recipes-core/systemd/systemd_%.bbappend deleted file mode 100644 index 3967e5ff..00000000 --- a/meta-renesas-extras/recipes-core/systemd/systemd_%.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-statx-don-t-redefine-if-structs-are-available-from-s.patch \ - " diff --git a/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module.bbappend deleted file mode 100644 index 9806a3cc..00000000 --- a/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module.bbappend +++ /dev/null @@ -1,38 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append = " file://gl3ext.h" - -DEPENDS = "mesa" - -do_install_append() { - install -m 644 ${WORKDIR}/gl3ext.h ${D}/${includedir}/GLES3/ -} diff --git a/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module/gl3ext.h b/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module/gl3ext.h deleted file mode 100644 index 4d4ea96c..00000000 --- a/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module/gl3ext.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef __gl3ext_h_ -#define __gl3ext_h_ - -/* $Revision: 17809 $ on $Date:: 2012-05-14 08:03:36 -0700 #$ */ - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -/* OpenGL ES 3 Extensions - * - * After an OES extension's interactions with OpenGl ES 3.0 have been documented, - * its tokens and function definitions should be added to this file in a manner - * that does not conflict with gl2ext.h or gl3.h. - * - * Tokens and function definitions for extensions that have become standard - * features in OpenGL ES 3.0 will not be added to this file. - * - * Applications using OpenGL-ES-2-only extensions should include gl2ext.h - */ - -#endif /* __gl3ext_h_ */ - diff --git a/meta-renesas-extras/recipes-graphics/mesa/mesa_%.bbappend b/meta-renesas-extras/recipes-graphics/mesa/mesa_%.bbappend deleted file mode 100644 index ff73b22d..00000000 --- a/meta-renesas-extras/recipes-graphics/mesa/mesa_%.bbappend +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -# pick random header to make build work -INSTALLED_HEADER_draak = "src/egl/wayland/wayland-egl/wayland-egl-backend.h" - -do_install_append() { - # ... and remove it - rm ${D}${includedir}/wayland-egl-backend.h -} - -# previously in libwayland-egl -FILES_${PN}-dev_append_draak = " ${includedir}/EGL/eglmesaext.h" diff --git a/meta-renesas-extras/recipes-graphics/wayland/libgbm.bbappend b/meta-renesas-extras/recipes-graphics/wayland/libgbm.bbappend deleted file mode 100644 index 502c7cce..00000000 --- a/meta-renesas-extras/recipes-graphics/wayland/libgbm.bbappend +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -PROVIDES += "virtual/libgbm" - -DEPENDS_append_draak = " udev" - -SRCREV = "a0c7d6c97fe1fffe45eee524060cbb12767c6461" -SRCREV_draak = "bc04aefc9d5322f8b2dc1ecb15d0713bbab684b8" - -SRC_URI = "git://github.com/renesas-rcar/libgbm;branch=rcar-gen3" diff --git a/meta-renesas-extras/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend b/meta-renesas-extras/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend deleted file mode 100644 index 1330d5fb..00000000 --- a/meta-renesas-extras/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -DEPENDS_append_draak = " wayland-native" diff --git a/meta-renesas-extras/recipes-graphics/wayland/weston_%.bbappend b/meta-renesas-extras/recipes-graphics/wayland/weston_%.bbappend deleted file mode 100644 index 9385f7a6..00000000 --- a/meta-renesas-extras/recipes-graphics/wayland/weston_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -EXTRA_OECONF_append_draak = " WAYLAND_PROTOCOLS_SYSROOT_DIR=" diff --git a/meta-renesas-extras/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/meta-renesas-extras/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend deleted file mode 100644 index e6e89eb4..00000000 --- a/meta-renesas-extras/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -EXTRA_OEMAKE += "COMMON_FLAGS="-Wno-error=expansion-to-defined -Wno-error=cast-function-type -Wno-error=sizeof-pointer-div -Wno-error=stringop-truncation -Wno-error=packed-not-aligned"" diff --git a/meta-renesas-extras/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-renesas-extras/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend deleted file mode 100644 index 19fbff62..00000000 --- a/meta-renesas-extras/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -# upstream recipe includes kernel module to wrong package -FILES_${PN}_draak = "" diff --git a/meta-renesas-extras/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend b/meta-renesas-extras/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend deleted file mode 100644 index 19fbff62..00000000 --- a/meta-renesas-extras/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -# upstream recipe includes kernel module to wrong package -FILES_${PN}_draak = "" diff --git a/meta-renesas-extras/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend b/meta-renesas-extras/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend deleted file mode 100644 index e4021368..00000000 --- a/meta-renesas-extras/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -# override to remove asm/bpf_perf_event.h -do_install_armmultilib_draak () { - oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h - oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h -} diff --git a/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch b/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch deleted file mode 100644 index a3a3624c..00000000 --- a/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch +++ /dev/null @@ -1,327 +0,0 @@ -From 1115b5113bc31d048441cc138c6d2f45785bd53e Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Tue, 20 Nov 2018 15:43:47 +0200 -Subject: [PATCH] draak: change lvds timings to match KOE 1280x480 display - -Add new dtb for Draak that enables LVDS output and changes -the panel timings to match KOE tx31d200vm0baa display. ---- - arch/arm64/boot/dts/renesas/Makefile | 1 + - .../boot/dts/renesas/r8a77995-draak-lvds.dts | 296 ++++++++++++++++++ - 2 files changed, 297 insertions(+) - create mode 100644 arch/arm64/boot/dts/renesas/r8a77995-draak-lvds.dts - -diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile -index 3daccfdfc5ea..b24e31d6a1ce 100644 ---- a/arch/arm64/boot/dts/renesas/Makefile -+++ b/arch/arm64/boot/dts/renesas/Makefile -@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb - dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb - dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb - dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb -+dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak-lvds.dtb - - always := $(dtb-y) - clean-files := *.dtb -diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak-lvds.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak-lvds.dts -new file mode 100644 -index 000000000000..53df48a99c30 ---- /dev/null -+++ b/arch/arm64/boot/dts/renesas/r8a77995-draak-lvds.dts -@@ -0,0 +1,296 @@ -+/* -+ * Device Tree Source for the Draak board -+ * -+ * Copyright (C) 2017 Renesas Electronics Corp. -+ * -+ * This file is licensed under the terms of the GNU General Public License -+ * version 2. This program is licensed "as is" without any warranty of any -+ * kind, whether express or implied. -+ */ -+ -+/dts-v1/; -+#include "r8a77995.dtsi" -+#include <dt-bindings/gpio/gpio.h> -+ -+/ { -+ model = "Renesas Draak board based on r8a77995"; -+ compatible = "renesas,draak", "renesas,r8a77995"; -+ -+ aliases { -+ serial0 = &scif2; -+ ethernet0 = &avb; -+ }; -+ -+ chosen { -+ bootargs = "ignore_loglevel"; -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ memory@48000000 { -+ device_type = "memory"; -+ /* first 128MB is reserved for secure area. */ -+ reg = <0x0 0x48000000 0x0 0x18000000>; -+ }; -+ -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ -+ /* global autoconfigured region for contiguous allocations */ -+ linux,cma { -+ compatible = "shared-dma-pool"; -+ reusable; -+ reg = <0x00000000 0x58000000 0x0 0x8000000>; -+ linux,cma-default; -+ }; -+ }; -+ -+ reg_1p8v: regulator0 { -+ compatible = "regulator-fixed"; -+ regulator-name = "fixed-1.8V"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ reg_3p3v: regulator1 { -+ compatible = "regulator-fixed"; -+ regulator-name = "fixed-3.3V"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ lvds0 { -+ compatible = "panel-lvds"; -+ -+ width-mm = <210>; -+ height-mm = <158>; -+ -+ data-mapping = "jeida-24"; -+ -+ panel-timing { -+ /* 1280x480 @60Hz */ -+ clock-frequency = <43248000>; -+ hactive = <1280>; -+ vactive = <480>; -+ hback-porch = <40>; -+ hfront-porch = <30>; -+ vback-porch = <30>; -+ vfront-porch = <10>; -+ hsync-len = <10>; -+ vsync-len = <10>; -+ }; -+ port { -+ lvds0_in: endpoint { -+ remote-endpoint = <&du_out_lvds0>; -+ }; -+ }; -+ }; -+ -+ lvds1 { -+ compatible = "panel-lvds"; -+ -+ width-mm = <210>; -+ height-mm = <158>; -+ -+ data-mapping = "jeida-24"; -+ -+ panel-timing { -+ /* 1280x480 @60Hz */ -+ clock-frequency = <43248000>; -+ hactive = <1280>; -+ vactive = <480>; -+ hback-porch = <40>; -+ hfront-porch = <30>; -+ vback-porch = <30>; -+ vfront-porch = <10>; -+ hsync-len = <10>; -+ vsync-len = <10>; -+ }; -+ port { -+ lvds1_in: endpoint { -+ remote-endpoint = <&du_out_lvds1>; -+ }; -+ }; -+ }; -+}; -+ -+&pfc { -+ avb_pins: avb { -+ groups = "avb0_td", "avb0_tx_ctl", "avb0_txc", -+ "avb0_rd", "avb0_rx_ctl", "avb0_rxc", -+ "avb0_txcrefclk", "avb0_mdc", "avb0_mdio"; -+ function = "avb0"; -+ }; -+ -+ sdhi2_pins: sd2 { -+ groups = "mmc_data8", "mmc_ctrl"; -+ function = "mmc"; -+ power-source = <3300>; -+ }; -+ -+ sdhi2_pins_uhs: sd2_uhs { -+ groups = "mmc_data8", "mmc_ctrl"; -+ function = "mmc"; -+ power-source = <1800>; -+ }; -+ -+ usb0_pins: usb0 { -+ groups = "usb0"; -+ function = "usb0"; -+ }; -+ -+}; -+ -+&extal_clk { -+ clock-frequency = <48000000>; -+}; -+ -+&du_dotclkin0 { -+ clock-frequency = <74250000>; -+}; -+ -+&i2c0 { -+ status = "okay"; -+ -+ clock-frequency = <400000>; -+ -+ adv7180: adv7180@20 { -+ compatible = "adi,adv7180"; -+ reg = <0x20>; -+ remote = <&vin4>; -+ -+ port { -+ cvbs_in: endpoint { -+ bus-width = <8>; -+ remote-endpoint = <&vin4ep0>; -+ }; -+ }; -+ }; -+ -+ adv7612: adv7612@4c { -+ compatible = "adi,adv7612"; -+ reg = <0x4c>; -+ remote = <&vin4>; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ default-input = <0>; -+ -+ port@0 { -+ reg = <0>; -+ }; -+ port@1 { -+ reg = <1>; -+ hdmi_in: endpoint { -+ remote-endpoint = <&vin4ep0>; -+ }; -+ }; -+ }; -+}; -+ -+&avb { -+ pinctrl-0 = <&avb_pins>; -+ pinctrl-names = "default"; -+ renesas,no-ether-link; -+ phy-handle = <&phy0>; -+ status = "okay"; -+ phy-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>; -+ phy-reset-gpios = <&gpio5 18 GPIO_ACTIVE_LOW>; -+ -+ phy0: ethernet-phy@0 { -+ rxc-skew-ps = <1500>; -+ rxdv-skew-ps = <420>; /* default */ -+ rxd0-skew-ps = <420>; /* default */ -+ rxd1-skew-ps = <420>; /* default */ -+ rxd2-skew-ps = <420>; /* default */ -+ rxd3-skew-ps = <420>; /* default */ -+ txc-skew-ps = <900>; /* default */ -+ txen-skew-ps = <420>; /* default */ -+ txd0-skew-ps = <420>; /* default */ -+ txd1-skew-ps = <420>; /* default */ -+ txd2-skew-ps = <420>; /* default */ -+ txd3-skew-ps = <420>; /* default */ -+ reg = <0>; -+ interrupt-parent = <&gpio5>; -+ interrupts = <20 IRQ_TYPE_LEVEL_LOW>; -+ }; -+}; -+ -+&scif2 { -+ status = "okay"; -+}; -+ -+&vin4 { -+ status = "okay"; -+ port { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ vin4ep0: endpoint { -+ remote-endpoint = <&hdmi_in>; -+ bus-width = <8>; -+ }; -+ }; -+}; -+ -+&usb2_phy0 { -+ pinctrl-0 = <&usb0_pins>; -+ pinctrl-names = "default"; -+ -+ status = "okay"; -+}; -+ -+&ehci0 { -+ status = "okay"; -+}; -+ -+&ohci0 { -+ status = "okay"; -+}; -+ -+&sdhi2 { -+ /* used for on-board 8bit eMMC */ -+ pinctrl-0 = <&sdhi2_pins>; -+ pinctrl-1 = <&sdhi2_pins_uhs>; -+ pinctrl-names = "default", "state_uhs"; -+ -+ vmmc-supply = <®_3p3v>; -+ vqmmc-supply = <®_1p8v>; -+ mmc-hs200-1_8v; -+ bus-width = <8>; -+ non-removable; -+ status = "okay"; -+}; -+ -+&du { -+ status = "okay"; -+ -+ /* update <du_dotclkin0/1> */ -+ clocks = <&cpg CPG_MOD 724>, -+ <&cpg CPG_MOD 723>, -+ <&cpg CPG_MOD 727>, -+ <&cpg CPG_MOD 727>, -+ <&du_dotclkin0>; -+ -+ backlight0-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;/* LVDS0 */ -+ backlight1-gpios = <&gpio4 0 GPIO_ACTIVE_HIGH>; /* LVDS1 */ -+ -+ ports { -+ port@1 { -+ endpoint { -+ remote-endpoint = <&lvds0_in>; -+ }; -+ }; -+ port@2 { -+ endpoint { -+ remote-endpoint = <&lvds1_in>; -+ }; -+ }; -+ }; -+}; diff --git a/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch b/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch deleted file mode 100644 index f7e0c486..00000000 --- a/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 32e78d93f53889686bc1d90865fcc33ec5c9e80d Mon Sep 17 00:00:00 2001 -From: Linus Torvalds <torvalds@linux-foundation.org> -Date: Thu, 2 Mar 2017 12:17:22 -0800 -Subject: [PATCH] give up on gcc ilog2() constant optimizations - -gcc-7 has an "optimization" pass that completely screws up, and -generates the code expansion for the (impossible) case of calling -ilog2() with a zero constant, even when the code gcc compiles does not -actually have a zero constant. - -And we try to generate a compile-time error for anybody doing ilog2() on -a constant where that doesn't make sense (be it zero or negative). So -now gcc7 will fail the build due to our sanity checking, because it -created that constant-zero case that didn't actually exist in the source -code. - -There's a whole long discussion on the kernel mailing about how to work -around this gcc bug. The gcc people themselevs have discussed their -"feature" in - - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785 - -but it's all water under the bridge, because while it looked at one -point like it would be solved by the time gcc7 was released, that was -not to be. - -So now we have to deal with this compiler braindamage. - -And the only simple approach seems to be to just delete the code that -tries to warn about bad uses of ilog2(). - -So now "ilog2()" will just return 0 not just for the value 1, but for -any non-positive value too. - -It's not like I can recall anybody having ever actually tried to use -this function on any invalid value, but maybe the sanity check just -meant that such code never made it out in public. - -Reported-by: Laura Abbott <labbott@redhat.com> -Cc: John Stultz <john.stultz@linaro.org>, -Cc: Thomas Gleixner <tglx@linutronix.de> -Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- - include/linux/log2.h | 13 ++----------- - tools/include/linux/log2.h | 13 ++----------- - 2 files changed, 4 insertions(+), 22 deletions(-) - -diff --git a/include/linux/log2.h b/include/linux/log2.h -index fd7ff3d91e6a..f38fae23bdac 100644 ---- a/include/linux/log2.h -+++ b/include/linux/log2.h -@@ -15,12 +15,6 @@ - #include <linux/types.h> - #include <linux/bitops.h> - --/* -- * deal with unrepresentable constant logarithms -- */ --extern __attribute__((const, noreturn)) --int ____ilog2_NaN(void); -- - /* - * non-constant log of base 2 calculators - * - the arch may override these in asm/bitops.h if they can be implemented -@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - #define ilog2(n) \ - ( \ - __builtin_constant_p(n) ? ( \ -- (n) < 1 ? ____ilog2_NaN() : \ -+ (n) < 2 ? 0 : \ - (n) & (1ULL << 63) ? 63 : \ - (n) & (1ULL << 62) ? 62 : \ - (n) & (1ULL << 61) ? 61 : \ -@@ -148,10 +142,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - (n) & (1ULL << 4) ? 4 : \ - (n) & (1ULL << 3) ? 3 : \ - (n) & (1ULL << 2) ? 2 : \ -- (n) & (1ULL << 1) ? 1 : \ -- (n) & (1ULL << 0) ? 0 : \ -- ____ilog2_NaN() \ -- ) : \ -+ 1 ) : \ - (sizeof(n) <= 4) ? \ - __ilog2_u32(n) : \ - __ilog2_u64(n) \ -diff --git a/tools/include/linux/log2.h b/tools/include/linux/log2.h -index 41446668ccce..d5677d39c1e4 100644 ---- a/tools/include/linux/log2.h -+++ b/tools/include/linux/log2.h -@@ -12,12 +12,6 @@ - #ifndef _TOOLS_LINUX_LOG2_H - #define _TOOLS_LINUX_LOG2_H - --/* -- * deal with unrepresentable constant logarithms -- */ --extern __attribute__((const, noreturn)) --int ____ilog2_NaN(void); -- - /* - * non-constant log of base 2 calculators - * - the arch may override these in asm/bitops.h if they can be implemented -@@ -78,7 +72,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - #define ilog2(n) \ - ( \ - __builtin_constant_p(n) ? ( \ -- (n) < 1 ? ____ilog2_NaN() : \ -+ (n) < 2 ? 0 : \ - (n) & (1ULL << 63) ? 63 : \ - (n) & (1ULL << 62) ? 62 : \ - (n) & (1ULL << 61) ? 61 : \ -@@ -141,10 +135,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - (n) & (1ULL << 4) ? 4 : \ - (n) & (1ULL << 3) ? 3 : \ - (n) & (1ULL << 2) ? 2 : \ -- (n) & (1ULL << 1) ? 1 : \ -- (n) & (1ULL << 0) ? 0 : \ -- ____ilog2_NaN() \ -- ) : \ -+ 1 ) : \ - (sizeof(n) <= 4) ? \ - __ilog2_u32(n) : \ - __ilog2_u64(n) \ diff --git a/meta-renesas-extras/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-renesas-extras/recipes-kernel/linux/linux-renesas_%.bbappend deleted file mode 100644 index edabc4b8..00000000 --- a/meta-renesas-extras/recipes-kernel/linux/linux-renesas_%.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend_draak := "${THISDIR}/${PN}:" - -SRC_URI_append_draak = " \ - file://0001-give-up-on-gcc-ilog2-constant-optimizations.patch \ - file://0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch \ - " diff --git a/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend deleted file mode 100644 index 9658abf2..00000000 --- a/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -DEPENDS_append_draak = " wayland-kms libgbm" diff --git a/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend deleted file mode 100644 index ef8dcdfd..00000000 --- a/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -DEPENDS_append_draak = " wayland-kms libgbm" diff --git a/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend deleted file mode 100644 index 55b6cc83..00000000 --- a/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs.bbappend +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://kms.conf" - -do_configure_append() { - echo "QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf" >> ${WORKDIR}/defaults - echo "QSG_RENDER_LOOP=basic" >> ${WORKDIR}/defaults -} - -do_install_append() { - install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ -} diff --git a/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/draak/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/draak/kms.conf deleted file mode 100644 index 4cbbf498..00000000 --- a/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/draak/kms.conf +++ /dev/null @@ -1,9 +0,0 @@ -{ - "device": "/dev/dri/card0", - "outputs": [ - { - "name": "VGA1", - "mode": "off" - } - ] -} diff --git a/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/ebisu/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/ebisu/kms.conf deleted file mode 100644 index 4cbbf498..00000000 --- a/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/ebisu/kms.conf +++ /dev/null @@ -1,9 +0,0 @@ -{ - "device": "/dev/dri/card0", - "outputs": [ - { - "name": "VGA1", - "mode": "off" - } - ] -} diff --git a/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf b/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf deleted file mode 100644 index db7a5032..00000000 --- a/meta-renesas-extras/recipes-qt/boot2qt-addons/default-qt-envs/kms.conf +++ /dev/null @@ -1,4 +0,0 @@ -{ - "device": "/dev/dri/card0", - "hwcursor": false -} diff --git a/meta-renesas-extras/recipes-qt/qt5/qtbase/oe-device-extra.pri b/meta-renesas-extras/recipes-qt/qt5/qtbase/oe-device-extra.pri deleted file mode 100644 index c6f88adc..00000000 --- a/meta-renesas-extras/recipes-qt/qt5/qtbase/oe-device-extra.pri +++ /dev/null @@ -1,4 +0,0 @@ -QMAKE_PLATFORM += boot2qt - -QT_QPA_DEFAULT_PLATFORM = eglfs -EGLFS_DEVICE_INTEGRATION = eglfs_kms diff --git a/meta-renesas-extras/recipes-qt/qt5/qtbase_git.bbappend b/meta-renesas-extras/recipes-qt/qt5/qtbase_git.bbappend deleted file mode 100644 index ecba1f14..00000000 --- a/meta-renesas-extras/recipes-qt/qt5/qtbase_git.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PACKAGECONFIG += "gbm kms" diff --git a/meta-renesas-extras/recipes-qt/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch b/meta-renesas-extras/recipes-qt/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch deleted file mode 100644 index 1c0196c7..00000000 --- a/meta-renesas-extras/recipes-qt/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bad20e3aebf7dc18621ee711defdfbce17f27c79 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Tue, 16 Oct 2018 13:43:43 +0300 -Subject: [PATCH] Workaround missing eglGetProcAddress - -Renesas boards are unable to find address for the eglGetProcAddress -symbol at runtime, instead do it already at link time. - -Task-number: QTBUG-71152 -Change-Id: Ibc4251c0ab7e878a65d8c6e7b4da3952807cbc91 ---- - src/core/core_module.pro | 2 ++ - src/core/ozone/gl_ozone_egl_qt.cpp | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index 2bfbc65b9..c6b48fe35 100644 ---- a/src/core/core_module.pro -+++ b/src/core/core_module.pro -@@ -85,6 +85,8 @@ win32 { - # and doesn't let Chromium get access to libc symbols through dlsym. - CONFIG -= bsymbolic_functions - -+qtConfig(egl): CONFIG += egl -+ - linux:qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)" - - REPACK_DIR = $$OUT_PWD/$$getConfigDir() -diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp -index 2fa86d79b..d23624776 100644 ---- a/src/core/ozone/gl_ozone_egl_qt.cpp -+++ b/src/core/ozone/gl_ozone_egl_qt.cpp -@@ -98,6 +98,9 @@ bool GLOzoneEGLQt::LoadGLES2Bindings(gl::GLImplementation /*implementation*/) - } - #endif - -+ if (!get_proc_address) -+ get_proc_address = &eglGetProcAddress; -+ - if (!get_proc_address) { - LOG(ERROR) << "eglGetProcAddress not found."; - base::UnloadNativeLibrary(eglgles2Library); diff --git a/meta-renesas-extras/recipes-qt/qt5/qtwebengine_git.bbappend b/meta-renesas-extras/recipes-qt/qt5/qtwebengine_git.bbappend deleted file mode 100644 index cc13b746..00000000 --- a/meta-renesas-extras/recipes-qt/qt5/qtwebengine_git.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 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$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-Workaround-missing-eglGetProcAddress.patch" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 8949ba22..202e6666 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -10,8 +10,6 @@ <remote fetch="git://github.com/openembedded" name="oe-mirror"/> <remote fetch="git://github.com/madisongh" name="madisongh"/> <remote fetch="ssh://git@git.qt.io/boot2qt" name="playground"/> - <remote fetch="git://github.com/renesas-rcar" name="renesas"/> - <remote fetch="git://git.linaro.org/openembedded" name="linaro"/> <remote fetch="git://git.toradex.com" name="toradex"/> <remote fetch="git://github.com/boundarydevices" name="boundary"/> <remote fetch="git://github.com/toradex" name="toradex-github"/> @@ -59,21 +57,6 @@ revision="40d61e3c7aa4cfe993685bb4011e16617edc24fa" path="sources/meta-tegra" groups="notdefault,jetson"/> - <project name="meta-renesas" - remote="renesas" - revision="276e6ae724d7e604e0d28e4670b8c9edea2957e3" - path="sources/meta-renesas" - groups="notdefault,renesas-gen3"/> - <project name="meta-renesas" - remote="renesas" - revision="0f865eb8b464ca717b1651e10c4ddc0c4f798423" - path="sources/meta-renesas-D3" - groups="notdefault,renesas-draak"/> - <project name="meta-linaro" - remote="linaro" - revision="edb7ffc2a121df7596385595abe75180296103e0" - path="sources/meta-linaro" - groups="notdefault,renesas-gen3,renesas-draak"/> <project name="meta-toradex-bsp-common" remote="toradex" revision="3fa96f28bb30643cac3b8a49d3abd7c976acb704" @@ -110,11 +93,6 @@ revision="a3dc22511ed845b7fe85a7b26c64b1c37a4763c4" path="sources/drive-t186" groups="notdefault,internal"/> - <project name="renesas-rcar-gen3" - remote="playground" - revision="53a345942e4207b2fa1b19d932b5b72bd5c4761c" - path="sources/renesas-rcar-gen3" - groups="notdefault,internal"/> <project name="meta-smx6" remote="playground" revision="ba2b99a9a5895033f081ffce25b0fd45e847c4c2" diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh index 07cd1492..7eb30db1 100755 --- a/scripts/setup-environment.sh +++ b/scripts/setup-environment.sh @@ -90,12 +90,6 @@ if [ ! -e ${PWD}/${BUILDDIRECTORY} ]; then tegra-x1|tegra-t18x) LAYERSCONF="bblayers.conf.nvidia-tegra.sample" ;; - salvator-x|h3ulcb|m3ulcb|ebisu) - LAYERSCONF="bblayers.conf.rcar-gen3.sample" - ;; - draak) - LAYERSCONF="bblayers.conf.draak.sample" - ;; jetson-tx1|jetson-tx2|jetson-tk1) LAYERSCONF="bblayers.conf.jetson.sample" ;; |