summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Mistewicz <a.mistewicz@samsung.com>2017-05-23 11:26:24 (GMT)
committerAleksander Mistewicz <a.mistewicz@samsung.com>2017-06-06 11:48:03 (GMT)
commite98831f4d156d46967368af91f8f6c66cec457ca (patch)
treef87cef238f0148d86221b59861b6c2ec42be1e1d
parent4a05bc2a42db104206b0973b4d26077b60316c91 (diff)
downloadmajor-e98831f4d156d46967368af91f8f6c66cec457ca.zip
major-e98831f4d156d46967368af91f8f6c66cec457ca.tar.gz
major-e98831f4d156d46967368af91f8f6c66cec457ca.tar.bz2
Add artik530 and artik710 supportrefs/changes/32/130932/2
Database update is required. Delete it or run: . tsp/common.sh sqlite3 "${DBPATH}" -batch < tsp/results-values-device.sql Change-Id: I3e9568e11fd35b76cdcdb70809131af9779d5205
-rwxr-xr-xtct/artik_prepare_flash_conf.sh14
-rwxr-xr-xtsp/common.sh10
-rw-r--r--tsp/image_map.example3
-rw-r--r--tsp/results-values-device.sql4
-rw-r--r--tsp/tree_unified3
5 files changed, 27 insertions, 7 deletions
diff --git a/tct/artik_prepare_flash_conf.sh b/tct/artik_prepare_flash_conf.sh
index 795cebd..ca88745 100755
--- a/tct/artik_prepare_flash_conf.sh
+++ b/tct/artik_prepare_flash_conf.sh
@@ -35,6 +35,12 @@ case "$BOOT_IMAGE" in
*artik10*)
MODEL="artik10"
;;
+ *artik530*)
+ MODEL="artik530"
+ ;;
+ *artik710*)
+ MODEL="artik710"
+ ;;
*artik5*)
MODEL="artik5"
;;
@@ -74,12 +80,7 @@ echo "### flash ###"
UUID_FILE="/var/tmp/uuid-${SDMUX}"
DEV_SDCARD=$(uuid2dev "${UUID_FILE}" "${SDMUX}") || die "sdcard not found!"
-ARTIK_FLASH_SCRIPT_DIR="$(dirname "${ARTIK_FLASH_SCRIPT}")"
-cd "${ARTIK_FLASH_SCRIPT_DIR}"
-PLATFORM_IMG="${ARTIK_FLASH_SCRIPT_DIR}/tizen-${SDMUX}.tar"
-mv "${TMP_TAR}" "${PLATFORM_IMG}"
-sudo "${ARTIK_FLASH_SCRIPT}" -d "${DEV_SDCARD}" -m "${MODEL}" -p "tizen-${SDMUX}.tar"
-cd "${OLDPWD}"
+"${ARTIK_FLASH_SCRIPT}" -d "${DEV_SDCARD}" -m "${MODEL}" -p "${TMP_TAR}"
RET=$?
change_uuid "${UUID_FILE}" "${DEV_SDCARD}"
@@ -93,4 +94,3 @@ dyper_restart "${SDMUX}" "dyper1"
echo "### cleanup ###"
rm -rf "${T_DIR}"
-rm "${PLATFORM_IMG}"
diff --git a/tsp/common.sh b/tsp/common.sh
index 9442c08..cd97cc0 100755
--- a/tsp/common.sh
+++ b/tsp/common.sh
@@ -29,6 +29,7 @@ die() {
# Supported targets are:
# * artik5, headless-artik5, artik10, headless-artik10
+# * artik710 headless-artik710, artik530, headless-artik530
# * minnow32, minnow64
# * common-odroid, tv-odroid
# * mbr64
@@ -173,6 +174,9 @@ get_userspace_dir() {
*headless-artik*)
USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-headless-*-armv7l-artik")"
;;
+ *artik710*|*artik530*)
+ USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-wayland-3parts-armv7l-artik710")"
+ ;;
*artik*)
USR_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-wayland*-armv7l-artik")"
;;
@@ -211,6 +215,12 @@ get_boot_dir() {
*rpi3*)
BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-arm64-rpi3")"
;;
+ *artik710*)
+ BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-arm64-artik710")"
+ ;;
+ *artik530*)
+ BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-armv7l-artik530")"
+ ;;
*artik5*)
BOOT_DIR="$(find "${DWN_WORKDIR}/" -type d -name "*-boot-armv7l-artik5")"
;;
diff --git a/tsp/image_map.example b/tsp/image_map.example
index 658882b..34fe11b 100644
--- a/tsp/image_map.example
+++ b/tsp/image_map.example
@@ -3,9 +3,12 @@ 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
+wayland-3parts-armv7l-artik710
emulator-wayland-mbr-i586
wayland-efi-i586
wayland-efi-x86_64
diff --git a/tsp/results-values-device.sql b/tsp/results-values-device.sql
index 36b5cfb..0d5b5a9 100644
--- a/tsp/results-values-device.sql
+++ b/tsp/results-values-device.sql
@@ -6,8 +6,12 @@ INSERT OR IGNORE INTO device VALUES (NULL, "minnow64");
INSERT OR IGNORE INTO device VALUES (NULL, "mbr64");
INSERT OR IGNORE INTO device VALUES (NULL, "artik5");
INSERT OR IGNORE INTO device VALUES (NULL, "headless-artik5");
+INSERT OR IGNORE INTO device VALUES (NULL, "artik530");
+INSERT OR IGNORE INTO device VALUES (NULL, "headless-artik530");
INSERT OR IGNORE INTO device VALUES (NULL, "artik10");
INSERT OR IGNORE INTO device VALUES (NULL, "headless-artik10");
+INSERT OR IGNORE INTO device VALUES (NULL, "artik710");
+INSERT OR IGNORE INTO device VALUES (NULL, "headless-artik710");
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/tree_unified b/tsp/tree_unified
index bc88778..78042fb 100644
--- a/tsp/tree_unified
+++ b/tsp/tree_unified
@@ -8,12 +8,15 @@ images/standard/common-wayland-mbr-x86_64/MD5SUMS
images/standard/common-minimal-mbr-x86_64/MD5SUMS
images/standard/common-wayland-2parts-armv7l/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