diff options
| author | Joel Kitching <kitching@google.com> | 2019-01-11 19:31:53 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-02-14 05:27:16 -0800 |
| commit | 1e177741c3a9bfb8bd69a92b6d3bf4b25655a71f (patch) | |
| tree | 1bbf8f49959405132929be482a6bf1fc84e9174d | |
| parent | 5113be71daaf3d6e7d5f4a9a0c7335370220680f (diff) | |
| download | vboot-1e177741c3a9bfb8bd69a92b6d3bf4b25655a71f.tar.gz | |
vboot: rename VB2_DISABLE_DEVELOPER_MODE
Rename VB2_DISABLE_DEVELOPER_MODE to VB2_CONTEXT_DISABLE_DEVELOPER_MODE.
Flag name should be consistent with others in vb2_context_flags.
VB2_DISABLE_DEVELOPER_MODE should be removed in subsequent CL.
BUG=b:124141368
TEST=Build locally
BRANCH=none
Change-Id: I42260205e9e27b4bd382cdf69962917d41ca882a
Reviewed-on: https://chromium-review.googlesource.com/1460645
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | firmware/2lib/2misc.c | 2 | ||||
| -rw-r--r-- | firmware/2lib/include/2api.h | 2 | ||||
| -rw-r--r-- | tests/vb2_misc_tests.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/firmware/2lib/2misc.c b/firmware/2lib/2misc.c index 0878279b..2f68639e 100644 --- a/firmware/2lib/2misc.c +++ b/firmware/2lib/2misc.c @@ -251,7 +251,7 @@ int vb2_check_dev_switch(struct vb2_context *ctx) * Check if we've been asked by the caller to disable dev mode. Note * that hardware switch and GBB flag will take precedence over this. */ - if (ctx->flags & VB2_DISABLE_DEVELOPER_MODE) + if (ctx->flags & VB2_CONTEXT_DISABLE_DEVELOPER_MODE) flags &= ~VB2_SECDATA_FLAG_DEV_MODE; /* Check virtual dev switch */ diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h index 1a75b355..90647d5e 100644 --- a/firmware/2lib/include/2api.h +++ b/firmware/2lib/include/2api.h @@ -111,6 +111,8 @@ enum vb2_context_flags { VB2_CONTEXT_FORCE_WIPEOUT_MODE = (1 << 8), /* Erase TPM developer mode state if it is enabled. */ + VB2_CONTEXT_DISABLE_DEVELOPER_MODE = (1 << 9), + /* Deprecated name; remove */ VB2_DISABLE_DEVELOPER_MODE = (1 << 9), /* diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index 9089d3da..fddd49df 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -392,7 +392,7 @@ static void dev_switch_tests(void) vb2_secdata_set(&cc, VB2_SECDATA_FLAGS, (VB2_SECDATA_FLAG_DEV_MODE | VB2_SECDATA_FLAG_LAST_BOOT_DEVELOPER)); - cc.flags |= VB2_DISABLE_DEVELOPER_MODE; + cc.flags |= VB2_CONTEXT_DISABLE_DEVELOPER_MODE; TEST_SUCC(vb2_check_dev_switch(&cc), "disable dev on ctx request"); TEST_EQ(sd->flags & VB2_SD_FLAG_DEV_MODE_ENABLED, 0, " sd not in dev"); |