Add new images for RaspberryPi 3

Change-Id: I2ca321b3d199f87230cc93d2dcf2002e0a2ff763

diff --git a/tsp/common.sh b/tsp/common.sh
index 43ddf39..9442c08 100755 (executable)
--- a/tsp/common.sh
+++ b/tsp/common.sh
@@ -32,8 +32,8 @@ die() {
 #   * minnow32, minnow64
 #   * common-odroid, tv-odroid
 #   * mbr64
-#   * rpi3
-TARGET_LIST="artik10 headless-artik5 mbr64 minnow64 minnow32 common-odroid tv-odroid ivi-odroid rpi3"
+#   * headless-rpi3, common-rpi3, tv-rpi3
+TARGET_LIST="artik10 headless-artik5 mbr64 minnow64 minnow32 common-odroid tv-odroid ivi-odroid headless-rpi3 common-rpi3 tv-rpi3"
 
 test -z "${TSP_DIR}" || export TS_ONFINISH="${TSP_DIR}/scripts/log.sh"
 
@@ -161,9 +161,15 @@ get_userspace_dir() {
         *tv-odroid*)
             USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "tv-wayland*-armv7l-odroidu3")"
             ;;
-        *rpi3*)
+        *headless-rpi3*)
             USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-headless-*-armv7l-rpi3")"
             ;;
+        *common-rpi3*)
+            USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "common*-wayland*-armv7l-rpi3")"
+            ;;
+        *tv-rpi3*)
+            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")"
             ;;

diff --git a/tsp/image_map.example b/tsp/image_map.example
index 29e3159..658882b 100644 (file)
--- a/tsp/image_map.example
+++ b/tsp/image_map.example
@@ -12,3 +12,5 @@ wayland-efi-x86_64
 minimal-mbr-x86_64
 boot-arm64-rpi3
 headless-2parts-armv7l-rpi3
+wayland-3parts-armv7l-rpi3
+wayland-armv7l-rpi3

diff --git a/tsp/results-values-device.sql b/tsp/results-values-device.sql
index 14dc0eb..36b5cfb 100644 (file)
--- a/tsp/results-values-device.sql
+++ b/tsp/results-values-device.sql
@@ -8,4 +8,6 @@ INSERT OR IGNORE INTO device VALUES (NULL, "artik5");
 INSERT OR IGNORE INTO device VALUES (NULL, "headless-artik5");
 INSERT OR IGNORE INTO device VALUES (NULL, "artik10");
 INSERT OR IGNORE INTO device VALUES (NULL, "headless-artik10");
-INSERT OR IGNORE INTO device VALUES (NULL, "rpi3");
+INSERT OR IGNORE INTO device VALUES (NULL, "headless-rpi3");
+INSERT OR IGNORE INTO device VALUES (NULL, "common-rpi3");
+INSERT OR IGNORE INTO device VALUES (NULL, "tv-rpi3");

diff --git a/tsp/scripts/common_prep_flash_conf.sh b/tsp/scripts/common_prep_flash_conf.sh
index 85842ad..a7dbb11 100755 (executable)
--- a/tsp/scripts/common_prep_flash_conf.sh
+++ b/tsp/scripts/common_prep_flash_conf.sh
@@ -34,6 +34,7 @@ case "$TARGET" in
     *rpi3*)
         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)"
         ;;
     *artik*)
         BOOT_IMG="$(pwd)/$(ls tizen-*-boot-*artik*.tar.gz)"

diff --git a/tsp/tree_unified b/tsp/tree_unified
index e49ff86..bc88778 100644 (file)
--- a/tsp/tree_unified
+++ b/tsp/tree_unified
@@ -21,3 +21,5 @@ images/standard/common-wayland-efi-x86_64/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-wayland-armv7l-rpi3/MD5SUMS