tegra: update to latest vibrante pdk

[RC 2.5] 25.11.01 Vibrante 4.0 Linux Drive CX2 - PDK

Drop support for nvidia-logan

Change-Id: Ic8c76313704c3e666050284f02cb1a40237366e5
Reviewed-by: Risto Avila <risto.avila@qt.io>

4 files changed, 6 insertions, 148 deletions

diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample
deleted file mode 100644
index 9a7272c..0000000
--- a/conf/bblayers.conf.nvidia-logan.sample
+++ /dev/null
@@ -1,53 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
-# changes incompatibly
-POKY_BBLAYERS_CONF_VERSION = "2"
-
-BBPATH = "${TOPDIR}"
-BBFILES ?= ""
-BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}"
-
-BBLAYERS ?= " \
-  ${BSPDIR}/sources/poky/meta \
-  ${BSPDIR}/sources/poky/meta-poky \
-  ${BSPDIR}/sources/nvidia-layer/meta-tegra \
-  ${BSPDIR}/sources/nvidia-layer/meta-vib3 \
-  ${BSPDIR}/sources/meta-openembedded/meta-oe \
-  ${BSPDIR}/sources/meta-openembedded/meta-python \
-  ${BSPDIR}/sources/meta-openembedded/meta-networking \
-  ${BSPDIR}/sources/meta-openembedded/meta-initramfs \
-  ${BSPDIR}/sources/meta-openembedded/meta-multimedia \
-  ${BSPDIR}/sources/meta-boot2qt \
-  ${BSPDIR}/sources/meta-boot2qt/meta-vib3-extras \
-  ${BSPDIR}/sources/meta-boot2qt/meta-tegra-extras \
-  ${BSPDIR}/sources/meta-mingw \
-  ${BSPDIR}/sources/meta-qt5 \
-  "
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
deleted file mode 100644
index 0dc1d84..0000000
--- a/conf/distro/include/nvidia-logan.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
-
-DEFAULTTUNE = "cortexa15hf-neon"
-
-KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
-PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/jetson-tk1-pro/vibrante-vcm30t124-linux")}'
-NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
-
-MACHINE_EXTRA_INSTALL = "\
-        libegl \
-        libgles2 \
-        tegra-firmware-gk20a \
-        graphics-fw \
-        libdrm-nv \
-"
-
-MACHINE_EXTRA_INSTALL_SDK = "\
-        libegl-dev \
-        libgles2-dev \
-        graphics-headers-dev \
-        libdrm-nv-dev \
-"
-
-PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
-PREFERRED_PROVIDER_drm ?= "libdrm-nv"
-
-BBMASK += "\
-    meta-vib3/recipes-kernel/linux-libc-headers \
-    meta-vib3/recipes-devtools/binutils \
-    meta-vib3/recipes-core/eglibc \
-    meta-vib3/recipes-core/systemd \
-    meta-vib3/recipes-connectivity \
-    meta-vib3/recipes-multimedia/pulseaudio \
-    meta-vib3/recipes-core/meta \
-    meta-vib3/recipes-core/packagegroups \
-    meta-vib3/recipes-devtools/gcc \
-    "
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index 515eb8d..f317ca9 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -20,15 +20,13 @@
 ##
 #############################################################################
 
-include conf/distro/include/tegra.inc
-
 OLDEST_KERNEL_aarch64 = "3.18"
 
 TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
 DISTRO_FEATURES_DEFAULT += "wayland"
 
 KERN_DIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/kernel")}'
-PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186/vibrante-t186ref-linux")}'
+PLATFORM_TOPDIR ?= '${@os.path.normpath("${TOPDIR}/../sources/vibrante-t186")}'
 NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 
 MACHINE_EXTRA_INSTALL = "\
@@ -48,7 +46,6 @@ MACHINE_EXTRA_INSTALL = "\
     virtual/libegl \
     virtual/libgles2 \
     libdrm-nv \
-    asound-conf \
     "
 
 PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers"
@@ -60,21 +57,18 @@ PREFERRED_PROVIDER_virtual/libgl ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libgles1 ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/mesa ?= "tegra-drivers"
 
-PREFERRED_PROVIDER_wayland ?= "wayland-nv"
-PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
-PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
-
 BBMASK += "\
     meta-vib4/recipes-connectivity/connman \
-    meta-vib4/recipes-core/busybox \
+    meta-vib4/recipes-core/toybox \
     meta-vib4/recipes-core/images \
-    meta-vib4/recipes-core/meta \
     meta-vib4/recipes-core/packagegroups \
-    meta-vib4/recipes-core/systemd/systemd \
-    meta-vib4/recipes-devtools \
     meta-vib4/recipes-extended \
     meta-vib4/recipes-multimedia/audiomanager \
     meta-vib4/recipes-core/glibc \
     meta-vib4/recipes-support/lvm2 \
     meta-vib4/recipes-kernel/linux-libc-headers \
+    meta-vib4/recipes-devtools/binutils \
+    meta-vib4/recipes-yocto-ivi/packagegroups \
+    meta-vib4/recipes-graphics/wayland/wayland-ivi-extension_%.bbappend \
+    meta-vib4/recipes-graphics/wayland/libinput_%.bbappend \
     "
diff --git a/conf/distro/include/tegra.inc b/conf/distro/include/tegra.inc
deleted file mode 100644
index 618a634..0000000
--- a/conf/distro/include/tegra.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-python set_nv_drv_version () {
-    # Boiler plate code to setup bitbake objects
-    d = e.data
-
-    nv_drv_version = d.getVar('NV_DRV_VER', True)
-    if nv_drv_version != "ignore":
-        # FIXME: When we add support to internal builds, both debug and release
-        # builds will need to be considered
-        path = d.getVar('PLATFORM_TOPDIR', True)
-        get_nv_drv_cmd = "strings " + path + "/lib-target/nvidia_drv.so \
-| grep -o -P '(?<=Driver ).*(?=Release)' | awk {'print $1'}"
-        # Execute cmd
-        nv_drv_version = bb.process.run(get_nv_drv_cmd)[0].strip()
-        # Store returned value in NV_DRV_VER
-        d.setVar('NV_DRV_VER', nv_drv_version)
-}
-