diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-11-10 16:59:30 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-11-14 13:59:15 +0000 |
commit | 1f764ffe81de51f9c8ee1cbac33abfb2fb3bc722 (patch) | |
tree | 26e4988667b948aac99c87c6f34d4c3a4ded4617 /scripts | |
parent | 802deb0631710a0f16965a0dce2b87a7478d598e (diff) | |
download | meta-boot2qt-1f764ffe81de51f9c8ee1cbac33abfb2fb3bc722.tar.gz |
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>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/manifest.xml | 9 | ||||
-rwxr-xr-x | scripts/setup-environment.sh | 3 | ||||
-rwxr-xr-x | scripts/upload.sh | 2 |
3 files changed, 3 insertions, 11 deletions
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 @@ | |||
63 | 63 | ||
64 | <project name="nvidia-layer" | 64 | <project name="nvidia-layer" |
65 | remote="playground" | 65 | remote="playground" |
66 | revision="38c9b1d76037ff39b9e0cbd679b3e04b36c86ed7" | 66 | revision="7c95fabf8d71617130f71464207dd55c3079facd" |
67 | path="sources/nvidia-layer" | 67 | path="sources/nvidia-layer" |
68 | groups="notdefault,internal"/> | 68 | groups="notdefault,internal"/> |
69 | <project name="jetson-tk1-pro" | ||
70 | remote="playground" | ||
71 | revision="a376c795d5361fda4ea5f19feecc23ab7e753646" | ||
72 | path="sources/jetson-tk1-pro" | ||
73 | groups="notdefault,internal"/> | ||
74 | <project name="vibrante-t186" | 69 | <project name="vibrante-t186" |
75 | remote="playground" | 70 | remote="playground" |
76 | revision="edc10bf3f4b17333021f85e9ad32f85838e2c33f" | 71 | revision="e947e8f412b41ef673714e752a4065dc2f4fb04e" |
77 | path="sources/vibrante-t186" | 72 | path="sources/vibrante-t186" |
78 | groups="notdefault,internal"/> | 73 | groups="notdefault,internal"/> |
79 | <project name="meta-smx6" | 74 | <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 | |||
74 | intel-corei7-64) | 74 | intel-corei7-64) |
75 | LAYERSCONF="bblayers.conf.intel.sample" | 75 | LAYERSCONF="bblayers.conf.intel.sample" |
76 | ;; | 76 | ;; |
77 | nvidia-logan) | ||
78 | LAYERSCONF="bblayers.conf.nvidia-logan.sample" | ||
79 | ;; | ||
80 | tegra-x1|tegra-t18x) | 77 | tegra-x1|tegra-t18x) |
81 | LAYERSCONF="bblayers.conf.nvidia-tegra.sample" | 78 | LAYERSCONF="bblayers.conf.nvidia-tegra.sample" |
82 | ;; | 79 | ;; |
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 | |||
41 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 41 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
42 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ | 42 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.img \ |
43 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf | 43 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.conf |
44 | elif ([ ${MACHINE} = "nvidia-logan" ] || [ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \ | 44 | elif ([ ${MACHINE} = "tegra-x1" ] || [ ${MACHINE} = "tegra-t18x" ]) \ |
45 | && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then | 45 | && [ -e tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz ]; then |
46 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ | 46 | 7z a -l b2qt-${PROJECT}-qt5-image-${MACHINE}.7z \ |
47 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ | 47 | $PWD/tmp/deploy/images/${MACHINE}/b2qt-${PROJECT}-qt5-image-${MACHINE}.tar.gz \ |