Fix to NVidia's tegra configurations.

Changed both nvidia-logan and tegra-t18x to use the same metalayer from the Vibrante 4.0 SDK.
Kernel sources and libraries are stored into the internal CI repository.
These definitions can be overridden by SDK folder using following environment variables:

export KERN_DIR=~/Vibrante4.0_RC1/vibrante-t186ref-linux_src/kernel
export PLATFORM_TOPDIR=~/Vibrante4.0_RC1/vibrante-t186ref-linux
export TOOLCHAIN_PATH=~/Vibrante4.0_RC1/toolchains/tegra-4.9-nv
export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE TOOLCHAIN_PATH KERN_DIR PLATFORM_TOPDIR"

Change-Id: If58a0fcbe01daa9a55dd041b79a9d80a90fde284
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

3 files changed, 69 insertions, 20 deletions

diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
index 21dd305..5849cfd 100644
--- a/conf/distro/include/nvidia-logan.conf
+++ b/conf/distro/include/nvidia-logan.conf
@@ -19,7 +19,13 @@
 ##
 ##############################################################################
 
-DISTRO_FEATURES_remove += "wayland"
+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 \
@@ -36,3 +42,17 @@ MACHINE_EXTRA_INSTALL_SDK = "\
         libdrm-nv-dev \
 "
 
+PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
+PREFERRED_PROVIDER_drm ?= "libdrm-nv"
+
+BBMASK ?= " "
+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/external-tegra-toolchain.bb\
+|meta-vib3/recipes-core/packagegroups\
+"
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index 12b57d4..baf7f5c 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -20,34 +20,43 @@
 ##
 #############################################################################
 
+include conf/distro/include/tegra.inc
+
 TARGET_CFLAGS += " -DWIN_INTERFACE_CUSTOM"
-DISTRO_FEATURES_DEFAULT += "wayland weston"
+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")}'
+NVLAYER_DIR ?= "${TOPDIR}/../sources/nvidia-layer"
 
 MACHINE_EXTRA_INSTALL = "\
-tegra-firmware-fecs \
-tegra-firmware-gmicrocode \
-tegra-firmware-gpccs \
-tegra-firmware-gpmu \
-tegra-firmware-gshader \
-tegra-firmware-pmu \
-tegra-firmware-prod-fuse \
-tegra-firmware-xusb \
-tegra-firmware-vic \
-tegra-firmware-nvdec \
-tegra-firmware-nvenc \
-tegra-firmware-nvjpeg \
-tegra-drivers \
-virtual/libegl \
-virtual/libgles2 \
-libdrm-nv \
-asound-conf \
-"
+    tegra-firmware-fecs \
+    tegra-firmware-gmicrocode \
+    tegra-firmware-gpccs \
+    tegra-firmware-gpmu \
+    tegra-firmware-gshader \
+    tegra-firmware-pmu \
+    tegra-firmware-prod-fuse \
+    tegra-firmware-xusb \
+    tegra-firmware-vic \
+    tegra-firmware-nvdec \
+    tegra-firmware-nvenc \
+    tegra-firmware-nvjpeg \
+    tegra-drivers \
+    virtual/libegl \
+    virtual/libgles2 \
+    libdrm-nv \
+    asound-conf \
+    "
 
 PREFERRED_PROVIDER_virtual/libgles2 ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libgles2-dev ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libegl ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/libegl-dev ?= "tegra-drivers"
 PREFERRED_PROVIDER_virtual/egl ?= "tegra-drivers"
+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"
@@ -64,4 +73,7 @@ BBMASK .= "\
 |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\
 "
diff --git a/conf/distro/include/tegra.inc b/conf/distro/include/tegra.inc
new file mode 100644
index 0000000..618a634
--- /dev/null
+++ b/conf/distro/include/tegra.inc
@@ -0,0 +1,17 @@
+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)
+}
+