From f956591bbe246fae0dc4ed9b6d911bcec526463f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Thu, 13 Oct 2016 13:06:09 +0300
Subject: Revert "tegra: update to latest vibrante pdk"

Problems with eglfs, so revert back to previous PDK.

This reverts commit 323408406d9133a5462a24fea4ec86e649088180.

Change-Id: I3ee36809cb823aefdc03f8a24d052c2a76f308db
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
---
 scripts/manifest.xml         | 9 +++++++--
 scripts/setup-environment.sh | 3 +++
 scripts/upload.sh            | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index afbc05c..e6a423c 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -69,12 +69,17 @@
 
   <project name="nvidia-layer"
            remote="playground"
-           revision="7c95fabf8d71617130f71464207dd55c3079facd"
+           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="e947e8f412b41ef673714e752a4065dc2f4fb04e"
+           revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f"
            path="sources/vibrante-t186"
            groups="notdefault,internal"/>
   <project name="meta-smx6"
diff --git a/scripts/setup-environment.sh b/scripts/setup-environment.sh
index 1a72d28..5825bf1 100755
--- a/scripts/setup-environment.sh
+++ b/scripts/setup-environment.sh
@@ -77,6 +77,9 @@ 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 5048797..af7e1f2 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} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \
+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 \
-- 
cgit v1.2.3-54-g00ecf