From 5c2243bb6b5b0b8a7afe2f79a0388c8ed8391a1a Mon Sep 17 00:00:00 2001 From: "Hu, Hebo" Date: Thu, 4 Jul 2019 10:32:52 +0800 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1688701 Reviewed-by: Jack Rosenthal Reviewed-by: Hebo Hu Tested-by: Hebo Hu Commit-Queue: Jack Rosenthal --- Makefile.rules | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'Makefile.rules') 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) -- cgit v1.2.1