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>

9 files changed, 363 insertions, 0 deletions

diff --git a/meta-vib3-extras/conf/layer.conf b/meta-vib3-extras/conf/layer.conf
new file mode 100644
index 0000000..8a3341f
--- /dev/null
+++ b/meta-vib3-extras/conf/layer.conf
@@ -0,0 +1,32 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+"
+
+BBFILE_COLLECTIONS += "b2qt_vib3"
+BBFILE_PATTERN_b2qt_vib3 := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_vib3 = "20"
diff --git a/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend
new file mode 100644
index 0000000..6080c3f
--- /dev/null
+++ b/meta-vib3-extras/recipes/graphics-fw/graphics-fw_1.0.bbappend
@@ -0,0 +1,26 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+SRC_URI_remove = " \
+    file://${PLATFORM_TOPDIR}/lib-target/NETB_img.bin \
+    file://${PLATFORM_TOPDIR}/lib-target/nvhost_msenc031.fw \
+    file://${PLATFORM_TOPDIR}/lib-target/vic03_ucode.bin \
+"
diff --git a/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
new file mode 100644
index 0000000..3ff042b
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux-libc-headers/linux-libc-headers_4.1.bbappend
@@ -0,0 +1,9 @@
+
+# Use our kernel instead of yocto which defaults to mainline 3.10.
+# Commit id of our kernel's include/uapi directory in kernel tree -
+# 8c37e1bfe7dd26a9d4cf4510460a75264c906444
+SRC_URI = "file://${KERN_DIR}/linux.tar.bz2"
+
+# Extracting linux.tar.bz2 creates directories
+# <top>/vibrante-oss-src/kernel
+S = "${WORKDIR}/vibrante-oss-src/kernel"
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
new file mode 100644
index 0000000..ee61a74
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch
@@ -0,0 +1,52 @@
+From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index f89515a..2bb8cac 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+        return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd8..f6aa84d 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-       return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);
+-- 
+1.9.1
+
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
new file mode 100644
index 0000000..66f031f
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/0001-Change-extern-inline-to-static-inline.patch
@@ -0,0 +1,133 @@
+From 0873625fb43dda5a54919b7414f235cdfdd98ddc Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 13 Apr 2016 15:42:49 +0300
+Subject: [PATCH] Change "extern inline" to "static inline"
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). "static inline" is the correct choice
+instead.
+---
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 10 +++++-----
+ drivers/staging/rtl8712/ieee80211.h            |  4 ++--
+ lib/mpi/mpi-inline.h                           |  2 +-
+ lib/mpi/mpi-internal.h                         | 16 ++++++++--------
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211.h b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+index 502bfdb..1c8d026 100644
+--- a/drivers/staging/rtl8192u/ieee80211/ieee80211.h
++++ b/drivers/staging/rtl8192u/ieee80211/ieee80211.h
+@@ -2254,7 +2254,7 @@ static inline void *ieee80211_priv(struct net_device *dev)
+        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -2270,7 +2270,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
++static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
+ {
+        /*
+         * It is possible for both access points and our device to support
+@@ -2296,7 +2296,7 @@ extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mod
+        return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = IEEE80211_3ADDR_LEN;
+ 
+@@ -2582,12 +2582,12 @@ void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee);
+ 
+ extern const long ieee80211_wlan_frequencies[];
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
++static inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
+ {
+        ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
++static inline int ieee80211_get_scans(struct ieee80211_device *ieee)
+ {
+        return ieee->scans;
+ }
+diff --git a/drivers/staging/rtl8712/ieee80211.h b/drivers/staging/rtl8712/ieee80211.h
+index 21515c3..7518061 100644
+--- a/drivers/staging/rtl8712/ieee80211.h
++++ b/drivers/staging/rtl8712/ieee80211.h
+@@ -734,7 +734,7 @@ enum ieee80211_state {
+ #define IEEE_G            (1<<2)
+ #define IEEE_MODE_MASK    (IEEE_A|IEEE_B|IEEE_G)
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+ {
+        /* Single white space is for Linksys APs */
+        if (essid_len == 1 && essid[0] == ' ')
+@@ -748,7 +748,7 @@ extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
+        return 1;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++static inline int ieee80211_get_hdrlen(u16 fc)
+ {
+        int hdrlen = 24;
+ 
+diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
+index e2b3985..c245ea3 100644
+--- a/lib/mpi/mpi-inline.h
++++ b/lib/mpi/mpi-inline.h
+@@ -30,7 +30,7 @@
+ #define G10_MPI_INLINE_H
+ 
+ #ifndef G10_MPI_INLINE_DECL
+-#define G10_MPI_INLINE_DECL  extern inline
++#define G10_MPI_INLINE_DECL  static inline
+ #endif
+ 
+ G10_MPI_INLINE_DECL mpi_limb_t
+diff --git a/lib/mpi/mpi-internal.h b/lib/mpi/mpi-internal.h
+index 77adcf6..4566d11 100644
+--- a/lib/mpi/mpi-internal.h
++++ b/lib/mpi/mpi-internal.h
+@@ -172,20 +172,20 @@ void mpi_rshift_limbs(MPI a, unsigned int count);
+ int mpi_lshift_limbs(MPI a, unsigned int count);
+ 
+ /*-- mpihelp-add.c --*/
+-mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
++//mpi_limb_t mpihelp_add_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_add_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++//mpi_limb_t mpihelp_add(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-sub.c --*/
+-mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+-                        mpi_size_t s1_size, mpi_limb_t s2_limb);
++//mpi_limb_t mpihelp_sub_1(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
++//                      mpi_size_t s1_size, mpi_limb_t s2_limb);
+ mpi_limb_t mpihelp_sub_n(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr,
+                         mpi_ptr_t s2_ptr, mpi_size_t size);
+-mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
+-                      mpi_ptr_t s2_ptr, mpi_size_t s2_size);
++//mpi_limb_t mpihelp_sub(mpi_ptr_t res_ptr, mpi_ptr_t s1_ptr, mpi_size_t s1_size,
++//                    mpi_ptr_t s2_ptr, mpi_size_t s2_size);
+ 
+ /*-- mpihelp-cmp.c --*/
+ int mpihelp_cmp(mpi_ptr_t op1_ptr, mpi_ptr_t op2_ptr, mpi_size_t size);
+-- 
+1.9.1
+
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch
new file mode 100644
index 0000000..8bbc38b
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compile_error_in_tegra_drivers.patch
@@ -0,0 +1,20 @@
+--- a/drivers/platform/tegra/tegra_cl_dvfs.c    2016-04-19 13:05:46.897056724 +0300
++++ b/drivers/platform/tegra/tegra_cl_dvfs.c    2016-04-19 12:55:28.053751626 +0300
+@@ -1021,7 +1021,7 @@
+ 
+ static void cl_dvfs_calibrate(struct tegra_cl_dvfs *cld)
+ {
+-       u32 val, data;
++       u32 val=0, data=0;
+        ktime_t now;
+        unsigned long rate;
+        unsigned long step = RATE_STEP(cld);
+@@ -3303,7 +3303,7 @@
+ 
+ static int monitor_get(void *data, u64 *val)
+ {
+-       u32 v, s;
++       u32 v=0, s=0;
+        unsigned long flags;
+        struct clk *c = (struct clk *)data;
+        struct tegra_cl_dvfs *cld = ((struct clk *)data)->u.dfll.cl_dvfs;
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch
new file mode 100644
index 0000000..fc8fe9f
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia/Fix_compiler_error_in_tegra12_lock.patch
@@ -0,0 +1,11 @@
+--- a/drivers/platform/tegra/tegra12_clocks.c   2016-04-19 13:51:34.912235128 +0300
++++ b/drivers/platform/tegra/tegra12_clocks.c   2016-04-19 13:51:55.739478254 +0300
+@@ -1331,7 +1331,7 @@
+  */
+ static void tegra12_cpu_clk_init(struct clk *c)
+ {
+-       c->state = (!is_lp_cluster() == (c->u.cpu.mode == MODE_G))? ON : OFF;
++       c->state = ((!is_lp_cluster()) == (c->u.cpu.mode == MODE_G))? ON : OFF;
+ }
+ 
+ static int tegra12_cpu_clk_enable(struct clk *c)
diff --git a/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend
new file mode 100644
index 0000000..5d4b59a
--- /dev/null
+++ b/meta-vib3-extras/recipes/linux/linux-nvidia_3.10.bbappend
@@ -0,0 +1,57 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+FILESEXTRAPATHS_prepend := "__default:${THISDIR}/${PN}:"
+
+DEPENDS_remove = "external-tegra-toolchain"
+do_kernel_defconfig[depends] = "kern-tools-native:do_populate_sysroot"
+
+SRC_URI += "\
+    file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \
+    file://0001-Change-extern-inline-to-static-inline.patch \
+    file://Fix_compile_error_in_tegra_drivers.patch \
+    file://Fix_compiler_error_in_tegra12_lock.patch \
+    "
+
+do_compile_prepend () {
+    # Cross compiling exports
+    export ARCH=${TARGET_ARCH}
+    export CROSS_COMPILE=${CROSS_COMPILE}
+
+    echo "CONFIG_FHANDLE=y" >> ${B}/.config
+    make olddefconfig
+}
+
+do_install_append() {
+    s=$(readlink -m "${S}")
+    kernsrc="${STAGING_KERNEL_DIR}"
+
+    if [ "${s}" != "${kernsrc}" ]; then
+        mkdir -p "${kernsrc}"
+        rm -rf "${kernsrc}"
+        mv "${S}" "${STAGING_KERNEL_DIR}"
+        ln -sf "${kernsrc}" "${s}"
+    fi
+}
+
+python do_patch () {
+    bb.build.exec_func('patch_do_patch', d)
+}
diff --git a/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend b/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend
new file mode 100644
index 0000000..c33ee23
--- /dev/null
+++ b/meta-vib3-extras/recipes/qt5/qtbase_git.bbappend
@@ -0,0 +1,23 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+DEPENDS += "graphics-headers"
+PACKAGECONFIG += "kms"