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>

4 files changed, 23 insertions, 9 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 28ccfa3..4c1e70f 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -73,16 +73,21 @@
            path="sources/meta-intel"
            groups="notdefault,external,intel"/>
 
-  <project name="meta-tegra"
+  <project name="nvidia-layer"
            remote="playground"
-           revision="3125d29a5c58a471b67104d1bff965df38eb3115"
-           path="sources/meta-tegra"
+           revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7"
+           path="sources/nvidia-layer"
            groups="notdefault,internal"/>
   <project name="jetson-tk1-pro"
            remote="playground"
            revision="a376c795d5361fda4ea5f19feecc23ab7e753646"
            path="sources/jetson-tk1-pro"
            groups="notdefault,internal"/>
+  <project name="vibrante-t186"
+           remote="playground"
+           revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f"
+           path="sources/vibrante-t186"
+           groups="notdefault,internal"/>
   <project name="meta-smx6"
            remote="playground"
            revision="c2f639ef4b2fd5809ab95fb330d28c2716aa290d"
diff --git a/scripts/manifest_jethro.xml b/scripts/manifest_jethro.xml
index 29b401c..6044ae5 100644
--- a/scripts/manifest_jethro.xml
+++ b/scripts/manifest_jethro.xml
@@ -73,16 +73,21 @@
            path="sources/meta-intel"
            groups="notdefault,external,intel"/>
 
-  <project name="meta-tegra"
+  <project name="nvidia-layer"
            remote="playground"
            revision="master"
-           path="sources/meta-tegra"
+           path="sources/nvidia-layer"
            groups="notdefault,internal"/>
   <project name="jetson-tk1-pro"
            remote="playground"
            revision="master"
            path="sources/jetson-tk1-pro"
            groups="notdefault,internal"/>
+  <project name="vibrante-t186"
+           remote="playground"
+           revision="master"
+           path="sources/vibrante-t186"
+           groups="notdefault,internal"/>
   <project name="meta-smx6"
            remote="playground"
            revision="fido"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 19f7ffa..1fb4d89 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -72,8 +72,11 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     intel-corei7-64)
       LAYERSCONF="bblayers.conf.intel.sample"
     ;;
-    nvidia-logan|tegra-x1|tegra-t18x)
-      LAYERSCONF="bblayers.conf.nvidia.sample"
+    nvidia-logan)
+      LAYERSCONF="bblayers.conf.nvidia-logan.sample"
+    ;;
+    tegra-x1|tegra-t18x)
+      LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
     ;;
     emulator)
       LAYERSCONF="bblayers.conf.emulator.sample"
diff --git a/scripts/upload.sh b/scripts/upload.sh
index 60e7e14..fc9c837 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -33,10 +33,11 @@ elif [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf
-elif [ ${MACHINE} == "nvidia-logan" || ${MACHINE} == "tegra-x1" || ${MACHINE} == "tegra-t18x" ] && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
+elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \
+    && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then
   7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \
-    $PWD/tmp/deploy/images/${MACHINE}/zImage
+    $PWD/tmp/deploy/images/${MACHINE}/*Image
 fi
 
 if [ -e b2qt-${PROJECT}-qt5-image-${MACHINE}.7z ]; then