From 1f764ffe81de51f9c8ee1cbac33abfb2fb3bc722 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 10 Nov 2016 16:59:30 +0200
Subject: 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: I9b2c55f213ff3eb01969a49ad64e596692fcee31
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 scripts/manifest.xml         | 9 ++-------
 scripts/setup-environment.sh | 3 ---
 scripts/upload.sh            | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 9d4061c..1938aee 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -63,17 +63,12 @@
 
   <project name="nvidia-layer"
            remote="playground"
-           revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7"
+           revision="7c95fabf8d71617130f71464207dd55c3079facd"
            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"
+           revision="e947e8f412b41ef673714e752a4065dc2f4fb04e"
            path="sources/vibrante-t186"
            groups="notdefault,internal"/>
   <project name="meta-smx6"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index cd48639..2f8264b 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -74,9 +74,6 @@ if [ ! -f ${PWD}/${BUILDDIRECTORY}/conf/bblayers.conf ]; then
     intel-corei7-64)
       LAYERSCONF="bblayers.conf.intel.sample"
     ;;
-    nvidia-logan)
-      LAYERSCONF="bblayers.conf.nvidia-logan.sample"
-    ;;
     tegra-x1|tegra-t18x)
       LAYERSCONF="bblayers.conf.nvidia-tegra.sample"
     ;;
diff --git a/scripts/upload.sh b/scripts/upload.sh
index af7e1f2..5048797 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -41,7 +41,7 @@ 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" ]) \
+elif ([ ${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 \
-- 
cgit v1.2.3-54-g00ecf