From bf5368700249a9a29ab6e4358115362a0ef7ae09 Mon Sep 17 00:00:00 2001 From: Abe Levkoy Date: Wed, 24 Mar 2021 15:43:50 -0600 Subject: genvif: Use VIF overrides by default Use board-specific override files when generating VIFs for boards. BUG=b:172276715 TEST=make buildall BRANCH=none Signed-off-by: Abe Levkoy Change-Id: I197365018ceb8197c22d631cebf4cbce1c0119f7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2785506 Reviewed-by: Denis Brockus Commit-Queue: Denis Brockus --- Makefile.rules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile.rules') diff --git a/Makefile.rules b/Makefile.rules index c30b2cd873..9916fba5ba 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -114,7 +114,8 @@ cmd_run_coverage_test = ./util/run_host_test --coverage $* $(silent) # generate new version.h, compare if it changed and replace if so cmd_version = ./util/getversion.sh > $@.tmp && \ cmp -s $@.tmp $@ && rm -f $@.tmp || mv $@.tmp $@ -cmd_vif = $(out)/util/genvif -b $(BOARD) -o $(out) +cmd_vif = $(out)/util/genvif -b $(BOARD) -o $(out) \ + -v board/$(BOARD)/vif_override.xml cmd_mv_from_tmp = mv $(out)/$*.bin.tmp $(out)/$*.bin cmd_extractrw-y = dd if=$(out)/$(PROJECT).bin.tmp of=$(out)/$(PROJECT).RW.bin \ bs=1 count=$(_rw_size) skip=$(_rw_off) $(silent_err) @@ -459,7 +460,7 @@ $(out)/%.bin: $(out)/%.obj $(call quiet,copyrw-y,COPY_RW)) $(call quiet,mv_from_tmp,MV ) -$(out)/$(BOARD)_vif.xml: $(out)/util/genvif +$(out)/$(BOARD)_vif.xml: $(out)/util/genvif board/$(BOARD)/vif_override.xml $(call quiet,vif,VIF ) flat-y := $(out)/RW/$(PROJECT).RW.flat -- cgit v1.2.1