diff options
| author | Vadim Sukhomlinov <sukhomlinov@google.com> | 2021-10-01 15:25:00 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-02 04:03:09 +0000 |
| commit | 7d9b0399d3b5d5cf4102a5c63a48b6c80b8c5512 (patch) | |
| tree | 70cd9babdf99fe8b48378e72f0333aae26b61024 | |
| parent | 0ad46f2259b79b07a1d4b114fd58472a88c19282 (diff) | |
| download | chrome-ec-7d9b0399d3b5d5cf4102a5c63a48b6c80b8c5512.tar.gz | |
cr50: adjust FIPS module dependency to rebuild on configuration changes
FIPS module wasn't rebuilt properly when configuration options were
changed. Added proper dependencies to ensure it is rebuilt when needed.
BUG=none
TEST=make buildall -j
Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com>
Change-Id: I543eeeb00d7a72c6b8a936948e62830753954f12
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3200516
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
| -rw-r--r-- | board/cr50/build.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/cr50/build.mk b/board/cr50/build.mk index 1fa86307a5..3efe034b4e 100644 --- a/board/cr50/build.mk +++ b/board/cr50/build.mk @@ -182,6 +182,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 + # Note, since FIPS object files are compiled with lto, actual compilation # and code optimization take place during link time. # Consider -ffile-prefix-map=old_path=new_path if needed @@ -190,10 +192,10 @@ FIPS_CFLAGS = $(CFLAGS) -frandom-seed=0 -flto=1 -flto-partition=1to1 -fipa-pta\ -flive-range-shrinkage -fgcse-after-reload -fgcse-sm -fgcse-las -fivopts\ -fpredictive-commoning -freorder-blocks-algorithm=stc -$(RW_BD_OUT)/$(FIPS_MODULE): $(RW_FIPS_OBJS) +$(RW_BD_OUT)/$(FIPS_MODULE): $(RW_FIPS_OBJS) $(FIPS_LD_SCRIPT) @echo " LD $(notdir $@)" $(Q)$(CC) $(FIPS_CFLAGS) --static -Wl,--relocatable\ - -Wl,-T $(FIPS_LD_SCRIPT) -Wl,-Map=$@.map -o $@ $^ + -Wl,-T $(FIPS_LD_SCRIPT) -Wl,-Map=$@.map -o $@ $(RW_FIPS_OBJS) $(Q)$(OBJDUMP) -th $@ > $@.sym board-y+= $(FIPS_MODULE) |