commit beaceaaf208c60ddcd77df9bca17171f25052424
author Alex Van Damme <atv@google.com> Mon Jan 14 20:18:23 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 14 20:18:23 2019 +0000
tree 41f224d4dad5b1b3cc3c5c2b750eb5238d30990c
parent d4fbc319d54a1acbe221a27788cba1dff64ca22b
parent 257f0bf7fc02a001bc4014a6d41e1000849f5861

Merge "Clean up arch.mk, only define really board-specific things here"

flash.sh

diff --git a/flash.sh b/flash.sh
old mode 100644
new mode 100755
index 4ae5012..fc6746f
--- a/flash.sh
+++ b/flash.sh
@@ -16,7 +16,7 @@
 
 set -e
 
-SCRIPT_DIR=$(dirname $0)
+SCRIPT_DIR=$(realpath $(dirname $0))
 FLASHTOOLS_DIR=${SCRIPT_DIR}/flashtools
 FBTOOL=${FLASHTOOLS_DIR}/fbtool.py
 EXCELSIOR_DEBUG_RESET_TOOL=${FLASHTOOLS_DIR}/debug_board_reset.py
@@ -42,8 +42,10 @@
 }
 
 load_lk_to_ram() {
+  pushd ${PRODUCT_OUT}
   echo "Load LK to rom and boot LK"
   ${FBTOOL} -f ${PRODUCT_OUT}/dl_addr.ini
+  popd
 }
 
 erase_mmc() {