scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-30 02:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "flash_ec: Accomodate using flashrom on beaglebone"

Browse Source 
This reverts commit fcdbe7da7a, 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>
This commit is contained in:
Shawn Nematbakhsh
2015-11-16 15:42:13 -08:00
committed by Shawn N
parent fcdbe7da7a
commit dbebdfdb70
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
util/flash_ec
View File

@@ -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