diff options
| author | Nicolas Norvez <norvez@chromium.org> | 2019-03-20 17:14:05 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-26 04:43:39 -0700 |
| commit | e29edbbf0ec91a2cdd5f36c80fe48181341d6c55 (patch) | |
| tree | a236c5a1b1d1cde71569bc2899baaf4f63987411 | |
| parent | 2ad68a68b3b738340f05711dfa50b0894d17b20a (diff) | |
| download | chrome-ec-e29edbbf0ec91a2cdd5f36c80fe48181341d6c55.tar.gz | |
flash_fp_mcu: only control PWREN if it exists
Some boards (Hatch) do not control the PWREN via a GPIO, instead the
power is always on. In that case, do not try to handle that non-existent
GPIO.
BRANCH=None
BUG=b:124405913
BUG=b:126455006
TEST=flash_fp_mcu on Hatch doesn't error out
TEST=flash_fp_mcu on Nocturne still works
Change-Id: I959024693b8af614e930f03991e11b0f44573a49
Signed-off-by: Nicolas Norvez <norvez@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1532344
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
| -rw-r--r-- | util/flash_fp_mcu_common.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/util/flash_fp_mcu_common.sh b/util/flash_fp_mcu_common.sh index e0e8ff3b50..31c264b617 100644 --- a/util/flash_fp_mcu_common.sh +++ b/util/flash_fp_mcu_common.sh @@ -54,9 +54,11 @@ flash_fp_mcu_stm32() { check_hardware_write_protect_disabled # Ensure the ACPI is not cutting power when unloading cros-ec-spi - echo "${gpio_pwren}" > /sys/class/gpio/export - echo "out" > "/sys/class/gpio/gpio${gpio_pwren}/direction" - echo 1 > "/sys/class/gpio/gpio${gpio_pwren}/value" + if [[ -n "${gpio_pwren}" ]]; then + echo "${gpio_pwren}" > /sys/class/gpio/export + echo "out" > "/sys/class/gpio/gpio${gpio_pwren}/direction" + echo 1 > "/sys/class/gpio/gpio${gpio_pwren}/value" + fi # Remove cros_fp if present echo "${spiid}" > /sys/bus/spi/drivers/cros-ec-spi/unbind @@ -102,7 +104,9 @@ flash_fp_mcu_stm32() { # Put back cros_fp driver echo "${spiid}" > /sys/bus/spi/drivers/cros-ec-spi/bind # Kernel driver is back, we are no longer controlling power - echo "${gpio_pwren}" > /sys/class/gpio/unexport + if [[ -n "${gpio_pwren}" ]]; then + echo "${gpio_pwren}" > /sys/class/gpio/unexport + fi # Test it ectool --name=cros_fp version } |