From fd8554678b746c25718f36bfc829d620701c63c5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 21 Feb 2019 13:42:25 +0200 Subject: renesas: adaptation to thud Renesas does not provide thud compatible meta layer, some adaptation is required to get builds working. U-boot is updated to more recent version. Renesas specific gstreamer plugins are not used since they fail to compile. Change-Id: Ie87c2824941b9880a529ce1316f65932cdf754b6 Reviewed-by: Mikko Gronoff --- meta-boot2qt-distro/conf/distro/include/draak.conf | 5 +- .../conf/distro/include/h3ulcb.conf | 4 +- .../conf/distro/include/m3ulcb.conf | 4 +- .../conf/distro/include/rcar-gen3.inc | 9 +- meta-renesas-extras/conf/layer.conf | 7 +- .../arm-trusted-firmware_git.bbappend | 31 + .../recipes-bsp/optee/optee-os_git.bbappend | 31 + .../recipes-bsp/u-boot/u-boot_%.bbappend | 44 ++ ...-redefine-if-structs-are-available-from-s.patch | 23 + .../recipes-core/systemd/systemd_%.bbappend | 33 + .../gles-module/gles-user-module.bbappend | 38 + .../gles-module/gles-user-module/gl3ext.h | 24 + .../recipes-graphics/mesa/mesa_%.bbappend | 39 + .../recipes-graphics/wayland/libgbm.bbappend | 37 + .../wayland/wayland-kms_1.6.0.bbappend | 30 + .../recipes-graphics/wayland/weston_%.bbappend | 30 + .../kernel-module-gles/kernel-module-gles.bbappend | 30 + .../kernel-module-vsp2driver.bbappend | 31 + .../kernel-module-vspm/kernel-module-vspm.bbappend | 31 + .../linux-libc-headers_%.bbappend | 36 + ...e-lvds-timings-to-match-KOE-1280x480-disp.patch | 327 +++++++++ ...ve-up-on-gcc-ilog2-constant-optimizations.patch | 124 ++++ .../recipes-kernel/linux/linux-renesas_%.bbappend | 35 + .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 30 + .../gstreamer/gstreamer1.0-plugins-base_%.bbappend | 30 + .../qt5/boot2qt-appcontroller/appcontroller.conf | 9 + .../qt5/boot2qt-appcontroller/draak/kms.conf | 9 + .../qt5/boot2qt-appcontroller/ebisu/kms.conf | 9 + .../recipes-qt/qt5/boot2qt-appcontroller/kms.conf | 4 + .../qt5/boot2qt-appcontroller_git.bbappend | 38 + .../recipes-qt/qt5/qtbase/oe-device-extra.pri | 4 + .../recipes-qt/qt5/qtbase_git.bbappend | 32 + ...0001-Workaround-missing-eglGetProcAddress.patch | 28 + .../recipes-qt/qt5/qtwebengine_git.bbappend | 32 + .../arm-trusted-firmware_git.bbappend | 31 - .../recipes/gles-module/gles-user-module.bbappend | 38 - .../recipes/gles-module/gles-user-module/gl3ext.h | 24 - .../gstreamer/gstreamer1.0-plugins-bad_%.bbappend | 30 - .../kernel-module-gles/kernel-module-gles.bbappend | 30 - .../kernel-module-vsp2driver.bbappend | 31 - .../kernel-module-vspm/kernel-module-vspm.bbappend | 31 - .../linux-libc-headers_%.bbappend | 34 - ...e-lvds-timings-to-match-KOE-1280x480-disp.patch | 327 --------- ...ve-up-on-gcc-ilog2-constant-optimizations.patch | 124 ---- .../recipes/linux/linux-renesas_%.bbappend | 35 - meta-renesas-extras/recipes/mesa/mesa_%.bbappend | 31 - .../qt5/boot2qt-appcontroller/appcontroller.conf | 9 - .../qt5/boot2qt-appcontroller/draak/kms.conf | 9 - .../qt5/boot2qt-appcontroller/ebisu/kms.conf | 9 - .../recipes/qt5/boot2qt-appcontroller/kms.conf | 4 - .../recipes/qt5/boot2qt-appcontroller_git.bbappend | 38 - .../recipes/qt5/qtbase/oe-device-extra.pri | 4 - .../recipes/qt5/qtbase_git.bbappend | 32 - ...0001-Workaround-missing-eglGetProcAddress.patch | 28 - .../recipes/qt5/qtwebengine_git.bbappend | 32 - ...-sync-include-linux-compiler-.h-with-Linu.patch | 808 --------------------- .../recipes/u-boot/u-boot_%.bbappend | 40 - .../recipes/wayland/libgbm.bbappend | 37 - .../recipes/wayland/wayland-kms_1.6.0.bbappend | 30 - .../recipes/wayland/weston_%.bbappend | 30 - scripts/manifest.xml | 2 +- 61 files changed, 1222 insertions(+), 1884 deletions(-) create mode 100644 meta-renesas-extras/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend create mode 100644 meta-renesas-extras/recipes-bsp/optee/optee-os_git.bbappend create mode 100644 meta-renesas-extras/recipes-bsp/u-boot/u-boot_%.bbappend create mode 100644 meta-renesas-extras/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch create mode 100644 meta-renesas-extras/recipes-core/systemd/systemd_%.bbappend create mode 100644 meta-renesas-extras/recipes-graphics/gles-module/gles-user-module.bbappend create mode 100644 meta-renesas-extras/recipes-graphics/gles-module/gles-user-module/gl3ext.h create mode 100644 meta-renesas-extras/recipes-graphics/mesa/mesa_%.bbappend create mode 100644 meta-renesas-extras/recipes-graphics/wayland/libgbm.bbappend create mode 100644 meta-renesas-extras/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend create mode 100644 meta-renesas-extras/recipes-graphics/wayland/weston_%.bbappend create mode 100644 meta-renesas-extras/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend create mode 100644 meta-renesas-extras/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend create mode 100644 meta-renesas-extras/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend create mode 100644 meta-renesas-extras/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend create mode 100644 meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch create mode 100644 meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch create mode 100644 meta-renesas-extras/recipes-kernel/linux/linux-renesas_%.bbappend create mode 100644 meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend create mode 100644 meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend create mode 100644 meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf create mode 100644 meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf create mode 100644 meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf create mode 100644 meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf create mode 100644 meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend create mode 100644 meta-renesas-extras/recipes-qt/qt5/qtbase/oe-device-extra.pri create mode 100644 meta-renesas-extras/recipes-qt/qt5/qtbase_git.bbappend create mode 100644 meta-renesas-extras/recipes-qt/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch create mode 100644 meta-renesas-extras/recipes-qt/qt5/qtwebengine_git.bbappend delete mode 100644 meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend delete mode 100644 meta-renesas-extras/recipes/gles-module/gles-user-module.bbappend delete mode 100644 meta-renesas-extras/recipes/gles-module/gles-user-module/gl3ext.h delete mode 100644 meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend delete mode 100644 meta-renesas-extras/recipes/kernel-module-gles/kernel-module-gles.bbappend delete mode 100644 meta-renesas-extras/recipes/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend delete mode 100644 meta-renesas-extras/recipes/kernel-module-vspm/kernel-module-vspm.bbappend delete mode 100644 meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend delete mode 100644 meta-renesas-extras/recipes/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch delete mode 100644 meta-renesas-extras/recipes/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch delete mode 100644 meta-renesas-extras/recipes/linux/linux-renesas_%.bbappend delete mode 100644 meta-renesas-extras/recipes/mesa/mesa_%.bbappend delete mode 100644 meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf delete mode 100644 meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/draak/kms.conf delete mode 100644 meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/ebisu/kms.conf delete mode 100644 meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf delete mode 100644 meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend delete mode 100644 meta-renesas-extras/recipes/qt5/qtbase/oe-device-extra.pri delete mode 100644 meta-renesas-extras/recipes/qt5/qtbase_git.bbappend delete mode 100644 meta-renesas-extras/recipes/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch delete mode 100644 meta-renesas-extras/recipes/qt5/qtwebengine_git.bbappend delete mode 100644 meta-renesas-extras/recipes/u-boot/u-boot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch delete mode 100644 meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend delete mode 100644 meta-renesas-extras/recipes/wayland/libgbm.bbappend delete mode 100644 meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend delete mode 100644 meta-renesas-extras/recipes/wayland/weston_%.bbappend diff --git a/meta-boot2qt-distro/conf/distro/include/draak.conf b/meta-boot2qt-distro/conf/distro/include/draak.conf index daf68f78..4d9db182 100644 --- a/meta-boot2qt-distro/conf/distro/include/draak.conf +++ b/meta-boot2qt-distro/conf/distro/include/draak.conf @@ -32,7 +32,7 @@ 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.91" +PREFERRED_VERSION_libdrm = "2.4.94" KERNEL_DEVICETREE += "renesas/r8a77995-draak-lvds.dtb" @@ -41,9 +41,10 @@ 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/arm-trusted-firmware \ + meta-renesas-extras/recipes-bsp/arm-trusted-firmware \ " diff --git a/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf index ddb40e01..2c73a11a 100644 --- a/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf +++ b/meta-boot2qt-distro/conf/distro/include/h3ulcb.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -30,3 +30,5 @@ 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/m3ulcb.conf b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf index cff78935..d886adda 100644 --- a/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf +++ b/meta-boot2qt-distro/conf/distro/include/m3ulcb.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -30,3 +30,5 @@ 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/rcar-gen3.inc b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc index 6b99603f..bcf2268b 100644 --- a/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc +++ b/meta-boot2qt-distro/conf/distro/include/rcar-gen3.inc @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -74,4 +74,11 @@ 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-renesas-extras/conf/layer.conf b/meta-renesas-extras/conf/layer.conf index 83dde0ec..6379f674 100644 --- a/meta-renesas-extras/conf/layer.conf +++ b/meta-renesas-extras/conf/layer.conf @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -39,4 +39,7 @@ BBFILE_COLLECTIONS += "b2qt_renesas" BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_renesas = "20" -LAYERSERIES_COMPAT_b2qt_renesas = "sumo" +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 new file mode 100644 index 00000000..8a62d828 --- /dev/null +++ b/meta-renesas-extras/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend @@ -0,0 +1,31 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..98990256 --- /dev/null +++ b/meta-renesas-extras/recipes-bsp/optee/optee-os_git.bbappend @@ -0,0 +1,31 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..8511d33b --- /dev/null +++ b/meta-renesas-extras/recipes-bsp/u-boot/u-boot_%.bbappend @@ -0,0 +1,44 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..1d6174fc --- /dev/null +++ b/meta-renesas-extras/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch @@ -0,0 +1,23 @@ +From c8b5b91b8a794719280b313e7dd844c3c2142668 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +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 new file mode 100644 index 00000000..3967e5ff --- /dev/null +++ b/meta-renesas-extras/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,33 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..9806a3cc --- /dev/null +++ b/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module.bbappend @@ -0,0 +1,38 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..4d4ea96c --- /dev/null +++ b/meta-renesas-extras/recipes-graphics/gles-module/gles-user-module/gl3ext.h @@ -0,0 +1,24 @@ +#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 new file mode 100644 index 00000000..ff73b22d --- /dev/null +++ b/meta-renesas-extras/recipes-graphics/mesa/mesa_%.bbappend @@ -0,0 +1,39 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..502c7cce --- /dev/null +++ b/meta-renesas-extras/recipes-graphics/wayland/libgbm.bbappend @@ -0,0 +1,37 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..1330d5fb --- /dev/null +++ b/meta-renesas-extras/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..9385f7a6 --- /dev/null +++ b/meta-renesas-extras/recipes-graphics/wayland/weston_%.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..e6e89eb4 --- /dev/null +++ b/meta-renesas-extras/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..19fbff62 --- /dev/null +++ b/meta-renesas-extras/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend @@ -0,0 +1,31 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..19fbff62 --- /dev/null +++ b/meta-renesas-extras/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend @@ -0,0 +1,31 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..e4021368 --- /dev/null +++ b/meta-renesas-extras/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend @@ -0,0 +1,36 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..a3a3624c --- /dev/null +++ b/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch @@ -0,0 +1,327 @@ +From 1115b5113bc31d048441cc138c6d2f45785bd53e Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +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 ++ ++/ { ++ 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 */ ++ 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 new file mode 100644 index 00000000..f7e0c486 --- /dev/null +++ b/meta-renesas-extras/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch @@ -0,0 +1,124 @@ +From 32e78d93f53889686bc1d90865fcc33ec5c9e80d Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +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 +Cc: John Stultz , +Cc: Thomas Gleixner +Cc: Ard Biesheuvel +Signed-off-by: Linus Torvalds +--- + 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 + #include + +-/* +- * 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 new file mode 100644 index 00000000..edabc4b8 --- /dev/null +++ b/meta-renesas-extras/recipes-kernel/linux/linux-renesas_%.bbappend @@ -0,0 +1,35 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..9658abf2 --- /dev/null +++ b/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..ef8dcdfd --- /dev/null +++ b/meta-renesas-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## 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/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf new file mode 100644 index 00000000..60ee1f17 --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/appcontroller.conf @@ -0,0 +1,9 @@ +env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins +env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf +env=QT_IM_MODULE=qtvirtualkeyboard +env=QT_QPA_EGLFS_FORCE888=0 +env=QT_QUICK_CONTROLS_1_STYLE=Flat +env=XDG_RUNTIME_DIR=/run/user/0 +env=QSG_RENDER_LOOP=basic +env=QTWEBENGINE_DISABLE_SANDBOX=1 +base=linux diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf new file mode 100644 index 00000000..4cbbf498 --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/draak/kms.conf @@ -0,0 +1,9 @@ +{ + "device": "/dev/dri/card0", + "outputs": [ + { + "name": "VGA1", + "mode": "off" + } + ] +} diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf new file mode 100644 index 00000000..4cbbf498 --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/ebisu/kms.conf @@ -0,0 +1,9 @@ +{ + "device": "/dev/dri/card0", + "outputs": [ + { + "name": "VGA1", + "mode": "off" + } + ] +} diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf new file mode 100644 index 00000000..db7a5032 --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller/kms.conf @@ -0,0 +1,4 @@ +{ + "device": "/dev/dri/card0", + "hwcursor": false +} diff --git a/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend new file mode 100644 index 00000000..708ed85e --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/boot2qt-appcontroller_git.bbappend @@ -0,0 +1,38 @@ +############################################################################ +## +## 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 += "file://kms.conf" + +FILES_${PN} += "${sysconfdir}/kms.conf" + +do_install_append() { + install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ +} 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 new file mode 100644 index 00000000..c6f88adc --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/qtbase/oe-device-extra.pri @@ -0,0 +1,4 @@ +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 new file mode 100644 index 00000000..ecba1f14 --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/qtbase_git.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## 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 new file mode 100644 index 00000000..ed1339b6 --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch @@ -0,0 +1,28 @@ +From 4b59d8fa3ba5647834d29fad58b9231c154b9136 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +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/ozone/gl_ozone_egl_qt.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp +index 2fa86d79..d2362477 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 new file mode 100644 index 00000000..cc13b746 --- /dev/null +++ b/meta-renesas-extras/recipes-qt/qt5/qtwebengine_git.bbappend @@ -0,0 +1,32 @@ +############################################################################ +## +## 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/meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend b/meta-renesas-extras/recipes/arm-trusted-firmware/arm-trusted-firmware_git.bbappend deleted file mode 100644 index 8a62d828..00000000 --- a/meta-renesas-extras/recipes/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/gles-module/gles-user-module.bbappend b/meta-renesas-extras/recipes/gles-module/gles-user-module.bbappend deleted file mode 100644 index 9806a3cc..00000000 --- a/meta-renesas-extras/recipes/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/gles-module/gles-user-module/gl3ext.h b/meta-renesas-extras/recipes/gles-module/gles-user-module/gl3ext.h deleted file mode 100644 index 4d4ea96c..00000000 --- a/meta-renesas-extras/recipes/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/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/meta-renesas-extras/recipes/gstreamer/gstreamer1.0-plugins-bad_%.bbappend deleted file mode 100644 index 9658abf2..00000000 --- a/meta-renesas-extras/recipes/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/kernel-module-gles/kernel-module-gles.bbappend b/meta-renesas-extras/recipes/kernel-module-gles/kernel-module-gles.bbappend deleted file mode 100644 index ad0959f3..00000000 --- a/meta-renesas-extras/recipes/kernel-module-gles/kernel-module-gles.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_OEMAKE_append_draak = " COMMON_FLAGS="-Wno-error=expansion-to-defined"" diff --git a/meta-renesas-extras/recipes/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/meta-renesas-extras/recipes/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend deleted file mode 100644 index 19fbff62..00000000 --- a/meta-renesas-extras/recipes/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-module-vspm/kernel-module-vspm.bbappend b/meta-renesas-extras/recipes/kernel-module-vspm/kernel-module-vspm.bbappend deleted file mode 100644 index 19fbff62..00000000 --- a/meta-renesas-extras/recipes/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/linux-libc-headers/linux-libc-headers_%.bbappend b/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend deleted file mode 100644 index e1022d86..00000000 --- a/meta-renesas-extras/recipes/linux-libc-headers/linux-libc-headers_%.bbappend +++ /dev/null @@ -1,34 +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$ -## -############################################################################ - -# 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/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch b/meta-renesas-extras/recipes/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/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 -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 -+ -+/ { -+ 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 */ -+ 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/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch b/meta-renesas-extras/recipes/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch deleted file mode 100644 index f7e0c486..00000000 --- a/meta-renesas-extras/recipes/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 -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 -Cc: John Stultz , -Cc: Thomas Gleixner -Cc: Ard Biesheuvel -Signed-off-by: Linus Torvalds ---- - 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 - #include - --/* -- * 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/linux/linux-renesas_%.bbappend b/meta-renesas-extras/recipes/linux/linux-renesas_%.bbappend deleted file mode 100644 index edabc4b8..00000000 --- a/meta-renesas-extras/recipes/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/mesa/mesa_%.bbappend b/meta-renesas-extras/recipes/mesa/mesa_%.bbappend deleted file mode 100644 index 1da45477..00000000 --- a/meta-renesas-extras/recipes/mesa/mesa_%.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$ -## -############################################################################ - -# pick random header to make build work -INSTALLED_HEADER_draak = "src/egl/wayland/wayland-egl/wayland-egl-backend.h" diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf deleted file mode 100644 index 60ee1f17..00000000 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/appcontroller.conf +++ /dev/null @@ -1,9 +0,0 @@ -env=QML2_IMPORT_PATH=/data/user/qt/qmlplugins -env=QT_QPA_EGLFS_KMS_CONFIG=/etc/kms.conf -env=QT_IM_MODULE=qtvirtualkeyboard -env=QT_QPA_EGLFS_FORCE888=0 -env=QT_QUICK_CONTROLS_1_STYLE=Flat -env=XDG_RUNTIME_DIR=/run/user/0 -env=QSG_RENDER_LOOP=basic -env=QTWEBENGINE_DISABLE_SANDBOX=1 -base=linux diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/draak/kms.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/draak/kms.conf deleted file mode 100644 index 4cbbf498..00000000 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/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/qt5/boot2qt-appcontroller/ebisu/kms.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/ebisu/kms.conf deleted file mode 100644 index 4cbbf498..00000000 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/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/qt5/boot2qt-appcontroller/kms.conf b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf deleted file mode 100644 index db7a5032..00000000 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller/kms.conf +++ /dev/null @@ -1,4 +0,0 @@ -{ - "device": "/dev/dri/card0", - "hwcursor": false -} diff --git a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend b/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.bbappend deleted file mode 100644 index 708ed85e..00000000 --- a/meta-renesas-extras/recipes/qt5/boot2qt-appcontroller_git.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 += "file://kms.conf" - -FILES_${PN} += "${sysconfdir}/kms.conf" - -do_install_append() { - install -m 0644 ${WORKDIR}/kms.conf ${D}${sysconfdir}/ -} diff --git a/meta-renesas-extras/recipes/qt5/qtbase/oe-device-extra.pri b/meta-renesas-extras/recipes/qt5/qtbase/oe-device-extra.pri deleted file mode 100644 index c6f88adc..00000000 --- a/meta-renesas-extras/recipes/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/qt5/qtbase_git.bbappend b/meta-renesas-extras/recipes/qt5/qtbase_git.bbappend deleted file mode 100644 index ecba1f14..00000000 --- a/meta-renesas-extras/recipes/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/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch b/meta-renesas-extras/recipes/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch deleted file mode 100644 index ed1339b6..00000000 --- a/meta-renesas-extras/recipes/qt5/qtwebengine/0001-Workaround-missing-eglGetProcAddress.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b59d8fa3ba5647834d29fad58b9231c154b9136 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -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/ozone/gl_ozone_egl_qt.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/core/ozone/gl_ozone_egl_qt.cpp b/src/core/ozone/gl_ozone_egl_qt.cpp -index 2fa86d79..d2362477 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/qt5/qtwebengine_git.bbappend b/meta-renesas-extras/recipes/qt5/qtwebengine_git.bbappend deleted file mode 100644 index cc13b746..00000000 --- a/meta-renesas-extras/recipes/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/meta-renesas-extras/recipes/u-boot/u-boot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch b/meta-renesas-extras/recipes/u-boot/u-boot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch deleted file mode 100644 index 639f67da..00000000 --- a/meta-renesas-extras/recipes/u-boot/u-boot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch +++ /dev/null @@ -1,808 +0,0 @@ -From 9b2c282b348dfe966bbba967dc7a45ce817cce50 Mon Sep 17 00:00:00 2001 -From: Tom Rini -Date: Mon, 29 Feb 2016 11:34:15 -0500 -Subject: [PATCH] compiler*.h: sync include/linux/compiler*.h with Linux - 4.5-rc6 - -Copy these from Linux v4.5-rc6 tag. - -This is needed so that we can keep up with newer gcc versions. Note -that we don't have the uapi/ hierarchy from the kernel so continue to -use - -Signed-off-by: Tom Rini ---- - include/linux/compiler-gcc.h | 259 ++++++++++++++++++++++++++++++++--------- - include/linux/compiler-gcc3.h | 23 ---- - include/linux/compiler-gcc4.h | 88 -------------- - include/linux/compiler-gcc5.h | 65 ----------- - include/linux/compiler-intel.h | 5 + - include/linux/compiler.h | 178 ++++++++++++++++++++++++++-- - 6 files changed, 383 insertions(+), 235 deletions(-) - delete mode 100644 include/linux/compiler-gcc3.h - delete mode 100644 include/linux/compiler-gcc4.h - delete mode 100644 include/linux/compiler-gcc5.h - -diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h -index e057bd2..22ab246 100644 ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -5,14 +5,28 @@ - /* - * Common definitions for all gcc versions go here. - */ --#define GCC_VERSION (__GNUC__ * 10000 \ -- + __GNUC_MINOR__ * 100 \ -- + __GNUC_PATCHLEVEL__) -- -+#define GCC_VERSION (__GNUC__ * 10000 \ -+ + __GNUC_MINOR__ * 100 \ -+ + __GNUC_PATCHLEVEL__) - - /* Optimization barrier */ -+ - /* The "volatile" is due to gcc bugs */ - #define barrier() __asm__ __volatile__("": : :"memory") -+/* -+ * This version is i.e. to prevent dead stores elimination on @ptr -+ * where gcc and llvm may behave differently when otherwise using -+ * normal barrier(): while gcc behavior gets along with a normal -+ * barrier(), llvm needs an explicit input variable to be assumed -+ * clobbered. The issue is as follows: while the inline asm might -+ * access any memory it wants, the compiler could have fit all of -+ * @ptr into memory registers instead, and since @ptr never escaped -+ * from that, it proofed that the inline asm wasn't touching any of -+ * it. This version works well with both compilers, i.e. we're telling -+ * the compiler that the inline asm absolutely may see the contents -+ * of @ptr. See also: https://llvm.org/bugs/show_bug.cgi?id=15495 -+ */ -+#define barrier_data(ptr) __asm__ __volatile__("": :"r"(ptr) :"memory") - - /* - * This macro obfuscates arithmetic on a variable address so that gcc -@@ -32,58 +46,63 @@ - * the inline assembly constraint from =g to =r, in this particular - * case either is valid. - */ --#define RELOC_HIDE(ptr, off) \ -- ({ unsigned long __ptr; \ -- __asm__ ("" : "=r"(__ptr) : "0"(ptr)); \ -- (typeof(ptr)) (__ptr + (off)); }) -+#define RELOC_HIDE(ptr, off) \ -+({ \ -+ unsigned long __ptr; \ -+ __asm__ ("" : "=r"(__ptr) : "0"(ptr)); \ -+ (typeof(ptr)) (__ptr + (off)); \ -+}) - - /* Make the optimizer believe the variable can be manipulated arbitrarily. */ --#define OPTIMIZER_HIDE_VAR(var) __asm__ ("" : "=r" (var) : "0" (var)) -+#define OPTIMIZER_HIDE_VAR(var) \ -+ __asm__ ("" : "=r" (var) : "0" (var)) - - #ifdef __CHECKER__ --#define __must_be_array(arr) 0 -+#define __must_be_array(a) 0 - #else - /* &a[0] degrades to a pointer: a different type from an array */ --#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) -+#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) - #endif - - /* - * Force always-inline if the user requests it so via the .config, - * or if gcc is too old: - */ --#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ -+#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ - !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) --# define inline inline __attribute__((always_inline)) notrace --# define __inline__ __inline__ __attribute__((always_inline)) notrace --# define __inline __inline __attribute__((always_inline)) notrace -+#define inline inline __attribute__((always_inline)) notrace -+#define __inline__ __inline__ __attribute__((always_inline)) notrace -+#define __inline __inline __attribute__((always_inline)) notrace - #else - /* A lot of inline functions can cause havoc with function tracing */ --# define inline inline notrace --# define __inline__ __inline__ notrace --# define __inline __inline notrace -+#define inline inline notrace -+#define __inline__ __inline__ notrace -+#define __inline __inline notrace - #endif - --#define __deprecated __attribute__((deprecated)) --#ifndef __packed --#define __packed __attribute__((packed)) --#endif --#ifndef __weak --#define __weak __attribute__((weak)) --#endif -+#define __always_inline inline __attribute__((always_inline)) -+#define noinline __attribute__((noinline)) -+ -+#define __deprecated __attribute__((deprecated)) -+#define __packed __attribute__((packed)) -+#define __weak __attribute__((weak)) -+#define __alias(symbol) __attribute__((alias(#symbol))) - - /* -- * it doesn't make sense on ARM (currently the only user of __naked) to trace -- * naked functions because then mcount is called without stack and frame pointer -- * being set up and there is no chance to restore the lr register to the value -- * before mcount was called. -+ * it doesn't make sense on ARM (currently the only user of __naked) -+ * to trace naked functions because then mcount is called without -+ * stack and frame pointer being set up and there is no chance to -+ * restore the lr register to the value before mcount was called. -+ * -+ * The asm() bodies of naked functions often depend on standard calling -+ * conventions, therefore they must be noinline and noclone. - * -- * The asm() bodies of naked functions often depend on standard calling conventions, -- * therefore they must be noinline and noclone. GCC 4.[56] currently fail to enforce -- * this, so we must do so ourselves. See GCC PR44290. -+ * GCC 4.[56] currently fail to enforce this, so we must do so ourselves. -+ * See GCC PR44290. - */ --#define __naked __attribute__((naked)) noinline __noclone notrace -+#define __naked __attribute__((naked)) noinline __noclone notrace - --#define __noreturn __attribute__((noreturn)) -+#define __noreturn __attribute__((noreturn)) - - /* - * From the GCC manual: -@@ -95,34 +114,170 @@ - * would be. - * [...] - */ --#ifndef __pure --#define __pure __attribute__((pure)) -+#define __pure __attribute__((pure)) -+#define __aligned(x) __attribute__((aligned(x))) -+#define __printf(a, b) __attribute__((format(printf, a, b))) -+#define __scanf(a, b) __attribute__((format(scanf, a, b))) -+#define __attribute_const__ __attribute__((__const__)) -+#define __maybe_unused __attribute__((unused)) -+#define __always_unused __attribute__((unused)) -+ -+/* gcc version specific checks */ -+ -+#if GCC_VERSION < 30200 -+# error Sorry, your compiler is too old - please upgrade it. -+#endif -+ -+#if GCC_VERSION < 30300 -+# define __used __attribute__((__unused__)) -+#else -+# define __used __attribute__((__used__)) -+#endif -+ -+#ifdef CONFIG_GCOV_KERNEL -+# if GCC_VERSION < 30400 -+# error "GCOV profiling support for gcc versions below 3.4 not included" -+# endif /* __GNUC_MINOR__ */ -+#endif /* CONFIG_GCOV_KERNEL */ -+ -+#if GCC_VERSION >= 30400 -+#define __must_check __attribute__((warn_unused_result)) -+#endif -+ -+#if GCC_VERSION >= 40000 -+ -+/* GCC 4.1.[01] miscompiles __weak */ -+#ifdef __KERNEL__ -+# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101 -+# error Your version of gcc miscompiles the __weak directive -+# endif -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __compiler_offsetof(a, b) \ -+ __builtin_offsetof(a, b) -+ -+#if GCC_VERSION >= 40100 && GCC_VERSION < 40600 -+# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) -+#endif -+ -+#if GCC_VERSION >= 40300 -+/* Mark functions as cold. gcc will assume any path leading to a call -+ * to them will be unlikely. This means a lot of manual unlikely()s -+ * are unnecessary now for any paths leading to the usual suspects -+ * like BUG(), printk(), panic() etc. [but let's keep them for now for -+ * older compilers] -+ * -+ * Early snapshots of gcc 4.3 don't support this and we can't detect this -+ * in the preprocessor, but we can live with this because they're unreleased. -+ * Maketime probing would be overkill here. -+ * -+ * gcc also has a __attribute__((__hot__)) to move hot functions into -+ * a special section, but I don't see any sense in this right now in -+ * the kernel context -+ */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+#endif /* GCC_VERSION >= 40300 */ -+ -+#if GCC_VERSION >= 40500 -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+#endif /* GCC_VERSION >= 40500 */ -+ -+#if GCC_VERSION >= 40600 -+/* -+ * When used with Link Time Optimization, gcc can optimize away C functions or -+ * variables which are referenced only from assembly code. __visible tells the -+ * optimizer that something else uses this function or variable, thus preventing -+ * this. -+ */ -+#define __visible __attribute__((externally_visible)) - #endif --#ifndef __aligned --#define __aligned(x) __attribute__((aligned(x))) -+ -+ -+#if GCC_VERSION >= 40900 && !defined(__CHECKER__) -+/* -+ * __assume_aligned(n, k): Tell the optimizer that the returned -+ * pointer can be assumed to be k modulo n. The second argument is -+ * optional (default 0), so we use a variadic macro to make the -+ * shorthand. -+ * -+ * Beware: Do not apply this to functions which may return -+ * ERR_PTRs. Also, it is probably unwise to apply it to functions -+ * returning extra information in the low bits (but in that case the -+ * compiler should see some alignment anyway, when the return value is -+ * massaged by 'flags = ptr & 3; ptr &= ~3;'). -+ */ -+#define __assume_aligned(a, ...) __attribute__((__assume_aligned__(a, ## __VA_ARGS__))) - #endif --#define __printf(a, b) __attribute__((format(printf, a, b))) --#define __scanf(a, b) __attribute__((format(scanf, a, b))) --#define noinline __attribute__((noinline)) --#define __attribute_const__ __attribute__((__const__)) --#define __maybe_unused __attribute__((unused)) --#define __always_unused __attribute__((unused)) - --#define __gcc_header(x) #x --#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) --#define gcc_header(x) _gcc_header(x) --#include gcc_header(__GNUC__) -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#if GCC_VERSION >= 40400 -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#endif -+#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600) -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -+ -+#if GCC_VERSION >= 50000 -+#define KASAN_ABI_VERSION 4 -+#elif GCC_VERSION >= 40902 -+#define KASAN_ABI_VERSION 3 -+#endif -+ -+#if GCC_VERSION >= 40902 -+/* -+ * Tell the compiler that address safety instrumentation (KASAN) -+ * should not be applied to that function. -+ * Conflicts with inlining: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368 -+ */ -+#define __no_sanitize_address __attribute__((no_sanitize_address)) -+#endif -+ -+#endif /* gcc version >= 40000 specific checks */ - - #if !defined(__noclone) - #define __noclone /* not needed */ - #endif - -+#if !defined(__no_sanitize_address) -+#define __no_sanitize_address -+#endif -+ - /* - * A trick to suppress uninitialized variable warning without generating any - * code - */ - #define uninitialized_var(x) x = x -- --#ifndef __always_inline --#define __always_inline inline __attribute__((always_inline)) --#endif -diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h -deleted file mode 100644 -index 7d89feb..0000000 ---- a/include/linux/compiler-gcc3.h -+++ /dev/null -@@ -1,23 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include directly, include instead." --#endif -- --#if GCC_VERSION < 30200 --# error Sorry, your compiler is too old - please upgrade it. --#endif -- --#if GCC_VERSION >= 30300 --# define __used __attribute__((__used__)) --#else --# define __used __attribute__((__unused__)) --#endif -- --#if GCC_VERSION >= 30400 --#define __must_check __attribute__((warn_unused_result)) --#endif -- --#ifdef CONFIG_GCOV_KERNEL --# if GCC_VERSION < 30400 --# error "GCOV profiling support for gcc versions below 3.4 not included" --# endif /* __GNUC_MINOR__ */ --#endif /* CONFIG_GCOV_KERNEL */ -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -deleted file mode 100644 -index 2507fd2..0000000 ---- a/include/linux/compiler-gcc4.h -+++ /dev/null -@@ -1,88 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include directly, include instead." --#endif -- --/* GCC 4.1.[01] miscompiles __weak */ --#ifdef __KERNEL__ --# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101 --# error Your version of gcc miscompiles the __weak directive --# endif --#endif -- --#define __used __attribute__((__used__)) --#define __must_check __attribute__((warn_unused_result)) --#define __compiler_offsetof(a,b) __builtin_offsetof(a,b) -- --#if GCC_VERSION >= 40100 && GCC_VERSION < 40600 --# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) --#endif -- --#if GCC_VERSION >= 40300 --/* Mark functions as cold. gcc will assume any path leading to a call -- to them will be unlikely. This means a lot of manual unlikely()s -- are unnecessary now for any paths leading to the usual suspects -- like BUG(), printk(), panic() etc. [but let's keep them for now for -- older compilers] -- -- Early snapshots of gcc 4.3 don't support this and we can't detect this -- in the preprocessor, but we can live with this because they're unreleased. -- Maketime probing would be overkill here. -- -- gcc also has a __attribute__((__hot__)) to move hot functions into -- a special section, but I don't see any sense in this right now in -- the kernel context */ --#define __cold __attribute__((__cold__)) -- --#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -- --#ifndef __CHECKER__ --# define __compiletime_warning(message) __attribute__((warning(message))) --# define __compiletime_error(message) __attribute__((error(message))) --#endif /* __CHECKER__ */ --#endif /* GCC_VERSION >= 40300 */ -- --#if GCC_VERSION >= 40500 --/* -- * Mark a position in code as unreachable. This can be used to -- * suppress control flow warnings after asm blocks that transfer -- * control elsewhere. -- * -- * Early snapshots of gcc 4.5 don't support this and we can't detect -- * this in the preprocessor, but we can live with this because they're -- * unreleased. Really, we need to have autoconf for the kernel. -- */ --#define unreachable() __builtin_unreachable() -- --/* Mark a function definition as prohibited from being cloned. */ --#define __noclone __attribute__((__noclone__)) -- --#endif /* GCC_VERSION >= 40500 */ -- --#if GCC_VERSION >= 40600 --/* -- * Tell the optimizer that something else uses this function or variable. -- */ --#define __visible __attribute__((externally_visible)) --#endif -- --/* -- * GCC 'asm goto' miscompiles certain code sequences: -- * -- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -- * -- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -- * Fixed in GCC 4.8.2 and later versions. -- * -- * (asm goto is automatically volatile - the naming reflects this.) -- */ --#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -- --#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP --#if GCC_VERSION >= 40400 --#define __HAVE_BUILTIN_BSWAP32__ --#define __HAVE_BUILTIN_BSWAP64__ --#endif --#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600) --#define __HAVE_BUILTIN_BSWAP16__ --#endif --#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h -deleted file mode 100644 -index c8c5659..0000000 ---- a/include/linux/compiler-gcc5.h -+++ /dev/null -@@ -1,65 +0,0 @@ --#ifndef __LINUX_COMPILER_H --#error "Please don't include directly, include instead." --#endif -- --#define __used __attribute__((__used__)) --#define __must_check __attribute__((warn_unused_result)) --#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -- --/* Mark functions as cold. gcc will assume any path leading to a call -- to them will be unlikely. This means a lot of manual unlikely()s -- are unnecessary now for any paths leading to the usual suspects -- like BUG(), printk(), panic() etc. [but let's keep them for now for -- older compilers] -- -- Early snapshots of gcc 4.3 don't support this and we can't detect this -- in the preprocessor, but we can live with this because they're unreleased. -- Maketime probing would be overkill here. -- -- gcc also has a __attribute__((__hot__)) to move hot functions into -- a special section, but I don't see any sense in this right now in -- the kernel context */ --#define __cold __attribute__((__cold__)) -- --#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -- --#ifndef __CHECKER__ --# define __compiletime_warning(message) __attribute__((warning(message))) --# define __compiletime_error(message) __attribute__((error(message))) --#endif /* __CHECKER__ */ -- --/* -- * Mark a position in code as unreachable. This can be used to -- * suppress control flow warnings after asm blocks that transfer -- * control elsewhere. -- * -- * Early snapshots of gcc 4.5 don't support this and we can't detect -- * this in the preprocessor, but we can live with this because they're -- * unreleased. Really, we need to have autoconf for the kernel. -- */ --#define unreachable() __builtin_unreachable() -- --/* Mark a function definition as prohibited from being cloned. */ --#define __noclone __attribute__((__noclone__)) -- --/* -- * Tell the optimizer that something else uses this function or variable. -- */ --#define __visible __attribute__((externally_visible)) -- --/* -- * GCC 'asm goto' miscompiles certain code sequences: -- * -- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -- * -- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -- * -- * (asm goto is automatically volatile - the naming reflects this.) -- */ --#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -- --#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP --#define __HAVE_BUILTIN_BSWAP32__ --#define __HAVE_BUILTIN_BSWAP64__ --#define __HAVE_BUILTIN_BSWAP16__ --#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h -index ba147a1..d4c7113 100644 ---- a/include/linux/compiler-intel.h -+++ b/include/linux/compiler-intel.h -@@ -13,9 +13,14 @@ - /* Intel ECC compiler doesn't support gcc specific asm stmts. - * It uses intrinsics to do the equivalent things. - */ -+#undef barrier -+#undef barrier_data - #undef RELOC_HIDE - #undef OPTIMIZER_HIDE_VAR - -+#define barrier() __memory_barrier() -+#define barrier_data(ptr) barrier() -+ - #define RELOC_HIDE(ptr, off) \ - ({ unsigned long __ptr; \ - __ptr = (unsigned long) (ptr); \ -diff --git a/include/linux/compiler.h b/include/linux/compiler.h -index d5ad7b1..020ad16 100644 ---- a/include/linux/compiler.h -+++ b/include/linux/compiler.h -@@ -17,6 +17,7 @@ - # define __release(x) __context__(x,-1) - # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0) - # define __percpu __attribute__((noderef, address_space(3))) -+# define __pmem __attribute__((noderef, address_space(5))) - #ifdef CONFIG_SPARSE_RCU_POINTER - # define __rcu __attribute__((noderef, address_space(4))) - #else -@@ -42,6 +43,7 @@ extern void __chk_io_ptr(const volatile void __iomem *); - # define __cond_lock(x,c) (c) - # define __percpu - # define __rcu -+# define __pmem - #endif - - /* Indirect macros required for expanded argument pasting, eg. __LINE__. */ -@@ -54,7 +56,11 @@ extern void __chk_io_ptr(const volatile void __iomem *); - #include - #endif - -+#if defined(CC_USING_HOTPATCH) && !defined(__CHECKER__) -+#define notrace __attribute__((hotpatch(0,0))) -+#else - #define notrace __attribute__((no_instrument_function)) -+#endif - - /* Intel compiler defines __GNUC__. So we will overwrite implementations - * coming from above header files here -@@ -138,7 +144,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - */ - #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) ) - #define __trace_if(cond) \ -- if (__builtin_constant_p((cond)) ? !!(cond) : \ -+ if (__builtin_constant_p(!!(cond)) ? !!(cond) : \ - ({ \ - int ______r; \ - static struct ftrace_branch_data \ -@@ -165,6 +171,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - # define barrier() __memory_barrier() - #endif - -+#ifndef barrier_data -+# define barrier_data(ptr) barrier() -+#endif -+ - /* Unreachable code */ - #ifndef unreachable - # define unreachable() do { } while (1) -@@ -186,6 +196,126 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - # define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __LINE__) - #endif - -+#include -+ -+#define __READ_ONCE_SIZE \ -+({ \ -+ switch (size) { \ -+ case 1: *(__u8 *)res = *(volatile __u8 *)p; break; \ -+ case 2: *(__u16 *)res = *(volatile __u16 *)p; break; \ -+ case 4: *(__u32 *)res = *(volatile __u32 *)p; break; \ -+ case 8: *(__u64 *)res = *(volatile __u64 *)p; break; \ -+ default: \ -+ barrier(); \ -+ __builtin_memcpy((void *)res, (const void *)p, size); \ -+ barrier(); \ -+ } \ -+}) -+ -+static __always_inline -+void __read_once_size(const volatile void *p, void *res, int size) -+{ -+ __READ_ONCE_SIZE; -+} -+ -+#ifdef CONFIG_KASAN -+/* -+ * This function is not 'inline' because __no_sanitize_address confilcts -+ * with inlining. Attempt to inline it may cause a build failure. -+ * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368 -+ * '__maybe_unused' allows us to avoid defined-but-not-used warnings. -+ */ -+static __no_sanitize_address __maybe_unused -+void __read_once_size_nocheck(const volatile void *p, void *res, int size) -+{ -+ __READ_ONCE_SIZE; -+} -+#else -+static __always_inline -+void __read_once_size_nocheck(const volatile void *p, void *res, int size) -+{ -+ __READ_ONCE_SIZE; -+} -+#endif -+ -+static __always_inline void __write_once_size(volatile void *p, void *res, int size) -+{ -+ switch (size) { -+ case 1: *(volatile __u8 *)p = *(__u8 *)res; break; -+ case 2: *(volatile __u16 *)p = *(__u16 *)res; break; -+ case 4: *(volatile __u32 *)p = *(__u32 *)res; break; -+ case 8: *(volatile __u64 *)p = *(__u64 *)res; break; -+ default: -+ barrier(); -+ __builtin_memcpy((void *)p, (const void *)res, size); -+ barrier(); -+ } -+} -+ -+/* -+ * Prevent the compiler from merging or refetching reads or writes. The -+ * compiler is also forbidden from reordering successive instances of -+ * READ_ONCE, WRITE_ONCE and ACCESS_ONCE (see below), but only when the -+ * compiler is aware of some particular ordering. One way to make the -+ * compiler aware of ordering is to put the two invocations of READ_ONCE, -+ * WRITE_ONCE or ACCESS_ONCE() in different C statements. -+ * -+ * In contrast to ACCESS_ONCE these two macros will also work on aggregate -+ * data types like structs or unions. If the size of the accessed data -+ * type exceeds the word size of the machine (e.g., 32 bits or 64 bits) -+ * READ_ONCE() and WRITE_ONCE() will fall back to memcpy and print a -+ * compile-time warning. -+ * -+ * Their two major use cases are: (1) Mediating communication between -+ * process-level code and irq/NMI handlers, all running on the same CPU, -+ * and (2) Ensuring that the compiler does not fold, spindle, or otherwise -+ * mutilate accesses that either do not require ordering or that interact -+ * with an explicit memory barrier or atomic instruction that provides the -+ * required ordering. -+ */ -+ -+#define __READ_ONCE(x, check) \ -+({ \ -+ union { typeof(x) __val; char __c[1]; } __u; \ -+ if (check) \ -+ __read_once_size(&(x), __u.__c, sizeof(x)); \ -+ else \ -+ __read_once_size_nocheck(&(x), __u.__c, sizeof(x)); \ -+ __u.__val; \ -+}) -+#define READ_ONCE(x) __READ_ONCE(x, 1) -+ -+/* -+ * Use READ_ONCE_NOCHECK() instead of READ_ONCE() if you need -+ * to hide memory access from KASAN. -+ */ -+#define READ_ONCE_NOCHECK(x) __READ_ONCE(x, 0) -+ -+#define WRITE_ONCE(x, val) \ -+({ \ -+ union { typeof(x) __val; char __c[1]; } __u = \ -+ { .__val = (__force typeof(x)) (val) }; \ -+ __write_once_size(&(x), __u.__c, sizeof(x)); \ -+ __u.__val; \ -+}) -+ -+/** -+ * smp_cond_acquire() - Spin wait for cond with ACQUIRE ordering -+ * @cond: boolean expression to wait for -+ * -+ * Equivalent to using smp_load_acquire() on the condition variable but employs -+ * the control dependency of the wait to reduce the barrier on many platforms. -+ * -+ * The control dependency provides a LOAD->STORE order, the additional RMB -+ * provides LOAD->LOAD order, together they provide LOAD->{LOAD,STORE} order, -+ * aka. ACQUIRE. -+ */ -+#define smp_cond_acquire(cond) do { \ -+ while (!(cond)) \ -+ cpu_relax(); \ -+ smp_rmb(); /* ctrl + rmb := acquire */ \ -+} while (0) -+ - #endif /* __KERNEL__ */ - - #endif /* __ASSEMBLY__ */ -@@ -304,6 +434,14 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - #define __visible - #endif - -+/* -+ * Assume alignment of return value. -+ */ -+#ifndef __assume_aligned -+#define __assume_aligned(a, ...) -+#endif -+ -+ - /* Are two types/vars the same type (ignoring qualifiers)? */ - #ifndef __same_type - # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b)) -@@ -311,7 +449,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - - /* Is this type a native word size -- useful for atomic operations */ - #ifndef __native_word --# define __native_word(t) (sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long)) -+# define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long)) - #endif - - /* Compile time object size, -1 for unknown */ -@@ -373,12 +511,38 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); - * to make the compiler aware of ordering is to put the two invocations of - * ACCESS_ONCE() in different C statements. - * -- * This macro does absolutely -nothing- to prevent the CPU from reordering, -- * merging, or refetching absolutely anything at any time. Its main intended -- * use is to mediate communication between process-level code and irq/NMI -- * handlers, all running on the same CPU. -+ * ACCESS_ONCE will only work on scalar types. For union types, ACCESS_ONCE -+ * on a union member will work as long as the size of the member matches the -+ * size of the union and the size is smaller than word size. -+ * -+ * The major use cases of ACCESS_ONCE used to be (1) Mediating communication -+ * between process-level code and irq/NMI handlers, all running on the same CPU, -+ * and (2) Ensuring that the compiler does not fold, spindle, or otherwise -+ * mutilate accesses that either do not require ordering or that interact -+ * with an explicit memory barrier or atomic instruction that provides the -+ * required ordering. -+ * -+ * If possible use READ_ONCE()/WRITE_ONCE() instead. -+ */ -+#define __ACCESS_ONCE(x) ({ \ -+ __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \ -+ (volatile typeof(x) *)&(x); }) -+#define ACCESS_ONCE(x) (*__ACCESS_ONCE(x)) -+ -+/** -+ * lockless_dereference() - safely load a pointer for later dereference -+ * @p: The pointer to load -+ * -+ * Similar to rcu_dereference(), but for situations where the pointed-to -+ * object's lifetime is managed by something other than RCU. That -+ * "something other" might be reference counting or simple immortality. - */ --#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x)) -+#define lockless_dereference(p) \ -+({ \ -+ typeof(p) _________p1 = READ_ONCE(p); \ -+ smp_read_barrier_depends(); /* Dependency order vs. p above. */ \ -+ (_________p1); \ -+}) - - /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */ - #ifdef CONFIG_KPROBES --- -2.7.4 - diff --git a/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend b/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend deleted file mode 100644 index 3a7bb526..00000000 --- a/meta-renesas-extras/recipes/u-boot/u-boot_%.bbappend +++ /dev/null @@ -1,40 +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-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch" - -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/wayland/libgbm.bbappend b/meta-renesas-extras/recipes/wayland/libgbm.bbappend deleted file mode 100644 index 502c7cce..00000000 --- a/meta-renesas-extras/recipes/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/wayland/wayland-kms_1.6.0.bbappend b/meta-renesas-extras/recipes/wayland/wayland-kms_1.6.0.bbappend deleted file mode 100644 index 1330d5fb..00000000 --- a/meta-renesas-extras/recipes/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/wayland/weston_%.bbappend b/meta-renesas-extras/recipes/wayland/weston_%.bbappend deleted file mode 100644 index 9385f7a6..00000000 --- a/meta-renesas-extras/recipes/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/scripts/manifest.xml b/scripts/manifest.xml index 0de9de30..da12a1b9 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -70,7 +70,7 @@ groups="notdefault,external,renesas-draak"/>