diff options
| author | Joel Kitching <kitching@google.com> | 2019-12-05 17:35:17 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-13 18:22:01 +0000 |
| commit | 1d9945764bb9e159680ef4b3a15c9bcd23fad8fe (patch) | |
| tree | 230baa5ce19dab549a6b1163a3ee232638f8050a | |
| parent | 2843aa62ba7bcaab2abccf16e3f1b8bd7e058fdb (diff) | |
| download | vboot-1d9945764bb9e159680ef4b3a15c9bcd23fad8fe.tar.gz | |
vboot: remove leftover legacy secdata symbols
Remove leftover secdata and secdatak symbols.
secdata_firmware and secdata_kernel should be used instead.
BUG=b:124141368, chromium:972956
TEST=make clean && make runtests
BRANCH=none
Change-Id: I89518242c447253c5a7c332257e126d31d76239c
Cq-Depend: chromium:1967151
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1952562
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | firmware/2lib/include/2api.h | 10 | ||||
| -rw-r--r-- | firmware/2lib/include/2constants.h | 4 |
2 files changed, 0 insertions, 14 deletions
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index 1dad47a8..28ad3aa8 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -27,14 +27,6 @@ #include "2recovery_reasons.h" #include "2return_codes.h" -/* TODO(chromium:972956): Remove once coreboot is using updated names */ -#define secdata secdata_firmware -#define secdatak secdata_kernel -#define vb2api_secdata_check vb2api_secdata_firmware_check -#define vb2api_secdata_create vb2api_secdata_firmware_create -#define vb2api_secdatak_check vb2api_secdata_kernel_check -#define vb2api_secdatak_create vb2api_secdata_kernel_create - /* Modes for vb2ex_tpm_set_mode. */ enum vb2_tpm_mode { /* @@ -69,8 +61,6 @@ enum vb2_context_flags { * this flag. */ VB2_CONTEXT_SECDATA_FIRMWARE_CHANGED = (1 << 1), - /* TODO: Remove once coreboot has switched over */ - VB2_CONTEXT_SECDATA_CHANGED = (1 << 1), /* Recovery mode is requested this boot */ VB2_CONTEXT_RECOVERY_MODE = (1 << 2), diff --git a/firmware/2lib/include/2constants.h b/firmware/2lib/include/2constants.h index b2abd4ab..a6ccf3fb 100644 --- a/firmware/2lib/include/2constants.h +++ b/firmware/2lib/include/2constants.h @@ -27,10 +27,6 @@ #define VB2_SECDATA_FWMP_MIN_SIZE 40 #define VB2_SECDATA_FWMP_MAX_SIZE 64 -/* TODO(chromium:972956): Remove once coreboot is using updated names */ -#define VB2_SECDATA_SIZE 10 -#define VB2_SECDATAK_SIZE 13 - /* * Recommended size of work buffer for firmware verification stage. * |