diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2019-02-28 20:05:27 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-05 09:21:44 -0700 |
| commit | 1d6c7bb9773f76aa70ce65822fa001ff72892cd2 (patch) | |
| tree | 3631462d9540df08d13cffa9a7f8e7e9bb3e7899 /test/build.mk | |
| parent | 63bf8f8ba87b23378391b147f1b3e9fdcf3d8dc5 (diff) | |
| download | chrome-ec-1d6c7bb9773f76aa70ce65822fa001ff72892cd2.tar.gz | |
nvmem: test modifications to support the new scheme
This patch includes changes to support testing of the new nvmem
implementation.
Making fizz compatible required duplicating a lot of functionality
available in the test/ directory (fuzz/nvmem_tpm2_mock.c is very
similar to test/nvmem_tpm2_mock.c), but I could not find an easy way
to avoid it.
BRANCH=cr50, cr50-mp
BUG=b:69907320, b:129710256
CQ-DEPEND=CL:1496607
TEST=with the rest of the patches applied 'make buildall -j' succeeds,
which confirms both test and fuzz success.
Change-Id: Ife999b04d22f8ddbe9ea5d35f4c3e21f57592754
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1450278
Reviewed-by: Andrey Pronin <apronin@chromium.org>
Diffstat (limited to 'test/build.mk')
| -rw-r--r-- | test/build.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/build.mk b/test/build.mk index 979fc352fe..6900c97e3d 100644 --- a/test/build.mk +++ b/test/build.mk @@ -47,7 +47,6 @@ test-list-host += motion_angle_tablet test-list-host += motion_lid test-list-host += mutex test-list-host += nvmem -test-list-host += nvmem_vars test-list-host += pingpong test-list-host += pinweaver test-list-host += power_button @@ -105,8 +104,7 @@ motion_angle-y=motion_angle.o motion_angle_data_literals.o motion_common.o motion_angle_tablet-y=motion_angle_tablet.o motion_angle_data_literals_tablet.o motion_common.o motion_lid-y=motion_lid.o mutex-y=mutex.o -nvmem-y=nvmem.o -nvmem_vars-y=nvmem_vars.o +nvmem-y=nvmem.o nvmem_tpm2_mock.o pingpong-y=pingpong.o pinweaver-y=pinweaver.o power_button-y=power_button.o @@ -135,3 +133,8 @@ vboot-y=vboot.o float-y=fp.o fp-y=fp.o x25519-y=x25519.o + +TPM2_ROOT := $(CROS_WORKON_SRCROOT)/src/third_party/tpm2 +$(out)/RO/common/new_nvmem.o: CFLAGS += -I$(TPM2_ROOT) +$(out)/RO/test/nvmem.o: CFLAGS += -I$(TPM2_ROOT) +$(out)/RO/test/nvmem_tpm2_mock.o: CFLAGS += -I$(TPM2_ROOT) |