diff options
author | Myles Watson <mylesgw@chromium.org> | 2015-05-29 16:06:09 -0700 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-09 01:17:57 +0000 |
commit | aaff3610116bab246906ad929b5f0179cbe09577 (patch) | |
tree | f6a3bcb5ec7e05a1e1ef043cdbb88eedec131c50 /util/flash_ec | |
parent | b793546316544eb6cb48362ad91d60c42dbee9e4 (diff) | |
download | chrome-ec-aaff3610116bab246906ad929b5f0179cbe09577.tar.gz |
flash_ec: split interface config from chip configs
rename setup_openocd -> flash_openocd
refactor so that flash_npcx and flash_lm4 set OCD_CMDS and call flash_openocd
BRANCH=none
BUG=chrome-os-partner:22990
TEST=run flash_ec before and after and compare the sequence of calls to
dut-control and the command-line args to openocd
tested with ryu (non-lm4), samus, link, npcx_evb, and peppy
Change-Id: I7a05e3219d4b324bcf19a20f86b149f8e3377465
Signed-off-by: Myles Watson <mylesgw@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/273907
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'util/flash_ec')
-rwxr-xr-x | util/flash_ec | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/util/flash_ec b/util/flash_ec index a7eef4efc2..b94ed556d9 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -312,19 +312,26 @@ function claim_pty() { # Board specific flashing scripts -# helper function for setting up servo v2/3 with openocd paths -function setup_openocd() { +# helper function for using servo v2/3 with openocd +function flash_openocd() { + OCD_CFG="servo.cfg" if [[ -z "${EC_DIR}" ]]; then # check if we're on beaglebone if [[ -e "/usr/bin/lib" ]]; then - OCD_CFG="servo_v3.cfg" OCD_PATH="/usr/bin/lib" else die "Cannot locate openocd configs" fi else - OCD_CFG="servo_v2.cfg" + OCD_PATH="${EC_DIR}/util/openocd" fi + + dut_control jtag_buf_on_flex_en:on + dut_control jtag_buf_en:on + + sudo openocd -s "${OCD_PATH}" -f "${OCD_CFG}" -f "${OCD_CHIP_CFG}" \ + -c "${OCD_CMDS}" || \ + die "Failed to program ${IMG}" } function flash_stm32() { @@ -384,37 +391,25 @@ function flash_stm32_dfu() { } function flash_lm4() { - OCD_PATH="${EC_DIR}/chip/lm4/openocd" - setup_openocd - + OCD_CHIP_CFG="lm4_chip.cfg" OCD_CMDS="init; flash_lm4 ${IMG} ${FLAGS_offset}; shutdown;" - dut_control jtag_buf_on_flex_en:on - dut_control jtag_buf_en:on + flash_openocd - sudo openocd -s "${OCD_PATH}" -f "${OCD_CFG}" -c "${OCD_CMDS}" || \ - die "Failed to program ${IMG}" } function flash_npcx() { - OCD_PATH="${EC_DIR}/chip/npcx/openocd" IMG_PATH="${EC_DIR}/build/${BOARD}" - setup_openocd - - dut_control jtag_buf_on_flex_en:on - dut_control jtag_buf_en:on - + OCD_CHIP_CFG="npcx_chip.cfg" if [ "${FLAGS_ro}" = ${FLAGS_TRUE} ] ; then # Program RO region only OCD_CMDS="init; flash_npcx_ro ${IMG_PATH} ${FLAGS_offset}; shutdown;" - sudo openocd -s "${OCD_PATH}" -f "${OCD_CFG}" -c "${OCD_CMDS}" || \ - die "Failed to program ${IMG}" else # Program all EC regions OCD_CMDS="init; flash_npcx_all ${IMG_PATH} ${FLAGS_offset}; shutdown;" - sudo openocd -s "${OCD_PATH}" -f "${OCD_CFG}" -c "${OCD_CMDS}" || \ - die "Failed to program ${IMG}" fi + + flash_openocd } function flash_mec1322() { |