[TRE-1496] Rename selected Artik and RPi3 images

Relevant issue: https://bugs.tizen.org/browse/TRE-1496

Change-Id: Ied7838122d49afa47fe4dbb2f143689aa7a5c74e

4 files changed, 41 insertions, 39 deletions

diff --git a/tsp/common.sh b/tsp/common.sh
index 810865a..fdac11a 100755
--- a/tsp/common.sh
+++ b/tsp/common.sh
@@ -171,7 +171,7 @@ get_userspace_dir() {
             USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "tv-wayland*-armv7l-odroidu3")"
             ;;
         *headless-rpi3*)
-            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-headless-*-armv7l-rpi3")"
+            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-gps_tracker-*-armv7l-rpi3")"
             ;;
         *common-rpi3*)
             USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "common*-wayland*-armv7l-rpi3")"
@@ -180,13 +180,13 @@ get_userspace_dir() {
             USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "tv-wayland*-armv7l-rpi3")"
             ;;
         *headless-artik*)
-            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-headless-*-armv7l-artik")"
+            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-headless-*-armv7l-artik*")"
             ;;
         *artik710*|*artik530*)
-            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-headed-3parts-armv7l-artik710")"
+            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-headed-*-armv7l-artik*")"
             ;;
         *artik*)
-            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-wayland*-armv7l-artik")"
+            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-wayland*-armv7l-artik*")"
             ;;
         *minnow32*)
             USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-wayland-efi-i586")"
@@ -230,7 +230,7 @@ get_boot_dir() {
             BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-armv7l-artik530")"
             ;;
         *artik5*)
-            BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-armv7l-artik5")"
+            BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-armv7l-artik520")"
             ;;
         *artik10*)
             BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-armv7l-artik10")"
diff --git a/tsp/image_map.example b/tsp/image_map.example
index 84ca773..0940a9e 100644
--- a/tsp/image_map.example
+++ b/tsp/image_map.example
@@ -1,19 +1,20 @@
-boot-armv7l-odroidu3
-wayland-3parts-armv7l-odroidu3
-target-odroidxu3
-wayland-armv7l-odroidu3
-boot-armv7l-artik5
-boot-armv7l-artik530
-boot-armv7l-artik10
 boot-arm64-artik710
-headless-3parts-armv7l-artik
-wayland-3parts-armv7l-artik
-headed-3parts-armv7l-artik710
+boot-arm64-rpi3
+boot-armv7l-artik10
+boot-armv7l-artik520
+boot-armv7l-artik530
+boot-armv7l-odroidu3
 emulator-wayland-mbr-i586
-wayland-efi-i586
-wayland-efi-x86_64
+headed-3parts-armv7l-artik530_710
+gps_tracker-2parts-armv7l-rpi3
+headless-3parts-armv7l-artik
 minimal-mbr-x86_64
-boot-arm64-rpi3
-headless-2parts-armv7l-rpi3
+target-odroidxu3
+wayland-3parts-armv7l-artik
+wayland-3parts-armv7l-artik710
+wayland-3parts-armv7l-odroidu3
 wayland-3parts-armv7l-rpi3
+wayland-armv7l-odroidu3
 wayland-armv7l-rpi3
+wayland-efi-i586
+wayland-efi-x86_64
diff --git a/tsp/scripts/common_prep_flash_conf.sh b/tsp/scripts/common_prep_flash_conf.sh
index a7dbb11..e857856 100755
--- a/tsp/scripts/common_prep_flash_conf.sh
+++ b/tsp/scripts/common_prep_flash_conf.sh
@@ -35,6 +35,7 @@ case "$TARGET" in
         BOOT_IMG="$(pwd)/$(ls tizen-*-boot-*rpi3*.tar.gz)"
         USR_IMG="$(pwd)/$(ls tizen-*-headless-*rpi3*.tar.gz)"
         test -f "$USR_IMG" || USR_IMG="$(pwd)/$(ls tizen-*-wayland-*rpi3*.tar.gz)"
