diff options
| author | Jett Rink <jettrink@chromium.org> | 2018-04-03 09:21:14 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-04-04 20:55:29 -0700 |
| commit | 039c4a95eb226241c492c8aca83d22f900e4a1b3 (patch) | |
| tree | 3eaa56298d8f4b3ade35b6b9c62c002ac8fece03 /util | |
| parent | 5bf954bedfc1bb11aee020eeb1729bbc187cb293 (diff) | |
| download | chrome-ec-039c4a95eb226241c492c8aca83d22f900e4a1b3.tar.gz | |
util: update flash_ec script to handle installed location
When flash_ec script is run from /usr/bin it could not find
the ec source directory to calculate the basebord. Handle flash_ec
running from /usr/bin by using the default chroot source layout to
find ec platform dir. If dir is not present, then skip baseboard
check
BRANCH=none
BUG=b:77128456
TEST=sudo emerge ec-devutils && flash_ec --board=yorp
Change-Id: Ib7766e5c7ca701f0a209c6e6e6c1a192284b9d0b
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/992993
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/flash_ec | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/util/flash_ec b/util/flash_ec index b8915b1a25..49a8b8c004 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -418,7 +418,15 @@ if [[ -n "${EC_DIR}" ]]; then fi # Get baseboard from build system if present -BASEBOARD=$(make --quiet -C ${EC_DIR} BOARD=${BOARD} print-baseboard) +BASEBOARD= +if [[ -n "${EC_DIR}" ]]; then + BASEBOARD=$(make --quiet -C ${EC_DIR} BOARD=${BOARD} print-baseboard) +elif [[ -d "${HOME}/trunk/src/platform/ec" ]]; then + BASEBOARD=$(make --quiet -C ${HOME}/trunk/src/platform/ec \ + BOARD=${BOARD} print-baseboard) +else + info "Could not find ec build folder to calculate baseboard." +fi if [[ -n "${BASEBOARD}" ]]; then EMERGE_BUILD=/build/${BASEBOARD}/firmware/${BOARD}/${EC_FILE} |