summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViorel Suman <viorel.suman@intel.com>2016-03-18 10:22:12 +0200
committerViorel Suman <viorel.suman@intel.com>2016-03-24 11:44:22 +0200
commit88def9110b6d9b212b5645ccd1f0570bc5bd9667 (patch)
treea291bbda25a0c2dbb3685686a37938ed91a249c6
parent460917dbc0f01f887bd64b5f14bb81e18add6894 (diff)
downloadminnowboard-88def9110b6d9b212b5645ccd1f0570bc5bd9667.tar.gz
Restore check for fastboot location
Restore check for fastboot location so that OS flash can be performed from a flashfiles tgz. Change-Id: If13a382ccd5bc1bdda0f67b9bb3b2e10fe5ce386 Tracked-On: https://jira01.devtools.intel.com/browse/BP-347 Signed-off-by: Viorel Suman <viorel.suman@intel.com>
-rwxr-xr-xflash_tools/brillo-flashall.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/flash_tools/brillo-flashall.sh b/flash_tools/brillo-flashall.sh
index 6641040..4719e3f 100755
--- a/flash_tools/brillo-flashall.sh
+++ b/flash_tools/brillo-flashall.sh
@@ -54,8 +54,14 @@ VENDOR=$(dir_with_file bootloader \
"${LOCAL_DIR}" \
"${ANDROID_BUILD_TOP}/vendor/bsp/intel/minnowboard/boot_binaries")
+if [ -x "${LOCAL_DIR}"/fastboot ]; then
+ FASTBOOT="${LOCAL_DIR}"/fastboot
+else
+ FASTBOOT=fastboot
+fi
-fastboot flash gpt "${VENDOR}"/gpt.bin \
+${FASTBOOT} \
+ flash gpt "${VENDOR}"/gpt.bin \
flash bootloader "${VENDOR}"/bootloader \
flash boot_a "${OS}"/boot.img \
flash boot_b "${OS}"/boot.img \
@@ -66,5 +72,5 @@ fastboot flash gpt "${VENDOR}"/gpt.bin \
oem set_active 0 "$@"
echo "Please run the following command to restart your MinnowBoard"
-echo " fastboot $@ reboot"
+echo " ${FASTBOOT} $@ reboot"
echo