summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Sukhomlinov <sukhomlinov@google.com>2021-10-06 09:27:30 -0700
committerCommit Bot <commit-bot@chromium.org>2021-10-07 18:20:52 +0000
commitee54c8a9c82746dbe3f1def393ddd1ba0f3a124a (patch)
tree51acab0ef5e413f5d4c7537a1f694872e5ea4815
parentaeb565aecb7341c6e688244647ca68940f636180 (diff)
downloadchrome-ec-ee54c8a9c82746dbe3f1def393ddd1ba0f3a124a.tar.gz
cr50: fix make file dependencies for FIPS module
Dependencies for FIPS module were incorrectly set as actual dependency on $(out)/ec_version.h and $(out)/env_config.h instead of order-only dependency, causing rebuild on any change in repository. BUG=b:202225290 TEST=make BOARD=cr50 echo ' ' >> board/cr50/tpm2/rsa.c make BOARD=cr50 should only rebuild tpm2/rsa.c and not dcrypto/* Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com> Change-Id: I4d2e8e4a2182ddf850ccfad18e9b517f41594d55 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3208539 Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org> Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org> Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
-rw-r--r--Makefile1
-rw-r--r--board/cr50/build.mk3
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 79e282871f..df2932b767 100644
--- a/Makefile
+++ b/Makefile
@@ -360,6 +360,7 @@ $(rw-eps) $(out)/RW/str_blob: $(rw-es)
$(rw-objs): $(out)/RW/str_blob $(rw-eps)
endif
+rw-deps += $(rw_board_deps)
ifeq ($(CONFIG_FW_INCLUDE_RO),y)
deps := $(ro-deps) $(rw-deps) $(deps-y)
diff --git a/board/cr50/build.mk b/board/cr50/build.mk
index 87c05f66a0..f04342d5e8 100644
--- a/board/cr50/build.mk
+++ b/board/cr50/build.mk
@@ -195,7 +195,8 @@ RW_FIPS_OBJS=$(patsubst %.o, $(RW_BD_OUT)/%.o, $(fips-y))
$(RW_FIPS_OBJS): CFLAGS += -frandom-seed=0 -fno-fat-lto-objects -Wswitch\
-Wsign-compare -Wuninitialized
-$(RW_FIPS_OBJS): $(out)/ec_version.h $(out)/env_config.h
+$(RW_FIPS_OBJS): | $(out)/ec_version.h $(out)/env_config.h
+rw_board_deps := $(addsuffix .d, $(RW_FIPS_OBJS))
# Note, since FIPS object files are compiled with lto, actual compilation
# and code optimization take place during link time.