diff options
| author | Bob Moragues <moragues@google.com> | 2018-11-28 14:17:04 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-12-18 21:09:05 +0000 |
| commit | c5ab11d5d903a2f6700dfad8beaceafc259d066e (patch) | |
| tree | 579660cd15ad1e14227384eea9858d8951e644a9 /util | |
| parent | 63504301a538200180252342962f13cdd3065ef5 (diff) | |
| download | chrome-ec-c5ab11d5d903a2f6700dfad8beaceafc259d066e.tar.gz | |
meowth: remove meowth/zoombini overlays and repositories
BRANCH=none
BUG=b:118494679
TEST=Verify PreCQ build
Signed-off-by: Bob Moragues <moragues@chromium.org>
Change-Id: Id6889d922a2b4d812cc92ddbb35b2581d881459d
Reviewed-on: https://chromium-review.googlesource.com/1354316
Commit-Ready: Bob Moragues <moragues@chromium.org>
Tested-by: Bob Moragues <moragues@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/1383203
Reviewed-by: Jett Rink <jettrink@chromium.org>
Commit-Queue: Jett Rink <jettrink@chromium.org>
Tested-by: Jett Rink <jettrink@chromium.org>
Trybot-Ready: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/build.mk | 2 | ||||
| -rwxr-xr-x | util/flash_ec | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/util/build.mk b/util/build.mk index f61a11d628..fef646f2de 100644 --- a/util/build.mk +++ b/util/build.mk @@ -18,7 +18,7 @@ uartupdatetool-objs=uut/main.o uut/cmd.o uut/opr.o uut/l_com_port.o \ uut/lib_crc.o $(out)/util/uartupdatetool: HOST_CFLAGS+=-Iutil/ # Build on a limited subset of boards to save build time -ifeq ($(BOARD),meowth_fp) +ifeq ($(BOARD),nocturne_fp) build-util-bin+=ectool_servo endif diff --git a/util/flash_ec b/util/flash_ec index 547296b27a..ec3a16903f 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -71,7 +71,6 @@ BOARDS_STM32=( jerry kitty kukui - meowth_fp minimuffin nami_fp nocturne_fp @@ -140,11 +139,9 @@ BOARDS_NPCX_INT_SPI=( fleex grunt meep - meowth nocturne phaser yorp - zoombini ) BOARDS_NPCX_UUT=( @@ -643,7 +640,7 @@ case "${BOARD}" in chocodile_bec ) MCU="usbpd" ;; oak_pd|samus_pd|strago_pd ) MCU="usbpd" ;; chell_pd|glados_pd ) MCU="usbpd" ;; - meowth_fp|nami_fp|nocturne_fp ) MCU="usbpd" ;; + nami_fp|nocturne_fp ) MCU="usbpd" ;; dingdong|hoho|twinkie ) DUT_CONTROL_CMD="true" ; MCU="ec" ;; *) MCU="ec" ;; esac @@ -833,14 +830,6 @@ function flash_flashrom() { # Servo micro doesn't support this control. dut_control spi1_buf_on_flex_en:on fi - - # b/65694390: Zoombini and Meowth take enough power that when - # flashing without power, the SPI Vref voltage dips for a little - # bit. Therefore, wait 1 second to let the voltage stabilize. - if [[ "${BOARD}" == "zoombini" || \ - "${BOARD}" == "meowth" ]]; then - sleep 1 - fi else if [ $board_is_npcx_internal_spi -eq 0 ]; then # Set GP_SEL# as low then start ec |