+        test -f "$USR_IMG" || USR_IMG="$(pwd)/$(ls tizen-*-gps_tracker-*rpi3*.tar.gz)"
         ;;
     *artik*)
         BOOT_IMG="$(pwd)/$(ls tizen-*-boot-*artik*.tar.gz)"
diff --git a/tsp/tree_unified b/tsp/tree_unified
index 78042fb..089774e 100644
--- a/tsp/tree_unified
+++ b/tsp/tree_unified
@@ -1,28 +1,28 @@
-images/standard/common-headless-3parts-armv7l-artik/MD5SUMS
-images/standard/common-wayland-efi-i586/MD5SUMS
-images/standard/common-emulator-wayland-3parts-i586/MD5SUMS
-images/standard/common-wayland-3parts-arm64/MD5SUMS
-images/standard/common-wayland-mbr-i586/MD5SUMS
+images/standard/common-boot-arm64-artik710/MD5SUMS
+images/standard/common-boot-armv7l-artik10/MD5SUMS
+images/standard/common-boot-armv7l-artik530/MD5SUMS
+images/standard/common-boot-armv7l-odroidu3/MD5SUMS
 images/standard/common-boot-armv7l-odroidxu3/MD5SUMS
-images/standard/common-wayland-mbr-x86_64/MD5SUMS
+images/standard/common-emulator-wayland-3parts-i586/MD5SUMS
+images/standard/common-emulator-wayland-mbr-i586/MD5SUMS
+images/standard/common-headless-3parts-armv7l-artik/MD5SUMS
+images/standard/common-installer-efi-x86_64/MD5SUMS
+images/standard/common-installer-mbr-i586/MD5SUMS
 images/standard/common-minimal-mbr-x86_64/MD5SUMS
 images/standard/common-wayland-2parts-armv7l/MD5SUMS
+images/standard/common-wayland-3parts-arm64/MD5SUMS
 images/standard/common-wayland-3parts-armv7l-artik/MD5SUMS
-images/standard/common-wayland-3parts-armv7l-artik710/MD5SUMS
-images/standard/common-emulator-wayland-mbr-i586/MD5SUMS
-images/standard/common-installer-efi-x86_64/MD5SUMS
-images/standard/common-boot-armv7l-artik10/MD5SUMS
-images/standard/common-boot-arm64-artik710/MD5SUMS
 images/standard/common-wayland-3parts-armv7l-odroidu3/MD5SUMS
-images/standard/tv-wayland-3parts-armv7l-odroidu3/MD5SUMS
-images/standard/common-boot-armv7l-artik5/MD5SUMS
-images/standard/common-boot-armv7l-artik530/MD5SUMS
-images/standard/common-boot-armv7l-odroidu3/MD5SUMS
-images/standard/tv-boot-armv7l-odroidu3/MD5SUMS
-images/standard/common-installer-mbr-i586/MD5SUMS
+images/standard/common-wayland-3parts-armv7l-rpi3/MD5SUMS
+images/standard/common-wayland-efi-i586/MD5SUMS
 images/standard/common-wayland-efi-x86_64/MD5SUMS
+images/standard/common-wayland-mbr-i586/MD5SUMS
+images/standard/common-wayland-mbr-x86_64/MD5SUMS
+images/standard/iot-boot-arm64-rpi3/MD5SUMS
+images/standard/iot-boot-armv7l-artik520/MD5SUMS
+images/standard/iot-gps_tracker-2parts-armv7l-rpi3/MD5SUMS
+images/standard/iot-headed-3parts-armv7l-artik530_710/MD5SUMS
 images/standard/ivi-target-odroidxu3/MD5SUMS
-images/standard/common-boot-arm64-rpi3/MD5SUMS
-images/standard/common-headless-2parts-armv7l-rpi3/MD5SUMS
-images/standard/common-wayland-3parts-armv7l-rpi3/MD5SUMS
+images/standard/tv-boot-armv7l-odroidu3/MD5SUMS
+images/standard/tv-wayland-3parts-armv7l-odroidu3/MD5SUMS
 images/standard/tv-wayland-armv7l-rpi3/MD5SUMS