diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2019-09-12 11:04:46 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-09-13 06:14:00 +0000 |
commit | 3d864e39d4a5510c2b2e11cd1a494106d6ccc4f1 (patch) | |
tree | bee337c5f0d7366314e29fc4a0e8911700d58548 | |
parent | 51ccee7c3b907dd32220fc4d683f006fc6c7171b (diff) |
Adaptation to warrior
Update layer for warrior branch and v3.19.0 of meta-renesas,
remove all appends that are no longer needed. Support for draak
is dropped since the v3.19.0 BSP does not support it.
Change-Id: I513b3eee47c9dfc24261975060e4287c9d0435a7
Reviewed-by: Kari Hormi <kari.hormi@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
19 files changed, 1 insertions, 976 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 6379f67..359308d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -39,7 +39,4 @@ BBFILE_COLLECTIONS += "b2qt_renesas" BBFILE_PATTERN_b2qt_renesas := "^${LAYERDIR}/" BBFILE_PRIORITY_b2qt_renesas = "20" -LAYERSERIES_COMPAT_b2qt_renesas = "thud" - -# override meta-renesas layer COMPAT -LAYERSERIES_COMPAT_rcar-gen3 = "thud" +LAYERSERIES_COMPAT_b2qt_renesas = "warrior" diff --git a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend b/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend deleted file mode 100644 index 8a62d82..0000000 --- a/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" -SRCREV = "dcb310296c07bce69149fa9d74f1848cdfd01f5a" diff --git a/recipes-bsp/optee/optee-os_git.bbappend b/recipes-bsp/optee/optee-os_git.bbappend deleted file mode 100644 index 9899025..0000000 --- a/recipes-bsp/optee/optee-os_git.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# disable -Werror=cast-function-type -EXTRA_OEMAKE += "NOWERROR=1" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend deleted file mode 100644 index 8511d33..0000000 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend_draak := "${THISDIR}/${PN}:" - -DEPENDS += "bison-native" - -BRANCH = "v2018.09/rcar-3.9.1" -SRCREV = "4d322dccdcf49c0aab18eb703663128aec81cffc" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" - -LICENSE_draak = "GPLv2+" - -S_draak = "${WORKDIR}/git" - -do_deploy_prepend_draak() { - cp ${B}/${UBOOT_SREC} ${S}/${UBOOT_SREC} -} diff --git a/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch b/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch deleted file mode 100644 index 1d6174f..0000000 --- a/recipes-core/systemd/systemd/0001-statx-don-t-redefine-if-structs-are-available-from-s.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c8b5b91b8a794719280b313e7dd844c3c2142668 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Fri, 22 Feb 2019 15:10:24 +0200 -Subject: [PATCH] statx: don't redefine if structs are available from - sys/stat.h - ---- - src/basic/missing.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/missing.h b/src/basic/missing.h -index dddc6de05c..d6ff612680 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -1405,7 +1405,7 @@ struct fib_rule_uid_range { - #define PF_KTHREAD 0x00200000 - #endif - --#if ! HAVE_STRUCT_STATX -+#if ! HAVE_STRUCT_STATX && !HAVE_STRUCT_STATX_IN_SYS_STAT_H - struct statx_timestamp { - int64_t tv_sec; - uint32_t tv_nsec; diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend deleted file mode 100644 index 3967e5f..0000000 --- a/recipes-core/systemd/systemd_%.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-statx-don-t-redefine-if-structs-are-available-from-s.patch \ - " diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend deleted file mode 100644 index ff73b22..0000000 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# pick random header to make build work -INSTALLED_HEADER_draak = "src/egl/wayland/wayland-egl/wayland-egl-backend.h" - -do_install_append() { - # ... and remove it - rm ${D}${includedir}/wayland-egl-backend.h -} - -# previously in libwayland-egl -FILES_${PN}-dev_append_draak = " ${includedir}/EGL/eglmesaext.h" diff --git a/recipes-graphics/wayland/libgbm.bbappend b/recipes-graphics/wayland/libgbm.bbappend deleted file mode 100644 index 502c7cc..0000000 --- a/recipes-graphics/wayland/libgbm.bbappend +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -PROVIDES += "virtual/libgbm" - -DEPENDS_append_draak = " udev" - -SRCREV = "a0c7d6c97fe1fffe45eee524060cbb12767c6461" -SRCREV_draak = "bc04aefc9d5322f8b2dc1ecb15d0713bbab684b8" - -SRC_URI = "git://github.com/renesas-rcar/libgbm;branch=rcar-gen3" diff --git a/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend b/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend deleted file mode 100644 index 1330d5f..0000000 --- a/recipes-graphics/wayland/wayland-kms_1.6.0.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DEPENDS_append_draak = " wayland-native" diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend deleted file mode 100644 index 9385f7a..0000000 --- a/recipes-graphics/wayland/weston_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -EXTRA_OECONF_append_draak = " WAYLAND_PROTOCOLS_SYSROOT_DIR=" diff --git a/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend deleted file mode 100644 index e6e89eb..0000000 --- a/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -EXTRA_OEMAKE += "COMMON_FLAGS="-Wno-error=expansion-to-defined -Wno-error=cast-function-type -Wno-error=sizeof-pointer-div -Wno-error=stringop-truncation -Wno-error=packed-not-aligned"" diff --git a/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend b/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend deleted file mode 100644 index 19fbff6..0000000 --- a/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# upstream recipe includes kernel module to wrong package -FILES_${PN}_draak = "" diff --git a/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend b/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend deleted file mode 100644 index 19fbff6..0000000 --- a/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# upstream recipe includes kernel module to wrong package -FILES_${PN}_draak = "" diff --git a/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend b/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend deleted file mode 100644 index e402136..0000000 --- a/recipes-kernel/linux-libc-headers/linux-libc-headers_%.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -# override to remove asm/bpf_perf_event.h -do_install_armmultilib_draak () { - oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h - oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h -} diff --git a/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch b/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch deleted file mode 100644 index a3a3624..0000000 --- a/recipes-kernel/linux/linux-renesas/0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch +++ /dev/null @@ -1,327 +0,0 @@ -From 1115b5113bc31d048441cc138c6d2f45785bd53e Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Tue, 20 Nov 2018 15:43:47 +0200 -Subject: [PATCH] draak: change lvds timings to match KOE 1280x480 display - -Add new dtb for Draak that enables LVDS output and changes -the panel timings to match KOE tx31d200vm0baa display. ---- - arch/arm64/boot/dts/renesas/Makefile | 1 + - .../boot/dts/renesas/r8a77995-draak-lvds.dts | 296 ++++++++++++++++++ - 2 files changed, 297 insertions(+) - create mode 100644 arch/arm64/boot/dts/renesas/r8a77995-draak-lvds.dts - -diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile -index 3daccfdfc5ea..b24e31d6a1ce 100644 ---- a/arch/arm64/boot/dts/renesas/Makefile -+++ b/arch/arm64/boot/dts/renesas/Makefile -@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb - dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb - dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb - dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb -+dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak-lvds.dtb - - always := $(dtb-y) - clean-files := *.dtb -diff --git a/arch/arm64/boot/dts/renesas/r8a77995-draak-lvds.dts b/arch/arm64/boot/dts/renesas/r8a77995-draak-lvds.dts -new file mode 100644 -index 000000000000..53df48a99c30 ---- /dev/null -+++ b/arch/arm64/boot/dts/renesas/r8a77995-draak-lvds.dts -@@ -0,0 +1,296 @@ -+/* -+ * Device Tree Source for the Draak board -+ * -+ * Copyright (C) 2017 Renesas Electronics Corp. -+ * -+ * This file is licensed under the terms of the GNU General Public License -+ * version 2. This program is licensed "as is" without any warranty of any -+ * kind, whether express or implied. -+ */ -+ -+/dts-v1/; -+#include "r8a77995.dtsi" -+#include <dt-bindings/gpio/gpio.h> -+ -+/ { -+ model = "Renesas Draak board based on r8a77995"; -+ compatible = "renesas,draak", "renesas,r8a77995"; -+ -+ aliases { -+ serial0 = &scif2; -+ ethernet0 = &avb; -+ }; -+ -+ chosen { -+ bootargs = "ignore_loglevel"; -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ memory@48000000 { -+ device_type = "memory"; -+ /* first 128MB is reserved for secure area. */ -+ reg = <0x0 0x48000000 0x0 0x18000000>; -+ }; -+ -+ reserved-memory { -+ #address-cells = <2>; -+ #size-cells = <2>; -+ ranges; -+ -+ /* global autoconfigured region for contiguous allocations */ -+ linux,cma { -+ compatible = "shared-dma-pool"; -+ reusable; -+ reg = <0x00000000 0x58000000 0x0 0x8000000>; -+ linux,cma-default; -+ }; -+ }; -+ -+ reg_1p8v: regulator0 { -+ compatible = "regulator-fixed"; -+ regulator-name = "fixed-1.8V"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ reg_3p3v: regulator1 { -+ compatible = "regulator-fixed"; -+ regulator-name = "fixed-3.3V"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-boot-on; -+ regulator-always-on; -+ }; -+ -+ lvds0 { -+ compatible = "panel-lvds"; -+ -+ width-mm = <210>; -+ height-mm = <158>; -+ -+ data-mapping = "jeida-24"; -+ -+ panel-timing { -+ /* 1280x480 @60Hz */ -+ clock-frequency = <43248000>; -+ hactive = <1280>; -+ vactive = <480>; -+ hback-porch = <40>; -+ hfront-porch = <30>; -+ vback-porch = <30>; -+ vfront-porch = <10>; -+ hsync-len = <10>; -+ vsync-len = <10>; -+ }; -+ port { -+ lvds0_in: endpoint { -+ remote-endpoint = <&du_out_lvds0>; -+ }; -+ }; -+ }; -+ -+ lvds1 { -+ compatible = "panel-lvds"; -+ -+ width-mm = <210>; -+ height-mm = <158>; -+ -+ data-mapping = "jeida-24"; -+ -+ panel-timing { -+ /* 1280x480 @60Hz */ -+ clock-frequency = <43248000>; -+ hactive = <1280>; -+ vactive = <480>; -+ hback-porch = <40>; -+ hfront-porch = <30>; -+ vback-porch = <30>; -+ vfront-porch = <10>; -+ hsync-len = <10>; -+ vsync-len = <10>; -+ }; -+ port { -+ lvds1_in: endpoint { -+ remote-endpoint = <&du_out_lvds1>; -+ }; -+ }; -+ }; -+}; -+ -+&pfc { -+ avb_pins: avb { -+ groups = "avb0_td", "avb0_tx_ctl", "avb0_txc", -+ "avb0_rd", "avb0_rx_ctl", "avb0_rxc", -+ "avb0_txcrefclk", "avb0_mdc", "avb0_mdio"; -+ function = "avb0"; -+ }; -+ -+ sdhi2_pins: sd2 { -+ groups = "mmc_data8", "mmc_ctrl"; -+ function = "mmc"; -+ power-source = <3300>; -+ }; -+ -+ sdhi2_pins_uhs: sd2_uhs { -+ groups = "mmc_data8", "mmc_ctrl"; -+ function = "mmc"; -+ power-source = <1800>; -+ }; -+ -+ usb0_pins: usb0 { -+ groups = "usb0"; -+ function = "usb0"; -+ }; -+ -+}; -+ -+&extal_clk { -+ clock-frequency = <48000000>; -+}; -+ -+&du_dotclkin0 { -+ clock-frequency = <74250000>; -+}; -+ -+&i2c0 { -+ status = "okay"; -+ -+ clock-frequency = <400000>; -+ -+ adv7180: adv7180@20 { -+ compatible = "adi,adv7180"; -+ reg = <0x20>; -+ remote = <&vin4>; -+ -+ port { -+ cvbs_in: endpoint { -+ bus-width = <8>; -+ remote-endpoint = <&vin4ep0>; -+ }; -+ }; -+ }; -+ -+ adv7612: adv7612@4c { -+ compatible = "adi,adv7612"; -+ reg = <0x4c>; -+ remote = <&vin4>; -+ -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ default-input = <0>; -+ -+ port@0 { -+ reg = <0>; -+ }; -+ port@1 { -+ reg = <1>; -+ hdmi_in: endpoint { -+ remote-endpoint = <&vin4ep0>; -+ }; -+ }; -+ }; -+}; -+ -+&avb { -+ pinctrl-0 = <&avb_pins>; -+ pinctrl-names = "default"; -+ renesas,no-ether-link; -+ phy-handle = <&phy0>; -+ status = "okay"; -+ phy-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>; -+ phy-reset-gpios = <&gpio5 18 GPIO_ACTIVE_LOW>; -+ -+ phy0: ethernet-phy@0 { -+ rxc-skew-ps = <1500>; -+ rxdv-skew-ps = <420>; /* default */ -+ rxd0-skew-ps = <420>; /* default */ -+ rxd1-skew-ps = <420>; /* default */ -+ rxd2-skew-ps = <420>; /* default */ -+ rxd3-skew-ps = <420>; /* default */ -+ txc-skew-ps = <900>; /* default */ -+ txen-skew-ps = <420>; /* default */ -+ txd0-skew-ps = <420>; /* default */ -+ txd1-skew-ps = <420>; /* default */ -+ txd2-skew-ps = <420>; /* default */ -+ txd3-skew-ps = <420>; /* default */ -+ reg = <0>; -+ interrupt-parent = <&gpio5>; -+ interrupts = <20 IRQ_TYPE_LEVEL_LOW>; -+ }; -+}; -+ -+&scif2 { -+ status = "okay"; -+}; -+ -+&vin4 { -+ status = "okay"; -+ port { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ vin4ep0: endpoint { -+ remote-endpoint = <&hdmi_in>; -+ bus-width = <8>; -+ }; -+ }; -+}; -+ -+&usb2_phy0 { -+ pinctrl-0 = <&usb0_pins>; -+ pinctrl-names = "default"; -+ -+ status = "okay"; -+}; -+ -+&ehci0 { -+ status = "okay"; -+}; -+ -+&ohci0 { -+ status = "okay"; -+}; -+ -+&sdhi2 { -+ /* used for on-board 8bit eMMC */ -+ pinctrl-0 = <&sdhi2_pins>; -+ pinctrl-1 = <&sdhi2_pins_uhs>; -+ pinctrl-names = "default", "state_uhs"; -+ -+ vmmc-supply = <®_3p3v>; -+ vqmmc-supply = <®_1p8v>; -+ mmc-hs200-1_8v; -+ bus-width = <8>; -+ non-removable; -+ status = "okay"; -+}; -+ -+&du { -+ status = "okay"; -+ -+ /* update <du_dotclkin0/1> */ -+ clocks = <&cpg CPG_MOD 724>, -+ <&cpg CPG_MOD 723>, -+ <&cpg CPG_MOD 727>, -+ <&cpg CPG_MOD 727>, -+ <&du_dotclkin0>; -+ -+ backlight0-gpios = <&gpio2 31 GPIO_ACTIVE_HIGH>;/* LVDS0 */ -+ backlight1-gpios = <&gpio4 0 GPIO_ACTIVE_HIGH>; /* LVDS1 */ -+ -+ ports { -+ port@1 { -+ endpoint { -+ remote-endpoint = <&lvds0_in>; -+ }; -+ }; -+ port@2 { -+ endpoint { -+ remote-endpoint = <&lvds1_in>; -+ }; -+ }; -+ }; -+}; diff --git a/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch b/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch deleted file mode 100644 index f7e0c48..0000000 --- a/recipes-kernel/linux/linux-renesas/0001-give-up-on-gcc-ilog2-constant-optimizations.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 32e78d93f53889686bc1d90865fcc33ec5c9e80d Mon Sep 17 00:00:00 2001 -From: Linus Torvalds <torvalds@linux-foundation.org> -Date: Thu, 2 Mar 2017 12:17:22 -0800 -Subject: [PATCH] give up on gcc ilog2() constant optimizations - -gcc-7 has an "optimization" pass that completely screws up, and -generates the code expansion for the (impossible) case of calling -ilog2() with a zero constant, even when the code gcc compiles does not -actually have a zero constant. - -And we try to generate a compile-time error for anybody doing ilog2() on -a constant where that doesn't make sense (be it zero or negative). So -now gcc7 will fail the build due to our sanity checking, because it -created that constant-zero case that didn't actually exist in the source -code. - -There's a whole long discussion on the kernel mailing about how to work -around this gcc bug. The gcc people themselevs have discussed their -"feature" in - - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=72785 - -but it's all water under the bridge, because while it looked at one -point like it would be solved by the time gcc7 was released, that was -not to be. - -So now we have to deal with this compiler braindamage. - -And the only simple approach seems to be to just delete the code that -tries to warn about bad uses of ilog2(). - -So now "ilog2()" will just return 0 not just for the value 1, but for -any non-positive value too. - -It's not like I can recall anybody having ever actually tried to use -this function on any invalid value, but maybe the sanity check just -meant that such code never made it out in public. - -Reported-by: Laura Abbott <labbott@redhat.com> -Cc: John Stultz <john.stultz@linaro.org>, -Cc: Thomas Gleixner <tglx@linutronix.de> -Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> -Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> ---- - include/linux/log2.h | 13 ++----------- - tools/include/linux/log2.h | 13 ++----------- - 2 files changed, 4 insertions(+), 22 deletions(-) - -diff --git a/include/linux/log2.h b/include/linux/log2.h -index fd7ff3d91e6a..f38fae23bdac 100644 ---- a/include/linux/log2.h -+++ b/include/linux/log2.h -@@ -15,12 +15,6 @@ - #include <linux/types.h> - #include <linux/bitops.h> - --/* -- * deal with unrepresentable constant logarithms -- */ --extern __attribute__((const, noreturn)) --int ____ilog2_NaN(void); -- - /* - * non-constant log of base 2 calculators - * - the arch may override these in asm/bitops.h if they can be implemented -@@ -85,7 +79,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - #define ilog2(n) \ - ( \ - __builtin_constant_p(n) ? ( \ -- (n) < 1 ? ____ilog2_NaN() : \ -+ (n) < 2 ? 0 : \ - (n) & (1ULL << 63) ? 63 : \ - (n) & (1ULL << 62) ? 62 : \ - (n) & (1ULL << 61) ? 61 : \ -@@ -148,10 +142,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - (n) & (1ULL << 4) ? 4 : \ - (n) & (1ULL << 3) ? 3 : \ - (n) & (1ULL << 2) ? 2 : \ -- (n) & (1ULL << 1) ? 1 : \ -- (n) & (1ULL << 0) ? 0 : \ -- ____ilog2_NaN() \ -- ) : \ -+ 1 ) : \ - (sizeof(n) <= 4) ? \ - __ilog2_u32(n) : \ - __ilog2_u64(n) \ -diff --git a/tools/include/linux/log2.h b/tools/include/linux/log2.h -index 41446668ccce..d5677d39c1e4 100644 ---- a/tools/include/linux/log2.h -+++ b/tools/include/linux/log2.h -@@ -12,12 +12,6 @@ - #ifndef _TOOLS_LINUX_LOG2_H - #define _TOOLS_LINUX_LOG2_H - --/* -- * deal with unrepresentable constant logarithms -- */ --extern __attribute__((const, noreturn)) --int ____ilog2_NaN(void); -- - /* - * non-constant log of base 2 calculators - * - the arch may override these in asm/bitops.h if they can be implemented -@@ -78,7 +72,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - #define ilog2(n) \ - ( \ - __builtin_constant_p(n) ? ( \ -- (n) < 1 ? ____ilog2_NaN() : \ -+ (n) < 2 ? 0 : \ - (n) & (1ULL << 63) ? 63 : \ - (n) & (1ULL << 62) ? 62 : \ - (n) & (1ULL << 61) ? 61 : \ -@@ -141,10 +135,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) - (n) & (1ULL << 4) ? 4 : \ - (n) & (1ULL << 3) ? 3 : \ - (n) & (1ULL << 2) ? 2 : \ -- (n) & (1ULL << 1) ? 1 : \ -- (n) & (1ULL << 0) ? 0 : \ -- ____ilog2_NaN() \ -- ) : \ -+ 1 ) : \ - (sizeof(n) <= 4) ? \ - __ilog2_u32(n) : \ - __ilog2_u64(n) \ diff --git a/recipes-kernel/linux/linux-renesas_%.bbappend b/recipes-kernel/linux/linux-renesas_%.bbappend deleted file mode 100644 index edabc4b..0000000 --- a/recipes-kernel/linux/linux-renesas_%.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend_draak := "${THISDIR}/${PN}:" - -SRC_URI_append_draak = " \ - file://0001-give-up-on-gcc-ilog2-constant-optimizations.patch \ - file://0001-draak-change-lvds-timings-to-match-KOE-1280x480-disp.patch \ - " diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend deleted file mode 100644 index 9658abf..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DEPENDS_append_draak = " wayland-kms libgbm" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend deleted file mode 100644 index ef8dcdf..0000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -DEPENDS_append_draak = " wayland-kms libgbm" |