Merge remote-tracking branch 'origin/morty' into pyro

* origin/morty:

  qtivi: don't use dlt by default
  poky, meta layers: update morty branches to latest version
  Remove all *.ci.local network addresses

Conflicts:
   scripts/manifest.xml

Change-Id: I7918561f735604be2fd7e532bd3dfb8aec1d068d

2 files changed, 3 insertions, 3 deletions

diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index 5c5e558..569c0c8 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -73,12 +73,12 @@
            groups="notdefault,external,renesas-gen3"/>
   <project name="meta-toradex-bsp-common"
            remote="toradex"
-           revision="554adccf11f2ba2947ed221307ddd703c0889967"
+           revision="b128af95613557af8deaea30212e89e6316eab88"
            path="sources/meta-toradex-bsp-common"
            groups="notdefault,external,toradex"/>
   <project name="meta-toradex-nxp"
            remote="toradex"
-           revision="d351e11b76c004afbf0f37d5481266bafdb015ee"
+           revision="89a17628efef01fd5af202e88d79188df08f636f"
            path="sources/meta-toradex-nxp"
            groups="notdefault,external,toradex"/>
 
diff --git a/scripts/upload.sh b/scripts/upload.sh
index cb94719..4f4e1a8 100755
--- a/scripts/upload.sh
+++ b/scripts/upload.sh
@@ -32,7 +32,7 @@ set -x
 set -e
 
 RELEASE=$(grep PV ../sources/meta-qt5/recipes-qt/qt5/qt5-git.inc | grep -o [0-9.]*)
-UPLOADPATH=QT@ci-files02-hki.ci.local:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
+UPLOADPATH=QT@ci-files02-hki.intra.qt.io:/srv/jenkins_data/enterprise/b2qt/yocto/${RELEASE}/
 UPLOADS="\
     tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \
     tmp/deploy/sdk/b2qt-x86_64-meta-toolchain-b2qt-${PROJECT}-qt5-sdk-${MACHINE}.sh \