summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorHu, Hebo <hebo.hu@intel.com>2019-07-04 10:32:52 +0800
committerCommit Bot <commit-bot@chromium.org>2019-07-12 01:11:10 +0000
commit5c2243bb6b5b0b8a7afe2f79a0388c8ed8391a1a (patch)
treefb7f43cd306bae68b798313c055542695e0f49d3 /Makefile.rules
parent220d0bf43c6ec01bac79360b99b75199b04d4ada (diff)
downloadchrome-ec-5c2243bb6b5b0b8a7afe2f79a0388c8ed8391a1a.tar.gz
ish: fix aon task not auto rebuild issue in increment build
aon task image build rules are lack of dependent rules of source code, so can't track the source code changes and trigger auto build. Refactor build rules for aon task to make sure always auto rebuild when aon task's source code and dependent header files update BUG=b:136691893 BRANCH=none TEST= ish aon task should always rebuild when it's code and dependent header files update Change-Id: I0d8c7c6a4a2b7e99d724b88b233e09a29b8facea Signed-off-by: Hu, Hebo <hebo.hu@intel.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1688701 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-by: Hebo Hu <hebo.hu@intel.corp-partner.google.com> Tested-by: Hebo Hu <hebo.hu@intel.corp-partner.google.com> Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules17
1 files changed, 1 insertions, 16 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 25e54b9055..d6280c098f 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -68,6 +68,7 @@ cmd_elf_to_signed ?= $(SIGNER) --key=util/signer/$(3) \
--b --input=$< --format=bin --output=$@.signed $(SIGNER_EXTRAS) \
&& sudo chown $(shell whoami) $@.signed && mv $@.signed $@
cmd_elf_to_dis = $(OBJDUMP) -D $< > $@
+cmd_elf_to_bin = $(OBJCOPY) -O binary $< $@
cmd_elf_to_hex = $(OBJCOPY) -O ihex $< $@
cmd_bin_to_hex = $(OBJCOPY) -I binary -O ihex \
--change-addresses $(_program_memory_base) $^ $@
@@ -586,22 +587,6 @@ $(npcx-monitor-hdr-rw-bin):$(out)/$(npcx-monitor-hdr)_rw.o
$(if $(V),,@echo ' EXTBIN ' $(subst $(out)/,,$@) ; )
-@ $(OBJCOPY) -O binary $< $@
-# rules for building ISH aon task fw
-$(ish-aontask-fw-bin):$(out)/$(ish-aontask-fw).ld
- $(if $(V),,@echo ' EXTBIN ' $(subst $(out)/,,$@) ; )
- -@ $(CC) $(CFLAGS) -MMD -MF $(out)/$(ish-aontask-fw).d -c $(ish-aontask-fw).c \
- -o $(out)/$(ish-aontask-fw).o
- -@ $(CC) $(CFLAGS) -MMD -MF $(out)/$(ish-aontask-dma).d -c $(ish-aontask-dma).c \
- -o $(out)/$(ish-aontask-dma).o
- -@ $(CC) $(out)/$(ish-aontask-fw).o $(out)/$(ish-aontask-dma).o $(LDFLAGS) \
- -o $(out)/$(ish-aontask-fw).elf -Wl,-T,$(out)/$(ish-aontask-fw).ld \
- -Wl,-Map,$(out)/$(ish-aontask-fw).map
- -@ $(OBJCOPY) -O binary $(out)/$(ish-aontask-fw).elf $@
-
-$(out)/$(ish-aontask-fw).ld:$(ish-aontask-fw).ld.in
- -@ mkdir -p $(@D)
- @ $(CC) $(CFLAGS) -x assembler-with-cpp -E -P $< -o $@
-
.PHONY: xrefs
xrefs: $(call targ_if_prog,etags,$(out)/TAGS) \
$(call targ_if_prog,ctags,$(out)/tags)