diff options
| author | Joel Kitching <kitching@google.com> | 2019-08-22 16:32:05 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-28 07:32:06 +0000 |
| commit | d0dae8029bc6c6805c56e384038cf8112e8766d6 (patch) | |
| tree | c49bdfef1f08ca297adc649838527cbe8ea4874e /Makefile | |
| parent | ab0d526e162ba7478080eab11200f00fe7565338 (diff) | |
| download | vboot-d0dae8029bc6c6805c56e384038cf8112e8766d6.tar.gz | |
vboot/secdata: remove DISABLE_ROLLBACK_TPM constant
This constant triggered different implementations of the two
functions RollbackFwmpRead and RollbackKernelLock, whose
overridden implementation would then be relied on in various
tests. Instead, directly override these functions within the
tests where they are required.
The overridden implementations were also used in
utilities/load_kernel_test.c, but this utility is currently
broken and not in active use. If we would like to get it working
again, simply override these two functions directly in the C
file, just as is done for unit tests. (See b:139839429.)
BUG=b:124141368, chromium:972956
TEST=make clean && make runtests
BRANCH=none
Change-Id: I0a4d24ea4ae4182b7f4f258860de6f712dae1555
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1765169
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -867,12 +867,6 @@ ${FWLIB21_OBJS}: CFLAGS += -DUNROLL_LOOPS ${FWLIB_OBJS}: CFLAGS += -DSAVE_LOCALE_IMMEDIATELY endif -ifeq (${FIRMWARE_ARCH},) -# Disable rollback TPM when compiling locally, since otherwise -# load_kernel_test attempts to talk to the TPM. -${FWLIB_OBJS}: CFLAGS += -DDISABLE_ROLLBACK_TPM -endif - ${FWLIB21_OBJS}: INCLUDES += -Ifirmware/lib21/include # Linktest ensures firmware lib doesn't rely on outside libraries |