summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2016-06-06 14:38:32 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-06-08 19:18:09 -0700
commit9ffc6915c9298c3a2325aee06a84f9822eb78330 (patch)
tree457de4a0939efdb48f4fc67b7fe9e6969d83d7b7
parent99515baf0bd567a39abc157434eb001ef2f83fef (diff)
downloadchrome-ec-9ffc6915c9298c3a2325aee06a84f9822eb78330.tar.gz
make: Fix npcx compile error due to missing ecst binary
Add an explicit dependency on utils-build (includes ecst) to prevent ec_elf_to_flat from running before ecst is built during parallel make. BUG=chrome-os-partner:52777 BRANCH=None TEST=Modify Makefile.rules to add 5sec sleep in $(build-utils) rule, verify that `make BOARD=kevin clean && make BOARD=kevin -j` still succeeds. Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org> Change-Id: Ia443f8b880cbd4451d41302817e176201f7870dc Reviewed-on: https://chromium-review.googlesource.com/350162 Commit-Ready: Shawn N <shawnn@chromium.org> Tested-by: Shawn N <shawnn@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r--Makefile.rules2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 20ab58afcc..9a10f23118 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -221,7 +221,7 @@ $(out)/RW/%.hex: $(out)/RW/%.elf $(out)/RW/%.smap
$(call quiet,elf_to_hex,OBJCOPY)
ifeq ($(SIGNED_IMAGES),)
-$(out)/%.flat: $(out)/%.elf $(out)/%.smap
+$(out)/%.flat: $(out)/%.elf $(out)/%.smap utils-build
$(call quiet,ec_elf_to_flat,OBJCOPY)
$(out)/RO/%.hex: $(out)/RO/%.elf $(out)/RO/%.smap