diff options
| author | Shawn Nematbakhsh <shawnn@google.com> | 2015-11-16 15:42:13 -0800 |
|---|---|---|
| committer | Shawn N <shawnn@chromium.org> | 2015-11-17 18:21:35 +0000 |
| commit | dbebdfdb70c4b50dd61dec036c7b2ec86ec8993d (patch) | |
| tree | cfc1af264704be10ccc34c3c1018a96601ec93a7 | |
| parent | fcdbe7da7a08201838138e8e08877f91225cdad2 (diff) | |
| download | chrome-ec-dbebdfdb70c4b50dd61dec036c7b2ec86ec8993d.tar.gz | |
Revert "flash_ec: Accomodate using flashrom on beaglebone"
This reverts commit fcdbe7da7a08201838138e8e08877f91225cdad2, which was
breaking flash_ec when run from the chroot.
BUG=chromium:554230
BRANCH=None
TEST=Compile only
Change-Id: Ie269446cd720c852e062c1365485259c69e8ef0a
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/312859
Reviewed-by: Shelley Chen <shchen@chromium.org>
| -rwxr-xr-x | util/flash_ec | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/util/flash_ec b/util/flash_ec index 59729e9f2c..f97a693bef 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -231,11 +231,6 @@ ec_enable_boot0() { eval ${SERVO_TYPE}_${MCU}_boot0 } -on_servov3() { - grep '^CHROMEOS_RELEASE_BOARD=' /etc/lsb-release | \ - sed 's/CHROMEOS_RELEASE_BOARD=//' -} - # Put back the servo and the system in a clean state at exit FROZEN_PIDS="" cleanup() { @@ -379,21 +374,15 @@ function flash_openocd() { function flash_flashrom() { TOOL_PATH="${EC_DIR}/build/${BOARD}/util:/usr/sbin/:$PATH" FLASHROM=$(PATH="${TOOL_PATH}" which flashrom) - if [ on_servov3 ]; then - FLASHROM_PARAM="-p linux_spi" - else - FLASHROM_PARAM="-p ft2232_spi:type=servo-v2,port=B" - fi + FLASHROM_PARAM="-p ft2232_spi:type=servo-v2,port=B" if [ ! -x "$FLASHROM" ]; then die "no flashrom util found." fi - if [ ! on_servov3 ]; then - SERIALNAME=$(${DUT_CONTROL_CMD} serialname | cut -d: -f2) - if [[ "$SERIALNAME" != "" ]] ; then - FLASHROM_PARAM="${FLASHROM_PARAM},serial=${SERIALNAME}" - fi + SERIALNAME=$(${DUT_CONTROL_CMD} serialname | cut -d: -f2) + if [[ "$SERIALNAME" != "" ]] ; then + FLASHROM_PARAM="${FLASHROM_PARAM},serial=${SERIALNAME}" fi dut_control cold_reset:on |