From 20dda8c1406708044b407b05659910eebaf10fca Mon Sep 17 00:00:00 2001 From: Namyoon Woo Date: Tue, 9 Apr 2019 11:12:37 -0700 Subject: make: include iteflash in host-util group iteflash is a flash tool for ITE EC, and needs to be installed in labstations. iteflash should belong to host-util like other EC flash tools. BUG=b:130036463 BRANCH=None TEST=built and ran iteflash on Ampton using servo_v2, servo_micro and Suzy-Q. Change-Id: If711a26f7d6d3979332b9064313a7e1b87cd594a Signed-off-by: Namyoon Woo Reviewed-on: https://chromium-review.googlesource.com/1560143 Reviewed-by: Matthew Blecker --- Makefile.toolchain | 2 ++ util/build.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.toolchain b/Makefile.toolchain index c19ad273c0..338caf0672 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -125,12 +125,14 @@ endif BUILD_CFLAGS = $(LIBFTDIUSB_CFLAGS) $(BUILD_CPPFLAGS) -O3 $(CFLAGS_DEBUG) BUILD_CFLAGS += $(CFLAGS_WARN) HOST_CFLAGS=$(HOST_CPPFLAGS) -O3 $(CFLAGS_DEBUG) $(CFLAGS_WARN) -DHOST_TOOLS_BUILD +HOST_CFLAGS+=$(LIBFTDIUSB_CFLAGS) ifneq (${SYSROOT},) LDFLAGS_EXTRA+=--sysroot=${SYSROOT} endif LDFLAGS=-nostdlib -g -Wl,-X -Wl,--gc-sections -Wl,--build-id=none \ $(LDFLAGS_EXTRA) $(CFLAGS_CPU) BUILD_LDFLAGS=$(LIBFTDIUSB_LDLIBS) +HOST_LDFLAGS=$(LIBFTDIUSB_LDLIBS) HOST_TEST_LDFLAGS=-Wl,-T core/host/host_exe.lds -lrt -pthread -rdynamic -lm\ -fuse-ld=bfd \ $(if $(TEST_COVERAGE),-fprofile-arcs,) \ diff --git a/util/build.mk b/util/build.mk index fef646f2de..7699ef4572 100644 --- a/util/build.mk +++ b/util/build.mk @@ -7,8 +7,8 @@ # host-util-bin=ectool lbplay stm32mon ec_sb_firmware_update lbcc \ - ec_parse_panicinfo cbi-util -build-util-bin=ec_uartd iteflash + ec_parse_panicinfo cbi-util iteflash +build-util-bin=ec_uartd build-util-art+=util/export_taskinfo.so ifeq ($(CHIP),npcx) build-util-bin+=ecst -- cgit v1.2.1